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 { - Integer sewageJobIdentificationMaterialQuantity = 0; - R 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 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 sampleQuantity = remoteHairJobService.getSampleQuantity(orgId, 2);