导入修改

This commit is contained in:
zhangheng 2024-12-31 17:31:20 +08:00
parent b54fee7a77
commit 4c137c636e
2 changed files with 2 additions and 6 deletions

View File

@ -440,9 +440,7 @@ public class PatientInfoServiceImpl implements IPatientInfoService {
deptAliasVO.setSn(sn); deptAliasVO.setSn(sn);
deptAliasVO.setDeptAlias(patientInfoImport.getDeptAlias()); deptAliasVO.setDeptAlias(patientInfoImport.getDeptAlias());
deptAliasVOS.add(deptAliasVO); deptAliasVOS.add(deptAliasVO);
// patientInfoImportList为总数据,新增patient_info_import需要
//
// 20241209 注释掉没什么用用zyk 貌似用于下面重复判断
patientInfoImportList.add(patientInfoImport); patientInfoImportList.add(patientInfoImport);
} }
if (CollectionUtils.isEmpty(patientInfoImportList)) { if (CollectionUtils.isEmpty(patientInfoImportList)) {
@ -465,7 +463,6 @@ public class PatientInfoServiceImpl implements IPatientInfoService {
log.info("缓存表新增失败!"); log.info("缓存表新增失败!");
return AjaxResult.error("数据导入失败!"); return AjaxResult.error("数据导入失败!");
} }
//导入记录主表
//region 导入记录主表 //region 导入记录主表
PatientInfoImportMain patientInfoImportMain = new PatientInfoImportMain(); PatientInfoImportMain patientInfoImportMain = new PatientInfoImportMain();
patientInfoImportMain.setCreateBy(SecurityUtils.getUsername()); patientInfoImportMain.setCreateBy(SecurityUtils.getUsername());
@ -482,7 +479,6 @@ public class PatientInfoServiceImpl implements IPatientInfoService {
if (CollectionUtils.isNotEmpty(deptAliasVOS)) { if (CollectionUtils.isNotEmpty(deptAliasVOS)) {
return AjaxResult.error("科室名称不存在", patientInfoImportVO); return AjaxResult.error("科室名称不存在", patientInfoImportVO);
} else { } else {
//新增居民表
//region 新增居民表 //region 新增居民表
patientInfoImportList.forEach(item -> patientInfoImportList.forEach(item ->
{ {
@ -563,7 +559,6 @@ public class PatientInfoServiceImpl implements IPatientInfoService {
patientInfo.setPatientVisitRecordId(patientVisitRecord.getId()); patientInfo.setPatientVisitRecordId(patientVisitRecord.getId());
patientInfoMapper.updatePatientInfoSelective(patientInfo); patientInfoMapper.updatePatientInfoSelective(patientInfo);
} }
//endregion //endregion
} }
PatientInfoImportMain patientInfoImportMainSn = new PatientInfoImportMain(); PatientInfoImportMain patientInfoImportMainSn = new PatientInfoImportMain();

View File

@ -238,6 +238,7 @@
<select id="selectResidentInfoByPhoneList" resultType="com.xinelu.manage.domain.residentinfo.ResidentInfo"> <select id="selectResidentInfoByPhoneList" resultType="com.xinelu.manage.domain.residentinfo.ResidentInfo">
select select
id,
patient_name, patient_name,
patient_phone patient_phone
from resident_info from resident_info