Passport near expiry

Hi I'm japanese citizen traveling from New Zealand to tokyo with a 5 hour transit in Shanghai pudong. NY passport has 4 months until it expires from the date I arrive in Shanghai. Am I eligible for a 24 hour visa. I read online it's either 3 or 6months. I'm worried I will get sent back to new zealand.

Thank you