Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java
===================================================================
diff -u -r21203 -r21336
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java	(.../SterilizationTest.java)	(revision 21203)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java	(.../SterilizationTest.java)	(revision 21336)
@@ -90,237 +90,258 @@
 						notEntryBasketTousseBarcods.get(i) + "\n");
 			}
 			Utils.retryingFindAndClick(By.id("btnBatchAddTousse")); // 一键入炉
+			if (Utils.isFind(Utils.retryingFind(By
+					.cssSelector("a[class='x-tree-node-anchor']")))) {
+				// 确认保存按钮被点击
+				wait.until(ExpectedConditions.elementToBeClickable(By
+						.id("saveBtn")));
+				// 保存灭菌记录
+				Utils.retryingFindAndClickByJavaScript(By.id("saveBtn"));
+				if (Utils.isFind(Utils.retryingFind(By
+						.xpath("//button[contains(text(), '是')]")))) {
+					Utils.retryingFindAndClick(By
+							.xpath("//button[contains(text(), '是')]"));
+				}
+				SterilizationHelper.炉次_1号高温蒸汽灭菌炉++;
 
-			// 确认保存按钮被点击
-			wait.until(ExpectedConditions.elementToBeClickable(By.id("saveBtn")));
-			// 保存灭菌记录
-			Utils.retryingFindAndClickByJavaScript(By.id("saveBtn"));
-			SterilizationHelper.炉次_1号高温蒸汽灭菌炉++;
+				// 灭菌中断
+				Utils.retryingFindAndSwitchToFrame(By
+						.id("iframe_sterilizationRecord"));
+				// 等待表单提交成功
+				if (Utils.isFind(Utils.retryingFind(By.id("formSubmitResult")))) {
+					wait.until(ExpectedConditions.attributeToBe(
+							Utils.retryingFind(By.id("formSubmitResult")),
+							"value", "1"));
+				}
+				choiceSterilizationRecord();
+				Utils.retryingFindAndClick(By.id("sterilizationInterruptBtn"));
+				Utils.driver.switchTo().window(Utils.driver.getWindowHandle());
+				Utils.retryingFindAndClick(By
+						.xpath("//button[contains(text(), '是')]"));
 
-			// 灭菌中断
-			Utils.retryingFindAndSwitchToFrame(By
-					.id("iframe_sterilizationRecord"));
-			// 等待表单提交成功
-			if (Utils.isFind(Utils.retryingFind(By.id("formSubmitResult")))) {
-				wait.until(ExpectedConditions.attributeToBe(
-						Utils.retryingFind(By.id("formSubmitResult")), "value",
-						"1"));
-			}
-			choiceSterilizationRecord();
-			Utils.retryingFindAndClick(By.id("sterilizationInterruptBtn"));
-			Utils.driver.switchTo().window(Utils.driver.getWindowHandle());
-			Utils.retryingFindAndClick(By
-					.xpath("//button[contains(text(), '是')]"));
+				// 灭菌中断后添加质量监测
+				// Utils.driver.switchTo().window(Utils.driver.getWindowHandle());
+				JSWaiter.waitUntilJQueryReady();
+				Utils.retryingFindAndSwitchToFrame(By
+						.id("iframe_sterilizationRecord"));
+				JSWaiter.waitUntilJQueryReady();
+				if (Utils.isFind(Utils.retryingFind(By.id("formName")))) {
+					Utils.retryingFindAndClick(By.id("formName"));
+					Utils.retryingFindAndSendKeys(By.id("formName"), Keys.DOWN);
+					// TODO: 下拉框没选择值
+					JSWaiter.waitUntilJQueryReady();
+					if (Utils
+							.isFind(Utils.retryingFind(By
+									.xpath("//div/div/div[contains(text(), '灭菌失败事件')]")))) {
+						Utils.retryingFindAndClick(By
+								.xpath("//div/div/div[contains(text(), '灭菌失败事件')]"));
+					}
+				}
+				Utils.retryingFindAndSendKeys(By.id("tempBarcode"),
+						notEntryBasketTousseBarcods.get(0) + "\n");
+				Utils.retryingFindAndClick(By.id("recycle"));
+				Utils.retryingFindAndClick(By
+						.xpath("//button[contains(text(), '保存')]"));
 
-			// 灭菌中断后添加质量监测
-			// Utils.driver.switchTo().window(Utils.driver.getWindowHandle());
-			JSWaiter.waitUntilJQueryReady();
-			Utils.retryingFindAndSwitchToFrame(By
-					.id("iframe_sterilizationRecord"));
-			JSWaiter.waitUntilJQueryReady();
-			if (Utils.isFind(Utils.retryingFind(By.id("formName")))) {
-				Utils.retryingFindAndClick(By.id("formName"));
-				Utils.retryingFindAndSendKeys(By.id("formName"), Keys.DOWN);
-				// TODO: 下拉框没选择值
+				// 保存按钮点击后，需要等待提交成功
+				Utils.waitForWindowAmountEquals(1, 2000);
 				JSWaiter.waitUntilJQueryReady();
+				if (Utils.isFind(Utils.retryingFind(By.id("qmSubmitResult")))) {
+					wait.until(ExpectedConditions.attributeToBe(
+							Utils.driver.findElement(By.id("qmSubmitResult")),
+							"value", "1"));
+				}
+				// 继续灭菌
+				// Utils.retryingFindAndDoAction(By.id("iframe_sterilizationRecord"),
+				// Utils.ACTION_SWITCH_TO_FRAME);
+				choiceSterilizationRecord();
+				Utils.retryingFindAndClick(By
+						.cssSelector("div[class='x-grid3-scroller']"));
+				Utils.retryingFindAndSendKeys(
+						By.cssSelector("div[class='x-grid3-scroller']"),
+						Keys.ARROW_RIGHT);
+				// Utils.retryingFindAndClick(By.id(sterilizerName + "-"
+				// + SterilizationHelper.炉次_1号高温蒸汽灭菌炉 + "-interruptionHandle"));
 				if (Utils.isFind(Utils.retryingFind(By
-						.xpath("//div/div/div[contains(text(), '灭菌失败事件')]")))) {
-					Utils.retryingFindAndClick(By
-							.xpath("//div/div/div[contains(text(), '灭菌失败事件')]"));
+						.cssSelector("img[title='重新灭菌']")))) {
+				} else {
+					Utils.retryingFindAndSendKeys(
+							By.cssSelector("div[class='x-grid3-scroller']"),
+							Keys.ARROW_RIGHT);
 				}
