Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
===================================================================
diff -u -r19892 -r19915
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java	(.../Recyle.java)	(revision 19892)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java	(.../Recyle.java)	(revision 19915)
@@ -543,7 +543,7 @@
 			Utils.retryingFindAndClick(By.id("recyclingErrorTable"));
 			// 点击第1行的+号按钮
 			Utils.retryingFindAndClick(By.id("addButton0"));
-			if(Utils.isFind(Utils.retryingFind(By.id("errorRemark")))){
+			if (Utils.isFind(Utils.retryingFind(By.id("errorRemark")))) {
 				Utils.retryingFindAndSendKeys(By.id("errorRemark"), "丢失标识牌");
 			}
 			Utils.retryingFindAndClick(By.id("errorSubmitButton"));
@@ -554,14 +554,15 @@
 
 			Utils.retryingFindAndClick(By.id("recyclingDamageForm"));
 			Utils.retryingFindAndClick(By.id("addButton0"));
-			
-			if(Utils.isFind(Utils.retryingFind(By.id("damageRemark")))){
+
+			if (Utils.isFind(Utils.retryingFind(By.id("damageRemark")))) {
 				Utils.retryingFindAndSendKeys(By.id("damageRemark"), "报损材料");
 			}
 			Utils.retryingFindAndClick(By.id("damageSubmitButton"));
 			// 加急
 			Utils.driver.switchTo().defaultContent();
-			Utils.retryingFindAndClick(By.id("urgentAmountDiv0"));
+			Utils.retryingFindAndClick(By
+					.cssSelector("div[id^='urgentAmountDiv']"));
 			Utils.retryingFindAndSwitchToFrame(By.tagName("iframe"));
 			Utils.retryingFindAndClick(By.id("recyclingErrorTable"));
 			Utils.retryingFindAndClick(By.id("addButton0"));
@@ -571,7 +572,6 @@
 				Utils.retryingFindAndClick(By.cssSelector("option[value='加急']"));
 			}
 			Utils.retryingFindAndClick(By.id("urgentSubmitButton"));
-			JSWaiter.waitUntilJQueryReady();
 			Utils.driver.switchTo().defaultContent();
 			// 扫描篮筐条码
 			recycleForm.sendKeys(Utils.settings.getJSONObject("一级供应室清洗篮筐3")
@@ -668,7 +668,7 @@
 			Utils.retryingFindAndClick(By.id("recyclingErrorTable"));
 			// 点击第1行的+号按钮
 			Utils.retryingFindAndClick(By.id("addButton0"));
-			if(Utils.isFind(Utils.retryingFind(By.id("errorRemark")))){
+			if (Utils.isFind(Utils.retryingFind(By.id("errorRemark")))) {
 				Utils.retryingFindAndSendKeys(By.id("errorRemark"), "丢失材料");
 			}
 			Utils.retryingFindAndClick(By.id("errorSubmitButton"));
@@ -1063,10 +1063,11 @@
 
 	@AfterMethod
 	public void after() {
-		Utils.driver.quit();
-		WindowsUtils.killByName("IEDriverServer.exe");
-		WindowsUtils.killByName("iexplore.exe");
-		WindowsUtils.killByName("iexplore.exe *32");
+			JSWaiter.waitUntilJQueryReady();
+			Utils.driver.quit();
+			WindowsUtils.killByName("IEDriverServer.exe");
+			WindowsUtils.killByName("iexplore.exe");
+			WindowsUtils.killByName("iexplore.exe *32");
 	}
 
 	/**
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java
===================================================================
diff -u -r19892 -r19915
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java	(.../Assemble.java)	(revision 19892)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java	(.../Assemble.java)	(revision 19915)
@@ -1145,6 +1145,7 @@
 
 	@AfterMethod
 	public void after() {
+		JSWaiter.waitUntilJQueryReady();
 		Utils.driver.quit();
 		WindowsUtils.killByName("IEDriverServer.exe");
 		WindowsUtils.killByName("iexplore.exe");
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Wash.java
===================================================================
diff -u -r19861 -r19915
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Wash.java	(.../Wash.java)	(revision 19861)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Wash.java	(.../Wash.java)	(revision 19915)
@@ -3,6 +3,8 @@
  */
 package test.forgon.disinfectsystem.selenium;
 
+import java.io.IOException;
+
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
 import org.testng.annotations.BeforeMethod;
@@ -270,7 +272,7 @@
 
 			// Utils.retryingFindAndClick(By.cssSelector("p[style='background-color:yellow']"));
 			Utils.retryingFindAndClick(By.xpath("//p[contains(text(), '清洗中')]"));
-
+			JSWaiter.waitUntilJQueryReady();
 			Utils.retryingFindAndClick(By
 					.xpath("//button[contains(text(), '清洗失败')]"));
 			JSWaiter.waitUntilJQueryReady();
@@ -494,9 +496,11 @@
 
 	@AfterMethod
 	public void after() {
-		Utils.driver.quit();
-		WindowsUtils.killByName("IEDriverServer.exe");
-		WindowsUtils.killByName("iexplore.exe");
-		WindowsUtils.killByName("iexplore.exe *32");
+			JSWaiter.waitUntilJQueryReady();
+			Utils.driver.quit();
+			WindowsUtils.killByName("IEDriverServer.exe");
+			WindowsUtils.killByName("iexplore.exe");
+			WindowsUtils.killByName("iexplore.exe *32");
+
 	}
 }
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
===================================================================
diff -u -r19902 -r19915
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java	(.../ALL.java)	(revision 19902)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java	(.../ALL.java)	(revision 19915)
@@ -2,8 +2,8 @@
 
 import java.io.File;
 import java.io.FilenameFilter;
-import java.io.IOException;
 import java.text.SimpleDateFormat;
+import java.util.Set;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.log4j.Logger;
@@ -72,6 +72,7 @@
 			// 然后再运行申请单的测试
 			ChainConsumer.doApplyForMultiple(DeskIconEnum.GDSY);
 			logger.info("申请流程结束..........");
+			JSWaiter.waitUntilJQueryReady();
 			Utils.driver.quit();
 
 		} catch (Exception e) {
@@ -113,10 +114,10 @@
 	@Test
 	public void all() {
 		try {
-			initCSSDData();
-			// 由于省医增加配置一次性物品没库存无法申请,调整一次性物品入库到申请前
-			oneUse();
-			before();
+			 initCSSDData();
+			 // 由于省医增加配置一次性物品没库存无法申请,调整一次性物品入库到申请前
+			 oneUse();
+			 before();
 			System.out.print("回收开始:");
 			Utils.DateTime();
 			login.init();
@@ -474,20 +475,23 @@
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-		try {
-			Utils.driver.quit();
-			WindowsUtils.killByName("IEDriverServer.exe");
-			WindowsUtils.killByName("iexplore.exe");
-			// TODO:暂时用下面语句杀掉IE进程，解决IE8，win7运行后装配界面没有关闭的问题
-			WindowsUtils.killByName("iexplore.exe *32");
+		Set<String> allWindowsId = Utils.driver.getWindowHandles();
+		for (String windowID : allWindowsId) {
+			if (Utils.driver.switchTo().window(windowID).getTitle()
+					.contains("消毒")) {
+				Utils.driver.switchTo().window(windowID);
+				System.out.println(windowID);
+				JSWaiter.waitUntilJQueryReady();
+				Utils.driver.quit();
+				WindowsUtils.killByName("conhost.exe");
+				WindowsUtils.killByName("IEDriverServer.exe *32");
+				WindowsUtils.killByName("iexplore.exe");
+				// TODO:暂时用下面语句杀掉IE进程，解决IE8，win7运行后装配界面没有关闭的问题
+				WindowsUtils.killByName("iexplore.exe *32");
+				continue;
+			}
 
-			Runtime.getRuntime()
-					.exec("taskkill /F /im " + "IEDriverServer.exe");
-			Runtime.getRuntime().exec("taskkill /F /im " + "iexplore.exe");
-			Runtime.getRuntime().exec("taskkill /F /im " + "iexplore.exe *32");
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
 		}
+
 	}
 }