From d43c59032ea6117b8c24faed3fb3c683174f5418 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 07 五月 2025 08:37:40 +0800
Subject: [PATCH] zjh20250507
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 c7cd8a3..ed8598f 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
@@ -2084,7 +2084,7 @@
document1.add(ppp);
}
}else {
- if (StrUtil.isNotBlank(value.get(0).getSj()) && StrUtil.isNotBlank(value.get(0).getProResult())) {
+ 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);
@@ -2561,7 +2561,7 @@
// List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.list(wqq);
List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.notHuaYanData(tjNumber);
for (TjOrderRemark tjOrderRemark : tjOrderRemarks) {
- printReport.put(tjOrderRemark, null);
+ printReport.put(tjOrderRemark,null);
}
for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : printReport.entrySet()) {
List<TjPdfVO> tjPdfVOS = new ArrayList<>();
--
Gitblit v1.8.0