From 62c7cb2668a90cfb00e7d3e2f8044ae9d8bfc664 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 13 三月 2025 17:35:23 +0800
Subject: [PATCH] zjh20250313
---
ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java | 13 +++++++------
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java | 18 +++++++++---------
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 5 ++++-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 6 +++---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java | 8 ++++----
5 files changed, 27 insertions(+), 23 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 6e30281..113b0d7 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
@@ -89,6 +89,7 @@
String dsqkssj = configService.selectConfigByKey("dsqkssj");
String dsqjssj = configService.selectConfigByKey("dsqjssj");
String yqbm = configService.selectConfigByKey("common_api_service_hospbm");
+ String dqyyyqbm = configService.selectConfigByKey("dqyyyqbm");
boolean panduandangqianshijian = panduandangqianshijian(dsqkssj, dsqjssj);
log.info("瀹氭椂鍣ㄨ嚜鍔ㄥ悓姝ユ楠屾鏌ョ粨鏋�");
log.info("褰撳墠鏃堕棿鏄惁鍦� " + dsqkssj + " 鐐瑰埌 " + dsqjssj + " 鐐逛箣闂�: " + panduandangqianshijian);
@@ -109,7 +110,7 @@
if (null != jy && !jy.isEmpty()) {
log.info("鍚屾妫�楠屼汉鍛� 鎵ц鏁伴噺->{}", jy.size());
for (String s : jy) {
- extractedjianyan(s);
+ extractedjianyan(s,dqyyyqbm);
}
}
@@ -117,7 +118,7 @@
if (null != jc && !jc.isEmpty()) {
log.info("鍚屾妫�鏌ヤ汉鍛� 鎵ц鏁伴噺->{}", jc.size());
for (String s : jc) {
- extractedjiancha(s);
+ extractedjiancha(s,dqyyyqbm);
}
}
Map<String, Object> map = new HashMap<>();
@@ -188,7 +189,7 @@
return time.isAfter(LocalTime.of(Integer.parseInt(kssj), 0)) && time.isBefore(LocalTime.of(Integer.parseInt(jssj), 0));
}
- private void extractedjianyan(String s) {
+ private void extractedjianyan(String s,String dqyyyqbm) {
try {
List<Aws> awsList = testMapper.getWsxmLtkjHysqdByLisViBySLAVEWS(s);
if(null !=awsList && !awsList.isEmpty()){
@@ -213,7 +214,7 @@
}
}
- List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s);
+ List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s,dqyyyqbm);
if (null != hysqdList && !hysqdList.isEmpty()) {
for (LtkjHysqd hysqd : hysqdList) {
LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(hysqd.getTjh(), hysqd.getTmh());
@@ -239,10 +240,10 @@
}
- private void extractedjiancha(String s) {
+ private void extractedjiancha(String s,String dqyyyqbm) {
try {
- List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(s);
+ List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(s,dqyyyqbm);
if (null != jcsqdList && !jcsqdList.isEmpty()) {
DynamicDataSourceContextHolder.clearDataSourceType();
jcsqdService.deletedLtkjJcsqdByTjhAndTmh(s);
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 7698bfc..4ceb6e7 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
@@ -193,22 +193,22 @@
@ApiOperation(value = "鎵嬪姩鍚屾妫�楠屾鏌ュ閫侀」鐩粨鏋滄帴鍙�")
public AjaxResult shoudongtbjyjcwsxmjg(@RequestParam @ApiParam(value = "jy妫�楠� jc妫�鏌� jyjc妫�楠屽拰妫�鏌�") String tblx,
@ApiParam(value = "浣撴鍙�")@RequestParam String tjh) {
-
+ String dqyyyqbm = configService.selectConfigByKey("dqyyyqbm");
log.info("鎵嬪姩鍚屾妫�楠屾垨妫�鏌ョ粨鏋滃紑濮�->{}",DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss"));
try {
switch (tblx){
case "jy":
- tbjianyan(tjh);
+ tbjianyan(tjh,dqyyyqbm);
log.info("褰撳墠鍚屾鐨勬槸->{} 缁撴灉","妫�楠�");
break;
case "jc":
- tbjiancha(tjh);
+ tbjiancha(tjh,dqyyyqbm);
log.info("褰撳墠鍚屾鐨勬槸->{} 缁撴灉","妫�鏌�");
break;
case "jyjc":
- tbjianyan(tjh);
- tbjiancha(tjh);
+ tbjianyan(tjh,dqyyyqbm);
+ tbjiancha(tjh,dqyyyqbm);
log.info("褰撳墠鍚屾鐨勬槸->{} 缁撴灉","妫�楠屾鏌�");
break;
default:
@@ -228,7 +228,7 @@
return AjaxResult.success();
}
- private void tbjianyan(String s) {
+ private void tbjianyan(String s,String dqyyyqbm) {
try {
List<Aws> awsList = testMapper.getWsxmLtkjHysqdByLisViBySLAVEWS(s);
if(null !=awsList && !awsList.isEmpty()){
@@ -239,7 +239,7 @@
awsService.saveBatch(awsList);
log.info("淇濆瓨澶栭�侀」鐩垚鍔�");
}
- List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s);
+ List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s,dqyyyqbm);
log.info("鍘焗ysqdList->{} 缁撴灉", JSONUtil.parseObj(hysqdList));
List<LtkjHysqd> wssq = testMapper.getWsxmLtkjHysqdByLisVi(s);
if(null !=wssq && !wssq.isEmpty()){
@@ -272,10 +272,10 @@
}
- private void tbjiancha(String s) {
+ private void tbjiancha(String s,String dqyyyqbm) {
try {
- List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(s);
+ List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(s,dqyyyqbm);
if (null != jcsqdList && !jcsqdList.isEmpty()) {
DynamicDataSourceContextHolder.clearDataSourceType();
jcsqdService.deletedLtkjJcsqdByTjhAndTmh(s);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index adb4e5d..f5413de 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -403,7 +403,7 @@
@RepeatSubmit
// @Transactional
public AjaxResult dataSynchronization(@RequestParam String tjNumber) {
-
+ String dqyyyqbm = configService.selectConfigByKey("dqyyyqbm");
RLock lock = redissonClient.getLock("lock:check:dataSynchronization:" + tjNumber);
try {
boolean tryLock = lock.tryLock(3L, TimeUnit.SECONDS);
@@ -668,7 +668,7 @@
return AjaxResult.success("鍚屾鎴愬姛");
}
else if(null !=sfkqdshitulianjie && sfkqdshitulianjie.equalsIgnoreCase("Y")){
- List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(order.getTjNumber());
+ List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(order.getTjNumber(),dqyyyqbm);
if(null != hysqdList && !hysqdList.isEmpty()){
for (LtkjHysqd hysqd : hysqdList) {
LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(hysqd.getTjh(),hysqd.getTmh());
@@ -683,7 +683,7 @@
}
DynamicDataSourceContextHolder.clearDataSourceType();
}
- List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(order.getTjNumber());
+ List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(order.getTjNumber(),dqyyyqbm);
if(null !=jcsqdList && !jcsqdList.isEmpty()){
jcsqdService.deletedLtkjJcsqdByTjhAndTmh(order.getCardId());
jcbgdService.deletedLtkjJcbgdByTjhAndTmh(order.getCardId());
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 103c6cc..f62d974 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -1098,8 +1098,11 @@
public AjaxResult processOrderWithTransaction(TjOrder tjOrder, TjCustomer tjCustomer, TjReservation tjReservation, TjFlowingWater tjFlowingWater, MallOrder mallOrder, SysUser sysUser) {
//鑾峰彇鎷兼帴鍓嶇紑
-// String makeLisTmhPrefix = configService.selectConfigByKey("make_lis_tmh_prefix");
+ String sfkqtjhqz = configService.selectConfigByKey("sfkqtjhqz");
String makeLisTmhPrefix = "";
+ if(sfkqtjhqz.equalsIgnoreCase("Y")){
+ makeLisTmhPrefix = configService.selectConfigByKey("make_lis_tmh_prefix");
+ }
//鐢熸垚浣撴鍙�
// String tjNumber = (SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmss").format(new Date()));
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 5f4306b..a6846ab 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
@@ -260,8 +260,8 @@
" \n" +
"FROM\n" +
" vi_his_patientinfo a\n" +
- "WHERE a.PATIENTTYPE=3 AND a.GH_PATIENTNO =#{tjNum}")
- List<LtkjHysqd> getCcXZxYyLtkjHysqdByLisVi(String tjNum);
+ "WHERE a.PATIENTTYPE=3 AND a.GH_PATIENTNO =#{tjNum} AND a.HOSPITALID =#{dqyyyqbm}")
+ List<LtkjHysqd> getCcXZxYyLtkjHysqdByLisVi(@Param("tjNum") String tjNum,@Param("dqyyyqbm") String dqyyyqbm);
@@ -365,8 +365,8 @@
" SYSDATE create_time\n" +
" \n" +
"FROM\n" +
- " ris.V_TJ_JCBGXX_NEWTJ a WHERE trim(a.HIS_ID)=#{tjNum}")
- List<LtkjExamJcsqd> getCcXZxYyPacsLtkjExamJcsqd(String tjNum);
+ " ris.V_TJ_JCBGXX_NEWTJ a WHERE trim(a.HIS_ID)=#{tjNum} AND a.HOSTPITALID =#{dqyyyqbm} ")
+ List<LtkjExamJcsqd> getCcXZxYyPacsLtkjExamJcsqd(@Param("tjNum") String tjNum,@Param("dqyyyqbm") String dqyyyqbm);
@DataSource(value = DataSourceType.SLAVE_PACS)
--
Gitblit v1.8.0