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 5fedb34..7278408 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 @@ -131,7 +131,8 @@ public class AntenatalExaminationFacade { private ITrackDownService trackDownService; @Autowired private TrackDownRecordService trackDownRecordService; - + @Autowired + private BreastFacade breastFacade; @Autowired private HosptialHighRiskFacade highRiskFacade; @@ -3408,12 +3409,26 @@ public class AntenatalExaminationFacade { if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getVcCardNo())) { patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, currentGroupHospital, 3, false, null, og.getbStatus() == 1); } + if("1".equals(queryRequest.getYcState())){ + try { + BaseObjectResponse baseResponse = (BaseObjectResponse)breastFacade.getPatient(queryRequest, userId); + if(baseResponse!=null && baseResponse.getData()!=null){ + patients = (Patients) baseResponse.getData(); + }else { + return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇还未在本院建档不能进行产检"); + } + } catch (Exception e) { + e.printStackTrace(); + } - //原来单机 - if (null != patients) { - return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇在系统中已分娩/已终止妊娠不能再进行产检,请重新建档"); + }else { + //原来单机 + 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("该孕妇还未在本院建档不能进行产检"); + } } 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 9e4a5b0..c3e0174 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 @@ -22,6 +22,8 @@ public class AntenatalExaminationQueryRequest { private String vcCardNo; private String patientId; + // 1孕妇产妇都可以查询,不传参数继续原理逻辑 + private String ycState; private String barCode; @@ -29,6 +31,14 @@ public class AntenatalExaminationQueryRequest { private String supplement; + public String getYcState() { + return ycState; + } + + public void setYcState(String ycState) { + this.ycState = ycState; + } + public String getSupplement() { return supplement; }