diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java index 6f938976..3ea9cfd6 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java @@ -440,13 +440,6 @@ public class PatientInfoServiceImpl implements IPatientInfoService { continue; } } - //同一手机号每月可最多拔打xx次 - if (CollectionUtils.isNotEmpty(patientInfoList) && StringUtils.isNotBlank(aiobMaxCount) && org.apache.commons.lang3.StringUtils.isNotBlank(patientInfoImport.getPatientPhone())) { - List collect1 = patientInfoList.stream().filter(Objects::nonNull).filter(item -> patientInfoImport.getPatientPhone().equals(item.getPatientPhone()) && item.getCountPhone() >= Long.parseLong(aiobMaxCount)).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(collect1) || collect1.size() != 0) { - continue; - } - } //判断是否有科室名称或别名一致 patientInfoImport.setSn(sn); patientInfoImport.setCreateBy(SecurityUtils.getUsername()); @@ -460,8 +453,6 @@ public class PatientInfoServiceImpl implements IPatientInfoService { if (Objects.nonNull(equalsDepartment.getId())) { patientInfoImport.setDepartmentId(equalsDepartment.getId()); patientInfoImport.setDepartmentName(equalsDepartment.getDepartmentName()); - patientInfoImportList.add(patientInfoImport); - continue; //科室别名一致塞值 } else { Department containsDepartment = departmentList.stream().filter(Objects::nonNull).filter(item -> StringUtils.isNotEmpty(item.getDepartmentAbbreviation()) && item.getDepartmentAbbreviation().contains(patientInfoImport.getDeptAlias())).findFirst().orElse(new Department()); @@ -471,12 +462,23 @@ public class PatientInfoServiceImpl implements IPatientInfoService { if (StringUtils.isNotBlank(s)) { patientInfoImport.setDepartmentId(containsDepartment.getId()); patientInfoImport.setDepartmentName(containsDepartment.getDepartmentName()); - patientInfoImportList.add(patientInfoImport); - continue; } } } } + //同一手机号每月可最多拔打xx次 + if (CollectionUtils.isNotEmpty(patientInfoList) && StringUtils.isNotBlank(aiobMaxCount) && Objects.nonNull(patientInfoImport.getDepartmentId())) { + List collect1 = patientInfoList.stream().filter(Objects::nonNull) + .filter(item -> (Objects.equals(patientInfoImport.getDepartmentId(), item.getDepartmentId())) && patientInfoImport.getPatientPhone().equals(item.getPatientPhone()) && item.getCountPhone() >= Long.parseLong(aiobMaxCount)).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(collect1) || collect1.size() != 0) { + continue; + } else { + patientInfoImportList.add(patientInfoImport); + } + } + if (Objects.nonNull(patientInfoImport.getDepartmentId())) { + continue; + } //无科室名返回数据 DeptAliasVO deptAliasVO = new DeptAliasVO(); deptAliasVO.setSn(sn);