From 6e90aef657150944651e4c9c3214d4f5d772093f Mon Sep 17 00:00:00 2001 From: liuhongrui Date: Sun, 30 Mar 2025 17:01:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BE=93=E6=B6=B2=E4=BB=A3=E7=A0=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OutpatientInfusionRecordController.java | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 deletions(-) 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 f0b8e580..95543e1a 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 @@ -12,7 +12,6 @@ import com.core.common.core.domain.R; import com.core.common.utils.MessageUtils; import com.openhis.common.constant.PromptMsgConstant; import com.openhis.web.outpatientmanage.appservice.IOutpatientInfusionRecordService; -import com.openhis.web.outpatientmanage.dto.OutpatientInfusionPatientDto; import com.openhis.web.outpatientmanage.dto.OutpatientInfusionRecordDto; import lombok.AllArgsConstructor; @@ -50,18 +49,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)); + // } /** * 批量执行患者门诊输液 @@ -102,9 +101,10 @@ public class OutpatientInfusionRecordController { * @return 门诊输液待执行记录列表 */ @GetMapping(value = "/infusion-wait-perform-record") - public R getPatientInfusionRecords(@RequestParam Long patientId,HttpServletRequest request) { + public R getPatientInfusionRecords(@RequestParam(value = "patientId", required = false) Long patientId, + HttpServletRequest request) { - return R.ok(outpatientInfusionRecordService.getPatientInfusionPerformRecord(patientId,request, false)); + return R.ok(outpatientInfusionRecordService.getPatientInfusionPerformRecord(patientId, request, false)); } /** @@ -114,9 +114,10 @@ public class OutpatientInfusionRecordController { * @return 门诊输液执行历史记录列表 */ @GetMapping(value = "/infusion-perform-record") - public R getPatientInfusionPerformRecord(@RequestParam Long patientId,HttpServletRequest request) { + public R getPatientInfusionPerformRecord(@RequestParam(value = "patientId", required = false) Long patientId, + HttpServletRequest request) { - return R.ok(outpatientInfusionRecordService.getPatientInfusionPerformRecord(patientId,request, true)); + return R.ok(outpatientInfusionRecordService.getPatientInfusionPerformRecord(patientId, request, true)); } }