From c42f62b32bac302a7ac9fcde7489f7c5fc6e11aa Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 06 十二月 2024 15:35:17 +0800
Subject: [PATCH] zjh20241205-3

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 1236 ++++++++++++++++++++++------------------------------------
 1 files changed, 467 insertions(+), 769 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 66484cb..e1955ac 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,24 +2,22 @@
 
 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;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.itextpdf.text.*;
 import com.itextpdf.text.pdf.*;
 import com.itextpdf.text.pdf.draw.LineSeparator;
 import com.ltkj.common.core.domain.AjaxResult;
 import com.ltkj.common.core.domain.entity.SysUser;
 import com.ltkj.common.utils.DateUtils;
-import com.ltkj.common.utils.StringUtils;
 import com.ltkj.framework.config.MatchUtils;
 import com.ltkj.hosp.domain.*;
+import com.ltkj.hosp.mapper.DictUserInfoMapper;
 import com.ltkj.hosp.service.*;
+import com.ltkj.hosp.sqlDomain.LtkjExamJcbgd;
 import com.ltkj.hosp.sqlDomain.LtkjHybgd;
 import com.ltkj.hosp.sqlDomain.LtkjHysqd;
-import com.ltkj.mall.mallOrderUtils.TjConstants;
+import com.ltkj.system.service.ISysConfigService;
 import com.ltkj.system.service.ISysUserService;
 import com.ltkj.web.config.pdfutils.PdfUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -27,15 +25,15 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
 import java.io.*;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.List;
-
-import static com.ltkj.web.config.pdfutils.PDFBinaryUtil.getPDFBinary;
 
 /**
  * 妫�鏌� 妫�楠屾姤鍛妏df鐢熸垚
@@ -75,77 +73,14 @@
     private String value;
     @Value("${path.reportServer}")
     private String urlValue;
-
-//    private static final
-
-    /**
-     * 閫氳繃his API璇锋眰鑾峰彇鏁版嵁鐢熸垚PDF
-     * @param pdfInfoMap
-     * @param params
-     * @param tjOrder
-     * @param tjReportTemplate
-     * @return
-     * @deprecated 鏈夋暟鎹悓姝ヤ笉鍦ㄨ皟鐢ㄦ帴鍙h幏鍙栨暟鎹洿鎺ユ煡鏁版嵁搴撴嬁鏁版嵁鐢熸垚
-     */
-    @Deprecated
-    public AjaxResult execHisRequest(HashMap<String, Object> pdfInfoMap, Map<String, Object> params,TjOrder tjOrder,TjReportTemplate tjReportTemplate) {
-        List<Map<String, Object>> list;
-        String hisRegistrationId = params.get("his_registration_id").toString();
-        AjaxResult getlabreportinfo = apiGetMethodService.getHISDataNew("Getlabreportinfo", params);
-        list = makePDFInfo(pdfInfoMap, getlabreportinfo, "鑾峰彇妫�楠屾姤鍛婅褰曚俊鎭�");
-        JSONArray jsonArray = JSONUtil.createArray();
-        if (list != null) {
-            params.clear();
-            for (Map<String, Object> stringObjectMap : list) {
-                if (stringObjectMap == null)
-                    continue;
-                JSONObject obj = JSONUtil.createObj();
-                obj.putOpt("鎶ュ憡璁板綍", stringObjectMap);
-                String jybgid = stringObjectMap.get("JYBGID").toString();
-                params.put("jybgid", jybgid);
-                // 鑾峰彇妫�楠岀粨鏋滆褰曚俊鎭�
-                AjaxResult getlabdetailinfo = apiGetMethodService.getHISDataNew("Getlabdetailinfo", params);
-                putData(obj, getlabdetailinfo, "妫�楠岀粨鏋滆褰�");
-                // 鑾峰彇寰敓鐗╂姤鍛婅褰曚俊鎭�
-                AjaxResult getlabgermrepinfo = apiGetMethodService.getHISDataNew("Getlabgermrepinfo", params);
-                putData(obj, getlabgermrepinfo, "寰敓鐗╂姤鍛婅褰�");
-                // 鑾峰彇寰敓鐗╄嵂鏁忎俊鎭�
-                AjaxResult getlabgermdetailinfo = apiGetMethodService.getHISDataNew("Getlabgermdetailinfo", params);
-                putData(obj, getlabgermdetailinfo, "寰敓鐗╄嵂鏁忎俊鎭�");
-                // 鑾峰彇鍗辨�ュ�间俊鎭�
-                AjaxResult getlaburgentinfo = apiGetMethodService.getHISDataNew("Getlaburgentinfo", params);
-                putData(obj, getlaburgentinfo, "鍗辨満鍊间俊鎭�");
-                jsonArray.put(obj);
-            }
-            // 鑾峰彇妫�鏌ユ姤鍛婁俊鎭�
-            params.clear();
-            params.put("his_registration_id", hisRegistrationId);
-            params.put("ksmc", "");
-            params.put("pationid", "");
-            params.put("ksrq", "");
-            params.put("jsrq", "");
-            params.put("pagecount", 100);
-            params.put("page", 1);
-            params.put("status", "");
-            AjaxResult getexamreportinfo = apiGetMethodService.getHISDataNew("Getexamreportinfo", params);
-            JSONObject object = JSONUtil.parseObj(getexamreportinfo.get("result"));
-            JSONObject response = JSONUtil.parseObj(object.get("Response"));
-            if (!response.getStr("ResultCode").equals("0")) {
-                if (!response.getStr("ResultContent").contains("鏌ヨ澶辫触"))
-                    return AjaxResult.error("鐢熸垚瓒呮椂锛岃閲嶈瘯");
-            }
-            JSONObject obj = JSONUtil.createObj();
-            putData(obj, getexamreportinfo, "妫�鏌ユ姤鍛�");
-            jsonArray.put(obj);
-//            System.out.println(JSONUtil.toJsonStr(jsonArray));
-            if (makePDF(hisRegistrationId, jsonArray,tjOrder,tjReportTemplate)) {
-                log.info("宸茬敓鎴愭姤鍛�");
-                return AjaxResult.success("宸茬敓鎴愭姤鍛婏紒鍙洿鎺ョ偣鍑婚瑙堬紒");
-            } else return AjaxResult.error();
-        } else {
-            return AjaxResult.error("鏈幏鍙栧埌妫�楠屾姤鍛婅褰曚俊鎭�");
-        }
-    }
+    @Autowired
+    private DictUserInfoMapper dictUserInfoMapper;
+    @Autowired
+    private ISysConfigService sysConfigService;
+    @Resource
+    private LtkjExamJcbgdService jcbgdService;
+    @Resource
+    private LtkjExamJcsqdService jcsqdService;
 
     private List<Map<String, Object>> makePDFInfo(HashMap<String, Object> map, AjaxResult ajaxResult, String key) {
         List<Map<String, Object>> data = null;
@@ -168,8 +103,10 @@
         }
     }
 
