endoreg-db 0.8.6.1__py3-none-any.whl → 0.8.8.9__py3-none-any.whl

endoreg_db/serializers/anonymization.py

@@ -7,7 +7,6 @@ Unterstützt DD.MM.YYYY als Primärformat und YYYY-MM-DD als Fallback.
 from rest_framework import serializers
 from endoreg_db.models.metadata.sensitive_meta_logic import parse_any_date
 
-
 class SensitiveMetaValidateSerializer(serializers.Serializer):
     """
     Serializer für SensitiveMeta-Validierung mit deutscher Datums-Priorität.
@@ -19,11 +18,11 @@ class SensitiveMetaValidateSerializer(serializers.Serializer):
     Alle Datumsfelder werden in date-Objekte konvertiert.
     """
     
-    patient_first_name = serializers.CharField(required=False, allow_blank=True)
-    patient_last_name = serializers.CharField(required=False, allow_blank=True)
-    patient_dob = serializers.CharField(required=False, allow_blank=True)
-    examination_date = serializers.CharField(required=False, allow_blank=True)
-    casenumber = serializers.CharField(required=False, allow_blank=True)
+    patient_first_name = serializers.CharField(required=True, allow_blank=True)
+    patient_last_name = serializers.CharField(required=True, allow_blank=True)
+    patient_dob = serializers.CharField(required=True, allow_blank=True)
+    examination_date = serializers.CharField(required=True, allow_blank=True)
+    casenumber = serializers.CharField(required=True, allow_blank=True)
     anonymized_text = serializers.CharField(required=False, allow_blank=True)
     patient_gender = serializers.CharField(required=False, allow_blank=True)
     center_name = serializers.CharField(required=False, allow_blank=True)
@@ -31,6 +30,10 @@ class SensitiveMetaValidateSerializer(serializers.Serializer):
     file_type = serializers.ChoiceField(
         choices=['video', 'pdf'], required=False
     )  # Optional: "video" oder "pdf"
+    center_name = serializers.CharField(required=False, allow_blank=True)
+    external_id = serializers.CharField(required=False, allow_blank=True)
+    external_id_origin = serializers.CharField(required=False, allow_blank=True)
+    
 
     def validate_patient_dob(self, value):
         """
@@ -40,8 +43,11 @@ class SensitiveMetaValidateSerializer(serializers.Serializer):
         - DD.MM.YYYY (z.B. "21.03.1994")
         - YYYY-MM-DD (z.B. "1994-03-21")
         """
-        if not value:
-            return None
+
+        if value == '' or not value:
+            raise serializers.ValidationError(
+                "Ungültiges Datum. Kein Input! Erlaubte Formate: DD.MM.YYYY oder YYYY-MM-DD."
+            ) 
             
         parsed_date = parse_any_date(value)
         if not parsed_date:
@@ -58,8 +64,10 @@ class SensitiveMetaValidateSerializer(serializers.Serializer):
         - DD.MM.YYYY (z.B. "15.02.2024")
         - YYYY-MM-DD (z.B. "2024-02-15")
         """
-        if not value:
-            return None
+        if value == '' or not value:
+            raise serializers.ValidationError(
+                "Ungültiges Datum. Kein Input! Erlaubte Formate: DD.MM.YYYY oder YYYY-MM-DD."
+            ) 
             
         parsed_date = parse_any_date(value)
         if not parsed_date:

endoreg_db/serializers/label_video_segment/label_video_segment.py

@@ -142,7 +142,7 @@ class LabelVideoSegmentSerializer(serializers.ModelSerializer):
             logger.debug(f"Serializer initialized with data: {self.initial_data}")
 
 
-    def get_time_segments(self, obj: LabelVideoSegment) -> List[dict]:
+    def get_time_segments(self, obj: LabelVideoSegment) -> dict[str, dict]:
         frames = obj.frames
         time_segments = {
             "segment_id": obj.id,
@@ -225,34 +225,7 @@ class LabelVideoSegmentSerializer(serializers.ModelSerializer):
         """
         return ImageClassificationAnnotationSerializer(obj.all_frame_annotations, many=True).data
 
