Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
===================================================================
diff -u -r17205 -r17295
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java	(.../SupplyRoomConfigAction.java)	(revision 17205)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java	(.../SupplyRoomConfigAction.java)	(revision 17295)
@@ -18,6 +18,7 @@
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.log4j.Logger;
@@ -1044,17 +1045,28 @@
 		List<SupplyRoomConfig> supplyRoomConfigList = new ArrayList<SupplyRoomConfig>();
 		String jsonStr = null;
 		//获取1级供应室
-		if(type.equals("1")){
-			supplyRoomConfigList.add(supplyRoomConfigManager
-					.getFirstSupplyRoomConfig());
-		}else if(type.equals("2")){
-			supplyRoomConfigList.addAll(supplyRoomConfigManager
-					.getSupplyRoomList(SupplyRoomConfig.SUPPLYROOM_TYPE_2));
+		if(StringUtils.equals(String.valueOf(SupplyRoomConfig.SUPPLYROOM_TYPE_1) , type)){
+			SupplyRoomConfig firstSupplyRoomConfig = supplyRoomConfigManager.getFirstSupplyRoomConfig();
+			if(firstSupplyRoomConfig != null){
+				supplyRoomConfigList.add(firstSupplyRoomConfig);
+			}
+		}else if(StringUtils.equals(String.valueOf(SupplyRoomConfig.SUPPLYROOM_TYPE_2) , type)){
+			List<SupplyRoomConfig> secondSupplyRoomConfigList = supplyRoomConfigManager
+			.getSupplyRoomList(SupplyRoomConfig.SUPPLYROOM_TYPE_2);
+			if(CollectionUtils.isNotEmpty(secondSupplyRoomConfigList)){
+				supplyRoomConfigList.addAll(secondSupplyRoomConfigList);
+			}
 		}else{//获取1级和2级供应室
-			supplyRoomConfigList.add(supplyRoomConfigManager
-					.getFirstSupplyRoomConfig());
-			supplyRoomConfigList.addAll(supplyRoomConfigManager
-					.getSupplyRoomList(SupplyRoomConfig.SUPPLYROOM_TYPE_2));
+			SupplyRoomConfig firstSupplyRoomConfig = supplyRoomConfigManager.getFirstSupplyRoomConfig();
+			if(firstSupplyRoomConfig != null){
+				supplyRoomConfigList.add(firstSupplyRoomConfig);
+			}
+			
+			List<SupplyRoomConfig> secondSupplyRoomConfigList = supplyRoomConfigManager
+					.getSupplyRoomList(SupplyRoomConfig.SUPPLYROOM_TYPE_2);
+			if(CollectionUtils.isNotEmpty(secondSupplyRoomConfigList)){
+				supplyRoomConfigList.addAll(secondSupplyRoomConfigList);
+			}
 		}
 		JSONArray jsonArray = supplyRoomConfigListToJSONArray(supplyRoomConfigList);
 		StrutsResponseUtils.output(jsonArray);
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
===================================================================
diff -u -r16994 -r17295
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java	(.../SupplyRoomConfigManagerImpl.java)	(revision 16994)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java	(.../SupplyRoomConfigManagerImpl.java)	(revision 17295)
@@ -479,8 +479,8 @@
 	public boolean isFirstSupplyRoomOrgUnit(String orgUnitCoding){
 		boolean isFirstSupplyRoomOrgUnit = false;
 		SupplyRoomConfig firstSupplyRoom = getFirstSupplyRoomConfig();
-		String unitCodeOfFirstSupplyRoom = firstSupplyRoom
-				.getOrgUnitCoding();
+		String unitCodeOfFirstSupplyRoom = firstSupplyRoom != null ? firstSupplyRoom
+				.getOrgUnitCoding() : null;
 		if (StringUtils.isNotBlank(orgUnitCoding)) {
 			if (orgUnitCoding.equals(unitCodeOfFirstSupplyRoom)) {
 				isFirstSupplyRoomOrgUnit = true;