Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
===================================================================
diff -u -r21268 -r21347
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java	(.../ALL.java)	(revision 21268)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java	(.../ALL.java)	(revision 21347)
@@ -219,8 +219,11 @@
 			Utils.driver.switchTo().window(currentwindowhandle);
 			delivery.Delivery_secondSupplyRoom();
 			userrecord.UserRecord_success();
-			recyle.after();
-			recyle.init();
+			login.login_Out();
+			Utils.driver.get(Utils.settings.get("服务器地址").toString()
+					+ "/?logonType=1080p");
+			login.loginAction();
+			Utils.waitUntilUrlContains("awaitForRecycleList.jsp", 15);
 			/** 一级供应室回收二级供应室使用记录转换的申请单 */
 			recyle.recyle_userRecordApplyUpdate();
 			Utils.waitUntilUrlChange(
@@ -300,15 +303,21 @@
 			if (Utils.isFind(element)) {
 				recyle.recyle_customSet();
 				logger.info("一级供应室消毒物品申请单回收完成");
-				recyle.after();
+				JSWaiter.waitUntilJQueryReady();
+					Utils.driver.get(Utils.settings.get("服务器地址").toString()
+							+ "logon.jsp");
 			} else {
-				recyle.after();
+				JSWaiter.waitUntilJQueryReady();
+				Utils.driver.get(Utils.settings.get("服务器地址").toString()
+						+ "logon.jsp");
 			}
 			/*** 一级供应室清洗 ***/
 			Utils.DateTime();
 			/*** 触摸屏清洗 ***/
 			wash.wash_touch();
-			recyle.after();
+			JSWaiter.waitUntilJQueryReady();
+			Utils.driver.get(Utils.settings.get("服务器地址").toString()
+					+ "logon.jsp");
 			wash.init();
 			/*** 一级供应室清洗并清洗添加材料 ***/
 			wash.wash_oneSupplyRoom();
@@ -461,11 +470,12 @@
 			recyle.recyle_Monitor();
 			JSWaiter.waitUntilJQueryReady();
 			logger.info("供应室回收质量监测登记的重新回收");
-			recyle.after();
+			JSWaiter.waitUntilJQueryReady();
+			Utils.driver.get(Utils.settings.get("服务器地址").toString()
+					+ "logon.jsp");
 			/*** 临床签收物品 ***/
 			System.out.print("签收物品开始:");
 			Utils.DateTime();
-			login.init();
 			login.login_clinicNoWarnig();
 			sign.Sign_Success();
 			logger.info("临床签收物品完成");
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Wash.java
===================================================================
diff -u -r21203 -r21347
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Wash.java	(.../Wash.java)	(revision 21203)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Wash.java	(.../Wash.java)	(revision 21347)
@@ -28,7 +28,8 @@
 	@BeforeMethod
 	public void init() {
 		try {
-			Utils.init();
+			//调试时需要打开
+//			Utils.init();
 			Login login = new Login();
 			login.login_oneSupplyRoom();
 			Utils.retryingFindAndClick(By.id("washAndDisinfect"));
@@ -71,7 +72,8 @@
 	@Test
 	public void wash_touch() {
 		try {
-			Utils.init();
+			//调试时需要打开
+//			Utils.init();
 			Login login = new Login();
 
 			String serverAddress = Utils.settings.get("服务器地址").toString();