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 | 46 +-
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHysqdMapper.java | 11
ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHysqdService.java | 3
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 14
ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjXdtgmdjgService.java | 5
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjXdtgmdjgServiceImpl.java | 9
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 103 ++++---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjXdtgmdjgMapper.java | 7
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 521 ++++++++++++++++++++++++++++++++++++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHysqdServiceImpl.java | 6
10 files changed, 651 insertions(+), 74 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 24567b7..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
@@ -153,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")
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
index 28223a3..a798d34 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
@@ -1990,6 +1990,527 @@
}
+ /**
+ * 瀵逛箣鍓嶄唬鐮佸鍔犳�讳环浠ュ強浠锋牸璁＄畻瑙勫垯閫昏緫
+ * @param customer
+ * @param date
+ * @param cardId
+ * @return
+ */
+ public AjaxResult tijianshenqing_v2(TjCustomer customer, String date,String cardId) {
+ String dept = configService.selectConfigByKey("request_default_dept");
+ String ysbm = configService.selectConfigByKey("request_default_ysbm");
+ String ysmc = configService.selectConfigByKey("request_default_ysmc");
+
+ List<TbTransition> detailList = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId);
+
+ List<TjOutpinmedicXm> outpinmedicXms = tjOutpinmedicXmService.list();
+
+ // his鐩存帴鍗曞紑浣撴璐瑰崟椤圭洰鎬讳环缂栫爜
+ String tjfhisxmbm = configService.selectConfigByKey("tjfhisxmbm");
+ // 鏄惁寮�鍚痟is鐩存帴鍗曞紑浣撴璐瑰崟椤圭洰 N浣跨敤鏄庣粏寮�鍗� 鍏朵粬閮戒负鍗曢」鐩紑鎬讳环
+ String lycdzjhmxj = configService.selectConfigByKey("lycdzjhmxj");
+ // 鏄惁浣跨敤his浠锋牸浼犻�掕鍒� Y寮�鍚�
+ String sfsyhisjgrule = configService.selectConfigByKey("sfsyhisjgrule");
+ // his浠锋牸浼犻�掕鍒欎繚鐣欏緱浣嶆暟 榛樿2浣�
+ String sfsyhisjgrulebaoliuweishu = configService.selectConfigByKey("sfsyhisjgrulebaoliuweishu");
+ // his浠锋牸浼犻�掕鍒� 1鍥涜垗浜斿叆 2鐩存帴鑸嶅幓
+ String sfsyhisjgrulesconfig = configService.selectConfigByKey("sfsyhisjgrulesconfig");
+
+ if (StrUtil.isNotBlank(lycdzjhmxj) && lycdzjhmxj.equalsIgnoreCase("Y")){
+ // 妫�楠岄」鐩�
+ LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
+ wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
+ wq.in(TjProject::getDeptId,deptService.getJyDeptIds());
+ List<TjProject> jyxms = projectService.list(wq);
+ if (!jyxms.isEmpty()){
+ List<TjProject> notNull = jyxms.stream().filter(i -> i.getSpecimenType() != null).collect(Collectors.toList());
+ List<TjProject> isNull = jyxms.stream().filter(i -> i.getSpecimenType() == null).collect(Collectors.toList());
+ Map<String, List<TjProject>> listMap = notNull.stream().collect(Collectors.groupingBy(TjProject::getSpecimenType));
+ if (!isNull.isEmpty())
+ listMap.put("",isNull);
+ for (Map.Entry<String, List<TjProject>> entry : listMap.entrySet()) {
+
+ }
+ }
+ // 妫�鏌ラ」鐩�
+ wq = new LambdaQueryWrapper<>();
+ wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
+ wq.in(TjProject::getDeptId,deptService.getJcDeptIds());
+ List<TjProject> jcxms = projectService.list(wq);
+
+ }else {
+
+ }
+
+ //妫�楠岀敵璇�
+ List<OutpinmedicapplyDetilsDto> outpinmedicapplyDetilsDtos =new ArrayList<>();
+ if (null != detailList && !detailList.isEmpty()) {
+ LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
+ wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
+ wq.in(TjProject::getDeptId,deptService.getJyDeptIds());
+ List<TjProject> projects = projectService.list(wq);
+ if (null != projects && !projects.isEmpty()) {
+ List<TjProject> notNull = projects.stream().filter(i -> i.getSpecimenType() != null).collect(Collectors.toList());
+ List<TjProject> isNull = projects.stream().filter(i -> i.getSpecimenType() == null).collect(Collectors.toList());
+ Map<String, List<TjProject>> listMap = notNull.stream().collect(Collectors.groupingBy(TjProject::getSpecimenType));
+ if (!isNull.isEmpty())
+ listMap.put("",isNull);
+
+ for (Map.Entry<String, List<TjProject>> entry : listMap.entrySet()) {
+ OutpintestapplyDto dto = new OutpintestapplyDto();
+ dto.setHisRegistrationId(cardId);
+ dto.setSfzh(customer.getCusIdcard());
+ dto.setSqysbm(ysbm);
+ dto.setMzksbm(dept);
+ dto.setSjrq(date);
+ dto.setCzybm(ysbm);
+ dto.setCzyksbm(dept);
+ dto.setSfjz("0");
+ List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>();
+ List<TjProject> value = entry.getValue();
+ for (TjProject project : value) {
+ 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()) && tjProject.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
+ OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
+ detailsDto.setMxfyxmbm(tjProject.getHisXmbm());
+ if (tjProject.getSfzhfy().equals("Y")) {
+ detailsDto.setSfzhfy("1");
+ } else {
+ detailsDto.setSfzhfy("0");
+ }
+ detailsDto.setSl(tjProject.getSl());
+ detailsDto.setProjg(tjProject.getProPrice());
+ detailsDtos.add(detailsDto);
+ }
+ }
+ if (!outpinmedicXms.isEmpty()) {
+ outpinmedicXms.stream().filter(i -> i.getProId().equals(project.getProId())).forEach(i -> {
+ OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto();
+ detilsDto.setYpbm(i.getYpbm());
+ detilsDto.setPcbm(i.getPcbm());
+ detilsDto.setSl(i.getSl());
+ detilsDto.setDj(i.getDj());
+ detilsDto.setDcjl(i.getDcjl());
+ detilsDto.setPj(i.getPj());
+ detilsDto.setJj(i.getJj());
+ detilsDto.setJldw("");
+ detilsDto.setTjbm("");
+ detilsDto.setPs("");
+ detilsDto.setPsbm("");
+ detilsDto.setYyts("");
+ detilsDto.setXtph("");
+ detilsDto.setScph("");
+ detilsDto.setYpxq("");
+ detilsDto.setCdbm("");
+ detilsDto.setKfdw("");
+ detilsDto.setYfdw("");
+ detilsDto.setYysm("");
+ detilsDto.setYpmc(i.getYpmc());
+ detilsDto.setFzbl(i.getFzbl());
+ detilsDto.setZh(i.getZh());
+ detilsDto.setCflx(i.getCflx());
+ outpinmedicapplyDetilsDtos.add(detilsDto);
+ });
+ }
+ }
+ if (!detailsDtos.isEmpty()) {
+ dto.setDetails(detailsDtos);
+ AjaxResult ajaxResult1 = controller.Outpintestapply(dto);
+ String result5 = getAjaxResult(ajaxResult1);
+ JSONObject object3 = getJSONObject(result5);
+ String code3 = object3.getStr("ResultCode");
+ if (code3.equals("0")) {
+ List<OutpintestapplyDetailsDto> details = dto.getDetails();
+ for (OutpintestapplyDetailsDto detail : details) {
+ LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
+ tree.setCardId(dto.getHisRegistrationId());
+ tree.setPationid(customer.getPationId());
+ JSONObject resultData = object3.getJSONObject("ResultData");
+ tree.setSqdh(resultData.getStr("jysqdh"));
+ tree.setFyhj(resultData.getStr("fyhj"));
+ String mxfyxmbm = detail.getMxfyxmbm();
+ tree.setHisXmdm(mxfyxmbm);
+ tree.setType("妫�楠�");
+ tree.setService("his");
+ tree.setTjPrice(String.valueOf(detail.getProjg()));
+ LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
+ if (detail.getSfzhfy().equals("1"))
+ wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm);
+ else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm, mxfyxmbm);
+ List<LtkjJfzhglmxjfxmzd> ltkjJfzhglmxjfxmzds = ltkjJfzhglmxjfxmzdService.list(wrapper1);
+ if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()) {
+ String xmdm = ltkjJfzhglmxjfxmzds.get(0).getXmdm();
+ LambdaQueryWrapper<LtkjMxjfxmzd> wrapper2 = new LambdaQueryWrapper<>();
+ wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm);
+ LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2);
+ LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>();
+ wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm());
+ LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3);
+ tree.setXmfl(ejjfxmzd.getYjkmdm());
+ }
+ tree.setCreateTime(DateUtil.date());
+ ltkjJianchajianyanTreeService.save(tree);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ //闂ㄨ瘖妫�鏌ョ敵璇�
+ if (null != detailList && !detailList.isEmpty()) {
+ LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
+ wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
+ wq.in(TjProject::getDeptId,deptService.getJcDeptIds());
+ List<TjProject> projects = projectService.list(wq);
+ List<Long> proIds = projects.stream().map(TjProject::getProId).collect(Collectors.toList());
+ if (!proIds.isEmpty()){
+ QueryWrapper<TjProject> wrapper4 = new QueryWrapper<>();
+ wrapper4.select("sum(sl) as sl","pro_id"
+ ,"pro_parent_id","pro_name","his_xmbm","his_xmmc"
+ ,"pro_price");
+ wrapper4.in("pro_parent_id",proIds);
+ wrapper4.groupBy("his_xmbm");
+ projects = projectService.list(wrapper4);
+ if (null != projects && !projects.isEmpty()) {
+ List<OutpintestapplyDetailsDto> detailsDtoss = new ArrayList<>();
+ for (TjProject project : projects) {
+ if (StrUtil.isNotBlank(project.getHisXmbm()) && project.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
+ OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
+ detailsDto.setMxfyxmbm(project.getHisXmbm());
+ detailsDto.setSfzhfy("0");
+ detailsDto.setSl(project.getSl());
+ detailsDto.setProjg(project.getProPrice());
+ detailsDtoss.add(detailsDto);
+ }
+ }
+ List<Long> proParentIds = projects.stream().map(TjProject::getProParentId).distinct().collect(Collectors.toList());
+ if (!outpinmedicXms.isEmpty()) {
+ outpinmedicXms.stream().filter(i -> proParentIds.contains(i.getProId())).forEach(i -> {
+ OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto();
+ detilsDto.setYpbm(i.getYpbm());
+ detilsDto.setPcbm(i.getPcbm());
+ detilsDto.setSl(i.getSl());
+ detilsDto.setDj(i.getDj());
+ detilsDto.setDcjl(i.getDcjl());
+ detilsDto.setPj(i.getPj());
+ detilsDto.setJj(i.getJj());
+ detilsDto.setJldw("");
+ detilsDto.setTjbm("");
+ detilsDto.setPs("");
+ detilsDto.setPsbm("");
+ detilsDto.setYyts("");
+ detilsDto.setXtph("");
+ detilsDto.setScph("");
+ detilsDto.setYpxq("");
+ detilsDto.setCdbm("");
+ detilsDto.setKfdw("");
+ detilsDto.setYfdw("");
+ detilsDto.setYysm("");
+ detilsDto.setYpmc(i.getYpmc());
+ detilsDto.setFzbl(i.getFzbl());
+ detilsDto.setZh(i.getZh());
+ detilsDto.setCflx(i.getCflx());
+ outpinmedicapplyDetilsDtos.add(detilsDto);
+ });
+ }
+ if (!detailsDtoss.isEmpty()) {
+ OutpinexamapplyDto outpinexamapplyDto = new OutpinexamapplyDto();
+ outpinexamapplyDto.setHisRegistrationId(cardId);
+ outpinexamapplyDto.setSfzh(customer.getCusIdcard());
+ outpinexamapplyDto.setSqysbm(ysbm);
+ outpinexamapplyDto.setMzksbm(dept);
+ outpinexamapplyDto.setCzybm(ysbm);
+ outpinexamapplyDto.setCzyksbm(dept);
+ outpinexamapplyDto.setSfjz("0");
+ outpinexamapplyDto.setDetails(detailsDtoss);
+ AjaxResult ajaxResult2 = controller.Outpinexamapply(outpinexamapplyDto);
+ String result6 = getAjaxResult(ajaxResult2);
+ JSONObject object5 = getJSONObject(result6);
+ String code4 = object5.getStr("ResultCode");
+ if (code4.equals("0")) {
+ List<OutpintestapplyDetailsDto> details = outpinexamapplyDto.getDetails();
+ for (OutpintestapplyDetailsDto detail : details) {
+ LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
+ tree.setCardId(outpinexamapplyDto.getHisRegistrationId());
+ tree.setPationid(customer.getPationId());
+ JSONObject resultData = object5.getJSONObject("ResultData");
+ tree.setSqdh(resultData.getStr("jcsqdh"));
+ tree.setFyhj(resultData.getStr("fyhj"));
+ String mxfyxmbm = detail.getMxfyxmbm();
+ tree.setHisXmdm(mxfyxmbm);
+ tree.setType("妫�鏌�");
+ tree.setService("his");
+ tree.setTjPrice(String.valueOf(detail.getProjg()));
+ LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
+ if (detail.getSfzhfy().equals("1"))
+ wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm);
+ else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm, mxfyxmbm);
+ List<LtkjJfzhglmxjfxmzd> ltkjJfzhglmxjfxmzds = ltkjJfzhglmxjfxmzdService.list(wrapper1);
+ if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()) {
+ String xmdm = ltkjJfzhglmxjfxmzds.get(0).getXmdm();
+ LambdaQueryWrapper<LtkjMxjfxmzd> wrapper2 = new LambdaQueryWrapper<>();
+ wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm);
+ LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2);
+ LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>();
+ wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm());
+ LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3);
+ tree.setXmfl(ejjfxmzd.getYjkmdm());
+ }
+ tree.setCreateTime(DateUtil.date());
+ ltkjJianchajianyanTreeService.save(tree);
+ }
+ }
+ }
+ }
+ }
+ }
+
+
+ //闂ㄨ瘖娌荤枟澶勭疆鐢宠
+ OutpintreatapplyDto dao = new OutpintreatapplyDto();
+ dao.setHisRegistrationId(cardId);
+ dao.setSfzh(customer.getCusIdcard());
+ dao.setSqysbm(ysbm);
+ dao.setMzksbm(dept);
+ dao.setSjrq(date);
+ dao.setCzybm(ysbm);
+ dao.setCzyksbm(dept);
+ dao.setSfjz("0");
+// List<TbTransition> details = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId);
+ if (null != detailList && !detailList.isEmpty()) {
+ LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
+ wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
+ wq.in(TjProject::getDeptId,deptService.getCzDeptIds());
+ List<TjProject> projects = projectService.list(wq);
+ List<Long> proIds = projects.stream().map(TjProject::getProId).collect(Collectors.toList());
+ if (!proIds.isEmpty()){
+ QueryWrapper<TjProject> wrapper4 = new QueryWrapper<>();
+ wrapper4.select("sum(sl) as sl","pro_id"
+ ,"pro_parent_id","pro_name","his_xmbm","his_xmmc"
+ ,"pro_price");
+ wrapper4.in("pro_parent_id",proIds);
+ wrapper4.groupBy("his_xmbm");
+ projects = projectService.list(wrapper4);
+ if (null != projects && !projects.isEmpty()) {
+ List<OutpintestapplyDetailsDto> detailDtos = new ArrayList<>();
+ for (TjProject project : projects) {
+ if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
+ if (StrUtil.isNotBlank(project.getHisXmbm()) && project.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
+ OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
+ detailsDto.setMxfyxmbm(project.getHisXmbm());
+ detailsDto.setSfzhfy("0");
+ detailsDto.setSl(project.getSl());
+ detailsDto.setProjg(project.getProPrice());
+ detailDtos.add(detailsDto);
+ }
+ }
+ }
+ List<Long> proParentIds = projects.stream().map(TjProject::getProParentId).distinct().collect(Collectors.toList());
+ if (!outpinmedicXms.isEmpty()) {
+ outpinmedicXms.stream().filter(i -> proParentIds.contains(i.getProId())).forEach(i -> {
+ OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto();
+ detilsDto.setYpbm(i.getYpbm());
+ detilsDto.setPcbm(i.getPcbm());
+ detilsDto.setSl(i.getSl());
+ detilsDto.setDj(i.getDj());
+ detilsDto.setDcjl(i.getDcjl());
+ detilsDto.setPj(i.getPj());
+ detilsDto.setJj(i.getJj());
+ detilsDto.setJldw("");
+ detilsDto.setTjbm("");
+ detilsDto.setPs("");
+ detilsDto.setPsbm("");
+ detilsDto.setYyts("");
+ detilsDto.setXtph("");
+ detilsDto.setScph("");
+ detilsDto.setYpxq("");
+ detilsDto.setCdbm("");
+ detilsDto.setKfdw("");
+ detilsDto.setYfdw("");
+ detilsDto.setYysm("");
+ detilsDto.setYpmc(i.getYpmc());
+ detilsDto.setFzbl(i.getFzbl());
+ detilsDto.setZh(i.getZh());
+ detilsDto.setCflx(i.getCflx());
+ outpinmedicapplyDetilsDtos.add(detilsDto);
+ });
+ }
+ if (!detailDtos.isEmpty()) {
+ dao.setDetails(detailDtos);
+ AjaxResult mzylyzsq1 = controller.Outpintreatapply(dao);
+ String mzylyzsq2 = getAjaxResult(mzylyzsq1);
+ JSONObject mzylyzsq3 = getJSONObject(mzylyzsq2);
+ String code5 = mzylyzsq3.getStr("ResultCode");
+ if (code5.equals("0")) {
+ List<OutpintestapplyDetailsDto> details1 = dao.getDetails();
+ for (OutpintestapplyDetailsDto detail : details1) {
+ LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
+ tree.setCardId(dao.getHisRegistrationId());
+ tree.setPationid(customer.getPationId());
+ JSONObject resultData = mzylyzsq3.getJSONObject("ResultData");
+ tree.setSqdh(resultData.getStr("zlczh"));
+ tree.setFyhj(resultData.getStr("fyhj"));
+ String mxfyxmbm = detail.getMxfyxmbm();
+ tree.setHisXmdm(mxfyxmbm);
+ tree.setType("澶勭疆");
+ tree.setTjPrice(String.valueOf(detail.getProjg()));
+ LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
+ if (detail.getSfzhfy().equals("1"))
+ wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm);
+ else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm, mxfyxmbm);
+ List<LtkjJfzhglmxjfxmzd> ltkjJfzhglmxjfxmzds = ltkjJfzhglmxjfxmzdService.list(wrapper1);
+ if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()) {
+ String xmdm = ltkjJfzhglmxjfxmzds.get(0).getXmdm();
+ LambdaQueryWrapper<LtkjMxjfxmzd> wrapper2 = new LambdaQueryWrapper<>();
+ wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm);
+ LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2);
+ LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>();
+ wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm());
+ LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3);
+ tree.setXmfl(ejjfxmzd.getYjkmdm());
+ }
+ tree.setCreateTime(DateUtil.date());
+ ltkjJianchajianyanTreeService.save(tree);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ //鑽搧鐢宠 鍘熺増
+// if(!outpinmedicapplyDetilsDtos.isEmpty()){
+// OutpinmedicapplyDto dto1=new OutpinmedicapplyDto();
+// dto1.setHisRegistrationId(cardId);
+// dto1.setSfzh(customer.getCusIdcard());
+// dto1.setSqysbm(ysbm);
+// dto1.setMzksbm(dept);
+// dto1.setSjrq(date);
+// String yfbm = configService.selectConfigByKey("chufang_yfbm");
+// String mzzd = configService.selectConfigByKey("chufang_mzzd");
+// String czybm = configService.selectConfigByKey("chufang_czybm");
+// String czyksbm = configService.selectConfigByKey("chufang_czyksbm");
+// String cflxbm = configService.selectConfigByKey("chufang_cflxbm");
+// if (czybm.equalsIgnoreCase("N"))
+// dto1.setCzybm(ysbm);
+// else dto1.setCzybm(czybm);
+// if (czyksbm.equalsIgnoreCase("N"))
+// dto1.setCzyksbm(dept);
+// else dto1.setCzyksbm(czyksbm);
+// dto1.setCflxbm(cflxbm);
+// if (yfbm.equalsIgnoreCase("N"))
+// dto1.setYfbm("1");
+// else dto1.setYfbm(yfbm);
+// dto1.setFyts("1");
+// if (mzzd.equalsIgnoreCase("N"))
+// dto1.setMzzd("");
+// else dto1.setMzzd(mzzd);
+// dto1.setDetails(outpinmedicapplyDetilsDtos);
+// AjaxResult result = controller.Outpinmedicapply(dto1);
+// String result1 = getAjaxResult(result);
+// JSONObject object = getJSONObject(result1);
+// String code = object.getStr("ResultCode");
+// if(null !=code && code.equals("0")){
+// JSONObject resultData = object.getJSONObject("ResultData");
+//// Map<String, Object> resultDatasss = (Map<String, Object>) resultData.get(0);
+// String cfh = resultData.getStr("cfh");
+// log.info("鑽搧鐢宠鍚庣殑澶勬柟鍙锋槸: "+cfh+" outpinmedicapplyDetilsDtos 閲岄潰鐨勫�间负: "+outpinmedicapplyDetilsDtos.toString());
+// for (OutpinmedicapplyDetilsDto detilsDto : outpinmedicapplyDetilsDtos) {
+// TjCf cf=new TjCf();
+// cf.setCardId(cardId);
+// cf.setSfzh(customer.getCusIdcard());
+// cf.setCfh(cfh);
+// cf.setSqysbm(ysbm);
+// cf.setSqysxm(ysmc);
+// cf.setMzksbn(dept);
+// cf.setSqrq(date);
+// cf.setCzybm(ysbm);
+// cf.setYpbm(detilsDto.getYpbm());
+// cf.setYpmc(detilsDto.getYpmc());
+// cf.setSl(String.valueOf(detilsDto.getSl()));
+// cf.setDj(String.valueOf(detilsDto.getDj()));
+// cf.setDcjl(String.valueOf(detilsDto.getDcjl()));
+// cf.setPj(String.valueOf(detilsDto.getPj()));
+// cf.setJj(String.valueOf(detilsDto.getJj()));
+// cf.setCreateTime(new Date());
+// cfService.save(cf);
+// }
+// }
+// }
+
+ /**
+ * 鑽搧鐢宠 澶勬柟绫诲瀷缁存姢鍦ㄨ嵂鍝佽〃
+ */
+ if(!outpinmedicapplyDetilsDtos.isEmpty()){
+ String yfbm = configService.selectConfigByKey("chufang_yfbm");
+ String mzzd = configService.selectConfigByKey("chufang_mzzd");
+ String czybm = configService.selectConfigByKey("chufang_czybm");
+ String czyksbm = configService.selectConfigByKey("chufang_czyksbm");
+// String cflxbm = configService.selectConfigByKey("chufang_cflxbm");
+ Map<String, List<OutpinmedicapplyDetilsDto>> listMap = outpinmedicapplyDetilsDtos.stream().collect(Collectors.groupingBy(OutpinmedicapplyDetilsDto::getCflx));
+ listMap.forEach((cflx, details) -> {
+ OutpinmedicapplyDto dto1 = new OutpinmedicapplyDto();
+ dto1.setHisRegistrationId(cardId);
+ dto1.setSfzh(customer.getCusIdcard());
+ dto1.setSqysbm(ysbm);
+ dto1.setMzksbm(dept);
+ dto1.setSjrq(date);
+ if (czybm.equalsIgnoreCase("N"))
+ dto1.setCzybm(ysbm);
+ else dto1.setCzybm(czybm);
+ if (czyksbm.equalsIgnoreCase("N"))
+ dto1.setCzyksbm(dept);
+ else dto1.setCzyksbm(czyksbm);
+ dto1.setCflxbm(cflx);
+ if (yfbm.equalsIgnoreCase("N"))
+ dto1.setYfbm("1");
+ else dto1.setYfbm(yfbm);
+ dto1.setFyts("1");
+ if (mzzd.equalsIgnoreCase("N"))
+ dto1.setMzzd("");
+ else dto1.setMzzd(mzzd);
+ dto1.setDetails(details);
+ AjaxResult result = controller.Outpinmedicapply(dto1);
+ String result1 = getAjaxResult(result);
+ JSONObject object = getJSONObject(result1);
+ String code = object.getStr("ResultCode");
+ if (null != code && code.equals("0")) {
+ JSONObject resultData = object.getJSONObject("ResultData");
+ String cfh = resultData.getStr("cfh");
+ log.info("鑽搧鐢宠鍚庣殑澶勬柟鍙锋槸: " + cfh + " outpinmedicapplyDetilsDtos 閲岄潰鐨勫�间负: " + outpinmedicapplyDetilsDtos.toString());
+ for (OutpinmedicapplyDetilsDto detilsDto : outpinmedicapplyDetilsDtos) {
+ TjCf cf = new TjCf();
+ cf.setCardId(cardId);
+ cf.setSfzh(customer.getCusIdcard());
+ cf.setCfh(cfh);
+ cf.setSqysbm(ysbm);
+ cf.setSqysxm(ysmc);
+ cf.setMzksbn(dept);
+ cf.setSqrq(date);
+ cf.setCzybm(ysbm);
+ cf.setYpbm(detilsDto.getYpbm());
+ cf.setYpmc(detilsDto.getYpmc());
+ cf.setSl(String.valueOf(detilsDto.getSl()));
+ cf.setDj(String.valueOf(detilsDto.getDj()));
+ cf.setDcjl(String.valueOf(detilsDto.getDcjl()));
+ cf.setPj(String.valueOf(detilsDto.getPj()));
+ cf.setJj(String.valueOf(detilsDto.getJj()));
+ cf.setCreateTime(new Date());
+ cfService.save(cf);
+ }
+ }
+ });
+ }
+
+ return AjaxResult.success();
+ }
+
+
public AjaxResult tijianshenqing(TjCustomer customer, String date, TjOrder tjOrder, SysUser sysUser, AjaxResult result) {
List<TbTransition> detailList = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(), tjOrder.getCardId());
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
index c5d09d4..af8ff5f 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
@@ -1346,10 +1346,16 @@
}
- LambdaQueryWrapper<TjXdtgmdjg> wqq=new LambdaQueryWrapper<>();
- wqq.eq(TjXdtgmdjg::getTjh,tjOrder.getTjNumber());
- wqq.isNotNull(TjXdtgmdjg::getUrl);
- List<TjXdtgmdjg> xdtgmdjgList = xdtgmdjgService.list(wqq);
+ String isPdfFujianPro = sysConfigService.selectConfigByKey("is_pdf_fujian_pro");
+ List<TjXdtgmdjg> xdtgmdjgList;
+ if (StrUtil.isNotBlank(isPdfFujianPro) && isPdfFujianPro.equalsIgnoreCase("Y")){
+ xdtgmdjgList = xdtgmdjgService.xdtGlAttProByTjNum(tjOrder.getTjNumber());
+ }else {
+ LambdaQueryWrapper<TjXdtgmdjg> wqq=new LambdaQueryWrapper<>();
+ wqq.eq(TjXdtgmdjg::getTjh,tjOrder.getTjNumber());
+ wqq.isNotNull(TjXdtgmdjg::getUrl);
+ xdtgmdjgList = xdtgmdjgService.list(wqq);
+ }
int index=1;
for (TjXdtgmdjg xdtgmdjg : xdtgmdjgList) {
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index 421a5bb..ea31683 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -766,15 +766,23 @@
String resultMsg = "";
if (null != baoGaoDans && !baoGaoDans.isEmpty()) {
Date dates = new Date();
- Map<String, Object> map = new HashMap<>();
- map.put("his_registration_id", order.getCardId());
- map.put("ksbm", "");
- map.put("pationid", "");
- map.put("ksrq", DateUtil.format(DateUtil.beginOfDay(order.getCreateTime()), "yyyy-MM-dd HH:mm:ss"));
- map.put("jsrq", DateUtil.format(DateUtil.endOfDay(dates), "yyyy-MM-dd HH:mm:ss"));
- map.put("pagecount", 10);
- map.put("page", 1);
- AjaxResult result = controller.Getlabreportinfo(map);
+ String jytbfs = configService.selectConfigByKey("jytbfs");
+ AjaxResult result;
+ if (StrUtil.isNotBlank(jytbfs) && jytbfs.equalsIgnoreCase("Y")){
+ Map<String, Object> map = new HashMap<>();
+ map.put("his_registration_id", order.getCardId());
+ map.put("ksbm", "");
+ map.put("pationid", "");
+ map.put("ksrq", DateUtil.format(DateUtil.beginOfDay(order.getCreateTime()), "yyyy-MM-dd HH:mm:ss"));
+ map.put("jsrq", DateUtil.format(DateUtil.endOfDay(dates), "yyyy-MM-dd HH:mm:ss"));
+ map.put("pagecount", 10);
+ map.put("page", 1);
+ result = controller.Getlabreportinfo(map);
+ }else {
+ result = ltkjHysqdService.getAsyncDataByPro("浣撴涓績", order.getCardId(), "''", 100, 1, "'1'");
+ }
+ log.info("妫�楠岄」鐩煡璇㈣繑鍥炲��: " + JSONUtil.toJsonStr(result));
+
String result1 = getAjaxResult(result);
JSONObject object = getJSONObject(result1);
String code = object.getStr("ResultCode");
@@ -790,19 +798,19 @@
boolean isInsertHysqd = false;
LtkjHysqd hysqd = new LtkjHysqd();
hysqd.setTjh(order.getCardId());
- hysqd.setTmh(jsonObject.getStr("JYBGID"));
- hysqd.setBbbh(jsonObject.getStr("BBDM"));
- hysqd.setBbmc(jsonObject.getStr("BBMC"));
- hysqd.setXmid(jsonObject.getStr("JYXMDM"));
- hysqd.setXmmc(jsonObject.getStr("JYXMMC"));
- hysqd.setSqsj(jsonObject.getStr("SQRQ"));
- hysqd.setSqys(jsonObject.getStr("SQRBH"));
- hysqd.setJgsj(jsonObject.getStr("JYBGRQ"));
- hysqd.setSqrxm(jsonObject.getStr("SQRXM"));
- hysqd.setSqdh(jsonObject.getStr("SQDBH"));
- hysqd.setShrdm(jsonObject.getStr("JYYSBH"));
- hysqd.setShrxm(jsonObject.getStr("JYYSQM"));
- hysqd.setJybgjg(jsonObject.getStr("JYBGJG"));
+ hysqd.setTmh(jsonObject.getStr("JYBGID"));// 妫�楠屾姤鍛� ID
+ hysqd.setBbbh(jsonObject.getStr("BBDM"));// 鏍囨湰浠ｇ爜
+ hysqd.setBbmc(jsonObject.getStr("BBMC"));// 鏍囨湰鍚嶇О
+ hysqd.setXmid(jsonObject.getStr("JYXMDM"));// 妫�楠岄」鐩唬鐮�
+ hysqd.setXmmc(jsonObject.getStr("JYXMMC"));// 妫�楠岄」鐩悕绉�
+ hysqd.setSqsj(jsonObject.getStr("SQRQ"));// 鐢宠鏃堕棿
+ hysqd.setSqys(jsonObject.getStr("SQRBH"));// 鐢宠鍖荤敓缂栧彿
+ hysqd.setJgsj(jsonObject.getStr("JYBGRQ"));// 鎶ュ憡鏃ユ湡
+ hysqd.setSqrxm(jsonObject.getStr("SQRXM"));// 鐢宠鍖荤敓濮撳悕
+ hysqd.setSqdh(jsonObject.getStr("SQDBH"));// 鐢宠鍖荤敓浠ｇ爜锛屽瓧鍏镐唬鐮�
+ hysqd.setShrdm(jsonObject.getStr("JYYSBH"));// 瀹℃牳浜哄憳浠ｇ爜锛屽瓧鍏镐唬鐮�
+ hysqd.setShrxm(jsonObject.getStr("JYYSQM"));// 瀹℃牳浜哄憳濮撳悕
+ hysqd.setJybgjg(jsonObject.getStr("JYBGJG"));// 妫�楠屾姤鍛婄粨鏋�
hysqd.setCreateTime(new Date());
QueryWrapper<LtkjHysqd> queryWrapper = new QueryWrapper<>(hysqd);
List<LtkjHysqd> list = ltkjHysqdService.list(queryWrapper);
@@ -839,7 +847,7 @@
results = jcsqdService.getTjJcProByHisCall("浣撴涓績", order.getCardId(), "''", 100, 1, "'1'");
DynamicDataSourceContextHolder.clearDataSourceType();
}
- log.info("妫�鏌ラ」鐩煡璇㈣繑鍥炲��: " + results.toString());
+ log.info("妫�鏌ラ」鐩煡璇㈣繑鍥炲��: " + JSONUtil.toJsonStr(results));
if (Integer.parseInt(results.get("code").toString()) == 200) {
List<Map<String, Object>> datas = (List<Map<String, Object>>) results.get("data");
if (null != datas && !datas.isEmpty()) {
@@ -883,30 +891,31 @@
jcbgdService.save(jcbgd);
}
jcsqdService.saveLtkjExamJcsqd(order.getCardId());
- List<LtkjExamJcsqd> jcsqdList = jcsqdService.getLtkjJcsqdByTjh(order.getCardId());
- jcycxmService.deletedByTjh(order.getTjNumber());
- if(!jcsqdList.isEmpty()){
- for (LtkjExamJcsqd jcsqd : jcsqdList) {
- if(StringUtil.isNotBlank(jcsqd.getJgzt())){
- String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;|,|锛�");
- for (String jg : split) {
- if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
- && !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈")
- && !jg.contains("鏈鏄庢樉")&& !jg.contains("姝ｅ父")&& !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")){
- TjJcycxm jcycxm=new TjJcycxm();
- jcycxm.setTjh(order.getTjNumber());
- jcycxm.setYqid("jczyy");
- String[] split1 = jcsqd.getJcxmid().split(";");
- jcycxm.setProId(split1[0]);
- jcycxm.setProName(jcsqd.getJcxmmc());
- jcycxm.setCreateTime(new Date());
- jcycxm.setJcjg(jg);
- jcycxmService.save(jcycxm);
- }
- }
- }
- }
- }
+// List<LtkjExamJcsqd> jcsqdList = jcsqdService.getLtkjJcsqdByTjh(order.getCardId());
+// jcycxmService.deletedByTjh(order.getTjNumber());
+// if(!jcsqdList.isEmpty()){
+// for (LtkjExamJcsqd jcsqd : jcsqdList) {
+// if(StringUtil.isNotBlank(jcsqd.getJgzt())){
+// String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;|,|锛�");
+// for (String jg : split) {
+// if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
+// && !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈")
+// && !jg.contains("鏈鏄庢樉")&& !jg.contains("姝ｅ父")&& !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")){
+// TjJcycxm jcycxm=new TjJcycxm();
+// jcycxm.setTjh(order.getTjNumber());
+// jcycxm.setYqid("jczyy");
+// String[] split1 = jcsqd.getJcxmid().split(";");
+// jcycxm.setProId(split1[0]);
+// jcycxm.setProName(jcsqd.getJcxmmc());
+// jcycxm.setCreateTime(new Date());
+// jcycxm.setJcjg(jg);
+// jcycxmService.save(jcycxm);
+// }
+// }
+// }
+// }
+// }
+ configController.tjjcycxm(tjNumber, "0");
testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
} else {
resultMsg += "\n妫�鏌ラ」鐩殏鏃舵湭鍑虹粨鏋�,璇风◢鍚庡悓姝�!!!";
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHysqdMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHysqdMapper.java
index 6768f37..296dc21 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHysqdMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHysqdMapper.java
@@ -11,9 +11,11 @@
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
+import org.springframework.beans.factory.annotation.Qualifier;
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* @Company: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃
@@ -102,4 +104,13 @@
" AND\n" +
" a.tjh=#{cardId}")
int getHyYcXmCount(String cardId);
+
+ @DataSource(value = DataSourceType.SLAVE_HIS)
+ @Qualifier(value = "slaveHisDataSource")
+ List<Map<String ,Object>> getAsyncDataByPro(@Param("ksmc") String ksmc,
+ @Param("str_in")String strIn,
+ @Param("brid")String brid,
+ @Param("pagecount")int pagecount,
+ @Param("page")int page,
+ @Param("status")String status);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjXdtgmdjgMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjXdtgmdjgMapper.java
index 6c970f0..b406a47 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjXdtgmdjgMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjXdtgmdjgMapper.java
@@ -5,6 +5,10 @@
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Map;
/**
* ClassName: TjXdtgmdjgMapper <br/>
@@ -18,4 +22,7 @@
@Delete("DELETE FROM tj_xdtgmdjg WHERE tjh=#{tjNumber} and pro_id=#{proId}")
void deletedByTJhAndProId(@Param("tjNumber") String tjNumber,@Param("proId") String proId);
+
+ @Select("call pro_pdf_fujian(#{tjnumber,mode=IN})")
+ List<TjXdtgmdjg> xdtGlAttProByTjNum(String tjnumber);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHysqdService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHysqdService.java
index 662a8d4..33775e1 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHysqdService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHysqdService.java
@@ -1,6 +1,7 @@
package com.ltkj.hosp.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.hosp.domain.TjCustomer;
import com.ltkj.hosp.domain.TjOrder;
import com.ltkj.hosp.sqlDomain.LtkjHybgd;
@@ -30,4 +31,6 @@
int getHyYcXmCount(String cardId);
void deletedByTjhAndXmId(String tjh, String xmid);
+
+ AjaxResult getAsyncDataByPro(String ksmc,String strIn,String brid,int pagecount,int page,String status);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjXdtgmdjgService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjXdtgmdjgService.java
index a052a73..d6f495e 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjXdtgmdjgService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjXdtgmdjgService.java
@@ -3,6 +3,9 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ltkj.hosp.domain.TjXdtgmdjg;
+import java.util.List;
+import java.util.Map;
+
/**
* ClassName: TjXdtgmdjgService <br/>
* Description: <br/>
@@ -14,4 +17,6 @@
public interface TjXdtgmdjgService extends IService<TjXdtgmdjg> {
void deletedByTJhAndProId(String tjNumber, String proId);
+
+ List<TjXdtgmdjg> xdtGlAttProByTjNum(String tjNum);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHysqdServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHysqdServiceImpl.java
index 7a90f41..6b65031 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHysqdServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHysqdServiceImpl.java
@@ -1,6 +1,7 @@
package com.ltkj.hosp.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.hosp.domain.TjCustomer;
import com.ltkj.hosp.domain.TjOrder;
import com.ltkj.hosp.mapper.LtkjExamJcsqdMapper;
@@ -62,4 +63,9 @@
public void deletedByTjhAndXmId(String tjh, String xmid) {
mapper.deletedByTjhAndXmId(tjh,xmid);
}
+
+ @Override
+ public AjaxResult getAsyncDataByPro(String ksmc,String strIn,String brid,int pagecount,int page,String status) {
+ return AjaxResult.success().put("ResultData",mapper.getAsyncDataByPro(ksmc,strIn,brid,pagecount,page,status)).put("code",0);
+ }
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjXdtgmdjgServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjXdtgmdjgServiceImpl.java
index 5d345a4..aeba5e5 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjXdtgmdjgServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjXdtgmdjgServiceImpl.java
@@ -7,6 +7,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
/**
* ClassName: TjXdtgmdjgServiceImpl <br/>
* Description: <br/>
@@ -24,4 +28,9 @@
public void deletedByTJhAndProId(String tjNumber, String proId) {
mapper.deletedByTJhAndProId(tjNumber,proId);
}
+
+ @Override
+ public List<TjXdtgmdjg> xdtGlAttProByTjNum(String tjNum) {
+ return mapper.xdtGlAttProByTjNum(tjNum);
+ }
}
--
Gitblit v1.8.0