diff --git a/nh_eobs/api.py b/nh_eobs/api.py index 5e62ccbb..1c8b4dde 100644 --- a/nh_eobs/api.py +++ b/nh_eobs/api.py @@ -1129,8 +1129,8 @@ def get_activities_for_patient( domain = [ ('patient_id', '=', patient_id), ('state', '=', 'completed'), - ('date_terminated', '>=', start_date.strftime(DTF)), - ('date_terminated', '<=', end_date.strftime(DTF))] \ + ('effective_date_terminated', '>=', start_date.strftime(DTF)), + ('effective_date_terminated', '<=', end_date.strftime(DTF))] \ if activity_type \ else [('patient_id', '=', patient_id), ('state', 'not in', ['completed', 'cancelled']), diff --git a/nh_eobs_mobile/views/template.xml b/nh_eobs_mobile/views/template.xml index b13137e3..d0af864c 100755 --- a/nh_eobs_mobile/views/template.xml +++ b/nh_eobs_mobile/views/template.xml @@ -36,7 +36,7 @@ Tasks