diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java index 47f0a69..26b7120 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java @@ -241,7 +241,6 @@ public class ResidentsArchiveFacade{ if (StringUtils.isNotEmpty(addRequest.getCertificateNum())) { //判断该证件号码是否在该医院建档 query.setCertificateNum(addRequest.getCertificateNum()); - query.setCertificateTypeId(addRequest.getCertificateTypeId()); List modelList = residentsArchiveService.queryResident(query); if (CollectionUtils.isNotEmpty(modelList)){ br.setErrorcode(ErrorCodeConstants.DATA_EXIST); @@ -250,6 +249,16 @@ public class ResidentsArchiveFacade{ } } + if (StringUtils.isNotEmpty(addRequest.getPhone())){ + query.setPhone(addRequest.getPhone()); + List modelList = residentsArchiveService.queryResident(query); + if (CollectionUtils.isNotEmpty(modelList)){ + br.setErrorcode(ErrorCodeConstants.DATA_EXIST); + br.setErrormsg("该手机号在医院已经建档"); + return br; + } + } + if (StringUtils.isNotEmpty(addRequest.getVcCardNo())){ query.setCertificateNum(null); //判断该就诊卡号是否在该医院建档