commit

DataFusion/res/config.properties

@@ -1,5 +1,5 @@
 #DB-connected partners
-jdbcUrl_connected  = jdbc:mysql://192.168.233.1:3306/pacsonline
+jdbcUrl_connected  = jdbc:mysql://192.168.233.1:3306/pacsonline?characterEncoding=utf8
 user_connected 	   = root
 password_connected = Zskk_2017
 #DATA-Parms

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

@@ -35,11 +35,11 @@ public class DataTask implements ITask {
 			//报告时间
 			params.put("report_datetime", record.getStr("REPORTDATE")==null?"2020-07-22 00:00:00":record.getStr("REPORTDATE"));
 			//审核医生姓名
-			params.put("review_doctor_name", record.getStr("REPORTDOCTOR")==null?"":record.getStr("REPORTDOCTOR"));
+			params.put("review_doctor_name", record.getStr("REVIEWDOCTOR")==null?"":record.getStr("REVIEWDOCTOR"));
 			//审核时间
 			params.put("review_datetime", record.getStr("REPORTDATE")==null?"2020-07-22 00:00:00":record.getStr("REPORTDATE"));
 			//确认医生姓名
-			params.put("confirm_doctor_name", record.getStr("REPORTDOCTOR")==null?"":record.getStr("REPORTDOCTOR"));
+			params.put("confirm_doctor_name", record.getStr("REVIEWDOCTOR")==null?"":record.getStr("REVIEWDOCTOR"));
 			//确认时间
 			params.put("confirm_datetime", record.getStr("REPORTDATE")==null?"2020-07-22 00:00:00":record.getStr("REPORTDATE"));
 			//意见建议
@@ -62,7 +62,7 @@ public class DataTask implements ITask {
 			params.put("phone", record.getStr("PHONE")==null?"":record.getStr("PHONE"));
 			//患者身份证号
 			params.put("card_num", record.getStr("IDCARD")==null?"":record.getStr("IDCARD"));
-			params.put("report_result", "0");
+			params.put("report_result", record.getStr("RESULT")=="0"?"1":"2");
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			tService.execute(() -> {
 				dService.saveReport(params);