Modified billing personal query
Merge branch 'MEDICASH-78'