Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Wash.java
===================================================================
diff -u -r19931 -r19949
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Wash.java	(.../Wash.java)	(revision 19931)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Wash.java	(.../Wash.java)	(revision 19949)
@@ -321,12 +321,11 @@
 			wait.until(ExpectedConditions.attributeToBe(
 					Utils.driver.findElement(By.id("washSaveSubmitResult")),
 					"value", "1"));
-			Utils.retryingFindAndClick(By.xpath("//p[contains(text(), '清洗中')]"));
+//			Utils.retryingFindAndClick(By.xpath("//p[contains(text(), '清洗中')]"));
 			WebElement element1 = Utils.retryingFind(By
 					.cssSelector("div[class='x-grid3-row-checker']"));
 			if (Utils.isFind(element1)) {
 				if (element1.isSelected()) {
-
 				} else {
 					element1.click();
 				}
@@ -346,6 +345,49 @@
 			wait2.until(ExpectedConditions.attributeToBe(
 					Utils.driver.findElement(By.id("washSaveConfirm")),
 					"value", "1"));
+			if (Utils.isFind(Utils.retryingFind(By
+					.xpath("//p[contains(text(), '清洗中')]")))) {
+				element1 = Utils.retryingFind(By
+						.cssSelector("div[class='x-grid3-row-checker']"));
+				if (Utils.isFind(element1)) {
+					if (element1.isSelected()) {
+						// 重新清洗后完成
+						Utils.retryingFindAndClick(By
+								.xpath("//button[contains(text(), '清洗完成')]"));
+						Utils.driver.switchTo().defaultContent();
+						currentwindowhandle = Utils.driver.getWindowHandle();
+						Utils.driver.switchTo().window(currentwindowhandle);
+						Utils.retryingFindAndClick(By
+								.xpath("//button[contains(text(), '是')]"));
+						// 定位回来
+						Utils.retryingFindAndSwitchToFrame(By
+								.id("iframe_washAndDisinfect"));
+						// 需要判断表单提交成功且返回正常后才能结束,否则就将不会提交到后台
+						wait2 = WaitFactory.createDefaultWait();
+						wait2.until(ExpectedConditions.attributeToBe(
+								Utils.driver.findElement(By
+										.id("washSaveConfirm")), "value", "1"));
+					} else {
+						element1.click();
+						// 重新清洗后完成
+						Utils.retryingFindAndClick(By
+								.xpath("//button[contains(text(), '清洗完成')]"));
+						Utils.driver.switchTo().defaultContent();
+						currentwindowhandle = Utils.driver.getWindowHandle();
+						Utils.driver.switchTo().window(currentwindowhandle);
+						Utils.retryingFindAndClick(By
+								.xpath("//button[contains(text(), '是')]"));
+						// 定位回来
+						Utils.retryingFindAndSwitchToFrame(By
+								.id("iframe_washAndDisinfect"));
+						// 需要判断表单提交成功且返回正常后才能结束,否则就将不会提交到后台
+						wait2 = WaitFactory.createDefaultWait();
+						wait2.until(ExpectedConditions.attributeToBe(
+								Utils.driver.findElement(By
+										.id("washSaveConfirm")), "value", "1"));
+					}
+				}
+			}
 		} catch (Exception e) {
 			e.printStackTrace();
 			AssertJUnit.fail(e.getMessage());
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java
===================================================================
diff -u -r19936 -r19949
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java	(.../SterilizationTest.java)	(revision 19936)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java	(.../SterilizationTest.java)	(revision 19949)
@@ -30,9 +30,9 @@
 	@Test
 	public static void sterilizationSeriesOperationsOfFristSupplyRoom() {
 		try {
-			// Utils.init();
-			// Login login = new Login();
-			// login.login_oneSupplyRoom();
+//			 Utils.init();
+//			 Login login = new Login();
+//			 login.login_oneSupplyRoom();
 			Wait<WebDriver> wait = WaitFactory.createDefaultWait();
 			Utils.driver.switchTo().defaultContent();
 			Utils.retryingFindAndClick(By
@@ -63,7 +63,7 @@
 					.getString("条码");
 			String text = Utils.retryingFindAndGetText(By
 					.id("sterilizationUser"));
-
+			
 			// 扫描灭菌炉条码=》灭菌程序条码=》用户条码=》灭菌目的选择“器械包灭菌”=》篮筐或者器械包条码
 			Utils.retryingFindAndSendKeys(By.id("inputBarcode"),
 					sterilizerBarcode + "\n");
@@ -103,20 +103,7 @@
 			// 等待表单提交成功
 			wait.until(ExpectedConditions.attributeToBe(
 					Utils.retryingFind(By.id("formSubmitResult")), "value", "1"));
-			if (Utils.isFind(Utils.retryingFind(By.id(sterilizerName + "-"
-					+ SterilizationHelper.炉次_1号高温蒸汽灭菌炉)))) {
-				Utils.retryingFindAndClick(By.id(sterilizerName + "-"
-						+ SterilizationHelper.炉次_1号高温蒸汽灭菌炉));
-			} else {
-				if (Utils.retryingFind(
-						By.cssSelector("div[class='x-grid3-row-checker']"))
-						.isSelected()) {
-
-				} else {
-					Utils.retryingFindAndClick(By
-							.cssSelector("div[class='x-grid3-row-checker']"));
-				}
-			}
+			choiceSterilizationRecord();
 			Utils.retryingFindAndClick(By.id("sterilizationInterruptBtn"));
 			Utils.driver.switchTo().window(Utils.driver.getWindowHandle());
 			Utils.retryingFindAndClick(By
@@ -155,22 +142,26 @@
 			// 继续灭菌
 			// Utils.retryingFindAndDoAction(By.id("iframe_sterilizationRecord"),
 			// Utils.ACTION_SWITCH_TO_FRAME);
-			Utils.retryingFindAndClick(By.id(sterilizerName + "-"
-					+ SterilizationHelper.炉次_1号高温蒸汽灭菌炉 + "-interruptionHandle"));
+			choiceSterilizationRecord();
+			Utils.retryingFindAndClick(By.cssSelector("div[class='x-grid3-scroller']"));
+			Utils.retryingFindAndSendKeys(By.cssSelector("div[class='x-grid3-scroller']"), Keys.ARROW_RIGHT);
+			Utils.retryingFindAndSendKeys(By.cssSelector("div[class='x-grid3-scroller']"), Keys.ARROW_RIGHT);
+//			Utils.retryingFindAndClick(By.id(sterilizerName + "-"
+//					+ SterilizationHelper.炉次_1号高温蒸汽灭菌炉 + "-interruptionHandle"));
+			Utils.retryingFindAndClick(By.cssSelector("img[title='重新灭菌']"));
 			Utils.driver.switchTo().window(Utils.driver.getWindowHandle());
 			Utils.retryingFindAndClick(By.id("continueBtn"));
 			Utils.driver.switchTo().window(Utils.driver.getWindowHandle());
 			Utils.retryingFindAndClick(By
-					.xpath("//button[contains(text(), '是')]"));
+					.xpath("//button[contains(text(), '是')]"));;
 
 			// 灭菌失败
 			Utils.retryingFindAndSwitchToFrame(By
 					.id("iframe_sterilizationRecord"));
 			wait.until(ExpectedConditions.attributeToBe(
 					Utils.driver.findElement(By.id("continueSubmitResult")),
 					"value", "1"));
-			Utils.retryingFindAndClick(By.id(sterilizerName + "-"
-					+ SterilizationHelper.炉次_1号高温蒸汽灭菌炉));
+			choiceSterilizationRecord();
 			Utils.retryingFindAndClick(By.id("sterilizationFailureBtn"));
 			Utils.driver.switchTo().window(Utils.driver.getWindowHandle());
 			Utils.retryingFindAndClick(By
@@ -207,11 +198,16 @@
 					Utils.driver.findElement(By.id("qmSubmitResult")), "value",
 					"1"));
 			JSWaiter.waitUntilJQueryReady();
-			WebElement element = Utils.retryingFind(By.id(sterilizerName + "-"
-					+ SterilizationHelper.炉次_1号高温蒸汽灭菌炉 + "-failureHandle"));
-			if (Utils.isFind(element)) {
-				element.click();
-			}
+//			WebElement element = Utils.retryingFind(By.id(sterilizerName + "-"
+//					+ SterilizationHelper.炉次_1号高温蒸汽灭菌炉 + "-failureHandle"));
+//			if (Utils.isFind(element)) {
+//				element.click();
+//			}
+			choiceSterilizationRecord();
+			Utils.retryingFindAndClick(By.cssSelector("div[class='x-grid3-scroller']"));
+			Utils.retryingFindAndSendKeys(By.cssSelector("div[class='x-grid3-scroller']"), Keys.ARROW_RIGHT);
+			Utils.retryingFindAndSendKeys(By.cssSelector("div[class='x-grid3-scroller']"), Keys.ARROW_RIGHT);
+			Utils.retryingFindAndClick(By.cssSelector("img[title='重新灭菌']"));
 			Utils.driver.switchTo().window(Utils.driver.getWindowHandle());
 			Utils.retryingFindAndClick(By
 					.xpath("//button[contains(text(), '重新灭菌')]")); // 他的id是saveBtn
@@ -220,8 +216,7 @@
 			// 完成灭菌
 			Utils.retryingFindAndSwitchToFrame(By
 					.id("iframe_sterilizationRecord"));
-			Utils.retryingFindAndClick(By.id(sterilizerName + "-"
-					+ SterilizationHelper.炉次_1号高温蒸汽灭菌炉));
+			choiceSterilizationRecord();
 			Utils.retryingFindAndClick(By.id("completeSterilizationBtn"));
 			Utils.driver.switchTo().window(Utils.driver.getWindowHandle());
 
@@ -242,8 +237,7 @@
 				WebElement confirmBtn = Utils.driver.findElement(By
 						.id("confirmBtn"));
 				if (confirmBtn.isDisplayed()) { // 灭菌卸载、或者灭菌确认
-					Utils.retryingFindAndClick(By.id(sterilizerName + "-"
-							+ SterilizationHelper.炉次_1号高温蒸汽灭菌炉));
+					choiceSterilizationRecord();
 					Utils.retryingFindAndClick(By.id("confirmBtn"));
 					Utils.driver.switchTo().window(
 							Utils.driver.getWindowHandle());
@@ -272,8 +266,7 @@
 						.getJSONObject("灭菌炉分组").getString("大型压力蒸汽")));
 				Utils.retryingFindAndSwitchToFrame(By
 						.id("iframe_sterilizationRecord"));
-				Utils.retryingFindAndClick(By.id(sterilizerName + "-"
-						+ SterilizationHelper.炉次_1号高温蒸汽灭菌炉));
+				choiceSterilizationRecord();
 			}
 			Utils.retryingFindAndClick(By.id("modifyBtn"));
 			Utils.driver.switchTo().window(Utils.driver.getWindowHandle());
@@ -305,4 +298,22 @@
 		}
 	}
 
+	private static void choiceSterilizationRecord() {
+		JSONObject sterilizerObj = Utils.settings.getJSONObject("1号高温蒸汽灭菌炉");
+		String sterilizerName = sterilizerObj.getString("名称");
+		if (Utils.isFind(Utils.retryingFind(By.id(sterilizerName + "-"
+				+ SterilizationHelper.炉次_1号高温蒸汽灭菌炉)))) {
+			Utils.retryingFindAndClick(By.id(sterilizerName + "-"
+					+ SterilizationHelper.炉次_1号高温蒸汽灭菌炉));
+		} else {
+			if (Utils.retryingFind(
+					By.cssSelector("div[class='x-grid3-row-checker']"))
+					.isSelected()) {
+
+			} else {
+				Utils.retryingFindAndClick(By
+						.cssSelector("div[class='x-grid3-row-checker']"));
+			}
+		}
+	}
 }