From 3fc2ccf502b185b14f0a4bd0a8a3183707634e75 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 11 Nov 2022 17:08:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=85=B1=E5=8D=AB=E7=94=9F=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/ResidentsArchiveFacade.java | 24 +--------------------- 1 file changed, 1 insertion(+), 23 deletions(-) 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 fc6bba3..67a9e8d 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 @@ -443,6 +443,7 @@ public class ResidentsArchiveFacade { //判断该证件号码是否在该医院建档 query.setCertificateNum(addRequest.getCertificateNum()); query.setCertificateTypeId(addRequest.getCertificateTypeId()); + query.setType(addRequest.getType()); List modelList = residentsArchiveService.queryResident(query); if (CollectionUtils.isNotEmpty(modelList)) { br.setErrorcode(ErrorCodeConstants.DATA_EXIST); @@ -451,29 +452,6 @@ public class ResidentsArchiveFacade { } } - if (StringUtils.isNotEmpty(addRequest.getPhone())) { - query.setCertificateTypeId(null); - query.setCertificateNum(null); - 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.setPhone(null); - //判断该就诊卡号是否在该医院建档 - query.setVcCardNo(addRequest.getVcCardNo()); - List modelList = residentsArchiveService.queryResident(query); - if (CollectionUtils.isNotEmpty(modelList)) { - br.setErrorcode(ErrorCodeConstants.DATA_EXIST); - br.setErrormsg("该就诊卡号在医院已经建档"); - return br; - } - } //保存建档数据 Date now = new Date(); -- 1.8.3.1