1

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

@@ -6,6 +6,7 @@ import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
 import com.jfinal.plugin.cron4j.ITask;
 import com.zskk.model.*;
+import com.zskk.service.ThreadPoolService;
 import okhttp3.*;
 import org.apache.commons.codec.digest.DigestUtils;
 
@@ -60,12 +61,12 @@ public class DataTask implements ITask {
 					exams2.setClinDiag(record.getStr("diagnosis"));
 					exams2.update();
 					// 传云医康 数据
-					/*Map<String, String> data = new HashMap<String, String>();
+					Map<String, String> data = new HashMap<String, String>();
 					// 获取data数据
 					// 医院id
 					data.put("hospital_id", "25200005");
 					// 影像所见
-					data.put("description", record.getStr("DESCRIPTION"));
+					data.put("description", record.getStr("description"));
 					// 意见建议
 					data.put("impression", record.getStr("impression"));
 					// 检查id
@@ -82,9 +83,9 @@ public class DataTask implements ITask {
 					// 手机号
 					data.put("phone", "");
 					// 患者生日
-					data.put("birthday", returnSecondTimestamp(record.getStr("birthdate")));
+					data.put("birthday", patientInfos.getBirthday());
 					// 患者检查时年龄
-					data.put("patient_age", record.getStr("patientage"));
+					data.put("patient_age", patientInfos.getAge());
 					// 阴阳性 1阴性 2阳性
 					data.put("report_result", "");
 					// 报告时间 10位时间戳
@@ -117,8 +118,7 @@ public class DataTask implements ITask {
 							// TODO Auto-generated catch block
 							e.printStackTrace();
 						}
-					});*/
-
+					});
 				} catch (Exception e) {
 					// TODO: handle exception
 					continue;