修复bug375:住院医生站点击“签发”按钮后系统提示语错误,显示为“保存成功”并且签发业务功能未实现。
bug376:【门诊医生站】检查页签申请单列表过滤异常,显示了历史检查就诊记录 bug377:【门诊医生站】检查申请单“执行科室”未获取配置默认值且字段交互逻辑不规范
This commit is contained in:
@@ -64,10 +64,29 @@ public class ExamApplyController extends BaseController {
|
||||
* 查询检查申请单列表
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(ExamApply examApply) {
|
||||
public TableDataInfo list(ExamApply examApply, @RequestParam(value = "encounterId", required = false) Long encounterId) {
|
||||
startPage();
|
||||
LambdaQueryWrapper<ExamApply> wrapper = new LambdaQueryWrapper<>();
|
||||
if (examApply.getVisitNo() != null) {
|
||||
|
||||
// 优先按本次就诊 encounterId 过滤(通过 wor_service_request 关联)
|
||||
if (encounterId != null) {
|
||||
List<ServiceRequest> reqList = serviceRequestService.list(new LambdaQueryWrapper<ServiceRequest>()
|
||||
.eq(ServiceRequest::getEncounterId, encounterId)
|
||||
.eq(ServiceRequest::getBasedOnTable, "exam_apply")
|
||||
.isNotNull(ServiceRequest::getBasedOnId)
|
||||
);
|
||||
List<Long> basedOnIds = reqList.stream()
|
||||
.map(ServiceRequest::getBasedOnId)
|
||||
.filter(java.util.Objects::nonNull)
|
||||
.distinct()
|
||||
.toList();
|
||||
// 没有本次就诊的检查申请单时,直接返回空列表
|
||||
if (basedOnIds.isEmpty()) {
|
||||
return getDataTable(java.util.Collections.emptyList());
|
||||
}
|
||||
wrapper.in(ExamApply::getId, basedOnIds);
|
||||
} else if (examApply.getVisitNo() != null) {
|
||||
// 兼容旧逻辑:按 visitNo 查询(可能包含历史记录)
|
||||
wrapper.eq(ExamApply::getVisitNo, examApply.getVisitNo());
|
||||
}
|
||||
wrapper.orderByDesc(ExamApply::getApplyTime);
|
||||
@@ -147,6 +166,8 @@ public class ExamApplyController extends BaseController {
|
||||
examApply.setOperatorId("system");
|
||||
}
|
||||
examApplyService.save(examApply);
|
||||
// 业务主键为 apply_no,自增 id 不会随 save 回填;列表接口依赖 wor_service_request.based_on_id=exam_apply.id 关联本次就诊,此处必须回读 id
|
||||
examApply = examApplyService.getById(applyNo);
|
||||
|
||||
// ========== 2. 批量保存明细 + 写入门诊医嘱 + 写入费用项 ==========
|
||||
if (dto.getItems() != null && !dto.getItems().isEmpty()) {
|
||||
|
||||
Reference in New Issue
Block a user