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 1f62b9e..403fd52 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 @@ -561,6 +561,8 @@ public class AreaCountFacade { pageSql+=sql; pageSql+=") A WHERE ROWNUM <= " + end + " ) WHERE RN >= " + start; + System.out.println("pageSql===="+pageSql); + System.out.println("countSql====" + sqlCount); List> ticketList = JdbcUtil.getOracleListDataBySql(DRIVER, JDBC, NAME, PWD, pageSql); int count = 0; Object totalCountObj = JdbcUtil.getOralceSingleObjBySql(DRIVER, JDBC, NAME, PWD, sqlCount); @@ -695,25 +697,25 @@ public class AreaCountFacade { allHospitalList.addAll(hospitalList); return allHospitalList; } -// //条件查询未空就返回条件查询的结果 -// if (CollectionUtils.isEmpty(orgHospitalList)) -// { -// return orgHospitalList; -// } -// -// //取所拥有的医院和查询条件查询的医院的交集 -// if (CollectionUtils.isNotEmpty(allHospitalList)) -// { -// for(String hp : allHospitalList) -// { -// if (orgHospitalList.contains(hp)) -// { -// hospitalList.add(hp); -// } -// } -// } -// return hospitalList; - return orgHospitalList; + //条件查询未空就返回条件查询的结果 + if (CollectionUtils.isEmpty(orgHospitalList)) + { + return orgHospitalList; + } + + //取所拥有的医院和查询条件查询的医院的交集 + if (CollectionUtils.isNotEmpty(allHospitalList)) + { + for(String hp : allHospitalList) + { + if (orgHospitalList.contains(hp)) + { + hospitalList.add(hp); + } + } + } + return hospitalList; +// return orgHospitalList; } /** @@ -779,6 +781,8 @@ public class AreaCountFacade { } sql+=" ) AA ON C.RECORD_ID=AA.RECORD_ID INNER JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID"; + + System.out.println("sql===="+sql); List> ticketList = JdbcUtil.getOracleListDataBySql(DRIVER, JDBC, NAME, PWD, sql); List> results = new ArrayList<>(); @@ -879,6 +883,7 @@ public class AreaCountFacade { } } + System.out.println("sql===="+sql); List> ticketList = JdbcUtil.getOracleListDataBySql(DRIVER, JDBC, NAME, PWD, sql); List> results = new ArrayList<>(); @@ -911,7 +916,7 @@ public class AreaCountFacade { cnames.put("hospitalName","产检机构"); //产检机构 cnames.put("doctorName","产检医生"); //产检医生 cnames.put("ffHospitalName","产检券发放机构"); //产检券发放机构 - cnames.put("telNo","联系电话"); //联系电话 + cnames.put("telNo", "联系电话"); //联系电话 ResponseUtil.responseExcel(cnames,results,httpServletResponse); } @@ -1268,7 +1273,8 @@ public class AreaCountFacade { " A.YCY_STSTEM_ID\n" + " ) BB ON AA.HOSPITAL_NO=BB.HOSPITAL_NO\n" + " ORDER BY 1,2,3"; - + System.out.println("sql===="+sql); + System.out.println("countSql===="+countSql); List chartData = new ArrayList<>(); List num12 = new ArrayList<>(); @@ -1498,6 +1504,9 @@ public class AreaCountFacade { } sql+=") A WHERE ROWNUM <= " + end + " ) WHERE RN >= " + start; + + System.out.println("sql===="+sql); + System.out.println("countSql===="+countSql); int count = 0; Object totalCountObj = JdbcUtil.getOralceSingleObjBySql(DRIVER, JDBC, NAME, PWD, countSql); if (totalCountObj != null) @@ -1569,6 +1578,8 @@ public class AreaCountFacade { } } + + System.out.println("sql===="+sql); List> ticketList = JdbcUtil.getOracleListDataBySql(DRIVER, JDBC, NAME, PWD, sql); List> results = new ArrayList<>(); @@ -1652,6 +1663,8 @@ public class AreaCountFacade { } } + + System.out.println("sql===="+sql); List> ticketList = JdbcUtil.getOracleListDataBySql(DRIVER, JDBC, NAME, PWD, sql); List> results = new ArrayList<>();