-			}
-			Utils.retryingFindAndSendKeys(By.id("tempBarcode"),
-					notEntryBasketTousseBarcods.get(0) + "\n");
-			Utils.retryingFindAndClick(By.id("recycle"));
-			Utils.retryingFindAndClick(By
-					.xpath("//button[contains(text(), '保存')]"));
+				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(), '是')]"));
+				// 灭菌失败
+				Utils.retryingFindAndSwitchToFrame(By
+						.id("iframe_sterilizationRecord"));
+				wait.until(ExpectedConditions.attributeToBe(
+						Utils.driver.findElement(By.id("continueSubmitResult")),
+						"value", "1"));
+				choiceSterilizationRecord();
+				Utils.retryingFindAndClick(By.id("sterilizationFailureBtn"));
+				Utils.driver.switchTo().window(Utils.driver.getWindowHandle());
+				Utils.retryingFindAndClick(By
+						.xpath("//button[contains(text(), '是')]"));
 
-			// 保存按钮点击后，需要等待提交成功
-			Utils.waitForWindowAmountEquals(1, 2000);
-			JSWaiter.waitUntilJQueryReady();
-			if (Utils.isFind(Utils.retryingFind(By.id("qmSubmitResult")))) {
+				// 灭菌失败后添加质量监测
+				// Utils.driver.switchTo().window(Utils.driver.getWindowHandle());
+
+				Utils.retryingFindAndSwitchToFrame(By
+						.id("iframe_sterilizationRecord"));
+				JSWaiter.waitUntilJQueryReady();
+				if (Utils.isFind(Utils.retryingFind(By.id("formName")))) {
+					Utils.retryingFindAndClick(By.id("formName"));
+					Utils.retryingFindAndSendKeys(By.id("formName"), Keys.DOWN);
+					// TODO: 下拉框没选择值
+					JSWaiter.waitUntilJQueryReady();
+					if (Utils
+							.isFind(Utils.retryingFind(By
+									.xpath("//div/div/div[contains(text(), '灭菌失败事件')]")))) {
+						Utils.retryingFindAndClick(By
+								.xpath("//div/div/div[contains(text(), '灭菌失败事件')]"));
+					}
+				}
+				Utils.retryingFindAndSendKeys(By.id("tempBarcode"), tempBarcode
+						+ "\n");
+				Utils.retryingFindAndClick(By.id("repacking"));
+				Utils.retryingFindAndClick(By
+						.xpath("//button[contains(text(), '保存')]"));
+
+				// 重新灭菌
+				// Utils.retryingFindAndDoAction(By.id("iframe_sterilizationRecord"),
+				// Utils.ACTION_SWITCH_TO_FRAME);
+				JSWaiter.waitUntilJQueryReady();
 				wait.until(ExpectedConditions.attributeToBe(
 						Utils.driver.findElement(By.id("qmSubmitResult")),
 						"value", "1"));
-			}
-			// 继续灭菌
-			// Utils.retryingFindAndDoAction(By.id("iframe_sterilizationRecord"),
-			// Utils.ACTION_SWITCH_TO_FRAME);
-			choiceSterilizationRecord();
-			Utils.retryingFindAndClick(By
-					.cssSelector("div[class='x-grid3-scroller']"));
-			Utils.retryingFindAndSendKeys(
-					By.cssSelector("div[class='x-grid3-scroller']"),
-					Keys.ARROW_RIGHT);
-			// Utils.retryingFindAndClick(By.id(sterilizerName + "-"
-			// + SterilizationHelper.炉次_1号高温蒸汽灭菌炉 + "-interruptionHandle"));
-			if (Utils.isFind(Utils.retryingFind(By
-					.cssSelector("img[title='重新灭菌']")))) {
-			} else {
+				JSWaiter.waitUntilJQueryReady();
+				// 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.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(), '是')]"));
-			// 灭菌失败
-			Utils.retryingFindAndSwitchToFrame(By
-					.id("iframe_sterilizationRecord"));
-			wait.until(ExpectedConditions.attributeToBe(
-					Utils.driver.findElement(By.id("continueSubmitResult")),
-					"value", "1"));
-			choiceSterilizationRecord();
-			Utils.retryingFindAndClick(By.id("sterilizationFailureBtn"));
-			Utils.driver.switchTo().window(Utils.driver.getWindowHandle());
-			Utils.retryingFindAndClick(By
-					.xpath("//button[contains(text(), '是')]"));
+				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
+				SterilizationHelper.炉次_1号高温蒸汽灭菌炉++;
 
-			// 灭菌失败后添加质量监测
-			// Utils.driver.switchTo().window(Utils.driver.getWindowHandle());
+				// 完成灭菌
+				Utils.retryingFindAndSwitchToFrame(By
+						.id("iframe_sterilizationRecord"));
+				choiceSterilizationRecord();
+				Utils.retryingFindAndClick(By.id("completeSterilizationBtn"));
+				Utils.driver.switchTo().window(Utils.driver.getWindowHandle());
 
-			Utils.retryingFindAndSwitchToFrame(By
-					.id("iframe_sterilizationRecord"));
-			JSWaiter.waitUntilJQueryReady();
-			if (Utils.isFind(Utils.retryingFind(By.id("formName")))) {
-				Utils.retryingFindAndClick(By.id("formName"));
-				Utils.retryingFindAndSendKeys(By.id("formName"), Keys.DOWN);
-				// TODO: 下拉框没选择值
-				JSWaiter.waitUntilJQueryReady();
+				// 有的医院需要扫描灭菌完成确认人
 				if (Utils.isFind(Utils.retryingFind(By
-						.xpath("//div/div/div[contains(text(), '灭菌失败事件')]")))) {
+						.id("completeUserBarcode")))) {
+					Utils.retryingFindAndSendKeys(By.id("completeUserBarcode"),
+							cssduser1Barcode + "\n");
+					Utils.retryingFindAndClickByJavaScript(By.id("saveBtn"));
+				} else if (Utils.isFind(Utils.retryingFind(By
+						.xpath("//button[contains(text(), '是')]")))) {
+					// 这里报错说明不需要扫描灭菌完成确认人
 					Utils.retryingFindAndClick(By
-							.xpath("//div/div/div[contains(text(), '灭菌失败事件')]"));
+							.xpath("//button[contains(text(), '是')]"));
 				}
