From b25d02c02d82191004df7913694e876fcce405fd Mon Sep 17 00:00:00 2001
From: rithviknishad <mail@rithviknishad.dev>
Date: Mon, 27 Nov 2023 17:42:53 +0530
Subject: [PATCH 1/2] Show "ICU Admission Date" only for Internal Transfer

---
 src/Components/Facility/ConsultationForm.tsx | 50 ++++++++++----------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/src/Components/Facility/ConsultationForm.tsx b/src/Components/Facility/ConsultationForm.tsx
index 091be6b5968..aff6132fe7f 100644
--- a/src/Components/Facility/ConsultationForm.tsx
+++ b/src/Components/Facility/ConsultationForm.tsx
@@ -724,7 +724,10 @@ export const ConsultationForm = (props: any) => {
             : undefined,
         consultation_notes: state.form.consultation_notes,
         is_telemedicine: state.form.is_telemedicine,
-        icu_admission_date: state.form.icu_admission_date,
+        icu_admission_date:
+          state.form.route_to_facility === 30
+            ? state.form.icu_admission_date
+            : undefined,
         action: state.form.action,
         review_interval: state.form.review_interval,
         assigned_to:
@@ -1218,29 +1221,28 @@ export const ConsultationForm = (props: any) => {
                     </div>
                   )}
 
-                  {state.form.route_to_facility &&
-                    [20, 30].includes(state.form.route_to_facility) && (
-                      <div
-                        className={classNames(
-                          "col-span-6",
-                          ["A", "DC"].includes(state.form.suggestion) &&
-                            "xl:col-span-3"
-                        )}
-                        ref={fieldRef["icu_admission_date"]}
-                      >
-                        <TextFormField
-                          {...field("icu_admission_date")}
-                          label="Date & Time  of admission to the ICU"
-                          type="datetime-local"
-                          value={
-                            state.form.icu_admission_date &&
-                            dayjs(state.form.icu_admission_date).format(
-                              "YYYY-MM-DDTHH:mm"
-                            )
-                          }
-                        />
-                      </div>
-                    )}
+                  {state.form.route_to_facility === 30 && (
+                    <div
+                      className={classNames(
+                        "col-span-6",
+                        ["A", "DC"].includes(state.form.suggestion) &&
+                          "xl:col-span-3"
+                      )}
+                      ref={fieldRef["icu_admission_date"]}
+                    >
+                      <TextFormField
+                        {...field("icu_admission_date")}
+                        label="Date & Time  of admission to the ICU"
+                        type="datetime-local"
+                        value={
+                          state.form.icu_admission_date &&
+                          dayjs(state.form.icu_admission_date).format(
+                            "YYYY-MM-DDTHH:mm"
+                          )
+                        }
+                      />
+                    </div>
+                  )}
 
                   {["A", "DC"].includes(state.form.suggestion) && !isUpdate && (
                     <div className="col-span-6 mb-6" ref={fieldRef["bed"]}>

From 97691995ce2c5426d08db0c82c80ea8edb2bf47a Mon Sep 17 00:00:00 2001
From: rithviknishad <mail@rithviknishad.dev>
Date: Mon, 27 Nov 2023 17:46:05 +0530
Subject: [PATCH 2/2] fix styling

---
 src/Components/Facility/ConsultationForm.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Components/Facility/ConsultationForm.tsx b/src/Components/Facility/ConsultationForm.tsx
index aff6132fe7f..ed3934441a8 100644
--- a/src/Components/Facility/ConsultationForm.tsx
+++ b/src/Components/Facility/ConsultationForm.tsx
@@ -1198,9 +1198,7 @@ export const ConsultationForm = (props: any) => {
                     <div
                       className={classNames(
                         "col-span-6",
-                        state.form.route_to_facility &&
-                          [20, 30].includes(state.form.route_to_facility) &&
-                          "xl:col-span-3"
+                        state.form.route_to_facility === 30 && "xl:col-span-3"
                       )}
                       ref={fieldRef["admission_date"]}
                     >