From d89a42213b4a32535e93185dedf41fe7a7fc1940 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 04 四月 2025 01:57:13 +0800
Subject: [PATCH] bug修改

---
 medicalWaste-system/src/main/java/com/sinata/system/service/MwCollectRecordService.java |   67 +++++++++++++++++++++++++++++++++
 1 files changed, 66 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 900bb3f..3954456 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,14 +2,18 @@
 
 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;
 import com.sinata.system.domain.dto.CollectTotalUpDto;
 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;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -48,7 +52,10 @@
      */
     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);
+    List<CollectDto> getGroup2(String boxNumber,Long departmentId);
+    List<CollectDto> getGroup3(String boxNumber,Long departmentId,Long carId);
 
     /**
      * 流转过程
@@ -58,10 +65,68 @@
      */
     MedicalWasteProcessVO getProcess(Long id);
 
+    /**
+     * 导出
+     *
+     * @param query
+     * @param response
+     * @throws IOException
+     */
     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);
+    List<CollectCarTotalUpDto> carGroup(Long carId,String name);
+
+    /**
+     * 监管报表医疗废物产生列表
+     *
+     * @param query
+     * @return
+     */
+    List<MwCollectRecordVO> getRegulationReportList(DisposalReportQuery query);
+
+    /**
+     * 查询昨日产废记录
+     *
+     * @return
+     */
+    List<MwCollectRecordWarningVO> queryListByDay();
+
+    /**
+     * 查询上月产废记录
+     *
+     * @return
+     */
+    List<MwCollectRecordWarningVO> queryListByMonth();
+
+    /**
+     * @return
+     */
+    List<MwCollectRecordWarningVO> queryListGroupByDepartment();
+
+    /**
+     * 预警数据统计
+     *
+     * @param id
+     * @return
+     */
+    MedicalWasteStaticsVO queryMedicalWasteStatics(String treeCode);
+
+    /**
+     * 获取大屏医疗机构标签信息
+     *
+     * @param id
+     * @return
+     */
+    DepartmentTagInfoVO getTagInfo(Long id);
+
+    /**
+     * 删除医废
+     *
+     * @param id
+     */
+    void delete(Long id);
 }

--
Gitblit v1.7.1