China visa enquiry

We fly into Shanghai on March 30th at 0925 hrs . I would like to find out if we can travel on the 144 hrs visa-free- transit .
Our itinerary is
30th March - Arrive Shanghai stay in hotel
31st March - Shanghai in hotel
1st April - Embark Cruise ship
2nd April - At Sea
3rd April - At Sea
4th April - Arrive at Beijing stay on ship at night
5th April - Beijing. Stay on ship at night
6th April - Beijing . Ship departs at 1800 hrs next stop Seoul in South Korea on 8th April .

We are probably in China for about 144 hrs but do the two days in between count as well ?

Many thanks