From 4bac2f20a035916b8c4e274aba13a323b223aead Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Mon, 8 Aug 2016 15:37:49 +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

---
 .../com/lyms/platform/biz/service/PatientsService.java  |  2 ++
 .../java/com/lyms/platform/query/PatientsQuery.java     | 17 +++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
index 2b2024f..3ffa49c 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
@@ -101,6 +101,8 @@ public class PatientsService {
         patientsQuery.setLastMensesEnd(endDate);
         patientsQuery.setLastMensesStart(start);
         patientsQuery.setYn(YnEnums.YES.getId());
+        patientsQuery.setDueStatus(0);
+        patientsQuery.setType(1);
         List<Patients> patientses = iPatientDao.queryPatient(patientsQuery.convertToQuery());
         int batchSize = 200;
         if (CollectionUtils.isNotEmpty(patientses)) {
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 d50d109..62c69e3 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
@@ -29,6 +29,9 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
     private Boolean isNull;
 
     private Boolean isHighRisk;
+    //分娩状态 0未终止妊娠 1终止妊娠
+    private Integer dueStatus;
+
 
     /**
      * 产妇名称
@@ -43,6 +46,17 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
      * 产妇年龄
      */
     private Integer age;
+
+    public Integer getDueStatus() {
+        return dueStatus;
+    }
+
+    public void setDueStatus(Integer dueStatus) {
+        this.dueStatus = dueStatus;
+    }
+
+
+
     /**
      * 访视状态
      */
@@ -423,6 +437,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!=dueStatus){
+            condition=condition.and("dueStatus",dueStatus,MongoOper.IS);
+        }
         if( buildType!=-1){
             condition=condition.and("buildType",buildType,MongoOper.NE);
         }
-- 
1.8.3.1