From f195a88ec9fe107be25a0a44ce4f66b2008d0495 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 8 Aug 2016 08:42:22 +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 --- .../main/java/com/lyms/platform/query/PatientsQuery.java | 13 +++++++++++++ .../operate/web/facade/AntenatalExaminationFacade.java | 2 +- .../com/lyms/platform/operate/web/facade/PatientFacade.java | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) 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 b39c002..8f17fb8 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 @@ -147,6 +147,16 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private String hcertificateNum; + private String buildType; + + public String getBuildType() { + return buildType; + } + + public void setBuildType(String buildType) { + this.buildType = buildType; + } + public String getHcertificateNum() { return hcertificateNum; } @@ -399,6 +409,9 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { MongoCondition con = MongoCondition.newInstance("areaPostRestId", areaIdOrRestId, MongoOper.IS); condition = condition.orCondition(new MongoCondition[]{con1, con}); } + if(null!=buildType){ + condition=condition.and("buildType",buildType,MongoOper.NE); + } if (visitstatus != -1) { condition = condition.and("isVisit", visitstatus, MongoOper.IS); } 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 c8c6fa5..23b39e2 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 @@ -259,7 +259,7 @@ public class AntenatalExaminationFacade { } } PostReviewQuery postReviewQuery = new PostReviewQuery(); - ; + postReviewQuery.setYn(YnEnums.YES.getId()); if (StringUtils.isNotEmpty(dueDate)) { Date date = DateUtil.parseYMD(dueDate); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 6964db5..5052ce9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -209,6 +209,7 @@ public class PatientFacade { patientsQuery.setIsHighRisk(isHighRisk); patientsQuery.setServiceStatus(riskPatientsQueryRequest.getServiceStatus()); patientsQuery.setYn(YnEnums.YES.getId()); + patientsQuery.setBuildType("1"); //查询符合条件的孕妇 List patientses = patientsService.queryPatient(patientsQuery); List data = new ArrayList<>(); -- 1.8.3.1