Index: ssts-web/src/test/java/test/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerTests.java =================================================================== diff -u -r26269 -r26403 --- ssts-web/src/test/java/test/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerTests.java (.../TousseTransitionRecordManagerTests.java) (revision 26269) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerTests.java (.../TousseTransitionRecordManagerTests.java) (revision 26403) @@ -174,7 +174,7 @@ TousseTransitionRecordItem ttri = tousseTransitionRecordItemManager.find(ttris,planItem1.getId()); assertTousseTransitionRecordItem(ttri,2,1,1,"加急"); //断言第二个申请项的内容(Test开口包) - assertTousseItem(tis.get(1), 0, 2,2,"无",0); + assertTousseItem(tis.get(1), 0, 2,2,"无",2); TousseTransitionPlanItem planItem2 = tousseTransitionPlanItemManager.find(planItems, tis.get(1).getId()); assertEquals(planItem2.getAmount().intValue(),3); assertTousseTransitionPlanItem(planItem2, 0, 2, 2, "无",0); @@ -188,7 +188,7 @@ Set appItems = assertApplicationItems(ip,3); TousseItem newTousseItem = appItems.stream().filter(p->p.getTousseDefinitionId().equals(td.getId())).collect(Collectors.toList()).get(0); - assertTousseItem(newTousseItem, 0, 2, 2, "无", 0); + assertTousseItem(newTousseItem, 0, 2, 2, "无", 2); List ttItems = tousseTransitionItemManager.getByProperty("tousseTransitionRecordId", records.get(0).getId()); poToDelete.addAll(ttItems); @@ -301,7 +301,7 @@ Set appItems2 = assertApplicationItems(ip,4); TousseItem newTousseItem2 = appItems2.stream().filter(p->p.getTousseDefinitionId().equals(td_开口包.getId())).collect(Collectors.toList()).get(0); - assertTousseItem(newTousseItem2, 0, 3, 3, "加急", 1); + assertTousseItem(newTousseItem2, 0, 3, 3, "加急", 3); List ttItems2 = tousseTransitionItemManager.getByProperty("tousseTransitionRecordId", records2.get(0).getId()); poToDelete.addAll(ttItems2); @@ -399,7 +399,7 @@ assertEquals(tousseItem.getUrgentLevel(),"无"); tousseIntance = ti_开颅包; assertTousseTransitionRecordItem(ttri, 2, 1, 1, "无"); - assertTousseItem(tousseItem, 1, 2, 1, "无", 0); + assertTousseItem(tousseItem, 1, 2, 1, "无", 2); } assertNotNull(tousseTransitionItem.getTousseItemId()); assertEquals(tousseTransitionItem.getTousseTransitionPlanItemId(),null); @@ -439,7 +439,7 @@ Set tiSet = recyclingApplication.getApplicationItems().stream().filter(p->!tousseItemIds.contains(p.getId())).collect(Collectors.toSet()); assertNotNull(tiSet); assertEquals(tiSet.size(), 1); - tiSet.forEach(p->assertTousseItem(p, 0, 2, 2, "无", 0)); + tiSet.forEach(p->assertTousseItem(p, 0, 2, 2, "无", 2)); assertEquals(recyclingApplication.getApplicant(), "or护士"); assertEquals(recyclingApplication.getApplicationItems().size(), 3);