[#583] Get surveyId from surveyInstance instead of surveyalValue

@mtwestra one thing we can fix now is getting the `collectionDate` directly from the SurveyInstance, and not from a custom map