From ae7f04be9321ddbe17c46fae8ab05d34e7493f9f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 二月 2025 13:40:06 +0800
Subject: [PATCH] 管理后台bug修改

---
 medicalWaste-system/src/main/java/com/sinata/system/service/MwCollectRecordService.java |   22 +++++++++++++++++++++-
 1 files changed, 21 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 92026af..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
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.extension.service.IService;
 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;
@@ -9,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;
@@ -53,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);
 
     /**
      * 流转过程
@@ -75,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);
 
     /**
      * 监管报表医疗废物产生列表
@@ -103,4 +107,20 @@
      * @return
      */
     List<MwCollectRecordWarningVO> queryListGroupByDepartment();
+
+    /**
+     * 预警数据统计
+     *
+     * @param id
+     * @return
+     */
+    MedicalWasteStaticsVO queryMedicalWasteStatics(String treeCode);
+
+    /**
+     * 获取大屏医疗机构标签信息
+     *
+     * @param id
+     * @return
+     */
+    DepartmentTagInfoVO getTagInfo(Long id);
 }

--
Gitblit v1.7.1