|
|
@@ -24,51 +24,51 @@ public class DataTask implements ITask {
|
|
|
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 KANJI_VIEW where ACCESSNUM=? and ReportStatus='已审报告'", jsonObject.getString("accession_num"));
|
|
|
if (record == null) {
|
|
|
continue;
|
|
|
}
|
|
|
- if (record.getStr("IMPRESSION") == null && record.getStr("DESCRIPTION") == null) {
|
|
|
+ if (record.getStr("WYGText") == null && record.getStr("WYSText") == 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("FirstApprover"));
|
|
|
//报告时间
|
|
|
- params.put("report_datetime", record.getStr("REPORTDATE"));
|
|
|
+ params.put("report_datetime", record.getStr("SubmitDt"));
|
|
|
//审核医生姓名
|
|
|
- params.put("review_doctor_name", record.getStr("REVIEWDOCTOR"));
|
|
|
+ params.put("review_doctor_name", record.getStr("Submitter"));
|
|
|
//审核时间
|
|
|
- params.put("review_datetime", record.getStr("REPORTDATE"));
|
|
|
+ params.put("review_datetime", record.getStr("SubmitDt"));
|
|
|
//确认医生姓名
|
|
|
- params.put("confirm_doctor_name", record.getStr("REVIEWDOCTOR"));
|
|
|
+ params.put("confirm_doctor_name", record.getStr("Submitter"));
|
|
|
//确认时间
|
|
|
- params.put("confirm_datetime", record.getStr("REPORTDATE"));
|
|
|
+ params.put("confirm_datetime", record.getStr("SubmitDt"));
|
|
|
//意见建议
|
|
|
- params.put("impression", record.getStr("IMPRESSION"));
|
|
|
+ params.put("impression", record.getStr("WYGText"));
|
|
|
//影像所见
|
|
|
- params.put("description", record.getStr("DESCRIPTION"));
|
|
|
+ params.put("description", record.getStr("WYSText"));
|
|
|
//exams表
|
|
|
//申请科室
|
|
|
- params.put("application_department", record.getStr("DEPARTMENT"));
|
|
|
+ params.put("application_department", record.getStr("Area"));
|
|
|
//申请医生
|
|
|
- params.put("application_doctor", record.getStr("CLINICALDOCTOR"));
|
|
|
+ params.put("application_doctor", "");
|
|
|
//临床诊断
|
|
|
- params.put("clin_diag", "");
|
|
|
+ params.put("clin_diag", record.getStr("ClinicDiagnose"));
|
|
|
//症状
|
|
|
params.put("clin_symp", "");
|
|
|
//patient_infos表
|
|
|
//患者姓名
|
|
|
- params.put("name", record.getStr("PATIENTNAME"));
|
|
|
+ params.put("name", record.getStr("F_PAT_NAME"));
|
|
|
//患者手机号
|
|
|
params.put("phone", "");
|
|
|
//患者身份证号
|
|
|
- params.put("card_num", record.getStr("IDCARD"));
|
|
|
+ params.put("card_num", "");
|
|
|
//检查结果1阴2阳
|
|
|
params.put("report_result", "0");
|
|
|
//门诊号住院号
|
|
|
- params.put("hopitalized_no", record.getStr("patientNumber"));
|
|
|
+ params.put("hopitalized_no", record.getStr("HospilizedNo"));
|
|
|
ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
|
|
|
tService.execute(() -> {
|
|
|
dService.saveReport(params);
|
