removed null checks and ensured last hiv encounter shows up regardless of last discontinue date
added ARV encounters table generation task