From e37740bcaa6a0dfdef6e082e4d8136b81d453000 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 09 七月 2024 18:16:48 +0800
Subject: [PATCH] zjh 2024/07/9-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 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 ef6ad67..da10175 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
@@ -257,7 +257,8 @@
*/
private List<ByteArrayOutputStream> makeHisJianChaTable(TjOrder tjOrder) {
LambdaQueryWrapper<LtkjGetexamreportinfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
- lambdaQueryWrapper.eq(LtkjGetexamreportinfo::getHisRegistrationId, tjOrder.getCardId());
+ lambdaQueryWrapper.eq(LtkjGetexamreportinfo::getRequestParamsHisRegistrationId, tjOrder.getCardId());
+ lambdaQueryWrapper.groupBy(LtkjGetexamreportinfo::getJcbgid);
List<LtkjGetexamreportinfo> list = ltkjGetexamreportinfoService.list(lambdaQueryWrapper);
// List<LtkjGetexamreportinfo> list = ltkjGetexamreportinfoService.list();
List<ByteArrayOutputStream> jianchas = new ArrayList<>();
@@ -512,7 +513,9 @@
// 鑼冨洿鍊�
String fwz = hybgd.getFwz();
// 妫�楠屽尰甯�
- String jyys = hybgd.getJyys();
+// String jyys = hybgd.getJyys();
+ //瀹℃牳鍖荤敓
+ String shysmc = hybgd.getShysmc();
if (jyjg != null && StrUtil.isNotBlank(jyjg) && fwz != null && StrUtil.isNotBlank(fwz)){
try {
String[] fwzs = fwz.split("-");
@@ -529,11 +532,12 @@
}
} catch (Exception ignored) {}
}
- LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(SysUser::getUserName,jyys);
- List<SysUser> sysUsers = userService.list(queryWrapper);
- if (!sysUsers.isEmpty())
- hashSet.add(sysUsers.get(0).getNickName());
+// LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
+// queryWrapper.eq(SysUser::getUserName,jyys);
+// List<SysUser> sysUsers = userService.list(queryWrapper);
+// if (!sysUsers.isEmpty())
+// hashSet.add(sysUsers.get(0).getNickName());
+ if(null !=shysmc) hashSet.add(shysmc);
ArrayList<String> strings = new ArrayList<>();
strings.add(jcxm);
strings.add(jyjg);
--
Gitblit v1.8.0