From b6ec9700dda9dfa2530ddd9aac3c992acd9e5af2 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期日, 01 十二月 2024 21:32:56 +0800
Subject: [PATCH] zjh20241201-1

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java |   37 ++++++++++++++++++++++++++++++-------
 1 files changed, 30 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 ca71035..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
@@ -270,7 +281,12 @@
 //            });
 //        }
 
-        List<CsProVo> list = orderRemarkService.cSWebGetProByTjNumAndOrderId(tjNumber);
+        List<CsProVo> list = getCsProVos(tjNumber,false);
+        return AjaxResult.success(list);
+    }
+
+    public List<CsProVo> getCsProVos(String tjNumber,boolean sfzpacs) {
+        List<CsProVo> list = orderRemarkService.cSWebGetProByTjNumAndOrderId(tjNumber,sfzpacs);
         if (null != list && list.size() > 0) {
             list.sort(new Comparator<CsProVo>() {
                 @Override
@@ -279,7 +295,7 @@
                 }
             });
         }
-        return AjaxResult.success(list);
+        return list;
     }
 
 
@@ -343,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) {
 
@@ -596,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());
                     //妫�鏌�
@@ -613,6 +633,8 @@
         }
     }
 
+
+
     /**
      * 鍚屾sql server鏁版嵁鍒版湰鍦版暟鎹簱鏁版嵁鎺ュ彛
      */
@@ -625,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");
 
@@ -636,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());
 
                     }
@@ -694,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) {
@@ -752,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("妫�鏌ラ」鐩殏鏃舵湭鍑虹粨鏋�,璇风◢鍚庡悓姝�!!!");
                                 }
@@ -761,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