Commit 1443fa37341c53beb5bf64033e940f9c0cbd4ef3
1 parent
2d03d8233e
Exists in
master
and in
6 other branches
儿童保健查看页面修改
Showing 1 changed file with 9 additions and 10 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
View file @
1443fa3
| ... | ... | @@ -158,7 +158,7 @@ |
| 158 | 158 | { |
| 159 | 159 | String start = time.split(" - ")[0]; |
| 160 | 160 | String end = time.split(" - ")[1]; |
| 161 | - examineSql+=" AND C.EXAMINE_DATE BETWEEN TO_DATE('"+start+"','yyyy-mm-dd') AND TO_DATE('"+end+"','yyyy-mm-dd')"; | |
| 161 | + examineSql+=" AND CC.EXAMINE_DATE BETWEEN TO_DATE('"+start+"','yyyy-mm-dd') AND TO_DATE('"+end+"','yyyy-mm-dd')"; | |
| 162 | 162 | } |
| 163 | 163 | if (StringUtils.isNotEmpty(provinceId)) |
| 164 | 164 | { |
| 165 | 165 | |
| ... | ... | @@ -432,11 +432,10 @@ |
| 432 | 432 | "INNER JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID ) A WHERE ROWNUM <= " + end + " ) WHERE RN >= " + start; |
| 433 | 433 | sqlCount+=" ) AA ON C.RECORD_ID=AA.RECORD_ID " + |
| 434 | 434 | "INNER JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID"; |
| 435 | - //产检使用统计 | |
| 436 | - List<Map<String, Object>> ticketList = JdbcUtil.getOracleListDataBySql(DRIVER, JDBC, NAME, PWD, sql); | |
| 437 | 435 | |
| 438 | - List<Map<String,Object>> resultDate = new ArrayList<>(); | |
| 439 | - | |
| 436 | + System.out.println("sql========="+sql); | |
| 437 | + System.out.println("sqlCount===="+sql); | |
| 438 | + List<Map<String, Object>> ticketList = JdbcUtil.getOracleListDataBySql(DRIVER, JDBC, NAME, PWD, sql); | |
| 440 | 439 | int count = 0; |
| 441 | 440 | Object totalCountObj = JdbcUtil.getOralceSingleObjBySql(DRIVER, JDBC, NAME, PWD, sqlCount); |
| 442 | 441 | if (totalCountObj != null) |
| ... | ... | @@ -445,7 +444,7 @@ |
| 445 | 444 | } |
| 446 | 445 | |
| 447 | 446 | PageInfo pageInfo = new PageInfo(page, 0, count, limit); |
| 448 | - return new BaseListResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(resultDate).setPageInfo(pageInfo); | |
| 447 | + return new BaseListResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(ticketList).setPageInfo(pageInfo); | |
| 449 | 448 | } |
| 450 | 449 | |
| 451 | 450 | public BaseResponse getTicketUseDetail(String time, String hospitalId, String provinceId, String cityId, String areaId, Integer page, Integer limit, Integer userId) { |
| ... | ... | @@ -570,8 +569,7 @@ |
| 570 | 569 | } |
| 571 | 570 | } |
| 572 | 571 | sb.append(")"); |
| 573 | - return ""; | |
| 574 | - //return sb.toString(); | |
| 572 | + return sb.toString(); | |
| 575 | 573 | } |
| 576 | 574 | return null; |
| 577 | 575 | |
| ... | ... | @@ -633,8 +631,9 @@ |
| 633 | 631 | } |
| 634 | 632 | else |
| 635 | 633 | { |
| 636 | - //没有查询条件 就返回所有的权限 | |
| 637 | - return allHospitalList; | |
| 634 | + //没有查询条件 就返回所有的权限 并且加上自己的医院id | |
| 635 | + allHospitalList.addAll(hospitalList); | |
| 636 | + return allHospitalList; | |
| 638 | 637 | } |
| 639 | 638 | //条件查询未空就返回条件查询的结果 |
| 640 | 639 | if (CollectionUtils.isEmpty(orgHospitalList)) |