Index: ssts-web/src/main/webapp/openSystemMainPage.jsp
===================================================================
diff -u -r24376 -r33370
--- ssts-web/src/main/webapp/openSystemMainPage.jsp	(.../openSystemMainPage.jsp)	(revision 24376)
+++ ssts-web/src/main/webapp/openSystemMainPage.jsp	(.../openSystemMainPage.jsp)	(revision 33370)
@@ -59,27 +59,34 @@
 }
 
 String logonType = (String)session.getAttribute("logonType");
-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");
+String targetPage = (String)session.getAttribute("targetPage");
+if(StringUtils.isNotBlank(targetPage)){
+	if (targetPage.equals("operationReservationView")){
+		response.sendRedirect(ctx + "/disinfectsystem/invoice/operationReservationView.jsp?hideButton=false");
 	}
-} else {//桌面版
-	//如果主页版本为1,则跳转至bootstrap主页
-	int mainPageVersion = CssdUtils.getSystemSetConfigByNameInt("mainPageVersion", 0);
-	if(mainPageVersion == 1){
-		response.sendRedirect(ctx + "/dx-disinfectsystem/pages/index.jsp");//bootstrap主页
-	}else if(mainPageVersion == 2){
-		//
-	}else{
-		response.sendRedirect(ctx + "/homepage/portalPage.jsp");//ext主页
+}else {
+	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 {//桌面版
+		//如果主页版本为1,则跳转至bootstrap主页
+		int mainPageVersion = CssdUtils.getSystemSetConfigByNameInt("mainPageVersion", 0);
+		if(mainPageVersion == 1){
+			response.sendRedirect(ctx + "/dx-disinfectsystem/pages/index.jsp");//bootstrap主页
+		}else if(mainPageVersion == 2){
+			//
+		}else{
+			response.sendRedirect(ctx + "/homepage/portalPage.jsp");//ext主页
+		}
 	}
 }
 
@@ -114,7 +121,6 @@
 <script language='javascript'>
 function openSystemWindow(){
     var isSuccessOpne = openFullSizeWindow("${ctx }/homepage/portal.jsp");
-  
    if(isSuccessOpne != false){
        window.opener=null;
        window.open("","_self");