diff --git a/src/Components/Patient/PatientInfoCard.tsx b/src/Components/Patient/PatientInfoCard.tsx index ec812d39b47..94296605ac9 100644 --- a/src/Components/Patient/PatientInfoCard.tsx +++ b/src/Components/Patient/PatientInfoCard.tsx @@ -10,6 +10,7 @@ import { DISCHARGE_REASONS, PATIENT_CATEGORIES, RESPIRATORY_SUPPORT, + TELEMEDICINE_ACTIONS, } from "../../Common/constants"; import moment from "moment"; import ButtonV2 from "../Common/components/ButtonV2"; @@ -159,11 +160,32 @@ export default function PatientInfoCard(props: { Discharged from CARE

)} -

- {patient.age} years - - {patient.gender} -

+
+
+ {patient.action && patient.action != 10 && ( +
+ + Action:{" "} + { + TELEMEDICINE_ACTIONS.find( + (i) => i.id === patient.action + )?.desc + } + +
+ )} +
+
+
+ Age: {patient.age} years +
+
+
+
+ Gender: {patient.gender} +
+
+
{[ ["Blood Group", patient.blood_group, patient.blood_group], @@ -199,26 +221,39 @@ export default function PatientInfoCard(props: { ); })}
-
-
- { - CONSULTATION_SUGGESTION.find( - (suggestion) => suggestion.id === consultation?.suggestion - )?.text - }{" "} - on{" "} - {consultation?.suggestion === "A" - ? moment(consultation?.admission_date).format("DD/MM/YYYY") - : consultation?.suggestion === "DD" - ? moment(consultation?.death_datetime).format("DD/MM/YYYY") - : moment(consultation?.created_date).format("DD/MM/YYYY")} +
+
+
+ { + CONSULTATION_SUGGESTION.find( + (suggestion) => suggestion.id === consultation?.suggestion + )?.text + }{" "} + on{" "} + {consultation?.suggestion === "A" + ? moment(consultation?.admission_date).format("DD/MM/YYYY") + : consultation?.suggestion === "DD" + ? moment(consultation?.death_datetime).format("DD/MM/YYYY") + : moment(consultation?.created_date).format("DD/MM/YYYY")} +
+ {patient.is_active === false && + consultation?.suggestion !== "OP" && + consultation?.suggestion !== "DD" && ( +
+ Discharged on{" "} + {moment(consultation?.discharge_date).format( + "DD/MM/YYYY" + )} +
+ )}
- {patient.is_active === false && - consultation?.suggestion !== "OP" && - consultation?.suggestion !== "DD" && ( -
- Discharged on{" "} - {moment(consultation?.discharge_date).format("DD/MM/YYYY")} + {patient.is_active && + patient?.last_consultation?.last_daily_round + ?.recommend_discharge && ( +
+ + Discharge Recommended +
)}
diff --git a/src/Components/Patient/models.tsx b/src/Components/Patient/models.tsx index 3da59b9ba4a..c32e5780678 100644 --- a/src/Components/Patient/models.tsx +++ b/src/Components/Patient/models.tsx @@ -26,6 +26,7 @@ export interface AssignedToObjectModel { export interface PatientModel { test_id?: string; id?: number; + action?: number; name?: string; age?: number; allow_transfer?: boolean;