From 8934d28d671672f654864e1d713deb698da424fc Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Mon, 5 Sep 2016 10:00:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?=
 =?UTF-8?q?=E7=97=85=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/platform/query/PatientsQuery.java   |  2 ++
 .../platform/operate/web/facade/PatientFacade.java    | 11 +++++++++--
 .../operate/web/request/RiskPatientsQueryRequest.java | 19 ++++++++++++++++++-
 3 files changed, 29 insertions(+), 3 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 ee843f3..a2df85a 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
@@ -113,6 +113,8 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
      */
     private Date lastMensesEnd;
 
+
+
     /**
      * 地址
      */
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 73608f6..f3b0d6e 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
@@ -202,6 +202,7 @@ public class PatientFacade {
         patientsQuery.setLikeName(riskPatientsQueryRequest.getName());
         patientsQuery.sethScore(riskPatientsQueryRequest.gethScore());
         patientsQuery.setrFactor(riskPatientsQueryRequest.getrFactor());
+        Date currentDate = DateUtil.formatDate(new Date());
         if (null != riskPatientsQueryRequest.getServiceType()) {
             patientsQuery.setServiceType(Integer.valueOf(riskPatientsQueryRequest.getServiceType()));
         }
@@ -210,13 +211,19 @@ public class PatientFacade {
         patientsQuery.setLastMensesEnd(riskPatientsQueryRequest.capStart());
 
         if(null!= riskPatientsQueryRequest.getStartAge()){
-            Date date = DateUtil.addYear(new Date(), -riskPatientsQueryRequest.getStartAge());
+            Date date = DateUtil.addYear(currentDate, -riskPatientsQueryRequest.getStartAge());
             patientsQuery.setBirthEnd(date);
         }
         if(null!= riskPatientsQueryRequest.getEndAge()){
-            Date date = DateUtil.addYear(new Date(), -riskPatientsQueryRequest.getEndAge());
+            Date date = DateUtil.addYear(currentDate, -riskPatientsQueryRequest.getEndAge());
             patientsQuery.setBirthStart(date);
         }
+        if(null!=riskPatientsQueryRequest.getStartChsj()){
+            patientsQuery.setFmDateEnd(DateUtil.addDay(currentDate, -riskPatientsQueryRequest.getStartChsj()));
+        }
+        if(null!=riskPatientsQueryRequest.getEndChsj()){
+            patientsQuery.setFmDateStart(DateUtil.addDay(currentDate, -riskPatientsQueryRequest.getEndChsj()));
+        }
 
         patientsQuery.setLimit(riskPatientsQueryRequest.getLimit());
         patientsQuery.setPage(riskPatientsQueryRequest.getPage());
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 de2dc6a..9f3bb45 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
@@ -35,7 +35,8 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest {
     @FormParam
     private Integer startAge;
     private Integer endAge;
-
+    private Integer endChsj;
+    private Integer startChsj;
 
     //风险等级
     @FormParam
@@ -59,6 +60,22 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest {
     @FormParam
     private Integer expVip;
 
+    public Integer getEndChsj() {
+        return endChsj;
+    }
+
+    public void setEndChsj(Integer endChsj) {
+        this.endChsj = endChsj;
+    }
+
+    public Integer getStartChsj() {
+        return startChsj;
+    }
+
+    public void setStartChsj(Integer startChsj) {
+        this.startChsj = startChsj;
+    }
+
     public Date capStart() {
         if (null != startDueWeek) {
             int start = NumberUtils.toInt(startDueWeek, 0);
-- 
1.8.3.1