Index: ssts-selenium-test/src/test/java/test_4_1/apply/service/ApplyServiceImpl.java =================================================================== diff -u -r17833 -r17834 --- ssts-selenium-test/src/test/java/test_4_1/apply/service/ApplyServiceImpl.java (.../ApplyServiceImpl.java) (revision 17833) +++ ssts-selenium-test/src/test/java/test_4_1/apply/service/ApplyServiceImpl.java (.../ApplyServiceImpl.java) (revision 17834) @@ -92,12 +92,16 @@ @Override public void applyForMultiple(ApplyGoodBo applyGoodBo, WebElement frame) { - // 申请外来器械 + // 申请外来器械带病人信息 // apply.apply_foreignSet(); Utils.driver.switchTo().frame(frame); applyGoodBo = ApplyGoodBoFactory.createApplyNormalGoodBo(SettingConstants.一级供应室用户, ApplyBtnEnum.FOREIGN); this.apply_foreignSetInformation(applyGoodBo); + // 申请外来器械不带病人信息 + Utils.driver.switchTo().frame(frame); + this.apply_foreignSet(applyGoodBo); + // 申请自定义器械 // apply.apply_custom(); Utils.driver.switchTo().frame(frame); Index: ssts-selenium-test/src/test/java/test_4_1/apply/service/GdsyApplyServiceImpl.java =================================================================== diff -u -r17833 -r17834 --- ssts-selenium-test/src/test/java/test_4_1/apply/service/GdsyApplyServiceImpl.java (.../GdsyApplyServiceImpl.java) (revision 17833) +++ ssts-selenium-test/src/test/java/test_4_1/apply/service/GdsyApplyServiceImpl.java (.../GdsyApplyServiceImpl.java) (revision 17834) @@ -105,12 +105,16 @@ borrowApplyServiceImpl.apply_borrow(applyGoodBo); - // 申请外来器械 + // 申请外来器械没有病人信息 Utils.driver.switchTo().defaultContent(); Utils.findByAwaitAndClick(By.xpath("//span[contains(text(), '个人桌面')]")); applyGoodBo = ApplyGoodBoFactory.createGdsyForeignApplyGoodBo(ApplyBtnEnum.FOREIGN); - ApplyHelper.openDeskTopIcon(applyGoodBo); + WebElement foreignFrame = ApplyHelper.openDeskTopIcon(applyGoodBo); this.apply_foreignSet(applyGoodBo); + + // 申请外来器械有病人信息 + Utils.driver.switchTo().frame(foreignFrame); + this.apply_foreignSetInformation(applyGoodBo); } }