From 9e2d683e190cdc32de602fe97f702c0913f0482f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=B3=E7=BE=BD?= <关羽@gentronhealth.com> Date: Mon, 11 May 2026 14:40:07 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BF=98=E5=8E=9F=20Bug=20#443/#475/#47?= =?UTF-8?q?7/#486/#497=20=E5=BC=95=E5=85=A5=E7=9A=84=20getRequestForm=20?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../appservice/IRequestFormManageAppService.java | 12 ------------ .../impl/RequestFormManageAppServiceImpl.java | 0 .../controller/RequestFormManageController.java | 13 ++----------- .../regdoctorstation/dto/RequestFormQueryDto.java | 0 .../regdoctorstation/RequestFormManageAppMapper.xml | 0 5 files changed, 2 insertions(+), 23 deletions(-) mode change 100755 => 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java mode change 100755 => 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java mode change 100755 => 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java mode change 100755 => 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormQueryDto.java mode change 100755 => 100644 openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java old mode 100755 new mode 100644 index c972faa0..c8607e15 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java @@ -32,18 +32,6 @@ public interface IRequestFormManageAppService { */ List getRequestForm(Long encounterId, String typeCode); - /** - * 查询申请单（支持筛选） - * - * @param encounterId 就诊id - * @param typeCode 申请单类型 - * @param startDate 开始日期（可选，格式：yyyy-MM-dd） - * @param endDate 结束日期（可选，格式：yyyy-MM-dd） - * @param status 单据状态（可选） - * @return 申请单列表 - */ - List getRequestForm(Long encounterId, String typeCode, String startDate, String endDate, String status); - /** * 分页查询申请单 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java old mode 100755 new mode 100644 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java old mode 100755 new mode 100644 index f135ff44..2bf64a04 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java @@ -81,23 +81,14 @@ public class RequestFormManageController { * 查询检查申请单 * * @param encounterId 就诊id - * @param startDate 开始日期（可选，格式：yyyy-MM-dd） - * @param endDate 结束日期（可选，格式：yyyy-MM-dd） - * @param status 单据状态（可选） - * @param keyword 关键字（可选，申请单号/检查项目名称模糊匹配） * @return 检查申请单 */ @GetMapping(value = "/get-check") - public R getCheckRequestForm( - @RequestParam(required = false) Long encounterId, - @RequestParam(required = false) String startDate, - @RequestParam(required = false) String endDate, - @RequestParam(required = false) String status, - @RequestParam(required = false) String keyword) { + public R getCheckRequestForm(@RequestParam(required = false) Long encounterId) { if (encounterId == null) { return R.fail("就诊ID不能为空"); } - return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, ActivityDefCategory.TEST.getCode(), startDate, endDate, status, keyword)); + return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, ActivityDefCategory.TEST.getCode())); } /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormQueryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormQueryDto.java old mode 100755 new mode 100644 diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml old mode 100755 new mode 100644