We do the ROS as the immediate problem list for the visit, like your second example. It is in addition to the HPI and I will sometimes document "as per HPI" if it is something extensively covered by the HPI. I put stuff like recurrent problems, surgeries, treatment etc in the Past Medical History.
.png "ACUF Donor I")
