From the last information I have, you need to exit Qatar within 7 days from the date of cancellation of your visa. If there has been a change in this rule, I am not aware of that yet. In your case, I suggest you ask your HR people as your visa will have expired before your departure date. Alternatively, if you do not wish to talk to your HR people, you can approach National Human Rights Committee and they will guide you best.