diff --git a/src/components/LabTest/CollectSpecimen.tsx b/src/components/LabTest/CollectSpecimen.tsx
index 1d05d1fb9b1..5797e3aaf69 100644
--- a/src/components/LabTest/CollectSpecimen.tsx
+++ b/src/components/LabTest/CollectSpecimen.tsx
@@ -158,7 +158,7 @@ export const CollectSpecimen: React.FC<{
- {data?.request.id}
+ {data?.request.id.slice(0, 8)}
Active
diff --git a/src/components/LabTest/InProcess.tsx b/src/components/LabTest/InProcess.tsx
index 72b4dbcd553..08581ea7c03 100644
--- a/src/components/LabTest/InProcess.tsx
+++ b/src/components/LabTest/InProcess.tsx
@@ -74,7 +74,7 @@ export const InProcess: React.FC = () => {
data={
data?.results?.map((specimen) => ({
specimenId: specimen.identifier ?? specimen.id.slice(0, 8),
- orderId: specimen.request.id,
+ orderId: specimen.request.id.slice(0, 8),
patientName: specimen.subject.name,
specimen: specimen.type.display || specimen.type.code,
tests: specimen.request.code.display || specimen.request.code.code,
diff --git a/src/components/LabTest/OrderPlaced.tsx b/src/components/LabTest/OrderPlaced.tsx
index d58434954c9..ca6f7504a3d 100644
--- a/src/components/LabTest/OrderPlaced.tsx
+++ b/src/components/LabTest/OrderPlaced.tsx
@@ -74,7 +74,7 @@ export const OrderPlaced: React.FC = () => {
data={
data?.results?.map((specimen) => ({
specimenId: specimen.identifier ?? specimen.id.slice(0, 8),
- orderId: specimen.request.id,
+ orderId: specimen.request.id.slice(0, 8),
patientName: specimen.subject.name,
specimen: specimen.type.display || specimen.type.code,
tests: specimen.request.code.display || specimen.request.code.code,
diff --git a/src/components/LabTest/ProcessSpecimen.tsx b/src/components/LabTest/ProcessSpecimen.tsx
index cbf97368f06..571d8b7be47 100644
--- a/src/components/LabTest/ProcessSpecimen.tsx
+++ b/src/components/LabTest/ProcessSpecimen.tsx
@@ -210,7 +210,7 @@ export const ProcessSpecimen = ({ specimenId }: ProcessSpecimenProps) => {
Order ID
- {specimen.request.id}
+ {specimen.request.id.slice(0, 8)}
@@ -702,10 +702,11 @@ export const ProcessSpecimen = ({ specimenId }: ProcessSpecimenProps) => {
id: uuid().toString(),
main_code: observation.code!,
value: observation.result,
- status: "final",
+ status: "final" as "final",
effective_datetime: new Date().toISOString(),
data_entered_by_id: currentUserId,
- subject_type: "patient",
+ subject_type: "patient" as "patient",
+ note: observation.note,
})),
},
},
@@ -757,9 +758,7 @@ export const ProcessSpecimen = ({ specimenId }: ProcessSpecimenProps) => {
{observation.value}
{observation.reference_range?.unit}
Dummy Ref range
-
-
-
+
{observation.note}
))}
diff --git a/src/components/LabTest/ReceiveSpecimen.tsx b/src/components/LabTest/ReceiveSpecimen.tsx
index ac07fb3f739..17f77a0bafc 100644
--- a/src/components/LabTest/ReceiveSpecimen.tsx
+++ b/src/components/LabTest/ReceiveSpecimen.tsx
@@ -120,7 +120,7 @@ export const ReceiveSpecimen: React.FC = () => {
Order ID
- {scannedSpecimen.request.id}
+ {scannedSpecimen.request.id.slice(0, 8)}
@@ -382,7 +382,7 @@ export const ReceiveSpecimen: React.FC = () => {
Order ID
- {specimen.request.id}
+ {specimen.request.id.slice(0, 8)}
{/* Specimen Type */}
diff --git a/src/components/LabTest/ReceivedAtLab.tsx b/src/components/LabTest/ReceivedAtLab.tsx
index e5852fb4f64..e883ae9f64f 100644
--- a/src/components/LabTest/ReceivedAtLab.tsx
+++ b/src/components/LabTest/ReceivedAtLab.tsx
@@ -79,7 +79,7 @@ export const ReceivedAtLab: React.FC = () => {
data={
data?.results?.map((specimen) => ({
specimenId: specimen.identifier ?? specimen.id.slice(0, 8),
- orderId: specimen.request.id,
+ orderId: specimen.request.id.slice(0, 8),
patientName: specimen.subject.name,
specimen: specimen.type.display || specimen.type.code,
tests:
diff --git a/src/components/LabTest/ReviewRequired.tsx b/src/components/LabTest/ReviewRequired.tsx
index 58406377bc9..f661b3d2574 100644
--- a/src/components/LabTest/ReviewRequired.tsx
+++ b/src/components/LabTest/ReviewRequired.tsx
@@ -66,7 +66,7 @@ export const ReviewRequired: React.FC = () => {
data={
data?.results?.map((report) => ({
patientName: report.subject.name,
- orderId: report.based_on.id,
+ orderId: report.based_on.id.slice(0, 8),
specimen: report.specimen
.map((specimen) => specimen.type.display || specimen.type.code)
.join(", "),
diff --git a/src/components/LabTest/ReviewResult.tsx b/src/components/LabTest/ReviewResult.tsx
index 390d3d1e57b..a00054b0918 100644
--- a/src/components/LabTest/ReviewResult.tsx
+++ b/src/components/LabTest/ReviewResult.tsx
@@ -121,7 +121,7 @@ export const ReviewResult: React.FC<{
return (
- {/* Left - Navigation/Progress Bar */}
+ {/* Left - Progress Bar */}
{/* Right - Main Content */}
diff --git a/src/components/LabTest/SendSpecimen.tsx b/src/components/LabTest/SendSpecimen.tsx
index 3486b8534aa..483c861633a 100644
--- a/src/components/LabTest/SendSpecimen.tsx
+++ b/src/components/LabTest/SendSpecimen.tsx
@@ -130,7 +130,7 @@ export const SendSpecimen: React.FC = () => {
- SPEC009213
+ {specimen.identifier ?? specimen.id.slice(0, 8)}
Ready for Dispatch
diff --git a/src/components/LabTest/SentToLab.tsx b/src/components/LabTest/SentToLab.tsx
index f6dfb51ad4d..a225437463d 100644
--- a/src/components/LabTest/SentToLab.tsx
+++ b/src/components/LabTest/SentToLab.tsx
@@ -80,7 +80,7 @@ export const SentToLab: React.FC = () => {
data={
data?.results?.map((specimen) => ({
specimenId: specimen.identifier ?? specimen.id.slice(0, 8),
- orderId: specimen.request.id,
+ orderId: specimen.request.id.slice(0, 8),
patientName: specimen.subject.name,
specimen: specimen.type.display || specimen.type.code,
tests:
diff --git a/src/components/LabTest/SpecimenCollected.tsx b/src/components/LabTest/SpecimenCollected.tsx
index 8dda55b1a4c..8c9aefb8b38 100644
--- a/src/components/LabTest/SpecimenCollected.tsx
+++ b/src/components/LabTest/SpecimenCollected.tsx
@@ -79,7 +79,7 @@ export const SpecimenCollected: React.FC = () => {
data={
data?.results?.map((specimen) => ({
specimenId: specimen.identifier ?? specimen.id.slice(0, 8),
- orderId: specimen.request.id,
+ orderId: specimen.request.id.slice(0, 8),
patientName: specimen.subject.name,
specimen: specimen.type.display || specimen.type.code,
tests: