Fix duplication of flags

samuelmale · samuelmale · commit 11021ce35080 · 2025-10-20T18:54:37.000+03:00
diff --git a/patient-flags/src/main/java/org/openmrs/module/drools/patientflags/DroolsFlagEvaluator.java b/patient-flags/src/main/java/org/openmrs/module/drools/patientflags/DroolsFlagEvaluator.java
@@ -31,6 +31,8 @@ public class DroolsFlagEvaluator implements FlagEvaluator {
     public Boolean eval(Flag flag, Patient patient, Map<Object, Object> contextMap) {
         Cohort cohort = new Cohort();
         cohort.addMember(patient.getId());
+        // clear stale context
+        contextMap.remove(patient.getId());
         Cohort resultCohort = evalCohort(flag, cohort, contextMap);
         return !resultCohort.isEmpty();
     }

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,8 @@ public class DroolsFlagEvaluator implements FlagEvaluator {`
`31`	`31`	`public Boolean eval(Flag flag, Patient patient, Map<Object, Object> contextMap) {`
`32`	`32`	`Cohort cohort = new Cohort();`
`33`	`33`	`cohort.addMember(patient.getId());`
	`34`	`+ // clear stale context`
	`35`	`+ contextMap.remove(patient.getId());`
`34`	`36`	`Cohort resultCohort = evalCohort(flag, cohort, contextMap);`
`35`	`37`	`return !resultCohort.isEmpty();`
`36`	`38`	`}`