Traveling from Thailand->Shanghai->United States

I will be traveling in Thailand for 2 weeks, then plan fly to Shanghai and stay 6 days before flying back to United States. I am a U.S. citizen. Does anyone know which type of entry permit I need? / How long it will take to obtain a visa if expedited? Any links or insight would be helpful.