commit

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

@@ -19,6 +19,7 @@ import com.zskk.service.ServiceFactory;
 import com.zskk.task.CFindTask;
 import com.zskk.task.CMoveTask;
 import com.zskk.task.DataTask;
+import com.zskk.task.ExamTask;
 import com.zskk.task.UpdateTask;
 
 public class ZskkConfig extends JFinalConfig {
@@ -86,21 +87,30 @@ public class ZskkConfig extends JFinalConfig {
 		arpLocal.setDialect(new MysqlDialect());
 		me.add(arpLocal);
 		
-		Cron4jPlugin cpData = new Cron4jPlugin();
-		cpData.addTask("*/5 * * * *", new DataTask());
-		me.add(cpData);
+		//报告匹配定时任务
+//		Cron4jPlugin cpData = new Cron4jPlugin();
+//		cpData.addTask("*/5 * * * *", new DataTask());
+//		me.add(cpData);
 		
+		//读取CFIND文件录入数据库定时任务
 		Cron4jPlugin inData = new Cron4jPlugin();
 		inData.addTask("5 2 * * *", new UpdateTask());
 		me.add(inData);
 		
+		//CFIND定时任务
 		Cron4jPlugin cgData = new Cron4jPlugin();
 		cgData.addTask("50 1 * * *", new CFindTask());
 		me.add(cgData);
 		
-		Cron4jPlugin mvData = new Cron4jPlugin();
-		mvData.addTask("*/3 * * * *", new CMoveTask());
-		me.add(mvData);
+		//CMOVE定时任务
+//		Cron4jPlugin mvData = new Cron4jPlugin();
+//		mvData.addTask("*/3 * * * *", new CMoveTask());
+//		me.add(mvData);
+		
+		//更新患者信息定时任务
+//		Cron4jPlugin upData = new Cron4jPlugin();
+//		upData.addTask("*/2 * * * *", new ExamTask());
+//		me.add(upData);
 	}
 
 	@Override

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

@@ -21,6 +21,8 @@ public class DataService {
     private static String GET_EXAM_URL = "https://risserver3.pacsonline.cn/butt/getExam";
     
     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 final OkHttpClient OKHTTP_CLIENT = new OkHttpClient();
     
@@ -53,6 +55,16 @@ public class DataService {
 		
 	}
     
+    /**
+     * 更新患者信息
+     * 
+     * @param instutionId
+     * @param number
+     */
+     public void updatePatientInfo(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();

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

@@ -73,7 +73,7 @@ public class ExamTask implements ITask {
 			params.put("exam_project", record.getStr("project"));
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			tService.execute(() -> {
-				dService.saveReport(params);
+				dService.updatePatientInfo(params);
 			});	
         }
 	}