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/MwCollectRecordService.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/MwCollectRecordService.java b/medicalWaste-system/src/main/java/com/sinata/system/service/MwCollectRecordService.java
index 8f17493..f027bc9 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/MwCollectRecordService.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/MwCollectRecordService.java
@@ -3,6 +3,9 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.sinata.common.entity.PageDTO;
import com.sinata.system.domain.MwCollectRecord;
+import com.sinata.system.domain.dto.CollectCarTotalUpDto;
+import com.sinata.system.domain.dto.CollectDto;
+import com.sinata.system.domain.dto.CollectTotalUpDto;
import com.sinata.system.domain.dto.MwCollectRecordDTO;
import com.sinata.system.domain.query.DisposalReportQuery;
import com.sinata.system.domain.query.MwCollectRecordQuery;
@@ -11,6 +14,8 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.time.LocalDate;
+import java.util.List;
import java.util.List;
/**
@@ -44,6 +49,8 @@
* @param dto
*/
void edit(MwCollectRecordDTO dto);
+ List<CollectDto> getGroup(String boxNumber,Long departmentId);
+ List<CollectDto> getGroup1(String boxNumber,Long departmentId);
/**
* 流转过程
@@ -62,6 +69,11 @@
*/
void export(MwCollectRecordQuery query, HttpServletResponse response) throws IOException;
+ List<CollectTotalUpDto> collectTotal(LocalDate date,Long departmentId);
+ List<CollectTotalUpDto> collectTotal1(LocalDate date,Long checkOutUserId,Long hospitalId);
+
+ List<CollectCarTotalUpDto> carGroup(Long carId);
+
/**
* 监管报表医疗废物产生列表
*
--
Gitblit v1.7.1