REPORT-571: Add EncounterObsDataDefinition