1、修改从华卓new数据库里面导入测试病历号

kernel/src/main/resources/kernel.properties

@@ -8,6 +8,6 @@ mysql.test.password = lantone
 mysql.test.url = jdbc:mysql://192.168.2.236:3306/sys-qctest?useUnicode=true&characterEncoding=UTF-8
 
 oracle.test.driver = oracle.jdbc.driver.OracleDriver
-oracle.test.user = ETRACKMRQC
-oracle.test.password = ETRACKMRQC
+oracle.test.user = ETRACKMRQCNEW
+oracle.test.password = ETRACKMRQCNEW
 oracle.test.url = jdbc:oracle:thin:@192.168.2.246:1521:orcl

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

@@ -37,13 +37,16 @@ public class TaizDataImportApiTest {
 
     private static void initTableMap() {
         if (cid.equals("changx")) {
-            tableMap.put("BR_INPATIENTINFO", "BR_INPATIENTINFO_CX");//患者信息
-            tableMap.put("GI_USERINFO", "GI_USERINFO_CX"); //医生
-            tableMap.put("HI_DEPTINFO", "HI_DEPTINFO_CX");//科室
-            tableMap.put("BR_RECHOME", "BR_RECHOME_CX");//病案首页
-            tableMap.put("BR_RECDIAGNOSE", "BR_RECDIAGNOSE_CX");//病案首页--出院诊断 门急诊诊断
-            tableMap.put("BR_DOCTADVICE", "BR_DOCTADVICE_CX");//医嘱
-            tableMap.put("BR_RECOPERATION", "BR_RECOPERATION_CX");//病案首页--手术
+            tableMap.put("BR_INPATIENTINFO", "BR_INPATIENTINFO");//患者信息
+            tableMap.put("MR_MEDICALRECORDS", "MR_MEDICALRECORDS");//病案首页--手术
+            tableMap.put("AR_MEDIRECCLASS", "AR_MEDIRECCLASS");//病案首页--手术
+            tableMap.put("MR_MRCONTENT", "MR_MRCONTENT");//病案首页--手术
+            tableMap.put("GI_USERINFO", "GI_USERINFO"); //医生
+            tableMap.put("HI_DEPTINFO", "HI_DEPTINFO");//科室
+            tableMap.put("BR_RECHOME", "BR_RECHOME");//病案首页
+            tableMap.put("BR_RECDIAGNOSE", "BR_RECDIAGNOSE");//病案首页--出院诊断 门急诊诊断
+            tableMap.put("BR_DOCTADVICE", "BR_DOCTADVICE");//医嘱
+            tableMap.put("BR_RECOPERATION", "BR_RECOPERATION");//病案首页--手术
         } else if (cid.equals("taizhou")) {
             tableMap.put("BR_INPATIENTINFO", "BR_INPATIENTINFO_TZ");
             tableMap.put("GI_USERINFO", "GI_USERINFO_TZ");
@@ -56,16 +59,18 @@ public class TaizDataImportApiTest {
     }
 
     public static void main(String[] args) {
+        String patientId = "ZY010000650197";
+
         TaizDataImportApiTest test = new TaizDataImportApiTest();
         initTableMap();
         //模块映射
         test.loadModelHospital();
         //患者信息
-        test.insertPatient(test.loadOraclePatients(tableMap.get("BR_INPATIENTINFO")));
+        test.insertPatient(test.loadOraclePatients(tableMap.get("BR_INPATIENTINFO"), patientId));
 //        test.insertDoctor(test.loadOracleDoctorInfos(tableMap.get("GI_USERINFO"), tableMap.get("HI_DEPTINFO")));
 
         //病人流水号获取    病历号--->id
-        Map<String, String> patientMap = test.loadPatients(hospitalId);
+        Map<String, String> patientMap = test.loadPatients(hospitalId, patientId);
         //model-->id
         Map<String, String> modelMap = test.loadModel();
         test.insertPatientText(patientMap, modelMap);
@@ -79,7 +84,7 @@ public class TaizDataImportApiTest {
             patientMap.put("hospital_id", hospitalId);
             list.add(patientMap);
         }
-        initMysqlJdbc().insert(list, "qc_cases_number_copy", new String[]{"hospital_id", "case_number"});
+        initMysqlJdbc().insert(list, "qc_cases_number", new String[]{"hospital_id", "case_number"});
     }
 
     private void insertDoctor(List<Doctor> doctors) {
@@ -181,7 +186,7 @@ public class TaizDataImportApiTest {
                 list.add(patientTextMap);
             }
         }
-        initMysqlJdbc().insert(list, "qc_model_mapping_copy", new String[]{"case_number", "case_number_id", "origin_text", "mode_id", "text", "origin_mode"});
+        initMysqlJdbc().insert(list, "qc_model_mapping", new String[]{"case_number", "case_number_id", "origin_text", "mode_id", "text", "origin_mode"});
 
         deletePatientInfos(deletePatient);
     }
@@ -214,6 +219,10 @@ public class TaizDataImportApiTest {
     }
 
     private List<Patient> loadOraclePatients(String tableName) {
+        return loadOraclePatients(tableName, "");
+    }
+
+    private List<Patient> loadOraclePatients(String tableName, String patientId) {
         MysqlJdbc mysqlJdbc = initOracleJdbc();
         Connection conn = mysqlJdbc.connect();
         Statement st = null;
@@ -222,7 +231,12 @@ public class TaizDataImportApiTest {
         List<Patient> patients = new ArrayList<>();
         try {
             st = conn.createStatement();
-            String sql = "select BRZYID from " + tableName;
+            String sql = "";
+            if (StringUtils.isNotEmpty(patientId)) {
+                sql = "select BRZYID from " + tableName + " where BRZYID = '" + patientId + "'";
+            } else {
+                sql = "select BRZYID from " + tableName;
+            }
             rs = st.executeQuery(sql);
             while (rs.next()) {
                 r1 = rs.getString(1);
@@ -311,9 +325,9 @@ public class TaizDataImportApiTest {
         List<PatientText> patientTexts = new ArrayList<>();
         try {
             st = conn.createStatement();
-            String sql = "select a.brzyid,c.bllbmc,b.bljlnr from MR_MEDICALRECORDS_CX a " +
-                    "left join MR_MRCONTENT_CX b on a.bljlid=b.bljlid " +
-                    "left join AR_MEDIRECCLASS_CX c on a.Bllbid = c.bllbid " +
+            String sql = "select a.brzyid,c.bllbmc,b.bljlnr from " + tableMap.get("MR_MEDICALRECORDS") + " a " +
+                    "left join " + tableMap.get("MR_MRCONTENT") + " b on a.bljlid=b.bljlid " +
+                    "left join " + tableMap.get("AR_MEDIRECCLASS") + " c on a.Bllbid = c.bllbid " +
                     "where bljlnr is not null and brzyid = '" + brzyid + "' " +
                     "order by brzyid";
             rs = st.executeQuery(sql);
@@ -354,6 +368,10 @@ public class TaizDataImportApiTest {
     }
 
     private Map<String, String> loadPatients(String hospitalId) {
+        return loadPatients(hospitalId, null);
+    }
+
+    private Map<String, String> loadPatients(String hospitalId, String patientId) {
         MysqlJdbc mysqlJdbc = initMysqlJdbc();
         Connection conn = mysqlJdbc.connect();
         Statement st = null;
@@ -362,7 +380,12 @@ public class TaizDataImportApiTest {
         Map<String, String> map = new HashMap<>();
         try {
             st = conn.createStatement();
-            String sql = "select id, case_number from qc_cases_number_copy where hospital_id = " + hospitalId;
+            String sql = "";
+            if (StringUtils.isNotEmpty(patientId)) {
+                sql = "select id, case_number from qc_cases_number where hospital_id = " + hospitalId + " and case_number = '" + patientId + "'";
+            } else {
+                sql = "select id, case_number from qc_cases_number where hospital_id = " + hospitalId;
+            }
             rs = st.executeQuery(sql);
             while (rs.next()) {
                 r1 = rs.getString(1);
@@ -438,7 +461,7 @@ public class TaizDataImportApiTest {
         try {
             st = conn.createStatement();
             for (String caseNumber : caseNumbers) {
-                String sql = "delete from qc_cases_number_copy where case_number = '" + caseNumber + "'";
+                String sql = "delete from qc_cases_number where case_number = '" + caseNumber + "'";
                 st.execute(sql);
             }
         } catch (SQLException sqle) {