Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Wash.java
===================================================================
diff -u -r20878 -r21037
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Wash.java	(.../Wash.java)	(revision 20878)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Wash.java	(.../Wash.java)	(revision 21037)
@@ -280,9 +280,11 @@
 			// 定位回来
 			Utils.retryingFindAndSwitchToFrame(By.id("iframe_washAndDisinfect"));
 			// 需要判断表单提交成功且返回正常后才能结束,否则就将不会提交到后台
-			wait.until(ExpectedConditions.attributeToBe(
-					Utils.driver.findElement(By.id("washSaveConfirm")),
-					"value", "1"));
+			if (Utils.isFind(Utils.retryingFind(By.id("washSaveConfirm")))) {
+				wait.until(ExpectedConditions.attributeToBe(
+						Utils.driver.findElement(By.id("washSaveConfirm")),
+						"value", "1"));
+			}
 			// 扫描篮筐条码，录质量监测记录
 			Utils.retryingFind(By.id("qualityMonitoringWin"));
 			Utils.retryingFindAndSendKeys(By.id("formName"), Keys.DOWN);
@@ -464,12 +466,13 @@
 		Utils.retryingFindAndClick(By.xpath("//span[contains(text(), '"
 				+ basketName + "')]"));
 		// 删除篮筐
+		Utils.retryingFindAndHover(By.cssSelector("div[name='divName_id']"));
 		Utils.retryingFindAndClick(By.cssSelector("div[name='divName_id']"));
 		String currentUrl = Utils.driver.getCurrentUrl();
 		System.out.println("currentUrl = " + currentUrl);
-		if(currentUrl.indexOf("/images/web/stop.png") > 0){
+		if (currentUrl.indexOf("/images/web/stop.png") > 0) {
 			Utils.driver.get(Utils.settings.get("服务器地址").toString()
-					+"/homepage/portalPage.jsp");
+					+ "/homepage/portalPage.jsp");
 			Utils.tryToCloseWarningWindow();
 			Utils.retryingFindAndClick(By.id("washAndDisinfect"));
 			Utils.retryingFindAndSwitchToFrame(By.id("iframe_washAndDisinfect"));
@@ -484,8 +487,10 @@
 		if (Utils.isFind(Utils.retryingFind(By.id("inputText")))) {
 			Utils.retryingFindAndSendKeys(By.id("inputText"), Utils.settings
 					.getJSONObject("一级供应室清洗篮筐3").getString("条码") + "\n");
-			if (Utils.isFind(Utils.retryingFind(By
-					.xpath("//a/span[contains(text(), '" + basketName + "')]")))) {
+			if (Utils
+					.isFind(Utils.retryingFind(By
+							.xpath("//a/span[contains(text(), '" + basketName
+									+ "')]")))) {
 			} else {
 				Utils.retryingFindAndSendKeys(
 						By.id("inputText"),
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java
===================================================================
diff -u -r20979 -r21037
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java	(.../SterilizationTest.java)	(revision 20979)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java	(.../SterilizationTest.java)	(revision 21037)
@@ -283,30 +283,33 @@
 						.id("iframe_sterilizationRecord"));
 				choiceSterilizationRecord();
 			}
-			Utils.retryingFindAndClick(By.id("modifyBtn"));
-			Utils.driver.switchTo().window(Utils.driver.getWindowHandle());
-			String javaScript = "Ext.getCmp('physicsResult').setValue('合格');";
-			javaScript += "Ext.getCmp('chemistryResult').setValue('不合格');";
-			javaScript += "Ext.getCmp('biologyResult').setValue('合格');";
-			Utils.runJavaScript(javaScript);
+			if (Utils.isFind(Utils.retryingFind(By.id("modifyBtn")))) {
+				Utils.retryingFindAndClick(By.id("modifyBtn"));
+				Utils.driver.switchTo().window(Utils.driver.getWindowHandle());
+				String javaScript = "Ext.getCmp('physicsResult').setValue('合格');";
+				javaScript += "Ext.getCmp('chemistryResult').setValue('不合格');";
+				javaScript += "Ext.getCmp('biologyResult').setValue('合格');";
+				Utils.runJavaScript(javaScript);
 
-			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-			Calendar calendar = Calendar.getInstance();
-			// 调短时间使发货不提示
-			calendar.add(Calendar.MINUTE, 1);
+				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+				Calendar calendar = Calendar.getInstance();
+				// 调短时间使发货不提示
+				calendar.add(Calendar.MINUTE, 1);
 
-			Utils.retryingFindAndSendKeys(
-					By.id("biologicalMonitoringStartDate"),
-					sdf.format(calendar.getTime()));
-			// 调短时间使发货不提示
-			calendar.add(Calendar.MINUTE, 2);
-			Utils.retryingFindAndSendKeys(By.id("biologicalMonitoringEndDate"),
-					sdf.format(calendar.getTime()));
-			Utils.retryingFindAndSendKeys(By.id("monitorUserBarcode"),
-					cssduser1Barcode + "\n");
-			Utils.retryingFindAndSendKeys(By.id("monitorCheckerBarcode"),
-					cssduser1Barcode + "\n");
-			Utils.retryingFindAndClick(By.id("monitorBtn"));
+				Utils.retryingFindAndSendKeys(
+						By.id("biologicalMonitoringStartDate"),
+						sdf.format(calendar.getTime()));
+				// 调短时间使发货不提示
+				calendar.add(Calendar.MINUTE, 2);
+				Utils.retryingFindAndSendKeys(
+						By.id("biologicalMonitoringEndDate"),
+						sdf.format(calendar.getTime()));
+				Utils.retryingFindAndSendKeys(By.id("monitorUserBarcode"),
+						cssduser1Barcode + "\n");
+				Utils.retryingFindAndSendKeys(By.id("monitorCheckerBarcode"),
+						cssduser1Barcode + "\n");
+				Utils.retryingFindAndClick(By.id("monitorBtn"));
+			}
 			JSWaiter.waitUntilJQueryReady();
 			Utils.driver.quit();
 		} catch (Exception e) {
@@ -329,13 +332,15 @@
 			JSWaiter.waitUntilJQueryReady();
 		} else {
 			Utils.refresh();
-			Utils.retryingFindAndHover(By.id("sterilizationRecord"));
-			Utils.retryingFindAndClick(By.linkText(Utils.settings
-					.getJSONObject("灭菌炉分组").getString("大型压力蒸汽")));
-			Utils.retryingFindAndSwitchToFrame(By
-					.id("iframe_sterilizationRecord"));
-			Utils.retryingFindAndClick(By
-					.cssSelector("div[class='x-grid3-row-checker']"));
+			if (Utils.isFind(Utils.retryingFind(By.id("sterilizationRecord")))) {
+				Utils.retryingFindAndHover(By.id("sterilizationRecord"));
+				Utils.retryingFindAndClick(By.linkText(Utils.settings
+						.getJSONObject("灭菌炉分组").getString("大型压力蒸汽")));
+				Utils.retryingFindAndSwitchToFrame(By
+						.id("iframe_sterilizationRecord"));
+				Utils.retryingFindAndClick(By
+						.cssSelector("div[class='x-grid3-row-checker']"));
+			}
 		}
 	}
 }