Index: ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/config.js
===================================================================
diff -u -r24181 -r24805
--- ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/config.js	(.../config.js)	(revision 24181)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/config.js	(.../config.js)	(revision 24805)
@@ -1,4 +1,4 @@
-var sstsConfig = {
+var sstsConfig = {
   // 禁用标识牌功能
   disableIdCard : false,
   // 审核器械包必须入篮筐（一级供应室）
@@ -73,6 +73,8 @@
   disableWashViewMouseover:true,
   // 设备维护功能自定义
   isDeviceMaintenanceCus : true,
+  //启用设备维护个人桌面图标显示
+  showDeviceMaintenanceDesktopIcon : true
   //是否启用器械包自动加急功能（只有为true时才启用，false或不配置都不启用）
   enableTousseVoluntarilyUrgent : true,
   //急物品的提示时间间隔（单位秒）
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/systemsetting/service/HttpOptionManagerSSTSImpl.java
===================================================================
diff -u -r24213 -r24805
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/systemsetting/service/HttpOptionManagerSSTSImpl.java	(.../HttpOptionManagerSSTSImpl.java)	(revision 24213)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/systemsetting/service/HttpOptionManagerSSTSImpl.java	(.../HttpOptionManagerSSTSImpl.java)	(revision 24805)
@@ -277,7 +277,9 @@
 
 
 		//医院消毒
-		if(optionId.equals(HttpOption.SYSTEMSETTING_MATERIALTYPE)){
+		if(StringUtils.isBlank(optionId)){
+			
+		}else if(optionId.equals(HttpOption.SYSTEMSETTING_MATERIALTYPE)){
 			return "材料类型";
 		}else if(optionId.equals(HttpOption.SYSTENSETTING_WASH_TYPE)){
 			return "清洗程序";
@@ -299,8 +301,7 @@
 			return "材料清洗分类";
 		}else if(optionId.equals(HttpOption.SYSTEMSETTING_STERILIZER_GROUP)){
 			return "灭菌炉分组";
-		}
-		else if (optionId.equals(HttpOption.SYSTEMSETTING_CONSTANT)) {
+		}else if (optionId.equals(HttpOption.SYSTEMSETTING_CONSTANT)) {
 			return "常用信息";
 		} else if (optionId.equals(HttpOption.WORKFLOW_COMMONNODENAME)) {
 			return "常用节点名称";
@@ -316,14 +317,13 @@
 			return "缺陷信息登记类型";
 		}
 		return "常用参数";
-	
 	}
 	
 	@Override
 	public String getHttpOptionNameTitle(String listId) {
-		if (listId.equals(HttpOption.SYSTEMSETTING_CONSTANT)) {
+		/*if (listId.equals(HttpOption.SYSTEMSETTING_CONSTANT)) {
 			return "名称";
-		}
+		}*/
 		return "名称";
 	}
 
@@ -344,9 +344,9 @@
 
 	@Override
 	public String getHttpOptionRemark(String listId) {
-		if (listId.equals(HttpOption.SYSTEMSETTING_CONSTANT)) {
+		/*if (listId.equals(HttpOption.SYSTEMSETTING_CONSTANT)) {
 			return "";
-		}
+		}*/
 		return "";
 	}
 
Index: ssts-web/src/main/webapp/homepage/portalPage.js
===================================================================
diff -u -r23729 -r24805
--- ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 23729)
+++ ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 24805)
@@ -817,7 +817,7 @@
 				return returnContent;
 			}
 
-			//如果不是使用版本2或者3,则隐藏申请外来器械图标
+			//如果不是使用版本2或者3并且不启用外来器械桌面图标显示,则隐藏申请外来器械图标
 			if (itemId == 'foreignTousseApplication' && !sstsConfig.enableForeignTousseApplicationDesktopIcon){
 				return returnContent;
 			}
@@ -838,7 +838,24 @@
 				return returnContent;
 			}
 
+			//如果启用设备维护个人桌面图标显示
+			if(sstsConfig.showDeviceMaintenanceDesktopIcon){
+				//设备维护(之前的非自定义配置的版本)
+				if (itemId == 'deviceMaintenance' && sstsConfig.isDeviceMaintenanceCus){
+					return returnContent;
+				}
+				
+				//设备维护(自定义配置版本)
+				if (itemId == 'deviceMaintenanceCustom' && !sstsConfig.isDeviceMaintenanceCus){
+					return returnContent;
+				}
+			}else{
+				if(itemId == 'deviceMaintenance' || itemId == 'deviceMaintenanceCustom'){
+					return returnContent;
+				}
+			}
 
