Fix OPAT discharge and referrals