Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
===================================================================
diff -u -r21464 -r21507
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java	(.../Recyle.java)	(revision 21464)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java	(.../Recyle.java)	(revision 21507)
@@ -29,6 +29,7 @@
 import test.forgon.disinfectsystem.selenium.factory.WaitFactory;
 import test.forgon.disinfectsystem.selenium.tools.JSWaiter;
 import test.forgon.disinfectsystem.selenium.tools.Utils;
+import static org.testng.Assert.assertNotNull;
 
 /**
  * @author cherry 2016-02-25
@@ -1288,8 +1289,14 @@
 					Utils.driver.switchTo().window(windowHandle);
 				}
 			}
+			
+			
 			WebElement recycleForm = Utils.retryingFind(By
 					.id("tousseItemTable"));
+			
+			// 如果自定义入筐的页面打开不成功，跳转到了登录页面，则recycleForm取到的值为空，导致测试失败
+			assertNotNull(recycleForm);
+			
 			if (Utils.isFind(recycleForm)) {
 			} else {
 				Utils.switchToDefaultContent();
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java
===================================================================
diff -u -r21391 -r21507
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java	(.../Assemble.java)	(revision 21391)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java	(.../Assemble.java)	(revision 21507)
@@ -23,6 +23,7 @@
 import test.forgon.disinfectsystem.selenium.factory.WaitFactory;
 import test.forgon.disinfectsystem.selenium.tools.JSWaiter;
 import test.forgon.disinfectsystem.selenium.tools.Utils;
+import static org.testng.Assert.assertNotNull;
 
 /**
  * @author cherry 2016-03-02
@@ -1370,16 +1371,22 @@
 	 */
 	public void scan() {
 		try {
-			WebElement element = Utils.retryingFind(By
+			WebElement reviewerElement = Utils.retryingFind(By
 					.cssSelector("input[name='reviewerBarcode']"));
-			String text = Utils.retryingFind(
-					By.cssSelector("input[name='operator']")).getText();
+			
+			WebElement operatorElement = Utils.retryingFind(
+					By.cssSelector("input[name='operator']"));
+			
+			assertNotNull(operatorElement);
+			
+			String text = operatorElement.getText();
+			
 			if (text.trim().equals("")) {
 				Utils.retryingFindAndSendKeys(
 						By.cssSelector("input[name='operatorBarcode']"),
 						Utils.settings.getJSONObject("一级供应室配包人")
 								.getString("条码") + "\n");
-				if (Utils.isFind(element)) {
+				if (Utils.isFind(reviewerElement)) {
 					Utils.retryingFindAndSendKeys(
 							By.cssSelector("input[name='reviewerBarcode']"),
 							Utils.settings.getJSONObject("一级供应室审核人").getString(