-    public AjaxResult hisPDF(TjOrder tjOrder,TjCustomer customer,TjReportTemplate tjReportTemplate) throws DocumentException {
+    public AjaxResult hisPDF(TjOrder tjOrder, TjCustomer customer, TjReportTemplate tjReportTemplate) throws Exception {
         HashMap<String, Object> pdfChangGui = makePDFInfo(tjOrder, customer, tjReportTemplate);
+        if (pdfChangGui == null)
+            return AjaxResult.error();
         Document document = (Document) pdfChangGui.get("document");
         PdfCopy copy = (PdfCopy) pdfChangGui.get("copy");
         ByteArrayOutputStream finalOutPut = (ByteArrayOutputStream) pdfChangGui.get("stream");
@@ -177,7 +114,7 @@
         Document document1 = new Document(PageSize.A4);
         PdfWriter pdfWriter = null;
         try {
-             pdfWriter = PdfWriter.getInstance(document1, byteArrayOutputStream1);
+            pdfWriter = PdfWriter.getInstance(document1, byteArrayOutputStream1);
         } catch (DocumentException e) {
             e.printStackTrace();
             return AjaxResult.error();
@@ -186,7 +123,7 @@
         document1.open();
         // 闈炲寲楠岄」鐩姤鍛�
         Map<TjOrderRemark, List<TjPdfVO>> printReport = new HashMap<>();
-        notHuaYanData(tjOrder.getTjNumber(), printReport,tjOrder,customer);
+        notHuaYanData(tjOrder.getTjNumber(), printReport, tjOrder, customer);
         try {
             notHuaYanTable(document1, printReport);
         } catch (DocumentException e) {
@@ -197,7 +134,10 @@
         // 缁勮妫�楠屾暟鎹�
         HashMap<String, Object> map = makeHisJianYan(tjOrder, customer);
         makeHisJianYanTable(document1, map);
+
+
         List<ByteArrayOutputStream> jianchas = makeHisJianChaTable(tjOrder);
+//        List<ByteArrayOutputStream> jianchas = makeCcgcHisJianChaTable(tjOrder);
         document1.close();
         pdfWriter.close();
         PdfReader reader = null;
@@ -227,40 +167,53 @@
             return AjaxResult.error();
         }
         String outputFileName1 = customer.getCusId() + tjOrder.getTjNumber() + customer.getCusName() + "_鎶ュ憡.pdf";
-        savePDFFile(outputFileName1,tjOrder, customer, finalOutPut);
-        TjReport tjReport = new TjReport();
-        String tjNumber = tjOrder.getTjNumber();
-        tjReport.setTjNumber(String.valueOf(tjNumber));
-        tjReport.setPath(urlValue + outputFileName1);
-        // 鏂囦欢閰嶇疆
-//        String outputPath1 = "/Users/chacca/寮�鍙戠浉鍏�/浠g爜/";
-        String outputPath1 = value+"\\";
-        String pdfBinary = getPDFBinary(outputPath1 + outputFileName1);
-        tjReport.setReport(pdfBinary);
-        tjReport.setType("浣撴鎶ュ憡");
-        tjReport.setPrint("pdf");
-        tjReportService.save(tjReport);
-        LambdaUpdateWrapper<TjOrder> updateWrapper = new LambdaUpdateWrapper<>();
-        updateWrapper.eq(TjOrder::getTjNumber, tjNumber);
-        updateWrapper.set(TjOrder::getReportTime, new Date());
-        updateWrapper.set(TjOrder::getPrintLastTime, new Date());
-        updateWrapper.set(TjOrder::getDownloadLastTime, new Date());
-        updateWrapper.set(TjOrder::getStatus, TjConstants.TJ_END);
-        tjOrderService.update(updateWrapper);
+        try {
+            PdfReader pdfReader = new PdfReader(finalOutPut.toByteArray());
+            int pages = pdfReader.getNumberOfPages();
+            ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+            PdfStamper pdfStamper = new PdfStamper(pdfReader, outputStream);
+            PdfContentByte contentByte;
+            BaseFont baseFont = PdfUtils.createBaseFont(null);
+            for (int i = 2; i <= pages; i++) {
+                contentByte = pdfStamper.getOverContent(i);
+                contentByte.beginText();
+                contentByte.setFontAndSize(baseFont, 11);
+                float x = contentByte.getPdfDocument().getPageSize().getWidth() / 2;
+                float y = 20;
+                contentByte.showTextAligned(PdfContentByte.ALIGN_CENTER, String.valueOf(i - 1), x, y, 0);
+                contentByte.endText();
+            }
+            pdfStamper.close();
+            pdfReader.close();
+            finalOutPut = outputStream;
+        } catch (IOException e) {
+            e.printStackTrace();
+            return AjaxResult.error();
+        }
+        savePDFFile(outputFileName1, tjOrder, customer, finalOutPut);
         return AjaxResult.success();
     }
 
     /**
      * 鐢熸垚妫�鏌ヨ〃鏍�
+     *
      * @param tjOrder
      * @return
      */
-    private List<ByteArrayOutputStream> makeHisJianChaTable(TjOrder tjOrder) {
+    private List<ByteArrayOutputStream> makeHisJianChaTable(TjOrder tjOrder) throws Exception {
         LambdaQueryWrapper<LtkjGetexamreportinfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(LtkjGetexamreportinfo::getHisRegistrationId, tjOrder.getCardId());
+        lambdaQueryWrapper.eq(LtkjGetexamreportinfo::getRequestParamsHisRegistrationId, tjOrder.getCardId());
+        lambdaQueryWrapper.groupBy(LtkjGetexamreportinfo::getJcbgid);
         List<LtkjGetexamreportinfo> list = ltkjGetexamreportinfoService.list(lambdaQueryWrapper);
 //        List<LtkjGetexamreportinfo> list = ltkjGetexamreportinfoService.list();
         List<ByteArrayOutputStream> jianchas = new ArrayList<>();
+        Paragraph elements = new Paragraph();
+        elements.setLeading(5f);
+        elements.setSpacingBefore(10f);
+        elements.setSpacingAfter(10f);
+        elements.setAlignment(Element.ALIGN_RIGHT);
+        Phrase phrase = new Phrase();
+        Font doctorFonts = PdfUtils.setFont(11);
         for (LtkjGetexamreportinfo getexamreportinfo : list) {
             String xm = getexamreportinfo.getHzxm();
             String xb = getexamreportinfo.getHzxb().equals("2") ? "濂�" : "鐢�";
@@ -282,45 +235,171 @@
             String sqrxm = getexamreportinfo.getSqrxm();
             String zyh = "";
             String ch = "";
-            String footer = "鐢宠浜猴細"+sqrxm + "     瀹℃牳鍖诲笀锛�"+shysqm+"     鍖诲笀绛惧悕锛�"+bgysqm;
-            ByteArrayOutputStream outputStream = makeJcPDFByteArrayStream(xm, xb, nl, jcks, zyh, ch, sjks, jcsb, jch, jcxm, ms, ts, null,footer);
+            String sqrbh = getexamreportinfo.getSqrbh();
+            String shysbh = getexamreportinfo.getShysbh();
+            String bgysbh = getexamreportinfo.getBgysbh();
+            String jcysqm = getexamreportinfo.getJcysqm();
+            String jcysbh = getexamreportinfo.getJcysbh();
+            StringBuilder builder;
+            String footer;
+            // 妫�鏌ヨ繑鍥炵殑鍖诲笀缂栫爜涓嶅睘浜巋is鍖诲笀id 鏆傛敞閲�
+//            String key = sysConfigService.selectConfigByKey("is_report_pdf_use_ysqm");
+//            if (key.equals("Y")){
+//                footer = null;
+//                if (null != sqrbh && StrUtil.isNotBlank(sqrbh)){
+//                    makeYiShiInfoLine(phrase, doctorFonts, sqrxm, sqrbh,"鐢宠浜猴細");
+//                }
+//                if (null != jcysbh && StrUtil.isNotBlank(jcysbh)){
+//                    makeYiShiInfoLine(phrase, doctorFonts, jcysqm, jcysbh,"     妫�鏌ュ尰甯堬細");
+//                }
+//                if (null != shysbh && StrUtil.isNotBlank(shysbh)){
+//                    makeYiShiInfoLine(phrase, doctorFonts, shysqm, shysbh,"     瀹℃牳鍖诲笀锛�");
+//                }
+//                if (null != bgysbh && StrUtil.isNotBlank(bgysbh)){
+//                    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();
+//            }
+//            elements.add(phrase);
+            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);
+        }
+        return jianchas;
+    }
+
+
+    /**
+     * 鐢熸垚妫�鏌ヨ〃鏍煎瓨鍌ㄨ繃绋嬫椂鐢�
+     *
+     * @param tjOrder
+     * @return
+     */
+    private List<ByteArrayOutputStream> makeCcgcHisJianChaTable(TjOrder tjOrder) throws Exception {
+
+        TjCustomer customer = tjCustomerService.getById(tjOrder.getUserId());
+
+       List<LtkjExamJcbgd> list=jcbgdService.getJianJcBaoGaoDanByTjh(tjOrder.getCardId());
+
+        List<ByteArrayOutputStream> jianchas = new ArrayList<>();
+        Paragraph elements = new Paragraph();
+        elements.setLeading(5f);
+        elements.setSpacingBefore(10f);
+        elements.setSpacingAfter(10f);
+        elements.setAlignment(Element.ALIGN_RIGHT);
+
+        for (LtkjExamJcbgd getexamreportinfo : list) {
+            String xm = customer.getCusName();
+            String xb = customer.getCusSex()==2 ? "濂�" : "鐢�";
+            String nl = customer.getAge();
+            String jcks = "浣撴涓績";
+            String sjks = "";
+            String jcsb = "";
+            String jch = getexamreportinfo.getTmh();
+            String jcxm = getexamreportinfo.getXmmc();
+            String ms = getexamreportinfo.getYxbx();
+            String ts = getexamreportinfo.getYxzd();
+            String bgysqm = getexamreportinfo.getShysxm();
+            String shysqm = getexamreportinfo.getShysdm();
+            String sqrxm = "鐜嬪仴钀�";
+            String zyh = "";
+            String ch = "";
+            String jcysqm = getexamreportinfo.getShysdm();
+            StringBuilder builder;
+            String footer;
+            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();
+            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);
         }
         return jianchas;
     }
 
     /**
-     * PDF鏂囦欢瀛樺偍鑷虫湰鍦�
-     * @param tjOrder
-     * @param customer
-     * @param finalOutPut
+     * 鍖诲笀淇℃伅琛�
+     * @param phrase
+     * @param doctorFonts
+     * @param sqrxm
+     * @param sqrbh
+     * @throws BadElementException
      */
-    private void savePDFFile(String outputFileName1,TjOrder tjOrder, TjCustomer customer, ByteArrayOutputStream finalOutPut) {
-        // 鏂囦欢閰嶇疆
-//        String outputPath1 = "/Users/chacca/寮�鍙戠浉鍏�/浠g爜/";
-        String outputPath1 = value+"\\";
-        File file = new File(outputPath1 + outputFileName1);
-        BufferedOutputStream outputStream = null;
-        try {
-            outputStream = new BufferedOutputStream(new FileOutputStream(file));
-            outputStream.write(finalOutPut.toByteArray());
-            outputStream.flush();
-            outputStream.close();
-            finalOutPut.close();
-        } catch (IOException e) {
-            log.error("鏈湴瀛樺偍pdf寮傚父");
-            e.printStackTrace();
+    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)) {
+            byte[] decode = Base64.getDecoder().decode(qmImg);
+            Image image = null;
+            try {
+                image = Image.getInstance(decode);
+                image.scaleToFit(60, 25);
+                phrase.add(new Chunk(title,doctorFonts));
+                phrase.add(new Chunk(image,0,-10,true));
+            } catch (IOException e) {
+                phrase.add(new Chunk(title+sqrxm, doctorFonts));
+            }
+        }else {
+            phrase.add(new Chunk(title+sqrxm, doctorFonts));
         }
     }
 
     /**
+     * PDF鏂囦欢瀛樺偍鑷虫湰鍦�
+     *
+     * @param tjOrder
+     * @param customer
+     * @param finalOutPut
+     */
+    private void savePDFFile(String outputFileName1, TjOrder tjOrder, TjCustomer customer, ByteArrayOutputStream finalOutPut) throws IOException {
+        // 鏂囦欢閰嶇疆
+//        String outputPath1 = "/Users/chacca/寮�鍙戠浉鍏�/浠g爜/";
+        String outputPath1 = value + File.separator;
+        File file = new File(outputPath1 + outputFileName1);
+        BufferedOutputStream outputStream = null;
+        outputStream = new BufferedOutputStream(new FileOutputStream(file));
+        outputStream.write(finalOutPut.toByteArray());
+        outputStream.flush();
+        outputStream.close();
+        finalOutPut.close();
+    }
+
+    /**
      * 濉厖妫�楠岃〃鏍兼暟鎹�
+     *
      * @param document1
      * @param map
      * @throws DocumentException
      */
