Seems like adding in gender only makes things less clear. The relevant information is sex and a medical history of specific surgeries and medications - the type of thing your doctor should already be aware of. Adding in gender only creates ambiguity because there's no way to measure gender from a biological perspective.