From cf650ab7b1ea9ce26096c3bbd096e397e3a61bbc Mon Sep 17 00:00:00 2001 From: zengwh Date: Wed, 15 Jun 2022 09:13:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=97=85=E6=A1=88=E5=AE=A4?= =?UTF-8?q?=E8=B4=A8=E6=8E=A7=E7=BB=88=E5=AE=A1updateFile=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E6=9F=A5=E8=AF=A2master=E8=A1=A8=E5=A4=9A=E6=9D=A1?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/emr/dao/Archive_MasterMapper.java | 2 +- .../com/emr/service/ipml/Archive_MasterServiceImpl.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) 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());