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 9950f8a..e09dd1c 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
@@ -206,8 +206,8 @@ public class PatientFacade {
             patientsQuery.setServiceType(Integer.valueOf(riskPatientsQueryRequest.getServiceType()));
         }
         patientsQuery.setrLevel(riskPatientsQueryRequest.getrLevel());
-        patientsQuery.setLastMensesStart(riskPatientsQueryRequest.capStart());
-        patientsQuery.setLastMensesEnd(riskPatientsQueryRequest.capEnd());
+        patientsQuery.setLastMensesStart(riskPatientsQueryRequest.capEnd());
+        patientsQuery.setLastMensesEnd(riskPatientsQueryRequest.capStart());
 
         if(null!= riskPatientsQueryRequest.getStartAge()){
             Date date = DateUtil.addYear(new Date(), -riskPatientsQueryRequest.getStartAge());
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 7cda15f..96a04f7 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
@@ -61,8 +61,8 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest {
 
     public Date capStart() {
         if (null != startDueWeek) {
-            start = NumberUtils.toInt(startDueWeek, 0);
-            Date endDate = DateUtil.addDay(new Date(), -(start*7));
+            int start = NumberUtils.toInt(startDueWeek, 0);
+            Date endDate = DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(start*7)+6);
             return endDate;
         }
         return null;
@@ -70,8 +70,8 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest {
 
     public Date capEnd() {
         if (null != endDueWeek) {
-            end = NumberUtils.toInt(endDueWeek, 0);
-            Date endDate = DateUtil.addDay(new Date(), -(end*7));
+            int  end = NumberUtils.toInt(endDueWeek, 0);
+            Date endDate = DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(end*7));
             return endDate;
         }
         return null;