From 4cbcb5d72ce5937a15ee955da07f9529980d443c Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Wed, 7 Sep 2016 11:20:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E7=97=85=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/MatDeliverFacade.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 78ba08e..d7b70de 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -497,6 +497,26 @@ public class MatDeliverFacade { Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, hospital, 1, false, null); //本院产妇 Patients patients3 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, hospital, 3, false, null); + PersonModelQuery personModelQuery=new PersonModelQuery(); + String pid = ""; + if(null!=patients1){ + pid=patients1.getPid(); + }else if (null!=patients){ + pid=patients.getPid(); + }else if(null!=patients3){ + pid= patients3.getPid(); + } + if(StringUtils.isNotEmpty(pid)){ + personModelQuery.setId(pid); + List personModels = personService.queryPersons(personModelQuery); + if(CollectionUtils.isNotEmpty(personModels)){ + PersonModel personModel= personModels.get(0); + if(personModel.getType()==1 &&null==patients){ + return new BaseResponse().setErrormsg("该孕妇还未在本院建档不能进行分娩").setErrorcode(ErrorCodeConstants.NO_DATA); + } + } + } + //本院产妇，并且本院没建档需要提醒补录记录 if (null != patients3 && null == patients) { patients = patients3; -- 1.8.3.1