-    private static void makeHisJianYanTable(Document document1, HashMap<String, Object> map) throws DocumentException {
-        if (!map.isEmpty()){
+    private void makeHisJianYanTable(Document document1, HashMap<String, Object> map) throws DocumentException {
+        if (!map.isEmpty()) {
             String[] titles = new String[]{"浣撴椤圭洰", "浣撴缁撴灉", "鍗曚綅", "鍙傝�冭寖鍥�"};
             float[] titlesWidth = new float[]{120, 120, 120, 120};
             for (Map.Entry<String, Object> entry : map.entrySet()) {
@@ -328,18 +407,53 @@
                 HashMap<String, Object> entryValue = (HashMap<String, Object>) entry.getValue();
                 HashSet<String> jyys = (HashSet<String>) entryValue.get("jyys");
                 ArrayList<List<String>> lists = (ArrayList<List<String>>) entryValue.get("data");
-                addJianYanTable(document1,titleName,titles,titlesWidth,lists);
-                Font doctorFonts = PdfUtils.setFont(9);
-                String doctors = "";
-                for (String s : jyys) {
-                    doctors+=s+"銆�";
+                addJianYanTable(document1, titleName, titles, titlesWidth, lists);
+                if (!jyys.isEmpty()) {
+                    Font doctorFonts = PdfUtils.setFont(11);
+                    String doctors = "";
+                    Paragraph elements = new Paragraph();
+                    elements.setLeading(5f);
+                    elements.setSpacingBefore(10f);
+                    elements.setSpacingAfter(10f);
+                    elements.setAlignment(Element.ALIGN_RIGHT);
+                    Phrase phrase = new Phrase();
+                    phrase.add(new Chunk("瀹℃牳鍖诲笀锛�",doctorFonts));
+                    boolean flag = false;
+                    for (String s : jyys) {
+                        if (s.contains("|")) {
+                            flag = true;
+                            String[] split = s.split("\\|");
+                            String qmImg = dictUserInfoMapper.selectQmImgInnerJoinUserByHisDictCode(split[1]);
+                            if (null != qmImg && StrUtil.isNotBlank(qmImg)) {
+                                byte[] decode = Base64.getDecoder().decode(qmImg);
+                                Image image = null;
+                                try {
+                                    image = Image.getInstance(decode);
+                                    image.scaleToFit(60, 25);
+                                    phrase.add(new Chunk(image,0,-10,true));
+                                } catch (IOException e) {
+                                    phrase.add(new Chunk(split[0].trim(),doctorFonts));
+                                }
+                            } else {
+                                phrase.add(new Chunk(split[0].trim(),doctorFonts));
+                            }
+                        } else {
+                            doctors += s.trim() + "銆�";
+                        }
+                    }
+                    if (!flag) {
+                        String substring = doctors.substring(0, doctors.length() - 1).trim();
+                        Paragraph df = PdfUtils.setParagraph(doctorFonts, "瀹℃牳鍖诲笀锛�" + substring);
+                        df.setAlignment(Element.ALIGN_RIGHT);
+                        document1.add(df);
+                    } else {
+                        elements.add(phrase);
+                        document1.add(elements);
+                    }
                 }
-                String substring = doctors.substring(0, doctors.length() - 1);
-                Paragraph df = PdfUtils.setParagraph(doctorFonts, "妫�楠屽尰甯堬細"+substring);
-                df.setAlignment(Element.ALIGN_RIGHT);
-                document1.add(df);
                 //鍒嗗壊绾�
                 LineSeparator objectName = new LineSeparator();
+                objectName.setOffset(-5);
                 document1.add(objectName);
             }
         }
@@ -347,156 +461,184 @@
 
     /**
      * 闈炲寲楠岄」鐩〃鏍煎~鍏�
+     *
      * @param document1
      * @param printReport
      * @throws DocumentException
      */
     private void notHuaYanTable(Document document1, Map<TjOrderRemark, List<TjPdfVO>> printReport) throws DocumentException {
         for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : printReport.entrySet()) {
-            List<TjPdfVO> value = entry.getValue();
             LambdaQueryWrapper<TjProject> wqqq = new LambdaQueryWrapper<>();
             wqqq.eq(TjProject::getProId, entry.getKey().getProId());
             TjProject one11 = projectService.getOne(wqqq);
             //鍒ゆ柇璇ラ」鐩槸鍚﹂渶瑕佹墦鍗版姤鍛�
-            if (null != one11 && "N".equals(one11.getNeedReport())) {
-                continue;
-            }
-            String titleName = null;
-            if (null != one11 && "1".equals(one11.getResultType())) {
-                titleName = one11.getProName();
-                // TODO 鍗曚綅
-                // 璁剧疆鏍囬瀛椾綋鏍峰紡
-                Font titleFonts = PdfUtils.setFont(9);
-                Paragraph paragraph = PdfUtils.setParagraph(titleFonts, titleName);
-                String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉","鍗曚綅"};
-                // 鑾峰彇鍒楄〃鏁版嵁
-                //璁剧疆琛ㄥご瀛椾綋鏍峰紡
-                Font headFont = PdfUtils.setFont(9);
-                // 璁剧疆姝f枃瀛椾綋鏍峰紡锛�12鍙�
-                Font textFont = PdfUtils.setFont(9);
-                //鍒涘缓琛ㄦ牸  灏嗚〃澶村瓧浣撳拰姝f枃瀛椾綋鏀捐繘鍘�
-                PdfPTable table = PdfUtils.setTable2(headFont, textFont, titles, value);
-                document1.add(paragraph);
-                document1.add(table);
-                //鍒ゆ柇澶囨敞鏄惁涓虹┖  绌轰笉鑳芥樉绀簄ull
-                if (entry.getKey().getRemark() == null) {
-                    entry.getKey().setRemark("");
-                }
-                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);
-                        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);
-                        Paragraph pp = PdfUtils.setParagraph(remarkFonts, substring);
-                        document1.add(pp);
-                    }
-                } else {
-                    Font remarkFonts = PdfUtils.setFont(9);
-                    Paragraph pp = PdfUtils.setParagraph(remarkFonts, remark);
-                    document1.add(pp);
-                }
-                //鍒ゆ柇涓绘鍖诲笀鏄惁涓虹┖  绌轰笉鑳芥樉绀簄ull
-                if (null != entry.getKey().getDoctorName() && null != userService.getById(entry.getKey().getDoctorName())) {
-                    //涓绘鍖诲笀
-                    String doctorName = "涓绘鍖诲笀锛�" + userService.getById(entry.getKey().getDoctorName()).getNickName();
-                    Font doctorFonts = PdfUtils.setFont(9);
-                    Paragraph df = PdfUtils.setParagraph(doctorFonts, doctorName);
-                    df.setAlignment(Element.ALIGN_RIGHT);
-                    document1.add(df);
-                } else {
-                    String doctorName = "涓绘鍖诲笀锛�" + "鏃�";
-                    Font doctorFonts = PdfUtils.setFont(9);
-                    Paragraph df = PdfUtils.setParagraph(doctorFonts, doctorName);
-                    df.setAlignment(Element.ALIGN_RIGHT);
-                    document1.add(df);
-                }
-                //鍒嗗壊绾�
-                LineSeparator objectName = new LineSeparator();
-                document1.add(objectName);
-            } else {
-                if (null != one11) {
+            if (null != one11 && "Y".equals(one11.getNeedReport())) {
+                List<TjPdfVO> value = entry.getValue();
+                String titleName = null;
+                if (null != one11 && "1".equals(one11.getResultType())) {
                     titleName = one11.getProName();
-                } else {
-                    titleName = entry.getKey().getProName();
-                }
-                // 璁剧疆鏍囬瀛椾綋鏍峰紡
-                Font titleFonts = PdfUtils.setFont(9);
-                Paragraph paragraph = PdfUtils.setParagraph(titleFonts, titleName);
-                String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉", "鍗曚綅", "鍙傝�冭寖鍥�"};
-                // 鑾峰彇鍒楄〃鏁版嵁
-                //璁剧疆琛ㄥご瀛椾綋鏍峰紡
-                Font headFont = PdfUtils.setFont(9);
-                // 璁剧疆姝f枃瀛椾綋鏍峰紡锛�12鍙�
-                Font textFont = PdfUtils.setFont(9);
-                //鍒涘缓琛ㄦ牸  灏嗚〃澶村瓧浣撳拰姝f枃瀛椾綋鏀捐繘鍘�
-                PdfPTable table = PdfUtils.setTable(headFont, textFont, titles, value);
-                document1.add(paragraph);
-                document1.add(table);
-                //鍒ゆ柇澶囨敞鏄惁涓虹┖  绌轰笉鑳芥樉绀簄ull
-                if (entry.getKey().getRemark() == null) {
-                    entry.getKey().setRemark("");
-                }
-                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);
-                        Paragraph pp = PdfUtils.setParagraph(remarkFonts, substring);
-                        document1.add(pp);
-                        j = j + 50;
+                    // 璁剧疆鏍囬瀛椾綋鏍峰紡
+                    Font titleFonts = PdfUtils.setFont(9);
+                    Paragraph paragraph = PdfUtils.setParagraph(titleFonts, titleName);
+                    String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉", "鍗曚綅"};
+                    // 鑾峰彇鍒楄〃鏁版嵁
+                    //璁剧疆琛ㄥご瀛椾綋鏍峰紡
+                    Font headFont = PdfUtils.setFont(9);
+                    // 璁剧疆姝f枃瀛椾綋鏍峰紡锛�12鍙�
+                    Font textFont = PdfUtils.setFont(9);
+                    //鍒涘缓琛ㄦ牸  灏嗚〃澶村瓧浣撳拰姝f枃瀛椾綋鏀捐繘鍘�
+                    PdfPTable table = PdfUtils.setTable2(headFont, textFont, titles, value);
+                    document1.add(paragraph);
+                    document1.add(table);
+                    //鍒ゆ柇澶囨敞鏄惁涓虹┖  绌轰笉鑳芥樉绀簄ull
+                    if (entry.getKey().getRemark() == null) {
+                        entry.getKey().setRemark("");
                     }
-                    if (remark.length() % 50 != 0) {
-                        String substring = remark.substring((remark.length() / 50) * 50, remark.length() - 1);
+                    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);
+                            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);
+                            Paragraph pp = PdfUtils.setParagraph(remarkFonts, substring);
+                            document1.add(pp);
+                        }
+                    } else {
                         Font remarkFonts = PdfUtils.setFont(9);
-                        Paragraph pp = PdfUtils.setParagraph(remarkFonts, substring);
+                        Paragraph pp = PdfUtils.setParagraph(remarkFonts, remark);
                         document1.add(pp);
                     }
