[Sangetsu]

You should have planned your China trip long ago and obtained a visa before coming to Japan. If you leave your passport at the Chinese embassy and are then asked for it by the Japanese police (it happens all the time) you are going to be in trouble. The law states that non citizens must have a passport or residency card on their persons at all times. Failure to do so will end up with your being detained.