Index: ssts-web/src/main/webapp/homepage/menu.jsp
===================================================================
diff -u -r22051 -r22147
--- ssts-web/src/main/webapp/homepage/menu.jsp	(.../menu.jsp)	(revision 22051)
+++ ssts-web/src/main/webapp/homepage/menu.jsp	(.../menu.jsp)	(revision 22147)
@@ -1108,23 +1108,23 @@
 /**
  * 《高值耗材管理》菜单
  */
-var SSTS_ExpensiveGoods_Menu = true;
+var SSTS_ExpensiveGoods_Hidden_Menu = true;
 <operation:authorize ifAnyGranted="SSTS_ExpensiveGoods_Create,SSTS_ExpensiveGoods_Update,SSTS_ExpensiveGoods_Select,SSTS_ExpensiveGoods_Delete,SSTS_ExpensiveGoodsPurchaseGodownEntry_Manager,SSTS_ExpensiveGoodsPrepareGodownEntry_Manager">
 	if (!notInWhiteList(sstsConfig, 'expensiveGoodsManage') && sstsConfig.enableExpensiveGoods) {
-		SSTS_ExpensiveGoods_Menu = false;
+		SSTS_ExpensiveGoods_Hidden_Menu = false;
 	}
 </operation:authorize>
 
 //高值耗材自购入库管理
-var SSTS_ExpensiveGoodsPurchaseGodownEntry_Manager = true;
+var SSTS_ExpensiveGoodsPurchaseGodownEntry_Hidden_Manager = true;
 <operation:authorize ifAnyGranted="SSTS_ExpensiveGoodsPurchaseGodownEntry_Manager">
-SSTS_ExpensiveGoodsPurchaseGodownEntry_Manager = false;
+SSTS_ExpensiveGoodsPurchaseGodownEntry_Hidden_Manager = false;
 </operation:authorize>
 
 //高值耗材预入库管理
-var SSTS_ExpensiveGoodsPrepareGodownEntry_Manager = true;
+var SSTS_ExpensiveGoodsPrepareGodownEntry_Hidden_Manager = true;
 <operation:authorize ifAnyGranted="SSTS_ExpensiveGoodsPrepareGodownEntry_Manager">
