commit

DataFusion/src/com/zskk/config/ZskkConfig.java

@@ -76,13 +76,13 @@ public class ZskkConfig extends JFinalConfig {
 		me.add(druidPluginConnected);
 
 		// 配置ActiveRecord插件
-//		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
-//		arpConnected.setDialect(new SqlServerDialect());
-//		me.add(arpConnected);
+		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
+		arpConnected.setDialect(new SqlServerDialect());
+		me.add(arpConnected);
 
-//		Cron4jPlugin cpData = new Cron4jPlugin();
-//		cpData.addTask("*/5 * * * *", new DataTask());
-//		me.add(cpData);
+		Cron4jPlugin cpData = new Cron4jPlugin();
+		cpData.addTask("*/5 * * * *", new DataTask());
+		me.add(cpData);
 
 //		Cron4jPlugin cp2 = new Cron4jPlugin();
 //		cp2.addTask("*/15 * * * *", new UpdateTask());

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

@@ -36,11 +36,11 @@ public class DataTask implements ITask {
 		// TODO Auto-generated method stub
 		try {
 			List<Exams> exams = Exams.dao.use("zskk").find(
-					"SELECT * FROM pacsonline.exams where exam_status=3 and institution_id='25000008' order by createdAt desc limit 30");
+					"SELECT * FROM pacsonline.exams where exam_status=3 and institution_id='25000008' order by createdAt desc limit 80");
 			for (Exams exams2 : exams) {
 				try {
 					Studies studies = Studies.dao.use("zskk").findById(exams2.getStudyId());
-					Record record = Db.use("connected").findFirst("select * from his.reportinfo where studyuid=?",
+					Record record = Db.use("connected").findFirst("select * from grid.reportinfo where studyuid=?",
 							studies.getStudyuid());
 					if (record == null) {
 						continue;
@@ -57,9 +57,9 @@ public class DataTask implements ITask {
 					report.setExamId(exams2.getId());
 					report.setCreatedAt(new Date());
 					report.setReportDoctorId(getDoctorIdByName(record.getStr("reportdoctor")==null?"":record.getStr("reportdoctor")));
-					report.setReviewDoctorId(getDoctorIdByName(record.getStr("reviewdoctor")));
+					report.setReviewDoctorId(getDoctorIdByName(record.getStr("reportdoctor")));
 					report.setReviewDatetime(parseStringToDate(record.getStr("reportdate")));
-					report.setConfirmDoctorId(getDoctorIdByName(record.getStr("reviewdoctor")));
+					report.setConfirmDoctorId(getDoctorIdByName(record.getStr("reportdoctor")));
 					report.setConfirmDatetime(parseStringToDate(record.getStr("reportdate")));
 					report.save();
 					PatientInfos patientInfos = PatientInfos.dao.use("zskk").findById(exams2.getPatientId());
@@ -74,7 +74,7 @@ public class DataTask implements ITask {
 //					exams2.setHopitalizedNo(patString);
 //					exams2.setClinDoctors(record.getStr("CLINICALDOCTOR"));
 					exams2.setApplicationDepartment(record.getStr("department"));
-					exams2.setApplicationDoctor(record.getStr("clinicaldoctor"));
+//					exams2.setApplicationDoctor(record.getStr("clinicaldoctor"));
 //					exams2.setClinDiag(record.getStr("diagnosis"));
 					exams2.update();
 					// 传云医康 数据
@@ -104,7 +104,7 @@ public class DataTask implements ITask {
 					// 患者检查时年龄
 					data.put("patient_age", patientInfos.getAge()==null?"":patientInfos.getAge());
 					// 阴阳性 1阴性 2阳性
-					data.put("report_result", record.getStr("result").contains("阳")?"2":"1");
+					data.put("report_result", "");
 					// 报告时间 10位时间戳
 					data.put("report_datetime", returnSecondTimestamp(record.getStr("reportdate")));
 					// 报告医生id
@@ -114,15 +114,15 @@ public class DataTask implements ITask {
 					// 审核时间
 					data.put("review_datetime", returnSecondTimestamp(record.getStr("reportdate")));
 					// 审核医生id
-					data.put("review_doctor_id", record.getStr("reviewdoctor"));
+					data.put("review_doctor_id", record.getStr("reportdoctor"));
 					// 审核姓名
-					data.put("review_doctor_name", record.getStr("reviewdoctor"));
+					data.put("review_doctor_name", record.getStr("reportdoctor"));
 					// 确认时间
 					data.put("confirm_datetime", returnSecondTimestamp(record.getStr("reportdate")));
 					// 确认医生id
-					data.put("confirm_doctor_id", record.getStr("reviewdoctor"));
+					data.put("confirm_doctor_id", record.getStr("reportdoctor"));
 					// 确认医生姓名
-					data.put("confirm_doctor_name", record.getStr("reviewdoctor"));
+					data.put("confirm_doctor_name", record.getStr("reportdoctor"));
 					data.put("patient_no", "");