do we need to get a visa we have 3 hours lay over and need also to transfer in Hongqiao Airport?

We are holding a Philippine passport and we are traveling to Japan this april from Singapore.

Depart Singapore - Arrive Pudong Airport (3 hours layover)- Depart Hongqiao Airport - Arrive Japan

Depart Japan - Arrive Hongqiao Airport (6 hrs layover) - Depart Pudong Airport - Arrive Singapore
My question is do we need to get a visa we have 6 hours lay over and need also to transfer in Pudong Airport
Thank you. Hope u can help me and my friends :)