-    def get_label_display(self, obj:LabelVideoSegment):
-        """
-        Return the German translation of the label name for display purposes.
-        
-        If the segment has no label, returns "Unbekannt". If a translation is not available, returns the original label name.
-        """
-        if not obj.label:
-            return "Unbekannt"
-            
-        label_name = obj.label.name
-        #TODO Refactor
-        translations = {
-            'appendix': 'Appendix',
-            'blood': 'Blut',
-            'diverticule': 'Divertikel',
-            'grasper': 'Greifer',
-            'ileocaecalvalve': 'Ileozäkalklappe',
-            'ileum': 'Ileum',
-            'low_quality': 'Niedrige Bildqualität',
-            'nbi': 'Narrow Band Imaging',
-            'needle': 'Nadel',
-            'outside': 'Außerhalb',
-            'polyp': 'Polyp',
-            'snare': 'Snare',
-            'water_jet': 'Wasserstrahl',
-            'wound': 'Wunde'
-        }
-        return translations.get(label_name, label_name)
+
     
     def get_video_name(self, obj):
         """

endoreg_db/serializers/meta/__init__.py

@@ -1,7 +1,4 @@
-from .pdf_file_meta_extraction import PDFFileForMetaSerializer
-from .report_meta import (
-    ReportMetaSerializer,
-)
+
 from .sensitive_meta_detail import SensitiveMetaDetailSerializer
 from .sensitive_meta_update import SensitiveMetaUpdateSerializer
 from .sensitive_meta_verification import SensitiveMetaVerificationSerializer
@@ -10,8 +7,6 @@ from .video_meta import (
 )
 
 __all__ = [
-    "PDFFileForMetaSerializer",
-    "ReportMetaSerializer",
     "SensitiveMetaDetailSerializer",
     "SensitiveMetaUpdateSerializer",
     "SensitiveMetaVerificationSerializer",

endoreg_db/serializers/meta/sensitive_meta_detail.py

@@ -1,6 +1,5 @@
 from rest_framework import serializers
 import logging
-
 from ...models import SensitiveMeta
 
 logger = logging.getLogger(__name__)
@@ -10,153 +9,99 @@ class SensitiveMetaDetailSerializer(serializers.ModelSerializer):
     Serializer for displaying SensitiveMeta details with verification state.
     Includes all relevant fields for annotation and verification.
     """
-    
+
     # State verification fields
     is_verified = serializers.SerializerMethodField()
     dob_verified = serializers.SerializerMethodField()
     names_verified = serializers.SerializerMethodField()
-    
-    # Related fields for better display
+
+    # Related fields
     center_name = serializers.CharField(source="center.name", read_only=True)
     patient_gender_name = serializers.CharField(source="patient_gender.name", read_only=True)
-    
-    # Examiner information
     examiners_display = serializers.SerializerMethodField()
-    
-    # Formatted dates for display
+
+    # Formatted display fields
     patient_dob_display = serializers.SerializerMethodField()
     examination_date_display = serializers.SerializerMethodField()
-    
-    # Hash displays (last 8 characters for security)
+
+    # Hash displays (last 8 chars)
     patient_hash_display = serializers.SerializerMethodField()
     examination_hash_display = serializers.SerializerMethodField()
 
+    # Text fields
+    text = serializers.SerializerMethodField()
+    anonymized_text = serializers.SerializerMethodField()
+
     class Meta:
         model = SensitiveMeta
         fields = [
-            'id',
-            'patient_first_name',
-            'patient_last_name', 
-            'patient_dob',
-            'patient_dob_display',
-            'examination_date',
-            'examination_date_display',
-            'center_name',
-            'patient_gender_name',
-            'endoscope_type',
-            'endoscope_sn',
-            'patient_hash_display',
-            'examination_hash_display',
-            'examiners_display',
-            'is_verified',
-            'dob_verified',
-            'names_verified',
+            "id",
+            "casenumber",
+            "patient_first_name",
+            "patient_last_name",
+            "patient_dob",
+            "patient_dob_display",
+            "examination_date",
+            "examination_date_display",
+            "examination_time",
+            "center_name",
+            "patient_gender_name",
+            "endoscope_type",
+            "endoscope_sn",
+            "patient_hash_display",
+            "examination_hash_display",
+            "examiners_display",
+            "is_verified",
+            "dob_verified",
+            "names_verified",
+            "text",
+            "anonymized_text",
+            "external_id",
+            "external_id_origin"
         ]
         read_only_fields = [
-            'id',
-            'patient_hash_display',
-            'examination_hash_display',
+            "id",
+            "patient_hash_display",
+            "examination_hash_display",
         ]
 
