commit

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

@@ -5,11 +5,13 @@ import com.jfinal.kit.PropKit;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
 import com.jfinal.plugin.activerecord.dialect.MysqlDialect;
 import com.jfinal.plugin.activerecord.dialect.SqlServerDialect;
+import com.jfinal.plugin.cron4j.Cron4jPlugin;
 import com.jfinal.plugin.druid.DruidPlugin;
 import com.jfinal.template.Engine;
 import com.zskk.control.ViewController;
 import com.zskk.model._MappingKit;
 import com.zskk.service.ServiceFactory;
+import com.zskk.task.DataTask;
 
 public class ZskkConfig extends JFinalConfig {
 	
@@ -71,9 +73,9 @@ public class ZskkConfig extends JFinalConfig {
 		arpConnected.setDialect(new SqlServerDialect());
 		me.add(arpConnected);
 
-//		Cron4jPlugin cpData = new Cron4jPlugin();
-//		cpData.addTask("*/15 * * * *", new DataTask());
-//		me.add(cpData);
+		Cron4jPlugin cpData = new Cron4jPlugin();
+		cpData.addTask("*/15 * * * *", new DataTask());
+		me.add(cpData);
 
 //		Cron4jPlugin cp2 = new Cron4jPlugin();
 //		cp2.addTask("*/3 * * * *", new SyncTask2());

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

@@ -23,28 +23,28 @@ public class DataTask implements ITask {
 	public void run() {
 		// 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=47600001 order by createdAt desc limit 30");
+			List<Exams> exams = Exams.dao.use("zskk").find("SELECT * FROM pacsonline.exams where exam_status=3 and institution_id=13430001 order by createdAt desc limit 30");
 			for (Exams exams2 : exams) {
 				Studies studies = Studies.dao.use("zskk").findById(exams2.getStudyId());
-				Record record = Db.use("connected").findFirst("select * from V_EXAMREQUESTS where studyuid=?",studies.getStudyuid());
+				Record record = Db.use("connected").findFirst("select * from reportinfo where studyuid=?",studies.getStudyuid());
 				if (record == null) {
 					continue;
 				}
 				Report report = new Report().use("zskk");
 				report.setId(creatId());
-				report.setReportDatetime(parseStringToDate(record.getStr("reportdate")));
-				if (record.getStr("impression") == null && record.getStr("description") == null) {
+//				report.setReportDatetime(parseStringToDate(record.getStr("reportdate")));
+				if (record.getStr("IMPRESSION") == null && record.getStr("DESCRIPTION") == null) {
 					continue;
 				}
-				report.setImpression(record.getStr("impression"));
-				report.setDescription(record.getStr("description"));
+				report.setImpression(record.getStr("IMPRESSION"));
+				report.setDescription(record.getStr("DESCRIPTION"));
 				report.setExamId(exams2.getId());
 				report.setCreatedAt(new Date());
 				report.setReportDoctorId(getDoctorIdByName(record.getStr("reportdoctor")));
 				report.setReviewDoctorId(getDoctorIdByName(record.getStr("reviewdoctor")));
-				report.setReviewDatetime(parseStringToDate(record.getStr("reportdate")));
+//				report.setReviewDatetime(parseStringToDate(record.getStr("reportdate")));
 				report.setConfirmDoctorId(getDoctorIdByName(record.getStr("reviewdoctor")));
-				report.setConfirmDatetime(parseStringToDate(record.getStr("reportdate")));
+//				report.setConfirmDatetime(parseStringToDate(record.getStr("reportdate")));
 				report.save();
 				PatientInfos patientInfos = PatientInfos.dao.use("zskk").findById(exams2.getPatientId());
 				patientInfos.setName(record.getStr("patientname"));
@@ -79,7 +79,7 @@ public class DataTask implements ITask {
 		if (name == null) {
 			return null;
 		}
-		Doctors doctors = Doctors.dao.use("zskk").findFirst("SELECT * FROM doctors where instr(?,realname) and institution_id=47600001",name);
+		Doctors doctors = Doctors.dao.use("zskk").findFirst("SELECT * FROM doctors where instr(?,realname) and institution_id=13430001",name);
 		if (doctors == null) {
 			return null;
 		}