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 ae259a4..e47ac69 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 @@ -265,20 +265,20 @@ public class BookbuildingFacade { } //就诊卡号判断 - if (StringUtils.isNotEmpty(yunRequest.getVcCardNo())) { - patientsQuery.setCardNo(null); - patientsQuery.setPhone(null); - patientsQuery.setVcCardNo(yunRequest.getVcCardNo()); - patientsQuery.setHospitalId(yunRequest.getHospitalId()); - List patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); - 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); - br.setErrormsg("该就诊卡号在该医院已经建档"); - return br; - } - } - } +// if (StringUtils.isNotEmpty(yunRequest.getVcCardNo())) { +// patientsQuery.setCardNo(null); +// patientsQuery.setPhone(null); +// patientsQuery.setVcCardNo(yunRequest.getVcCardNo()); +// patientsQuery.setHospitalId(yunRequest.getHospitalId()); +// List patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); +// 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); +// br.setErrormsg("该就诊卡号在该医院已经建档"); +// return br; +// } +// } +// } Integer type = 1; //1孕妇 2儿童 3产妇 //建档类型 0 未分娩建档 1儿童建档时建档 2 自动分娩类型 3 转诊自动建档 @@ -1154,22 +1154,22 @@ public class BookbuildingFacade { } } - if (pat != null && StringUtils.isNotEmpty(pat.getVcCardNo()) && !pat.getVcCardNo().equals(yunRequest.getVcCardNo())) { - - //就诊卡号判断 - if (StringUtils.isNotEmpty(yunRequest.getVcCardNo())) { - patientsQuery.setCardNo(null); - patientsQuery.setPhone(null); - patientsQuery.setVcCardNo(yunRequest.getVcCardNo()); - patientsQuery.setHospitalId(yunRequest.getHospitalId()); - patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); - if (CollectionUtils.isNotEmpty(patients)) { - br.setErrorcode(ErrorCodeConstants.DATA_EXIST); - br.setErrormsg("该就诊卡号在该医院已经建档"); - return br; - } - } - } +// if (pat != null && StringUtils.isNotEmpty(pat.getVcCardNo()) && !pat.getVcCardNo().equals(yunRequest.getVcCardNo())) { +// +// //就诊卡号判断 +// if (StringUtils.isNotEmpty(yunRequest.getVcCardNo())) { +// patientsQuery.setCardNo(null); +// patientsQuery.setPhone(null); +// patientsQuery.setVcCardNo(yunRequest.getVcCardNo()); +// patientsQuery.setHospitalId(yunRequest.getHospitalId()); +// patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); +// if (CollectionUtils.isNotEmpty(patients)) { +// br.setErrorcode(ErrorCodeConstants.DATA_EXIST); +// br.setErrormsg("该就诊卡号在该医院已经建档"); +// return br; +// } +// } +// } } }