From ea91e62004a5a86be6c7a5fda852995e1bf3e3a0 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 23 五月 2025 18:55:36 +0800
Subject: [PATCH] zjh20250523
---
ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java | 4 +
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java | 5 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java | 28 +++++++++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java | 43 +++++++++++++++------
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java | 4 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java | 3 +
8 files changed, 74 insertions(+), 17 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java
index c6211ad..a96d7a8 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java
@@ -295,13 +295,15 @@
try {
List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(s,hospId);
+ log.info("鑷姩鍚屾妫�鏌ョ敵璇峰崟鏁版嵁:"+jcsqdList);
if (null != jcsqdList && !jcsqdList.isEmpty()) {
DynamicDataSourceContextHolder.clearDataSourceType();
jcsqdService.deletedLtkjJcsqdByTjhAndTmh(s);
jcbgdService.deletedLtkjJcbgdByTjhAndTmh(s);
jcsqdService.saveBatch(jcsqdList);
List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(s,hospId);
- DynamicDataSourceContextHolder.clearDataSourceType();
+// DynamicDataSourceContextHolder.clearDataSourceType();
+ log.info("鑷姩鍚屾妫�鏌ユ姤鍛婂崟鏁版嵁:"+jcbgdList);
if (null != jcbgdList && !jcbgdList.isEmpty()) jcbgdService.saveBatch(jcbgdList);
DynamicDataSourceContextHolder.clearDataSourceType();
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
index 7e87202..e46ac4d 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
@@ -298,13 +298,15 @@
String yqbm = configService.selectConfigByKey("common_api_service_hospbm");
try {
List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(s,hosp);
+ log.info("鎵嬪姩鍚屾妫�鏌ョ敵璇峰崟鏁版嵁:"+jcsqdList);
if (null != jcsqdList && !jcsqdList.isEmpty()) {
DynamicDataSourceContextHolder.clearDataSourceType();
jcsqdService.deletedLtkjJcsqdByTjhAndTmh(s);
jcbgdService.deletedLtkjJcbgdByTjhAndTmh(s);
jcsqdService.saveBatch(jcsqdList);
List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(s,hosp);
- DynamicDataSourceContextHolder.clearDataSourceType();
+// DynamicDataSourceContextHolder.clearDataSourceType();
+ log.info("鎵嬪姩鍚屾妫�鏌ユ姤鍛婂崟鏁版嵁:"+jcbgdList);
if (null != jcbgdList && !jcbgdList.isEmpty()) jcbgdService.saveBatch(jcbgdList);
jcycxmService.deletedByTjh(s);
for (LtkjExamJcsqd jcsqd : jcsqdList) {
@@ -475,4 +477,28 @@
}
}
+
+ @GetMapping ("/shoudongtbjcbgdsj")
+ @ApiOperation(value = "鎵嬪姩鍚屾妫�鏌ユ姤鍛婂崟缁撴灉鎺ュ彛")
+ public AjaxResult shoudongtbjcbgdsj(HttpServletRequest request) {
+ String hospId = request.getHeader("hospId");
+ log.info("鎵嬪姩鍚屾妫�楠屾垨妫�鏌ョ粨鏋滃紑濮�->{}{}",hospId,DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss"));
+ try {
+ List<String> jc = orderService.shoudongtbjcbgdsj();
+ for (String s : jc) {
+ jcbgdService.deletedLtkjJcbgdByTjhAndTmh(s);
+ List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(s,hospId);
+ log.info("鎵嬪姩鍚屾妫�鏌ユ姤鍛婂崟鏁版嵁:"+jcbgdList);
+ if (null != jcbgdList && !jcbgdList.isEmpty()) jcbgdService.saveBatch(jcbgdList);
+ }
+
+ log.info("褰撳墠鍚屾鐨勬槸->{} 缁撴灉","妫�鏌�");
+ return AjaxResult.success("鍚屾鎴愬姛");
+
+ } catch (Exception e) {
+ log.error(String.valueOf(e));
+ }
+ return AjaxResult.success();
+ }
+
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java
index 1aa7371..133d549 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java
@@ -21,7 +21,7 @@
//@DataSource(value = DataSourceType.MASTER)
public interface LtkjExamJcbgdMapper extends BaseMapper<LtkjExamJcbgd> {
- @Delete("DELETE FROM ltkj_exam_jcbgd WHERE tjh=#{tmh} ")
+ @Delete("DELETE FROM ltkj_exam_jcbgd WHERE tjh=#{tmh} and lx='1' ")
void deletedLtkjJcbgdByTjhAndTmh(String tmh);
@Select("SELECT a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id =#{cardId} AND a.type='妫�鏌�' GROUP BY a.sqdh")
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
index 2dbf2af..9d01532 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
@@ -25,7 +25,7 @@
@Select ("SELECT * FROM ltkj_exam_jcsqd a WHERE a.tjh=#{tjh} AND a.tmh=#{tmh} ")
LtkjExamJcsqd getLtkjJcsqdByTjhAndTmh(@Param("tjh") String tjh,@Param("tmh") String tmh);
- @Delete ("DELETE FROM ltkj_exam_jcsqd WHERE tjh=#{tjh}")
+ @Delete ("DELETE FROM ltkj_exam_jcsqd WHERE tjh=#{tjh} and lx='1' ")
void deletedLtkjJcsqdByTjhAndTmh(@Param("tjh")String tjh);
@Select("SELECT * FROM ltkj_exam_jcsqd a WHERE a.tjh=#{tjh}")
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
index eaf00bf..727060a 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
@@ -471,24 +471,41 @@
@DataSource(value = DataSourceType.SLAVE_PACS)
- @Select("SELECT\n" +
+// @Select("SELECT\n" +
+// " trim(a.HIS_ID) tjh,\n" +
+// " trim(a.HIS_ID) tmh,\n" +
+// " a.JCLX jclx,\n" +
+// " NULL jczlx,\n" +
+// " a.BGYS bgys,\n" +
+// " NULL bgysid,\n" +
+// " a.SQRJ sqsj,\n" +
+// " a.BGSJ jgsj,\n" +
+// " REPLACE(a.JCMC,'tj_','') jcxmmc,\n" +
+// " trim(a.JCMID) jcxmid,\n" +
+// " a.JCBW bw,\n" +
+// " TRIM(a.JCJL) jgzt,\n" +
+// " TRIM(a.JCSJ) jgbx,\n" +
+// " SYSDATE create_time\n" +
+// " \n" +
+// "FROM\n" +
+// " ris.V_TJ_JCBGXX_NEWTJ a WHERE trim(a.HIS_ID)=#{tjNum} AND a.HOSTPITALID = #{hosp}")
+ @Select(" SELECT\n" +
" trim(a.HIS_ID) tjh,\n" +
" trim(a.HIS_ID) tmh,\n" +
- " a.JCLX jclx,\n" +
- " NULL jczlx,\n" +
- " a.BGYS bgys,\n" +
- " NULL bgysid,\n" +
+ " trim(a.JCMID) xmdm,\n" +
+ " a.JCMC xmmc,\n" +
+ " NULL bg_mig,\n" +
+ " NULL bg_url,\n" +
+ " TRIM(a.JCSJ) bg_nr,\n" +
+ " a.SHYS shysdm,\n" +
+ " a.SHYS shysxm,\n" +
+ " TRIM(a.JCJL) yxbx,\n" +
+ " a.BGSJ zdsj,\n" +
" a.SQRJ sqsj,\n" +
- " a.BGSJ jgsj,\n" +
- " REPLACE(a.JCMC,'tj_','') jcxmmc,\n" +
- " trim(a.JCMID) jcxmid,\n" +
- " a.JCBW bw,\n" +
- " TRIM(a.JCJL) jgzt,\n" +
- " TRIM(a.JCSJ) jgbx,\n" +
+ " a.JCBW jcbw,\n" +
" SYSDATE create_time\n" +
- " \n" +
"FROM\n" +
- " ris.V_TJ_JCBGXX_NEWTJ a WHERE trim(a.HIS_ID)=#{tjNum} AND a.HOSTPITALID = #{hosp}")
+ " ris.V_TJ_JCBGXX_NEWTJ a WHERE a.HIS_ID=#{tjNum} AND a.HOSTPITALID = #{hosp} ")
List<LtkjExamJcbgd> getCcXZxYyPacsLtkjExamJcbgd(@Param("tjNum") String tjNum,@Param("hosp") String hosp);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
index 825f8da..985f52d 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
@@ -393,4 +393,8 @@
List<List<?>> getYxJcList(Map<String,Object> map);
+
+ @Select("SELECT DISTINCT a.tjh FROM ltkj_exam_jcbgd a WHERE ISNULL(a.xmdm)")
+ List<String> shoudongtbjcbgdsj();
+
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
index 3af8105..b99c3fe 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
@@ -194,4 +194,7 @@
//瀛樺偍杩囩▼涓撶敤鎺ュ彛(鍒濆)
Map<String,Object> getYxJcList(Integer checkStatus ,String tjNumber,Integer page,Integer pageSize,
String compId, String beginTime, String endTime,String tjname,String tcm,String deptId);
+
+ List<String> shoudongtbjcbgdsj();
+
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
index 1f02b7e..f5d5521 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
@@ -476,4 +476,9 @@
map1.put("total",map.get("total"));
return map1;
}
+
+ @Override
+ public List<String> shoudongtbjcbgdsj() {
+ return tjOrderMapper.shoudongtbjcbgdsj();
+ }
}
--
Gitblit v1.8.0