diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java
index 985644a..32201a9 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java
@@ -1,5 +1,6 @@
 package com.lyms.platform.operate.web;
 
+import com.lyms.platform.common.utils.DateUtil;
 import net.sourceforge.pinyin4j.PinyinHelper;
 import org.apache.log4j.Logger;
 
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 bc0579e..0275cd1 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
@@ -376,11 +376,13 @@ public class PatientFacade {
         patientsQuery.setCityId(riskPatientsQueryRequest.getCityRegisterId());
         patientsQuery.setStreetId(riskPatientsQueryRequest.getStreetRegisterId());
         List<String> hospitalList = null;
+        List<String> fmHospitalList = null;
         //区域范围内孕妇
         if (isRegion) {
             patientsQuery.setExtEnable(false);
             //王平说的  必须要给区域医院权限，不然他就是蠢逼 201611124  16:41
             hospitalList = new ArrayList<>();
+            fmHospitalList = new ArrayList<>();
             String hospital = autoMatchFacade.getHospitalId(userId);
             if (null != hospital) {
                 hospitalList.add(hospital);
@@ -398,7 +400,6 @@ public class PatientFacade {
                     }
                 }
             }
-
             if (StringUtils.isNotEmpty(riskPatientsQueryRequest.gethId())) {
                 List<String> orgId = new ArrayList<>();
                 orgId.add(riskPatientsQueryRequest.gethId());
@@ -426,11 +427,36 @@ public class PatientFacade {
             }
             patientsQuery.setHospitalList(hospitalList);
 
-            if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(riskPatientsQueryRequest.getCprovinceId()))
+
+            fmHospitalList.addAll(hospitalList);
+
+            if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(riskPatientsQueryRequest.getFprovinceId())) {
+                OrganizationQuery organizationQuery = new OrganizationQuery();
+                organizationQuery.setYn(YnEnums.YES.getId());
+                organizationQuery.setProvinceId(riskPatientsQueryRequest.getCprovinceId());
+                if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(riskPatientsQueryRequest.getFcityId())) {
+                    organizationQuery.setCityId(riskPatientsQueryRequest.getCcityId());
+                    if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(riskPatientsQueryRequest.getFareaId())) {
+                        organizationQuery.setAreaId(riskPatientsQueryRequest.getCareaId());
+                    }
+                }
+                List<String> orgId = new ArrayList<>();
+                List<Organization> organizations = organizationService.queryOrganization(organizationQuery);
+                if (CollectionUtils.isNotEmpty(organizations)) {
+                    for (Organization org : organizations) {
+                        if (null != org.getId()) {
+                            orgId.add(org.getId() + "");
+                        }
+                    }
+                }
+                fmHospitalList.retainAll(orgId);
+            }
+            if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(riskPatientsQueryRequest.getFprovinceId()))
             {
-                patientsQuery.setFmHospitalList(hospitalList);
+                patientsQuery.setFmHospitalList(fmHospitalList);
             }
 
+
         } else {
             String hospital = autoMatchFacade.getHospitalId(userId);
             patientsQuery.setHospitalId(hospital);
@@ -463,13 +489,13 @@ public class PatientFacade {
 
         if (riskPatientsQueryRequest.getPostViewDaysStart() != null)
         {
-            Date start = DateUtil.addDay(new Date(),-riskPatientsQueryRequest.getPostViewDaysStart()+1);
+            Date start = DateUtil.addDay(new Date(),-riskPatientsQueryRequest.getPostViewDaysStart());
             patientsQuery.setFmDateEnd(start);
         }
 
         if (riskPatientsQueryRequest.getPostViewDaysEnd() != null)
         {
-            Date end = DateUtil.addDay(new Date(),-riskPatientsQueryRequest.getPostViewDaysEnd());
+            Date end = DateUtil.addDay(new Date(),-riskPatientsQueryRequest.getPostViewDaysEnd()-1);
             patientsQuery.setFmDateStart(end);
         }
 
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 400411a..d8afe90 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
@@ -100,6 +100,13 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest {
     private String cprovinceId;
     private String ccityId;
     private String careaId;
+
+
+    //分娩医院
+    private String fprovinceId;
+    private String fcityId;
+    private String fareaId;
+
     // 医院id
     private String hId;
 
@@ -124,6 +131,30 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest {
     //分娩医院
     private String fmHospital;
 
+    public String getFprovinceId() {
+        return fprovinceId;
+    }
+
+    public void setFprovinceId(String fprovinceId) {
+        this.fprovinceId = fprovinceId;
+    }
+
+    public String getFcityId() {
+        return fcityId;
+    }
+
+    public void setFcityId(String fcityId) {
+        this.fcityId = fcityId;
+    }
+
+    public String getFareaId() {
+        return fareaId;
+    }
+
+    public void setFareaId(String fareaId) {
+        this.fareaId = fareaId;
+    }
+
     public Integer getPostViewDaysStart() {
         return postViewDaysStart;
     }