Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r19197 -r19203
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 19197)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 19203)
@@ -8008,7 +8008,7 @@
 //			Integer amount = getAmountBySql(sql);
 //			String columnName = "处理器械总件数 ";
 //			YearWorkloadBean bean = new YearWorkloadBean(i,month, 1, columnName, amount);
-			list.add(getYearWorkloadBean(i,month, 1, "处理器械总件数 ", sql));
+			list.add(getYearWorkloadBean(i,month, 1, "处理器械总件数", sql));
 			// 处理器械总包数 
 			//数据获取：不包含外来器械申请单、代理灭菌单、消毒物品、敷料包。包类型只针对器械包，
 			// 所有包装类型都可以统计。申请科室没有限制。数量统计为回收的器械包的包数
@@ -8017,15 +8017,15 @@
 						+ " where (ip.id is null or (ip.id is not null and ip.type != '" + InvoicePlan.TYPE_FOREIGNTOUSSEAPPLIACTION + "' and ip.type != '" + InvoicePlan.TYPE_PROXYDISINFECTION + "' and ip.type != '" +InvoicePlan.TYPE_DRESSING_APPLICATION_FROM+ "' and ip.type != '" +InvoicePlan.TYPE_DISINFECT_GOODS_APPLICATION_FORM+ "'))"
 						+ " and td.tousseType != '" +TousseDefinition.PACKAGE_TYPE_DISINFECTION + "' and td.tousseType != '" + TousseDefinition.PACKAGE_TYPE_DRESSING+ "'"
 						+ " and rr.recyclingTime between " + startDay +" and "+endDay;
-			list.add(getYearWorkloadBean(i,month, 2, "处理器械总包数  ", sql));
+			list.add(getYearWorkloadBean(i,month, 2, "处理器械总包数 ", sql));
 			// 处理手术室器械总件数  申请科室为“手术室” 只统计包类型为“器械包” 统计回收器械包的材料数量
 			sql = " select sum(tdc.amount*ri.amount) from RecyclingRecord rr,RecyclingItem ri,TousseDefinition td, "
 				 + "(select td.id tid,td.name tdName, sum(mi.count) amount from MaterialInstance mi, tousseDefinition td where mi.tousse_id=td.id and td.forDisplay=1 group by td.id,td.name) tdc "
 				 + " where rr.id=ri.recyclingRecord_id and ri.tousseDefinitionId=td.id and td.id=tdc.tid and rr.depart='手术室' "
 				 + " and (td.tousseType='器械包') "
 				 + " and rr.recyclingTime between " + startDay +" and "+endDay;
 			list.add(getYearWorkloadBean(i,month, 3, "处理手术室器械总件数", sql));
-			// 处理临床总件数，数据获取器械包申请时科室不等于手术室的，并且包装类型不包含纸塑
+			// 处理临床科室物品总件数，数据获取器械包申请时科室不等于手术室的
 			String sql10 = " select sum(tdc.amount) from Invoice i,TousseInstance ti,TousseDefinition td,(select td.name tdName, sum(mi.count) amount from MaterialInstance mi, tousseDefinition td "  
 					+ " where mi.tousse_id=td.id and td.forDisplay=1 group by td.name) tdc "
 					+ " where i.id=ti.invoice_id and ti.tousseDefinition_id=td.id "