患者导入
This commit is contained in:
parent
5790a26e47
commit
5818cf14e2
@ -389,7 +389,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(patientInfoImport.getDepartmentName());
|
patientInfoImport.setDepartmentName(patientInfoImport.getDepartmentName());
|
||||||
patientInfoImportList.add(patientInfoImport);
|
|
||||||
} else {
|
} else {
|
||||||
DeptAliasVO deptAliasVO = new DeptAliasVO();
|
DeptAliasVO deptAliasVO = new DeptAliasVO();
|
||||||
deptAliasVO.setSn(sn);
|
deptAliasVO.setSn(sn);
|
||||||
@ -402,6 +401,7 @@ public class PatientInfoServiceImpl implements IPatientInfoService {
|
|||||||
deptAliasVO.setDeptAlias(patientInfoImport.getDeptAlias());
|
deptAliasVO.setDeptAlias(patientInfoImport.getDeptAlias());
|
||||||
deptAliasVOS.add(deptAliasVO);
|
deptAliasVOS.add(deptAliasVO);
|
||||||
}
|
}
|
||||||
|
patientInfoImportList.add(patientInfoImport);
|
||||||
}
|
}
|
||||||
//组装返回数据
|
//组装返回数据
|
||||||
List<PatientInfoImport> patientInfoImports = new ArrayList<>(patientInfoImportList);
|
List<PatientInfoImport> patientInfoImports = new ArrayList<>(patientInfoImportList);
|
||||||
@ -427,7 +427,7 @@ public class PatientInfoServiceImpl implements IPatientInfoService {
|
|||||||
patientInfoImportMainMapper.insertPatientInfoImportMain(patientInfoImportMain);
|
patientInfoImportMainMapper.insertPatientInfoImportMain(patientInfoImportMain);
|
||||||
//科室名称全符合新增患者表,否则返回数据
|
//科室名称全符合新增患者表,否则返回数据
|
||||||
if (CollectionUtils.isNotEmpty(deptAliasVOS)) {
|
if (CollectionUtils.isNotEmpty(deptAliasVOS)) {
|
||||||
return AjaxResult.success("科室名称不存在", patientInfoImportVO);
|
return AjaxResult.error("科室名称不存在", patientInfoImportVO);
|
||||||
} else {
|
} else {
|
||||||
//新增患者表
|
//新增患者表
|
||||||
int i = patientInfoMapper.insertPatientInfoList(patientInfoImportList);
|
int i = patientInfoMapper.insertPatientInfoList(patientInfoImportList);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user