Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r15803 -r16052
--- ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 15803)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 16052)
@@ -259,12 +259,30 @@
 
 
 ManagementTreeData =[{
-	text:"监测管理",
+	text:"质量监测管理",
 	singleClickExpand:singleClickExpandTree,
 	hidden:SSTS_QualityRecord_Menu,
 	children:[
-	    {hidden :SSTS_RoutineMonitoring_Menu,text:"定期监测记录",href:WWWROOT+'/disinfectsystem/routineMonitoring/routineMonitoringView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_QualityMonitoring_Menu,text:"质量监测记录",href:WWWROOT+'/disinfectsystem/qualitymonitoring/qualitymonitoringView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}
+	    {hidden :SSTS_routineMonitoring_manager,text:"定期监测记录",href:WWWROOT+'/disinfectsystem/routineMonitoring/routineMonitoringView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_QualityMonitoring_Menu,text:"质量监测记录",href:WWWROOT+'/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
+        {
+			text:"质量监测定义管理",
+			singleClickExpand:singleClickExpandTree,
+			hidden:SSTS_QualityMonitoring_Config,
+			children:[
+			      {hidden :SSTS_QualityMonitoring_Config,text:"质量监测定义",href:WWWROOT+'/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.jsp?listType=lastDefinition&formType=质量监测',hrefTarget:linkTarget,leaf:true},
+			      {hidden :SSTS_QualityMonitoring_Config,text:"已部署质量监测定义",href:WWWROOT+'/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.jsp?listType=deployed&formType=质量监测',hrefTarget:linkTarget,leaf:true}
+		    ]
+		},
+		{
+			text:"定期监测定义管理",
+			singleClickExpand:singleClickExpandTree,
+			hidden:SSTS_routineMonitoring_Config,
+			children:[
+			      {hidden :SSTS_routineMonitoring_Config,text:"定期监测定义",href:WWWROOT+'/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.jsp?listType=definitionList&formType=定期监测',hrefTarget:linkTarget,leaf:true},
+			      {hidden :SSTS_routineMonitoring_Config,text:"已部署定期监测定义",href:WWWROOT+'/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.jsp?listType=deployList&formType=定期监测',hrefTarget:linkTarget,leaf:true}
+		    ]
+		}
     ]
 },{
 	text:"器材丢失及报损",
@@ -412,6 +430,23 @@
         {hidden :SSTS_RecallRecord_Menu,text:"召回记录信息",href:WWWROOT+'/disinfectsystem/recallRecord/recallRecordView.jsp',hrefTarget:linkTarget,leaf:true}
     ]
 },{
+	text:"自定义表单管理",
+	singleClickExpand:singleClickExpandTree,
+	hidden:SSTS_CustomForm_Menu,
+	children:[
+        {hidden :SSTS_CustomFormInput_Menu,text:"表单登记列表",href:WWWROOT + '/disinfectsystem/customform/forminstanceView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_CustomFormInput_Menu,text:"表单查询统计",href:WWWROOT + '/disinfectsystem/customform/formInstanceReportView.jsp',hrefTarget:linkTarget,leaf:true},
+        {
+  			text:"表单定义管理",
+  			singleClickExpand:singleClickExpandTree,
+  			hidden:SSTS_CustomForm_Config,
+  			children:[
+  			        {hidden :SSTS_CustomForm_Config,text:"表单定义列表",href:WWWROOT + '/disinfectsystem/customform/formdefinitionView.jsp?listType=lastDefinition',hrefTarget:linkTarget,leaf:true},
+  			        {hidden :SSTS_CustomForm_Config,text:"已部署表单列表",href:WWWROOT + '/disinfectsystem/customform/formdefinitionView.jsp?listType=deployed',hrefTarget:linkTarget,leaf:true}
+  		    ]
+  		}
+    ]
+},{
 	text:"设备维护与监测管理",
 	singleClickExpand:singleClickExpandTree,
 	hidden:SSTS_DeviceMaintenanceAndMonitoring_Folder,
@@ -558,8 +593,6 @@
             {hidden :SSTS_SupplyRoomType,text:"供应室服务临床科室配置",href:WWWROOT+'/disinfectsystem/basedatamanager/supplyroomtype/cssdServiceDeptsView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_SupplyRoomType,text:"各环节超时设置",href:WWWROOT+'/systemmanage/timeoutSetting.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_SerialNumber,text:"流水号设置",href:WWWROOT+'/disinfectsystem/basedatamanager/serialnumconfig/serialNumConfigView.jsp',hrefTarget:linkTarget,leaf:true},
-            {hidden :SSTS_QualityItem,text:"质量监测项设置",href:WWWROOT+'/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualitymonitoringConfigView.jsp?type=质量监测',hrefTarget:linkTarget,leaf:true},
-            {hidden :SSTS_Qualitymonitoring,text:"定期监测项设置",href:WWWROOT+'/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualitymonitoringConfigView.jsp?type=定期监测',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_ImportBaseData,text:"导入导出基础数据",href:WWWROOT+'/disinfectsystem/basedatamanager/importbasedata/importBasedata.mhtml',hrefTarget:linkTarget,leaf:true},
             {hidden :!(SSTS_IPAndOrgUnitMapping || sstsConfig.enableIPAndOrgUnitMapping),text:"IP对应的默认科室配置",href:WWWROOT+'/disinfectsystem/basedatamanager/iPAndOrgUnitMapping/iPAndOrgUnitMappingView.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_GoodsBindingConfig,text:"物品绑定",href:WWWROOT+ '/disinfectsystem/goodsBindingConfig/goodsBindingConfigView.jsp',hrefTarget:linkTarget,leaf:true},