From 2f18b3a28054c3917010f95ba84f7425280a2622 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期二, 21 四月 2026 19:43:24 +0800
Subject: [PATCH] feat:消毒记录增加新增功能、医院废弃物报表增加在库统计环节
---
src/main/java/cn/besteam/modules/report/biz/ReportBiz.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cn/besteam/modules/report/biz/ReportBiz.java b/src/main/java/cn/besteam/modules/report/biz/ReportBiz.java
index de7ff52..8d97883 100644
--- a/src/main/java/cn/besteam/modules/report/biz/ReportBiz.java
+++ b/src/main/java/cn/besteam/modules/report/biz/ReportBiz.java
@@ -1428,6 +1428,8 @@
queryWrapper.in(MwCollectRecord::getStatus, 1,2,3);//收集
}else if(dto.getTypeTpl()==2){
queryWrapper.in(MwCollectRecord::getStatus, 2,3);//入库
+ }else if(dto.getTypeTpl()!=null && dto.getTypeTpl()==4){
+ queryWrapper.eq(MwCollectRecord::getStatus, MedicalWasteEnum.MedicalWasteStatusEnum.STORE.getStatus());//在库
}else{
queryWrapper.in(MwCollectRecord::getStatus, 3);//出库
}
@@ -1435,7 +1437,6 @@
for(MwCollectRecord mwCollectRecord:mwCollectRecordList){
mwCollectRecord.setCreateTimes(DateUtil.format(mwCollectRecord.getCreateTime(), "yyyy-MM-dd"));
}
- //
List<DepartmentReportItemVO> voList = buildDepartmentStatementItemVOList(wasteTypeList, mwCollectRecordList, dto);
vo.setList(voList);
return vo;
--
Gitblit v1.7.1