From 5f1d1c462bbf49bc6a22b9e17b49733bcc1e0bc6 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 20 六月 2025 19:01:13 +0800
Subject: [PATCH] zjh20250620

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java |   12 ++++++------
 1 files changed, 6 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 53d0542..8285d91 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
@@ -2530,11 +2530,11 @@
         String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix");
         String isRequestLisAllzx = configService.selectConfigByKey("jcx_is_requestLisAllzx");
         if (mergeRequest.equals("Y")){
+            LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(TjSampling::getTjNum,tjOrder.getTjNumber());
+            List<TjSampling> list = tjSamplingService.list(wrapper);
             if (isRequestLisAllzx != null && isRequestLisAllzx.equals("Y")){
                 log.info("杩涘叆鍥綋鏍规嵁灏忛」鏍囨湰鍚堝苟鍙戦�佹柟娉�");
-                LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
-                wrapper.eq(TjSampling::getTjNum,tjOrder.getTjNumber());
-                List<TjSampling> list = tjSamplingService.list(wrapper);
                 if(null !=list && !list.isEmpty()){
                     List<String> strings = list.stream().map(TjSampling::getProId).collect(Collectors.toList());
                     LambdaQueryWrapper<TjProject> wrapper1 = new LambdaQueryWrapper<>();
@@ -2562,9 +2562,9 @@
 
             }else{
                 try {
-                    LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
-                    wrapper.eq(TjSampling::getTjNum,tjOrder.getTjNumber());
-                    List<TjSampling> list = tjSamplingService.list(wrapper);
+//                    LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
+//                    wrapper.eq(TjSampling::getTjNum,tjOrder.getTjNumber());
+//                    List<TjSampling> list = tjSamplingService.list(wrapper);
                     log.info("閲囨牱鏁版嵁 ->{}",JSONUtil.toJsonStr(list));
                     if (!list.isEmpty()) {
                         Map<String, List<TjSampling>> listMap = list.stream().collect(Collectors.groupingBy(TjSampling::getSpecimenTypeCode));

--
Gitblit v1.8.0