From 555ff988376b8650455547d0b6ff7f12f4ae2c63 Mon Sep 17 00:00:00 2001
From: luoyisheng <yangdongji@argo-ai.cn>
Date: 星期三, 26 三月 2025 17:27:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-system/src/main/java/com/sinata/system/mapper/MwCollectRecordMapper.java | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwCollectRecordMapper.java b/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwCollectRecordMapper.java
index da5109d..ccc803a 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwCollectRecordMapper.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwCollectRecordMapper.java
@@ -1,6 +1,8 @@
package com.sinata.system.mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sinata.system.domain.MedicalWasteStaticsVO;
import com.sinata.system.domain.MwCollectRecord;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.sinata.system.domain.dto.CollectCarTotalUpDto;
@@ -8,8 +10,10 @@
import com.sinata.system.domain.dto.CollectTotalUpDto;
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 org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -60,6 +64,8 @@
List<CollectDto> getGroup(@Param("boxNumber")String boxNumber,@Param("departmentId")Long departmentId);
List<CollectDto> getGroup1(@Param("boxNumber")String boxNumber,@Param("departmentId")Long departmentId);
+ List<CollectDto> getGroup2(@Param("boxNumber")String boxNumber,@Param("departmentId")Long departmentId);
+ List<CollectDto> getGroup3(@Param("boxNumber")String boxNumber,@Param("departmentId")Long departmentId,@Param("carId")Long carId);
List<CollectDto> getGroupWithStatus(@Param("boxNumber")String boxNumber, @Param("departmentId")Long departmentId, @Param("status")Integer status);
@@ -67,7 +73,7 @@
List<CollectTotalUpDto> collectTotal3(@Param("departmentId")Long departmentId);
List<CollectTotalUpDto> collectTotal1(@Param("date")LocalDate date,@Param("checkOutUserId")Long checkOutUserId,@Param("id") Long id);
- List<CollectCarTotalUpDto> carGroup(@Param("carId")Long carId);
+ List<CollectCarTotalUpDto> carGroup(@Param("carId")Long carId,@Param("name") String name);
/**
* 监管报表医疗废物产生列表
@@ -78,4 +84,34 @@
*/
List<MwCollectRecordVO> getRegulationReportList(@Param("query") DisposalReportQuery query, @Param("treeCode") String treeCode);
+ /**
+ * 获取时间类型列表
+ *
+ * @param timeType 时间类型 1：日 2：月
+ * @return
+ */
+ List<MwCollectRecordWarningVO> queryListTimeType(Integer timeType);
+
+ /**
+ * 根据医疗机构分组查询医废存储量
+ *
+ * @return
+ */
+ List<MwCollectRecordWarningVO> queryListGroupByDepartment();
+
+ /**
+ * 预警数据统计
+ *
+ * @param id
+ * @return
+ */
+ MedicalWasteStaticsVO queryMedicalWasteStatics(String treeCode);
+
+ /**
+ * 获取大屏医疗机构标签信息
+ *
+ * @param id
+ * @return
+ */
+ DepartmentTagInfoVO getTagInfo(Long id);
}
--
Gitblit v1.7.1