生成核查任务列表总数问题修改

src/main/java/com/diagbot/facade/MedCheckWorkFacade.java

@@ -34,6 +34,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -97,14 +98,10 @@ public class MedCheckWorkFacade {
 
             //创建用户集合
             Set<Long> creaters = list.stream().map(MedCheckInfo::getJobCreator).collect(Collectors.toSet());
-            if (creaters != null && !creaters.contains(principleId) || creaters != null && creaters.size() > 1) {
-                throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL, "只能取消本人生成任务！");
-            if(creaters!=null)
-            {
+            if (creaters != null) {
                 //移除当前用户如果还有其他用户
                 creaters.remove(principleId);
-                if(creaters.size()>0)
-                {
+                if (creaters.size() > 0) {
                     throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL, "无法取消他人生成任务！");
                 }
             }
@@ -237,15 +234,13 @@ public class MedCheckWorkFacade {
             return res;
         }
         List<String> behospitalCodes = res.getRecords().stream().map(CheckWorkDTO::getBehospitalCode).collect(Collectors.toList());
-        List<CheckWorkDTO> ageCheckWorkDTO = medCheckInfoFacade.getBaseMapper().getCheckWorkAgeByCodes(checkWorkPageVO.getHospitalId(), behospitalCodes);
-        res.getRecords().stream().forEach(checkWorkDTO -> {
-            ageCheckWorkDTO.stream().forEach(agecheckWork -> {
-                if (checkWorkDTO.getBehospitalCode().equals(agecheckWork.getBehospitalCode())) {
-                    checkWorkDTO.setAgeYear(agecheckWork.getAgeYear());
-                    checkWorkDTO.setAgeMon(agecheckWork.getAgeMon());
-                    checkWorkDTO.setAgeDay(agecheckWork.getAgeDay());
-                }
-            });
+        Map<String, CheckWorkDTO> ageMap = medCheckInfoFacade.getBaseMapper().getCheckWorkAgeByCodes(checkWorkPageVO.getHospitalId(), behospitalCodes).stream().collect(Collectors.toMap(i -> i.getBehospitalCode(), i -> i));
+        res.getRecords().stream().forEach(i -> {
+            if (ageMap.get(i.getBehospitalCode()) != null) {
+                i.setAgeYear(ageMap.get(i.getBehospitalCode()).getAgeYear());
+                i.setAgeMon(ageMap.get(i.getBehospitalCode()).getAgeMon());
+                i.setAgeDay(ageMap.get(i.getBehospitalCode()).getAgeDay());
+            }
         });
         res.getRecords().forEach(i -> {
             String age = "";