endoreg-db 0.6.4__py3-none-any.whl → 0.8.2__py3-none-any.whl

endoreg_db/data/requirement_operator/lab_operators.yaml

@@ -1,128 +1,129 @@
 - model: endoreg_db.requirement_operator
   fields:
-    name: "lab_numeric_normal"
+    name: "lab_latest_numeric_normal"
     name_de: "Laborwert normal"
     name_en: "Lab value normal"
     description: "Make sure that the provided numeric lab value is within the normal range. The normal range is defined using the numeric_value_min and numeric_value_max fields. To work, the passed lab value must have a reference value"
-
+    
 # lab_numeric_increased
 - model: endoreg_db.requirement_operator
   fields:
-    name: "lab_numeric_increased"
+    name: "lab_latest_numeric_increased"
     name_de: "Laborwert erhöht"
     name_en: "Lab value increased"
     description: "Make sure that the provided numeric lab value is above the normal range. The normal range is defined using the numeric_value_min and numeric_value_max fields."
-
+    
 - model: endoreg_db.requirement_operator
   fields:
-    name: "lab_numeric_decreased"
+    name: "lab_latest_numeric_decreased"
     name_de: "Laborwert verringert"
     name_en: "Lab value decreased"
     description: "Make sure that the provided numeric lab value is below the normal range. The normal range is defined using the numeric_value_min and numeric_value_max fields."
-
+    
 - model: endoreg_db.requirement_operator
   fields:
-    name: "lab_numeric_decreased_factor"
+    name: "lab_latest_numeric_decreased_factor"
     name_de: "Laborwert um Faktor verringert"
     name_en: "Lab value decreased by factor"
     description: "Make sure that the provided numeric lab value is decreased by a factor. The factor is defined using the numeric_value_min field."
-
+    
 - model: endoreg_db.requirement_operator
   fields:
-    name: "lab_numeric_increased_factor"
+    name: "lab_latest_numeric_increased_factor"
     name_de: "Laborwert um Faktor erhöht"
     name_en: "Lab value increased by factor"
     description: "Make sure that the provided numeric lab value is increased by a factor. The factor is defined using the numeric_value_min field."
-
+    
 - model: endoreg_db.requirement_operator
   fields:
-    name: "lab_numeric_lower_than_value"
+    name: "lab_latest_numeric_lower_than_value"
     name_de: "Laborwert kleiner als Wert"
     name_en: "Lab value lower than value"
     description: "Make sure that the provided numeric lab value is lower than the given value. The value is defined using the numeric_value_min field."
-
+    
 - model: endoreg_db.requirement_operator
   fields:
-    name: "lab_numeric_greater_than_value"
+    name: "lab_latest_numeric_greater_than_value"
     name_de: "Laborwert größer als Wert"
     name_en: "Lab value greater than value"
     description: "Make sure that the provided numeric lab value is greater than the given value. The value is defined using the numeric_value_min field."
-
+    
 # Timeframe
 - model: endoreg_db.requirement_operator
   fields:
-    name: "lab_numeric_normal_in_timeframe"
+    name: "lab_latest_numeric_normal_in_timeframe"
     name_de: "Laborwert normal im angegebenen Zeitraum"
     name_en: "Lab value normal in the given timeframe"
     description: "Make sure that the provided numeric lab value is always within the normal range within the given timeframe. The normal range is defined using the numeric_value_min and numeric_value_max fields and the timeframe is defined using numeric_value_min and numeric_value_max and setting the unit to a fitting one (e.g. week)."
-
+    
 - model: endoreg_db.requirement_operator
   fields:
-    name: "lab_numeric_decreased_factor_in_timeframe"
+    name: "lab_latest_numeric_decreased_factor_in_timeframe"
     name_de: "Laborwert um Faktor verringert im angegebenen Zeitraum"
     name_en: "Lab value decreased by factor in the given timeframe"
     description: "Make sure that the provided numeric lab value is always decreased by a factor within the given timeframe. The factor is defined using the numeric_value_min field and the timeframe is defined using numeric_value_min and numeric_value_max and setting the unit to a fitting one (e.g. week)."
