From 0e9613bcd6901b23323b41ac279ddb01cbde9f48 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 30 四月 2025 17:18:03 +0800
Subject: [PATCH] pdf生成增加失败撤回

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java |  675 +++++++++++++++++++------------------------------------
 1 files changed, 236 insertions(+), 439 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 a3fbce1..c7cd8a3 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
@@ -46,6 +46,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 +122,8 @@
     private ITjProAdvicerulesService tjProAdvicerulesService;
     @Autowired
     private TjOrderYcxmService ycxmService;
+    @Resource
+    private TjXdtgmdjgService xdtgmdjgService;
 
     private Integer pdfPage = 0;
 
@@ -994,442 +999,154 @@
 //        List<Map<String, Object>> jiancha = new ArrayList<>();
 
 
-        paragraph = PdfUtils.setParagraph(defaultTitleFont, "妫�鏌ョ患杩帮細");
-        paragraph.setSpacingBefore(3f);
-        paragraph.setSpacingAfter(2f);
-        document2.add(paragraph);
 
         int xmXh = 1;
-
         Map<Long, List<TjOrderDetail>> collect = orderDetails.stream().collect(Collectors.groupingBy(TjOrderDetail::getProId));
-        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) {
+        LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
+        wq.eq(TjOrderYcxm::getTjh, tjOrder.getTjNumber());
+        List<TjOrderYcxm> ycxms = ycxmService.list(wq);
+        boolean isBr = false;
+        if (null != ycxms && !ycxms.isEmpty()) {
 
-                // 妫�鏌�
-                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;
-                    for (TjOrderDetail detail : details) {
-                        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)) {
-                            int index = 1;
-                            result = result.replaceAll("鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐o紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�", "");
-//                            result = result.replaceAll("", "");
-                            String[] split = result.split("\n");
-                            StringBuilder builder = new StringBuilder();
-                            for (String s : split) {
-                                if (StrUtil.isBlank(s.replaceAll("\n", "").trim())) continue;
-                                builder.append("    (").append(index).append(")").append(s).append("\n");
-                                index++;
-                            }
-                            result = builder.toString();
-                        }
-                        paragraph = new Paragraph(result, defaultFont);
+            paragraph = PdfUtils.setParagraph(defaultTitleFont, "妫�鏌ョ患杩帮細");
+            paragraph.setSpacingBefore(3f);
+            paragraph.setSpacingAfter(2f);
+            document2.add(paragraph);
+            isBr = true;
+
+            Map<String, List<TjOrderYcxm>> stringListMap = ycxms.stream().collect(Collectors.groupingBy(TjOrderYcxm::getParentName));
+
+            for (Map.Entry<String, List<TjOrderYcxm>> entry : stringListMap.entrySet()) {
+                List<TjOrderYcxm> details = entry.getValue();
+                String xmmc = entry.getKey();
+//                    String xmmc = details.get(0).getProName();
+                boolean isXmWrite = false;
+                int index = 1;
+                for (TjOrderYcxm 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;
                     }
-                    if (isXmWrite) {
-                        paragraph = PdfUtils.setParagraph(defaultFont, "");
-                        paragraph.setLeading(0f);
-                        paragraph.setSpacingBefore(0f);
-                        paragraph.setSpacingAfter(5f);
-                        document2.add(paragraph);
-                        xmXh++;
-                    }
-                }
+                    String result = detail.getJcjg();
+                    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.getJcxm()).append(": ").append(result).append("\n");
+                        index++;
 
-                // 妫�楠�
-                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++;
-                        }
+                        result = builder.toString();
                     }
-                    if (isXmWrite) {
-                        paragraph = PdfUtils.setParagraph(defaultFont, "");
-                        paragraph.setSpacingBefore(0f);
-                        paragraph.setSpacingAfter(5f);
-                        document2.add(paragraph);
-                        xmXh++;
-                    }
+                    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++;
                 }
             }
         }
 
-        paragraph = PdfUtils.setParagraph(defaultFont, "");
-        paragraph.setLeading(0f);
-        paragraph.setSpacingBefore(10f);
-        paragraph.setSpacingAfter(10f);
-        document2.add(paragraph);
-        paragraph = PdfUtils.setParagraph(defaultTitleFont, "鍖荤敓寤鸿锛�");
-        paragraph.setSpacingBefore(3f);
-        paragraph.setSpacingAfter(2f);
-        document2.add(paragraph);
+        if(isBr) {
+            paragraph = PdfUtils.setParagraph(defaultFont, "");
+            paragraph.setLeading(0f);
+            paragraph.setSpacingBefore(10f);
+            paragraph.setSpacingAfter(10f);
+            document2.add(paragraph);
+        }
+
+
         xmXh = 0;
