From 7dff38876f582644ae95daad8ac21d4f57088d56 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 28 十二月 2024 16:19:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 medicalWaste-system/src/main/java/com/sinata/system/service/MwDisposalRecordService.java |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 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 566ea8c..fc98875 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
@@ -3,11 +3,16 @@
 import com.sinata.common.entity.PageDTO;
 import com.sinata.system.domain.MwDisposalRecord;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.sinata.system.domain.query.DisposalReportQuery;
 import com.sinata.system.domain.query.MwDisposalRecordItemQuery;
 import com.sinata.system.domain.query.MwDisposalRecordQuery;
 import com.sinata.system.domain.vo.DisposalRecordStaticsVO;
+import com.sinata.system.domain.vo.MwCollectRecordVO;
 import com.sinata.system.domain.vo.MwDisposalRecordItemVO;
+import com.sinata.system.domain.vo.MwDisposalRecordReportVO;
 import com.sinata.system.domain.vo.MwDisposalRecordVO;
+
+import java.util.List;
 
 /**
  * <p>
@@ -41,4 +46,20 @@
      * @return
      */
     PageDTO<MwDisposalRecordItemVO> detail(MwDisposalRecordItemQuery query);
+
+    /**
+     * 处置报表
+     *
+     * @param query
+     * @return
+     */
+    List<MwDisposalRecordReportVO> disposalReceiveReport(DisposalReportQuery query);
+
+    /**
+     * 监管报表医疗废物处置列表
+     *
+     * @param query
+     * @return
+     */
+    List<MwCollectRecordVO> getRegulationReportList(DisposalReportQuery query);
 }

--
Gitblit v1.7.1