zjh
2025-05-09 6341f129682926b3909604e9b04dc95199c2059a
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
@@ -2074,26 +2074,36 @@
                            if (isPacs) {
                                Paragraph pp;
                                Paragraph 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);
                                    }
//                                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);
//                                    }
//                                }
                                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, "检查提示:");
                                document1.add(pp);
                                ppp = new Paragraph((value.get(0).getTs() != null ? value.get(0).getTs() : value.get(0).getProResult()), remarkFonts);