Merge remote-tracking branch 'origin/0418_小程序开发' into dev

This commit is contained in:
haown 2024-04-19 14:54:37 +08:00
commit e733c82e6e

View File

@ -143,11 +143,13 @@ public class PatientPreHospitalizationServiceImpl implements IPatientPreHospital
setPreHospitalizationInfoNull(patientInfo); setPreHospitalizationInfoNull(patientInfo);
} else { } else {
// 将患者信息更改为就诊信息 // 将患者信息更改为就诊信息
Long patientId = patientInfo.getId();
BeanUtils.copyBeanProp(patientInfo, patientVisitRecord); BeanUtils.copyBeanProp(patientInfo, patientVisitRecord);
patientInfo.setPatientVisitRecordId(patientVisitRecord.getId()); patientInfo.setPatientVisitRecordId(patientVisitRecord.getId());
patientVisitRecordService.setPatientType(patientInfo, patientVisitRecord); patientVisitRecordService.setPatientType(patientInfo, patientVisitRecord);
patientInfo.setId(patientId);
} }
patientInfoService.updatePatientInfo(patientInfo); patientInfoMapper.updatePatientInfo(patientInfo);
} }
return preHospitalizationMapper.deleteByIds(ids); return preHospitalizationMapper.deleteByIds(ids);
} }