-    def get_is_verified(self, obj):
-        """
-        Return the overall verification status of the given SensitiveMeta instance.
-        
-        Returns:
-            bool: True if the instance is verified; False if the verification attribute is missing.
-        
-        Raises:
-            Exception: Propagates unexpected exceptions after logging.
-        """
-        try:
-            return obj.is_verified
-        except AttributeError:
-            return False
-        except Exception as e:
-            logger.exception(f"Unexpected error in get_is_verified for SensitiveMeta {getattr(obj, 'pk', None)}: {e}")
-            raise
-
-    def get_dob_verified(self, obj):
-        """
-        Return the date of birth verification status for the given object.
-        
-        Returns:
-            bool: True if the date of birth is verified; otherwise, False if unavailable or on error.
-        """
-        try:
-            return obj.state.dob_verified
-        except Exception:
-            return False
-
-    def get_names_verified(self, obj):
-        """
-        Return whether the patient's names have been verified.
-        
-        Returns:
-            bool: True if the names are verified; False if not verified or if an error occurs.
-        """
-        try:
-            return obj.state.names_verified
-        except Exception:
-            return False
+    # --- Verification getters ---
+    def get_is_verified(self, obj): return getattr(obj, "is_verified", False)
+    def get_dob_verified(self, obj): return getattr(getattr(obj, "state", None), "dob_verified", False)
+    def get_names_verified(self, obj): return getattr(getattr(obj, "state", None), "names_verified", False)
 
+    # --- Examiner display ---
     def get_examiners_display(self, obj):
-        """
-        Return a list of examiner full names for the given SensitiveMeta instance.
-        
-        Returns:
-            list[str]: List of examiner names in "First Last" format, or an empty list if unavailable.
-        """
         try:
-            if obj.pk:
-                examiners = obj.examiners.all()
-                return [f"{e.first_name} {e.last_name}" for e in examiners]
-            return []
+            return [f"{e.first_name} {e.last_name}" for e in obj.examiners.all()] if obj.pk else []
         except Exception as e:
-            logger.warning(f"Error getting examiners for SensitiveMeta {obj.pk}: {e}")
+            logger.warning(f"Error fetching examiners for SensitiveMeta {obj.pk}: {e}")
             return []
 
+    # --- Date formatters ---
     def get_patient_dob_display(self, obj):
-        """
-        Return the patient's date of birth formatted as "YYYY-MM-DD" for display.
-        
-        Returns:
-            str or None: Formatted date string if available, otherwise None.
-        """
-        if obj.patient_dob:
-            return obj.patient_dob.strftime("%Y-%m-%d")
-        return None
+        return obj.patient_dob.strftime("%Y-%m-%d") if obj.patient_dob else None
 
     def get_examination_date_display(self, obj):
-        """
-        Return the examination date formatted as "YYYY-MM-DD" for display.
-        
-        Returns:
-            str or None: Formatted examination date string, or None if not set.
-        """
-        if obj.examination_date:
-            return obj.examination_date.strftime("%Y-%m-%d")
-        return None
+        return obj.examination_date.strftime("%Y-%m-%d") if obj.examination_date else None
 
+    # --- Hash short forms ---
     def get_patient_hash_display(self, obj):
-        """
-        Return the last eight characters of the patient's hash, prefixed with ellipsis, or None if not available.
-        
-        Returns:
-            str or None: Truncated patient hash for display, or None if the hash is not set.
-        """
-        if obj.patient_hash:
-            return f"...{obj.patient_hash[-8:]}"
-        return None
+        return f"...{obj.patient_hash[-8:]}" if obj.patient_hash else None
 
     def get_examination_hash_display(self, obj):
-        """
-        Return the last eight characters of the examination hash, prefixed with ellipsis, or None if not available.
-        
-        Returns:
-            str or None: Truncated examination hash for display, or None if the hash is not set.
-        """
-        if obj.examination_hash:
-            return f"...{obj.examination_hash[-8:]}"
-        return None
+        return f"...{obj.examination_hash[-8:]}" if obj.examination_hash else None
+
+    # --- Text fields ---
+    def get_text(self, obj):
+        return obj.text if isinstance(obj.text, str) else None
+
+    def get_anonymized_text(self, obj):
+        return obj.anonymized_text if isinstance(obj.anonymized_text, str) else None
+    
+    def get_external_id(self, obj) -> str | None:  
+        return obj.external_id if isinstance(obj.external_id, str) else None  
+    
+    def get_external_id_origin(self, obj) -> str | None:  
+        return obj.external_id_origin if isinstance(obj.external_id_origin, str) else None 
 

