[IMP] medical_clinical_impression: Remove dependancy on encounters

Author: etobella

medical_clinical_impression/__manifest__.py

@@ -19,9 +19,7 @@
         "security/ir.model.access.csv",
         "data/ir_sequence_data.xml",
         "wizards/create_impression_from_patient.xml",
-        "wizards/create_impression_from_encounter.xml",
         "views/medical_clinical_impression.xml",
-        "views/medical_encounter.xml",
         "views/medical_patient.xml",
         "views/medical_clinical_finding.xml",
         "views/medical_family_member_history.xml",

medical_clinical_impression/demo/medical_demo.xml

@@ -36,21 +36,13 @@
         <field name="name">Gynecology</field>
         <field name="description">Gynecology</field>
     </record>
-    <record id="encounter_01_patient_01" model="medical.encounter">
-        <field name="patient_id" ref="medical_base.patient_01" />
-        <!-- <field name="center_id" ref="medical_administration_center.partner_center_1" /> -->
-    </record>
     <record id="impression_01_patient_01" model="medical.clinical.impression">
         <field name="fhir_state">completed</field>
         <field
             name="specialty_id"
             ref="medical_clinical_impression.specialty_gynecology"
         />
         <field name="patient_id" ref="medical_base.patient_01" />
-        <field
-            name="encounter_id"
-            ref="medical_clinical_impression.encounter_01_patient_01"
-        />
         <field name="validation_date" eval="datetime.now()" />
         <field name="validation_user_id" ref="base.user_demo" />
         <field

medical_clinical_impression/models/__init__.py

@@ -1,6 +1,5 @@
 from . import medical_clinical_impression
 from . import medical_patient
-from . import medical_encounter
 from . import medical_clinical_finding
 from . import medical_specialty
 from . import medical_family_member_history

medical_clinical_impression/models/medical_clinical_impression.py

@@ -34,11 +34,11 @@ def _get_states(self):
     )
     # FHIR: description
 
-    encounter_id = fields.Many2one("medical.encounter", required=True, readonly=True)
-    # FHIR: encounter
-
     patient_id = fields.Many2one(
-        related="encounter_id.patient_id", readonly=True, states={}
+        "medical.patient",
+        required=True,
+        readonly=True,
+        states={"draft": [("readonly", False)]},
     )
     # FHIR: patient
 
@@ -80,12 +80,6 @@ def _get_states(self):
     note = fields.Text(readonly=True, states={"draft": [("readonly", False)]})
     # FHIR: Note
 
-    current_encounter = fields.Boolean(
-        help="This field is only used to stand out the impressions "
-        "of the current encounter in the tree view",
-        compute="_compute_current_encounter",
-    )
-
     warning_info = fields.Json(compute="_compute_warning_info")
 
     def _get_warning_info(self):
@@ -110,16 +104,6 @@ def _get_internal_identifier(self, vals):
             self.env["ir.sequence"].next_by_code("medical.clinical.impression") or "/"
         )
 
