xinyilu/PostDischargePatientManage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

导入修改

Browse Source
This commit is contained in:
zhangheng 2026-01-29 11:19:54 +08:00
parent 601e89dd79
commit 2e57804cc9
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java
View File

@ -440,13 +440,6 @@ public class PatientInfoServiceImpl implements IPatientInfoService {
continue; continue;
} }
} }
//同一手机号每月可最多拔打xx次
if (CollectionUtils.isNotEmpty(patientInfoList) && StringUtils.isNotBlank(aiobMaxCount) && org.apache.commons.lang3.StringUtils.isNotBlank(patientInfoImport.getPatientPhone())) {
List<PatientInfo> 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.setSn(sn);
patientInfoImport.setCreateBy(SecurityUtils.getUsername()); patientInfoImport.setCreateBy(SecurityUtils.getUsername());
@ -460,8 +453,6 @@ public class PatientInfoServiceImpl implements IPatientInfoService {
if (Objects.nonNull(equalsDepartment.getId())) { if (Objects.nonNull(equalsDepartment.getId())) {
patientInfoImport.setDepartmentId(equalsDepartment.getId()); patientInfoImport.setDepartmentId(equalsDepartment.getId());
patientInfoImport.setDepartmentName(equalsDepartment.getDepartmentName()); patientInfoImport.setDepartmentName(equalsDepartment.getDepartmentName());
patientInfoImportList.add(patientInfoImport);
continue;
//科室别名一致塞值 //科室别名一致塞值
} else { } else {
Department containsDepartment = departmentList.stream().filter(Objects::nonNull).filter(item -> StringUtils.isNotEmpty(item.getDepartmentAbbreviation()) && item.getDepartmentAbbreviation().contains(patientInfoImport.getDeptAlias())).findFirst().orElse(new Department()); 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)) { if (StringUtils.isNotBlank(s)) {
patientInfoImport.setDepartmentId(containsDepartment.getId()); patientInfoImport.setDepartmentId(containsDepartment.getId());
patientInfoImport.setDepartmentName(containsDepartment.getDepartmentName()); patientInfoImport.setDepartmentName(containsDepartment.getDepartmentName());
patientInfoImportList.add(patientInfoImport);
continue;
} }
} }
} }
} }
//同一手机号每月可最多拔打xx次
if (CollectionUtils.isNotEmpty(patientInfoList) && StringUtils.isNotBlank(aiobMaxCount) && Objects.nonNull(patientInfoImport.getDepartmentId())) {
List<PatientInfo> 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 deptAliasVO = new DeptAliasVO();
deptAliasVO.setSn(sn); deptAliasVO.setSn(sn);