Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/returnGoodsDetailView.jsp
===================================================================
diff -u -r23942 -r28833
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/returnGoodsDetailView.jsp	(.../returnGoodsDetailView.jsp)	(revision 23942)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/returnGoodsDetailView.jsp	(.../returnGoodsDetailView.jsp)	(revision 28833)
@@ -52,7 +52,7 @@
 </c:if>
 
 var isFirstSupplyRoom = false;
-if(${supplyRoomType}==1){
+if(${supplyRoomType}==1 || ${supplyRoomType}==2){
     isFirstSupplyRoom = true;
 }
 var orgUnitName = '${orgUnitName}';
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r28831 -r28833
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 28831)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 28833)
@@ -12293,7 +12293,7 @@
 			}
 			
 			//1.如果当前登录为一级供应室用户(按处理科室进行过滤)
-			if(supplyRoomConfigManager.isFirstSupplyRoomOrgUnit(AcegiHelper.getCurrentOrgUnitCode())){
+			if(supplyRoomConfigManager.isFirstOrSecondSupplyRoomOrgUnit(AcegiHelper.getCurrentOrgUnitCode())){
 				//2.如果当前登录用户为非供应室用户(如:临床科室用户)
 				String handleDeptCode = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig();
 				sql += " and m.handleDepartCode = '" + handleDeptCode + "'";