Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java =================================================================== diff -u -r22288 -r22298 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java (.../ForeignProxyDisinfectionManagerImpl.java) (revision 22288) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java (.../ForeignProxyDisinfectionManagerImpl.java) (revision 22298) @@ -193,11 +193,6 @@ tousseItemIds.add(foreignProxyItem.getTousseItemId()); } foreignProxyItem.setIsTerminated(true); - if(!foreignProxyItem.terminated()){ - allItemsTerminated = false; - }else{ - anyItemsTerminated = true; - } List list = foreignProxyItem.getTousseInstanceList(objectDao); if(!CollectionUtils.isEmpty(list)){ for (TousseInstance tousseInstance : list) { @@ -212,6 +207,11 @@ } objectDao.update(foreignProxyItem); } + if(!foreignProxyItem.terminated()){ + allItemsTerminated = false; + }else{ + anyItemsTerminated = true; + } } if(!tousseItemIds.isEmpty()){ invoicePlanManager.terminateTousseItemByIds(tousseItemIds, endCase);