fix(#613): 医嘱退回流程完善 — 前端退回原因必填弹窗 + 后端存储退回原因

根因(全链路6环分析):
- ① 前端/页面  handleCancel() 直接调 API,无退回原因输入弹窗
- ② Controller  不涉及 backReason — 纯转发,无需修改
- ③ Service  adviceReject() 从 DTO 读取 list 但不提取 backReason,硬编码传 null
- ④ Mapper/DB  backReason 参数已就绪但上游传 null 导致不写入
- ⑤ 医生端  因 DB 无数据,无法展示退回原因

修复:
- 前端: handleCancel() 改为弹对话框,新增 confirmCancel() 校验必填后传 backReason
- 后端: adviceReject() 从 PerformInfoDto 提取 backReason 传给 updateDraftStatus/updateDraftStatusBatch

全链路状态流转:
护士选医嘱 → 点退回 → 弹窗要求输入原因 → 确定 → API传backReason → DB保存 → 医生端可显示
This commit is contained in:
2026-05-29 14:15:26 +08:00
parent 3997c02564
commit 5b80695669
2 changed files with 55 additions and 9 deletions

View File

@@ -58,6 +58,7 @@ import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
import java.util.*;
import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -413,15 +414,21 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
}
Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
Date checkDate = new Date();
// 从请求中提取退回原因(所有项目共享同一原因)
String backReason = performInfoList.stream()
.map(PerformInfoDto::getBackReason)
.filter(Objects::nonNull)
.findFirst()
.orElse(null);
if (!serviceRequestList.isEmpty()) {
// 更新服务请求状态待发送
serviceRequestService.updateDraftStatus(
serviceRequestList.stream().map(PerformInfoDto::getRequestId).toList(), practitionerId, checkDate, null);
serviceRequestList.stream().map(PerformInfoDto::getRequestId).toList(), practitionerId, checkDate, backReason);
}
if (!medRequestList.isEmpty()) {
// 更新药品请求状态待发送
medicationRequestService.updateDraftStatusBatch(
medRequestList.stream().map(PerformInfoDto::getRequestId).toList(), practitionerId, checkDate, null);
medRequestList.stream().map(PerformInfoDto::getRequestId).toList(), practitionerId, checkDate, backReason);
}
return R.ok(null, "退回成功");
}