From 6f31a7ec7b9c1d7d8190900b22e861eae2851200 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 11 六月 2025 09:31:01 +0800
Subject: [PATCH] 0611

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java |  129 ++++++++++++++++++++++++++-----------------
 1 files changed, 78 insertions(+), 51 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 6366910..39dcfac 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
@@ -18,6 +18,7 @@
 import com.ltkj.hosp.sqlDomain.LtkjHybgd;
 import com.ltkj.hosp.sqlDomain.LtkjHysqd;
 import com.ltkj.hosp.vodomain.CsProVo;
+import com.ltkj.web.controller.system.SysConfigController;
 import com.ltkj.web.controller.system.TjCheckController;
 import io.swagger.annotations.Api;
 import jodd.util.StringUtil;
@@ -63,6 +64,8 @@
     private ITjCustomerService tjCustomerService;
     @Autowired
     private TjJcycxmService jcycxmService;
+    @Autowired
+    private SysConfigController configController;
 
     /**
      * 鑾峰彇pacs妫�鏌ユ暟鎹�
@@ -150,29 +153,29 @@
     @PostMapping("/lis/getList")
     public AjaxResult getLisList(@RequestBody String 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) {
-            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.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\":\"琛�娑插垎鏋怽"},{\"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));
+//        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.getLisJyList(name, mzh, start, end);
+//        return AjaxResult.success(jcList);
+        String json1 = "[{\"deptName\":\"鍐呭効绉�                                            \",\"brid\":\"250512000069      \",\"jcxmid\":\"0103\",\"diagnosis\":0,\"project\":\"0-0.20\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"checkParts\":\"椤圭洰1\",\"proResult\":\"0.0000\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129    \",\"shys\":\"寮犻挵鏃�                        \",\"company\":\"10^9/L\",\"reportDoctorName\":\"寮犻挵鏃�                        \",\"proName\":\"*宸ㄥぇ鏈垚鐔熺粏鑳瀄",\"tjStandardGtValue\":\"0-0.20\"},{\"deptName\":\"鍐呭効绉�                                            \",\"brid\":\"250512000070      \",\"checkParts\":\"椤圭洰2\",\"jcxmid\":\"0104\",\"diagnosis\":0,\"project\":\"0-2.50\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"0.1000\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129    \",\"shys\":\"寮犻挵鏃�                        \",\"company\":\"%\",\"reportDoctorName\":\"寮犻挵鏃�                        \",\"proName\":\"*宸ㄥぇ鏈垚鐔熺粏鑳炵櫨鍒嗘瘮\",\"tjStandardGtValue\":\"0-2.50\"},{\"deptName\":\"鍐呭効绉�                                            \",\"brid\":\"250512000069      \",\"jcxmid\":\"0101\",\"diagnosis\":0,\"project\":\"0-0.20\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"0.0000\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129    \",\"shys\":\"寮犻挵鏃�                        \",\"company\":\"10^9/L\",\"reportDoctorName\":\"寮犻挵鏃�                        \",\"proName\":\"*寮傚舰娣嬪反缁嗚優\",\"tjStandardGtValue\":\"0-0.20\"},{\"deptName\":\"鍐呭効绉�                                            \",\"brid\":\"250512000069      \",\"jcxmid\":\"0102\",\"diagnosis\":0,\"project\":\"0-2.00\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"0.0000\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129    \",\"shys\":\"寮犻挵鏃�                        \",\"company\":\"%\",\"reportDoctorName\":\"寮犻挵鏃�                        \",\"proName\":\"*寮傚舰娣嬪反缁嗚優鐧惧垎姣擻",\"tjStandardGtValue\":\"0-2.00\"},{\"deptName\":\"鍐呭効绉�                                            \",\"brid\":\"250512000069      \",\"jcxmid\":\"0001\",\"diagnosis\":0,\"project\":\"4.00-10.00\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"5.4500\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129    \",\"shys\":\"寮犻挵鏃�                        \",\"company\":\"10^9/L\",\"reportDoctorName\":\"寮犻挵鏃�                        \",\"proName\":\"鈼嗙櫧缁嗚優\",\"tjStandardGtValue\":\"4.00-10.00\"},{\"deptName\":\"鍐呭効绉�                                            \",\"brid\":\"250512000069      \",\"jcxmid\":\"0012\",\"diagnosis\":0,\"project\":\"3.50-5.50\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"4.4400\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129    \",\"shys\":\"寮犻挵鏃�                        \",\"company\":\"10^12/L\",\"reportDoctorName\":\"寮犻挵鏃�                        \",\"proName\":\"鈼嗙孩缁嗚優\",\"tjStandardGtValue\":\"3.50-5.50\"},{\"deptName\":\"鍐呭効绉�                                            \",\"brid\":\"250512000069      \",\"jcxmid\":\"0014\",\"diagnosis\":0,\"project\":\"37.00-54.00\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"42.0000\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129    \",\"shys\":\"寮犻挵鏃�                        \",\"company\":\"%\",\"reportDoctorName\":\"寮犻挵鏃�                        \",\"proName\":\"鈼嗙孩缁嗚優鍘嬬Н\",\"tjStandardGtValue\":\"37.00-54.00\"},{\"deptName\":\"鍐呭効绉�                                            \",\"brid\":\"250512000069      \",\"jcxmid\":\"0013\",\"diagnosis\":0,\"project\":\"110.00-160.00\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"135.0000\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129    \",\"shys\":\"寮犻挵鏃�                        \",\"company\":\"g/L\",\"reportDoctorName\":\"寮犻挵鏃�                        \",\"proName\":\"鈼嗚绾㈣泲鐧絓",\"tjStandardGtValue\":\"110.00-160.00\"},{\"deptName\":\"鍐呭効绉�                                            \",\"brid\":\"250512000069      \",\"jcxmid\":\"0020\",\"diagnosis\":0,\"project\":\"100.00-300.00\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"154.0000\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129    \",\"shys\":\"寮犻挵鏃�                        \",\"company\":\"10^9/L\",\"reportDoctorName\":\"寮犻挵鏃�                        \",\"proName\":\"鈼嗚灏忔澘\",\"tjStandardGtValue\":\"100.00-300.00\"},{\"deptName\":\"鍐呭効绉�                                            \",\"brid\":\"250512000069      \",\"jcxmid\":\"0023\",\"diagnosis\":0,\"project\":\"0.10-0.50\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"0.1700\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129    \",\"shys\":\"寮犻挵鏃�                        \",\"company\":\"%\",\"reportDoctorName\":\"寮犻挵鏃�                        \",\"proName\":\"鈼嗚灏忔澘鍘嬬Н\",\"tjStandardGtValue\":\"0.10-0.50\"},{\"deptName\":\"鍐呭効绉�                                            \",\"brid\":\"250512000069      \",\"jcxmid\":\"0006\",\"diagnosis\":0,\"project\":\"0.10-0.80\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"0.2900\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129    \",\"shys\":\"寮犻挵鏃�                        \",\"company\":\"10^9/L\",\"reportDoctorName\":\"寮犻挵鏃�                        \",\"proName\":\"鍗曟牳缁嗚優\",\"tjStandardGtValue\":\"0.10-0.80\"},{\"deptName\":\"鍐呭効绉�                                            \",\"brid\":\"250512000069      \",\"jcxmid\":\"0007\",\"diagnosis\":0,\"project\":\"3.00-8.00\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"5.3000\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129    \",\"shys\":\"寮犻挵鏃�                        \",\"company\":\"%\",\"reportDoctorName\":\"寮犻挵鏃�                        \",\"proName\":\"鍗曟牳缁嗚優鐧惧垎姣擻",\"tjStandardGtValue\":\"3.00-8.00\"},{\"deptName\":\"鍐呭効绉�                                            \",\"brid\":\"250512000069      \",\"jcxmid\":\"0019\",\"diagnosis\":0,\"project\":\"10.00-15.00\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"13.7000\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129    \",\"shys\":\"寮犻挵鏃�                        \",\"company\":\"%\",\"reportDoctorName\":\"寮犻挵鏃�                        \",\"proName\":\"绾㈢粏鑳炲垎甯冨搴﹀彉寮傜郴鏁癨",\"tjStandardGtValue\":\"10.00-15.00\"},{\"deptName\":\"鍐呭効绉�                                            \",\"brid\":\"250512000069      \",\"jcxmid\":\"0018\",\"diagnosis\":0,\"project\":\"30.00-57.00\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"47.7000\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129    \",\"shys\":\"寮犻挵鏃�                        \",\"company\":\"fL\",\"reportDoctorName\":\"寮犻挵鏃�                        \",\"proName\":\"绾㈢粏鑳炲垎甯冨搴︽爣鍑嗗樊\",\"tjStandardGtValue\":\"30.00-57.00\"},{\"deptName\":\"鍐呭効绉�                                            \",\"brid\":\"250512000069      \",\"jcxmid\":\"0004\",\"diagnosis\":0,\"project\":\"0.80-4.00\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"2.1100\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129    \",\"shys\":\"寮犻挵鏃�                        \",\"company\":\"10^9/L\",\"reportDoctorName\":\"寮犻挵鏃�                        \",\"proName\":\"娣嬪反缁嗚優\",\"tjStandardGtValue\":\"0.80-4.00\"},{\"deptName\":\"鍐呭効绉�                                            \",\"brid\":\"250512000069      \",\"jcxmid\":\"0005\",\"diagnosis\":0,\"project\":\"20.00-40.00\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"38.7000\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129    \",\"shys\":\"寮犻挵鏃�                        \",\"company\":\"%\",\"reportDoctorName\":\"寮犻挵鏃�                        \",\"proName\":\"娣嬪反缁嗚優鐧惧垎姣擻",\"tjStandardGtValue\":\"20.00-40.00\"},{\"deptName\":\"鍐呭効绉�                                            \",\"brid\":\"250512000069      \",\"jcxmid\":\"0015\",\"diagnosis\":0,\"project\":\"80.00-100.00\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"94.6000\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129    \",\"shys\":\"寮犻挵鏃�                        \",\"company\":\"fL\",\"reportDoctorName\":\"寮犻挵鏃�                        \",\"proName\":\"骞冲潎绾㈢粏鑳炰綋绉痋",\"tjStandardGtValue\":\"80.00-100.00\"},{\"deptName\":\"鍐呭効绉�                                            \",\"brid\":\"250512000069      \",\"jcxmid\":\"0016\",\"diagnosis\":0,\"project\":\"27.00-34.00\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"30.4000\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129    \",\"shys\":\"寮犻挵鏃�                        \",\"company\":\"pg\",\"reportDoctorName\":\"寮犻挵鏃�                        \",\"proName\":\"骞冲潎绾㈢粏鑳炶绾㈣泲鐧藉惈閲廫",\"tjStandardGtValue\":\"27.00-34.00\"},{\"deptName\":\"鍐呭効绉�                                            \",\"brid\":\"250512000069      \",\"jcxmid\":\"0017\",\"diagnosis\":0,\"project\":\"320.00-360.00\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"321.0000\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129    \",\"shys\":\"寮犻挵鏃�                        \",\"company\":\"g/L\",\"reportDoctorName\":\"寮犻挵鏃�                        \",\"proName\":\"骞冲潎绾㈢粏鑳炶绾㈣泲鐧芥祿搴",\"tjStandardGtValue\":\"320.00-360.00\"},{\"deptName\":\"鍐呭効绉�                                            \",\"brid\":\"250512000069      \",\"jcxmid\":\"0022\",\"diagnosis\":0,\"project\":\"6.00-14.00\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"11.3000\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129    \",\"shys\":\"寮犻挵鏃�                        \",\"company\":\"fL\",\"reportDoctorName\":\"寮犻挵鏃�                        \",\"proName\":\"骞冲潎琛�灏忔澘浣撶Н\",\"tjStandardGtValue\":\"6.00-14.00\"},{\"deptName\":\"鍐呭効绉�                                            \",\"brid\":\"250512000069      \",\"jcxmid\":\"0010\",\"diagnosis\":0,\"project\":\"0-0.10\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"0.0100\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129    \",\"shys\":\"寮犻挵鏃�                        \",\"company\":\"10^9/L\",\"reportDoctorName\":\"寮犻挵鏃�                        \",\"proName\":\"鍡滅⒈绮掔粏鑳瀄",\"tjStandardGtValue\":\"0-0.10\"},{\"deptName\":\"鍐呭効绉�                                            \",\"brid\":\"250512000069      \",\"jcxmid\":\"0011\",\"diagnosis\":0,\"project\":\"0-3.00\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"0.2000\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129    \",\"shys\":\"寮犻挵鏃�                        \",\"company\":\"%\",\"reportDoctorName\":\"寮犻挵鏃�                        \",\"proName\":\"鍡滅⒈绮掔粏鑳炵櫨鍒嗘瘮\",\"tjStandardGtValue\":\"0-3.00\"},{\"deptName\":\"鍐呭効绉�                                            \",\"brid\":\"250512000069      \",\"jcxmid\":\"0008\",\"diagnosis\":0,\"project\":\"0.05-0.35\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"0.0300\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129    \",\"shys\":\"寮犻挵鏃�                        \",\"company\":\"10^9/L\",\"reportDoctorName\":\"寮犻挵鏃�                        \",\"proName\":\"鍡滈吀绮掔粏鑳瀄",\"tjStandardGtValue\":\"0.05-0.35\"},{\"deptName\":\"鍐呭効绉�                                            \",\"brid\":\"250512000069      \",\"jcxmid\":\"0009\",\"diagnosis\":0,\"project\":\"0.50-5.00\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"0.6000\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129    \",\"shys\":\"寮犻挵鏃�                        \",\"company\":\"%\",\"reportDoctorName\":\"寮犻挵鏃�                        \",\"proName\":\"鍡滈吀绮掔粏鑳炵櫨鍒嗘瘮\",\"tjStandardGtValue\":\"0.50-5.00\"},{\"deptName\":\"鍐呭効绉�                                            \",\"brid\":\"250512000069      \",\"jcxmid\":\"0021\",\"diagnosis\":0,\"project\":\"9.00-18.00\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"16.4000\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129    \",\"shys\":\"寮犻挵鏃�                        \",\"company\":\"fL\",\"reportDoctorName\":\"寮犻挵鏃�                        \",\"proName\":\"琛�灏忔澘鍒嗗竷瀹藉害\",\"tjStandardGtValue\":\"9.00-18.00\"},{\"deptName\":\"鍐呭効绉�                                            \",\"brid\":\"250512000069      \",\"jcxmid\":\"0002\",\"diagnosis\":0,\"project\":\"2.00-7.00\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"3.0100\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129    \",\"shys\":\"寮犻挵鏃�                        \",\"company\":\"10^9/L\",\"reportDoctorName\":\"寮犻挵鏃�                        \",\"proName\":\"涓�х矑缁嗚優\",\"tjStandardGtValue\":\"2.00-7.00\"},{\"deptName\":\"鍐呭効绉�                                            \",\"brid\":\"250512000069      \",\"jcxmid\":\"0003\",\"diagnosis\":0,\"project\":\"52.00-72.00\",\"jyxh\":\"250512000069\",\"examinationDate\":\"2025-05-12 10:11:18\",\"proResult\":\"55.2000\",\"name\":\"鑻忚彶\",\"patientAge\":34,\"mzh\":\"20250512000129    \",\"shys\":\"寮犻挵鏃�                        \",\"company\":\"%\",\"reportDoctorName\":\"寮犻挵鏃�                        \",\"proName\":\"涓�х矑缁嗚優鐧惧垎姣擻",\"tjStandardGtValue\":\"52.00-72.00\"}]";
+        return AjaxResult.success(JSONUtil.parseArray(json1));
     }
 
     @GetMapping("/getTjList")
@@ -285,28 +288,36 @@
 
                 ltkjExamJcsqdService.deletedLtkjJcsqdByTjhAndXmId(ltkjExamJcsqd.getTjh(), ltkjExamJcsqd.getJcxmid());
                 boolean save1 = ltkjExamJcsqdService.save(ltkjExamJcsqd);
-                log.info("鎵嬪姩鍚屾妫�鏌ョ粨鏋滅姸鎬� ->{}", ltkjExamJcsqd.getJgzt());
+          /*      log.info("鎵嬪姩鍚屾妫�鏌ョ粨鏋滅姸鎬� ->{}", ltkjExamJcsqd.getJgzt());
                 if (StringUtil.isNotBlank(ltkjExamJcsqd.getJgzt())) {
-                    jcycxmService.deletedByTjh(order.getTjNumber());
+//                    jcycxmService.deletedByTjh(order.getTjNumber());
+                    jcycxmService.deletedByTjhAndXmm(order.getTjNumber(),ltkjExamJcsqd.getJcxmmc());
                     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);
+                            log.info("杩涘叆妫�鏌ョ粨鏋滃紓甯告彁鍙�  鍗冲皢淇濆瓨妫�鏌ュ紓甯哥粨鏋�->{}->{}", order.getTjNumber(), jg);
+                            try {
+                                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);
+                            } catch (Exception e) {
+                                logger.error("淇濆瓨妫�鏌ュ紓甯哥粨鏋滃け璐�",e);
+                                throw new RuntimeException(e);
+                            }
+                            log.info("杩涘叆妫�鏌ョ粨鏋滃紓甯告彁鍙�  淇濆瓨妫�鏌ュ紓甯哥粨鏋滃畬姣�");
                         }
                     }
                 }
-
+*/
                 LtkjExamJcbgd ltkjExamJcbgd = new LtkjExamJcbgd();
                 ltkjExamJcbgd.setTjh(ltkjExamJcsqd.getTjh());
                 ltkjExamJcbgd.setTmh(ltkjExamJcsqd.getTmh());
