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 de41c0f..37d8565 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
@@ -817,7 +817,7 @@ public class RiskReportFacade {
                     }
                     final List<String> organizations = currentUserHospPermissions.subList(i, end);
                     Callable callable = new AreaHighRiskCountExportTask(basicConfigService,usersService,patientsService,organizationService,
-                            riskLevelConfig,organizations,countRequest.getExportType(),this,countRequest);
+                            riskLevelConfig,organizations,this,countRequest);
                     Future f = commonThreadPool.submit(callable);
                     futures.add(f);
                 }
@@ -840,6 +840,24 @@ public class RiskReportFacade {
                 }
             }
 
+            if (countRequest.getExportType() < 3)
+            {
+                Collections.sort(datas, new Comparator<Map<String, Object>>() {
+                    @Override
+                    public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+
+                        Object value1 = o1.get("highRiskPatTotal");
+                        int num1 = Integer.parseInt(String.valueOf(value1));
+
+                        Object value2 = o1.get("highRiskPatTotal");
+                        int num2 = Integer.parseInt(String.valueOf(value2));
+
+                        return num1 == num2 ? 0 : (num1 > num2 ? 1 : -1);
+                    }
+                });
+            }
+
+
             OutputStream out = response.getOutputStream();
             Map<String, String> cnames = new LinkedHashMap<>();
             if (countRequest.getExportType() == 1)
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 d0fbf42..8f98ccf 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
@@ -35,7 +35,6 @@ public class AreaHighRiskCountExportTask implements Callable {
     private UsersService usersService;
     private OrganizationService organizationService;
     private BasicConfigService basicConfigService;
-    private  Integer exportType;
     private List<String> organizations;
 
     private List<BasicConfig> riskLevelConfig;
@@ -48,7 +47,6 @@ public class AreaHighRiskCountExportTask implements Callable {
                                        OrganizationService organizationService,
                                        List<BasicConfig> riskLevelConfig,
                                        List<String> organizations,
-                                       Integer exportType,
                                        RiskReportFacade riskReportFacade,
                                        RiskPatientsCountRequest countRequest)
     {
@@ -58,7 +56,6 @@ public class AreaHighRiskCountExportTask implements Callable {
         this.patientsService = patientsService;
         this.organizations = organizations;
         this.riskLevelConfig = riskLevelConfig;
-        this.exportType = exportType;
         this.riskReportFacade = riskReportFacade;
         this.countRequest = countRequest;
     }
@@ -86,13 +83,13 @@ public class AreaHighRiskCountExportTask implements Callable {
             if (CollectionUtils.isNotEmpty(riskLevelConfig)) {
                 for (BasicConfig config : riskLevelConfig) {
 
-                    if (exportType  == 1)
+                    if (countRequest.getExportType()  == 1)
                     {
                         data.put("cityName", city == null ? "" : city.getName());
                         data.put("areaName", area == null ? "" : area.getName());
                         data.put("streetName", street == null ? "" : street.getName());
                     }
-                    else if (exportType  == 2)
+                    else if (countRequest.getExportType()  == 2)
                     {
                         data.put("areaName", area == null ? "" : area.getName());
                         data.put("streetName", street == null ? "" : street.getName());
@@ -103,9 +100,11 @@ public class AreaHighRiskCountExportTask implements Callable {
                     int riskPatientCount = 0;
                     PatientsQuery query1 = riskReportFacade.getRequestQuery(countRequest);
                     query1.setHospitalId(String.valueOf(organization.getId()));
+                    //高危等级
+                    query1.setrLevel(config.getId());
 
 
-                    if (exportType == 3)
+                    if (countRequest.getExportType() == 3)
                     {
                         List<Patients> patientses = patientsService.queryPatient(query1);
                         if (CollectionUtils.isNotEmpty(patientses))
@@ -220,7 +219,7 @@ public class AreaHighRiskCountExportTask implements Callable {
                 }
             }
 
-            if (exportType < 3)
+            if (countRequest.getExportType() < 3)
             {
                 data.put("highRiskPatTotal", highRiskPatTotal);
                 datas.add(data);