From f4531d81db11ee9fb63db7e716afac616cc9ff2e Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Mon, 24 Oct 2016 16:53:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=A7=E6=9C=BA=E5=8F=B7=20=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/query/PatientsQuery.java     | 28 ++++++++++++++++++++++
 .../platform/operate/web/facade/PatientFacade.java |  2 ++
 .../web/request/RiskPatientsQueryRequest.java      |  9 +++++++
 3 files changed, 39 insertions(+)

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 4035d8f..2959cbf 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
@@ -83,6 +83,15 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
     //本院最后一次产检时间
     private Date lastCTimeStart;
     private Date lastCTimeEnd;
+    private Integer postViewTimes;
+
+    public Integer getPostViewTimes() {
+        return postViewTimes;
+    }
+
+    public void setPostViewTimes(Integer postViewTimes) {
+        this.postViewTimes = postViewTimes;
+    }
 
     public Date getLastMensesNeEnd() {
         return lastMensesNeEnd;
@@ -670,6 +679,9 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
         if (-1 != type) {
             condition = condition.and("type", type, MongoOper.IS);
         }
+        if(null!=postViewTimes){
+            condition = condition.and("postViewTimes", postViewTimes, MongoOper.IS);
+        }
 
         if (null != lastRhTimeStart) {
             if (null != c1) {
@@ -678,6 +690,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
                 c1 = Criteria.where("lastRhTime").gte(lastRhTimeStart);
             }
         }
+
         if (null != lastRhTimeEnd) {
             if (null != c1) {
                 c1 = c1.lte(lastRhTimeEnd);
@@ -724,6 +737,21 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
             condition = condition.orCondition(new MongoCondition[]{mongoCondition, condition2});
         }
 
+        if(null != lastCTimeStart){
+            if (null != c1) {
+                c1 = c1.and("lastCTime").gte(lastCTimeStart);
+            } else {
+                c1 = Criteria.where("lastCTime").gte(lastCTimeStart);
+            }
+        }
+        if (null != lastCTimeEnd) {
+            if (c1 != null) {
+                c1 = c1.lte(lastCTimeEnd);
+            } else {
+                c1 = Criteria.where("lastCTime").lte(lastCTimeEnd);
+            }
+        }
+
         if (null != lastMensesStart) {
             if (null != c1) {
                 c1 = c1.and("lastMenses").gte(lastMensesStart);
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 8e3ecd4..50f3d30 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
@@ -212,6 +212,8 @@ public class PatientFacade {
         patientsQuery.setrFactor(riskPatientsQueryRequest.getrFacotr());
         Date currentDate = DateUtil.formatDate(new Date());
 
+        patientsQuery.setPostViewTimes(riskPatientsQueryRequest.getPostViewTimes());
+
         //服务类型
         if (null != riskPatientsQueryRequest.getServiceType() && ServiceTypeEnums.ALL_SERVICE.getId() != Integer.valueOf(riskPatientsQueryRequest.getServiceType())) {
             patientsQuery.setServiceType(Integer.valueOf(riskPatientsQueryRequest.getServiceType()));
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java
index e36e3ef..24fb503 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java
@@ -69,10 +69,19 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest {
     private String lastCTime;
     //预产期
     private String dueDate;
+    //复查次数
+    private Integer postViewTimes;
 
     // 0 高危孕妇 1 全部孕妇 2全部产妇
     private Integer queryType;
 
+    public Integer getPostViewTimes() {
+        return postViewTimes;
+    }
+
+    public void setPostViewTimes(Integer postViewTimes) {
+        this.postViewTimes = postViewTimes;
+    }
 
     public String getLastCTime() {
         return lastCTime;
-- 
1.8.3.1