Is the visa free transit for inbond flight or outbond flight?

I am flying from New York to Bangkok by Air China. I want to visit Beijing for two days on the way back, which means New York to Bangkok, stay 2 weeks; then fly from Bangkok to Beijing, stay 2 days and fly from Beijing to New York again. Am I eligible for the free transit?