From 1443fa37341c53beb5bf64033e940f9c0cbd4ef3 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 22 Mar 2017 16:16:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E4=BF=9D=E5=81=A5=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/AreaCountFacade.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) 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 c528919..96c169f 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 @@ -158,7 +158,7 @@ public class AreaCountFacade { { String start = time.split(" - ")[0]; String end = time.split(" - ")[1]; - examineSql+=" AND C.EXAMINE_DATE BETWEEN TO_DATE('"+start+"','yyyy-mm-dd') AND TO_DATE('"+end+"','yyyy-mm-dd')"; + examineSql+=" AND CC.EXAMINE_DATE BETWEEN TO_DATE('"+start+"','yyyy-mm-dd') AND TO_DATE('"+end+"','yyyy-mm-dd')"; } if (StringUtils.isNotEmpty(provinceId)) { @@ -432,11 +432,10 @@ public class AreaCountFacade { "INNER JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID ) A WHERE ROWNUM <= " + end + " ) WHERE RN >= " + start; sqlCount+=" ) AA ON C.RECORD_ID=AA.RECORD_ID " + "INNER JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID"; - //产检使用统计 - List> ticketList = JdbcUtil.getOracleListDataBySql(DRIVER, JDBC, NAME, PWD, sql); - - List> resultDate = new ArrayList<>(); + System.out.println("sql========="+sql); + System.out.println("sqlCount===="+sql); + List> ticketList = JdbcUtil.getOracleListDataBySql(DRIVER, JDBC, NAME, PWD, sql); int count = 0; Object totalCountObj = JdbcUtil.getOralceSingleObjBySql(DRIVER, JDBC, NAME, PWD, sqlCount); if (totalCountObj != null) @@ -445,7 +444,7 @@ public class AreaCountFacade { } PageInfo pageInfo = new PageInfo(page, 0, count, limit); - return new BaseListResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(resultDate).setPageInfo(pageInfo); + return new BaseListResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(ticketList).setPageInfo(pageInfo); } public BaseResponse getTicketUseDetail(String time, String hospitalId, String provinceId, String cityId, String areaId, Integer page, Integer limit, Integer userId) { @@ -570,8 +569,7 @@ public class AreaCountFacade { } } sb.append(")"); - return ""; - //return sb.toString(); + return sb.toString(); } return null; @@ -633,8 +631,9 @@ public class AreaCountFacade { } else { - //没有查询条件 就返回所有的权限 - return allHospitalList; + //没有查询条件 就返回所有的权限 并且加上自己的医院id + allHospitalList.addAll(hospitalList); + return allHospitalList; } //条件查询未空就返回条件查询的结果 if (CollectionUtils.isEmpty(orgHospitalList)) -- 1.8.3.1