diff --git a/welkin/models/assessment.py b/welkin/models/assessment.py index e37f615..9f58276 100644 --- a/welkin/models/assessment.py +++ b/welkin/models/assessment.py @@ -94,6 +94,7 @@ class AssessmentRecords(Collection): @model_id("Patient") def get(self, patient_id: str, **kwargs): - path = f"{self._client.instance}/patients/{patient_id}/assessment-records" - - return super().get(path, **kwargs) + return super().get( + f"{self._client.instance}/patients/{patient_id}/assessment-records", + **kwargs, + ) diff --git a/welkin/models/encounter.py b/welkin/models/encounter.py index 5b576e8..49255e9 100644 --- a/welkin/models/encounter.py +++ b/welkin/models/encounter.py @@ -80,24 +80,17 @@ def get( *args, **kwargs, ): - root = "" + path = f"{self._client.instance}/" if patient_id: - root = f"patients/{patient_id}" + path += f"patients/{patient_id}/" elif user_id: - root = f"users/{user_id}" - elif self._parent: - if self._parent.__class__.__name__ == "Patient": - root = f"patients/{self._parent.id}" - elif self._parent.__class__.__name__ == "User": - root = f"users/{self._parent.id}" + path += f"users/{user_id}/" + elif self._parent.__class__.__name__ == "Patient": + path += f"patients/{self._parent.id}/" + elif self._parent.__class__.__name__ == "User": + path += f"users/{self._parent.id}/" - encounters = "encounters" - if related_data: - encounters = "full-encounters" - - path = f"{self._client.instance}/{encounters}" - if root: - path = f"{self._client.instance}/{root}/{encounters}" + path += "full-encounters" if related_data else "encounters" params = { "withCareTeam": with_care_team,