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/impl/MwCollectRecordServiceImpl.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 50 insertions(+), 1 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCollectRecordServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCollectRecordServiceImpl.java
index 1793c66..00ddb23 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCollectRecordServiceImpl.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCollectRecordServiceImpl.java
@@ -10,9 +10,11 @@
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 com.sinata.system.mapper.MwCollectRecordMapper;
import com.sinata.system.service.MwCollectRecordService;
import com.sinata.system.service.SysDepartmentService;
@@ -84,7 +86,13 @@
@Override
public List<CollectDto> getGroup(String boxNumber,Long departmentId) {
return this.baseMapper.getGroup(boxNumber,departmentId);
- } @Override
+ }
+ @Override
+ public List<CollectDto> getGroupWithStatus(String boxNumber,Long departmentId,Integer status) {
+ return this.baseMapper.getGroupWithStatus(boxNumber,departmentId,status);
+ }
+
+ @Override
public List<CollectDto> getGroup1(String boxNumber,Long departmentId) {
return this.baseMapper.getGroup1(boxNumber,departmentId);
}
@@ -116,9 +124,25 @@
FastExcel.write(response.getOutputStream(), MwCollectRecordVO.class).sheet("医废收集记录").doWrite(vo);
}
+ /**
+ * 监管报表医疗废物产生列表
+ *
+ * @param query
+ * @return
+ */
+ @Override
+ public List<MwCollectRecordVO> getRegulationReportList(DisposalReportQuery query) {
+ String treeCode = sysDepartmentService.getTreeCodeByDepartmentId(query.getDepartmentId());
+ return baseMapper.getRegulationReportList(query, treeCode);
+ }
+
@Override
public List<CollectTotalUpDto> collectTotal(LocalDate date,Long departmentId) {
return baseMapper.collectTotal(date,departmentId);
+ }
+ @Override
+ public List<CollectTotalUpDto> collectTotal3(Long departmentId) {
+ return baseMapper.collectTotal3(departmentId);
}
@Override
public List<CollectTotalUpDto> collectTotal1(LocalDate date,Long checkOutUserId,Long id ) {
@@ -129,4 +153,29 @@
public List<CollectCarTotalUpDto> carGroup(Long carId) {
return this.baseMapper.carGroup(carId);
}
+
+ /**
+ * 查询日产废记录
+ *
+ * @return
+ */
+ @Override
+ public List<MwCollectRecordWarningVO> queryListByDay() {
+ return baseMapper.queryListTimeType(1);
+ }
+
+ /**
+ * 查询月产废记录
+ *
+ * @return
+ */
+ @Override
+ public List<MwCollectRecordWarningVO> queryListByMonth() {
+ return baseMapper.queryListTimeType(2);
+ }
+
+ @Override
+ public List<MwCollectRecordWarningVO> queryListGroupByDepartment() {
+ return baseMapper.queryListGroupByDepartment();
+ }
}
--
Gitblit v1.7.1