Shows encounter duration in discharge confirmation dialog (#8124)

* Shows encounter duration in discharge confirmation dialog * correction for IP days * update text of "IP Days" to "IP Day No"
ohcnetwork · Jul 11, 2024 · ff70e5f · ff70e5f
1 parent 0f5b54c
commit ff70e5f
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 6 deletions.
diff --git a/src/Components/Facility/DischargeModal.tsx b/src/Components/Facility/DischargeModal.tsx
@@ -25,6 +25,7 @@ import { FacilitySelect } from "../Common/FacilitySelect";
 import { FacilityModel } from "./models";
 import dayjs from "../../Utils/dayjs";
 import { FieldError } from "../Form/FieldValidators";
+import { useTranslation } from "react-i18next";
 
 interface PreDischargeFormInterface {
   new_discharge_reason: number | null;
@@ -57,6 +58,7 @@ const DischargeModal = ({
   discharge_date = dayjs().format("YYYY-MM-DDTHH:mm"),
   death_datetime = dayjs().format("YYYY-MM-DDTHH:mm"),
 }: IProps) => {
+  const { t } = useTranslation();
   const { enable_hcx } = useConfig();
   const dispatch: any = useDispatch();
   const [preDischargeForm, setPreDischargeForm] =
@@ -205,6 +207,19 @@ const DischargeModal = ({
     }));
   };
 
+  const encounterDuration = dayjs
+    .duration(
+      dayjs(
+        preDischargeForm[
+          discharge_reason ===
+          DISCHARGE_REASONS.find((i) => i.text == "Expired")?.id
+            ? "death_datetime"
+            : "discharge_date"
+        ],
+      ).diff(consultationData.encounter_date),
+    )
+    .humanize();
+
   return (
     <DialogModal
       title={
@@ -321,7 +336,6 @@ const DischargeModal = ({
               : errors?.discharge_date
           }
         />
-
         {discharge_reason ===
           DISCHARGE_REASONS.find((i) => i.text == "Recovered")?.id && (
           <>
@@ -374,7 +388,13 @@ const DischargeModal = ({
         </div>
       )}
 
-      <div className="flex flex-col gap-2 pt-4 md:flex-row md:justify-end">
+      <div className="py-4">
+        <span className="text-gray-700">
+          {t("encounter_duration_confirmation")}{" "}
+          <strong>{encounterDuration}</strong>.
+        </span>
+      </div>
+      <div className="cui-form-button-group">
         <Cancel onClick={onClose} />
         {isSendingDischargeApi ? (
           <CircularProgress />

diff --git a/src/Components/Patient/ManagePatients.tsx b/src/Components/Patient/ManagePatients.tsx
@@ -610,7 +610,7 @@ export const PatientManager = () => {
                         size="small"
                         variant="primary"
                         startIcon="l-clock-three"
-                        text={`IP Days: ${dayjs().diff(patient.last_consultation.encounter_date, "day")}`}
+                        text={`IP Day No: ${dayjs().diff(patient.last_consultation.encounter_date, "day") + 1}`}
                       />
                     )}
                   {patient.gender === 2 &&

diff --git a/src/Components/Patient/PatientInfoCard.tsx b/src/Components/Patient/PatientInfoCard.tsx
@@ -559,12 +559,12 @@ export default function PatientInfoCard(props: {
                     {dayjs(consultation.discharge_date || undefined).diff(
                       consultation.encounter_date,
                       "day",
-                    )}
+                    ) + 1}
                   </span>
                 </div>
               </div>
               <span className="mt-1 text-xs font-medium text-gray-700">
-                IP Days
+                IP Day No
               </span>
             </div>
           )}

diff --git a/src/Locale/en/Consultation.json b/src/Locale/en/Consultation.json
@@ -36,5 +36,6 @@
   "prev_sessions": "Prev Sessions",
   "next_sessions": "Next Sessions",
   "no_changes": "No changes",
-  "encounter_suggestion_edit_disallowed": "Not allowed to switch to this option in edit consultation"
+  "encounter_suggestion_edit_disallowed": "Not allowed to switch to this option in edit consultation",
+  "encounter_duration_confirmation": "The duration of this encounter would be"
 }