From bfe19e95df8193a99e008caeb1d69129f9efca8d Mon Sep 17 00:00:00 2001 From: qiaoyuewang Date: Tue, 8 Apr 2025 19:06:23 +0800 Subject: [PATCH] =?UTF-8?q?6:=E5=88=A4=E6=96=AD=E5=BB=BA=E5=BD=93=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E6=A1=A3=E6=A1=88=E5=8F=B7=E6=98=AF=E5=90=A6=E9=87=8D?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/BookbuildingFacade.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 10a9040..ad7244f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -301,11 +301,6 @@ public class BookbuildingFacade { br.setErrormsg("该高危专案档案号已存在"); return br; } - if(CollectionUtils.isNotEmpty(patients) && !(patients.get(0).getFileCode().length() >0)){ - br.setErrorcode(ErrorCodeConstants.DATA_EXIST); - br.setErrormsg("该档案号已存在"); - return br; - } if (yunRequest.getLastMenstrualPeriod() != null && !yunRequest.getLastMenstrualPeriod().equals("")) {//todowtt if (CollectionUtils.isNotEmpty(patients) && patients.get(0).getLastMenses().getTime() < DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()).getTime()) { br.setErrorcode(ErrorCodeConstants.DATA_EXIST); @@ -315,6 +310,19 @@ public class BookbuildingFacade { } } + if (StringUtils.isNotEmpty(yunRequest.getFileCode())) { + patientsQuery.setCardNo(null); + patientsQuery.setPhone(null); + patientsQuery.setFileCode(yunRequest.getFileCode()); + //判断该手机号码在 孕期内有没有建档 + List patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); + if(CollectionUtils.isNotEmpty(patients)){ + br.setErrorcode(ErrorCodeConstants.DATA_EXIST); + br.setErrormsg("该档案号已存在"); + return br; + } + + } //就诊卡号判断 // if (StringUtils.isNotEmpty(yunRequest.getVcCardNo())) { // patientsQuery.setCardNo(null); -- 1.8.3.1