Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/YearWorkloadReportHelper.java =================================================================== diff -u -r37170 -r37189 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/YearWorkloadReportHelper.java (.../YearWorkloadReportHelper.java) (revision 37170) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/YearWorkloadReportHelper.java (.../YearWorkloadReportHelper.java) (revision 37189) @@ -199,7 +199,7 @@ } if(dataIndexSources.contains("器械手工清洗件数")){ // 处理器械总件数 - params.extraQuery= " and wr.rinserId not in (select id from Rinser where isManualClean='是') "; + params.extraQuery= " and wr.rinserId in (select id from Rinser where isManualClean='是') and wr.endDate is not null "; sql = String.format("select sum(tl.amount) amount, monthstr from (" +dataIndex.getWorkAmountByMaterialSQL("清洗数量", params, dataSoureOfMaterialsCountOfToussesInReports) + ") tl group by monthstr ");