From 35bf4a558e23d5016bccaa2145c4bed20aed920f Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 02 十二月 2024 00:18:13 +0800
Subject: [PATCH] zjh20241202-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 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 75860ff..328415d 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
@@ -138,6 +138,17 @@
}
+
+ @GetMapping ("/ceshi")
+ @ApiOperation (value = "娴嬭瘯璋冪敤lis瑙嗗浘鏁版嵁鎺ュ彛")
+ @RepeatSubmit
+// @Transactional
+ public AjaxResult ceshi() {
+ List<Map<String, Object>> ccXZxYyLisJgSt = testMapper.getCcXZxYyLisJgSt();
+ return AjaxResult.success(ccXZxYyLisJgSt);
+ }
+
+
@GetMapping ("/getCsList")
@ApiOperation (value = "鍒濆鏌ヨ浣撴璁板綍瀹㈡埛鍒楄〃")//0寰�1宸�
@Transactional
@@ -348,6 +359,7 @@
final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
final String sfkqdyhis = configService.selectConfigByKey("sfkqdyhis");
+ final String sfkqdshitulianjie = configService.selectConfigByKey("sfkqdshitulianjie");
TjOrder order = orderService.getOrderByTjNum(tjNumber);
if (null != order) {
@@ -601,6 +613,9 @@
//鍚屾妫�鏌ラ」鐩粰redis缂撳瓨鐜板湪涓嶇敤浜�
// asyncService.updateCheckType(order.getTjNumber());
}
+// else if(null !=sfkqdshitulianjie && sfkqdshitulianjie.equals("Y")){
+// List<Map<String,Object>> maps= testMapper.getCcXZxYyLisJgSt();
+// }
//鍖栭獙
testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
//妫�鏌�
@@ -618,6 +633,8 @@
}
}
+
+
/**
* 鍚屾sql server鏁版嵁鍒版湰鍦版暟鎹簱鏁版嵁鎺ュ彛
*/
@@ -630,6 +647,7 @@
try {
boolean tryLock = lock.tryLock(3L, TimeUnit.SECONDS);
if (tryLock){
+ String doctorId = configService.selectConfigByKey("request_default_check_doctorId");
//鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
@@ -641,9 +659,9 @@
if ("Y".equals(getInfoFromSqlData)) {
tbhyxm(order);
//鍚屾鍖栭獙椤圭洰
- testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), "148");
+ testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
//鍚屾妫�鏌ラ」鐩�
- testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), "148");
+ testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
asyncService.updateCheckType(order.getTjNumber());
}
@@ -699,7 +717,7 @@
}
}
//鍚屾鍖栭獙椤圭洰
- testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), "148");
+ testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
}
/*鍚屾妫�鏌� his鎺ュ彛*/
if (null != jianChaBaoGaoDan && jianChaBaoGaoDan.size() > 0) {
@@ -757,7 +775,7 @@
jcbgdService.save(jcbgd);
}
jcsqdService.saveLtkjExamJcsqd(order.getCardId());
- testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), "148");
+ testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
}else {
return AjaxResult.error("妫�鏌ラ」鐩殏鏃舵湭鍑虹粨鏋�,璇风◢鍚庡悓姝�!!!");
}
@@ -766,7 +784,7 @@
return AjaxResult.success("鍚屾鎴愬姛");
}
//鍖栭獙
- testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), "148");
+ testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
//妫�鏌�
jcsqdService.saveLtkjExamJcsqd(order.getCardId());
return AjaxResult.success("鍚屾鎴愬姛");
--
Gitblit v1.8.0