Shanghai to Thailand & Back

Hello - I'm flying into Shanghai (with a 3 hour layover, so not leaving the airport) then flying to Thailand for 13 days. On our return from Thailand we fly back to Shanghai and plan on staying for 2 days to go to Disneyland. Am I eligible for a 72 hour visa at that point?

Thanks for your help!