|
@@ -24,7 +24,7 @@ public class DataTask implements ITask {
|
|
|
JSONArray jsonArray = dService.getExamList(80);
|
|
|
for (Object object : jsonArray) {
|
|
|
JSONObject jsonObject = JSON.parseObject(object.toString());
|
|
|
- Record record = Db.use("connected").findFirst("select * from reportinfo where accessionNumber=?", jsonObject.getString("accession_num"));
|
|
|
+ Record record = Db.use("connected").findFirst("select * from reportinfo where studyuid=?", jsonObject.getString("studyuid"));
|
|
|
if (record == null) {
|
|
|
continue;
|
|
|
}
|
|
@@ -40,11 +40,11 @@ public class DataTask implements ITask {
|
|
|
//审核医生姓名
|
|
|
params.put("review_doctor_name", record.getStr("reviewdoctor")==null?record.getStr("reportdoctor"):"");
|
|
|
//审核时间
|
|
|
- params.put("review_datetime", record.getStr("reportdate"));
|
|
|
+ params.put("review_datetime", record.getStr("reviewdate"));
|
|
|
//确认医生姓名
|
|
|
params.put("confirm_doctor_name", record.getStr("reviewdoctor")==null?record.getStr("reportdoctor"):"");
|
|
|
//确认时间
|
|
|
- params.put("confirm_datetime", record.getStr("reportdate"));
|
|
|
+ params.put("confirm_datetime", record.getStr("reviewdate"));
|
|
|
//意见建议
|
|
|
params.put("impression", record.getStr("impression"));
|
|
|
//影像所见
|
|
@@ -57,7 +57,7 @@ public class DataTask implements ITask {
|
|
|
//临床诊断
|
|
|
params.put("clin_diag", record.getStr("diagnosis"));
|
|
|
//症状
|
|
|
- params.put("clin_symp", "");
|
|
|
+ params.put("clin_symp", record.getStr("symptom"));
|
|
|
//patient_infos表
|
|
|
//患者姓名
|
|
|
params.put("name", record.getStr("patientname"));
|
|
@@ -68,7 +68,7 @@ public class DataTask implements ITask {
|
|
|
//检查结果1阴2阳
|
|
|
params.put("report_result", record.getStr("result").contains("阳")?"2":"1");
|
|
|
//门诊号住院号
|
|
|
-// params.put("hopitalized_no", record.getStr("hospitalNumber")==null?"":record.getStr("hospitalNumber"));
|
|
|
+ params.put("hopitalized_no", record.getStr("inPatientNum")==null?"":record.getStr("inPatientNum"));
|
|
|
ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
|
|
|
tService.execute(() -> {
|
|
|
dService.saveReport(params);
|