Update consciousness level constants (#6947)

coronasafe · Jan 2, 2024 · 20acc9d · 20acc9d
1 parent fe511d9
commit 20acc9d
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 60 deletions.
diff --git a/src/Common/constants.tsx b/src/Common/constants.tsx
@@ -307,7 +307,7 @@ export const CONSCIOUSNESS_LEVEL = [
   { id: "ALERT", text: "Alert" },
   { id: "AGITATED_OR_CONFUSED", text: "Agitated or Confused" },
   {
-    id: "Onset of Agitation and Confusion",
+    id: "ONSET_OF_AGITATION_AND_CONFUSION",
     text: "Onset of Agitation and Confusion",
   },
   { id: "UNKNOWN", text: "Unknown" },

diff --git a/src/Components/Patient/DailyRounds.tsx b/src/Components/Patient/DailyRounds.tsx
@@ -1,7 +1,7 @@
 import { navigate } from "raviger";
 
 import dayjs from "dayjs";
-import { lazy, useCallback, useEffect, useState } from "react";
+import { lazy, useCallback, useState } from "react";
 import { useDispatch } from "react-redux";
 import {
   CONSCIOUSNESS_LEVEL,
@@ -61,7 +61,7 @@ const initForm: any = {
   rhythm: "0",
   rhythm_detail: "",
   ventilator_spo2: null,
-  consciousness_level: "Unknown",
+  consciousness_level: "UNKNOWN",
   // bed: null,
 };
 
@@ -135,47 +135,15 @@ export const DailyRounds = (props: any) => {
     "consciousness_level",
   ];
 
-  useEffect(() => {
-    (async () => {
-      if (patientId) {
-        const res = await dispatchAction(getPatient({ id: patientId }));
-        if (res.data) {
-          setPatientName(res.data.name);
-          setFacilityName(res.data.facility_object.name);
-          setConsultationSuggestion(res.data.last_consultation?.suggestion);
-          setPreviousReviewInterval(
-            Number(res.data.last_consultation.review_interval)
-          );
-          const getAction =
-            TELEMEDICINE_ACTIONS.find((action) => action.id === res.data.action)
-              ?.text || "NO_ACTION";
-          setPreviousAction(getAction);
-          setInitialData({
-            ...initialData,
-            action: getAction,
-          });
-          dispatch({
-            type: "set_form",
-            form: {
-              ...state.form,
-              action: getAction,
-            },
-          });
-        }
-      } else {
-        setPatientName("");
-        setFacilityName("");
-      }
-    })();
-  }, [dispatchAction, patientId]);
-
   const fetchRoundDetails = useCallback(
     async (status: statusType) => {
       setIsLoading(true);
       const res = await dispatchAction(
         getConsultationDailyRoundsDetails({ consultationId, id })
       );
 
+      let formData: any = {};
+
       if (!status.aborted) {
         if (res?.data) {
           const data = {
@@ -191,34 +159,41 @@ export const DailyRounds = (props: any) => {
               "0",
             admitted_to: res.data.admitted_to ? res.data.admitted_to : "Select",
           };
-          dispatch({ type: "set_form", form: data });
-          setInitialData(data);
+          formData = { ...formData, ...data };
         }
         setIsLoading(false);
       }
-    },
-    [consultationId, id, dispatchAction]
-  );
-  useAbortableEffect(
-    (status: statusType) => {
-      if (id) {
-        fetchRoundDetails(status);
+      if (patientId) {
+        const res = await dispatchAction(getPatient({ id: patientId }));
+        if (res.data) {
+          setPatientName(res.data.name);
+          setFacilityName(res.data.facility_object.name);
+          setConsultationSuggestion(res.data.last_consultation?.suggestion);
+          setPreviousReviewInterval(
+            Number(res.data.last_consultation.review_interval)
+          );
+          const getAction =
+            TELEMEDICINE_ACTIONS.find((action) => action.id === res.data.action)
+              ?.text || "NO_ACTION";
+          setPreviousAction(getAction);
+          setInitialData({
+            ...initialData,
+            action: getAction,
+          });
+          formData = { ...formData, ...{ action: getAction } };
+        }
+      } else {
+        setPatientName("");
+        setFacilityName("");
       }
-    },
-    [dispatchAction, fetchRoundDetails]
-  );
-
-  useEffect(() => {
-    (async () => {
       if (consultationId && !id) {
         const res = await dispatchAction(
           getDailyReport({ limit: 1, offset: 0 }, { consultationId })
         );
         setHasPreviousLog(res.data.count > 0);
-        dispatch({
-          type: "set_form",
-          form: {
-            ...state.form,
+        formData = {
+          ...formData,
+          ...{
             patient_category: res.data.patient_category
               ? PATIENT_CATEGORIES.find(
                   (i) => i.text === res.data.patient_category
@@ -229,12 +204,22 @@ export const DailyRounds = (props: any) => {
                 RHYTHM_CHOICES.find((i) => i.text === res.data.rhythm)?.id) ||
               "0",
             temperature: parseFloat(res.data.temperature),
-            // clone_last: res.data.count > 0 ? true : false,
           },
-        });
+        };
+      }
+      dispatch({ type: "set_form", form: formData });
+      setInitialData(formData);
+    },
+    [consultationId, id, dispatchAction, patientId]
+  );
+  useAbortableEffect(
+    (status: statusType) => {
+      if (id) {
+        fetchRoundDetails(status);
       }
-    })();
-  }, [dispatchAction, consultationId, id]);
+    },
+    [dispatchAction, fetchRoundDetails]
+  );
 
   const validateForm = () => {
     const errors = { ...initError };