commit

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

@@ -21,6 +21,8 @@ import com.jfinal.plugin.activerecord.Record;
 import com.jfinal.plugin.activerecord.dialect.OracleDialect;
 import com.jfinal.plugin.activerecord.dialect.SqlServerDialect;
 import com.jfinal.plugin.druid.DruidPlugin;
+import com.zskk.service.ServiceFactory;
+import com.zskk.service.ThreadPoolService;
 import com.zskk.tools.ExecUtil;
 import com.zskk.tools.XmlHelper;
 
@@ -115,32 +117,45 @@ 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 (modalitiesString.equals("SC")) {
+						continue;
 					}
+					
+					
 					Record studyidfind = Db.use("local").findFirst("select * from study where studyuid = ?",
 							studyuidString);
 					if (studyidfind == null) {
-						Record studyinfo = new Record().set("studyuid", studyuidString).set("modalities", modalitiesString)
-								.set("status", 1).set("createAt", parseStringToDateTime()).set("updateAt", parseStringToDateTime()).set("device", deviceString);
+						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");
+						}
+						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 {
+					} 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");
+						}
 						studyidfind.set("device", deviceString);
-		    			studyidfind.set("updateAt", parseStringToDateTime());
-		        		Db.use("local").update("study", studyidfind);
+						studyidfind.set("updateAt", parseStringToDateTime());
+						Db.use("local").update("study", studyidfind);
 					}
+						
+					
 				}
-				renderNull();
+				renderText("succeed");
 			} catch (IOException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 				renderText(e.toString());
-			}
-		
-		
+			}	
 	}
 		
 		/**

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

@@ -35,7 +35,19 @@ public class CMoveTask implements ITask {
 					flag = 1;
 				}
             }
-        	if (flag == 1) {
+        	if (studyidfind.getStr("device") == null) {
+        		Record dRecord = Db.use("connected").findFirst("select * from reportinfo where STUDYUID = ?",
+        				studyidfind.getStr("STUDYUID"));
+				String deviceString = "";
+				if (dRecord != null && dRecord.getStr("DEVICE") != null) {
+					deviceString = dRecord.getStr("DEVICE");
+				}
+				studyidfind.set("device", deviceString);
+				studyidfind.set("updateAt", parseStringToDateTime());
+				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"))) {
         		studyidfind.set("status", 5);
     			studyidfind.set("updateAt", parseStringToDateTime());
         		Db.use("local").update("study", studyidfind);			

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

@@ -28,7 +28,7 @@ public class DBDataTask implements ITask {
         	try {
         		JSONObject jsonObject = JSON.parseObject(object.toString());
         		Record studyidfind = Db.use("local").findFirst("select * from study where studyuid = ?", jsonObject.getString("studyuid"));
-    			if (studyidfind != null && studyidfind.getInt("status")==1 || studyidfind.getInt("status")==2) {
+    			if (studyidfind != null && studyidfind.getStr("device")!=null && (studyidfind.getInt("status")==1 || studyidfind.getInt("status")==2) && (!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

@@ -65,14 +65,29 @@ public class UpdateTask implements ITask {
 				if (modalitiesString.equals("SC")) {
 					continue;
 				}
-				Record dRecord = Db.use("connected").findFirst("select * from reportinfo where STUDYUID = ?",
-						studyuidString);
+				
 				Record studyidfind = Db.use("local").findFirst("select * from study where studyuid = ?",
 						studyuidString);
 				if (studyidfind == 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");
+					}
 					Record studyinfo = new Record().set("studyuid", studyuidString).set("modalities", modalitiesString)
-							.set("status", 1).set("createAt", parseStringToDateTime()).set("updateAt", parseStringToDateTime()).set("device", dRecord.getStr("DEVICE"));
+							.set("status", 1).set("createAt", parseStringToDateTime()).set("updateAt", parseStringToDateTime()).set("device", deviceString);
 					Db.use("local").save("study", studyinfo);
+				}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");
+					}
+					studyidfind.set("device", deviceString);
+					studyidfind.set("updateAt", parseStringToDateTime());
+					Db.use("local").update("study", studyidfind);
 				}
 			}
 		} catch (IOException e) {