+                    //鍒ゆ柇涓绘鍖诲笀鏄惁涓虹┖  绌轰笉鑳芥樉绀簄ull
+                    zhuJianYiShi(document1, entry);
+                    //鍒嗗壊绾�
+                    LineSeparator objectName = new LineSeparator();
+                    document1.add(objectName);
                 } else {
-                    Font remarkFonts = PdfUtils.setFont(9);
-                    Paragraph pp = PdfUtils.setParagraph(remarkFonts, remark);
-                    document1.add(pp);
+                    if (null != one11) {
+                        titleName = one11.getProName();
+                    } else {
+                        titleName = entry.getKey().getProName();
+                    }
+                    // 璁剧疆鏍囬瀛椾綋鏍峰紡
+                    Font titleFonts = PdfUtils.setFont(9);
+                    Paragraph paragraph = PdfUtils.setParagraph(titleFonts, titleName);
+                    String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉", "鍗曚綅"};
+                    // 鑾峰彇鍒楄〃鏁版嵁
+                    //璁剧疆琛ㄥご瀛椾綋鏍峰紡
+                    Font headFont = PdfUtils.setFont(9);
+                    // 璁剧疆姝f枃瀛椾綋鏍峰紡锛�12鍙�
+                    Font textFont = PdfUtils.setFont(9);
+                    //鍒涘缓琛ㄦ牸  灏嗚〃澶村瓧浣撳拰姝f枃瀛椾綋鏀捐繘鍘�
+                    PdfPTable table = PdfUtils.setTable(headFont, textFont, titles, value);
+                    document1.add(paragraph);
+                    document1.add(table);
+                    //鍒ゆ柇澶囨敞鏄惁涓虹┖  绌轰笉鑳芥樉绀簄ull
+                    if (entry.getKey().getRemark() == null) {
+                        entry.getKey().setRemark("");
+                    }
+                    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);
+                            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);
+                            Paragraph pp = PdfUtils.setParagraph(remarkFonts, substring);
+                            document1.add(pp);
+                        }
+                    } else {
+                        Font remarkFonts = PdfUtils.setFont(9);
+                        Paragraph pp = PdfUtils.setParagraph(remarkFonts, remark);
+                        document1.add(pp);
+                    }
+                    //鍒ゆ柇涓绘鍖诲笀鏄惁涓虹┖  绌轰笉鑳芥樉绀簄ull
+                    zhuJianYiShi(document1, entry);
+                    //鍒嗗壊绾�
+                    LineSeparator objectName = new LineSeparator();
+                    document1.add(objectName);
                 }
-                //鍒ゆ柇涓绘鍖诲笀鏄惁涓虹┖  绌轰笉鑳芥樉绀簄ull
-                if (null != entry.getKey().getDoctorName() && null != userService.getById(entry.getKey().getDoctorName())) {
-                    //涓绘鍖诲笀
-                    String doctorName = "涓绘鍖诲笀锛�" + userService.getById(entry.getKey().getDoctorName()).getNickName();
-                    Font doctorFonts = PdfUtils.setFont(9);
-                    Paragraph df = PdfUtils.setParagraph(doctorFonts, doctorName);
-                    df.setAlignment(Element.ALIGN_RIGHT);
-                    document1.add(df);
-                } else {
-                    String doctorName = "涓绘鍖诲笀锛�" + "鏃�";
-                    Font doctorFonts = PdfUtils.setFont(9);
-                    Paragraph df = PdfUtils.setParagraph(doctorFonts, doctorName);
-                    df.setAlignment(Element.ALIGN_RIGHT);
-                    document1.add(df);
-                }
-                //鍒嗗壊绾�
-                LineSeparator objectName = new LineSeparator();
-                document1.add(objectName);
             }
         }
     }
 
