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 08f33f9..ce46a2e 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,11 @@ public class BookbuildingFacade { br.setErrormsg("该高危专案档案号已存在"); return br; } - if(CollectionUtils.isNotEmpty(patients) && patients.get(0).getFileCode()!=null){ + /*if(CollectionUtils.isNotEmpty(patients) && patients.get(0).getFileCode()!=null){ 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); @@ -314,7 +314,10 @@ public class BookbuildingFacade { } } } - /*if (StringUtils.isNotEmpty(yunRequest.getFileCode())) { + if (StringUtils.isNotEmpty(yunRequest.getFileCode())) { + System.out.println("检查档案号"); + System.out.println("检查档案号"); + System.out.println("检查档案号"); patientsQuery.setCardNo(null); patientsQuery.setPhone(null); patientsQuery.setFileCode(yunRequest.getFileCode()); @@ -322,11 +325,14 @@ public class BookbuildingFacade { List patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); if(CollectionUtils.isNotEmpty(patients)){ br.setErrorcode(ErrorCodeConstants.DATA_EXIST); + System.out.println("检查档案号完毕"); + System.out.println("检查档案号完毕"); + System.out.println("检查档案号完毕"); br.setErrormsg("该档案号已存在"); return br; } - }*/ + } //就诊卡号判断 // if (StringUtils.isNotEmpty(yunRequest.getVcCardNo())) { // patientsQuery.setCardNo(null);