commit

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

@@ -31,11 +31,11 @@ public class DownloadTask implements ITask {
 		Db.use("local").update("study",recordfind);
 //			JSONObject jsonObject = JSON.parseObject(object.toString());
 //			String[] strings = jsonObject.getString("Path").split("\\\\");
-//			dService.downloadFtpFile(jsonObject.getString("Path"));
+			dService.downloadFtpFile(recordfind.getStr("path"));
 //		}
-//		recordfind.set("status", 3);
-//		recordfind.set("updateAt", getDateStr());
-//		Db.use("local").update("study",recordfind);
+		recordfind.set("status", 3);
+		recordfind.set("updateAt", getDateStr());
+		Db.use("local").update("study",recordfind);
 	}
 
 	@Override

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

@@ -32,7 +32,7 @@ public class StudyTask implements ITask {
 				continue;
 			}
 			String pathString = record.getStr("ftp").replace("ftp://192.168.0.188/", "");
-			Record study = new Record().set("studyuid", record.getStr("studyuid")).set("path",pathString).set("status", 1).set("createAt", getDateStr()).set("updateAt", getDateStr());
+			Record study = new Record().set("studyuid", record.getStr("StudyInstanceUID")).set("path",pathString).set("status", 1).set("createAt", getDateStr()).set("updateAt", getDateStr());
 			Db.use("local").save("study", study);
 		}			
 	}