From 879ba828e91f8df21c16d5ef453d0dbe062b21f7 Mon Sep 17 00:00:00 2001
From: litao <a15234804788@163.com>
Date: Wed, 12 Oct 2022 22:40:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=B8=8D=E5=BF=85=E8=A6=81?=
 =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lims/controller/EntrustController.java          | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java
index fbcbe42..e828d18 100644
--- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java
+++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java
@@ -517,7 +517,8 @@ public class EntrustController extends BladeController {
         List<Examine> list = examineService.list(lambdaQueryWrapper);
         if (CollectionUtils.isNotEmpty(list)) {
             for (Examine examine : list) {
-                if (examine.getExperieNum() != null && !"".equals(examine.getExperieNum())) {
+                // 2022年10月11日20:31:27 感觉没必要，而且影响前端数据展示
+//                if (examine.getExperieNum() != null && !"".equals(examine.getExperieNum())) {
                     ExamineItem examineItem = examineItemService.getById(examine.getExamineItemId());
                     if (examineItem != null) {
                         examine.setExamineItemName(examineItem.getName());
@@ -537,7 +538,7 @@ public class EntrustController extends BladeController {
                             examine.setExamineByName(user.getName());
                         }
                     }
-                }
+//                }
             }
             entrust.setExamines(list);
         }
@@ -568,7 +569,7 @@ public class EntrustController extends BladeController {
                     if (examines != null && examines.size() > 0) {
                         List<Examine> examineList = new ArrayList<>();
                         for (Examine examine : examines) {
-                            if (examine.getExperieNum() != null && !"".equals(examine.getExperieNum())) {
+//                            if (examine.getExperieNum() != null && !"".equals(examine.getExperieNum())) {
                                 ExamineItem examineItem = examineItemService.getById(examine.getExamineItemId());
                                 if (examineItem != null) {
                                     examine.setExamineItemName(examineItem.getName());
@@ -589,7 +590,7 @@ public class EntrustController extends BladeController {
                                     }
                                 }
                                 examineList.add(examine);
-                            }
+//                            }
                         }
                         eTask.setExamines(examineList);
                         if (eTask.getSimpleReceiver() != null && !eTask.getSimpleReceiver().equals("")) {
@@ -619,12 +620,12 @@ public class EntrustController extends BladeController {
                 taskBlueprint.setTaskIssuedBy(user1.getName());
             }
         }
-
+        // 待分样
         if ("1".equals(entrust.getEntrustStatus())) {
             map.put("entrust", entrust);
             return R.data(map);
         }
-        //待计划
+        // 待计划
         if ("2".equals(entrust.getEntrustStatus())) {
             map.put("entrust", entrust);
             map.put("simple", simpleList);