From 92fec7876dbbc43f1780e66901ef8bfd0fad445b Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 31 三月 2025 14:33:10 +0800
Subject: [PATCH] zjh20250331
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java | 64 +++++++++++++++++--------------
1 files changed, 35 insertions(+), 29 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 3ae736f..a80790b 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
@@ -126,9 +126,7 @@
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());
@@ -284,11 +282,14 @@
ltkjExamJcbgd.setBgUrl("");
ltkjExamJcbgd.setShysxm(pacs.getStr("reportDoctorName"));
ltkjExamJcbgd.setShysdm(pacs.getStr("reportDoctorCode"));
- ltkjExamJcbgd.setYxzd(ltkjExamJcsqd.getJgzt());
- ltkjExamJcbgd.setYxbx(ltkjExamJcsqd.getJgbx());
+// 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());
boolean save2 = ltkjExamJcbgdService.save(ltkjExamJcbgd);
if (save1 && save2) {
try {
@@ -310,7 +311,7 @@
LambdaQueryWrapper<TjOrder> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TjOrder::getTjNumber,tjNum);
TjOrder order = tjOrderService.getOne(wrapper);
- hysqd.setTjh(order.getTjNumber());
+ hysqd.setTjh(order.getCardId());
String mzh = order.getCardId();
LambdaQueryWrapper<LtkjJianchajianyanTree> queryWrapper = new LambdaQueryWrapper<>();
@@ -341,22 +342,35 @@
}
}
}
-
-
- hysqd.setTmh(tree.getSqdh()+"_"+tree.getHisXmdm());
- hysqd.setXmid(xmdm);
- hysqd.setXmmc(project.getHisXmbm());
+ String tmh = tree.getSqdh()+"_"+tree.getHisXmdm();
+ 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.setSqsj(format.format(tree.getCreateTime()));
hysqd.setJgsj(format.format(new Date()));
+ hysqd.setShrxm(shys);
// hysqd.setBbmc();
- boolean save = hysqdService.save(hysqd);
- boolean save2 = true;
+ hysqdService.deletedByTjhAndXmId(hysqd.getTjh(),hysqd.getXmid());
+ hybgdService.deletedLtkjHybgdByTjhAndTmh(tree.getSqdh()+"_"+tree.getHisXmdm());
+ hysqdService.save(hysqd);
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.setJcxm(jsonObject.getStr("proName"));
hybgd.setJyjg(jsonObject.getStr("proResult"));
hybgd.setJgdw(jsonObject.getStr("company"));
String tjStandardGtValue = jsonObject.getStr("tjStandardGtValue");
@@ -373,22 +387,14 @@
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;
- }
+ hybgd.setShysmc(shys);
+ hybgd.setYcbz(jsonObject.getStr("ycbz"));
+ hybgdService.save(hybgd);
}
- if (save && save2){
- 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("鍚屾澶辫触璇烽噸璇�");
- }
- } else {
+ 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("鍚屾澶辫触璇烽噸璇�");
}
--
Gitblit v1.8.0