-			}
-			Utils.retryingFindAndSendKeys(By.id("tempBarcode"), tempBarcode
-					+ "\n");
-			Utils.retryingFindAndClick(By.id("repacking"));
-			Utils.retryingFindAndClick(By
-					.xpath("//button[contains(text(), '保存')]"));
-
-			// 重新灭菌
-			// Utils.retryingFindAndDoAction(By.id("iframe_sterilizationRecord"),
-			// Utils.ACTION_SWITCH_TO_FRAME);
-			JSWaiter.waitUntilJQueryReady();
-			wait.until(ExpectedConditions.attributeToBe(
-					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();
-			// }
-			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
-			SterilizationHelper.炉次_1号高温蒸汽灭菌炉++;
-
-			// 完成灭菌
-			Utils.retryingFindAndSwitchToFrame(By
-					.id("iframe_sterilizationRecord"));
-			choiceSterilizationRecord();
-			Utils.retryingFindAndClick(By.id("completeSterilizationBtn"));
-			Utils.driver.switchTo().window(Utils.driver.getWindowHandle());
-
-			// 有的医院需要扫描灭菌完成确认人
-			if (Utils.isFind(Utils.retryingFind(By.id("completeUserBarcode")))) {
-				Utils.retryingFindAndSendKeys(By.id("completeUserBarcode"),
-						cssduser1Barcode + "\n");
-				Utils.retryingFindAndClickByJavaScript(By.id("saveBtn"));
-			} else if (Utils.isFind(Utils.retryingFind(By
-					.xpath("//button[contains(text(), '是')]")))) {
-				// 这里报错说明不需要扫描灭菌完成确认人
-				Utils.retryingFindAndClick(By
-						.xpath("//button[contains(text(), '是')]"));
-			}
-			Utils.retryingFindAndSwitchToFrame(By
-					.id("iframe_sterilizationRecord"));
-			try {
-				WebElement confirmBtn = Utils.driver.findElement(By
-						.id("confirmBtn"));
-				if (confirmBtn.isDisplayed()) { // 灭菌卸载、或者灭菌确认
+				Utils.retryingFindAndSwitchToFrame(By
+						.id("iframe_sterilizationRecord"));
+				try {
+					WebElement confirmBtn = Utils.driver.findElement(By
+							.id("confirmBtn"));
+					if (confirmBtn.isDisplayed()) { // 灭菌卸载、或者灭菌确认
+						choiceSterilizationRecord();
+						Utils.retryingFindAndClick(By.id("confirmBtn"));
+						Utils.driver.switchTo().window(
+								Utils.driver.getWindowHandle());
+						if (Utils.isFind(Utils.retryingFind(By
+								.id("completeUserBarcode1")))) {
+							Utils.retryingFindAndSendKeys(
+									By.id("completeUserBarcode1"),
+									cssduser1Barcode + "\n");
+							Utils.retryingFindAndClickByJavaScript(By
+									.id("saveBtn"));
+							Utils.retryingFindAndSwitchToFrame(By
+									.id("iframe_sterilizationRecord"));
+						}
+					}
+				} catch (Exception e) {
+					// 这里报错说明不需要灭菌卸载、或者灭菌确认
+				}
+				// 填写灭菌监测
+				if (Utils.isFind(Utils.retryingFind(By.id(sterilizerName + "-"
+						+ SterilizationHelper.炉次_1号高温蒸汽灭菌炉)))) {
+					Utils.retryingFindAndClick(By.id(sterilizerName + "-"
+							+ SterilizationHelper.炉次_1号高温蒸汽灭菌炉));
+				} else {
+					Utils.refresh();
+					Utils.retryingFindAndHover(By.id("sterilizationRecord"));
+					if (Utils.isFind(Utils.retryingFind(By
+							.linkText(Utils.settings.getJSONObject("灭菌炉分组")
+									.getString("大型压力蒸汽"))))) {
+						Utils.retryingFindAndClick(By.linkText(Utils.settings
+								.getJSONObject("灭菌炉分组").getString("大型压力蒸汽")));
+					}
+					Utils.retryingFindAndSwitchToFrame(By
+							.id("iframe_sterilizationRecord"));
 					choiceSterilizationRecord();
-					Utils.retryingFindAndClick(By.id("confirmBtn"));
+				}
+				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);
 					if (Utils.isFind(Utils.retryingFind(By
-							.id("completeUserBarcode1")))) {
+							.id("biologicalMonitoringStartDate")))) {
 						Utils.retryingFindAndSendKeys(
-								By.id("completeUserBarcode1"), cssduser1Barcode
-										+ "\n");
-						Utils.retryingFindAndClickByJavaScript(By.id("saveBtn"));
-						Utils.retryingFindAndSwitchToFrame(By
-								.id("iframe_sterilizationRecord"));
+								By.id("biologicalMonitoringStartDate"),
+								sdf.format(calendar.getTime()));
 					}
