From 2c19fa65dc87ea8f3d81f84154f4eeabff7f8d00 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 05 六月 2025 12:36:47 +0800
Subject: [PATCH] zjh20250605

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java | 1458 +++++++++++++++++++++------------------------------------
 1 files changed, 549 insertions(+), 909 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java
index f8b2008..6366910 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java
@@ -9,9 +9,7 @@
 import com.ltkj.common.core.controller.BaseController;
 import com.ltkj.common.core.domain.AjaxResult;
 import com.ltkj.framework.config.UserHoder;
-import com.ltkj.hosp.domain.LtkjJianchajianyanTree;
-import com.ltkj.hosp.domain.TjOrder;
-import com.ltkj.hosp.domain.TjProject;
+import com.ltkj.hosp.domain.*;
 import com.ltkj.hosp.hisDto.*;
 import com.ltkj.hosp.mapper.TestMapper;
 import com.ltkj.hosp.service.*;
@@ -22,8 +20,10 @@
 import com.ltkj.hosp.vodomain.CsProVo;
 import com.ltkj.web.controller.system.TjCheckController;
 import io.swagger.annotations.Api;
+import jodd.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.NoTransactionException;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
@@ -59,50 +59,59 @@
     private LtkjHysqdService hysqdService;
     @Autowired
     private LtkjHybgdService hybgdService;
+    @Autowired
+    private ITjCustomerService tjCustomerService;
+    @Autowired
+    private TjJcycxmService jcycxmService;
 
     /**
      * 鑾峰彇pacs妫�鏌ユ暟鎹�
      * @param json
      * @return
      */
-    @PostMapping("/pacs/getAll")
-    public AjaxResult getAllList(@RequestBody String json) {
-        cn.hutool.json.JSONObject parseObj = JSONUtil.parseObj(json);
-        String tjNum = StrUtil.isBlank(parseObj.getStr("tjNum")) ? null : parseObj.getStr("tjNum");
-        String name = StrUtil.isBlank(parseObj.getStr("name")) ? null : parseObj.getStr("name");
-        String start = StrUtil.isBlank(parseObj.getStr("start")) ? null : parseObj.getStr("start");
-        String end = StrUtil.isBlank(parseObj.getStr("end")) ? null : parseObj.getStr("end");
-        String mzh = null;
-        if (tjNum == null && name == null){
-            return AjaxResult.error("浣撴鍙峰拰鍚嶅瓧涓嶈兘閮戒负绌�");
-        }
-        if (tjNum != null) {
-            LambdaQueryWrapper<TjOrder> wrapper = new LambdaQueryWrapper<>();
-            wrapper.eq(TjOrder::getTjNumber,tjNum);
-            TjOrder order = tjOrderService.getOne(wrapper);
-            mzh = order.getCardId();
-        }
-        List<Map<String, Object>> jcList = testMapper.getPacsJcList(name, mzh, start, end);
-        if (jcList.isEmpty()){
-            return AjaxResult.success();
-        }
-        if (tjNum == null){
-            String string = jcList.get(0).get("mzh").toString();
-            LambdaQueryWrapper<TjOrder> wrapper = new LambdaQueryWrapper<>();
-            wrapper.eq(TjOrder::getCardId,string);
-            TjOrder order = tjOrderService.getOne(wrapper);
-            if (order == null) return AjaxResult.error("");
-            tjNum = order.getTjNumber();
-        }
-        List<CsProVo> proVos = tjCheckController.getCsProVos(tjNum,true);
-        HashMap<String, Object> hashMap = new HashMap<>();
-        hashMap.put("pacs",jcList);
-        hashMap.put("vo",proVos);
-        return AjaxResult.success(hashMap);
-    }
+//    @PostMapping("/pacs/getAll")
+//    public AjaxResult getAllList(@RequestBody String json) {
+//        cn.hutool.json.JSONObject parseObj = JSONUtil.parseObj(json);
+//        String tjNum = StrUtil.isBlank(parseObj.getStr("tjNum")) ? null : parseObj.getStr("tjNum");
+//        String name = StrUtil.isBlank(parseObj.getStr("name")) ? null : parseObj.getStr("name");
+//        String start = StrUtil.isBlank(parseObj.getStr("start")) ? null : parseObj.getStr("start");
+//        String end = StrUtil.isBlank(parseObj.getStr("end")) ? null : parseObj.getStr("end");
+//        String mzh = null;
+//        if (tjNum == null && name == null){
+//            return AjaxResult.error("浣撴鍙峰拰鍚嶅瓧涓嶈兘閮戒负绌�");
+//        }
+//        if (tjNum != null) {
+//            LambdaQueryWrapper<TjOrder> wrapper = new LambdaQueryWrapper<>();
+//            wrapper.eq(TjOrder::getTjNumber,tjNum);
+//            TjOrder order = tjOrderService.getOne(wrapper);
+//            mzh = order.getCardId();
+//            LambdaQueryWrapper<TjCustomer> wrapper1 = new LambdaQueryWrapper<>();
+//            wrapper1.eq(TjCustomer::getCusId,order.getUserId());
+//            TjCustomer tjCustomer = tjCustomerService.getOne(wrapper1);
+//            name = tjCustomer.getCusName();
+//        }
+//        List<Map<String, Object>> jcList = testMapper.getPacsJcList(name, mzh, start, end);
+//        if (jcList.isEmpty()){
+//            return AjaxResult.success();
+//        }
+//        if (tjNum == null){
+//            String string = jcList.get(0).get("mzh").toString();
+//            LambdaQueryWrapper<TjOrder> wrapper = new LambdaQueryWrapper<>();
+//            wrapper.eq(TjOrder::getCardId,string);
+//            TjOrder order = tjOrderService.getOne(wrapper);
+//            if (order == null) return AjaxResult.error("");
+//            tjNum = order.getTjNumber();
+//        }
+//        List<CsProVo> proVos = tjCheckController.getCsProVos(tjNum,true);
+//        HashMap<String, Object> hashMap = new HashMap<>();
+//        hashMap.put("pacs",jcList);
+//        hashMap.put("vo",proVos);
+//        return AjaxResult.success(hashMap);
+//    }
 
     /**
      * 鑾峰彇pacs妫�鏌ユ暟鎹�
+     *
      * @param json
      * @return
      */
@@ -115,14 +124,16 @@
         String start = StrUtil.isBlank(parseObj.getStr("start")) ? null : parseObj.getStr("start");
         String end = StrUtil.isBlank(parseObj.getStr("end")) ? null : parseObj.getStr("end");
         String mzh = null;
-        if (tjNum == null && name == null){
+        if (tjNum == null && name == null) {
             return AjaxResult.error("浣撴鍙峰拰鍚嶅瓧涓嶈兘閮戒负绌�");
         }
         if (tjNum != null) {
-            LambdaQueryWrapper<TjOrder> wrapper = new LambdaQueryWrapper<>();
-            wrapper.eq(TjOrder::getTjNumber,tjNum);
-            TjOrder order = tjOrderService.getOne(wrapper);
+            TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
             mzh = order.getCardId();
+            LambdaQueryWrapper<TjCustomer> wrapper1 = new LambdaQueryWrapper<>();
+            wrapper1.eq(TjCustomer::getCusId, order.getUserId());
+            TjCustomer tjCustomer = tjCustomerService.getOne(wrapper1);
+            name = tjCustomer.getCusName();
         }
         List<Map<String, Object>> jcList = testMapper.getPacsJcList(name, mzh, start, end);
         return AjaxResult.success(jcList);
@@ -130,59 +141,67 @@
 //        return AjaxResult.success(JSONUtil.parseArray(json1));
     }
 
