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 5c2dd85..9b0e1f8 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
@@ -1646,7 +1646,7 @@ public class SieveFacade {
         int csJxCount = 0;
         // 羊水 诊断数	异常数
         int ysDiaCount = 0;
-        int csDiaExcCount = 0;
+        int ysDiaExcCount = 0;
 
         // 绒毛 诊断数	异常数
         int rmDiaCount = 0;
@@ -1672,19 +1672,6 @@ public class SieveFacade {
 
             dataMap.put("areaName",organizationService.getOrganization(Integer.parseInt(hid)).getName());
 
-            //筛查孕妇数
-            SieveQuery sieveQuery1 = new SieveQuery();
-            sieveQuery1.setHospitalId(hid);
-            sieveQuery1.setYn(YnEnums.YES.getId());
-            sieveQuery1.setStatus(3);
-            if (dates != null) {
-                sieveQuery1.setResultTimeStart(DateUtil.parseYMD(dates[0]));
-                if (dates.length == 2) {
-                    sieveQuery1.setResultTimeEnd(DateUtil.parseYMDHMS(dates[1]));
-                }
-            }
-            sieveCount = sieveService.queryListCount(sieveQuery1);
-
 
             PatientsQuery patientsQuery = new PatientsQuery();
             patientsQuery.setHospitalId(hid);
@@ -1700,97 +1687,170 @@ public class SieveFacade {
                 }
             }
 
+            if (CollectionUtils.isNotEmpty(patientIds))
+            {
+                //筛查孕妇数
+                SieveQuery sieveQuery1 = new SieveQuery();
+                sieveQuery1.setHospitalId(hid);
+                sieveQuery1.setYn(YnEnums.YES.getId());
+                sieveQuery1.setStatus(3);
+                if (dates != null) {
+                    sieveQuery1.setResultTimeStart(DateUtil.parseYMD(dates[0]));
+                    if (dates.length == 2) {
+                        sieveQuery1.setResultTimeEnd(DateUtil.parseYMDHMS(dates[1]));
+                    }
+                }
+                sieveCount = sieveService.queryListCount(sieveQuery1);
 
-            SieveResultQuery sieveResultQuery = new SieveResultQuery();
-            sieveResultQuery.setParentIds(patientIds);
-            sieveResultQuery.setYn(YnEnums.YES.getId());
-            if (dates != null) {
-                sieveResultQuery.setResultTimeStart(DateUtil.parseYMD(dates[0]));
-                if (dates.length == 2) {
-                    sieveResultQuery.setResultTimeEnd(DateUtil.parseYMD(dates[1]));
+
+                SieveResultQuery sieveResultQuery = new SieveResultQuery();
+                sieveResultQuery.setParentIds(patientIds);
+                sieveResultQuery.setYn(YnEnums.YES.getId());
+                if (dates != null) {
+                    sieveResultQuery.setResultTimeStart(DateUtil.parseYMD(dates[0]));
+                    if (dates.length == 2) {
+                        sieveResultQuery.setResultTimeEnd(DateUtil.parseYMD(dates[1]));
+                    }
                 }
-            }
-            sieveResultQuery.setTszhz("2");
-            st21Count = sieveService.queryListSieveResultCount(sieveResultQuery);
-
-            sieveResultQuery = new SieveResultQuery();
-            if (dates != null) {
-                sieveResultQuery.setResultTimeStart(DateUtil.parseYMD(dates[0]));
-                if (dates.length == 2) {
-                    sieveResultQuery.setResultTimeEnd(DateUtil.parseYMD(dates[1]));
+                sieveResultQuery.setTszhz("2");
+                st21Count = sieveService.queryListSieveResultCount(sieveResultQuery);
+
+                sieveResultQuery = new SieveResultQuery();
+                if (dates != null) {
+                    sieveResultQuery.setResultTimeStart(DateUtil.parseYMD(dates[0]));
+                    if (dates.length == 2) {
+                        sieveResultQuery.setResultTimeEnd(DateUtil.parseYMD(dates[1]));
+                    }
                 }
-            }
-            sieveResultQuery.setParentIds(patientIds);
-            sieveResultQuery.setYn(YnEnums.YES.getId());
-            sieveResultQuery.setSbst("2");
-            int temp1 = sieveService.queryListSieveResultCount(sieveResultQuery);
-
-            sieveResultQuery = new SieveResultQuery();
-            if (dates != null) {
-                sieveResultQuery.setResultTimeStart(DateUtil.parseYMD(dates[0]));
-                if (dates.length == 2) {
-                    sieveResultQuery.setResultTimeEnd(DateUtil.parseYMD(dates[1]));
+                sieveResultQuery.setParentIds(patientIds);
+                sieveResultQuery.setYn(YnEnums.YES.getId());
+                sieveResultQuery.setSbst("2");
+                int temp1 = sieveService.queryListSieveResultCount(sieveResultQuery);
+
+                sieveResultQuery = new SieveResultQuery();
+                if (dates != null) {
+                    sieveResultQuery.setResultTimeStart(DateUtil.parseYMD(dates[0]));
+                    if (dates.length == 2) {
+                        sieveResultQuery.setResultTimeEnd(DateUtil.parseYMD(dates[1]));
+                    }
                 }
-            }
-            sieveResultQuery.setParentIds(patientIds);
-            sieveResultQuery.setYn(YnEnums.YES.getId());
-            sieveResultQuery.setStzhz13("2");
-            int temp2 = sieveService.queryListSieveResultCount(sieveResultQuery);
-            st1813Count = temp1 + temp2;
+                sieveResultQuery.setParentIds(patientIds);
+                sieveResultQuery.setYn(YnEnums.YES.getId());
+                sieveResultQuery.setStzhz13("2");
+                int temp2 = sieveService.queryListSieveResultCount(sieveResultQuery);
+                st1813Count = temp1 + temp2;
 
 
-            sieveResultQuery = new SieveResultQuery();
-            if (dates != null) {
-                sieveResultQuery.setResultTimeStart(DateUtil.parseYMD(dates[0]));
-                if (dates.length == 2) {
-                    sieveResultQuery.setResultTimeEnd(DateUtil.parseYMD(dates[1]));
+                sieveResultQuery = new SieveResultQuery();
+                if (dates != null) {
+                    sieveResultQuery.setResultTimeStart(DateUtil.parseYMD(dates[0]));
+                    if (dates.length == 2) {
+                        sieveResultQuery.setResultTimeEnd(DateUtil.parseYMD(dates[1]));
+                    }
                 }
-            }
-            sieveResultQuery.setParentIds(patientIds);
-            sieveResultQuery.setYn(YnEnums.YES.getId());
-            sieveResultQuery.setSjgjx("2");
-            sjqxCount = sieveService.queryListSieveResultCount(sieveResultQuery);
+                sieveResultQuery.setParentIds(patientIds);
+                sieveResultQuery.setYn(YnEnums.YES.getId());
+                sieveResultQuery.setSjgjx("2");
+                sjqxCount = sieveService.queryListSieveResultCount(sieveResultQuery);
+
+                sieveExcCountAll = st21Count+st1813Count+sjqxCount;
+
+
+                //羊水穿刺产前诊断 诊断项目(1,羊水穿刺；2，绒毛穿刺；3，脐带血检测)
+                DiagnosisQuery diagnosisQuery1 = new DiagnosisQuery();
+                diagnosisQuery1.setHospitalId(hid);
+                diagnosisQuery1.setDiaProject("1");
+                diagnosisQuery1.setDiaStatus("3");//（0，未申请；1，已申请；2，已接收；3，已诊断）
+                if (dates != null) {
+                    diagnosisQuery1.setResultDateStart(DateUtil.parseYMD(dates[0]));
+                    if (dates.length == 2) {
+                        diagnosisQuery1.setResultDateEnd(DateUtil.parseYMD(dates[1]));
+                    }
+                }
+                disCount = diagnosisService.queryDiagnosisCount(diagnosisQuery1);
 
-            sieveExcCountAll = st21Count+st1813Count+sjqxCount;
+                diagnosisQuery1 = new DiagnosisQuery();
+                diagnosisQuery1.setHospitalId(hid);
+                diagnosisQuery1.setDiaProject("1");
+                diagnosisQuery1.setDiaResult("1");//诊断结果(0，阴性；1，阳性)
+                diagnosisQuery1.setDiaStatus("3");//（0，未申请；1，已申请；2，已接收；3，已诊断）
+                if (dates != null) {
+                    diagnosisQuery1.setResultDateStart(DateUtil.parseYMD(dates[0]));
+                    if (dates.length == 2) {
+                        diagnosisQuery1.setResultDateEnd(DateUtil.parseYMD(dates[1]));
+                    }
+                }
+                disExcCount = diagnosisService.queryDiagnosisCount(diagnosisQuery1);
 
+                diagnosisQuery1 = new DiagnosisQuery();
+                diagnosisQuery1.setHospitalId(hid);
+                diagnosisQuery1.setDiaProject("1");
+                diagnosisQuery1.setRsResult("1"); //0继续妊娠 1 终止妊娠
+                if (dates != null) {
+                    diagnosisQuery1.setResultDateStart(DateUtil.parseYMD(dates[0]));
+                    if (dates.length == 2) {
+                        diagnosisQuery1.setResultDateEnd(DateUtil.parseYMD(dates[1]));
+                    }
+                }
+                disStopCount = diagnosisService.queryDiagnosisCount(diagnosisQuery1);
 
-            //羊水穿刺产前诊断 诊断项目(1,羊水穿刺；2，绒毛穿刺；3，脐带血检测)
-            DiagnosisQuery diagnosisQuery1 = new DiagnosisQuery();
-            diagnosisQuery1.setHospitalIds(hospitalIds);
-            diagnosisQuery1.setDiaProject("1");
-            diagnosisQuery1.setDiaStatus("3");//（0，未申请；1，已申请；2，已接收；3，已诊断）
-            if (dates != null) {
-                diagnosisQuery1.setResultDateStart(DateUtil.parseYMD(dates[0]));
-                if (dates.length == 2) {
-                    diagnosisQuery1.setResultDateEnd(DateUtil.parseYMD(dates[1]));
+                diagnosisQuery1 = new DiagnosisQuery();
+                diagnosisQuery1.setHospitalId(hid);
+                diagnosisQuery1.setDiaProject("2");
+                diagnosisQuery1.setDiaStatus("3");//（0，未申请；1，已申请；2，已接收；3，已诊断）
+                if (dates != null) {
+                    diagnosisQuery1.setResultDateStart(DateUtil.parseYMD(dates[0]));
+                    if (dates.length == 2) {
+                        diagnosisQuery1.setResultDateEnd(DateUtil.parseYMD(dates[1]));
+                    }
                 }
-            }
-            disCount = diagnosisService.queryDiagnosisCount(diagnosisQuery1);
-
-            diagnosisQuery1 = new DiagnosisQuery();
-            diagnosisQuery1.setHospitalIds(hospitalIds);
-            diagnosisQuery1.setDiaProject("1");
-            diagnosisQuery1.setDiaResult("1");//诊断结果(0，阴性；1，阳性)
-            diagnosisQuery1.setDiaStatus("3");//（0，未申请；1，已申请；2，已接收；3，已诊断）
-            if (dates != null) {
-                diagnosisQuery1.setResultDateStart(DateUtil.parseYMD(dates[0]));
-                if (dates.length == 2) {
-                    diagnosisQuery1.setResultDateEnd(DateUtil.parseYMD(dates[1]));
+                rmDiaCount = diagnosisService.queryDiagnosisCount(diagnosisQuery1);
+
+                diagnosisQuery1 = new DiagnosisQuery();
+                diagnosisQuery1.setHospitalId(hid);
+                diagnosisQuery1.setDiaProject("2");//诊断项目(1,羊水穿刺；2，绒毛穿刺；3，脐带血检测)
+                diagnosisQuery1.setDiaResult("1");//诊断结果(0，阴性；1，阳性)
+                diagnosisQuery1.setDiaStatus("3");//（0，未申请；1，已申请；2，已接收；3，已诊断）
+                if (dates != null) {
+                    diagnosisQuery1.setResultDateStart(DateUtil.parseYMD(dates[0]));
+                    if (dates.length == 2) {
+                        diagnosisQuery1.setResultDateEnd(DateUtil.parseYMD(dates[1]));
+                    }
                 }
-            }
-            disExcCount = diagnosisService.queryDiagnosisCount(diagnosisQuery1);
-
-            diagnosisQuery1 = new DiagnosisQuery();
-            diagnosisQuery1.setHospitalIds(hospitalIds);
-            diagnosisQuery1.setDiaProject("1");
-            diagnosisQuery1.setRsResult("1"); //0继续妊娠 1 终止妊娠
-            if (dates != null) {
-                diagnosisQuery1.setResultDateStart(DateUtil.parseYMD(dates[0]));
-                if (dates.length == 2) {
-                    diagnosisQuery1.setResultDateEnd(DateUtil.parseYMD(dates[1]));
+                rmDiaExcCount = diagnosisService.queryDiagnosisCount(diagnosisQuery1);
+
+
+                diagnosisQuery1 = new DiagnosisQuery();
+                diagnosisQuery1.setHospitalId(hid);
+                diagnosisQuery1.setDiaProject("3");
+                diagnosisQuery1.setDiaStatus("3");//（0，未申请；1，已申请；2，已接收；3，已诊断）
+                if (dates != null) {
+                    diagnosisQuery1.setResultDateStart(DateUtil.parseYMD(dates[0]));
+                    if (dates.length == 2) {
+                        diagnosisQuery1.setResultDateEnd(DateUtil.parseYMD(dates[1]));
+                    }
+                }
+                teDiaCount = diagnosisService.queryDiagnosisCount(diagnosisQuery1);
+
+                diagnosisQuery1 = new DiagnosisQuery();
+                diagnosisQuery1.setHospitalId(hid);
+                diagnosisQuery1.setDiaProject("3");//诊断项目(1,羊水穿刺；2，绒毛穿刺；3，脐带血检测)
+                diagnosisQuery1.setDiaResult("1");//诊断结果(0，阴性；1，阳性)
+                diagnosisQuery1.setDiaStatus("3");//（0，未申请；1，已申请；2，已接收；3，已诊断）
+                if (dates != null) {
+                    diagnosisQuery1.setResultDateStart(DateUtil.parseYMD(dates[0]));
+                    if (dates.length == 2) {
+                        diagnosisQuery1.setResultDateEnd(DateUtil.parseYMD(dates[1]));
+                    }
                 }
+                teDiaExcCount = diagnosisService.queryDiagnosisCount(diagnosisQuery1);
+
+                //合计诊断数
+                hjDiaCount=disCount+csDiaCount+ysDiaCount+rmDiaCount+teDiaCount+qtDiaCount;
+                hjDiaExcCount=disExcCount+csDiaCount+ysDiaExcCount+rmDiaExcCount+teDiaExcCount+qtDiaExcCount;
+                hjStopCount=disStopCount;
             }
-            disStopCount = diagnosisService.queryDiagnosisCount(diagnosisQuery1);
+
             dataMap.put("sieveCount",String.valueOf(sieveCount));
             dataMap.put("st21Count",String.valueOf(st21Count));
             dataMap.put("st1813Count",String.valueOf(st1813Count));
@@ -1809,7 +1869,7 @@ public class SieveFacade {
             dataMap.put("csQtCount",String.valueOf(csQtCount));
             dataMap.put("csJxCount",String.valueOf(csJxCount));
             dataMap.put("ysDiaCount",String.valueOf(ysDiaCount));
-            dataMap.put("csDiaExcCount",String.valueOf(csDiaExcCount));
+            dataMap.put("ysDiaExcCount",String.valueOf(ysDiaExcCount));
             dataMap.put("rmDiaCount",String.valueOf(rmDiaCount));
             dataMap.put("rmDiaExcCount",String.valueOf(rmDiaExcCount));
             dataMap.put("teDiaCount",String.valueOf(teDiaCount));
@@ -1851,7 +1911,7 @@ public class SieveFacade {
         int csJxCount = 0;
         // 羊水 诊断数	异常数
         int ysDiaCount = 0;
-        int csDiaExcCount = 0;
+        int ysDiaExcCount = 0;
         // 绒毛 诊断数	异常数
         int rmDiaCount = 0;
         int rmDiaExcCount = 0;
@@ -1889,7 +1949,7 @@ public class SieveFacade {
                 csQtCount += Integer.parseInt(map.get("csQtCount"));
                 csJxCount += Integer.parseInt(map.get("csJxCount"));
                 ysDiaCount += Integer.parseInt(map.get("ysDiaCount"));
-                csDiaExcCount += Integer.parseInt(map.get("csDiaExcCount"));
+                ysDiaExcCount += Integer.parseInt(map.get("ysDiaExcCount"));
                 rmDiaCount += Integer.parseInt(map.get("rmDiaCount"));
                 rmDiaExcCount += Integer.parseInt(map.get("rmDiaExcCount"));
                 teDiaCount += Integer.parseInt(map.get("teDiaCount"));
@@ -1921,7 +1981,7 @@ public class SieveFacade {
         dataMap.put("csQtCount",String.valueOf(csQtCount));
         dataMap.put("csJxCount",String.valueOf(csJxCount));
         dataMap.put("ysDiaCount",String.valueOf(ysDiaCount));
-        dataMap.put("csDiaExcCount",String.valueOf(csDiaExcCount));
+        dataMap.put("ysDiaExcCount",String.valueOf(ysDiaExcCount));
         dataMap.put("rmDiaCount",String.valueOf(rmDiaCount));
         dataMap.put("rmDiaExcCount",String.valueOf(rmDiaExcCount));
         dataMap.put("teDiaCount",String.valueOf(teDiaCount));