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 fb956c1..de4b25e 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 @@ -1024,10 +1024,8 @@ public class AreaCountFacade { " SUM(NUM_24) AS NUM_24,\n" + " SUM(NUM_36) AS NUM_36,\n" + " SUM(NUM_40) AS NUM_40\n" + - "FROM ODS_D_HOSPITAL AAA INNER JOIN" + - "(\n" + - "--建档人数\n" + - "SELECT A.PROVINCE_ID,\n" + + " FROM ODS_D_HOSPITAL AAA INNER JOIN " + + " ( SELECT A.PROVINCE_ID,\n" + " A.PROVINCE,\n" + " A.CITY_ID,\n" + " A.CITY,\n" + @@ -1037,9 +1035,9 @@ public class AreaCountFacade { " A.HOSPITAL_NAME,\n" + " A.YCY_STSTEM_ID,\n" + " COUNT(B.RECORD_ID) AS JD_NUM\n" + - "FROM ODS_D_HOSPITAL A\n" + - "INNER JOIN ODS_F_GRAVIDA_RECORD B ON A.HOSPITAL_NO=B.HOSPITAL_NO\n" + - "WHERE 1=1 "; + " FROM ODS_D_HOSPITAL A\n" + + " INNER JOIN ODS_F_GRAVIDA_RECORD B ON A.HOSPITAL_NO=B.HOSPITAL_NO\n" + + " WHERE 1=1 "; if (StringUtils.isNotEmpty(time)) { String startTime = time.split(" - ")[0]; @@ -1082,10 +1080,9 @@ public class AreaCountFacade { " A.HOSPITAL_NO,\n" + " A.HOSPITAL_NAME,\n" + " A.YCY_STSTEM_ID\n" + - ") AA ON AAA.HOSPITAL_NO=AA.HOSPITAL_NO" + - "LEFT JOIN (\n" + - "--产检节点人数\n" + - "SELECT A.PROVINCE_ID,\n" + + " ) AA ON AAA.HOSPITAL_NO=AA.HOSPITAL_NO" + + " INNER JOIN (\n" + + " SELECT A.PROVINCE_ID,\n" + " A.PROVINCE,\n" + " A.CITY_ID,\n" + " A.CITY,\n" + @@ -1100,8 +1097,8 @@ public class AreaCountFacade { " SUM(CASE WHEN B.NODE_NAME='21~24 孕周' THEN 1 ELSE 0 END) AS NUM_24,\n" + " SUM(CASE WHEN B.NODE_NAME='28~36 孕周' THEN 1 ELSE 0 END) AS NUM_36,\n" + " SUM(CASE WHEN B.NODE_NAME='37~ 分娩' THEN 1 ELSE 0 END) AS NUM_40\n" + - "FROM ODS_D_HOSPITAL A\n" + - "LEFT JOIN ODS_F_EXAMINE_HISTORY B ON A.HOSPITAL_NO=B.HOSPITAL_NO "+ + " FROM ODS_D_HOSPITAL A\n" + + " LEFT JOIN ODS_F_EXAMINE_HISTORY B ON A.HOSPITAL_NO=B.HOSPITAL_NO "+ " INNER JOIN ODS_F_GRAVIDA_RECORD C ON B.RECORD_ID=C.RECORD_ID "; if (pointType != null && pointType == 1){ countSql+=" AND B.NODE_ID=2 ";