From 1945a27d8471f47a2ff5e39cca7ddb23cd8f8b05 Mon Sep 17 00:00:00 2001
From: rithviknishad <mail@rithviknishad.dev>
Date: Thu, 6 Jun 2024 19:24:02 +0530
Subject: [PATCH 1/3] show uncategorised text for diagnosis without chapters

---
 .../PrincipalDiagnosisSelect.tsx                           | 7 ++++++-
 src/Components/Diagnosis/types.ts                          | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Components/Diagnosis/ConsultationDiagnosisBuilder/PrincipalDiagnosisSelect.tsx b/src/Components/Diagnosis/ConsultationDiagnosisBuilder/PrincipalDiagnosisSelect.tsx
index 8018c6480ed..fa6e099ceac 100644
--- a/src/Components/Diagnosis/ConsultationDiagnosisBuilder/PrincipalDiagnosisSelect.tsx
+++ b/src/Components/Diagnosis/ConsultationDiagnosisBuilder/PrincipalDiagnosisSelect.tsx
@@ -48,11 +48,16 @@ const PrincipalDiagnosisSelect = <T extends Option>(props: Props<T>) => {
           }}
           errorClassName="hidden"
         />
-        {diagnosis && (
+        {diagnosis?.chapter ? (
           <span className="mt-3 flex w-full flex-wrap justify-center gap-x-1 px-2 text-center text-gray-900">
             <p>This encounter will be categorised under:</p>
             <p className="font-bold">{diagnosis.chapter}</p>
           </span>
+        ) : (
+          <span className="mt-3 flex w-full flex-wrap justify-center gap-x-1 px-2 text-center italic text-gray-700">
+            This encounter will not be categorised under any chapter as the
+            diagnosis does not fall under a chapter.
+          </span>
         )}
       </div>
     </div>
diff --git a/src/Components/Diagnosis/types.ts b/src/Components/Diagnosis/types.ts
index 006bb2feb6c..694e7a482d6 100644
--- a/src/Components/Diagnosis/types.ts
+++ b/src/Components/Diagnosis/types.ts
@@ -3,7 +3,7 @@ import { PerformedByModel } from "../HCX/misc";
 export type ICD11DiagnosisModel = {
   id: string;
   label: string;
-  chapter: string;
+  chapter?: string;
 };
 
 export const ActiveConditionVerificationStatuses = [

From 1a0d1fba54398ffdd1a7dfcfe7e6c14792c9ad86 Mon Sep 17 00:00:00 2001
From: rithviknishad <mail@rithviknishad.dev>
Date: Fri, 7 Jun 2024 12:45:02 +0530
Subject: [PATCH 2/3] fix uncategorised text shown if no principal diagnosis
 selected

---
 .../PrincipalDiagnosisSelect.tsx              | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/Components/Diagnosis/ConsultationDiagnosisBuilder/PrincipalDiagnosisSelect.tsx b/src/Components/Diagnosis/ConsultationDiagnosisBuilder/PrincipalDiagnosisSelect.tsx
index fa6e099ceac..70ab633e1da 100644
--- a/src/Components/Diagnosis/ConsultationDiagnosisBuilder/PrincipalDiagnosisSelect.tsx
+++ b/src/Components/Diagnosis/ConsultationDiagnosisBuilder/PrincipalDiagnosisSelect.tsx
@@ -48,17 +48,18 @@ const PrincipalDiagnosisSelect = <T extends Option>(props: Props<T>) => {
           }}
           errorClassName="hidden"
         />
-        {diagnosis?.chapter ? (
-          <span className="mt-3 flex w-full flex-wrap justify-center gap-x-1 px-2 text-center text-gray-900">
-            <p>This encounter will be categorised under:</p>
-            <p className="font-bold">{diagnosis.chapter}</p>
-          </span>
-        ) : (
-          <span className="mt-3 flex w-full flex-wrap justify-center gap-x-1 px-2 text-center italic text-gray-700">
-            This encounter will not be categorised under any chapter as the
-            diagnosis does not fall under a chapter.
-          </span>
-        )}
+        {diagnosis &&
+          (diagnosis?.chapter ? (
+            <span className="mt-3 flex w-full flex-wrap justify-center gap-x-1 px-2 text-center text-gray-900">
+              <p>This encounter will be categorised under:</p>
+              <p className="font-bold">{diagnosis.chapter}</p>
+            </span>
+          ) : (
+            <span className="mt-3 flex w-full flex-wrap justify-center gap-x-1 px-2 text-center italic text-gray-700">
+              This encounter will not be categorised under any chapter as the
+              diagnosis does not fall under a chapter.
+            </span>
+          ))}
       </div>
     </div>
   );

From acab1314f40663f6257c3de0426a69da5920ee68 Mon Sep 17 00:00:00 2001
From: rithviknishad <mail@rithviknishad.dev>
Date: Fri, 7 Jun 2024 12:45:29 +0530
Subject: [PATCH 3/3] minor code improvement

---
 .../ConsultationDiagnosisBuilder/PrincipalDiagnosisSelect.tsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Components/Diagnosis/ConsultationDiagnosisBuilder/PrincipalDiagnosisSelect.tsx b/src/Components/Diagnosis/ConsultationDiagnosisBuilder/PrincipalDiagnosisSelect.tsx
index 70ab633e1da..657451e4538 100644
--- a/src/Components/Diagnosis/ConsultationDiagnosisBuilder/PrincipalDiagnosisSelect.tsx
+++ b/src/Components/Diagnosis/ConsultationDiagnosisBuilder/PrincipalDiagnosisSelect.tsx
@@ -49,7 +49,7 @@ const PrincipalDiagnosisSelect = <T extends Option>(props: Props<T>) => {
           errorClassName="hidden"
         />
         {diagnosis &&
-          (diagnosis?.chapter ? (
+          (diagnosis.chapter ? (
             <span className="mt-3 flex w-full flex-wrap justify-center gap-x-1 px-2 text-center text-gray-900">
               <p>This encounter will be categorised under:</p>
               <p className="font-bold">{diagnosis.chapter}</p>