Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r19375 -r19383
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 19375)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 19383)
@@ -2655,7 +2655,7 @@
 				startDay = keyOfInnerMap;
 				endDay = innerMap.get(keyOfInnerMap);
 			}
-			sql = getWorkUnQualityAmountContainSql("应急处理 ",startDay,endDay,querySupplyRoom);
+			sql = getWorkUnQualityAmountContainSql("应急处理",startDay,endDay,querySupplyRoom);
 			totalSql = getTotalRecSql(startDay,endDay,querySupplyRoom);
 			setWorkQualityCollectionData(bean3,key,sql,totalSql);
 		}
@@ -2671,13 +2671,15 @@
 				endDay = innerMap.get(keyOfInnerMap);
 			}
 			sql = getWorkUnQualityAmountContainSql("普通器械清洗不合格",startDay,endDay,querySupplyRoom);
-			totalSql = "select sum(cit.amount*tdc.amount)  from RecyclingRecord rr 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 "
-					+ " join ClassifiedItem cit on cb.id=cit.classifybasket_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.tousseGroupName is null or td.tousseGroupName !=  '专科') group by td.id,td.name) tdc on tdc.tid=cit.tousseDefinitionID" 
-					+ " where itemType !='材料' and rr.depart != '手术一区'  and rr.depart != '手术二区' and rr.depart != '手术三区' "
-					+ " and wr.id is not null "
-					+ " and rr.orgUnitCoding = '" + querySupplyRoom + "'"
+			totalSql = "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.tousseGroupName is null or td.tousseGroupName !=  '专科') 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 "
+					+ " where rr.depart is not null and rr.depart != '手术一区' and  rr.depart != '手术二区' and rr.depart != '手术三区'  and wr.id is not null "
+					+ " and ritem.tousseDefinitionId in (select cit.tousseDefinitionID from ClassifyBasket clb,ClassifiedItem cit where clb.id=cit.classifybasket_id and cb.id=clb.id) "
+					+ " and rr.orgUnitCoding = '"+querySupplyRoom+"'"
 					+ " and (rr.recyclingTime between "+dateQueryAdapter.dateAdapter(startDay)+" and " + dateQueryAdapter.dateAdapter(endDay) + ")";
 			setWorkQualityCollectionData(bean4,key,sql,totalSql);
 		}
@@ -3139,13 +3141,15 @@
 		addWorkQualityCollectionBean(list,titleName,sql,recAmountMap);
 		// 普通器械清洗不合格率 
 		String totalSql = "select " +dateQueryAdapter.dateConverAdapter3("rr.recyclingTime","mm")
-				+ " month,sum(cit.amount*tdc.amount)  from RecyclingRecord rr 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 "
-				+ " join ClassifiedItem cit on cb.id=cit.classifybasket_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.tousseGroupName is null or td.tousseGroupName !=  '专科') group by td.id,td.name) tdc on tdc.tid=cit.tousseDefinitionID" 
-				+ " where itemType !='材料' and rr.depart != '手术一区'  and rr.depart != '手术二区' and rr.depart != '手术三区' "
-				+ " and wr.id is not null "
-				+ " and rr.orgUnitCoding = '" + querySupplyRoom + "'"
+				+ " month,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.tousseGroupName is null or td.tousseGroupName !=  '专科') 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 "
+				+ " where rr.depart is not null and rr.depart != '手术一区' and  rr.depart != '手术二区' and rr.depart != '手术三区'  and wr.id is not null "
+				+ " and ritem.tousseDefinitionId in (select cit.tousseDefinitionID from ClassifyBasket clb,ClassifiedItem cit where clb.id=cit.classifybasket_id and cb.id=clb.id) "
+				+ " and rr.orgUnitCoding = '"+querySupplyRoom+"'"
 				+ " and (rr.recyclingTime between "+dateQueryAdapter.dateAdapter(queryYear)+" and " + dateQueryAdapter.dateAdapter(nextYear) + ")"
 				+ " group by " + dateQueryAdapter.dateConverAdapter3("rr.recyclingTime","mm");
 		Map<String,Integer> totalmap = getMapBySql(totalSql);
@@ -3232,7 +3236,7 @@
 		sql = " select " + dateQueryAdapter.dateConverAdapter3("qmi.dateTime","mm") + " monthstr,sum(qmd.amount) amount "
 				 + " from QualityMonitoringInstance qmi,FormInstance fi,FormDefinition fd,QualityMonitoringGoods qmd" 
 				 + " where qmi.id=fi.id and fi.formDefinition_id=fd.id and qmi.id = qmd.qualityMonitoringInstance_id "
-				 + " and fd.formName = '包内指示卡欠缺'"
+				 + " and fd.formName = '包内指示卡欠缺例数'"
 				 + " and fi.orgUnitCoding = '"+querySupplyRoom+"'"
 				 + " and (qmi.dateTime between " +dateQueryAdapter.dateAdapter(queryYear)+" and " + dateQueryAdapter.dateAdapter(nextYear) + ")"
 				 + " group by " + dateQueryAdapter.dateConverAdapter3("qmi.dateTime","mm");