commit

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

@@ -72,17 +72,17 @@ public class ZskkConfig extends JFinalConfig {
 		me.add(arpZskk);
 
 		// 配置数据库连接池插件
-//		DruidPlugin druidPluginConnected = createConnectedDruidPlugin();
-//		me.add(druidPluginConnected);
-//
-//		// 配置ActiveRecord插件
-//		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);
+		DruidPlugin druidPluginConnected = createConnectedDruidPlugin();
+		me.add(druidPluginConnected);
+
+		// 配置ActiveRecord插件
+		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 cp2 = new Cron4jPlugin();
 //		cp2.addTask("*/15 * * * *", new UpdateTask());

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

@@ -40,7 +40,7 @@ public class DataTask implements ITask {
 			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 reportinfo where studyuid=?",
 							studies.getStudyuid());
 					if (record == null) {
 						continue;
@@ -48,11 +48,11 @@ public class DataTask implements ITask {
 					Report report = new Report().use("zskk");
 					report.setId(creatId());
 					report.setReportDatetime(parseStringToDate(record.getStr("reportdate")));
-					if (record.getStr("description") == null || record.getStr("impression") == null
-							|| record.getStr("description").isBlank()) {
+					if (record.getStr("DESCRIPTION") == null || record.getStr("impression") == null
+							|| record.getStr("DESCRIPTION").isBlank()) {
 						continue;
 					}
-					report.setImpression(record.getStr("description"));
+					report.setImpression(record.getStr("DESCRIPTION"));
 					report.setDescription(record.getStr("impression"));
 					report.setExamId(exams2.getId());
 					report.setCreatedAt(new Date());
@@ -64,8 +64,8 @@ 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.setCardNum(record.getStr("IDCARD"));
+					patientInfos.setPhone(record.getStr("phone"));
+					patientInfos.setCardNum(record.getStr("idcard"));
 					patientInfos.update();
 					exams2.setExamStatus(9);
 //					String patString = record.getStr("住院号");
@@ -83,7 +83,7 @@ public class DataTask implements ITask {
 					// 医院id
 					data.put("hospital_id", "25660009");
 					// 影像所见
-					data.put("description", record.getStr("description"));
+					data.put("description", record.getStr("DESCRIPTION"));
 					// 意见建议
 					data.put("impression", record.getStr("impression"));
 					// 检查id