From 2c785c3d4513daea9deb5c7edbb17a9f17111d25 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 21 二月 2025 17:49:03 +0800
Subject: [PATCH] zjh20250221

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 2449 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 2,094 insertions(+), 355 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 3f2c630..dd2f9cb 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
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -15,9 +16,13 @@
 import com.ltkj.common.core.domain.entity.SysDictData;
 import com.ltkj.common.core.domain.entity.SysUser;
 import com.ltkj.common.utils.DateUtils;
+import com.ltkj.common.utils.SecurityUtils;
 import com.ltkj.framework.config.MatchUtils;
 import com.ltkj.hosp.domain.*;
 import com.ltkj.hosp.mapper.DictUserInfoMapper;
+import com.ltkj.hosp.mapper.TjOrderDetailMapper;
+import com.ltkj.hosp.mapper.TjOrderRemarkMapper;
+import com.ltkj.hosp.mapper.TjRulesMapper;
 import com.ltkj.hosp.service.*;
 import com.ltkj.hosp.sqlDomain.LtkjExamJcbgd;
 import com.ltkj.hosp.sqlDomain.LtkjHybgd;
@@ -27,6 +32,7 @@
 import com.ltkj.system.service.ISysDictDataService;
 import com.ltkj.system.service.ISysUserService;
 import com.ltkj.web.config.pdfutils.PdfUtils;
+import com.ltkj.web.controller.system.SysDeptController;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +46,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.math.BigDecimal;
+import java.text.Collator;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.List;
@@ -98,6 +105,28 @@
     private IDictHospService dictHospService;
     @Autowired
     private ISysDictDataService sysDictDataService;
+    @Autowired
+    private ITjRulesService tjRulesService;
+    @Autowired
+    private TjRulesMapper tjRulesMapper;
+    @Autowired
+    private TjOrderRemarkMapper tjOrderRemarkMapper;
+    @Autowired
+    private TjOrderDetailMapper tjOrderDetailMapper;
+    @Autowired
+    private SysDeptController sysDeptController;
+    @Autowired
+    private ITjProAdvicerulesService tjProAdvicerulesService;
+    @Autowired
+    private TjOrderYcxmService ycxmService;
+
+    private Integer pdfPage = 0;
+
+    private static int DEFAULT_FONT_SIZE = 10;
+    private static int DEFAULT_LITTLE_TITLE_FONT_SIZE = 11;
+    private static int DEFAULT_TITLE_FONT_SIZE = 12;
+    private static int DEFAULT_ZONGJIAN_FONT_SIZE = 15;
+    private static String HOSP_NAME;
 
     private List<Map<String, Object>> makePDFInfo(HashMap<String, Object> map, AjaxResult ajaxResult, String key) {
         List<Map<String, Object>> data = null;
@@ -113,7 +142,7 @@
         return data;
     }
 
