diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 59b2301..65a220c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -268,6 +268,17 @@ public class BabyBookbuildingFacade { br.setErrormsg("儿童就诊卡号在该医院已经建档"); return br; } + + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setVcCardNo(request.getVcCardNo()); + patientsQuery.setHospitalId(request.getHospitalId()); + List patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); + if (CollectionUtils.isNotEmpty(patients)) + { + br.setErrorcode(ErrorCodeConstants.DATA_EXIST); + br.setErrormsg("该就诊卡号在该医院已经建档"); + return br; + } } Patients patients = null; 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 5127e51..a16da33 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 @@ -117,8 +117,6 @@ public class BookbuildingFacade { if (StringUtils.isNotEmpty(yunRequest.getVcCardNo())) { patientsQuery.setCardNo(null); - patientsQuery.setBuildTypeEq(null); - patientsQuery.setDueStatus(null); patientsQuery.setPhone(null); patientsQuery.setVcCardNo(yunRequest.getVcCardNo()); patientsQuery.setHospitalId(yunRequest.getHospitalId()); @@ -390,8 +388,6 @@ public class BookbuildingFacade { if (StringUtils.isNotEmpty(yunRequest.getVcCardNo())) { patientsQuery.setCardNo(null); - patientsQuery.setBuildTypeEq(null); - patientsQuery.setDueStatus(null); patientsQuery.setPhone(null); patientsQuery.setVcCardNo(yunRequest.getVcCardNo()); patientsQuery.setHospitalId(yunRequest.getHospitalId());