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-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHybgdMapper.java | 3 +++
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 7 ++++---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHybgdService.java | 2 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHybgdServiceImpl.java | 5 +++++
4 files changed, 14 insertions(+), 3 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 3be6b35..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
@@ -2616,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()
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHybgdMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHybgdMapper.java
index 5ecb689..2967d44 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHybgdMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHybgdMapper.java
@@ -33,4 +33,7 @@
@Select("SELECT a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id =#{cardId} AND a.type='妫�鏌�' GROUP BY a.sqdh")
List<String> getJianChaBaoGaoDan(String cardId);
+
+ @Select("SELECT * FROM ltkj_hybgd WHERE tmh=#{tmh} GROUP BY jcxmid HAVING MAX(shsj) ")
+ List<LtkjHybgd> getReportJianYanBaoGaoDanList(String tmh);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHybgdService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHybgdService.java
index c233e9d..85f515d 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHybgdService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHybgdService.java
@@ -20,4 +20,6 @@
List<LtkjHybgd> getJianYanBaoGaoDanList(String tmh);
List<String> getJianChaBaoGaoDan(String cardId);
+
+ List<LtkjHybgd> getReportJianYanBaoGaoDanList(String tmh);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHybgdServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHybgdServiceImpl.java
index 9ad2f8c..612cdb5 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHybgdServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHybgdServiceImpl.java
@@ -42,4 +42,9 @@
public List<String> getJianChaBaoGaoDan(String cardId) {
return mapper.getJianChaBaoGaoDan(cardId);
}
+
+ @Override
+ public List<LtkjHybgd> getReportJianYanBaoGaoDanList(String tmh) {
+ return mapper.getReportJianYanBaoGaoDanList(tmh);
+ }
}
--
Gitblit v1.8.0