-
+    
 - model: endoreg_db.requirement_operator
   fields:
-    name: "lab_numeric_increased_factor_in_timeframe"
+    name: "lab_latest_numeric_increased_factor_in_timeframe"
     name_de: "Laborwert um Faktor erhöht im angegebenen Zeitraum"
     name_en: "Lab value increased by factor in the given timeframe"
     description: "Make sure that the provided numeric lab value is always increased by a factor within the given timeframe. The factor is defined using the numeric_value_min field and the timeframe is defined using numeric_value_min and numeric_value_max and setting the unit to a fitting one (e.g. week)."
-
+    
 - model: endoreg_db.requirement_operator
   fields:
-    name: "lab_numeric_lower_than_value_in_timeframe"
+    name: "lab_latest_numeric_lower_than_value_in_timeframe"
     name_de: "Laborwert kleiner als Wert im angegebenen Zeitraum"
     name_en: "Lab value lower than value in the given timeframe"
     description: "Make sure that the provided numeric lab value is lower than the given value within the given timeframe. The value is defined using the numeric_value_min field and the timeframe is defined using numeric_value_min and numeric_value_max and setting the unit to a fitting one (e.g. week)."
-
+    
 - model: endoreg_db.requirement_operator
   fields:
-    name: "lab_numeric_greater_than_value_in_timeframe"
+    name: "lab_latest_numeric_greater_than_value_in_timeframe"
     name_de: "Laborwert größer als Wert im angegebenen Zeitraum"
     name_en: "Lab value greater than value in the given timeframe"
     description: "Make sure that the provided numeric lab value is greater than the given value within the given timeframe. The value is defined using the numeric_value_min field and the timeframe is defined using numeric_value_min and numeric_value_max and setting the unit to a fitting one (e.g. week)."
-
+    
 - model: endoreg_db.requirement_operator
   fields:
-    name: "lab_categorical_match"
+    name: "lab_latest_categorical_match"
     name_de: "Text-basierter Laborwert entspricht exakt"
     name_en: "Text-based lab value matches exactly"
     description: "Make sure that the provided categorical lab value matches exactly the given value. The value is defined using the string_value field."
-
+    
 - model: endoreg_db.requirement_operator
   fields:
-    name: "lab_categorical_match_substring"
+    name: "lab_latest_categorical_match_substring"
     name_de: "Text-basierter Laborwert enthält Teilstring"
     name_en: "Text-based lab value contains substring"
     description: "Make sure that the provided categorical lab value contains the given substring. The substring is defined using the string_value field."
-
+    
 - model: endoreg_db.requirement_operator
   fields:
-    name: "lab_categorical_match_regex"
+    name: "lab_latest_categorical_match_regex"
     name_de: "Text-basierter Laborwert entspricht Regex"
     name_en: "Text-based lab value matches regex"
     description: "Make sure that the provided categorical lab value matches the given regex. The regex is defined using the string_value field."
-
+    
 # Timeframe
 - model: endoreg_db.requirement_operator
   fields:
-    name: "lab_categorical_match_in_timeframe"
+    name: "lab_latest_categorical_match_in_timeframe"
     name_de: "Text-basierter Laborwert entspricht exakt im angegebenen Zeitraum"
     name_en: "Text-based lab value matches exactly in the given timeframe"
     description: "Make sure that the provided categorical lab value matches exactly the given value within the given timeframe. The value is defined using the string_value field and the timeframe is defined using numeric_value_min and numeric_value_max and setting the unit to a fitting one (e.g. week)."
-
+    
 - model: endoreg_db.requirement_operator
   fields:
