Index: ssts-web/src/main/webapp/homepage/portalPage.js
===================================================================
diff -u -r40823 -r40839
--- ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 40823)
+++ ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 40839)
@@ -1177,6 +1177,151 @@
 	return flag;
 }
 
+//BJDXZLYY-70：菜单是否在配置里
+function desktopShortcutIconsConfigFun(itemId) {
+	var arr = [
+		'cardinalNumManage',
+		'sterilizerDelivery',
+		'deviceMaintenance',
+		'deviceMaintenanceCustom',
+		'foreignProxySterilizationManage',
+		'foreignTousseApplication',
+		'customform',
+		'tousseGoodsStockView',
+		'operationReservationView',
+		'idCardInstance',
+		'tousseReturnDisinfect',
+		'returnGoodsRecordView',
+		'instrumentInstanceView'
+	]
+
+	//高值耗材的几个图标不显示
+	var expensiveArr = [
+		'expensiveGoodsApplication',
+		'expensiveGodownEntryPurchase',
+		'expensiveGodownEntryPrepareIn',
+		'expensiveInvoicePlan',
+		'expensiveInvoice',
+		'expensiveBill',
+		'expensiveStockTake',
+		'myUnFinishedTask',
+		'myFinishedTask',
+		'expensiveGoodsInstanceView',
+		'expensiveEnterpriseView'
+	]
+
+	if (expensiveArr.indexOf(itemId) >= 0) {
+		return true
+	}
+
+	if (!sstsConfig.portal_showComboToussePackingIcon && itemId == 'comboToussePacking') {
+		return true;
+	}
+
+	if (!sstsConfig.toussePicturesShow && itemId == 'toussePictures') {
+		return true;
+	}
+
+	if (!sstsConfig.enableInstrumentRepairManagement && itemId == 'instrumentRepair') {
+		return true;
+	}
+
+	//如果没有启手术仪器管理功能,则桌面图标不显示
+	if (!sstsConfig.enableSurgicalInstrumentsManagement && itemId == 'instrumentGoods') {
+		return true;
+	}
+
+	//如果没有库位管理功能,则桌面图标不显示
+	if (!sstsConfig.enableWarehousePositionModule && (itemId == 'storageLocationManager' || itemId == 'storageLocationLook' || itemId == 'tousseAccess')) {
+		return true;
+	}
+
+	//如果当前图标是物品签收2，配置的是1或者未配置，隐藏图标
+	if ((sstsConfig.signModuleVersion == 1 || !sstsConfig.signModuleVersion) && itemId == 'goodsReceiptVersion2') {
+		return true;
+	}
+
+	//如果当前图标是物品签收1，配置的是2，隐藏图标
+	if ((sstsConfig.signModuleVersion == 2) && itemId == 'goodsReceipt') {
+		return true;
+	}
+
+	if (sstsConfig.desktopShortcutIconsConfig) {
+		var arr = sstsConfig.desktopShortcutIconsConfig || [];
+
+		//基数管理图标
+		if (arr.indexOf('基数管理') == -1 && itemId == 'cardinalNumManage') {
+			return true;
+		}
+		//灭菌员发货图标
+		if (arr.indexOf('灭菌员发货') == -1 && itemId == 'sterilizerDelivery') {
+			return true;
+		}
+		//设备维护信息图标
+		if (arr.indexOf('设备维护信息') >= 0) {
+			//设备维护(之前的非自定义配置的版本)
+			if (itemId == 'deviceMaintenance' && sstsConfig.isDeviceMaintenanceCus) {
+				return true;
+			}
+
+			//设备维护(自定义配置版本)
+			if (itemId == 'deviceMaintenanceCustom' && !sstsConfig.isDeviceMaintenanceCus) {
+				return true;
+			}
+		} else if (arr.indexOf('设备维护信息') == -1 && (itemId == 'deviceMaintenance' || itemId == 'deviceMaintenanceCustom')) {
+			return true;
+		}
+
+		//外部代理灭菌图标
+		if (arr.indexOf('外部代理灭菌') == -1 && itemId == 'foreignProxySterilizationManage') {
+			return true;
+		}
+
+		//如果不是使用版本2或者3并且不启用外来器械桌面图标显示,则隐藏申请外来器械图标
+		if (arr.indexOf('外来器械申请') == -1 && itemId == 'foreignTousseApplication') {
+			return true;
+		}
+
+		//自定义表单图标
+		if (arr.indexOf('自定义表单') == -1 && itemId == 'customform') {
+			return true;
+		}
+
+		//器械包库存图标
+		if (arr.indexOf('器械包库存') == -1 && itemId == 'tousseGoodsStockView') {
+			return true;
+		}
+
+		//手术预约管理图标
+		if (arr.indexOf('手术预约管理') == -1 && itemId == 'operationReservationView') {
+			return true;
+		}
+
+		if ((!sstsConfig.enableInstrumentRepairManagement || arr.indexOf('器械维修') == -1) && itemId == 'instrumentRepair') {
+			return true;
+		}
+
+		if ((sstsConfig.disableIdCard || arr.indexOf('标识牌信息') == -1) && itemId == 'idCardInstance') {
+			return true;
+		}
+		if ((arr.indexOf('器械包返消') == -1) && itemId == 'tousseReturnDisinfect') {
+			return true;
+		}
+		//GZFDZL-163：退货记录管理图标
+		if (arr.indexOf('退货记录管理') == -1 && itemId == 'returnGoodsRecordView') {
+			return true;
+		}
+		//GZFDZL-163：退货记录管理图标
+		if (arr.indexOf('器械生命周期管理') == -1 && itemId == 'instrumentInstanceView') {
+			return true;
+		}
+	} else {
+		if (arr.indexOf(itemId) >= 0) {
+			return true
+		}
+	}
+}
+
 /**
  * 解析portalPage.xml配置的某个人桌面功能图标.
  * @param portalPage
@@ -1197,19 +1342,7 @@
 		if (notInWhiteList2(itemId)) {
 			return returnContent;
 		}
-		//高值耗材的几个图标不显示
-		if (itemId == 'expensiveGoodsApplication' || itemId == 'expensiveGodownEntryPurchase' || itemId == 'expensiveGodownEntryPrepareIn'
-			|| itemId == 'expensiveInvoicePlan' || itemId == 'expensiveInvoice' || itemId == 'expensiveBill'
-			|| itemId == 'expensiveStockTake' || itemId == 'myUnFinishedTask' || itemId == 'myFinishedTask' || itemId == 'expensiveGoodsInstanceView' || itemId == 'expensiveEnterpriseView') {
-			return returnContent;
-		}
-		if (!sstsConfig.portal_showComboToussePackingIcon && itemId == 'comboToussePacking') {
-			return returnContent;
-		}
-		//如果没有启手术仪器管理功能,则桌面图标不显示
-		if (!sstsConfig.enableSurgicalInstrumentsManagement && itemId == 'instrumentGoods') {
-			return returnContent;
-		} else if (sstsConfig.enableSurgicalInstrumentsManagement && itemId == 'instrumentGoods') {
+		if (sstsConfig.enableSurgicalInstrumentsManagement && itemId == 'instrumentGoods') {
 			//GDSRMYY-575：手术仪器管理自定义名称
 			var title = item['title'];
 			if (sstsConfig.aliasNameOfSurgicalInstrumentsManagement) {
@@ -1230,88 +1363,12 @@
 			return returnContent;
 		}
 
-		if (!sstsConfig.toussePicturesShow && itemId == 'toussePictures') {
+		if (desktopShortcutIconsConfigFun(itemId)) {
 			return returnContent;
 		}
 
-		if (sstsConfig.desktopShortcutIconsConfig) {
-			var arr = sstsConfig.desktopShortcutIconsConfig || [];
-
-			//基数管理图标
-			if (arr.indexOf('基数管理') == -1 && itemId == 'cardinalNumManage') {
-				return returnContent;
-			}
-			//灭菌员发货图标
-			if (arr.indexOf('灭菌员发货') == -1 && itemId == 'sterilizerDelivery') {
-				return returnContent;
-			}
-			//设备维护信息图标
-			if (arr.indexOf('设备维护信息') >= 0) {
-				//设备维护(之前的非自定义配置的版本)
-				if (itemId == 'deviceMaintenance' && sstsConfig.isDeviceMaintenanceCus) {
-					return returnContent;
-				}
-
-				//设备维护(自定义配置版本)
-				if (itemId == 'deviceMaintenanceCustom' && !sstsConfig.isDeviceMaintenanceCus) {
-					return returnContent;
-				}
-			} else if (arr.indexOf('设备维护信息') == -1 && (itemId == 'deviceMaintenance' || itemId == 'deviceMaintenanceCustom')) {
-				return returnContent;
-			}
-
-			//外部代理灭菌图标
-			if (arr.indexOf('外部代理灭菌') == -1 && itemId == 'foreignProxySterilizationManage') {
-				return returnContent;
-			}
-
-			//如果不是使用版本2或者3并且不启用外来器械桌面图标显示,则隐藏申请外来器械图标
-			if (arr.indexOf('外来器械申请') == -1 && itemId == 'foreignTousseApplication') {
-				return returnContent;
-			}
-
-			//自定义表单图标
-			if (arr.indexOf('自定义表单') == -1 && itemId == 'customform') {
-				return returnContent;
-			}
-
-			//器械包库存图标
-			if (arr.indexOf('器械包库存') == -1 && itemId == 'tousseGoodsStockView') {
-				return returnContent;
-			}
-
-			//手术预约管理图标
-			if (arr.indexOf('手术预约管理') == -1 && itemId == 'operationReservationView') {
-				return returnContent;
-			}
-
-			if ((!sstsConfig.enableInstrumentRepairManagement || arr.indexOf('器械维修') == -1) && itemId == 'instrumentRepair') {
-				return returnContent;
-			}
-
-			if ((sstsConfig.disableIdCard || arr.indexOf('标识牌信息') == -1) && itemId == 'idCardInstance') {
-				return returnContent;
-			}
-			if ((arr.indexOf('器械包返消') == -1) && itemId == 'tousseReturnDisinfect') {
-				return returnContent;
-			}
-			//GZFDZL-163：退货记录管理图标
-			if (arr.indexOf('退货记录管理') == -1 && itemId == 'returnGoodsRecordView') {
-				return returnContent;
-			}
-		} else {
-			if (itemId == 'cardinalNumManage' || itemId == 'sterilizerDelivery' || itemId == 'deviceMaintenance' || itemId == 'deviceMaintenanceCustom' || itemId == 'foreignProxySterilizationManage' || itemId == 'foreignTousseApplication' || itemId == 'customform' || itemId == 'tousseGoodsStockView' || itemId == 'operationReservationView' || itemId == 'idCardInstance' || itemId == 'tousseReturnDisinfect' || itemId == 'returnGoodsRecordView') {
-				return returnContent;
-			}
-			if (!sstsConfig.enableInstrumentRepairManagement && itemId == 'instrumentRepair') {
-				return returnContent;
-			}
-		}
-
-		//如果没有开启库位管理功能,则桌面图标不显示
-		if (!sstsConfig.enableWarehousePositionModule && (itemId == 'storageLocationManager' || itemId == 'storageLocationLook' || itemId == 'tousseAccess')) {
-			return returnContent;
-		} else if (sstsConfig.enableWarehousePositionModule && (itemId == 'storageLocationManager' || itemId == 'storageLocationLook' || itemId == 'tousseAccess')) {
+		//开启库位管理功能
+		if (sstsConfig.enableWarehousePositionModule && (itemId == 'storageLocationManager' || itemId == 'storageLocationLook' || itemId == 'tousseAccess')) {
 			if (quickJumpGroupStorageArr.length == 1) {
 				var itemLinkUrl;
 				var title;
@@ -1356,16 +1413,6 @@
 			}
 		}
 
-		//如果当前图标是物品签收2，配置的是1或者未配置，隐藏图标
-		if (itemId == 'goodsReceiptVersion2' && (sstsConfig.signModuleVersion == 1 || !sstsConfig.signModuleVersion)) {
-			return returnContent;
-		}
-
-		//如果当前图标是物品签收1，配置的是2，隐藏图标
-		if (itemId == 'goodsReceipt' && (sstsConfig.signModuleVersion == 2)) {
-			return returnContent;
-		}
-
 		//发货计划
 		if (itemId == 'invoicePlan' && sstsConfig.enableBorrowInvoicePlanSeperateSend) {
 			returnContent += '<li id="' + itemId + '" class="' + portalPage['itemStyleClass'] + '" title="' + item['title'] + '">';