From 57b41b18aa3472be34b8b13d725db8578a14b836 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 18 十月 2024 16:44:13 +0800
Subject: [PATCH] zjh20241018
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 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..cd155b5 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
@@ -552,12 +552,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 +765,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 +876,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 +891,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 +913,8 @@
String code = object.getStr("ResultCode");
if (code.equals("0")) {
orderService.delHuoQuBlJcsqdh(order.getCardId(),bldh);
+ }else {
+ return false;
}
}
}
@@ -916,6 +928,8 @@
code1 = object1.getStr("ResultCode");
if (code1.equals("0")) {
orderService.delHuoQuBlJysqdh(order.getCardId(),bldh);
+ }else {
+ return false;
}
}
}
@@ -930,6 +944,8 @@
code1 = object1.getStr("ResultCode");
if (code1.equals("0")) {
orderService.delHuoQuZlsqdh(order.getCardId(),bldh);
+ }else {
+ return false;
}
}
}
@@ -943,6 +959,8 @@
String code = object.getStr("ResultCode");
if(null !=code && code.equals("0")){
cfService.delCfByCardId(cfh);
+ }else {
+ return false;
}
}
}
--
Gitblit v1.8.0