-    name: "lab_categorical_match_substring_in_timeframe"
+    name: "lab_latest_categorical_match_substring_in_timeframe"
     name_de: "Text-basierter Laborwert enthält Teilstring im angegebenen Zeitraum"
     name_en: "Text-based lab value contains substring in the given timeframe"
     description: "Make sure that the provided categorical lab value contains the given substring within the given timeframe. The substring is defined using the string_value field and the timeframe is defined using numeric_value_min and numeric_value_max and setting the unit to a fitting one (e.g. week)."
-
+    
 - model: endoreg_db.requirement_operator
   fields:
-    name: "lab_categorical_match_regex_in_timeframe"
+    name: "lab_latest_categorical_match_regex_in_timeframe"
     name_de: "Text-basierter Laborwert entspricht Regex im angegebenen Zeitraum"
     name_en: "Text-based lab value matches regex in the given timeframe"
     description: "Make sure that the provided categorical lab value matches the given regex within the given timeframe. The regex is defined using the string_value field and the timeframe is defined using numeric_value_min and numeric_value_max and setting the unit to a fitting one (e.g. week)."
+    

endoreg_db/data/requirement_operator/model_operators.yaml

@@ -47,6 +47,13 @@
     name_en: "Number of models is in the given range"
     description: "Make sure that the number of provided Foreign Key models is in the given range. The range is defined using numeric_value_min and numeric_value_max."
 
+- model: endoreg_db.requirement_operator
+  fields:
+    name: "models_match_any_in_timeframe"
+    name_de: "Mindestens ein Modell existiert im angegebenen Zeitraum"
+    name_en: "At least one model exists in the given timeframe"
+    description: "Make sure that at least one of the provided Foreign Key models exist and its associated date falls within the specified timeframe. Timeframe is defined by numeric_value_min, numeric_value_max, and unit on the Requirement."
+
 - model: endoreg_db.requirement_operator
   fields:
     name: "models_match_all_in_timeframe"
@@ -54,13 +61,6 @@
     name_en: "Models exist in the given timeframe"
     description: "Make sure that all the provided Foreign Key models have a date within the given timeframe. The timeframe is defined using numeric_value_min and numeric_value_max and setting the unit to a fitting one (e.g. week)."
 
-- model: endoreg_db.requirement_operator
-  fields:
-    name: "models_match_any_in_timeframe"
-    name_de: "Mindestens ein Modell existiert im angegebenen Zeitraum"
-    name_en: "At least one model exists in the given timeframe"
-    description: "Make sure that at least one of the provided Foreign Key models has a date within the given timeframe. The timeframe is defined using numeric_value_min and numeric_value_max and setting the unit to a fitting one (e.g. week)."
-
 - model: endoreg_db.requirement_operator
   fields:
     name: "models_match_none_in_timeframe"
@@ -88,3 +88,9 @@
     name_de: "Höchstens n Modelle existieren im angegebenen Zeitraum"
     name_en: "At most n models exist in the given timeframe"
     description: "Make sure that at most n of the provided Foreign Key models have a date within the given timeframe. The timeframe is defined using numeric_value_min and numeric_value_max and setting the unit to a fitting one (e.g. week). The number n is defined using the numeric_value_min field."
+
+- model: endoreg_db.requirement_operator
+  fields:
+    name: "patient_medication_schedule_matches_template"
+    description: "Checks if any PatientMedication in the input PatientMedicationSchedule matches the profile (medication, dose, unit, intake times) of any MedicationSchedule template linked to the requirement."
+    evaluation_function_name: "_evaluate_patient_medication_schedule_matches_template"

endoreg_db/data/requirement_set/01_endoscopy_generic.yaml

