Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseDefinitionUtils.java =================================================================== diff -u -r13769 -r14865 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseDefinitionUtils.java (.../TousseDefinitionUtils.java) (revision 13769) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseDefinitionUtils.java (.../TousseDefinitionUtils.java) (revision 14865) @@ -50,11 +50,11 @@ public static TousseDefinition getForeignTousseDefinitionByTousseItem(ObjectDao objectDao,TousseItem tousseItem){ String tousseName = tousseItem.getTousseName(); - Long tousseDefinitionID = tousseItem.getTousseDefinitionId(); + Long tousseDefinitionId = tousseItem.getTousseDefinitionId(); Long invoicePlanID = tousseItem.getInvoicePlanID(); TousseDefinition td = null; - if(DatabaseUtil.isPoIdValid(tousseDefinitionID)){ - td = getTousseDefinitionById(objectDao,tousseDefinitionID.toString()); + if(DatabaseUtil.isPoIdValid(tousseDefinitionId)){ + td = getTousseDefinitionById(objectDao,tousseDefinitionId.toString()); }else if(DatabaseUtil.isPoIdValid(invoicePlanID)){ td = getTousseDefinitionByNameTypeAndAPPID(objectDao,tousseName, TousseDefinition.PACKAGE_TYPE_FOREIGN, invoicePlanID.toString()); }