Index: ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java
===================================================================
diff -u -r17743 -r17751
--- ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java	(.../Utils.java)	(revision 17743)
+++ ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java	(.../Utils.java)	(revision 17751)
@@ -281,7 +281,7 @@
 	 * @param by
 	 * @return
 	 */
-	private static WebElement fluentWaitUntilFind(By by) {
+	public static WebElement fluentWaitUntilFind(By by) {
 		WebElement element;
 		Wait<WebDriver> wait = new FluentWait<WebDriver>(Utils.driver)
 				.withTimeout(5000, TimeUnit.MILLISECONDS)
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp
===================================================================
diff -u -r17747 -r17751
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp	(.../setForeignTousseDefinition.jsp)	(revision 17747)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp	(.../setForeignTousseDefinition.jsp)	(revision 17751)
@@ -145,7 +145,6 @@
 	    $.layer({
 	         type : 2,
 	         title : ['修改数量',true],
-	         id:'setAmountFrame',
 	         iframe : {src : 'updateAmount.jsp?from=errors&resolution=${param.resolution}&row='+row},
 	         area : [width + 'px' , height + 'px'],
 	         border : [5, 0.3, '#fff', true],
Index: ssts-selenium-test/src/test/java/test_4_1/Recyle.java
===================================================================
diff -u -r17747 -r17751
--- ssts-selenium-test/src/test/java/test_4_1/Recyle.java	(.../Recyle.java)	(revision 17747)
+++ ssts-selenium-test/src/test/java/test_4_1/Recyle.java	(.../Recyle.java)	(revision 17751)
@@ -154,8 +154,6 @@
 
 			Utils.retryingFindClickFirstCellOfTable(By
 					.id("awaitForRecycleTable"));
-			String recyclingFormWindowhandle = Utils.driver.getWindowHandle();
-			Utils.driver.switchTo().window(recyclingFormWindowhandle);
 			// 获取器械包的器械（材料）清单表格
 			Wait<WebDriver> wait = new FluentWait<WebDriver>(Utils.driver)
 					.withTimeout(5000, TimeUnit.MILLISECONDS)
@@ -203,7 +201,7 @@
 			Utils.retryingFindAndClick(By.linkText(Utils.settings
 					.getJSONObject("一级供应室器械包2").getString("名称")));
 
-			recyclingFormWindowhandle = Utils.driver.getWindowHandle();
+			String recyclingFormWindowhandle = Utils.driver.getWindowHandle();
 			Utils.driver.switchTo().window(recyclingFormWindowhandle);
 
 			List<WebElement> addButtons = tousseItemTable.findElements(By
@@ -711,9 +709,6 @@
 		try {
 			String a = Utils.settings.getJSONObject("临床科室").getString("条码");
 			boolean displayed = false;
-			// for (String winHandle : Utils.driver.getWindowHandles()) {
-			// Utils.driver.switchTo().window(winHandle);
-			// }
 			// 输入临床科室条码，只显示临床科室的申请单
 			Utils.retryingFindAndSendKeys(By.tagName("body"), a + "\n");
 
@@ -758,19 +753,19 @@
 			Utils.retryingFindAndClick(By.id("includeImplant1"));
 
 			Utils.retryingFindAndClick(By.id("amount1"));
+			
+			WebElement amountFrame = Utils.fluentWaitUntilFind(By.id("xubox_iframe"));
+			Utils.driver.switchTo().frame(amountFrame);
 
-			frame = Utils.retryingFindAndSwitchToFrame(By.id("xubox_iframe"));
+			Utils.retryingFindAndClick(By.id("button1"));
 
-			String x = (int) (Math.random() * 8 + 1) + "";
-			Utils.retryingFindAndClick(By.linkText(x));
+			Utils.retryingFindAndClick(By.id("button6"));
+			Utils.retryingFindAndClick(By.id("okButton"));
 
-			Utils.retryingFindAndClick(By.linkText("6"));
-			Utils.retryingFindAndClick(By.cssSelector(".btn-a"));
-
 			Utils.driver.switchTo().defaultContent();
 			frame = Utils.retryingFindAndSwitchToFrame(By.id("xubox_iframe"));
 
-			Utils.retryingFindAndClick(By.cssSelector("a[class='submit']"));
+			Utils.retryingFindAndClick(By.id("ftDefinitionSubmitButton"));
 
 			wait = new FluentWait<WebDriver>(Utils.driver)
 					.withTimeout(5000, TimeUnit.MILLISECONDS)
@@ -813,8 +808,6 @@
 			Utils.retryingFindClickFirstCellOfTable(By
 					.id("awaitForRecycleTable"));
 
-			String recyclingFormWindowhandle = Utils.driver.getWindowHandle();
-			Utils.driver.switchTo().window(recyclingFormWindowhandle);
 			// 获取器械包的器械（材料）清单表格
 			Wait<WebDriver> wait = new FluentWait<WebDriver>(Utils.driver)
 					.withTimeout(5000, TimeUnit.MILLISECONDS)
@@ -847,15 +840,14 @@
 			}
 			Utils.retryingFindAndClick(By.id("showTousseName0"));
 			Utils.driver.switchTo().defaultContent();
-			WebElement frame = Utils.retryingFindAndSwitchToFrame(By
-					.id("xubox_iframe"));
+			WebElement frame = Utils.retryingFindAndSwitchToFrame(By.id("xubox_iframe"));
 			Utils.retryingFindAndClick(By.id("amount1"));
 
-			frame = Utils.retryingFindAndSwitchToFrame(By.id("xubox_iframe"));
-
-			Utils.retryingFindAndClick(By.id("1"));
-
-			Utils.retryingFindAndClick(By.id("5"));
+			WebElement amountFrame = Utils.fluentWaitUntilFind(By.id("xubox_iframe"));
+			Utils.driver.switchTo().frame(amountFrame);
+			Thread.sleep(500);
+			Utils.retryingFindAndClick(By.id("button1"));
+			Utils.retryingFindAndClick(By.id("button5"));
 			Utils.retryingFindAndClick(By.id("okButton"));
 
 			Utils.driver.switchTo().defaultContent();
@@ -871,7 +863,7 @@
 			Alert alertBox = Utils.driver.switchTo().alert();
 			alertBox.accept();
 
-			recyclingFormWindowhandle = Utils.driver.getWindowHandle();
+			String recyclingFormWindowhandle = Utils.driver.getWindowHandle();
 			Utils.driver.switchTo().window(recyclingFormWindowhandle);
 			List<WebElement> addButtons = tousseItemTable.findElements(By
 					.cssSelector(".btn-a"));