COMMIT

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

@@ -68,13 +68,13 @@ public class ZskkConfig extends JFinalConfig {
 		me.add(druidPluginConnected);
 
 		// 配置ActiveRecord插件
-//		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
-//		arpConnected.setDialect(new OracleDialect());
-//		me.add(arpConnected);
+		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
+		arpConnected.setDialect(new OracleDialect());
+		me.add(arpConnected);
 
-//		Cron4jPlugin cpData = new Cron4jPlugin();
-//		cpData.addTask("*/5 * * * *", new DataTask());
-//		me.add(cpData);
+		Cron4jPlugin cpData = new Cron4jPlugin();
+		cpData.addTask("*/5 * * * *", new DataTask());
+		me.add(cpData);
 	}
 
 	@Override

DataFusion/src/com/zskk/task/DataTask.java

@@ -25,7 +25,7 @@ public class DataTask implements ITask {
         for (Object object : jsonArray) {
         	try {
 			JSONObject jsonObject = JSON.parseObject(object.toString());
-			Record record = Db.use("connected").findFirst("select * from REPORTINFO where STUDYUID=?", jsonObject.getString("studyuid"));
+			Record record = Db.use("connected").findFirst("select * from REPORTINFO where ACCESSIONNUMBER=?", jsonObject.getString("accession_num"));
 			if (record == null) {
 				continue;
 			}
@@ -39,11 +39,11 @@ public class DataTask implements ITask {
 			//报告时间
 			params.put("report_datetime", record.getStr("REPORTDATE"));
 			//审核医生姓名
-			params.put("review_doctor_name", record.getStr("REVIEWDOCTOR")==null?"":record.getStr("REVIEWDOCTOR"));
+			params.put("review_doctor_name", record.getStr("REPORTDOCTOR")==null?"":record.getStr("REPORTDOCTOR"));
 			//审核时间
 			params.put("review_datetime", record.getStr("REPORTDATE"));
 			//确认医生姓名
-			params.put("confirm_doctor_name", record.getStr("REVIEWDOCTOR")==null?"":record.getStr("REVIEWDOCTOR"));
+			params.put("confirm_doctor_name", record.getStr("REPORTDOCTOR")==null?"":record.getStr("REPORTDOCTOR"));
 			//确认时间
 			params.put("confirm_datetime", record.getStr("REPORTDATE"));
 			//意见建议
@@ -63,11 +63,11 @@ public class DataTask implements ITask {
 			//患者姓名
 			params.put("name", record.getStr("PATIENTNAME"));
 			//患者手机号
-			params.put("phone", "");
+			params.put("phone", record.getStr("PHONE")==null?"":record.getStr("PHONE"));
 			//患者身份证号
-			params.put("card_num", record.getStr("IDCARD"));
+			params.put("card_num", record.getStr("IDCARD")==null?"":record.getStr("IDCARD"));
 			//检查结果1阴2阳
-			params.put("report_result", "0");
+			params.put("report_result", record.getStr("RESULT").equals("1")?"2":"1");
 			//门诊号住院号
 			params.put("hopitalized_no", record.getStr("patientNumber"));
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);