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/impl/MwCollectRecordServiceImpl.java | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 111 insertions(+), 6 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..f81b042 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
@@ -4,15 +4,22 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.sinata.common.entity.PageDTO;
+import com.sinata.common.exception.ServiceException;
import com.sinata.common.utils.StringUtils;
+import com.sinata.system.config.AutoColumnWidthEntityStrategy;
+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 com.sinata.system.enums.MedicalWasteStatusEnum;
import com.sinata.system.mapper.MwCollectRecordMapper;
import com.sinata.system.service.MwCollectRecordService;
import com.sinata.system.service.SysDepartmentService;
@@ -23,7 +30,6 @@
import java.io.IOException;
import java.net.URLEncoder;
import java.time.LocalDate;
-import java.util.Collections;
import java.util.List;
import java.util.Objects;
@@ -84,11 +90,24 @@
@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);
}
-
+ @Override
+ public List<CollectDto> getGroup2(String boxNumber,Long departmentId) {
+ return this.baseMapper.getGroup2(boxNumber,departmentId);
+ }
+ @Override
+ public List<CollectDto> getGroup3(String boxNumber,Long departmentId,Long carId) {
+ return this.baseMapper.getGroup3(boxNumber,departmentId,carId);
+ }
/**
* 流转过程
*
@@ -113,7 +132,21 @@
// 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系
String fileName = URLEncoder.encode("医废收集记录", "UTF-8").replaceAll("\\+", "%20");
response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
- FastExcel.write(response.getOutputStream(), MwCollectRecordVO.class).sheet("医废收集记录").doWrite(vo);
+ FastExcel.write(response.getOutputStream(), MwCollectRecordVO.class)
+ .registerWriteHandler(new AutoColumnWidthEntityStrategy())
+ .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
@@ -121,12 +154,84 @@
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);
}
@Override
- public List<CollectCarTotalUpDto> carGroup(Long carId) {
- return this.baseMapper.carGroup(carId);
+ public List<CollectCarTotalUpDto> carGroup(Long carId,String name) {
+ return this.baseMapper.carGroup(carId,name);
+ }
+
+ /**
+ * 查询日产废记录
+ *
+ * @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);
+ }
+
+ /**
+ * 获取大屏医疗机构标签信息
+ *
+ * @param id
+ * @return
+ */
+ @Override
+ public DepartmentTagInfoVO getTagInfo(Long id) {
+ return baseMapper.getTagInfo(id);
+ }
+
+ /**
+ * 删除医废
+ *
+ * @param id
+ */
+ @Override
+ public void delete(Long id) {
+ MwCollectRecord collectRecord = getById(id);
+ if (Objects.nonNull(collectRecord)) {
+ if (!collectRecord.getStatus().equals(MedicalWasteStatusEnum.TEMPORARILY_STORED.getCode())) {
+ throw new ServiceException("该医废已被转运，不能删除");
+ }
+ removeById(id);
+ }
}
}
--
Gitblit v1.7.1