From 4cd336bd441027bbcb470f50884491c9255fbcc0 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 30 Oct 2018 09:14:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8D=A3=E6=88=90=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/hospitalapi/rcfy/ConnTools.java | 27 ++++++++++++++-------- .../com/lyms/hospitalapi/rcfy/RcGlxtService.java | 7 +++--- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/ConnTools.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/ConnTools.java index bfa9a0a..e0fa95f 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/ConnTools.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/ConnTools.java @@ -9,25 +9,32 @@ import java.sql.SQLException; */ public class ConnTools { + //测试环境 private static String dirverClassName = "com.mysql.jdbc.Driver"; private static String url = "jdbc:mysql://119.90.57.26:3306/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8"; private static String user = "platform"; private static String password = "platform123"; + //荣成环境 + private static String rcdirverClassName = "com.mysql.jdbc.Driver"; + private static String rcurl = "jdbc:mysql://127.0.0.1:3306/platform_rc?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8"; + private static String rcuser = "platform_rc"; + private static String rcpassword = "platform_rc123"; + public static Connection makeConnection() { Connection conn = null; try { - Class.forName(dirverClassName); - } catch (ClassNotFoundException e) { - e.printStackTrace(); - } - try { - conn = DriverManager.getConnection(url, user, password); - } catch (SQLException e) { - e.printStackTrace(); + Class.forName(rcdirverClassName); + conn = DriverManager.getConnection(rcurl, rcuser, rcpassword); + } catch (Exception e) { + try { + Class.forName(dirverClassName); + conn = DriverManager.getConnection(url, user, password); + }catch (Exception e1) + { + System.out.println(e1.toString()); + } } return conn; } - - } diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/RcGlxtService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/RcGlxtService.java index 50eaa15..1e1e9a0 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/RcGlxtService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/RcGlxtService.java @@ -84,8 +84,8 @@ public class RcGlxtService { private static Map CHECK_STATUS = new HashMap<>(); private static Map CHECK_TYPE = new HashMap<>(); static{ -// hospitalsMap.put("2100001785","371082007011");//荣成市人民医院 - hospitalsMap.put("216","216");//测试用的秦皇岛医院 + hospitalsMap.put("2100001785","371082007011");//荣成市人民医院 +// hospitalsMap.put("216","216");//测试用的秦皇岛医院 hospitalsMap.put("2100001818","371082006011");//荣成市石岛人民医院 hospitalsMap.put("2100001772","371082007001");//荣成市中医院 hospitalsMap.put("2100001750","371082000011");//荣成市妇幼保健院 @@ -1343,6 +1343,7 @@ public class RcGlxtService { patientsQuery1.setYn(YnEnums.YES.getId()); patientsQuery1.setModifiedEnd(end); patientsQuery1.setModifiedStart(start); + patientsQuery1.setHospitalList(hids); List patientses = patientsService.queryPatient(patientsQuery1); System.out.println("xxxxxxpatientses="+patientses.size()+"===="+patientsQuery1.convertToQuery().convertToMongoQuery().toString()); if (org.apache.commons.collections.CollectionUtils.isNotEmpty(patientses)) @@ -1471,7 +1472,7 @@ public class RcGlxtService { //母婴阻断 AntExChuQuery antExChuQuery = new AntExChuQuery(); antExChuQuery.setYn(YnEnums.YES.getId()); - antExChuQuery.setHospitalList(getHids()); + antExChuQuery.setHospitalList(hids); antExChuQuery.setModifiedStart(start); antExChuQuery.setModifiedEnd(end); List antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); -- 1.8.3.1