commit

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

@@ -162,10 +162,23 @@ public class ViewController extends Controller {
 					params.put("exam_project", record.getStr("project"));
 					//病人ID
 					params.put("his_patient_id", record.getStr("patientid"));
-					ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
-					tService.execute(() -> {
+//					ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
+//					tService.execute(() -> {
 						dService.saveReport(params);
-					});	
+//					});	
+					
+					//上传报告附件
+					Map<String, String> annex_params = new HashMap<>();
+					annex_params.put("institution_id", PropKit.get("institution_id"));
+					annex_params.put("type", "1");
+					annex_params.put("code", examid);
+					//附件类型1.mp4 2.pdf 3.jpeg
+					annex_params.put("annex_class_code", "3");
+		      		dService.saveAnnex(annex_params, record.getStr("report_url"));
+		      		
+		      		Record usinfo = new Record().set("code", record.getStr("studyuid"))
+							.set("createAt", parseStringToDateTime()).set("updateAt", parseStringToDateTime());
+					Db.use("local").save("usexam", usinfo);
 				} catch (Exception e) {
 					// TODO: handle exception
 //					continue;			
@@ -173,18 +186,7 @@ public class ViewController extends Controller {
 
 				}
 				
-				//上传报告附件
-				Map<String, String> annex_params = new HashMap<>();
-				annex_params.put("institution_id", PropKit.get("institution_id"));
-				annex_params.put("type", "4");
-				annex_params.put("code", record.getStr("studyuid"));
-				//附件类型1.mp4 2.pdf 3.jpeg
-				annex_params.put("annex_class_code", "3");
-	      		dService.saveAnnex(annex_params, record.getStr("report_url"));
-	      		
-	      		Record usinfo = new Record().set("code", record.getStr("studyuid"))
-						.set("createAt", parseStringToDateTime()).set("updateAt", parseStringToDateTime());
-				Db.use("local").save("usexam", usinfo);
+				
 			}
 	    			
 //			DataService dService = ServiceFactory.getService(DataService.class);

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

@@ -112,23 +112,25 @@ public class USReportTask implements ITask {
 				tService.execute(() -> {
 					dService.saveReport(params);
 				});	
+				
+				//上传报告附件
+				Map<String, String> annex_params = new HashMap<>();
+				annex_params.put("institution_id", PropKit.get("institution_id"));
+				annex_params.put("type", "1");
+				annex_params.put("code", examid);
+				//附件类型1.mp4 2.pdf 3.jpeg
+				annex_params.put("annex_class_code", "3");
+	      		dService.saveAnnex(annex_params, record.getStr("report_url"));
+	      		
+	      		Record usinfo = new Record().set("code", record.getStr("studyuid"))
+						.set("createAt", parseStringToDateTime()).set("updateAt", parseStringToDateTime());
+				Db.use("local").save("usexam", usinfo);
 			} catch (Exception e) {
 				// TODO: handle exception
 				continue;
 			}
 			
-			//上传报告附件
-			Map<String, String> annex_params = new HashMap<>();
-			annex_params.put("institution_id", PropKit.get("institution_id"));
-			annex_params.put("type", "4");
-			annex_params.put("code", record.getStr("studyuid"));
-			//附件类型1.mp4 2.pdf 3.jpeg
-			annex_params.put("annex_class_code", "3");
-      		dService.saveAnnex(annex_params, record.getStr("report_url"));
-      		
-      		Record usinfo = new Record().set("code", record.getStr("studyuid"))
-					.set("createAt", parseStringToDateTime()).set("updateAt", parseStringToDateTime());
-			Db.use("local").save("usexam", usinfo);
+			
 		}