From 7fc564f30d27f47158061e015511595eebefd3b0 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 20 五月 2025 20:22:39 +0800
Subject: [PATCH] zjh20250520

---
 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjReportServiceImpl.java |  452 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 226 insertions(+), 226 deletions(-)

diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjReportServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjReportServiceImpl.java
index 337ad2d..80d2292 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjReportServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjReportServiceImpl.java
@@ -145,234 +145,234 @@
         return tjReportMapper.deleteTjReportByReId(reId);
     }
 
-    @Value("${path.filePath}")
+//    @Value("${path.filePath}")
     private String value;
 
-    @Override
-    public AjaxResult getTjReport(String tjNumber) {
-        //鏍规嵁浣撴鍙�
-        //鍦╫rder閲屾煡璇綋妫�鐘舵�� 鍒ゆ柇浣撴鏄惁瀹屾垚
-        LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
-        wq.eq(TjOrder::getTjNumber, tjNumber);
-        TjOrder tjOrder = tjOrderService.getOne(wq);
-        if (null != tjOrder) {
-            Integer checkStatus = tjOrder.getCheckStatus();
-            if (checkStatus == 1) {
-                //鏌ュ嚭瀹㈡埛涓汉淇℃伅  閫氳繃user_id
-                LambdaQueryWrapper<TjCustomer> wq1 = new LambdaQueryWrapper<>();
-                wq1.eq(TjCustomer::getCusId, tjOrder.getUserId());
-                TjCustomer tjCustomer = tjCustomerService.getOne(wq1);
-
-                //鏍规嵁order琛ㄧ殑鍗曚綅id鏌ュ嚭鍗曚綅鍚嶇О
-                LambdaQueryWrapper<DictComp> wq111 = new LambdaQueryWrapper<>();
-                wq111.eq(DictComp::getDrugManufacturerId, tjOrder.getFirmId());
-                DictComp dictComp = dictCompService.getOne(wq111);
-
-                //鏌ュ嚭璁板綍璇︽儏  閫氳繃order_id
-                LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>();
-                wq2.eq(TjOrderDetail::getOrderId, tjOrder.getOrderId());
-                List<TjOrderDetail> list = tjOrderDetailService.list(wq2);
-
-                //閬嶅巻瀹㈡埛鎵�閫夌殑椤圭洰(鍖呭惈瀛愰」鐖堕」)
-                for (TjOrderDetail tjOrderDetail : list) {
-                    //鏌ュ嚭鍗曚釜椤圭洰瀵硅薄 璧嬪�肩粰瀵硅薄灞炴��
-                    TjProject tjProject = projectService.selectTjProjectByProId(tjOrderDetail.getProId());
-                    tjOrderDetail.setProject(tjProject);
-                }
-                /*
-                 * ====================绗竴閮ㄥ垎 濉厖浣撴鎶ュ憡灏侀潰妯℃澘
-                 * */
-                //鏍规嵁鏁版嵁搴撲腑鐨勬ā鏉夸簩杩涘埗鏂囦欢  杞琾df  鍒涘缓鏂囦欢澶�  灏唒df鏀捐繘鏂囦欢澶�
-                LambdaQueryWrapper<TjReportTemplate> tjReportTemplateLambdaQueryWrapper = new LambdaQueryWrapper<>();
-                tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, 1);
-                TjReportTemplate one1 = reportTemplateService.getOne(tjReportTemplateLambdaQueryWrapper);
-                String template = one1.getTemplate();  //鎷垮埌浜岃繘鍒�
-
-                //鏈湴鍒涘缓涓存椂鏂囦欢澶�
-                //String userId ="10000";
-                //褰撳墠鐧诲綍鐨勪汉宸ュ彿
-                String userId = SecurityUtils.getLoginUser().getUsername();
-                //浜岃繘鍒惰浆pdf 瀛樺偍鍦ㄤ复鏃舵枃浠跺す涓�
-                PDFBinaryUtil.base64StringToPDF(template, FileUtil.mkdir(value).getPath() + File.separator + userId + "浣撴鎶ュ憡灏侀潰妯℃澘.pdf");
-
-                // 妯℃澘鏂囦欢璺緞
-                String inputFileName = value + File.separator + userId + "浣撴鎶ュ憡灏侀潰妯℃澘.pdf";
-                // 鐢熸垚鐨勬枃浠惰矾寰�
-                String outputFileName = value + File.separator + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf";
-                OutputStream os = null;
-                PdfStamper ps = null;
-                PdfReader reader = null;
-                File file = new File(outputFileName);
-                try {
-                    os = Files.newOutputStream(file.toPath());
-                    // 璇诲叆pdf琛ㄥ崟
-                    reader = new PdfReader(inputFileName);
-                    // 鏍规嵁琛ㄥ崟鐢熸垚涓�涓柊鐨刾df
-                    ps = new PdfStamper(reader, os);
-                    // 鑾峰彇pdf琛ㄥ崟
-                    AcroFields form = ps.getAcroFields();
-                    // 缁欒〃鍗曟坊鍔犱腑鏂囧瓧浣�
-                    //String prefixFont = "C:Windows\\Fonts" + File.separator + "STFANGSO.TTF";
-                    //璇ュ瓧浣撻�犳垚绫诲瀷涓嶅潎鍖�锛屼絾鏄痯df杞浘鐗囦笉涔辩爜
-                    //BaseFont bf = BaseFont.createFont("C:Windows\\Fonts\\simfang.ttf", BaseFont.IDENTITY_H, BaseFont.EMBEDDED);
-                    BaseFont bf = BaseFont.createFont("STSong-Light", "UniGB-UCS2-H", BaseFont.NOT_EMBEDDED);
-                    form.addSubstitutionFont(bf);
-
-                    // 濉厖鏁版嵁缁欒〃鏍�
-                    Map<String, Object> data = new HashMap<>();
-                    data.put("name", tjCustomer.getCusName());
-                    //濉厖鎬у埆锛氬垽鏂敺濂�
-                    Long cusSex = tjCustomer.getCusSex();
-                    String sex;
-                    if (cusSex == 0) {
-                        sex = "鐢�";
-                    } else {
-                        sex = "濂�";
-                    }
-                    data.put("sex", sex);
-                    data.put("age", DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
-                    data.put("tjnumber", tjNumber);
-                    data.put("tjdate", DateUtils.parseDateToStr("yyyy/MM/dd", tjOrder.getCreateTime()));
-                    data.put("phone", tjCustomer.getCusPhone());
-                    if (dictComp == null) {
-                        data.put("work", "鏃�");
-                    } else {
-                        data.put("work", dictComp.getCnName());
-                    }
-
-                    data.put("remark", "绀轰緥锛氳韩楂樹綋閲�" +
-                            "\n1銆佸悎鐞嗘帶鍒堕ギ椋燂紝灏戝悆鐐�" +
-                            "\n蹇冪數鍥�" +
-                            "\n璇锋敞鎰忎繚鎸侊紒锛侊紒杩欓噷鏀惧缓璁�/寮傚父鍟ョ殑銆傘�傘�傘�傛垨鎬绘寤鸿" + tjOrder.getCheckAdvice());
-                    // 閬嶅巻data 缁檖df琛ㄥ崟琛ㄦ牸璧嬪��
-                    for (String key : data.keySet()) {
-                        form.setField(key, data.get(key).toString());
-                    }
-                    //璁剧疆涓烘棤娉曠紪杈�
-                    ps.setFormFlattening(true);
-
-                    ps.close();
-                    os.close();
-                    reader.close();
-                    /*
-                     * ==========================绗簩閮ㄥ垎  鐢熸垚椤圭洰璇︽儏
-                     */
-                    //鏂囨。瀵硅薄  瀹炵幇A4绾搁〉闈�
-                    Document document = new Document(PageSize.A4);
-                    //document.setMarginMirroring(true);
-                    //璁剧疆鏂囨。鐨勯〉杈硅窛灏辨槸璺濈椤甸潰杈逛笂鐨勮窛绂伙紝鍒嗗埆涓猴細宸﹁竟璺濓紝鍙宠竟璺濓紝涓婅竟璺濓紝涓嬭竟璺�
-                    document.setMargins(70, 70, 40, 40);
-                    //杩欎釜鏄敓鎴恜df鐨勪綅缃互鍙婂悕绉�
-                    String fileName = value + File.separator + userId + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf";
-                    OutputStream outputStream = Files.newOutputStream(Paths.get(fileName));
-                    PdfWriter pdfWriter = PdfWriter.getInstance(document, outputStream);
-
-                    // 娣诲姞椤电湁/椤佃剼/姘村嵃
-                    pdfWriter.setPageEvent((PdfPageEvent) new MyHeaderFooter());// 椤电湁椤佃剼锛堥渶瑕佹椂璁剧疆锛�
-
-                    //鎵撳紑鏂囨。
-                    document.open();
-
-                    // 鑾峰彇鏁版嵁
-                    Map<TjOrderRemark, List<TjPdfVO>> tjOrderRemarkObjectMap = addTable(tjNumber);
-                    for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : tjOrderRemarkObjectMap.entrySet()) {
-                        List<TjPdfVO> value = entry.getValue();
-                        LambdaQueryWrapper<TjProject> wqqq = new LambdaQueryWrapper<>();
-                        wqqq.eq(TjProject::getProId, entry.getKey().getProId());
-                        TjProject one11 = projectService.getOne(wqqq);
-
-                        String titleName = one11.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 = setTable(headFont, textFont, titles, value);
-
-                        // 濉厖琛ㄦ牸鍐呭
-                        document.add(paragraph);
-                        document.add(table);
-
-                        //鍒ゆ柇澶囨敞鏄惁涓虹┖  绌轰笉鑳芥樉绀簄ull
-                        if (entry.getKey().getRemark() == null) {
-                            entry.getKey().setRemark("");
-                        }
-
-                        //澶囨敞
-                        String remark = "澶囨敞锛�" + entry.getKey().getRemark();
-                        Font remarkFonts = PdfUtils.setFont(9);
-                        Paragraph pp = PdfUtils.setParagraph(remarkFonts, remark);
-                        document.add(pp);
-
-                        //涓绘鍖诲笀
-                        String doctorName = "涓绘鍖诲笀锛�" + entry.getKey().getDoctorName();
-                        Font doctorFonts = PdfUtils.setFont(9);
-                        Paragraph df = PdfUtils.setParagraph(doctorFonts, doctorName);
-                        df.setAlignment(Element.ALIGN_RIGHT);
-                        document.add(df);
-
-                        //鍒嗗壊绾�
-                        LineSeparator objectName = new LineSeparator();
-                        document.add(objectName);
-                    }
-                    /*
-                     * document鍏抽棴鐨勫叾瀹炴槸鏂囦欢鐨勭洃鍚姸鎬侊紝writer鍏抽棴鐨勬槸io娴侊紝writer鍒涘缓鍦╠ocument涔嬪悗
-                     * */
-                    document.close();
-                    pdfWriter.close();
-                    outputStream.close();
-
-                    //=============================== 绗笁閮ㄥ垎  鍚堝苟浣撴鎶ュ憡灏侀潰椤靛拰浣撴鎶ュ憡椤圭洰璇︽儏椤�
-                    String[] files1 = {value + File.separator + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + File.separator + userId + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf"};
-                    String outputPath1 = value + File.separator;
-                    String outputFileName1 = tjNumber + "浣撴鎶ュ憡.pdf";
-
-                    File file1 = new File(outputPath1 + outputFileName1);
-                    List<File> f = new ArrayList<>();
-                    for (String s : files1) {
-                        f.add(new File(s));
-                    }
-                    MergePdf.mergeFileToPDF(f, file1);
-
-                    //============================= 绗洓閮ㄥ垎  灏唒df璺緞瀛樺偍鏁版嵁搴�  鏂囦欢杞簩杩涘埗瀛樺偍鍜屽拰璺緞瀛樺偍
-                    TjReport tjReport = new TjReport();
-                    tjReport.setTjNumber(String.valueOf(tjNumber));
-                    tjReport.setPath(outputPath1 + outputFileName1);
-                    String pdfBinary = getPDFBinary(outputPath1 + outputFileName1);
-                    tjReport.setReport(pdfBinary);
-                    tjReportService.save(tjReport);
-
-                    //灏嗕复鏃舵枃浠跺す涓殑鍥涗釜鏂囦欢鍒犻櫎
-                    //FileUtil.del(value+"\\"+tjNumber + "浣撴鎶ュ憡.pdf");
-                    FileUtil.del(value + File.separator + userId + "浣撴鎶ュ憡灏侀潰妯℃澘.pdf");
-                    FileUtil.del(value + File.separator + userId + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf");
-                    FileUtil.del(value + File.separator + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf");
-
-                    //淇敼order琛ㄤ腑鐨勬墦鍗版姤鍛婃椂闂翠负褰撳墠鏃堕棿
-                    LambdaUpdateWrapper<TjOrder> updateWrapper = new LambdaUpdateWrapper<>();
-                    updateWrapper.eq(TjOrder::getTjNumber, tjNumber);
-                    updateWrapper.set(TjOrder::getReportTime, new Date());
-                    tjOrderService.update(updateWrapper);
-
-
-                    return AjaxResult.success("宸茬敓鎴愭姤鍛婏紒鍙洿鎺ョ偣鍑婚瑙堬紒");
-
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    return AjaxResult.error("PDF瀵煎嚭澶辫触");
-                }
-            }
-        }
-        return null;
-    }
+//    @Override
+//    public AjaxResult getTjReport(String tjNumber) {
+//        //鏍规嵁浣撴鍙�
+//        //鍦╫rder閲屾煡璇綋妫�鐘舵�� 鍒ゆ柇浣撴鏄惁瀹屾垚
+//        LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
+//        wq.eq(TjOrder::getTjNumber, tjNumber);
+//        TjOrder tjOrder = tjOrderService.getOne(wq);
+//        if (null != tjOrder) {
+//            Integer checkStatus = tjOrder.getCheckStatus();
+//            if (checkStatus == 1) {
+//                //鏌ュ嚭瀹㈡埛涓汉淇℃伅  閫氳繃user_id
+//                LambdaQueryWrapper<TjCustomer> wq1 = new LambdaQueryWrapper<>();
+//                wq1.eq(TjCustomer::getCusId, tjOrder.getUserId());
+//                TjCustomer tjCustomer = tjCustomerService.getOne(wq1);
+//
+//                //鏍规嵁order琛ㄧ殑鍗曚綅id鏌ュ嚭鍗曚綅鍚嶇О
+//                LambdaQueryWrapper<DictComp> wq111 = new LambdaQueryWrapper<>();
+//                wq111.eq(DictComp::getDrugManufacturerId, tjOrder.getFirmId());
+//                DictComp dictComp = dictCompService.getOne(wq111);
+//
+//                //鏌ュ嚭璁板綍璇︽儏  閫氳繃order_id
+//                LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>();
+//                wq2.eq(TjOrderDetail::getOrderId, tjOrder.getOrderId());
+//                List<TjOrderDetail> list = tjOrderDetailService.list(wq2);
+//
+//                //閬嶅巻瀹㈡埛鎵�閫夌殑椤圭洰(鍖呭惈瀛愰」鐖堕」)
+//                for (TjOrderDetail tjOrderDetail : list) {
+//                    //鏌ュ嚭鍗曚釜椤圭洰瀵硅薄 璧嬪�肩粰瀵硅薄灞炴��
+//                    TjProject tjProject = projectService.selectTjProjectByProId(tjOrderDetail.getProId());
+//                    tjOrderDetail.setProject(tjProject);
+//                }
+//                /*
+//                 * ====================绗竴閮ㄥ垎 濉厖浣撴鎶ュ憡灏侀潰妯℃澘
+//                 * */
+//                //鏍规嵁鏁版嵁搴撲腑鐨勬ā鏉夸簩杩涘埗鏂囦欢  杞琾df  鍒涘缓鏂囦欢澶�  灏唒df鏀捐繘鏂囦欢澶�
+//                LambdaQueryWrapper<TjReportTemplate> tjReportTemplateLambdaQueryWrapper = new LambdaQueryWrapper<>();
+//                tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, 1);
+//                TjReportTemplate one1 = reportTemplateService.getOne(tjReportTemplateLambdaQueryWrapper);
+//                String template = one1.getTemplate();  //鎷垮埌浜岃繘鍒�
+//
+//                //鏈湴鍒涘缓涓存椂鏂囦欢澶�
+//                //String userId ="10000";
+//                //褰撳墠鐧诲綍鐨勪汉宸ュ彿
+//                String userId = SecurityUtils.getLoginUser().getUsername();
+//                //浜岃繘鍒惰浆pdf 瀛樺偍鍦ㄤ复鏃舵枃浠跺す涓�
+//                PDFBinaryUtil.base64StringToPDF(template, FileUtil.mkdir(value).getPath() + File.separator + userId + "浣撴鎶ュ憡灏侀潰妯℃澘.pdf");
+//
+//                // 妯℃澘鏂囦欢璺緞
+//                String inputFileName = value + File.separator + userId + "浣撴鎶ュ憡灏侀潰妯℃澘.pdf";
+//                // 鐢熸垚鐨勬枃浠惰矾寰�
+//                String outputFileName = value + File.separator + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf";
+//                OutputStream os = null;
+//                PdfStamper ps = null;
+//                PdfReader reader = null;
+//                File file = new File(outputFileName);
+//                try {
+//                    os = Files.newOutputStream(file.toPath());
+//                    // 璇诲叆pdf琛ㄥ崟
+//                    reader = new PdfReader(inputFileName);
+//                    // 鏍规嵁琛ㄥ崟鐢熸垚涓�涓柊鐨刾df
+//                    ps = new PdfStamper(reader, os);
+//                    // 鑾峰彇pdf琛ㄥ崟
+//                    AcroFields form = ps.getAcroFields();
+//                    // 缁欒〃鍗曟坊鍔犱腑鏂囧瓧浣�
+//                    //String prefixFont = "C:Windows\\Fonts" + File.separator + "STFANGSO.TTF";
+//                    //璇ュ瓧浣撻�犳垚绫诲瀷涓嶅潎鍖�锛屼絾鏄痯df杞浘鐗囦笉涔辩爜
+//                    //BaseFont bf = BaseFont.createFont("C:Windows\\Fonts\\simfang.ttf", BaseFont.IDENTITY_H, BaseFont.EMBEDDED);
+//                    BaseFont bf = BaseFont.createFont("STSong-Light", "UniGB-UCS2-H", BaseFont.NOT_EMBEDDED);
+//                    form.addSubstitutionFont(bf);
+//
+//                    // 濉厖鏁版嵁缁欒〃鏍�
+//                    Map<String, Object> data = new HashMap<>();
+//                    data.put("name", tjCustomer.getCusName());
+//                    //濉厖鎬у埆锛氬垽鏂敺濂�
+//                    Long cusSex = tjCustomer.getCusSex();
+//                    String sex;
+//                    if (cusSex == 0) {
+//                        sex = "鐢�";
+//                    } else {
+//                        sex = "濂�";
+//                    }
+//                    data.put("sex", sex);
+//                    data.put("age", DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
+//                    data.put("tjnumber", tjNumber);
+//                    data.put("tjdate", DateUtils.parseDateToStr("yyyy/MM/dd", tjOrder.getCreateTime()));
+//                    data.put("phone", tjCustomer.getCusPhone());
+//                    if (dictComp == null) {
+//                        data.put("work", "鏃�");
+//                    } else {
+//                        data.put("work", dictComp.getCnName());
+//                    }
+//
+//                    data.put("remark", "绀轰緥锛氳韩楂樹綋閲�" +
+//                            "\n1銆佸悎鐞嗘帶鍒堕ギ椋燂紝灏戝悆鐐�" +
+//                            "\n蹇冪數鍥�" +
+//                            "\n璇锋敞鎰忎繚鎸侊紒锛侊紒杩欓噷鏀惧缓璁�/寮傚父鍟ョ殑銆傘�傘�傘�傛垨鎬绘寤鸿" + tjOrder.getCheckAdvice());
+//                    // 閬嶅巻data 缁檖df琛ㄥ崟琛ㄦ牸璧嬪��
+//                    for (String key : data.keySet()) {
+//                        form.setField(key, data.get(key).toString());
+//                    }
+//                    //璁剧疆涓烘棤娉曠紪杈�
+//                    ps.setFormFlattening(true);
+//
+//                    ps.close();
+//                    os.close();
+//                    reader.close();
+//                    /*
+//                     * ==========================绗簩閮ㄥ垎  鐢熸垚椤圭洰璇︽儏
+//                     */
+//                    //鏂囨。瀵硅薄  瀹炵幇A4绾搁〉闈�
+//                    Document document = new Document(PageSize.A4);
+//                    //document.setMarginMirroring(true);
+//                    //璁剧疆鏂囨。鐨勯〉杈硅窛灏辨槸璺濈椤甸潰杈逛笂鐨勮窛绂伙紝鍒嗗埆涓猴細宸﹁竟璺濓紝鍙宠竟璺濓紝涓婅竟璺濓紝涓嬭竟璺�
+//                    document.setMargins(70, 70, 40, 40);
+//                    //杩欎釜鏄敓鎴恜df鐨勪綅缃互鍙婂悕绉�
+//                    String fileName = value + File.separator + userId + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf";
+//                    OutputStream outputStream = Files.newOutputStream(Paths.get(fileName));
+//                    PdfWriter pdfWriter = PdfWriter.getInstance(document, outputStream);
+//
+//                    // 娣诲姞椤电湁/椤佃剼/姘村嵃
+//                    pdfWriter.setPageEvent((PdfPageEvent) new MyHeaderFooter());// 椤电湁椤佃剼锛堥渶瑕佹椂璁剧疆锛�
+//
+//                    //鎵撳紑鏂囨。
+//                    document.open();
+//
+//                    // 鑾峰彇鏁版嵁
+//                    Map<TjOrderRemark, List<TjPdfVO>> tjOrderRemarkObjectMap = addTable(tjNumber);
+//                    for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : tjOrderRemarkObjectMap.entrySet()) {
+//                        List<TjPdfVO> value = entry.getValue();
+//                        LambdaQueryWrapper<TjProject> wqqq = new LambdaQueryWrapper<>();
+//                        wqqq.eq(TjProject::getProId, entry.getKey().getProId());
+//                        TjProject one11 = projectService.getOne(wqqq);
+//
+//                        String titleName = one11.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 = setTable(headFont, textFont, titles, value);
+//
+//                        // 濉厖琛ㄦ牸鍐呭
+//                        document.add(paragraph);
+//                        document.add(table);
+//
+//                        //鍒ゆ柇澶囨敞鏄惁涓虹┖  绌轰笉鑳芥樉绀簄ull
+//                        if (entry.getKey().getRemark() == null) {
+//                            entry.getKey().setRemark("");
+//                        }
+//
+//                        //澶囨敞
+//                        String remark = "澶囨敞锛�" + entry.getKey().getRemark();
+//                        Font remarkFonts = PdfUtils.setFont(9);
+//                        Paragraph pp = PdfUtils.setParagraph(remarkFonts, remark);
+//                        document.add(pp);
+//
+//                        //涓绘鍖诲笀
+//                        String doctorName = "涓绘鍖诲笀锛�" + entry.getKey().getDoctorName();
+//                        Font doctorFonts = PdfUtils.setFont(9);
+//                        Paragraph df = PdfUtils.setParagraph(doctorFonts, doctorName);
+//                        df.setAlignment(Element.ALIGN_RIGHT);
+//                        document.add(df);
+//
+//                        //鍒嗗壊绾�
+//                        LineSeparator objectName = new LineSeparator();
+//                        document.add(objectName);
+//                    }
+//                    /*
+//                     * document鍏抽棴鐨勫叾瀹炴槸鏂囦欢鐨勭洃鍚姸鎬侊紝writer鍏抽棴鐨勬槸io娴侊紝writer鍒涘缓鍦╠ocument涔嬪悗
+//                     * */
+//                    document.close();
+//                    pdfWriter.close();
+//                    outputStream.close();
+//
+//                    //=============================== 绗笁閮ㄥ垎  鍚堝苟浣撴鎶ュ憡灏侀潰椤靛拰浣撴鎶ュ憡椤圭洰璇︽儏椤�
+//                    String[] files1 = {value + File.separator + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + File.separator + userId + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf"};
+//                    String outputPath1 = value + File.separator;
+//                    String outputFileName1 = tjNumber + "浣撴鎶ュ憡.pdf";
+//
+//                    File file1 = new File(outputPath1 + outputFileName1);
+//                    List<File> f = new ArrayList<>();
+//                    for (String s : files1) {
+//                        f.add(new File(s));
+//                    }
+//                    MergePdf.mergeFileToPDF(f, file1);
+//
+//                    //============================= 绗洓閮ㄥ垎  灏唒df璺緞瀛樺偍鏁版嵁搴�  鏂囦欢杞簩杩涘埗瀛樺偍鍜屽拰璺緞瀛樺偍
+//                    TjReport tjReport = new TjReport();
+//                    tjReport.setTjNumber(String.valueOf(tjNumber));
+//                    tjReport.setPath(outputPath1 + outputFileName1);
+//                    String pdfBinary = getPDFBinary(outputPath1 + outputFileName1);
+//                    tjReport.setReport(pdfBinary);
+//                    tjReportService.save(tjReport);
+//
+//                    //灏嗕复鏃舵枃浠跺す涓殑鍥涗釜鏂囦欢鍒犻櫎
+//                    //FileUtil.del(value+"\\"+tjNumber + "浣撴鎶ュ憡.pdf");
+//                    FileUtil.del(value + File.separator + userId + "浣撴鎶ュ憡灏侀潰妯℃澘.pdf");
+//                    FileUtil.del(value + File.separator + userId + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf");
+//                    FileUtil.del(value + File.separator + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf");
+//
+//                    //淇敼order琛ㄤ腑鐨勬墦鍗版姤鍛婃椂闂翠负褰撳墠鏃堕棿
+//                    LambdaUpdateWrapper<TjOrder> updateWrapper = new LambdaUpdateWrapper<>();
+//                    updateWrapper.eq(TjOrder::getTjNumber, tjNumber);
+//                    updateWrapper.set(TjOrder::getReportTime, new Date());
+//                    tjOrderService.update(updateWrapper);
+//
+//
+//                    return AjaxResult.success("宸茬敓鎴愭姤鍛婏紒鍙洿鎺ョ偣鍑婚瑙堬紒");
+//
+//                } catch (Exception e) {
+//                    e.printStackTrace();
+//                    return AjaxResult.error("PDF瀵煎嚭澶辫触");
+//                }
+//            }
+//        }
+//        return null;
+//    }
 
     @Override
     public Integer getSelectCount(Wrapper<TjReport> queryWrapper) {

--
Gitblit v1.8.0