Added provider_id where required in encounter table