-    public HashMap<String, Object> makeHisJianYan(TjOrder tjOrder, TjCustomer customer){
-        // TODO 杩欓噷鍏堜娇鐢ㄦ煡鍏ㄩ儴娴嬭瘯
+    /**
+     * 涓昏鍖诲笀琛屾樉绀鸿缃�
+     * @param document1
+     * @param entry
+     * @throws DocumentException
+     */
+    private void zhuJianYiShi(Document document1, Map.Entry<TjOrderRemark, List<TjPdfVO>> entry) throws DocumentException {
+        if (null != entry.getKey().getDoctorName() && null != userService.getById(entry.getKey().getDoctorName())) {
+            //涓绘鍖诲笀
+            String key = sysConfigService.selectConfigByKey("is_report_pdf_use_ysqm");
+            SysUser sysUser = userService.getById(entry.getKey().getDoctorName());
+            Font doctorFonts = PdfUtils.setFont(9);
+            if (key.equals("Y")){
+                String qmImg = dictUserInfoMapper.selectQmImgInnerJoinUserByUserId(String.valueOf(sysUser.getUserId()));
+                if (null != qmImg && StrUtil.isNotBlank(qmImg)) {
+                    Paragraph elements = new Paragraph();
+                    elements.setLeading(5f);
+                    elements.setSpacingBefore(10f);
+                    elements.setSpacingAfter(10f);
+                    elements.setAlignment(Element.ALIGN_RIGHT);
+                    Phrase phrase = new Phrase();
+                    phrase.add(new Chunk("涓绘鍖诲笀锛�",doctorFonts));
+                    byte[] decode = Base64.getDecoder().decode(qmImg);
+                    Image image = null;
+                    try {
+                        image = Image.getInstance(decode);
+                        image.scaleToFit(60, 25);
+                        phrase.add(new Chunk(image,0,-10,true));
+                        elements.add(phrase);
+                        document1.add(elements);
+                    } catch (IOException e) {
+                        String doctorName = "涓绘鍖诲笀锛�" + sysUser.getNickName();
+                        Paragraph df = PdfUtils.setParagraph(doctorFonts, doctorName);
+                        df.setAlignment(Element.ALIGN_RIGHT);
+                        document1.add(df);
+                    }
+                }else {
+                    String doctorName = "涓绘鍖诲笀锛�" + sysUser.getNickName();
+                    Paragraph df = PdfUtils.setParagraph(doctorFonts, doctorName);
+                    df.setAlignment(Element.ALIGN_RIGHT);
+                    document1.add(df);
+                }
+            }else {
+                String doctorName = "涓绘鍖诲笀锛�" + sysUser.getNickName();
+                Paragraph df = PdfUtils.setParagraph(doctorFonts, doctorName);
+                df.setAlignment(Element.ALIGN_RIGHT);
+                document1.add(df);
+            }
+        } else {
+            String doctorName = "涓绘鍖诲笀锛�" + "鏃�";
+            Font doctorFonts = PdfUtils.setFont(9);
+            Paragraph df = PdfUtils.setParagraph(doctorFonts, doctorName);
+            df.setAlignment(Element.ALIGN_RIGHT);
+            document1.add(df);
+        }
+    }
+
+    public HashMap<String, Object> makeHisJianYan(TjOrder tjOrder, TjCustomer customer) {
         LambdaQueryWrapper<LtkjHysqd> ltkjHysqdLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        ltkjHysqdLambdaQueryWrapper.eq(LtkjHysqd::getTjh,tjOrder.getCardId());
+        ltkjHysqdLambdaQueryWrapper.eq(LtkjHysqd::getTjh, tjOrder.getCardId());
         List<LtkjHysqd> list = ltkjHysqdService.list(ltkjHysqdLambdaQueryWrapper);
-//        List<LtkjHysqd> list = ltkjHysqdService.list();
         HashMap<String, Object> data = new HashMap<>();
         for (LtkjHysqd hysqd : list) {
             LambdaQueryWrapper<LtkjHybgd> ltkjHybgdLambdaQueryWrapper = new LambdaQueryWrapper<>();
-            ltkjHybgdLambdaQueryWrapper.eq(LtkjHybgd::getTmh,hysqd.getTmh());
+            ltkjHybgdLambdaQueryWrapper.eq(LtkjHybgd::getTmh, hysqd.getTmh());
             List<LtkjHybgd> hybgds = ltkjHybgdService.list(ltkjHybgdLambdaQueryWrapper);
             // 澶х被椤圭洰鍚嶇О
             String xmmc = hysqd.getXmmc();
@@ -504,18 +646,20 @@
             HashSet<String> hashSet = new HashSet<>();
             for (LtkjHybgd hybgd : hybgds) {
                 // 妫�鏌ラ」鐩�
-                String jcxm = hybgd.getJcxm();
+                String jcxm = hybgd.getJcxm() != null ? hybgd.getJcxm().trim() : null;
                 // 妫�楠岀粨鏋�
-                String jyjg = hybgd.getJyjg();
+                String jyjg = hybgd.getJyjg() != null ? hybgd.getJyjg().trim() : null;
                 // 缁撴灉鍗曚綅
-                String jgdw = hybgd.getJgdw();
+                String jgdw = hybgd.getJgdw() != null ? hybgd.getJgdw().trim() : null;
                 // 鑼冨洿鍊�
-                String fwz = hybgd.getFwz();
+                String fwz = hybgd.getFwz() != null ? hybgd.getFwz().trim() : null;
                 // 妫�楠屽尰甯�
 //                String jyys = hybgd.getJyys();
                 //瀹℃牳鍖荤敓
-                String shysmc = hybgd.getShysmc();
-                if (jyjg != null && StrUtil.isNotBlank(jyjg) && fwz != null && StrUtil.isNotBlank(fwz)){
+                String shysmc = hybgd.getShysmc() != null ? hybgd.getShysmc().trim() : null;
+                // 瀹℃牳鍖诲笀缂栫爜
+                String shys = hybgd.getShys() != null ? hybgd.getShys().trim() : null;
+                if (jyjg != null && StrUtil.isNotBlank(jyjg) && fwz != null && StrUtil.isNotBlank(fwz)) {
                     try {
                         String[] fwzs = fwz.split("-");
                         BigDecimal min = new BigDecimal(fwzs[0]);
@@ -529,14 +673,20 @@
                             // jyjg 澶т簬鑼冨洿鏈�澶у�硷紝娣诲姞涓婄澶�
                             jyjg = jyjg + "   鈫�";
                         }
-                    } 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());
-                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);
@@ -546,8 +696,8 @@
             }
             if (!lists.isEmpty()) {
                 HashMap<String, Object> map = new HashMap<>();
-                map.put("data",lists);
-                map.put("jyys",hashSet);
+                map.put("data", lists);
+                map.put("jyys", hashSet);
                 data.put(xmmc, map);
             }
         }
@@ -556,10 +706,11 @@
 
     /**
      * 鐢熸垚PDF妯$増浠ュ強鐢ㄦ埛淇℃伅閮ㄥ垎
+     *
      * @param tjOrder
      * @param reportTemplate
      */
-    public HashMap<String ,Object> makePDFInfo(TjOrder tjOrder,TjCustomer tjCustomer,TjReportTemplate reportTemplate){
+    public HashMap<String, Object> makePDFInfo(TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate) {
         String tjNumber = tjOrder.getTjNumber();
         String template = reportTemplate.getTemplate();
         LambdaQueryWrapper<DictComp> wq111 = new LambdaQueryWrapper<>();
@@ -633,6 +784,7 @@
             }
             //寮傚父椤圭洰
             data.put("yichang", str.toString());
+            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());
@@ -657,9 +809,9 @@
             // 娣诲姞璇︽儏椤�
             document.newPage();
             HashMap<String, Object> map = new HashMap<>();
-            map.put("document",document);
-            map.put("copy",copy);
-            map.put("stream",finalOutPut);
+            map.put("document", document);
+            map.put("copy", copy);
+            map.put("stream", finalOutPut);
             return map;
         } catch (IOException | DocumentException e) {
             e.printStackTrace();
@@ -667,448 +819,22 @@
         }
     }
 
