commit

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

@@ -20,44 +20,39 @@ public class UpdateTask implements ITask {
 	public void run() {
 		// TODO Auto-generated method stub
 		DataService dService = ServiceFactory.getService(DataService.class);
-        JSONArray jsonArray = dService.getExamListConfirmed(80);
-		List<Record> records = Db.use("connected").find("select top 10 * from reportcheck order by checktime desc");
-
+        JSONArray jsonArray = dService.getExamListConfirmed(20);
         for (Object object : jsonArray) {
         	try {
 			JSONObject jsonObject = JSON.parseObject(object.toString());
-			Record record = Db.use("connected").findFirst("select * from reportcheck where studyuid=?checktime", jsonObject.getString("studyuid"));
+			Record record = Db.use("connected").findFirst("select * from examinfo where studyuid=?", jsonObject.getString("studyuid"));
 			if (record == null) {
 				continue;
 			}
-			if (record.getStr("impression").isBlank() && record.getStr("description").isBlank()) {
-				continue;
-			}
 			Map<String, String> params = new HashMap<>();
 			params.put("exam_id", jsonObject.getString("id"));
 			//报告医生姓名
-			params.put("report_doctor_name", record.getStr("reportdoctor"));
+			params.put("report_doctor_name", "");
 			//报告时间
-			params.put("report_datetime", record.getStr("reportdate"));
+			params.put("report_datetime", "");
 			//审核医生姓名
-			params.put("review_doctor_name", record.getStr("reviewdoctor")==null?"":record.getStr("reviewdoctor"));
+			params.put("review_doctor_name", "");
 			//审核时间
-			params.put("review_datetime", record.getStr("reportdate"));
+			params.put("review_datetime", "");
 			//确认医生姓名
-			params.put("confirm_doctor_name", record.getStr("reviewdoctor")==null?"":record.getStr("reviewdoctor"));
+			params.put("confirm_doctor_name", "");
 			//确认时间
-			params.put("confirm_datetime", record.getStr("reportdate"));
+			params.put("confirm_datetime", "");
 			//意见建议
-			params.put("impression", record.getStr("impression"));
+			params.put("impression", "");
 			//影像所见
-			params.put("description", record.getStr("description"));
+			params.put("description", "");
 			//exams表
 			//申请科室
 			params.put("application_department", record.getStr("department"));
 			//申请医生
 			params.put("application_doctor", record.getStr("clinicaldoctor"));
 			//临床诊断
-			params.put("clin_diag", "");
+			params.put("clin_diag", record.getStr("diagnosis"));
 			//症状
 			params.put("clin_symp", record.getStr("symptom"));
 			//patient_infos表
@@ -73,7 +68,7 @@ public class UpdateTask implements ITask {
 			params.put("hopitalized_no", "");
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			tService.execute(() -> {
-				dService.saveReport(params);
+				dService.(params);
 			});	
         	} catch (Exception e) {
 				// TODO: handle exception