+					// 调短时间使发货不提示
+					calendar.add(Calendar.MINUTE, 2);
+					if (Utils.isFind(Utils.retryingFind(By
+							.id("biologicalMonitoringEndDate")))) {
+						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"));
 				}
-			} catch (Exception e) {
-				// 这里报错说明不需要灭菌卸载、或者灭菌确认
-			}
-			// 填写灭菌监测
-			if (Utils.isFind(Utils.retryingFind(By.id(sterilizerName + "-"
-					+ SterilizationHelper.炉次_1号高温蒸汽灭菌炉)))) {
-				Utils.retryingFindAndClick(By.id(sterilizerName + "-"
-						+ SterilizationHelper.炉次_1号高温蒸汽灭菌炉));
 			} else {
-				Utils.refresh();
-				Utils.retryingFindAndHover(By.id("sterilizationRecord"));
-				if (Utils.isFind(Utils.retryingFind(By.linkText(Utils.settings
-						.getJSONObject("灭菌炉分组").getString("大型压力蒸汽"))))) {
-					Utils.retryingFindAndClick(By.linkText(Utils.settings
-							.getJSONObject("灭菌炉分组").getString("大型压力蒸汽")));
-				}
-				Utils.retryingFindAndSwitchToFrame(By
-						.id("iframe_sterilizationRecord"));
-				choiceSterilizationRecord();
+				Utils.retryingFindAndClick(By
+						.xpath("//button[contains(text(), '取消')]"));
+				System.out.print("没有待灭菌的物品");
 			}
