From 7e73e7699d55b4b229bef4dc5d89e01aedef5a19 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 19 五月 2025 17:13:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java |  803 +++++++++++++-------------------------------------------
 1 files changed, 189 insertions(+), 614 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
index 5ad75ef..2b89aaf 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
@@ -33,6 +33,7 @@
 import com.ltkj.system.service.ISysUserService;
 import com.ltkj.web.config.pdfutils.PdfUtils;
 import com.ltkj.web.controller.system.SysDeptController;
+import jodd.util.StringUtil;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,6 +47,9 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.math.BigDecimal;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.text.Collator;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -119,6 +123,10 @@
     private ITjProAdvicerulesService tjProAdvicerulesService;
     @Autowired
     private TjOrderYcxmService ycxmService;
+    @Resource
+    private TjXdtgmdjgService xdtgmdjgService;
+    @Autowired
+    private TjReportSpecialProjectService tjReportSpecialProjectService;
 
     private Integer pdfPage = 0;
 
@@ -1049,102 +1057,6 @@
                 }
             }
         }
-        /*else {
-            if (!collect.isEmpty() || !map.isEmpty()){
-                paragraph = PdfUtils.setParagraph(defaultTitleFont, "妫�鏌ョ患杩帮細");
-                paragraph.setSpacingBefore(3f);
-                paragraph.setSpacingAfter(2f);
-                document2.add(paragraph);
-                isBr = true;
-            }
-
-            for (Map.Entry<String, List<CsProVo>> deptEntry : listMap.entrySet()) {
-                List<CsProVo> proVos = deptEntry.getValue();
-                if (proVos.size() > 1) {
-                    proVos = proVos.stream()
-                            .sorted(Comparator.comparingLong(CsProVo::getProId))
-                            .collect(Collectors.toList());
-                }
-                // 宸茬粡閬嶅巻杩囩殑
-                ArrayList<String> jianYanYiDa = new ArrayList<>();
-                for (CsProVo proVo : proVos) {
-
-                    // 妫�鏌�
-                    for (Map.Entry<Long, List<TjOrderDetail>> entry : collect.entrySet()) {
-                        if (!entry.getKey().equals(proVo.getProId())) continue;
-                        List<TjOrderDetail> details = entry.getValue();
-                        String xmmc = proVo.getProName();
-//                    String xmmc = details.get(0).getProName();
-                        boolean isXmWrite = false;
-                        int index = 1;
-                        for (TjOrderDetail detail : details) {
-//                        if (!entry.getKey().equals(detail.getProId())) continue;
-                            if (!isXmWrite) {
-                                paragraph = new Paragraph(xmXh + ".  " + xmmc, defaultFont);
-                                paragraph.setAlignment(Element.ALIGN_LEFT);
-                                document2.add(paragraph);
-                                isXmWrite = true;
-                            }
-                            String result = detail.getProResult();
-                            if (StrUtil.isNotBlank(result)) {
-                                result = result.replaceAll("鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐o紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�", "");
-                                StringBuilder builder = new StringBuilder();
-                                if (StrUtil.isBlank(result.replaceAll("\n", "").trim())) continue;
-                                builder.append("    (").append(index).append(")").append(detail.getProName()).append(": ").append(result).append("\n");
-                                index++;
-
-                                result = builder.toString();
-                            }
-                            paragraph = new Paragraph(result, defaultFont);
-                            paragraph.setAlignment(Element.ALIGN_LEFT);
-                            document2.add(paragraph);
-                        }
-                        if (isXmWrite) {
-                            paragraph = PdfUtils.setParagraph(defaultFont, "");
-                            paragraph.setLeading(0f);
-                            paragraph.setSpacingBefore(0f);
-                            paragraph.setSpacingAfter(5f);
-                            document2.add(paragraph);
-                            xmXh++;
-                        }
-                    }
-
-                    // 妫�楠�
-                    for (Map.Entry<String, Object> item : map.entrySet()) {
-                        String xmmc = item.getKey();
-                        HashMap<String, Object> entryValue = (HashMap<String, Object>) item.getValue();
-                        ArrayList<List<String>> lists = (ArrayList<List<String>>) entryValue.get("data");
-                        boolean isXmWrite = false;
-                        int index = 1;
-                        for (List<String> i : lists) {
-                            if (!i.get(6).contains(String.valueOf(proVo.getProId()))) continue;
-                            if (i.contains("鈫�") || i.contains("鈫�")) {
-                                if (jianYanYiDa.contains(i.get(5))) continue;
-                                jianYanYiDa.add(i.get(5));
-                                if (!isXmWrite) {
-                                    paragraph = new Paragraph(xmXh + ".  " + xmmc, defaultFont);
-                                    paragraph.setAlignment(Element.ALIGN_LEFT);
-                                    document2.add(paragraph);
-                                    isXmWrite = true;
-                                }
-                                String content = "    (" + index + ") " + i.get(0) + "锛�" + i.get(1) + "  " + i.get(3) + "  " + i.get(4) + "      " + i.get(2);
-                                paragraph = new Paragraph(content, defaultFont);
-                                paragraph.setAlignment(Element.ALIGN_LEFT);
-                                document2.add(paragraph);
-                                index++;
-                            }
-                        }
-                        if (isXmWrite) {
-                            paragraph = PdfUtils.setParagraph(defaultFont, "");
-                            paragraph.setSpacingBefore(0f);
-                            paragraph.setSpacingAfter(5f);
-                            document2.add(paragraph);
-                            xmXh++;
-                        }
-                    }
-                }
-            }
-        }*/
 
         if(isBr) {
             paragraph = PdfUtils.setParagraph(defaultFont, "");
@@ -1236,348 +1148,8 @@
                 }
             }
 