-    public Boolean makePDF(String cardId, JSONArray jsonArray,TjOrder tjOrder,TjReportTemplate reportTemplate) {
-        String tjNumber = tjOrder.getTjNumber();
-        String template = reportTemplate.getTemplate();
-        LambdaQueryWrapper<TjCustomer> wq1 = new LambdaQueryWrapper<>();
-        wq1.eq(TjCustomer::getCusId, tjOrder.getUserId());
-        TjCustomer tjCustomer = tjCustomerService.getOne(wq1);
-        Long userId = tjCustomer.getCusId();
-        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());
-        //20230306鍒ゆ柇璇ラ」鐩槸鍚﹂��璐�/缂磋垂
-        wq2.isNotNull(TjOrderDetail::getFlowingWaterId);
-        //20230323鍒ゆ柇璇ラ」鐩槸鍚﹀純妫�/鏈
-//                wq2.eq(TjOrderDetail::getTjStatus,1);
-        List<TjOrderDetail> list = tjOrderDetailService.list(wq2);
-        for (TjOrderDetail tjOrderDetail : list) {
-            TjProject tjProject = projectService.selectTjProjectByProId(tjOrderDetail.getProId());
-            tjOrderDetail.setProject(tjProject);
-        }
-        // 鐢熸垚pdf
-        try {
-            ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-            PdfReader reader = new PdfReader(new ByteArrayInputStream(Base64.getDecoder().decode(template)));
-            PdfStamper pdfStamper = new PdfStamper(reader, byteArrayOutputStream);
-            // 鑾峰彇pdf琛ㄥ崟
-            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<>();
-            // 璁剧疆鐢ㄦ埛淇℃伅
-            setUserInfo(tjNumber, tjOrder, tjCustomer, data);
-            //寮傚父椤圭洰
-            if (dictComp == null) {
-                data.put("work", "鏃�");
-            } else {
-                data.put("work", dictComp.getCnName());
-            }
-            //灏侀潰椤典笅闈㈢殑鎬绘寤鸿鏄剧ず
-            if (tjOrder.getCheckAdvice() == null) {
-                data.put("remark", "鏃�");
-            } else {
-                data.put("remark", tjOrder.getCheckAdvice());
-            }
-            //灏侀潰椤典笅闈㈢殑鎬绘寤鸿鏄剧ず
-            if (tjOrder.getCheckDoctor() == null) {
-                data.put("docname", "鏃�");
-            } else {
-                data.put("docname", tjOrder.getCheckDoctor());
-            }
-            //鎷兼帴閲嶅ぇ闃虫�х粨鏋�
-            StringBuffer str = new StringBuffer();
-            str.append("銆愰噸澶ч槼鎬ч」鐩�慭n");
-            LambdaQueryWrapper<TjBigPositive> bigPositiveLambdaQueryWrapper = new LambdaQueryWrapper<>();
-            bigPositiveLambdaQueryWrapper.eq(TjBigPositive::getTjNumber, tjNumber);
-            List<TjBigPositive> list1 = tjBigPositiveService.list(bigPositiveLambdaQueryWrapper);
-            if (list1 != null && list1.size() > 0) {
-                for (int i = 0; i < list1.size(); i++) {
-                    str.append((i + 1) + "銆�" + list1.get(i).getProName() + ";\n");
-                }
-            } else {
-                str.append("    鏃狅紱\n");
-            }
-            //鎷兼帴寮傚父椤圭洰
-            str.append("銆愬紓甯告儏鍐甸」鐩�慭n");
-            if (list.size() > 0) {
-                for (int i = 0; i < list.size(); i++) {
-                    if (list.get(i).getExceptionDesc() == 1) {
-                        str.append((i + 1) + "銆�" + projectService.getById(list.get(i).getProId()).getProName() + ";\n");
-                    }
-                }
-            } else {
-                str.append("    鏃狅紱\n");
-            }
-
-            //寮傚父椤圭洰
-            data.put("yichang", str.toString());
-            // 閬嶅巻data 缁檖df琛ㄥ崟琛ㄦ牸璧嬪��
-            for (String key : data.keySet()) {
-                acroFields.setField(key, data.get(key).toString());
-            }
-            //璁剧疆涓烘棤娉曠紪杈�
-            pdfStamper.setFormFlattening(true);
-            pdfStamper.close();
-            reader.close();
-            // 灏嗕慨鏀瑰悗鐨凱DF鍐呭鍐欏叆
-            byte[] bytes = byteArrayOutputStream.toByteArray();
-            // 鍒涘缓鏂扮殑PDF鏂囨。
-            Document document = new Document(PageSize.A4);
-            ByteArrayOutputStream finalOutPut = new ByteArrayOutputStream();
-            PdfCopy copy = new PdfCopy(document, finalOutPut);
-            document.open();
-            reader = new PdfReader(bytes);
-            int numberOfPages = reader.getNumberOfPages();
-            for (int i = 1; i <= numberOfPages; i++) {
-                PdfImportedPage page = copy.getImportedPage(reader, i);
-                copy.addPage(page);
-            }
-            // 娣诲姞璇︽儏椤�
-            document.newPage();
-            ByteArrayOutputStream byteArrayOutputStream1 = new ByteArrayOutputStream();
-            Document document1 = new Document(PageSize.A4);
-            PdfWriter pdfWriter = PdfWriter.getInstance(document1, byteArrayOutputStream1);
-            document1.setMargins(70, 70, 40, 40);
-            document1.open();
-            // 闈炲寲楠岄」鐩姤鍛�
-            Map<TjOrderRemark, List<TjPdfVO>> printReport = new HashMap<>();
-            notHuaYanData(tjNumber, printReport,tjOrder,tjCustomer);
-            for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : printReport.entrySet()) {
-                List<TjPdfVO> value = entry.getValue();
-                LambdaQueryWrapper<TjProject> wqqq = new LambdaQueryWrapper<>();
-                wqqq.eq(TjProject::getProId, entry.getKey().getProId());
-                TjProject one11 = projectService.getOne(wqqq);
-                //鍒ゆ柇璇ラ」鐩槸鍚﹂渶瑕佹墦鍗版姤鍛�
-                if (null != one11 && "N".equals(one11.getNeedReport())) {
-                    continue;
-                }
-                String titleName = null;
-                if (null != one11 && "1".equals(one11.getResultType())) {
-                    titleName = one11.getProName();
-                    // TODO 鍗曚綅
-                    // 璁剧疆鏍囬瀛椾綋鏍峰紡
-                    Font titleFonts = PdfUtils.setFont(9);
-                    Paragraph paragraph = PdfUtils.setParagraph(titleFonts, titleName);
-                    String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉","鍗曚綅"};
-                    // 鑾峰彇鍒楄〃鏁版嵁
-                    //璁剧疆琛ㄥご瀛椾綋鏍峰紡
-                    Font headFont = PdfUtils.setFont(9);
-                    // 璁剧疆姝f枃瀛椾綋鏍峰紡锛�12鍙�
-                    Font textFont = PdfUtils.setFont(9);
-                    //鍒涘缓琛ㄦ牸  灏嗚〃澶村瓧浣撳拰姝f枃瀛椾綋鏀捐繘鍘�
-                    PdfPTable table = PdfUtils.setTable2(headFont, textFont, titles, value);
-                    document1.add(paragraph);
-                    document1.add(table);
-                    //鍒ゆ柇澶囨敞鏄惁涓虹┖  绌轰笉鑳芥樉绀簄ull
-                    if (entry.getKey().getRemark() == null) {
-                        entry.getKey().setRemark("");
-                    }
-                    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);
-                            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);
-                            Paragraph pp = PdfUtils.setParagraph(remarkFonts, substring);
-                            document1.add(pp);
-                        }
-                    } else {
-                        Font remarkFonts = PdfUtils.setFont(9);
-                        Paragraph pp = PdfUtils.setParagraph(remarkFonts, remark);
-                        document1.add(pp);
-                    }
-                    //鍒ゆ柇涓绘鍖诲笀鏄惁涓虹┖  绌轰笉鑳芥樉绀簄ull
-                    if (null != entry.getKey().getDoctorName() && null != userService.getById(entry.getKey().getDoctorName())) {
-                        //涓绘鍖诲笀
-                        String doctorName = "涓绘鍖诲笀锛�" + userService.getById(entry.getKey().getDoctorName()).getNickName();
-                        Font doctorFonts = PdfUtils.setFont(9);
-                        Paragraph df = PdfUtils.setParagraph(doctorFonts, doctorName);
-                        df.setAlignment(Element.ALIGN_RIGHT);
-                        document1.add(df);
-                    } else {
-                        String doctorName = "涓绘鍖诲笀锛�" + "鏃�";
-                        Font doctorFonts = PdfUtils.setFont(9);
-                        Paragraph df = PdfUtils.setParagraph(doctorFonts, doctorName);
-                        df.setAlignment(Element.ALIGN_RIGHT);
-                        document1.add(df);
-                    }
-                    //鍒嗗壊绾�
-                    LineSeparator objectName = new LineSeparator();
-                    document1.add(objectName);
-                } else {
-                    if (null != one11) {
-                        titleName = one11.getProName();
-                    } else {
-                        titleName = entry.getKey().getProName();
-                    }
-                    // 璁剧疆鏍囬瀛椾綋鏍峰紡
-                    Font titleFonts = PdfUtils.setFont(9);
-                    Paragraph paragraph = PdfUtils.setParagraph(titleFonts, titleName);
-                    String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉", "鍗曚綅", "鍙傝�冭寖鍥�"};
-                    // 鑾峰彇鍒楄〃鏁版嵁
-                    //璁剧疆琛ㄥご瀛椾綋鏍峰紡
-                    Font headFont = PdfUtils.setFont(9);
-                    // 璁剧疆姝f枃瀛椾綋鏍峰紡锛�12鍙�
-                    Font textFont = PdfUtils.setFont(9);
-                    //鍒涘缓琛ㄦ牸  灏嗚〃澶村瓧浣撳拰姝f枃瀛椾綋鏀捐繘鍘�
-                    PdfPTable table = PdfUtils.setTable(headFont, textFont, titles, value);
-                    document1.add(paragraph);
-                    document1.add(table);
-                    //鍒ゆ柇澶囨敞鏄惁涓虹┖  绌轰笉鑳芥樉绀簄ull
-                    if (entry.getKey().getRemark() == null) {
-                        entry.getKey().setRemark("");
-                    }
-                    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);
-                            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);
-                            Paragraph pp = PdfUtils.setParagraph(remarkFonts, substring);
-                            document1.add(pp);
-                        }
-                    } else {
-                        Font remarkFonts = PdfUtils.setFont(9);
-                        Paragraph pp = PdfUtils.setParagraph(remarkFonts, remark);
-                        document1.add(pp);
-                    }
-                    //鍒ゆ柇涓绘鍖诲笀鏄惁涓虹┖  绌轰笉鑳芥樉绀簄ull
-                    if (null != entry.getKey().getDoctorName() && null != userService.getById(entry.getKey().getDoctorName())) {
-                        //涓绘鍖诲笀
-                        String doctorName = "涓绘鍖诲笀锛�" + userService.getById(entry.getKey().getDoctorName()).getNickName();
-                        Font doctorFonts = PdfUtils.setFont(9);
-                        Paragraph df = PdfUtils.setParagraph(doctorFonts, doctorName);
-                        df.setAlignment(Element.ALIGN_RIGHT);
-                        document1.add(df);
-                    } else {
-                        String doctorName = "涓绘鍖诲笀锛�" + "鏃�";
-                        Font doctorFonts = PdfUtils.setFont(9);
-                        Paragraph df = PdfUtils.setParagraph(doctorFonts, doctorName);
-                        df.setAlignment(Element.ALIGN_RIGHT);
-                        document1.add(df);
-                    }
-                    //鍒嗗壊绾�
-                    LineSeparator objectName = new LineSeparator();
-                    document1.add(objectName);
-                }
-            }
-            List<ByteArrayOutputStream> jianchas = new ArrayList<>();
-            for (Object o : jsonArray) {
-                JSONObject jsonObject = (JSONObject) o;
-                // 妫�楠屾姤鍛婁互鍙婄粨鏋滀俊鎭�
-                JSONObject reportInfo = jsonObject.getJSONObject("鎶ュ憡璁板綍");
-                String titleName = "";
-                if (reportInfo != null) {
-                    titleName = reportInfo.getStr("JYXMMC").trim();
-                }
-                JSONArray reportDetails = jsonObject.getJSONArray("妫�楠岀粨鏋滆褰�");
-                ArrayList<TjPdfVO> listPdf = new ArrayList<>();
-                String[] titles = null;
-                float[] titlesWidth = null;
-                // 缁撴灉淇℃伅
-                if (reportDetails != null && reportDetails.size() > 0) {
-                    for (Object reportDetail : reportDetails) {
-                        JSONObject detail = (JSONObject) reportDetail;
-                        TjPdfVO tjPdfVO = new TjPdfVO();
-                        tjPdfVO.setProName(detail.getStr("JCZBMC"));
-                        tjPdfVO.setProResult(detail.getStr("JCZBJG"));
-                        tjPdfVO.setVal1(detail.getStr("JLDW"));
-                        tjPdfVO.setVal2(detail.getStr("CKZFW"));
-                        listPdf.add(tjPdfVO);
-                    }
-                    titles = new String[]{"浣撴椤圭洰", "浣撴缁撴灉", "鍗曚綅", "鍙傝�冭寖鍥�"};
-                    titlesWidth = new float[]{120, 120, 120, 120};
-                    addTable(document1, titleName, titles, titlesWidth, listPdf);
-                    // 涓绘鍖诲笀
-                    String bgysqm = reportInfo.getStr("BGYSQM");
-                    String doctorName = "涓绘鍖诲笀锛�" + bgysqm;
-                    Font doctorFonts = PdfUtils.setFont(9);
-                    Paragraph df = PdfUtils.setParagraph(doctorFonts, doctorName);
-                    df.setAlignment(Element.ALIGN_RIGHT);
-                    document1.add(df);
-                    //鍒嗗壊绾�
-                    LineSeparator objectName = new LineSeparator();
-                    document1.add(objectName);
-                }
-                // 寰敓鐗╂姤鍛婅褰曚俊鎭�
-                JSONArray labgermrepInfos = jsonObject.getJSONArray("寰敓鐗╂姤鍛婅褰�");
-                if (labgermrepInfos != null && labgermrepInfos.size() > 0) {
-                    listPdf = new ArrayList<>();
-                    for (Object info : labgermrepInfos) {
-                        JSONObject object = (JSONObject) info;
-                        TjPdfVO tjPdfVO = new TjPdfVO();
-                        tjPdfVO.setProName(object.getStr("XJMC"));
-                        tjPdfVO.setProResult(object.getStr("JCJG"));
-                        listPdf.add(tjPdfVO);
-                    }
-                    titles = new String[]{"浣撴椤圭洰", "浣撴缁撴灉"};
-                    titlesWidth = new float[]{120, 120};
-                    addTable(document1, titleName, titles, titlesWidth, listPdf);
-                    //鍒嗗壊绾�
-                    LineSeparator objectName = new LineSeparator();
-                    document1.add(objectName);
-                }
-                // 寰敓鐗╄嵂鏁忎俊鎭�
-                JSONArray labgermdetailinfos = jsonObject.getJSONArray("寰敓鐗╄嵂鏁忎俊鎭�");
-                if (labgermdetailinfos != null && labgermdetailinfos.size() > 0) {
-                    listPdf = new ArrayList<>();
-                    for (Object info : labgermdetailinfos) {
-                        JSONObject object = (JSONObject) info;
-                        TjPdfVO tjPdfVO = new TjPdfVO();
-                        tjPdfVO.setProName(object.getStr("YMMC"));
-                        tjPdfVO.setProResult(object.getStr("JCJG"));
-                        tjPdfVO.setVal1(object.getStr("ZPHYL"));
-                        tjPdfVO.setVal2(object.getStr("YJND"));
-                        tjPdfVO.setVal3(object.getStr("YJHZJ"));
-                        listPdf.add(tjPdfVO);
-                    }
-                    titles = new String[]{"鑽晱鍚嶇О", "妫�鏌ョ粨鏋�", "绾哥墖鍚嵂閲�", "鎶戣弻娴撳害", "鎶戣弻鐜洿寰�"};
-                    titlesWidth = new float[]{90, 90, 90, 90, 90};
-                    addTable(document1, titleName, titles, titlesWidth, listPdf);
-                    //鍒嗗壊绾�
-                    LineSeparator objectName = new LineSeparator();
-                    document1.add(objectName);
-                }
-                // 鍗辨�ュ�间俊鎭�
-                JSONArray laburgentinfos = jsonObject.getJSONArray("鍗辨満鍊间俊鎭�");
-                if (laburgentinfos != null && laburgentinfos.size() > 0) {
-                    listPdf = new ArrayList<>();
-                    for (Object info : laburgentinfos) {
-                        JSONObject object = (JSONObject) info;
-                        TjPdfVO tjPdfVO = new TjPdfVO();
-                        tjPdfVO.setProName(object.getStr("zbmc"));
-                        tjPdfVO.setProResult(object.getStr("jg"));
-                        tjPdfVO.setVal1(object.getStr("clfs"));
-                        tjPdfVO.setVal2(object.getStr("bgcljg"));
-                        listPdf.add(tjPdfVO);
-                    }
-                    titles = new String[]{"鎸囨爣鍚嶇О", "鍗辨�ュ�肩粨鏋�", "澶勭悊鏂瑰紡", "澶勭悊鎰忚"};
-                    titlesWidth = new float[]{120, 120, 120, 120};
-                    addTable(document1, titleName, titles, titlesWidth, listPdf);
-                    //鍒嗗壊绾�
-                    LineSeparator objectName = new LineSeparator();
-                    document1.add(objectName);
-                }
-                JSONArray object = jsonObject.getJSONArray("妫�鏌ユ姤鍛�");
-                if (object != null && object.size() > 0) {
-                    for (Object info : object) {
-                        JSONObject obj = (JSONObject) info;
-                        String xm = obj.getStr("HZXM");
-                        String xb = obj.getStr("HZXB").equals("2") ? "濂�" : "鐢�";
-                        String nl = obj.getStr("HZNL");
-                        if (StrUtil.isNotBlank(nl) && nl.contains(".")) {
-                            String[] split = nl.split("\\.");
-                            nl = split[0];
-                        }
-                        String jcks = obj.getStr("JCKSMC");
-                        String zyh = "";
-                        String sqks = obj.getStr("SQKSMC");
-                        String sjks = obj.getStr("ZDJGMC");
-                        String jcsb = obj.getStr("SBBM");
-                        String jch = obj.getStr("JCH");
-                        String jcxm = obj.getStr("JCXMMC");
-                        String ms = obj.getStr("YXBX");
-                        String ts = obj.getStr("YXZD");
-                        String ch = obj.getStr("BZBCH");
-                        // 鎶ュ憡鍖诲笀绛惧悕
-                        String bgysqm = obj.getStr("BGYSQM");
-                        // 瀹℃牳鍖诲笀绛惧悕
-                        String shysqm = obj.getStr("SHYSQM");
-                        // 鐢宠浜�
-                        String sqrxm = obj.getStr("SQRXM");
-                        String footer = "鐢宠浜猴細"+sqrxm + "     瀹℃牳鍖诲笀锛�"+shysqm+"     "+bgysqm;
-                        ByteArrayOutputStream outputStream = makeJcPDFByteArrayStream(xm, xb, nl, jcks, zyh, ch, sjks, jcsb, jch, jcxm, ms, ts, null,footer);
-                        jianchas.add(outputStream);
-                    }
-                }
-            }
-            document1.close();
-            pdfWriter.close();
-            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();
-            }
-            byteArrayOutputStream1.close();
-            document.close();
-            copy.close();
-            reader.close();
-            String outputFileName1 = userId + tjNumber + tjCustomer.getCusName() + "_鎶ュ憡.pdf";
-            // 鏂囦欢閰嶇疆
-//            String outputPath1 = "/Users/chacca/寮�鍙戠浉鍏�/浠g爜/";
-            String outputPath1 = value+"\\";
-            File file = new File(outputPath1 + outputFileName1);
-            BufferedOutputStream outputStream = new BufferedOutputStream(new FileOutputStream(file));
-            outputStream.write(finalOutPut.toByteArray());
-            outputStream.flush();
-            outputStream.close();
-            finalOutPut.close();
-            reader.close();
-            // 淇濆瓨鏁版嵁
-            TjReport tjReport = new TjReport();
-            tjReport.setTjNumber(String.valueOf(tjNumber));
-            tjReport.setPath(urlValue + outputFileName1);
-            String pdfBinary = getPDFBinary(outputPath1 + outputFileName1);
-            tjReport.setReport(pdfBinary);
-            tjReport.setType("浣撴鎶ュ憡");
-            tjReport.setPrint("pdf");
-            tjReportService.save(tjReport);
-            //淇敼order琛ㄤ腑鐨勬墦鍗版姤鍛婃椂闂翠负褰撳墠鏃堕棿
-            LambdaUpdateWrapper<TjOrder> updateWrapper = new LambdaUpdateWrapper<>();
-            updateWrapper.eq(TjOrder::getTjNumber, tjNumber);
-            updateWrapper.set(TjOrder::getReportTime, new Date());
-            updateWrapper.set(TjOrder::getPrintLastTime, new Date());
-            updateWrapper.set(TjOrder::getDownloadLastTime, new Date());
-            updateWrapper.set(TjOrder::getStatus, TjConstants.TJ_END);
-            tjOrderService.update(updateWrapper);
-        } catch (IOException | DocumentException e) {
-            e.printStackTrace();
-            return false;
-        }
-        return true;
-    }
-
     /**
      * 缁勫悎闈炲寲楠岄」鐩姤鍛婃暟鎹�
+     *
      * @param tjNumber
      * @param printReport
      * @param one
      * @param customer
      */
