commit

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

@@ -74,10 +74,10 @@ public class ZskkConfig extends JFinalConfig {
 		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);
 //		
 //		Cron4jPlugin upData = new Cron4jPlugin();
 //		upData.addTask("*/12 * * * *", new UpdateTask());

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

@@ -21,11 +21,11 @@ public class DataTask implements ITask {
 	public void run() {
 		// TODO Auto-generated method stub
 		DataService dService = ServiceFactory.getService(DataService.class);
-        JSONArray jsonArray = dService.getExamList(50);	
+        JSONArray jsonArray = dService.getExamList(80);	
         for (Object object : jsonArray) {
         	try {
 			JSONObject jsonObject = JSON.parseObject(object.toString());
-			Record record = Db.use("connected").findFirst("select * from reportinfo where ACCESSIONNUMBER=?", jsonObject.getString("patient_num"));
+			Record record = Db.use("connected").findFirst("select * from zlhis.zskk_reportinfo_1 where ACCESSIONNUMBER=?", jsonObject.getString("accession_num"));
 			if (record == null) {
 				continue;
 			}
@@ -52,13 +52,13 @@ public class DataTask implements ITask {
 			params.put("description", record.getStr("DESCRIPTION"));
 			//exams表
 			//申请科室
-			params.put("application_department", record.getStr("DEPARTMENT"));
+			params.put("application_department", record.getStr("DEPATMENT"));
 			//申请医生
-			params.put("application_doctor", record.getStr("CLINICALDOCTOR"));
+			params.put("application_doctor", record.getStr("CLINICALDOCTOR")==null?"":record.getStr("CLINICALDOCTOR"));
 			//临床诊断
 			params.put("clin_diag", record.getStr("DIAGNOSIS")==null?"":record.getStr("DIAGNOSIS"));
 			//症状
-			params.put("clin_symp", record.getStr("SYMPTOM")==null?"":record.getStr("SYMPTOM"));
+			params.put("clin_symp", record.getStr("SYMPOM")==null?"":record.getStr("SYMPOM"));
 			//patient_infos表
 			//患者姓名
 			params.put("name", record.getStr("PATIENTNAME"));
@@ -67,9 +67,9 @@ public class DataTask implements ITask {
 			//患者身份证号
 			params.put("card_num", record.getStr("IDCARD")==null?"":record.getStr("IDCARD"));
 			//检查结果1阴2阳
-			params.put("report_result", record.getStr("RESULT").contains("阳")?"2":"1");
+			params.put("report_result", "0");
 			//住院号
-			params.put("hopitalized_no", "0");
+			params.put("hopitalized_no", "");
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			tService.execute(() -> {
 				dService.saveReport(params);