@@ -0,0 +1,48 @@
+- models: endoreg_db.requirement_set
+  fields:
+    name: "patient_gender_generic"
+    name_de: "Patientengeschlecht (männlich/weiblich)"
+    name_en: "Patient gender generic" 
+    description: "Patient gender (generic)"
+    requirement_set_type: "any"
+    requirements:
+      - patient_gender_is_male
+      - patient_gender_is_female
+
+- models: endoreg_db.requirement_set
+  fields:
+    name: "basic_lab_values_normal"
+    name_de: "Basis-Labortests (Unauffällig)"
+    name_en: "Basic Lab Tests (Normal)"
+    description: "Basic lab tests (normal)"
+    requirement_set_type: "all"
+    requirements:
+      - "lab_value_hb_normal"
+      - "lab_value_leukocytes_normal"
+      - "lab_value_platelets_normal"
+      - "lab_value_creatinine_normal"
+      - "lab_value_inr_normal"
+
+- models: endoreg_db.requirement_set
+  fields:
+    name: "patient_age_generic"
+    name_de: "Patientenalter (18-100 Jahre)"
+    name_en: "Patient Age (18-100 years)"
+    description: "Patient age between 18 and 100 years"
+    requirement_set_type: "all"
+    requirements:
+      - "patient_age_gte_18"
+      - "patient_age_lte_100"
+
+# - models: endoreg_db.requirement_set
+- models: endoreg_db.requirement_set
+  fields:
+    name: "generic_patient"
+    requirement_set_type: "all"
+    description: "Generic patient requirement set"
+    name_de: "Generische Patientenanforderung"
+    name_en: "Generic Patient Requirement"
+    links_to_sets:
+      - "patient_age_generic"
+      - "patient_gender_generic"
+      - "basic_lab_values_normal"

endoreg_db/data/requirement_set/colonoscopy_austria_screening.yaml

@@ -0,0 +1,57 @@
+
+
+- models: endoreg_db.requirement_set
+  fields:
+    name: "colonoscopy_austria_screening_finding_polyp_required_classifications"
+    name_de: "Vorsorge Koloskopie Österreich: Polyp"
+    requirement_set_type: "all"
+    links_to_sets: []
+    requirements:
+      - "colon_austria_screening_polyp_size"
+      - "colonoscopy_austria_screening_polyp_location"
+      - "colonoscopy_austria_screening_polyp_histology"
+
+- models: endoreg_db.requirement_set
+  fields:
+    name: "colonoscopy_austria_screening_examination_complete"
+    requirement_set_type: "any"
+    requirements:
+      - "colonoscopy_austria_screening_examination_cecum_visualized"
+      - "colonoscopy_austria_screening_examination_reason_incomplete"
+
+- models: endoreg_db.requirement_set
+  fields:
+    name: "colonoscopy_austria_screening_examination_required_findings"
+    links_to_sets:
+      - "colonoscopy_austria_screening_examination_complete"
+    requirement_set_type: "all"
+    requirements:
+      - "colonoscopy_austria_screening_bowel_prep"
+      - "colonoscopy_austria_screening_sedation"
+
+- models: endoreg_db.requirement_set
+  fields:
+    name: "colonoscopy_austria_screening_required_patient_information"
+    name_de: "Vorsorge Koloskopie Österreich: Patienteninformation"
+    requirement_set_type: "all"
+    links_to_sets:
+      - "patient_gender_generic"
+      - "patient_age_generic"
+
+- models: endoreg_db.requirement_set
+  fields:
+    name: "colonoscopy_austria_screening_qa"
+    name_de: "Vorsorge Koloskopie Österreich QA"
+    name_en: "Colonoscopy Austria Screening QA"
+    description: "Colonoscopy Austria Screening QA"
+    requirement_set_type: "all"
+    links_to_sets:
+      - "colonoscopy_austria_screening_finding_polyp_required_classifications"
+      - "colonoscopy_austria_screening_required_patient_information"
+      - "colonoscopy_austria_screening_examination_required_findings"
+    tags:
+      - "report_mask_requirement_set"
+      - "colonoscopy_austria_screening"
+    reqset_exam_links:
+      - "colonoscopy_austria_req_sets"
+      - "colonoscopy_req_sets"

endoreg_db/data/requirement_set/endoscopy_bleeding_risk.yaml

@@ -6,7 +6,47 @@
     description: "Endoskopie - Blutungsrisiko: hoch"
     # linked_sets: [] # if this rule depends on others
     requirement_set_type: "any"
