1、修改数据库连接，支持长兴和台州

kernel/src/test/java/com/lantone/qc/kernel/ChangxDataImportApiTest.java

@@ -105,16 +105,16 @@ public class ChangxDataImportApiTest {
         for (Map.Entry<String, String> entry : patientMap.entrySet()) {
             List<PatientText> patientTexts = new ArrayList<>();
             //病人的病案首页内容
-            List<Map<String, Object>> homePageList = DataTest.loadHomePage(tableMap.get("BR_RECHOME"), entry.getKey());
+            List<Map<String, Object>> homePageList = DataTest.loadHomePage(hospitalId, tableMap.get("BR_RECHOME"), entry.getKey());
             if (homePageList == null || homePageList.isEmpty()) { //没病案首页直接不导入
                 deletePatient.add(entry.getKey()); //没病案首页的患者也要删除
                 continue;
             }
             Map<String, Object> homePageMap = homePageList.get(0);
-            homePageMap.put("出院诊断", FastJsonUtils.getBeanToJson(DataTest.loadHomePageDiagnose(tableMap.get("BR_RECDIAGNOSE"),"2", entry.getKey())).replaceAll("\"", "'"));
-            homePageMap.put("损伤、中毒外部原因", FastJsonUtils.getBeanToJson(DataTest.loadHomePageDiagnose(tableMap.get("BR_RECDIAGNOSE"),"3", entry.getKey())).replaceAll("\"", "'"));
-            homePageMap.put("病理诊断", FastJsonUtils.getBeanToJson(DataTest.loadHomePageDiagnose(tableMap.get("BR_RECDIAGNOSE"), "4", entry.getKey())).replaceAll("\"", "'"));
-            homePageMap.put("手术信息", FastJsonUtils.getBeanToJson(DataTest.loadHomePageOperation(tableMap.get("BR_RECOPERATION"), tableMap.get("GI_USERINFO"), entry.getKey())).replaceAll("\"", "'"));
+            homePageMap.put("出院诊断", FastJsonUtils.getBeanToJson(DataTest.loadHomePageDiagnose(hospitalId, tableMap.get("BR_RECDIAGNOSE"),"2", entry.getKey())).replaceAll("\"", "'"));
+            homePageMap.put("损伤、中毒外部原因", FastJsonUtils.getBeanToJson(DataTest.loadHomePageDiagnose(hospitalId, tableMap.get("BR_RECDIAGNOSE"),"3", entry.getKey())).replaceAll("\"", "'"));
+            homePageMap.put("病理诊断", FastJsonUtils.getBeanToJson(DataTest.loadHomePageDiagnose(hospitalId, tableMap.get("BR_RECDIAGNOSE"), "4", entry.getKey())).replaceAll("\"", "'"));
+            homePageMap.put("手术信息", FastJsonUtils.getBeanToJson(DataTest.loadHomePageOperation(hospitalId, tableMap.get("BR_RECOPERATION"), tableMap.get("GI_USERINFO"), entry.getKey())).replaceAll("\"", "'"));
 
             Map<String, Object> firstPageTextMap = new HashMap<>();
             firstPageTextMap.put("case_number", entry.getKey());
@@ -141,7 +141,7 @@ public class ChangxDataImportApiTest {
             list.add(firstPageTextMap);
 
             //病人医嘱信息
-            List<Map<String, Object>> docAdviceMap = DataTest.loadHomePage(tableMap.get("BR_DOCTADVICE"), entry.getKey());
+            List<Map<String, Object>> docAdviceMap = DataTest.loadHomePage(hospitalId, tableMap.get("BR_DOCTADVICE"), entry.getKey());
             for (Map<String, Object> docMap : docAdviceMap) {
                 Map<String, Object> docAdviceTextMap = new HashMap<>();
                 docAdviceTextMap.put("case_number", entry.getKey());

kernel/src/test/java/com/lantone/qc/kernel/DataTest.java

@@ -21,13 +21,13 @@ public class DataTest {
 
     }
 
-    public static List<Map<String, Object>> loadHomePage(String tableName, String patientId) {
+    public static List<Map<String, Object>> loadHomePage(String hospitalId, String tableName, String patientId) {
         Connection conn = null;
         Statement stmt = null;
         ResultSet rs = null;
         List<Map<String, Object>> resultList = null;
         try {
-            conn = getConnection();
+            conn = getConnection(hospitalId);
             stmt = conn.createStatement();
 
             DatabaseMetaData dmd = conn.getMetaData();
@@ -64,13 +64,13 @@ public class DataTest {
         return resultList;
     }
 
-    public static List<Map<String, String>> loadHomePageDiagnose(String tableName, String zdlbdm, String patientId) {
+    public static List<Map<String, String>> loadHomePageDiagnose(String hospitalId, String tableName, String zdlbdm, String patientId) {
         Connection conn = null;
         Statement stmt = null;
         ResultSet rs = null;
         List<Map<String, String>> resultList = new ArrayList<>();
         try {
-            conn = getConnection();
+            conn = getConnection(hospitalId);
             stmt = conn.createStatement();
             if (zdlbdm.equals("1")) {
                 zdlbdm = "'门诊诊断'";
@@ -111,13 +111,13 @@ public class DataTest {
         return resultList;
     }
 
-    public static List<Map<String, String>> loadHomePageOperation(String tableNameOperation, String tableNameUser, String patientId) {
+    public static List<Map<String, String>> loadHomePageOperation(String hospitalId, String tableNameOperation, String tableNameUser, String patientId) {
         Connection conn = null;
         Statement stmt = null;
         ResultSet rs = null;
         List<Map<String, String>> resultList = new ArrayList<>();
         try {
-            conn = getConnection();
+            conn = getConnection(hospitalId);
             stmt = conn.createStatement();
             rs = stmt.executeQuery("SELECT r.BASYID, r.brssxh, r.BRSSRQ, r.BRSSMC, SSDMID, r.QKDJDM, r.YHDJDM, SSYSID, \n" +
                     "U1.YHRYMC, r.YZHSID, u3.yhrymc, r.MZYSID, u2.yhrymc, r.MZFFMC  FROM " + tableNameOperation + " r\n" +
@@ -181,15 +181,25 @@ public class DataTest {
         return resultList;
     }
 
-    private static Connection getConnection() throws Exception {
+    private static Connection getConnection(String hospitalId) throws Exception {
         PropertiesUtil propertiesUtil = new PropertiesUtil("kernel.properties");
         Class.forName(propertiesUtil.getProperty("oracle.test.driver"));
 
-        Properties props = new Properties();
-        String url = propertiesUtil.getProperty("oracle.test.url");
-        // 127.0.0.1是本机地址，1521是Oracle默认连接端口，DATABASE_NAME为实例名（SID）
-        String user = propertiesUtil.getProperty("oracle.test.user");// 用户系统默认的账户名
-        String password = propertiesUtil.getProperty("oracle.test.password");// 你安装时选设置的密码
+        String url = "";
+        String user = "";
+        String password = "";
+                Properties props = new Properties();
+        if ("1".equals(hospitalId)) {
+            url = propertiesUtil.getProperty("oracle.test.url");
+            // 127.0.0.1是本机地址，1521是Oracle默认连接端口，DATABASE_NAME为实例名（SID）
+            user = propertiesUtil.getProperty("oracle.test.user");// 用户系统默认的账户名
+            password = propertiesUtil.getProperty("oracle.test.password");// 你安装时选设置的密码
+        } else if ("3".equals(hospitalId)) {
+            url = propertiesUtil.getProperty("oracle.taizhou.url");
+            // 127.0.0.1是本机地址，1521是Oracle默认连接端口，DATABASE_NAME为实例名（SID）
+            user = propertiesUtil.getProperty("oracle.taizhou.user");// 用户系统默认的账户名
+            password = propertiesUtil.getProperty("oracle.taizhou.password");// 你安装时选设置的密码
+        }
         props.put("user", user);
         props.put("password", password);
         props.put("defaultRowPrefetch", "15");

kernel/src/test/java/com/lantone/qc/kernel/TaizDataImportApiTest.java

@@ -62,7 +62,7 @@ public class TaizDataImportApiTest {
     }
 
     public static void main(String[] args) {
-        String patientId = "223344_6";
+        String patientId = "10005071_6";
 
         TaizDataImportApiTest test = new TaizDataImportApiTest();
         initTableMap();
@@ -109,16 +109,16 @@ public class TaizDataImportApiTest {
         for (Map.Entry<String, String> entry : patientMap.entrySet()) {
             List<PatientText> patientTexts = new ArrayList<>();
             //病人的病案首页内容
-            List<Map<String, Object>> homePageList = DataTest.loadHomePage(tableMap.get("BR_RECHOME"), entry.getKey());
+            List<Map<String, Object>> homePageList = DataTest.loadHomePage(hospitalId, tableMap.get("BR_RECHOME"), entry.getKey());
             if (homePageList == null || homePageList.isEmpty()) { //没病案首页直接不导入
                 deletePatient.add(entry.getKey()); //没病案首页的患者也要删除
                 continue;
             }
             Map<String, Object> homePageMap = homePageList.get(0);
-            homePageMap.put("出院诊断", FastJsonUtils.getBeanToJson(DataTest.loadHomePageDiagnose(tableMap.get("BR_RECDIAGNOSE"),"2", entry.getKey())).replaceAll("\"", "'"));
-            homePageMap.put("损伤、中毒外部原因", FastJsonUtils.getBeanToJson(DataTest.loadHomePageDiagnose(tableMap.get("BR_RECDIAGNOSE"),"3", entry.getKey())).replaceAll("\"", "'"));
-            homePageMap.put("病理诊断", FastJsonUtils.getBeanToJson(DataTest.loadHomePageDiagnose(tableMap.get("BR_RECDIAGNOSE"), "4", entry.getKey())).replaceAll("\"", "'"));
-            homePageMap.put("手术信息", FastJsonUtils.getBeanToJson(DataTest.loadHomePageOperation(tableMap.get("BR_RECOPERATION"), tableMap.get("GI_USERINFO"), entry.getKey())).replaceAll("\"", "'"));
+            homePageMap.put("出院诊断", FastJsonUtils.getBeanToJson(DataTest.loadHomePageDiagnose(hospitalId, tableMap.get("BR_RECDIAGNOSE"),"2", entry.getKey())).replaceAll("\"", "'"));
+            homePageMap.put("损伤、中毒外部原因", FastJsonUtils.getBeanToJson(DataTest.loadHomePageDiagnose(hospitalId, tableMap.get("BR_RECDIAGNOSE"),"3", entry.getKey())).replaceAll("\"", "'"));
+            homePageMap.put("病理诊断", FastJsonUtils.getBeanToJson(DataTest.loadHomePageDiagnose(hospitalId, tableMap.get("BR_RECDIAGNOSE"), "4", entry.getKey())).replaceAll("\"", "'"));
+            homePageMap.put("手术信息", FastJsonUtils.getBeanToJson(DataTest.loadHomePageOperation(hospitalId, tableMap.get("BR_RECOPERATION"), tableMap.get("GI_USERINFO"), entry.getKey())).replaceAll("\"", "'"));
 
             Map<String, Object> firstPageTextMap = new HashMap<>();
             firstPageTextMap.put("case_number", entry.getKey());
@@ -145,7 +145,7 @@ public class TaizDataImportApiTest {
             list.add(firstPageTextMap);
 
             //病人医嘱信息
-            List<Map<String, Object>> docAdviceMap = DataTest.loadHomePage(tableMap.get("BR_DOCTADVICE"), entry.getKey());
+            List<Map<String, Object>> docAdviceMap = DataTest.loadHomePage(hospitalId, tableMap.get("BR_DOCTADVICE"), entry.getKey());
             for (Map<String, Object> docMap : docAdviceMap) {
                 Map<String, Object> docAdviceTextMap = new HashMap<>();
                 docAdviceTextMap.put("case_number", entry.getKey());