Index: ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfy/spring/security/applicationContext-acegi-security.xml
===================================================================
diff -u -r31574 -r37196
--- ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfy/spring/security/applicationContext-acegi-security.xml	(.../applicationContext-acegi-security.xml)	(revision 31574)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfy/spring/security/applicationContext-acegi-security.xml	(.../applicationContext-acegi-security.xml)	(revision 37196)
@@ -45,7 +45,6 @@
 			<intercept-url pattern="/disinfectsystem/config/**" access="permitAll"></intercept-url>
 			<intercept-url pattern="/disinfectsystem/common/**" access="permitAll"></intercept-url>
 			<intercept-url pattern="/disinfectSystem/fileUploadServlet/**" access="permitAll"></intercept-url>
-			<intercept-url pattern="/disinfectSystem/mediaDownloadServlet/**" access="permitAll"></intercept-url>
 			<intercept-url pattern="/CodeImageServlet/**" access="permitAll"></intercept-url>
 			<intercept-url pattern="/fckeditor/**" access="permitAll"></intercept-url>
 			<intercept-url pattern="/UserUpLoadFiles/**" access="permitAll"></intercept-url>
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfy/menu/menuconfigure.js
===================================================================
diff -u -r35830 -r37196
--- ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfy/menu/menuconfigure.js	(.../menuconfigure.js)	(revision 35830)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfy/menu/menuconfigure.js	(.../menuconfigure.js)	(revision 37196)
@@ -141,8 +141,7 @@
 	children:[
         {hidden :SSTS_SatisfactionSurveyTemplate_Menu,text:"满意度调查表定义",href:WWWROOT+'/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateView.jsp',hrefTarget:linkTarget,leaf:true},
         {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},
-        {hidden :SSTS_SatisfactionSurveyTemplate_Menu,text:"满意度调查明细报表",href:WWWROOT+'/disinfectsystem/reportforms/departSatisfyDetailView.jsp',hrefTarget:linkTarget,leaf:true}
+        {hidden :SSTS_SatisfactionSurveyTemplate_Menu,text:"满意度调查报表",href:WWWROOT+'/disinfectsystem/reportforms/departSatisfyView.jsp',hrefTarget:linkTarget,leaf:true}
     ]
 };
 DisinfectsystemTreeData[11] = {
@@ -328,7 +327,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='+encodeURIComponent("是"),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},
@@ -555,9 +554,9 @@
 	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 :SSTS_StatisticalWorkload,text:(sstsConfig.strengthenStatisticalWorkload ? "消毒供应中心员工绩效评分表" : (sstsConfig.statisticalWorkloadName ? sstsConfig.statisticalWorkloadName : "消毒供应中心员工工作量统计报表")),href:WWWROOT+'/disinfectsystem/reportforms/statisticalWorkloadView.jsp',hrefTarget:linkTarget,leaf:true},
+	    {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 :SSTS_StatisticalWorkload,text:(sstsConfig.strengthenStatisticalWorkload ? "消毒供应中心工作人员绩效评分表" : (sstsConfig.statisticalWorkloadName ? sstsConfig.statisticalWorkloadName : "消毒供应中心工作量统计报表")),href:WWWROOT+'/disinfectsystem/reportforms/statisticalWorkloadView.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}
 	]
@@ -590,8 +589,8 @@
 	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_GodownEntryStatistic,text:"入（退）库物品统计报表",href:WWWROOT+'/disinfectsystem/reportforms/godownEntryStatisticView.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/godownEntryStatisticView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_GodownEntryStatistic,text:"入库物品明细统计报表",href:WWWROOT+'/disinfectsystem/reportforms/godownEntryDetailStatisticView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_ForeignTousseReport,text:"外来器械申请单统计报表",href:WWWROOT+'/disinfectsystem/reportforms/foreignTousseApplicationReport.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_ForeignTousseSterilizationMonitorAndDelivery,text:"含植入物器械包灭菌监测及发放情况报表",href:WWWROOT+'/disinfectsystem/reportforms/foreignTousseSterilizationMonitorAndDelivery.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_UrgentNeedGoodsProcessingCycle,text:"急用物品处理周期统计报表",href:WWWROOT+'/disinfectsystem/reportforms/urgentNeedGoodsProcessingCycleView.jsp',hrefTarget:linkTarget,leaf:true}
@@ -685,7 +684,7 @@
             {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},
-            {hidden :SSTS_SterilerGroup_manager,text:"灭菌炉分组设置",href:WWWROOT+'/disinfectsystem/basedatamanager/sterilerGroup/sterilerGroupView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_SterilerGroup_manager,text:"灭菌炉分组设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=sterilerGroup',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_Sterilizer,text:"灭菌炉管理",href:WWWROOT+'/disinfectsystem/basedatamanager/sterilizer/sterilizerView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_SterilizationPurpose_manager,text:"灭菌目的设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=sterilizationPurpose',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_SterilizationMode_manager,text:"灭菌方式设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=sterilizationMode',hrefTarget:linkTarget,leaf:true},