|
|
|
@ -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,8 +2976,7 @@ 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(); |
|
|
|
@ -2988,7 +2985,6 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru |
|
|
|
|
sewageJobIdentificationMaterialQuantity = 0; |
|
|
|
|
} |
|
|
|
|
markersVOS.add(new MarkersVO("污水送检检材", sewageJobIdentificationMaterialQuantity, "", "SewageJobGet")); |
|
|
|
|
}, GlobalThreadPool.getInstance()); |
|
|
|
|
|
|
|
|
|
try { |
|
|
|
|
R<Integer> sampleQuantity = remoteHairJobService.getSampleQuantity(orgId, 2); |
|
|
|
|