fix encounter data model and some medical services