Index: ssts-web/src/main/webapp/openSystemMainPage.jsp
===================================================================
diff -u -r18405 -r23160
--- ssts-web/src/main/webapp/openSystemMainPage.jsp	(.../openSystemMainPage.jsp)	(revision 18405)
+++ ssts-web/src/main/webapp/openSystemMainPage.jsp	(.../openSystemMainPage.jsp)	(revision 23160)
@@ -1,3 +1,4 @@
+<%@page import="org.apache.commons.lang.StringUtils"%>
 <%@ page contentType="text/html; charset=UTF-8"%>
 <%@ include file="/common/taglibs.jsp" %>
 <%@ page import="com.forgon.security.service.*,com.forgon.directory.vo.LoginUserData,com.forgon.tools.SpringBeanManger,com.forgon.security.service.OperationManager"%>
@@ -58,16 +59,20 @@
 }
 
 String logonType = (String)session.getAttribute("logonType");
-if(logonType != null && !session.getAttribute("userOperationIds").toString().contains(",SSTS_RecycRecord_Create,")){
-	response.sendRedirect(ctx + "/logon.jsp?login_error=3");
-} else if(logonType != null && "ipad".equals(logonType.toLowerCase())){
-	response.sendRedirect(ctx + "/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp?resolution=1024");   //触摸屏
-} else if (logonType != null && "1080p".equals(logonType.toLowerCase())){
-	response.sendRedirect(ctx + "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980");   //触摸屏
-} else if (logonType != null && "washform".equals(logonType.toLowerCase())){
-	response.sendRedirect(ctx + "/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.jsp?resolution=1980");   //触摸屏
+if(StringUtils.isNotBlank(logonType)){// && !session.getAttribute("userOperationIds").toString().contains(",SSTS_RecycRecord_Create,")){
+	if(logonType != null && "ipad".equals(logonType.toLowerCase())){
+		response.sendRedirect(ctx + "/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp?resolution=1024");   //触摸屏
+	} else if (logonType != null && "1080p".equals(logonType.toLowerCase())){
+		response.sendRedirect(ctx + "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980");   //触摸屏
+	} else if (logonType != null && "washform".equals(logonType.toLowerCase())){
+		response.sendRedirect(ctx + "/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.jsp?resolution=1980");   //触摸屏
+	} else if (logonType != null && "expensivegoods".equals(logonType.toLowerCase())){
+		response.sendRedirect(ctx + "/expensivegoodshomepage/portalPage.jsp");   //高值耗材主页
+	} else {
+		response.sendRedirect(ctx + "/logon.jsp?login_error=3");
+	}
 } else {
-    response.sendRedirect(ctx + "/homepage/portalPage.jsp");//桌面版
+	response.sendRedirect(ctx + "/homepage/portalPage.jsp");//桌面版
 }
 
 String reqUrl = request.getHeader("Referer");