pdf生成增加是否根据orderdetail结果字段判断 修复字体重叠问题 固定项目结论增加字符串去除null

zhaowenxuan

2025-04-29 c63daceb66fbb7faa56849e695c07e28447818b9

pdf生成增加是否根据orderdetail结果字段判断 修复字体重叠问题 固定项目结论增加字符串去除null

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

@@ -1866,7 +1866,7 @@
                                paragraph.setLeading(5f);
                                document1.add(ppp);
                                if (StrUtil.isNotBlank(entry.getKey().getRemark())) {
                                    ppp = new Paragraph("结论：" + entry.getKey().getRemark(), remarkFonts);
                                    ppp = new Paragraph("结论：" + entry.getKey().getRemark().replaceAll("null",""), remarkFonts);
                                    paragraph.setAlignment(Element.ALIGN_LEFT);
                                    paragraph.setLeading(5f);
                                    document1.add(ppp);
@@ -1931,7 +1931,7 @@
                                    paragraph.setLeading(5f);
                                    document1.add(ppp);
                                    if (StrUtil.isNotBlank(entry.getKey().getRemark())) {
                                        ppp = new Paragraph("结论：" + entry.getKey().getRemark(), remarkFonts);
                                        ppp = new Paragraph("结论：" + entry.getKey().getRemark().replaceAll("null",""), remarkFonts);
                                        paragraph.setAlignment(Element.ALIGN_LEFT);
                                        paragraph.setLeading(5f);
                                        document1.add(ppp);
@@ -2054,7 +2054,7 @@
                                paragraph.setLeading(5f);
                                document1.add(ppp);
                                if (StrUtil.isNotBlank(entry.getKey().getRemark())) {
                                    ppp = new Paragraph("结论：" + entry.getKey().getRemark(), remarkFonts);
                                    ppp = new Paragraph("结论：" + entry.getKey().getRemark().replaceAll("null",""), remarkFonts);
                                    paragraph.setAlignment(Element.ALIGN_LEFT);
                                    paragraph.setLeading(5f);
                                    document1.add(ppp);
@@ -2073,16 +2073,32 @@
                            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, "检查提示：");
                                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);
@@ -2120,7 +2136,7 @@
                                    paragraph.setLeading(5f);
                                    document1.add(ppp);
                                    if (StrUtil.isNotBlank(entry.getKey().getRemark())) {
                                        ppp = new Paragraph("结论：" + entry.getKey().getRemark(), remarkFonts);
                                        ppp = new Paragraph("结论：" + entry.getKey().getRemark().replaceAll("null",""), remarkFonts);
                                        paragraph.setAlignment(Element.ALIGN_LEFT);
                                        paragraph.setLeading(5f);
                                        document1.add(ppp);