You are lost? 
I thought you wanted to split Survey into the two kinds based on who filled them out. They will have different qualities, so the requests made sense.
“Person self-report” is about anything self-reported, not just the surveys. But not all surveys are patient reported.
What do you think?