travel from Newark--> Tokyo ---> Beijing--> Newark valid for 144 hr Beijing Vissa

I plan to travel from Newark,USA --> Tokyo ---> Beijing--> Newark . Like to confirm that this is that valid itinerary for 144 hr visa. Travel from Tokyo to Beijing on ANA and onward travel from Beijing to Newark, USA on United airline.

Part 2 of the question, can I take a day trip to Shanghai (from Beijing) on 144 hr visa.