Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
===================================================================
diff -u -r23583 -r23932
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java	(.../ALL.java)	(revision 23583)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java	(.../ALL.java)	(revision 23932)
@@ -131,13 +131,13 @@
 			/** 二级供应室回收 */
 			/** 二级供应室自定义入筐回收 */
 			recyle.recyle_quickly();
-			Utils.waitUntilUrlChange(
+			Utils.waitUntilUrlContains(
 					SERVER_URL
 							+ "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980",
 					8);
 			recyle.recyle_custom();
 			logger.info("二级供应室自定义入筐回收完成");
-			Utils.waitUntilUrlChange(
+			Utils.waitUntilUrlContains(
 					SERVER_URL
 							+ "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980",
 					8);
@@ -147,7 +147,7 @@
 					.id("awaitForRecycleTable"));
 			if (Utils.isFind(element)) {
 				recyle.recyle_SecondSupplyRoom();
-				Utils.waitUntilUrlChange(
+				Utils.waitUntilUrlContains(
 						SERVER_URL
 								+ "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980",
 						8);
@@ -157,7 +157,7 @@
 						+ "/homepage/portalPage.jsp", 8);
 				Utils.tryToCloseWarningWindow();
 			} else {
-				Utils.waitUntilUrlChange(
+				Utils.waitUntilUrlContains(
 						SERVER_URL
 								+ "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980",
 						8);
@@ -217,61 +217,61 @@
 			Utils.waitUntilUrlContains("awaitForRecycleList.jsp", 15);
 			/** 一级供应室回收二级供应室使用记录转换的申请单 */
 			recyle.recyle_userRecordApplyUpdate();
-			Utils.waitUntilUrlChange(
+			Utils.waitUntilUrlContains(
 					SERVER_URL
 							+ "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980",
 					8);
 			logger.info("一级供应室回收二级供应室使用记录转换的申请单");
 			/** 一级供应室回收带标识牌的回收单 */
 			recyle.recyle_recyleSignboardAndDropAndScrap();
-			Utils.waitUntilUrlChange(
+			Utils.waitUntilUrlContains(
 					SERVER_URL
 							+ "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980",
 					8);
 			logger.info("一级供应室回收带标识牌的回收单完成");
 			/** 一级供应室回收单确认 */
 			recyle.recyle_confirm_new();
-			Utils.waitUntilUrlChange(
+			Utils.waitUntilUrlContains(
 					SERVER_URL
 							+ "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980",
 					8);
 			logger.info("一级供应室回收单确认");
 			/** 一级供应室回收部分终止的单 */
 			recyle.recyle_oneSupplyRoom();
-			Utils.waitUntilUrlChange(
+			Utils.waitUntilUrlContains(
 					SERVER_URL
 							+ "/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp?resolution=1980",
 					8);
 			logger.info("一级供应室回收部分终止的单完成");
 			/** 切换篮筐并丢失材料 */
 			recyle.recyle_changeBasket();
-			Utils.waitUntilUrlChange(
+			Utils.waitUntilUrlContains(
 					SERVER_URL
 							+ "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980",
 					8);
 			logger.info("切换篮筐并丢失材料完成");
 			/** 一级供应室回收单确认 */
 			recyle.recyle_confirm_new();
-			Utils.waitUntilUrlChange(
+			Utils.waitUntilUrlContains(
 					SERVER_URL
 							+ "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980",
 					8);
 			logger.info("一级供应室回收单确认完成");
 			/** 一级供应室回收申请单 */
 			recyle.recyle_oneSupplyRoomSignboard();
-			Utils.waitUntilUrlChange(
+			Utils.waitUntilUrlContains(
 					SERVER_URL
 							+ "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980",
 					8);
 			logger.info("一级供应室回收申请单完成");
 			/** 一级供应室回收外来器械 */
 			recyle.recyle_Foreign_edit();
-			Utils.waitUntilUrlChange(
+			Utils.waitUntilUrlContains(
 					SERVER_URL
 							+ "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980",
 					8);
 			recyle.recyle_Foreign();
-			Utils.waitUntilUrlChange(
+			Utils.waitUntilUrlContains(
 					SERVER_URL
 							+ "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980",
 					8);
@@ -286,7 +286,7 @@
 					.id("awaitForRecycleTable"));
 			if (Utils.isFind(element)) {
 				recyle.recyle_customSet();
-				Utils.waitUntilUrlChange(
+				Utils.waitUntilUrlContains(
 						SERVER_URL
 								+ "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980",
 						8);