diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RiskReportController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RiskReportController.java
index 0b97415..34aa2c8 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RiskReportController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RiskReportController.java
@@ -63,17 +63,17 @@ public class RiskReportController extends BaseController {
      * @return
      */
     @RequestMapping(method = RequestMethod.GET, value = "/exportAreaHighRisk")
-//    @TokenRequired
+    @TokenRequired
     public void exportAreaHighRisk(@Valid RiskPatientsCountRequest riskPatientsCountRequest,
                                    HttpServletRequest request,
                                    HttpServletResponse response) {
-//        LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
-//        riskReportFacade.exportAreaHighRisk(riskPatientsCountRequest,
-//                loginState.getId(), response);
-//
-
+        LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
         riskReportFacade.exportAreaHighRisk(riskPatientsCountRequest,
-                1000000185, response);
+                loginState.getId(), response);
+
+
+//        riskReportFacade.exportAreaHighRisk(riskPatientsCountRequest,
+//                1000000185, response);
     }
 
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java
index 74b3ba3..9abe550 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java
@@ -246,8 +246,6 @@ public class RiskReportFacade {
 
         if (StringUtils.isNotEmpty(countRequest.getTimeStart()) && StringUtils.isNotEmpty(countRequest.getTimeEnd()))
         {
-            patientsQuery.setBookbuildingDateStart(DateUtil.parseYMD(countRequest.getTimeStart()));
-            patientsQuery.setBookbuildingDateEnd(DateUtil.parseYMD(countRequest.getTimeEnd()));
             times =  DateUtil.getRange(DateUtil.parseYMD(countRequest.getTimeStart()),
                     DateUtil.parseYMD(countRequest.getTimeEnd()));
         }
@@ -474,16 +472,6 @@ public class RiskReportFacade {
             }
             result.addAll(totalAllList);
         }
-//
-//        for (List<String> items : result)
-//        {
-//            for (String item : items)
-//            {
-//                System.out.print("  "+ item);
-//            }
-//            System.out.println();
-//        }
-
 
         //统计柱状图数据封装--------------------------------
 
@@ -693,12 +681,17 @@ public class RiskReportFacade {
      * @param countRequest
      */
 
-    private PatientsQuery getRequestQuery(RiskPatientsCountRequest countRequest) {
+    public PatientsQuery getRequestQuery(RiskPatientsCountRequest countRequest) {
 
         //孕妇基础查询对象
         PatientsQuery patientsQuery = new PatientsQuery();
         patientsQuery.setYn(YnEnums.YES.getId());
 
+        if (StringUtils.isNotEmpty(countRequest.getTimeStart()) && StringUtils.isNotEmpty(countRequest.getTimeEnd())) {
+            patientsQuery.setBookbuildingDateStart(DateUtil.parseYMD(countRequest.getTimeStart()));
+            patientsQuery.setBookbuildingDateEnd(DateUtil.parseYMD(countRequest.getTimeEnd()));
+        }
+
         Date currentDate = DateUtil.getYear();
 
         //0:全部 1:20岁一下 2:25-30 3:30-40 4:40岁以上
@@ -803,8 +796,7 @@ public class RiskReportFacade {
             {
                 countRequest.setExportType(3);
             }
-//            currentUserHospPermissions.clear();
-//            currentUserHospPermissions.add("216");
+
 
             BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
             basicConfigQuery.setYn(YnEnums.YES.getId());
@@ -823,7 +815,7 @@ public class RiskReportFacade {
                     }
                     final List<String> organizations = currentUserHospPermissions.subList(i, end);
                     Callable callable = new AreaHighRiskCountExportTask(basicConfigService,usersService,patientsService,organizationService,
-                            riskLevelConfig,organizations,countRequest.getExportType());
+                            riskLevelConfig,organizations,countRequest.getExportType(),this,countRequest);
                     Future f = commonThreadPool.submit(callable);
                     futures.add(f);
                 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/AreaHighRiskCountExportTask.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/AreaHighRiskCountExportTask.java
index a015855..d0fbf42 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/AreaHighRiskCountExportTask.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/AreaHighRiskCountExportTask.java
@@ -7,6 +7,8 @@ import com.lyms.platform.common.enums.YnEnums;
 import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.common.utils.ExceptionUtils;
 import com.lyms.platform.common.utils.StringUtils;
+import com.lyms.platform.operate.web.facade.RiskReportFacade;
+import com.lyms.platform.operate.web.request.RiskPatientsCountRequest;
 import com.lyms.platform.operate.web.result.RiskReportResult;
 import com.lyms.platform.permission.model.Organization;
 import com.lyms.platform.permission.model.OrganizationQuery;
@@ -37,6 +39,8 @@ public class AreaHighRiskCountExportTask implements Callable {
     private List<String> organizations;
 
     private List<BasicConfig> riskLevelConfig;
+    private RiskReportFacade riskReportFacade;
+    private RiskPatientsCountRequest countRequest;
 
     public AreaHighRiskCountExportTask(BasicConfigService basicConfigService,
                                        UsersService usersService,
@@ -44,7 +48,9 @@ public class AreaHighRiskCountExportTask implements Callable {
                                        OrganizationService organizationService,
                                        List<BasicConfig> riskLevelConfig,
                                        List<String> organizations,
-                                       Integer exportType)
+                                       Integer exportType,
+                                       RiskReportFacade riskReportFacade,
+                                       RiskPatientsCountRequest countRequest)
     {
         this.basicConfigService = basicConfigService;
         this.organizationService = organizationService;
@@ -53,6 +59,8 @@ public class AreaHighRiskCountExportTask implements Callable {
         this.organizations = organizations;
         this.riskLevelConfig = riskLevelConfig;
         this.exportType = exportType;
+        this.riskReportFacade = riskReportFacade;
+        this.countRequest = countRequest;
     }
     @Override
     public List<Map<String, Object>> call() throws Exception {
@@ -93,17 +101,9 @@ public class AreaHighRiskCountExportTask implements Callable {
                     data.put("hospitalName", organization.getName());
 
                     int riskPatientCount = 0;
-
-                    PatientsQuery query1 = new PatientsQuery();
+                    PatientsQuery query1 = riskReportFacade.getRequestQuery(countRequest);
                     query1.setHospitalId(String.valueOf(organization.getId()));
-                    query1.setYn(YnEnums.YES.getId());
-                    query1.setType(1);
-                    //高危等级
-                    query1.setrLevel(config.getId());
-                    List buildType = new ArrayList();
-                    buildType.add(0);
-                    buildType.add(2);
-                    query1.setBuildTypeList(buildType);
+
 
                     if (exportType == 3)
                     {