Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/UserRecord.java =================================================================== diff -u -r20870 -r21209 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/UserRecord.java (.../UserRecord.java) (revision 20870) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/UserRecord.java (.../UserRecord.java) (revision 21209) @@ -62,30 +62,36 @@ Utils.driver.switchTo().defaultContent(); String currentwindowhandle = Utils.driver.getWindowHandle(); Utils.driver.switchTo().window(currentwindowhandle); - Utils.retryingFindAndSendKeys(By.id("hospitalNum"), "aa"); - Utils.retryingFindAndSendKeys(By.id("treatmentNum"), "bb"); - Utils.retryingFindAndSendKeys(By.id("washHandNurse"), - Utils.settings.getJSONObject("二级供应室用户").getString("条码") - + "\n"); - Utils.retryingFindAndSendKeys(By.id("circuitNurse"), Utils.settings - .getJSONObject("二级供应室用户").getString("条码") + "\n"); - Utils.retryingFindAndSendKeys(By.id("operationRoom"), "cc" + "\n"); - // 器械包登记使用记录 - for (int i = 0; i < Utils.reBarcodes.size(); i++) { - Utils.retryingFindAndSendKeys(By.id("tempBarcode"), - Utils.reBarcodes.get(i) + "\n"); + if (Utils.isFind(Utils.retryingFind(By + .id("useRecordApplicationWin")))) { + Utils.retryingFindAndClick(By.id("useRecordApplicationWin")); + Utils.retryingFindAndSendKeys(By.id("hospitalNum"), "aa"); + Utils.retryingFindAndSendKeys(By.id("treatmentNum"), "bb"); + Utils.retryingFindAndSendKeys(By.id("washHandNurse"), + Utils.settings.getJSONObject("二级供应室用户").getString("条码") + + "\n"); + Utils.retryingFindAndSendKeys(By.id("circuitNurse"), + Utils.settings.getJSONObject("二级供应室用户").getString("条码") + + "\n"); + Utils.retryingFindAndSendKeys(By.id("operationRoom"), "cc" + + "\n"); + // 器械包登记使用记录 + for (int i = 0; i < Utils.reBarcodes.size(); i++) { + Utils.retryingFindAndSendKeys(By.id("tempBarcode"), + Utils.reBarcodes.get(i) + "\n"); - } + } - // 一次性物品登记使用记录 - if (CollectionUtils - .isNotEmpty(Utils.disposableGoodsBatchBarcodesAfterEntry)) { - for (String barcode : Utils.disposableGoodsBatchBarcodesAfterEntry) { - Utils.retryingFindAndSendKeys(By.id("tempBarcode"), barcode - + "\n"); + // 一次性物品登记使用记录 + if (CollectionUtils + .isNotEmpty(Utils.disposableGoodsBatchBarcodesAfterEntry)) { + for (String barcode : Utils.disposableGoodsBatchBarcodesAfterEntry) { + Utils.retryingFindAndSendKeys(By.id("tempBarcode"), + barcode + "\n"); + } } + Save(); } - Save(); JSWaiter.waitUntilJQueryReady(); } catch (Exception e) { e.printStackTrace(); @@ -99,33 +105,40 @@ @Test public void UserRecord_success_ji() { try { - Utils.retryingFindAndSendKeys(By.id("hospitalNum"), "01"); - Utils.retryingFindAndSendKeys(By.id("treatmentNum"), "02"); - Utils.retryingFindAndSendKeys(By.id("washHandNurse"), - Utils.settings.getJSONObject("洗手护士").getString("条码") + "\n"); - Utils.retryingFindAndSendKeys(By.id("circuitNurse"), Utils.settings - .getJSONObject("巡回护士").getString("条码") + "\n"); - Utils.retryingFindAndSendKeys(By.id("operationRoom"), "03" + "\n"); - if (CollectionUtils - .isNotEmpty(Utils.disposableGoodsBatchBarcodesAfterEntry)) { - for (String barcode : Utils.disposableGoodsBatchBarcodesAfterEntry) { - Utils.retryingFindAndSendKeys(By.id("tempBarcode"), barcode - + "\n"); + if (Utils.isFind(Utils.retryingFind(By + .id("useRecordApplicationWin")))) { + Utils.retryingFindAndClick(By.id("useRecordApplicationWin")); + Utils.retryingFindAndSendKeys(By.id("hospitalNum"), "01"); + Utils.retryingFindAndSendKeys(By.id("treatmentNum"), "02"); + Utils.retryingFindAndSendKeys(By.id("washHandNurse"), + Utils.settings.getJSONObject("洗手护士").getString("条码") + + "\n"); + Utils.retryingFindAndSendKeys(By.id("circuitNurse"), + Utils.settings.getJSONObject("巡回护士").getString("条码") + + "\n"); + Utils.retryingFindAndSendKeys(By.id("operationRoom"), "03" + + "\n"); + if (CollectionUtils + .isNotEmpty(Utils.disposableGoodsBatchBarcodesAfterEntry)) { + for (String barcode : Utils.disposableGoodsBatchBarcodesAfterEntry) { + Utils.retryingFindAndSendKeys(By.id("tempBarcode"), + barcode + "\n"); + } } - } - // 器械包登记使用记录 - for (int i = 0; i < Utils.reBarcodes.size(); i++) { - int a = Integer.valueOf(Utils.reBarcodes.get(i)).intValue(); - if (a % 2 != 0) { - Utils.retryingFindAndSendKeys(By.id("tempBarcode"), - Utils.reBarcodes.get(i) + "\n"); + // 器械包登记使用记录 + for (int i = 0; i < Utils.reBarcodes.size(); i++) { + int a = Integer.valueOf(Utils.reBarcodes.get(i)).intValue(); + if (a % 2 != 0) { + Utils.retryingFindAndSendKeys(By.id("tempBarcode"), + Utils.reBarcodes.get(i) + "\n"); + } + } + Utils.retryingFindAndClick(By + .cssSelector("img[src $='/images/web/arrow_top.png']")); + Save(); } - Utils.retryingFindAndClick(By - .cssSelector("img[src $='/images/web/arrow_top.png']")); - - Save(); JSWaiter.waitUntilJQueryReady(); } catch (Exception e) {