-    public void putData(JSONObject jsonObject, AjaxResult result, String key) {
+/*    public void putData(JSONObject jsonObject, AjaxResult result, String key) {
         if (Integer.parseInt(result.get("code").toString()) == 200) {
             List<Map<String, Object>> data = (List<Map<String, Object>>) result.get("data");
             jsonObject.putOpt(key, data);
@@ -126,7 +155,7 @@
 //        list.get(0).getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")
         List<SysDictData> sysUserSex = sysDictDataService.list(new LambdaQueryWrapper<SysDictData>().eq(SysDictData::getDictType, "sys_user_sex"));
         HashMap<String, Object> map = makeHisJianYan(tjOrder, customer);
-        HashMap<String, Object> pdfChangGui = makePDFInfo(tjOrder, customer, tjReportTemplate,dictHosp,map);
+        HashMap<String, Object> pdfChangGui = makePDFInfo(tjOrder, customer, tjReportTemplate, dictHosp, map);
         if (pdfChangGui == null)
             return AjaxResult.error();
         Document document = (Document) pdfChangGui.get("document");
@@ -138,7 +167,8 @@
         int pageSize = 0;
         try {
             pdfWriter = PdfWriter.getInstance(document1, byteArrayOutputStream1);
-            if (dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")){
+//            if (dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")){
+            if (true) {
                 String sex = "";
                 if (customer.getCusSex() != null) {
                     for (SysDictData userSex : sysUserSex) {
@@ -148,7 +178,8 @@
                     }
                 }
                 if (StrUtil.isBlank(sex)) sex = "鏈煡";
-                pdfWriter.setPageEvent(new FooterHeaderPageEvent("婢勫悎鐭垮姟灞�涓績鍖婚櫌",customer.getCusName(),tjOrder.getTjNumber(),sex,String.valueOf(DateUtil.ageOfNow(customer.getCusBrithday()))));
+//                pdfWriter.setPageEvent(new FooterHeaderPageEvent("婢勫悎鐭垮姟灞�涓績鍖婚櫌",customer.getCusName(),tjOrder.getTjNumber(),sex,String.valueOf(DateUtil.ageOfNow(customer.getCusBrithday())),null));
+                pdfWriter.setPageEvent(new FooterHeaderPageEvent(dictHosp.getHospName(), customer.getCusName(), tjOrder.getTjNumber(), sex, String.valueOf(DateUtil.ageOfNow(customer.getCusBrithday())), null));
                 pageSize = pdfWriter.getPageNumber();
             }
         } catch (DocumentException e) {
@@ -158,82 +189,88 @@
         document1.setMargins(70, 70, 40, 40);
         document1.open();
 
-        if (dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")){
+//        if (dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")){
+        if (true) {
             // 缁勮浣撴妫�鏌ラ」鐩姤鍛�
             Map<TjOrderRemark, List<TjPdfVO>> printReport = new HashMap<>();
             notHuaYanData(tjOrder.getTjNumber(), printReport, tjOrder, customer);
             try {
-                notHuaYanTable(document1, printReport,dictHosp,color);
+                notHuaYanTable(document1, printReport, dictHosp, color, false);
             } catch (DocumentException e) {
                 log.error("闈炲寲楠岄」鐩~鍏呰〃鏍煎紓甯�");
                 log.error(String.valueOf(e));
                 return AjaxResult.error();
             }
             // 缁勮妫�楠屾暟鎹�
-            makeHisJianYanTable(document1, map,dictHosp,color);
+            makeHisJianYanTable(document1, map, dictHosp, color);
 
             // 缁勮pacs妫�鏌ユ暟鎹�
             printReport = new HashMap<>();
             pacsJianChaData(tjOrder.getTjNumber(), printReport, tjOrder, customer);
             try {
-                notHuaYanTable(document1, printReport,dictHosp,color);
+                notHuaYanTable(document1, printReport, dictHosp, color, true);
             } catch (DocumentException e) {
-                log.error("闈炲寲楠岄」鐩~鍏呰〃鏍煎紓甯�");
+                log.error("pacs椤圭洰濉厖琛ㄦ牸寮傚父");
                 log.error(String.valueOf(e));
                 return AjaxResult.error();
             }
-        }else {
+        } else {
             // 闈炲寲楠岄」鐩姤鍛�
             Map<TjOrderRemark, List<TjPdfVO>> printReport = new HashMap<>();
             notHuaYanData(tjOrder.getTjNumber(), printReport, tjOrder, customer);
             try {
-                notHuaYanTable(document1, printReport,dictHosp,color);
+                notHuaYanTable(document1, printReport, dictHosp, color, true);
             } catch (DocumentException e) {
                 log.error("闈炲寲楠岄」鐩~鍏呰〃鏍煎紓甯�");
                 log.error(String.valueOf(e));
                 return AjaxResult.error();
             }
             // 缁勮妫�楠屾暟鎹�
-            makeHisJianYanTable(document1, map,dictHosp,color);
+            makeHisJianYanTable(document1, map, dictHosp, color);
         }
-
-
-        List<ByteArrayOutputStream> jianchas =  makeHisJianChaTable(tjOrder);
-//        List<ByteArrayOutputStream> jianchas = makeCcgcHisJianChaTable(tjOrder);
         document1.close();
+
         PdfReader reader = null;
-        try {
-            reader = new PdfReader(byteArrayOutputStream1.toByteArray());
-            int numberOfPages1 = reader.getNumberOfPages();
-            for (int i = 1; i <= numberOfPages1; i++) {
-                PdfImportedPage page = copy.getImportedPage(reader, i);
-                copy.addPage(page);
-            }
-            for (ByteArrayOutputStream jiancha : jianchas) {
-                reader = new PdfReader(jiancha.toByteArray());
-                numberOfPages1 = reader.getNumberOfPages();
-                for (int i = 1; i <= numberOfPages1; i++) {
-                    PdfImportedPage page = copy.getImportedPage(reader, i);
-                    copy.addPage(page);
-                }
-                jiancha.close();
-            }
-            reader.close();
-            byteArrayOutputStream1.close();
-            document.close();
-            copy.close();
-        } catch (IOException e) {
-            log.error("鎷疯礉pdf寮傚父");
-            log.error(String.valueOf(e));
-            return AjaxResult.error();
+        reader = new PdfReader(byteArrayOutputStream1.toByteArray());
+        int numberOfPages1 = reader.getNumberOfPages();
+        for (int i = 1; i <= numberOfPages1; i++) {
+            PdfImportedPage page = copy.getImportedPage(reader, i);
+            copy.addPage(page);
         }
+
+//        if (!dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")){
+        if (!true) {
+            List<ByteArrayOutputStream> jianchas = makeHisJianChaTable(tjOrder);
+//        List<ByteArrayOutputStream> jianchas = makeCcgcHisJianChaTable(tjOrder);
+            try {
+                for (ByteArrayOutputStream jiancha : jianchas) {
+                    reader = new PdfReader(jiancha.toByteArray());
+                    numberOfPages1 = reader.getNumberOfPages();
+                    for (int i = 1; i <= numberOfPages1; i++) {
+                        PdfImportedPage page = copy.getImportedPage(reader, i);
+                        copy.addPage(page);
+                    }
+                    jiancha.close();
+                }
+            } catch (IOException e) {
+                log.error("鎷疯礉pdf寮傚父");
+                log.error(String.valueOf(e));
+                return AjaxResult.error();
+            }
+        }
+        reader.close();
+        byteArrayOutputStream1.close();
+        document.close();
+        copy.close();
+
         String outputFileName1 = customer.getCusId() + tjOrder.getTjNumber() + customer.getCusName() + "_鎶ュ憡.pdf";
         try {
             PdfReader pdfReader = new PdfReader(finalOutPut.toByteArray());
             int pages = pdfReader.getNumberOfPages();
             ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
             PdfStamper pdfStamper = new PdfStamper(pdfReader, outputStream);
-            if (!dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")){
+//            if (!dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")){
+            if (!true) {
                 PdfContentByte contentByte;
                 BaseFont baseFont = PdfUtils.createBaseFont(null);
                 for (int i = 2; i <= pages; i++) {
@@ -258,103 +295,1558 @@
     }
 
     public AjaxResult hisPDFNew(TjOrder tjOrder, TjCustomer customer, TjReportTemplate tjReportTemplate) throws Exception {
+        pdfPage = 0;
         DictHosp dictHosp = dictHospService.list().get(0);
         String color = sysConfigService.selectConfigByKey("report_title_color");
         List<SysDictData> sysUserSex = sysDictDataService.list(new LambdaQueryWrapper<SysDictData>().eq(SysDictData::getDictType, "sys_user_sex"));
+        // 妫�楠屾暟鎹�
+        HashMap<String, Object> map = makeHisJianYan(tjOrder, customer);
+        String sex = "";
+        if (customer.getCusSex() != null) {
+            for (SysDictData userSex : sysUserSex) {
+                if (userSex.getDictValue().equals(String.valueOf(customer.getCusSex()))) {
+                    sex = userSex.getDictLabel();
+                }
+            }
+        }
+        if (StrUtil.isBlank(sex)) sex = "鏈煡";
+
+
+        // 鐢熸垚 document2 骞跺皢鍏跺唴瀹逛繚瀛樺埌 byteArrayOutputStream2 涓�
+        ByteArrayOutputStream byteArrayOutputStream2 = new ByteArrayOutputStream();
+        Document document2 = new Document(PageSize.A4);
+        PdfWriter writer2 = PdfWriter.getInstance(document2, byteArrayOutputStream2);
+
+        writer2.setPageEvent(new FooterHeaderPageEvent(dictHosp.getHospName(), customer.getCusName(), tjOrder.getTjNumber(), sex, String.valueOf(DateUtil.ageOfNow(customer.getCusBrithday())), 0));
+
+        document2.setMargins(50, 70, 40, 50);
+        document2.open();
+
+        List<CsProVo> list = tjOrderRemarkService.cSWebGetProByTjNumAndOrderId(tjOrder.getTjNumber(), false);
+
+        Font defaultFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
+        Font defaultTitleFont = PdfUtils.setFont(DEFAULT_LITTLE_TITLE_FONT_SIZE);
+        defaultTitleFont.setStyle(Font.BOLD);
+        Paragraph paragraph = PdfUtils.setParagraph(defaultTitleFont, "妫�鏌ョ瀹や笌妫�鏌ラ」鐩�");
+        document2.add(paragraph);
+
+        PdfPTable table = new PdfPTable(new float[]{80, 100, 80, 80});
+        table.setTotalWidth(PageSize.A4.getWidth() - 100);
+        table.setLockedWidth(true);
+        table.setHorizontalAlignment(Element.ALIGN_LEFT);
+        String[] titles = {"绉戝", "浣撴椤圭洰", "妫�鏌ョ姸鎬�", "妫�鏌ユ椂闂�"};
+
+        for (String head : titles) {
+            table.addCell(PdfUtils.createCell(head, defaultFont, Rectangle.BOX, Element.ALIGN_CENTER, 5f, 5f));
+        }
+        Map<String, List<CsProVo>> listMap = list.stream().collect(Collectors.groupingBy(CsProVo::getDeptName));
+        for (Map.Entry<String, List<CsProVo>> entry : listMap.entrySet()) {
+            String dept = entry.getKey();
+            List<CsProVo> proVos = entry.getValue();
+            PdfPCell deptCell = new PdfPCell();
+            deptCell.setVerticalAlignment(Element.ALIGN_MIDDLE);
+            deptCell.setHorizontalAlignment(Element.ALIGN_CENTER);
+            deptCell.setPhrase(new Phrase(dept, defaultFont));
+            deptCell.setPaddingTop(5f);
+            deptCell.setPaddingBottom(5f);
+            deptCell.setRowspan(proVos.size());
+            table.addCell(deptCell);
+            proVos.forEach(proVo -> {
+                table.addCell(PdfUtils.createCell(proVo.getProName(), defaultFont, Rectangle.BOX, Element.ALIGN_CENTER, 5f, 5f));
+                String tjType = "";
+                switch (proVo.getType()) {
+                    case 0:
+                        tjType = "鏈";
+                        break;
+                    case 1:
+                        tjType = "宸叉";
+                        break;
+                    case 2:
+                        tjType = "寮冩";
+                        break;
+                    case 3:
+                        tjType = "寤舵湡";
+                        break;
+                }
+                table.addCell(PdfUtils.createCell(tjType, defaultFont, Rectangle.BOX, Element.ALIGN_CENTER, 5f, 5f));
+                String tjTime = "";
+                if (proVo.getQdcreateTime() != null) {
+                    tjTime = new SimpleDateFormat("yyyy-MM-dd").format(proVo.getQdcreateTime());
+                }
+                table.addCell(PdfUtils.createCell(tjTime, defaultFont, Rectangle.BOX, Element.ALIGN_CENTER, 5f, 5f));
+            });
+        }
+        document2.add(table);
+
+        for (int i = 0; i < 2; i++) {
+            paragraph = PdfUtils.setParagraph(defaultFont, "");
+            document2.add(paragraph);
+        }
+
+
+        //        List<TjOrderRemark> remarks = tjOrderRemarkMapper.getzongjianyishengchakanyichangxiangmu3( tjOrder.getTjNumber());
+        List<TjOrderDetail> orderDetails = tjOrderDetailMapper.getzongjianyishengchakanyichangxiangmu4(tjOrder.getTjNumber());
+//        List<Map<String, Object>> jiancha = new ArrayList<>();
+
+
+        paragraph = PdfUtils.setParagraph(defaultTitleFont, "妫�鏌ョ患杩帮細");
+        paragraph.setSpacingBefore(3f);
+        paragraph.setSpacingAfter(2f);
+        document2.add(paragraph);
+
+        int xmXh = 1;
+        for (Map.Entry<Long, List<TjOrderDetail>> entry : orderDetails.stream().collect(Collectors.groupingBy(TjOrderDetail::getProId)).entrySet()) {
+            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紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�", "");
+                    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.setAlignment(Element.ALIGN_LEFT);
+                document2.add(paragraph);
+            }
+            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.contains("鈫�") || i.contains("鈫�")) {
+                    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++;
+                }
+            }
+            paragraph = PdfUtils.setParagraph(defaultFont, "");
+            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);
+        xmXh = 0;
+        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.contains("鈫�") || i.contains("鈫�")) {
+                    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(5), "");
+                    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);
+                            String content1 = str + objectMap.get("bt").toString().trim() + objectMap.get("nr").toString().trim();
+                            if (StrUtil.isBlank(content1))
+                                content1 = "     鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐o紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�";
+
+                            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++;
+                }
+            }
+            paragraph = PdfUtils.setParagraph(defaultFont, "");
+            paragraph.setSpacingBefore(0f);
+            paragraph.setSpacingAfter(5f);
+            document2.add(paragraph);
+        }
+
+
+        for (Map.Entry<Long, List<TjOrderDetail>> entry : orderDetails.stream().collect(Collectors.groupingBy(TjOrderDetail::getProId)).entrySet()) {
+            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紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�");
+                    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紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�");
+                    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);
+                paragraph = new Paragraph(result, defaultFont);
+                paragraph.setAlignment(Element.ALIGN_LEFT);
+                document2.add(paragraph);
+                String str = "     ";
+                List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(entry.getKey().toString(), "", "", tjOrder.getTjNumber(), detail.getProName(), "");
+                for (Map<String, Object> objectMap : maps) {
+                    String content1 = str + objectMap.get("bt").toString() + objectMap.get("nr").toString();
+                    if (StrUtil.isBlank(content1))
+                        content1 = "     鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐o紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�";
+
+                    paragraph = new Paragraph(content1, 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 (int i = 0; i < 1; i++) {
+            paragraph = PdfUtils.setParagraph(defaultFont, "");
+            document2.add(paragraph);
+        }
+
+        paragraph = PdfUtils.setParagraph(defaultTitleFont, "鎬绘鍖荤敓寤鸿锛�");
+        document2.add(paragraph);
+        if (tjOrder.getCheckAdvice() == null) {
+            paragraph = PdfUtils.setParagraph(defaultFont, "鏃�");
+            document2.add(paragraph);
+        } else {
+            paragraph = PdfUtils.setParagraph(defaultFont, tjOrder.getCheckAdvice());
+            document2.add(paragraph);
+        }
+
+
+        Paragraph paragraphNone = new Paragraph("", defaultFont);
+        paragraphNone.setAlignment(Element.ALIGN_LEFT);
+        //琛岄棿璺�
+        paragraphNone.setLeading(5f);
+        paragraphNone.setSpacingBefore(10f);
+        paragraphNone.setSpacingAfter(10f);
+        document2.add(paragraphNone);
+        paragraphNone = new Paragraph("", defaultFont);
+        paragraphNone.setAlignment(Element.ALIGN_LEFT);
+        //琛岄棿璺�
+        paragraphNone.setLeading(5f);
+        paragraphNone.setSpacingBefore(10f);
+        paragraphNone.setSpacingAfter(10f);
+        document2.add(paragraphNone);
+
+
+        PdfPTable tableQz = new PdfPTable(new float[]{100f, 100f, 50f});
+        tableQz.setTotalWidth(PageSize.A4.getWidth() - 100);
+        tableQz.setLockedWidth(true);
+        tableQz.setHorizontalAlignment(Element.ALIGN_LEFT);
+        tableQz.getDefaultCell().setBorder(0);
+        tableQz.getDefaultCell().setHorizontalAlignment(Element.ALIGN_RIGHT);
+
+        Font zongJianFont = PdfUtils.setFont(DEFAULT_ZONGJIAN_FONT_SIZE);
+        Font zongJianTitleFont = PdfUtils.setFont(DEFAULT_ZONGJIAN_FONT_SIZE);
+        zongJianTitleFont.setStyle(Font.BOLD);
+
+        for (int i = 0; i < 3; i++) {
+            PdfPCell cell = new PdfPCell();
+            cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
+            cell.setHorizontalAlignment(Element.ALIGN_RIGHT);
+            cell.setPhrase(new Phrase("", defaultFont));
+            cell.setBorder(Rectangle.NO_BORDER);
+            tableQz.addCell(cell);
+        }
+
+
+        PdfPCell cell = new PdfPCell();
+        cell.setBorder(Rectangle.NO_BORDER);
+        cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
+        cell.setHorizontalAlignment(Element.ALIGN_RIGHT);
+        cell.setPhrase(new Phrase("", defaultFont));
+        cell.setRowspan(3);
+        tableQz.addCell(cell);
+
+        cell = new PdfPCell();
+        cell.setBorder(Rectangle.NO_BORDER);
+        cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
+        cell.setHorizontalAlignment(Element.ALIGN_RIGHT);
+        cell.setPaddingTop(10);
+        cell.setPaddingBottom(10);
+        cell.setPhrase(new Phrase("浣撴鍗曚綅鐩栫珷:", zongJianTitleFont));
+
+        tableQz.addCell(cell);
+
+        cell = new PdfPCell();
+        cell.setBorder(Rectangle.NO_BORDER);
+        cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
+        cell.setHorizontalAlignment(Element.ALIGN_RIGHT);
+        cell.setPaddingTop(10);
+        cell.setPaddingBottom(10);
+        cell.setPhrase(new Phrase("", zongJianFont));
+        tableQz.addCell(cell);
+
+
+        cell = new PdfPCell();
+        cell.setBorder(Rectangle.NO_BORDER);
+        cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
+        cell.setHorizontalAlignment(Element.ALIGN_RIGHT);
+        cell.setPaddingTop(10);
+        cell.setPaddingBottom(10);
+        cell.setPhrase(new Phrase("鎬绘鍖诲笀:", zongJianTitleFont));
+        tableQz.addCell(cell);
+
+        cell = new PdfPCell();
+        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("浣曞皬濠�", zongJianFont));
+        cell.setPhrase(new Phrase(sysConfigService.selectConfigByKey("pdf_report_zongjianysname"), zongJianFont));
+        tableQz.addCell(cell);
+
+        cell = new PdfPCell();
+        cell.setBorder(Rectangle.NO_BORDER);
+        cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
+        cell.setHorizontalAlignment(Element.ALIGN_RIGHT);
+        cell.setPaddingTop(10);
+        cell.setPaddingBottom(10);
+        cell.setPhrase(new Phrase("鎬绘鏃ユ湡:", zongJianTitleFont));
+        tableQz.addCell(cell);
+
+        cell = new PdfPCell();
+        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(new SimpleDateFormat("yyyy-MM-dd").format(tjOrder.getCheckTime()), zongJianFont));
+        tableQz.addCell(cell);
+
+        document2.add(tableQz);
+
+        document2.close();
+
 
         ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
         Document document = new Document(PageSize.A4);
         PdfWriter pdfWriter = null;
-        int pageSize = 0;
-        try {
-            pdfWriter = PdfWriter.getInstance(document, byteArrayOutputStream);
-                String sex = "";
-                if (customer.getCusSex() != null) {
-                    for (SysDictData userSex : sysUserSex) {
-                        if (userSex.getDictValue().equals(String.valueOf(customer.getCusSex()))) {
-                            sex = userSex.getDictLabel();
-                        }
-                    }
-                }
-                if (StrUtil.isBlank(sex)) sex = "鏈煡";
-                pdfWriter.setPageEvent(new FooterHeaderPageEvent(dictHosp.getHospName(),customer.getCusName(),tjOrder.getTjNumber(),sex,String.valueOf(DateUtil.ageOfNow(customer.getCusBrithday()))));
-                pageSize = pdfWriter.getPageNumber();
-        } catch (DocumentException e) {
-            log.error(String.valueOf(e));
-            return AjaxResult.error();
-        }
+//        int pageSize = 0;
+//        try {
+        pdfWriter = PdfWriter.getInstance(document, byteArrayOutputStream);
+        pdfWriter.setPageEvent(new FooterHeaderPageEvent(dictHosp.getHospName(), customer.getCusName(), tjOrder.getTjNumber(), sex, String.valueOf(DateUtil.ageOfNow(customer.getCusBrithday())), null));
+//            pageSize = pdfWriter.getPageNumber();
+//        } catch (DocumentException e) {
+//            log.error(String.valueOf(e));
+//            return AjaxResult.error();
+//        }
+        // 鍚庨潰椤电爜鏁伴噺
+        int dataPageNumer = pdfWriter.getPageNumber();
+        document.setMargins(70, 70, 40, 40);
+        document.open();
 
         Map<TjOrderRemark, List<TjPdfVO>> printReport = new HashMap<>();
         notHuaYanData(tjOrder.getTjNumber(), printReport, tjOrder, customer);
         try {
-            notHuaYanTable(document, printReport,dictHosp,color);
+            notHuaYanTable(document, printReport, dictHosp, color, false);
         } catch (DocumentException e) {
             log.error("闈炲寲楠岄」鐩~鍏呰〃鏍煎紓甯�");
             log.error(String.valueOf(e));
             return AjaxResult.error();
         }
         PdfReader reader = null;
+        makeHisJianYanTable(document, map, dictHosp, color);
 
-        // 妫�楠屾暟鎹�
-        HashMap<String, Object> map = makeHisJianYan(tjOrder, customer);
-        makeHisJianYanTable(document, map,dictHosp,color);
-        List<ByteArrayOutputStream> jianchas =  makeHisJianChaTable(tjOrder);
-        document.close();
-
-        Document document1 = new Document(PageSize.A4);
-        ByteArrayOutputStream finalOutPut = new ByteArrayOutputStream();
-        PdfCopy copy = new PdfCopy(document1, finalOutPut);
-        byte[] bytes = byteArrayOutputStream.toByteArray();
-        document1.open();
-        reader = new PdfReader(bytes);
-
-        int numberOfPages = reader.getNumberOfPages();
-
-
-
-
-
+        printReport = new HashMap<>();
+        pacsJianChaData(tjOrder.getTjNumber(), printReport, tjOrder, customer);
         try {
-            reader = new PdfReader(byteArrayOutputStream.toByteArray());
-            int numberOfPages1 = reader.getNumberOfPages();
-            for (int i = 1; i <= numberOfPages1; i++) {
-                PdfImportedPage page = copy.getImportedPage(reader, i);
-                copy.addPage(page);
-            }
-            for (ByteArrayOutputStream jiancha : jianchas) {
-                reader = new PdfReader(jiancha.toByteArray());
-                numberOfPages1 = reader.getNumberOfPages();
-                for (int i = 1; i <= numberOfPages1; i++) {
-                    PdfImportedPage page = copy.getImportedPage(reader, i);
-                    copy.addPage(page);
-                }
-                jiancha.close();
-            }
-            reader.close();
-            byteArrayOutputStream.close();
-            document.close();
-            copy.close();
-        } catch (IOException e) {
-            log.error("鎷疯礉pdf寮傚父");
+            notHuaYanTable(document, printReport, dictHosp, color, true);
+        } catch (DocumentException e) {
+            log.error("pacs椤圭洰濉厖琛ㄦ牸寮傚父");
             log.error(String.valueOf(e));
             return AjaxResult.error();
         }
+        document.close();
 
 
+        // 棣栭〉琛ㄥ崟
+        String tjNumber = tjOrder.getTjNumber();
+        String template = tjReportTemplate.getTemplate();
+        LambdaQueryWrapper<DictComp> wq111 = new LambdaQueryWrapper<>();
+        wq111.eq(DictComp::getDrugManufacturerId, tjOrder.getFirmId());
+        DictComp dictComp = dictCompService.getOne(wq111);
+        LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>();
+        wq2.eq(TjOrderDetail::getOrderId, tjOrder.getOrderId());
+        wq2.isNotNull(TjOrderDetail::getFlowingWaterId);
+        List<TjOrderDetail> detailList = tjOrderDetailService.list(wq2);
+        for (TjOrderDetail tjOrderDetail : detailList) {
+            TjProject tjProject = projectService.selectTjProjectByProId(tjOrderDetail.getProId());
+            tjOrderDetail.setProject(tjProject);
+        }
+        ByteArrayOutputStream byteArrayOutputStream4 = new ByteArrayOutputStream();
+        PdfReader reader4 = null;
+        PdfStamper pdfStamper = null;
+
+        reader4 = new PdfReader(new ByteArrayInputStream(Base64.getDecoder().decode(template)));
+        pdfStamper = new PdfStamper(reader4, byteArrayOutputStream4);
+        AcroFields acroFields = pdfStamper.getAcroFields();
+        BaseFont bf = BaseFont.createFont("STSong-Light", "UniGB-UCS2-H", BaseFont.NOT_EMBEDDED);
+        acroFields.addSubstitutionFont(bf);
+        HashMap<String, Object> data = new HashMap<>();
+        Long cusSex = customer.getCusSex();
+        String tjtype;
+        if (cusSex == 0) {
+            sex = "鐢�";
+        } else {
+            sex = "濂�";
+        }
+        HashMap<String, String> hashMap = new HashMap<>();
+        hashMap.put("name", customer.getCusName());
+        if ("1".equals(tjOrder.getTjType())) {
+            tjtype = "鍥㈤槦";
+            hashMap.put("tjtype", tjtype);
+        } else {
+            tjtype = "涓汉";
+            hashMap.put("tjtype", tjtype);
+        }
+        if (dictComp == null) {
+            hashMap.put("work", "鏃�");
+        } else {
+            hashMap.put("work", dictComp.getCnName());
+        }
+        hashMap.put("sex", sex);
+        hashMap.put("tjnumber", tjNumber);
+        hashMap.put("tjdate", DateUtils.parseDateToStr("yyyy/MM/dd", tjOrder.getCreateTime()));
+        hashMap.put("phone", customer.getCusPhone());
+        for (String key : hashMap.keySet()) {
+            acroFields.setFieldProperty(key, "textsize", DEFAULT_FONT_SIZE, null);
+            acroFields.setField(key, hashMap.get(key));
+        }
+        pdfStamper.setFormFlattening(true);
+        pdfStamper.close();
+        reader4.close();
+        // 灏嗕慨鏀瑰悗鐨凱DF鍐呭鍐欏叆
+        byte[] bytes = byteArrayOutputStream4.toByteArray();
 
 
-        /*
-        * 绗簩椤垫鏌ョ姸鎬佷俊鎭� 妫�鏌ョ瀹や笌妫�鏌ラ」鐩�
-        * <span v-if="scope.row.type == '0'">鏈</span>
-        * <span v-if="scope.row.type == '1'">宸叉</span>
-        * <span v-if="scope.row.type == '2'">寮冩</span>
-        * <span v-if="scope.row.type == '3'">寤舵湡</span>
-        * */
-        List<CsProVo> list = tjOrderRemarkService.cSWebGetProByTjNumAndOrderId(tjOrder.getTjNumber(),false);
+        ByteArrayOutputStream finalOutput = new ByteArrayOutputStream();
+        Document mergedDocument = new Document(PageSize.A4);
+        PdfCopy copy = new PdfCopy(mergedDocument, finalOutput);
+        mergedDocument.open();
+
+        reader4 = new PdfReader(new ByteArrayInputStream(bytes));
+        int numberOfPages = reader4.getNumberOfPages();
+        for (int i = 1; i <= numberOfPages; i++) {
+            copy.addPage(copy.getImportedPage(reader4, i));
+        }
+
+        PdfReader reader2 = new PdfReader(byteArrayOutputStream2.toByteArray());
+        int numberOfPages2 = reader2.getNumberOfPages();
+        for (int i = 1; i <= numberOfPages2; i++) {
+            PdfImportedPage page = copy.getImportedPage(reader2, i);
+            copy.addPage(page);
+        }
+        reader2.close();
+
+        PdfReader reader1 = new PdfReader(byteArrayOutputStream.toByteArray());
+        int numberOfPages1 = reader1.getNumberOfPages();
+        for (int i = 1; i <= numberOfPages1; i++) {
+            PdfImportedPage page = copy.getImportedPage(reader1, i);
+            copy.addPage(page);
+        }
+        reader1.close();
+        mergedDocument.close();
+
+        String outputFileName1 = customer.getCusId() + tjOrder.getTjNumber() + customer.getCusName() + "_鎶ュ憡.pdf";
+        savePDFFile(outputFileName1, tjOrder, customer, finalOutput);
+        return AjaxResult.success();
+    }*/
+
+    public AjaxResult hisPDFNew2(TjOrder tjOrder, TjCustomer customer, TjReportTemplate tjReportTemplate, TjReportTemplate zongJianYiShiQianMing) throws Exception {
+        String s1 = sysConfigService.selectConfigByKey("tjreport_font_size_second_page_info");
+        String s2 = sysConfigService.selectConfigByKey("tjreport_font_size_second_page_title");
+        String s3 = sysConfigService.selectConfigByKey("tjreport_font_size_result_title");
+        String s4 = sysConfigService.selectConfigByKey("tjreport_font_size_zongjian");
+//        String hospName = sysDeptController.getdangqiandengluyuanqu().get("msg").toString();
+        if (StrUtil.isNotBlank(s1) && Integer.parseInt(s1) > 10) DEFAULT_FONT_SIZE = Integer.parseInt(s1);
+        else DEFAULT_FONT_SIZE = 10;
+        if (StrUtil.isNotBlank(s2) && Integer.parseInt(s2) > 10) DEFAULT_LITTLE_TITLE_FONT_SIZE = Integer.parseInt(s2);
+        else DEFAULT_LITTLE_TITLE_FONT_SIZE = 10;
+        if (StrUtil.isNotBlank(s3) && Integer.parseInt(s3) > 10) DEFAULT_TITLE_FONT_SIZE = Integer.parseInt(s3);
+        else DEFAULT_TITLE_FONT_SIZE = 10;
+        if (StrUtil.isNotBlank(s4) && Integer.parseInt(s4) > 10) DEFAULT_ZONGJIAN_FONT_SIZE = Integer.parseInt(s4);
+        else DEFAULT_ZONGJIAN_FONT_SIZE = 10;
+        pdfPage = 0;
+        DictHosp dictHosp = dictHospService.list().get(0);
+        HOSP_NAME = dictHosp.getHospName();
+        String color = sysConfigService.selectConfigByKey("report_title_color");
+        List<SysDictData> sysUserSex = sysDictDataService.list(new LambdaQueryWrapper<SysDictData>().eq(SysDictData::getDictType, "sys_user_sex"));
+        // 妫�楠屾暟鎹�
+        HashMap<String, Object> map = makeHisJianYan(tjOrder, customer);
+        String sex = "";
+        if (customer.getCusSex() != null) {
+            for (SysDictData userSex : sysUserSex) {
+                if (userSex.getDictValue().equals(String.valueOf(customer.getCusSex()))) {
+                    sex = userSex.getDictLabel();
+                }
+            }
+        }
+        if (StrUtil.isBlank(sex)) sex = "鏈煡";
 
 
+        // 鐢熸垚 document2 骞跺皢鍏跺唴瀹逛繚瀛樺埌 byteArrayOutputStream2 涓�
+        ByteArrayOutputStream byteArrayOutputStream2 = new ByteArrayOutputStream();
+        Document document2 = new Document(PageSize.A4);
+        PdfWriter writer2 = PdfWriter.getInstance(document2, byteArrayOutputStream2);
+
+        writer2.setPageEvent(new FooterHeaderPageEvent(dictHosp.getHospName(), customer.getCusName(), tjOrder.getTjNumber(), sex, String.valueOf(DateUtil.ageOfNow(customer.getCusBrithday())), 0));
+
+        document2.setMargins(50, 70, 40, 50);
+        document2.open();
+
+        List<CsProVo> list = tjOrderRemarkService.cSWebGetProByTjNumAndOrderId(tjOrder.getTjNumber(), false);
+
+        Font defaultFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
+        Font defaultTitleFont = PdfUtils.setFont(DEFAULT_LITTLE_TITLE_FONT_SIZE);
+        defaultTitleFont.setStyle(Font.BOLD);
+        Paragraph paragraph = PdfUtils.setParagraph(defaultTitleFont, "妫�鏌ョ瀹や笌妫�鏌ラ」鐩�");
+        document2.add(paragraph);
+
+        PdfPTable table = new PdfPTable(new float[]{80, 100, 80, 80});
+        table.setTotalWidth(PageSize.A4.getWidth() - 100);
+        table.setLockedWidth(true);
+        table.setHorizontalAlignment(Element.ALIGN_LEFT);
+        String[] titles = {"绉戝", "浣撴椤圭洰", "妫�鏌ョ姸鎬�", "妫�鏌ユ椂闂�"};
+
+        for (String head : titles) {
+            table.addCell(PdfUtils.createCell(head, defaultFont, Rectangle.BOX, Element.ALIGN_CENTER, 5f, 5f));
+        }
+//        Map<String, List<CsProVo>> listMap = list.stream()
+//                .collect(Collectors.groupingBy(i -> i.getDeptId() + "_" + i.getDeptName()));
+        Map<String, List<CsProVo>> listMap = list.stream()
+                .collect(Collectors.groupingBy(
+                        i -> i.getDeptId() + "_" + i.getDeptName(),
+                        TreeMap::new, // 鎸夐敭鎺掑簭
+                        Collectors.mapping(
+                                i -> i,
+                                Collectors.collectingAndThen(
+                                        Collectors.toList(),
+                                        l -> l.stream()
+                                                .sorted(Comparator.comparing(CsProVo::getDeptId)) // 瀵� List 鎺掑簭
+                                                .collect(Collectors.toList())
+                                )
+                        )
+                ));
+
+//        List<CsProVo> sortedList = list.stream()
+//                .sorted(Comparator.comparingLong(CsProVo::getProId))
+//                .collect(Collectors.toList());
+        for (Map.Entry<String, List<CsProVo>> entry : listMap.entrySet()) {
+            String dept = entry.getKey().split("_")[1];
+            List<CsProVo> proVos = entry.getValue();
+            proVos = proVos.stream()
+                    .sorted(Comparator.comparingLong(CsProVo::getProId))
+                    .collect(Collectors.toList());
+            PdfPCell deptCell = new PdfPCell();
+            deptCell.setVerticalAlignment(Element.ALIGN_MIDDLE);
+            deptCell.setHorizontalAlignment(Element.ALIGN_CENTER);
+            deptCell.setPhrase(new Phrase(dept, defaultFont));
+            deptCell.setPaddingTop(5f);
+            deptCell.setPaddingBottom(5f);
+            if (proVos.size() > 1)
+                deptCell.setRowspan(proVos.size());
+            table.addCell(deptCell);
+            proVos.forEach(proVo -> {
+                table.addCell(PdfUtils.createCell(proVo.getProName(), defaultFont, Rectangle.BOX, Element.ALIGN_CENTER, 5f, 5f));
+                String tjType = "";
+                switch (proVo.getType()) {
+                    case 0:
+                        tjType = "鏈";
+                        break;
+                    case 1:
+                        tjType = "宸叉";
+                        break;
+                    case 2:
+                        tjType = "寮冩";
+                        break;
+                    case 3:
+                        tjType = "寤舵湡";
+                        break;
+                }
+                table.addCell(PdfUtils.createCell(tjType, defaultFont, Rectangle.BOX, Element.ALIGN_CENTER, 5f, 5f));
+                String tjTime = "";
+                if (proVo.getQdcreateTime() != null) {
+                    tjTime = new SimpleDateFormat("yyyy-MM-dd").format(proVo.getQdcreateTime());
+                }
+                table.addCell(PdfUtils.createCell(tjTime, defaultFont, Rectangle.BOX, Element.ALIGN_CENTER, 5f, 5f));
+            });
+        }
+        document2.add(table);
+
+        for (int i = 0; i < 2; i++) {
+            paragraph = PdfUtils.setParagraph(defaultFont, "");
+            document2.add(paragraph);
+        }
 
 
+        //        List<TjOrderRemark> remarks = tjOrderRemarkMapper.getzongjianyishengchakanyichangxiangmu3( tjOrder.getTjNumber());
+        List<TjOrderDetail> orderDetails = tjOrderDetailMapper.getzongjianyishengchakanyichangxiangmu4(tjOrder.getTjNumber());
+//        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));
+        LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
+        wq.eq(TjOrderYcxm::getTjh, tjOrder.getTjNumber());
+        List<TjOrderYcxm> ycxms = ycxmService.list(wq);
+        if (null != ycxms && !ycxms.isEmpty()) {
+
+            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;
+                    }
+                    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++;
+
+                        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++;
+                }
+            }
+        }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 = 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++;
+                        }
+                    }
+                }
+            }
+        }
+
+        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);
+        xmXh = 0;
+//        LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
+//        wq.eq(TjOrderYcxm::getTjh, tjOrder.getTjNumber());
+//        List<TjOrderYcxm> ycxms = ycxmService.list(wq);
+        if (null != ycxms && !ycxms.isEmpty()) {
+
+            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());
+                    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;
+                        }
+                        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++;
+
+                            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<>();
+
+                            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 = "     ";
+                                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, 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 {
+            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, "");
+            document2.add(paragraph);
+        }
+        paragraph = PdfUtils.setParagraph(defaultTitleFont, "鎬绘鍖荤敓寤鸿锛�");
+        document2.add(paragraph);
+        if (tjOrder.getCheckAdvice() == null) {
+            paragraph = PdfUtils.setParagraph(defaultFont, "鏃�");
+            document2.add(paragraph);
+        } else {
+            Paragraph paragraphs = new Paragraph(tjOrder.getCheckAdvice(), defaultFont);
+            //璁剧疆鏂囧瓧灞呬腑
+            paragraphs.setAlignment(Element.ALIGN_LEFT);
+            //琛岄棿璺�
+//            paragraphs.setLeading(5f);
+            //璁剧疆娈佃惤涓婄┖鐧�
+            paragraphs.setSpacingBefore(10f);
+            //璁剧疆娈佃惤涓嬬┖鐧�
+            paragraphs.setSpacingAfter(10f);
+//            paragraph = PdfUtils.setParagraph(defaultFont, tjOrder.getCheckAdvice());
+            document2.add(paragraphs);
+        }
+
+
+        Paragraph paragraphNone = new Paragraph("", defaultFont);
+        paragraphNone.setAlignment(Element.ALIGN_LEFT);
+        //琛岄棿璺�
+        paragraphNone.setLeading(5f);
+        paragraphNone.setSpacingBefore(10f);
+        paragraphNone.setSpacingAfter(10f);
+        document2.add(paragraphNone);
+        paragraphNone = new Paragraph("", defaultFont);
+        paragraphNone.setAlignment(Element.ALIGN_LEFT);
+        //琛岄棿璺�
+        paragraphNone.setLeading(5f);
+        paragraphNone.setSpacingBefore(10f);
+        paragraphNone.setSpacingAfter(10f);
+        document2.add(paragraphNone);
+
+
+        PdfPTable tableQz = new PdfPTable(new float[]{100f, 100f, 50f});
+        tableQz.setTotalWidth(PageSize.A4.getWidth() - 100);
+        tableQz.setLockedWidth(true);
+        tableQz.setHorizontalAlignment(Element.ALIGN_LEFT);
+        tableQz.getDefaultCell().setBorder(0);
+        tableQz.getDefaultCell().setHorizontalAlignment(Element.ALIGN_RIGHT);
+
+        Font zongJianFont = PdfUtils.setFont(DEFAULT_ZONGJIAN_FONT_SIZE);
+        Font zongJianTitleFont = PdfUtils.setFont(DEFAULT_ZONGJIAN_FONT_SIZE);
+        zongJianTitleFont.setStyle(Font.BOLD);
+
+        for (int i = 0; i < 3; i++) {
+            PdfPCell cell = new PdfPCell();
+            cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
+            cell.setHorizontalAlignment(Element.ALIGN_RIGHT);
+            cell.setPhrase(new Phrase("", defaultFont));
+            cell.setBorder(Rectangle.NO_BORDER);
+            tableQz.addCell(cell);
+        }
+
+
+        PdfPCell cell = new PdfPCell();
+        cell.setBorder(Rectangle.NO_BORDER);
+        cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
+        cell.setHorizontalAlignment(Element.ALIGN_RIGHT);
+        cell.setPhrase(new Phrase("", defaultFont));
+        cell.setRowspan(3);
+        tableQz.addCell(cell);
+
+        cell = new PdfPCell();
+        cell.setBorder(Rectangle.NO_BORDER);
+        cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
+        cell.setHorizontalAlignment(Element.ALIGN_RIGHT);
+        cell.setPaddingTop(10);
+        cell.setPaddingBottom(10);
+        cell.setPhrase(new Phrase("浣撴鍗曚綅鐩栫珷:", zongJianTitleFont));
+
+        tableQz.addCell(cell);
+
+        File file = new File(value + File.separator + "yinzhang.png");
+        cell = new PdfPCell();
+        cell.setBorder(Rectangle.NO_BORDER);
+        cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
+        cell.setHorizontalAlignment(Element.ALIGN_RIGHT);
+        cell.setPaddingTop(10);
+        cell.setPaddingBottom(10);
+        if (!file.exists()) {
+            cell.setPhrase(new Phrase("", zongJianFont));
+        }else {
+            FileInputStream fileInputStream = new FileInputStream(file);
+            byte[] fileBytes = new byte[(int) file.length()];
+            fileInputStream.read(fileBytes);
+            fileInputStream.close();
+            Image image = Image.getInstance(Base64.getDecoder().decode(Base64.getEncoder().encodeToString(fileBytes)));
+            image.scaleToFit(90, 90);
+            cell.addElement(image);
+        }
+        tableQz.addCell(cell);
+
+        cell = new PdfPCell();
+        cell.setBorder(Rectangle.NO_BORDER);
+        cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
+        cell.setHorizontalAlignment(Element.ALIGN_RIGHT);
+        cell.setPaddingTop(10);
+        cell.setPaddingBottom(10);
+        cell.setPhrase(new Phrase("鎬绘鍖诲笀:", zongJianTitleFont));
+        tableQz.addCell(cell);
+
+
+        cell = new PdfPCell();
+        cell.setBorder(Rectangle.NO_BORDER);
+        cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
+        cell.setHorizontalAlignment(Element.ALIGN_CENTER);
+        cell.setPaddingTop(10);
+        cell.setPaddingBottom(10);
+        String zongjianysname = sysConfigService.selectConfigByKey("pdf_report_zongjianysname");
+        if (zongJianYiShiQianMing == null && StrUtil.isNotBlank(zongjianysname) && !zongjianysname.equals("鏃�")) {
+            cell.setPhrase(new Phrase(zongjianysname, zongJianFont));
+            tableQz.addCell(cell);
+        } else if (zongJianYiShiQianMing == null && zongjianysname.equals("鏃�")) {
+            String nickName = SecurityUtils.getLoginUser().getUser().getNickName();
+            cell.setPhrase(new Phrase(nickName, zongJianFont));
+            tableQz.addCell(cell);
+        } else {
+            byte[] bytes = Base64.getDecoder().decode(zongJianYiShiQianMing.getTemplate());
+            Image image = Image.getInstance(bytes);
+            image.scaleToFit(100, 100);
+            cell.addElement(image);
+            tableQz.addCell(cell);
+        }
+
+        cell = new PdfPCell();
+        cell.setBorder(Rectangle.NO_BORDER);
+        cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
+        cell.setHorizontalAlignment(Element.ALIGN_RIGHT);
+        cell.setPaddingTop(10);
+        cell.setPaddingBottom(10);
+        cell.setPhrase(new Phrase("鎬绘鏃ユ湡:", zongJianTitleFont));
+        tableQz.addCell(cell);
+
+        cell = new PdfPCell();
+        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(new SimpleDateFormat("yyyy-MM-dd").format(tjOrder.getCheckTime()), zongJianFont));
+        tableQz.addCell(cell);
+
+        document2.add(tableQz);
+
+        document2.close();
+
+
+        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+        Document document = new Document(PageSize.A4);
+        PdfWriter pdfWriter = null;
+//        int pageSize = 0;
+//        try {
+        pdfWriter = PdfWriter.getInstance(document, byteArrayOutputStream);
+        pdfWriter.setPageEvent(new FooterHeaderPageEvent(dictHosp.getHospName(), customer.getCusName(), tjOrder.getTjNumber(), sex, String.valueOf(DateUtil.ageOfNow(customer.getCusBrithday())), null));
+//            pageSize = pdfWriter.getPageNumber();
+//        } catch (DocumentException e) {
+//            log.error(String.valueOf(e));
+//            return AjaxResult.error();
+//        }
+        // 鍚庨潰椤电爜鏁伴噺
+        int dataPageNumer = pdfWriter.getPageNumber();
+        document.setMargins(70, 70, 40, 40);
+        document.open();
+
+        Map<TjOrderRemark, List<TjPdfVO>> printReport = new HashMap<>();
+        notHuaYanData(tjOrder.getTjNumber(), printReport, tjOrder, customer);
+        try {
+            notHuaYanTable(document, printReport, dictHosp, color, false);
+        } catch (DocumentException e) {
+            log.error("闈炲寲楠岄」鐩~鍏呰〃鏍煎紓甯�");
+            log.error(String.valueOf(e));
+            return AjaxResult.error();
+        }
+        PdfReader reader = null;
+        makeHisJianYanTable(document, map, dictHosp, color);
+
+        printReport = new HashMap<>();
+        pacsJianChaData(tjOrder.getTjNumber(), printReport, tjOrder, customer);
+        try {
+            notHuaYanTable(document, printReport, dictHosp, color, true);
+        } catch (DocumentException e) {
+            log.error("pacs椤圭洰濉厖琛ㄦ牸寮傚父");
+            log.error(String.valueOf(e));
+            return AjaxResult.error();
+        }
+        document.close();
+
+
+        // 棣栭〉琛ㄥ崟
+        String tjNumber = tjOrder.getTjNumber();
+        String template = tjReportTemplate.getTemplate();
+
+        LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>();
+        wq2.eq(TjOrderDetail::getOrderId, tjOrder.getOrderId());
+        wq2.isNotNull(TjOrderDetail::getFlowingWaterId);
+        List<TjOrderDetail> detailList = tjOrderDetailService.list(wq2);
+        for (TjOrderDetail tjOrderDetail : detailList) {
+            TjProject tjProject = projectService.selectTjProjectByProId(tjOrderDetail.getProId());
+            tjOrderDetail.setProject(tjProject);
+        }
+        ByteArrayOutputStream byteArrayOutputStream4 = new ByteArrayOutputStream();
+        PdfReader reader4 = null;
+        PdfStamper pdfStamper = null;
+
+        reader4 = new PdfReader(new ByteArrayInputStream(Base64.getDecoder().decode(template)));
+        pdfStamper = new PdfStamper(reader4, byteArrayOutputStream4);
+        AcroFields acroFields = pdfStamper.getAcroFields();
+        BaseFont bf = BaseFont.createFont("STSong-Light", "UniGB-UCS2-H", BaseFont.NOT_EMBEDDED);
+        acroFields.addSubstitutionFont(bf);
+        HashMap<String, Object> data = new HashMap<>();
+        Long cusSex = customer.getCusSex();
+        String tjtype;
+        if (cusSex == 0) {
+            sex = "鐢�";
+        } else {
+            sex = "濂�";
+        }
+        HashMap<String, String> hashMap = new HashMap<>();
+        hashMap.put("name", customer.getCusName());
+        if ("1".equals(tjOrder.getTjType())) {
+            tjtype = "鍥㈤槦";
+            hashMap.put("tjtype", tjtype);
+        } else {
+            tjtype = "涓汉";
+            hashMap.put("tjtype", tjtype);
+        }
+        if (StrUtil.isNotBlank(tjOrder.getFirmName())) {
+            hashMap.put("work", tjOrder.getFirmName());
+        } else {
+//            LambdaQueryWrapper<DictComp> wq111 = new LambdaQueryWrapper<>();
+//            wq111.eq(DictComp::getDrugManufacturerId, tjOrder.getFirmId());
+//            DictComp dictComp = dictCompService.getOne(wq111);
+
+            if (StrUtil.isBlank(tjOrder.getFirmName())) {
+                hashMap.put("work", "鏃�");
+            } else {
+                hashMap.put("work", tjOrder.getFirmName());
+            }
+        }
+        if (StrUtil.isBlank(tjOrder.getFirmDeptName())) {
+            hashMap.put("bumen", "鏃�");
+        } else {
+            hashMap.put("bumen", tjOrder.getFirmDeptName());
+        }
+        hashMap.put("sex", sex);
+        hashMap.put("tjnumber", tjNumber);
+        hashMap.put("tjdate", DateUtils.parseDateToStr("yyyy/MM/dd", tjOrder.getCreateTime()));
+        hashMap.put("phone", customer.getCusPhone());
+        for (String key : hashMap.keySet()) {
+            acroFields.setFieldProperty(key, "textsize", DEFAULT_FONT_SIZE, null);
+            acroFields.setField(key, hashMap.get(key));
+        }
+        pdfStamper.setFormFlattening(true);
+        pdfStamper.close();
+        reader4.close();
+        // 灏嗕慨鏀瑰悗鐨凱DF鍐呭鍐欏叆
+        byte[] bytes = byteArrayOutputStream4.toByteArray();
+
+
+        ByteArrayOutputStream finalOutput = new ByteArrayOutputStream();
+        Document mergedDocument = new Document(PageSize.A4);
+        PdfCopy copy = new PdfCopy(mergedDocument, finalOutput);
+        mergedDocument.open();
+
+        reader4 = new PdfReader(new ByteArrayInputStream(bytes));
+        int numberOfPages = reader4.getNumberOfPages();
+        for (int i = 1; i <= numberOfPages; i++) {
+            copy.addPage(copy.getImportedPage(reader4, i));
+        }
+
+        PdfReader reader2 = new PdfReader(byteArrayOutputStream2.toByteArray());
+        int numberOfPages2 = reader2.getNumberOfPages();
+        for (int i = 1; i <= numberOfPages2; i++) {
+            PdfImportedPage page = copy.getImportedPage(reader2, i);
+            copy.addPage(page);
+        }
+        reader2.close();
+
+        PdfReader reader1 = new PdfReader(byteArrayOutputStream.toByteArray());
+        int numberOfPages1 = reader1.getNumberOfPages();
+        for (int i = 1; i <= numberOfPages1; i++) {
+            PdfImportedPage page = copy.getImportedPage(reader1, i);
+            copy.addPage(page);
+        }
+        reader1.close();
+        mergedDocument.close();
+
+        String outputFileName1 = customer.getCusId() + tjOrder.getTjNumber() + customer.getCusName() + "_鎶ュ憡.pdf";
+        savePDFFile(outputFileName1, tjOrder, customer, finalOutput);
         return AjaxResult.success();
     }
 
