diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java
index ee87dcd..9e6a047 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java
@@ -533,13 +533,13 @@ public class BabyStatisticsManagerFacade {
                         " FROM ODS_F_INFANT_RECORD A" +
                         " INNER JOIN ODS_D_HOSPITAL B ON A.HOSPITAL_NO=B.HOSPITAL_NO" +
                         // 医院，判断本院外院使用
-                        " WHERE B.YCY_STSTEM_ID='" + hospitalId+"'";
+                        " WHERE B.YCY_STSTEM_ID='" + hospitalId + "'";
         // 这三个查询条件暂时没用，直接注释掉
         // "AND B.PROVINCE_ID=" +
         // "AND B.CITY_ID=" +
         // "AND B.AREA_COUNTY_ID="
         if (StringUtils.isNotEmpty(babyStatisticsManagerBuildSourceListRequest.getBuildDate())) {
-            sql += " AND A.INSERT_DATE BETWEEN TO_DATE('" + buildDateStart + "','YYYY-MM-DD') AND TO_DATE('" + buildDateEnd+"','YYYY-MM-DD')";
+            sql += " AND A.INSERT_DATE BETWEEN TO_DATE('" + buildDateStart + "','YYYY-MM-DD') AND TO_DATE('" + buildDateEnd + "','YYYY-MM-DD')";
         }
         sql += " GROUP BY " +
                 "B.PROVINCE_ID," +
@@ -558,7 +558,7 @@ public class BabyStatisticsManagerFacade {
                 "END)";
         // jdbc查oracle
 //        List<Map<String, Object>> list = JdbcUtil.getOracleListDataBySql("com.mysql.jdbc.Driver", "jdbc:oracle:thin:@127.0.0.1:1521:orcl", "LYMS_ODS", "Welcome1", sql);
-        ExceptionUtils.catchException("babyStatisticsManagerBuildSourceList:  "+sql);
+        ExceptionUtils.catchException("babyStatisticsManagerBuildSourceList:  " + sql);
         List<Map<String, Object>> list = JdbcUtil.getOracleListDataBySql("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@192.168.1.32:1521:orcl", "LYMS_ODS", "Welcome1", sql);
         // 构造返回list，这里写死的4条，因为高帆说只有4条
         BabyStatisticsManagerBuildSourceListQueryModel babyStatisticsManagerBuildSourceListQueryModel1 = new BabyStatisticsManagerBuildSourceListQueryModel();
@@ -668,13 +668,13 @@ public class BabyStatisticsManagerFacade {
                         " INNER JOIN ODS_D_HOSPITAL B ON A.HOSPITAL_NO=B.HOSPITAL_NO" +
                         " LEFT JOIN ODS_F_CHILD_PHYSICAL C ON A.RECORD_ID=C.RECORD_ID AND C.EXAMINE_HISTORY_NUM=1" +
                         " WHERE A.HOSPITAL_NO=A.BIRTH_HOSPITAL_NO" +
-                        " AND B.YCY_STSTEM_ID='" + hospitalId+"'";
+                        " AND B.YCY_STSTEM_ID='" + hospitalId + "'";
         // 这三个查询条件暂时没用，直接注释掉
         // "AND B.PROVINCE_ID="+
         // "AND B.CITY_ID="+
         // "AND B.AREA_COUNTY_ID="+'2015-01-19','YYYY-MM-DD')
         if (StringUtils.isNotEmpty(babyStatisticsManagerSelfConversionListRequest.getBirthDate())) {
-            sql += " AND A.INSERT_DATE BETWEEN TO_DATE('" + birthDateStart + "','YYYY-MM-DD') AND TO_DATE('" + birthDateEnd+"','YYYY-MM-DD')";
+            sql += " AND A.INSERT_DATE BETWEEN TO_DATE('" + birthDateStart + "','YYYY-MM-DD') AND TO_DATE('" + birthDateEnd + "','YYYY-MM-DD')";
         }
         sql += " GROUP BY " +
                 "B.PROVINCE_ID," +
@@ -689,7 +689,7 @@ public class BabyStatisticsManagerFacade {
 
         // jdbc查oracle
 //        List<Map<String, Object>> list = JdbcUtil.getOracleListDataBySql("com.mysql.jdbc.Driver", "jdbc:oracle:thin:@127.0.0.1:1521:orcl", "LYMS_ODS", "Welcome1", sql);
-        ExceptionUtils.catchException("babyStatisticsManagerSelfConversionList: "+sql);
+        ExceptionUtils.catchException("babyStatisticsManagerSelfConversionList: " + sql);
         List<Map<String, Object>> list = JdbcUtil.getOracleListDataBySql("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@192.168.1.32:1521:orcl", "LYMS_ODS", "Welcome1", sql);
         // List<Map<String, Object>> list = new ArrayList<>();
         // Map<String, Object> test1 = new HashMap<>();
@@ -737,27 +737,38 @@ public class BabyStatisticsManagerFacade {
         // 检查人数
         List<Integer> result = new ArrayList<>();
         Integer total = 0;
-        ExceptionUtils.catchException("babyStatisticsManagerSelfConversionList list result :" +list);
+        ExceptionUtils.catchException("babyStatisticsManagerSelfConversionList list result :" + list);
         // 从0开始，没有也填充
         int index = 0;
-        for (Integer i = 0; i <12 /*13*/; i++) {
-            try {
-                while (!i.toString().equals(list.get(index).get("examineMonth").toString()) && index > Integer.valueOf(list.get(index).get("examineMonth").toString())) {
-                    index++;
-                }
-            } catch (Exception e) {
-                index++;
-            }
-            if (CollectionUtils.isEmpty(list) || list.size() /*< */>index || list.get(index) == null || !i.toString().equals(list.get(index).get("examineMonth").toString())) {
+        for (Integer i = 0; i < 12 /*13*/; i++) {
+//            try {
+//                while (!i.toString().equals(list.get(index).get("examineMonth").toString()) && index > Integer.valueOf(list.get(index).get("examineMonth").toString())) {
+//                    index++;
+//                }
+//            } catch (Exception e) {
+//                index++;
+//            }
+//            if (CollectionUtils.isEmpty(list) || list.size() /*< */>index || list.get(index) == null || !i.toString().equals(list.get(index).get("examineMonth").toString())) {
+//                result.add(0);
+//            } else {
+//                try {
+//                    result.add(Integer.valueOf(list.get(index).get("cnt").toString()));
+//                    total += Integer.valueOf(list.get(index).get("cnt").toString());
+//                    index++;
+//                } catch (Exception e) {
+//                    result.add(0);
+//                    index++;
+//                }
+//            }
+
+            if (CollectionUtils.isEmpty(list) || list.get(i) == null || null == list.get(i).get("examineMonth")) {
                 result.add(0);
             } else {
                 try {
-                    result.add(Integer.valueOf(list.get(index).get("cnt").toString()));
-                    total += Integer.valueOf(list.get(index).get("cnt").toString());
-                    index++;
+                    result.add(Integer.valueOf(list.get(i).get("cnt").toString()));
+                    total += Integer.valueOf(list.get(i).get("cnt").toString());
                 } catch (Exception e) {
                     result.add(0);
-                    index++;
                 }
             }
         }