commit

DataFusion/res/config.properties

@@ -8,5 +8,10 @@ jdbcUrl_local  = jdbc:mysql://127.0.0.1:3306/pacsonline?characterEncoding=utf8&z
 #jdbcUrl_connected  = jdbc:oracle:thin:@192.168.100.4:1521:pacs
 user_local 	   = zskk
 password_local = Zskk_2022
+
+#jdbcUrl_local  = jdbc:mysql://127.0.0.1:3306/pacsonline?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull
+jdbcUrl_crb  = jdbc:oracle:thin:@11.129.12.58:1521:orcl
+user_crb	 = hz_dongmx
+password_crb = dongMx123
 #DATA-Parms
-institution_id     = 27400005
+institution_id = 27400005

DataFusion/src/com/zskk/config/ZskkConfig.java

@@ -67,6 +67,11 @@ public class ZskkConfig extends JFinalConfig {
 
 		return new DruidPlugin(PropKit.get("jdbcUrl_local"), PropKit.get("user_local"),PropKit.get("password_local").trim());
 	}
+	
+	public static DruidPlugin createCrbDruidPlugin() {
+
+		return new DruidPlugin(PropKit.get("jdbcUrl_crb"), PropKit.get("user_crb"),PropKit.get("password_crb").trim());
+	}
 
 	@Override
 	public void configPlugin(Plugins me) {
@@ -77,6 +82,9 @@ public class ZskkConfig extends JFinalConfig {
 		DruidPlugin druidPluginLocal = createLocalDruidPlugin();
 		me.add(druidPluginLocal);
 
+		DruidPlugin druidPluginCrb = createCrbDruidPlugin();
+		me.add(druidPluginCrb);
+		
 		// 配置ActiveRecord插件
 		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
 		arpConnected.setDialect(new SqlServerDialect());
@@ -85,6 +93,10 @@ public class ZskkConfig extends JFinalConfig {
 		ActiveRecordPlugin arpLocal = new ActiveRecordPlugin("local", druidPluginLocal);
 		arpLocal.setDialect(new MysqlDialect());
 		me.add(arpLocal);
+		
+		ActiveRecordPlugin arpCrb = new ActiveRecordPlugin("crb", druidPluginCrb);
+		arpCrb.setDialect(new OracleDialect());
+		me.add(arpCrb);
 
 		Cron4jPlugin cpData = new Cron4jPlugin();
 		cpData.addTask("*/2 * * * *", new UpdateTask());

DataFusion/src/com/zskk/service/DataService.java

@@ -22,6 +22,9 @@ public class DataService {
     private static String SAVE_REPORT_URL = "https://risserver3.pacsonline.cn/butt/saveReport";
     
     private static String UPDATE_PATIENT_URL = "https://risserver3.pacsonline.cn/butt/saveExam";
+    
+    private static String GET_REPORT_URL = "https://risserver3.pacsonline.cn/getDmReport";
+
 	
     private static final OkHttpClient OKHTTP_CLIENT = new OkHttpClient();
     
@@ -64,6 +67,10 @@ public class DataService {
     postWithParameters(UPDATE_PATIENT_URL, map);
     }
     
+    public void getReport(Map<String, String> map) {
+        postWithParameters(UPDATE_PATIENT_URL, map);
+	}
+    
     public static String postWithParameters(String url, Map<String, String> map) {
     	
     	FormBody.Builder formbody = new FormBody.Builder();