Index: ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/menu/menuconfigure.js
===================================================================
diff -u -r32132 -r32134
--- ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/menu/menuconfigure.js	(.../menuconfigure.js)	(revision 32132)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/menu/menuconfigure.js	(.../menuconfigure.js)	(revision 32134)
@@ -1,12 +1,21 @@
 var linkTarget = 'mainFrame';
 var singleClickExpandTree=true;
+var viewport = '';
 //是否禁用虚拟篮筐(未启用disableLoadToVirtualBasket配置项目或该配置项的值为true时,则禁用,否则启用虚拟篮筐)
 var disableLoadToVirtualBasket = true;
 var url = WWWROOT+'/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980';
 var qualityMonthViewName = "质量监测项统计月报";
 if(sstsConfig.hasOwnProperty('isQualityMonthViewSpecial') && sstsConfig.isQualityMonthViewSpecial){
 	qualityMonthViewName = "质量监测项统计分析报表";
 }
+var hasForeignTousseSizeSetting = false;
+if(sstsConfig.hasOwnProperty('foreignTousseSizeSetting')){
+	hasForeignTousseSizeSetting = true;
+}
+var enableOperatingRoomInstrumentSetUsageAndApportionmentExpenseReport = false;
+if(sstsConfig.hasOwnProperty('enableOperatingRoomInstrumentSetUsageAndApportionmentExpenseReport') && sstsConfig.enableOperatingRoomInstrumentSetUsageAndApportionmentExpenseReport){
+	enableOperatingRoomInstrumentSetUsageAndApportionmentExpenseReport = true;
+}
 var isDeviceMaintenanceCus = false;
 if(sstsConfig.hasOwnProperty('isDeviceMaintenanceCus') && sstsConfig.isDeviceMaintenanceCus){
 	isDeviceMaintenanceCus = true;
@@ -26,7 +35,9 @@
 	}
 }
 
-DisinfectsystemTreeData =[{
+//高级视图-消毒供应管理树型目录菜单数组(更换为数组格式,以便于方便以后有新菜单需求插入到中间)
+var DisinfectsystemTreeData = [];
+DisinfectsystemTreeData.push({
 	text:"科室申领",
 	singleClickExpand:singleClickExpandTree,
 	hidden:SSTS_RecycApplication_Folder,
@@ -39,7 +50,8 @@
         {hidden :SSTS_Invoice_Sign,text:"物品签收",leaf:true}
 		
     ]
-},{
+});
+DisinfectsystemTreeData.push({
 	text:"回收清点",
 	singleClickExpand:singleClickExpandTree,
 	hidden:SSTS_RecycRecord_Menu,
@@ -53,48 +65,62 @@
         }},
         {hidden :SSTS_RecycRecord_Menu,text:"器械交接",href:WWWROOT+'/disinfectsystem/recycle/tousseTransition/tousseTransitionView.jsp',hrefTarget:linkTarget,leaf:true}
     ]
-},{
+});
+DisinfectsystemTreeData.push({
 	text:"回收分类",
 	singleClickExpand:singleClickExpandTree,
 	hidden : true,
 	children:[
         {hidden :true,text:"器械分类记录",href:WWWROOT+'/disinfectsystem/becleanitem/becleanitem.jsp',hrefTarget:linkTarget,leaf:true}
     ]
-},{
+});
+DisinfectsystemTreeData.push({
 	text:"清洗消毒",
 	singleClickExpand:singleClickExpandTree,
 	hidden:SSTS_Wash_Menu,
 	children:[
         {hidden :SSTS_WashRecord_Menu,text:"清洗消毒记录",href:WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_WashTransitionRecord_Menu,text:"清洗交接记录",href:WWWROOT+'/disinfectsystem/washanddisinfectmanager/washTransitionRecord/washTransitionRecordView.jsp?',hrefTarget:linkTarget,leaf:true}
   ]
-}];
+});
 
-var index = DisinfectsystemTreeData.length;
-
-DisinfectsystemTreeData[4] = {
+//装配菜单位于消毒供应管理的索引位置
+var packingMenuIndexOfDisinfectsystemTree = DisinfectsystemTreeData.length;
+DisinfectsystemTreeData.push({
 	text:"装配管理",
 	singleClickExpand:singleClickExpandTree,
 	hidden:SSTS_Packing_Manager,
 	children:[]
-};
-
-DisinfectsystemTreeData[5] = {
-	text:"审核打包",
+});
+var reviewViewText;
+var reviewViewText2;
+if(sstsConfig.nameSchemeOfReviewModule == 2){
+	reviewViewText = "包装管理";
+	reviewViewText2 = "包装";
+}else{
+	reviewViewText = "审核打包";
+	reviewViewText2 = "审核";
+}
+//审核菜单位于消毒供应管理的索引位置
+var reviewMenuIndexOfDisinfectsystemTree = DisinfectsystemTreeData.length;
+DisinfectsystemTreeData.push({
+	text:reviewViewText,
 	singleClickExpand:singleClickExpandTree,
 	hidden:SSTS_Tousse_Review_Manager,
 	children:[]
-};
+});
 
-DisinfectsystemTreeData[6] = {
+//灭菌菜单位于消毒供应管理的索引位置
+var sterilizationMenuIndexOfDisinfectsystemTree = DisinfectsystemTreeData.length;
+DisinfectsystemTreeData.push({
 	text:"灭菌管理",
 	singleClickExpand:singleClickExpandTree,
 	hidden:SSTS_Sterilization_Manager,
 	children:[
 	    
     ]
-};
-DisinfectsystemTreeData[7] = {
+});
+DisinfectsystemTreeData.push({
 	text:"发货管理",
 	singleClickExpand:singleClickExpandTree,
 	hidden:SSTS_Invoice_Manager,
@@ -106,35 +132,36 @@
         {hidden :SSTS_OperationReservationDelivery_Menu,text:"手术预约汇总发货",href:WWWROOT+'/disinfectsystem/invoice/operationReservationMergeInvoiceView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_CustomDelivery_Manager,text:"自定义发货",href:WWWROOT+'/disinfectsystem/invoice/customInvoiceForm.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_Invoice_Menu,text:"快速发货",href:WWWROOT+'/disinfectsystem/invoice/expressInvoiceView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_Invoice_Menu,text:"科室发货计划设置",href:WWWROOT+'/disinfectsystem/invoice/invoiceDepartmentView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_Invoice_Menu,text:"发货科室分组设置",href:WWWROOT+'/disinfectsystem/invoice/invoiceDepartmentView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_Invoice_Menu,text:"发货单管理",href:WWWROOT+'/disinfectsystem/invoice/invoiceView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_Invoice_Menu,text:"材料发货管理",href:WWWROOT+'/disinfectsystem/invoice/materialInvoiceView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
         {hidden :true,text:"发货单批量打印",href:WWWROOT+'/disinfectsystem/invoice/invoicePrintView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_DeliverGoodsQuqery,text:"发货物品查询",href:WWWROOT+'/disinfectsystem/reportforms/invoiceQueryView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_OperationReservationInvoice,text:"手术排班物品查询",href:WWWROOT+'/disinfectsystem/reportforms/operationReservationInvoiceView.jsp?',hrefTarget:linkTarget,leaf:true}
     ]
-};
+});
 
