From 9f2fdafa17032b347696fd5dd8b7f6cf3c6d5150 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 16 十月 2024 16:11:04 +0800
Subject: [PATCH] 修改客户采样查询条件 恢复确认采样代码

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java |   14 ++++++++------
 1 files changed, 8 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 ccad753..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();

--
Gitblit v1.8.0