Index: ssts-web/src/test/java/test/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseDefinitionManagerTests.java =================================================================== diff -u -r16843 -r17719 --- ssts-web/src/test/java/test/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseDefinitionManagerTests.java (.../TousseDefinitionManagerTests.java) (revision 16843) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseDefinitionManagerTests.java (.../TousseDefinitionManagerTests.java) (revision 17719) @@ -27,8 +27,8 @@ private void prepareData(){ initCSSDData(); - // 11种器械包定义,3种消毒物品定义,1种聚合包定义 共15种 - int baseDataTousseDefinitionsCount = 15; + // 9个器械包,1个敷料包,1个外来器械,1个外部代理灭菌,3种消毒物品定义,1种聚合包定义 共16种 + int baseDataTousseDefinitionsCount = 16; List definitions = tousseDefinitionManager.findTousseDefinitionList(); Index: ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java =================================================================== diff -u -r17707 -r17719 --- ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java (.../AbstractCSSDTest.java) (revision 17707) +++ ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java (.../AbstractCSSDTest.java) (revision 17719) @@ -826,16 +826,20 @@ /** * 初始化材料与器械包定义(器械包定义数量:11) + * 器械包9个:Test开胸包 Test开颅包 Test开口包 Test穿刺包 TestOR胆加仪 TestOR甲加仪(半年期) Test缝合包 Test清创包 Test宫碘包 + * 敷料包1个:Test治疗巾 + * 外部代理灭菌1个:普通批 */ initMaterialAndTousseData(); /** - * 初始化1个外来器械包 + * 初始化1个外来器械包:Test钢板 */ initForeignTousse(); /** * 初始化消毒物品定义(器械包定义数量:3) + * Test雾化器 止血带[100条/扎] 呼吸机 */ initDisinfectToussesData(); @@ -851,6 +855,7 @@ /** * 初始化聚合包定义(器械包定义数量:1) + * Test聚合包 */ bulidComboTousseDefinition();