diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 8e87c87..7f949dc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -2660,19 +2660,35 @@ public class AntenatalExaminationFacade { // patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospitalId, 1, false, null, false); } - if (null == patients) { - if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getVcCardNo())) { - patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, currentGroupHospital, 3, false, null, og.getbStatus() == 1); + if (StringUtils.isNotEmpty(queryRequest.getSupplement())) + { + if (null == patients) { + if (StringUtils.isNotEmpty(queryRequest.getCardNo()) || StringUtils.isNotEmpty(queryRequest.getVcCardNo())) { + patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, currentGroupHospital, 3, false, null, og.getbStatus() == 1); + } + + if (null == patients) { + return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("该孕妇在系统中没有档案,请新建档"); + } } + } + else + { + if (null == patients) { + if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getVcCardNo())) { + patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, currentGroupHospital, 3, false, null, og.getbStatus() == 1); + } - //原来单机 - if (null != patients) { - return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇在系统中已分娩/已终止妊娠不能再进行产检,请重新建档"); + //原来单机 + if (null != patients) { + return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇在系统中已分娩/已终止妊娠不能再进行产检,请重新建档"); + } + return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇还未在本院建档不能进行产检"); } - return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇还未在本院建档不能进行产检"); } + MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); matDeliverQuery.setPid(patients.getPid()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntenatalExaminationQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntenatalExaminationQueryRequest.java index fc8fccf..9e4a5b0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntenatalExaminationQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntenatalExaminationQueryRequest.java @@ -27,6 +27,16 @@ public class AntenatalExaminationQueryRequest { private String coupon; + private String supplement; + + public String getSupplement() { + return supplement; + } + + public void setSupplement(String supplement) { + this.supplement = supplement; + } + public String getCoupon() { return coupon; }