Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r17504 -r17511
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 17504)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 17511)
@@ -13995,9 +13995,9 @@
 		// 获取灭菌不合格物品的sql 
 		String qmDataSql = dateQueryAdapter.dateToVarchar2("qmi.dateTime");
 		String sterilizeUQSql = "select " + qmDataSql +" dataStr,src.orgUnitName,sum(qmi.amount) count "
-				+ " from QualityMonitoringInstance qmi,FormInstance fi,FormDefinition fd,FormInstanceItem fiItem,FormDefinitionItem fdi "
-				+ " , SupplyRoomConfig src "
-				+ " where qmi.id=fi.id and fd.id = fi.formDefinition_id and fi.id = fiItem.formInstance_id  and fiItem.formDefinitionItem_id = fdi.id "
+				+ " from QualityMonitoringInstance qmi,FormInstance fi,FormDefinition fd , "
+				+ " SupplyRoomConfig src "
+				+ " where qmi.id=fi.id and fd.id = fi.formDefinition_id and (src.supplyroomtype = 1 or src.supplyroomtype = 2) "
 				+ " and src.orgUnitCoding = fi.orgUnitCoding "
 				+ " and ( fd.formName = '" + "灭菌失败事件"+ "' or fd.formName = '"+ "湿包"
 				+ "' or fd.formName = '"+ "破包"+ "' or fd.formName = '"+ "指示卡变色不均匀有水渍"+ "' )"
@@ -14013,9 +14013,9 @@
 		Map<String,Integer> washUQMap = new HashMap<String,Integer>();
 		Map<String,Integer> washTotalMap = new HashMap<String,Integer>();
 		String washUQSql = "select " + qmDataSql +" dataStr,src.orgUnitName,sum(qmi.amount) count "
-				+ " from QualityMonitoringInstance qmi,FormInstance fi,FormDefinition fd,FormInstanceItem fiItem,FormDefinitionItem fdi "
-				+ " , SupplyRoomConfig src "
-				+ " where qmi.id=fi.id and fd.id = fi.formDefinition_id and fi.id = fiItem.formInstance_id  and fiItem.formDefinitionItem_id = fdi.id "
+				+ " from QualityMonitoringInstance qmi,FormInstance fi,FormDefinition fd,"
+				+ " SupplyRoomConfig src "
+				+ " where qmi.id=fi.id and fd.id = fi.formDefinition_id and (src.supplyroomtype = 1 or src.supplyroomtype = 2) "
 				+ " and src.orgUnitCoding = fi.orgUnitCoding "
 				+ " and ( fd.formName = '" + "器械清洗不合格"+ "' )"
 				+ " and qmi.dateTime between " + dateQueryAdapter.dateAdapter(startDay)
@@ -14024,6 +14024,7 @@
 		String washDateSql = dateQueryAdapter.dateToVarchar2("w.enddate");
 		String washTotalSql = "select "+washDateSql+" dataStr,src.orgUnitName, sum(w.washMaterialAmount) amount from washanddisinfectrecord w,SupplyRoomConfig src "
 						+ " where w.orgUnitCoding = src.orgUnitCoding "
+						+ " and (src.supplyroomtype = 1 or src.supplyroomtype = 2) "
 						+ " and (w.washStatus = '" + WashAndDisinfectRecord.STATUS_WASHED + "' or w.washStatus = '" + WashAndDisinfectRecord.STATUS_WASHFAILD + "' )"
 						+ " and w.enddate between "+dateQueryAdapter.dateAdapter(startDay)
 						+ " and "+dateQueryAdapter.dateAdapter(endDay)
@@ -14034,9 +14035,9 @@
 		// 包装不合格的map，包装总数的map跟灭菌总数的一样
 		Map<String,Integer> packingUQMap = new HashMap<String,Integer>();
 		String packingUQSql = "select " + qmDataSql +" dataStr,src.orgUnitName,sum(qmi.amount) count "
-				+ " from QualityMonitoringInstance qmi,FormInstance fi,FormDefinition fd,FormInstanceItem fiItem,FormDefinitionItem fdi "
-				+ " , SupplyRoomConfig src "
-				+ " where qmi.id=fi.id and fd.id = fi.formDefinition_id and fi.id = fiItem.formInstance_id  and fiItem.formDefinitionItem_id = fdi.id "
+				+ " from QualityMonitoringInstance qmi,FormInstance fi,FormDefinition fd,"
+				+ " SupplyRoomConfig src "
+				+ " where qmi.id=fi.id and fd.id = fi.formDefinition_id and (src.supplyroomtype = 1 or src.supplyroomtype = 2) "
 				+ " and src.orgUnitCoding = fi.orgUnitCoding "
 				+ " and ( fd.formName = '" + "器械包装不合格"+ "' or fd.formName = '"+ "器械材料问题"
 				+ "' or fd.formName = '"+ "器械功能不全"+ "' or fd.formName = '"+ "器械包装松散"+ "' )"
@@ -14048,9 +14049,9 @@
 		// 湿包数量的map，包总数的map跟灭菌总数的一样
 		Map<String,Integer> wetPackUQMap = new HashMap<String,Integer>();
 		String wetPackUQSql = "select " + qmDataSql +" dataStr,src.orgUnitName,sum(qmi.amount) count "
-				+ " from QualityMonitoringInstance qmi,FormInstance fi,FormDefinition fd,FormInstanceItem fiItem,FormDefinitionItem fdi "
-				+ " , SupplyRoomConfig src "
-				+ " where qmi.id=fi.id and fd.id = fi.formDefinition_id and fi.id = fiItem.formInstance_id  and fiItem.formDefinitionItem_id = fdi.id "
+				+ " from QualityMonitoringInstance qmi,FormInstance fi,FormDefinition fd, "
+				+ " SupplyRoomConfig src "
+				+ " where qmi.id=fi.id and fd.id = fi.formDefinition_id and (src.supplyroomtype = 1 or src.supplyroomtype = 2) "
 				+ " and src.orgUnitCoding = fi.orgUnitCoding "
 				+ " and ( fd.formName = '" + "湿包"+"' )"
 				+ " and qmi.dateTime between " + dateQueryAdapter.dateAdapter(startDay)