+
 			var supplyRoomRecall = false;
 			if(itemId == "recallRecord"){
 				if(SSTS_RecallRecord_Menu == false){
Index: ssts-web/src/main/resources/systemset/portalPage.xml
===================================================================
diff -u -r24681 -r24805
--- ssts-web/src/main/resources/systemset/portalPage.xml	(.../portalPage.xml)	(revision 24681)
+++ ssts-web/src/main/resources/systemset/portalPage.xml	(.../portalPage.xml)	(revision 24805)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <portal>
-	<!-- pageId,pageIndex,itemId必须指定并唯一-->
+	<!-- pageId,pageIndex,itemId必须指定并唯,type表示类型(1表示打开新tab,2表示打开新窗口,3表示鼠标移入显示,4表示打开模态框窗口),system表示系统(0为多系统共用,1为消毒追溯,2为高值耗材)一-->
 	<portalPage pageIndex="1" pageId="normal" itemStyleClass="ui-state-default">
 		<portalItem type="1" system="1" title="科室申领" itemId="recyclingApplication" operationIds="SSTS_PACKAGE_Create,SSTS_RecycApplication_Create,SSTS_RecycApplication_Update,SSTS_RecycApplication_Select,SSTS_RecycApplication_Delete,SSTS_ForeignTousseApplication_Create,SSTS_ForeignTousseApplication_Update,SSTS_ForeignTousseApplication_Select,SSTS_ForeignTousseApplication_Delete" imgUrl="/themes/portalPage/img/tabs_recyclingApplication.png" itemLinkUrl="/disinfectsystem/recyclingApplication/goodsApplicationView.jsp?listType=todoList" itemLinkBootstrapUrl="/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/goodsApplicationView.jsp" />
 		<portalItem type="1" system="1" title="科室申领" itemId="recyclingApplicationVersion2" operationIds="SSTS_PACKAGE_Create,SSTS_RecycApplication_Create,SSTS_RecycApplication_Update,SSTS_RecycApplication_Select,SSTS_RecycApplication_Delete,SSTS_ForeignTousseApplication_Create,SSTS_ForeignTousseApplication_Update,SSTS_ForeignTousseApplication_Select,SSTS_ForeignTousseApplication_Delete" imgUrl="/themes/portalPage/img/tabs_recyclingApplication.png" itemLinkUrl="/disinfectsystem/recyclingApplication/goodsApplicationViewVersion2.jsp" />
@@ -35,6 +35,8 @@
 		<portalItem type="1" system="1" title="质量监测" itemId="qualityMonitoring" operationIds="SSTS_QualityRecord_Create,SSTS_QualityRecord_Update,SSTS_QualityRecord_Select,SSTS_QualityRecord_Delete" imgUrl="/themes/portalPage/img/tabs_qualityMonitoring.png" itemLinkUrl="/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.jsp?editMode=true" />
 		<portalItem type="1" system="1" title="器械包信息" itemId="tousseInstance" operationIds="SSTS_TousseInstanceManager_ViewMenu,SSTS_TousseInstanceManager_Selectall" imgUrl="/themes/portalPage/img/tousse.png" itemLinkUrl="/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp" />
 		<portalItem type="1" system="1" title="定期监测" itemId="routineMonitoring" operationIds="SSTS_RoutineMonitoring_Create,SSTS_RoutineMonitoring_Update,SSTS_RoutineMonitoring_Delete,SSTS_RoutineMonitoring_Review" imgUrl="/themes/portalPage/img/routineMonitoring.png" itemLinkUrl="/disinfectsystem/routineMonitoring/routineMonitoringView.jsp" />
+		<portalItem type="1" system="1" title="设备维护信息" itemId="deviceMaintenance" operationIds="SSTS_DeviceMonitoring_Create,SSTS_DeviceMonitoring_Update,SSTS_DeviceMonitoring_Select,SSTS_DeviceMonitoring_Delete,SSTS_DeviceMaintenance_Create,SSTS_DeviceMaintenance_Update,SSTS_DeviceMaintenance_Select,SSTS_DeviceMaintenance_Delete" imgUrl="/themes/portalPage/img/tabs_maintenance.png" itemLinkUrl="/disinfectsystem/deviceMaintenance/deviceMaintenanceView.jsp" />
+		<portalItem type="1" system="1" title="设备维护信息" itemId="deviceMaintenanceCustom" operationIds="SSTS_DeviceMonitoring_Create,SSTS_DeviceMonitoring_Update,SSTS_DeviceMonitoring_Select,SSTS_DeviceMonitoring_Delete,SSTS_DeviceMaintenance_Create,SSTS_DeviceMaintenance_Update,SSTS_DeviceMaintenance_Select,SSTS_DeviceMaintenance_Delete" imgUrl="/themes/portalPage/img/tabs_maintenance.png" itemLinkUrl="/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsView.jsp" />
 
 		<portalItem type="1" system="2" title="待办任务" itemId="myUnFinishedTask" operationIds="SSTS_ExpensiveGoodsWorkFlowApprovalTask_Manager" imgUrl="/themes/portalPage/img/todo.png" itemLinkUrl="/systemmanage/workFlow/workFlowApprovalTask.jsp?FormType=高值耗材申请单" />
 		<portalItem type="1" system="2" title="已办任务" itemId="myFinishedTask" operationIds="SSTS_ExpensiveGoodsWorkFlowFinishedApprovalTask_Manager" imgUrl="/themes/portalPage/img/allreadydo.png" itemLinkUrl="/systemmanage/workFlow/workFlowFinishedApprovalTask.jsp" />