-        LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
-        wq.eq(TjOrderYcxm::getTjh, tjOrder.getTjNumber());
-        List<TjOrderYcxm> ycxms = ycxmService.list(wq);
+//        LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
+//        wq.eq(TjOrderYcxm::getTjh, tjOrder.getTjNumber());
+//        List<TjOrderYcxm> ycxms = ycxmService.list(wq);
         if (null != ycxms && !ycxms.isEmpty()) {
-            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))
+
+            paragraph = PdfUtils.setParagraph(defaultTitleFont, "鍖荤敓寤鸿锛�");
+            paragraph.setSpacingBefore(3f);
+            paragraph.setSpacingAfter(2f);
+            document2.add(paragraph);
+
+            Map<String, List<TjOrderYcxm>> stringListMap = ycxms.stream().collect(Collectors.groupingBy(TjOrderYcxm::getParentName));
+
+            for (Map.Entry<String, List<TjOrderYcxm>> entry : stringListMap.entrySet()) {
+                List<TjOrderYcxm> details = entry.getValue();
+                if(null !=details && !details.isEmpty()){
+                    details= details.stream()
+                            .sorted(Comparator.comparing(TjOrderYcxm::getJcxm))
                             .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 = 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)) {
-                                    String[] split = result.split("\n");
-                                    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++;
-                                    }
-                                    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,xmmc);
-                                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);
-                            }
+                    boolean isXmWrite = false;
+                    int index = 1;
+                    int index1 = 1;
+                    for (TjOrderYcxm detail : details) {
+                        String xmmc = entry.getKey().toString();
+                        if (!isXmWrite) {
+                            xmXh++;
+                            paragraph = new Paragraph("銆�" + xmXh + "." + xmmc + "銆�", defaultFont);
+                            paragraph.setAlignment(Element.ALIGN_LEFT);
+                            document2.add(paragraph);
+                            isXmWrite = true;
                         }
-                    }
-                    // 妫�楠�
-                    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 = "    ";
+                        String result = detail.getJcjg();
+                        if (StrUtil.isNotBlank(result)) {
+                            StringBuilder builder = new StringBuilder();
+                            if (StrUtil.isBlank(result.replaceAll("\n", "").trim())) continue;
+                            builder.append("    (").append(index1).append(")").append(detail.getJcxm()).append(": ").append(result).append("\n");
+                            index1++;
 
-                                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++;
-                                }
-                            }
+                            result = builder.toString();
                         }
-                        if (isXmWrite) {
-                            paragraph = PdfUtils.setParagraph(defaultFont, "");
-                            paragraph.setSpacingBefore(0f);
-                            paragraph.setSpacingAfter(5f);
+                        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);
                         }
-                    }
-                }
-            }
-        } else {
-            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);
-                                    }
-                                }
+                        String str = "     ";
+                        List<Map<String, Object>> maps = new ArrayList<>();
+
+                            String jynr = detail.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 = "     鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐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);
-                        }
+                        index++;
+                        paragraph = PdfUtils.setParagraph(defaultFont, "");
+                        paragraph.setLeading(0f);
+                        paragraph.setSpacingBefore(0f);
+                        paragraph.setSpacingAfter(5f);
+                        document2.add(paragraph);
                     }
                 }
             }
+
         }
