add readmission (#6239)

ohcnetwork · Sep 12, 2023 · 87f36ba · 87f36ba
1 parent 8c242d6
commit 87f36ba
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 4 deletions.
diff --git a/src/Components/Facility/ConsultationCard.tsx b/src/Components/Facility/ConsultationCard.tsx
@@ -5,6 +5,7 @@ import ButtonV2 from "../Common/components/ButtonV2";
 import { NonReadOnlyUsers } from "../../Utils/AuthorizeFor";
 import RelativeDateUserMention from "../Common/RelativeDateUserMention";
 import useConfig from "../../Common/hooks/useConfig";
+import Chip from "../../CAREUI/display/Chip";
 
 interface ConsultationProps {
   itemData: ConsultationModel;
@@ -70,6 +71,15 @@ export const ConsultationCard = (props: ConsultationProps) => {
               </div>
               <div className="mt-1 overflow-x-scroll whitespace-normal break-words text-sm font-medium leading-5">
                 {formatDateTime(itemData.admission_date)}
+                {itemData.is_readmission && (
+                  <Chip
+                    size="small"
+                    variant="custom"
+                    className="ml-4 border-blue-600 bg-blue-100 text-blue-600"
+                    startIcon="l-repeat"
+                    text="Readmission"
+                  />
+                )}
               </div>
             </div>
           </div>

diff --git a/src/Components/Facility/models.tsx b/src/Components/Facility/models.tsx
@@ -142,6 +142,7 @@ export interface ConsultationModel {
   cause_of_death?: string;
   death_datetime?: string;
   death_confirmed_doctor?: string;
+  is_readmission?: boolean;
 }
 export interface PatientStatsModel {
   id?: number;

diff --git a/src/Components/Patient/ManagePatients.tsx b/src/Components/Patient/ManagePatients.tsx
@@ -603,6 +603,15 @@ export const PatientManager = () => {
                         text="Review Missed"
                       />
                     )}
+                  {patient.last_consultation?.is_readmission && (
+                    <Chip
+                      size="small"
+                      variant="custom"
+                      className="border-blue-600 bg-blue-100 text-blue-600"
+                      startIcon="l-repeat"
+                      text="Readmission"
+                    />
+                  )}
                   {patient.disease_status === "POSITIVE" && (
                     <Chip
                       size="small"

diff --git a/src/Components/Patient/PatientInfoCard.tsx b/src/Components/Patient/PatientInfoCard.tsx
@@ -143,7 +143,7 @@ export default function PatientInfoCard(props: {
                   </div>
                 )}
             </div>
-            <div className="flex flex-col items-center gap-1 sm:flex-row lg:mb-2">
+            <div className="flex flex-col items-center gap-2 sm:flex-row lg:mb-2">
               <Link
                 href={`/facility/${consultation?.facility}`}
                 className="font-semibold text-black hover:text-primary-600"
@@ -177,9 +177,18 @@ export default function PatientInfoCard(props: {
               {consultation?.suggestion === "DC" && (
                 <>
                   <span className="mx-2">•</span>
-                  <span className="space-x-2">
-                    Domiciliary Care{" "}
-                    <CareIcon className="care-l-estate text-base text-gray-700" />
+                  <span>
+                    <CareIcon icon="l-estate" className="mr-1 text-gray-700" />
+                    Domiciliary Care
+                  </span>
+                </>
+              )}
+              {consultation?.is_readmission && (
+                <>
+                  <span className="mx-2">•</span>
+                  <span>
+                    <CareIcon icon="l-repeat" className="mr-1 text-gray-600" />
+                    Readmitted
                   </span>
                 </>
               )}