I am sure that the OP would prefer up to date information from a person IN China and who travels regularly in and out (as I am, and do).

Of course rules/regs. on immigration matters change here as they do in many countries, however the advice I gave is on the current situation. We do not have the ability to see into the future, nor do we have the full details of the OP's situation. However as a general rule on RP's and leaving China with a current RP, take it as read.