endoreg_db/serializers/misc/file_overview.py

@@ -3,12 +3,8 @@ from typing import TYPE_CHECKING
 from rest_framework import serializers
 
 from endoreg_db.models.media import RawPdfFile, VideoFile
-from endoreg_db.models.state.raw_pdf import (
-    AnonymizationStatus as PdfAnonymizationStatus,
-)
-from endoreg_db.models.state.video import (
-    AnonymizationStatus as VideoAnonymizationStatus,
-)
+from endoreg_db.models.state.anonymization import AnonymizationState as PdfAnonymizationState
+from endoreg_db.models.state.anonymization import AnonymizationState as VideoAnonymizationState
 
 if TYPE_CHECKING:
     pass
@@ -28,10 +24,6 @@ class FileOverviewSerializer(serializers.Serializer):
     anonymizationStatus = serializers.CharField(read_only=True)
     annotationStatus = serializers.CharField(read_only=True)
     createdAt = serializers.DateTimeField(read_only=True)
-    text = serializers.CharField(required=False, allow_blank=True, read_only=True)
-    anonymizedText = serializers.CharField(
-        required=False, allow_blank=True, read_only=True
-    )
 
     # --- converting DB objects to that shape -----------------------
     def to_representation(self, instance):
@@ -62,110 +54,32 @@ class FileOverviewSerializer(serializers.Serializer):
             )
 
             # ------- anonymization status using VideoState model
-            vs = instance.state
+            vs = instance.get_or_create_state()
             anonym_status = (
-                vs.anonymization_status if vs else VideoAnonymizationStatus.NOT_STARTED
+                vs.anonymization_status if vs else VideoAnonymizationState.NOT_STARTED
             )
 
             # ------- annotation status (validated label segments)
             if instance.label_video_segments.filter(state__is_validated=True).exists():
-                annot_status = "done"
+                annot_status = "validated"
             else:
                 annot_status = "not_started"
 
-            # ------- Extract text from sensitive_meta for videos
-            if instance.sensitive_meta:
-                sm = instance.sensitive_meta
-                # Create a structured text representation from sensitive meta
-                text_parts = []
-
-                # Patient information
-                if sm.patient_first_name or sm.patient_last_name:
-                    patient_name = f"{sm.patient_first_name or ''} {sm.patient_last_name or ''}".strip()
-                    text_parts.append(f"Patient: {patient_name}")
-
-                if sm.patient_dob:
-                    text_parts.append(f"Date of Birth: {sm.patient_dob.date()}")
-
-                if sm.patient_gender:
-                    text_parts.append(f"Gender: {sm.patient_gender}")
-
-                # Examination information
-                if sm.examination_date:
-                    text_parts.append(f"Examination Date: {sm.examination_date}")
-
-                if sm.center:
-                    text_parts.append(f"Center: {sm.center.name}")
-
-                # Equipment information
-                if sm.endoscope_type:
-                    text_parts.append(f"Endoscope Type: {sm.endoscope_type}")
-
-                if sm.endoscope_sn:
-                    text_parts.append(f"Endoscope SN: {sm.endoscope_sn}")
-
-                # Examiner information
-                if sm.pk:  # Only if saved
-                    try:
-                        examiners = list(sm.examiners.all())
-                        if examiners:
-                            examiner_names = ", ".join(str(e) for e in examiners)
-                            text_parts.append(f"Examiners: {examiner_names}")
-                    except Exception:
-                        pass  # Ignore examiner lookup errors
-
-                text = "\n".join(text_parts)
-
-                # Create anonymized version by replacing sensitive data
-                anonym_text = text
-                if sm.patient_first_name:
-                    anonym_text = anonym_text.replace(
-                        sm.patient_first_name, "[FIRST_NAME]"
-                    )
-                if sm.patient_last_name:
-                    anonym_text = anonym_text.replace(
-                        sm.patient_last_name, "[LAST_NAME]"
-                    )
-                if sm.patient_dob:
-                    anonym_text = anonym_text.replace(
-                        str(sm.patient_dob.date()), "[DOB]"
-                    )
-                if sm.endoscope_sn:
-                    anonym_text = anonym_text.replace(sm.endoscope_sn, "[ENDOSCOPE_SN]")
-
-                # Replace examiner names if available
-                if sm.pk:
-                    try:
-                        examiners = list(sm.examiners.all())
-                        for examiner in examiners:
-                            anonym_text = anonym_text.replace(
-                                str(examiner), "[EXAMINER]"
-                            )
-                    except Exception:
-                        pass
-
         elif isinstance(instance, RawPdfFile):
