Commit 56a24cb23071c9b9aa5e48ba6f844c1746086c5b
1 parent
ce1ff85a34
Exists in
master
and in
6 other branches
ulpdate
Showing 1 changed file with 19 additions and 14 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
View file @
56a24cb
... | ... | @@ -1139,18 +1139,23 @@ |
1139 | 1139 | |
1140 | 1140 | |
1141 | 1141 | |
1142 | - String sql = "SELECT AA.PROVINCE,AA.PROVINCE_ID," + | |
1143 | - " AA.CITY,AA.CITY_ID," + | |
1144 | - " AA.AREA_COUNTY,AA.AREA_COUNTY_ID ," + | |
1145 | - " AA.HOSPITAL_NAME,AA.YCY_STSTEM_ID," + | |
1146 | - " (CASE WHEN AA.JD_NUM IS NULL THEN 0 ELSE AA.JD_NUM END) AS JD_NUM," + | |
1147 | - " (CASE WHEN CJ_NUM IS NULL THEN 0 ELSE CJ_NUM END) AS CJ_NUM," + | |
1148 | - " (CASE WHEN NUM_12 IS NULL THEN 0 ELSE NUM_12 END) AS NUM_12," + | |
1149 | - " (CASE WHEN NUM_16 IS NULL THEN 0 ELSE NUM_16 END) AS NUM_16," + | |
1150 | - " (CASE WHEN NUM_24 IS NULL THEN 0 ELSE NUM_24 END) AS NUM_24," + | |
1151 | - " (CASE WHEN NUM_36 IS NULL THEN 0 ELSE NUM_36 END) AS NUM_36," + | |
1152 | - " (CASE WHEN NUM_40 IS NULL THEN 0 ELSE NUM_40 END) AS NUM_40 " + | |
1153 | - " FROM (" + | |
1142 | + String sql = "SELECT " + | |
1143 | + " AAA.PROVINCE," + | |
1144 | + " AAA.PROVINCE_ID," + | |
1145 | + " AAA.CITY," + | |
1146 | + " AAA.CITY_ID," + | |
1147 | + " AAA.AREA_COUNTY," + | |
1148 | + " AAA.AREA_COUNTY_ID ," + | |
1149 | + " AAA.HOSPITAL_NAME," + | |
1150 | + " AAA.YCY_STSTEM_ID," + | |
1151 | + " (CASE WHEN AA.JD_NUM IS NULL THEN 0 ELSE AA.JD_NUM END) AS JD_NUM," + | |
1152 | + " (CASE WHEN CJ_NUM IS NULL THEN 0 ELSE CJ_NUM END) AS CJ_NUM," + | |
1153 | + " (CASE WHEN NUM_12 IS NULL THEN 0 ELSE NUM_12 END) AS NUM_12," + | |
1154 | + " (CASE WHEN NUM_16 IS NULL THEN 0 ELSE NUM_16 END) AS NUM_16," + | |
1155 | + " (CASE WHEN NUM_24 IS NULL THEN 0 ELSE NUM_24 END) AS NUM_24," + | |
1156 | + " (CASE WHEN NUM_36 IS NULL THEN 0 ELSE NUM_36 END) AS NUM_36," + | |
1157 | + " (CASE WHEN NUM_40 IS NULL THEN 0 ELSE NUM_40 END) AS NUM_40 " + | |
1158 | + " FROM ODS_D_HOSPITAL AAA LEFT JOIN (" + | |
1154 | 1159 | " SELECT A.PROVINCE_ID," + |
1155 | 1160 | " A.PROVINCE," + |
1156 | 1161 | " A.CITY_ID," + |
... | ... | @@ -1207,7 +1212,7 @@ |
1207 | 1212 | " A.HOSPITAL_NO,\n" + |
1208 | 1213 | " A.HOSPITAL_NAME,\n" + |
1209 | 1214 | " A.YCY_STSTEM_ID\n" + |
1210 | - " ) AA LEFT JOIN (\n" + | |
1215 | + " ) AA ON AAA.HOSPITAL_NO=AA.HOSPITAL_NO LEFT JOIN (\n" + | |
1211 | 1216 | " SELECT A.PROVINCE_ID,\n" + |
1212 | 1217 | " A.PROVINCE,\n" + |
1213 | 1218 | " A.CITY_ID,\n" + |
... | ... | @@ -1273,7 +1278,7 @@ |
1273 | 1278 | " A.HOSPITAL_NO,\n" + |
1274 | 1279 | " A.HOSPITAL_NAME,\n" + |
1275 | 1280 | " A.YCY_STSTEM_ID\n" + |
1276 | - " ) BB ON AA.HOSPITAL_NO=BB.HOSPITAL_NO\n" + | |
1281 | + " ) BB ON AAA.HOSPITAL_NO = BB.HOSPITAL_NO " + | |
1277 | 1282 | " ORDER BY 1,2,3"; |
1278 | 1283 | System.out.println("sql===="+sql); |
1279 | 1284 | System.out.println("countSql===="+countSql); |