From fc5cda9c324a91948dd964e91960623b41baf293 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 02 一月 2025 10:55:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-system/src/main/java/com/sinata/system/service/MwCollectRecordService.java | 14 ++++++++++++++
1 files changed, 14 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 27f58d0..f92765c 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
@@ -4,6 +4,9 @@
import com.sinata.common.entity.PageDTO;
import com.sinata.system.domain.MedicalWasteStaticsVO;
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;
@@ -13,6 +16,8 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.time.LocalDate;
+import java.util.List;
import java.util.List;
/**
@@ -46,6 +51,9 @@
* @param dto
*/
void edit(MwCollectRecordDTO dto);
+ List<CollectDto> getGroup(String boxNumber,Long departmentId);
+ List<CollectDto> getGroupWithStatus(String boxNumber,Long departmentId,Integer status);
+ List<CollectDto> getGroup1(String boxNumber,Long departmentId);
/**
* 流转过程
@@ -64,6 +72,12 @@
*/
void export(MwCollectRecordQuery query, HttpServletResponse response) throws IOException;
+ List<CollectTotalUpDto> collectTotal(LocalDate date,Long departmentId);
+ List<CollectTotalUpDto> collectTotal3(Long departmentId);
+ List<CollectTotalUpDto> collectTotal1(LocalDate date,Long checkOutUserId,Long hospitalId);
+
+ List<CollectCarTotalUpDto> carGroup(Long carId);
+
/**
* 监管报表医疗废物产生列表
*
--
Gitblit v1.7.1