changed the discharged logic in patient consultation dashboard (#5379)

ohcnetwork · Apr 26, 2023 · 33b2530 · 33b2530
1 parent f013a27
commit 33b2530
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 21 deletions.
diff --git a/src/Components/Facility/ConsultationDetails.tsx b/src/Components/Facility/ConsultationDetails.tsx
@@ -355,7 +355,7 @@ export const ConsultationDetails = (props: any) => {
             backUrl="/patients"
           />
           <div className="w-full sm:w-min lg:absolute xl:right-0 -right-6 top-0 flex sm:flex-row sm:items-center flex-col space-y-1 sm:space-y-0 sm:divide-x-2">
-            {patientData.is_active && (
+            {!consultationData.discharge_date && (
               <div className="w-full flex flex-col sm:flex-row px-2">
                 <ButtonV2
                   onClick={() =>
@@ -493,10 +493,7 @@ export const ConsultationDetails = (props: any) => {
                 <button
                   className="btn btn-primary"
                   onClick={handleDischageClickOpen}
-                  disabled={
-                    !patientData.is_active ||
-                    patientData.last_consultation?.facility !== facilityId
-                  }
+                  disabled={!!consultationData.discharge_date}
                 >
                   <i className="fas fa-hospital-user"></i>
                   &nbsp; Discharge from CARE

diff --git a/src/Components/Patient/PatientInfoCard.tsx b/src/Components/Patient/PatientInfoCard.tsx
@@ -1,21 +1,23 @@
-import { Link } from "raviger";
-import { getDimensionOrDash } from "../../Common/utils";
-import { PatientModel } from "./models";
-import DialogModal from "../Common/Dialog";
-import Beds from "../Facility/Consultations/Beds";
-import { useState } from "react";
-import { ConsultationModel, PatientCategory } from "../Facility/models";
+import * as Notification from "../../Utils/Notifications.js";
+
 import {
   CONSULTATION_SUGGESTION,
   DISCHARGE_REASONS,
   PATIENT_CATEGORIES,
   RESPIRATORY_SUPPORT,
 } from "../../Common/constants";
-import moment from "moment";
+import { ConsultationModel, PatientCategory } from "../Facility/models";
+
+import Beds from "../Facility/Consultations/Beds";
 import ButtonV2 from "../Common/components/ButtonV2";
 import CareIcon from "../../CAREUI/icons/CareIcon";
-import * as Notification from "../../Utils/Notifications.js";
+import DialogModal from "../Common/Dialog";
+import { Link } from "raviger";
+import { PatientModel } from "./models";
+import { getDimensionOrDash } from "../../Common/utils";
+import moment from "moment";
 import useConfig from "../../Common/hooks/useConfig";
+import { useState } from "react";
 
 export default function PatientInfoCard(props: {
   patient: PatientModel;
@@ -36,7 +38,7 @@ export default function PatientInfoCard(props: {
     ? PATIENT_CATEGORIES.find((c) => c.text === category)?.twClass
     : "patient-unknown";
 
-  const bedDialogTitle = !patient.is_active
+  const bedDialogTitle = consultation?.discharge_date
     ? "Bed History"
     : !consultation?.current_bed
     ? "Assign Bed"
@@ -54,7 +56,7 @@ export default function PatientInfoCard(props: {
           <Beds
             facilityId={patient?.facility}
             patientId={patient?.id}
-            discharged={!patient.is_active}
+            discharged={!!consultation?.discharge_date}
             consultationId={consultation?.id}
             setState={setOpen}
             fetchPatientData={props.fetchPatientData}
@@ -154,7 +156,7 @@ export default function PatientInfoCard(props: {
                 </span>
               )}
             </div>
-            {!patient.is_active && (
+            {!!consultation?.discharge_date && (
               <p className="bg-red-100 text-red-600 inline-block rounded-lg px-2 py-1 my-1 text-sm">
                 Discharged from CARE
               </p>
@@ -199,7 +201,7 @@ export default function PatientInfoCard(props: {
                 );
               })}
             </div>
-            {patient.is_active === false && (
+            {!!consultation?.discharge_date && (
               <div className="flex gap-4 text-sm mt-3 px-3 py-1 font-medium bg-cyan-300">
                 <div>
                   <span>
@@ -241,7 +243,7 @@ export default function PatientInfoCard(props: {
         </div>
 
         <div className="w-full lg:w-fit flex gap-2 flex-col px-4 py-1 lg:p-6">
-          {patient.is_active === false && (
+          {!!consultation?.discharge_date && (
             <div className="flex flex-col justify-center items-center">
               <div className="text-sm leading-5 font-normal text-gray-500">
                 Discharge Reason
@@ -264,13 +266,17 @@ export default function PatientInfoCard(props: {
               `/facility/${patient.facility}/patient/${patient.id}/consultation/${consultation?.id}/update`,
               "Edit Consultation Details",
               "pen",
-              patient.is_active && consultation?.id,
+              patient.is_active &&
+                consultation?.id &&
+                !consultation?.discharge_date,
             ],
             [
               `/facility/${patient.facility}/patient/${patient.id}/consultation/${consultation?.id}/daily-rounds`,
               "Log Update",
               "plus",
-              patient.is_active && consultation?.id,
+              patient.is_active &&
+                consultation?.id &&
+                !consultation?.discharge_date,
               [
                 !(consultation?.facility !== patient.facility) &&
                   !(consultation?.discharge_date || !patient.is_active) &&