From 196ac84b6ec0dd05304dd6577f169f7fbf5fe726 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 01 一月 2025 10:13:18 +0800
Subject: [PATCH] merge
---
medicalWaste-system/src/main/java/com/sinata/system/service/MwCollectRecordService.java | 2 ++
1 files changed, 2 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 f027bc9..86e0c99 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
@@ -50,6 +50,7 @@
*/
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);
/**
@@ -70,6 +71,7 @@
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