From 62662f5a8a0259ab934a09326768f1fb933319d4 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 11 三月 2025 17:55:15 +0800
Subject: [PATCH] zjh20250311
---
ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java | 21 +++++++++++++++++----
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java | 1 +
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjFlowingWaterServiceImpl.java | 5 +++++
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 5 +++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjFlowingWaterService.java | 2 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjFlowingWaterMapper.java | 3 +++
6 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
index 8f666a2..6e30281 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
@@ -198,9 +198,22 @@
awsService.saveBatch(awsList);
log.info("淇濆瓨澶栭�侀」鐩垚鍔�");
}
- List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s);
List<LtkjHysqd> wssq = testMapper.getWsxmLtkjHysqdByLisVi(s);
- if(null !=wssq && !wssq.isEmpty())hysqdList.addAll(wssq);
+ if(null !=wssq && !wssq.isEmpty()){
+ for (LtkjHysqd hysqd : wssq) {
+ LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(hysqd.getTjh(), hysqd.getTmh());
+ if (null != jybgid) {
+ ltkjHysqdService.deletedLtkjHysqdByTjhAndTmh(hysqd.getTjh(), hysqd.getTmh());
+ ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(hysqd.getTmh());
+ }
+ if (ltkjHysqdService.save(hysqd)) {
+ List<LtkjHybgd> wsbg = testMapper.getWsxmLtkjHybgdByLisVi(s);
+ ltkjHybgdService.saveBatch(wsbg);
+ }
+ }
+ }
+
+ List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s);
if (null != hysqdList && !hysqdList.isEmpty()) {
for (LtkjHysqd hysqd : hysqdList) {
LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(hysqd.getTjh(), hysqd.getTmh());
@@ -210,8 +223,8 @@
}
if (ltkjHysqdService.save(hysqd)) {
List<LtkjHybgd> hybgdList = testMapper.getCcXZxYyLtkjHybgdByLisVi(hysqd.getTmh());
- List<LtkjHybgd> wsbg = testMapper.getWsxmLtkjHybgdByLisVi(s);
- if(null !=wsbg && !wsbg.isEmpty())hybgdList.addAll(wsbg);
+// List<LtkjHybgd> wsbg = testMapper.getWsxmLtkjHybgdByLisVi(s);
+// if(null !=wsbg && !wsbg.isEmpty())hybgdList.addAll(wsbg);
ltkjHybgdService.saveBatch(hybgdList);
}
}
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 d714603..6da223c 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
@@ -2654,6 +2654,11 @@
ltkjHybgdLambdaQueryWrapper.eq(LtkjHybgd::getTmh, hysqd.getTmh());
List<LtkjHybgd> hybgds = ltkjHybgdService.list(ltkjHybgdLambdaQueryWrapper);
if(null !=hybgds && !hybgds.isEmpty()){
+
+ hybgds = new ArrayList<>(hybgds.stream()
+ .collect(Collectors.toMap(LtkjHybgd::getJcxm, p -> p, (existing, replacement) -> existing))
+ .values());
+
// hybgds=hybgds.stream().sorted(Comparator.comparing(LtkjHybgd::getJcxm, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
// hybgds = hybgds.stream()
// .sorted(Comparator.comparingInt(
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
index 0d5da1a..199cb4b 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
@@ -333,6 +333,7 @@
Map<String, Object> map = new HashMap<>();
map.put("waterId", tjFlowingWater.getWaterId());
map.put("mobanId", reportService.getMoBanIds());
+
return AjaxResult.success("鏀惰垂鎴愬姛", map);
}
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjFlowingWaterMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjFlowingWaterMapper.java
index 1377c24..95e3f7d 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjFlowingWaterMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjFlowingWaterMapper.java
@@ -104,4 +104,7 @@
" from tj_flowing_water" +
" where jxbz = #{bldh}")
void deleteTjOrderDetailByjxbz(String bldh);
+
+ @Select("call tj_bl(#{tjh,mode=IN})")
+ void getTjBlCall(@Param("tjh") String tjh);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjFlowingWaterService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjFlowingWaterService.java
index f1c14cb..f8d2634 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjFlowingWaterService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjFlowingWaterService.java
@@ -75,4 +75,6 @@
public int deleteTjFlowingWaterByOrderId(String order);
void deleteTjOrderDetailByjxbz(String bldh);
+
+ void getTjBlCall(String tjh);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjFlowingWaterServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjFlowingWaterServiceImpl.java
index 38eba80..5749bfe 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjFlowingWaterServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjFlowingWaterServiceImpl.java
@@ -123,4 +123,9 @@
public void deleteTjOrderDetailByjxbz(String bldh) {
tjFlowingWaterMapper.deleteTjOrderDetailByjxbz(bldh);
}
+
+ @Override
+ public void getTjBlCall(String tjh) {
+ tjFlowingWaterMapper.getTjBlCall(tjh);
+ }
}
--
Gitblit v1.8.0