-
     /**
      * 鑾峰彇Lis妫�楠屾暟鎹�
+     *
      * @param json
      * @return
      */
     @PostMapping("/lis/getList")
     public AjaxResult getLisList(@RequestBody String json) {
-        log.info("lis鎺ュ彛鍙傛暟->{}",JSONUtil.toJsonStr(json));
+//        log.info("lis鎺ュ彛鍙傛暟->{}",JSONUtil.toJsonStr(json));
         cn.hutool.json.JSONObject parseObj = JSONUtil.parseObj(json);
         String tjNum = StrUtil.isBlank(parseObj.getStr("tjNum")) ? null : parseObj.getStr("tjNum");
         String name = StrUtil.isBlank(parseObj.getStr("name")) ? null : parseObj.getStr("name");
         String start = StrUtil.isBlank(parseObj.getStr("start")) ? null : parseObj.getStr("start");
         String end = StrUtil.isBlank(parseObj.getStr("end")) ? null : parseObj.getStr("end");
         String mzh = null;
-        if (tjNum == null && name == null){
+        if (tjNum == null && name == null) {
             return AjaxResult.error("浣撴鍙峰拰鍚嶅瓧涓嶈兘閮戒负绌�");
         }
         if (tjNum != null) {
             LambdaQueryWrapper<TjOrder> wrapper = new LambdaQueryWrapper<>();
-            wrapper.eq(TjOrder::getTjNumber,tjNum);
+            wrapper.eq(TjOrder::getTjNumber, tjNum);
             TjOrder order = tjOrderService.getOne(wrapper);
             mzh = order.getCardId();
+            LambdaQueryWrapper<TjCustomer> wrapper1 = new LambdaQueryWrapper<>();
+            wrapper1.eq(TjCustomer::getCusId, order.getUserId());
+            TjCustomer tjCustomer = tjCustomerService.getOne(wrapper1);
+            name = tjCustomer.getCusName();
         }
         List<Map<String, Object>> jcList = testMapper.getLisJyList(name, mzh, start, end);
         return AjaxResult.success(jcList);
-//        String json1 = "[{\"deptName\":\"绉戝\",\"gender\":\"鐢穃",\"brid\":\"sqd445314589914\",\"checkParts\":\"琛�娑瞈",\"project\":\"1.0-2.0\",\"examinationDate\":\"2025-02-11 05:12:23\",\"proResult\":\"1.0\",\"name\":\"璧靛洓1\",\"patientAge\":\"20\",\"mzh\":\"810001246120745\",\"reportDoctorName\":\"鍖诲笀\",\"proName\":\"琛�娑插垎鏋怽",\"conclusion\":\"寮傚父\",\"tjStandardGtValue\":\"1 - 5\",\"company\":\"姣厠\",\"checkDoctorName\":\"妫�娴嬪尰甯圽",\"jcxmid\":\"123\",\"shys\":\"瀹℃牳鍖诲笀\"},{\"deptName\":\"绉戝\",\"gender\":\"鐢穃",\"brid\":\"sqd445314589914\",\"checkParts\":\"琛�娑瞈",\"project\":\"1.0-2.0\",\"examinationDate\":\"2025-02-11 05:12:23\",\"proResult\":\"1.0\",\"name\":\"璧靛洓2\",\"patientAge\":\"20\",\"mzh\":\"201474534\",\"reportDoctorName\":\"鍖诲笀\",\"proName\":\"琛�娑插垎鏋怽"},{\"deptName\":\"绉戝\",\"gender\":\"鐢穃",\"brid\":\"sqd445314589914\",\"checkParts\":\"琛�娑瞈",\"project\":\"1.0-2.0\",\"examinationDate\":\"2025-02-11 05:12:23\",\"proResult\":\"1.0\",\"name\":\"璧靛洓3\",\"patientAge\":\"20\",\"mzh\":\"201474534\",\"reportDoctorName\":\"鍖诲笀\",\"proName\":\"琛�娑插垎鏋怽"}]";
+//        String json1 = "[{\"deptName\":\"绉戝\",\"gender\":\"鐢穃",\"brid\":\"sqd445314589914\",\"checkParts\":\"琛�娑瞈",\"project\":\"1.0-2.0\",\"examinationDate\":\"2025-02-11 05:12:23\",\"proResult\":\"1.0\",\"name\":\"璧靛洓1\",\"patientAge\":\"20\",\"mzh\":\"810001246120745\",\"reportDoctorName\":\"鍖诲笀\",\"proName\":\"琛�娑插垎鏋怽",\"conclusion\":\"寮傚父\",\"tjStandardGtValue\":\"1 - 5\",\"company\":\"姣厠\",\"checkDoctorName\":\"妫�娴嬪尰甯圽",\"jcxmid\":\"123\",\"shys\":\"瀹℃牳鍖诲笀\"},{\"deptName\":\"绉戝\",\"gender\":\"鐢穃",\"brid\":\"sqd445314589914\",\"checkParts\":\"琛�娑瞈",\"project\":\"1.0-2.0\",\"examinationDate\":\"2025-02-11 05:12:23\",\"proResult\":\"1.0\",\"name\":\"璧靛洓2\",\"patientAge\":\"20\",\"mzh\":\"201474534\",\"reportDoctorName\":\"鍖诲笀\",\"proName\":\"琛�娑插垎鏋怽"},{\"deptName\":\"绉戝\",\"gender\":\"鐢穃",\"brid\":\"sqd445314589914\",\"checkParts\":\"琛�娑瞈",\"project\":\"1.0-2.0\",\"examinationDate\":\"2025-02-11 05:12:23\",\"proResult\":\"1.0\",\"name\":\"璧靛洓3\",\"patientAge\":\"20\",\"mzh\":\"201474534\",\"reportDoctorName\":\"鍖诲笀\",\"proName\":\"琛�娑插垎鏋怽"},{\"deptName\":\"绉戝\",\"gender\":\"鐢穃",\"brid\":\"sqd445314589914\",\"checkParts\":\"琛�娑瞈",\"project\":\"1.0-2.0\",\"examinationDate\":\"2025-02-11 05:12:23\",\"proResult\":\"1.0\",\"name\":\"璧靛洓3\",\"patientAge\":\"20\",\"mzh\":\"201474534\",\"reportDoctorName\":\"鍖诲笀\",\"proName\":\"琛�娑插垎鏋怽"},{\"deptName\":\"绉戝\",\"gender\":\"鐢穃",\"brid\":\"sqd445314589914\",\"checkParts\":\"琛�娑瞈",\"project\":\"1.0-2.0\",\"examinationDate\":\"2025-02-11 05:12:23\",\"proResult\":\"1.0\",\"name\":\"璧靛洓3\",\"patientAge\":\"20\",\"mzh\":\"201474534\",\"reportDoctorName\":\"鍖诲笀\",\"proName\":\"琛�娑插垎鏋怽"},{\"deptName\":\"绉戝\",\"gender\":\"鐢穃",\"brid\":\"sqd445314589914\",\"checkParts\":\"琛�娑瞈",\"project\":\"1.0-2.0\",\"examinationDate\":\"2025-02-11 05:12:23\",\"proResult\":\"1.0\",\"name\":\"璧靛洓3\",\"patientAge\":\"20\",\"mzh\":\"201474534\",\"reportDoctorName\":\"鍖诲笀\",\"proName\":\"琛�娑插垎鏋怽"},{\"deptName\":\"绉戝\",\"gender\":\"鐢穃",\"brid\":\"sqd445314589914\",\"checkParts\":\"琛�娑瞈",\"project\":\"1.0-2.0\",\"examinationDate\":\"2025-02-11 05:12:23\",\"proResult\":\"1.0\",\"name\":\"璧靛洓3\",\"patientAge\":\"20\",\"mzh\":\"201474534\",\"reportDoctorName\":\"鍖诲笀\",\"proName\":\"琛�娑插垎鏋怽"},{\"deptName\":\"绉戝\",\"gender\":\"鐢穃",\"brid\":\"sqd445314589914\",\"checkParts\":\"琛�娑瞈",\"project\":\"1.0-2.0\",\"examinationDate\":\"2025-02-11 05:12:23\",\"proResult\":\"1.0\",\"name\":\"璧靛洓3\",\"patientAge\":\"20\",\"mzh\":\"201474534\",\"reportDoctorName\":\"鍖诲笀\",\"proName\":\"琛�娑插垎鏋怽"}]";
 //        return AjaxResult.success(JSONUtil.parseArray(json1));
     }
 
     @GetMapping("/getTjList")
-    public AjaxResult getTjList(@RequestParam("code")String code){
+    public AjaxResult getTjList(@RequestParam("code") String code) {
 //        log.info("tjList鎺ュ彛鍙傛暟->{}",code);
         LambdaQueryWrapper<TjOrder> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(TjOrder::getCardId,code);
+        queryWrapper.eq(TjOrder::getCardId, code)
+                .or()
+                .eq(TjOrder::getTjNumber, code);
         TjOrder order = tjOrderService.getOne(queryWrapper);
-        if (order == null){
-            return AjaxResult.error("闂ㄨ瘖鍙�:"+code+"鍦ㄤ綋妫�绯荤粺涓笉瀛樺湪");
+        if (order == null) {
+            return AjaxResult.error("闂ㄨ瘖鍙�:" + code + "鍦ㄤ綋妫�绯荤粺涓笉瀛樺湪");
         }
         List<CsProVo> proVos = tjCheckController.getCsProVos(order.getTjNumber(),true);
         return AjaxResult.success(proVos);
-//        String json = "[{\"deptName\":\"CT瀹",\"proName\":\"(tj)鑳搁儴CT骞虫壂\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"},{\"deptName\":\"褰╄秴瀹",\"proName\":\"(tj)娉屽翱绯诲墠鍒楄吅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2024-11-06 10:47:15\",\"bcupdateTime\":\"2024-11-06 10:47:15\",\"bcdoctorName\":null,\"zhupdateTime\":\"2024-11-06 10:47:15\"}]";
+//        String json = "[{\"proId\":\"1870371396991955206\",\"deptName\":\"DR瀹",\"proName\":\"鑳搁儴DR姝d綅\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2025-06-05 10:55:43\",\"bcupdateTime\":\"2025-06-05 10:55:43\",\"bcdoctorName\":null,\"imageUrl\":null,\"zhupdateTime\":\"2025-06-05 10:55:43\",\"deptId\":599},{\"proId\":\"1878964342340526298\",\"deptName\":\"褰╄秴瀹",\"proName\":\"鑲濊儐鑴捐儼鑲惧僵瓒匼",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2025-06-05 10:55:43\",\"bcupdateTime\":\"2025-06-05 10:55:43\",\"bcdoctorName\":null,\"imageUrl\":null,\"zhupdateTime\":\"2025-06-05 10:55:43\",\"deptId\":609},{\"proId\":\"1878964342340526330\",\"deptName\":\"褰╄秴瀹",\"proName\":\"鑶�鑳卞墠鍒楄吅褰╄秴\",\"type\":0,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2025-06-05 10:55:43\",\"bcupdateTime\":\"2025-06-05 10:55:43\",\"bcdoctorName\":null,\"imageUrl\":null,\"zhupdateTime\":\"2025-06-05 10:55:43\",\"deptId\":609},{\"proId\":\"1870371396991955336\",\"deptName\":\"蹇冪數鍥綷",\"proName\":\"蹇冪數鍥炬鏌",\"type\":1,\"doctorName\":null,\"sffs\":\"缁熸敹\",\"isPay\":\"宸叉敹璐筡",\"qdcreateTime\":\"2025-06-05 10:55:43\",\"bcupdateTime\":\"2025-06-05 11:12:50\",\"bcdoctorName\":null,\"imageUrl\":null,\"zhupdateTime\":\"2025-06-05 11:12:50\",\"deptId\":601}]";
 //        return AjaxResult.success(JSONUtil.parseArray(json));
     }
 
     @GetMapping("/getJyTjList")
-    public AjaxResult getJyTjList(@RequestParam("code")String code){
+    public AjaxResult getJyTjList(@RequestParam("code") String code) {
 //        log.info("tjList鎺ュ彛鍙傛暟->{}",code);
         LambdaQueryWrapper<TjOrder> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(TjOrder::getCardId,code);
+        queryWrapper.eq(TjOrder::getCardId, code)
+                .or()
+                .eq(TjOrder::getTjNumber, code);
         TjOrder order = tjOrderService.getOne(queryWrapper);
-        if (order == null){
-            return AjaxResult.error("闂ㄨ瘖鍙�:"+code+"鍦ㄤ綋妫�绯荤粺涓笉瀛樺湪");
+        if (order == null) {
+            return AjaxResult.error("闂ㄨ瘖鍙�:" + code + "鍦ㄤ綋妫�绯荤粺涓笉瀛樺湪");
         }
         List<CsProVo> proVos = orderRemarkService.cSWebGetProByTjNumAndOrderIdJy(order.getTjNumber());
         if (null != proVos && !proVos.isEmpty()) {
@@ -196,7 +215,8 @@
     @Transactional
     @PostMapping("/asyncPacs")
     public AjaxResult asyncPacs(@RequestBody String json) {
-        log.info("鍚堝苟妫�娴嬪悓姝ュ弬鏁� ->{}",json);
+        try {
+            log.info("鍚堝苟妫�娴嬪悓姝ュ弬鏁� ->{}", json);
 //        try {
 //            Thread.sleep(2000);
 //        } catch (InterruptedException ignored) {
@@ -204,883 +224,503 @@
 //        }
 //        if (true)
 //            return AjaxResult.error("鍚屾澶辫触璇烽噸璇�");
-        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        cn.hutool.json.JSONObject parseObj = JSONUtil.parseObj( json);
-        cn.hutool.json.JSONObject pacs = parseObj.getJSONObject("pacs");
-        cn.hutool.json.JSONArray lis = parseObj.getJSONArray("lis");
-        cn.hutool.json.JSONObject tj = parseObj.getJSONObject("tj");
-        if (pacs != null && !pacs.isEmpty()){
-            LtkjExamJcsqd ltkjExamJcsqd = new LtkjExamJcsqd();
-            ltkjExamJcsqd.setTjh(pacs.getStr("mzh"));
+            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            cn.hutool.json.JSONObject parseObj = JSONUtil.parseObj(json);
+            cn.hutool.json.JSONObject pacs = parseObj.getJSONObject("pacs");
+            cn.hutool.json.JSONArray lis = parseObj.getJSONArray("lis");
+            cn.hutool.json.JSONObject tj = parseObj.getJSONObject("tj");
+            if (pacs != null && !pacs.isEmpty()) {
+                String tjNum = pacs.getStr("tjnum");
+                LambdaQueryWrapper<TjOrder> wrapper1 = new LambdaQueryWrapper<>();
+                wrapper1.eq(TjOrder::getTjNumber, tjNum);
+                TjOrder order = tjOrderService.getOne(wrapper1);
 
-            LambdaQueryWrapper<LtkjJianchajianyanTree> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(LtkjJianchajianyanTree::getCardId, pacs.getStr("mzh"));
-            String xmdm = projectService.getById(tj.getStr("proId")).getHisXmbm();
-            queryWrapper.eq(LtkjJianchajianyanTree::getType,"妫�鏌�");
-            queryWrapper.eq(LtkjJianchajianyanTree::getHisXmdm,xmdm);
+                LtkjExamJcsqd ltkjExamJcsqd = new LtkjExamJcsqd();
+                ltkjExamJcsqd.setTjh(order.getCardId());
 
-            LtkjJianchajianyanTree tree = ltkjJianchajianyanTreeService.getOne(queryWrapper);
-            ltkjExamJcsqd.setTmh("M_"+tree.getSqdh()+"_"+tree.getHisXmdm());
-            ltkjExamJcsqd.setBgys(pacs.getStr("checkDoctorName"));
-            ltkjExamJcsqd.setBgysid(pacs.getStr("checkDoctorCode"));
-            ltkjExamJcsqd.setSqsj(format.format(tree.getCreateTime()));
-            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss");
-            Date reportDate = null;
-            try {
-                reportDate = dateFormat.parse(pacs.getStr("reportDate"));
-                ltkjExamJcsqd.setJgsj(format.format(reportDate));
-            } catch (ParseException ignored) {
-                ltkjExamJcsqd.setJgsj(format.format(new Date()));
-            }
-            String checkParts = pacs.getStr("checkParts");
-            ltkjExamJcsqd.setJcxmmc(checkParts);
-            ltkjExamJcsqd.setJcxmid(xmdm);
-            ltkjExamJcsqd.setBw(checkParts);
-            ltkjExamJcsqd.setJgzt(pacs.getStr("diagnosis"));
-            ltkjExamJcsqd.setJgbx(pacs.getStr("examination"));
-            boolean save1 = ltkjExamJcsqdService.save(ltkjExamJcsqd);
-
-            LtkjExamJcbgd ltkjExamJcbgd = new LtkjExamJcbgd();
-            ltkjExamJcbgd.setTjh(ltkjExamJcsqd.getTjh());
-            ltkjExamJcbgd.setTmh(ltkjExamJcsqd.getTmh());
-            ltkjExamJcbgd.setXmdm(ltkjExamJcsqd.getJcxmid());
-            ltkjExamJcbgd.setXmmc(ltkjExamJcsqd.getJcxmmc());
-            ltkjExamJcbgd.setBgUrl("");
-            ltkjExamJcbgd.setShysxm(pacs.getStr("reportDoctorName"));
-            ltkjExamJcbgd.setShysdm(pacs.getStr("reportDoctorCode"));
-            ltkjExamJcbgd.setYxzd(ltkjExamJcsqd.getJgzt());
-            ltkjExamJcbgd.setYxbx(ltkjExamJcsqd.getJgbx());
-            ltkjExamJcbgd.setZdsj(ltkjExamJcsqd.getJgsj());
-            ltkjExamJcbgd.setSqsj(ltkjExamJcsqd.getSqsj());
-            ltkjExamJcbgd.setJcbw(ltkjExamJcsqd.getJcxmmc());
-            boolean save2 = ltkjExamJcbgdService.save(ltkjExamJcbgd);
-            if (save1 && save2) {
-                LambdaQueryWrapper<TjOrder> wrapper = new LambdaQueryWrapper<>();
-                wrapper.eq(TjOrder::getCardId, ltkjExamJcbgd.getTjh());
-                TjOrder order = tjOrderService.getOne(wrapper);
-                try {
-                    testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
-                }catch (Exception e){
-                    log.error(String.valueOf(e));
-                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                    return AjaxResult.error("鍚屾澶辫触璇烽噸璇�");
-                }
-            } else {
-                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return AjaxResult.error("鍚屾澶辫触璇烽噸璇�");
-            }
-            return AjaxResult.success();
-        }else {
-            cn.hutool.json.JSONObject entries = (cn.hutool.json.JSONObject) lis.get(0);
-            String mzh = entries.getStr("mzh");
-            LtkjHysqd hysqd = new LtkjHysqd();
-            LambdaQueryWrapper<TjOrder> wrapper = new LambdaQueryWrapper<>();
-            wrapper.eq(TjOrder::getCardId,mzh);
-            TjOrder order = tjOrderService.getOne(wrapper);
-            hysqd.setTjh(order.getTjNumber());
-
-            LambdaQueryWrapper<LtkjJianchajianyanTree> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(LtkjJianchajianyanTree::getCardId, mzh);
-            TjProject project = projectService.getById(tj.getStr("proId"));
-            String xmdm = project.getHisXmbm();
-            queryWrapper.eq(LtkjJianchajianyanTree::getType,"妫�楠�");
-            queryWrapper.eq(LtkjJianchajianyanTree::getHisXmdm,xmdm);
-            LtkjJianchajianyanTree tree = ltkjJianchajianyanTreeService.getOne(queryWrapper);
-            if (tree == null) {
-                tree = new LtkjJianchajianyanTree();
-                tree.setHisXmdm(xmdm);
-                tree.setCreateTime(new Date());
-                String sqdh = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + String.valueOf(RandomUtil.randomInt(0, 99999));
-                queryWrapper = new LambdaQueryWrapper<>();
-                queryWrapper.eq(LtkjJianchajianyanTree::getSqdh,sqdh);
-                if (ltkjJianchajianyanTreeService.getOne(queryWrapper) == null) {
-                    tree.setSqdh(sqdh);
-                }else {
-                    while (true){
-                        sqdh = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + String.valueOf(RandomUtil.randomInt(0, 99999));
-                        queryWrapper = new LambdaQueryWrapper<>();
-                        queryWrapper.eq(LtkjJianchajianyanTree::getSqdh,sqdh);
-                        if (ltkjJianchajianyanTreeService.getOne(queryWrapper) == null) {
-                            tree.setSqdh(sqdh);
+                LambdaQueryWrapper<LtkjJianchajianyanTree> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(LtkjJianchajianyanTree::getCardId, order.getCardId());
+                TjProject project = projectService.getById(tj.getStr("proId"));
+                String xmdm = project.getHisXmbm();
+                if (project.getSfzhfy().equals("N")) {
+                    LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
+                    wrapper.eq(TjProject::getProParentId, project.getProId());
+                    List<TjProject> list = projectService.list(wrapper);
+                    for (TjProject tjProject : list) {
+                        if (StrUtil.isNotBlank(tjProject.getHisXmbm())) {
+                            xmdm = tjProject.getHisXmbm();
                             break;
                         }
                     }
                 }
-            }
 
+                queryWrapper.eq(LtkjJianchajianyanTree::getType, "妫�鏌�");
+                queryWrapper.eq(LtkjJianchajianyanTree::getHisXmdm, xmdm);
 
-            hysqd.setTmh(tree.getSqdh()+"_"+tree.getHisXmdm());
-            hysqd.setXmid(xmdm);
-            hysqd.setXmmc(project.getHisXmbm());
-            hysqd.setSqsj(format.format(tree.getCreateTime()));
-            hysqd.setJgsj(format.format(new Date()));
-//            hysqd.setBbmc();
-            boolean save = hysqdService.save(hysqd);
-            boolean save2 = true;
-            for (Object object : lis) {
-                cn.hutool.json.JSONObject jsonObject = (cn.hutool.json.JSONObject) object;
-                LtkjHybgd hybgd = new LtkjHybgd();
-                hybgd.setTmh(tree.getSqdh()+"_"+tree.getHisXmdm());
-                hybgd.setJcxmid(jsonObject.getStr("jcxmid"));
-                hybgd.setJcxm(jsonObject.getStr("checkParts"));
-                hybgd.setJyjg(jsonObject.getStr("proResult"));
-                hybgd.setJgdw(jsonObject.getStr("company"));
-                String tjStandardGtValue = jsonObject.getStr("tjStandardGtValue");
-                String zdz = "";
-                String zxz = "";
-                if (tjStandardGtValue.contains("-")){
-                    String[] split = tjStandardGtValue.split("-");
-                    zxz = split[0].trim();
-                    zdz = split[1].trim();
+                LtkjJianchajianyanTree tree = ltkjJianchajianyanTreeService.getOne(queryWrapper);
+                ltkjExamJcsqd.setTmh("M_" + tree.getSqdh() + "_" + tree.getHisXmdm());
+                ltkjExamJcsqd.setBgys(pacs.getStr("checkDoctorName"));
+                ltkjExamJcsqd.setBgysid(pacs.getStr("checkDoctorCode"));
+                ltkjExamJcsqd.setSqsj(format.format(tree.getCreateTime()));
+                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss");
+                Date reportDate = null;
+                try {
+                    reportDate = dateFormat.parse(pacs.getStr("reportDate"));
+                    ltkjExamJcsqd.setJgsj(format.format(reportDate));
+                } catch (ParseException ignored) {
+                    ltkjExamJcsqd.setJgsj(format.format(new Date()));
                 }
-                hybgd.setFwzdz(zdz);
-                hybgd.setFwzgz(zxz);
-                hybgd.setFwz(tjStandardGtValue);
-                hybgd.setJysj(jsonObject.getStr("examinationDate"));
-                hybgd.setShsj(jsonObject.getStr("examinationDate"));
-                hybgd.setJyys(jsonObject.getStr("checkDoctorName"));
-                hybgd.setShys(jsonObject.getStr("shys"));
-                boolean save1 = hybgdService.save(hybgd);
-                if (!save1) {
-                    save2 = false;
-                    break;
+                String checkParts = pacs.getStr("checkParts");
+                //            ltkjExamJcsqd.setJcxmmc(checkParts);
+                //            ltkjExamJcsqd.setJcxmid(xmdm);
+
+                ltkjExamJcsqd.setJcxmmc(project.getProName());
+                ltkjExamJcsqd.setJcxmid(project.getProId().toString());
+
+                ltkjExamJcsqd.setBw(checkParts);
+                ltkjExamJcsqd.setJgzt(pacs.getStr("diagnosis"));
+                ltkjExamJcsqd.setJgbx(pacs.getStr("examination"));
+                ltkjExamJcsqd.setSgorzd("1");
+                ltkjExamJcsqd.setCreateTime(new Date());
+
+                ltkjExamJcsqdService.deletedLtkjJcsqdByTjhAndXmId(ltkjExamJcsqd.getTjh(), ltkjExamJcsqd.getJcxmid());
+                boolean save1 = ltkjExamJcsqdService.save(ltkjExamJcsqd);
+                log.info("鎵嬪姩鍚屾妫�鏌ョ粨鏋滅姸鎬� ->{}", ltkjExamJcsqd.getJgzt());
+                if (StringUtil.isNotBlank(ltkjExamJcsqd.getJgzt())) {
+                    jcycxmService.deletedByTjh(order.getTjNumber());
+                    String[] split = ltkjExamJcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;|,|锛�");
+                    log.info("杩涘叆妫�鏌ョ粨鏋滃紓甯告彁鍙栧垎鍓叉柟娉曚綋 ->{}->{}", order.getTjNumber(), split);
+                    for (String jg : split) {
+                        if (StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
+                                && !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈")
+                                && !jg.contains("鏈鏄庢樉") && !jg.contains("姝e父") && !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")) {
+                            TjJcycxm jcycxm = new TjJcycxm();
+                            jcycxm.setTjh(order.getTjNumber());
+                            jcycxm.setYqid("jczyy");
+                            String[] split1 = ltkjExamJcsqd.getJcxmid().split(";");
+                            jcycxm.setProId(split1[0]);
+                            jcycxm.setProName(ltkjExamJcsqd.getJcxmmc());
+                            jcycxm.setCreateTime(new Date());
+                            jcycxm.setJcjg(jg);
+                            jcycxmService.save(jcycxm);
+                        }
+                    }
                 }
-            }
-            if (save && save2){
+
+                LtkjExamJcbgd ltkjExamJcbgd = new LtkjExamJcbgd();
+                ltkjExamJcbgd.setTjh(ltkjExamJcsqd.getTjh());
+                ltkjExamJcbgd.setTmh(ltkjExamJcsqd.getTmh());
+                //            ltkjExamJcbgd.setXmdm(ltkjExamJcsqd.getJcxmid());
+                //            ltkjExamJcbgd.setXmmc(ltkjExamJcsqd.getJcxmmc());
+
+                ltkjExamJcbgd.setXmdm(project.getProId().toString());
+                ltkjExamJcbgd.setXmmc(project.getProName());
+
+                ltkjExamJcbgd.setBgUrl("");
+                ltkjExamJcbgd.setShysxm(pacs.getStr("reportDoctorName"));
+                ltkjExamJcbgd.setShysdm(pacs.getStr("reportDoctorCode"));
+                //            ltkjExamJcbgd.setYxzd(ltkjExamJcsqd.getJgzt());
+                //            ltkjExamJcbgd.setYxbx(ltkjExamJcsqd.getJgbx());
+                ltkjExamJcbgd.setZdsj(ltkjExamJcsqd.getJgsj());
+                ltkjExamJcbgd.setSqsj(ltkjExamJcsqd.getSqsj());
+                ltkjExamJcbgd.setJcbw(ltkjExamJcsqd.getJcxmmc());
+                ltkjExamJcbgd.setBgNr(ltkjExamJcsqd.getJgbx());
+                ltkjExamJcbgd.setYxbx(ltkjExamJcsqd.getJgzt());
+                ltkjExamJcbgd.setYxzd(ltkjExamJcsqd.getJgzt());
+                ltkjExamJcbgd.setSgorzd("1");
+                ltkjExamJcsqd.setCreateTime(new Date());
+                ltkjExamJcbgdService.deletedLtkjJcbgdByTjhAndTmhA(ltkjExamJcsqd.getTjh(), ltkjExamJcsqd.getTmh());
+                boolean save2 = ltkjExamJcbgdService.save(ltkjExamJcbgd);
+                if (save1 && save2) {
+                    try {
+                        testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+                    } catch (Exception e) {
+                        log.error(String.valueOf(e));
+                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                        return AjaxResult.error("鍚屾澶辫触璇烽噸璇�");
+                    }
+                } else {
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    return AjaxResult.error("鍚屾澶辫触璇烽噸璇�");
+                }
+                return AjaxResult.success();
+            } else {
+                cn.hutool.json.JSONObject entries = (cn.hutool.json.JSONObject) lis.get(0);
+                String tjNum = entries.getStr("tjNum");
+                LtkjHysqd hysqd = new LtkjHysqd();
+                TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
+                hysqd.setTjh(order.getCardId());
+                String mzh = order.getCardId();
+
+                LambdaQueryWrapper<LtkjJianchajianyanTree> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(LtkjJianchajianyanTree::getCardId, mzh);
+                TjProject project = projectService.getById(tj.getStr("proId"));
+                String xmdm = project.getHisXmbm();
+                queryWrapper.eq(LtkjJianchajianyanTree::getType, "妫�楠�");
+                queryWrapper.eq(LtkjJianchajianyanTree::getHisXmdm, xmdm);
+                LtkjJianchajianyanTree tree = ltkjJianchajianyanTreeService.getOne(queryWrapper);
+                String tmh;
+                if (tree == null) {
+                    tree = new LtkjJianchajianyanTree();
+                    tree.setHisXmdm(xmdm);
+                    tree.setCreateTime(new Date());
+                    String sqdh = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + String.valueOf(RandomUtil.randomInt(0, 99999));
+                    queryWrapper = new LambdaQueryWrapper<>();
+                    queryWrapper.eq(LtkjJianchajianyanTree::getSqdh, sqdh);
+                    if (ltkjJianchajianyanTreeService.getOne(queryWrapper) == null) {
+                        tree.setSqdh(sqdh);
+                    } else {
+                        while (true) {
+                            sqdh = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + String.valueOf(RandomUtil.randomInt(0, 99999));
+                            queryWrapper = new LambdaQueryWrapper<>();
+                            queryWrapper.eq(LtkjJianchajianyanTree::getSqdh, sqdh);
+                            if (ltkjJianchajianyanTreeService.getOne(queryWrapper) == null) {
+                                tree.setSqdh(sqdh);
+                                break;
+                            }
+                        }
+                    }
+                    tmh = tree.getSqdh() + "_" + tree.getHisXmdm();
+                } else {
+                    tmh = tree.getSqdh();
+                }
+                String shys = "";
+                for (Object o : lis) {
+                    cn.hutool.json.JSONObject jsonObject = (cn.hutool.json.JSONObject) o;
+                    if (StrUtil.isNotBlank(jsonObject.getStr("jyxh"))) tmh = jsonObject.getStr("jyxh");
+                    if (StrUtil.isNotBlank(jsonObject.getStr("shys"))) shys = jsonObject.getStr("shys");
+                    if (StrUtil.isNotBlank(tmh) && StrUtil.isNotBlank(shys) && StrUtil.isNotBlank(jsonObject.getStr("jyxh")))
+                        break;
+                }
+                hysqd.setTmh(tmh);
+
+                //            if (StrUtil.isNotBlank(xmdm)) {
+                //                hysqd.setXmid(xmdm);
+                //                hysqd.setXmmc(project.getHisXmmc());
+                //            }else {
+                //                hysqd.setXmid(String.valueOf(project.getProId()));
+                //                hysqd.setXmmc(project.getProName());
+                //            }
+
+                hysqd.setXmid(project.getProId().toString());
+                hysqd.setXmmc(project.getProName());
+
+                hysqd.setSqsj(format.format(tree.getCreateTime()));
+                hysqd.setJgsj(format.format(new Date()));
+                hysqd.setShrxm(shys);
+                hysqd.setCreateTime(new Date());
+                //            hysqd.setBbmc();
+                hysqdService.deletedByTjhAndXmId(hysqd.getTjh(), hysqd.getXmid());
+                hybgdService.deletedLtkjHybgdByTjhAndTmh(tmh);
+                hysqdService.save(hysqd);
+                for (Object object : lis) {
+                    cn.hutool.json.JSONObject jsonObject = (cn.hutool.json.JSONObject) object;
+                    LtkjHybgd hybgd = new LtkjHybgd();
+                    hybgd.setTmh(tmh);
+                    hybgd.setJcxmid(jsonObject.getStr("jcxmid"));
+                    hybgd.setJcxm(jsonObject.getStr("proName"));
+                    hybgd.setJyjg(jsonObject.getStr("proResult"));
+                    hybgd.setJgdw(jsonObject.getStr("company"));
+                    String tjStandardGtValue = jsonObject.getStr("tjStandardGtValue");
+                    String zdz = "";
+                    String zxz = "";
+                    if (tjStandardGtValue.contains("-")) {
+                        String[] split = tjStandardGtValue.split("-");
+                        zxz = split[0].trim();
+                        zdz = split[1].trim();
+                    }
+                    hybgd.setFwzdz(zdz);
+                    hybgd.setFwzgz(zxz);
+                    hybgd.setFwz(tjStandardGtValue);
+                    hybgd.setJysj(jsonObject.getStr("examinationDate"));
+                    hybgd.setShsj(jsonObject.getStr("examinationDate"));
+                    hybgd.setJyys(jsonObject.getStr("checkDoctorName"));
+                    hybgd.setShysmc(shys);
+                    hybgd.setYcbz(jsonObject.getStr("ycbz"));
+                    hybgd.setCreateTime(new Date());
+                    hybgdService.save(hybgd);
+                }
                 try {
                     testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
-                }catch (Exception e){
+                } catch (Exception e) {
                     log.error(String.valueOf(e));
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return AjaxResult.error("鍚屾澶辫触璇烽噸璇�");
                 }
-            } else {
-                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return AjaxResult.error("鍚屾澶辫触璇烽噸璇�");
+                return AjaxResult.success();
             }
-            return AjaxResult.success();
+        } catch (NoTransactionException e) {
+            log.error(String.valueOf(e));
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return AjaxResult.error("鍚屾澶辫触璇烽噸璇�");
         }
 
     }
 
+    @Transactional
+    @PostMapping("/newasyncPacs")
+    public AjaxResult newasyncPacs(@RequestBody String json) {
+        try {
+            log.info("鍚堝苟妫�娴嬪悓姝ュ弬鏁� ->{}", json);
+//        try {
+//            Thread.sleep(2000);
+//        } catch (InterruptedException ignored) {
+//
+//        }
+//        if (true)
+//            return AjaxResult.error("鍚屾澶辫触璇烽噸璇�");
+            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            cn.hutool.json.JSONObject parseObj = JSONUtil.parseObj(json);
+            cn.hutool.json.JSONArray pacss = parseObj.getJSONArray("pacs");
+            cn.hutool.json.JSONArray lis = parseObj.getJSONArray("lis");
+            cn.hutool.json.JSONObject tj = parseObj.getJSONObject("tj");
 
 
-        @PostMapping(value = "/callback")
-        public void callback(@RequestBody JSONObject json) {
-            System.out.println("===================璁板綍鎵撳嵃娆℃暟====================");
-            System.out.println(json.toJSONString());
-            String tjNumber = json.get("tjNumber").toString();
-            String reportName = json.get("reportName").toString();
-            System.out.println("鐢ㄦ埛: "+tjNumber+reportName+" 宸叉墦鍗�");
+            if (pacss != null && !pacss.isEmpty()) {
+                cn.hutool.json.JSONObject entries = (cn.hutool.json.JSONObject) pacss.get(0);
+                String tjNum = entries.getStr("tjNum");
+                LambdaQueryWrapper<TjOrder> wrapper1 = new LambdaQueryWrapper<>();
+                wrapper1.eq(TjOrder::getTjNumber, tjNum);
+                TjOrder order = tjOrderService.getOne(wrapper1);
+
+                for (Object o : pacss) {
+                    cn.hutool.json.JSONObject pacs = (cn.hutool.json.JSONObject) o;
+                    if (pacs != null && !pacs.isEmpty()) {
+
+                        LtkjExamJcsqd ltkjExamJcsqd = new LtkjExamJcsqd();
+                        ltkjExamJcsqd.setTjh(order.getCardId());
+
+                        LambdaQueryWrapper<LtkjJianchajianyanTree> queryWrapper = new LambdaQueryWrapper<>();
+                        queryWrapper.eq(LtkjJianchajianyanTree::getCardId, order.getCardId());
+                        TjProject project = projectService.getById(tj.getStr("proId"));
+                        String xmdm = project.getHisXmbm();
+                        if (project.getSfzhfy().equals("N")) {
+                            LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
+                            wrapper.eq(TjProject::getProParentId, project.getProId());
+                            List<TjProject> list = projectService.list(wrapper);
+                            for (TjProject tjProject : list) {
+                                if (StrUtil.isNotBlank(tjProject.getHisXmbm())) {
+                                    xmdm = tjProject.getHisXmbm();
+                                    break;
+                                }
+                            }
+                        }
+
+                        queryWrapper.eq(LtkjJianchajianyanTree::getType, "妫�鏌�");
+                        queryWrapper.eq(LtkjJianchajianyanTree::getHisXmdm, xmdm);
+
+                        LtkjJianchajianyanTree tree = ltkjJianchajianyanTreeService.getOne(queryWrapper);
+                        String brid = pacs.getStr("brid");
+
+                        ltkjExamJcsqd.setTmh(brid + tree.getHisXmdm());
+                        ltkjExamJcsqd.setBgys(pacs.getStr("checkDoctorName"));
+                        ltkjExamJcsqd.setBgysid(pacs.getStr("checkDoctorCode"));
+                        ltkjExamJcsqd.setSqsj(format.format(tree.getCreateTime()));
+                        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss");
+                        Date reportDate = null;
+                        try {
+                            reportDate = dateFormat.parse(pacs.getStr("reportDate"));
+                            ltkjExamJcsqd.setJgsj(format.format(reportDate));
+                        } catch (ParseException ignored) {
+                            ltkjExamJcsqd.setJgsj(format.format(new Date()));
+                        }
+                        String checkParts = pacs.getStr("checkParts");
+                        //            ltkjExamJcsqd.setJcxmmc(checkParts);
+                        //            ltkjExamJcsqd.setJcxmid(xmdm);
+
+                        ltkjExamJcsqd.setJcxmmc(project.getProName());
+                        ltkjExamJcsqd.setJcxmid(project.getProId().toString());
+
+                        ltkjExamJcsqd.setBw(checkParts);
+                        ltkjExamJcsqd.setJgzt(pacs.getStr("diagnosis"));
+                        ltkjExamJcsqd.setJgbx(pacs.getStr("examination"));
+                        ltkjExamJcsqd.setSgorzd("1");
+                        ltkjExamJcsqd.setCreateTime(new Date());
+
+//                        ltkjExamJcsqdService.deletedLtkjJcsqdByTjhAndXmId(ltkjExamJcsqd.getTjh(), ltkjExamJcsqd.getJcxmid());
+                        ltkjExamJcsqdService.sdtbdeletedLtkjJcsqdByTjhandtmh(ltkjExamJcsqd.getTjh(), ltkjExamJcsqd.getTmh());
+                        boolean save1 = ltkjExamJcsqdService.save(ltkjExamJcsqd);
+                        log.info("鎵嬪姩鍚屾妫�鏌ョ粨鏋滅姸鎬� ->{}", ltkjExamJcsqd.getJgzt());
+                        if (StringUtil.isNotBlank(ltkjExamJcsqd.getJgzt())) {
+                            jcycxmService.deletedByTjh(order.getTjNumber());
+                            String[] split = ltkjExamJcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;|,|锛�");
+                            log.info("杩涘叆妫�鏌ョ粨鏋滃紓甯告彁鍙栧垎鍓叉柟娉曚綋 ->{}->{}", order.getTjNumber(), split);
+                            for (String jg : split) {
+                                if (StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
+                                        && !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈")
+                                        && !jg.contains("鏈鏄庢樉") && !jg.contains("姝e父") && !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")) {
+                                    TjJcycxm jcycxm = new TjJcycxm();
+                                    jcycxm.setTjh(order.getTjNumber());
+                                    jcycxm.setYqid("jczyy");
+                                    String[] split1 = ltkjExamJcsqd.getJcxmid().split(";");
+                                    jcycxm.setProId(split1[0]);
+                                    jcycxm.setProName(ltkjExamJcsqd.getJcxmmc());
+                                    jcycxm.setCreateTime(new Date());
+                                    jcycxm.setJcjg(jg);
+                                    jcycxmService.save(jcycxm);
+                                }
+                            }
+                        }
+
+                        LtkjExamJcbgd ltkjExamJcbgd = new LtkjExamJcbgd();
+                        ltkjExamJcbgd.setTjh(ltkjExamJcsqd.getTjh());
+                        ltkjExamJcbgd.setTmh(ltkjExamJcsqd.getTmh());
+                        //            ltkjExamJcbgd.setXmdm(ltkjExamJcsqd.getJcxmid());
+                        //            ltkjExamJcbgd.setXmmc(ltkjExamJcsqd.getJcxmmc());
+
+                        ltkjExamJcbgd.setXmdm(project.getProId().toString());
+                        ltkjExamJcbgd.setXmmc(project.getProName());
+
+                        ltkjExamJcbgd.setBgUrl("");
+                        ltkjExamJcbgd.setShysxm(pacs.getStr("reportDoctorName"));
+                        ltkjExamJcbgd.setShysdm(pacs.getStr("reportDoctorCode"));
+                        //            ltkjExamJcbgd.setYxzd(ltkjExamJcsqd.getJgzt());
+                        //            ltkjExamJcbgd.setYxbx(ltkjExamJcsqd.getJgbx());
+                        ltkjExamJcbgd.setZdsj(ltkjExamJcsqd.getJgsj());
+                        ltkjExamJcbgd.setSqsj(ltkjExamJcsqd.getSqsj());
+                        ltkjExamJcbgd.setJcbw(ltkjExamJcsqd.getJcxmmc());
+                        ltkjExamJcbgd.setBgNr(ltkjExamJcsqd.getJgbx());
+                        ltkjExamJcbgd.setYxbx(ltkjExamJcsqd.getJgzt());
+                        ltkjExamJcbgd.setYxzd(ltkjExamJcsqd.getJgzt());
+                        ltkjExamJcbgd.setSgorzd("1");
+                        ltkjExamJcsqd.setCreateTime(new Date());
+                        ltkjExamJcbgdService.deletedLtkjJcbgdByTjhAndTmhA(ltkjExamJcsqd.getTjh(), ltkjExamJcsqd.getTmh());
+                        boolean save2 = ltkjExamJcbgdService.save(ltkjExamJcbgd);
+                        if (save1 && save2) {
+                            try {
+                                testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+                            } catch (Exception e) {
+                                log.error(String.valueOf(e));
+                                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                                return AjaxResult.error("鍚屾澶辫触璇烽噸璇�");
+                            }
+                        } else {
+                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                            return AjaxResult.error("鍚屾澶辫触璇烽噸璇�");
+                        }
+                    }
+                }
+                return AjaxResult.success();
+            } else {
+                cn.hutool.json.JSONObject entries = (cn.hutool.json.JSONObject) lis.get(0);
+                String tjNum = entries.getStr("tjNum");
+                LtkjHysqd hysqd = new LtkjHysqd();
+                TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
+                hysqd.setTjh(order.getCardId());
+                String mzh = order.getCardId();
+
+                LambdaQueryWrapper<LtkjJianchajianyanTree> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(LtkjJianchajianyanTree::getCardId, mzh);
+                TjProject project = projectService.getById(tj.getStr("proId"));
+                String xmdm = project.getHisXmbm();
+                queryWrapper.eq(LtkjJianchajianyanTree::getType, "妫�楠�");
+                queryWrapper.eq(LtkjJianchajianyanTree::getHisXmdm, xmdm);
+                LtkjJianchajianyanTree tree = ltkjJianchajianyanTreeService.getOne(queryWrapper);
+                String tmh;
+                if (tree == null) {
+                    tree = new LtkjJianchajianyanTree();
+                    tree.setHisXmdm(xmdm);
+                    tree.setCreateTime(new Date());
+                    String sqdh = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + String.valueOf(RandomUtil.randomInt(0, 99999));
+                    queryWrapper = new LambdaQueryWrapper<>();
+                    queryWrapper.eq(LtkjJianchajianyanTree::getSqdh, sqdh);
+                    if (ltkjJianchajianyanTreeService.getOne(queryWrapper) == null) {
+                        tree.setSqdh(sqdh);
+                    } else {
+                        while (true) {
+                            sqdh = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + String.valueOf(RandomUtil.randomInt(0, 99999));
+                            queryWrapper = new LambdaQueryWrapper<>();
+                            queryWrapper.eq(LtkjJianchajianyanTree::getSqdh, sqdh);
+                            if (ltkjJianchajianyanTreeService.getOne(queryWrapper) == null) {
+                                tree.setSqdh(sqdh);
+                                break;
+                            }
+                        }
+                    }
+                    tmh = tree.getSqdh() + "_" + tree.getHisXmdm();
+                } else {
+                    tmh = tree.getSqdh();
+                }
+                String shys = "";
+                for (Object o : lis) {
+                    cn.hutool.json.JSONObject jsonObject = (cn.hutool.json.JSONObject) o;
+                    if (StrUtil.isNotBlank(jsonObject.getStr("jyxh"))) tmh = jsonObject.getStr("jyxh");
+                    if (StrUtil.isNotBlank(jsonObject.getStr("shys"))) shys = jsonObject.getStr("shys");
+                    if (StrUtil.isNotBlank(tmh) && StrUtil.isNotBlank(shys) && StrUtil.isNotBlank(jsonObject.getStr("jyxh")))
+                        break;
+                }
+                hysqd.setTmh(tmh);
+
+                //            if (StrUtil.isNotBlank(xmdm)) {
+                //                hysqd.setXmid(xmdm);
+                //                hysqd.setXmmc(project.getHisXmmc());
+                //            }else {
+                //                hysqd.setXmid(String.valueOf(project.getProId()));
+                //                hysqd.setXmmc(project.getProName());
+                //            }
+
+                hysqd.setXmid(project.getProId().toString());
+                hysqd.setXmmc(project.getProName());
+
+                hysqd.setSqsj(format.format(tree.getCreateTime()));
+                hysqd.setJgsj(format.format(new Date()));
+                hysqd.setShrxm(shys);
+                hysqd.setCreateTime(new Date());
+                //            hysqd.setBbmc();
+                hysqdService.deletedByTjhAndXmId(hysqd.getTjh(), hysqd.getXmid());
+                hybgdService.deletedLtkjHybgdByTjhAndTmh(tmh);
+                hysqdService.save(hysqd);
+                for (Object object : lis) {
+                    cn.hutool.json.JSONObject jsonObject = (cn.hutool.json.JSONObject) object;
+                    LtkjHybgd hybgd = new LtkjHybgd();
+                    hybgd.setTmh(tmh);
+                    hybgd.setJcxmid(jsonObject.getStr("jcxmid"));
+                    hybgd.setJcxm(jsonObject.getStr("proName"));
+                    hybgd.setJyjg(jsonObject.getStr("proResult"));
+                    hybgd.setJgdw(jsonObject.getStr("company"));
+                    String tjStandardGtValue = jsonObject.getStr("tjStandardGtValue");
+                    String zdz = "";
+                    String zxz = "";
+                    if (tjStandardGtValue.contains("-")) {
+                        String[] split = tjStandardGtValue.split("-");
+                        zxz = split[0].trim();
+                        zdz = split[1].trim();
+                    }
+                    hybgd.setFwzdz(zdz);
+                    hybgd.setFwzgz(zxz);
+                    hybgd.setFwz(tjStandardGtValue);
+                    hybgd.setJysj(jsonObject.getStr("examinationDate"));
+                    hybgd.setShsj(jsonObject.getStr("examinationDate"));
+                    hybgd.setJyys(jsonObject.getStr("checkDoctorName"));
+                    hybgd.setShysmc(shys);
+                    hybgd.setYcbz(jsonObject.getStr("ycbz"));
+                    hybgd.setCreateTime(new Date());
+                    hybgdService.save(hybgd);
+                }
+                try {
+                    testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+                } catch (Exception e) {
+                    log.error(String.valueOf(e));
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    return AjaxResult.error("鍚屾澶辫触璇烽噸璇�");
+                }
+                return AjaxResult.success();
+            }
+        } catch (NoTransactionException e) {
+            log.error(String.valueOf(e));
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return AjaxResult.error("鍚屾澶辫触璇烽噸璇�");
         }
 
+    }
 
+    @PostMapping(value = "/callback")
+    public void callback(@RequestBody JSONObject json) {
+        System.out.println("===================璁板綍鎵撳嵃娆℃暟====================");
+        System.out.println(json.toJSONString());
+        String tjNumber = json.get("tjNumber").toString();
+        String reportName = json.get("reportName").toString();
+        System.out.println("鐢ㄦ埛: " + tjNumber + reportName + " 宸叉墦鍗�");
+    }
 
-
-
-//    @Autowired
-//    private ITjCustomerService tjCustomerService;
-//
-//    @Autowired
-//    private HisApiGetMethodService service;
-//
-//    private static final String HIS_URL = "https://mock.mengxuegu.com/mock/664d3dbce45d2156fa209c80/example/api/His/HisRequest";
-//
-//
-//    @GetMapping("/his")
-//    public AjaxResult Outpinconapply() {
-//        Map<String, Object> maps = new HashMap<>();
-//        maps.put("his_registration_id","20240704000218");
-//        maps.put("ksbm", "浣撴涓績");
-//        maps.put("pagecount", 100);
-//        maps.put("page", 1);
-//       service.getHISDataNew("", maps);
-//        return AjaxResult.success();
-//    }
-
-
-//    @PostMapping("/Outpincreateapply")
-//    @ApiOperation(value = "鏂板/淇敼闂ㄨ瘖娉ㄥ唽淇℃伅")
-//    public AjaxResult Outpincreateapply(@RequestBody TjCustomer customer) {
-//        Map<String, Object> map = new HashMap<>();
-//        if (null != customer.getCusId()) {
-//            map.put("pationid", customer.getCusId());
-//        } else {
-//            map.put("pationid", null);
-//        }
-//        map.put("brxm", customer.getCusName());
-//        map.put("brxb", customer.getCusSex());
-//        map.put("csrq", customer.getCusBrithday());
-//        map.put("brnl", customer.getAge());
-//        map.put("brnldw", customer.getAgeUnit());
-//        map.put("addr", customer.getAddr());
-//        map.put("gzdw", null);
-//        map.put("dwdz", null);
-//        map.put("lxr", customer.getCusName());
-//        map.put("lxrdh", customer.getCusPhone());
-//        map.put("lxrgx", "鏈汉");
-//        map.put("sfzh", customer.getCusIdcard());
-//        map.put("jhrxm", null);
-//        map.put("jhrsfzh", null);
-//        map.put("mz", customer.getCusNational());
-//        map.put("zy", customer.getCareer());
-//        map.put("fbbm", null);
-//        map.put("czy", customer.getCreateBy());
-//        map.put("jkkkh", customer.getIndexCard());
-//        map.put("mindex_id", customer.getIndexCard());
-//        String post = HttpClientUtils.sendPost(HIS_URL, map);
-//        return AjaxResult.success(post);
-//    }
-//
-//
-//    @PostMapping("/Outpinconapply")
-//    @ApiOperation(value = "闂ㄨ瘖鍖荤敓鎺ヨ瘖")
-//    public AjaxResult Outpinconapply(@RequestParam @ApiParam(value = "灏辫瘖鍙�") String jzh,
-//                                     @ApiParam(value = "鎺ヨ瘖鏃ユ湡") @RequestParam Date jzrq,
-//                                     @ApiParam(value = "鎺ヨ瘖鍖诲笀") @RequestParam String jzysbm) {
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("jzh",jzh);
-//        map.put("jzrq",jzrq);
-//        map.put("jzysbm",jzysbm);
-//        String post = HttpClientUtils.sendPost(HIS_URL, map);
-//        return AjaxResult.success(post);
-//    }
-//
-//
-//    @PostMapping("/Outpinunconapply")
-//    @ApiOperation(value = "闂ㄨ瘖鍖荤敓鍙栨秷鎺ヨ瘖")
-//    public AjaxResult Outpinunconapply(@RequestParam @ApiParam(value = "灏辫瘖鍙�") String jzh,
-//                                     @ApiParam(value = "鎺ヨ瘖鏃ユ湡") @RequestParam Date jzrq,
-//                                     @ApiParam(value = "鎺ヨ瘖鍖诲笀") @RequestParam String jzysbm) {
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("jzh",jzh);
-//        map.put("jzrq",jzrq);
-//        map.put("jzysbm",jzysbm);
-//        String post = HttpClientUtils.sendPost(HIS_URL, map);
-//        return AjaxResult.success(post);
-//    }
-//
-//    @PostMapping("/Outpinimpapply")
-//    @ApiOperation(value = "鏂板/淇敼闂ㄨ瘖璇婃柇")
-//    public AjaxResult Outpinimpapply(@RequestBody OutpinimpapplyDto dto ) {
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("his_registration_id",dto.getHisRegistrationId());
-//        map.put("mzzdid",dto.getMzzdid());
-//        map.put("sqysbm",dto.getSqysbm());
-//        map.put("mzksbm",dto.getMzksbm());
-//        map.put("fbrq",dto.getFbrq());
-//        map.put("zdrq",dto.getZdrq());
-//        map.put("czybm",dto.getCzybm());
-//        map.put("czyksbm",dto.getCzyksbm());
-//        map.put("zs",dto.getZs());
-//        map.put("bs",dto.getBs());
-//        map.put("clyz",dto.getClyz());
-//        map.put("jws",dto.getJws());
-//        map.put("tgjc",dto.getTgjc());
-//        map.put("gms",dto.getGms());
-//        map.put("jbbm",dto.getJbbm());
-//        map.put("jbbm1",dto.getJbbm1());
-//        map.put("jbbm2",dto.getJbbm2());
-////        map.put("tw",dto.getTw());
-////        map.put("mb",dto.getMb());
-////        map.put("hx",dto.getHx());
-////        map.put("bp",dto.getBp());
-//        map.put("fzbz",dto.getFzbz());
-//        map.put("hzqx",dto.getHzqx());
-//        map.put("sfqc",dto.getSfqc());
-//        map.put("qchs",dto.getQchs());
-//        map.put("sfqj",dto.getSfqj());
-//        map.put("jzqk",dto.getJzqk());
-//        String post = HttpClientUtils.sendPost(HIS_URL, map);
-//        return AjaxResult.success(post);
-//    }
-//
-//
-//    @PostMapping("/Outpinmesapply")
-//    @ApiOperation(value = "闂ㄨ瘖棰勪氦鏀惰垂")
-//    public AjaxResult Outpinmesapply(@RequestParam @ApiParam(value = "闂ㄨ瘖鎮h�� ID") String pationid,
-//                                       @ApiParam(value = "鎿嶄綔鍛�") @RequestParam String czybm,
-//                                       @ApiParam(value = "鏀粯绫诲瀷缂栫爜") @RequestParam String zflxbm,
-//                                       @ApiParam(value = "棰勪氦閲戦") @RequestParam int yjje) {
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("pationid",pationid);
-//        map.put("czybm",czybm);
-//        map.put("zflxbm",zflxbm);
-//        map.put("yjje",yjje);
-//        String post = HttpClientUtils.sendPost(HIS_URL, map);
-//        return AjaxResult.success(post);
-//    }
-//
-//
-//    @PostMapping("/Outpinregapply")
-//    @ApiOperation(value = "鏂板/淇敼闂ㄨ瘖鎸傚彿鐢宠")
-//    public AjaxResult Outpinregapply(@RequestBody OutpinregapplyDto dao) {
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("pationid",dao.getPationid());
-//        map.put("his_registration_id",dao.getHisRegistrationId());
-//        map.put("sqysbm",dao.getSqysbm());
-//        map.put("mzksbm",dao.getMzksbm());
-//        map.put("czybm",dao.getCzybm());
-//        map.put("sfjz",dao.getSfjz());
-//        map.put("ghzlbm",dao.getGhzlbm());
-//        map.put("ywckbm",dao.getYwckbm());
-//        map.put("sflstd",dao.getSflstd());
-//        map.put("ghrq",dao.getGhrq());
-//        String post = HttpClientUtils.sendPost(HIS_URL, map);
-//        return AjaxResult.success(post);
-//    }
-//
-//    @PostMapping("/Outpintestapply")
-//    @ApiOperation(value = "闂ㄨ瘖妫�楠岀敵璇�")
-//    public AjaxResult Outpintestapply(@RequestBody OutpintestapplyDto dao) {
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("his_registration_id",dao.getHisRegistrationId());
-//        map.put("sfzh",dao.getHisRegistrationId());
-//        map.put("sqysbm",dao.getSqysbm());
-//        map.put("mzksbm",dao.getMzksbm());
-//        map.put("sjrq",dao.getSjrq());
-//        map.put("czybm",dao.getCzybm());
-//        map.put("czyksbm",dao.getCzyksbm());
-//        map.put("sfjz",dao.getSfjz());
-//        map.put("details",dao.getDetails());
-//        String post = HttpClientUtils.sendPost(HIS_URL, map);
-//        return AjaxResult.success(post);
-//    }
-//
-//
-//    @PostMapping("/Outpindeltestapply")
-//    @ApiOperation(value = "浣滃簾闂ㄨ瘖妫�楠岀敵璇�")
-//    public AjaxResult Outpindeltestapply(@RequestParam @ApiParam(value = "灏辫瘖鍙� ID") String hisRegistrationId,
-//                                     @ApiParam(value = "鎿嶄綔鍛�") @RequestParam String czybm,
-//                                     @ApiParam(value = "鐢宠鍗曞彿") @RequestParam String sqdh) {
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("his_registration_id",hisRegistrationId);
-//        map.put("czybm",czybm);
-//        map.put("zflxbm",sqdh);
-//        String post = HttpClientUtils.sendPost(HIS_URL, map);
-//        return AjaxResult.success(post);
-//    }
-//
-//
-//    @PostMapping("/Outpinexamapply")
-//    @ApiOperation(value = "闂ㄨ瘖妫�鏌ョ敵璇�")
-//    public AjaxResult Outpinexamapply(@RequestBody OutpinexamapplyDto dao) {
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("his_registration_id",dao.getHisRegistrationId());
-//        map.put("sfzh",dao.getHisRegistrationId());
-//        map.put("sqysbm",dao.getSqysbm());
-//        map.put("mzksbm",dao.getMzksbm());
-//        map.put("sjrq",dao.getSjrq());
-//        map.put("czybm",dao.getCzybm());
-//        map.put("czyksbm",dao.getCzyksbm());
-//        map.put("lczz",dao.getLczz());
-//        map.put("lczd",dao.getLczd());
-//        map.put("jcms",dao.getJcms());
-//        map.put("jcbw",dao.getJcbw());
-//        map.put("sfjz",dao.getSfjz());
-//        map.put("details",dao.getDetails());
-//        String post = HttpClientUtils.sendPost(HIS_URL, map);
-//        return AjaxResult.success(post);
-//    }
-//
-//
-//    @PostMapping("/Outpindelexamapply")
-//    @ApiOperation(value = "浣滃簾闂ㄨ瘖妫�鏌ョ敵璇�")
-//    public AjaxResult Outpindelexamapply(@RequestParam @ApiParam(value = "灏辫瘖鍙� ID") String hisRegistrationId,
-//                                         @ApiParam(value = "鎿嶄綔鍛�") @RequestParam String czybm,
-//                                         @ApiParam(value = "鐢宠鍗曞彿") @RequestParam String sqdh) {
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("his_registration_id",hisRegistrationId);
-//        map.put("czybm",czybm);
-//        map.put("zflxbm",sqdh);
-//        String post = HttpClientUtils.sendPost(HIS_URL, map);
-//        return AjaxResult.success(post);
-//    }
-//
-//
-//    @PostMapping("/Outpinmedapply")
-//    @ApiOperation(value = "闂ㄨ瘖鍖荤枟鍖诲槺鐢宠")
-//    public AjaxResult Outpinmedapply(@RequestBody OutpinmedapplyDto dao) {
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("his_registration_id",dao.getHisRegistrationId());
-//        map.put("sfzh",dao.getHisRegistrationId());
-//        map.put("sqysbm",dao.getSqysbm());
-//        map.put("mzksbm",dao.getMzksbm());
-//        map.put("sjrq",dao.getSjrq());
-//        map.put("czybm",dao.getCzybm());
-//        map.put("czyksbm",dao.getCzyksbm());
-//        map.put("bqsm",dao.getBqsm());
-//        map.put("sfjz",dao.getSfjz());
-//        map.put("details",dao.getDetails());
-//        String post = HttpClientUtils.sendPost(HIS_URL, map);
-//        return AjaxResult.success(post);
-//    }
-//
-//
-//    @PostMapping("/Outpindelmedapply")
-//    @ApiOperation(value = "浣滃簾闂ㄨ瘖鍖荤枟鍖诲槺鐢宠")
-//    public AjaxResult Outpindelmedapply(@RequestParam @ApiParam(value = "灏辫瘖鍙� ID") String hisRegistrationId,
-//                                         @ApiParam(value = "鎿嶄綔鍛�") @RequestParam String czybm,
-//                                         @ApiParam(value = "鐢宠鍗曞彿") @RequestParam String sqdh) {
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("his_registration_id",hisRegistrationId);
-//        map.put("czybm",czybm);
-//        map.put("zflxbm",sqdh);
-//        String post = HttpClientUtils.sendPost(HIS_URL, map);
-//        return AjaxResult.success(post);
-//    }
-//
-//
-//    @PostMapping("/Outpintreatapply")
-//    @ApiOperation(value = "闂ㄨ瘖娌荤枟澶勭疆鐢宠")
-//    public AjaxResult Outpintreatapply(@RequestBody OutpintreatapplyDto dao) {
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("his_registration_id",dao.getHisRegistrationId());
-//        map.put("sfzh",dao.getHisRegistrationId());
-//        map.put("sqysbm",dao.getSqysbm());
-//        map.put("mzksbm",dao.getMzksbm());
-//        map.put("sjrq",dao.getSjrq());
-//        map.put("czybm",dao.getCzybm());
-//        map.put("czyksbm",dao.getCzyksbm());
-//        map.put("bqsm",dao.getBqsm());
-//        map.put("sfjz",dao.getSfjz());
-//        map.put("zlbz",dao.getZlbz());
-//        map.put("details",dao.getDetails());
-//        String post = HttpClientUtils.sendPost(HIS_URL, map);
-//        return AjaxResult.success(post);
-//    }
-//
-//    @PostMapping("/Outpintdelreatapply")
-//    @ApiOperation(value = "浣滃簾闂ㄨ瘖娌荤枟澶勭疆鐢宠")
-//    public AjaxResult Outpintdelreatapply(@RequestParam @ApiParam(value = "灏辫瘖鍙� ID") String hisRegistrationId,
-//                                        @ApiParam(value = "鎿嶄綔鍛�") @RequestParam String czybm,
-//                                        @ApiParam(value = "鐢宠鍗曞彿") @RequestParam String sqdh) {
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("his_registration_id",hisRegistrationId);
-//        map.put("czybm",czybm);
-//        map.put("zflxbm",sqdh);
-//        String post = HttpClientUtils.sendPost(HIS_URL, map);
-//        return AjaxResult.success(post);
-//    }
-//
-//
-//    @PostMapping("/Outpinmedicapply")
-//    @ApiOperation(value = "闂ㄨ瘖鑽搧鐢宠")
-//    public AjaxResult Outpinmedicapply(@RequestBody OutpinmedicapplyDto dao) {
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("his_registration_id",dao.getHisRegistrationId());
-//        map.put("sfzh",dao.getHisRegistrationId());
-//        map.put("sqysbm",dao.getSqysbm());
-//        map.put("mzksbm",dao.getMzksbm());
-//        map.put("sjrq",dao.getSjrq());
-//        map.put("czybm",dao.getCzybm());
-//        map.put("czyksbm",dao.getCzyksbm());
-//        map.put("cflxbm",dao.getCflxbm());
-//        map.put("yfbm",dao.getYfbm());
-//        map.put("fyts",dao.getFyts());
-//        map.put("mzzd",dao.getMzzd());
-//        map.put("details",dao.getDetails());
-//        String post = HttpClientUtils.sendPost(HIS_URL, map);
-//        return AjaxResult.success(post);
-//    }
-//
-//    @PostMapping("/Outpindelmedicapply")
-//    @ApiOperation(value = "浣滃簾闂ㄨ瘖鑽搧鐢宠")
-//    public AjaxResult Outpindelmedicapply(@RequestParam @ApiParam(value = "灏辫瘖鍙� ID") String hisRegistrationId,
-//                                          @ApiParam(value = "鎿嶄綔鍛�") @RequestParam String czybm,
-//                                          @ApiParam(value = "鐢宠鍗曞彿") @RequestParam String sqdh) {
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("his_registration_id",hisRegistrationId);
-//        map.put("czybm",czybm);
-//        map.put("zflxbm",sqdh);
-//        String post = HttpClientUtils.sendPost(HIS_URL, map);
-//        return AjaxResult.success(post);
-//    }
-//
-//
-//    @PostMapping("/Getexamapplyinfo")
-//    @ApiOperation(value = "鑾峰彇妫�鏌ョ敵璇蜂俊鎭�")
-//    public AjaxResult Getexamapplyinfo(@RequestParam @ApiParam(value = "灏辫瘖鍙� ID") String hisRegistrationId,
-//                                          @ApiParam(value = "绉戝缂栫爜") @RequestParam String ksbm,
-//                                          @ApiParam(value = "缁撴潫鏃ユ湡") @RequestParam Date jsrq,
-//                                          @ApiParam(value = "寮�濮嬫棩鏈�") @RequestParam Date ksrq) {
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("his_registration_id",hisRegistrationId);
-//        map.put("ksbm",ksbm);
-//        map.put("jsrq",jsrq);
-//        map.put("ksrq",ksrq);
-//        String post = HttpClientUtils.sendPost(HIS_URL, map);
-//        return AjaxResult.success(post);
-//    }
-//
-//
-//    @PostMapping("/Getexamreportinfo")
-//    @ApiOperation(value = "鑾峰彇妫�鏌ユ姤鍛婁俊鎭�")
-//    public AjaxResult Getexamreportinfo(@RequestParam @ApiParam(value = "灏辫瘖鍙� ID") String hisRegistrationId,
-//                                       @ApiParam(value = "绉戝鍚嶇О") @RequestParam String ksmc,
-//                                       @ApiParam(value = "鎮h�� ID") @RequestParam String pationid,
-//                                       @ApiParam(value = "缁撴潫鏃ユ湡") @RequestParam Date jsrq,
-//                                       @ApiParam(value = "寮�濮嬫棩鏈�") @RequestParam Date ksrq,
-//                                       @ApiParam(value = "椤靛ぇ灏忥紝鏈�灏� 10 琛�") @RequestParam(defaultValue = "10") Integer pagecount,
-//                                       @ApiParam(value = "椤垫暟锛屾渶灏� 1 椤�") @RequestParam(defaultValue = "1") Integer page,
-//                                       @ApiParam(value = "鐘舵�侊細宸茬櫥璁� 锛屽凡璇婃柇锛屽凡浣滃簾") @RequestParam String status,
-//                                       @ApiParam(value = "鍗$被鍨� 5 灏辫瘖娴佹按鍙� 9 鐢靛瓙鍋ュ悍鍗� 娴佹按鍙� 榛樿 5") @RequestParam String cardtype) {
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("his_registration_id",hisRegistrationId);
-//        map.put("ksmc",ksmc);
-//        map.put("jsrq",jsrq);
-//        map.put("ksrq",ksrq);
-//        map.put("pationid",pationid);
-//        map.put("pagecount",pagecount);
-//        map.put("page",page);
-//        map.put("status",status);
-//        map.put("cardtype",cardtype);
-//        String post = HttpClientUtils.sendPost(HIS_URL, map);
-//        return AjaxResult.success(post);
-//    }
-//
-//    @PostMapping("/Examreportrecordinfo")
-//    @ApiOperation(value = "鏂板/淇敼妫�鏌ユ姤鍛婅褰�")
-//    public AjaxResult Examreportrecordinfo(@RequestBody ExamreportrecordinfoDto dto) {
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("his_registration_id",dto.getHisRegistrationId());
-//        map.put("jcbgid",dto.getJcbgid());
-//        map.put("sfjz",dto.getSfjz());
-//        map.put("pationid",dto.getPationid());
-//        map.put("mzzybz",dto.getMzzybz());
-//        map.put("brxm",dto.getBrxm());
-//        map.put("brxb",dto.getBrxb());
-//        map.put("brnl",dto.getBrnl());
-//        map.put("brnldw",dto.getBrnldw());
-//        map.put("lxrdh",dto.getLxrdh());
-//        map.put("hzksbm",dto.getHzksbm());
-//        map.put("sqdh",dto.getSqdh());
-//        map.put("sqjgdm",dto.getSqjgdm());
-//        map.put("sqsj",dto.getSqsj());
-//        map.put("sqrbm",dto.getSqrbm());
-//        map.put("sqrxm",dto.getSqrxm());
-//        map.put("hzzs",dto.getHzzs());
-//        map.put("hzbs",dto.getHzbs());
-//        map.put("xyzdbm",dto.getXyzdbm());
-//        map.put("xyzdmc",dto.getXyzdmc());
-//        map.put("zdrq",dto.getZdrq());
-//        map.put("fbrq",dto.getFbrq());
-//        map.put("tsjcbz",dto.getTsjcbz());
-//        map.put("jcxmdm",dto.getJcxmdm());
-//        map.put("jcxmmc",dto.getJcxmmc());
-//        map.put("jcjgdm",dto.getJcjgdm());
-//        map.put("jcjsbh",dto.getJcjsbh());
-//        map.put("jcjsxm",dto.getJcjsxm());
-//        map.put("jcrq",dto.getJcrq());
-//        map.put("jcbgdbh",dto.getJcbgdbh());
-//        map.put("jcff",dto.getJcff());
-//        map.put("jcksbh",dto.getJcksbh());
-//        map.put("jcksmc",dto.getJcksmc());
-//        map.put("yqbm",dto.getYqbm());
-//        map.put("jcbgbz",dto.getJcbgbz());
-//        map.put("jcbwdm",dto.getJcbwdm());
-//        map.put("bgksbh",dto.getBgksbh());
-//        map.put("bgksmc",dto.getBgksmc());
-//        map.put("bgrq",dto.getBgrq());
-//        map.put("bgysbh",dto.getBgysbh());
-//        map.put("bgysxm",dto.getBgysxm());
-//        map.put("shysbh",dto.getShysbh());
-//        map.put("shysxm",dto.getShysxm());
-//        map.put("jch",dto.getJch());
-//        map.put("yxh",dto.getYxh());
-//        map.put("kdsj",dto.getKdsj());
-//        map.put("jclx",dto.getJclx());
-//        map.put("yyh",dto.getYyh());
-//        map.put("yxbx",dto.getYxbx());
-//        map.put("yxzd",dto.getYxzd());
-//        map.put("sfyyx",dto.getSfyyx());
-//        map.put("yxzl",dto.getYxzl());
-//        map.put("yxs",dto.getYxs());
-//        map.put("jlysbh",dto.getJlysbh());
-//        map.put("jlrq",dto.getJlrq());
-//        map.put("bgzt",dto.getBgzt());
-//        map.put("lczdfh",dto.getLczdfh());
-//        map.put("wjz",dto.getWjz());
-//        map.put("wjzzdmc",dto.getWjzzdmc());
-//        map.put("wjzjcysyj",dto.getWjzjcysyj());
-//        map.put("wjzjcysbh",dto.getWjzjcysbh());
-//        map.put("wjzjcysxyj",dto.getWjzjcysyj());
-//        map.put("wjzqrrq",dto.getWjzqrrq());
-//        map.put("wjzjsrbh",dto.getWjzjsrbh());
-//        map.put("wjzjsrxm",dto.getWjzjsrxm());
-//        map.put("wjzjsrq",dto.getWjzjsrq());
-//        map.put("wjzclysbh",dto.getWjzclysbh());
-//        map.put("wjzclysxm",dto.getWjzclysxm());
-//        map.put("wjzclyj",dto.getWjzclyj());
-//        map.put("wjzclrq",dto.getWjzclrq());
-//        map.put("sfkf",dto.getSfkf());
-//        map.put("yzid",dto.getYzid());
-//        String post = HttpClientUtils.sendPost(HIS_URL, map);
-//        return AjaxResult.success(post);
-//    }
-//
-//    @PostMapping("/Getexamurgentinfo")
-//    @ApiOperation(value = "鑾峰彇妫�鏌ュ嵄鎬ュ�间俊鎭�")
-//    public AjaxResult Getexamurgentinfo(@RequestParam @ApiParam(value = "灏辫瘖鍙� ID") String hisRegistrationId,
-//                                        @ApiParam(value = "缁撴潫鏃ユ湡") @RequestParam Date jsrq,
-//                                        @ApiParam(value = "寮�濮嬫棩鏈�") @RequestParam Date ksrq,
-//                                        @ApiParam(value = "椤靛ぇ灏忥紝鏈�灏� 10 琛�") @RequestParam(defaultValue = "10") Integer pagecount,
-//                                        @ApiParam(value = "椤垫暟锛屾渶灏� 1 椤�") @RequestParam(defaultValue = "1") Integer page) {
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("his_registration_id",hisRegistrationId);
-//        map.put("jsrq",jsrq);
-//        map.put("ksrq",ksrq);
-//        map.put("pagecount",pagecount);
-//        map.put("page",page);
-//        String post = HttpClientUtils.sendPost(HIS_URL, map);
-//        return AjaxResult.success(post);
-//    }
-//
-//
-//    @PostMapping("/Getexamimageinfo")
-//    @ApiOperation(value = "鑾峰彇妫�鏌ュ奖鍍忎俊鎭�")
-//    public AjaxResult Getexamimageinfo(@RequestParam @ApiParam(value = "灏辫瘖鍙� ID") String hisRegistrationId,
-//                                        @ApiParam(value = "缁撴潫鏃ユ湡") @RequestParam Date jsrq,
-//                                        @ApiParam(value = "寮�濮嬫棩鏈�") @RequestParam Date ksrq,
-//                                        @ApiParam(value = "椤靛ぇ灏忥紝鏈�灏� 10 琛�") @RequestParam(defaultValue = "10") Integer pagecount,
-//                                        @ApiParam(value = "椤垫暟锛屾渶灏� 1 椤�") @RequestParam(defaultValue = "1") Integer page) {
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("his_registration_id",hisRegistrationId);
-//        map.put("jsrq",jsrq);
-//        map.put("ksrq",ksrq);
-//        map.put("pagecount",pagecount);
-//        map.put("page",page);
-//        String post = HttpClientUtils.sendPost(HIS_URL, map);
-//        return AjaxResult.success(post);
-//    }
-//
-//
-//    @PostMapping("/Getlabapplyinfo")
-//    @ApiOperation(value = "鑾峰彇妫�楠岀敵璇蜂俊鎭�")
-//    public AjaxResult Getlabapplyinfo(@RequestParam @ApiParam(value = "灏辫瘖鍙� ID") String hisRegistrationId,
-//                                       @ApiParam(value = "缁撴潫鏃ユ湡") @RequestParam Date jsrq,
-//                                       @ApiParam(value = "寮�濮嬫棩鏈�") @RequestParam Date ksrq,
-//                                       @ApiParam(value = "鍗$被鍨嬶紝 1 鐢靛瓙鍋ュ悍鍗� 2 韬唤璇� 3" +
-//                                               "璇婄枟鍗� 4 鎮h�� ID 5 灏辫瘖娴佹按鍙� 榛樿" +
-//                                               "4 鎮h�� ID") @RequestParam String cardtype,
-//                                       @ApiParam(value = "涓氬姟绫诲瀷锛氶棬璇娿�佷綇闄€�佷綋妫�銆佸叾浠�") @RequestParam String mzorzy,
-//                                       @ApiParam(value = "鐢宠绉戝") @RequestParam String ksbm) {
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("his_registration_id",hisRegistrationId);
-//        map.put("jsrq",jsrq);
-//        map.put("ksrq",ksrq);
-//        map.put("cardtype",cardtype);
-//        map.put("mzorzy",mzorzy);
-//        map.put("ksbm",ksbm);
-//        String post = HttpClientUtils.sendPost(HIS_URL, map);
-//        return AjaxResult.success(post);
-//    }
-//
-//
-//    @PostMapping("/Getlabreportinfo")
-//    @ApiOperation(value = "鑾峰彇妫�楠屾姤鍛婅褰曚俊鎭�")
-//    public AjaxResult Getlabreportinfo(@RequestParam @ApiParam(value = "灏辫瘖鍙� ID") String hisRegistrationId,
-//                                       @ApiParam(value = "缁撴潫鏃ユ湡") @RequestParam Date jsrq,
-//                                       @ApiParam(value = "寮�濮嬫棩鏈�") @RequestParam Date ksrq,
-//                                       @ApiParam(value = "鐢宠绉戝") @RequestParam String ksbm,
-//                                       @ApiParam(value = "鐢宠绉戝") @RequestParam String pationid,
-//                                       @ApiParam(value = "椤靛ぇ灏忥紝鏈�灏� 10 琛�") @RequestParam(defaultValue = "10") Integer pagecount,
-//                                       @ApiParam(value = "椤垫暟锛屾渶灏� 1 椤�") @RequestParam(defaultValue = "1") Integer page) {
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("his_registration_id",hisRegistrationId);
-//        map.put("jsrq",jsrq);
-//        map.put("ksrq",ksrq);
-//        map.put("ksbm",ksbm);
-//        map.put("pationid",pationid);
-//        map.put("pagecount",pagecount);
-//        map.put("page",page);
-//        String post = HttpClientUtils.sendPost(HIS_URL, map);
-//        return AjaxResult.success(post);
-//    }
-//
-//
-//
-//    @PostMapping("/Getlabgermrepinfo")
-//    @ApiOperation(value = "鑾峰彇寰敓鐗╂姤鍛婅褰曚俊鎭�")
-//    public AjaxResult Getlabgermrepinfo(@RequestParam @ApiParam(value = "妫�楠屾姤鍛� ID") String jybgid) {
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("jybgid",jybgid);
-//        String post = HttpClientUtils.sendPost(HIS_URL, map);
-//        return AjaxResult.success(post);
-//    }
-//
-//    @PostMapping("/Getlabgermdetailinfo")
-//    @ApiOperation(value = "鑾峰彇寰敓鐗╄嵂鏁忎俊鎭�")
-//    public AjaxResult Getlabgermdetailinfo(@RequestParam @ApiParam(value = "妫�楠屾姤鍛� ID") String jybgid) {
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("jybgid",jybgid);
-//        String post = HttpClientUtils.sendPost(HIS_URL, map);
-//        return AjaxResult.success(post);
-//    }
-//
-//
-//    @PostMapping("/Getlaburgentinfo")
-//    @ApiOperation(value = "鑾峰彇鍗辨�ュ�间俊鎭�")
-//    public AjaxResult Getlaburgentinfo(@RequestParam @ApiParam(value = "妫�楠屾姤鍛� ID") String jybgid,
-//                                       @ApiParam(value = "缁撴潫鏃ユ湡") @RequestParam Date jsrq,
-//                                       @ApiParam(value = "寮�濮嬫棩鏈�") @RequestParam Date ksrq) {
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("jybgid",jybgid);
-//        map.put("jsrq",jsrq);
-//        map.put("ksrq",ksrq);
-//        String post = HttpClientUtils.sendPost(HIS_URL, map);
-//        return AjaxResult.success(post);
-//    }
-//
-//
-//    @PostMapping("/Labreportapply")
-//    @ApiOperation(value = "妫�楠屾牱鏈嫆鏀惰褰�")
-//    public AjaxResult Labreportapply(@RequestParam @ApiParam(value = "鏉$爜鍙�") String tmh,
-//                                       @ApiParam(value = "鎺ユ敹浜哄憳浠g爜锛屽瓧鍏镐唬鐮�") @RequestParam String jsrydm,
-//                                       @ApiParam(value = "鎷掓敹鎶ュ憡鏃ユ湡锛寉yyy-mm-dd hh:mm:ss") @RequestParam Date jsrq,
-//                                       @ApiParam(value = "鎷掓敹鍘熷洜") @RequestParam String jsyy) {
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("tmh",tmh);
-//        map.put("jsrydm",jsrydm);
-//        map.put("jsrq",jsrq);
-//        map.put("jsyy",jsyy);
-//        String post = HttpClientUtils.sendPost(HIS_URL, map);
-//        return AjaxResult.success(post);
-//    }
-//
-//
-//    @PostMapping("/Getlabreginfoinfo")
-//    @ApiOperation(value = "鑾峰彇妫�楠岀櫥璁颁俊鎭�")
-//    public AjaxResult Getlabreginfoinfo(@RequestParam @ApiParam(value = "灏辫瘖鍙� ID") String hisRegistrationId,
-//                                        @ApiParam(value = "缁撴潫鏃ユ湡") @RequestParam Date jsrq,
-//                                        @ApiParam(value = "寮�濮嬫棩鏈�") @RequestParam Date ksrq,
-//                                        @ApiParam(value = "鐘舵�侊細 宸茬敵璇� 宸查噰鏍� 宸叉娴� 宸插" +
-//                                                "鏍� 宸蹭綔搴�") @RequestParam String Status,
-//                                        @ApiParam(value = "鎮h�� ID") @RequestParam String pationid,
-//                                        @ApiParam(value = "椤靛ぇ灏忥紝鏈�灏� 10 琛�") @RequestParam(defaultValue = "10") Integer pagecount,
-//                                        @ApiParam(value = "椤垫暟锛屾渶灏� 1 椤�") @RequestParam(defaultValue = "1") Integer page) {
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("his_registration_id",hisRegistrationId);
-//        map.put("Status",Status);
-//        map.put("jsrq",jsrq);
-//        map.put("ksrq",ksrq);
-//        map.put("pationid",pationid);
-//        map.put("pagecount",pagecount);
-//        map.put("page",page);
-//        String post = HttpClientUtils.sendPost(HIS_URL, map);
-//        return AjaxResult.success(post);
-//    }
-//
-//    @PostMapping("/Testcostapply")
-//    @ApiOperation(value = "浣撴璐圭敤鐢宠")
-//    public AjaxResult Testcostapply(@RequestBody TestcostapplyDto dao) {
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("his_registration_id",dao.getHisRegistrationId());
-//        map.put("czybm",dao.getCzybm());
-//        map.put("czyksbm",dao.getCzyksbm());
-//        map.put("brxm",dao.getBrxm());
-//        map.put("ywck",dao.getYwck());
-//        map.put("sfzh",dao.getSfzh());
-//        map.put("jkkkh",dao.getJkkkh());
-//        map.put("mindexId",dao.getMindexId());
-//        map.put("brxb",dao.getBrxb());
-//        map.put("csrq",dao.getCsrq());
-//        map.put("brnl",dao.getBrnl());
-//        map.put("brnldw",dao.getBrnldw());
-//        map.put("addr",dao.getAddr());
-//        map.put("lxrdh",dao.getLxrdh());
-//        map.put("mz",dao.getMz());
-//        map.put("zy",dao.getZy());
-//        map.put("details",dao.getDetails());
-//        map.put("mxfyxmbm",dao.getMxfyxmbm());
-//        map.put("sfzhfy",dao.getSfzhfy());
-//        map.put("sl",dao.getSl());
-//        String post = HttpClientUtils.sendPost(HIS_URL, map);
-//        return AjaxResult.success(post);
-//    }
-//
-//
-//    @PostMapping("/Testregapply")
-//    @ApiOperation(value = "鏂板鎴栦慨鏀逛綋妫�鐧昏淇℃伅")
-//    public AjaxResult Testregapply(@RequestBody TestregapplyDto dao) {
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("his_registration_id",dao.getHisRegistrationId());
-//        map.put("czybm",dao.getCzybm());
-//        map.put("czyksbm",dao.getCzyksbm());
-//        map.put("tjbh",dao.getTjbh());
-//        map.put("grbh",dao.getGrbh());
-//        map.put("sfzh",dao.getSfzh());
-//        map.put("xm",dao.getXm());
-//        map.put("xb",dao.getXb());
-//        map.put("nl",dao.getNl());
-//        map.put("csrq",dao.getCsrq());
-//        map.put("nldw",dao.getNldw());
-//        map.put("addr",dao.getAddr());
-//        map.put("sj",dao.getSj());
-//        map.put("dwbm",dao.getDwbm());
-//        map.put("tcbm",dao.getTcbm());
-//        map.put("details",dao.getDetails());
-//        map.put("je",dao.getJe());
-//        map.put("sjje",dao.getSjje());
-//        map.put("details_mx",dao.getDetailsMx());
-//        String post = HttpClientUtils.sendPost(HIS_URL, map);
-//        return AjaxResult.success(post);
-//    }
-//
-//
-//    @PostMapping("/Getoutpatientcostinfo")
-//    @ApiOperation(value = "鑾峰彇闂ㄨ瘖鎮h�呰垂鐢ㄦ竻鍗曚俊鎭�")
-//    public AjaxResult Getoutpatientcostinfo(@RequestParam @ApiParam(value = "鍗$被鍨� 1 鐢靛瓙鍋ュ悍鍗� 2 韬唤璇� 3 璇�" +
-//            "鐤楀崱 4 鎮h�� ID 5 灏辫瘖娴佹按鍙� 9 鐢靛瓙" +
-//            "鍋ュ悍鍗℃祦姘村彿") String cardtype,
-//                                        @ApiParam(value = "缁撴潫鏃ユ湡") @RequestParam Date jsrq,
-//                                        @ApiParam(value = "寮�濮嬫棩鏈�") @RequestParam Date ksrq,
-//                                        @ApiParam(value = "妫�绱㈢爜" +
-//                                                "1 鐢靛瓙鍋ュ悍鍗★紝闀垮害>=64   2 韬唤璇侊紝闀垮害=18锛堟敞鍐岃韩浠借瘉鎴栧崱鍙疯韩浠借瘉鍙风爜锛�3 璇婄枟鍗★紝闀垮害=8  4 鎮h�� ID   5 灏辫瘖娴佹按鍙�   " +
-//                                                "9 鍋ュ悍鍗℃祦姘村彿锛堝缓妗e敮涓�鍙凤級闀垮害n" +
-//                                                "14") @RequestParam String input,
-//                                        @ApiParam(value = "椤靛ぇ灏忥紝鏈�灏� 10 琛�") @RequestParam(defaultValue = "10") Integer pagecount,
-//                                        @ApiParam(value = "椤垫暟锛屾渶灏� 1 椤�") @RequestParam(defaultValue = "1") Integer page) {
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("cardtype",cardtype);
-//        map.put("input",input);
-//        map.put("jsrq",jsrq);
-//        map.put("ksrq",ksrq);
-//        map.put("pagecount",pagecount);
-//        map.put("page",page);
-//        String post = HttpClientUtils.sendPost(HIS_URL, map);
-//        return AjaxResult.success(post);
-//    }
-//
-//
-//    @PostMapping("/Getoutaccountrecord")
-//    @ApiOperation(value = "鑾峰彇闂ㄨ瘖缁撶畻璁板綍")
-//    public AjaxResult Getoutaccountrecord(@RequestParam @ApiParam(value = "灏辫瘖鍙� ID") String hisRegistrationId,
-//                                          @ApiParam(value = "缁撴潫鏃ユ湡") @RequestParam Date jsrq,
-//                                          @ApiParam(value = "寮�濮嬫棩鏈�") @RequestParam Date ksrq,
-//                                          @ApiParam(value = "椤靛ぇ灏忥紝鏈�灏� 10 琛�") @RequestParam(defaultValue = "10") Integer pagecount,
-//                                          @ApiParam(value = "椤垫暟锛屾渶灏� 1 椤�") @RequestParam(defaultValue = "1") Integer page) {
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("his_registration_id",hisRegistrationId);
-//        map.put("jsrq",jsrq);
-//        map.put("ksrq",ksrq);
-//        map.put("pagecount",pagecount);
-//        map.put("page",page);
-//        String post = HttpClientUtils.sendPost(HIS_URL, map);
-//        return AjaxResult.success(post);
-//    }
-//
-//
-//    @PostMapping("/Getpatientalterregrecord")
-//    @ApiOperation(value = "鑾峰彇鎮h�呮敞鍐屼俊鎭紙鍚彉鏇磋褰曪級")
-//    public AjaxResult Getpatientalterregrecord(@RequestParam @ApiParam(value = "灏辫瘖鍙� ID") String mzzybz,
-//                                          @ApiParam(value = "缁撴潫鏃ユ湡") @RequestParam Date jsrq,
-//                                          @ApiParam(value = "寮�濮嬫棩鏈�") @RequestParam Date ksrq) {
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("mzzybz",mzzybz);
-//        map.put("jsrq",jsrq);
-//        map.put("ksrq",ksrq);
-//        String post = HttpClientUtils.sendPost(HIS_URL, map);
-//        return AjaxResult.success(post);
-//    }
 }

--
Gitblit v1.8.0