-    @api.depends("encounter_id")
-    def _compute_current_encounter(self):
-        for rec in self:
-            current_encounter = False
-            if self.env.context.get("encounter_id"):
-                default_encounter = self.env.context.get("encounter_id")
-                if default_encounter == rec.encounter_id.id:
-                    current_encounter = True
-            rec.current_encounter = current_encounter
-
     def _create_conditions_from_findings(self):
         finding_ids = self.finding_ids.filtered(
             lambda f: f.create_condition_from_clinical_impression

medical_clinical_impression/models/medical_encounter.py

@@ -59,16 +59,10 @@ def _compute_impression_specialties(self):
 
     def action_view_clinical_impressions(self):
         self.ensure_one()
-        encounter = self._get_last_encounter()
         action = self.env["ir.actions.act_window"]._for_xml_id(
             "medical_clinical_impression." "medical_clinical_impression_act_window"
         )
         action["domain"] = [("patient_id", "=", self.id)]
-        if encounter:
-            action["context"] = {
-                "default_encounter_id": encounter.id,
-                "search_default_filter_not_cancelled": True,
-            }
         return action
 
     def action_view_family_history(self):

medical_clinical_impression/models/medical_patient.py

@@ -1,6 +1,6 @@
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
 
-from odoo import fields, models
+from odoo import api, fields, models
 from odoo.osv import expression
 
 
@@ -10,54 +10,46 @@ class MedicalSpecialty(models.Model):
 
     patient_impression_count = fields.Integer(compute="_compute_impression_info")
 
-    encounter_impression_count = fields.Integer(compute="_compute_impression_info")
-
     impression_last_update = fields.Datetime(compute="_compute_impression_info")
 
     impressions_in_progress_count = fields.Integer(compute="_compute_impression_info")
 
+    @api.depends_context("patient_id")
     def _compute_impression_info(self):
         for rec in self:
-            patient_count = 0
-            encounter_count = 0
-            impressions_in_progress = 0
-            patient_id = None
-            last_update = False
-            if self.env.context.get("patient_id"):
-                patient_id = self.env["medical.patient"].browse(
-                    self.env.context.get("patient_id")
-                )
-            elif self.env.context.get("encounter_id"):
-                encounter_id = self.env["medical.encounter"].browse(
-                    self.env.context.get("encounter_id")
-                )
-                encounter_count = len(
-                    encounter_id.medical_impression_ids.filtered(
-                        lambda r: r.specialty_id.id == rec.id
-                        and r.fhir_state != "cancelled"
-                    )
-                )
-                patient_id = encounter_id.patient_id
-            if patient_id:
-                patient_impression_ids = patient_id.medical_impression_ids.filtered(
-                    lambda r: r.specialty_id.id == rec.id
-                    and r.fhir_state != "cancelled"
-                )
-                patient_count = len(patient_impression_ids)
-                impressions_completed = patient_impression_ids.filtered(
-                    lambda r: r.fhir_state == "completed"
-                )
-                if impressions_completed:
-                    last_update = impressions_completed[0].validation_date
-                impressions_in_progress = len(
-                    patient_impression_ids.filtered(
-                        lambda r: r.fhir_state == "in_progress"
-                    )
-                )
-            rec.patient_impression_count = patient_count
-            rec.encounter_impression_count = encounter_count
-            rec.impression_last_update = last_update
-            rec.impressions_in_progress_count = impressions_in_progress
+            vals = rec._get_impression_info()
+            rec.update(vals)
+
+    def _get_impression_info_patient(self):
+        if self.env.context.get("patient_id"):
+            return self.env["medical.patient"].browse(
+                self.env.context.get("patient_id")
+            )
+        return None
+
+    def _get_impression_info(self):
+        patient_count = 0
+        impressions_in_progress = 0
+        patient_id = self._get_impression_info_patient()
+        last_update = False
+        if patient_id:
+            patient_impression_ids = patient_id.medical_impression_ids.filtered(
+                lambda r: r.specialty_id.id == self.id and r.fhir_state != "cancelled"
+            )
+            patient_count = len(patient_impression_ids)
+            impressions_completed = patient_impression_ids.filtered(
+                lambda r: r.fhir_state == "completed"
+            )
+            if impressions_completed:
+                last_update = impressions_completed[0].validation_date
+            impressions_in_progress = len(
+                patient_impression_ids.filtered(lambda r: r.fhir_state == "in_progress")
+            )
+        return {
+            "patient_impression_count": patient_count,
+            "impression_last_update": last_update,
+            "impressions_in_progress_count": impressions_in_progress,
+        }
 
     def _get_default_context(self):
         return {
@@ -73,17 +65,8 @@ def get_specialty_impression(self):
             "medical_clinical_impression." "medical_clinical_impression_act_window"
         )
         ctx_dict = self._get_default_context()
-        if self.env.context.get("patient_id"):
-            patient_id = self.env["medical.patient"].browse(
-                self.env.context.get("patient_id")
-            )
-            encounter_id = patient_id._get_last_encounter()
-        elif self.env.context.get("encounter_id"):
-            encounter_id = self.env["medical.encounter"].browse(
-                self.env.context.get("encounter_id")
-            )
-            patient_id = encounter_id.patient_id
-        else:
+        patient_id = self._get_impression_info_patient()
+        if not patient_id:
             return False
         domain = expression.AND(
             [
@@ -94,7 +77,6 @@ def get_specialty_impression(self):
                 ],
             ]
         )
-        ctx_dict["default_encounter_id"] = encounter_id.id
         ctx_dict["search_default_filter_not_cancelled"] = True
         result["domain"] = domain
         result["context"] = ctx_dict

medical_clinical_impression/models/medical_specialty.py

@@ -39,10 +39,6 @@
                         </b>
                     </h4>
                     <div class="row">
-                        <div class="col-6">
-                            <strong>Encounter:</strong>
-                            <span t-field="o.encounter_id" />
-                        </div>
                         <div class="col-6">
                             <strong>Date:</strong>
                             <span t-field="o.validation_date" />

medical_clinical_impression/reports/medical_impression_report.xml

