fix:added requester field in DiagnosticReportRetrieveSpec (#3443)

* fix:added sr requester field

* minor change

Author: nandkishorr

care/emr/resources/diagnostic_report/spec.py

@@ -6,13 +6,14 @@
 from care.emr.models.diagnostic_report import DiagnosticReport
 from care.emr.models.observation import Observation
 from care.emr.models.service_request import ServiceRequest
-from care.emr.resources.base import EMRResource
+from care.emr.resources.base import EMRResource, model_from_cache
 from care.emr.resources.diagnostic_report.valueset import (
     DIAGNOSTIC_SERVICE_SECTIONS_CODE_VALUESET,
 )
 from care.emr.resources.encounter.spec import EncounterListSpec
 from care.emr.resources.observation.spec import ObservationRetrieveSpec
 from care.emr.resources.observation.valueset import CARE_OBSERVATION_VALUSET
+from care.emr.resources.user.spec import UserSpec
 from care.emr.utils.valueset_coding_type import ValueSetBoundCoding
 from care.utils.shortcuts import get_object_or_404
 
@@ -65,6 +66,7 @@ class DiagnosticReportRetrieveSpec(DiagnosticReportListSpec):
 
     created_by: dict | None = None
     updated_by: dict | None = None
+    requester: dict | None = None
 
     @classmethod
     def perform_extra_serialization(cls, mapping, obj):
@@ -77,3 +79,5 @@ def perform_extra_serialization(cls, mapping, obj):
             for observation in observations
         ]
         mapping["encounter"] = EncounterListSpec.serialize(obj.encounter).to_json()
+        if obj.service_request_id:
+            mapping["requester"] = model_from_cache(UserSpec, id=obj.service_request.requester_id)