@@ -423,23 +1915,23 @@
 //                    makeYiShiInfoLine(phrase, doctorFonts, bgysqm, bgysbh,"     鎶ュ憡鍖诲笀锛�");
 //                }
 //            }else {
-                builder = new StringBuilder();
-                if (null != sqrxm && StrUtil.isNotBlank(sqrxm)){
-                    builder.append("鐢宠浜猴細").append(sqrxm);
-                }
-                if (null != jcysqm && StrUtil.isNotBlank(jcysqm)){
-                    builder.append("     妫�鏌ュ尰甯堬細").append(jcysqm);
-                }
-                if (null != shysqm && StrUtil.isNotBlank(shysqm)){
-                    builder.append("     瀹℃牳鍖诲笀锛�").append(shysqm);
-                }
-                if (null != bgysqm && StrUtil.isNotBlank(bgysqm)){
-                    builder.append("     鎶ュ憡鍖诲笀锛�").append(bgysqm);
-                }
-                footer = builder.toString().trim();
+            builder = new StringBuilder();
+            if (null != sqrxm && StrUtil.isNotBlank(sqrxm)) {
+                builder.append("鐢宠浜猴細").append(sqrxm);
+            }
+            if (null != jcysqm && StrUtil.isNotBlank(jcysqm)) {
+                builder.append("     妫�鏌ュ尰甯堬細").append(jcysqm);
+            }
+            if (null != shysqm && StrUtil.isNotBlank(shysqm)) {
+                builder.append("     瀹℃牳鍖诲笀锛�").append(shysqm);
+            }
+            if (null != bgysqm && StrUtil.isNotBlank(bgysqm)) {
+                builder.append("     鎶ュ憡鍖诲笀锛�").append(bgysqm);
+            }
+            footer = builder.toString().trim();
 //            }
 //            elements.add(phrase);