+
 
         for (int i = 0; i < 1; i++) {
             paragraph = PdfUtils.setParagraph(defaultFont, "");
@@ -1623,6 +1340,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();
 
 
@@ -2108,7 +1866,7 @@
                                 paragraph.setLeading(5f);
                                 document1.add(ppp);
                                 if (StrUtil.isNotBlank(entry.getKey().getRemark())) {
-                                    ppp = new Paragraph("缁撹锛�" + entry.getKey().getRemark(), remarkFonts);
+                                    ppp = new Paragraph("缁撹锛�" + entry.getKey().getRemark().replaceAll("null",""), remarkFonts);
                                     paragraph.setAlignment(Element.ALIGN_LEFT);
                                     paragraph.setLeading(5f);
                                     document1.add(ppp);
@@ -2124,18 +1882,22 @@
                             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);
@@ -2169,7 +1931,7 @@
                                     paragraph.setLeading(5f);
                                     document1.add(ppp);
                                     if (StrUtil.isNotBlank(entry.getKey().getRemark())) {
-                                        ppp = new Paragraph("缁撹锛�" + entry.getKey().getRemark(), remarkFonts);
+                                        ppp = new Paragraph("缁撹锛�" + entry.getKey().getRemark().replaceAll("null",""), remarkFonts);
                                         paragraph.setAlignment(Element.ALIGN_LEFT);
                                         paragraph.setLeading(5f);
                                         document1.add(ppp);
@@ -2292,7 +2054,7 @@
                                 paragraph.setLeading(5f);
                                 document1.add(ppp);
                                 if (StrUtil.isNotBlank(entry.getKey().getRemark())) {
-                                    ppp = new Paragraph("缁撹锛�" + entry.getKey().getRemark(), remarkFonts);
+                                    ppp = new Paragraph("缁撹锛�" + entry.getKey().getRemark().replaceAll("null",""), remarkFonts);
                                     paragraph.setAlignment(Element.ALIGN_LEFT);
                                     paragraph.setLeading(5f);
                                     document1.add(ppp);
@@ -2309,18 +2071,38 @@
                             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);
+                                    }
+                                }
+                                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);
@@ -2354,7 +2136,7 @@
                                     paragraph.setLeading(5f);
                                     document1.add(ppp);
                                     if (StrUtil.isNotBlank(entry.getKey().getRemark())) {
-                                        ppp = new Paragraph("缁撹锛�" + entry.getKey().getRemark(), remarkFonts);
+                                        ppp = new Paragraph("缁撹锛�" + entry.getKey().getRemark().replaceAll("null",""), remarkFonts);
                                         paragraph.setAlignment(Element.ALIGN_LEFT);
                                         paragraph.setLeading(5f);
                                         document1.add(ppp);
@@ -2502,10 +2284,16 @@
         List<LtkjHysqd> list = ltkjHysqdService.list(ltkjHysqdLambdaQueryWrapper);
         HashMap<String, Object> data = new HashMap<>();
         for (LtkjHysqd hysqd : list) {
-            LambdaQueryWrapper<LtkjHybgd> ltkjHybgdLambdaQueryWrapper = new LambdaQueryWrapper<>();
-            ltkjHybgdLambdaQueryWrapper.eq(LtkjHybgd::getTmh, hysqd.getTmh());
-            List<LtkjHybgd> hybgds = ltkjHybgdService.list(ltkjHybgdLambdaQueryWrapper);
+//            LambdaQueryWrapper<LtkjHybgd> ltkjHybgdLambdaQueryWrapper = new LambdaQueryWrapper<>();
+//            ltkjHybgdLambdaQueryWrapper.eq(LtkjHybgd::getTmh, hysqd.getTmh());
+//            List<LtkjHybgd> hybgds = ltkjHybgdService.list(ltkjHybgdLambdaQueryWrapper);
+            List<LtkjHybgd> hybgds = ltkjHybgdService.getReportJianYanBaoGaoDanList(hysqd.getTmh());
             if(null !=hybgds && !hybgds.isEmpty()){
+
+                hybgds = new ArrayList<>(hybgds.stream()
+                        .collect(Collectors.toMap(LtkjHybgd::getJcxm, p -> p, (existing, replacement) -> existing))
+                        .values());
+
 //                hybgds=hybgds.stream().sorted(Comparator.comparing(LtkjHybgd::getJcxm, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
 //                hybgds = hybgds.stream()
 //                        .sorted(Comparator.comparingInt(
@@ -2805,14 +2593,14 @@
                     }
                 }
             }
-//            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());
-//            }
+            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);
         }
     }
@@ -2841,6 +2629,8 @@
                     if (tjOrderDetail.getProject().getProParentId().equals(entry.getKey().getProId())
                             && entry.getKey().getType() == 1
                             && !ids.contains(String.valueOf(tjOrderDetail.getProject().getProParentId()))) {
+
+                        TjProject tjProjectq = projectService.getById(tjOrderDetail.getProject().getProParentId());
                         TjPdfVO tjPdfVO = new TjPdfVO();
                         tjPdfVO.setProName(tjOrderDetail.getProject().getProName());
                         tjPdfVO.setProResult(tjOrderDetail.getProResult());
@@ -2851,10 +2641,17 @@
                             tjPdfVO.setCompany("/");
                         }
                         tjPdfVO.setProId(String.valueOf(tjOrderDetail.getProject().getProId()));
+//                        LambdaQueryWrapper<LtkjExamJcbgd> wrapper = new LambdaQueryWrapper<>();
+//                        wrapper.eq(LtkjExamJcbgd::getTjh, one.getCardId());
+//                        wrapper.like(LtkjExamJcbgd::getXmdm, String.valueOf(tjOrderDetail.getProject().getProParentId()))
+//                                .or().eq(LtkjExamJcbgd::getXmdm, String.valueOf(tjProjectq.getHisXmbm()));
+//                        wrapper.orderByDesc(LtkjExamJcbgd::getZdsj);
                         LambdaQueryWrapper<LtkjExamJcbgd> wrapper = new LambdaQueryWrapper<>();
-                        wrapper.eq(LtkjExamJcbgd::getTjh, tjNumber);
-                        wrapper.like(LtkjExamJcbgd::getXmdm, String.valueOf(tjOrderDetail.getProject().getProParentId()));
-                        wrapper.orderByDesc(LtkjExamJcbgd::getZdsj);
+                        wrapper.eq(LtkjExamJcbgd::getTjh, one.getCardId())
+                                .and(w -> w.like(LtkjExamJcbgd::getXmdm, String.valueOf(tjOrderDetail.getProject().getProParentId()))
+                                        .or()
+                                        .eq(LtkjExamJcbgd::getXmdm, String.valueOf(tjProjectq.getHisXmbm()))).orderByDesc(LtkjExamJcbgd::getZdsj);
+
                         List<LtkjExamJcbgd> list = jcbgdService.list(wrapper);
                         if (null != list && !list.isEmpty()) {
                             LtkjExamJcbgd jcbgd = list.get(0);

--
Gitblit v1.8.0