Merge pull request #10397 from ohcnetwork/rithviknishad/feat/filter-a…

…llergies-if-encounter-completed

Filter allergies by encounter if encounter is marked as completed

src/components/Patient/allergy/list.tsx

@@ -22,24 +22,32 @@ import { Avatar } from "@/components/Common/Avatar";
 import query from "@/Utils/request/query";
 import { AllergyIntolerance } from "@/types/emr/allergyIntolerance/allergyIntolerance";
 import allergyIntoleranceApi from "@/types/emr/allergyIntolerance/allergyIntoleranceApi";
+import { Encounter, completedEncounterStatus } from "@/types/emr/encounter";
 
 interface AllergyListProps {
   facilityId?: string;
   patientId: string;
   encounterId?: string;
+  encounterStatus?: Encounter["status"];
 }
 
 export function AllergyList({
   facilityId,
   patientId,
   encounterId,
+  encounterStatus,
 }: AllergyListProps) {
   const [showEnteredInError, setShowEnteredInError] = useState(false);
 
   const { data: allergies, isLoading } = useQuery({
-    queryKey: ["allergies", patientId, encounterId],
+    queryKey: ["allergies", patientId, encounterId, encounterStatus],
     queryFn: query(allergyIntoleranceApi.getAllergy, {
       pathParams: { patientId },
+      queryParams: {
+        encounter: completedEncounterStatus.includes(encounterStatus as string)
+          ? encounterId
+          : undefined,
+      },
     }),
   });
 

src/pages/Encounters/tabs/EncounterUpdatesTab.tsx

@@ -23,6 +23,7 @@ export const EncounterUpdatesTab = ({
               facilityId={facilityId}
               patientId={patient.id}
               encounterId={encounter.id}
+              encounterStatus={encounter.status}
             />
           </div>