Removed ROS requirement for encounter.  Fixed medication saving for encounter.