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 |   26 ++++++++++++++++++++------
 1 files changed, 20 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..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();
@@ -877,6 +879,8 @@
                                 String code = object.getStr("ResultCode");
                                 if(code.equals("1")){
                                     orderService.delHuoQuBlJcsqdh(order.getCardId(),bldh);
+                                }else {
+                                    return false;
                                 }
                             }
                         }
@@ -889,6 +893,8 @@
                                 String code= object.getStr("ResultCode");
                                 if(code.equals("1")){
                                     orderService.delHuoQuBlJysqdh(order.getCardId(),bldh);
+                                }else {
+                                    return false;
                                 }
                             }
                         }
@@ -903,6 +909,8 @@
                                 String code = object.getStr("ResultCode");
                                 if (code.equals("0")) {
                                     orderService.delHuoQuBlJcsqdh(order.getCardId(),bldh);
+                                }else {
+                                    return false;
                                 }
                             }
                         }
@@ -916,6 +924,8 @@
                                 code1 = object1.getStr("ResultCode");
                                 if (code1.equals("0")) {
                                     orderService.delHuoQuBlJysqdh(order.getCardId(),bldh);
+                                }else {
+                                    return false;
                                 }
                             }
                         }
@@ -930,6 +940,8 @@
                             code1 = object1.getStr("ResultCode");
                             if (code1.equals("0")) {
                                 orderService.delHuoQuZlsqdh(order.getCardId(),bldh);
+                            }else {
+                                return false;
                             }
                         }
                     }
@@ -943,6 +955,8 @@
                             String code = object.getStr("ResultCode");
                             if(null !=code && code.equals("0")){
                                 cfService.delCfByCardId(cfh);
+                            }else {
+                                return false;
                             }
                         }
                     }

--
Gitblit v1.8.0