-    information_sources:
-      - "guideline_quality_in_gi"
     requirements:
       - "endoscopy_intervention_bleeding_risk_high"
+
+
+
+- models: endoreg_db.requirement_set
+  fields:
+    name: "endoscopy_bleeding_risk_low"
+    name_de: "Endoskopie - Blutungsrisiko: niedrig"
+    name_en: "Endoscopy - Bleeding Risk: Low"
+    description: "Endoskopie - Blutungsrisiko: niedrig"
+    # linked_sets: [] # if this rule depends on others
+    requirement_set_type: "any"
+    requirements:
+      - "endoscopy_intervention_bleeding_risk_low"
+    links_to_sets: []
+
+
+
+    
+- models: endoreg_db.requirement_set
+  fields:
+    name: "patient_medication_indication_anticoagulation"
+    name_de: "Patientenmedikation - Antikoagulation"
+    name_en: "Patient Medication - Anticoagulation"
+    description: "Patient medication - anticoagulation"
+    requirement_set_type: "any"
+    requirements:
+      - "indication_non_valvular_af_apixaban_is_defined_in_requirement"
+      - "indication_after_hip_apixaban_is_defined_in_requirement"
+      - "indication_after_knee_apixaban_is_defined_in_requirement"
+    
+
+- models: endoreg_db.requirement_set
+  fields:
+    name: "high_bleed_risk_endoscopy_w_patient_w_anticoagulation"
+    name_de: "Endoskopie - hohes Blutungsrisiko mit generischen Patientenanforderungen"
+    name_en: "High Bleed Risk Endoscopy with Generic Patient Requirements"
+    description: "High bleed risk endoscopy with generic patient requirements"
+    requirement_set_type: "all"
+    links_to_sets:
+      - "endoscopy_bleeding_risk_high"
+      - "generic_patient"
+      - "patient_medication_indication_anticoagulation"

endoreg_db/data/requirement_type/requirement_types.yaml

@@ -5,6 +5,27 @@
     name_en: "Patient examination"
     description: "Requirements of this type are used on PatientExamination Objects."
 
+- model: endoreg_db.requirement_type
+  fields:
+    name: "patient_lab_sample"
+    name_de: "Patientenlabormuster"
+    name_en: "Patient lab sample"
+    description: "Requirements of this type are used on PatientLabSample Objects."
+
+- model: endoreg_db.requirement_type
+  fields:
+    name: "patient_lab_value"
+    name_de: "Patientenlaborwert"
+    name_en: "Patient lab value"
+    description: "Requirements of this type are used on PatientLabValue Objects."
+
+- model: endoreg_db.requirement_type
+  fields:
+    name: "patient_disease"
+    name_de: "Patientenerkrankung"
+    name_en: "Patient Disease"
+    description: "Requirements of this type are used on PatientDisease Objects."
+
 - model: endoreg_db.requirement_type
   fields:
     name: "examination"
@@ -81,3 +102,64 @@
     name_de: "Befundinterventionen (multiple)"
     name_en: "Finding Interventions (multiple)"
     description: "Finding interventions (multiple) requirements"
