Fixed GSOD for patient report which also had referral.  Moved referral "in Progress" message to the correct column on report

https://www.pivotaltracker.com/story/show/80044476
Merge pull request #374 from pfschwartz/develop

Fixed GSOD for patient report which also had referral.  Moved referral "...