commit

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

@@ -56,7 +56,7 @@ public class DataTask implements ITask {
 					report.setDescription(record.getStr("DESCRIPTION"));
 					report.setExamId(exams2.getId());
 					report.setCreatedAt(new Date());
-					report.setReportDoctorId(getDoctorIdByName(record.getStr("reportdoctor")==null?"":record.getStr("reportdoctor")));
+					report.setReportDoctorId(getDoctorIdByName(record.getStr("reviewdoctor")==null?"":record.getStr("reviewdoctor")));
 					report.setReviewDoctorId(getDoctorIdByName(record.getStr("reviewdoctor")));
 					report.setReviewDatetime(parseStringToDate(record.getStr("reportdate")));
 					report.setConfirmDoctorId(getDoctorIdByName(record.getStr("reviewdoctor")));
@@ -108,9 +108,9 @@ public class DataTask implements ITask {
 					// 报告时间 10位时间戳
 					data.put("report_datetime", returnSecondTimestamp(record.getStr("reportdate")));
 					// 报告医生id
-					data.put("report_doctor_id", record.getStr("reportdoctor")==null?"":record.getStr("reportdoctor"));
+					data.put("report_doctor_id", record.getStr("reviewdoctor")==null?"":record.getStr("reviewdoctor"));
 					// 报告医生姓名
-					data.put("report_doctor_name", record.getStr("reportdoctor")==null?"":record.getStr("reportdoctor"));
+					data.put("report_doctor_name", record.getStr("reviewdoctor")==null?"":record.getStr("reviewdoctor"));
 					// 审核时间
 					data.put("review_datetime", returnSecondTimestamp(record.getStr("reportdate")));
 					// 审核医生id