commit

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

@@ -18,6 +18,7 @@ import com.zskk.control.ViewController;
 import com.zskk.service.ServiceFactory;
 import com.zskk.task.CFindTask;
 import com.zskk.task.CMoveTask;
+import com.zskk.task.DBDataTask;
 import com.zskk.task.DataTask;
 import com.zskk.task.ExamTask;
 import com.zskk.task.UpdateTask;
@@ -88,8 +89,12 @@ public class ZskkConfig extends JFinalConfig {
 		me.add(arpLocal);
 		
 		//报告匹配定时任务
+//		Cron4jPlugin cpData = new Cron4jPlugin();
+//		cpData.addTask("*/3 * * * *", new DataTask());
+//		me.add(cpData);
+		
 		Cron4jPlugin cpData = new Cron4jPlugin();
-		cpData.addTask("*/3 * * * *", new DataTask());
+		cpData.addTask("*/3 * * * *", new DBDataTask());
 		me.add(cpData);
 		
 		//读取CFIND文件录入数据库定时任务
@@ -103,9 +108,9 @@ public class ZskkConfig extends JFinalConfig {
 		me.add(cgData);
 		
 		//CMOVE定时任务
-//		Cron4jPlugin mvData = new Cron4jPlugin();
-//		mvData.addTask("*/1 * * * *", new CMoveTask());
-//		me.add(mvData);
+		Cron4jPlugin mvData = new Cron4jPlugin();
+		mvData.addTask("*/1 * * * *", new CMoveTask());
+		me.add(mvData);
 		
 		//更新报告匹配
 		Cron4jPlugin upData = new Cron4jPlugin();

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

@@ -76,9 +76,9 @@ public class DBDataTask implements ITask {
     			params.put("report_result", "0");
     			//门诊号住院号
     			params.put("hopitalized_no", record.getStr("IDCARD"));
-    			params.put("out_patient", record.getStr("IDCARD"));
+    			params.put("out_patient", record.getStr("OUTPATIENTNUM"));
     			//病人ID
-    			params.put("his_patient_id", record.getStr("PATIENTID"));
+    			params.put("his_patient_id", record.getStr("INPATIENTNUM"));
     			//检查方法
     			params.put("exam_project", record.getStr("PROJECT"));
     			//1急诊 （out_patient）2住院（hopitalized_no）3门诊（out_patient）4体检（out_patient）
@@ -86,6 +86,12 @@ public class DBDataTask implements ITask {
 				case "门诊":
 	    			params.put("patient_source", "3");
 					break;
+				case "体检":
+	    			params.put("patient_source", "4");
+					break;
+				case "住院":
+	    			params.put("patient_source", "2");
+					break;
 
 				default:
 					break;