@@ -333,7 +344,10 @@
                 boolean save2 = ltkjExamJcbgdService.save(ltkjExamJcbgd);
                 if (save1 && save2) {
                     try {
-                        testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+
+                        configController.tjjcycxm(tjNum,  "0");
+//                        testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+                        orderRemarkService.updateTjOrderRemarkByTjzt(order.getTjNumber(),project.getProId().toString());
                     } catch (Exception e) {
                         log.error(String.valueOf(e));
                         TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -441,8 +455,10 @@
                     hybgdService.save(hybgd);
                 }
                 try {
-                    testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+//                    testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+                    orderRemarkService.updateTjOrderRemarkByTjzt(order.getTjNumber(),project.getProId().toString());
                 } catch (Exception e) {
+
                     log.error(String.valueOf(e));
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return AjaxResult.error("鍚屾澶辫触璇烽噸璇�");
@@ -540,27 +556,35 @@
 //                        ltkjExamJcsqdService.deletedLtkjJcsqdByTjhAndXmId(ltkjExamJcsqd.getTjh(), ltkjExamJcsqd.getJcxmid());
                         ltkjExamJcsqdService.sdtbdeletedLtkjJcsqdByTjhandtmh(ltkjExamJcsqd.getTjh(), ltkjExamJcsqd.getTmh());
                         boolean save1 = ltkjExamJcsqdService.save(ltkjExamJcsqd);
-                        log.info("鎵嬪姩鍚屾妫�鏌ョ粨鏋滅姸鎬� ->{}", ltkjExamJcsqd.getJgzt());
+          /*              log.info("鎵嬪姩鍚屾妫�鏌ョ粨鏋滅姸鎬� ->{}", ltkjExamJcsqd.getJgzt());
                         if (StringUtil.isNotBlank(ltkjExamJcsqd.getJgzt())) {
-                            jcycxmService.deletedByTjh(order.getTjNumber());
+//                            jcycxmService.deletedByTjh(order.getTjNumber());
+                            jcycxmService.deletedByTjhAndXmm(order.getTjNumber(),ltkjExamJcsqd.getJcxmmc());
                             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);
+                                     log.info("杩涘叆妫�鏌ョ粨鏋滃紓甯告彁鍙�  鍗冲皢淇濆瓨妫�鏌ュ紓甯哥粨鏋�->{}->{}", order.getTjNumber(), jg);
+                                    try {
+                                        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);
+                                    } catch (Exception e) {
+                                        log.error("淇濆瓨妫�鏌ュ紓甯哥粨鏋滃け璐�",e);
+                                        throw new RuntimeException(e);
+                                    }
+                                    log.info("杩涘叆妫�鏌ョ粨鏋滃紓甯告彁鍙�  淇濆瓨妫�鏌ュ紓甯哥粨鏋滃畬姣�");
                                 }
                             }
-                        }
+                        }*/
 
                         LtkjExamJcbgd ltkjExamJcbgd = new LtkjExamJcbgd();
                         ltkjExamJcbgd.setTjh(ltkjExamJcsqd.getTjh());
@@ -588,7 +612,9 @@
                         boolean save2 = ltkjExamJcbgdService.save(ltkjExamJcbgd);
                         if (save1 && save2) {
                             try {
-                                testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+                                configController.tjjcycxm(tjNum,  "0");
+//                                testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+                                orderRemarkService.updateTjOrderRemarkByTjzt(order.getTjNumber(),project.getProId().toString());
                             } catch (Exception e) {
                                 log.error(String.valueOf(e));
                                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -698,7 +724,8 @@
                     hybgdService.save(hybgd);
                 }
                 try {
-                    testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+//                    testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+                    orderRemarkService.updateTjOrderRemarkByTjzt(order.getTjNumber(),project.getProId().toString());
                 } catch (Exception e) {
                     log.error(String.valueOf(e));
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();

--
Gitblit v1.8.0