From 8eaf86014216a5fa42188db54006691968b715dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=B5=B7=E8=88=AA?=
 <11918452+yang-haihang@user.noreply.gitee.com>
Date: Mon, 25 Nov 2024 15:43:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EntrustmentServiceImpl.java  | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java
index b068faa..396052c 100644
--- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java
+++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java
@@ -31,7 +31,6 @@ import digital.laboratory.platform.common.feign.RemoteWord2PDFService;
 import digital.laboratory.platform.common.mybatis.security.service.DLPUser;
 import digital.laboratory.platform.common.oss.service.OssFile;
 import digital.laboratory.platform.common.security.util.SecurityUtils;
-import digital.laboratory.platform.entrustment.config.GlobalThreadPool;
 import digital.laboratory.platform.entrustment.constant.EntrustMarkConstants;
 import digital.laboratory.platform.entrustment.convert.DrugLiteConvert;
 import digital.laboratory.platform.entrustment.dto.EntrustmentDTO;
@@ -79,7 +78,6 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 import java.util.function.Predicate;
@@ -2966,7 +2964,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
 
         Integer entrustmentIdentificationMaterialQuantity = 0;
         Integer acceptanceIdentificationMaterialQuantity = 0;
-
+        Integer sewageJobIdentificationMaterialQuantity = 0;
         Integer hairJobIdentificationMaterialQuantity = 0;
 
         //查询这个账户（机构）下的所有委托中的所有已受理检材的数量
@@ -2978,17 +2976,15 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
         }
 
         markersVOS.add(new MarkersVO("案件委托检材", entrustmentIdentificationMaterialQuantity, "", "EntrustmentCreate"));
-        CompletableFuture.runAsync(() -> {
-            Integer sewageJobIdentificationMaterialQuantity = 0;
-            R<Integer> imQuantity = remoteSewageJobService.getIMQuantity(dlpUser.getOrgId());
-            if (imQuantity.getCode() == CommonConstants.SUCCESS) {
-                sewageJobIdentificationMaterialQuantity = imQuantity.getData();
-            } else {
-                log.error("查询这个账户（机构）下面所送检且已受理的所有污水检材的数量 失败！失败原因：{}", imQuantity.getMsg());
-                sewageJobIdentificationMaterialQuantity = 0;
-            }
-            markersVOS.add(new MarkersVO("污水送检检材", sewageJobIdentificationMaterialQuantity, "", "SewageJobGet"));
-        }, GlobalThreadPool.getInstance());
+
+        R<Integer> imQuantity = remoteSewageJobService.getIMQuantity(dlpUser.getOrgId());
+        if (imQuantity.getCode() == CommonConstants.SUCCESS) {
+            sewageJobIdentificationMaterialQuantity = imQuantity.getData();
+        } else {
+            log.error("查询这个账户（机构）下面所送检且已受理的所有污水检材的数量 失败！失败原因：{}", imQuantity.getMsg());
+            sewageJobIdentificationMaterialQuantity = 0;
+        }
+        markersVOS.add(new MarkersVO("污水送检检材", sewageJobIdentificationMaterialQuantity, "", "SewageJobGet"));
 
         try {
             R<Integer> sampleQuantity = remoteHairJobService.getSampleQuantity(orgId, 2);