From b44b174f656aac1fe03e7f96851e564c3982f67d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 28 三月 2025 16:52:25 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/boymi/YiFeiNN
---
medicalWaste-system/src/main/java/com/sinata/system/service/MwCollectRecordService.java | 13 ++++++++++++-
1 files changed, 12 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 f92765c..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
@@ -10,6 +10,7 @@
import com.sinata.system.domain.dto.MwCollectRecordDTO;
import com.sinata.system.domain.query.DisposalReportQuery;
import com.sinata.system.domain.query.MwCollectRecordQuery;
+import com.sinata.system.domain.vo.DepartmentTagInfoVO;
import com.sinata.system.domain.vo.MedicalWasteProcessVO;
import com.sinata.system.domain.vo.MwCollectRecordVO;
import com.sinata.system.domain.vo.MwCollectRecordWarningVO;
@@ -54,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);
/**
* 流转过程
@@ -76,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);
/**
* 监管报表医疗废物产生列表
@@ -112,4 +115,12 @@
* @return
*/
MedicalWasteStaticsVO queryMedicalWasteStatics(String treeCode);
+
+ /**
+ * 获取大屏医疗机构标签信息
+ *
+ * @param id
+ * @return
+ */
+ DepartmentTagInfoVO getTagInfo(Long id);
}
--
Gitblit v1.7.1