Diagnosis on preventative visits

We have a difference of opinion as to whether diagnosis for medical conditions should be listed with the preventative visit CPT® especially when the documentation doesn't support billing a seperate E/M service.