AHHH – the generic output is exactly what you were reporting in APA 7th. So what fields in what order to you want from Gov Doc (in 6th it is exactly the same as Report -
Author. (Year). Title. (Report Number). Place Published|: Publisher| Retrieved from URL|.
but that is slightly different from 7th report
Author. (Year). Title (Report Number)|. Retrieved from Place Published: URL ).