Index: ssts-web/src/test/java/test/forgon/disinfectsystem/secondsupplyroom/service/TestSecondSupplyRoom.java =================================================================== diff -u -r16654 -r16785 --- ssts-web/src/test/java/test/forgon/disinfectsystem/secondsupplyroom/service/TestSecondSupplyRoom.java (.../TestSecondSupplyRoom.java) (revision 16654) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/secondsupplyroom/service/TestSecondSupplyRoom.java (.../TestSecondSupplyRoom.java) (revision 16785) @@ -159,8 +159,15 @@ AcegiHelper.getCurrentOrgUnitName(), InvoicePlan.TYPE_SECOND_SUPPLY_ROOM); assertNotNull(secondSupplyRoomApplications); - assertTrue(secondSupplyRoomApplications.size() >= 1); - + //因为v4.1版本使用记录转申请单不再生成二级供应室申请单,所以断言数量改为0 + assertTrue(secondSupplyRoomApplications.size() == 0); + + List comboRoomApplications = recyclingApplicationManager + .getUnfinishedRecyclingApplicationByDepart( + AcegiHelper.getCurrentOrgUnitName(), + InvoicePlan.TYPE_COMBO_FORM); + //因为复大肿瘤不分单,所以使用记录转申请单生成的是通用申请单 + assertTrue(comboRoomApplications.size() == 1); } }