commit

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

@@ -120,8 +120,6 @@ public class ViewController extends Controller {
 					if (modalitiesString.equals("SC")) {
 						continue;
 					}
-					
-					
 					Record studyidfind = Db.use("local").findFirst("select * from study where studyuid = ?",
 							studyuidString);
 					if (studyidfind == null) {
@@ -140,8 +138,8 @@ public class ViewController extends Controller {
 						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");
+						if (dRecord != null) {
+							deviceString = dRecord.getStr("DEVICE")==null?"":dRecord.getStr("DEVICE");
 						}
 						studyidfind.set("device", deviceString);
 						studyidfind.set("updateAt", parseStringToDateTime());