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 a078a69..790484b 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
@@ -1497,15 +1497,25 @@ public class SieveFacade {
 
             mapData.put("disExcCount",String.valueOf(disExcCount));//异常数
 
-            mapData.put("sjDisCount",String.valueOf(sjDisCount));//诊断数
+            mapData.put("sjDisCount","-");//诊断数
 
-            mapData.put("sjDisExcCount",String.valueOf(sjDisExcCount));//异常数
+            mapData.put("sjDisExcCount","-");//异常数
 
-            mapData.put("dnaSieveCount",String.valueOf(dnaSieveCount));//筛查数
+            mapData.put("dnaSieveCount","-");//筛查数
 
-            mapData.put("dnaSieveLowCount",String.valueOf(dnaSieveLowCount));//低风险人数
+            mapData.put("dnaSieveLowCount","-");//低风险人数
 
-            mapData.put("dnaSieveHighCount",String.valueOf(dnaSieveHighCount));//高风险人数
+            mapData.put("dnaSieveHighCount","-");//高风险人数
+
+            // mapData.put("sjDisCount",String.valueOf(sjDisCount));//诊断数
+
+//            mapData.put("sjDisExcCount",String.valueOf(sjDisExcCount));//异常数
+//
+//            mapData.put("dnaSieveCount",String.valueOf(dnaSieveCount));//筛查数
+//
+//            mapData.put("dnaSieveLowCount",String.valueOf(dnaSieveLowCount));//低风险人数
+//
+//            mapData.put("dnaSieveHighCount",String.valueOf(dnaSieveHighCount));//高风险人数
 
             list.add(mapData);
         }
@@ -1545,11 +1555,11 @@ public class SieveFacade {
                 sieveCount += Integer.parseInt(map.get("sieveCount"));
                 disCount += Integer.parseInt(map.get("disCount"));
                 disExcCount += Integer.parseInt(map.get("disExcCount"));
-                sjDisCount += Integer.parseInt(map.get("sjDisCount"));
-                sjDisExcCount += Integer.parseInt(map.get("sjDisExcCount"));
-                dnaSieveCount += Integer.parseInt(map.get("dnaSieveCount"));
-                dnaSieveLowCount += Integer.parseInt(map.get("dnaSieveLowCount"));
-                dnaSieveHighCount += Integer.parseInt(map.get("dnaSieveHighCount"));
+//                sjDisCount += Integer.parseInt(map.get("sjDisCount"));
+//                sjDisExcCount += Integer.parseInt(map.get("sjDisExcCount"));
+//                dnaSieveCount += Integer.parseInt(map.get("dnaSieveCount"));
+//                dnaSieveLowCount += Integer.parseInt(map.get("dnaSieveLowCount"));
+//                dnaSieveHighCount += Integer.parseInt(map.get("dnaSieveHighCount"));
             }
         }
         Map<String,String> totalMap = new LinkedHashMap<>();
@@ -1562,11 +1572,17 @@ public class SieveFacade {
         totalMap.put("sjqxCount",String.valueOf(sjqxCount));
         totalMap.put("disCount",String.valueOf(disCount));
         totalMap.put("disExcCount",String.valueOf(disExcCount));
-        totalMap.put("sjDisCount",String.valueOf(sjDisCount));
-        totalMap.put("sjDisExcCount",String.valueOf(sjDisExcCount));
-        totalMap.put("dnaSieveCount",String.valueOf(dnaSieveCount));
-        totalMap.put("dnaSieveLowCount",String.valueOf(dnaSieveLowCount));
-        totalMap.put("dnaSieveHighCount",String.valueOf(dnaSieveHighCount));
+        totalMap.put("sjDisCount","-");
+        totalMap.put("sjDisExcCount","-");
+        totalMap.put("dnaSieveCount","-");
+        totalMap.put("dnaSieveLowCount","-");
+        totalMap.put("dnaSieveHighCount","-");
+
+//        totalMap.put("sjDisCount",String.valueOf(sjDisCount));
+//        totalMap.put("sjDisExcCount",String.valueOf(sjDisExcCount));
+//        totalMap.put("dnaSieveCount",String.valueOf(dnaSieveCount));
+//        totalMap.put("dnaSieveLowCount",String.valueOf(dnaSieveLowCount));
+//        totalMap.put("dnaSieveHighCount",String.valueOf(dnaSieveHighCount));
 
         list.add(totalMap);
     }
