Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add django filter for patient review missed #1938

Merged
merged 18 commits into from
Apr 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions care/facility/api/viewsets/patient.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
)
from django.db.models.functions import Coalesce, ExtractDay, Now
from django.db.models.query import QuerySet
from django.utils import timezone
from django_filters import rest_framework as filters
from djqscsv import render_to_csv_response
from drf_spectacular.utils import extend_schema, extend_schema_view
Expand Down Expand Up @@ -237,6 +238,20 @@ def filter_bed_not_null(self, queryset, name, value):
last_consultation__discharge_date__isnull=True,
)

def filter_by_review_missed(self, queryset, name, value):
if isinstance(value, bool):
if value:
queryset = queryset.filter(
(Q(review_time__isnull=False) & Q(review_time__lt=timezone.now()))
)
else:
queryset = queryset.filter(
Q(review_time__isnull=True) | Q(review_time__gt=timezone.now())
)
return queryset

review_missed = filters.BooleanFilter(method="filter_by_review_missed")

# Filter consultations by ICD-11 Diagnoses
diagnoses = MultiSelectFilter(method="filter_by_diagnoses")
diagnoses_unconfirmed = MultiSelectFilter(method="filter_by_diagnoses")
Expand Down
15 changes: 15 additions & 0 deletions care/facility/tests/test_patient_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,21 @@ def test_filter_by_diagnoses_confirmed(self):
)
self.assertNotContains(res, self.patient.external_id)

def test_filter_by_review_missed(self):
self.client.force_authenticate(user=self.user)
sainak marked this conversation as resolved.
Show resolved Hide resolved
res = self.client.get(self.get_base_url() + "?review_missed=true")
self.assertEqual(res.status_code, status.HTTP_200_OK)
for patient in res.json()["results"]:
self.assertLess(patient["review_time"], now())

res = self.client.get(self.get_base_url() + "?review_missed=false")
self.assertEqual(res.status_code, status.HTTP_200_OK)
for patient in res.json()["results"]:
if patient["review_time"]:
self.assertGreaterEqual(patient["review_time"], now())
else:
self.assertIsNone(patient["review_time"])


class PatientTransferTestCase(TestUtils, APITestCase):
@classmethod
Expand Down
Loading