refactor filters

project/npda/views/visit.py

@@ -2,6 +2,7 @@
 import datetime
 
 # Django imports
+from django.apps import apps
 from django.contrib import messages
 from django.contrib.auth.mixins import PermissionRequiredMixin
 from django.contrib.messages.views import SuccessMessageMixin
@@ -63,21 +64,28 @@ def get_context_data(self, **kwargs):
         context["submission"] = submission
 
         try:
-            pdu = (
-                Transfer.objects.filter(
-                    patient=patient, date_leaving_service__isnull=True
+            if patient.is_in_transfer_in_the_last_year():
+                pz_code = (
+                    Transfer.objects.filter(
+                        patient=patient,
+                    )
+                    .order_by("-date_leaving_service")
+                    .first()
+                    .previous_pz_code
                 )
-                .first()
-                .paediatric_diabetes_unit
-            )
+                PaediatricDiabetesUnit = apps.get_model(
+                    "npda", "PaediatricDiabetesUnit"
+                )
+                pdu = PaediatricDiabetesUnit.objects.get(pz_code=pz_code)
         # get the PDU for this patient - this is the PDU that the patient is currently under.
         # If the patient has left the PDU, the date_leaving_service will be set and it will be possible to view KPIs for the PDU up until transfer,
         # if this happened during the audit period. This is TODO
         except:
             #  this patient has been transferred but not yet received at a new PDU
             pdu = (
-                Transfer.objects.filter(patient=patient)
-                .order_by("-date_leaving_service")
+                Transfer.objects.filter(
+                    patient=patient, date_leaving_service__isnull=True
+                )
                 .first()
                 .paediatric_diabetes_unit
             )