From 2eb40036e885988fbf93ebcb98a339b197fb6340 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 05 六月 2025 17:39:52 +0800
Subject: [PATCH] zjh20250605
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java | 83 +++++++++++++++++++++++++++--------------
1 files changed, 55 insertions(+), 28 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..24567b7 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妫�鏌ユ暟鎹�
@@ -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("姝ｅ父") && !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("姝ｅ父") && !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