From 5588342e2777ee57e17f6d2fa069443a7ce6b9fa Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 13 三月 2025 10:26:16 +0800
Subject: [PATCH] zjh20250313
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 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 dede3db..e192d46 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
@@ -1050,9 +1050,10 @@
xmXh++;
}
}
- }else {
+ }
+ /* else {
- if (!collect.isEmpty() && !map.isEmpty()){
+ if (!collect.isEmpty() || !map.isEmpty()){
paragraph = PdfUtils.setParagraph(defaultTitleFont, "妫�鏌ョ患杩帮細");
paragraph.setSpacingBefore(3f);
paragraph.setSpacingAfter(2f);
@@ -1146,7 +1147,7 @@
}
}
}
- }
+ } */
@@ -1390,9 +1391,10 @@
}
}
}*/
- } else {
+ }
+ /* else {
- if (!collect.isEmpty() && !map.isEmpty()){
+ if (!collect.isEmpty() || !map.isEmpty()){
paragraph = PdfUtils.setParagraph(defaultTitleFont, "鍖荤敓寤鸿锛�");
paragraph.setSpacingBefore(3f);
paragraph.setSpacingAfter(2f);
@@ -1536,7 +1538,7 @@
}
}
}
- }
+ } */
for (int i = 0; i < 1; i++) {
paragraph = PdfUtils.setParagraph(defaultFont, "");
@@ -2614,9 +2616,10 @@
List<LtkjHysqd> list = ltkjHysqdService.list(ltkjHysqdLambdaQueryWrapper);
HashMap<String, Object> data = new HashMap<>();
for (LtkjHysqd hysqd : list) {
- LambdaQueryWrapper<LtkjHybgd> ltkjHybgdLambdaQueryWrapper = new LambdaQueryWrapper<>();
- ltkjHybgdLambdaQueryWrapper.eq(LtkjHybgd::getTmh, hysqd.getTmh());
- List<LtkjHybgd> hybgds = ltkjHybgdService.list(ltkjHybgdLambdaQueryWrapper);
+// LambdaQueryWrapper<LtkjHybgd> ltkjHybgdLambdaQueryWrapper = new LambdaQueryWrapper<>();
+// ltkjHybgdLambdaQueryWrapper.eq(LtkjHybgd::getTmh, hysqd.getTmh());
+// List<LtkjHybgd> hybgds = ltkjHybgdService.list(ltkjHybgdLambdaQueryWrapper);
+ List<LtkjHybgd> hybgds = ltkjHybgdService.getReportJianYanBaoGaoDanList(hysqd.getTmh());
if(null !=hybgds && !hybgds.isEmpty()){
// hybgds = hybgds.stream().distinct().collect(Collectors.toList());
hybgds = new ArrayList<>(hybgds.stream()
--
Gitblit v1.8.0