From 89919412a7d94f87aea159b39d823e5d6014a20e Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 21 十月 2024 10:52:21 +0800
Subject: [PATCH] zjh20241021
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 deletions(-)
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 ddb0200..a1f37da 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
@@ -9,6 +9,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.common.core.domain.entity.SysUser;
+import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.hisDto.*;
import com.ltkj.hosp.service.*;
@@ -74,6 +75,7 @@
private TjSysAsyncServiceImpl tjSysAsyncService;
@Autowired
private LisApiMethod lisApiMethod;
+
//灏嗘柟娉曡繑鍥炲�艰В鏋愭垚json鏍煎紡
public JSONObject getJSONObject(String builder) {
@@ -249,7 +251,7 @@
}
}
}
- if (detailsDtos.size() > 0) {
+ if (!detailsDtos.isEmpty()) {
dto.setDetails(detailsDtos);
AjaxResult ajaxResult1 = controller.Outpintestapply(dto);
String result5 = getAjaxResult(ajaxResult1);
@@ -285,6 +287,11 @@
}
tree.setCreateTime(DateUtil.date());
ltkjJianchajianyanTreeService.save(tree);
+ }
+ TjOrder tjOrder = orderService.getOrderByCardId(cardId);
+ if(null !=tjOrder){
+ List<TjOrderDetail> dengJi = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
+ tjSysAsyncService.addCaiYangDengJi(dengJi,!dengJi.isEmpty(),tjOrder, SecurityUtils.getLoginUser().getUser(), null);
}
}
}
@@ -552,12 +559,15 @@
log.error("pacs鐢宠澶辫触 璇ョ櫥璁颁汉鎸傚彿澶辫触, 灏辫瘖鍙蜂负: " + tjOrder.getCardId());
return AjaxResult.error("鎸傚彿澶辫触!" + result.get("msg").toString());
}
- LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>();
- wq2.eq(TjOrderDetail::getOrderId, tjOrder.getOrderId());
- wq2.isNotNull(TjOrderDetail::getFlowingWaterId);
- wq2.eq(TjOrderDetail::getIsSampling, 0);
- List<TjOrderDetail> detailList1 = tjOrderDetailService.list(wq2);
- tjSysAsyncService.addCaiYangDengJi(detailList1, !detailList.isEmpty(), tjOrder, sysUser);
+
+// LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>();
+// wq2.eq(TjOrderDetail::getOrderId, tjOrder.getOrderId());
+// wq2.isNotNull(TjOrderDetail::getFlowingWaterId);
+// wq2.eq(TjOrderDetail::getIsSampling, 0);
+// List<TjOrderDetail> detailList1 = tjOrderDetailService.list(wq2);
+ List<TjOrderDetail> detailList1 = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
+ log.info("TjOrderDetail ->{}",JSONUtil.toJsonStr(detailList1));
+ tjSysAsyncService.addCaiYangDengJi(detailList1, !detailList1.isEmpty(), tjOrder, sysUser,null);
//妫�楠岀敵璇�
OutpintestapplyDto dto = new OutpintestapplyDto();
@@ -762,6 +772,7 @@
if (jysqdh != null && !jysqdh.isEmpty()){
for (String sqdh : jysqdh) {
AjaxResult cancelLisAjaxResult = lisApiMethod.cancel(sqdh, order.getCardId(), customer1.getCusName());
+ log.info("lis璇锋眰杩斿洖 ->{}",JSONUtil.toJsonStr(cancelLisAjaxResult));
String result = cancelLisAjaxResult.get("data").toString();
JSONObject object = JSONUtil.parseObj(result);
String code= object.getStr("ResultCode");
@@ -872,11 +883,14 @@
if (jcsqdh != null && !jcsqdh.isEmpty()){
for (String sqdh : jcsqdh) {
AjaxResult cancelPacsAjaxResult = pacsApiMethodService.updatePacsApply(sqdh, order.getCardId(), customer1.getCusName());
+ log.info("浣滃簾妫�鏌� pacs杩斿洖 ->{}",JSONUtil.toJsonStr(cancelPacsAjaxResult));
String result = cancelPacsAjaxResult.get("data").toString();
JSONObject object = JSONUtil.parseObj(result);
String code = object.getStr("ResultCode");
if(code.equals("1")){
orderService.delHuoQuBlJcsqdh(order.getCardId(),bldh);
+ }else {
+ return false;
}
}
}
@@ -884,11 +898,14 @@
if (jysqdh != null && !jysqdh.isEmpty()){
for (String sqdh : jysqdh) {
AjaxResult cancelLisAjaxResult = lisApiMethod.cancel(sqdh, order.getCardId(), customer1.getCusName());
+ log.info("浣滃簾妫�楠� pacs杩斿洖 ->{}",JSONUtil.toJsonStr(cancelLisAjaxResult));
String result = cancelLisAjaxResult.get("data").toString();
JSONObject object = JSONUtil.parseObj(result);
String code= object.getStr("ResultCode");
if(code.equals("1")){
orderService.delHuoQuBlJysqdh(order.getCardId(),bldh);
+ }else {
+ return false;
}
}
}
@@ -903,6 +920,8 @@
String code = object.getStr("ResultCode");
if (code.equals("0")) {
orderService.delHuoQuBlJcsqdh(order.getCardId(),bldh);
+ }else {
+ return false;
}
}
}
@@ -916,6 +935,8 @@
code1 = object1.getStr("ResultCode");
if (code1.equals("0")) {
orderService.delHuoQuBlJysqdh(order.getCardId(),bldh);
+ }else {
+ return false;
}
}
}
@@ -930,6 +951,8 @@
code1 = object1.getStr("ResultCode");
if (code1.equals("0")) {
orderService.delHuoQuZlsqdh(order.getCardId(),bldh);
+ }else {
+ return false;
}
}
}
@@ -943,6 +966,8 @@
String code = object.getStr("ResultCode");
if(null !=code && code.equals("0")){
cfService.delCfByCardId(cfh);
+ }else {
+ return false;
}
}
}
--
Gitblit v1.8.0