From 7fb4185297f98f4c0ee2ecf588c5be26bb4dce2c Mon Sep 17 00:00:00 2001
From: Ashraf Mohammed <98876115+AshrafMd-1@users.noreply.github.com>
Date: Wed, 17 Apr 2024 15:08:38 +0530
Subject: [PATCH] Fix Domiciliary Care discrepancy.  (#7568)

* Fix bug

* remove extra space

Co-authored-by: Ashesh <3626859+Ashesh3@users.noreply.github.com>

---------

Co-authored-by: Khavin Shankar <khavinshankar@gmail.com>
Co-authored-by: Ashesh <3626859+Ashesh3@users.noreply.github.com>
---
 src/Components/Facility/TreatmentSummary.tsx | 8 ++++++--
 src/Components/Patient/PatientInfoCard.tsx   | 4 +++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Components/Facility/TreatmentSummary.tsx b/src/Components/Facility/TreatmentSummary.tsx
index d0d1658cd61..a83cb64ec66 100644
--- a/src/Components/Facility/TreatmentSummary.tsx
+++ b/src/Components/Facility/TreatmentSummary.tsx
@@ -78,9 +78,13 @@ const TreatmentSummary = (props: any) => {
               </div>
 
               <div className="col-span-1 px-3 py-2">
-                <b>Date of admission : </b>
+                {consultationData?.suggestion === "DC" ? (
+                  <b>Date of domiciliary care commenced : </b>
+                ) : (
+                  <b>Date of admission : </b>
+                )}
                 <span>
-                  {consultationData?.admitted
+                  {consultationData?.encounter_date
                     ? formatDateTime(consultationData.encounter_date)
                     : " --/--/----"}
                 </span>
diff --git a/src/Components/Patient/PatientInfoCard.tsx b/src/Components/Patient/PatientInfoCard.tsx
index b2f00dd1cc3..cb73739b3ba 100644
--- a/src/Components/Patient/PatientInfoCard.tsx
+++ b/src/Components/Patient/PatientInfoCard.tsx
@@ -401,7 +401,9 @@ export default function PatientInfoCard(props: {
                       <span className="flex">
                         {consultation?.encounter_date && (
                           <div>
-                            Admission on:{" "}
+                            {consultation.suggestion === "DC"
+                              ? "Commenced on: "
+                              : "Admitted on: "}
                             {formatDateTime(consultation?.encounter_date)}
                           </div>
                         )}