From b22f118eabab8f2f27dbd73e7c6cb1090cd82c82 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 27 三月 2025 14:46:00 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/boymi/YiFeiNN
---
medicalWaste-system/src/main/java/com/sinata/system/service/biz/StaticsService.java | 133 +++++++++++++++++++++++---------------------
1 files changed, 69 insertions(+), 64 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/biz/StaticsService.java b/medicalWaste-system/src/main/java/com/sinata/system/service/biz/StaticsService.java
index 2fa4733..9b75a92 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/biz/StaticsService.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/biz/StaticsService.java
@@ -6,7 +6,7 @@
import com.sinata.common.core.domain.entity.SysDictData;
import com.sinata.common.utils.CollUtils;
import com.sinata.common.utils.DateUtils;
-import com.sinata.system.domain.MedicalWasteStaticsVO;
+import com.sinata.system.config.AutoColumnWidthStrategy;
import com.sinata.system.domain.MwCollectRecord;
import com.sinata.system.domain.MwWarningRecord;
import com.sinata.system.domain.SysDepartment;
@@ -20,8 +20,6 @@
import com.sinata.system.domain.vo.MwMedicalWasteBoxVO;
import com.sinata.system.domain.vo.SysDictDataVO;
import com.sinata.system.domain.vo.TransformVO;
-import com.sinata.system.enums.DepartmentEnum;
-import com.sinata.system.enums.MedicalWasteStatusEnum;
import com.sinata.system.service.ISysDictDataService;
import com.sinata.system.service.MwCheckoutRecordService;
import com.sinata.system.service.MwCollectRecordService;
@@ -29,6 +27,7 @@
import com.sinata.system.service.MwDisposalRecordService;
import com.sinata.system.service.MwWarningRecordService;
import com.sinata.system.service.SysDepartmentService;
+import com.sinata.system.utils.ImageToBase64;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -42,6 +41,7 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -60,19 +60,7 @@
private final MwDisposalRecordService mwDisposalRecordService;
private final MwDisposalHandleRecordService mwDisposalHandleRecordService;
- /**
- * 机构分布-获取机构列表
- *
- * @param type 1：全部 2：医院 3：处置单位
- * @return
- */
- public List<SysDepartment> departmentList(Integer type) {
- return sysDepartmentService.lambdaQuery().eq(type != 1, SysDepartment::getOrgType, type).list();
- }
- public MedicalWasteStaticsVO medicalWaste() {
- return null;
- }
/**
* 医院报表
@@ -82,6 +70,10 @@
*/
public DepartmentReportVO hospitalReport(HospitalReportQuery query) {
DepartmentReportVO vo = new DepartmentReportVO();
+ SysDepartment department = sysDepartmentService.getById(query.getDepartmentId());
+ if (Objects.nonNull(department)) {
+ vo.setDepartmentName(department.getDepartmentName());
+ }
List<SysDictDataVO> wasteTypeList = sysDictDataService.medicalWasteTypeList();
if (CollUtils.isEmpty(wasteTypeList)) {
@@ -89,8 +81,8 @@
}
vo.setLegend(wasteTypeList.stream().map(SysDictDataVO::getDictLabel).collect(Collectors.toList()));
vo.getLegend().add("小计");
- List<MwCollectRecord> collectRecordList = mwCollectRecordService.lambdaQuery().eq(query.getReportType().equals(1), MwCollectRecord::getStatus, MedicalWasteStatusEnum.TEMPORARILY_STORED.getCode())
- .ne(query.getReportType().equals(2), MwCollectRecord::getStatus, MedicalWasteStatusEnum.TEMPORARILY_STORED.getCode())
+ List<MwCollectRecord> collectRecordList = mwCollectRecordService.lambdaQuery()/*.eq(query.getReportType().equals(1), MwCollectRecord::getStatus, MedicalWasteStatusEnum.TEMPORARILY_STORED.getCode())
+ .ne(query.getReportType().equals(2), MwCollectRecord::getStatus, MedicalWasteStatusEnum.TEMPORARILY_STORED.getCode())*/
.eq(MwCollectRecord::getDepartmentId, query.getDepartmentId())
.between(query.getReportType().equals(1), MwCollectRecord::getCollectTime, query.getStartTime(), query.getEndTime())
.between(query.getReportType().equals(2), MwCollectRecord::getCheckoutTime, query.getStartTime(), query.getEndTime())
@@ -135,13 +127,17 @@
totalCount = totalCount.add(currentCount);
totalWeight = totalWeight.add(weight);
}
+ itemVO.getData().add(totalCount);
+ itemVO.getData().add(totalWeight);
//查询预警记录判断是否超时
if (query.getDateType().equals(1)) {
itemVO.setOverTimeFlag("否");
List<Long> collectIdList = collectRecordList.stream().filter(e -> finalSdf.format(e.getCollectTime()).equals(date)).map(MwCollectRecord::getId).collect(Collectors.toList());
- List<MwWarningRecord> warningRecordList = mwWarningRecordService.lambdaQuery().in(MwWarningRecord::getWarningTargetId, collectIdList).list();
- if (CollUtils.isNotEmpty(warningRecordList)) {
- itemVO.setOverTimeFlag("是");
+ if (CollUtils.isNotEmpty(collectIdList)) {
+ List<MwWarningRecord> warningRecordList = mwWarningRecordService.lambdaQuery().in(MwWarningRecord::getWarningTargetId, collectIdList).list();
+ if (CollUtils.isNotEmpty(warningRecordList)) {
+ itemVO.setOverTimeFlag("是");
+ }
}
}
list.add(itemVO);
@@ -169,6 +165,7 @@
FastExcel.write(response.getOutputStream())
.head(head)
.autoCloseStream(Boolean.TRUE)
+ .registerWriteHandler(new AutoColumnWidthStrategy())
.sheet("医院报表")
.doWrite(getHospitalReportStaticsData(query));
}
@@ -224,38 +221,40 @@
public DepartmentReportVO transformList(TransformQuery query) {
DepartmentReportVO vo = new DepartmentReportVO();
SysDepartment department = sysDepartmentService.getById(query.getDepartmentId());
+ if (Objects.nonNull(department)) {
+ vo.setDepartmentName(department.getDepartmentName());
+ }
SysDepartment region = sysDepartmentService.getDepartmentByParentId(department.getParentId());
- List<SysDepartment> hospitalList = sysDepartmentService.lambdaQuery().likeRight(SysDepartment::getTreeCode, region.getTreeCode()).eq(SysDepartment::getOrgType, DepartmentEnum.MEDICAL_INSTITUTION.getCode()).list();
- if (CollUtils.isNotEmpty(hospitalList)) {
- List<TransformVO> checkoutRecordVOList = mwCheckoutRecordService.getCheckoutRecordList(query, region.getTreeCode());
- if (CollUtils.isNotEmpty(checkoutRecordVOList)) {
- //查询医废类型
- List<SysDictData> wasteTypeList = sysDictDataService.lambdaQuery().in(SysDictData::getDictCode, query.getWasteTypeCodeList()).list();
- if (CollUtils.isNotEmpty(wasteTypeList)) {
- vo.setLegend(wasteTypeList.stream().map(SysDictData::getDictLabel).collect(Collectors.toList()));
- vo.getLegend().add("小计");
- for (TransformVO transformVO : checkoutRecordVOList) {
- BigDecimal totalCount = BigDecimal.ZERO;
- BigDecimal totalWeight = BigDecimal.ZERO;
- DepartmentReportItemVO departmentReportItemVO = new DepartmentReportItemVO();
- departmentReportItemVO.setName(transformVO.getHospitalName());
- departmentReportItemVO.setData(new ArrayList<>());
- departmentReportItemVO.setDriverName(transformVO.getDriverName());
- departmentReportItemVO.setHospitalSignature(transformVO.getHospitalSignature());
- departmentReportItemVO.setHandoverTime(transformVO.getCheckoutTime());
- for (SysDictData sysDictData : wasteTypeList) {
- BigDecimal count = BigDecimal.valueOf(transformVO.getCollectRecordList().stream().filter(item -> item.getWasteType().equals(sysDictData.getDictCode())).count());
- BigDecimal weight = transformVO.getCollectRecordList().stream().filter(item -> item.getWasteType().equals(sysDictData.getDictCode())).map(MwMedicalWasteBoxVO::getTotalWeight).reduce(BigDecimal.ZERO, BigDecimal::add);
- departmentReportItemVO.getData().add(count);
- departmentReportItemVO.getData().add(weight);
- totalCount = totalCount.add(count);
- totalWeight = totalWeight.add(weight);
- }
- departmentReportItemVO.getData().add(totalCount);
- departmentReportItemVO.getData().add(totalWeight);
- }
+ //List<SysDepartment> hospitalList = sysDepartmentService.lambdaQuery().likeRight(SysDepartment::getTreeCode, region.getTreeCode()).eq(SysDepartment::getOrgType, DepartmentEnum.MEDICAL_INSTITUTION.getCode()).list();
+ List<TransformVO> checkoutRecordVOList = mwCheckoutRecordService.getCheckoutRecordList(query, region.getTreeCode());
+ //查询医废类型
+ List<SysDictData> wasteTypeList = sysDictDataService.lambdaQuery().in(SysDictData::getDictCode, query.getWasteTypeCodeList()).orderByDesc(SysDictData::getDictCode).list();
+ if (CollUtils.isNotEmpty(wasteTypeList)) {
+ vo.setLegend(wasteTypeList.stream().map(SysDictData::getDictLabel).collect(Collectors.toList()));
+ vo.getLegend().add("小计");
+ List<DepartmentReportItemVO> list = new ArrayList<>();
+ for (TransformVO transformVO : checkoutRecordVOList) {
+ BigDecimal totalCount = BigDecimal.ZERO;
+ BigDecimal totalWeight = BigDecimal.ZERO;
+ DepartmentReportItemVO departmentReportItemVO = new DepartmentReportItemVO();
+ departmentReportItemVO.setName(transformVO.getHospitalName());
+ departmentReportItemVO.setData(new ArrayList<>());
+ departmentReportItemVO.setDriverName(transformVO.getDriverName());
+ departmentReportItemVO.setHospitalSignature(ImageToBase64.convertImageToBase64(transformVO.getHospitalSignature()));
+ departmentReportItemVO.setHandoverTime(transformVO.getCheckoutTime());
+ for (SysDictData sysDictData : wasteTypeList) {
+ BigDecimal count = BigDecimal.valueOf(transformVO.getCollectRecordList().stream().filter(item -> item.getWasteType().equals(sysDictData.getDictCode())).count());
+ BigDecimal weight = transformVO.getCollectRecordList().stream().filter(item -> item.getWasteType().equals(sysDictData.getDictCode())).map(MwMedicalWasteBoxVO::getTotalWeight).reduce(BigDecimal.ZERO, BigDecimal::add);
+ departmentReportItemVO.getData().add(count);
+ departmentReportItemVO.getData().add(weight);
+ totalCount = totalCount.add(count);
+ totalWeight = totalWeight.add(weight);
}
+ departmentReportItemVO.getData().add(totalCount);
+ departmentReportItemVO.getData().add(totalWeight);
+ list.add(departmentReportItemVO);
}
+ vo.setList(list);
}
return vo;
}
@@ -273,6 +272,7 @@
FastExcel.write(response.getOutputStream())
.head(head)
.autoCloseStream(Boolean.TRUE)
+ .registerWriteHandler(new AutoColumnWidthStrategy())
.sheet("转运联单")
.doWrite(getTransformReportStaticsData(query));
}
@@ -334,6 +334,10 @@
*/
public DepartmentReportVO disposalReport(DisposalReportQuery query) {
DepartmentReportVO vo = new DepartmentReportVO();
+ SysDepartment department = sysDepartmentService.getById(query.getDepartmentId());
+ if (Objects.nonNull(department)) {
+ vo.setDepartmentName(department.getDepartmentName());
+ }
//已接收
List<MwDisposalRecordReportVO> receivedList = mwDisposalRecordService.disposalReceiveReport(query);
//已处置
@@ -364,23 +368,17 @@
SimpleDateFormat finalSdf = sdf;
//接收
for (SysDictData sysDictData : wasteTypeList) {
- departmentReportItemVO.getData().add(BigDecimal.ZERO);
- if (CollUtils.isNotEmpty(receivedList)) {
- BigDecimal totalWeight = receivedList.stream().filter(item -> item.getWasteType().equals(sysDictData.getDictCode()) &&
- finalSdf.format(item.getReceiveTime()).equals(date)).map(MwDisposalRecordReportVO::getWeight)
- .reduce(BigDecimal.ZERO, BigDecimal::add);
- departmentReportItemVO.getData().add(totalWeight);
- }
+ BigDecimal totalWeight = receivedList.stream().filter(item -> item.getWasteType().equals(sysDictData.getDictCode()) &&
+ finalSdf.format(item.getReceiveTime()).equals(date)).map(MwDisposalRecordReportVO::getWeight)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ departmentReportItemVO.getData().add(totalWeight);
}
//处置
for (SysDictData sysDictData : wasteTypeList) {
- departmentReportItemVO.getData().add(BigDecimal.ZERO);
- if (CollUtils.isNotEmpty(disposaledList)) {
- BigDecimal totalWeight = disposaledList.stream().filter(item -> item.getWasteType().equals(sysDictData.getDictCode()) &&
- finalSdf.format(item.getReceiveTime()).equals(date)).map(MwDisposalRecordReportVO::getWeight)
- .reduce(BigDecimal.ZERO, BigDecimal::add);
- departmentReportItemVO.getData().add(totalWeight);
- }
+ BigDecimal totalWeight = disposaledList.stream().filter(item -> item.getWasteType().equals(sysDictData.getDictCode()) &&
+ finalSdf.format(item.getDisposalTime()).equals(date)).map(MwDisposalRecordReportVO::getWeight)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ departmentReportItemVO.getData().add(totalWeight);
}
list.add(departmentReportItemVO);
}
@@ -408,6 +406,7 @@
FastExcel.write(response.getOutputStream())
.head(head)
.autoCloseStream(Boolean.TRUE)
+ .registerWriteHandler(new AutoColumnWidthStrategy())
.sheet("处置报表")
.doWrite(getDisposalReportStaticsData(query));
}
@@ -462,6 +461,10 @@
*/
public DepartmentReportVO regulationReport(DisposalReportQuery query) {
DepartmentReportVO vo = new DepartmentReportVO();
+ SysDepartment department = sysDepartmentService.getById(query.getDepartmentId());
+ if (Objects.nonNull(department)) {
+ vo.setDepartmentName(department.getDepartmentName());
+ }
//医废产生量
List<MwCollectRecordVO> collectRecordList = mwCollectRecordService.getRegulationReportList(query);
//医废转移量
@@ -490,6 +493,7 @@
for (String date : dateList) {
DepartmentReportItemVO departmentReportItemVO = new DepartmentReportItemVO();
departmentReportItemVO.setName(date);
+ departmentReportItemVO.setData(new ArrayList<>());
SimpleDateFormat finalSdf = sdf;
for (SysDictData sysDictData : wasteTypeList) {
BigDecimal weight = collectRecordList.stream().filter(e -> e.getWasteType().equals(sysDictData.getDictCode()) &&
@@ -499,7 +503,7 @@
}
for (SysDictData sysDictData : wasteTypeList) {
BigDecimal weight = checkoutRecordList.stream().filter(e -> e.getWasteType().equals(sysDictData.getDictCode()) &&
- finalSdf.format(e.getCollectTime()).equals(date)).map(MwCollectRecordVO::getWeight).reduce(BigDecimal.ZERO, BigDecimal::add);
+ finalSdf.format(e.getCheckoutTime()).equals(date)).map(MwCollectRecordVO::getWeight).reduce(BigDecimal.ZERO, BigDecimal::add);
departmentReportItemVO.getData().add(weight);
}
for (SysDictData sysDictData : wasteTypeList) {
@@ -527,6 +531,7 @@
FastExcel.write(response.getOutputStream())
.head(head)
.autoCloseStream(Boolean.TRUE)
+ .registerWriteHandler(new AutoColumnWidthStrategy())
.sheet("监管报表")
.doWrite(getRegulationReportStaticsData(query));
}
--
Gitblit v1.7.1