From 2dc478231fd09a88a4d86d44388ae807aca08bc5 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 01 一月 2025 10:14:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-system/src/main/java/com/sinata/system/service/MwCollectRecordService.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 56 insertions(+), 0 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 ecefd14..92026af 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
@@ -3,10 +3,21 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.sinata.common.entity.PageDTO;
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.MedicalWasteProcessVO;
import com.sinata.system.domain.vo.MwCollectRecordVO;
+import com.sinata.system.domain.vo.MwCollectRecordWarningVO;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.time.LocalDate;
+import java.util.List;
+import java.util.List;
/**
* <p>
@@ -39,6 +50,9 @@
* @param dto
*/
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);
/**
* 流转过程
@@ -47,4 +61,46 @@
* @return
*/
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);
+
+ /**
+ * 监管报表医疗废物产生列表
+ *
+ * @param query
+ * @return
+ */
+ List<MwCollectRecordVO> getRegulationReportList(DisposalReportQuery query);
+
+ /**
+ * 查询昨日产废记录
+ *
+ * @return
+ */
+ List<MwCollectRecordWarningVO> queryListByDay();
+
+ /**
+ * 查询上月产废记录
+ *
+ * @return
+ */
+ List<MwCollectRecordWarningVO> queryListByMonth();
+
+ /**
+ * @return
+ */
+ List<MwCollectRecordWarningVO> queryListGroupByDepartment();
}
--
Gitblit v1.7.1