From 7e73e7699d55b4b229bef4dc5d89e01aedef5a19 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 19 五月 2025 17:13:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java | 41 +++++++++++++++++++++++++++++++++--------
1 files changed, 33 insertions(+), 8 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 122f41e..c93615d 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java
@@ -9,10 +9,7 @@
import com.ltkj.common.core.controller.BaseController;
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.framework.config.UserHoder;
-import com.ltkj.hosp.domain.LtkjJianchajianyanTree;
-import com.ltkj.hosp.domain.TjCustomer;
-import com.ltkj.hosp.domain.TjOrder;
-import com.ltkj.hosp.domain.TjProject;
+import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.hisDto.*;
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
@@ -23,6 +20,7 @@
import com.ltkj.hosp.vodomain.CsProVo;
import com.ltkj.web.controller.system.TjCheckController;
import io.swagger.annotations.Api;
+import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.NoTransactionException;
@@ -63,6 +61,8 @@
private LtkjHybgdService hybgdService;
@Autowired
private ITjCustomerService tjCustomerService;
+ @Autowired
+ private TjJcycxmService jcycxmService;
/**
* 鑾峰彇pacs妫�鏌ユ暟鎹�
@@ -278,10 +278,31 @@
ltkjExamJcsqd.setBw(checkParts);
ltkjExamJcsqd.setJgzt(pacs.getStr("diagnosis"));
ltkjExamJcsqd.setJgbx(pacs.getStr("examination"));
+ ltkjExamJcsqd.setSgorzd("1");
ltkjExamJcsqd.setCreateTime(new Date());
ltkjExamJcsqdService.deletedLtkjJcsqdByTjhAndXmId(ltkjExamJcsqd.getTjh(),ltkjExamJcsqd.getJcxmid());
boolean save1 = ltkjExamJcsqdService.save(ltkjExamJcsqd);
+
+ if(StringUtil.isNotBlank(ltkjExamJcsqd.getJgzt())){
+ jcycxmService.deletedByTjh(order.getTjNumber());
+ String[] split = ltkjExamJcsqd.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 = ltkjExamJcsqd.getJcxmid().split(";");
+ jcycxm.setProId(split1[0]);
+ jcycxm.setProName(ltkjExamJcsqd.getJcxmmc());
+ jcycxm.setCreateTime(new Date());
+ jcycxm.setJcjg(jg);
+ jcycxmService.save(jcycxm);
+ }
+ }
+ }
LtkjExamJcbgd ltkjExamJcbgd = new LtkjExamJcbgd();
ltkjExamJcbgd.setTjh(ltkjExamJcsqd.getTjh());
@@ -303,8 +324,9 @@
ltkjExamJcbgd.setBgNr(ltkjExamJcsqd.getJgbx());
ltkjExamJcbgd.setYxbx(ltkjExamJcsqd.getJgzt());
ltkjExamJcbgd.setYxzd(ltkjExamJcsqd.getJgzt());
+ ltkjExamJcbgd.setSgorzd("1");
ltkjExamJcsqd.setCreateTime(new Date());
- ltkjExamJcbgdService.deletedLtkjJcbgdByTjhAndTmh(ltkjExamJcsqd.getTjh());
+ ltkjExamJcbgdService.deletedLtkjJcbgdByTjhAndTmhA(ltkjExamJcsqd.getTjh(),ltkjExamJcsqd.getTmh());
boolean save2 = ltkjExamJcbgdService.save(ltkjExamJcbgd);
if (save1 && save2) {
try {
@@ -334,6 +356,7 @@
queryWrapper.eq(LtkjJianchajianyanTree::getType,"妫�楠�");
queryWrapper.eq(LtkjJianchajianyanTree::getHisXmdm,xmdm);
LtkjJianchajianyanTree tree = ltkjJianchajianyanTreeService.getOne(queryWrapper);
+ String tmh;
if (tree == null) {
tree = new LtkjJianchajianyanTree();
tree.setHisXmdm(xmdm);
@@ -354,8 +377,10 @@
}
}
}
+ tmh = tree.getSqdh()+"_"+tree.getHisXmdm();
+ }else{
+ tmh = tree.getSqdh();
}
- String tmh = tree.getSqdh()+"_"+tree.getHisXmdm();
String shys = "";
for (Object o : lis) {
cn.hutool.json.JSONObject jsonObject = (cn.hutool.json.JSONObject) o;
@@ -382,12 +407,12 @@
hysqd.setCreateTime(new Date());
// hysqd.setBbmc();
hysqdService.deletedByTjhAndXmId(hysqd.getTjh(),hysqd.getXmid());
- hybgdService.deletedLtkjHybgdByTjhAndTmh(tree.getSqdh()+"_"+tree.getHisXmdm());
+ hybgdService.deletedLtkjHybgdByTjhAndTmh(tmh);
hysqdService.save(hysqd);
for (Object object : lis) {
cn.hutool.json.JSONObject jsonObject = (cn.hutool.json.JSONObject) object;
LtkjHybgd hybgd = new LtkjHybgd();
- hybgd.setTmh(tree.getSqdh()+"_"+tree.getHisXmdm());
+ hybgd.setTmh(tmh);
hybgd.setJcxmid(jsonObject.getStr("jcxmid"));
hybgd.setJcxm(jsonObject.getStr("proName"));
hybgd.setJyjg(jsonObject.getStr("proResult"));
--
Gitblit v1.8.0