Commit 13d1293916711279291b7a97975540a9024396f4
1 parent
e805f99974
Exists in
master
and in
6 other branches
update code
Showing 1 changed file with 13 additions and 9 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
View file @
13d1293
... | ... | @@ -1085,7 +1085,8 @@ |
1085 | 1085 | " SUM(CASE WHEN B.NODE_NAME='28~36 孕周' THEN 1 ELSE 0 END) AS NUM_36,\n" + |
1086 | 1086 | " SUM(CASE WHEN B.NODE_NAME='37~ 分娩' THEN 1 ELSE 0 END) AS NUM_40\n" + |
1087 | 1087 | "FROM ODS_D_HOSPITAL A\n" + |
1088 | - "LEFT JOIN ODS_F_EXAMINE_HISTORY B ON A.HOSPITAL_NO=B.HOSPITAL_NO "; | |
1088 | + "LEFT JOIN ODS_F_EXAMINE_HISTORY B ON A.HOSPITAL_NO=B.HOSPITAL_NO "+ | |
1089 | + " INNER JOIN ODS_F_GRAVIDA_RECORD C ON B.RECORD_ID=C.RECORD_ID "; | |
1089 | 1090 | if (pointType != null && pointType == 1){ |
1090 | 1091 | countSql+=" AND B.NODE_ID=2 "; |
1091 | 1092 | } |
... | ... | @@ -1223,7 +1224,8 @@ |
1223 | 1224 | " SUM(CASE WHEN B.NODE_NAME='28~36 孕周' THEN 1 ELSE 0 END) AS NUM_36,\n" + |
1224 | 1225 | " SUM(CASE WHEN B.NODE_NAME='37~ 分娩' THEN 1 ELSE 0 END) AS NUM_40\n" + |
1225 | 1226 | " FROM ODS_D_HOSPITAL A\n" + |
1226 | - " LEFT JOIN ODS_F_EXAMINE_HISTORY B ON A.HOSPITAL_NO=B.HOSPITAL_NO "; | |
1227 | + " LEFT JOIN ODS_F_EXAMINE_HISTORY B ON A.HOSPITAL_NO=B.HOSPITAL_NO "+ | |
1228 | + " INNER JOIN ODS_F_GRAVIDA_RECORD C ON B.RECORD_ID=C.RECORD_ID "; | |
1227 | 1229 | if (pointType != null && pointType == 1){ |
1228 | 1230 | sql+=" AND B.NODE_ID=2 "; |
1229 | 1231 | } |
... | ... | @@ -1614,7 +1616,8 @@ |
1614 | 1616 | ResponseUtil.responseExcel(cnames,results,httpServletResponse); |
1615 | 1617 | } |
1616 | 1618 | |
1617 | - public void getCheckPointBuildDetailExport(String time, String hospitalId, String provinceId, String cityId, String areaId, Integer userId, HttpServletResponse httpServletResponse) { | |
1619 | + public void getCheckPointBuildDetailExport(String time, String hospitalId, String provinceId, String cityId, String areaId, | |
1620 | + Integer userId, HttpServletResponse httpServletResponse) { | |
1618 | 1621 | |
1619 | 1622 | String sql ="SELECT C.CREATE_DATE,\n" + |
1620 | 1623 | " C.NAME,\n" + |
... | ... | @@ -1627,7 +1630,8 @@ |
1627 | 1630 | " D.PROVINCE||D.CITY||D.AREA_COUNTY AS HJ_ADDR,\n" + |
1628 | 1631 | " C.TEL_NO\n" + |
1629 | 1632 | " FROM ODS_F_GRAVIDA_RECORD C " + |
1630 | - " INNER JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID"+ | |
1633 | + " INNER JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID" + | |
1634 | + " INNER JOIN ODS_D_HOSPITAL A ON C.HOSPITAL_NO=A.HOSPITAL_NO "+ | |
1631 | 1635 | " WHERE 1=1 "; |
1632 | 1636 | |
1633 | 1637 | |
1634 | 1638 | |
1635 | 1639 | |
1636 | 1640 | |
1637 | 1641 | |
... | ... | @@ -1639,28 +1643,28 @@ |
1639 | 1643 | } |
1640 | 1644 | if (StringUtils.isNotEmpty(provinceId)) |
1641 | 1645 | { |
1642 | - sql += " AND C.PROVINCE_ID= '"+provinceId+"'"; | |
1646 | + sql += " AND A.PROVINCE_ID= '"+provinceId+"'"; | |
1643 | 1647 | } |
1644 | 1648 | |
1645 | 1649 | if (StringUtils.isNotEmpty(cityId)) |
1646 | 1650 | { |
1647 | - sql+= " AND C.CITY_ID= '" +cityId+"'"; | |
1651 | + sql+= " AND A.CITY_ID= '" +cityId+"'"; | |
1648 | 1652 | } |
1649 | 1653 | |
1650 | 1654 | if (StringUtils.isNotEmpty(areaId)) |
1651 | 1655 | { |
1652 | - sql+= " AND C.AREA_COUNTY_ID= '" +areaId+"'"; | |
1656 | + sql+= " AND A.AREA_COUNTY_ID= '" +areaId+"'"; | |
1653 | 1657 | } |
1654 | 1658 | if (StringUtils.isNotEmpty(hospitalId)) |
1655 | 1659 | { |
1656 | - sql+=" AND C.YCY_STSTEM_ID= '" +hospitalId+"'"; | |
1660 | + sql+=" AND A.YCY_STSTEM_ID= '" +hospitalId+"'"; | |
1657 | 1661 | } |
1658 | 1662 | else |
1659 | 1663 | { |
1660 | 1664 | String hospitals = getPermissionStr(userId,provinceId,cityId,areaId); |
1661 | 1665 | if (StringUtils.isNotEmpty(hospitals)) |
1662 | 1666 | { |
1663 | - sql+=" AND C.YCY_STSTEM_ID IN " +hospitals; | |
1667 | + sql+=" AND A.YCY_STSTEM_ID IN " +hospitals; | |
1664 | 1668 | } |
1665 | 1669 | |
1666 | 1670 | } |