Roni | BSHR-395 | Code moved to Patient Service