From 1ac5f6d31803d1d22f194bf1437978086e00112c Mon Sep 17 00:00:00 2001
From: jabahum <jabajnan8@gmail.com>
Date: Wed, 6 Dec 2023 10:23:09 +0300
Subject: [PATCH] ft : add patient name

---
 .../completed-list.component.tsx              | 22 +++++++++++------
 .../laboratory-patient-list.component.tsx     | 23 ++++++++++++------
 src/review-list/review-list.component.tsx     | 22 +++++++++++------
 src/work-list/work-list.component.tsx         | 24 ++++++++++++-------
 4 files changed, 62 insertions(+), 29 deletions(-)

diff --git a/src/completed-list/completed-list.component.tsx b/src/completed-list/completed-list.component.tsx
index aacd4de1..6e279cc1 100644
--- a/src/completed-list/completed-list.component.tsx
+++ b/src/completed-list/completed-list.component.tsx
@@ -64,17 +64,18 @@ const CompletedList: React.FC<CompletedlistProps> = ({ fulfillerStatus }) => {
     { id: 0, header: t("date", "Date"), key: "date" },
 
     { id: 1, header: t("orderNumber", "Order Number"), key: "orderNumber" },
+    { id: 2, header: t("patient", "Patient"), key: "patient" },
+
     {
-      id: 2,
+      id: 3,
       header: t("accessionNumber", "Accession Number"),
       key: "accessionNumber",
     },
-    { id: 3, header: t("test", "Test"), key: "test" },
-    { id: 4, header: t("action", "Action"), key: "action" },
-    { id: 5, header: t("status", "Status"), key: "status" },
-    { id: 6, header: t("orderer", "Orderer"), key: "orderer" },
-    { id: 7, header: t("orderType", "Order Type"), key: "orderType" },
-    { id: 8, header: t("urgency", "Urgency"), key: "urgency" },
+    { id: 4, header: t("test", "Test"), key: "test" },
+    { id: 5, header: t("action", "Action"), key: "action" },
+    { id: 6, header: t("status", "Status"), key: "status" },
+    { id: 8, header: t("orderer", "Orderer"), key: "orderer" },
+    { id: 9, header: t("urgency", "Urgency"), key: "urgency" },
   ];
 
   const tableRows = useMemo(() => {
@@ -88,6 +89,13 @@ const CompletedList: React.FC<CompletedlistProps> = ({ fulfillerStatus }) => {
           </>
         ),
       },
+      patient: {
+        content: (
+          <>
+            <span>{entry.patient.display.split("-")[1]}</span>
+          </>
+        ),
+      },
       orderNumber: { content: <span>{entry.orderNumber}</span> },
       accessionNumber: { content: <span>{entry.accessionNumber}</span> },
       test: { content: <span>{entry.concept.display}</span> },
diff --git a/src/queue-list/laboratory-patient-list.component.tsx b/src/queue-list/laboratory-patient-list.component.tsx
index e5932ff2..91307599 100644
--- a/src/queue-list/laboratory-patient-list.component.tsx
+++ b/src/queue-list/laboratory-patient-list.component.tsx
@@ -87,17 +87,19 @@ const LaboratoryPatientList: React.FC<LaboratoryPatientListProps> = () => {
     { id: 0, header: t("date", "Date"), key: "date" },
 
     { id: 1, header: t("orderNumber", "Order Number"), key: "orderNumber" },
+    { id: 2, header: t("patient", "Patient"), key: "patient" },
+
     {
-      id: 2,
+      id: 3,
       header: t("accessionNumber", "Accession Number"),
       key: "accessionNumber",
     },
-    { id: 3, header: t("test", "Test"), key: "test" },
-    { id: 4, header: t("action", "Action"), key: "action" },
-    { id: 5, header: t("status", "Status"), key: "status" },
-    { id: 6, header: t("orderer", "Orderer"), key: "orderer" },
-    { id: 8, header: t("urgency", "Urgency"), key: "urgency" },
-    { id: 9, header: t("actions", "Actions"), key: "actions" },
+    { id: 4, header: t("test", "Test"), key: "test" },
+    { id: 5, header: t("action", "Action"), key: "action" },
+    { id: 6, header: t("status", "Status"), key: "status" },
+    { id: 8, header: t("orderer", "Orderer"), key: "orderer" },
+    { id: 9, header: t("urgency", "Urgency"), key: "urgency" },
+    { id: 10, header: t("actions", "Actions"), key: "actions" },
   ];
 
   const tableRows = useMemo(() => {
@@ -113,6 +115,13 @@ const LaboratoryPatientList: React.FC<LaboratoryPatientListProps> = () => {
             </>
           ),
         },
+        patient: {
+          content: (
+            <>
+              <span>{entry.patient.display.split("-")[1]}</span>
+            </>
+          ),
+        },
         orderNumber: { content: <span>{entry.orderNumber}</span> },
         accessionNumber: { content: <span>{entry.accessionNumber}</span> },
         test: { content: <span>{entry.concept.display}</span> },
diff --git a/src/review-list/review-list.component.tsx b/src/review-list/review-list.component.tsx
index 2eaedb8b..f91da5a2 100644
--- a/src/review-list/review-list.component.tsx
+++ b/src/review-list/review-list.component.tsx
@@ -94,17 +94,18 @@ const ReviewList: React.FC<ReviewlistProps> = ({ fulfillerStatus }) => {
     { id: 0, header: t("date", "Date"), key: "date" },
 
     { id: 1, header: t("orderNumber", "Order Number"), key: "orderNumber" },
+    { id: 2, header: t("patient", "Patient"), key: "patient" },
+
     {
-      id: 2,
+      id: 3,
       header: t("accessionNumber", "Accession Number"),
       key: "accessionNumber",
     },
-    { id: 3, header: t("test", "Test"), key: "test" },
-    { id: 4, header: t("action", "Action"), key: "action" },
-    { id: 5, header: t("status", "Status"), key: "status" },
-    { id: 6, header: t("orderer", "Orderer"), key: "orderer" },
-    { id: 7, header: t("orderType", "Order Type"), key: "orderType" },
-    { id: 8, header: t("urgency", "Urgency"), key: "urgency" },
+    { id: 4, header: t("test", "Test"), key: "test" },
+    { id: 5, header: t("action", "Action"), key: "action" },
+    { id: 6, header: t("status", "Status"), key: "status" },
+    { id: 8, header: t("orderer", "Orderer"), key: "orderer" },
+    { id: 9, header: t("urgency", "Urgency"), key: "urgency" },
   ];
 
   const tableRows = useMemo(() => {
@@ -118,6 +119,13 @@ const ReviewList: React.FC<ReviewlistProps> = ({ fulfillerStatus }) => {
           </>
         ),
       },
+      patient: {
+        content: (
+          <>
+            <span>{entry.patient.display.split("-")[1]}</span>
+          </>
+        ),
+      },
       orderNumber: { content: <span>{entry.orderNumber}</span> },
       accessionNumber: { content: <span>{entry.accessionNumber}</span> },
       test: { content: <span>{entry.concept.display}</span> },
diff --git a/src/work-list/work-list.component.tsx b/src/work-list/work-list.component.tsx
index 117894ff..b55ef977 100644
--- a/src/work-list/work-list.component.tsx
+++ b/src/work-list/work-list.component.tsx
@@ -101,18 +101,19 @@ const WorkList: React.FC<WorklistProps> = ({ fulfillerStatus }) => {
     { id: 0, header: t("date", "Date"), key: "date" },
 
     { id: 1, header: t("orderNumber", "Order Number"), key: "orderNumber" },
+    { id: 2, header: t("patient", "Patient"), key: "patient" },
+
     {
-      id: 2,
+      id: 3,
       header: t("accessionNumber", "Accession Number"),
       key: "accessionNumber",
     },
-    { id: 3, header: t("test", "Test"), key: "test" },
-    { id: 4, header: t("action", "Action"), key: "action" },
-    { id: 5, header: t("status", "Status"), key: "status" },
-    { id: 6, header: t("orderer", "Orderer"), key: "orderer" },
-    { id: 7, header: t("orderType", "Order Type"), key: "orderType" },
-    { id: 8, header: t("urgency", "Urgency"), key: "urgency" },
-    { id: 9, header: t("actions", "Actions"), key: "actions" },
+    { id: 4, header: t("test", "Test"), key: "test" },
+    { id: 5, header: t("action", "Action"), key: "action" },
+    { id: 6, header: t("status", "Status"), key: "status" },
+    { id: 8, header: t("orderer", "Orderer"), key: "orderer" },
+    { id: 9, header: t("urgency", "Urgency"), key: "urgency" },
+    { id: 10, header: t("actions", "Actions"), key: "actions" },
   ];
 
   const ResultsOrder: React.FC<ResultsOrderProps> = ({
@@ -146,6 +147,13 @@ const WorkList: React.FC<WorklistProps> = ({ fulfillerStatus }) => {
             </>
           ),
         },
+        patient: {
+          content: (
+            <>
+              <span>{entry.patient.display.split("-")[1]}</span>
+            </>
+          ),
+        },
         orderNumber: { content: <span>{entry.orderNumber}</span> },
         accessionNumber: { content: <span>{entry.accessionNumber}</span> },
         test: { content: <span>{entry.concept.display}</span> },