+
+- model: endoreg_db.requirement_type
+  fields:
+    name: "patient"
+    name_de: "Patient"
+    name_en: "Patient"
+    description: "Relates to a patient record."
+
+- model: endoreg_db.requirement_type
+  fields:
+    name: "patient_event"
+    name_de: "Patientenereignis"
+    name_en: "Patient Event"
+    description: "Requirements of this type are used on PatientEvent Objects."
+
+- model: endoreg_db.requirement_type
+  fields:
+    name: "patient_finding"
+    
+
+- model: endoreg_db.requirement_type
+  fields:
+    name: "patient_medication"
+    name_de: "Patientenmedikation"
+    name_en: "Patient Medication"
+    description: "Requirements of this type are used on PatientMedication Objects."
+
+- model: endoreg_db.requirement_type
+  fields:
+    name: "medication"
+    name_de: "Medikament"
+    name_en: "Medication"
+    description: "Requirements of this type are used on Medication Objects."
+
+- model: endoreg_db.requirement_type
+  fields:
+    name: "medication_indication"
+    name_de: "Medikationsindikation"
+    name_en: "Medication Indication"
+    description: "Requirements of this type are used on MedicationIndication Objects."
+
+- model: endoreg_db.requirement_type
+  fields:
+    name: "medication_intake_time"
+    name_de: "Medikamenteneinnahmezeit"
+    name_en: "Medication Intake Time"
+    description: "Requirements of this type are used on MedicationIntakeTime Objects."
+
+- model: endoreg_db.requirement_type
+  fields:
+    name: "medication_schedule"
+    name_de: "Medikationsschema"
+    name_en: "Medication Schedule"
+    description: "Requirements of this type are used on MedicationSchedule Objects."
+
+- model: endoreg_db.requirement_type
+  fields:
+    name: "patient_medication_schedule"
+    name_de: "Patienten-Medikationsplan"
+    name_en: "Patient Medication Schedule"
+    description: "Represents a patient's overall medication schedule, which may contain multiple patient medications."

endoreg_db/data/shift/endoscopy.yaml

@@ -0,0 +1,21 @@
+- model: endoreg_db.shift
+  fields:
+    name: "endoscopy_base"
+    name_de: "Endoskopie (Basis)"
+    name_en: "Endoscopy (Base)"
+    description: "This shift represents a basic, planned endoscopy shift (EGD, colonoscopy)."
+    required_qualifications: 
+      - "endoscopy_base"
+    shift_types:
+    
+
+- model: endoreg_db.shift
+  fields:
+    name: "endoscopy_training"
+    name_de: "Endoskopie (Training)"
+    name_en: "Endoscopy (Training)"
+    description: "This shift represents a training endoscopy shift which is covered 1:1 with an experienced endoscopist."
+    required_qualifications: 
+      - "endoscopy_supervised"
+
+

endoreg_db/data/shift_type/base.yaml

@@ -0,0 +1,35 @@
+- model: endoreg_db.shift_type
+  fields:
+    name: "regular"
+    name_de: "Regulär"
+    name_en: "Regular"
+
+- model: endoreg_db.shift_type
+  fields:
+    name: "supervision"
+    name_de: "Supervision"
+    name_en: "Supervision"
+
+- model: endoreg_db.shift_type
+  fields:
+    name: "off_hours"
+    name_de: "Nicht reguläre Arbeitszeit ('Dienste')"
+    name_en: "Off Hours"
+
+- model: endoreg_db.shift_type
+  fields:
+    name: "on_call"
+    name_de: "Bereitschaftsdienst"
+    name_en: "On Call"
+
+- model: endoreg_db.shift_type
+  fields:
+    name: "ward"
+    name_de: "Station"
+    name_en: "Ward"
+
+- model: endoreg_db.shift_type
+  fields:
+    name: "miscellaneous"
+    name_de: "Sonstiges"
+    name_en: "Miscellaneous"

endoreg_db/data/tag/requirement_set_tags.yaml

@@ -0,0 +1,11 @@
+- model: endoreg_db.tag
+  fields:
+    name: "report_mask_requirement_set"
+
+- model: endoreg_db.tag
+  fields:
+    name: "colonoscopy_austria_screening"
+
+- model: endoreg_db.tag
+  fields:
+    name: "colonoscopy_austria"

endoreg_db/data/unit/concentration.yaml

@@ -6,6 +6,21 @@
     name_en: "picogram per mililiter"
     abbreviation: "pg/ml"
 