-            instance: RawPdfFile
             media_type = "pdf"
             created_at = instance.date_created
             filename = instance.file.name.split("/")[-1] if instance.file else "unknown"
 
-            # ------- anonymization status using RawPdfState model (like VideoFile)
-            ps = instance.state
+            # ------- anonymization status using RawPdfState model
+            rps = instance.get_or_create_state()
             anonym_status = (
-                ps.anonymization_status if ps else PdfAnonymizationStatus.NOT_STARTED
+                rps.anonymization_status if rps else PdfAnonymizationState.NOT_STARTED
             )
 
-            # PDF annotation == "sensitive meta validated"
+            # ------- annotation status (not applicable for PDFs)
             annot_status = (
-                "done"
-                if getattr(instance.sensitive_meta, "is_verified", False)
-                else "not_started"
-            )
-
-            # Extract text content from PDF
-            text = instance.text or ""
-            anonym_text = instance.anonymized_text or ""
+                            PdfAnonymizationState.VALIDATED if rps.anonymization_validated else PdfAnonymizationState.NOT_STARTED 
+                            )
 
         else:  # shouldn't happen
             raise TypeError(f"Unsupported instance for overview: {type(instance)}")
@@ -177,6 +91,4 @@ class FileOverviewSerializer(serializers.Serializer):
             "anonymizationStatus": anonym_status,
             "annotationStatus": annot_status,
             "createdAt": created_at,
-            "text": text,
-            "anonymizedText": anonym_text,
         }

endoreg_db/serializers/misc/sensitive_patient_data.py

@@ -1,14 +1,14 @@
-from endoreg_db.models.media import RawPdfFile, VideoFile
-
-
 from rest_framework import serializers
 
-#TODO add this "naming convention" to the documentation
+from endoreg_db.models.media import RawPdfFile, VideoFile
+
+# TODO add this "naming convention" to the documentation
 # VoP: Video or Pdf
 
+
 class VoPPatientDataSerializer(serializers.Serializer):
     """
-    Serializer that converts a VideoFile or RawPdfFile to the structure 
+    Serializer that converts a VideoFile or RawPdfFile to the structure
     the Pinia store needs for validation workflow.
     """
 
@@ -24,12 +24,12 @@ class VoPPatientDataSerializer(serializers.Serializer):
     def to_representation(self, instance):
         """
         Serialize a VideoFile or RawPdfFile instance into a structured dictionary for validation workflows.
-        
+
         Depending on the instance type, constructs a dictionary containing identifiers, sensitive metadata, text summaries, anonymized text, processing status, and error flag. For VideoFile instances, generates a text summary from associated sensitive metadata and anonymizes personal identifiers. For RawPdfFile instances, uses the instance's text fields directly. Raises a TypeError if the instance is neither type.
-        
+
         Parameters:
             instance: A VideoFile or RawPdfFile model instance to serialize.
-        
+
         Returns:
             dict: A structured representation of the instance suitable for Pinia store consumption.
         """
@@ -62,44 +62,62 @@ class VoPPatientDataSerializer(serializers.Serializer):
                 # Create anonymized version
                 anonym_text = text
                 if sm.patient_first_name:
-                    anonym_text = anonym_text.replace(sm.patient_first_name, "[FIRST_NAME]")
+                    anonym_text = anonym_text.replace(
+                        sm.patient_first_name, "[FIRST_NAME]"
+                    )
                 if sm.patient_last_name:
-                    anonym_text = anonym_text.replace(sm.patient_last_name, "[LAST_NAME]")
+                    anonym_text = anonym_text.replace(
+                        sm.patient_last_name, "[LAST_NAME]"
+                    )
                 if sm.patient_dob:
