From a3721222ee4ef79211db6a4c5738205c4a381f7c Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 19 三月 2025 10:08:43 +0800
Subject: [PATCH] zjh20250319
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
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 5e976cf..a0f3052 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
@@ -209,6 +209,7 @@
@ApiParam (value = "浣撴鍗曞彿") @RequestParam (required = false) String tjNumber,
@ApiParam (value = "鍗曚綅") @RequestParam (required = false) Long compId,
@ApiParam (value = "濮撳悕)") @RequestParam (required = false) String name,
+ @ApiParam (value = "濂楅鍚�)") @RequestParam (required = false) String tcm,
@ApiParam (value = "寮�濮嬫椂闂�") @RequestParam (required = false) String beginTime,
@ApiParam (value = "缁撴潫鏃堕棿") @RequestParam (required = false) String endTime) {
@@ -294,7 +295,8 @@
if (name == null) name = "";
if (beginTime == null) beginTime = "";
if (endTime == null) endTime = "";
- return AjaxResult.success(orderService.getCsCunChuGuoChengCustomerList(tjNumber, page, pageSize, checkStatus, value, beginTime, endTime, name));
+ if (tcm == null) tcm = "";
+ return AjaxResult.success(orderService.getCsCunChuGuoChengCustomerList(tjNumber, page, pageSize, checkStatus, value, beginTime, endTime, name,tcm));
}
@@ -401,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);
@@ -666,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());
@@ -681,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());
@@ -813,7 +815,7 @@
resultMsg = "鍖栭獙椤圭洰鏆傛椂鏈嚭缁撴灉,璇风◢鍚庡悓姝�!!!";
}
//鍚屾鍖栭獙椤圭洰
-// testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
+ testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
}
/*鍚屾妫�鏌� his鎺ュ彛*/
if (null != jianChaBaoGaoDan && !jianChaBaoGaoDan.isEmpty()) {
@@ -890,9 +892,9 @@
else return AjaxResult.error(resultMsg);
}
//鍖栭獙
- testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
+// testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
//妫�鏌�
- jcsqdService.saveLtkjExamJcsqd(order.getCardId());
+// jcsqdService.saveLtkjExamJcsqd(order.getCardId());
return AjaxResult.success("鍚屾鎴愬姛");
}
return AjaxResult.error("鏈煡鍒拌浜哄憳浣撴璁板綍");
--
Gitblit v1.8.0