-            /*for (Map.Entry<String, List<CsProVo>> deptEntry : listMap.entrySet()) {
-                List<CsProVo> proVos = deptEntry.getValue();
-                if (proVos.size() > 1) {
-                    proVos = proVos.stream()
-                            .sorted(Comparator.comparingLong(CsProVo::getProId))
-                            .collect(Collectors.toList());
-                }
-                ArrayList<String> jianYanYiDa = new ArrayList<>();
-                for (CsProVo proVo : proVos) {
-                    // 妫�鏌�
-                    for (Map.Entry<Long, List<TjOrderDetail>> entry : collect.entrySet()) {
-                        if (!entry.getKey().equals(proVo.getProId())) continue;
-                        List<TjOrderDetail> details = entry.getValue();
-                        if(null !=details && !details.isEmpty()){
-                             details= details.stream()
-                                     .sorted(Comparator.comparing(TjOrderDetail::getProName))
-                                    .collect(Collectors.toList());
-                            boolean isXmWrite = false;
-                            int index = 1;
-                            int index1 = 1;
-                            for (TjOrderDetail detail : details) {
-                                String xmmc = proVo.getProName();
-//                                String xmmc = detail.getProName();
-                                if (!isXmWrite) {
-                                    xmXh++;
-                                    paragraph = new Paragraph("銆�" + xmXh + "." + xmmc + "銆�", defaultFont);
-                                    paragraph.setAlignment(Element.ALIGN_LEFT);
-                                    document2.add(paragraph);
-                                    isXmWrite = true;
-                                }
-                                String result = detail.getProResult();
-                                if (StrUtil.isNotBlank(result)) {
-                                    StringBuilder builder = new StringBuilder();
-//                                    String[] split = result.split("\n");
-//                                    for (String s : split) {
-//                                        if (StrUtil.isBlank(s.replaceAll("\n", "").trim())) continue;
-//                                        builder.append("    (").append(index1).append(")").append(s).append("\n");
-//                                        index1++;
-//                                    }
-
-                                        if (StrUtil.isBlank(result.replaceAll("\n", "").trim())) continue;
-                                        builder.append("    (").append(index1).append(")").append(detail.getProName()).append(": ").append(result).append("\n");
-                                        index1++;
-
-                                    result = builder.toString();
-                                }
-                                if (StrUtil.isNotBlank(result)) {
-                                    paragraph = new Paragraph(result, defaultFont);
-                                    paragraph.setAlignment(Element.ALIGN_LEFT);
-                                    document2.add(paragraph);
-                                } else {
-                                    paragraph = new Paragraph("寤鸿瀹氭湡澶嶆煡", defaultFont);
-                                    paragraph.setAlignment(Element.ALIGN_LEFT);
-                                    document2.add(paragraph);
-                                }
-                                String str = "     ";
-                                List<Map<String, Object>> maps = new ArrayList<>();
-
-                                LambdaQueryWrapper<TjOrderYcxm> ycwq=new LambdaQueryWrapper<>();
-                                ycwq.eq(TjOrderYcxm::getTjh,tjOrder.getTjNumber());
-                                ycwq.eq(TjOrderYcxm::getJcxm,detail.getProName());
-                                TjOrderYcxm ycxm = ycxmService.getOne(ycwq);
-                                if(null !=ycxm){
-                                    String jynr = ycxm.getJynr();
-                                    JSONArray array = JSONUtil.parseArray(jynr);
-                                    for (Object object : array) {
-                                        Map<String,Object> objectMap=new HashMap<>();
-                                        JSONObject jsonObject = (JSONObject) object;
-                                        String bt = jsonObject.getStr("bt");
-                                        String nr = jsonObject.getStr("nr");
-                                        objectMap.put("bt",bt);
-                                        objectMap.put("nr",nr);
-                                        if(null !=bt || null !=nr) maps.add(objectMap);
-                                    }
-                                    List<Map<String, Object>> collect1 = maps.stream().distinct().collect(Collectors.toList());
-                                    for (Map<String, Object> objectMap : collect1) {
-                                        String content = str + objectMap.get("bt").toString() + objectMap.get("nr").toString();
-                                        if (StrUtil.isBlank(content)) content = "     ";
-                                        paragraph = new Paragraph(content, defaultFont);
-                                        paragraph.setAlignment(Element.ALIGN_LEFT);
-                                        document2.add(paragraph);
-                                    }
-                                }
-                                index++;
-                                paragraph = PdfUtils.setParagraph(defaultFont, "");
-                                paragraph.setLeading(0f);
-                                paragraph.setSpacingBefore(0f);
-                                paragraph.setSpacingAfter(5f);
-                                document2.add(paragraph);
-                            }
-                        }
-                    }
-                    // 妫�楠�
-                    for (Map.Entry<String, Object> item : map.entrySet()) {
-                        String xmmc = item.getKey();
-                        HashMap<String, Object> entryValue = (HashMap<String, Object>) item.getValue();
-                        ArrayList<List<String>> lists = (ArrayList<List<String>>) entryValue.get("data");
-                        boolean isXmWrite = false;
-                        int index = 1;
-                        for (List<String> i : lists) {
-                            if (!i.get(6).contains(String.valueOf(proVo.getProId()))) continue;
-                            if (i.contains("鈫�") || i.contains("鈫�")) {
-                                if (jianYanYiDa.contains(i.get(5))) continue;
-                                jianYanYiDa.add(i.get(5));
-                                if (!isXmWrite) {
-                                    xmXh++;
-                                    paragraph = new Paragraph("銆�" + xmXh + "." + xmmc + "銆�", defaultFont);
-                                    paragraph.setAlignment(Element.ALIGN_LEFT);
-                                    document2.add(paragraph);
-                                    isXmWrite = true;
-                                }
-                                String content = "    (" + index + ")" + i.get(0) + "锛�" + i.get(1) + "  " + i.get(3) + "  " + i.get(4) + "  " + i.get(2);
-                                paragraph = new Paragraph(content, defaultFont);
-                                paragraph.setAlignment(Element.ALIGN_LEFT);
-                                document2.add(paragraph);
-                                String str = "    ";
-
-                                LambdaQueryWrapper<TjOrderYcxm> ycwq=new LambdaQueryWrapper<>();
-                                ycwq.eq(TjOrderYcxm::getTjh,tjOrder.getTjNumber());
-                                ycwq.eq(TjOrderYcxm::getJcxm,i.get(0));
-                                TjOrderYcxm ycxm = ycxmService.getOne(ycwq);
-                                if(null !=ycxm){
-                                    String jynr = ycxm.getJynr();
-                                    JSONArray array = JSONUtil.parseArray(jynr);
-                                    for (Object object : array) {
-                                        JSONObject jsonObject = (JSONObject) object;
-                                        String bt = jsonObject.getStr("bt");
-                                        String nr = jsonObject.getStr("nr");
-                                        if(null !=bt || null !=nr) {
-                                            String content1 = str + bt + nr;
-                                            if (StrUtil.isBlank(content)) content1 = "     ";
-                                            paragraph = new Paragraph(content1, defaultFont);
-                                        }
-                                        paragraph.setAlignment(Element.ALIGN_LEFT);
-                                        document2.add(paragraph);
-                                    }
-                                    paragraph = PdfUtils.setParagraph(defaultFont, "");
-                                    paragraph.setSpacingBefore(2f);
-                                    paragraph.setSpacingAfter(5f);
-                                    document2.add(paragraph);
-                                    index++;
-                                }
-                            }
-                        }
-                        if (isXmWrite) {
-                            paragraph = PdfUtils.setParagraph(defaultFont, "");
-                            paragraph.setSpacingBefore(0f);
-                            paragraph.setSpacingAfter(5f);
-                            document2.add(paragraph);
-                        }
-                    }
-                }
-            }*/
         }
