更换视图

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

@@ -25,7 +25,7 @@ public class DataTask implements ITask {
         JSONArray jsonArray = dService.getExamList(50);	
         for (Object object : jsonArray) {
 			JSONObject jsonObject = JSON.parseObject(object.toString());
-			Record record = Db.use("connected").findFirst("select * from reportinfo where studyuid=?", jsonObject.getString("studyuid"));
+			Record record = Db.use("connected").findFirst("select * from reportinfo_NEW where studyuid=?", jsonObject.getString("studyuid"));
 			if (record == null) {
 				continue;
 			}
@@ -46,11 +46,11 @@ public class DataTask implements ITask {
 			//审核医生姓名
 			params.put("review_doctor_name", record.getStr("reviewdoctor"));
 			//审核时间
-			params.put("review_datetime", record.getStr("reportdate"));
+			params.put("review_datetime", record.getStr("reviewdate"));
 			//确认医生姓名
 			params.put("confirm_doctor_name", record.getStr("reviewdoctor"));
 			//确认时间
-			params.put("confirm_datetime", record.getStr("reportdate"));
+			params.put("confirm_datetime", record.getStr("reviewdate"));
 			//意见建议
 			params.put("impression", record.getStr("impression"));
 			//影像所见
@@ -72,22 +72,27 @@ public class DataTask implements ITask {
 			//患者身份证号
 			params.put("card_num", record.getStr("idcard"));
 			//检查结果1阴2阳
-			params.put("report_result", "0");
-			//门诊号住院号
-			params.put("hopitalized_no", record.getStr("patientnumber"));
+			params.put("report_result", record.getStr("result").contains("阳")?"2":"1");
+			//住院号
+			params.put("hopitalized_no", record.getStr("inPatientNum"));
+			//门诊号
+			params.put("out_patient", record.getStr("outPatientNum"));
+			//检查方法
+			params.put("exam_project", record.getStr("project"));
+
 			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", jsonObject.getString("id"));
-			//附件类型1.mp4 2.pdf 3.jpeg
-			annex_params.put("annex_class_code", "3");
-      		dService.saveAnnex(annex_params, record.getStr("report_url"));
+//			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", jsonObject.getString("id"));
+//			//附件类型1.mp4 2.pdf 3.jpeg
+//			annex_params.put("annex_class_code", "3");
+//      		dService.saveAnnex(annex_params, record.getStr("report_url"));
         }
 	}