diff --git a/care/facility/api/serializers/patient_investigation.py b/care/facility/api/serializers/patient_investigation.py index bc209b1e68..65ab93e614 100644 --- a/care/facility/api/serializers/patient_investigation.py +++ b/care/facility/api/serializers/patient_investigation.py @@ -1,6 +1,9 @@ from rest_framework import serializers from care.facility.api.serializers import TIMESTAMP_FIELDS +from care.facility.api.serializers.patient_consultation import ( + PatientConsultationSerializer, +) from care.facility.models.patient_investigation import ( InvestigationSession, InvestigationValue, @@ -41,6 +44,10 @@ class Meta: class InvestigationValueSerializer(serializers.ModelSerializer): id = serializers.CharField(source="external_id", read_only=True) + consultation_object = PatientConsultationSerializer( + source="consultation", read_only=True + ) + group_object = PatientInvestigationGroupSerializer(source="group", read_only=True) investigation_object = MinimalPatientInvestigationSerializer( source="investigation", read_only=True diff --git a/care/facility/api/viewsets/patient_investigation.py b/care/facility/api/viewsets/patient_investigation.py index f575a33fe2..7fee707963 100644 --- a/care/facility/api/viewsets/patient_investigation.py +++ b/care/facility/api/viewsets/patient_investigation.py @@ -99,7 +99,7 @@ class PatientInvestigationSummaryViewSet( mixins.ListModelMixin, mixins.RetrieveModelMixin, viewsets.GenericViewSet ): serializer_class = InvestigationValueSerializer - queryset = InvestigationValue.objects.all() + queryset = InvestigationValue.objects.select_related("consultation").all() lookup_field = "external_id" permission_classes = (IsAuthenticated,) filterset_class = PatientInvestigationFilter @@ -155,7 +155,7 @@ class InvestigationValueViewSet( viewsets.GenericViewSet, ): serializer_class = InvestigationValueSerializer - queryset = InvestigationValue.objects.all() + queryset = InvestigationValue.objects.select_related("consultation").all() lookup_field = "external_id" permission_classes = (IsAuthenticated,) filterset_class = PatientInvestigationFilter