Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Reject.java
===================================================================
diff -u -r19666 -r19680
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Reject.java	(.../Reject.java)	(revision 19666)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Reject.java	(.../Reject.java)	(revision 19680)
@@ -24,16 +24,15 @@
 			Login login = new Login();
 			login.login_oneSupplyRoom();
 			Utils.retryingFindAndClick(By.id("enterpriseView"));
-			Utils.retryingFindAndSwitchToFrame(By
-					.id("iframe_enterpriseView"));
-			Utils.retryingFindAndClick(
-					By.xpath("//div/span[contains(text(), '后台监控管理')]"));
+			Utils.retryingFindAndSwitchToFrame(By.id("iframe_enterpriseView"));
+			Utils.retryingFindAndClick(By
+					.xpath("//div/span[contains(text(), '后台监控管理')]"));
 
-			Utils.retryingFindAndClick(
-					By.xpath("//div/a/span[contains(text(), '退货记录管理')]"));
+			Utils.retryingFindAndClick(By
+					.xpath("//div/a/span[contains(text(), '退货记录管理')]"));
 
-			Utils.retryingFindAndClick(
-					By.xpath("//div/a/span[contains(text(), '退货记录信息')]"));
+			Utils.retryingFindAndClick(By
+					.xpath("//div/a/span[contains(text(), '退货记录信息')]"));
 
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -49,34 +48,48 @@
 		try {
 
 			Utils.retryingFindAndSwitchToFrame(By.id("mainFrame"));
-			Utils.retryingFindAndClick(
-					By.xpath("//button[contains(text(), '一次性物品退货')]"));
+			Utils.retryingFindAndClick(By
+					.xpath("//button[contains(text(), '一次性物品退货')]"));
 			String currentwindowhandle = Utils.driver.getWindowHandle();
 			Utils.driver.switchTo().window(currentwindowhandle);
 			JSWaiter.waitUntilJQueryReady();
-			Utils.retryingFindAndSendKeys(By.id("depart"),Keys.DOWN);
-			String name = Utils.settings.getJSONObject("临床科室").getString("名称");
+			if (Utils.isFind(Utils.retryingFind(By.id("depart")))) {
+				Utils.retryingFindAndClick(By.id("depart"));
+				Utils.retryingFindAndSendKeys(By.id("depart"), Keys.DOWN);
+				String name = Utils.settings.getJSONObject("临床科室").getString(
+						"名称");
+				if (Utils.isFind(Utils.retryingFind(By
+						.xpath("//div/div/div[contains(text(), '" + name
+								+ "')]")))) {
+					Utils.retryingFindAndClick(By
+							.xpath("//div/div/div[contains(text(), '" + name
+									+ "')]"));
+					Utils.retryingFindAndSendKeys(By.id("warehouse"), Keys.DOWN);
+					name = Utils.settings.getJSONObject("一级供应室用户").getString(
+							"科室名称");
 
-			Utils.retryingFindAndClick(
-					By.xpath("//div/div/div[contains(text(), '" + name + "')]"));
-			Utils.retryingFindAndSendKeys(By.id("warehouse"),Keys.DOWN);
-			name = Utils.settings.getJSONObject("一级供应室用户").getString("科室名称");
-
-			Utils.retryingFindAndClick(
-					By.xpath("//div/div/div[contains(text(), '" + name + "')]"));
-			if (CollectionUtils
-					.isNotEmpty(Utils.disposableGoodsBatchBarcodesAfterEntry)) {
-				for (String barcode : Utils.disposableGoodsBatchBarcodesAfterEntry) {
-					Utils.retryingFindAndSendKeys(By.id("barcode"), barcode
-							+ "\n");
-					Utils.retryingFindAndSendKeys(By.id("combo_price"), Keys.DOWN+"\n");
-					Utils.retryingFindAndClick(By.xpath("//button[contains(text(), '添加')]"));
+					Utils.retryingFindAndClick(By
+							.xpath("//div/div/div[contains(text(), '" + name
+									+ "')]"));
+					if (CollectionUtils
+							.isNotEmpty(Utils.disposableGoodsBatchBarcodesAfterEntry)) {
+						for (String barcode : Utils.disposableGoodsBatchBarcodesAfterEntry) {
+							Utils.retryingFindAndSendKeys(By.id("barcode"),
+									barcode + "\n");
+							Utils.retryingFindAndSendKeys(By.id("combo_price"),
+									Keys.DOWN + "\n");
+							Utils.retryingFindAndClick(By
+									.xpath("//button[contains(text(), '添加')]"));
+						}
+					}
+					Utils.retryingFindAndClick(By
+							.xpath("//button[contains(text(), '保存')]"));
+					currentwindowhandle = Utils.driver.getWindowHandle();
+					Utils.driver.switchTo().window(currentwindowhandle);
+					Utils.retryingFindAndClick(By
+							.xpath("//button[contains(text(), '是')]"));
 				}
 			}
-			Utils.retryingFindAndClick(By.xpath("//button[contains(text(), '保存')]"));
-			currentwindowhandle = Utils.driver.getWindowHandle();
-			Utils.driver.switchTo().window(currentwindowhandle);
-			Utils.retryingFindAndClick(By.xpath("//button[contains(text(), '是')]"));
 		} catch (Exception e) {
 			e.printStackTrace();
 			AssertJUnit.fail(e.getMessage());
@@ -91,36 +104,38 @@
 		try {
 			Utils.refresh();
 			Utils.retryingFindAndClick(By.id("enterpriseView"));
-			Utils.retryingFindAndSwitchToFrame(By
-					.id("iframe_enterpriseView"));
-			Utils.retryingFindAndClick(
-					By.xpath("//div/span[contains(text(), '后台监控管理')]"));
+			Utils.retryingFindAndSwitchToFrame(By.id("iframe_enterpriseView"));
+			Utils.retryingFindAndClick(By
+					.xpath("//div/span[contains(text(), '后台监控管理')]"));
 
-			Utils.retryingFindAndClick(
-					By.xpath("//div/a/span[contains(text(), '退货记录管理')]"));
+			Utils.retryingFindAndClick(By
+					.xpath("//div/a/span[contains(text(), '退货记录管理')]"));
 
-			Utils.retryingFindAndClick(
-					By.xpath("//div/a/span[contains(text(), '材料退货记录')]"));
+			Utils.retryingFindAndClick(By
+					.xpath("//div/a/span[contains(text(), '材料退货记录')]"));
 
 			Utils.retryingFindAndSwitchToFrame(By.id("mainFrame"));
-			Utils.retryingFindAndClick(By.xpath("//button[contains(text(), '添加')]"));
+			Utils.retryingFindAndClick(By
+					.xpath("//button[contains(text(), '添加')]"));
 			String currentwindowhandle = Utils.driver.getWindowHandle();
 			Utils.driver.switchTo().window(currentwindowhandle);
 			String name = Utils.settings.getJSONObject("临床科室").getString("名称");
 
-			Utils.retryingFindAndSendKeys(By.id("depart"),Keys.DOWN);
-			Utils.retryingFindAndClick(
-					By.xpath("//div/div/div[contains(text(), '" + name + "')]"));
-			Utils.retryingFindAndSendKeys(By.id("warehouse"),Keys.DOWN + "\n");
-			Utils.retryingFindAndSendKeys(By.id("package1"),
-					Utils.settings.getJSONObject("一级供应室材料").getString("拼音码"));
+			Utils.retryingFindAndSendKeys(By.id("depart"), Keys.DOWN);
+			Utils.retryingFindAndClick(By
+					.xpath("//div/div/div[contains(text(), '" + name + "')]"));
+			Utils.retryingFindAndSendKeys(By.id("warehouse"), Keys.DOWN + "\n");
+			Utils.retryingFindAndSendKeys(By.id("package1"), Utils.settings
+					.getJSONObject("一级供应室材料").getString("拼音码"));
 
 			Utils.retryingFindAndSendKeys(By.id("package1"), "\n");
 			Utils.retryingFindAndSendKeys(By.id("count1"), "1" + "\n");
-			Utils.retryingFindAndClick(By.xpath("//button[contains(text(), '保存')]"));
+			Utils.retryingFindAndClick(By
+					.xpath("//button[contains(text(), '保存')]"));
 			currentwindowhandle = Utils.driver.getWindowHandle();
 			Utils.driver.switchTo().window(currentwindowhandle);
-			Utils.retryingFindAndClick(By.xpath("//button[contains(text(), '是')]"));
+			Utils.retryingFindAndClick(By
+					.xpath("//button[contains(text(), '是')]"));
 		} catch (Exception e) {
 			e.printStackTrace();
 			AssertJUnit.fail(e.getMessage());
@@ -134,7 +149,8 @@
 	public void Reject_set_success() {
 		try {
 			Utils.retryingFindAndSwitchToFrame(By.id("mainFrame"));
-			Utils.retryingFindAndClick(By.xpath("//button[contains(text(), '器械包退货')]"));
+			Utils.retryingFindAndClick(By
+					.xpath("//button[contains(text(), '器械包退货')]"));
 			String currentwindowhandle = Utils.driver.getWindowHandle();
 			Utils.driver.switchTo().window(currentwindowhandle);
 			for (int i = 0; i < Utils.reBarcodes.size(); i++) {
@@ -143,15 +159,17 @@
 			}
 			String name = Utils.settings.getJSONObject("一级供应室器械包3").getString(
 					"名称");
-			Utils.retryingFindAndSendKeys(By.id("package1"),Keys.DOWN);
+			Utils.retryingFindAndSendKeys(By.id("package1"), Keys.DOWN);
 
-			Utils.retryingFindAndClick(
-					By.xpath("//div/div/div[contains(text(), '" + name + "')]"));
+			Utils.retryingFindAndClick(By
+					.xpath("//div/div/div[contains(text(), '" + name + "')]"));
 			Utils.retryingFindAndSendKeys(By.id("count1"), "1" + "\n");
-			Utils.retryingFindAndClick(By.xpath("//button[contains(text(), '保存')]"));
+			Utils.retryingFindAndClick(By
+					.xpath("//button[contains(text(), '保存')]"));
 			currentwindowhandle = Utils.driver.getWindowHandle();
 			Utils.driver.switchTo().window(currentwindowhandle);
-			Utils.retryingFindAndClick(By.xpath("//button[contains(text(), '是')]"));
+			Utils.retryingFindAndClick(By
+					.xpath("//button[contains(text(), '是')]"));
 		} catch (Exception e) {
 			e.printStackTrace();
 			AssertJUnit.fail(e.getMessage());
@@ -165,7 +183,8 @@
 	public void Reject_set_success_ou() {
 		try {
 			Utils.retryingFindAndSwitchToFrame(By.id("mainFrame"));
-			Utils.retryingFindAndClick(By.xpath("//button[contains(text(), '器械包退货')]"));
+			Utils.retryingFindAndClick(By
+					.xpath("//button[contains(text(), '器械包退货')]"));
 			String currentwindowhandle = Utils.driver.getWindowHandle();
 			Utils.driver.switchTo().window(currentwindowhandle);
 			for (int i = 0; i < Utils.reBarcodes.size(); i++) {
@@ -178,16 +197,18 @@
 			String name = Utils.settings.getJSONObject("一级供应室器械包3").getString(
 					"拼音码");
 
-			Utils.retryingFindAndSendKeys(By.id("package1"),name);
+			Utils.retryingFindAndSendKeys(By.id("package1"), name);
 
 			Utils.retryingFindAndSendKeys(By.id("package1"), "\n");
 			Utils.retryingFindAndSendKeys(By.id("count1"), "1");
 
 			Utils.retryingFindAndSendKeys(By.id("count1"), "\n");
-			Utils.retryingFindAndClick(By.xpath("//button[contains(text(), '保存')]"));
+			Utils.retryingFindAndClick(By
+					.xpath("//button[contains(text(), '保存')]"));
 			currentwindowhandle = Utils.driver.getWindowHandle();
 			Utils.driver.switchTo().window(currentwindowhandle);
-			Utils.retryingFindAndClick(By.xpath("//button[contains(text(), '是')]"));
+			Utils.retryingFindAndClick(By
+					.xpath("//button[contains(text(), '是')]"));
 		} catch (Exception e) {
 			e.printStackTrace();
 			AssertJUnit.fail(e.getMessage());