HI,
It would be 3111, as you have completed your residency.. unless you have qualified to be a GP....but remember to clarify that residency is part of work, and not education as CIC is clear that specialist education is since the time you were eligible to practice that..... so I presume, it is completion of residency and passing the Board exam ( for IM)...
PG