-DisinfectsystemTreeData[8] = {
+DisinfectsystemTreeData.push({
 	text:"使用记录",
 	singleClickExpand:singleClickExpandTree,
-	hidden:SSTS_UseRecord_Menu,
+	hidden:SSTS_UseRecord_Menu && SSTS_DepartmentUseRecord_Menu,
 	children:[
-        {hidden :SSTS_UseRecord_Menu,text:"使用记录",href:WWWROOT+'/disinfectsystem/useRecord/useRecordView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}
+        {hidden :SSTS_UseRecord_Menu,text:sstsConfig.enableDepartmentUseRecord ? "病人使用记录" : "使用记录",href:WWWROOT+'/disinfectsystem/useRecord/useRecordView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_DepartmentUseRecord_Menu,text:"科室使用记录",href:WWWROOT+'/disinfectsystem/useRecord/useRecordView.jsp?departmentUseRecord=true',hrefTarget:linkTarget,leaf:true}
     ]
-};
+});
 
-DisinfectsystemTreeData[9] = {
+DisinfectsystemTreeData.push({
 		text:"器械包返消",
 		singleClickExpand:singleClickExpandTree,
 		hidden:SSTS_TousseReturnDisinfect_Menu,
 		children:[
 	        {hidden :SSTS_TousseReturnDisinfect_Menu,text:"器械包返消",href:WWWROOT+'/disinfectsystem/tousseReturnDisinfect/tousseReturnDisinfectView.jsp',hrefTarget:linkTarget,leaf:true},
 	        {hidden :SSTS_TousseReturnDisinfectionReport,text:"器械包返消统计报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseReturnDisinfectionView.jsp',hrefTarget:linkTarget,leaf:true}
 	    ]
-	};
+});
 
-DisinfectsystemTreeData[10] = {
+DisinfectsystemTreeData.push({
 	text:"满意度调查",
 	singleClickExpand:singleClickExpandTree,
 	hidden:SSTS_SatisfactionSurvey_Menu,
@@ -143,8 +170,8 @@
         {hidden :SSTS_SatisfactionSurveyTable_Menu,text:"满意度调查表",href:WWWROOT+'/disinfectsystem/satisfactionsurvey/satisfactionSurveyTableView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_SatisfactionSurveyTemplate_Menu,text:"满意度调查报表",href:WWWROOT+'/disinfectsystem/reportforms/departSatisfyView.jsp',hrefTarget:linkTarget,leaf:true}
     ]
-};
-DisinfectsystemTreeData[11] = {
+});
+DisinfectsystemTreeData.push({
 	text:"运作监控管理",
 	singleClickExpand:singleClickExpandTree,
 	hidden:SSTS_supplyRoomOperate_View,
@@ -153,24 +180,43 @@
         {hidden :SSTS_supplyRoomOperate_Menu,text:"消毒供应中心未完成工作列表",href:WWWROOT+'/homepage/supplyRoomUnfinishedWork.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_TousseOperateCountReport,text:"科室运作监控",href:WWWROOT+'/disinfectsystem/reportforms/tousseOperate.jsp',hrefTarget:linkTarget,leaf:true}
     ]
-};
-DisinfectsystemTreeData[12] = {
-		text:"档案管理",
-		singleClickExpand:singleClickExpandTree,
-		hidden:(!sstsConfig.hasOwnProperty('hideStaffArchive')) || sstsConfig.hideStaffArchive || SSTS_StaffArchive_Menu,
-		children:[
-	        {hidden :SSTS_StaffArchive_Menu,text:"人员档案管理",href:WWWROOT+'/disinfectsystem/staffArchives/staffArchiveView.jsp',hrefTarget:linkTarget,leaf:true}
-	    ]
-	};
-DisinfectsystemTreeData[13] = {
-		text:"培训管理",
-		singleClickExpand:singleClickExpandTree,
-		hidden:SSTS_TrainingManage_Menu,
-		children:[
-	        {hidden :SSTS_TrainingManage_Menu,text:"培训管理",href:WWWROOT+'/knowledge/view.do?moduleId=trainingManage',hrefTarget:linkTarget,leaf:true}
-	    ]
-	};
+});
+DisinfectsystemTreeData.push({
+	text:"档案管理",
+	singleClickExpand:singleClickExpandTree,
+	hidden:(!sstsConfig.hasOwnProperty('hideStaffArchive')) || sstsConfig.hideStaffArchive || SSTS_StaffArchive_Menu,
+	children:[
+        {hidden :SSTS_StaffArchive_Menu,text:"人员档案管理",href:WWWROOT+'/disinfectsystem/staffArchives/staffArchiveView.jsp',hrefTarget:linkTarget,leaf:true}
+    ]
+});
+DisinfectsystemTreeData.push({
+	text:"培训管理",
+	singleClickExpand:singleClickExpandTree,
+	hidden:SSTS_TrainingManage_Menu,
+	children:[
+        {hidden :SSTS_TrainingManage_Menu,text:"培训管理",href:WWWROOT+'/knowledge/view.do?moduleId=trainingManage',hrefTarget:linkTarget,leaf:true}
+    ]
+});
+DisinfectsystemTreeData.push({
+	text:"收费记录管理",
+	singleClickExpand:singleClickExpandTree,
+	hidden:SSTS_chargeRecordManage_MENU,
+	children:[
+	    {hidden :SSTS_chargeRecordManage_MENU,text:"收费记录管理",href:WWWROOT+'/disinfectsystem/chargeRecord/chargeRecord.jsp',hrefTarget:linkTarget,leaf:true}
+	]
+});
+DisinfectsystemTreeData.push({
+	text:"库位管理",
+	singleClickExpand:singleClickExpandTree,
+	hidden:SSTS_storageLocationManager && SSTS_storageLocationLook && SSTS_tousseAccess,
+	children:[ 
+		   {hidden :SSTS_storageLocationManager,text:"库位管理",href:WWWROOT+'/disinfectsystem/storageLocationManage/storageLocationManageView.jsp',hrefTarget:linkTarget,leaf:true},
+		   {hidden :SSTS_storageLocationLook,text:"库存查看",href:WWWROOT+'/disinfectsystem/storageLocationManage/storageLocationLookView.jsp',hrefTarget:linkTarget,leaf:true},
+		   {hidden :SSTS_tousseAccess,text:"物品存取",href:WWWROOT+'/disinfectsystem/storageLocationManage/goodsAccess.jsp',hrefTarget:linkTarget,leaf:true}
+    ]
+});
 
+/**设置"装配管理"菜单的下一级子菜单(各任务组装配、自定义装配、历史装配记录)、"审核打包"菜单的下一级子菜单(各任务组) begin */
 DWREngine.setAsync(false);
 PackingTableManager.getAllTaskGroup(setTaskGroup);
 function setTaskGroup(taskGroup){
@@ -181,32 +227,35 @@
 		link1.href = encodeURI(WWWROOT+'/disinfectsystem/packing/packingView.jsp?taskGroup='+taskGroup[i]);
 		link1.hrefTarget = linkTarget;
 		link1.leaf = true;
-		DisinfectsystemTreeData[4].children[i] = link1;
+		DisinfectsystemTreeData[packingMenuIndexOfDisinfectsystemTree].children[i] = link1;
 		
 		var link2 = new Object();
 		link2.hidden = false;
 		link2.text = taskGroup[i];
 		link2.href = encodeURI(WWWROOT+'/disinfectsystem/packing/reviewView.jsp?taskGroup='+taskGroup[i]);
 		link2.hrefTarget = linkTarget;
 		link2.leaf = true;
-		DisinfectsystemTreeData[5].children[i] = link2;
+		DisinfectsystemTreeData[reviewMenuIndexOfDisinfectsystemTree].children[i] = link2;
 	}
 	var directPackingLink = new Object();
 	directPackingLink.hidden = SSTS_CustomPacking_Manager;
 	directPackingLink.text = '自定义装配';
 	directPackingLink.href = WWWROOT+'/disinfectsystem/packing/directPacking.jsp';
 	directPackingLink.hrefTarget = linkTarget;
 	directPackingLink.leaf = true;
-	DisinfectsystemTreeData[4].children[taskGroup.length] = directPackingLink;
+	DisinfectsystemTreeData[packingMenuIndexOfDisinfectsystemTree].children[taskGroup.length] = directPackingLink;
 	
 	var historyPackingLink = new Object();
 	historyPackingLink.hidden = SSTS_HistoryPacking_Manager;
 	historyPackingLink.text = '历史装配记录';
 	historyPackingLink.href = WWWROOT+'/disinfectsystem/packing/historyPackingView.jsp';
 	historyPackingLink.hrefTarget = linkTarget;
 	historyPackingLink.leaf = true;
-	DisinfectsystemTreeData[4].children[taskGroup.length+1] = historyPackingLink;
+	DisinfectsystemTreeData[packingMenuIndexOfDisinfectsystemTree].children[taskGroup.length+1] = historyPackingLink;
 }
+/**设置"装配管理"菜单的下一级子菜单(各任务组装配、自定义装配、历史装配记录)、"审核打包"菜单的下一级子菜单(各任务组) end */
+
+/**设置"灭菌管理"菜单的下一级子菜单(各灭菌炉组装配、灭菌交接、灭菌物品装载、当天灭菌记录管理、历史灭菌记录管理、代理灭菌管理、外部代理灭菌管理) begin */
 DWREngine.setAsync(true);
 if(sterilerGroupList.length >0){
 	for(var i=0;i<sterilerGroupList.length;i++){
@@ -216,7 +265,7 @@
 		link1.href = encodeURI(WWWROOT+'/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp?editMode=true&type=today&ownGroup='+sterilerGroupList[i]);
 		link1.hrefTarget = linkTarget;
 		link1.leaf = true;
-		DisinfectsystemTreeData[6].children[i] = link1;
+		DisinfectsystemTreeData[sterilizationMenuIndexOfDisinfectsystemTree].children[i] = link1;
 	}
 }
 var sterilizationIndex = sterilerGroupList.length ? sterilerGroupList.length : 0;
@@ -227,50 +276,50 @@
 sterilizationTransition.href = WWWROOT+'/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionView.jsp';
 sterilizationTransition.hrefTarget = linkTarget;
 sterilizationTransition.leaf = true;
-DisinfectsystemTreeData[6].children[sterilizationIndex++] = sterilizationTransition;
+DisinfectsystemTreeData[sterilizationMenuIndexOfDisinfectsystemTree].children[sterilizationIndex++] = sterilizationTransition;
 
 var sterilLoading = new Object();
 sterilLoading.hidden = SSTS_Sterilization_Loading_Menu;
 sterilLoading.text = '灭菌物品装载';
 sterilLoading.href = WWWROOT+'/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingView.jsp';
 sterilLoading.hrefTarget = linkTarget;
 sterilLoading.leaf = true;
-DisinfectsystemTreeData[6].children[sterilizationIndex++] = sterilLoading;
+DisinfectsystemTreeData[sterilizationMenuIndexOfDisinfectsystemTree].children[sterilizationIndex++] = sterilLoading;
 
 var todaySterilingLink = new Object();
 todaySterilingLink.hidden = SSTS_Sterilization_Menu;
 todaySterilingLink.text = '当天灭菌记录管理';
 todaySterilingLink.href = WWWROOT+'/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp?editMode=true&type=today';
 todaySterilingLink.hrefTarget = linkTarget;
 todaySterilingLink.leaf = true;
-DisinfectsystemTreeData[6].children[sterilizationIndex++] = todaySterilingLink;
+DisinfectsystemTreeData[sterilizationMenuIndexOfDisinfectsystemTree].children[sterilizationIndex++] = todaySterilingLink;
 
 var historySterilizationLink = new Object();
 historySterilizationLink.hidden = SSTS_Sterilization_Menu;
 historySterilizationLink.text = '历史灭菌记录管理';
 historySterilizationLink.href = WWWROOT+'/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp?editMode=true';
 historySterilizationLink.hrefTarget = linkTarget;
 historySterilizationLink.leaf = true;
-DisinfectsystemTreeData[6].children[sterilizationIndex++] = historySterilizationLink;
+DisinfectsystemTreeData[sterilizationMenuIndexOfDisinfectsystemTree].children[sterilizationIndex++] = historySterilizationLink;
 
 var ProxyDisinfectionLink = new Object();
 ProxyDisinfectionLink.hidden = SSTS_ProxyDisinfection_Menu;
 ProxyDisinfectionLink.text = '代理灭菌管理';
 ProxyDisinfectionLink.href = WWWROOT+'/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.jsp';
 ProxyDisinfectionLink.hrefTarget = linkTarget;
 ProxyDisinfectionLink.leaf = true;
-DisinfectsystemTreeData[6].children[sterilizationIndex++] = ProxyDisinfectionLink;
+DisinfectsystemTreeData[sterilizationMenuIndexOfDisinfectsystemTree].children[sterilizationIndex++] = ProxyDisinfectionLink;
 
 var foreignSterilizationLink = new Object();
 foreignSterilizationLink.hidden = SSTS_ForeignProxyDisinfection_Menu;
 foreignSterilizationLink.text = '外部代理灭菌管理';
 foreignSterilizationLink.href = WWWROOT+'/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.jsp?editMode=true';
 foreignSterilizationLink.hrefTarget = linkTarget;
 foreignSterilizationLink.leaf = true;
-DisinfectsystemTreeData[6].children[sterilizationIndex++] = foreignSterilizationLink;
+DisinfectsystemTreeData[sterilizationMenuIndexOfDisinfectsystemTree].children[sterilizationIndex++] = foreignSterilizationLink;
+/**设置"灭菌管理"菜单的下一级子菜单(各灭菌炉组装配、灭菌交接、灭菌物品装载、当天灭菌记录管理、历史灭菌记录管理、代理灭菌管理、外部代理灭菌管理) begin */
 
 
-
 ManagementTreeData =[{
 	text:"质量监测管理",
 	singleClickExpand:singleClickExpandTree,
@@ -320,7 +369,7 @@
 	hidden:SSTS_DisposableGoods_Manager,
 	children:[
         {hidden :SSTS_DisposableGoods_Menu,text:"一次性物品管理",href:WWWROOT+'/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.jsp',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_DisposableGoods_Menu,text:"停用一次性物品",href:WWWROOT+'/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.jsp?isDisable=是',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_DisposableGoods_Menu,text:"停用一次性物品",href:WWWROOT+'/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.jsp?isDisable='+encodeURI('是'),hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_DisposableGoods_Menu || !sstsConfig.enableExpensiveDisposableGoods,text:"高值耗材使用记录",href:WWWROOT+'/disinfectsystem/assestManagement/disposableGoods/expensiveDisposableGoodsUseRecordView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_DisposableGoodsStock_Manager,text:"一次性物品库存",href:WWWROOT+'/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_DisposableGoodsStock_Manager || !sstsConfig.enableBatchStockCompare,text:"库存对比",href:WWWROOT+'/disinfectsystem/assestManagement/disposableGoods/batchStockCompare.jsp',hrefTarget:linkTarget,leaf:true},
@@ -329,8 +378,9 @@
         {hidden :SSTS_DisposableGoodsCancellingStocks_Manager,text:"一次性物品退库单管理",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/godownOutView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_DisposableGoodsAllot_Manager,text:"一次性物品调拨单管理",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/appropriationView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_DisposableGoodsProfitAndLoss_Manager,text:"一次性物品盘盈盘亏管理",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/godownStockTakeView.jsp',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_DisposableGoodsCheck_Manager,text:"一次性物品盘点管理",href:WWWROOT+'/disinfectsystem/stocktakerecordmanager/'+ (sstsConfig.inventoryDisposableVersion == 2 ? "inventoryrecordView2.jsp" : "inventoryrecordView.jsp") +'?type=' + inventoryTypeCodeDisposableGoods,hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_DisposableGoodSsettleAccounts_Manager,text:"一次性物品结算管理",href:WWWROOT+'/disinfectsystem/reportforms/stocktakeView.jsp',hrefTarget:linkTarget,leaf:true}
+        {hidden :sstsConfig.enableInventorySettlementFunctionStandarEdition,text:"一次性物品盘点管理",href:WWWROOT+'/disinfectsystem/stocktakerecordmanager/'+ (sstsConfig.inventoryDisposableVersion == 2 ? "inventoryrecordView2.jsp" : "inventoryrecordView.jsp") +'?type=' + inventoryTypeCodeDisposableGoods,hrefTarget:linkTarget,leaf:true},
+		{hidden :!sstsConfig.enableInventorySettlementFunctionStandarEdition,text:"一次性物品月盘点记录",href:WWWROOT+'/disinfectsystem/stocktakerecordmanager/stocktakerecordView.jsp',hrefTarget:linkTarget,leaf:true},
+		{hidden :sstsConfig.enableInventorySettlementFunctionStandarEdition,text:"一次性物品结算管理",href:WWWROOT+'/disinfectsystem/reportforms/stocktakeView.jsp',hrefTarget:linkTarget,leaf:true}
     ]
 },{
 	text:"高值耗材管理",
@@ -383,7 +433,8 @@
         {hidden :SSTS_MaterialGodownEntry_Manager,text:"材料入库管理",href:WWWROOT+'/disinfectsystem/materialmanager/materialEntryView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_MaterialCancellingStocks_Manager,text:"材料退库管理",href:WWWROOT+'/disinfectsystem/materialmanager/materialOutView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_MaterialCheck_Manager,text:"材料盘点管理",href:WWWROOT+'/disinfectsystem/stocktakerecordmanager/inventoryrecordView.jsp?type=' + inventoryTypeCodeMaterial,hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_MaterialAppropriation_Manager,text:"材料调拨管理",href:WWWROOT+'/disinfectsystem/materialmanager/materialAppropriationView.jsp',hrefTarget:linkTarget,leaf:true}
+		{hidden :SSTS_MaterialMonthCheck_list,text:"器械材料月盘点记录",href:WWWROOT+'/disinfectsystem/stocktakerecordmanager/materialCheckView.jsp',hrefTarget:linkTarget,leaf:true},
+		{hidden :SSTS_MaterialAppropriation_Manager,text:"材料调拨管理",href:WWWROOT+'/disinfectsystem/materialmanager/materialAppropriationView.jsp',hrefTarget:linkTarget,leaf:true}
     ]
 },{
 	text:"同步入库单",
@@ -392,26 +443,28 @@
 	children:[
 	     {hidden :sstsConfig.hiddSyncGodownEntryMenu,text:"同步入库单",href:encodeURI(WWWROOT+'/disinfectsystem/datasynchronization/inventory/syncStorageEntry.jsp?type=入库单'),hrefTarget:linkTarget,leaf:true},
 	     {hidden :sstsConfig.hiddSyncGodownOutEntryMenu,text:"同步退库单",href:encodeURI(WWWROOT+'/disinfectsystem/datasynchronization/inventory/syncStorageEntry.jsp?type=退库单'),hrefTarget:linkTarget,leaf:true},
-	     {hidden :sstsConfig.hiddSyncGodownReturnEntryMenu,text:"同步退货单",href:encodeURI(WWWROOT+'/disinfectsystem/datasynchronization/inventory/syncStorageEntry.jsp?type=退货单'),hrefTarget:linkTarget,leaf:true}
-	     //{hidden :sstsConfig.hiddSyncHisMaterialDefinitionMenu,text:"材料同步管理",href:encodeURI(WWWROOT+'/disinfectsystem/basedatamanager/materialDefinition/syncMaterialDefinition.jsp'),hrefTarget:linkTarget,leaf:true}
+	     {hidden :sstsConfig.hiddSyncGodownReturnEntryMenu,text:"同步退货单",href:encodeURI(WWWROOT+'/disinfectsystem/datasynchronization/inventory/syncStorageEntry.jsp?type=退货单'),hrefTarget:linkTarget,leaf:true},
+	     {hidden :sstsConfig.hiddSyncHisMaterialDefinitionMenu,text:"材料同步管理",href:encodeURI(WWWROOT+'/disinfectsystem/basedatamanager/materialDefinition/syncMaterialDefinition.jsp'),hrefTarget:linkTarget,leaf:true}
 
     ]
 },{
 	text:"器械包管理",
 	singleClickExpand:singleClickExpandTree,
 	hidden:SSTS_TousseManagerView,
 	children:[
+		{hidden :SSTS_TousseInstanceType_list,text:"器械包种类定义",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/tousseType.jsp',hrefTarget:linkTarget,leaf:true},
 		{hidden :SSTS_Tousse,text:"器械包定义管理",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/tousseView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
 		{hidden :SSTS_Tousse,text:"停用的器械包",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/tousseView.jsp?editMode=true&onlyShowDisable=yes',hrefTarget:linkTarget,leaf:true},
+		{hidden :SSTS_CustomTousse,text:"自定义器械包管理",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/customTousseDefinitionView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
 		{hidden :SSTS_ForeignTousse_Manage,text:"外来器械包管理",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/foreignTousseView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
 		{hidden :SSTS_ForeignTousse_Manage,text:"停用的外来器械包",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/foreignTousseView.jsp?editMode=true&onlyShowDisable=yes',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_TousseInstanceManager_ViewMenu,text:"器械包信息",href:WWWROOT+'/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_TousseInstanceManager_ViewMenu,text:"标识牌信息",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/idCardInstanceView.jsp',hrefTarget:linkTarget,leaf:true},
+		{hidden :SSTS_TousseInstanceManager_ViewMenu,text:"器械包信息",href:WWWROOT+'/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp',hrefTarget:linkTarget,leaf:true},
+		{hidden :SSTS_TousseInstanceManager_ViewMenu,text:"标识牌信息",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/idCardInstanceView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_Tousse,text:"器械包库存",href:WWWROOT+'/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_TousseMaintain_Manager,text:"器械包保养",href:WWWROOT+'/disinfectsystem/toussemanager/toussemaintain/tousseMaintainView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :!sstsConfig.hasOwnProperty('enableComboTousse') || sstsConfig.enableComboTousse == false || SSTS_ComboTousseManager,text:"聚合包定义管理",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/comboTousse.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_DepartMentTousseManager,text:"基数管理",href:WWWROOT+'/disinfectsystem/departmentStock/departmentStockInputView.jsp',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_BaseAmountinventoryCheck_Manager,text:"基数盘点历史记录",href:WWWROOT+'/disinfectsystem/stocktakerecordmanager/inventoryrecordView.jsp?type='+inventoryTypeCodeBaseAmount,hrefTarget:linkTarget,leaf:true}
+        {hidden :SSTS_BaseAmountinventoryCheck_Manager,text:"基数盘点历史记录",href:WWWROOT+'/disinfectsystem/stocktakerecordmanager/inventoryrecordView.jsp?type='+encodeURI(inventoryTypeCodeBaseAmount),hrefTarget:linkTarget,leaf:true}
     ]
 },{
 	text:"手术仪器管理",
@@ -463,7 +516,7 @@
         {hidden :SSTS_InterfereOrgUnit_ViewMenu,text:"科室干预管理",href:WWWROOT+'/disinfectsystem/interfere/processSameOrgunitName/processSameOrgunitNameData.mhtml',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_InterfereTerminateInvoicePlan_ViewMenu,text:"批量终止申请单管理",href:WWWROOT+'/disinfectsystem/interfere/interfereTerminateInvoicePlanView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_InterfereUeserRecord_ViewMenu,text:"使用记录干预管理",href:WWWROOT+'/disinfectsystem/interfere/interfereUseRecordView.jsp',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_InterfereReviewRecord_ViewMenu,text:"审核器械包干预管理",href:WWWROOT+'/disinfectsystem/interfere/interfereReviewView.jsp',hrefTarget:linkTarget,leaf:true}
+        {hidden :SSTS_InterfereReviewRecord_ViewMenu,text:""+reviewViewText2+"器械包干预管理",href:WWWROOT+'/disinfectsystem/interfere/interfereReviewView.jsp',hrefTarget:linkTarget,leaf:true}
     ]
 },{
 	text:"消毒供应中心物品领用",
@@ -477,9 +530,17 @@
 	singleClickExpand:singleClickExpandTree,
 	hidden:SSTS_MESSAGE_Menu,
 	children:[
-	          {hidden :SSTS_MESSAGE_Menu,text:"消息发布管理",href:WWWROOT+'/disinfectsystem/message/message.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}
-	          ]
+		{hidden :SSTS_MESSAGE_Menu,text:"消息发布管理",href:WWWROOT+'/disinfectsystem/message/message.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}
+	]
 },{
+	text:"科室问题反馈",
+	singleClickExpand:singleClickExpandTree,
+	hidden:sstsConfig.disableDepartmentProblemFeedback?true:SSTS_ProblemReport_Menu,
+	children:[
+		{hidden :sstsConfig.disableDepartmentProblemFeedback?true:SSTS_ProblemReport_Menu,text:"科室问题反馈",href:WWWROOT+'/disinfectsystem/problemReport/problemReport.jsp',hrefTarget:linkTarget,leaf:true},
+		{hidden :sstsConfig.disableDepartmentProblemFeedback?true:SSTS_ProblemReport_Menu,text:"科室问题反馈类型设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=question_feedback',hrefTarget:linkTarget,leaf:true}
+	]
+},{
 	text:"系统告警",
 	singleClickExpand:singleClickExpandTree,
 	hidden:SSTS_SystemWarning_Menu,
@@ -543,23 +604,35 @@
   		}
     ]
 },{
+	text:"视频监控",
+	singleClickExpand:singleClickExpandTree,
+	hidden:SSTS_cameraDefinition && SSTS_computerDefinition && SSTS_videoManage,
+	children:[
+        {hidden : SSTS_cameraDefinition,text:"摄像头定义",href:WWWROOT+'/disinfectsystem/videoMonitor/cameraDefinitionView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden : SSTS_computerDefinition,text:"电脑工作站定义",href:WWWROOT+'/disinfectsystem/videoMonitor/computerDefinitionView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden : SSTS_videoManage,text:"视频管理",href:WWWROOT+'/disinfectsystem/videoMonitor/videoManage.jsp',hrefTarget:linkTarget,leaf:true}
+    ]
+},{
 	text:"消毒供应中心工作量统计报表",
 	singleClickExpand:singleClickExpandTree,
 	hidden:SSTS_WorkLoad_Menu,
 	children:[
 	    {hidden :!(sstsConfig.enableNewYearWorkloadReport) || SSTS_YearWorkload,text:"年度消毒中心指标工作量统计(新)",href:WWWROOT+'/disinfectsystem/report/cssdWorkloadCountByDate/cssdWorkloadMainReport.jsp',hrefTarget:linkTarget,leaf:true},
 	    {hidden :SSTS_YearWorkload,text:"年度消毒中心指标工作量统计",href:WWWROOT+'/disinfectsystem/reportforms/yearWorkloadReportView2.jsp',hrefTarget:linkTarget,leaf:true},
-	    {hidden :false,text:"消毒供应中心工作量统计报表",href:"http://localhost:8075/webroot/decision/view/report?viewlet=消毒供应中心工作量统计报表.cpt&op=view&userName="+userName,hrefTarget:linkTarget,leaf:true},
-	    //{hidden :SSTS_StatisticalWorkload,text:(sstsConfig.strengthenStatisticalWorkload ? "消毒供应中心工作人员绩效评分表" : (sstsConfig.statisticalWorkloadName ? sstsConfig.statisticalWorkloadName : "消毒供应中心工作量统计报表")),href:WWWROOT+'/disinfectsystem/reportforms/statisticalWorkloadView.jsp',hrefTarget:linkTarget,leaf:true},
-	  	//{hidden :SSTS_USERECORD_TOTAL,text:"使用记录录入统计报表",href:WWWROOT+'/disinfectsystem/reportforms/useRecordTotalView.jsp',hrefTarget:linkTarget,leaf:true},
-	  	//{hidden :SSTS_USERECORD_Item,text:"使用记录录入明细报表",href:WWWROOT+'/disinfectsystem/reportforms/useRecordItemView.jsp',hrefTarget:linkTarget,leaf:true},
-	  	//{hidden :SSTS_USERECORD_OperatorTotal,text:"使用记录人员汇总报表",href:WWWROOT+'/disinfectsystem/reportforms/useRecordOperatorTotalView.jsp',hrefTarget:linkTarget,leaf:true},
-	  	//{hidden :SSTS_USERECORD_ForGoods,text:"使用记录物品分类汇总表",href:WWWROOT+'/disinfectsystem/reportforms/summaryUseRecordForGoodsView.jsp',hrefTarget:linkTarget,leaf:true},
+	    {hidden :false,text:"消毒供应中心工作量统计报表",href:"http://192.168.2.180:8075/webroot/decision/view/report?viewlet="+encodeURI('消毒供应中心工作量统计报表')+".cpt&op=view&userName="+userName,hrefTarget:linkTarget,leaf:true},
+	    {hidden :!((sstsConfig.hasOwnProperty('enableWorkloadScoreStatisticReport')) && sstsConfig.enableWorkloadScoreStatisticReport),text:"工作量积分统计报表",href:WWWROOT+'/disinfectsystem/reportforms/workloadScoreStatisticView.jsp',hrefTarget:linkTarget,leaf:true},
+	  	{hidden :SSTS_USERECORD_TOTAL,text:"使用记录录入统计报表",href:WWWROOT+'/disinfectsystem/reportforms/useRecordTotalView.jsp',hrefTarget:linkTarget,leaf:true},
+	  	{hidden :SSTS_USERECORD_Item,text:"使用记录录入明细报表",href:WWWROOT+'/disinfectsystem/reportforms/useRecordItemView.jsp',hrefTarget:linkTarget,leaf:true},
+	  	{hidden :SSTS_USERECORD_OperatorTotal,text:"使用记录人员汇总报表",href:WWWROOT+'/disinfectsystem/reportforms/useRecordOperatorTotalView.jsp',hrefTarget:linkTarget,leaf:true},
+	  	{hidden :SSTS_USERECORD_ForGoods,text:"使用记录物品分类汇总表",href:WWWROOT+'/disinfectsystem/reportforms/summaryUseRecordForGoodsView.jsp',hrefTarget:linkTarget,leaf:true},
+	  	{hidden :!sstsConfig.enableUseRecordByPatientDept,text:"使用记录物品分类汇总表(病人所在科室)",href:WWWROOT+'/disinfectsystem/reportforms/summaryUseRecordForGoodsAndDepartView.jsp',hrefTarget:linkTarget,leaf:true},
+	  	{hidden :!sstsConfig.enableUseRecordByPatientDept,text:"使用记录物品汇总表(病人所在科室)",href:WWWROOT+'/disinfectsystem/reportforms/summaryUseRecordView.jsp',hrefTarget:linkTarget,leaf:true},
+	  	{hidden :SSTS_WashingMachineStoveUseCountReport,text:"清洗机使用次数统计报表",href:WWWROOT+'/disinfectsystem/reportforms/washingMachineStoveUseCountView.jsp',hrefTarget:linkTarget,leaf:true},
 	  	{hidden :SSTS_SterilizingStoveUseCountReport,text:"灭菌炉使用次数统计报表",href:WWWROOT+'/disinfectsystem/reportforms/sterilizingStoveUseCountView.jsp',hrefTarget:linkTarget,leaf:true},
 	  	{hidden :SSTS_TousseWorkLoadTotalReport,text:(sstsConfig.tousseWorkLoadName ? sstsConfig.tousseWorkLoadName : "器械包工作量统计报表"),href:WWWROOT+'/disinfectsystem/reportforms/tousseWorkLoadView.jsp',hrefTarget:linkTarget,leaf:true},
-	  	//{hidden :SSTS_CleaningAreaWorkloadForUser,text:'清洗区人员工作量统计报表',href:WWWROOT+'/disinfectsystem/reportforms/cleaningAreaWorkloadForUser.jsp',hrefTarget:linkTarget,leaf:true},
-	  	{hidden :SSTS_WaitPackingTaskReport,text:'待装配任务工作表',href:WWWROOT+'/disinfectsystem/reportforms/waitPackingTaskReport.jsp',hrefTarget:linkTarget,leaf:true},
-	  	{hidden :SSTS_ScheduleReport,text:"排班统计报表",href:WWWROOT+'/disinfectsystem/reportforms/scheduleReportView.jsp',hrefTarget:linkTarget,leaf:true}
+	  	{hidden :!((sstsConfig.hasOwnProperty('enableRiskLevelOfTousseDefinition')) && sstsConfig.enableRiskLevelOfTousseDefinition),text:"物品风险级别统计报表",href:WWWROOT+'/disinfectsystem/reportforms/goodsRiskLevelReport.jsp',hrefTarget:linkTarget,leaf:true},
+	  	{hidden :SSTS_CleaningAreaWorkloadForUser,text:'清洗区人员工作量统计报表',href:WWWROOT+'/disinfectsystem/reportforms/cleaningAreaWorkloadForUser.jsp',hrefTarget:linkTarget,leaf:true},
+	  	{hidden :SSTS_WaitPackingTaskReport,text:'待装配任务工作表',href:WWWROOT+'/disinfectsystem/reportforms/waitPackingTaskReport.jsp',hrefTarget:linkTarget,leaf:true}
 	]
 
 },{
@@ -569,10 +642,10 @@
 	children:[
 	    //“临床护理质量管理与控制指标”报表暂时屏蔽，等客户现场确认不用后，应该把相应的业务代码全部删除
 	    //{hidden :true,text:"临床护理质量管理与控制指标",href:WWWROOT+'/disinfectsystem/reportforms/qualityControlOfClinic.jsp',hrefTarget:linkTarget,leaf:true},
-	    //{hidden :SSTS_QualityControlOfClinic,text:"供应室护理质量指标统计表",href:WWWROOT+'/disinfectsystem/reportforms/supplyRoomQualityQuota.jsp',hrefTarget:linkTarget,leaf:true},
-	    //{hidden :SSTS_QuotaReport,text:"十八项指标分析报表",href:WWWROOT+'/disinfectsystem/reportforms/quotaReportView.jsp',hrefTarget:linkTarget,leaf:true},
+	    {hidden :SSTS_QualityControlOfClinic,text:"供应室护理质量指标统计表",href:WWWROOT+'/disinfectsystem/reportforms/supplyRoomQualityQuota.jsp',hrefTarget:linkTarget,leaf:true},
+	    {hidden :SSTS_QuotaReport,text:"十八项指标分析报表",href:WWWROOT+'/disinfectsystem/reportforms/quotaReportView.jsp',hrefTarget:linkTarget,leaf:true},
 	    {hidden :SSTS_WorkQualityCountReport,text:"工作质量持续收集统计报表",href:WWWROOT+'/disinfectsystem/reportforms/workQualityCollectionView.jsp',hrefTarget:linkTarget,leaf:true},
-	    //{hidden :SSTS_RecycleMaterialDetailReport,text:"回收器械材料明细报表",href:WWWROOT+'/disinfectsystem/reportforms/recycleMaterialDetailView.jsp',hrefTarget:linkTarget,leaf:true},
+	    {hidden :SSTS_RecycleMaterialDetailReport,text:"回收器械材料明细报表",href:WWWROOT+'/disinfectsystem/reportforms/recycleMaterialDetailView.jsp',hrefTarget:linkTarget,leaf:true},
 	    {hidden :SSTS_WashWorkloadReport,text:"清洗区工作量及不合格率月报",href:WWWROOT+'/disinfectsystem/reportforms/washWorkloadReportView.jsp',hrefTarget:linkTarget,leaf:true},
 	    {hidden :SSTS_WashMaterialTypeWorkloadReport,text:"清洗区材料类型工作量统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialTypeWorkloadReportView.jsp',hrefTarget:linkTarget,leaf:true},
 	    {hidden :SSTS_PackingUnqualifieReport,text:"包装区工作量及不合格率月报",href:WWWROOT+'/disinfectsystem/reportforms/packingUnqualifieReportView.jsp',hrefTarget:linkTarget,leaf:true},
@@ -582,25 +655,25 @@
         {hidden :hideDeviceMaintenaceReport,text:"设备维护报表",href:WWWROOT+'/disinfectsystem/reportforms/deviceMaintenanceView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :hideDeviceMaintenaceCusReport,text:"设备维护报表",href:WWWROOT+'/disinfectsystem/reportforms/deviceMaintenanceCusReportView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_QualityMonitoringReport,text:"质量监测报表",href:WWWROOT+'/disinfectsystem/reportforms/qualityMonitoringView.jsp',hrefTarget:linkTarget,leaf:true},
-        //{hidden :SSTS_QualityMonitoringReport,text:qualityMonthViewName,href:WWWROOT+'/disinfectsystem/reportforms/qualityMonitoringMonthView.jsp',hrefTarget:linkTarget,leaf:true},
-        //{hidden :SSTS_QualityMonitoringReport,text:"器械清洗不合格部位数量统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialWashUnqualifiedPositionView.jsp',hrefTarget:linkTarget,leaf:true},
-        //{hidden :SSTS_QualityMonitoringReport,text:"器械清洗不合格评估方法数量统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialWashUnqualifiedAssessMethodView.jsp',hrefTarget:linkTarget,leaf:true},
-        //{hidden :!sstsConfig.enableMaterialWashUnUnqualifiedReport,text:"器械材料清洗不合格统计报表",href:WWWROOT+'/disinfectsystem/reportforms/washUnUnqualifiedReportView.jsp',hrefTarget:linkTarget,leaf:true},
-        //{hidden :SSTS_YearWashReportChart,text:"清洗不合格率环比折线图报表",href:WWWROOT+'/disinfectsystem/reportforms/yearWashReportChartView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_QualityMonitoringReport,text:qualityMonthViewName,href:WWWROOT+'/disinfectsystem/reportforms/qualityMonitoringMonthView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_QualityMonitoringReport,text:"器械清洗不合格部位数量统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialWashUnqualifiedPositionView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_QualityMonitoringReport,text:"器械清洗不合格评估方法数量统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialWashUnqualifiedAssessMethodView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :!sstsConfig.enableMaterialWashUnUnqualifiedReport,text:"器械材料清洗不合格统计报表",href:WWWROOT+'/disinfectsystem/reportforms/washUnUnqualifiedReportView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_YearWashReportChart,text:"清洗不合格率环比折线图报表",href:WWWROOT+'/disinfectsystem/reportforms/yearWashReportChartView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_MATERIAL_MISS_ITEM_TOTAL_VIEW,text:"器材丢失汇总统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialMissTotalView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_MATERIAL_MISS_ITEM_TOTAL_VIEW,text:"器材丢失明细统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialMissItemView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_MATERIAL_MISS_ITEM_TOTAL_VIEW,text:"器材报损汇总统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialDamageTotalView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_MATERIAL_MISS_ITEM_TOTAL_VIEW,text:"器材报损明细统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialDamageItemView.jsp',hrefTarget:linkTarget,leaf:true},
-        //{hidden :SSTS_MATERIAL_MISS_ITEM_TOTAL_VIEW,text:"器材丢失报损分类统计月报",href:WWWROOT+'/disinfectsystem/reportforms/materialDamageMissMonthView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_MATERIAL_MISS_ITEM_TOTAL_VIEW,text:"器材丢失报损分类统计月报",href:WWWROOT+'/disinfectsystem/reportforms/materialDamageMissMonthView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_SterilizationRecordInfoReport,text:"灭菌情况报表",href:WWWROOT+'/disinfectsystem/reportforms/sterilizationRecordInfoView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_SterilizationEffectMonitorReport,text:"灭菌效果监测结果报表",href:WWWROOT+'/disinfectsystem/reportforms/sterilizationEffectMonitorView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_WashAndDisinfectRecordInfoReport,text:"清洗情况报表",href:WWWROOT+'/disinfectsystem/reportforms/washAndDisinfectRecordInfoView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :!sstsConfig.enableTousseOverloadReport,text:"器械包实际负载组合统计报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseOverLoad.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :!sstsConfig.enableTousseMorrowSend,text:"器械包次日下送率统计报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseMorrowSend.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :!sstsConfig.enableNurseWorkload,text:"护理工作质量指标报表",href:WWWROOT+'/disinfectsystem/reportforms/nurseWorkload.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :!sstsConfig.showSterilizerQualityReport,text:"灭菌物品质量监测统计报表",href:WWWROOT+'/disinfectsystem/reportforms/sterilizerQuality.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :!sstsConfig.showUnqualifiedPretreatmentReport,text:"预处理不合格报表",href:WWWROOT+'/disinfectsystem/reportforms/unqualifiedPretreatmentReport.jsp',hrefTarget:linkTarget,leaf:true},
-        //{hidden :SSTS_SterilizationOmitReport,text:'灭菌遗漏检查表',href:WWWROOT+'/disinfectsystem/reportforms/sterilizationOmitReport.jsp',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_BiologicalMonitoringReport,text:"生物监测统计报表",href:WWWROOT+'/disinfectsystem/reportforms/statisticalStatementOfBiologicalMonitoringView.jsp',hrefTarget:linkTarget,leaf:true}
+        {hidden :SSTS_SterilizationOmitReport,text:'灭菌遗漏检查表',href:WWWROOT+'/disinfectsystem/reportforms/sterilizationOmitReport.jsp',hrefTarget:linkTarget,leaf:true}
     ]
 },{
 	text:"财务核算及物品发放报表",
@@ -609,34 +682,37 @@
 	children:[
 	    {hidden :SSTS_DepartmentMonthly,text:"核算月报",href:WWWROOT+'/disinfectsystem/reportforms/departmentMonthlyView.jsp',hrefTarget:linkTarget,leaf:true},
 	    {hidden :SSTS_DepartmentMonthlyDetail,text:"明细核算月报",href:WWWROOT+'/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.jsp',hrefTarget:linkTarget,leaf:true},
-    	//{hidden :SSTS_EOGoodsDetailReport,text:"发货物品统计月报(按灭菌程序)",href:WWWROOT+'/disinfectsystem/reportforms/EOGoodsDetailView.jsp',hrefTarget:linkTarget,leaf:true},
-    	//{hidden :SSTS_GodownEntryStatistic,text:"消耗物品月盘点统计报表",href:WWWROOT+'/disinfectsystem/reportforms/disposableGoodsInventoryView.jsp',hrefTarget:linkTarget,leaf:true},
-        //{hidden :SSTS_GodownEntryStatistic,text:"一次性物品三类查询报表",href:WWWROOT+'/disinfectsystem/reportforms/goodsAmountSummaryByGradeView.jsp',hrefTarget:linkTarget,leaf:true},
-        //{hidden :SSTS_GodownEntryStatistic,text:"入（退）库物品统计报表",href:WWWROOT+'/disinfectsystem/reportforms/godownEntryStatisticView.jsp',hrefTarget:linkTarget,leaf:true},
-        //{hidden :SSTS_GodownEntryStatistic,text:"入/退库物品统计报表(按供应商)",href:WWWROOT+'/disinfectsystem/reportforms/godownEntrySummaryView.jsp',hrefTarget:linkTarget,leaf:true},
-        //{hidden :SSTS_GodownEntryStatistic,text:"入（退）库物品明细统计报表",href:WWWROOT+'/disinfectsystem/reportforms/godownEntryDetailStatisticView.jsp',hrefTarget:linkTarget,leaf:true},
-        //{hidden :SSTS_GodownEntryStatistic,text:"一次性物品发货量对比报表",href:WWWROOT+'/disinfectsystem/reportforms/invoiceAmountContrastChartView.jsp',hrefTarget:linkTarget,leaf:true},
+	    {hidden :!((sstsConfig.hasOwnProperty('enableSciProjectAccountingMonthlyReport')) && sstsConfig.enableSciProjectAccountingMonthlyReport),text:"科研项目明细核算月报",href:WWWROOT+'/disinfectsystem/reportforms/sciProjectAccountingMonthlyView.jsp',hrefTarget:linkTarget,leaf:true},
+    	{hidden :SSTS_EOGoodsDetailReport,text:"发货物品统计月报(按灭菌程序)",href:WWWROOT+'/disinfectsystem/reportforms/EOGoodsDetailView.jsp',hrefTarget:linkTarget,leaf:true},
+    	{hidden :SSTS_GodownEntryStatistic,text:"消耗物品月盘点统计报表",href:WWWROOT+'/disinfectsystem/reportforms/disposableGoodsInventoryView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_GodownEntryStatistic,text:"一次性物品三类查询报表",href:WWWROOT+'/disinfectsystem/reportforms/goodsAmountSummaryByGradeView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_GodownEntryStatistic,text:"入（退）库物品统计报表",href:WWWROOT+'/disinfectsystem/reportforms/godownEntryStatisticView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_GodownEntryStatistic,text:"入/退库物品统计报表(按供应商)",href:WWWROOT+'/disinfectsystem/reportforms/godownEntrySummaryView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_GodownEntryStatistic,text:"入（退）库物品明细统计报表",href:WWWROOT+'/disinfectsystem/reportforms/godownEntryDetailStatisticView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_GodownEntryStatistic,text:"一次性物品发货量对比报表",href:WWWROOT+'/disinfectsystem/reportforms/invoiceAmountContrastChartView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_MaterialStockReport,text:"材料库存统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialStockReportView.jsp',hrefTarget:linkTarget,leaf:true},
-        //{hidden :SSTS_ReturnGoodsDetailReport,text:"签收统计报表",href:WWWROOT+'/disinfectsystem/reportforms/signGoodsDetailView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_ReturnGoodsDetailReport,text:"签收统计报表",href:WWWROOT+'/disinfectsystem/reportforms/signGoodsDetailView.jsp',hrefTarget:linkTarget,leaf:true},
     	{hidden :SSTS_ReturnGoodsDetailReport,text:"退货统计报表",href:WWWROOT+'/disinfectsystem/reportforms/returnGoodsDetailView.jsp',hrefTarget:linkTarget,leaf:true},
-    	//{hidden :SSTS_GoodsDistributeReportChart,text:"物品发放分布饼图",href:WWWROOT+'/disinfectsystem/reportforms/goodsDistributeReportChartView.jsp',hrefTarget:linkTarget,leaf:true},
+    	{hidden :SSTS_GoodsDistributeReportChart,text:"物品发放分布饼图",href:WWWROOT+'/disinfectsystem/reportforms/goodsDistributeReportChartView.jsp',hrefTarget:linkTarget,leaf:true},
     	{hidden :SSTS_TousseDeliverReport,text:"器械包发货统计报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseDeliverStatisticsView.jsp',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_ForeignTousseReport,text:"外来器械申请统计报表",href:WWWROOT+'/disinfectsystem/config/xjjqzyy/reports/foreignTousseApplicationReport.jsp',hrefTarget:linkTarget,leaf:true},
-        //{hidden :SSTS_ApparatusInfusionisType,text:"各类型输液器报表",href:WWWROOT+'/disinfectsystem/reportforms/apparatusInfusionisTypeView.jsp',hrefTarget:linkTarget,leaf:true},
-        //{hidden :SSTS_TousseMaterialMonthCheckReport,text:"消毒供应中心器械月盘点统计报表",href:WWWROOT+'/disinfectsystem/reportforms/supplyRoomApplianceMonthStatisticsView.jsp',hrefTarget:linkTarget,leaf:true},
-        //{hidden :SSTS_BorrowReport,text:"借还物品统计报表",href:WWWROOT+'/disinfectsystem/reportforms/borrowReportView.jsp',hrefTarget:linkTarget,leaf:true},
-        //{hidden :SSTS_ForeignTousseSterilizationMonitorAndDelivery,text:"含植入物器械包灭菌监测及发放情况报表",href:WWWROOT+'/disinfectsystem/reportforms/foreignTousseSterilizationMonitorAndDelivery.jsp',hrefTarget:linkTarget,leaf:true},
-        //{hidden :SSTS_ForeignTousseAfterUseDelivery,text:"外来器械使用后交接报表",href:WWWROOT+'/disinfectsystem/reportforms/foreignTousseAfterUseDelivery.jsp',hrefTarget:linkTarget,leaf:true},
-        //{hidden :SSTS_UrgentNeedGoodsProcessingCycle,text:"急用物品处理周期统计报表",href:WWWROOT+'/disinfectsystem/reportforms/urgentNeedGoodsProcessingCycleView.jsp',hrefTarget:linkTarget,leaf:true},
-        //{hidden :SSTS_TousseSpecificationSizeStatistics,text:"器械包规格大小统计报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseSpecificationSizeStatistics.jsp',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_TousseApplySummary,text:"各部门器械包申请汇总报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseApplySummary.jsp',hrefTarget:linkTarget,leaf:true}
+        {hidden :SSTS_ForeignTousseReport,text:"外来器械申请单统计报表",href:WWWROOT+'/disinfectsystem/reportforms/foreignTousseApplicationReport.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :!hasForeignTousseSizeSetting,text:"外来器械包大小统计报表",href:WWWROOT+'/disinfectsystem/reportforms/foreignTousseSizeReport.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_ApparatusInfusionisType,text:"各类型输液器报表",href:WWWROOT+'/disinfectsystem/reportforms/apparatusInfusionisTypeView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_TousseMaterialMonthCheckReport,text:"消毒供应中心器械月盘点统计报表",href:WWWROOT+'/disinfectsystem/reportforms/supplyRoomApplianceMonthStatisticsView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_BorrowReport,text:"借还物品统计报表",href:WWWROOT+'/disinfectsystem/reportforms/borrowReportView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_ForeignTousseSterilizationMonitorAndDelivery,text:"含植入物器械包灭菌监测及发放情况报表",href:WWWROOT+'/disinfectsystem/reportforms/foreignTousseSterilizationMonitorAndDelivery.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_ForeignTousseAfterUseDelivery,text:"外来器械使用后交接报表",href:WWWROOT+'/disinfectsystem/reportforms/foreignTousseAfterUseDelivery.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_UrgentNeedGoodsProcessingCycle,text:"急用物品处理周期统计报表",href:WWWROOT+'/disinfectsystem/reportforms/urgentNeedGoodsProcessingCycleView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_TousseSpecificationSizeStatistics,text:"器械包规格大小统计报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseSpecificationSizeStatistics.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_TousseApplySummary,text:"各部门器械包申请汇总报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseApplySummary.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :!enableOperatingRoomInstrumentSetUsageAndApportionmentExpenseReport,text:"手术室器械包使用分摊费用报表",href:WWWROOT+'/disinfectsystem/reportforms/operatingRoomInstrumentSetUsageAndApportionmentExpenseReport.jsp',hrefTarget:linkTarget,leaf:true}
    ]
 },
 //simon-add
 {
 	text:"排班管理",
 	singleClickExpand:singleClickExpandTree,
-	hidden:false,
+	hidden:true,
 	children:[
 			{hidden :SSTS_RecycRecord_Menu,text:"排班信息查看",href:'javascript:void(0);',leaf:true,listeners:{
 				click:function(node, e){ 
@@ -656,6 +732,166 @@
     ]
 }];
 
+var parentTree = {
+	text:"自定义报表", 
+	singleClickExpand:singleClickExpandTree,
+	hidden:SSTS_CustomizeReport_ReportCustomize  && SSTS_CustomizeReport_FolderCustomize && SSTS_CustomizeReport_ReportList,
+	children:[
+  	    {hidden :SSTS_CustomizeReport_ReportCustomize,text:"报表定义",href:WWWROOT+'/disinfectsystem/customizedreports/reportList.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_CustomizeReport_FolderCustomize,text:"文件夹定义",href:WWWROOT+'/disinfectsystem/customizedreports/folderList.jsp',hrefTarget:linkTarget,leaf:true},
+       	{hidden :SSTS_CustomizeReport_ReportList,text:"报表列表",singleClickExpand:singleClickExpandTree}
+   	]
+}
+
+ManagementTreeData.push(parentTree);
+
+folderList(true);
+
+//获取文件夹
+function folderList(isFirst) {
+	Ext.Ajax.request({
+		url: WWWROOT + '/disinfectSystem/customizedReports/folderController/getAllFolders.mhtml',
+		success: function(response, options) {
+			var result = response.responseText;
+
+			if (result != "" && result != "{}") {
+				var res = Ext.util.JSON.decode(result);
+				var rows = res.rows || [];
+				
+				var folderArr = [];
+
+				for (var i = 0; i < rows.length; i++) {
+					folderArr[i] = {
+						text:rows[i].folderName,
+						singleClickExpand:singleClickExpandTree,
+						hidden:false,
+						children:[]
+					}
+				}
+				
+				reportList(folderArr,isFirst);
+			}
+		}
+	});
+};
+
+//获取报表列表
+function reportList(folderArr,isFirst){
+	var isTrue = isFirst || false;
+	
+	Ext.Ajax.request({
+		url: WWWROOT + '/disinfectSystem/customizedReports/reportController/getAllReportDefinitions.mhtml',
+		params: {
+			isDraft: 0
+		},
+		success: function(response, options) {
+			var result = response.responseText;
+	
+			if (result != "" && result != "{}") {
+				var res = Ext.util.JSON.decode(result);
+				var rows = res.rows || [];
+	
+				var newStore = buildTree(rows);
+	
+				var storeIndex = 0;
+				var parentStore = [];
+				
+				for(var key in newStore){
+					var child = [];
+					
+					for(var k = 0;k<newStore[key].children.length;k++){
+						var reportName = newStore[key].children[k].reportName;
+						var reportId = newStore[key].children[k].reportId;
+						
+						child[k] = {
+							hidden :false,
+							text:reportName,
+							href:'javascript:void(0);',
+							hrefTarget:linkTarget,
+							leaf:true,
+							listeners:{
+								click:function(node, e){ 
+									var url = WWWROOT + '/disinfectsystem/customizedreports/reportView.jsp?id=' + reportId + '&position=left';
+									var recyclingWindow = openFullSizeWindowWithName(url,'yes',"recyclingWindow");
+									var loop = setInterval(function() {
+									      if(recyclingWindow.closed) {
+									         clearInterval(loop);
+									         folderList();
+									      }
+									}, 1000);
+									return;
+								}
+							}
+						}
+					}
+					
+					parentStore[storeIndex] = {
+						text:key,
+						singleClickExpand:singleClickExpandTree,
+						hidden:false,
+						children:child
+					}
+					
+					storeIndex++
+				}
+				
+				var noFolder = [];
+				
+				for(var i=0;i<folderArr.length;i++){
+					for(var j=0;j<parentStore.length;j++){
+						if(folderArr[i].text == parentStore[j].text){
+							folderArr[i].children = parentStore[j].children;
+						}
+						if(parentStore[j].text == '未命名'){
+							noFolder = parentStore[j];
+						}
+					}
+				}
+				
+				if(noFolder.length != 0){
+					folderArr.push(noFolder);
+				}
+				
+				parentTree.children[2].children = folderArr;
+				
+				ManagementTreeData[24] = parentTree;
+
+				var viewports = viewport || '';
+
+				if(viewports !== ''){
+					var trees = viewport.getComponent(0).getComponent(1).root;
+        			
+					if(!isFirst){
+						trees.childNodes[24].reload();
+					}
+				}
+			}
+		}
+	});
+}
+
+//扁平数组转换为树状
+function buildTree(list){	
+	var temp = {};	
+	
+	for(var i=0;i<list.length;i++){
+		var folderName = list[i].folderName || '未命名';
+		
+		if(!temp[folderName]){
+			temp[folderName] = {
+				text:folderName,
+				singleClickExpand:singleClickExpandTree,
+				hidden:SSTS_CustomizeReport_FolderList,
+				children:[]
+			}
+		}
+		
+		temp[folderName].children.push(list[i]);
+	}
+	
+	return temp;
+}
+
 var printRecyclingConfigFormVersion = getIntValueFromJs('sstsConfig.printRecyclingConfigFormVersion',1);
 //控制面版菜单
 ControlCenterTreeData = [{
@@ -665,16 +901,16 @@
         hidden :System_Manage_Menu,
         children:[
             {hidden :System_Orgunit_Select,text:"组织机构",href:WWWROOT+'/systemmanage/orgUnitExtView.jsp',hrefTarget:linkTarget,leaf:true,icon:WWWROOT+'/images/icon_org.gif'},
-            {hidden :System_Orgunit_Select,text:"停用的组织机构",href:WWWROOT+'/systemmanage/disabledOrgUnitExtView.jsp',hrefTarget:linkTarget,leaf:true,icon:WWWROOT+'/images/icon_org.gif'},
-            {hidden :System_User_Select,text:"用户管理",href:WWWROOT+'/systemmanage/userExtView.jsp',hrefTarget:linkTarget,leaf:true,icon:WWWROOT+'/images/icon_user.gif'},
+			{hidden :System_Orgunit_Select,text:"停用的组织机构",href:WWWROOT+'/systemmanage/disabledOrgUnitExtView.jsp',hrefTarget:linkTarget,leaf:true,icon:WWWROOT+'/images/icon_org.gif'},
+			{hidden :System_User_Select,text:"用户管理",href:WWWROOT+'/systemmanage/userExtView.jsp',hrefTarget:linkTarget,leaf:true,icon:WWWROOT+'/images/icon_user.gif'},
             {hidden :System_Role_Select,text:"权限管理",href:WWWROOT+'/systemmanage/roleList.jsp',hrefTarget:linkTarget,leaf:true,icon:WWWROOT+'/images/icon_role.gif'},
             {hidden :System_Log_Menu,text:"日志管理",href:WWWROOT+'/log/loggrid.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :System_DBManage,text:"初始化演示数据",href:WWWROOT+'/systemmanage/initData.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :System_DBManage,text:"导出邮件",href:WWWROOT+'/email/exportMailForm.mhtml',hrefTarget:linkTarget,leaf:true},
             {hidden :System_DBManage,text:"备份数据库",href:WWWROOT+'/databaseBackupAndRestore/backup.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :System_DBManage,text:"还原数据库",href:WWWROOT+'/databaseBackupAndRestore/restore.jsp',hrefTarget:linkTarget,leaf:true},
-            {hidden :false,text:"活动管理",href:WWWROOT+'/systemmanage/system/activityView.jsp',hrefTarget:linkTarget,leaf:true},
-            {hidden :System_Check,text:"系统体检",href:WWWROOT+'/systemmanage/system/systemCheck.jsp',hrefTarget:linkTarget,leaf:true},
+			{hidden :false,text:"活动管理",href:WWWROOT+'/systemmanage/system/activityView.jsp',hrefTarget:linkTarget,leaf:true},
+			{hidden :System_Check,text:"系统体检",href:WWWROOT+'/systemmanage/system/systemCheck.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :false,text:"系统信息",href:WWWROOT+'/systemmanage/system/systemInfo.jsp',hrefTarget:linkTarget,leaf:true}
         ]
     },{
@@ -689,13 +925,14 @@
             {hidden :SSTS_RecyclePrint_Menu || (printRecyclingConfigFormVersion!=2),text:"打印发货计划设置",href:WWWROOT+'/disinfectsystem/printRecyclingConfig2/printRecyclingConfigView.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_RecyclePrint_Menu || !((sstsConfig.hasOwnProperty('printInvoiceVersion')) && sstsConfig.printInvoiceVersion==2),text:"打印发货单设置",href:WWWROOT+'/disinfectsystem/printInvoiceConfig/printInvoiceConfigView.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_SupplyRoomType_manager,text:"标签模板管理",href:WWWROOT+'/disinfectsystem/labelTemplateDesign/labelTemplateView.jsp',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_RecyclePrint_Menu,text:"科室分组设置",href:WWWROOT+'/disinfectsystem/basedatamanager/departmentgroup/departmentgroupCommonView.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_RecyclePrint_Menu,text:"回收科室分组设置",href:WWWROOT+'/disinfectsystem/basedatamanager/departmentgroup/departmentgroupView.jsp',hrefTarget:linkTarget,leaf:true},
-            {hidden :SSTS_RecyclePrint_Menu,text:"审核科室分组设置",href:encodeURI(WWWROOT+'/disinfectsystem/basedatamanager/departmentgroupOption/departmentgroupOptionView.jsp?type='+departmentGroupOption_REVIEWE),hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_RecyclePrint_Menu,text:""+reviewViewText2+"科室分组设置",href:encodeURI(WWWROOT+'/disinfectsystem/basedatamanager/departmentgroupOption/departmentgroupOptionView.jsp?type='+departmentGroupOption_REVIEWE),hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_RecyclePrint_Menu,text:"物品科室共用配置",href:WWWROOT+'/disinfectsystem/goodsDepartShareConfig/goodsDepartShareConfigView.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_UseRecordConvertConfig_Manager,text:"使用记录转换配置",href:WWWROOT+'/disinfectsystem/basedatamanager/useRecordConvertConfig/useRecordConvertConfigView.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_RecyclePrint_Menu,text:"器械包回收备注设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=recycleItem_remark',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_SpecialInfection_manager,text:"特殊感染类型设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=specialInfection',hrefTarget:linkTarget,leaf:true},
-			{hidden :!sstsConfig.enablePatientAreaSetting,text:"病区设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=patientArea',hrefTarget:linkTarget,leaf:true},
+            {hidden :!sstsConfig.enablePatientAreaSetting,text:"病区设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=patientArea',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_application_end_cause_manager,text:"申请单终止原因设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=application_end_cause',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_application_end_cause_manager,text:"器械包废弃原因设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=tousse_discard_cause',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_foreignProxyGroup_manager,text:"外部代理灭菌分组设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=foreignProxyGroup',hrefTarget:linkTarget,leaf:true},
@@ -711,13 +948,13 @@
             {hidden :SSTS_PackType_manager,text:"包装类型设置",href:WWWROOT+'/systemmanage/httpOptionByValue.mhtml?listId=packType',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_equipment_manager,text:"设备设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=equipment',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_equipment_manager,text:"清洗方式设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=washMethod',hrefTarget:linkTarget,leaf:true},
-            //{hidden :SSTS_Tousse_Update,text:"器械包重量设置",href:encodeURI(WWWROOT+'/systemmanage/httpOption.mhtml?listId=tousseWeight&optionName=器械包重量设置'),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_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_ExpensiveGoodsSupplier_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 :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},
             {hidden :SSTS_Rinser,text:"清洗机管理",href:WWWROOT+'/disinfectsystem/basedatamanager/rinser/rinserView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
@@ -729,7 +966,7 @@
             {hidden :SSTS_Bioreader,text:"生物阅读器管理",href:WWWROOT+'/disinfectsystem/basedatamanager/bioreader/bioreaderView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :(!sstsConfig.hasOwnProperty('disableDeviceInterface')) || sstsConfig.disableDeviceInterface,text:"设备接口管理",href:WWWROOT+'/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_Expiration,text:"物品失效期管理",href:WWWROOT+'/disinfectsystem/basedatamanager/expirationDateInfo/expirationDateInfoView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
-            //{hidden :SSTS_SupplyRoomType_manager,text:"PDA参数设置",href:WWWROOT+'/personalSetting/modifyExitLoginTime.jsp',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_SupplyRoomType_manager,text:"PDA参数设置",href:WWWROOT+'/personalSetting/modifyExitLoginTime.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_SupplyRoomType_manager,text:"仓库管理",href:WWWROOT+'/disinfectsystem/basedatamanager/warehouse/wareHouseView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_SupplyRoomType_manager,text:"各环节超时设置",href:WWWROOT+'/systemmanage/timeoutSetting.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_SerialNumber_manager,text:"流水号设置",href:WWWROOT+'/disinfectsystem/basedatamanager/serialnumconfig/serialNumConfigView.jsp',hrefTarget:linkTarget,leaf:true},
@@ -743,14 +980,17 @@
             {hidden :SSTS_ExpensiveGoods_Hidden_Menu || SSTS_ExpensiveGoodsWorkFlow_Hidden_Manager,text:"流程定义管理",href:WWWROOT+'/systemmanage/workFlow/workFlow.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_ExpensiveGoods_Hidden_Menu || SSTS_ExpensiveGoodsWorkFloAuthorization_Hidden_Manager,text:"流程审批权限代理配置",href:WWWROOT+'/systemmanage/workFlow/workFlowAuthorize/workFlowApprovalAuthorization.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_UsedDoctor_manager,text:"常用医生设置",href:WWWROOT+'/disinfectsystem/basedatamanager/commonlyUsedDoctor/comUsedDoctorView.jsp',hrefTarget:linkTarget,leaf:true},
-            {hidden :SSTS_Handover_manager,text:"交接模块管理",href:WWWROOT+'/disinfectsystem/basedatamanager/handover/handoverView.jsp',hrefTarget:linkTarget,leaf:true},
+            {hidden :!(!SSTS_Handover_manager && sstsConfig.enableHandoverModule),text:"交接模块管理",href:WWWROOT+'/disinfectsystem/basedatamanager/handover/handoverView.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_ResponsibilityPart_manager,text:"责任环节",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=responsibilityPart',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_DefectiveMessageRegisterType_manager,text:"缺陷信息登记类型分组",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=defectiveMessageRegisterType',hrefTarget:linkTarget,leaf:true},
             {hidden :(!sstsConfig.hasOwnProperty('hideStaffArchive')) || sstsConfig.hideStaffArchive,text:"职称设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=positionalTitle',hrefTarget:linkTarget,leaf:true},
+            {hidden :!sstsConfig.enableMultipleBranchesOfHospital,text:"院区设置",href:WWWROOT+'/disinfectsystem/basedatamanager/branchesOfHospital/branchesOfHospitalView.jsp',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_chargeRecordManage_MENU,text:"收费项目设置",href:encodeURI(WWWROOT+'/systemmanage/httpOption.mhtml?listId=chargeItem&optionName=收费项目设置'),hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_SupplyRoomType_manager,text:"供应室处理器械包配置",href:WWWROOT+'/disinfectsystem/basedatamanager/supplyroomtype/cssdHandleToussesView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_SupplyRoomType_manager,text:"供应室服务临床科室配置",href:WWWROOT+'/disinfectsystem/basedatamanager/supplyroomtype/cssdServiceDeptsView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
-            {hidden :SSTS_SupplyRoomType_manager,text:"科室供应室设置",href:WWWROOT+'/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}
-        ]
+            {hidden :SSTS_SupplyRoomType_manager,text:"科室供应室设置",href:WWWROOT+'/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
+			{hidden :!sstsConfig.enablePackingMaterialsCheckFunction,text:"配包需逐一检查材料的物品",href:WWWROOT+'/disinfectsystem/basedatamanager/packingMaterialsCheck/packingMaterialsCheckView.jsp',hrefTarget:linkTarget,leaf:true}
+            ]
     },{
         text:"个人设置",
         singleClickExpand:singleClickExpandTree,