|
|
@@ -162,11 +162,11 @@ public class ReviewTask implements ITask {
|
|
|
|
|
|
//体检科
|
|
|
List<Record> recordstj = Db.use("connected").find("select * from reportinfo where reviewdate >? and reviewdate <? and department='健康体检科' order by reviewdate desc",parseStringToDatetje(),parseStringToDatetjs());
|
|
|
- for (Record record : recordstj) {
|
|
|
+ for (Record recordnstj : recordstj) {
|
|
|
try {
|
|
|
List<Record> record_accnum = Db.use("connected").find("select * from reportinfo where accessionNumber=?",
|
|
|
- record.getStr("accessionNumber"));
|
|
|
-// Record record = null;
|
|
|
+ recordnstj.getStr("accessionNumber"));
|
|
|
+ Record record = null;
|
|
|
//所见
|
|
|
String desString = "";
|
|
|
//建议
|
|
|
@@ -241,23 +241,21 @@ public class ReviewTask implements ITask {
|
|
|
|
|
|
params.put("code", record.getStr("examNo"));
|
|
|
// 报告医生姓名
|
|
|
- params.put("report_doctor_name", record.getStr("reportdoctor"));
|
|
|
+ params.put("report_doctor_name", reportdocString);
|
|
|
// 报告时间
|
|
|
params.put("report_datetime", record.getStr("reportdate"));
|
|
|
// 审核医生姓名
|
|
|
- params.put("review_doctor_name",
|
|
|
- record.getStr("reviewdoctor") == null ? "" : record.getStr("reviewdoctor"));
|
|
|
+ params.put("review_doctor_name", reviewdocString);
|
|
|
// 审核时间
|
|
|
params.put("review_datetime", record.getStr("reviewdate"));
|
|
|
// 确认医生姓名
|
|
|
- params.put("confirm_doctor_name",
|
|
|
- record.getStr("reviewdoctor") == null ? "" : record.getStr("reviewdoctor"));
|
|
|
+ params.put("confirm_doctor_name", reviewdocString);
|
|
|
// 确认时间
|
|
|
params.put("confirm_datetime", record.getStr("reviewdate"));
|
|
|
// 意见建议
|
|
|
- params.put("impression", record.getStr("impression"));
|
|
|
+ params.put("impression", impString);
|
|
|
// 影像所见
|
|
|
- params.put("description", record.getStr("description"));
|
|
|
+ params.put("description", desString);
|
|
|
// exams表
|
|
|
// 申请科室
|
|
|
params.put("application_department", record.getStr("department"));
|
|
|
@@ -287,7 +285,7 @@ public class ReviewTask implements ITask {
|
|
|
// 病人ID
|
|
|
params.put("his_patient_id", hispatientidStr);
|
|
|
// 检查方法
|
|
|
- params.put("exam_project", record.getStr("project"));
|
|
|
+ params.put("exam_project", proString);
|
|
|
ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
|
|
|
tService.execute(() -> {
|
|
|
dService.saveReport(params);
|
