|
|
@@ -18,51 +18,49 @@ public class DataTask implements ITask {
|
|
|
public void run() {
|
|
|
// TODO Auto-generated method stub
|
|
|
try {
|
|
|
-
|
|
|
DataService dService = ServiceFactory.getService(DataService.class);
|
|
|
JSONArray jsonArray = dService.getExamList(30);
|
|
|
for (Object object : jsonArray) {
|
|
|
JSONObject jsonObject = JSON.parseObject(object.toString());
|
|
|
- Record record = Db.use("connected").findFirst("select * from PACSONLINE_Interface where STUDYUID=?",
|
|
|
- jsonObject.getString("studyuid"));
|
|
|
+ Record record = Db.use("connected").findFirst("select * from vi_CSH_KIOSK_Examinfo1 where studyuid=?",jsonObject.getString("accession_num"));
|
|
|
if (record == null) {
|
|
|
continue;
|
|
|
}
|
|
|
- if (record.getStr("IMPRESSION") == null && record.getStr("DESCRIPTION") == null) {
|
|
|
+ if (record.getStr("impression") == null && record.getStr("description") == null) {
|
|
|
continue;
|
|
|
}
|
|
|
Map<String, String> params = new HashMap<>();
|
|
|
params.put("exam_id", jsonObject.getString("id"));
|
|
|
// 报告医生姓名
|
|
|
- params.put("report_doctor_name", record.getStr("REPORTDOCTOR"));
|
|
|
+ params.put("report_doctor_name", record.getStr("reportdoctor"));
|
|
|
// 报告时间
|
|
|
- params.put("report_datetime", record.getStr("REPORTDATE"));
|
|
|
+ params.put("report_datetime", record.getStr("reportdate"));
|
|
|
// 审核医生姓名
|
|
|
- params.put("review_doctor_name", record.getStr("REVIEWDOCTOR"));
|
|
|
+ params.put("review_doctor_name", record.getStr("reviewdoctor"));
|
|
|
// 审核时间
|
|
|
- params.put("review_datetime", record.getStr("REPORTDATE"));
|
|
|
+ params.put("review_datetime", record.getStr("reportdate"));
|
|
|
// 确认医生姓名
|
|
|
- params.put("confirm_doctor_name", record.getStr("REVIEWDOCTOR"));
|
|
|
+ params.put("confirm_doctor_name", record.getStr("reviewdoctor"));
|
|
|
// 确认时间
|
|
|
- params.put("confirm_datetime", record.getStr("REPORTDATE"));
|
|
|
+ params.put("confirm_datetime", record.getStr("reportdate"));
|
|
|
// 意见建议
|
|
|
- params.put("impression", record.getStr("IMPRESSION"));
|
|
|
+ params.put("impression", record.getStr("impression"));
|
|
|
// 影像所见
|
|
|
- params.put("description", record.getStr("DESCRIPTION"));
|
|
|
+ params.put("description", record.getStr("description"));
|
|
|
// exams表
|
|
|
// 申请科室
|
|
|
- params.put("application_department", record.getStr("DEPARTMENT"));
|
|
|
+ params.put("application_department", record.getStr("department"));
|
|
|
// 申请医生
|
|
|
- params.put("application_doctor", record.getStr("CLINICALDOCTOR"));
|
|
|
+ params.put("application_doctor", record.getStr("clinicaldoctor"));
|
|
|
// 临床诊断
|
|
|
- params.put("clin_diag", "");
|
|
|
+ params.put("clin_diag", record.getStr("diagnosis"));
|
|
|
// patient_infos表
|
|
|
// 患者姓名
|
|
|
- params.put("name", record.getStr("PATIENTNAME"));
|
|
|
+ params.put("name", record.getStr("patientname"));
|
|
|
// 患者手机号
|
|
|
- params.put("phone", "");
|
|
|
+ params.put("phone", record.getStr("phone"));
|
|
|
// 患者身份证号
|
|
|
- params.put("card_num", record.getStr("IDCARD"));
|
|
|
+ params.put("card_num", "");
|
|
|
params.put("report_result", "0");
|
|
|
ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
|
|
|
tService.execute(() -> {
|
