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

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

@@ -96,8 +96,7 @@ 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)
-            {
+            if (creaters != null && !creaters.contains(principleId) || creaters != null && creaters.size() > 1) {
                 throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL, "只能取消本人生成任务！");
             }
             int i = medCheckInfoFacade.getBaseMapper().deleteBatchCodes(medCheckWorkVO.getBehospitalCodeList());
@@ -228,14 +227,11 @@ public class MedCheckWorkFacade {
         if (res == null || ListUtil.isEmpty(res.getRecords())) {
             return res;
         }
-        List<String> behospitalCodes = res.getRecords().stream()
-                .map(CheckWorkDTO::getBehospitalCode).collect(Collectors.toList());
-        checkWorkPageVO.setBehospitalCodes(behospitalCodes);
-        List<CheckWorkDTO>  ageCheckWorkDTO = medCheckInfoFacade.getBaseMapper().getCheckWorkAgeByCodes(checkWorkPageVO);
+        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()))
-                {
+            ageCheckWorkDTO.stream().forEach(agecheckWork -> {
+                if (checkWorkDTO.getBehospitalCode().equals(agecheckWork.getBehospitalCode())) {
                     checkWorkDTO.setAgeYear(agecheckWork.getAgeYear());
                     checkWorkDTO.setAgeMon(agecheckWork.getAgeMon());
                     checkWorkDTO.setAgeDay(agecheckWork.getAgeDay());
@@ -255,8 +251,7 @@ public class MedCheckWorkFacade {
         //更新delFlag
         Long principleId = Long.valueOf(SysUserUtils.getCurrentPrincipleID());
         res.getRecords().stream().forEach(checkWorkDTO -> {
-            if(principleId.equals(checkWorkDTO.getJobCreator()))
-            {
+            if (principleId.equals(checkWorkDTO.getJobCreator())) {
                 checkWorkDTO.setDelFlag(true);
             }
         });

src/main/java/com/diagbot/mapper/MedCheckInfoMapper.java

@@ -32,7 +32,7 @@ public interface MedCheckInfoMapper extends BaseMapper<MedCheckInfo> {
     //核查任务列表
     IPage<CheckWorkDTO> getCheckWorkPage(CheckWorkPageVO checkWorkPageVO);
     //获取核查任务年龄
-    List<CheckWorkDTO> getCheckWorkAgeByCodes(CheckWorkPageVO checkWorkPageVO);
+    List<CheckWorkDTO> getCheckWorkAgeByCodes(Long hospitalId, List<String> behospitalCodes);
     //获取指定核查人员的核查任务
     List<CheckJobDTO> getCheckListByUserId(CheckJobVO checkJobVO);
     //取消核查任务