@@ -1858,23 +1874,23 @@ public class SieveFacade {
             dataMap.put("disCount",String.valueOf(disCount));
             dataMap.put("disExcCount",String.valueOf(disExcCount));
             dataMap.put("disStopCount",String.valueOf(disStopCount));
-            dataMap.put("csDiaCount",String.valueOf(csDiaCount));
-            dataMap.put("csClCount",String.valueOf(csClCount));
-            dataMap.put("csDzCount",String.valueOf(csDzCount));
-            dataMap.put("csXzbCount",String.valueOf(csXzbCount));
-            dataMap.put("csSjgqxCount",String.valueOf(csSjgqxCount));
-            dataMap.put("csNjsCount",String.valueOf(csNjsCount));
-            dataMap.put("csZtdsCount",String.valueOf(csZtdsCount));
-            dataMap.put("csQtCount",String.valueOf(csQtCount));
-            dataMap.put("csJxCount",String.valueOf(csJxCount));
-            dataMap.put("ysDiaCount",String.valueOf(ysDiaCount));
-            dataMap.put("ysDiaExcCount",String.valueOf(ysDiaExcCount));
+            dataMap.put("csDiaCount","-");
+            dataMap.put("csClCount","-");
+            dataMap.put("csDzCount","-");
+            dataMap.put("csXzbCount","-");
+            dataMap.put("csSjgqxCount","-");
+            dataMap.put("csNjsCount","-");
+            dataMap.put("csZtdsCount","-");
+            dataMap.put("csQtCount","-");
+            dataMap.put("csJxCount","-");
+            dataMap.put("ysDiaCount","-");
+            dataMap.put("ysDiaExcCount","-");
             dataMap.put("rmDiaCount",String.valueOf(rmDiaCount));
             dataMap.put("rmDiaExcCount",String.valueOf(rmDiaExcCount));
             dataMap.put("teDiaCount",String.valueOf(teDiaCount));
             dataMap.put("teDiaExcCount",String.valueOf(teDiaExcCount));
-            dataMap.put("qtDiaCount",String.valueOf(qtDiaCount));
-            dataMap.put("qtDiaExcCount",String.valueOf(qtDiaExcCount));
+            dataMap.put("qtDiaCount","-");
+            dataMap.put("qtDiaExcCount","-");
             dataMap.put("hjDiaCount",String.valueOf(hjDiaCount));
             dataMap.put("hjDiaExcCount",String.valueOf(hjDiaExcCount));
             dataMap.put("hjStopCount",String.valueOf(hjStopCount));
@@ -1938,23 +1954,23 @@ public class SieveFacade {
                 disCount += Integer.parseInt(map.get("disCount"));
                 disExcCount += Integer.parseInt(map.get("disExcCount"));
                 disStopCount += Integer.parseInt(map.get("disStopCount"));
-                csDiaCount += Integer.parseInt(map.get("csDiaCount"));
-                csClCount += Integer.parseInt(map.get("csClCount"));
-                csDzCount += Integer.parseInt(map.get("csDzCount"));
-                csXzbCount += Integer.parseInt(map.get("csXzbCount"));
-                csSjgqxCount += Integer.parseInt(map.get("csSjgqxCount"));
-                csNjsCount += Integer.parseInt(map.get("csNjsCount"));
-                csZtdsCount += Integer.parseInt(map.get("csZtdsCount"));
-                csQtCount += Integer.parseInt(map.get("csQtCount"));
-                csJxCount += Integer.parseInt(map.get("csJxCount"));
-                ysDiaCount += Integer.parseInt(map.get("ysDiaCount"));
-                ysDiaExcCount += Integer.parseInt(map.get("ysDiaExcCount"));
+//                csDiaCount += Integer.parseInt(map.get("csDiaCount"));
+//                csClCount += Integer.parseInt(map.get("csClCount"));
+//                csDzCount += Integer.parseInt(map.get("csDzCount"));
+//                csXzbCount += Integer.parseInt(map.get("csXzbCount"));
+//                csSjgqxCount += Integer.parseInt(map.get("csSjgqxCount"));
+//                csNjsCount += Integer.parseInt(map.get("csNjsCount"));
+//                csZtdsCount += Integer.parseInt(map.get("csZtdsCount"));
+//                csQtCount += Integer.parseInt(map.get("csQtCount"));
+//                csJxCount += Integer.parseInt(map.get("csJxCount"));
+//                ysDiaCount += Integer.parseInt(map.get("ysDiaCount"));
+//                ysDiaExcCount += Integer.parseInt(map.get("ysDiaExcCount"));
                 rmDiaCount += Integer.parseInt(map.get("rmDiaCount"));
                 rmDiaExcCount += Integer.parseInt(map.get("rmDiaExcCount"));
                 teDiaCount += Integer.parseInt(map.get("teDiaCount"));
                 teDiaExcCount += Integer.parseInt(map.get("teDiaExcCount"));
-                qtDiaCount += Integer.parseInt(map.get("qtDiaCount"));
-                qtDiaExcCount += Integer.parseInt(map.get("qtDiaExcCount"));
+//                qtDiaCount += Integer.parseInt(map.get("qtDiaCount"));
+//                qtDiaExcCount += Integer.parseInt(map.get("qtDiaExcCount"));
                 hjDiaCount += Integer.parseInt(map.get("hjDiaCount"));
                 hjDiaExcCount += Integer.parseInt(map.get("hjDiaExcCount"));
                 hjStopCount += Integer.parseInt(map.get("hjStopCount"));
@@ -1970,23 +1986,38 @@ public class SieveFacade {
         dataMap.put("disCount",String.valueOf(disCount));
         dataMap.put("disExcCount",String.valueOf(disExcCount));
         dataMap.put("disStopCount",String.valueOf(disStopCount));
-        dataMap.put("csDiaCount",String.valueOf(csDiaCount));
-        dataMap.put("csClCount",String.valueOf(csClCount));
-        dataMap.put("csDzCount",String.valueOf(csDzCount));
-        dataMap.put("csXzbCount",String.valueOf(csXzbCount));
-        dataMap.put("csSjgqxCount",String.valueOf(csSjgqxCount));
-        dataMap.put("csNjsCount",String.valueOf(csNjsCount));
-        dataMap.put("csZtdsCount",String.valueOf(csZtdsCount));
-        dataMap.put("csQtCount",String.valueOf(csQtCount));
-        dataMap.put("csJxCount",String.valueOf(csJxCount));
-        dataMap.put("ysDiaCount",String.valueOf(ysDiaCount));
-        dataMap.put("ysDiaExcCount",String.valueOf(ysDiaExcCount));
+
+        dataMap.put("csDiaCount","-");
+        dataMap.put("csClCount","-");
+        dataMap.put("csDzCount","-");
+        dataMap.put("csXzbCount","-");
+        dataMap.put("csSjgqxCount","-");
+        dataMap.put("csNjsCount","-");
+        dataMap.put("csZtdsCount","-");
+        dataMap.put("csQtCount","-");
+        dataMap.put("csJxCount","-");
+        dataMap.put("ysDiaCount","-");
+        dataMap.put("ysDiaExcCount","-");
+
+//        dataMap.put("csDiaCount",String.valueOf(csDiaCount));
+//        dataMap.put("csClCount",String.valueOf(csClCount));
+//        dataMap.put("csDzCount",String.valueOf(csDzCount));
+//        dataMap.put("csXzbCount",String.valueOf(csXzbCount));
+//        dataMap.put("csSjgqxCount",String.valueOf(csSjgqxCount));
+//        dataMap.put("csNjsCount",String.valueOf(csNjsCount));
+//        dataMap.put("csZtdsCount",String.valueOf(csZtdsCount));
+//        dataMap.put("csQtCount",String.valueOf(csQtCount));
+//        dataMap.put("csJxCount",String.valueOf(csJxCount));
+//        dataMap.put("ysDiaCount",String.valueOf(ysDiaCount));
+//        dataMap.put("ysDiaExcCount",String.valueOf(ysDiaExcCount));
         dataMap.put("rmDiaCount",String.valueOf(rmDiaCount));
         dataMap.put("rmDiaExcCount",String.valueOf(rmDiaExcCount));
         dataMap.put("teDiaCount",String.valueOf(teDiaCount));
         dataMap.put("teDiaExcCount",String.valueOf(teDiaExcCount));
-        dataMap.put("qtDiaCount",String.valueOf(qtDiaCount));
-        dataMap.put("qtDiaExcCount",String.valueOf(qtDiaExcCount));
+//        dataMap.put("qtDiaCount",String.valueOf(qtDiaCount));
+//        dataMap.put("qtDiaExcCount",String.valueOf(qtDiaExcCount));
+        dataMap.put("qtDiaCount","-");
+        dataMap.put("qtDiaExcCount","-");
         dataMap.put("hjDiaCount",String.valueOf(hjDiaCount));
         dataMap.put("hjDiaExcCount",String.valueOf(hjDiaExcCount));
         dataMap.put("hjStopCount",String.valueOf(hjStopCount));