From ac950bf0a65fef05c3411d796cb7e2ea15967f06 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期二, 29 四月 2025 18:10:52 +0800
Subject: [PATCH] 生成报告增加orderdetail是否判断值
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 42 ++++++++++++++++++++++++++++++------------
1 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
index 44a2ea1..a4c4373 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
+++ b/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);
--
Gitblit v1.8.0