From 6b73ef6f82fa10747c29bdec04cb43d0f7e91598 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 05 三月 2025 16:43:55 +0800
Subject: [PATCH] zjh20250305
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 101 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 98 insertions(+), 3 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 4f3e9af..5fe0317 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
@@ -129,6 +129,8 @@
private ITjProAdvicerulesService tjProAdvicerulesService;
@Autowired
private TjOrderYcxmService ycxmService;
+ @Autowired
+ private SysConfigController configController;
@GetMapping ("/ceshicc")
@@ -871,7 +873,7 @@
jcbgdService.save(jcbgd);
}
jcsqdService.saveLtkjExamJcsqd(order.getCardId());
-// testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
+ testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
}else {
return AjaxResult.error("妫�鏌ラ」鐩殏鏃舵湭鍑虹粨鏋�,璇风◢鍚庡悓姝�!!!");
}
@@ -880,7 +882,7 @@
return AjaxResult.success("鍚屾鎴愬姛");
}
//鍖栭獙
-// 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());
return AjaxResult.success("鍚屾鎴愬姛");
@@ -1752,7 +1754,7 @@
return AjaxResult.success();
}
- private List<Map<String, Object>> zongjianyishengchakanyichangxiangmu(String tjNumber) {
+ /*private List<Map<String, Object>> zongjianyishengchakanyichangxiangmu(String tjNumber) {
// asyncService.updateCheckType(tjNumber);
List<TjOrderRemark> remarkList = orderRemarkService.getzongjianyishengchakanyichangxiangmu(tjNumber);
@@ -1780,6 +1782,68 @@
List<Map<String,Object>> mapList=new ArrayList<>();
for (String s : split) {
s = s.replaceAll("\n", "");
+// Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
+ Map<String,Object> maps= tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(),s,"0");
+ if(null !=maps && !maps.isEmpty()){
+ Object bt = maps.get("bt");
+ Object nr = maps.get("nr");
+ if(null !=bt || null !=nr) mapList.add(maps);
+ }
+ }
+ tjOrderDetail.setAdvices(mapList);
+ }
+
+ }
+
+ dels.add(tjOrderDetail);
+ }
+ }
+ if(!dels.isEmpty()){
+ parent.put("proName",remark.getProName());
+ parent.put("jyjc",remark.getJyjc());
+ parent.put("sone",dels);
+ list.add(parent);
+ }
+ }
+ }
+
+ }
+ return list;
+ }*/
+
+ private List<Map<String, Object>> zongjianyishengchakanyichangxiangmu(String tjNumber) {
+// asyncService.updateCheckType(tjNumber);
+
+ List<TjOrderRemark> remarkList = orderRemarkService.getzongjianyishengchakanyichangxiangmu(tjNumber);
+ List<TjOrderDetail> tjOrderDetails = detailService.getzongjianyishengchakanyichangxiangmu(tjNumber);
+ List<Map<String, Object>> list = new ArrayList<>();
+ if (null != remarkList && !remarkList.isEmpty()) {
+ for (TjOrderRemark remark : remarkList) {
+ Map<String, Object> parent = new HashMap<>();
+ if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
+ List<TjOrderDetail> dels = new ArrayList<>();
+ for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
+ if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
+ if(null !=tjOrderDetail.getProId()&& null !=tjOrderDetail.getYcbz()){
+ if(!tjOrderDetail.getDeptId().equals("2")){
+ List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString()
+ ,tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[锛�)]", "")
+ .replaceAll("[ 娴嬪畾妫�娴� 鈼哴","").replaceAll("\\[.*?\\]", "")
+ ,tjOrderDetail.getYcbz().replaceAll(" ", ""),tjNumber
+ ,tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "")
+ .replaceAll("[ 娴嬪畾妫�娴� 鈼哴","").replaceAll("\\[.*?\\]", "")
+ ,tjOrderDetail.getProResult());
+
+
+ if(null !=maps && !maps.isEmpty()){
+ tjOrderDetail.setAdvices(maps);
+ }
+
+ }else {
+ String[] split = tjOrderDetail.getProResult().split("銆倈,|锛�");
+ List<Map<String,Object>> mapList=new ArrayList<>();
+ for (String s : split) {
+ s = s.replaceAll("\n", "");
// Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
Map<String,Object> maps= tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(),s,"0");
if(null !=maps && !maps.isEmpty()){
@@ -1845,4 +1909,35 @@
+
+ /**
+ * 鍚屾sql server鏁版嵁鍒版湰鍦版暟鎹簱鏁版嵁鎺ュ彛
+ */
+ @GetMapping ("/newdataSynchronization")
+ @ApiOperation (value = "鏈�鏂板叕鍏卞悓姝ql server鏁版嵁鍒版湰鍦版暟鎹簱鏁版嵁鎺ュ彛")
+ @RepeatSubmit
+ public AjaxResult newdataSynchronization(@RequestParam String tjNumber) {
+ try {
+ //鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
+ final String sfkqdyhis = configService.selectConfigByKey("sfkqdyhis");
+ TjOrder order = orderService.getOrderByTjNum(tjNumber);
+ if (null != order) {
+ if (null != sfkqdyhis && sfkqdyhis.equals("Y")) {
+ dataSynchronizationApi(tjNumber);
+ }else {
+ configController.shoudongtbjyjcwsxmjg("jyjc",tjNumber);
+ }
+ return AjaxResult.success("鍚屾鎴愬姛");
+ }
+ return AjaxResult.error("鏈煡鍒拌浜哄憳浣撴璁板綍");
+ } catch (Exception e) {
+// throw new RuntimeException(ex);
+ log.error(String.valueOf(e),e.getMessage());
+ return AjaxResult.error("璇ヤ汉鍛樻暟鎹鍦ㄥ悓姝ヤ腑锛岃绋嶇瓑");
+ }
+ }
+
+
+
+
}
--
Gitblit v1.8.0