zjh20250611

zjh

2025-06-11 1931c00063f392f201ee5f9154e9a4826820ab49

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

@@ -1868,12 +1868,12 @@
                                if (StrUtil.isNotBlank(value.get(0).getSj())) {
                                    pp = PdfUtils.setParagraph(remarkFonts, "检查所见：");
                                    document1.add(pp);
                                    ppp = new Paragraph(value.get(0).getSj(), remarkFonts);
                                    ppp = new Paragraph(value.get(0).getSj().replaceAll("\n",""), remarkFonts);
                                    paragraph.setAlignment(Element.ALIGN_LEFT);
                                    paragraph.setLeading(5f);
                                    document1.add(ppp);
                                }
                                pp = PdfUtils.setParagraph(remarkFonts, "检查提示："+value.get(0).getTs());
                                pp = PdfUtils.setParagraph(remarkFonts, "检查提示："+value.get(0).getTs().replaceAll("\n",""));
                                document1.add(pp);
//                                ppp = new Paragraph(value.get(0).getTs(), remarkFonts);
//                                paragraph.setAlignment(Element.ALIGN_LEFT);
@@ -1947,7 +1947,8 @@
                    Paragraph paragraph = PdfUtils.setParagraph(titleFonts, titleName);

//                    if (dictHosp.getHospName().equals("澄合矿务局中心医院")) {
                    if (StrUtil.isBlank(value.get(0).getProResult()) && (StrUtil.isBlank(value.get(0).getTs()) && StrUtil.isBlank(value.get(0).getSj()))) {
                    if (StrUtil.isBlank(value.get(0).getProResult()) && (StrUtil.isBlank(value.get(0).getTs().replaceAll("\n",""))
                            && StrUtil.isBlank(value.get(0).getSj().replaceAll("\n","")))) {
                        continue;
                    }
                    Font titleFont = PdfUtils.setFont(DEFAULT_TITLE_FONT_SIZE);
@@ -2016,7 +2017,7 @@
                                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);
                                    ppp = new Paragraph(value.get(0).getSj() != null ? value.get(0).getSj().replaceAll("\n","") : value.get(0).getProResult().replaceAll("\n",""), remarkFonts);
                                    paragraph.setAlignment(Element.ALIGN_LEFT);
                                    paragraph.setLeading(5f);
                                    document1.add(ppp);
@@ -2024,7 +2025,7 @@

                                pp = PdfUtils.setParagraph(remarkFonts, "检查提示：");
                                document1.add(pp);
                                ppp = new Paragraph((value.get(0).getTs() != null ? value.get(0).getTs() : value.get(0).getProResult()), remarkFonts);
                                ppp = new Paragraph((value.get(0).getTs() != null ? value.get(0).getTs().replaceAll("\n","") : value.get(0).getProResult().replaceAll("\n","")), remarkFonts);
                                paragraph.setAlignment(Element.ALIGN_LEFT);
                                paragraph.setLeading(5f);
                                document1.add(ppp);