Encounter, fixed join condition for provider. Added field to patient