From cd6114bf85d19e6bdcd6a17c66f34b8c838870d5 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 16 十月 2024 15:31:23 +0800
Subject: [PATCH] 增加标本代码设置
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 102 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 71 insertions(+), 31 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 6752265..8f944bc 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,14 @@
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());
+ tjSysAsyncService.addCaiYangDengJi(detailList1, !detailList1.isEmpty(), tjOrder, sysUser);
//妫�楠岀敵璇�
OutpintestapplyDto dto = new OutpintestapplyDto();
@@ -861,36 +863,70 @@
List<String> cfhs = cfService.getCfBlhs(order.getCardId(),bldh);
- //2.1.6.5 浣滃簾闂ㄨ瘖妫�鏌ョ敵璇�
- if (null != jcsqdh && jcsqdh.size()>0) {
- for (String s : jcsqdh) {
- AjaxResult result = controller.Outpindelexamapply(order.getCardId(), "00029", s);
- String result1 = getAjaxResult(result);
- JSONObject object = getJSONObject(result1);
- String code = object.getStr("ResultCode");
- if (code.equals("0")) {
- orderService.delHuoQuBlJcsqdh(order.getCardId(),bldh);
- }
- }
-
- }
-
-
- //2.1.6.3 浣滃簾闂ㄨ瘖妫�楠岀敵璇�
-
AjaxResult ajaxResult = null;
String result2 = null;
JSONObject object1 = null;
String code1 = null;
- if (null != jysqdh && jysqdh.size()>0) {
- for (String s : jysqdh) {
- ajaxResult = controller.Outpindeltestapply(order.getCardId(), "00029", s);
- result2 = getAjaxResult(ajaxResult);
- object1 = getJSONObject(result2);
- code1 = object1.getStr("ResultCode");
- if (code1.equals("0")) {
- orderService.delHuoQuBlJysqdh(order.getCardId(),bldh);
+ if (lisApiMethod.isUseLisAndPacsRegister(order)) {
+ TjCustomer customer1 = customerService.getById(order.getUserId());
+ // 浣滃簾妫�鏌ョ敵璇�
+ if (jcsqdh != null && !jcsqdh.isEmpty()){
+ for (String sqdh : jcsqdh) {
+ AjaxResult cancelPacsAjaxResult = pacsApiMethodService.updatePacsApply(sqdh, order.getCardId(), customer1.getCusName());
+ 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;
+ }
+ }
+ }
+ // 浣滃簾妫�楠岀敵璇�
+ if (jysqdh != null && !jysqdh.isEmpty()){
+ for (String sqdh : jysqdh) {
+ AjaxResult cancelLisAjaxResult = lisApiMethod.cancel(sqdh, order.getCardId(), customer1.getCusName());
+ 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;
+ }
+ }
+ }
+
+ }else {
+ //2.1.6.5 浣滃簾闂ㄨ瘖妫�鏌ョ敵璇�
+ if (null != jcsqdh && jcsqdh.size()>0) {
+ for (String s : jcsqdh) {
+ AjaxResult result = controller.Outpindelexamapply(order.getCardId(), "00029", s);
+ String result1 = getAjaxResult(result);
+ JSONObject object = getJSONObject(result1);
+ String code = object.getStr("ResultCode");
+ if (code.equals("0")) {
+ orderService.delHuoQuBlJcsqdh(order.getCardId(),bldh);
+ }else {
+ return false;
+ }
+ }
+ }
+
+ //2.1.6.3 浣滃簾闂ㄨ瘖妫�楠岀敵璇�
+ if (null != jysqdh && jysqdh.size()>0) {
+ for (String s : jysqdh) {
+ ajaxResult = controller.Outpindeltestapply(order.getCardId(), "00029", s);
+ result2 = getAjaxResult(ajaxResult);
+ object1 = getJSONObject(result2);
+ code1 = object1.getStr("ResultCode");
+ if (code1.equals("0")) {
+ orderService.delHuoQuBlJysqdh(order.getCardId(),bldh);
+ }else {
+ return false;
+ }
}
}
}
@@ -904,6 +940,8 @@
code1 = object1.getStr("ResultCode");
if (code1.equals("0")) {
orderService.delHuoQuZlsqdh(order.getCardId(),bldh);
+ }else {
+ return false;
}
}
}
@@ -917,6 +955,8 @@
String code = object.getStr("ResultCode");
if(null !=code && code.equals("0")){
cfService.delCfByCardId(cfh);
+ }else {
+ return false;
}
}
}
--
Gitblit v1.8.0