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);