-        /** else {
 
-            if (!collect.isEmpty() || !map.isEmpty()){
-                paragraph = PdfUtils.setParagraph(defaultTitleFont, "鍖荤敓寤鸿锛�");
-                paragraph.setSpacingBefore(3f);
-                paragraph.setSpacingAfter(2f);
-                document2.add(paragraph);
-            }
-
-            for (Map.Entry<String, List<CsProVo>> deptEntry : listMap.entrySet()) {
-                List<CsProVo> proVos = deptEntry.getValue();
-                if (proVos.size() > 1) {
-                    proVos = proVos.stream()
-                            .sorted(Comparator.comparingLong(CsProVo::getProId))
-                            .collect(Collectors.toList());
-                }
-                ArrayList<String> jianYanYiDa = new ArrayList<>();
-                for (CsProVo proVo : proVos) {
-                    // 妫�鏌�
-                    for (Map.Entry<Long, List<TjOrderDetail>> entry : collect.entrySet()) {
-                        if (!entry.getKey().equals(proVo.getProId())) continue;
-                        List<TjOrderDetail> details = entry.getValue();
-                        String xmmc = details.get(0).getProName();
-                        boolean isXmWrite = false;
-                        int index = 1;
-                        for (TjOrderDetail detail : details) {
-                            if (!isXmWrite) {
-                                xmXh++;
-                                paragraph = new Paragraph("銆�" + xmXh + "." + xmmc + "銆�", defaultFont);
-                                paragraph.setAlignment(Element.ALIGN_LEFT);
-                                document2.add(paragraph);
-                                isXmWrite = true;
-                            }
-                            String result = detail.getProResult();
-                            if (StrUtil.isNotBlank(result)) {
-//                    result = result.replaceAll(" ","").replaceAll("\t","");
-//                    result = result.replaceAll("\n鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐o紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�", "");
-//                    result = "\n      " + result.replaceAll("\n", "\n      ");
-                                int index1 = 1;
-                                String[] split = result.split("\n");
-//                            boolean contains = result.contains("鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐o紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�");
-                                boolean contains = result.contains(" ");
-                                StringBuilder builder = new StringBuilder();
-                                for (String s : split) {
-                                    if (StrUtil.isBlank(s.replaceAll("\n", "").trim())) continue;
-                                    builder.append("    (").append(index1).append(")").append(s).append("\n");
-                                    index1++;
-                                }
-//                            if (!contains) builder.append("    (").append(index1).append(")").append("鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐o紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�");
-//                            if (!contains) builder.append("    (").append(index1).append(")").append(" ");
-//                            else builder.substring(0,builder.length() - 1);
-                                result = builder.toString();
-                            }
-//                String content = "  (" + index + ") " + detail.getProName() + "锛�" + result;
-//                content = content.replaceAll("[\\n\\r]+$", "");
-//                content = content.replaceAll("\\s+$", "");
-//                paragraph = new Paragraph(content, defaultFont);
-                            if (StrUtil.isNotBlank(result)) {
-                                paragraph = new Paragraph(result, defaultFont);
-                                paragraph.setAlignment(Element.ALIGN_LEFT);
-                                document2.add(paragraph);
-                            } else {
-                                paragraph = new Paragraph("寤鸿瀹氭湡澶嶆煡", defaultFont);
-                                paragraph.setAlignment(Element.ALIGN_LEFT);
-                                document2.add(paragraph);
-                            }
-                            String str = "     ";
-//                        List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(entry.getKey().toString(),"",
-//                                detail.getYcbz(),tjOrder.getTjNumber(),detail.getProName().replaceAll("[锛�(][^锛�)]*[锛�)]", "")
-//                                        .replaceAll("[ 娴嬪畾妫�娴媇",""),detail.getProResult());
-                            List<Map<String, Object>> maps = new ArrayList<>();
-                            if (detail.getDeptId().equals("2")) {
-                                String[] split = result.split("銆倈,|锛�");
-                                for (String s : split) {
-                                    s = s.replaceAll("\n", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "");
-//                                Map<String,Object> mapss= tjRulesService.getyichangxiangmujianyiguizeJianCha(s);
-                                    Map<String, Object> mapss = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(detail.getKs(), s, "0");
-                                    if (null != mapss) {
-                                        Object bt = mapss.get("bt");
-                                        Object nr = mapss.get("nr");
-                                        if (null != bt && null != nr) maps.add(mapss);
-                                    }
-                                }
-                            }
-                            List<Map<String, Object>> collect1 = maps.stream().distinct().collect(Collectors.toList());
-
-                            for (Map<String, Object> objectMap : collect1) {
-                                String content = str + objectMap.get("bt").toString() + objectMap.get("nr").toString();
-//                            if (StrUtil.isBlank(content)) content = "     鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐o紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�";
-                                if (StrUtil.isBlank(content)) content = "     ";
-                                paragraph = new Paragraph(content, defaultFont);
-                                paragraph.setAlignment(Element.ALIGN_LEFT);
-                                document2.add(paragraph);
-                            }
-                            index++;
-                            paragraph = PdfUtils.setParagraph(defaultFont, "");
-                            paragraph.setLeading(0f);
-                            paragraph.setSpacingBefore(0f);
-                            paragraph.setSpacingAfter(5f);
-                            document2.add(paragraph);
-                        }
-                    }
-                    // 妫�楠�
-                    for (Map.Entry<String, Object> item : map.entrySet()) {
-                        String xmmc = item.getKey();
-                        HashMap<String, Object> entryValue = (HashMap<String, Object>) item.getValue();
-                        ArrayList<List<String>> lists = (ArrayList<List<String>>) entryValue.get("data");
-                        boolean isXmWrite = false;
-                        int index = 1;
-                        for (List<String> i : lists) {
-                            if (!i.get(6).contains(String.valueOf(proVo.getProId()))) continue;
-                            if (i.contains("鈫�") || i.contains("鈫�")) {
-                                if (jianYanYiDa.contains(i.get(5))) continue;
-                                jianYanYiDa.add(i.get(5));
-                                if (!isXmWrite) {
-                                    xmXh++;
-                                    paragraph = new Paragraph("銆�" + xmXh + "." + xmmc + "銆�", defaultFont);
-                                    paragraph.setAlignment(Element.ALIGN_LEFT);
-                                    document2.add(paragraph);
-                                    isXmWrite = true;
-                                }
-                                String content = "    (" + index + ")" + i.get(0) + "锛�" + i.get(1) + "  " + i.get(3) + "  " + i.get(4) + "  " + i.get(2);
-                                paragraph = new Paragraph(content, defaultFont);
-                                paragraph.setAlignment(Element.ALIGN_LEFT);
-                                document2.add(paragraph);
-                                // 绗叚浣嶆槸lis椤圭洰id
-//                    LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
-//                    wrapper.eq(TjProject::getLisXmbm,i.get(5));
-//                    TjProject project = projectService.getOne(wrapper);
-//                    if (project != null) {
-//                        LambdaQueryWrapper<TjRules> queryWrapper = new LambdaQueryWrapper<>();
-//                        queryWrapper.eq(TjRules::getProId,project.getProId());
-//                        List<TjRules> rules = tjRulesService.list(queryWrapper);
-//                        if (!rules.isEmpty()){
-//
-//                        }
-                                String str = "    ";
-                                List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(i.get(5), "",
-                                        i.get(2), tjOrder.getTjNumber(), i.get(0).replaceAll("[锛�(][^锛�)]*[锛�)]", "")
-                                                .replaceAll("[ 娴嬪畾妫�娴媇", ""), i.get(1));
-                                if (!maps.isEmpty()) {
-                                    for (Map<String, Object> objectMap : maps) {
-//                                paragraph = new Paragraph(str+"寤鸿鏍囬",defaultFont);
-//                                paragraph.setAlignment(Element.ALIGN_LEFT);
-//                                document2.add(paragraph);
-//
-//                                paragraph = new Paragraph(str+objectMap.get("bt").toString(),defaultFont);
-//                                paragraph.setAlignment(Element.ALIGN_LEFT);
-//                                document2.add(paragraph);
-//
-//                                paragraph = new Paragraph(str+"寤鸿鍐呭",defaultFont);
-//                                paragraph.setAlignment(Element.ALIGN_LEFT);
-//                                document2.add(paragraph);
-//
-//                                paragraph = new Paragraph(str+objectMap.get("nr").toString(),defaultFont);
-//                                paragraph.setAlignment(Element.ALIGN_LEFT);
-//                                document2.add(paragraph);
-                                        Object bt = objectMap.get("bt");
-                                        Object nr = objectMap.get("nr");
-                                        if (null != bt && null != nr) {
-                                            String content1 = str + bt.toString() + nr.toString().trim();
-                                            if (StrUtil.isBlank(content)) content1 = "     ";
-                                            paragraph = new Paragraph(content1, defaultFont);
-                                        }
-//                                    if (StrUtil.isBlank(content)) content1 = "     鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐o紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�";
-                                        paragraph.setAlignment(Element.ALIGN_LEFT);
-                                        document2.add(paragraph);
-                                    }
-                                    paragraph = PdfUtils.setParagraph(defaultFont, "");
-                                    paragraph.setSpacingBefore(2f);
-                                    paragraph.setSpacingAfter(5f);
-                                    document2.add(paragraph);
-                                }
-//                    }
-                                index++;
-                            }
-                        }
-                        if (isXmWrite) {
-                            paragraph = PdfUtils.setParagraph(defaultFont, "");
-                            paragraph.setSpacingBefore(0f);
-                            paragraph.setSpacingAfter(5f);
-                            document2.add(paragraph);
-                        }
-                    }
-                }
-            }
-        }
-        */
 
         for (int i = 0; i < 1; i++) {
             paragraph = PdfUtils.setParagraph(defaultFont, "");
@@ -1771,6 +1343,47 @@
             log.error(String.valueOf(e));
             return AjaxResult.error();
         }
