From 1f5ef3a86b1227f49c6840b2205174e4ab2f0f14 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 27 三月 2025 15:49:37 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/boymi/YiFeiNN
---
medicalWaste-system/src/main/java/com/sinata/system/service/MwCollectRecordService.java | 4 +++-
1 files changed, 3 insertions(+), 1 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 4858ea0..10de272 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
@@ -55,6 +55,8 @@
List<CollectDto> getGroup(String boxNumber,Long departmentId);
List<CollectDto> getGroupWithStatus(String boxNumber,Long departmentId,Integer status);
List<CollectDto> getGroup1(String boxNumber,Long departmentId);
+ List<CollectDto> getGroup2(String boxNumber,Long departmentId);
+ List<CollectDto> getGroup3(String boxNumber,Long departmentId,Long carId);
/**
* 流转过程
@@ -77,7 +79,7 @@
List<CollectTotalUpDto> collectTotal3(Long departmentId);
List<CollectTotalUpDto> collectTotal1(LocalDate date,Long checkOutUserId,Long hospitalId);
- List<CollectCarTotalUpDto> carGroup(Long carId);
+ List<CollectCarTotalUpDto> carGroup(Long carId,String name);
/**
* 监管报表医疗废物产生列表
--
Gitblit v1.7.1