diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
index ad71518..08653ee 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
@@ -1018,7 +1018,7 @@ public class AreaCountFacade {
                 "FROM ODS_D_HOSPITAL A\n" +
                 "LEFT JOIN ODS_F_EXAMINE_HISTORY B ON A.HOSPITAL_NO=B.HOSPITAL_NO ";
                 if (pointType != null && pointType == 1){
-                    countSql+="  AND CC.NODE_ID=2 ";
+                    countSql+="  AND B.NODE_ID=2 ";
                 }
                  countSql+= "WHERE  1=1" ;
                 if (StringUtils.isNotEmpty(time))
@@ -1262,6 +1262,7 @@ public class AreaCountFacade {
         List<Map<String, Object>> checkPointtList = JdbcUtil.getOracleListDataBySql(DRIVER, JDBC, NAME, PWD, sql);
         Map<String,Object> data = new HashMap<>();
         data.put("list",checkPointtList);
+        data.put("chartData",chartData);
         data.put("num12",num12);
         data.put("num20",num20);
         data.put("num24",num24);
@@ -1285,6 +1286,7 @@ public class AreaCountFacade {
                 "       C.NAME,\n" +
                 "       C.CREATE_WEEKS,\n" +
                 "       C.CREATE_WEEKS_DAY,\n" +
+                "       DECODE( C.CREATE_WEEKS_DAY,0,'孕'||C.CREATE_WEEKS||'周','孕'||C.CREATE_WEEKS||'周+'||C.CREATE_WEEKS_DAY||'天') AS YZ_NAME, "+
                 "       C.HOSPITAL_NAME,\n" +
                 "       C.DOCTOR_NAME,\n" +
                 "       C.HOME_ADDR,\n" +
@@ -1302,33 +1304,33 @@ public class AreaCountFacade {
                 }
                 if (StringUtils.isNotEmpty(provinceId))
                 {
-                    sql += " AND  A.PROVINCE_ID= '"+provinceId+"'";
-                    countSql += " AND  A.PROVINCE_ID= '"+provinceId+"'";
+                    sql += " AND  C.PROVINCE_ID= '"+provinceId+"'";
+                    countSql += " AND  C.PROVINCE_ID= '"+provinceId+"'";
                 }
 
                 if (StringUtils.isNotEmpty(cityId))
                 {
-                    sql+= "  AND A.CITY_ID= '" +cityId+"'";
-                    countSql+= "  AND A.CITY_ID= '" +cityId+"'";
+                    sql+= "  AND C.CITY_ID= '" +cityId+"'";
+                    countSql+= "  AND C.CITY_ID= '" +cityId+"'";
                 }
 
                 if (StringUtils.isNotEmpty(areaId))
                 {
-                    sql+= "  AND A.AREA_COUNTY_ID= '" +areaId+"'";
-                    countSql+= "  AND A.AREA_COUNTY_ID= '" +areaId+"'";
+                    sql+= "  AND C.AREA_COUNTY_ID= '" +areaId+"'";
+                    countSql+= "  AND C.AREA_COUNTY_ID= '" +areaId+"'";
                 }
                 if (StringUtils.isNotEmpty(hospitalId))
                 {
-                    sql+="  AND A.YCY_STSTEM_ID= '" +hospitalId+"'";
-                    countSql+="  AND A.YCY_STSTEM_ID= '" +hospitalId+"'";
+                    sql+="  AND C.YCY_STSTEM_ID= '" +hospitalId+"'";
+                    countSql+="  AND C.YCY_STSTEM_ID= '" +hospitalId+"'";
                 }
                 else
                 {
                     String hospitals = getPermissionStr(userId,provinceId,cityId,areaId);
                     if (StringUtils.isNotEmpty(hospitals))
                     {
-                        sql+="  AND A.YCY_STSTEM_ID IN " +hospitals;
-                        countSql+="  AND A.YCY_STSTEM_ID IN " +hospitals;
+                        sql+="  AND C.YCY_STSTEM_ID IN " +hospitals;
+                        countSql+="  AND C.YCY_STSTEM_ID IN " +hospitals;
                     }
 
                 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
index c69467a..637230a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
@@ -306,6 +306,8 @@ public class ViewFacade {
         //产检劵
         map.put("barCode", data.getBarCode());
         map.put("nextCheckTime",DateUtil.getyyyy_MM_dd(data.getNextCheckTime()));
+        //下次检查孕周
+        map.put("nextCheckWeek",ResolveUtils.getPregnancyWeek(patients.getLastMenses(), data.getNextCheckTime()));
         /*  初诊信息  */
         //既往史
         String pastHistory = "";
@@ -658,6 +660,9 @@ public class ViewFacade {
         }
         map.put("hospital", hospital);
         map.put("nextCheckTime",DateUtil.getyyyy_MM_dd(data.getNextCheckTime()));
+        //下次检查孕周
+        map.put("nextCheckWeek",ResolveUtils.getPregnancyWeek(patients.getLastMenses(), data.getNextCheckTime()));
+        /*  初诊信息  */
         map.put("cDueWeek",ResolveUtils.getPregnancyWeek(patients));
 //        map.put("cDueWeek", data.getcDueWeek()==null ? "": com.lyms.platform.common.utils.StringUtils.dueWeek(Integer.parseInt(data.getcDueWeek())));