-			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);
-				if (Utils.isFind(Utils.retryingFind(By
-						.id("biologicalMonitoringStartDate")))) {
-					Utils.retryingFindAndSendKeys(
-							By.id("biologicalMonitoringStartDate"),
-							sdf.format(calendar.getTime()));
-				}
-				// 调短时间使发货不提示
-				calendar.add(Calendar.MINUTE, 2);
-				if (Utils.isFind(Utils.retryingFind(By
-						.id("biologicalMonitoringEndDate")))) {
-					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) {
@@ -347,13 +368,15 @@
 				Utils.retryingFindAndHover(By.id("sterilizationRecord"));
 				if (Utils.isFind(Utils.retryingFind(By.linkText(Utils.settings
 						.getJSONObject("灭菌炉分组").getString("大型压力蒸汽"))))) {
+					Utils.retryingFindAndHover(By.linkText(Utils.settings
+							.getJSONObject("灭菌炉分组").getString("大型压力蒸汽")));
 					Utils.retryingFindAndClick(By.linkText(Utils.settings
 							.getJSONObject("灭菌炉分组").getString("大型压力蒸汽")));
+					Utils.retryingFindAndSwitchToFrame(By
+							.id("iframe_sterilizationRecord"));
+					Utils.retryingFindAndClick(By
+							.cssSelector("div[class='x-grid3-row-checker']"));
 				}
-				Utils.retryingFindAndSwitchToFrame(By
-						.id("iframe_sterilizationRecord"));
-				Utils.retryingFindAndClick(By
-						.cssSelector("div[class='x-grid3-row-checker']"));
 			}
 		}
 	}
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Disinfection.java
===================================================================
diff -u -r21325 -r21336
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Disinfection.java	(.../Disinfection.java)	(revision 21325)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Disinfection.java	(.../Disinfection.java)	(revision 21336)
@@ -1229,53 +1229,69 @@
 						Utils.settings.getJSONObject("灭菌篮筐001").getString("条码")
 								+ "\n");
 				JSWaiter.waitUntilJQueryReady();
