Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/YearWorkloadReportHelper.java
===================================================================
diff -u -r37190 -r37430
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/YearWorkloadReportHelper.java	(.../YearWorkloadReportHelper.java)	(revision 37190)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/YearWorkloadReportHelper.java	(.../YearWorkloadReportHelper.java)	(revision 37430)
@@ -275,6 +275,25 @@
 			disinfectionSql = String.format("select sum(tl.amount) amount,monthstr from ("
 					+dataIndex.getWorkAmountByMaterialSQL("配包数量", params, dataSoureOfMaterialsCountOfToussesInReports)
 					+ ") tl group by monthstr");
+	    }else if(statisticSourceOfDisinfectGoodsAmount == 5){//清洗包数
+	    	monthlyStr = dateQueryAdapter.dateConverAdapter3("wdr.endDate",mmOrdd);
+	    	params.extraGroupBy = "";
+			params.extraSelectColumns = "," + monthlyStr + "monthstr";
+			params.monthlyStr = monthlyStr;
+			params.groupBySql = " group by " + monthlyStr;
+			disinfectionSql = String.format("select sum(tl.amount) amount, monthstr  from ("
+					+dataIndex.getWorkAmountByPackageSQL("清洗数量", params)
+					+ ") tl group by monthstr ");
+	    }else if(statisticSourceOfDisinfectGoodsAmount == 6){//清洗件数
+	    	// 处理器械总件数
+	    	monthlyStr = dateQueryAdapter.dateConverAdapter3("wr.endDate",mmOrdd);
+	    	params.extraGroupBy = "";
+			params.extraSelectColumns = "";
+			params.monthlyStr = monthlyStr;
+			params.groupBySql = "";
+	    	disinfectionSql = String.format("select sum(tl.amount) amount, monthstr  from ("
+					+dataIndex.getWorkAmountByMaterialSQL("清洗数量", params, dataSoureOfMaterialsCountOfToussesInReports)
+					+ ") tl group by monthstr ");
 	    }else{
 	    	monthlyStr = dateQueryAdapter.dateConverAdapter3("i.sendTime",mmOrdd);
 	    	params.extraSelectColumns = "," + monthlyStr + "monthstr";