|
|
@@ -8,6 +8,7 @@ import java.util.Map;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
+import com.jfinal.kit.PropKit;
|
|
|
import com.jfinal.plugin.activerecord.Db;
|
|
|
import com.jfinal.plugin.activerecord.Record;
|
|
|
import com.jfinal.plugin.cron4j.ITask;
|
|
|
@@ -26,6 +27,9 @@ public class DataTask implements ITask {
|
|
|
try {
|
|
|
JSONObject jsonObject = JSON.parseObject(object.toString());
|
|
|
Record record = Db.use("connected").findFirst("select * from reportinfo where STUDYUID=?", jsonObject.getString("studyuid"));
|
|
|
+ if (record == null) {
|
|
|
+ record = Db.use("connected").findFirst("select * from reportinfo where ACCESSIONNUMBER=?", jsonObject.getString("accession_num"));
|
|
|
+ }
|
|
|
if (record == null) {
|
|
|
continue;
|
|
|
}
|
|
|
@@ -33,7 +37,12 @@ public class DataTask implements ITask {
|
|
|
continue;
|
|
|
}
|
|
|
Map<String, String> params = new HashMap<>();
|
|
|
- params.put("exam_id", jsonObject.getString("id"));
|
|
|
+ //1:exam_id 2:patient_num 3:accession_num 4:study_uid
|
|
|
+ params.put("type", "1");
|
|
|
+
|
|
|
+ params.put("institution_id", PropKit.get("institution_id"));
|
|
|
+
|
|
|
+ params.put("code", jsonObject.getString("id"));
|
|
|
//报告医生姓名
|
|
|
params.put("report_doctor_name", record.getStr("REPORTDOCTOR"));
|
|
|
//报告时间
|
