commit

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

@@ -80,9 +80,9 @@ public class ZskkConfig extends JFinalConfig {
 		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='02400006' order by createdAt desc limit 30");
+					"SELECT * FROM pacsonline.exams where exam_status=3 and institution_id='02800005' 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=?",
+					Record record = Db.use("connected").findFirst("select * from reportinfo where studyuid=?",
 							studies.getStudyuid());
 					if (record == null) {
 						continue;
@@ -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("住院号");
@@ -81,7 +81,7 @@ public class DataTask implements ITask {
 					Map<String, String> data = new HashMap<String, String>();
 					// 获取data数据
 					// 医院id
-					data.put("hospital_id", "02400006");
+					data.put("hospital_id", "02800005");
 					// 影像所见
 					data.put("description", record.getStr("description"));
 					// 意见建议
@@ -96,9 +96,9 @@ public class DataTask implements ITask {
 					// 患者性别
 					data.put("patient_sex", patientInfos.getSex());
 					// 身份证号
-					data.put("card_num", "");
+					data.put("card_num", patientInfos.getCardNum());
 					// 手机号
-					data.put("phone", "");
+					data.put("phone", patientInfos.getPhone());
 					// 患者生日
 					data.put("birthday", patientInfos.getBirthday()==null?"":patientInfos.getBirthday());
 					// 患者检查时年龄
@@ -285,14 +285,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='02400006' and realname <>''", name);
+				"SELECT * FROM doctors where instr(?,realname) and institution_id='02800005' 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("02400006");
+			newDoctors.setInstitutionId("02800005");
 			newDoctors.setCreatedAt(new Date());
 			newDoctors.setUpdatedAt(new Date());
 			newDoctors.save();