-            ByteArrayOutputStream outputStream = makeJcPDFByteArrayStream(xm, xb, nl, jcks, zyh, ch, sjks, jcsb, jch, jcxm, ms, ts, null, footer,elements);
+            ByteArrayOutputStream outputStream = makeJcPDFByteArrayStream(xm, xb, nl, jcks, zyh, ch, sjks, jcsb, jch, jcxm, ms, ts, null, footer, elements);
             if (outputStream == null)
                 throw new Exception();
             jianchas.add(outputStream);
@@ -458,7 +1950,7 @@
 
         TjCustomer customer = tjCustomerService.getById(tjOrder.getUserId());
 
-       List<LtkjExamJcbgd> list=jcbgdService.getJianJcBaoGaoDanByTjh(tjOrder.getCardId());
+        List<LtkjExamJcbgd> list = jcbgdService.getJianJcBaoGaoDanByTjh(tjOrder.getCardId());
 
         List<ByteArrayOutputStream> jianchas = new ArrayList<>();
         Paragraph elements = new Paragraph();
@@ -469,7 +1961,7 @@
 
         for (LtkjExamJcbgd getexamreportinfo : list) {
             String xm = customer.getCusName();
-            String xb = customer.getCusSex()==2 ? "濂�" : "鐢�";
+            String xb = customer.getCusSex() == 2 ? "濂�" : "鐢�";
             String nl = customer.getAge();
             String jcks = "浣撴涓績";
             String sjks = "";
@@ -487,20 +1979,20 @@
             StringBuilder builder;
             String footer;
             builder = new StringBuilder();
-            if (null != sqrxm && StrUtil.isNotBlank(sqrxm)){
+            if (null != sqrxm && StrUtil.isNotBlank(sqrxm)) {
                 builder.append("鐢宠浜猴細").append(sqrxm);
             }
-            if (null != jcysqm && StrUtil.isNotBlank(jcysqm)){
+            if (null != jcysqm && StrUtil.isNotBlank(jcysqm)) {
                 builder.append("     妫�鏌ュ尰甯堬細").append(jcysqm);
             }
-            if (null != shysqm && StrUtil.isNotBlank(shysqm)){
+            if (null != shysqm && StrUtil.isNotBlank(shysqm)) {
                 builder.append("     瀹℃牳鍖诲笀锛�").append(shysqm);
             }
-            if (null != bgysqm && StrUtil.isNotBlank(bgysqm)){
+            if (null != bgysqm && StrUtil.isNotBlank(bgysqm)) {
                 builder.append("     鎶ュ憡鍖诲笀锛�").append(bgysqm);
             }
             footer = builder.toString().trim();
-            ByteArrayOutputStream outputStream = makeJcPDFByteArrayStream(xm, xb, nl, jcks, zyh, ch, sjks, jcsb, jch, jcxm, ms, ts, null, footer,elements);
+            ByteArrayOutputStream outputStream = makeJcPDFByteArrayStream(xm, xb, nl, jcks, zyh, ch, sjks, jcsb, jch, jcxm, ms, ts, null, footer, elements);
             if (outputStream == null)
                 throw new Exception();
             jianchas.add(outputStream);
@@ -510,13 +2002,14 @@
 
     /**
      * 鍖诲笀淇℃伅琛�
+     *
      * @param phrase
      * @param doctorFonts
      * @param sqrxm
      * @param sqrbh
      * @throws BadElementException
      */
-    private void makeYiShiInfoLine(Phrase phrase, Font doctorFonts, String sqrxm, String sqrbh,String title) throws BadElementException {
+    private void makeYiShiInfoLine(Phrase phrase, Font doctorFonts, String sqrxm, String sqrbh, String title) throws BadElementException {
         String qmImg = dictUserInfoMapper.selectQmImgInnerJoinUserByHisDictCode(sqrbh);
 //        String qmImg = dictUserInfoMapper.selectQmImgInnerJoinUserByUserId(sqrbh);
         if (null != qmImg && StrUtil.isNotBlank(qmImg)) {
@@ -525,13 +2018,13 @@
             try {
                 image = Image.getInstance(decode);
                 image.scaleToFit(60, 25);
-                phrase.add(new Chunk(title,doctorFonts));
-                phrase.add(new Chunk(image,0,-10,true));
+                phrase.add(new Chunk(title, doctorFonts));
+                phrase.add(new Chunk(image, 0, -10, true));
             } catch (IOException e) {
-                phrase.add(new Chunk(title+sqrxm, doctorFonts));
+                phrase.add(new Chunk(title + sqrxm, doctorFonts));
             }
-        }else {
-            phrase.add(new Chunk(title+sqrxm, doctorFonts));
+        } else {
+            phrase.add(new Chunk(title + sqrxm, doctorFonts));
         }
     }
 
@@ -576,7 +2069,6 @@
     }
 
 
-
     /**
      * 濉厖妫�楠岃〃鏍兼暟鎹�
      *
@@ -584,9 +2076,9 @@
      * @param map
      * @throws DocumentException
      */
-    private void makeHisJianYanTable(Document document1, HashMap<String, Object> map,DictHosp dictHosp,String colorStr) throws DocumentException {
+    private void makeHisJianYanTable(Document document1, HashMap<String, Object> map, DictHosp dictHosp, String colorStr) throws DocumentException {
         if (!map.isEmpty()) {
-            String[] titles = new String[]{"浣撴椤圭洰", "浣撴缁撴灉","鎻愮ず", "鍗曚綅", "鍙傝�冭寖鍥�"};
+            String[] titles = new String[]{"浣撴椤圭洰", "浣撴缁撴灉", "鎻愮ず", "鍗曚綅", "鍙傝�冭寖鍥�"};
             float[] titlesWidth = new float[]{280, 100, 40, 100, 120};
             for (Map.Entry<String, Object> entry : map.entrySet()) {
                 String titleName = entry.getKey().trim();
@@ -594,9 +2086,9 @@
                 HashSet<String> jyys = (HashSet<String>) entryValue.get("jyys");
                 ArrayList<List<String>> lists = (ArrayList<List<String>>) entryValue.get("data");
                 String shsj = entryValue.get("shsj").toString();
-                addJianYanTable(document1, titleName, titles, titlesWidth, lists,dictHosp,colorStr);
+                addJianYanTable(document1, titleName, titles, titlesWidth, lists, dictHosp, colorStr);
                 if (!jyys.isEmpty()) {
-                    Font doctorFonts = PdfUtils.setFont(11);
+                    Font doctorFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
                     String doctors = "";
                     Paragraph elements = new Paragraph();
                     elements.setLeading(5f);
@@ -604,7 +2096,7 @@
                     elements.setSpacingAfter(10f);
                     elements.setAlignment(Element.ALIGN_RIGHT);
                     Phrase phrase = new Phrase();
-                    phrase.add(new Chunk("妫�鏌ユ棩鏈燂細"+shsj+"         瀹℃牳鍖诲笀锛�",doctorFonts));
+                    phrase.add(new Chunk("妫�鏌ユ棩鏈燂細" + shsj + "         瀹℃牳鍖诲笀锛�", doctorFonts));
                     boolean flag = false;
                     for (String s : jyys) {
                         if (s.contains("|")) {
@@ -617,12 +2109,12 @@
                                 try {
                                     image = Image.getInstance(decode);
                                     image.scaleToFit(60, 25);
-                                    phrase.add(new Chunk(image,0,-10,true));
+                                    phrase.add(new Chunk(image, 0, -10, true));
                                 } catch (IOException e) {
-                                    phrase.add(new Chunk(split[0].trim(),doctorFonts));
+                                    phrase.add(new Chunk(split[0].trim(), doctorFonts));
                                 }
                             } else {
-                                phrase.add(new Chunk(split[0].trim(),doctorFonts));
+                                phrase.add(new Chunk(split[0].trim(), doctorFonts));
                             }
                         } else {
                             doctors += s.trim() + "銆�";
@@ -630,7 +2122,7 @@
                     }
                     if (!flag) {
                         String substring = doctors.substring(0, doctors.length() - 1).trim();
-                        Paragraph df = PdfUtils.setParagraph(doctorFonts, "妫�鏌ユ棩鏈燂細"+shsj+"         瀹℃牳鍖诲笀锛�" + substring);
+                        Paragraph df = PdfUtils.setParagraph(doctorFonts, "妫�鏌ユ棩鏈燂細" + shsj + "         瀹℃牳鍖诲笀锛�" + substring);
                         df.setAlignment(Element.ALIGN_RIGHT);
                         document1.add(df);
                     } else {
@@ -639,7 +2131,8 @@
                     }
                 }
                 //鍒嗗壊绾�
-                if (!dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")) {
+//                if (!dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")) {
+                if (!true) {
                     LineSeparator objectName = new LineSeparator();
                     objectName.setOffset(-5);
                     document1.add(objectName);
@@ -655,25 +2148,29 @@
      * @param printReport
      * @throws DocumentException
      */
-    private void notHuaYanTable(Document document1, Map<TjOrderRemark, List<TjPdfVO>> printReport,DictHosp dictHosp,String colorStr) throws DocumentException {
+    private void notHuaYanTable(Document document1, Map<TjOrderRemark, List<TjPdfVO>> printReport, DictHosp dictHosp, String colorStr, boolean isPacs) throws DocumentException {
         for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : printReport.entrySet()) {
             LambdaQueryWrapper<TjProject> wqqq = new LambdaQueryWrapper<>();
             wqqq.eq(TjProject::getProId, entry.getKey().getProId());
             TjProject one11 = projectService.getOne(wqqq);
-            if (entry.getValue().isEmpty()) continue;
+            if (entry.getValue() == null || entry.getValue().isEmpty()) continue;
             //鍒ゆ柇璇ラ」鐩槸鍚﹂渶瑕佹墦鍗版姤鍛�
             if (null != one11 && "Y".equals(one11.getNeedReport())) {
                 TjOrderRemark orderRemark = entry.getKey();
                 List<TjPdfVO> value = entry.getValue();
+                if (StrUtil.isBlank(value.get(0).getProResult()) && (StrUtil.isBlank(value.get(0).getTs()) && StrUtil.isBlank(value.get(0).getSj()))) {
+                    continue;
+                }
                 String titleName = null;
-                if (null != one11 && "1".equals(one11.getResultType())) {
+                if ("1".equals(one11.getResultType())) {
                     titleName = one11.getProName();
                     // 璁剧疆鏍囬瀛椾綋鏍峰紡
                     Font titleFonts = PdfUtils.setFont(9);
                     Paragraph paragraph = PdfUtils.setParagraph(titleFonts, titleName);
 
-                    if (dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")) {
-                        Font titleFont = PdfUtils.setFont(11);
+//                    if (dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")) {
+                    if (true) {
+                        Font titleFont = PdfUtils.setFont(DEFAULT_TITLE_FONT_SIZE);
                         titleFont.setStyle(Font.BOLD);
                         PdfPCell cellTitle = new PdfPCell(PdfUtils.setParagraph(titleFont, titleName));
                         cellTitle.setBorder(Rectangle.NO_BORDER);
@@ -685,7 +2182,7 @@
                         tableTitle.addCell(cellTitle);
                         // 灏嗚〃鏍兼坊鍔犲埌鏂囨。涓�
                         document1.add(tableTitle);
-                    }else {
+                    } else {
                         document1.add(paragraph);
                     }
 
@@ -696,95 +2193,183 @@
 //                    PdfPTable table = PdfUtils.setTable2(headFont, textFont, titles, value,dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌"));
 //                    document1.add(table);
 
-                    if (dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌") && !value.isEmpty()){
-                        if (value.size()>1){
-                            String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉", "鍗曚綅"};
-                            Font headFont = PdfUtils.setFont(9);
-                            Font textFont = PdfUtils.setFont(9);
-                            PdfPTable table = PdfUtils.setTable2(headFont, textFont, titles, value,dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌"));
-                            document1.add(table);
-                        }else {
-                            Font remarkFonts = PdfUtils.setFont(9);
-                            Paragraph pp = PdfUtils.setParagraph(remarkFonts, "妫�鏌ユ墍瑙侊細");
-                            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);
+//                    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);
+                                }
+                            } else {
+                                String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉", "鍗曚綅"};
+                                Font headFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
+                                Font textFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
+                                PdfPTable table = PdfUtils.setTable2(headFont, textFont, titles, value, isPacs, new float[]{240, 240, 240});
+                                document1.add(table);
+                            }
+                        } else {
+                            Font remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
+
+                            if (isPacs) {
+                                Paragraph pp = PdfUtils.setParagraph(remarkFonts, "妫�鏌ユ墍瑙侊細");
+                                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);
+                            } 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);
+                                    }
+                                } else {
+                                    String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉"};
+                                    Font headFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
+                                    Font textFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
+                                    PdfPTable table = PdfUtils.setTable2(headFont, textFont, titles, value, false, new float[]{240, 300});
+                                    document1.add(table);
+                                }
+                            }
                         }
-                    }else {
+                    } else {
                         String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉", "鍗曚綅"};
-                        Font headFont = PdfUtils.setFont(9);
-                        Font textFont = PdfUtils.setFont(9);
-                        PdfPTable table = PdfUtils.setTable2(headFont, textFont, titles, value,dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌"));
+                        Font headFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
+                        Font textFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
+                        PdfPTable table = PdfUtils.setTable2(headFont, textFont, titles, value, isPacs, new float[]{240, 240, 240});
                         document1.add(table);
                     }
                     //鍒ゆ柇澶囨敞鏄惁涓虹┖  绌轰笉鑳芥樉绀簄ull
                     if (entry.getKey().getRemark() == null) {
                         entry.getKey().setRemark("");
                     }
-                    if (!dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")){
+//                    if (!dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")){
+                    if (false) {
                         String remark = "澶囨敞锛�" + entry.getKey().getRemark();
                         if (entry.getKey().getRemark().length() > 50) {
                             int j = 0;
                             for (int i = 0; i < remark.length() / 50; i++) {
                                 String substring = remark.substring(j, j + 50);
-                                Font remarkFonts = PdfUtils.setFont(9);
+                                Font remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
                                 Paragraph pp = PdfUtils.setParagraph(remarkFonts, substring);
                                 document1.add(pp);
                                 j = j + 50;
                             }
                             if (remark.length() % 50 != 0) {
                                 String substring = remark.substring((remark.length() / 50) * 50, remark.length() - 1);
-                                Font remarkFonts = PdfUtils.setFont(9);
+                                Font remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
                                 Paragraph pp = PdfUtils.setParagraph(remarkFonts, substring);
                                 document1.add(pp);
                             }
                         } else {
-                            Font remarkFonts = PdfUtils.setFont(9);
+                            Font remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
                             Paragraph pp = PdfUtils.setParagraph(remarkFonts, remark);
                             document1.add(pp);
                         }
                     }
                     //鍒ゆ柇涓绘鍖诲笀鏄惁涓虹┖  绌轰笉鑳芥樉绀簄ull
-                    zhuJianYiShi(document1, entry,orderRemark.getCreateTime(),dictHosp);
+                    zhuJianYiShi(document1, entry, orderRemark.getCreateTime(), dictHosp);
                     //鍒嗗壊绾�
-                    if (!dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")) {
+//                    if (!dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")) {
+                    if (false) {
                         LineSeparator objectName = new LineSeparator();
                         document1.add(objectName);
                     }
                 } else {
-                    if (null != one11) {
-                        titleName = one11.getProName();
-                    } else {
-                        titleName = entry.getKey().getProName();
-                    }
+                    if (entry.getValue().get(0).getProName().contains(";"))
+                        titleName = entry.getValue().get(0).getProName();
+                    else titleName = one11.getProName();
                     // 璁剧疆鏍囬瀛椾綋鏍峰紡
-                    Font titleFonts = PdfUtils.setFont(9);
+                    Font titleFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
                     Paragraph paragraph = PdfUtils.setParagraph(titleFonts, titleName);
 
-                    if (dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")) {
-                        Font titleFont = PdfUtils.setFont(11);
-                        titleFont.setStyle(Font.BOLD);
-                        PdfPCell cellTitle = new PdfPCell(PdfUtils.setParagraph(titleFont, titleName));
-                        cellTitle.setBorder(Rectangle.NO_BORDER);
-                        Color color = Color.decode("#B4CDCD");
-                        cellTitle.setBackgroundColor(new BaseColor(color.getRed(), color.getGreen(), color.getBlue())); // 璁剧疆鑳屾櫙棰滆壊锛堝崄鍏繘鍒� RGB锛�
-                        // 鍒涘缓琛ㄦ牸骞舵坊鍔犲崟鍏冩牸
-                        PdfPTable tableTitle = new PdfPTable(1);
-                        tableTitle.setWidthPercentage(100);
-                        tableTitle.addCell(cellTitle);
-                        // 灏嗚〃鏍兼坊鍔犲埌鏂囨。涓�
-                        document1.add(tableTitle);
-                    }else {
-                        document1.add(paragraph);
+//                    if (dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")) {
+                    if (StrUtil.isBlank(value.get(0).getProResult()) && (StrUtil.isBlank(value.get(0).getTs()) && StrUtil.isBlank(value.get(0).getSj()))) {
+                        continue;
                     }
+                    Font titleFont = PdfUtils.setFont(DEFAULT_TITLE_FONT_SIZE);
+                    titleFont.setStyle(Font.BOLD);
+                    PdfPCell cellTitle = new PdfPCell(PdfUtils.setParagraph(titleFont, titleName));
+                    cellTitle.setBorder(Rectangle.NO_BORDER);
+                    Color color = Color.decode("#B4CDCD");
+                    cellTitle.setBackgroundColor(new BaseColor(color.getRed(), color.getGreen(), color.getBlue())); // 璁剧疆鑳屾櫙棰滆壊锛堝崄鍏繘鍒� RGB锛�
+                    // 鍒涘缓琛ㄦ牸骞舵坊鍔犲崟鍏冩牸
+                    PdfPTable tableTitle = new PdfPTable(1);
+                    tableTitle.setWidthPercentage(100);
+                    tableTitle.addCell(cellTitle);
+                    // 灏嗚〃鏍兼坊鍔犲埌鏂囨。涓�
+                    document1.add(tableTitle);
 
 //                    String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉", "鍗曚綅"};
 //                    Font headFont = PdfUtils.setFont(9);
@@ -792,34 +2377,123 @@
 //                    PdfPTable table = PdfUtils.setTable(headFont, textFont, titles, value,dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌"));
 //                    document1.add(table);
 
-                    if (dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌") && !value.isEmpty()){
-                        System.out.println("value = " + value);
-                        if (value.size()>1){
-                            String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉", "鍗曚綅"};
-                            Font headFont = PdfUtils.setFont(9);
-                            Font textFont = PdfUtils.setFont(9);
-                            PdfPTable table = PdfUtils.setTable2(headFont, textFont, titles, value,dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌"));
-                            document1.add(table);
-                        }else {
-                            Font remarkFonts = PdfUtils.setFont(9);
-                            Paragraph pp = PdfUtils.setParagraph(remarkFonts, "妫�鏌ユ墍瑙侊細");
-                            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);
+//                    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);
+                                }
+                            } else {
+                                String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉", "鍗曚綅"};
+                                Font headFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
+                                Font textFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
+                                PdfPTable table = PdfUtils.setTable2(headFont, textFont, titles, value, isPacs, new float[]{240, 240, 240});
+                                document1.add(table);
+                            }
+
+                        } else {
+                            Font remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
+
+                            if (isPacs) {
+                                Paragraph 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);
+                                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);
+                            } 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);
+                                    }
+                                } else {
+                                    String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉"};
+                                    Font headFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
+                                    Font textFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
+                                    PdfPTable table = PdfUtils.setTable2(headFont, textFont, titles, value, false, new float[]{240, 300});
+                                    document1.add(table);
+                                }
+                            }
+
                         }
-                    }else {
+                    } else {
                         String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉", "鍗曚綅"};
-                        Font headFont = PdfUtils.setFont(9);
-                        Font textFont = PdfUtils.setFont(9);
-                        PdfPTable table = PdfUtils.setTable(headFont, textFont, titles, value,dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌"));
+                        Font headFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
+                        Font textFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
+                        PdfPTable table = PdfUtils.setTable(headFont, textFont, titles, value, isPacs);
                         document1.add(table);
                     }
 
@@ -828,32 +2502,34 @@
                     if (entry.getKey().getRemark() == null) {
                         entry.getKey().setRemark("");
                     }
-                    if (!dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")){
+//                    if (!dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")){
+                    if (!true) {
                         String remark = "澶囨敞锛�" + entry.getKey().getRemark();
                         if (entry.getKey().getRemark().length() > 50) {
                             int j = 0;
                             for (int i = 0; i < remark.length() / 50; i++) {
                                 String substring = remark.substring(j, j + 50);
-                                Font remarkFonts = PdfUtils.setFont(9);
+                                Font remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
                                 Paragraph pp = PdfUtils.setParagraph(remarkFonts, substring);
                                 document1.add(pp);
                                 j = j + 50;
                             }
                             if (remark.length() % 50 != 0) {
                                 String substring = remark.substring((remark.length() / 50) * 50, remark.length() - 1);
-                                Font remarkFonts = PdfUtils.setFont(9);
+                                Font remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
                                 Paragraph pp = PdfUtils.setParagraph(remarkFonts, substring);
                                 document1.add(pp);
                             }
                         } else {
-                            Font remarkFonts = PdfUtils.setFont(9);
+                            Font remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
                             Paragraph pp = PdfUtils.setParagraph(remarkFonts, remark);
                             document1.add(pp);
                         }
                     }
                     //鍒ゆ柇涓绘鍖诲笀鏄惁涓虹┖  绌轰笉鑳芥樉绀簄ull
-                    zhuJianYiShi(document1, entry,orderRemark.getCreateTime(),dictHosp);
-                    if (!dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")) {
+                    zhuJianYiShi(document1, entry, orderRemark.getCreateTime(), dictHosp);
+//                    if (!dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")) {
+                    if (!true) {
                         //鍒嗗壊绾�
                         LineSeparator objectName = new LineSeparator();
                         document1.add(objectName);
@@ -865,22 +2541,25 @@
 
     /**
      * 涓昏鍖诲笀琛屾樉绀鸿缃�
+     *
      * @param document1
      * @param entry
      * @throws DocumentException
      */
-    private void zhuJianYiShi(Document document1, Map.Entry<TjOrderRemark, List<TjPdfVO>> entry,Date createTime,DictHosp dictHosp) throws DocumentException {
-        if ((null != entry.getKey().getDoctorName() && null != userService.getById(entry.getKey().getDoctorName())) || dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌") ) {
+    private void zhuJianYiShi(Document document1, Map.Entry<TjOrderRemark, List<TjPdfVO>> entry, Date createTime, DictHosp dictHosp) throws DocumentException {
+//        if ((null != entry.getKey().getDoctorName() && null != userService.getById(entry.getKey().getDoctorName())) || dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌") ) {
+        if ((null != entry.getKey().getDoctorName() && null != userService.getById(entry.getKey().getDoctorName())) || true) {
             //涓绘鍖诲笀
             String key = sysConfigService.selectConfigByKey("is_report_pdf_use_ysqm");
             SysUser sysUser = userService.getById(entry.getKey().getDoctorName());
             String doctorNameDefault = "鏃�";
-            if (sysUser != null)doctorNameDefault = sysUser.getNickName();
-            if (!entry.getValue().isEmpty() && StrUtil.isNotBlank(entry.getValue().get(0).getShys()) && dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")){
+            if (sysUser != null) doctorNameDefault = sysUser.getNickName();
+//            if (!entry.getValue().isEmpty() && StrUtil.isNotBlank(entry.getValue().get(0).getShys()) && dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")){
+            if (!entry.getValue().isEmpty() && StrUtil.isNotBlank(entry.getValue().get(0).getShys()) && true) {
                 doctorNameDefault = entry.getValue().get(0).getShys();
             }
             Font doctorFonts = PdfUtils.setFont(9);
-            if (key.equals("Y")){
+            if (key.equals("Y")) {
                 String qmImg = dictUserInfoMapper.selectQmImgInnerJoinUserByUserId(String.valueOf(sysUser.getUserId()));
                 if (null != qmImg && StrUtil.isNotBlank(qmImg)) {
                     Paragraph elements = new Paragraph();
@@ -890,8 +2569,8 @@
                     elements.setAlignment(Element.ALIGN_RIGHT);
                     Phrase phrase = new Phrase();
                     if (createTime != null) {
-                        phrase.add(new Chunk("妫�鏌ユ椂闂达細"+new SimpleDateFormat("yyyy-MM-dd").format(createTime)+"             涓绘鍖诲笀锛�", doctorFonts));
-                    }else {
+                        phrase.add(new Chunk("妫�鏌ユ椂闂达細" + new SimpleDateFormat("yyyy-MM-dd").format(createTime) + "             涓绘鍖诲笀锛�", doctorFonts));
+                    } else {
                         phrase.add(new Chunk("涓绘鍖诲笀锛�", doctorFonts));
                     }
                     byte[] decode = Base64.getDecoder().decode(qmImg);
@@ -899,33 +2578,37 @@
                     try {
                         image = Image.getInstance(decode);
                         image.scaleToFit(60, 25);
-                        phrase.add(new Chunk(image,0,-10,true));
+                        phrase.add(new Chunk(image, 0, -10, true));
                         elements.add(phrase);
                         document1.add(elements);
                     } catch (IOException e) {
                         String doctorName = "涓绘鍖诲笀锛�" + doctorNameDefault;
-                        if (createTime != null) doctorName = "妫�鏌ユ椂闂达細"+new SimpleDateFormat("yyyy-MM-dd").format(createTime)+"             涓绘鍖诲笀锛�" + doctorNameDefault;
+                        if (createTime != null)
+                            doctorName = "妫�鏌ユ椂闂达細" + new SimpleDateFormat("yyyy-MM-dd").format(createTime) + "             涓绘鍖诲笀锛�" + doctorNameDefault;
                         Paragraph df = PdfUtils.setParagraph(doctorFonts, doctorName);
                         df.setAlignment(Element.ALIGN_RIGHT);
                         document1.add(df);
                     }
-                }else {
+                } else {
                     String doctorName = "涓绘鍖诲笀锛�" + doctorNameDefault;
-                    if (createTime != null) doctorName = "妫�鏌ユ椂闂达細"+new SimpleDateFormat("yyyy-MM-dd").format(createTime)+"             涓绘鍖诲笀锛�" + doctorNameDefault;
+                    if (createTime != null)
+                        doctorName = "妫�鏌ユ椂闂达細" + new SimpleDateFormat("yyyy-MM-dd").format(createTime) + "             涓绘鍖诲笀锛�" + doctorNameDefault;
                     Paragraph df = PdfUtils.setParagraph(doctorFonts, doctorName);
                     df.setAlignment(Element.ALIGN_RIGHT);
                     document1.add(df);
                 }
-            }else {
+            } else {
                 String doctorName = "涓绘鍖诲笀锛�" + doctorNameDefault;
-                if (createTime != null) doctorName = "妫�鏌ユ椂闂达細"+new SimpleDateFormat("yyyy-MM-dd").format(createTime)+"             涓绘鍖诲笀锛�" + doctorNameDefault;
+                if (createTime != null)
+                    doctorName = "妫�鏌ユ椂闂达細" + new SimpleDateFormat("yyyy-MM-dd").format(createTime) + "             涓绘鍖诲笀锛�" + doctorNameDefault;
                 Paragraph df = PdfUtils.setParagraph(doctorFonts, doctorName);
                 df.setAlignment(Element.ALIGN_RIGHT);
                 document1.add(df);
             }
         } else {
             String doctorName = "涓绘鍖诲笀锛�" + "鏃�";
-            if (createTime != null) doctorName = "妫�鏌ユ椂闂达細"+new SimpleDateFormat("yyyy-MM-dd").format(createTime)+"             涓绘鍖诲笀锛�" + "鏃�";
+            if (createTime != null)
+                doctorName = "妫�鏌ユ椂闂达細" + new SimpleDateFormat("yyyy-MM-dd").format(createTime) + "             涓绘鍖诲笀锛�" + "鏃�";
             Font doctorFonts = PdfUtils.setFont(9);
             Paragraph df = PdfUtils.setParagraph(doctorFonts, doctorName);
             df.setAlignment(Element.ALIGN_RIGHT);
@@ -942,76 +2625,87 @@
             LambdaQueryWrapper<LtkjHybgd> ltkjHybgdLambdaQueryWrapper = new LambdaQueryWrapper<>();
             ltkjHybgdLambdaQueryWrapper.eq(LtkjHybgd::getTmh, hysqd.getTmh());
             List<LtkjHybgd> hybgds = ltkjHybgdService.list(ltkjHybgdLambdaQueryWrapper);
-            // 澶х被椤圭洰鍚嶇О
-            String xmmc = hysqd.getXmmc();
-            ArrayList<List<String>> lists = new ArrayList<>();
-            HashSet<String> hashSet = new HashSet<>();
-            String shsj = "";
-            for (LtkjHybgd hybgd : hybgds) {
-                shsj = hybgd.getShsj();
-                // 妫�鏌ラ」鐩�
-                String jcxm = hybgd.getJcxm() != null ? hybgd.getJcxm().trim() : null;
-                // 妫�楠岀粨鏋�
-                String jyjg = hybgd.getJyjg() != null ? hybgd.getJyjg().trim() : null;
-                // 缁撴灉鍗曚綅
-                String jgdw = hybgd.getJgdw() != null ? hybgd.getJgdw().trim() : null;
-                // 鑼冨洿鍊�
-                String fwz = hybgd.getFwz() != null ? hybgd.getFwz().trim() : null;
-                // 妫�楠屽尰甯�
-//                String jyys = hybgd.getJyys();
-                //瀹℃牳鍖荤敓
-                String shysmc = hybgd.getShysmc() != null ? hybgd.getShysmc().trim() : null;
-                // 瀹℃牳鍖诲笀缂栫爜
-                String shys = hybgd.getShys() != null ? hybgd.getShys().trim() : null;
-                String ycbz = "";
+            if(null !=hybgds && !hybgds.isEmpty()){
+//                hybgds=hybgds.stream().sorted(Comparator.comparing(LtkjHybgd::getJcxm, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
+//                hybgds = hybgds.stream()
+//                        .sorted(Comparator.comparingInt(
+//                                a -> a.getJcxm().length() // 鏍规嵁鍚嶅瓧鐨勯暱搴︽帓搴�
+//                        ))
+//                        .collect(Collectors.toList());
 
-                if (jyjg != null && StrUtil.isNotBlank(jyjg) && fwz != null && StrUtil.isNotBlank(fwz)) {
-                    try {
-                        String[] fwzs = fwz.split("-");
-                        BigDecimal min = new BigDecimal(fwzs[0]);
-                        BigDecimal max = new BigDecimal(fwzs[1]);
-                        BigDecimal jyjgval = new BigDecimal(jyjg);
-                        // 姣旇緝妫�楠岀粨鏋滃拰鑼冨洿鍊�
-                        if (jyjgval.compareTo(min) < 0) {
-                            // jyjg 灏忎簬鑼冨洿鏈�灏忓�硷紝娣诲姞涓嬬澶�
+                // 澶х被椤圭洰鍚嶇О
+                String xmmc = hysqd.getXmmc();
+                ArrayList<List<String>> lists = new ArrayList<>();
+                HashSet<String> hashSet = new HashSet<>();
+                String shsj = "";
+                for (LtkjHybgd hybgd : hybgds) {
+                    shsj = hybgd.getShsj();
+                    // 妫�鏌ラ」鐩�
+                    String jcxm = hybgd.getJcxm() != null ? hybgd.getJcxm().trim() : null;
+                    // 妫�楠岀粨鏋�
+                    String jyjg = hybgd.getJyjg() != null ? hybgd.getJyjg().trim() : null;
+                    // 缁撴灉鍗曚綅
+                    String jgdw = hybgd.getJgdw() != null ? hybgd.getJgdw().trim() : null;
+                    // 鑼冨洿鍊�
+                    String fwz = hybgd.getFwz() != null ? hybgd.getFwz().trim() : null;
+                    // 妫�楠屽尰甯�
+//                String jyys = hybgd.getJyys();
+                    //瀹℃牳鍖荤敓
+                    String shysmc = hybgd.getShysmc() != null ? hybgd.getShysmc().trim() : null;
+                    // 瀹℃牳鍖诲笀缂栫爜
+                    String shys = hybgd.getShys() != null ? hybgd.getShys().trim() : null;
+                    String ycbz = "";
+
+                    if (jyjg != null && StrUtil.isNotBlank(jyjg) && fwz != null && StrUtil.isNotBlank(fwz)) {
+                        try {
+                            String[] fwzs = fwz.split("-");
+                            BigDecimal min = new BigDecimal(fwzs[0]);
+                            BigDecimal max = new BigDecimal(fwzs[1]);
+                            BigDecimal jyjgval = new BigDecimal(jyjg);
+                            // 姣旇緝妫�楠岀粨鏋滃拰鑼冨洿鍊�
+                            if (jyjgval.compareTo(min) < 0) {
+                                // jyjg 灏忎簬鑼冨洿鏈�灏忓�硷紝娣诲姞涓嬬澶�
 //                            jyjg = jyjg + "   鈫�";
-                            ycbz = "鈫�";
-                        } else if (jyjgval.compareTo(max) > 0) {
-                            // jyjg 澶т簬鑼冨洿鏈�澶у�硷紝娣诲姞涓婄澶�
+                                ycbz = "鈫�";
+                            } else if (jyjgval.compareTo(max) > 0) {
+                                // jyjg 澶т簬鑼冨洿鏈�澶у�硷紝娣诲姞涓婄澶�
 //                            jyjg = jyjg + "   鈫�";
-                            ycbz = "鈫�";
+                                ycbz = "鈫�";
+                            }
+                        } catch (Exception ignored) {
                         }
-                    } catch (Exception ignored) {
                     }
-                }
 //                LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
 //                queryWrapper.eq(SysUser::getUserName,jyys);
 //                List<SysUser> sysUsers = userService.list(queryWrapper);
 //                if (!sysUsers.isEmpty())
 //                    hashSet.add(sysUsers.get(0).getNickName());
-                String key = sysConfigService.selectConfigByKey("is_report_pdf_use_ysqm");
-                if (null != shys && null != shysmc && key.equals("Y")) {
-                    hashSet.add(shysmc + "|" + shys);
-                } else {
-                    if (null != shysmc) hashSet.add(shysmc);
+                    String key = sysConfigService.selectConfigByKey("is_report_pdf_use_ysqm");
+                    if (null != shys && null != shysmc && key.equals("Y")) {
+                        hashSet.add(shysmc + "|" + shys);
+                    } else {
+                        if (null != shysmc) hashSet.add(shysmc);
+                    }
+                    ArrayList<String> strings = new ArrayList<>();
+                    strings.add(jcxm);
+                    strings.add(jyjg);
+                    strings.add(ycbz);
+                    strings.add(jgdw);
+                    strings.add(fwz);
+                    strings.add(hybgd.getJcxmid());
+                    strings.add(hysqd.getXmid());
+                    lists.add(strings);
                 }
-                ArrayList<String> strings = new ArrayList<>();
-                strings.add(jcxm);
-                strings.add(jyjg);
-                strings.add(ycbz);
-                strings.add(jgdw);
-                strings.add(fwz);
-                lists.add(strings);
-            }
-            if (!lists.isEmpty()) {
-                HashMap<String, Object> map = new HashMap<>();
-                map.put("data", lists);
-                map.put("jyys", hashSet);
-                if (StrUtil.isNotBlank(shsj)){
-                    shsj = shsj.split(" ")[0];
+                if (!lists.isEmpty()) {
+                    HashMap<String, Object> map = new HashMap<>();
+                    map.put("data", lists);
+                    map.put("jyys", hashSet);
+                    if (StrUtil.isNotBlank(shsj)) {
+                        shsj = shsj.split(" ")[0];
+                    }
+                    map.put("shsj", shsj);
+                    data.put(xmmc, map);
                 }
-                map.put("shsj",shsj);
-                data.put(xmmc, map);
             }
         }
         return data;
@@ -1023,7 +2717,7 @@
      * @param tjOrder
      * @param reportTemplate
      */
-    public HashMap<String, Object> makePDFInfo(TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate,DictHosp dictHosp,HashMap<String, Object> jianYanMap) {
+    public HashMap<String, Object> makePDFInfo(TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate, DictHosp dictHosp, HashMap<String, Object> jianYanMap) {
         String tjNumber = tjOrder.getTjNumber();
         String template = reportTemplate.getTemplate();
         LambdaQueryWrapper<DictComp> wq111 = new LambdaQueryWrapper<>();
@@ -1073,7 +2767,8 @@
             }
             //鎷兼帴閲嶅ぇ闃虫�х粨鏋�
             StringBuffer str = new StringBuffer();
-            if (!dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")) {
+//            if (!dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")) {
+            if (!true) {
                 str.append("銆愰噸澶ч槼鎬ч」鐩�慭n");
                 LambdaQueryWrapper<TjBigPositive> bigPositiveLambdaQueryWrapper = new LambdaQueryWrapper<>();
                 bigPositiveLambdaQueryWrapper.eq(TjBigPositive::getTjNumber, tjNumber);
@@ -1088,7 +2783,8 @@
             }
             //鎷兼帴寮傚父椤圭洰
             str.append("銆愬紓甯告儏鍐甸」鐩�慭n");
-            if (!dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")) {
+//            if (!dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")) {
+            if (!true) {
                 if (list.size() > 0) {
                     for (int i = 0; i < list.size(); i++) {
                         if (list.get(i).getExceptionDesc() == 1) {
@@ -1098,7 +2794,7 @@
                 } else {
                     str.append("    鏃狅紱\n");
                 }
-            }else {
+            } else {
                 int maxProjectLength = 0;
                 for (Map.Entry<String, Object> item : jianYanMap.entrySet()) {
                     HashMap<String, Object> entryValue = (HashMap<String, Object>) item.getValue();
@@ -1136,7 +2832,7 @@
             }
             //寮傚父椤圭洰
             data.put("yichang", str.toString());
-            data.put("zjrq",new SimpleDateFormat("yyyy-MM-dd").format(tjOrder.getCheckTime()));
+            data.put("zjrq", new SimpleDateFormat("yyyy-MM-dd").format(tjOrder.getCheckTime()));
             // 閬嶅巻data 缁檖df琛ㄥ崟琛ㄦ牸璧嬪��
             for (String key : data.keySet()) {
                 acroFields.setField(key, data.get(key).toString());
@@ -1164,7 +2860,7 @@
             map.put("document", document);
             map.put("copy", copy);
             map.put("stream", finalOutPut);
-            map.put("form",pdfStamper);
+            map.put("form", pdfStamper);
             return map;
         } catch (IOException | DocumentException e) {
             e.printStackTrace();
@@ -1202,12 +2898,15 @@
         for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : printReport.entrySet()) {
             List<TjPdfVO> tjPdfVOS = new ArrayList<>();
             List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.getDetailByOrderIdAndParId(one.getOrderId(), entry.getKey().getProId());
+            tjOrderDetails = tjOrderDetails.stream().filter(i -> StrUtil.isNotBlank(i.getProResult())).collect(Collectors.toList());
+            tjOrderDetails = new ArrayList<>(tjOrderDetails.stream()
+                    .collect(Collectors.toMap(TjOrderDetail::getProId, i -> i, (existing, replacement) -> existing)).values());
             for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
-                TjProject tjProject = projectService.getById(tjOrderDetail.getProId());
+                TjProject tjProject = projectService.getById(String.valueOf(tjOrderDetail.getProId()));
                 if (null != tjProject && tjProject.getNeedReport().equals("Y")) {
                     tjOrderDetail.setProject(tjProject);
 
-                    if (tjOrderDetail.getProject().getProParentId().equals(entry.getKey().getProId())) {
+                    if (tjOrderDetail.getProject().getProParentId().equals(entry.getKey().getProId()) && entry.getKey().getType() == 1) {
                         TjPdfVO tjPdfVO = new TjPdfVO();
                         tjPdfVO.setProName(tjOrderDetail.getProject().getProName());
                         tjPdfVO.setProResult(tjOrderDetail.getProResult());
@@ -1218,22 +2917,26 @@
                             tjPdfVO.setCompany("/");
                         }
                         tjPdfVO.setProId(String.valueOf(tjOrderDetail.getProject().getProId()));
-                        LambdaQueryWrapper<LtkjExamJcbgd> wrapper = new LambdaQueryWrapper<>();
-                        wrapper.eq(LtkjExamJcbgd::getTjh,tjNumber);
-                        wrapper.eq(LtkjExamJcbgd::getXmdm,String.valueOf(tjOrderDetail.getProject().getProParentId()));
-//                        LtkjExamJcbgd jcbgd = jcbgdService.getOne(wrapper);
-//                        if (jcbgd != null){
-//                            tjPdfVO.setTs(jcbgd.getYxbx());
-//                            tjPdfVO.setSj(jcbgd.getBgNr());
-//                            tjPdfVO.setShys(jcbgd.getShysxm());
-//                        }
+                        tjPdfVO.setPid(String.valueOf(tjProject.getProParentId()));
+//                        LambdaQueryWrapper<LtkjExamJcbgd> wrapper = new LambdaQueryWrapper<>();
+//                        wrapper.eq(LtkjExamJcbgd::getTjh, tjNumber);
+//                        wrapper.eq(LtkjExamJcbgd::getXmdm, String.valueOf(tjOrderDetail.getProject().getProParentId()));
                         tjPdfVOS.add(tjPdfVO);
                     }
                 }
             }
+            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);
         }
     }
+
     private void pacsJianChaData(String tjNumber, Map<TjOrderRemark, List<TjPdfVO>> printReport, TjOrder one, TjCustomer customer) {
 //        LambdaQueryWrapper<TjOrderRemark> wqq = new LambdaQueryWrapper<>();
 //        wqq.eq(TjOrderRemark::getTjNumber, tjNumber);
@@ -1245,15 +2948,19 @@
         for (TjOrderRemark tjOrderRemark : tjOrderRemarks) {
             printReport.put(tjOrderRemark, null);
         }
+        String ids = "";
         for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : printReport.entrySet()) {
             List<TjPdfVO> tjPdfVOS = new ArrayList<>();
             List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.getDetailByOrderIdAndParId(one.getOrderId(), entry.getKey().getProId());
+            tjOrderDetails = new ArrayList<>(tjOrderDetails.stream().collect(Collectors.toMap(TjOrderDetail::getProId, i -> i, (existing, replacement) -> existing)).values());
             for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
                 TjProject tjProject = projectService.getById(tjOrderDetail.getProId());
                 if (null != tjProject && tjProject.getNeedReport().equals("Y")) {
                     tjOrderDetail.setProject(tjProject);
 
-                    if (tjOrderDetail.getProject().getProParentId().equals(entry.getKey().getProId())) {
+                    if (tjOrderDetail.getProject().getProParentId().equals(entry.getKey().getProId())
+                            && entry.getKey().getType() == 1
+                            && !ids.contains(String.valueOf(tjOrderDetail.getProject().getProParentId()))) {
                         TjPdfVO tjPdfVO = new TjPdfVO();
                         tjPdfVO.setProName(tjOrderDetail.getProject().getProName());
                         tjPdfVO.setProResult(tjOrderDetail.getProResult());
@@ -1265,18 +2972,32 @@
                         }
                         tjPdfVO.setProId(String.valueOf(tjOrderDetail.getProject().getProId()));
                         LambdaQueryWrapper<LtkjExamJcbgd> wrapper = new LambdaQueryWrapper<>();
-                        wrapper.eq(LtkjExamJcbgd::getTjh,tjNumber);
-                        wrapper.eq(LtkjExamJcbgd::getXmdm,String.valueOf(tjOrderDetail.getProject().getProParentId()));
-                        LtkjExamJcbgd jcbgd = jcbgdService.getOne(wrapper);
-                        if (jcbgd != null){
-                            tjPdfVO.setTs(jcbgd.getYxbx());
-                            tjPdfVO.setSj(jcbgd.getBgNr());
-                            tjPdfVO.setShys(jcbgd.getShysxm());
+                        wrapper.eq(LtkjExamJcbgd::getTjh, tjNumber);
+                        wrapper.like(LtkjExamJcbgd::getXmdm, String.valueOf(tjOrderDetail.getProject().getProParentId()));
+                        wrapper.orderByDesc(LtkjExamJcbgd::getZdsj);
+                        List<LtkjExamJcbgd> list = jcbgdService.list(wrapper);
+                        if (null != list && !list.isEmpty()) {
+                            LtkjExamJcbgd jcbgd = list.get(0);
+                            if (jcbgd != null) {
+                                tjPdfVO.setTs(jcbgd.getYxbx());
+                                tjPdfVO.setSj(jcbgd.getBgNr());
+                                tjPdfVO.setShys(jcbgd.getShysxm());
+                                tjPdfVO.setProName(jcbgd.getXmmc());
+                                ids += "|" + jcbgd.getXmdm();
+                            }
                         }
                         tjPdfVOS.add(tjPdfVO);
                     }
                 }
             }
+//            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);
         }
     }
@@ -1402,11 +3123,12 @@
         document.add(table);
     }
 
-    private static void addJianYanTable(Document document, String titleName, String[] titles, float[] titlesWidth, ArrayList<List<String>> lists,DictHosp dictHosp,String colorStr) throws DocumentException {
+    private static void addJianYanTable(Document document, String titleName, String[] titles, float[] titlesWidth, ArrayList<List<String>> lists, DictHosp dictHosp, String colorStr) throws DocumentException {
         // 澶ч」鏍囬
-        Font titleFont = PdfUtils.setFont(10);
-        if (dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")) {
-            titleFont.setSize(11);
+        Font titleFont = PdfUtils.setFont(DEFAULT_TITLE_FONT_SIZE);
+//        if (dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")) {
+        if (true) {
+            titleFont.setSize(DEFAULT_TITLE_FONT_SIZE);
             titleFont.setStyle(Font.BOLD);
         }
         Paragraph paragraph = new Paragraph(titleName, titleFont);
@@ -1417,7 +3139,8 @@
         paragraph.setSpacingBefore(10f);
         // 璁剧疆娈佃惤涓嬬┖鐧�
         paragraph.setSpacingAfter(10f);
-        if (dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")) {
+//        if (dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")) {
+        if (true) {
             // 琛岄棿璺�
             paragraph.setLeading(7f);
             // 璁剧疆娈佃惤涓婄┖鐧�
@@ -1436,12 +3159,12 @@
 
             // 灏嗚〃鏍兼坊鍔犲埌鏂囨。涓�
             document.add(tableTitle);
-        }else {
+        } else {
             document.add(paragraph);
         }
         // 鍒涘缓涓�涓〃鏍煎苟娣诲姞鍒版枃妗�
-        Font headFont = PdfUtils.setFont(10);
-        Font textFont = PdfUtils.setFont(10);
+        Font headFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
+        Font textFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
         PdfPTable table = new PdfPTable(titlesWidth);
         table.setTotalWidth(PageSize.A4.getWidth() - 10); // 璁剧疆琛ㄦ牸鎬诲搴�
         //table.setLockedWidth(true); // 閿佸畾琛ㄦ牸瀹藉害
@@ -1462,28 +3185,33 @@
 
         for (List<String> list : lists) {
             boolean isYc = false;
-            textFont = PdfUtils.setFont(10);
-            if (dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")){
-                if (list.contains("鈫�") || list.contains("鈫�")){
+            textFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
+//            if (dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")){
+            if (true) {
+                if (list.contains("鈫�") || list.contains("鈫�")) {
                     isYc = true;
                 }
             }
+            int index = 1;
             for (String s : list) {
+                // 璺宠繃椤圭洰id
+                if (index == 6) continue;
                 PdfPCell nameCell = new PdfPCell();
                 nameCell.setVerticalAlignment(Element.ALIGN_MIDDLE);
                 nameCell.setHorizontalAlignment(Element.ALIGN_LEFT);
 
                 nameCell.setBorder(Rectangle.NO_BORDER); // 绉婚櫎鍗曞厓鏍艰竟妗�
-                if (isYc){
+                if (isYc) {
                     textFont.setStyle(Font.BOLD);
                     nameCell.setPhrase(new Paragraph(s, textFont));
                     nameCell.setBorder(Rectangle.NO_BORDER);
 //                    Color color = Color.decode("#0033cc");
 //                    nameCell.setBackgroundColor(new BaseColor(color.getRed(), color.getGreen(), color.getBlue())); // 璁剧疆鑳屾櫙棰滆壊锛堝崄鍏繘鍒� RGB锛�
-                }else {
+                } else {
                     nameCell.setPhrase(new Paragraph(s, textFont));
                 }
                 table.addCell(nameCell);
+                index++;
             }
         }
         document.add(table);
@@ -1509,7 +3237,7 @@
      * @return bytearrayoutputstream
      */
     public static ByteArrayOutputStream makeJcPDFByteArrayStream(String xm, String xb, String nl, String jcks, String zyh, String ch, String sjks, String jcsb, String jch
-            , String jcxm, String ms, String ts, File[] files, String footer,Paragraph elements) {
+            , String jcxm, String ms, String ts, File[] files, String footer, Paragraph elements) {
         try {
             Document document = new Document(PageSize.A4);
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -1529,7 +3257,8 @@
             table1.setSpacingAfter(10f);
 
             Font titleFont = PdfUtils.setFont(12);
-            PdfPCell mergedCell = new PdfPCell(new Phrase("闄曞仴鍖绘緞鍚堢熆鍔″眬涓績鍖婚櫌", titleFont));
+//            PdfPCell mergedCell = new PdfPCell(new Phrase("闄曞仴鍖绘緞鍚堢熆鍔″眬涓績鍖婚櫌", titleFont));
+            PdfPCell mergedCell = new PdfPCell(new Phrase(HOSP_NAME, titleFont));
             mergedCell.setBorder(Rectangle.NO_BORDER);
             mergedCell.setColspan(10);
             mergedCell.setHorizontalAlignment(Element.ALIGN_CENTER);
@@ -1795,7 +3524,7 @@
             this.footerText = footerText;
         }
 
-        public Footer(Paragraph paragraph){
+        public Footer(Paragraph paragraph) {
             this.paragraph = paragraph;
         }
 
@@ -1815,20 +3544,22 @@
     }
 
     // 鑷畾涔夐〉鑴氬拰椤电湁鐨勭粯鍒�
-    static class FooterHeaderPageEvent extends PdfPageEventHelper {
+    class FooterHeaderPageEvent extends PdfPageEventHelper {
 
         private String name; // 椤电湁鐨勫悕瀛�
         private String tjName;
         private String tjNumber;
         private String sex;
         private String age;
+        private Integer page;
 
-        public FooterHeaderPageEvent(String name,String tjName,String tjNumber,String sex,String age) {
+        public FooterHeaderPageEvent(String name, String tjName, String tjNumber, String sex, String age, Integer page) {
             this.name = name;
             this.tjNumber = tjNumber;
             this.tjName = tjName;
             this.sex = sex;
             this.age = age;
+            this.page = page;
         }
 
         // 鍦ㄦ瘡涓�椤电殑椤堕儴缁樺埗椤电湁
@@ -1900,7 +3631,7 @@
             footerTable.setSpacingBefore(0); // 鍘婚櫎琛ㄦ牸椤堕儴鐨勯棿璺�
             footerTable.setSpacingAfter(0); // 鍘婚櫎琛ㄦ牸搴曢儴鐨勯棿璺�
             footerTable.getDefaultCell().setBorder(Rectangle.NO_BORDER); // 鍘婚櫎鎵�鏈夊崟鍏冩牸鐨勮竟妗�
-            float[] columnWidths = { 2.5f, 2f };  // 绗竴鍒楀崰 1锛岀浜屽垪鍗� 2
+            float[] columnWidths = {2.5f, 2f};  // 绗竴鍒楀崰 1锛岀浜屽垪鍗� 2
             footerTable.setWidths(columnWidths); // 璁剧疆鍒楀姣斾緥
 
             // 绗竴琛岋細鍖婚櫌鍚嶅拰椤电爜
@@ -1914,8 +3645,16 @@
             footerTable.addCell(hospitalNameCell);
 
             // 鍒涘缓椤电爜鐨勫崟鍏冩牸锛氬彸瀵归綈
-//            String pageText = "绗� " + writer.getPageNumber() + 1 + " 椤碉紝鍏� " + writer.getPageNumber() + " 椤�"; // 椤电爜
-            String pageText = "绗� " + (writer.getPageNumber() + 1) + " 椤�"; // 椤电爜
+            String pageText;
+//            if (page != null) pageText = "绗� " + writer.getPageNumber() + 1 + " 椤碉紝鍏� " + page + " 椤�"; // 椤电爜
+//            else pageText = "绗� " + (writer.getPageNumber() + 1) + " 椤�"; // 椤电爜
+
+//            if (page == null) {
+//                pageText = "绗� " + (writer.getPageNumber() + 1) + " 椤�"; // 椤电爜
+//            } else {
+//                pageText = "绗� " + (page + 1) + " 椤�"; // 椤电爜
+//            }
+            pageText = "绗� " + (++pdfPage) + " 椤�";
             PdfPCell pageCell = new PdfPCell(new Phrase(pageText, PdfUtils.setFont(8)));
             pageCell.setHorizontalAlignment(Element.ALIGN_RIGHT); // 鍙冲榻�
             pageCell.setVerticalAlignment(Element.ALIGN_TOP); // 鍨傜洿瀵归綈鍒板簳閮�

--
Gitblit v1.8.0