3 day stay with 17 hr layover a week later

I will be staying in Bejing for 3 days in May 2018 (in from the US, out to Japan). Then a week later I have a 17 hour layover (in from the Japan, out to the US) where I will be getting a hotel room and plan to revisit the city for the day. Will I need to apply for a double entry tourist L? Or would a single entry work and then the layover would count towards the 72 hr rule?

Thanks in advance!

Nikki