Patient listing changes

To make sure only affected patients are in mchcs program, and fixed relevant unit test