commit

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

@@ -106,7 +106,7 @@ public class ZskkConfig extends JFinalConfig {
 		
 		//comve获取检查影像
 		Cron4jPlugin mvData = new Cron4jPlugin();
-		mvData.addTask("*/1 * * * *", new CMoveTask());
+		mvData.addTask("*/2 * * * *", new CMoveTask());
 		me.add(mvData);
 		
 		//更新患者信息

DataFusion/src/com/zskk/control/ViewController.java

@@ -64,7 +64,7 @@ public class ViewController extends Controller {
 		}
 	}
 	
-	public void tempmatch() {
+	public void sdcfind() {
 		String execCmd = ExecUtil.execCmd("/zskk_system/other/cfind.sh " + this.getPara("time") + " STUDYUID_" + "temppp" + ".xml");
 		if (execCmd.contains("Connection refused")) {
 			return;

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

@@ -23,7 +23,7 @@ public class ReCMoveTask implements ITask {
 //			return;
 //		}
 		//2小时到2天内的检查重新获取
-		List<Record> studyidfinds = Db.use("local").find("select * from study where status =3 and createAt between ? and ? and (modalities like '%CT%' or modalities like '%MR%' or modalities like '%DX%') order by createAt asc", parseStringToDateTo(), parseStringToDateFrom());
+		List<Record> studyidfinds = Db.use("local").find("select * from study where status =3 and createAt between ? and ? and (modalities like '%CT%' or modalities like '%MR%' or modalities like '%DX%' or modalities like '%CR%') order by createAt asc", parseStringToDateTo(), parseStringToDateFrom());
 		if (studyidfinds == null) {
 			return;
 		}