From ddd2c4ba951efe32dd7d86b206ebedd644f0ee04 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Wed, 22 Jun 2016 18:58:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=A6=87=E5=A2=9E=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/AntenatalExaminationFacade.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) 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 f28e397..aa26ddc 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 @@ -77,7 +77,7 @@ public class AntenatalExaminationFacade { public BaseResponse addOneAnetExChu(AntExcAddRequest excAddRequest){ AntExChuModel antExChuModel = excAddRequest.convertToDataModel(); if(StringUtils.isNotEmpty(antExChuModel.getId()) &&StringUtils.isNotEmpty(antExChuModel.getParentId())){ - antenatalExaminationService.updateAntExChu(antExChuModel,antExChuModel.getId()); + antenatalExaminationService.updateAntExChu(antExChuModel, antExChuModel.getId()); }else{ antExChuModel.setYn(YnEnums.YES.getId()); antenatalExaminationService.addOneAntEx(antExChuModel); @@ -146,7 +146,9 @@ public class AntenatalExaminationFacade { public BaseResponse queryAntenatalExamination(AntenatalExaminationQueryRequest queryRequest){ //查询产妇数据 Patients patients = findOnePatient(queryRequest.getCardNo(),queryRequest.getVcCardNo()); - + if(null==patients){ + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有产妇信息"); + } AntexListResult antexListResult = new AntexListResult(); AntExChuQuery antExChuQuery=new AntExChuQuery(); antExChuQuery.setParentId(patients.getId()); @@ -184,6 +186,15 @@ public class AntenatalExaminationFacade { }else{ //查询初诊数据 AntexChuResult antexChuResult= new AntexChuResult(); + AntExChuQuery antExChuQuery=new AntExChuQuery(); + antExChuQuery.setYn(YnEnums.YES.getId()); + antExChuQuery.setId(antExQueryRequest.getId()); + List antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); + AntExChuModel antExChuModel=null; + if(CollectionUtils.isNotEmpty(antExChuModels)){ + antExChuModels.get(0); + } + antexChuResult.convertToResult(antExChuModel); object=antexChuResult; } -- 1.8.3.1