From 440b4b13ca895b28bf7787f467ba4bb10ab18180 Mon Sep 17 00:00:00 2001
From: liuhongrui <liuhr@ccbjb.com.cn>
Date: Sun, 30 Mar 2025 16:14:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E8=AF=8A=E8=BE=93=E6=B6=B2=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95up?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OutpatientInfusionRecordServiceImpl.java  |  2 ++
 .../OutpatientInfusionRecordController.java   | 29 ++++++++++---------
 2 files changed, 17 insertions(+), 14 deletions(-)

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 daf8da50..0ee18760 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
@@ -374,6 +374,8 @@ public class OutpatientInfusionRecordServiceImpl implements IOutpatientInfusionR
             queryWrapper.isNull(CommonConstants.FieldName.BasedOnId);
             // 状态是进行中
             queryWrapper.eq(CommonConstants.FieldName.RequestStatus, EventStatus.IN_PROGRESS.getValue());
+            //筛选当前ID的患者历史执行记录
+            queryWrapper.eq(CommonConstants.FieldName.PatientId,patientId);
 
             return editRecords(queryWrapper);
         }
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 99c45ea5..f0b8e580 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
@@ -50,18 +50,18 @@ public class OutpatientInfusionRecordController {
             .ok(outpatientInfusionRecordService.getOutpatientInfusionPatientList(searchKey, pageNo, pageSize, request));
     }
 
-    /**
-     * 点击患者，查询该患者的输液记录
-     *
-     * @param outpatientInfusionPatientDto 患者输液信息
-     * @return 当前患者门诊输液待执行列表
-     */
-    @GetMapping(value = "/patient-infusion-record")
-    public R<?> getPatientInfusionRecord(OutpatientInfusionPatientDto outpatientInfusionPatientDto,
-        HttpServletRequest request) {
-
-        return R.ok(outpatientInfusionRecordService.getPatientInfusionRecord(outpatientInfusionPatientDto, request));
-    }
+//    /**
+//     * 点击患者，查询该患者的输液记录
+//     *
+//     * @param outpatientInfusionPatientDto 患者输液信息
+//     * @return 当前患者门诊输液待执行列表
+//     */
+//    @GetMapping(value = "/patient-infusion-record")
+//    public R<?> getPatientInfusionRecord(OutpatientInfusionPatientDto outpatientInfusionPatientDto,
+//        HttpServletRequest request) {
+//
+//        return R.ok(outpatientInfusionRecordService.getPatientInfusionRecord(outpatientInfusionPatientDto, request));
+//    }
 
     /**
      * 批量执行患者门诊输液
@@ -98,12 +98,13 @@ public class OutpatientInfusionRecordController {
     /**
      * 门诊输液待执行记录查询
      *
+     * @param patientId 患者ID
      * @return 门诊输液待执行记录列表
      */
     @GetMapping(value = "/infusion-wait-perform-record")
-    public R<?> getPatientInfusionRecords(HttpServletRequest request) {
+    public R<?> getPatientInfusionRecords(@RequestParam Long patientId,HttpServletRequest request) {
 
-        return R.ok(outpatientInfusionRecordService.getPatientInfusionPerformRecord(null,request, false));
+        return R.ok(outpatientInfusionRecordService.getPatientInfusionPerformRecord(patientId,request, false));
     }
 
     /**