From dc9f340fa83555c30655a0e42c175a91d81d65d2 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 25 三月 2025 18:24:03 +0800
Subject: [PATCH] zjh20250325
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 50 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 41 insertions(+), 9 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 f5413de..2189921 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
@@ -37,6 +37,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
import lombok.var;
import org.aspectj.weaver.AjAttribute;
@@ -131,6 +132,8 @@
private TjOrderYcxmService ycxmService;
@Autowired
private SysConfigController configController;
+ @Autowired
+ private TjJcycxmService jcycxmService;
@GetMapping ("/ceshicc")
@@ -710,7 +713,7 @@
}
return AjaxResult.error("璇ヤ汉鍛樻暟鎹鍦ㄥ悓姝ヤ腑锛岃绋嶇瓑");
} catch (InterruptedException e) {
- e.printStackTrace();
+ log.error(String.valueOf(e),e.getMessage());
return AjaxResult.error("璇ヤ汉鍛樻暟鎹鍦ㄥ悓姝ヤ腑锛岃绋嶇瓑");
}finally {
lock.unlock();
@@ -734,7 +737,7 @@
String doctorId = configService.selectConfigByKey("request_default_check_doctorId");
//鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
-
+ String dqyyyqbm = configService.selectConfigByKey("dqyyyqbm");
final String sfkqdyhis = configService.selectConfigByKey("sfkqdyhis");
TjOrder order = orderService.getOrderByTjNum(tjNumber);
if (null != order) {
@@ -815,7 +818,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()) {
@@ -878,8 +881,32 @@
jcbgd.setSqsj(objectMap.get("SQRQSJ").toString());
jcbgd.setCreateTime(new Date());
jcbgdService.save(jcbgd);
+
}
jcsqdService.saveLtkjExamJcsqd(order.getCardId());
+ /* List<LtkjExamJcsqd> jcsqdList = jcsqdService.getLtkjJcsqdByTjh(order.getCardId());
+ if(null !=jcsqdList && !jcsqdList.isEmpty()) {
+ for (LtkjExamJcsqd jcsqd : jcsqdList) {
+ if (StringUtil.isNotBlank(jcsqd.getJgzt())) {
+ String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;");
+ for (String jg : split) {
+ if (StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
+ && !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈")
+ && !jg.contains("鏈鏄庢樉") && !jg.contains("姝ｅ父") && !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")) {
+ TjJcycxm jcycxm = new TjJcycxm();
+ jcycxm.setTjh(order.getTjNumber());
+ jcycxm.setYqid(dqyyyqbm);
+ String[] split1 = jcsqd.getJcxmid().split(";");
+ jcycxm.setProId(split1[0]);
+ jcycxm.setProName(jcsqd.getJcxmmc());
+ jcycxm.setCreateTime(new Date());
+ jcycxm.setJcjg(jg);
+ jcycxmService.save(jcycxm);
+ }
+ }
+ }
+ }
+ }*/
testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
}else {
// return AjaxResult.error("妫�鏌ラ」鐩殏鏃舵湭鍑虹粨鏋�,璇风◢鍚庡悓姝�!!!");
@@ -892,9 +919,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("鏈煡鍒拌浜哄憳浣撴璁板綍");
@@ -1682,12 +1709,16 @@
@GetMapping ("/getzongjianyishengchakanyichangxiangmu")
@ApiOperation (value = "鎬绘鏌ョ湅寮傚父椤圭洰鎺ュ彛")
public AjaxResult getzongjianyishengchakanyichangxiangmu(@RequestParam String tjNum) {
+ long l = System.currentTimeMillis();
if (StrUtil.isNotBlank(tjNum)) {
TjOrder one = orderService.getOrderByTjNum(tjNum);
if (one == null) {
return AjaxResult.error("鏆傛棤鏁版嵁锛侊紒");
}
+ String yqbm = configService.selectConfigByKey("common_api_service_hospbm");
+ jcycxmService.deletedByTjh(tjNum);
+ configController.zongjianshengchengyichangxiangmu(tjNum,yqbm);
LambdaQueryWrapper<TjOrderYcxm> wq=new LambdaQueryWrapper<>();
wq.eq(TjOrderYcxm::getTjh,tjNum);
@@ -1741,14 +1772,15 @@
List<Map<String, Object>> collect1 = maps.stream()
.sorted((map1, map2) -> map2.get("proName").toString().compareTo(map1.get("proName").toString()))
.collect(Collectors.toList());
+ System.out.println("鎬昏�楁椂:"+(System.currentTimeMillis()-l));
return AjaxResult.success(collect1);
}
- return AjaxResult.success(maps);
+ System.out.println("鎬昏�楁椂:"+(System.currentTimeMillis()-l));
+
+ return AjaxResult.success(maps);
}else {
List<Map<String, Object>> mapList = zongjianyishengchakanyichangxiangmu(tjNum);
-// if(mapList.isEmpty()){
-// return AjaxResult.success("鏆傛棤鏁版嵁");
-// }
+ System.out.println("鎬昏�楁椂:"+(System.currentTimeMillis()-l));
return AjaxResult.success(mapList);
}
--
Gitblit v1.8.0