From fc5cda9c324a91948dd964e91960623b41baf293 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 02 一月 2025 10:55:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCollectRecordServiceImpl.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 54 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 ec92e1b..9561f73 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
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.sinata.common.entity.PageDTO;
import com.sinata.common.utils.StringUtils;
+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;
@@ -14,6 +15,7 @@
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;
@@ -85,7 +87,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);
}
@@ -134,6 +142,10 @@
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 ) {
return baseMapper.collectTotal1(date,checkOutUserId,id);
}
@@ -142,4 +154,45 @@
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);
+ }
+
+ /**
+ * 医疗机构存储量预警
+ *
+ * @return
+ */
+ @Override
+ public List<MwCollectRecordWarningVO> queryListGroupByDepartment() {
+ return baseMapper.queryListGroupByDepartment();
+ }
+
+ /**
+ * 预警数据统计
+ *
+ * @param id
+ * @return
+ */
+ @Override
+ public MedicalWasteStaticsVO queryMedicalWasteStatics(String treeCode) {
+ return baseMapper.queryMedicalWasteStatics(treeCode);
+ }
}
--
Gitblit v1.7.1