|
|
@@ -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;
|
|
|
|
|
|
@@ -59,7 +60,7 @@ public class DataTask implements ITask {
|
|
|
exams2.setApplicationDoctor(record.getStr("CLINICALDOCTOR"));
|
|
|
//exams2.setClinDiag(record.getStr("CLINICALDOCTOR"));
|
|
|
exams2.update();
|
|
|
- /* // 传云医康 数据
|
|
|
+ // 传云医康 数据
|
|
|
Map<String, String> data = new HashMap<String, String>();
|
|
|
// 获取data数据
|
|
|
// 医院id
|
|
|
@@ -67,44 +68,44 @@ public class DataTask implements ITask {
|
|
|
// 影像所见
|
|
|
data.put("description", record.getStr("DESCRIPTION"));
|
|
|
// 意见建议
|
|
|
- data.put("impression", record.getStr("impression"));
|
|
|
+ data.put("impression", record.getStr("IMPRESSION"));
|
|
|
// 检查id
|
|
|
data.put("exam_id", exams2.getId());
|
|
|
data.put("study_id", exams2.getStudyId());
|
|
|
// 患者id
|
|
|
data.put("patient_id", exams2.getPatientId());
|
|
|
// 患者姓名
|
|
|
- data.put("patient_name", record.getStr("patientname"));
|
|
|
+ data.put("patient_name", record.getStr("PATIENTNAME"));
|
|
|
// 患者性别
|
|
|
- data.put("patient_sex", record.getStr("patientsex").equals("女") ? "F" : "M");
|
|
|
+ data.put("patient_sex", record.getStr("PATIENTSEX").equals("女") ? "F" : "M");
|
|
|
// 身份证号
|
|
|
data.put("card_num", "");
|
|
|
// 手机号
|
|
|
data.put("phone", "");
|
|
|
// 患者生日
|
|
|
- data.put("birthday", returnSecondTimestamp(record.getStr("birthdate")));
|
|
|
+ data.put("birthday", returnSecondTimestamp(record.getStr("BIRTHDATE")));
|
|
|
// 患者检查时年龄
|
|
|
- data.put("patient_age", record.getStr("patientage"));
|
|
|
+ data.put("patient_age", record.getStr("PATIENTAGE"));
|
|
|
// 阴阳性 1阴性 2阳性
|
|
|
data.put("report_result", "");
|
|
|
// 报告时间 10位时间戳
|
|
|
- data.put("report_datetime", returnSecondTimestamp(record.getStr("reportdate")));
|
|
|
+ data.put("report_datetime", returnSecondTimestamp(record.getStr("REPORTDATE")));
|
|
|
// 报告医生id
|
|
|
- data.put("report_doctor_id", record.getStr("reportdoctor"));
|
|
|
+ data.put("report_doctor_id", record.getStr("REPORTDOCTOR"));
|
|
|
// 报告医生姓名
|
|
|
- data.put("report_doctor_name", record.getStr("reportdoctor"));
|
|
|
+ data.put("report_doctor_name", record.getStr("REPORTDOCTOR"));
|
|
|
// 审核时间
|
|
|
- data.put("review_datetime", returnSecondTimestamp(record.getStr("reportdate")));
|
|
|
+ data.put("review_datetime", returnSecondTimestamp(record.getStr("REPORTDATE")));
|
|
|
// 审核医生id
|
|
|
- data.put("review_doctor_id", record.getStr("reviewdoctor"));
|
|
|
+ data.put("review_doctor_id", record.getStr("REPORTDOCTOR"));
|
|
|
// 审核姓名
|
|
|
- data.put("review_doctor_name", record.getStr("reviewdoctor"));
|
|
|
+ data.put("review_doctor_name", record.getStr("REPORTDOCTOR"));
|
|
|
// 确认时间
|
|
|
- data.put("confirm_datetime", returnSecondTimestamp(record.getStr("reportdate")));
|
|
|
+ data.put("confirm_datetime", returnSecondTimestamp(record.getStr("REPORTDATE")));
|
|
|
// 确认医生id
|
|
|
- data.put("confirm_doctor_id", record.getStr("reviewdoctor"));
|
|
|
+ data.put("confirm_doctor_id", record.getStr("REPORTDOCTOR"));
|
|
|
// 确认医生姓名
|
|
|
- data.put("confirm_doctor_name", record.getStr("reviewdoctor"));
|
|
|
+ data.put("confirm_doctor_name", record.getStr("REPORTDOCTOR"));
|
|
|
|
|
|
ThreadPoolService tService = new com.zskk.service.ThreadPoolService();
|
|
|
tService.execute(() -> {
|
|
|
@@ -117,7 +118,7 @@ public class DataTask implements ITask {
|
|
|
// TODO Auto-generated catch block
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
- });*/
|
|
|
+ });
|
|
|
|
|
|
} catch (Exception e) {
|
|
|
// TODO: handle exception
|
zhangzhanping