Merge branch 'develop' into sainak/disable-asect-ratio-validation-for…

…-images

care/facility/api/serializers/patient.py

@@ -2,7 +2,6 @@
 
 from django.conf import settings
 from django.db import transaction
-from django.db.models import Q
 from django.utils.timezone import make_aware, now
 from rest_framework import serializers
 
@@ -37,8 +36,6 @@
 )
 from care.facility.models.patient_consultation import PatientConsultation
 from care.facility.models.patient_external_test import PatientExternalTest
-from care.hcx.models.claim import Claim
-from care.hcx.models.policy import Policy
 from care.users.api.serializers.lsg import (
     DistrictSerializer,
     LocalBodySerializer,
@@ -94,37 +91,6 @@ class PatientListSerializer(serializers.ModelSerializer):
 
     assigned_to_object = UserBaseMinimumSerializer(source="assigned_to", read_only=True)
 
-    # HCX
-    has_eligible_policy = serializers.SerializerMethodField(
-        "get_has_eligible_policy", read_only=True
-    )
-
-    def get_has_eligible_policy(self, patient):
-        eligible_policies = Policy.objects.filter(
-            (Q(error_text="") | Q(error_text=None)),
-            outcome="complete",
-            patient=patient.id,
-        )
-        return bool(len(eligible_policies))
-
-    approved_claim_amount = serializers.SerializerMethodField(
-        "get_approved_claim_amount", read_only=True
-    )
-
-    def get_approved_claim_amount(self, patient):
-        if patient.last_consultation is not None:
-            claim = (
-                Claim.objects.filter(
-                    Q(error_text="") | Q(error_text=None),
-                    consultation__external_id=patient.last_consultation.external_id,
-                    outcome="complete",
-                    total_claim_amount__isnull=False,
-                )
-                .order_by("-modified_date")
-                .first()
-            )
-            return claim.total_claim_amount if claim is not None else None
-
     class Meta:
         model = PatientRegistration
         exclude = (

care/facility/management/commands/load_redis_index.py

@@ -1,9 +1,11 @@
+from importlib import import_module
+
 from django.core.cache import cache
 from django.core.management import BaseCommand
 
 from care.facility.static_data.icd11 import load_icd11_diagnosis
 from care.facility.static_data.medibase import load_medibase_medicines
-from care.hcx.static_data.pmjy_packages import load_pmjy_packages
+from plug_config import manager
 
 
 class Command(BaseCommand):
@@ -23,6 +25,18 @@ def handle(self, *args, **options):
 
         load_icd11_diagnosis()
         load_medibase_medicines()
-        load_pmjy_packages()
+
+        for plug in manager.plugs:
+            try:
+                module_path = f"{plug.name}.static_data"
+                module = import_module(module_path)
+
+                load_static_data = getattr(module, "load_static_data", None)
+                if load_static_data:
+                    load_static_data()
+            except ModuleNotFoundError:
+                print(f"Module {module_path} not found")
+            except Exception as e:
+                print(f"Error loading static data for {plug.name}: {e}")
 
         cache.delete("redis_index_loading")

care/facility/tasks/redis_index.py

@@ -1,3 +1,4 @@
+from importlib import import_module
 from logging import Logger
 
 from celery import shared_task
@@ -6,8 +7,8 @@
 
 from care.facility.static_data.icd11 import load_icd11_diagnosis
 from care.facility.static_data.medibase import load_medibase_medicines
-from care.hcx.static_data.pmjy_packages import load_pmjy_packages
 from care.utils.static_data.models.base import index_exists
+from plug_config import manager
 
 logger: Logger = get_task_logger(__name__)
 
@@ -26,7 +27,19 @@ def load_redis_index():
 
     load_icd11_diagnosis()
     load_medibase_medicines()
-    load_pmjy_packages()
+
+    for plug in manager.plugs:
+        try:
+            module_path = f"{plug.name}.static_data"
+            module = import_module(module_path)
+
+            load_static_data = getattr(module, "load_static_data", None)
+            if load_static_data:
+                load_static_data()
+        except ModuleNotFoundError:
+            logger.info(f"Module {module_path} not found")
+        except Exception as e:
+            logger.info(f"Error loading static data for {plug.name}: {e}")
 
     cache.delete("redis_index_loading")
     logger.info("Redis Index Loaded")

care/facility/tests/test_pdf_generation.py

@@ -143,7 +143,6 @@ def setUpTestData(cls) -> None:
             suggestion="A",
         )
         cls.create_patient_sample(cls.patient, cls.consultation, cls.facility, cls.user)
-        cls.create_policy(patient=cls.patient, user=cls.user)
         cls.create_encounter_symptom(cls.consultation, cls.user)
         cls.patient_investigation_group = cls.create_patient_investigation_group()
         cls.patient_investigation = cls.create_patient_investigation(

care/facility/utils/reports/discharge_summary.py

@@ -31,7 +31,6 @@
     ConditionVerificationStatus,
 )
 from care.facility.static_data.icd11 import get_icd11_diagnosis_object_by_id
-from care.hcx.models.policy import Policy
 
 logger = logging.getLogger(__name__)
 
@@ -117,7 +116,6 @@ def get_discharge_summary_data(consultation: PatientConsultation):
     samples = PatientSample.objects.filter(
         patient=consultation.patient, consultation=consultation
     )
-    hcx = Policy.objects.filter(patient=consultation.patient)
     symptoms = EncounterSymptom.objects.filter(
         consultation=consultation, onset_date__lt=consultation.encounter_date
     ).exclude(clinical_impression_status=ClinicalImpressionStatus.ENTERED_IN_ERROR)
@@ -181,7 +179,6 @@ def get_discharge_summary_data(consultation: PatientConsultation):
     return {
         "patient": consultation.patient,
         "samples": samples,
-        "hcx": hcx,
         "symptoms": symptoms,
         "admitted_to": admitted_to,
         "admission_duration": admission_duration,