From 7374e17f2eafc8504838c9334d13563538d5ea00 Mon Sep 17 00:00:00 2001 From: chenqi Date: Mon, 15 Jun 2026 09:25:57 +0800 Subject: [PATCH] =?UTF-8?q?feat(clinical):=20=E6=B7=BB=E5=8A=A0=E4=B8=B4?= =?UTF-8?q?=E5=BA=8A=E6=A3=80=E9=AA=8C=E7=AE=A1=E7=90=86API=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增ClinicalManageLaboratoryController支持检验结果页面API映射 - 新增ClinicalManageObservationController提供检查结果API兼容接口 - 实现检验结果分页查询和详情获取功能 - 为检查结果预留接口并返回空数据避免前端报错 - 修复封存表medical_record_id字段非空约束导致的插入错误 --- .../ClinicalManageLaboratoryController.java | 37 +++++++++++++++++++ .../ClinicalManageObservationController.java | 30 +++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/controller/ClinicalManageLaboratoryController.java create mode 100644 healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/controller/ClinicalManageObservationController.java diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/controller/ClinicalManageLaboratoryController.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/controller/ClinicalManageLaboratoryController.java new file mode 100644 index 000000000..df7164d76 --- /dev/null +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/controller/ClinicalManageLaboratoryController.java @@ -0,0 +1,37 @@ +package com.healthlink.his.web.Inspection.controller; + +import com.core.common.core.domain.R; +import com.healthlink.his.web.Inspection.appservice.ILaboratoryManageAppService; +import com.healthlink.his.web.Inspection.dto.ReportResultManageDto; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import jakarta.servlet.http.HttpServletRequest; + +/** + * 前端 lisPascResult 页面 API 兼容映射 + * 前端调用 /clinical-manage/laboratory/* 和 /clinical-manage/observation/* + * 路由到已有的 /inspection/* 服务 + */ +@RestController +@Slf4j +@AllArgsConstructor +@RequestMapping("/clinical-manage/laboratory") +public class ClinicalManageLaboratoryController { + private final ILaboratoryManageAppService appService; + + @GetMapping("/result-page") + public R getResultPage(ReportResultManageDto dto, + @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, + @RequestParam(name = "searchKey", required = false) String searchKey, + HttpServletRequest request) { + return appService.getReportResultList(dto, pageNo, pageSize, searchKey, request); + } + + @GetMapping("/result-detail/{id}") + public R getResultDetail(@PathVariable Long id) { + return appService.getReportById(id); + } +} \ No newline at end of file diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/controller/ClinicalManageObservationController.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/controller/ClinicalManageObservationController.java new file mode 100644 index 000000000..68712743a --- /dev/null +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/controller/ClinicalManageObservationController.java @@ -0,0 +1,30 @@ +package com.healthlink.his.web.Inspection.controller; + +import com.core.common.core.domain.R; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import java.util.Collections; + +/** + * 前端 lisPascResult 检查结果 API 兼容映射 + * 后端暂无检查结果独立服务,返回空列表避免前端报错 + * TODO: 接入检查报告数据源后替换实现 + */ +@RestController +@Slf4j +@AllArgsConstructor +@RequestMapping("/clinical-manage/observation") +public class ClinicalManageObservationController { + + @GetMapping("/result-page") + public R getResultPage(@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) { + // 暂时返回空列表,前端可正常渲染 + return R.ok(new java.util.HashMap() {{ + put("records", Collections.emptyList()); + put("total", 0); + }}); + } +} \ No newline at end of file