Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r19461 -r19467
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 19461)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 19467)
@@ -9268,11 +9268,12 @@
 //						+ " and td.tousseType != '" +TousseDefinition.PACKAGE_TYPE_DISINFECTION + "' and td.tousseType != '" + TousseDefinition.PACKAGE_TYPE_DRESSING+ "'"
 //						+ " and rr.recyclingTime between " + startDay +" and "+endDay;
 			// 包装器械总包数。数据获取改成装配总包数，除了外来器械包其余所有的都统计在内，包含敷料、消毒物品、纸塑包
-			String sql = "select count(*) from tousseInstance ti,tousseDefinition td "
-					+ " where ti.tousseDefinition_id=td.id "
+			String sql = "select sum(pr.amount) from PackingRecord pr,tousseDefinition td "
+					+ " where pr.tousseDefinitionId=td.id "
 					+ " and td.tousseType != '" + TousseDefinition.PACKAGE_TYPE_FOREIGN + "'"
 					+ " and td.tousseType != '" + TousseDefinition.PACKAGE_TYPE_SPLIT + "'"
-					+ " and ti.operationTime between "  + startDay +" and " + endDay;
+					+ " and pr.packTime between "  + startDay +" and " + endDay;
+					
 			list.add(getYearWorkloadBean(i,month, 2, "包装器械总包数", sql));
 			// 处理手术室器械总件数  申请科室为“手术室” 只统计包类型为“器械包” 统计回收器械包的材料数量
 //			sql = " select sum(tdc.amount*ri.amount) from RecyclingRecord rr,RecyclingItem ri,TousseDefinition td, "
@@ -9283,7 +9284,7 @@
 			// 回收科室等于手术室的器械清洗总件数，不包含外来器械
 			sql = "select sum(ritem.amount*tdc.amount)  from RecyclingRecord rr join RecyclingItem ritem on ritem.recyclingRecord_id = rr.id "
 					+ "  join (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 and( td.tousseType is null or td.tousseType != '" + TousseDefinition.PACKAGE_TYPE_FOREIGN + "') group by td.id,td.name) tdc on tdc.tid=ritem.tousseDefinitionId " 
+					+ " where mi.tousse_id=td.id and( td.tousseType is null or td.tousseType != '" + TousseDefinition.PACKAGE_TYPE_FOREIGN + "') group by td.id,td.name) tdc on tdc.tid=ritem.tousseDefinitionId " 
 					+ " join ClassifyBasket_RecyclingRecord cr on rr.id=cr.RecyclingRecord_ID " 
 					+ " join ClassifyBasket cb on cr.ClassifyBasket_ID=cb.id join ClassifyBasket_WashRecord cw on cb.id=cw.ClassifyBasket_ID "
 					+ " join WashAndDisinfectRecord wr on cw.WashAndDisinfectRecord_ID=wr.id "
@@ -9308,7 +9309,7 @@
 //					+ " and i.sendTime between " + startDay +" and "+endDay;
 			String sql10 = "select sum(ritem.amount*tdc.amount)  from RecyclingRecord rr join RecyclingItem ritem on ritem.recyclingRecord_id = rr.id "
 					+ "  join (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 on tdc.tid=ritem.tousseDefinitionId " 
+					+ " where mi.tousse_id=td.id group by td.id,td.name) tdc on tdc.tid=ritem.tousseDefinitionId " 
 					+ " join ClassifyBasket_RecyclingRecord cr on rr.id=cr.RecyclingRecord_ID " 
 					+ " join ClassifyBasket cb on cr.ClassifyBasket_ID=cb.id join ClassifyBasket_WashRecord cw on cb.id=cw.ClassifyBasket_ID "
 					+ " join WashAndDisinfectRecord wr on cw.WashAndDisinfectRecord_ID=wr.id "
@@ -9362,16 +9363,16 @@
 			//清洗机使用炉次”：
 			//数据获取为：所有清洗机的运作次数
 			sql = "select count(*) from WashAndDisinfectRecord wr, Rinser r "
-						+ " where r.id=wr.rinserId "
-						+ " and r.name not like '%手工%' "
-						+ " and wr.startDate between " + startDay +" and "+endDay;
+				+ " where r.id=wr.rinserId "
+				+ " and wr.disinfectIdentification not like '%手工%' "
+				+ " and wr.startDate between " + startDay +" and "+endDay;
 			list.add(getYearWorkloadBean(i,month, 8, "清洗机使用炉次", sql));
 			
 			// 清洗消毒物品总件数：数据获取：清洗消毒物品类型材料的总件数
 			sql = "select sum(wr.disinfectMaterialAmount) from WashAndDisinfectRecord wr , Rinser r "
-					+ " where r.id=wr.rinserId "
-					+ " and r.orgUnitCoding = '" + querySupplyRoom + "'"
-					+ " and wr.startDate between " + startDay +" and "+endDay;
+				+ " where r.id=wr.rinserId "
+				+ " and r.orgUnitCoding = '" + querySupplyRoom + "'"
+				+ " and wr.startDate between " + startDay +" and "+endDay;
 			list.add(getYearWorkloadBean(i,month, 8, "清洗消毒物品总件数", sql));
 			
 			// 处理纸塑包总包数