From d2aa2be0f5769b0dc04c31ca93c98cc1f39f35fd Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 2 Aug 2016 17:13:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=A6=87=E5=88=86=E5=A8=A9=E5=90=8E?= =?UTF-8?q?=20=E5=8F=98=E6=88=90=E4=BA=A7=E5=A6=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/lyms/platform/query/PatientsQuery.java | 4 ++-- .../platform/operate/web/facade/AntenatalExaminationFacade.java | 7 ++++--- .../com/lyms/platform/operate/web/facade/MatDeliverFacade.java | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index d0538c0..b39c002 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -219,11 +219,11 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { this.serviceStatus = serviceStatus; } - public int getType() { + public Integer getType() { return type; } - public void setType(int type) { + public void setType(Integer type) { this.type = type; } 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 11af93b..d8137dc 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 @@ -358,7 +358,7 @@ public class AntenatalExaminationFacade { * @param vcCardNo * @return */ - public Patients findOnePatient(String cardNo, String vcCardNo, String id, String hospitalId) { + public Patients findOnePatient(String cardNo, String vcCardNo, String id, String hospitalId,Integer type) { PatientsQuery patientsQuery = new PatientsQuery(); if (StringUtils.isNotEmpty(cardNo)) { patientsQuery.setCardNo(cardNo); @@ -367,6 +367,7 @@ public class AntenatalExaminationFacade { } else if (StringUtils.isNotEmpty(id)) { patientsQuery.setId(id); } + patientsQuery.setType(type); patientsQuery.setHospitalId(hospitalId); patientsQuery.setYn(YnEnums.YES.getId()); Patients patients = null; @@ -437,8 +438,8 @@ public class AntenatalExaminationFacade { hospital = list1.get(0) + ""; } //查询产妇数据 - patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospital); - patients1 = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, null); + patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospital,1); + patients1 = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, null,1); } if (null == patients) { 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 9d7eb5f..21d4995 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 @@ -251,7 +251,7 @@ public class MatDeliverFacade { hospital= list1.get(0) + ""; } //获取 - Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null,hospital); + Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null,hospital,3); if (null == patients) { return new BaseResponse().setErrormsg("没有相关的产妇记录").setErrorcode(ErrorCodeConstants.BUSINESS_ERROR); } -- 1.8.3.1