diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
index c651548..6700af2 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
@@ -1158,61 +1158,55 @@ public class SieveFacade {
         //图标数据
         List<Map<String, Object>> series = new LinkedList<>();
 
-        SieveQuery sieveQuery = new SieveQuery();
-        sieveQuery.setHospitalIds(currentUserHospPermissions);
-        sieveQuery.setYn(YnEnums.YES.getId());
-        sieveQuery.setStatus(3);
-        if (dates != null) {
-            sieveQuery.setResultTimeStart(DateUtil.parseYMD(dates[0]));
-            if (dates.length == 2) {
-                sieveQuery.setResultTimeEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59"));
-            }
-        }
-
-        int sieveFinishCount = sieveService.queryListCount(sieveQuery);
-        List<String> csItems = new ArrayList<>();
-        csItems.add(String.valueOf(sieveFinishCount));
-        Map<String, Object> map = new HashMap();
-        map.put("name", "产筛人数");
-        map.put("type", "bar");
-        map.put("data", csItems);
-        series.add(map);
 
-        DiagnosisQuery diagnosisQuery = new DiagnosisQuery();
-        diagnosisQuery.setHospitalIds(currentUserHospPermissions);
-
-        if (dates != null) {
-            diagnosisQuery.setResultDateStart(DateUtil.parseYMD(dates[0]));
-            if (dates.length == 2) {
-                diagnosisQuery.setResultDateEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59"));
-            }
-        }
-
-        int diagnosisCount = diagnosisService.queryDiagnosisCount(diagnosisQuery);
-        List<String> dItems = new ArrayList<>();
-        csItems.add(String.valueOf(diagnosisCount));
-        Map<String, Object> dMap = new HashMap();
-        dMap.put("name", "诊断人数");
-        dMap.put("type", "bar");
-        dMap.put("data", dItems);
-        series.add(dMap);
 
         List<List<String>> result = new ArrayList<>();
 
-//        List<String> titles = new ArrayList<>();
-//        titles.add("序号");
-//        titles.add("地市名称");
-//        titles.add("机构数");
-//        titles.add("应筛查人数");
-//        titles.add("产筛总数");
-//        titles.add("诊断总人数");
-//        result.add(titles);
-
         int num = 1;
         if (CollectionUtils.isNotEmpty(configList))
         {
-
             for (BasicConfig c : configList) {
+                SieveQuery sieveQuery = new SieveQuery();
+                sieveQuery.setHospitalIds(currentUserHospPermissions);
+                sieveQuery.setYn(YnEnums.YES.getId());
+                sieveQuery.setStatus(3);
+                if (dates != null) {
+                    sieveQuery.setResultTimeStart(DateUtil.parseYMD(dates[0]));
+                    if (dates.length == 2) {
+                        sieveQuery.setResultTimeEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59"));
+                    }
+                }
+
+                int sieveFinishCount = sieveService.queryListCount(sieveQuery);
+                List<String> csItems = new ArrayList<>();
+                csItems.add(String.valueOf(sieveFinishCount));
+                Map<String, Object> map = new HashMap();
+                map.put("name", "产筛人数");
+                map.put("type", "bar");
+                map.put("data", csItems);
+                series.add(map);
+
+                DiagnosisQuery diagnosisQuery = new DiagnosisQuery();
+                diagnosisQuery.setHospitalIds(currentUserHospPermissions);
+
+                if (dates != null) {
+                    diagnosisQuery.setResultDateStart(DateUtil.parseYMD(dates[0]));
+                    if (dates.length == 2) {
+                        diagnosisQuery.setResultDateEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59"));
+                    }
+                }
+
+                int diagnosisCount = diagnosisService.queryDiagnosisCount(diagnosisQuery);
+                List<String> dItems = new ArrayList<>();
+                dItems.add(String.valueOf(diagnosisCount));
+                Map<String, Object> dMap = new HashMap();
+                dMap.put("name", "诊断人数");
+                dMap.put("type", "bar");
+                dMap.put("data", dItems);
+                series.add(dMap);
+
+
+
                 List<String> items = new ArrayList<>();
                 items.add(String.valueOf(num));
                 items.add(c.getName());
@@ -1271,6 +1265,7 @@ public class SieveFacade {
                 int diagnosisCountAll = diagnosisService.queryDiagnosisCount(diagnosisQuery1);
                 items.add(String.valueOf(diagnosisCountAll));
                 num++;
+                result.add(items);
             }
         }
 
@@ -1278,6 +1273,7 @@ public class SieveFacade {
         datas.put("series", series);
         datas.put("xAxis", xAxis);
         datas.put("legend", titleItems);
+        datas.put("tableDatas", result);
         return new BaseObjectResponse()
                 .setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(datas);
     }