Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r16028 -r16042
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 16028)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 16042)
@@ -8983,15 +8983,16 @@
 					 +"("
 					       +"select  sum(w.generalmaterialamount)as m1,sum(w.operatematerialamount) as m2,sum(w.foreignmaterialamount)as m3,"
 					       +"sum(w.disinfectMaterialAmount) as m4,sum(w.secondWashForeignAmount) as m5,"
-					       +"sum(w.generalmaterialamount+w.operatematerialamount+w.foreignmaterialamount) as m6 "
+					       +"sum(w.washMaterialAmount) as m6 "
 					       +"from washanddisinfectrecord w where w.enddate between "+dateQueryAdapter.dateConverAdapter2(statDate,"yyyy-mm-dd")
 					       +" and "+dateQueryAdapter.dateConverAdapter2(endDate,"yyyy-mm-dd")
 					       +" and w.orgUnitCoding = '"+querySupplyRoom+"'"
 					 +")temp,"
 					 +"("
-					       +"select sum(qu.amount)as amount from QualityMonitoring qu where qu.inspectitem in "
-					       +"(select qm.name from qualitymonitoringConfig qm where qm.departcodes like '%"+querySupplyRoom+"%'" 
-					       +" and qm.responsibilitypart = '清洗消毒' and qm.type = '质量监测')"
+					       +"select sum(qu.amount)as amount from QualityMonitoring qu where qu.inspectitem like '%器械清洗不合格%' "
+//					       +"(select qm.name from qualitymonitoringConfig qm where qm.departcodes like '%"+querySupplyRoom+"%'" 
+//					       +" and qm.responsibilitypart = '清洗消毒' and qm.type = '质量监测')"
+//					       + " and qu.inspectitem like '%器械清洗不合格%' "
 					       +" and qu.datetime between "+dateQueryAdapter.dateConverAdapter2(statDate,"yyyy-mm-dd")
 					       +" and "+dateQueryAdapter.dateConverAdapter2(endDate,"yyyy-mm-dd")
 					       +" and qu.orgUnitCoding = '"+querySupplyRoom+"'"