Index: ssts-web/src/main/webapp/homepage/menu.jsp
===================================================================
diff -u -r40042 -r40044
--- ssts-web/src/main/webapp/homepage/menu.jsp	(.../menu.jsp)	(revision 40042)
+++ ssts-web/src/main/webapp/homepage/menu.jsp	(.../menu.jsp)	(revision 40044)
@@ -98,7 +98,7 @@
 </operation:authorize>
 
 var System_DBManage = true;
-<authz:authorize ifAnyGranted="ROLE_ADMINISTRATOR">
+<authz:authorize access="hasAnyAuthority('ROLE_ADMINISTRATOR')">
 System_DBManage = false;
 </authz:authorize>
 
@@ -1190,7 +1190,7 @@
  * 《使用记录》菜单(启用科室使用记录配置项,该菜单名为病人使用记录)
  */
 var SSTS_UseRecord_Menu = true;
-<operation:authorize ifAnyGranted="SSTS_UseRecord_SeeAll,SSTS_UseRecord_SeeAllDepart,SSTS_UseRecord_Convert,SSTS_UseRecord_Review,SSTS_UseRecord_Create,SSTS_UseRecord_Update,SSTS_UseRecord_Select,SSTS_UseRecord_Delete,SSTS_ScheduleExpeditedOfUseRecord_Manager,SSTS_ScheduleExpeditedOfUseRecord_GroupSetting_Manager,SSTS_ScheduleExpeditedOfUseRecord_GroupSetting_list">
+<operation:authorize ifAnyGranted="SSTS_UseRecord_SeeAll,SSTS_UseRecord_SeeAllDepart,SSTS_UseRecord_Convert,SSTS_UseRecord_Review,SSTS_UseRecord_Create,SSTS_UseRecord_Update,SSTS_UseRecord_Select,SSTS_UseRecord_Delete,SSTS_ScheduleExpeditedOfUseRecord_Manager">
 	if (!sstsConfig.disableUseRecord && !notInWhiteList(sstsConfig, 'useRecord')) {
 		SSTS_UseRecord_Menu = false;
 	}
@@ -1215,17 +1215,7 @@
 		SSTS_ScheduleExpeditedOfUseRecord_Manager = false
 	}
 </operation:authorize>
-
 /**
- * 《GDSRMYY-623：预约加急分组设置》菜单
- */
-var SSTS_ScheduleExpeditedOfUseRecord_GroupSetting_Manager = true;
-<operation:authorize ifAnyGranted="SSTS_ScheduleExpeditedOfUseRecord_GroupSetting_Manager,SSTS_ScheduleExpeditedOfUseRecord_GroupSetting_list">
-	if(sstsConfig.enableScheduleExpeditedOfUseRecord){
-		SSTS_ScheduleExpeditedOfUseRecord_GroupSetting_Manager = false
-	}
-</operation:authorize>
-/**
  * 《质量监测管理》总菜单
  */
 var SSTS_QualityRecord_Menu = true;
@@ -1999,16 +1989,6 @@
 </operation:authorize>
 
 /**
- * 《GZSZYY-107：设备维护分组设置》权限
- */
- var SSTS_DeviceMaintenanceCusGroup_manager = true;
-<operation:authorize ifAnyGranted="SSTS_DeviceMaintenanceCusGroup_manager">
-	if(sstsConfig.enableGroupManagementOfDeviceMaintenanceFunction){
-		SSTS_DeviceMaintenanceCusGroup_manager = false
-	}
-</operation:authorize>
-
-/**
  * 《灭菌目的设置管理》权限
  */
 var SSTS_SterilizationPurpose_manager = true;
@@ -2578,23 +2558,11 @@
 </operation:authorize>
 
 
-/**
- * 《DGSETYY-108:默认定期监测管理查看》权限
- */
-var SSTS_RoutineMonitoring_DefaultSelect = true;
-<operation:authorize ifAnyGranted="SSTS_RoutineMonitoring_DefaultSelect">
-	if(sstsConfig.enableDefaultQualityMonitoringDefinitionAlerts){
-		SSTS_RoutineMonitoring_DefaultSelect = false
-	}
-</operation:authorize>
-
-
 var SSTS_routineMonitoring_manager = true;
-<operation:authorize ifAnyGranted="SSTS_RoutineMonitoring_Create,SSTS_RoutineMonitoring_Update,SSTS_RoutineMonitoring_Select,SSTS_RoutineMonitoring_Delete,SSTS_RoutineMonitoring_Review,SSTS_RoutineMonitoring_DefaultSelect">
+<operation:authorize ifAnyGranted="SSTS_RoutineMonitoring_Create,SSTS_RoutineMonitoring_Update,SSTS_RoutineMonitoring_Select,SSTS_RoutineMonitoring_Delete,SSTS_RoutineMonitoring_Review">
 SSTS_routineMonitoring_manager = false;
 </operation:authorize>
 
-
 /**
  * 《导入基础数据管理》权限
  */
@@ -2863,8 +2831,7 @@
 && SSTS_DiposableGoodsType_manager && SSTS_Container && SSTS_Supplier && SSTS_CleanMethod && SSTS_Rinser && SSTS_Sterilisation 
 && SSTS_Sterilizer && SSTS_Bioreader && SSTS_Expiration && SSTS_SerialNumber_manager && SSTS_ImportBaseData_manager && SSTS_IPAndOrgUnitMapping 
 && SSTS_GoodsBindingConfig && SSTS_GoodsFilterConfig && SSTS_Tousse && SSTS_Damage && SSTS_TousseGroup && SSTS_UrgentLevel_manager
-&& SSTS_OperationRoom_manager && SSTS_equipment_manager && SSTS_DiposableGoodsSummary_manager && SSTS_ChineseMedicineApparatus_manager
-&& SSTS_DeviceMaintenanceCusGroup_manager;
+&& SSTS_OperationRoom_manager && SSTS_equipment_manager && SSTS_DiposableGoodsSummary_manager && SSTS_ChineseMedicineApparatus_manager;
 
 var enableSurgicalInstrumentsManagement = false;
 if (sstsConfig.enableSurgicalInstrumentsManagement) {