pdf生成增加失败撤回

zhaowenxuan

2025-04-30 aacaa3d2daafbd97ab008908b9f2fe9ed6c1f713

 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java

@@ -2268,7 +2268,7 @@
                                paragraph.setLeading(5f);
                                document1.add(ppp);
                                if (StrUtil.isNotBlank(entry.getKey().getRemark())) {
                                    ppp = new Paragraph("结论：" + entry.getKey().getRemark(), remarkFonts);
                                    ppp = new Paragraph("结论：" + entry.getKey().getRemark().replaceAll("null",""), remarkFonts);
                                    paragraph.setAlignment(Element.ALIGN_LEFT);
                                    paragraph.setLeading(5f);
                                    document1.add(ppp);
@@ -2387,7 +2387,7 @@
                                    paragraph.setLeading(5f);
                                    document1.add(ppp);
                                    if (StrUtil.isNotBlank(entry.getKey().getRemark())) {
                                        ppp = new Paragraph("结论：" + entry.getKey().getRemark(), remarkFonts);
                                        ppp = new Paragraph("结论：" + entry.getKey().getRemark().replaceAll("null",""), remarkFonts);
                                        paragraph.setAlignment(Element.ALIGN_LEFT);
                                        paragraph.setLeading(5f);
                                        document1.add(ppp);
@@ -2510,7 +2510,7 @@
                                paragraph.setLeading(5f);
                                document1.add(ppp);
                                if (StrUtil.isNotBlank(entry.getKey().getRemark())) {
                                    ppp = new Paragraph("结论：" + entry.getKey().getRemark(), remarkFonts);
                                    ppp = new Paragraph("结论：" + entry.getKey().getRemark().replaceAll("null",""), remarkFonts);
                                    paragraph.setAlignment(Element.ALIGN_LEFT);
                                    paragraph.setLeading(5f);
                                    document1.add(ppp);
@@ -2529,16 +2529,34 @@
                            if (isPacs) {
                                Paragraph pp;
                                Paragraph ppp;
                                if (StrUtil.isNotBlank(value.get(0).getSj()) && StrUtil.isNotBlank(value.get(0).getProResult())) {
                                    pp = PdfUtils.setParagraph(remarkFonts, "检查所见：");
                                    document1.add(pp);
                                    ppp = new Paragraph(value.get(0).getSj() != null ? value.get(0).getSj() : value.get(0).getProResult(), remarkFonts);
                                    paragraph.setAlignment(Element.ALIGN_LEFT);
                                    paragraph.setLeading(5f);
                                    document1.add(ppp);
                                String key = sysConfigService.selectConfigByKey("makepdfuseorderdetailproresult");
                                if (StrUtil.isNotBlank(key) && !key.equals("Y")){
                                    if (StrUtil.isNotBlank(value.get(0).getSj())) {
                                        pp = PdfUtils.setParagraph(remarkFonts, "检查所见：");
                                        document1.add(pp);
                                        ppp = new Paragraph(value.get(0).getSj(), remarkFonts);
                                        paragraph.setAlignment(Element.ALIGN_LEFT);
                                        paragraph.setLeading(5f);
                                        document1.add(ppp);
                                    }
                                }else{
                                    if (StrUtil.isNotBlank(value.get(0).getSj()) && StrUtil.isNotBlank(value.get(0).getProResult())) {
                                        pp = PdfUtils.setParagraph(remarkFonts, "检查所见：");
                                        document1.add(pp);
                                        ppp = new Paragraph(value.get(0).getSj() != null ? value.get(0).getSj() : value.get(0).getProResult(), remarkFonts);
                                        paragraph.setAlignment(Element.ALIGN_LEFT);
                                        paragraph.setLeading(5f);
                                        document1.add(ppp);
                                    }
                                }
                                pp = PdfUtils.setParagraph(remarkFonts, "检查提示："+ (value.get(0).getTs() != null ? value.get(0).getTs() : value.get(0).getProResult()));
//                                pp = PdfUtils.setParagraph(remarkFonts, "检查提示："+ (value.get(0).getTs() != null ? value.get(0).getTs() : value.get(0).getProResult()));
//                                document1.add(pp);
                                pp = PdfUtils.setParagraph(remarkFonts, "检查提示：");
                                document1.add(pp);
                                ppp = new Paragraph((value.get(0).getTs() != null ? value.get(0).getTs() : value.get(0).getProResult()), remarkFonts);
                                paragraph.setAlignment(Element.ALIGN_LEFT);
                                paragraph.setLeading(5f);
                                document1.add(ppp);
//                                ppp = new Paragraph(value.get(0).getTs() != null ? value.get(0).getTs() : value.get(0).getProResult(), remarkFonts);
//                                paragraph.setAlignment(Element.ALIGN_LEFT);
//                                paragraph.setLeading(5f);
@@ -2576,7 +2594,7 @@
                                    paragraph.setLeading(5f);
                                    document1.add(ppp);
                                    if (StrUtil.isNotBlank(entry.getKey().getRemark())) {
                                        ppp = new Paragraph("结论：" + entry.getKey().getRemark(), remarkFonts);
                                        ppp = new Paragraph("结论：" + entry.getKey().getRemark().replaceAll("null",""), remarkFonts);
                                        paragraph.setAlignment(Element.ALIGN_LEFT);
                                        paragraph.setLeading(5f);
                                        document1.add(ppp);
@@ -3023,6 +3041,7 @@
                        }
                        tjPdfVO.setProId(String.valueOf(tjOrderDetail.getProject().getProId()));
                        tjPdfVO.setPid(String.valueOf(tjProject.getProParentId()));
                        tjPdfVO.setXh(tjProject.getXh());
//                        LambdaQueryWrapper<LtkjExamJcbgd> wrapper = new LambdaQueryWrapper<>();
//                        wrapper.eq(LtkjExamJcbgd::getTjh, tjNumber);
//                        wrapper.eq(LtkjExamJcbgd::getXmdm, String.valueOf(tjOrderDetail.getProject().getProParentId()));
@@ -3031,12 +3050,13 @@
                }
            }
            if(!tjPdfVOS.isEmpty()){
                tjPdfVOS=tjPdfVOS.stream().sorted(Comparator.comparing(TjPdfVO::getProName, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
                tjPdfVOS = tjPdfVOS.stream()
                        .sorted(Comparator.comparingInt(
                                tjPdfVO -> tjPdfVO.getProName().length() // 根据名字的长度排序
                        ))
                        .collect(Collectors.toList());
//                tjPdfVOS=tjPdfVOS.stream().sorted(Comparator.comparing(TjPdfVO::getProName, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
//                tjPdfVOS = tjPdfVOS.stream()
//                        .sorted(Comparator.comparingInt(
//                                tjPdfVO -> tjPdfVO.getProName().length() // 根据名字的长度排序
//                        ))
//                        .collect(Collectors.toList());
                tjPdfVOS=tjPdfVOS.stream().sorted(Comparator.comparing(TjPdfVO::getXh)).collect(Collectors.toList());
            }
            printReport.put(entry.getKey(), tjPdfVOS);
        }