Commit 4cd336bd441027bbcb470f50884491c9255fbcc0
1 parent
b3f8d3fe9b
Exists in
master
and in
6 other branches
荣成接口
Showing 2 changed files with 21 additions and 13 deletions
platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/ConnTools.java
View file @
4cd336b
| ... | ... | @@ -9,26 +9,33 @@ |
| 9 | 9 | */ |
| 10 | 10 | public class ConnTools { |
| 11 | 11 | |
| 12 | + //测试环境 | |
| 12 | 13 | private static String dirverClassName = "com.mysql.jdbc.Driver"; |
| 13 | 14 | private static String url = "jdbc:mysql://119.90.57.26:3306/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8"; |
| 14 | 15 | private static String user = "platform"; |
| 15 | 16 | private static String password = "platform123"; |
| 16 | 17 | |
| 18 | + //荣成环境 | |
| 19 | + private static String rcdirverClassName = "com.mysql.jdbc.Driver"; | |
| 20 | + private static String rcurl = "jdbc:mysql://127.0.0.1:3306/platform_rc?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8"; | |
| 21 | + private static String rcuser = "platform_rc"; | |
| 22 | + private static String rcpassword = "platform_rc123"; | |
| 23 | + | |
| 17 | 24 | public static Connection makeConnection() { |
| 18 | 25 | Connection conn = null; |
| 19 | 26 | try { |
| 20 | - Class.forName(dirverClassName); | |
| 21 | - } catch (ClassNotFoundException e) { | |
| 22 | - e.printStackTrace(); | |
| 27 | + Class.forName(rcdirverClassName); | |
| 28 | + conn = DriverManager.getConnection(rcurl, rcuser, rcpassword); | |
| 29 | + } catch (Exception e) { | |
| 30 | + try { | |
| 31 | + Class.forName(dirverClassName); | |
| 32 | + conn = DriverManager.getConnection(url, user, password); | |
| 33 | + }catch (Exception e1) | |
| 34 | + { | |
| 35 | + System.out.println(e1.toString()); | |
| 36 | + } | |
| 23 | 37 | } |
| 24 | - try { | |
| 25 | - conn = DriverManager.getConnection(url, user, password); | |
| 26 | - } catch (SQLException e) { | |
| 27 | - e.printStackTrace(); | |
| 28 | - } | |
| 29 | 38 | return conn; |
| 30 | 39 | } |
| 31 | - | |
| 32 | - | |
| 33 | 40 | } |
platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/RcGlxtService.java
View file @
4cd336b
| ... | ... | @@ -84,8 +84,8 @@ |
| 84 | 84 | private static Map<String,String> CHECK_STATUS = new HashMap<>(); |
| 85 | 85 | private static Map<String,String> CHECK_TYPE = new HashMap<>(); |
| 86 | 86 | static{ |
| 87 | -// hospitalsMap.put("2100001785","371082007011");//荣成市人民医院 | |
| 88 | - hospitalsMap.put("216","216");//测试用的秦皇岛医院 | |
| 87 | + hospitalsMap.put("2100001785","371082007011");//荣成市人民医院 | |
| 88 | +// hospitalsMap.put("216","216");//测试用的秦皇岛医院 | |
| 89 | 89 | hospitalsMap.put("2100001818","371082006011");//荣成市石岛人民医院 |
| 90 | 90 | hospitalsMap.put("2100001772","371082007001");//荣成市中医院 |
| 91 | 91 | hospitalsMap.put("2100001750","371082000011");//荣成市妇幼保健院 |
| ... | ... | @@ -1343,6 +1343,7 @@ |
| 1343 | 1343 | patientsQuery1.setYn(YnEnums.YES.getId()); |
| 1344 | 1344 | patientsQuery1.setModifiedEnd(end); |
| 1345 | 1345 | patientsQuery1.setModifiedStart(start); |
| 1346 | + patientsQuery1.setHospitalList(hids); | |
| 1346 | 1347 | List<Patients> patientses = patientsService.queryPatient(patientsQuery1); |
| 1347 | 1348 | System.out.println("xxxxxxpatientses="+patientses.size()+"===="+patientsQuery1.convertToQuery().convertToMongoQuery().toString()); |
| 1348 | 1349 | if (org.apache.commons.collections.CollectionUtils.isNotEmpty(patientses)) |
| ... | ... | @@ -1471,7 +1472,7 @@ |
| 1471 | 1472 | //母婴阻断 |
| 1472 | 1473 | AntExChuQuery antExChuQuery = new AntExChuQuery(); |
| 1473 | 1474 | antExChuQuery.setYn(YnEnums.YES.getId()); |
| 1474 | - antExChuQuery.setHospitalList(getHids()); | |
| 1475 | + antExChuQuery.setHospitalList(hids); | |
| 1475 | 1476 | antExChuQuery.setModifiedStart(start); |
| 1476 | 1477 | antExChuQuery.setModifiedEnd(end); |
| 1477 | 1478 | List<AntExChuModel> antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); |