From 05628d269dff7ad4f2e9d3419b05b4e7e5768797 Mon Sep 17 00:00:00 2001 From: luoyisheng <yangdongji@argo-ai.cn> Date: 星期三, 12 二月 2025 14:19:28 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- medicalWaste-system/src/main/java/com/sinata/system/service/MwCheckoutRecordService.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/MwCheckoutRecordService.java b/medicalWaste-system/src/main/java/com/sinata/system/service/MwCheckoutRecordService.java index cdc6cfe..8f00d1a 100644 --- a/medicalWaste-system/src/main/java/com/sinata/system/service/MwCheckoutRecordService.java +++ b/medicalWaste-system/src/main/java/com/sinata/system/service/MwCheckoutRecordService.java @@ -42,10 +42,10 @@ /** * 转运记录详情 * - * @param departmentId + * @param id * @return */ - MwCheckoutRecordVO hospitalDetail(Long departmentId); + MwCheckoutRecordVO hospitalDetail(Long id); /** * 转运记录医废详情分页列表 @@ -110,6 +110,7 @@ List<CollectTotalUpDto> totalUp5(Long departmentId); List<CollectTotalUpDto> totalUp3(LocalDate date1,LocalDate date2, Long departmentId); List<CollectTotalUpDto> totalUp1(Long outId); + List<CollectTotalUpDto> totalUp6(Long outId); /** * 车辆转运异常预警 -- Gitblit v1.7.1