Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java =================================================================== diff -u -r29311 -r30123 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java (.../SupplyRoomConfig.java) (revision 29311) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java (.../SupplyRoomConfig.java) (revision 30123) @@ -571,7 +571,11 @@ @Deprecated public boolean getAfterRecyclingTousseDeliver() { - return afterRecyclingTousseDeliver; + if(StringUtils.equals(tousseDeliverOccasion, TOUSSEDELIVEROCCASION_AFTERPRERECYCLING) + || StringUtils.equals(tousseDeliverOccasion, TOUSSEDELIVEROCCASION_AFTERRECYCLING)){ + return true; + } + return false; } public void setAfterRecyclingTousseDeliver(Boolean afterRecyclingTousseDeliver) {