From 0ebc42ccd16d2e8ea1a5d815253021c91cc2836f Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 07 三月 2025 16:43:52 +0800
Subject: [PATCH] 2025-03-07
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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 21ff9cd..4c04cea 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
@@ -1048,7 +1048,8 @@
xmXh++;
}
}
- }else {
+ }
+ /*else {
if (!collect.isEmpty() || !map.isEmpty()){
paragraph = PdfUtils.setParagraph(defaultTitleFont, "妫�鏌ョ患杩帮細");
paragraph.setSpacingBefore(3f);
@@ -1143,7 +1144,7 @@
}
}
}
- }
+ }*/
if(isBr) {
paragraph = PdfUtils.setParagraph(defaultFont, "");
@@ -1388,7 +1389,8 @@
}
}
}*/
- } else {
+ }
+ /** else {
if (!collect.isEmpty() || !map.isEmpty()){
paragraph = PdfUtils.setParagraph(defaultTitleFont, "鍖荤敓寤鸿锛�");
@@ -1575,6 +1577,7 @@
}
}
}
+ */
for (int i = 0; i < 1; i++) {
paragraph = PdfUtils.setParagraph(defaultFont, "");
@@ -2997,8 +3000,9 @@
}
tjPdfVO.setProId(String.valueOf(tjOrderDetail.getProject().getProId()));
LambdaQueryWrapper<LtkjExamJcbgd> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(LtkjExamJcbgd::getTjh, tjNumber);
- wrapper.like(LtkjExamJcbgd::getXmdm, String.valueOf(tjOrderDetail.getProject().getProParentId()));
+ wrapper.eq(LtkjExamJcbgd::getTjh, one.getCardId());
+ wrapper.like(LtkjExamJcbgd::getXmdm, String.valueOf(tjOrderDetail.getProject().getProParentId()))
+ .or().eq(LtkjExamJcbgd::getXmdm, String.valueOf(tjOrderDetail.getProject().getHisXmbm()));
wrapper.orderByDesc(LtkjExamJcbgd::getZdsj);
List<LtkjExamJcbgd> list = jcbgdService.list(wrapper);
if (null != list && !list.isEmpty()) {
--
Gitblit v1.8.0