jiangjiazhi / regional-platform

Download as
Browse Code »

Commit aa29a1ddf50f8ba9c74dbcfc1a8e5c19170c8bfe

Authored by liquanyu
1 parent 15c024f2f6
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 1 changed file with 10 additions and 13 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java View file @ aa29a1d
... ... @@ -1024,10 +1024,8 @@
1024 1024 " SUM(NUM_24) AS NUM_24,\n" +
1025 1025 " SUM(NUM_36) AS NUM_36,\n" +
1026 1026 " SUM(NUM_40) AS NUM_40\n" +
1027   - "FROM ODS_D_HOSPITAL AAA INNER JOIN" +
1028   - "(\n" +
1029   - "--建档人数\n" +
1030   - "SELECT A.PROVINCE_ID,\n" +
  1027 + " FROM ODS_D_HOSPITAL AAA INNER JOIN " +
  1028 + " ( SELECT A.PROVINCE_ID,\n" +
1031 1029 " A.PROVINCE,\n" +
1032 1030 " A.CITY_ID,\n" +
1033 1031 " A.CITY,\n" +
... ... @@ -1037,9 +1035,9 @@
1037 1035 " A.HOSPITAL_NAME,\n" +
1038 1036 " A.YCY_STSTEM_ID,\n" +
1039 1037 " COUNT(B.RECORD_ID) AS JD_NUM\n" +
1040   - "FROM ODS_D_HOSPITAL A\n" +
1041   - "INNER JOIN ODS_F_GRAVIDA_RECORD B ON A.HOSPITAL_NO=B.HOSPITAL_NO\n" +
1042   - "WHERE 1=1 ";
  1038 + " FROM ODS_D_HOSPITAL A\n" +
  1039 + " INNER JOIN ODS_F_GRAVIDA_RECORD B ON A.HOSPITAL_NO=B.HOSPITAL_NO\n" +
  1040 + " WHERE 1=1 ";
1043 1041 if (StringUtils.isNotEmpty(time))
1044 1042 {
1045 1043 String startTime = time.split(" - ")[0];
... ... @@ -1082,10 +1080,9 @@
1082 1080 " A.HOSPITAL_NO,\n" +
1083 1081 " A.HOSPITAL_NAME,\n" +
1084 1082 " A.YCY_STSTEM_ID\n" +
1085   - ") AA ON AAA.HOSPITAL_NO=AA.HOSPITAL_NO" +
1086   - "LEFT JOIN (\n" +
1087   - "--产检节点人数\n" +
1088   - "SELECT A.PROVINCE_ID,\n" +
  1083 + " ) AA ON AAA.HOSPITAL_NO=AA.HOSPITAL_NO" +
  1084 + " INNER JOIN (\n" +
  1085 + " SELECT A.PROVINCE_ID,\n" +
1089 1086 " A.PROVINCE,\n" +
1090 1087 " A.CITY_ID,\n" +
1091 1088 " A.CITY,\n" +
... ... @@ -1100,8 +1097,8 @@
1100 1097 " SUM(CASE WHEN B.NODE_NAME='21～24 孕周' THEN 1 ELSE 0 END) AS NUM_24,\n" +
1101 1098 " SUM(CASE WHEN B.NODE_NAME='28～36 孕周' THEN 1 ELSE 0 END) AS NUM_36,\n" +
1102 1099 " SUM(CASE WHEN B.NODE_NAME='37～ 分娩' THEN 1 ELSE 0 END) AS NUM_40\n" +
1103   - "FROM ODS_D_HOSPITAL A\n" +
1104   - "LEFT JOIN ODS_F_EXAMINE_HISTORY B ON A.HOSPITAL_NO=B.HOSPITAL_NO "+
  1100 + " FROM ODS_D_HOSPITAL A\n" +
  1101 + " LEFT JOIN ODS_F_EXAMINE_HISTORY B ON A.HOSPITAL_NO=B.HOSPITAL_NO "+
1105 1102 " INNER JOIN ODS_F_GRAVIDA_RECORD C ON B.RECORD_ID=C.RECORD_ID ";
1106 1103 if (pointType != null && pointType == 1){
1107 1104 countSql+=" AND B.NODE_ID=2 ";