From b03d89e792a34c486f0afeab69e837f85d8cbe16 Mon Sep 17 00:00:00 2001
From: luoyisheng <yangdongji@argo-ai.cn>
Date: 星期二, 25 三月 2025 15:13:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-system/src/main/java/com/sinata/system/service/MwCheckoutRecordService.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/MwCheckoutRecordService.java b/medicalWaste-system/src/main/java/com/sinata/system/service/MwCheckoutRecordService.java
index cdc6cfe..64bff39 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/MwCheckoutRecordService.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/MwCheckoutRecordService.java
@@ -42,10 +42,10 @@
/**
* 转运记录详情
*
- * @param departmentId
+ * @param id
* @return
*/
- MwCheckoutRecordVO hospitalDetail(Long departmentId);
+ MwCheckoutRecordVO hospitalDetail(Long id);
/**
* 转运记录医废详情分页列表
@@ -106,10 +106,11 @@
List<CollectTotalUpDto> totalUp(LocalDate date, Long departmentId);
List<CollectTotalUpDto> totalUp4(Long departmentId);
- List<CollectTotalUpDto> totalUp2(LocalDate date1,LocalDate date2, Long departmentId);
+ List<CollectTotalUpDto> totalUp2(LocalDate date1, Long departmentId);
List<CollectTotalUpDto> totalUp5(Long departmentId);
List<CollectTotalUpDto> totalUp3(LocalDate date1,LocalDate date2, Long departmentId);
List<CollectTotalUpDto> totalUp1(Long outId);
+ List<CollectTotalUpDto> totalUp6(Long outId);
/**
* 车辆转运异常预警
--
Gitblit v1.7.1