commit

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

@@ -13,15 +13,12 @@ import com.zskk.model.Studies;
 import com.zskk.service.ServiceFactory;
 import com.zskk.service.ThreadPoolService;
 import com.zskk.service.WeixinService;
-
 import okhttp3.FormBody;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
-
 import org.apache.commons.codec.digest.DigestUtils;
-
 import java.io.*;
 import java.net.URLEncoder;
 import java.text.ParseException;
@@ -36,12 +33,12 @@ 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='02400005' order by createdAt desc limit 30");
+					"SELECT * FROM pacsonline.exams where exam_status=3 and institution_id='41800001' 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 v_reportinfo where ACCESSIONNUMBER=?",
-							exams2.getAccessionNum());
+					Record record = Db.use("connected").findFirst("select * from reportinfo where ACCESSIONNUMBER=?",
+							exams2.getPatientNum());
 					if (record == null) {
 						continue;
 					}
@@ -73,7 +70,7 @@ public class DataTask implements ITask {
 //					patString = String.format("%0"+length+"d",Long.valueOf(patString));
 //					exams2.setHopitalizedNo(patString);
 //					exams2.setClinDoctors(record.getStr("CLINICALDOCTOR"));
-//					exams2.setApplicationDepartment(record.getStr("DEPARTMENT"));
+					exams2.setApplicationDepartment(record.getStr("DEPARTMENT"));
 					exams2.setApplicationDoctor(record.getStr("CLINICALDOCTOR")==null?"":record.getStr("CLINICALDOCTOR"));
 //					exams2.setClinDiag(record.getStr("diagnosis"));
 					exams2.update();
@@ -81,7 +78,7 @@ public class DataTask implements ITask {
 					Map<String, String> data = new HashMap<String, String>();
 					// 获取data数据
 					// 医院id
-					data.put("hospital_id", "02400005");
+					data.put("hospital_id", "41800001");
 					// 影像所见
 					data.put("description", record.getStr("DESCRIPTION"));
 					// 意见建议
@@ -104,7 +101,7 @@ public class DataTask implements ITask {
 					// 患者检查时年龄
 					data.put("patient_age", "");
 					// 阴阳性 1阴性 2阳性
-					data.put("report_result", "");
+					data.put("report_result", record.getStr("RESULT").contains("阳")?"2":"1");
 					// 报告时间 10位时间戳
 					data.put("report_datetime", returnSecondTimestamp(record.getStr("REPORTDATE")));
 					// 报告医生id
@@ -278,14 +275,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='02400005' and realname <>''", name);
+				"SELECT * FROM doctors where instr(?,realname) and institution_id='41800001' 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("02400005");
+			newDoctors.setInstitutionId("41800001");
 			newDoctors.setCreatedAt(new Date());
 			newDoctors.setUpdatedAt(new Date());
 			newDoctors.save();
@@ -298,7 +295,7 @@ public class DataTask implements ITask {
 		if (dateStr == null) {
 			return new Date();
 		}
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		Date date = null;
 		try {
 			date = sdf.parse(dateStr);