can we get the free transit for the time in Shanghai?

This is a little confusing. We have a visa for one entry to China we are there for 12 days before flying from Shanghai to Hanoi for 10 days, we then fly back to Shanghai for 2days before flying out from Shanghai to home to New Zealand.