From 75aa42c51ae2a63d7c1e5e813c0a88fd303bdbf4 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 03 一月 2025 18:04:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitee/master'

---
 medicalWaste-system/src/main/java/com/sinata/system/mapper/MwCheckoutRecordMapper.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwCheckoutRecordMapper.java b/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwCheckoutRecordMapper.java
index 189bac0..0eb0152 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwCheckoutRecordMapper.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwCheckoutRecordMapper.java
@@ -44,10 +44,10 @@
     /**
      * 转运记录详情
      *
-     * @param departmentId
+     * @param id
      * @return
      */
-    MwCheckoutRecordVO hospitalDetail(Long departmentId);
+    MwCheckoutRecordVO hospitalDetail(Long id);
 
     /**
      * 转运记录医废详情分页列表
@@ -83,7 +83,7 @@
      * @param id
      * @return
      */
-    Page<MwMedicalWasteBoxVO> transitDetailPageList(Page<MwMedicalWasteBoxVO> objectPage, Long id);
+    Page<MwMedicalWasteBoxVO> transitDetailPageList(Page<MwMedicalWasteBoxVO> page, @Param("id") Long id);
 
     /**
      * 转运记录导出
@@ -99,6 +99,7 @@
     List<CollectTotalUpDto> totalUp5(@Param("departmentId")Long departmentId);
     List<CollectTotalUpDto> totalUp3(@Param("date1") LocalDate date1, @Param("date2") LocalDate date2,@Param("departmentId")Long departmentId);
     List<CollectTotalUpDto> totalUp1(@Param("outId")Long outId);
+    List<CollectTotalUpDto> totalUp6(@Param("outId")Long outId);
 
     /**
      * 转移联单数据

--
Gitblit v1.7.1