-    private void notHuaYanData(String tjNumber, Map<TjOrderRemark, List<TjPdfVO>> printReport,TjOrder one,TjCustomer customer) {
-        LambdaQueryWrapper<TjOrderRemark> wqq = new LambdaQueryWrapper<>();
-        wqq.eq(TjOrderRemark::getTjNumber, tjNumber);
-        wqq.ne(TjOrderRemark::getDeptId, "241");
-        wqq.in(TjOrderRemark::getDeptId, "269", "270", "253", "254", "255", "257", "251", "271");
-        wqq.notIn(TjOrderRemark::getProId, projectService.getNneedReprotProId());
-        List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.list(wqq);
+    private void notHuaYanData(String tjNumber, Map<TjOrderRemark, List<TjPdfVO>> printReport, TjOrder one, TjCustomer customer) {
+//        LambdaQueryWrapper<TjOrderRemark> wqq = new LambdaQueryWrapper<>();
+//        wqq.eq(TjOrderRemark::getTjNumber, tjNumber);
+//        wqq.ne(TjOrderRemark::getDeptId, "241");
+//        wqq.in(TjOrderRemark::getDeptId, "269", "270", "253", "254", "255", "257");
+//        wqq.notIn(TjOrderRemark::getProId, projectService.getNneedReprotProId());
+//        List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.list(wqq);
+        List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.notHuaYanData(tjNumber);
         for (TjOrderRemark tjOrderRemark : tjOrderRemarks) {
             printReport.put(tjOrderRemark, null);
         }
@@ -1117,61 +843,21 @@
             List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.getDetailByOrderIdAndParId(one.getOrderId(), entry.getKey().getProId());
             for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
                 TjProject tjProject = projectService.getById(tjOrderDetail.getProId());
-                if (null != tjProject) {
+                if (null != tjProject && tjProject.getNeedReport().equals("Y")) {
                     tjOrderDetail.setProject(tjProject);
-                }
-                if (tjOrderDetail.getProject().getProParentId().equals(entry.getKey().getProId())) {
-                    LambdaQueryWrapper<TjStandard> wq6 = new LambdaQueryWrapper<>();
-                    wq6.eq(TjStandard::getProId, tjOrderDetail.getProId());
-                    List<TjStandard> list2 = tjStandardService.list(wq6);
-                    if (list2.size() == 0) {
-                        TjStandard s = new TjStandard();
-                        s.setCompany(" ");
-                        s.setTjStandardLtValue(" ");
-                        s.setTjStandardGtValue(" ");
-                        tjOrderDetail.setStandard(s);
-                    } else if (list2.size() == 1) {
-                        tjOrderDetail.setStandard(list2.get(0));
-                    } else {
-                        Long cusSex = customer.getCusSex();
-                        Date cusBrithday = customer.getCusBrithday();
-                        int age = DateUtil.ageOfNow(cusBrithday);
-                        for (TjStandard tjStandard : list2) {
-                            LambdaQueryWrapper<TjStandard> wq8 = new LambdaQueryWrapper<>();
-                            if (tjStandard.getTjSex() != null) {
-                                wq8.eq(TjStandard::getTjSex, cusSex);
-                            }
-                            if (tjStandard.getTjType() != null) {
-                                wq8.eq(TjStandard::getTjType, StringUtils.getAgeType(age));
-                            }
-                            TjStandard standard = tjStandardService.getOne(wq8);
-                            tjOrderDetail.setStandard(standard);
-                        }
-                    }
-                    TjPdfVO tjPdfVO = new TjPdfVO();
-                    tjPdfVO.setProName(tjOrderDetail.getProject().getProName());
-                    tjPdfVO.setProResult(tjOrderDetail.getProResult());
-                    tjPdfVO.setExc(tjOrderDetail.getExceptionDesc());
-                    if (tjOrderDetail.getStandard() != null) {
-                        //鍗曚綅
-                        if (tjOrderDetail.getStandard().getCompany() == null) {
-                            tjPdfVO.setCompany(" ");
+
+                    if (tjOrderDetail.getProject().getProParentId().equals(entry.getKey().getProId())) {
+                        TjPdfVO tjPdfVO = new TjPdfVO();
+                        tjPdfVO.setProName(tjOrderDetail.getProject().getProName());
+                        tjPdfVO.setProResult(tjOrderDetail.getProResult());
+                        tjPdfVO.setExc(tjOrderDetail.getExceptionDesc());
+                        if (null != tjProject.getProMetering()) {
+                            tjPdfVO.setCompany(tjProject.getProMetering());
                         } else {
-                            tjPdfVO.setCompany(tjOrderDetail.getStandard().getCompany());
+                            tjPdfVO.setCompany("/");
                         }
-                        // TODO 璁剧疆鍗曚綅
-                        //鏈�澶у�煎拰鏈�灏忓��
-                        String tjStandardGtValue = tjOrderDetail.getStandard().getTjStandardGtValue();
-                        String tjStandardLtValue = tjOrderDetail.getStandard().getTjStandardLtValue();
-                        if (tjStandardGtValue == null) {
-                            tjStandardGtValue = " ";
-                        }
-                        if (tjStandardLtValue == null) {
-                            tjStandardLtValue = " ";
-                        }
-                        tjPdfVO.setStandardValue(tjStandardLtValue + "-" + tjStandardGtValue);
+                        tjPdfVOS.add(tjPdfVO);
                     }
-                    tjPdfVOS.add(tjPdfVO);
                 }
             }
             printReport.put(entry.getKey(), tjPdfVOS);
@@ -1221,7 +907,6 @@
     }
 
     /**
-     *
      * @param document
      * @param titleName
      * @param titles
@@ -1300,7 +985,7 @@
         document.add(table);
     }
 
-    private static void addJianYanTable(Document document, String titleName, String[] titles, float[] titlesWidth, ArrayList<List<String >> lists) throws DocumentException {
+    private static void addJianYanTable(Document document, String titleName, String[] titles, float[] titlesWidth, ArrayList<List<String>> lists) throws DocumentException {
         Font titleFont = PdfUtils.setFont(9);
         Paragraph paragraph = new Paragraph(titleName, titleFont);
         // 璁剧疆鏂囧瓧灞呬腑
@@ -1343,6 +1028,7 @@
 
     /**
      * 鍒涘缓妫�鏌df
+     *
      * @param xm
      * @param xb
      * @param nl
@@ -1359,12 +1045,17 @@
      * @param footer
      * @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) {
+    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) {
         try {
             Document document = new Document(PageSize.A4);
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
             PdfWriter writer = PdfWriter.getInstance(document, baos);
-            writer.setPageEvent(new Footer(footer));
+            if (footer != null) {
+                writer.setPageEvent(new Footer(footer));
+            } else {
+                writer.setPageEvent(new Footer(elements));
+            }
             document.open();
             document.setMargins(70, 70, 40, 40);
 
@@ -1375,7 +1066,7 @@
             table1.setSpacingAfter(10f);
 
             Font titleFont = PdfUtils.setFont(12);
-            PdfPCell mergedCell = new PdfPCell(new Phrase("娉� 宸� 鍘� 浜� 姘� 鍖� 闄�", titleFont));
+            PdfPCell mergedCell = new PdfPCell(new Phrase("闄曞仴鍖绘緞鍚堢熆鍔″眬涓績鍖婚櫌", titleFont));
             mergedCell.setBorder(Rectangle.NO_BORDER);
             mergedCell.setColspan(10);
             mergedCell.setHorizontalAlignment(Element.ALIGN_CENTER);
@@ -1527,7 +1218,7 @@
             float[] columnWidths = {0.8f, 0.8f, 0.8f, 0.8f, 0.1f, 0.1f, 0.8f, 0.8f, 0.8f, 0.8f};
             table2.setWidths(columnWidths);
 
-            if(files != null){
+            if (files != null) {
                 int imageIndex = 0;
                 while (imageIndex < files.length) {
                     // 绗竴寮犲浘鐗囧崰浣嶇
@@ -1617,8 +1308,8 @@
             return baos;
         } catch (DocumentException | IOException e) {
             e.printStackTrace();
+            return null;
         }
-        return null;
     }
 
     private static PdfPCell createImageCell(String path) throws IOException, BadElementException {
@@ -1635,9 +1326,14 @@
     static class Footer extends PdfPageEventHelper {
         private String footerText;
         private Font footerFont = PdfUtils.setFont(10);
+        private Paragraph paragraph;
 
         public Footer(String footerText) {
             this.footerText = footerText;
+        }
+
+        public Footer(Paragraph paragraph){
+            this.paragraph = paragraph;
         }
 
         @Override
@@ -1647,9 +1343,11 @@
             footer.setWidthPercentage(100);
             footer.getDefaultCell().setBorder(Rectangle.NO_BORDER);
             footer.getDefaultCell().setHorizontalAlignment(Element.ALIGN_CENTER);
-            footer.addCell(new Phrase(footerText, footerFont));
-
-            footer.writeSelectedRows(0, -1, 36, 36, writer.getDirectContent());
+            if (footerText != null)
+                footer.addCell(new Phrase(footerText, footerFont));
+            if (paragraph != null)
+                footer.addCell(paragraph);
+            footer.writeSelectedRows(0, -1, 36, 50, writer.getDirectContent());
         }
     }
 }

--
Gitblit v1.8.0