You are able to add 4 diagnoses per CPT code with a total of 12 per claim. This is per 5010 guidelines. You are able to add as many diagnoses as you want to the note itself.
You also have the option to document and bill for a separate visit with the appropriate codes if you are seeing a patient for a well visit, and providing care for a separate identifiable service.