-				if(Utils.isFind(Utils.retryingFind(By.cssSelector("a[class='x-tree-node-anchor']")))){
-				Utils.retryingFindAndClickByJavaScript(By
-						.xpath("//button[contains(text(), '保存')]"));
-				Utils.retryingFindAndSwitchToFrame(By
-						.id("iframe_sterilizationRecord"));
-				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
-						.xpath("//p[contains(text(), '灭菌中')]"));
-				Utils.retryingFindAndClick(By
-						.xpath("//button[contains(text(), '完成灭菌')]"));
-				String currentwindowhandle = Utils.driver.getWindowHandle();
-				Utils.driver.switchTo().window(currentwindowhandle);
-				WebElement element = Utils.retryingFind(By
-						.xpath("//button[contains(text(), '是')]"));
-				if (Utils.isFind(element)) {
+				if (Utils.isFind(Utils.retryingFind(By
+						.cssSelector("a[class='x-tree-node-anchor']")))) {
+					Utils.retryingFindAndClickByJavaScript(By
+							.xpath("//button[contains(text(), '保存')]"));
+					if (Utils.isFind(Utils.retryingFind(By
+							.xpath("//button[contains(text(), '是')]")))) {
+						Utils.retryingFindAndClick(By
+								.xpath("//button[contains(text(), '是')]"));
+					}
+					if (Utils.isFind(Utils.retryingFind(By
+							.id("sterilizationRecordWin")))) {
+						Utils.retryingFindAndClick(By
+								.id("sterilizationRecordWin"));
+						Utils.retryingFindAndClick(By
+								.xpath("//button[contains(text(), '保存')]"));
+					}
+					Utils.retryingFindAndSwitchToFrame(By
+							.id("iframe_sterilizationRecord"));
 					Utils.retryingFindAndClick(By
-							.xpath("//button[contains(text(), '是')]"));
-				} else {
+							.cssSelector("div[class='x-grid3-scroller']"));
 					Utils.retryingFindAndSendKeys(
-							By.id("completeUserBarcode"),
-							Utils.settings.getJSONObject("二级供应室用户").getString(
-									"条码")
-									+ "\n");
-					Utils.retryingFindAndClick(By
-							.xpath("//button[contains(text(), '保存')]"));
+							By.cssSelector("div[class='x-grid3-scroller']"),
+							Keys.ARROW_RIGHT);
+					Utils.retryingFindAndSendKeys(
+							By.cssSelector("div[class='x-grid3-scroller']"),
+							Keys.ARROW_RIGHT);
+					if (Utils.isFind(Utils.retryingFind(By
+							.xpath("//p[contains(text(), '灭菌中')]")))) {
+						Utils.retryingFindAndClick(By
+								.xpath("//p[contains(text(), '灭菌中')]"));
+						Utils.retryingFindAndClick(By
+								.xpath("//button[contains(text(), '完成灭菌')]"));
+						String currentwindowhandle = Utils.driver
+								.getWindowHandle();
+						Utils.driver.switchTo().window(currentwindowhandle);
+						WebElement element = Utils.retryingFind(By
+								.xpath("//button[contains(text(), '是')]"));
+						if (Utils.isFind(element)) {
+							Utils.retryingFindAndClick(By
+									.xpath("//button[contains(text(), '是')]"));
+						} else {
+							Utils.retryingFindAndSendKeys(
+									By.id("completeUserBarcode"),
+									Utils.settings.getJSONObject("二级供应室用户")
+											.getString("条码") + "\n");
+							Utils.retryingFindAndClick(By
+									.xpath("//button[contains(text(), '保存')]"));
+						}
+						Utils.retryingFindAndSwitchToFrame(By
+								.id("iframe_sterilizationRecord"));
+						element = Utils.retryingFind(By
+								.xpath("//button[contains(text(), '灭菌确认')]"));
+						if (Utils.isFind(element)) {
+							confirm_One();
+						}
+						element = Utils.retryingFind(By
+								.xpath("//button[contains(text(), '灭菌卸载')]"));
+						if (Utils.isFind(element)) {
+							confirm_One();
+						}
+					}
 				}
