From 3adab9fb4592250ceb365424d0c6313f53034aeb Mon Sep 17 00:00:00 2001
From: liuhongrui <liuhr@ccbjb.com.cn>
Date: Thu, 20 Mar 2025 17:43:15 +0800
Subject: [PATCH] up

---
 .../appservice/IOutpatientInfusionRecordService.java      | 3 ++-
 .../impl/OutpatientInfusionRecordServiceImpl.java         | 8 +++++---
 .../controller/OutpatientInfusionRecordController.java    | 6 ++++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientInfusionRecordService.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientInfusionRecordService.java
index 6203c6e4..f36ccaf4 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientInfusionRecordService.java
+++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientInfusionRecordService.java
@@ -19,12 +19,13 @@ public interface IOutpatientInfusionRecordService {
     /**
      * 获取门诊输液记录的患者列表
      *
+     * @param infusionPatientDto 输液患者实体
      * @param searchKey 模糊查询关键字
      * @param pageNo 当前页
      * @param pageSize 每页多少条
      * @return 分页查询
      */
-    IPage<OutpatientInfusionPatientDto> getOutpatientInfusionPatientList(
+    IPage<OutpatientInfusionPatientDto> getOutpatientInfusionPatientList(OutpatientInfusionPatientDto infusionPatientDto,
         String searchKey, Integer pageNo, Integer pageSize, HttpServletRequest request);
 
     /**
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientInfusionRecordServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientInfusionRecordServiceImpl.java
index ce79dc17..19022515 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientInfusionRecordServiceImpl.java
+++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientInfusionRecordServiceImpl.java
@@ -64,17 +64,19 @@ public class OutpatientInfusionRecordServiceImpl implements IOutpatientInfusionR
     /**
      * 获取门诊输液记录的患者列表
      *
+     * @param infusionPatientDto 输液患者实体
      * @param searchKey 模糊查询关键字
      * @param pageNo 当前页
      * @param pageSize 每页多少条
      * @return 分页查询
      */
     @Override
-    public IPage<OutpatientInfusionPatientDto> getOutpatientInfusionPatientList(String searchKey, Integer pageNo,
-        Integer pageSize, HttpServletRequest request) {
+    public IPage<OutpatientInfusionPatientDto> getOutpatientInfusionPatientList(
+        OutpatientInfusionPatientDto infusionPatientDto, String searchKey, Integer pageNo, Integer pageSize,
+        HttpServletRequest request) {
 
         // 构建查询条件
-        QueryWrapper<OutpatientInfusionPatientDto> queryWrapper = HisQueryUtils.buildQueryWrapper(null, searchKey,
+        QueryWrapper<OutpatientInfusionPatientDto> queryWrapper = HisQueryUtils.buildQueryWrapper(infusionPatientDto, searchKey,
             new HashSet<>(Arrays.asList(CommonConstants.FieldName.PatientBusNo,
                 CommonConstants.FieldName.EncounterBusNo, CommonConstants.FieldName.PatientName)),
             request);
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientInfusionRecordController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientInfusionRecordController.java
index 9f7f3e7d..c4d563fb 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientInfusionRecordController.java
+++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientInfusionRecordController.java
@@ -36,18 +36,20 @@ public class OutpatientInfusionRecordController {
     /**
      * 查询门诊输液的患者列表
      *
+     * @param infusionPatientDto 患者实体
      * @param searchKey 模糊查询关键字
      * @param pageNo 当前页
      * @param pageSize 每页多少条
      * @return 返回门诊输液的患者列表
      */
     @GetMapping(value = "/infusion-patient-list")
-    public R<?> getOutpatientInfusionPatientList(@RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+    public R<?> getOutpatientInfusionPatientList(OutpatientInfusionPatientDto infusionPatientDto,
+        @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
         @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
 
         return R
-            .ok(outpatientInfusionRecordService.getOutpatientInfusionPatientList(searchKey, pageNo, pageSize, request));
+            .ok(outpatientInfusionRecordService.getOutpatientInfusionPatientList(infusionPatientDto,searchKey, pageNo, pageSize, request));
     }
 
     /**