jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit 9c30a235994de6e0665d095b9b8d1f4e485db68f

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

update code

Showing 1 changed file with 11 additions and 10 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java View file @ 9c30a23
... ... @@ -1338,6 +1338,7 @@
1338 1338 " C.TEL_NO\n" +
1339 1339 " FROM ODS_F_GRAVIDA_RECORD C\n" +
1340 1340 " INNER JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID"+
  1341 + " INNER JOIN ODS_D_HOSPITAL A ON C.HOSPITAL_NO=A.HOSPITAL_NO "+
1341 1342 " WHERE 1 = 1";
1342 1343 if (StringUtils.isNotEmpty(time))
1343 1344 {
1344 1345  
1345 1346  
1346 1347  
1347 1348  
... ... @@ -1348,33 +1349,33 @@
1348 1349 }
1349 1350 if (StringUtils.isNotEmpty(provinceId))
1350 1351 {
1351   - sql += " AND C.PROVINCE_ID= '"+provinceId+"'";
1352   - countSql += " AND C.PROVINCE_ID= '"+provinceId+"'";
  1352 + sql += " AND A.PROVINCE_ID= '"+provinceId+"'";
  1353 + countSql += " AND A.PROVINCE_ID= '"+provinceId+"'";
1353 1354 }
1354 1355  
1355 1356 if (StringUtils.isNotEmpty(cityId))
1356 1357 {
1357   - sql+= " AND C.CITY_ID= '" +cityId+"'";
1358   - countSql+= " AND C.CITY_ID= '" +cityId+"'";
  1358 + sql+= " AND A.CITY_ID= '" +cityId+"'";
  1359 + countSql+= " AND A.CITY_ID= '" +cityId+"'";
1359 1360 }
1360 1361  
1361 1362 if (StringUtils.isNotEmpty(areaId))
1362 1363 {
1363   - sql+= " AND C.AREA_COUNTY_ID= '" +areaId+"'";
1364   - countSql+= " AND C.AREA_COUNTY_ID= '" +areaId+"'";
  1364 + sql+= " AND A.AREA_COUNTY_ID= '" +areaId+"'";
  1365 + countSql+= " AND A.AREA_COUNTY_ID= '" +areaId+"'";
1365 1366 }
1366 1367 if (StringUtils.isNotEmpty(hospitalId))
1367 1368 {
1368   - sql+=" AND C.YCY_STSTEM_ID= '" +hospitalId+"'";
1369   - countSql+=" AND C.YCY_STSTEM_ID= '" +hospitalId+"'";
  1369 + sql+=" AND A.YCY_STSTEM_ID= '" +hospitalId+"'";
  1370 + countSql+=" AND A.YCY_STSTEM_ID= '" +hospitalId+"'";
1370 1371 }
1371 1372 else
1372 1373 {
1373 1374 String hospitals = getPermissionStr(userId,provinceId,cityId,areaId);
1374 1375 if (StringUtils.isNotEmpty(hospitals))
1375 1376 {
1376   - sql+=" AND C.YCY_STSTEM_ID IN " +hospitals;
1377   - countSql+=" AND C.YCY_STSTEM_ID IN " +hospitals;
  1377 + sql+=" AND A.YCY_STSTEM_ID IN " +hospitals;
  1378 + countSql+=" AND A.YCY_STSTEM_ID IN " +hospitals;
1378 1379 }
1379 1380  
1380 1381 }