From 6d09c6301492d3095ff64dba2336f0d0b69638e6 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 10 四月 2025 18:04:44 +0800
Subject: [PATCH] zjh20250410
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java | 41 ++++++++++++++++++++++++++---------------
1 files changed, 26 insertions(+), 15 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 a80790b..fefb840 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
@@ -168,7 +168,7 @@
}
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));
}
@@ -267,8 +267,12 @@
ltkjExamJcsqd.setJgsj(format.format(new Date()));
}
String checkParts = pacs.getStr("checkParts");
- ltkjExamJcsqd.setJcxmmc(checkParts);
- ltkjExamJcsqd.setJcxmid(xmdm);
+// 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"));
@@ -277,8 +281,12 @@
LtkjExamJcbgd ltkjExamJcbgd = new LtkjExamJcbgd();
ltkjExamJcbgd.setTjh(ltkjExamJcsqd.getTjh());
ltkjExamJcbgd.setTmh(ltkjExamJcsqd.getTmh());
- ltkjExamJcbgd.setXmdm(ltkjExamJcsqd.getJcxmid());
- ltkjExamJcbgd.setXmmc(ltkjExamJcsqd.getJcxmmc());
+// 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"));
@@ -308,9 +316,7 @@
cn.hutool.json.JSONObject entries = (cn.hutool.json.JSONObject) lis.get(0);
String tjNum = entries.getStr("tjNum");
LtkjHysqd hysqd = new LtkjHysqd();
- LambdaQueryWrapper<TjOrder> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TjOrder::getTjNumber,tjNum);
- TjOrder order = tjOrderService.getOne(wrapper);
+ TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
hysqd.setTjh(order.getCardId());
String mzh = order.getCardId();
@@ -351,13 +357,18 @@
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());
- }
+
+// 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);
--
Gitblit v1.8.0