Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r21357 -r21412
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 21357)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 21412)
@@ -584,7 +584,7 @@
 						.getmaterialWashUnqualifiedAssessMethodBean(startDay,
 								endDay);
 			}
-		} else if (reportName.equals("yearWorkloadReport2")) {
+		} else if (reportName.equals("yearWorkloadReport2")) {  //年度消毒供应中心工作量统计报表
 			String year = StrutsParamUtils.getPraramValue("year", "");
 			String departCoding = StrutsParamUtils.getPraramValue("departCoding", "");
 			String isSpecial = StrutsParamUtils.getPraramValue("isSpecial", "");
@@ -1425,7 +1425,7 @@
 				year = new SimpleDateFormat("yyyy").format(new Date());
 			}
 			map.put("title", year + "CSSD工作量汇总表");
-		}else if (reportName.equals("yearWorkloadReport2")) {
+		}else if (reportName.equals("yearWorkloadReport2")) {  //年度消毒供应中心工作量统计报表
 			String year = StrutsParamUtils.getPraramValue("year", "");
 			if (StringUtils.isBlank(year)) {
 				year = new SimpleDateFormat("yyyy").format(new Date());
@@ -2421,7 +2421,7 @@
 				getpackingUnqualifieReportParam(map);
 			} else if (reportName.equals("yearWorkloadReport")) {// CSSD工作量汇总表
 				getYearWorkloadReportParam(map);
-			} else if (reportName.equals("yearWorkloadReport2")) {// 年度消毒供应中心工作量统计报表
+			} else if (reportName.equals("yearWorkloadReport2")) {  //年度消毒供应中心工作量统计报表（sql）
 				getYearWorkloadReport2Param(map);
 			} else if (reportName.equals("yearUserWorkloadReport")) {// 年度消毒供应中心员工工作量统计报表
 				getyearUserWorkloadReportParam(map);
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r21357 -r21412
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 21357)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 21412)
@@ -9166,6 +9166,7 @@
 		
 		List<YearWorkloadBean> list = new ArrayList<YearWorkloadBean>();
 		
+		//所有的灭菌炉所属分组
 		List<String> groupList = new ArrayList<String>();
 		String ownGroupSql = "select distinct ownGroup from Sterilizer";
 		ResultSet rs2 =  objectDao.executeSql(ownGroupSql);
@@ -9233,6 +9234,13 @@
 			YearWorkloadBean bean2 = new YearWorkloadBean(i,month, 2, columnName2, amount2);
 			list.add(bean2);
 			
+			
+			//消毒物品数量
+			String disinfectionSql = String.format("select count(1) from TousseInstance ti join TousseDefinition td on td.id=ti.tousseDefinition_id "
+					+ "where ti.toussefixedBarcode<>1 and ti.operationTime between %s and %s and td.tousseType='%s'",
+					startDay, endDay, TousseDefinition.PACKAGE_TYPE_DISINFECTION);
+			list.add(new YearWorkloadBean(i,month, 2, "消毒物品数量", objectDao.countBySql(disinfectionSql)));
+			
 			String sterilizaSql = " select sum(sr.amount),sum(sr.foreignTousseAmount) "  
 					+ " from SterilizationRecord sr where sr.status = '"+ SterilizationRecord.STERILIZATION_STATUS_END +"' " 
 					+ " and sr.orgUnitCoding = '"+querySupplyRoom+"'"