Merge branch 'develop' into adding-sms-providers

ohcnetwork · Jan 2, 2025 · 72c9741 · 72c9741
2 parents f673760 + 954ddca
commit 72c9741
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 20 deletions.
diff --git a/care/emr/api/viewsets/base.py b/care/emr/api/viewsets/base.py
@@ -270,7 +270,6 @@ class EMRModelViewSet(
     EMRUpdateMixin,
     EMRListMixin,
     EMRDeleteMixin,
-    EMRQuestionnaireMixin,
     EMRBaseViewSet,
     EMRUpsertMixin,
 ):
@@ -280,7 +279,6 @@ class EMRModelViewSet(
 class EMRModelReadOnlyViewSet(
     EMRRetrieveMixin,
     EMRListMixin,
-    EMRQuestionnaireMixin,
     EMRBaseViewSet,
 ):
     pass
diff --git a/care/emr/api/viewsets/notes.py b/care/emr/api/viewsets/notes.py
@@ -44,7 +44,7 @@ def get_patient(self):
     def authorize_create(self, instance):
         patient = self.get_patient()
         if instance.encounter:
-            encounter = get_object_or_404(Encounter, instance.encounter)
+            encounter = get_object_or_404(Encounter, external_id=instance.encounter)
             allowed = AuthorizationController.call(
                 "can_update_encounter_obj", self.request.user, encounter
             )

diff --git a/care/emr/models/medication_request.py b/care/emr/models/medication_request.py
@@ -15,5 +15,5 @@ class MedicationRequest(EMRBaseModel):
     patient = models.ForeignKey("emr.Patient", on_delete=models.CASCADE)
     encounter = models.ForeignKey("emr.Encounter", on_delete=models.CASCADE)
     authored_on = models.DateTimeField(null=True, blank=True)
-    dosage_instruction = models.JSONField(default=dict, null=True, blank=True)
+    dosage_instruction = models.JSONField(default=list, null=True, blank=True)
     note = models.TextField(null=True, blank=True)
diff --git a/care/emr/resources/medication/request/spec.py b/care/emr/resources/medication/request/spec.py
@@ -154,19 +154,6 @@ def validate_additional_instruction(cls, codes):
             for code in codes
         ]
 
-    @field_validator("as_needed_for")
-    @classmethod
-    def validate_as_needed_for(cls, code, values):
-        if values.data.get("as_needed_boolean", False) and not code:
-            err = "as_needed_for is required when as_needed_boolean is True"
-            raise ValueError(err)
-
-        return validate_valueset(
-            "as_needed_for",
-            cls.model_fields["as_needed_for"].json_schema_extra["slug"],
-            code,
-        )
-
     @field_validator("site")
     @classmethod
     def validate_site(cls, code):
@@ -236,7 +223,7 @@ class BaseMedicationRequestSpec(EMRResource):
         description="When request was initially authored",
     )
 
-    dosage_instruction: DosageInstruction = Field(
+    dosage_instruction: list[DosageInstruction] = Field(
         description="Dosage instructions for the medication",
     )
 

diff --git a/config/api_router.py b/config/api_router.py
@@ -45,7 +45,6 @@
     AvailabilityExceptionsViewSet,
 )
 from care.emr.api.viewsets.scheduling.booking import TokenBookingViewSet
-from care.emr.api.viewsets.units import UnitsView
 from care.emr.api.viewsets.user import UserViewSet
 from care.emr.api.viewsets.valueset import ValueSetViewSet
 from care.facility.api.viewsets.facility import AllFacilityViewSet
@@ -78,7 +77,7 @@
 
 router.register("batch_requests", BatchRequestView, basename="batch-requests")
 
-router.register("units", UnitsView, basename="units")
+# router.register("units", UnitsView, basename="units")
 
 router.register("valueset", ValueSetViewSet, basename="value-set")