+
+
+        LambdaQueryWrapper<TjXdtgmdjg> wqq=new LambdaQueryWrapper<>();
+        wqq.eq(TjXdtgmdjg::getTjh,tjOrder.getTjNumber());
+        wqq.isNotNull(TjXdtgmdjg::getUrl);
+        List<TjXdtgmdjg> xdtgmdjgList = xdtgmdjgService.list(wqq);
+
+        int index=1;
+        for (TjXdtgmdjg xdtgmdjg : xdtgmdjgList) {
+            document.newPage();
+            cell = new PdfPCell();
+            PdfPTable tablefj = new PdfPTable(new float[]{100f});
+            tablefj.setTotalWidth(PageSize.A4.getWidth() - 100);
+            tablefj.setLockedWidth(true);
+            tablefj.setHorizontalAlignment(Element.ALIGN_LEFT);
+            tablefj.getDefaultCell().setBorder(0);
+            tablefj.getDefaultCell().setHorizontalAlignment(Element.ALIGN_RIGHT);
+
+            cell.setBorder(Rectangle.NO_BORDER);
+            cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
+            cell.setHorizontalAlignment(Element.ALIGN_CENTER);
+            cell.setPaddingTop(10);
+            cell.setPaddingBottom(10);
+            cell.setPhrase(new Phrase("闄勪欢"+index+": "+ xdtgmdjg.getProName(), zongJianFont));
+            Path path = Paths.get(xdtgmdjg.getUrl());
+            byte[] bytesfj = null;
+            try {
+                bytesfj = Files.readAllBytes(path);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+            Image image = Image.getInstance(bytesfj);
+            image.scaleToFit(500, 2500);
+            tablefj.addCell(cell);
+            cell = new PdfPCell();
+            cell.addElement(image);
+            tablefj.addCell(cell);
+            document.add(tablefj);
+            index++;
+        }
+
         document.close();
 
 
@@ -2177,6 +1790,7 @@
      * @throws DocumentException
      */
     private void notHuaYanTable(Document document1, Map<TjOrderRemark, List<TjPdfVO>> printReport, DictHosp dictHosp, String colorStr, boolean isPacs) throws DocumentException {
+        List<TjReportSpecialProject> tjReportSpecialProjects = tjReportSpecialProjectService.list();
         for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : printReport.entrySet()) {
             LambdaQueryWrapper<TjProject> wqqq = new LambdaQueryWrapper<>();
             wqqq.eq(TjProject::getProId, entry.getKey().getProId());
@@ -2224,43 +1838,12 @@
 //                    if (dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌") && !value.isEmpty()){
                     if (!value.isEmpty()) {
                         if (value.size() > 1) {
-                            if (value.get(0).getPid().equals("1862852701533012001")) {
-                                Font remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
-                                Paragraph ppp = new Paragraph("闃虫�у弬鑰冨�硷細", remarkFonts);
-                                paragraph.setAlignment(Element.ALIGN_LEFT);
-                                paragraph.setLeading(5f);
-                                document1.add(ppp);
-
-                                ppp = new Paragraph("DOB鍊硷細         鈮�      4.0                HP-闃虫��", remarkFonts);
-                                paragraph.setAlignment(Element.ALIGN_LEFT);
-                                paragraph.setLeading(5f);
-                                document1.add(ppp);
-
-                                ppp = new Paragraph("                <      4.0                  姝e父", remarkFonts);
-                                paragraph.setAlignment(Element.ALIGN_LEFT);
-                                paragraph.setLeading(5f);
-                                document1.add(ppp);
-
-
-                                ppp = new Paragraph("妫�娴嬬粨鏋滐細 DOB=" + value.get(0).getProResult(), remarkFonts);
-                                paragraph.setAlignment(Element.ALIGN_LEFT);
-                                paragraph.setLeading(5f);
-                                document1.add(ppp);
-
-                                ppp = new Paragraph("", remarkFonts);
-                                paragraph.setAlignment(Element.ALIGN_LEFT);
-                                paragraph.setLeading(5f);
-                                document1.add(ppp);
-                                ppp = new Paragraph("", remarkFonts);
-                                paragraph.setAlignment(Element.ALIGN_LEFT);
-                                paragraph.setLeading(5f);
-                                document1.add(ppp);
-                                if (StrUtil.isNotBlank(entry.getKey().getRemark())) {
-                                    ppp = new Paragraph("缁撹锛�" + entry.getKey().getRemark(), remarkFonts);
-                                    paragraph.setAlignment(Element.ALIGN_LEFT);
-                                    paragraph.setLeading(5f);
-                                    document1.add(ppp);
-                                }
+                            Long pid = Long.valueOf(value.get(0).getPid());
+                            Optional<TjReportSpecialProject> match = tjReportSpecialProjects.stream()
+                                    .filter(item -> item.getProId().equals(pid))
+                                    .findFirst();
+                            if (match.isPresent()) {
+                                reportSpecialProject(document1, entry, paragraph, value,match.get());
                             } else {
                                 String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉", "鍗曚綅"};
                                 Font headFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
@@ -2272,56 +1855,29 @@
                             Font remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
 
                             if (isPacs) {
-                                Paragraph pp = PdfUtils.setParagraph(remarkFonts, "妫�鏌ユ墍瑙侊細");
+                                Paragraph pp;
+                                Paragraph ppp;
+                                if (StrUtil.isNotBlank(value.get(0).getSj())) {
+                                    pp = PdfUtils.setParagraph(remarkFonts, "妫�鏌ユ墍瑙侊細");
+                                    document1.add(pp);
+                                    ppp = new Paragraph(value.get(0).getSj(), remarkFonts);
+                                    paragraph.setAlignment(Element.ALIGN_LEFT);
+                                    paragraph.setLeading(5f);
+                                    document1.add(ppp);
+                                }
+                                pp = PdfUtils.setParagraph(remarkFonts, "妫�鏌ユ彁绀猴細"+value.get(0).getTs());
                                 document1.add(pp);
-                                Paragraph ppp = new Paragraph(value.get(0).getSj(), remarkFonts);
-                                paragraph.setAlignment(Element.ALIGN_LEFT);
-                                paragraph.setLeading(5f);
-                                document1.add(ppp);
-                                pp = PdfUtils.setParagraph(remarkFonts, "缁撹锛�");
-                                document1.add(pp);
-                                ppp = new Paragraph(value.get(0).getTs(), remarkFonts);
-                                paragraph.setAlignment(Element.ALIGN_LEFT);
-                                paragraph.setLeading(5f);
-                                document1.add(ppp);
+//                                ppp = new Paragraph(value.get(0).getTs(), remarkFonts);
+//                                paragraph.setAlignment(Element.ALIGN_LEFT);
+//                                paragraph.setLeading(5f);
+//                                document1.add(ppp);
                             } else {
-                                if (value.get(0).getPid().equals("1862852701533012001")) {
-                                    remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
-                                    Paragraph ppp = new Paragraph("闃虫�у弬鑰冨�硷細", remarkFonts);
-                                    paragraph.setAlignment(Element.ALIGN_LEFT);
-                                    paragraph.setLeading(5f);
-                                    document1.add(ppp);
-
-                                    ppp = new Paragraph("DOB鍊硷細         鈮�      4.0                HP-闃虫��", remarkFonts);
-                                    paragraph.setAlignment(Element.ALIGN_LEFT);
-                                    paragraph.setLeading(5f);
-                                    document1.add(ppp);
-
-                                    ppp = new Paragraph("                <      4.0                  姝e父", remarkFonts);
-                                    paragraph.setAlignment(Element.ALIGN_LEFT);
-                                    paragraph.setLeading(5f);
-                                    document1.add(ppp);
-
-
-                                    ppp = new Paragraph("妫�娴嬬粨鏋滐細 DOB=" + value.get(0).getProResult(), remarkFonts);
-                                    paragraph.setAlignment(Element.ALIGN_LEFT);
-                                    paragraph.setLeading(5f);
-                                    document1.add(ppp);
-
-                                    ppp = new Paragraph("", remarkFonts);
-                                    paragraph.setAlignment(Element.ALIGN_LEFT);
-                                    paragraph.setLeading(5f);
-                                    document1.add(ppp);
-                                    ppp = new Paragraph("", remarkFonts);
-                                    paragraph.setAlignment(Element.ALIGN_LEFT);
-                                    paragraph.setLeading(5f);
-                                    document1.add(ppp);
-                                    if (StrUtil.isNotBlank(entry.getKey().getRemark())) {
-                                        ppp = new Paragraph("缁撹锛�" + entry.getKey().getRemark(), remarkFonts);
-                                        paragraph.setAlignment(Element.ALIGN_LEFT);
-                                        paragraph.setLeading(5f);
-                                        document1.add(ppp);
-                                    }
+                                Long pid = Long.valueOf(value.get(0).getPid());
+                                Optional<TjReportSpecialProject> match = tjReportSpecialProjects.stream()
+                                        .filter(item -> item.getProId().equals(pid))
+                                        .findFirst();
+                                if (match.isPresent()) {
+                                    reportSpecialProject(document1, entry, paragraph, value,match.get());
                                 } else {
                                     String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉"};
                                     Font headFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
@@ -2408,43 +1964,12 @@
 //                    if (dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌") && !value.isEmpty()){
                     if (!value.isEmpty()) {
                         if (value.size() > 1) {
-                            if (value.get(0).getPid().equals("1862852701533012001")) {
-                                Font remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
-                                Paragraph ppp = new Paragraph("闃虫�у弬鑰冨�硷細", remarkFonts);
-                                paragraph.setAlignment(Element.ALIGN_LEFT);
-                                paragraph.setLeading(5f);
-                                document1.add(ppp);
-
-                                ppp = new Paragraph("DOB鍊硷細         鈮�      4.0                HP-闃虫��", remarkFonts);
-                                paragraph.setAlignment(Element.ALIGN_LEFT);
-                                paragraph.setLeading(5f);
-                                document1.add(ppp);
-
-                                ppp = new Paragraph("                <      4.0                  姝e父", remarkFonts);
-                                paragraph.setAlignment(Element.ALIGN_LEFT);
-                                paragraph.setLeading(5f);
-                                document1.add(ppp);
-
-
-                                ppp = new Paragraph("妫�娴嬬粨鏋滐細 DOB=" + value.get(0).getProResult(), remarkFonts);
-                                paragraph.setAlignment(Element.ALIGN_LEFT);
-                                paragraph.setLeading(5f);
-                                document1.add(ppp);
-
-                                ppp = new Paragraph("", remarkFonts);
-                                paragraph.setAlignment(Element.ALIGN_LEFT);
-                                paragraph.setLeading(5f);
-                                document1.add(ppp);
-                                ppp = new Paragraph("", remarkFonts);
-                                paragraph.setAlignment(Element.ALIGN_LEFT);
-                                paragraph.setLeading(5f);
-                                document1.add(ppp);
-                                if (StrUtil.isNotBlank(entry.getKey().getRemark())) {
-                                    ppp = new Paragraph("缁撹锛�" + entry.getKey().getRemark(), remarkFonts);
-                                    paragraph.setAlignment(Element.ALIGN_LEFT);
-                                    paragraph.setLeading(5f);
-                                    document1.add(ppp);
-                                }
+                            Long pid = Long.valueOf(value.get(0).getPid());
+                            Optional<TjReportSpecialProject> match = tjReportSpecialProjects.stream()
+                                    .filter(item -> item.getProId().equals(pid))
+                                    .findFirst();
+                            if (match.isPresent()) {
+                                reportSpecialProject(document1, entry, paragraph, value,match.get());
                             } else {
                                 String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉", "鍗曚綅"};
                                 Font headFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
@@ -2457,56 +1982,55 @@
                             Font remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
 
                             if (isPacs) {
-                                Paragraph pp = PdfUtils.setParagraph(remarkFonts, "妫�鏌ユ墍瑙侊細");
+                                Paragraph pp;
+                                Paragraph ppp;
+//                                String key = sysConfigService.selectConfigByKey("makepdfuseorderdetailproresult");
+//                                if (StrUtil.isNotBlank(key) && !key.equals("Y")){
+//                                    if (StrUtil.isNotBlank(value.get(0).getSj())) {
+//                                        pp = PdfUtils.setParagraph(remarkFonts, "妫�鏌ユ墍瑙侊細");
+//                                        document1.add(pp);
+//                                        ppp = new Paragraph(value.get(0).getSj(), remarkFonts);
+//                                        paragraph.setAlignment(Element.ALIGN_LEFT);
+//                                        paragraph.setLeading(5f);
+//                                        document1.add(ppp);
+//                                    }
+//                                }else {
+//                                    if (StrUtil.isNotBlank(value.get(0).getSj()) || StrUtil.isNotBlank(value.get(0).getProResult())) {
+//                                        pp = PdfUtils.setParagraph(remarkFonts, "妫�鏌ユ墍瑙侊細");
+//                                        document1.add(pp);
+//                                        ppp = new Paragraph(value.get(0).getSj() != null ? value.get(0).getSj() : value.get(0).getProResult(), remarkFonts);
+//                                        paragraph.setAlignment(Element.ALIGN_LEFT);
+//                                        paragraph.setLeading(5f);
+//                                        document1.add(ppp);
+//                                    }
+//                                }
+
+                                if (StrUtil.isNotBlank(value.get(0).getSj()) || StrUtil.isNotBlank(value.get(0).getProResult())) {
+                                    pp = PdfUtils.setParagraph(remarkFonts, "妫�鏌ユ墍瑙侊細");
+                                    document1.add(pp);
+                                    ppp = new Paragraph(value.get(0).getSj() != null ? value.get(0).getSj() : value.get(0).getProResult(), remarkFonts);
+                                    paragraph.setAlignment(Element.ALIGN_LEFT);
+                                    paragraph.setLeading(5f);
+                                    document1.add(ppp);
+                                }
+
+                                pp = PdfUtils.setParagraph(remarkFonts, "妫�鏌ユ彁绀猴細");
                                 document1.add(pp);
-                                Paragraph ppp = new Paragraph(value.get(0).getSj() != null ? value.get(0).getSj() : value.get(0).getProResult(), remarkFonts);
+                                ppp = new Paragraph((value.get(0).getTs() != null ? value.get(0).getTs() : value.get(0).getProResult()), remarkFonts);
                                 paragraph.setAlignment(Element.ALIGN_LEFT);
                                 paragraph.setLeading(5f);
                                 document1.add(ppp);
-                                pp = PdfUtils.setParagraph(remarkFonts, "缁撹锛�");
-                                document1.add(pp);
-                                ppp = new Paragraph(value.get(0).getTs() != null ? value.get(0).getTs() : value.get(0).getProResult(), remarkFonts);
-                                paragraph.setAlignment(Element.ALIGN_LEFT);
-                                paragraph.setLeading(5f);
-                                document1.add(ppp);
+//                                ppp = new Paragraph(value.get(0).getTs() != null ? value.get(0).getTs() : value.get(0).getProResult(), remarkFonts);
+//                                paragraph.setAlignment(Element.ALIGN_LEFT);
+//                                paragraph.setLeading(5f);
+//                                document1.add(ppp);
                             } else {
-                                if (value.get(0).getPid().equals("1862852701533012001")) {
-                                    remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
-                                    Paragraph ppp = new Paragraph("闃虫�у弬鑰冨�硷細", remarkFonts);
-                                    paragraph.setAlignment(Element.ALIGN_LEFT);
-                                    paragraph.setLeading(5f);
-                                    document1.add(ppp);
-
-                                    ppp = new Paragraph("DOB鍊硷細         鈮�      4.0                HP-闃虫��", remarkFonts);
-                                    paragraph.setAlignment(Element.ALIGN_LEFT);
-                                    paragraph.setLeading(5f);
-                                    document1.add(ppp);
-
-                                    ppp = new Paragraph("                <      4.0                  姝e父", remarkFonts);
-                                    paragraph.setAlignment(Element.ALIGN_LEFT);
-                                    paragraph.setLeading(5f);
-                                    document1.add(ppp);
-
-
-                                    ppp = new Paragraph("妫�娴嬬粨鏋滐細 DOB=" + value.get(0).getProResult(), remarkFonts);
-                                    paragraph.setAlignment(Element.ALIGN_LEFT);
-                                    paragraph.setLeading(5f);
-                                    document1.add(ppp);
-
-                                    ppp = new Paragraph("", remarkFonts);
-                                    paragraph.setAlignment(Element.ALIGN_LEFT);
-                                    paragraph.setLeading(5f);
-                                    document1.add(ppp);
-                                    ppp = new Paragraph("", remarkFonts);
-                                    paragraph.setAlignment(Element.ALIGN_LEFT);
-                                    paragraph.setLeading(5f);
-                                    document1.add(ppp);
-                                    if (StrUtil.isNotBlank(entry.getKey().getRemark())) {
-                                        ppp = new Paragraph("缁撹锛�" + entry.getKey().getRemark(), remarkFonts);
-                                        paragraph.setAlignment(Element.ALIGN_LEFT);
-                                        paragraph.setLeading(5f);
-                                        document1.add(ppp);
-                                    }
+                                Long pid = Long.valueOf(value.get(0).getPid());
+                                Optional<TjReportSpecialProject> match = tjReportSpecialProjects.stream()
+                                        .filter(item -> item.getProId().equals(pid))
+                                        .findFirst();
+                                if (match.isPresent()) {
+                                    reportSpecialProject(document1, entry, paragraph, value,match.get());
                                 } else {
                                     String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉"};
                                     Font headFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
@@ -2564,6 +2088,57 @@
                     }
                 }
             }
+        }
+    }
+
+    /**
+     * 鐩墠鍐欐 鍙湁纰�13銆�14 妯℃澘閮芥槸涓�鏍风殑鍙笉杩囧弬鑰冨�间笉鍚�
+     * 鍑屼簯锛歿"dy":"4.0","xy":"4.0","title":"闃虫�у弬鑰冨�硷細","dystr":"DOB鍊硷細         鈮�      ${dy}                HP-闃虫��","xystr":"                <      ${xy}                  姝e父","en":"DOB"}
+     * 娉惧窛鍘垮尰闄細{"dy":"100","xy":"100","title":"鍙傝�冨��(DPM)锛�","dystr":"DPM鍊硷細         鈮�      ${dy}                闃虫��","xystr":"                <      ${xy}                  闃存��","en":"DPM"}
+     * @param document1
+     * @param entry
+     * @param paragraph
+     * @param value
+     * @param tjReportSpecialProject
+     * @throws DocumentException
+     */
+    private static void reportSpecialProject(Document document1, Map.Entry<TjOrderRemark, List<TjPdfVO>> entry, Paragraph paragraph, List<TjPdfVO> value,TjReportSpecialProject tjReportSpecialProject) throws DocumentException {
+        JSONObject entries = JSONUtil.parseObj(tjReportSpecialProject.getParams());
+        Font remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
+        Paragraph ppp = new Paragraph(entries.getStr("title"), remarkFonts);
+        paragraph.setAlignment(Element.ALIGN_LEFT);
+        paragraph.setLeading(5f);
+        document1.add(ppp);
+
+        ppp = new Paragraph(entries.getStr("dystr").replace("${dy}",entries.getStr("dy")), remarkFonts);
+        paragraph.setAlignment(Element.ALIGN_LEFT);
+        paragraph.setLeading(5f);
+        document1.add(ppp);
+
+        ppp = new Paragraph(entries.getStr("xystr").replace("${xy}",entries.getStr("xy")), remarkFonts);
+        paragraph.setAlignment(Element.ALIGN_LEFT);
+        paragraph.setLeading(5f);
+        document1.add(ppp);
+
+
+        ppp = new Paragraph("妫�娴嬬粨鏋滐細 "+entries.getStr("en")+"=" + value.get(0).getProResult(), remarkFonts);
+        paragraph.setAlignment(Element.ALIGN_LEFT);
+        paragraph.setLeading(5f);
+        document1.add(ppp);
+
+        ppp = new Paragraph("", remarkFonts);
+        paragraph.setAlignment(Element.ALIGN_LEFT);
+        paragraph.setLeading(5f);
+        document1.add(ppp);
+        ppp = new Paragraph("", remarkFonts);
+        paragraph.setAlignment(Element.ALIGN_LEFT);
+        paragraph.setLeading(5f);
+        document1.add(ppp);
+        if (StrUtil.isNotBlank(entry.getKey().getRemark())) {
+            ppp = new Paragraph("缁撹锛�" + entry.getKey().getRemark().replaceAll("null",""), remarkFonts);
+            paragraph.setAlignment(Element.ALIGN_LEFT);
+            paragraph.setLeading(5f);
+            document1.add(ppp);
         }
     }
 
@@ -2927,7 +2502,7 @@
 //        List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.list(wqq);
         List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.notHuaYanData(tjNumber);
         for (TjOrderRemark tjOrderRemark : tjOrderRemarks) {
-            printReport.put(tjOrderRemark, null);
+            printReport.put(tjOrderRemark,null);
         }
         for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : printReport.entrySet()) {
             List<TjPdfVO> tjPdfVOS = new ArrayList<>();
@@ -3022,8 +2597,16 @@
                         if (null != list && !list.isEmpty()) {
                             LtkjExamJcbgd jcbgd = list.get(0);
                             if (jcbgd != null) {
-                                tjPdfVO.setTs(jcbgd.getYxbx());
-                                tjPdfVO.setSj(jcbgd.getBgNr());
+                                String yxbx = jcbgd.getYxbx();
+                                String bgNr = jcbgd.getBgNr();
+                                // 姝e垯琛ㄨ揪寮忥細鍖归厤鏁板瓧鍚庤窡 '.' 鎴� '銆�'
+                                String regex = "\\d+[\\.,銆乚";
+                                // 浣跨敤姝e垯鏇挎崲锛屽尮閰嶇殑鏁板瓧鍚庢坊鍔犳崲琛岀
+                                if(StringUtil.isNotBlank(yxbx)) yxbx = yxbx.replaceAll(regex, "\n$0");
+                                if(StringUtil.isBlank(bgNr)) bgNr = "";
+                                if(StringUtil.isBlank(yxbx)) yxbx = "";
+                                tjPdfVO.setTs(yxbx);
+                                tjPdfVO.setSj(bgNr);
                                 tjPdfVO.setShys(jcbgd.getShysxm());
                                 tjPdfVO.setProName(jcbgd.getXmmc());
                                 ids += "|" + jcbgd.getXmdm();
@@ -3033,14 +2616,6 @@
                     }
                 }
             }
-//            if(!tjPdfVOS.isEmpty()){
-//                tjPdfVOS=tjPdfVOS.stream().sorted(Comparator.comparing(TjPdfVO::getProName, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
-//                tjPdfVOS = tjPdfVOS.stream()
-//                        .sorted(Comparator.comparingInt(
-//                                tjPdfVO -> tjPdfVO.getProName().length() // 鏍规嵁鍚嶅瓧鐨勯暱搴︽帓搴�
-//                        ))
-//                        .collect(Collectors.toList());
-//            }
             printReport.put(entry.getKey(), tjPdfVOS);
         }
     }

--
Gitblit v1.8.0