diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/appservice/IConsultationAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/appservice/IConsultationAppService.java index 4c907756..1117e2d6 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/appservice/IConsultationAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/appservice/IConsultationAppService.java @@ -149,6 +149,14 @@ public interface IConsultationAppService { * @return 会诊意见列表 */ List getConsultationOpinions(String consultationId); + + /** + * 根据ID查询会诊申请详情 + * + * @param id 会诊申请ID + * @return 会诊申请详情 + */ + ConsultationRequestDto getConsultationById(Long id); } diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/appservice/impl/ConsultationAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/appservice/impl/ConsultationAppServiceImpl.java index 15632f7a..32004338 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/appservice/impl/ConsultationAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/appservice/impl/ConsultationAppServiceImpl.java @@ -786,10 +786,6 @@ public class ConsultationAppServiceImpl implements IConsultationAppService { } } - log.info("填充会诊记录信息,已确认和已签名医生数:{},已签名医生数:{}", - confirmedAndSignedPhysicians.size(), signedPhysicians.size()); - } - } } } @@ -1822,5 +1818,26 @@ public class ConsultationAppServiceImpl implements IConsultationAppService { return new ArrayList<>(); } } + + @Override + public ConsultationRequestDto getConsultationById(Long id) { + try { + if (id == null) { + throw new IllegalArgumentException("会诊申请ID不能为空"); + } + + // 1. 查询会诊申请 + ConsultationRequest request = consultationRequestMapper.selectById(id); + if (request == null) { + throw new IllegalArgumentException("会诊申请不存在,ID: " + id); + } + + // 2. 转换为DTO并返回 + return convertToDto(request); + } catch (Exception e) { + log.error("查询会诊申请详情失败", e); + throw new RuntimeException("查询会诊申请详情失败: " + e.getMessage()); + } + } } diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/controller/ConsultationController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/controller/ConsultationController.java index de2746f3..5e8672d0 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/controller/ConsultationController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/controller/ConsultationController.java @@ -302,5 +302,21 @@ public class ConsultationController { return R.fail("获取会诊意见列表失败: " + e.getMessage()); } } + + /** + * 根据ID查询会诊申请详情 + */ + @ApiOperation("根据ID查询会诊申请详情") + @GetMapping("/detail/{id}") + public R getConsultationById( + @ApiParam("会诊申请ID") @PathVariable Long id) { + try { + ConsultationRequestDto detail = consultationAppService.getConsultationById(id); + return R.ok(detail); + } catch (Exception e) { + log.error("查询会诊申请详情失败", e); + return R.fail("查询会诊申请详情失败: " + e.getMessage()); + } + } } diff --git a/openhis-ui-vue3/src/views/consultationmanagement/consultationapplication/api.js b/openhis-ui-vue3/src/views/consultationmanagement/consultationapplication/api.js index e6b21b12..add1b16c 100644 --- a/openhis-ui-vue3/src/views/consultationmanagement/consultationapplication/api.js +++ b/openhis-ui-vue3/src/views/consultationmanagement/consultationapplication/api.js @@ -135,3 +135,14 @@ export function getConsultationOpinions(consultationId) { }) } +/** + * 根据ID查询会诊申请详情 + * @param {Number} id 会诊申请ID + */ +export function getConsultationById(id) { + return request({ + url: `/consultation/detail/${id}`, + method: 'get' + }) +} +