-SSTS_ExpensiveGoodsPrepareGodownEntry_Manager = false;
+SSTS_ExpensiveGoodsPrepareGodownEntry_Hidden_Manager = false;
 </operation:authorize>
 
 /* 高值耗材 */
Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r22146 -r22147
--- ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 22146)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 22147)
@@ -329,30 +329,30 @@
 },{
 	text:"高值耗材管理",
 	singleClickExpand:singleClickExpandTree,
-	hidden:SSTS_ExpensiveGoods_Menu,
+	hidden:SSTS_ExpensiveGoods_Hidden_Menu,
 	children:[
-        {hidden :SSTS_ExpensiveGoods_Menu,text:"高值耗材管理",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsView.jsp',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_ExpensiveGoods_Menu,text:"导入高值耗材",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/importExpensiveGoods.mhtml',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_ExpensiveGoods_Menu,text:"高值耗材实例列表",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsInstanceView.jsp',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_ExpensiveGoods_Menu,text:"高值耗材库存",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsStockView.jsp',hrefTarget:linkTarget,leaf:true},
-        //{hidden :SSTS_ExpensiveGoods_Menu,text:"高值耗材出入库记录",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/storageRecordView.jsp',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_ExpensiveGoods_Menu && SSTS_ExpensiveGoodsPurchaseGodownEntry_Manager,text:"高值耗材自购入库单管理",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.jsp?entryType=' + entryTypePurchase,hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_ExpensiveGoods_Menu && SSTS_ExpensiveGoodsPrepareGodownEntry_Manager,text:"高值耗材预入库单管理",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.jsp?entryType=' + entryTypePrepareIn,hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_ExpensiveGoods_Menu,text:"高值耗材退库单管理",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownOutEntryView.jsp',hrefTarget:linkTarget,leaf:true},
-        //{hidden :SSTS_ExpensiveGoods_Menu,text:"高值耗材调拨单管理",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/appropriationView.jsp',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_ExpensiveGoods_Menu,text:"高值耗材盘盈盘亏管理",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownStockTakeView.jsp',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_ExpensiveGoods_Menu,text:"高值耗材盘点管理",href:WWWROOT+'/disinfectsystem/stocktakerecordmanager/inventoryrecordView.jsp'+'?type=' + inventoryTypeCodeExpensiveGoods,hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_ExpensiveGoods_Menu,text:"高值耗材结算管理",href:WWWROOT+'/disinfectsystem/reportforms/stocktakeView.jsp',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_ExpensiveGoods_Menu,text:"高值耗材发票管理",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/expensiveGoodsBillView.jsp',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_ExpensiveGoods_Menu,text:"高值耗材授权管理",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsAuthorizationView.jsp',hrefTarget:linkTarget,leaf:true}
+        {hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"高值耗材管理",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"导入高值耗材",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/importExpensiveGoods.mhtml',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"高值耗材实例列表",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsInstanceView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"高值耗材库存",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsStockView.jsp',hrefTarget:linkTarget,leaf:true},
+        //{hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"高值耗材出入库记录",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/storageRecordView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_ExpensiveGoods_Hidden_Menu || SSTS_ExpensiveGoodsPurchaseGodownEntry_Hidden_Manager,text:"高值耗材自购入库单管理",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.jsp?entryType=' + entryTypePurchase,hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_ExpensiveGoods_Hidden_Menu || SSTS_ExpensiveGoodsPrepareGodownEntry_Hidden_Manager,text:"高值耗材预入库单管理",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.jsp?entryType=' + entryTypePrepareIn,hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"高值耗材退库单管理",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownOutEntryView.jsp',hrefTarget:linkTarget,leaf:true},
+        //{hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"高值耗材调拨单管理",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/appropriationView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"高值耗材盘盈盘亏管理",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownStockTakeView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"高值耗材盘点管理",href:WWWROOT+'/disinfectsystem/stocktakerecordmanager/inventoryrecordView.jsp'+'?type=' + inventoryTypeCodeExpensiveGoods,hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"高值耗材结算管理",href:WWWROOT+'/disinfectsystem/reportforms/stocktakeView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"高值耗材发票管理",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/expensiveGoodsBillView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"高值耗材授权管理",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsAuthorizationView.jsp',hrefTarget:linkTarget,leaf:true}
     ]
 },{
 	text:"采购计划",
 	singleClickExpand:singleClickExpandTree,
 	hidden:SSTS_PurchasePlan_Manager,
 	children:[
         {hidden :SSTS_PurchasePlan_Manager,text:"采购计划",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/goodPurchasePlanView.jsp',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_ExpensiveGoods_Menu,text:"高值耗材采购计划",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/expensiveGoodPurchasePlanView.jsp',hrefTarget:linkTarget,leaf:true}
+        {hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"高值耗材采购计划",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/expensiveGoodPurchasePlanView.jsp',hrefTarget:linkTarget,leaf:true}
     ]
 },{
 	text:"器械仓库管理",
@@ -649,10 +649,10 @@
             {hidden :SSTS_PackType_manager,text:"包装类型设置",href:WWWROOT+'/systemmanage/httpOptionByValue.mhtml?listId=packType',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_Tousse_Update,text:"器械包重量设置",href:encodeURI(WWWROOT+'/systemmanage/httpOption.mhtml?listId=tousseWeight&optionName=器械包重量设置'),hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_DiposableGoodsType_manager,text:"一次性物品类型设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=diposableGoodsType',hrefTarget:linkTarget,leaf:true},
-            {hidden :SSTS_ExpensiveGoods_Menu,text:"高值耗材类型设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=expensiveGoodsType',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"高值耗材类型设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=expensiveGoodsType',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_Container,text:"容器管理",href:WWWROOT+'/disinfectsystem/basedatamanager/container/containerView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_Supplier,text:"供应商管理",href:WWWROOT+'/disinfectsystem/basedatamanager/supplier/supplierView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
-            {hidden :SSTS_ExpensiveGoods_Menu,text:"高值耗材供应商管理",href:WWWROOT+'/disinfectsystem/basedatamanager/supplier/expensiveGoodsSupplierView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"高值耗材供应商管理",href:WWWROOT+'/disinfectsystem/basedatamanager/supplier/expensiveGoodsSupplierView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_SupplyRoomType_manager,text:"条码信息",href:WWWROOT+'/disinfectsystem/basedatamanager/barcodeInformation/barcodeInformation.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :!((sstsConfig.hasOwnProperty('haveRinserPosition')) && sstsConfig.haveRinserPosition),text:"位置管理",href:WWWROOT+'/disinfectsystem/basedatamanager/position/positionView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_CleanMethod,text:"清洗程序管理",href:WWWROOT+'/disinfectsystem/basedatamanager/cleanmethod/cleanMethodView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
@@ -673,8 +673,8 @@
             {hidden :SSTS_GoodsFilterConfig,text:"物品黑白名单过滤设置",href:WWWROOT+'/disinfectsystem/goodFilterConfig/goodFilterTemplate.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_UrgentLevel_manager,text:"加急级别管理",href:WWWROOT+'/disinfectsystem/basedatamanager/urgentLevel/urgentLevelView.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_OperationRoom_manager,text:"手术间管理",href:WWWROOT+'/disinfectsystem/basedatamanager/operationRoom/operationRoom.jsp',hrefTarget:linkTarget,leaf:true},
-            {hidden :SSTS_ExpensiveGoods_Menu,text:"流程定义管理",href:WWWROOT+'/systemmanage/workFlow/workFlow.jsp',hrefTarget:linkTarget,leaf:true},
-            {hidden :SSTS_ExpensiveGoods_Menu,text:"待办任务",href:WWWROOT+'/systemmanage/workFlow/workFlowApprovalTask.jsp',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"流程定义管理",href:WWWROOT+'/systemmanage/workFlow/workFlow.jsp',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"待办任务",href:WWWROOT+'/systemmanage/workFlow/workFlowApprovalTask.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_UsedDoctor_manager,text:"常用医生设置",href:WWWROOT+'/disinfectsystem/basedatamanager/commonlyUsedDoctor/comUsedDoctorView.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_SupplyRoomType_manager,text:"科室供应室设置",href:WWWROOT+'/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}