Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
===================================================================
diff -u -r29316 -r29410
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 29316)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 29410)
@@ -2849,7 +2849,19 @@
 			
 			String gys = "供应室";
 			String sss = "手术室";
-
+			Set<String> supplyRoomNameSet = new HashSet<String>();
+			SupplyRoomConfig firstSupplyRoom = supplyRoomConfigManager.getFirstSupplyRoomConfig();
+			if(firstSupplyRoom != null && StringUtils.isNotBlank(firstSupplyRoom.getOrgUnitName())){
+				supplyRoomNameSet.add(firstSupplyRoom.getOrgUnitName());
+			}
+			List<SupplyRoomConfig> sencondSupplyrooms = supplyRoomConfigManager.getSupplyRoomList(SupplyRoomConfig.SUPPLYROOM_TYPE_SECOND_SUPPLYROOM);
+			if(sencondSupplyrooms != null){
+				for(SupplyRoomConfig supplyRoomConfig : sencondSupplyrooms){
+					if(StringUtils.isNotBlank(supplyRoomConfig.getOrgUnitName())){
+						supplyRoomNameSet.add(supplyRoomConfig.getOrgUnitName());
+					}
+				}
+			}
 			for (RecyclingRecord record : recyclingRecords) {
 				List<RecyclingItem> itemList = record.getItems();
 				for (RecyclingItem tousseItem : itemList) {
@@ -2862,7 +2874,7 @@
 						// 资产归属
 						String assetsBelong = td.getAssetsBelong(objectDao);
 						if(gys.equals(departType)){
-							if(gys.equals(assetsBelong) || StringUtils.isBlank(assetsBelong)){
+							if(StringUtils.isBlank(assetsBelong) || supplyRoomNameSet.contains(assetsBelong)){
 								isQueryPackage = true;
 							}
 						}else if(sss.equals(departType) && sss.equals(assetsBelong)){