diff --git a/src/components/LabTest/CollectSpecimen.tsx b/src/components/LabTest/CollectSpecimen.tsx index a525b037b54..20616e9ac8f 100644 --- a/src/components/LabTest/CollectSpecimen.tsx +++ b/src/components/LabTest/CollectSpecimen.tsx @@ -242,11 +242,10 @@ export const CollectSpecimen: React.FC<{ {[ data?.request.requester?.first_name, data?.request.requester?.last_name, - ].join(" ")} - {"District Admin"} + ].join(" ") ?? "NA"}

- {data?.request.requester?.user_type} + {data?.request.requester?.user_type ?? "NA"}

diff --git a/src/components/LabTest/ListEncounterServiceRequests.tsx b/src/components/LabTest/ListEncounterServiceRequests.tsx index 998c187b112..e47c439d67e 100644 --- a/src/components/LabTest/ListEncounterServiceRequests.tsx +++ b/src/components/LabTest/ListEncounterServiceRequests.tsx @@ -28,8 +28,6 @@ export default function ListEncounterServiceRequests({ }, }); - // TODO: Add Loader while fetching data - const priorityVariantMap: Record = { routine: "info", asap: "warning", diff --git a/src/components/LabTest/ReviewResult.tsx b/src/components/LabTest/ReviewResult.tsx index 6e127081922..01829ad52d5 100644 --- a/src/components/LabTest/ReviewResult.tsx +++ b/src/components/LabTest/ReviewResult.tsx @@ -309,11 +309,18 @@ export const ReviewResult: React.FC<{ {diagnosticReport?.based_on.id} - + {diagnosticReport?.conclusion - ? "Under Review" - : "Completed"} - + ? "Completed" + : "Under Review"} +
@@ -368,10 +375,11 @@ export const ReviewResult: React.FC<{

{diagnosticReport?.based_on?.requester - ?.first_name ?? "Dummy Name"} + ?.first_name ?? "NA"}

- Dummy Designation + {diagnosticReport?.based_on?.requester + ?.user_type ?? "NA"}