jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 7a25f45e753c09a60b17e16139f018bc7ce1afda

Authored by liquanyu
1 parent fafefa3710
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update code

Showing 1 changed file with 34 additions and 21 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java View file @ 7a25f45
... ... @@ -561,6 +561,8 @@
561 561 pageSql+=sql;
562 562 pageSql+=") A WHERE ROWNUM <= " + end + " ) WHERE RN >= " + start;
563 563  
  564 + System.out.println("pageSql===="+pageSql);
  565 + System.out.println("countSql====" + sqlCount);
564 566 List<Map<String, Object>> ticketList = JdbcUtil.getOracleListDataBySql(DRIVER, JDBC, NAME, PWD, pageSql);
565 567 int count = 0;
566 568 Object totalCountObj = JdbcUtil.getOralceSingleObjBySql(DRIVER, JDBC, NAME, PWD, sqlCount);
... ... @@ -695,25 +697,25 @@
695 697 allHospitalList.addAll(hospitalList);
696 698 return allHospitalList;
697 699 }
698   -// //条件查询未空就返回条件查询的结果
699   -// if (CollectionUtils.isEmpty(orgHospitalList))
700   -// {
701   -// return orgHospitalList;
702   -// }
703   -//
704   -// //取所拥有的医院和查询条件查询的医院的交集
705   -// if (CollectionUtils.isNotEmpty(allHospitalList))
706   -// {
707   -// for(String hp : allHospitalList)
708   -// {
709   -// if (orgHospitalList.contains(hp))
710   -// {
711   -// hospitalList.add(hp);
712   -// }
713   -// }
714   -// }
715   -// return hospitalList;
716   - return orgHospitalList;
  700 + //条件查询未空就返回条件查询的结果
  701 + if (CollectionUtils.isEmpty(orgHospitalList))
  702 + {
  703 + return orgHospitalList;
  704 + }
  705 +
  706 + //取所拥有的医院和查询条件查询的医院的交集
  707 + if (CollectionUtils.isNotEmpty(allHospitalList))
  708 + {
  709 + for(String hp : allHospitalList)
  710 + {
  711 + if (orgHospitalList.contains(hp))
  712 + {
  713 + hospitalList.add(hp);
  714 + }
  715 + }
  716 + }
  717 + return hospitalList;
  718 +// return orgHospitalList;
717 719 }
718 720  
719 721 /**
... ... @@ -779,6 +781,8 @@
779 781  
780 782 }
781 783 sql+=" ) AA ON C.RECORD_ID=AA.RECORD_ID INNER JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID";
  784 +
  785 + System.out.println("sql===="+sql);
782 786 List<Map<String, Object>> ticketList = JdbcUtil.getOracleListDataBySql(DRIVER, JDBC, NAME, PWD, sql);
783 787  
784 788 List<Map<String,Object>> results = new ArrayList<>();
... ... @@ -879,6 +883,7 @@
879 883 }
880 884  
881 885 }
  886 + System.out.println("sql===="+sql);
882 887 List<Map<String, Object>> ticketList = JdbcUtil.getOracleListDataBySql(DRIVER, JDBC, NAME, PWD, sql);
883 888  
884 889 List<Map<String,Object>> results = new ArrayList<>();
... ... @@ -911,7 +916,7 @@
911 916 cnames.put("hospitalName","产检机构"); //产检机构
912 917 cnames.put("doctorName","产检医生"); //产检医生
913 918 cnames.put("ffHospitalName","产检券发放机构"); //产检券发放机构
914   - cnames.put("telNo","联系电话"); //联系电话
  919 + cnames.put("telNo", "联系电话"); //联系电话
915 920  
916 921 ResponseUtil.responseExcel(cnames,results,httpServletResponse);
917 922 }
918 923  
... ... @@ -1268,8 +1273,9 @@
1268 1273 " A.YCY_STSTEM_ID\n" +
1269 1274 " ) BB ON AA.HOSPITAL_NO=BB.HOSPITAL_NO\n" +
1270 1275 " ORDER BY 1,2,3";
  1276 + System.out.println("sql===="+sql);
  1277 + System.out.println("countSql===="+countSql);
1271 1278  
1272   -
1273 1279 List<String> chartData = new ArrayList<>();
1274 1280 List<Integer> num12 = new ArrayList<>();
1275 1281 List<Integer> num20 = new ArrayList<>();
... ... @@ -1498,6 +1504,9 @@
1498 1504  
1499 1505 }
1500 1506 sql+=") A WHERE ROWNUM <= " + end + " ) WHERE RN >= " + start;
  1507 +
  1508 + System.out.println("sql===="+sql);
  1509 + System.out.println("countSql===="+countSql);
1501 1510 int count = 0;
1502 1511 Object totalCountObj = JdbcUtil.getOralceSingleObjBySql(DRIVER, JDBC, NAME, PWD, countSql);
1503 1512 if (totalCountObj != null)
... ... @@ -1569,6 +1578,8 @@
1569 1578 }
1570 1579  
1571 1580 }
  1581 +
  1582 + System.out.println("sql===="+sql);
1572 1583 List<Map<String, Object>> ticketList = JdbcUtil.getOracleListDataBySql(DRIVER, JDBC, NAME, PWD, sql);
1573 1584  
1574 1585 List<Map<String,Object>> results = new ArrayList<>();
... ... @@ -1652,6 +1663,8 @@
1652 1663 }
1653 1664  
1654 1665 }
  1666 +
  1667 + System.out.println("sql===="+sql);
1655 1668 List<Map<String, Object>> ticketList = JdbcUtil.getOracleListDataBySql(DRIVER, JDBC, NAME, PWD, sql);
1656 1669  
1657 1670 List<Map<String,Object>> results = new ArrayList<>();