From 958757105d1c27e54bcebd044ec2e8c740fc5301 Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Tue, 15 Jan 2019 09:17:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A8=81=E6=B5=B7=E4=BA=A7=E5=90=8E=E8=A7=82?= =?UTF-8?q?=E5=AF=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/PostpartumRecordsFacade.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumRecordsFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumRecordsFacade.java index 53bbf18..0857b90 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumRecordsFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumRecordsFacade.java @@ -87,9 +87,18 @@ public class PostpartumRecordsFacade { else if(StringUtils.isNotEmpty(prQueryRequest.getVcCardNo())){ patientsQuery.setVcCardNo(prQueryRequest.getVcCardNo()); }else if(StringUtils.isNotEmpty(prQueryRequest.getId())){ - prQuery.setId(prQueryRequest.getId()); + MatDeliverQuery matDeliverQuery1 = new MatDeliverQuery(); + matDeliverQuery1.setId(prQueryRequest.getId()); + matDeliverQuery1.setYn(YnEnums.YES.getId()); + List mdList1 = matDeliverService.query(matDeliverQuery1); + if(CollectionUtils.isNotEmpty(mdList1)){ + patientsQuery.setId(mdList1.get(0).getParentId()); + } + /*prQuery.setId(prQueryRequest.getId()); prQuery.setIsDelete("1"); - prList = postpartumRecordsService.getPostpartumRecordsQuery(prQuery); + prList = postpartumRecordsService.getPostpartumRecordsQuery(prQuery);*/ + }else{ + return new BaseObjectResponse().setErrormsg("参数传入错误！").setErrorcode(ErrorCodeConstants.PARAMETER_ERROR); } //patientsQuery.setHospitalId(hospital); //查询孕妇 @@ -107,7 +116,7 @@ public class PostpartumRecordsFacade { prQuery.setParentId(parentId); prQuery.setIsDelete("1"); prQuery.setId(null); - //prQuery.setHospitalId(hospital); + prQuery.setHospitalId(hospital); if(CollectionUtils.isEmpty(prList)){ prList = postpartumRecordsService.getPostpartumRecordsQuery(prQuery); } -- 1.8.3.1