Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/service/UrgentLevelManagerImpl.java
===================================================================
diff -u -r31168 -r31181
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/service/UrgentLevelManagerImpl.java	(.../UrgentLevelManagerImpl.java)	(revision 31168)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/service/UrgentLevelManagerImpl.java	(.../UrgentLevelManagerImpl.java)	(revision 31181)
@@ -14,6 +14,7 @@
 
 import com.forgon.Constants;
 import com.forgon.disinfectsystem.basedatamanager.urgent.vo.UrgentLevelVo;
+import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
 import com.forgon.disinfectsystem.entity.tousseitem.TousseItem;
 import com.forgon.disinfectsystem.entity.urgent.UrgentLevel;
@@ -209,7 +210,13 @@
 	
 	@Override
 	public List<UrgentLevel> getAllExceptVoluntarily() {
-		String condition = "enable='" + Constants.STR_YES + "' and id not in (select src.urgentLevel.id from SupplyRoomConfig src where src.supplyRoomType = 0) order by grade asc";
-		return getByHql(condition);
+		List<UrgentLevel> list = getAllExceptDisabled();
+		SupplyRoomConfig supplyRoomConfig = (SupplyRoomConfig) objectDao.getByProperty(
+				SupplyRoomConfig.class.getSimpleName(), "supplyRoomType",
+				SupplyRoomConfig.SUPPLYROOM_TYPE_SYSTEM_CONFIG);
+		if(supplyRoomConfig != null && supplyRoomConfig.getUrgentLevel() != null){
+			list.remove(supplyRoomConfig.getUrgentLevel());
+		}
+		return list;
 	}
 }