From 5289ad23a4d6b417e047bd3a124c3e10c08f8927 Mon Sep 17 00:00:00 2001 From: Ashraf Mohammed Date: Mon, 30 Oct 2023 20:22:24 +0530 Subject: [PATCH 1/2] stop displaying bed name two times --- src/Components/Patient/ManagePatients.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Components/Patient/ManagePatients.tsx b/src/Components/Patient/ManagePatients.tsx index 61b18faa367..1d58f6a10fc 100644 --- a/src/Components/Patient/ManagePatients.tsx +++ b/src/Components/Patient/ManagePatients.tsx @@ -533,7 +533,6 @@ export const PatientManager = () => { - {patient?.last_consultation?.current_bed?.bed_object.name} { patient?.last_consultation?.current_bed?.bed_object From 382c35169073e81b3cc5664b289f87049976dd07 Mon Sep 17 00:00:00 2001 From: Ashraf Mohammed Date: Mon, 30 Oct 2023 22:52:11 +0530 Subject: [PATCH 2/2] resolve tooltip --- src/Components/Patient/ManagePatients.tsx | 25 ++++++++++------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/src/Components/Patient/ManagePatients.tsx b/src/Components/Patient/ManagePatients.tsx index 1d58f6a10fc..7db0bcceb39 100644 --- a/src/Components/Patient/ManagePatients.tsx +++ b/src/Components/Patient/ManagePatients.tsx @@ -519,26 +519,23 @@ export const PatientManager = () => {
{patient?.last_consultation?.current_bed && patient?.last_consultation?.discharge_date === null ? ( -
- +
+ { patient?.last_consultation?.current_bed?.bed_object ?.location_object?.name } - - { - patient?.last_consultation?.current_bed?.bed_object - ?.location_object?.name - } - - - { - patient?.last_consultation?.current_bed?.bed_object - ?.name - } - + {patient?.last_consultation?.current_bed?.bed_object?.name} + + + { + patient?.last_consultation?.current_bed?.bed_object + ?.location_object?.name + } +
+ {patient?.last_consultation?.current_bed?.bed_object?.name}
) : patient.last_consultation?.suggestion === "DC" ? (