+# gram per liter
+- model: endoreg_db.unit
+  fields:
+    name: "gram per liter"
+    name_de: "Gramm pro Liter"
+    name_en: "gram per liter"
+    abbreviation: "g/L"
+
+# micromole per liter: 
+- model: endoreg_db.unit
+  fields:
+    name: "micromole per liter"
+    name_de: "Mikromol pro Liter"
+    name_en: "micromole per liter"
+    abbreviation: "µmol/L"
 
 - model: endoreg_db.unit
   fields:
@@ -67,6 +82,14 @@
     name_en: "miligram per deciliter"
     description: "miligrams per deciliter, commonly used for various blood measurements."
 
+- model: endoreg_db.Unit
+  fields:
+    name: "miligram per liter"
+    abbreviation: "mg/L"
+    name_de: "miligramm pro Liter"
+    name_en: "miligram per liter"
+    description: "miligrams per liter, a unit of measurement for concentration in blood."
+
 # x 10^9 per liter
 - model: endoreg_db.Unit
   fields:

endoreg_db/exceptions.py

@@ -0,0 +1,19 @@
+
+
+class InsufficientStorageError(Exception):
+    """Raised when there's not enough disk space for an operation."""
+    
+    def __init__(self, message, required_space=None, available_space=None):
+        super().__init__(message)
+        self.required_space = required_space
+        self.available_space = available_space
+
+
+class TranscodingError(Exception):
+    """Raised when video transcoding fails."""
+    pass
+
+
+class VideoProcessingError(Exception):
+    """Base class for video processing errors."""
+    pass

endoreg_db/forms/patient_finding_intervention_form.py

@@ -1,7 +1,7 @@
 from django import forms
 from endoreg_db.models import (
     Patient, PatientExamination, Finding, 
-    FindingLocationClassification, FindingMorphologyClassification, 
+    FindingClassification, FindingClassificationChoice,
     FindingIntervention, PatientFindingIntervention
 )
 
@@ -9,11 +9,10 @@ class PatientFindingInterventionForm(forms.ModelForm):
     patient = forms.ModelChoiceField(queryset=Patient.objects.all(), required=True)
     examination = forms.ModelChoiceField(queryset=PatientExamination.objects.none(), required=True)
     finding = forms.ModelChoiceField(queryset=Finding.objects.none(), required=True)
-    location = forms.ModelChoiceField(queryset=FindingLocationClassification.objects.none(), required=True)
-    location_choice = forms.ModelChoiceField(queryset=FindingLocationClassification.objects.none(), required=True)
-    morphology = forms.ModelChoiceField(queryset=FindingMorphologyClassification.objects.none(), required=True)
+    classification = forms.ModelChoiceField(queryset=FindingClassification.objects.none(), required=True)
+    classification_choice = forms.ModelChoiceField(queryset=FindingClassificationChoice.objects.none(), required=True)
     interventions = forms.ModelMultipleChoiceField(queryset=FindingIntervention.objects.none(), widget=forms.CheckboxSelectMultiple, required=True)
 
     class Meta:
         model = PatientFindingIntervention
-        fields = ["patient", "examination", "finding", "location", "location_choice", "morphology", "interventions"]
+        fields = ["patient", "examination", "finding", "classification", "classification_choice", "interventions"]

endoreg_db/forms/patient_form.py

@@ -1,11 +1,12 @@
 from django import forms
 from django.forms import ModelForm, Select
-from endoreg_db.models.persons.patient.patient import Patient
-from django import forms
-from django.forms import ModelForm, Select
-from endoreg_db.models.persons.patient.patient import Patient
-from endoreg_db.models.persons.gender import Gender  
-from endoreg_db.models.center import Center  
+from endoreg_db.models import (
+    Patient,
+    Gender,
+    Center
+)
+
+
 class PatientForm(ModelForm):
     gender = forms.ModelChoiceField(
         queryset=Gender.objects.all(),  

endoreg_db/forms/questionnaires/__init__.py

@@ -1 +1 @@
-from .tto_questionnaire import TtoQuestionnaireForm, TtoQuestionnaireCreate
+# from .tto_questionnaire import TtoQuestionnaireForm, TtoQuestionnaireCreate