commit

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

@@ -111,7 +111,7 @@ public class ZskkConfig extends JFinalConfig {
 		
 		//CMOVE定时任务
 		Cron4jPlugin mvData = new Cron4jPlugin();
-		mvData.addTask("*/2 * * * *", new CMoveTask());
+		mvData.addTask("*/1 * * * *", new CMoveTask());
 		me.add(mvData);
 		
 		//更新报告匹配
@@ -124,7 +124,7 @@ public class ZskkConfig extends JFinalConfig {
 		ifData.addTask("*/2 * * * *", new InfoTask());
 		me.add(ifData);
 		
-		//更新患者信息
+		//更新未同步检查
 		Cron4jPlugin nsData = new Cron4jPlugin();
 		nsData.addTask("*/2 * * * *", new NewStudyTask());
 		me.add(nsData);

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

@@ -136,7 +136,7 @@ public class ViewController extends Controller {
 								.set("createAt", parseStringToDateTime()).set("updateAt", parseStringToDateTime())
 								.set("device", deviceString);
 						Db.use("local").save("study", studyinfo);
-					} else if(studyidfind.getStr("device")==null){
+					} else if(studyidfind.getStr("device").isBlank()){
 						String deviceString = "";
 						Record dRecord = Db.use("connected").findFirst("select * from reportinfo where STUDYUID = ?",
 								studyuidString);

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

@@ -35,7 +35,7 @@ public class CMoveTask implements ITask {
 					flag = 1;
 				}
             }
-        	if (studyidfind.getStr("device") == null) {
+        	if (studyidfind.getStr("device").isBlank()) {
         		Record dRecord = Db.use("connected").findFirst("select * from reportinfo where STUDYUID = ?",
         				studyidfind.getStr("STUDYUID"));
 				String deviceString = "";
@@ -47,7 +47,7 @@ public class CMoveTask implements ITask {
 				Db.use("local").update("study", studyidfind);
         		
 			}
-        	if (flag == 1 && studyidfind.getStr("device")!=null && (!studyidfind.getStr("device").equals("Achieva 3.0T") || !studyidfind.getStr("device").equals("联影 40排CT"))) {
+        	if (flag == 1 && !studyidfind.getStr("device").isBlank() && (!studyidfind.getStr("device").equals("Achieva 3.0T") || !studyidfind.getStr("device").equals("联影 40排CT"))) {
         		studyidfind.set("status", 5);
     			studyidfind.set("updateAt", parseStringToDateTime());
         		Db.use("local").update("study", studyidfind);			

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

@@ -35,8 +35,12 @@ public class NewStudyTask implements ITask {
 		for (Record record : studys) {
 			Record studyidfind = Db.use("local").findFirst("select * from study where studyuid = ?", record.getStr("STUDYUID"));
 			if (studyidfind == null) {
+				String deviceString = "";
+				if (record.getStr("DEVICE") != null) {
+					deviceString = record.getStr("DEVICE");
+				}
 				Record studyinfo = new Record().set("studyuid", record.getStr("STUDYUID")).set("modalities", record.getStr("MODALITY"))
-						.set("status", 1).set("createAt", parseStringToDateTime()).set("updateAt", parseStringToDateTime());
+						.set("status", 1).set("createAt", parseStringToDateTime()).set("updateAt", parseStringToDateTime()).set("device", deviceString);
 				Db.use("local").save("study", studyinfo);
 			}    			
 		}

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

@@ -78,7 +78,7 @@ public class UpdateTask implements ITask {
 					Record studyinfo = new Record().set("studyuid", studyuidString).set("modalities", modalitiesString)
 							.set("status", 1).set("createAt", parseStringToDateTime()).set("updateAt", parseStringToDateTime()).set("device", deviceString);
 					Db.use("local").save("study", studyinfo);
-				}else if(studyidfind.getStr("device")==null){
+				}else if(studyidfind.getStr("device").isBlank()){
 					String deviceString = "";
 					Record dRecord = Db.use("connected").findFirst("select * from reportinfo where STUDYUID = ?",
 							studyuidString);