-                    anonym_text = anonym_text.replace(str(sm.patient_dob.date()), "[DOB]")
+                    anonym_text = anonym_text.replace(
+                        str(sm.patient_dob.date()), "[DOB]"
+                    )
 
             return {
                 "id": instance.pk,
-                "sensitiveMetaId": instance.sensitive_meta.pk if instance.sensitive_meta else None,
+                "sensitiveMetaId": instance.sensitive_meta.pk
+                if instance.sensitive_meta
+                else None,
                 "text": text,
                 "anonymizedText": anonym_text,
-                "reportMeta": self._serialize_sensitive_meta(instance.sensitive_meta) if instance.sensitive_meta else None,
-                "status": "processing" if instance.state and instance.state.frames_extracted else "not_started",
+                "reportMeta": self._serialize_sensitive_meta(instance.sensitive_meta)
+                if instance.sensitive_meta
+                else None,
+                "status": "processing"
+                if instance.state and instance.state.frames_extracted
+                else "not_started",
                 "error": False,
             }
 
         elif isinstance(instance, RawPdfFile):
-            # Generate PDF streaming URL using pdf_id (RawPdfFile.id)
-            pdf_stream_url = f"/api/media/pdfs/{instance.pk}/stream/"
-            
+            # Generate report streaming URL using pdf_id (RawPdfFile.id)
+            report_stream_url = f"/api/media/pdfs/{instance.pk}/stream/"
+
             return {
                 "id": instance.pk,
-                "sensitiveMetaId": instance.sensitive_meta.pk if instance.sensitive_meta else None,
+                "sensitiveMetaId": instance.sensitive_meta.pk
+                if instance.sensitive_meta
+                else None,
                 "text": instance.text or "",
                 "anonymizedText": instance.anonymized_text or "",
-                "reportMeta": self._serialize_sensitive_meta(instance.sensitive_meta) if instance.sensitive_meta else None,
+                "reportMeta": self._serialize_sensitive_meta(instance.sensitive_meta)
+                if instance.sensitive_meta
+                else None,
                 "status": "done" if instance.anonymized_text else "not_started",
                 "error": False,
-                "pdfStreamUrl": pdf_stream_url,
+                "pdfStreamUrl": report_stream_url,
             }
 
         else:
-            raise TypeError(f"Unsupported instance for VoPPatientDataSerializer: {type(instance)}")
+            raise TypeError(
+                f"Unsupported instance for VoPPatientDataSerializer: {type(instance)}"
+            )
 
     def _serialize_sensitive_meta(self, sensitive_meta):
         """
         Serialize a SensitiveMeta object into a dictionary with patient and examination details.
-        
+
         Returns:
             dict or None: A dictionary containing patient and examination metadata fields, or None if sensitive_meta is not provided.
         """
@@ -110,11 +128,17 @@ class VoPPatientDataSerializer(serializers.Serializer):
             "id": sensitive_meta.pk,
             "patientFirstName": sensitive_meta.patient_first_name or "",
             "patientLastName": sensitive_meta.patient_last_name or "",
-            "patientDob": sensitive_meta.patient_dob.isoformat() if sensitive_meta.patient_dob else "",
-            "patientGender": str(sensitive_meta.patient_gender) if sensitive_meta.patient_gender else "",
-            "examinationDate": sensitive_meta.examination_date.isoformat() if sensitive_meta.examination_date else "",
+            "patientDob": sensitive_meta.patient_dob.isoformat()
+            if sensitive_meta.patient_dob
+            else "",
+            "patientGender": str(sensitive_meta.patient_gender)
+            if sensitive_meta.patient_gender
+            else "",
+            "examinationDate": sensitive_meta.examination_date.isoformat()
+            if sensitive_meta.examination_date
+            else "",
             "centerName": sensitive_meta.center.name if sensitive_meta.center else "",
             "endoscopeType": sensitive_meta.endoscope_type or "",
             "endoscopeSn": sensitive_meta.endoscope_sn or "",
             "isVerified": getattr(sensitive_meta, "is_verified", False),
-        }
+        }

endoreg_db/serializers/patient_examination/patient_examination.py

@@ -135,7 +135,7 @@ class PatientExaminationSerializer(serializers.ModelSerializer):
     
     def get_findings(self, patient_examination_id):
         """Gibt die zugehörigen Befunde zurück"""
-        obj = PatientExamination.get_or_create_patient_examination_by_id(PatientExamination, patient_examination_id)
+        pe = PatientExamination()
+        obj = pe.get_or_create_patient_examination_by_id(patient_examination_id)
         self.instance = obj
-        response = PatientExaminationSerializer()
-        return self.instance.patient_findings.all() if self.instance else []
+        return self.instance.get_available_findings() if self.instance else []