angshu | #391 | refactored to use the new patient encounters contract. Minor refactoring for service client WebClient.