commit

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

@@ -78,9 +78,9 @@ public class ZskkConfig extends JFinalConfig {
 		arpConnected.setDialect(new SqlServerDialect());
 		me.add(arpConnected);
 
-//		Cron4jPlugin cpData = new Cron4jPlugin();
-//		cpData.addTask("*/20 * * * *", 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

@@ -13,7 +13,7 @@ import com.zskk.model.Doctors;
 import com.zskk.model.Exams;
 import com.zskk.model.PatientInfos;
 import com.zskk.model.Report;
-//import com.zskk.model.Studies;
+import com.zskk.model.Studies;
 import com.zskk.service.WeixinService;
 
 public class DataTask implements ITask {
@@ -22,10 +22,10 @@ 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=01000001 order by createdAt desc limit 50");
+			List<Exams> exams = Exams.dao.use("zskk").find("SELECT * FROM pacsonline.exams where exam_status=3 and institution_id=47300001 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 reportinfo where accessionNumber=?",exams2.getAccessionNum());
+				Studies studies = Studies.dao.use("zskk").findById(exams2.getStudyId());
+				Record record = Db.use("connected").findFirst("select * from zskk where studyuid=?",studies.getStudyuid());
 				if (record == null) {
 					continue;
 				}
@@ -35,8 +35,8 @@ public class DataTask implements ITask {
 				if (record.getStr("impression") == null && record.getStr("description") == null) {
 					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")));
@@ -78,9 +78,18 @@ 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=01000001",name);
+		Doctors doctors = Doctors.dao.use("zskk").findFirst("SELECT * FROM doctors where instr(?,realname) and institution_id=47300001 and realname<>null",name);
 		if (doctors == null) {
-			return null;
+			Doctors newDoctors = new Doctors().use("zskk");
+			newDoctors.setId(creatId());
+			newDoctors.setUsername("none");
+			newDoctors.setRealname(name);
+			newDoctors.setPassword("123456");
+			newDoctors.setInstitutionId("47300001");
+			newDoctors.setCreatedAt(new Date());
+			newDoctors.setUpdatedAt(new Date());
+			newDoctors.save();
+			return newDoctors.getId();
 		}
 		return doctors.getId();
 	}
@@ -89,7 +98,7 @@ public class DataTask implements ITask {
 		if (dateStr == null) {
 			return new Date();
 		}
-		SimpleDateFormat sdf= new SimpleDateFormat("yyyy.MM.dd HH:mm:ss");
+		SimpleDateFormat sdf= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 	    Date date = null;
 		try {
 			date = sdf.parse(dateStr);