From ceb04fd2ff9e95da27a16db27489a69d3651e119 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Thu, 7 Sep 2017 15:16:17 +0800
Subject: [PATCH] update code

---
 .../com/lyms/platform/query/PatientsQuery.java     | 37 +++++++++++++++++++
 .../platform/operate/web/facade/PatientFacade.java | 17 +++++++++
 .../web/request/RiskPatientsQueryRequest.java      | 41 ++++++++++++++++++++++
 3 files changed, 95 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 975d1ac..2f5ca40 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
@@ -485,6 +485,27 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
     // 是否自动分娩
     private Integer isAutoFm = -1;
 
+
+    //复查次数
+    private Integer postViewTimesStart;
+    private Integer postViewTimesEnd;
+
+    public Integer getPostViewTimesStart() {
+        return postViewTimesStart;
+    }
+
+    public void setPostViewTimesStart(Integer postViewTimesStart) {
+        this.postViewTimesStart = postViewTimesStart;
+    }
+
+    public Integer getPostViewTimesEnd() {
+        return postViewTimesEnd;
+    }
+
+    public void setPostViewTimesEnd(Integer postViewTimesEnd) {
+        this.postViewTimesEnd = postViewTimesEnd;
+    }
+
     public List<String> getVcCardNos() {
         return vcCardNos;
     }
@@ -1277,6 +1298,22 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
             }
         }
 
+        if (null != postViewTimesStart) {
+            if (null != c1) {
+                c1 = c1.and("postViewTimes").gte(postViewTimesStart);
+            } else {
+                c1 = Criteria.where("postViewTimes").gte(postViewTimesStart);
+            }
+        }
+
+        if (null != postViewTimesEnd) {
+            if (null != c1) {
+                c1 = c1.lte(postViewTimesEnd);
+            } else {
+                c1 = Criteria.where("postViewTimes").lte(postViewTimesEnd);
+            }
+        }
+
         if (null != lastRhTimeStart) {
             if (null != c1) {
                 c1 = c1.and("lastRhTime").gte(lastRhTimeStart);
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 2053591..b26e03d 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
@@ -451,6 +451,23 @@ public class PatientFacade {
 
         patientsQuery.setQueryNo(riskPatientsQueryRequest.getQueryNo());
 
+
+        patientsQuery.setPostViewTimesStart(riskPatientsQueryRequest.getPostViewTimesStart());
+        patientsQuery.setPostViewTimesEnd(riskPatientsQueryRequest.getPostViewTimesEnd());
+
+        if (riskPatientsQueryRequest.getPostViewDaysStart() != null)
+        {
+            Date start = DateUtil.addDay(new Date(),-riskPatientsQueryRequest.getPostViewDaysStart());
+            patientsQuery.setFmDateEnd(start);
+        }
+
+        if (riskPatientsQueryRequest.getPostViewDaysEnd() != null)
+        {
+            Date end = DateUtil.addDay(new Date(),-riskPatientsQueryRequest.getPostViewDaysEnd());
+            patientsQuery.setFmDateStart(end);
+        }
+
+
         return patientsQuery;
     }
 
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 225c4c0..400411a 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
@@ -71,6 +71,15 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest {
     //复查次数
     private Integer postViewTimes;
 
+    //复查次数
+    private Integer postViewTimesStart;
+    private Integer postViewTimesEnd;
+
+
+    //产后天数
+    private Integer postViewDaysStart;
+    private Integer postViewDaysEnd;
+
     // 0 高危孕妇 1 全部孕妇 2全部产妇
     private Integer queryType;
 
@@ -115,6 +124,38 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest {
     //分娩医院
     private String fmHospital;
 
+    public Integer getPostViewDaysStart() {
+        return postViewDaysStart;
+    }
+
+    public void setPostViewDaysStart(Integer postViewDaysStart) {
+        this.postViewDaysStart = postViewDaysStart;
+    }
+
+    public Integer getPostViewDaysEnd() {
+        return postViewDaysEnd;
+    }
+
+    public void setPostViewDaysEnd(Integer postViewDaysEnd) {
+        this.postViewDaysEnd = postViewDaysEnd;
+    }
+
+    public Integer getPostViewTimesStart() {
+        return postViewTimesStart;
+    }
+
+    public void setPostViewTimesStart(Integer postViewTimesStart) {
+        this.postViewTimesStart = postViewTimesStart;
+    }
+
+    public Integer getPostViewTimesEnd() {
+        return postViewTimesEnd;
+    }
+
+    public void setPostViewTimesEnd(Integer postViewTimesEnd) {
+        this.postViewTimesEnd = postViewTimesEnd;
+    }
+
     public String getFmHospital() {
         return fmHospital;
     }
-- 
1.8.3.1