Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/YearWorkloadReportHelper.java
===================================================================
diff -u -r37189 -r37190
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/YearWorkloadReportHelper.java	(.../YearWorkloadReportHelper.java)	(revision 37189)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/YearWorkloadReportHelper.java	(.../YearWorkloadReportHelper.java)	(revision 37190)
@@ -155,7 +155,7 @@
 		Map<String, Integer> endoscopicMap = new HashMap<String, Integer>();//内窥镜map
 		Map<String, Integer> nextSendAmountMap = new HashMap<String, Integer>();//下收下送map
 		Map<String, Integer> manualWashAmountMap = new HashMap<String, Integer>();//器械手工清洗总件数map
-		Map<String,Integer> rinserTotalUseAmountMap = new HashMap<String, Integer>();//灭菌炉使用次数map
+		Map<String,Integer> rinserTotalUseAmountMap = new HashMap<String, Integer>();//清洗机使用次数map
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
 		
 		Map<String, Integer> amountTotalMap = new HashMap<String, Integer>();
@@ -199,7 +199,7 @@
 		}
 		if(dataIndexSources.contains("器械手工清洗件数")){
 			// 处理器械总件数
-			params.extraQuery= " and wr.rinserId in (select id from Rinser where isManualClean='是') and wr.endDate is not null ";
+			params.extraQuery= " and wr.rinserId in (select id from Rinser where isManualClean='是') ";
 		    sql = String.format("select sum(tl.amount) amount, monthstr  from ("
 					+dataIndex.getWorkAmountByMaterialSQL("清洗数量", params, dataSoureOfMaterialsCountOfToussesInReports)
 					+ ") tl group by monthstr ");
@@ -537,7 +537,7 @@
 						  + " monthStr from "+ WashAndDisinfectRecord.class.getSimpleName() +" wr "
 					      + " where wr.orgUnitCoding='" + querySupplyRoom + "' "
 					      + " and wr.startDate between " + startDay + " and " + endDay
-					      + " and wr.rinserId not in (select id from Rinser where isManualClean='是' ) group by "
+					      + " and wr.rinserId not in (select id from Rinser where isManualClean='是' ) and wr.endDate is not null group by "
 					      + monthlyStr;
 			ResultSet rs = null;
 			try {