The survey should have an option "both" in first question.
I am almost diagnosed now (autism specialist and a psychologist agreed already, still need a psychiatrist opinion to get official diagnosis but it seems like only paperwork) but I was self diagnosed for 2 years before starting the diagnosis process.