From aded6d51dd8cc3b7d2b5a9a0be54378c5b2ee924 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 01 一月 2025 15:11:15 +0800
Subject: [PATCH] merge

---
 medicalWaste-system/src/main/java/com/sinata/system/service/MwDisposalRecordService.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/MwDisposalRecordService.java b/medicalWaste-system/src/main/java/com/sinata/system/service/MwDisposalRecordService.java
index 7940776..9d8806c 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/MwDisposalRecordService.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/MwDisposalRecordService.java
@@ -11,6 +11,7 @@
 import com.sinata.system.domain.vo.MwDisposalRecordItemVO;
 import com.sinata.system.domain.vo.MwDisposalRecordReportVO;
 import com.sinata.system.domain.vo.MwDisposalRecordVO;
+import com.sinata.system.domain.vo.MwDisposalRecordWarningVO;
 
 import java.util.List;
 
@@ -51,10 +52,9 @@
      * 处置报表
      *
      * @param query
-     * @param type  1:接收 2:处置
      * @return
      */
-    List<MwDisposalRecordReportVO> disposalReportByType(DisposalReportQuery query, Integer type);
+    List<MwDisposalRecordReportVO> disposalReceiveReport(DisposalReportQuery query);
 
     /**
      * 监管报表医疗废物处置列表
@@ -63,4 +63,11 @@
      * @return
      */
     List<MwCollectRecordVO> getRegulationReportList(DisposalReportQuery query);
+
+    /**
+     * 处置单位存储量预警
+     *
+     * @return
+     */
+    List<MwDisposalRecordWarningVO> queryDisposalListByDepartment();
 }

--
Gitblit v1.7.1