Add hiv_intake_extra data for intake and followup encounters