updated hiv status query
Merge branch 'development' into dde_integration