commit

DataFusion/res/config.properties

@@ -3,6 +3,6 @@ jdbcUrl_zskk  = jdbc:mysql://47.104.6.21:3306/pacsonline?characterEncoding=utf8&
 user_zskk 	  = pacs
 password_zskk = ZSKK@2017~!@#
 
-jdbcUrl_connected  = jdbc:oracle:thin:@//11.0.0.1:1521/HIS
+jdbcUrl_connected  = jdbc:oracle:thin:@//11.0.0.2:1521/orcl
 user_connected 	   = VUSER_PACS
 password_connected = VUSER_PACS

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

@@ -80,9 +80,9 @@ public class ZskkConfig extends JFinalConfig {
 		arpConnected.setDialect(new OracleDialect());
 		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

@@ -35,7 +35,7 @@ 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='02400003' order by createdAt desc limit 30");
+					"SELECT * FROM pacsonline.exams where exam_status=3 and institution_id='02400001' order by createdAt desc limit 30");
 			for (Exams exams2 : exams) {
 				try {
 					// Studies studies = Studies.dao.use("zskk").findById(exams2.getStudyId());
@@ -80,7 +80,7 @@ public class DataTask implements ITask {
 					Map<String, String> data = new HashMap<String, String>();
 					// 获取data数据
 					// 医院id
-					data.put("hospital_id", "02400003");
+					data.put("hospital_id", "02400001");
 					// 影像所见
 					data.put("description", record.getStr("description"));
 					// 意见建议
@@ -276,14 +276,14 @@ public class DataTask implements ITask {
 		}
 		name = name.replace(" ", "");
 		Doctors doctors = Doctors.dao.use("zskk").findFirst(
-				"SELECT * FROM doctors where instr(?,realname) and institution_id='02400003' and realname <>''", name);
+				"SELECT * FROM doctors where instr(?,realname) and institution_id='02400001' and realname <>''", name);
 		if (doctors == null) {
 			Doctors newDoctors = new Doctors().use("zskk");
 			newDoctors.setId(creatId());
 			newDoctors.setUsername("none");
 			newDoctors.setRealname(name);
 			newDoctors.setPassword("123456");
-			newDoctors.setInstitutionId("02400003");
+			newDoctors.setInstitutionId("02400001");
 			newDoctors.setCreatedAt(new Date());
 			newDoctors.setUpdatedAt(new Date());
 			newDoctors.save();