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 2dbb3ea..be176c8 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 @@ -1085,7 +1085,8 @@ public class AreaCountFacade { " 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 "; + "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 "; } @@ -1223,7 +1224,8 @@ public class AreaCountFacade { " 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 "; + " 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){ sql+=" AND B.NODE_ID=2 "; } @@ -1614,7 +1616,8 @@ public class AreaCountFacade { ResponseUtil.responseExcel(cnames,results,httpServletResponse); } - public void getCheckPointBuildDetailExport(String time, String hospitalId, String provinceId, String cityId, String areaId, Integer userId, HttpServletResponse httpServletResponse) { + public void getCheckPointBuildDetailExport(String time, String hospitalId, String provinceId, String cityId, String areaId, + Integer userId, HttpServletResponse httpServletResponse) { String sql ="SELECT C.CREATE_DATE,\n" + " C.NAME,\n" + @@ -1627,7 +1630,8 @@ public class AreaCountFacade { " D.PROVINCE||D.CITY||D.AREA_COUNTY AS HJ_ADDR,\n" + " C.TEL_NO\n" + " FROM ODS_F_GRAVIDA_RECORD C " + - " INNER JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID"+ + " INNER JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID" + + " INNER JOIN ODS_D_HOSPITAL A ON C.HOSPITAL_NO=A.HOSPITAL_NO "+ " WHERE 1=1 "; @@ -1639,28 +1643,28 @@ public class AreaCountFacade { } if (StringUtils.isNotEmpty(provinceId)) { - sql += " AND C.PROVINCE_ID= '"+provinceId+"'"; + sql += " AND A.PROVINCE_ID= '"+provinceId+"'"; } if (StringUtils.isNotEmpty(cityId)) { - sql+= " AND C.CITY_ID= '" +cityId+"'"; + sql+= " AND A.CITY_ID= '" +cityId+"'"; } if (StringUtils.isNotEmpty(areaId)) { - sql+= " AND C.AREA_COUNTY_ID= '" +areaId+"'"; + sql+= " AND A.AREA_COUNTY_ID= '" +areaId+"'"; } if (StringUtils.isNotEmpty(hospitalId)) { - sql+=" AND C.YCY_STSTEM_ID= '" +hospitalId+"'"; + sql+=" AND A.YCY_STSTEM_ID= '" +hospitalId+"'"; } else { String hospitals = getPermissionStr(userId,provinceId,cityId,areaId); if (StringUtils.isNotEmpty(hospitals)) { - sql+=" AND C.YCY_STSTEM_ID IN " +hospitals; + sql+=" AND A.YCY_STSTEM_ID IN " +hospitals; } }