Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
===================================================================
diff -u -r29301 -r29309
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java	(.../SupplyRoomConfigAction.java)	(revision 29301)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java	(.../SupplyRoomConfigAction.java)	(revision 29309)
@@ -1106,6 +1106,8 @@
 		String withoutBaseOrg = StrutsParamUtils.getPraramValue(
 				"withoutBaseOrg", "true");
 		String showDisableOrgUnit = StrutsParamUtils.getPraramValue("showDisableOrgUnit", "true");
+		//GDSZYY-19消息发布的科室范围限制为只能选择申领科室以及一、二级供应室
+		String searchSupplyRoom = StrutsParamUtils.getPraramValue("searchSupplyRoom", "false");
 		List<OrgUnit> orgUnitList = new ArrayList<OrgUnit>();
 		
 		//如果指定了要加载哪个科室，则直接返回即可
@@ -1119,6 +1121,20 @@
 		} else {
 			orgUnitList = orgUnitManager
 					.searchOrgUnitByRoomTypeSpellOrWbCode(spell, SupplyRoomConfig.SUPPLYROOM_TYPE_APPLY, true, Boolean.valueOf(showDisableOrgUnit));
+			if(Boolean.valueOf(searchSupplyRoom)){
+				List<OrgUnit> firstSupplyRooms = orgUnitManager
+						.searchOrgUnitByRoomTypeSpellOrWbCode(spell, SupplyRoomConfig.SUPPLYROOM_TYPE_FIRST_SUPPLYROOM, true, Boolean.valueOf(showDisableOrgUnit));
+				if(CollectionUtils.isNotEmpty(firstSupplyRooms)){
+					orgUnitList.removeAll(firstSupplyRooms);
+					orgUnitList.addAll(firstSupplyRooms);
+				}
+				List<OrgUnit> secondSupplyRooms = orgUnitManager
+						.searchOrgUnitByRoomTypeSpellOrWbCode(spell, SupplyRoomConfig.SUPPLYROOM_TYPE_SECOND_SUPPLYROOM, true, Boolean.valueOf(showDisableOrgUnit));
+				if(CollectionUtils.isNotEmpty(secondSupplyRooms)){
+					orgUnitList.removeAll(secondSupplyRooms);
+					orgUnitList.addAll(secondSupplyRooms);
+				}
+			}
 		}
 		
 		List<Map<String, Object>> list = new LinkedList<>();