|
@@ -34,17 +34,29 @@ public class ReviewTask implements ITask {
|
|
|
String impString = "";
|
|
|
//项目
|
|
|
String proString = "";
|
|
|
+ //报告医生
|
|
|
+ String reportdocString = "";
|
|
|
+ //审核医生
|
|
|
+ String reviewdocString = "";
|
|
|
if (record_accnum.size() == 1) {
|
|
|
record = record_accnum.get(0);
|
|
|
desString = desString + record.getStr("description");
|
|
|
impString = impString + record.getStr("impression");
|
|
|
proString = proString + record.getStr("project");
|
|
|
+ reportdocString = reportdocString + record.getStr("reportdoctor");
|
|
|
+ reviewdocString = reviewdocString + record.getStr("reviewdoctor") == null ? "" : record.getStr("reviewdoctor");
|
|
|
}else if (record_accnum.size() > 1) {
|
|
|
record = record_accnum.get(0);
|
|
|
for (Record countRecord : record_accnum) {
|
|
|
desString = desString + countRecord.getStr("description") + "\n\n";
|
|
|
impString = impString + countRecord.getStr("impression") + "\n\n";
|
|
|
proString = proString + countRecord.getStr("project") + ";";
|
|
|
+ if (!reportdocString.contains(countRecord.getStr("reportdoctor"))) {
|
|
|
+ reportdocString = reportdocString + countRecord.getStr("reportdoctor") + " ";
|
|
|
+ }
|
|
|
+ if (countRecord.getStr("reviewdoctor") != null && !reviewdocString.contains(countRecord.getStr("reviewdoctor"))) {
|
|
|
+ reviewdocString = reviewdocString + countRecord.getStr("reviewdoctor") + " ";
|
|
|
+ }
|
|
|
}
|
|
|
}else {
|
|
|
continue;
|
|
@@ -76,17 +88,15 @@ 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"));
|
|
|
// 意见建议
|