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 77f9b29..aafd42c 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 @@ -72,16 +72,27 @@ public class BookbuildingFacade { patientsQuery.setType(1); patientsQuery.setHospitalId(yunRequest.getHospitalId()); - patientsQuery.setCardNo(yunRequest.getPregnantCertificateNum()); - if (yunRequest.getPregnantCertificateNum() != null) { + patientsQuery.setCardNo(yunRequest.getPregnantCertificateNum()); //判断该身份证号码是否有孕妇建档 在该医院 List patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); if (CollectionUtils.isNotEmpty(patients)) { br.setErrorcode(ErrorCodeConstants.DATA_EXIST); - br.setErrormsg("孕妇在该医院已建档"); + br.setErrormsg("该身份证在医院已经建档"); + return br; + } + } + if (yunRequest.getPregnantPhone() != null) + { + patientsQuery.setPhone(yunRequest.getPregnantPhone()); + //判断该手机号码在 孕期内有没有建档 + List patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); + if (CollectionUtils.isNotEmpty(patients)) + { + br.setErrorcode(ErrorCodeConstants.DATA_EXIST); + br.setErrormsg("该手机号码已经建档"); return br; } }