commit

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

@@ -35,7 +35,7 @@ public class CMoveTask implements ITask {
 					flag = 1;
 				}
             }
-        	if (studyidfind.getStr("device").isBlank()) {
+        	if (studyidfind.getStr("device")==null) {
         		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").isBlank() && (!studyidfind.getStr("device").equals("Achieva 3.0T") || !studyidfind.getStr("device").equals("联影 40排CT"))) {
+        	if (flag == 1 && studyidfind.getStr("device")!=null && (!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/UpdateTask.java

@@ -78,13 +78,11 @@ 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").isBlank()){
+				}else if(studyidfind.getStr("device")==null){
 					String deviceString = "";
 					Record dRecord = Db.use("connected").findFirst("select * from reportinfo where STUDYUID = ?",
 							studyuidString);
-					if (dRecord != null && dRecord.getStr("DEVICE") != null) {
-						deviceString = dRecord.getStr("DEVICE");
-					}
+					deviceString = dRecord.getStr("DEVICE")==null?"":dRecord.getStr("DEVICE");
 					studyidfind.set("device", deviceString);
 					studyidfind.set("updateAt", parseStringToDateTime());
 					Db.use("local").update("study", studyidfind);