[ENG-552] Fix interpretation with patient tags (#3681)

* Fix interpretation with patient tags

* Fix for encoutner

Author: vigneshhari

care/utils/evaluators/evaluation_metric/encounter_tag.py

@@ -33,11 +33,12 @@ def clean_rule(self, rule):
 
     def get_value(self):
         encounter = self.context_object
-        facility_external_id = str(encounter.facility.external_id)
         if self._value_type == "encounter":
             return [*encounter.tags]
         patient = encounter.patient
-        patient_facility_tags = patient.facility_tags.get(facility_external_id, [])
+        patient_facility_tags = patient.facility_tags.get(
+            str(encounter.facility.id), []
+        )
         patient_instance_tags = patient.instance_tags
         return [*patient_facility_tags, *patient_instance_tags]
 

care/utils/evaluators/evaluation_metric/patient_tag.py

@@ -35,7 +35,7 @@ def get_value(self):
         facility = self.context.get("facility")
         if not facility:
             return []
-        patient_facility_tags = patient.facility_tags.get(str(facility.external_id), [])
+        patient_facility_tags = patient.facility_tags.get(str(facility.id), [])
         patient_instance_tags = patient.instance_tags
         return [*patient_facility_tags, *patient_instance_tags]