diff --git a/src/main/java/com/emr/dao/Archive_MasterMapper.java b/src/main/java/com/emr/dao/Archive_MasterMapper.java index b26c0e9..546f32f 100644 --- a/src/main/java/com/emr/dao/Archive_MasterMapper.java +++ b/src/main/java/com/emr/dao/Archive_MasterMapper.java @@ -108,5 +108,5 @@ public interface Archive_MasterMapper { int insertCommonlyUsed(CommomVo commomVo); - Archive_Master selectCommonlyUsed(Archive_Master record); + List selectCommonlyUsed(Archive_Master record); } \ No newline at end of file diff --git a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java index 36201a0..affdb31 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -1229,7 +1229,11 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { String ids = master.getId(); String[] idList = ids.split(","); List archiveFlowRoles = flowRoleMapper.selectAll(); - Archive_Master archive_master_vos = archive_masterMapper.selectCommonlyUsed(master); + List archive_masterVos = archive_masterMapper.selectCommonlyUsed(master); + if(CollectionUtils.isEmpty(archive_masterVos)){ + return; + } + Archive_Master archive_master_vos = archive_masterVos.get(0); CommomVo commomVo=new CommomVo(); commomVo.setPatientId(archive_master_vos.getPatientId()); commomVo.setAdmissTimes(archive_master_vos.getVisitId());