Mujir, Bharti|#539| Refactoing code, creating patientmatchservice