-				Utils.retryingFindAndSwitchToFrame(By
-						.id("iframe_sterilizationRecord"));
-				element = Utils.retryingFind(By
-						.xpath("//button[contains(text(), '灭菌确认')]"));
-				if (Utils.isFind(element)) {
-					confirm_One();
-				}
-				element = Utils.retryingFind(By
-						.xpath("//button[contains(text(), '灭菌卸载')]"));
-				if (Utils.isFind(element)) {
-					confirm_One();
-				}
-			}}
-			else{
+			} else {
 				Utils.retryingFindAndClick(By
 						.xpath("//button[contains(text(), '取消')]"));
 				System.out.print("没有待灭菌的物品");
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java
===================================================================
diff -u -r21203 -r21336
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java	(.../Assemble.java)	(revision 21203)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java	(.../Assemble.java)	(revision 21336)
@@ -119,7 +119,15 @@
 							+ "\n");
 			Utils.retryingFindAndClick(By.id("checkAllTaskNode-inputRow"));
 			scan();
-			choice();
+			WebElement element = Utils.retryingFind(By
+					.cssSelector("input[name='sterilingType']"));
+			String name = Utils.settings.getJSONObject("灭菌程序").getString("名称1");
+			if (Utils.isFind(element)) {
+				element.click();
+				element.sendKeys(Keys.DOWN);
+				Utils.retryingFindAndClick(By
+						.xpath("//div/ul/li[contains(text(), '" + name + "')]"));
+			}
 			Utils.retryingFindAndClick(By.id("save_print"));
 			JSWaiter.waitUntilJQueryReady();
 			/** 获取装配成功后的条码 **/
@@ -873,6 +881,15 @@
 				System.out.println("本次装配条码：" + Utils.barcodes);
 				System.out.println("所有装配条码：" + Utils.reBarcodes);
 			}
+			if (Utils.isFind(Utils.retryingFind(By.id("foreignTousseWin")))) {
+				System.out.println("外来器械拆包窗口未消失");
+				if (Utils
+						.isFind(Utils.retryingFind(By
+								.cssSelector("img[class='x4-tool-img x4-tool-close']")))) {
+					Utils.retryingFindAndClick(By
+							.cssSelector("img[class='x4-tool-img x4-tool-close']"));
+				}
+			}
 		} catch (Exception e) {
 			e.printStackTrace();
 			AssertJUnit.fail(e.getMessage());
@@ -1062,14 +1079,16 @@
 					}
 				});
 			}
+			if (Utils.isFind(Utils.retryingFind(By
+					.id("packageType-triggerWrap")))) {
+				Utils.retryingFindAndClick(By.id("packageType-triggerWrap"));
 
-			Utils.retryingFindAndClick(By.id("packageType-triggerWrap"));
+				name = Utils.settings.getJSONObject("包装类型").getString("名称1");
+				Utils.retryingFindAndClickBySeleniumAPI(By
+						.xpath("//div/ul/li[contains(text(), '" + name + "')]"));
 
-			name = Utils.settings.getJSONObject("包装类型").getString("名称1");
-			Utils.retryingFindAndClickBySeleniumAPI(By
-					.xpath("//div/ul/li[contains(text(), '" + name + "')]"));
-
-			isAlertPresent();
+				isAlertPresent();
+			}
 			Utils.retryingFindAndClick(By.id("save_print"));
 			/** 获取装配成功后的条码 **/
 			Utils.barcodes = Utils.getToussesBarcodes();