commit

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

@@ -79,10 +79,10 @@ public class ZskkConfig extends JFinalConfig {
 		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

@@ -39,9 +39,9 @@ public class DataTask implements ITask {
 					"SELECT * FROM pacsonline.exams where exam_status=3 and institution_id='25700001' order by createdAt desc limit 30");
 			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=?",
-							studies.getStudyuid());
+//					Studies studies = Studies.dao.use("zskk").findById(exams2.getStudyId());
+					Record record = Db.use("connected").findFirst("select * from reportinfo where patientid=?",
+							exams2.getPatientNum());
 					if (record == null) {
 						continue;
 					}
@@ -52,8 +52,8 @@ public class DataTask implements ITask {
 							|| record.getStr("description").isBlank()) {
 						continue;
 					}
-					report.setImpression(record.getStr("description"));
-					report.setDescription(record.getStr("impression"));
+					report.setImpression(record.getStr("impression"));
+					report.setDescription(record.getStr("description"));
 					report.setExamId(exams2.getId());
 					report.setCreatedAt(new Date());
 					report.setReportDoctorId(getDoctorIdByName(record.getStr("reportdoctor")==null?"":record.getStr("reportdoctor")));
@@ -64,7 +64,7 @@ public class DataTask implements ITask {
 					report.save();
 					PatientInfos patientInfos = PatientInfos.dao.use("zskk").findById(exams2.getPatientId());
 					patientInfos.setName(record.getStr("patientname"));
-//					patientInfos.setPhone(record.getStr("PHONE"));
+					patientInfos.setPhone(record.getStr("phone"));
 //					patientInfos.setCardNum(record.getStr("IDCARD"));
 					patientInfos.update();
 					exams2.setExamStatus(9);
@@ -98,13 +98,13 @@ public class DataTask implements ITask {
 					// 身份证号
 					data.put("card_num", "");
 					// 手机号
-					data.put("phone", "");
+					data.put("phone", patientInfos.getPhone());
 					// 患者生日
 					data.put("birthday", patientInfos.getBirthday()==null?"":patientInfos.getBirthday());
 					// 患者检查时年龄
 					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