@@ -3,4 +3,3 @@ medical_clinical_impression_display,medical_clinical_impression_display,model_me
 medical_clinical_impression_manager,medical_clinical_impression_manager,model_medical_clinical_impression,medical_base.group_medical_assistance_user,0,1,1,0
 medical_family_member_history_manager,medical_family_member_history_manager,model_medical_family_member_history,medical_base.group_medical_assistance_user,1,1,1,1
 access_create_impression_from_patient,access_create_impression_from_patient,model_create_impression_from_patient,medical_base.group_medical_assistance_user,1,1,1,0
-access_create_impression_from_encounter,access_create_impression_from_encounter,model_create_impression_from_encounter,medical_base.group_medical_assistance_user,1,1,1,0

medical_clinical_impression/security/ir.model.access.csv

@@ -1,3 +1,2 @@
 from . import test_medical_clinical_impression
 from . import test_medical_patient
-from . import test_medical_encounter

medical_clinical_impression/tests/__init__.py

@@ -11,9 +11,6 @@ class TestClinicalImpression(TransactionCase):
     def setUp(self):
         super(TestClinicalImpression, self).setUp()
         self.patient = self.env["medical.patient"].create({"name": "Patient"})
-        self.encounter = self.env["medical.encounter"].create(
-            {"patient_id": self.patient.id}
-        )
         self.finding_pregnant = self.env["medical.clinical.finding"].create(
             {
                 "name": "Pregnant",
@@ -50,7 +47,6 @@ def test_validate_impression_fields(self):
         impression = self.env["medical.clinical.impression"].create(
             {
                 "patient_id": self.patient.id,
-                "encounter_id": self.encounter.id,
                 "specialty_id": self.specialty_cardiology.id,
             }
         )
@@ -65,7 +61,6 @@ def test_create_condition_from_impression_finding(self):
         impression = self.env["medical.clinical.impression"].create(
             {
                 "patient_id": self.patient.id,
-                "encounter_id": self.encounter.id,
                 "specialty_id": self.specialty_gynecology.id,
                 "finding_ids": [
                     (4, self.finding_pregnant.id),
@@ -85,7 +80,6 @@ def test_create_condition_from_impression_finding(self):
         impression_2 = self.env["medical.clinical.impression"].create(
             {
                 "patient_id": self.patient.id,
-                "encounter_id": self.encounter.id,
                 "specialty_id": self.specialty_gynecology.id,
                 "finding_ids": [(4, self.finding_pregnant.id)],
             }
@@ -102,7 +96,6 @@ def test_create_allergy_from_impression_allergy_substance(self):
         impression = self.env["medical.clinical.impression"].create(
             {
                 "patient_id": self.patient.id,
-                "encounter_id": self.encounter.id,
                 "specialty_id": self.specialty_gynecology.id,
                 "allergy_substance_ids": [(4, self.allergy_substance_ibuprofen.id)],
             }
@@ -118,7 +111,6 @@ def test_create_allergy_from_impression_allergy_substance(self):
         impression_2 = self.env["medical.clinical.impression"].create(
             {
                 "patient_id": self.patient.id,
-                "encounter_id": self.encounter.id,
                 "specialty_id": self.specialty_gynecology.id,
                 "allergy_substance_ids": [(4, self.allergy_substance_ibuprofen.id)],
             }
@@ -134,7 +126,6 @@ def test_cancel_impression(self):
         impression = self.env["medical.clinical.impression"].create(
             {
                 "patient_id": self.patient.id,
-                "encounter_id": self.encounter.id,
                 "specialty_id": self.specialty_gynecology.id,
                 "allergy_substance_ids": [(4, self.allergy_substance_ibuprofen.id)],
             }
@@ -145,23 +136,3 @@ def test_cancel_impression(self):
         # The allergies and findings created in that impression should be cancelled too.
         self.patient.invalidate_recordset()
         self.assertEqual(self.patient.medical_allergies_count, 0)
-
-    def test_compute_current_encounter(self):
-        impression = self.env["medical.clinical.impression"].create(
-            {
-                "patient_id": self.patient.id,
-                "encounter_id": self.encounter.id,
-                "specialty_id": self.specialty_gynecology.id,
-            }
-        )
-        self.encounter_2 = self.env["medical.encounter"].create(
-            {"patient_id": self.patient.id}
-        )
-        impression.with_context(
-            **{"encounter_id": self.encounter.id}
-        )._compute_current_encounter()
-        self.assertTrue(impression.current_encounter)
-        impression.with_context(
-            **{"encounter_id": self.encounter_2.id}
-        )._compute_current_encounter()
-        self.assertFalse(impression.current_encounter)