Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r25250 -r25253
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 25250)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 25253)
@@ -15924,10 +15924,10 @@
 	 */
 	@Override
 	public List getRecycleMaterialDetail(String startTime, String endTime,
-			String handelDepartCoding, String applyDepartCoding,
+			String querySupplyRoom, String applyDepartCoding,
 			String materialName) {
 		List<RecycleMaterialVo> voList = new ArrayList<RecycleMaterialVo>();
-		if(StringUtils.isBlank(startTime) || StringUtils.isBlank(endTime) || StringUtils.isBlank(handelDepartCoding)){
+		if(StringUtils.isBlank(startTime) || StringUtils.isBlank(endTime)){
 			return voList;
 		}
 		String sql = String.format("select po1.depart,po1.recyclingTime,po5.name,po5.specification,(po2.amount * po4.count) "
@@ -15936,7 +15936,7 @@
 		sql += " where po1.id = po2.recyclingRecord_id and po2.tousseDefinitionId = po3.id and po3.id = po4.tousse_id "
 			+ "and po4.materialDefinition_id = po5.id and po1.recyclingTime between " + dateQueryAdapter.dateAdapter(startTime) 
 			+ " and " + dateQueryAdapter.dateAdapter(endTime);
-		sql += " and po1.orgUnitCoding = '" + handelDepartCoding + "'";
+		sql += SqlUtils.get_InSql_Extra("po1.orgUnitCoding", querySupplyRoom); 
 		if(StringUtils.isNotBlank(applyDepartCoding)){
 			sql += " and po1.departCode = '" + applyDepartCoding + "'";
 		}
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/recycleMaterialDetailView.js
===================================================================
diff -u -r25237 -r25253
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/recycleMaterialDetailView.js	(.../recycleMaterialDetailView.js)	(revision 25237)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/recycleMaterialDetailView.js	(.../recycleMaterialDetailView.js)	(revision 25253)
@@ -95,20 +95,26 @@
 	function reloadReport(){
 		var startTime= Ext.getCmp('startTime').getRawValue();
 		var endTime = Ext.getCmp('endTime').getRawValue();
-		var handelDepartCoding = Ext.getCmp('querySupplyRoom').getValue();
+		var querySupplyRoom = Ext.getCmp('querySupplyRoom').getValue();
 		var applyDepartCoding = Ext.getCmp('departSearch').getValue();
 		var materialName = Ext.getCmp('materialName').getValue();
 		
 		var departCoding = Ext.getCmp('querySupplyRoom').getValue();
+
 		
 		if(startTime == "" || endTime == ""){
 			showResult("开始时间或结束时间不能为空!");
 			return false;
 		}
-		if(handelDepartCoding == ""){
+		if(querySupplyRoom == ""){
 			showResult("请选择处理科室!");
 			return false;
 		}
+		
+		if(querySupplyRoom.indexOf(ALL) == 0){
+			querySupplyRoom = "";
+		}
+		
 		myMask = new Ext.LoadMask(Ext.getBody(), {
 			msg: '正在加载，请稍候！',
 			removeMask: true
@@ -120,7 +126,7 @@
 		if(Ext.getCmp('materialName').getRawValue() == ""){
 			materialName = "";
 		}
-		window.open(WWWROOT+"/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do?jasperreportName=recycleMaterialReport.jasper&startTime="+startTime+"&endTime="+endTime+"&handelDepartCoding="+handelDepartCoding+"&applyDepartCoding="+applyDepartCoding+"&materialName="+materialName+"&reportName=recycleMaterialDetail",'thisIframe','_self');
+		window.open(WWWROOT+"/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do?jasperreportName=recycleMaterialReport.jasper&startTime="+startTime+"&endTime="+endTime+"&querySupplyRoom="+querySupplyRoom+"&applyDepartCoding="+applyDepartCoding+"&materialName="+materialName+"&reportName=recycleMaterialDetail",'thisIframe','_self');
 	}
 
 		var departJsonStore = new Ext.data.SimpleStore({
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r25250 -r25253
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 25250)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 25253)
@@ -296,10 +296,10 @@
 		}else if(reportName.equals("recycleMaterialDetail")){//回收器械材料明细报表
 			String startTime = StrutsParamUtils.getPraramValue("startTime", "");
 			String endTime = StrutsParamUtils.getPraramValue("endTime", "");
-			String handelDepartCoding = StrutsParamUtils.getPraramValue("handelDepartCoding", "");
+			String querySupplyRoom = StrutsParamUtils.getPraramValue("querySupplyRoom", "");
 			String applyDepartCoding = StrutsParamUtils.getPraramValue("applyDepartCoding", "");
 			String materialName = StrutsParamUtils.getPraramValue("materialName", "");
-			return jasperReportManager.getRecycleMaterialDetail(startTime, endTime, handelDepartCoding, applyDepartCoding, materialName);
+			return jasperReportManager.getRecycleMaterialDetail(startTime, endTime, querySupplyRoom, applyDepartCoding, materialName);
 		}else if(reportName.equals("washUnUnqualified")){//器械材料清洗不合格统计报表
 			String startTime = StrutsParamUtils.getPraramValue("startTime", "");
 			String endTime = StrutsParamUtils.getPraramValue("endTime", "");