made some refactoring in ScriptedCompositionPatientDataDefinitionEvaluator