(
null,
);
- const [openUploadDialog, setOpenUploadDialog] = useState(false);
- const [conclusion, setConclusion] = useState("");
- const queryClient = useQueryClient();
-
- // Get the latest report if any exists
- const latestReport =
- diagnosticReports.length > 0 ? diagnosticReports[0] : null;
- const hasReport = !!latestReport;
// Check if all required specimens are collected
const hasCollectedSpecimens =
activityDefinition?.specimen_requirements?.length === 0 ||
specimens.some((specimen) => specimen.status === SpecimenStatus.available);
- // Fetch the full diagnostic report to get observations
- const { data: fullReport, isLoading: isLoadingReport } = useQuery({
- queryKey: ["diagnosticReport", latestReport?.id],
- queryFn: query(diagnosticReportApi.retrieveDiagnosticReport, {
- pathParams: {
- patient_external_id: patientId,
- external_id: latestReport?.id || "",
- },
- }),
- enabled: !!latestReport?.id,
- });
-
- // Query to fetch files for the diagnostic report
- const { data: files = { results: [], count: 0 } } = useQuery<
- PaginatedResponse
- >({
- queryKey: ["files", "diagnostic_report", fullReport?.id],
- queryFn: query(fileApi.list, {
- queryParams: {
- file_type: "diagnostic_report",
- associating_id: fullReport?.id,
- limit: 100,
- offset: 0,
- },
- }),
- enabled: !!fullReport?.id,
- });
+ const isMultipleDiagnosticReport =
+ !!activityDefinition?.diagnostic_report_codes &&
+ activityDefinition.diagnostic_report_codes.length > 0;
// Creating a new diagnostic report
const { mutate: createDiagnosticReport, isPending: isCreatingReport } =
@@ -183,35 +154,183 @@ export function DiagnosticReportForm({
queryClient.invalidateQueries({
queryKey: ["serviceRequest"],
});
- // Fetch the newly created report
queryClient.invalidateQueries({
queryKey: ["diagnosticReport"],
});
},
- onError: (err: any) => {
+ onError: (err: Error) => {
toast.error(
- `Failed to create diagnostic report: ${err.message || "Unknown error"}`,
+ t("failed_to_create_diagnostic_report", {
+ error: err.message || "Unknown error",
+ }),
);
},
});
- // Effect to handle diagnostic reports changes
- useEffect(() => {
- const latestReport = diagnosticReports[0];
- if (latestReport) {
- // If we have a new report, update the UI accordingly
- setSelectedReportCode(latestReport.code || null);
- setIsExpanded(true);
+ function handleCreateReport(code?: Code) {
+ if (!hasCollectedSpecimens) {
+ toast.error(t("specimen_collection_required"));
+ return;
}
- }, [diagnosticReports]);
- // Effect to handle fullReport changes
- useEffect(() => {
- if (fullReport) {
- // When we get the full report details, ensure UI is in correct state
- setSelectedReportCode(fullReport.code || null);
- }
- }, [fullReport]);
+ const category: Code = {
+ code: "LAB",
+ display: "Laboratory",
+ system: "http://terminology.hl7.org/CodeSystem/v2-0074",
+ };
+
+ createDiagnosticReport({
+ status: DiagnosticReportStatus.preliminary,
+ category,
+ service_request: serviceRequestId,
+ code: code || undefined,
+ });
+ }
+
+ return (
+ <>
+ {diagnosticReports.length > 0 && (
+
+
+ {diagnosticReports.map((report) => (
+ (
+ {},
+ );
+ const [isExpanded, setIsExpanded] = useState(true);
+ const [openUploadDialog, setOpenUploadDialog] = useState(false);
+ const [conclusion, setConclusion] = useState(report.conclusion || "");
+
+ const { data: fullReport } = useQuery({
+ queryKey: ["diagnosticReport", report.id],
+ queryFn: query(diagnosticReportApi.retrieveDiagnosticReport, {
+ pathParams: {
+ patient_external_id: patientId,
+ external_id: report.id,
+ },
+ }),
+ enabled: !!report.id,
+ });
+
+ // Query to fetch files for the diagnostic report
+ const { data: files = { results: [], count: 0 } } = useQuery<
+ PaginatedResponse
+ >({
+ queryKey: ["files", "diagnostic_report", report.id],
+ queryFn: query(fileApi.list, {
+ queryParams: {
+ file_type: "diagnostic_report",
+ associating_id: report.id,
+ limit: 100,
+ offset: 0,
+ },
+ }),
+ enabled: !!report.id,
+ });
// Upserting observations for a diagnostic report
const { mutate: upsertObservations, isPending: isUpsertingObservations } =
@@ -219,21 +338,23 @@ export function DiagnosticReportForm({
mutationFn: mutate(observationApi.upsertObservations, {
pathParams: {
patient_external_id: patientId,
- external_id: latestReport?.id || "",
+ external_id: report.id,
},
}),
onSuccess: () => {
- toast.success("Test results saved successfully");
+ toast.success(t("test_results_saved_successfully"));
queryClient.invalidateQueries({
- queryKey: ["serviceRequest", serviceRequestId],
+ queryKey: ["serviceRequest", facilityId, serviceRequestId],
});
queryClient.invalidateQueries({
- queryKey: ["diagnosticReport", latestReport?.id],
+ queryKey: ["diagnosticReport", report.id],
});
},
- onError: (err: any) => {
+ onError: (err: Error) => {
toast.error(
- `Failed to save test results: ${err.message || "Unknown error"}`,
+ t("failed_to_save_test_results", {
+ error: err.message || "Unknown error",
+ }),
);
},
});
@@ -243,13 +364,13 @@ export function DiagnosticReportForm({
mutationFn: mutate(diagnosticReportApi.updateDiagnosticReport, {
pathParams: {
patient_external_id: patientId,
- external_id: latestReport?.id || "",
+ external_id: report.id,
},
}),
onSuccess: () => {
toast.success(t("conclusion_updated_successfully"));
queryClient.invalidateQueries({
- queryKey: ["diagnosticReport", latestReport?.id],
+ queryKey: ["diagnosticReport", report.id],
});
setIsExpanded(false);
},
@@ -259,14 +380,16 @@ export function DiagnosticReportForm({
});
// Initialize file upload hook
+ const inputId = `file_upload_diagnostic_report_${report.id}`;
const fileUpload = useFileUpload({
- type: "diagnostic_report" as any,
+ type: "diagnostic_report" as FileType,
+ inputId,
multiple: true,
allowedExtensions: BACKEND_ALLOWED_EXTENSIONS,
allowNameFallback: false,
onUpload: () => {
queryClient.invalidateQueries({
- queryKey: ["diagnosticReport", latestReport?.id],
+ queryKey: ["diagnosticReport", report.id],
});
},
compress: false,
@@ -289,9 +412,10 @@ export function DiagnosticReportForm({
if (!openUploadDialog) {
fileUpload.clearFiles();
}
+ // eslint-disable-next-line react-hooks/exhaustive-deps
}, [openUploadDialog]);
- // Initialize form with existing observations from the full report
+ // Initialize form with existing observations from the report
useEffect(() => {
if (fullReport?.observations && fullReport.observations.length > 0) {
const initialObservations: ObservationsByDefinition = {};
@@ -333,10 +457,10 @@ export function DiagnosticReportForm({
});
setObservations(initialObservations);
+ }
- if (fullReport.conclusion) {
- setConclusion(fullReport.conclusion);
- }
+ if (fullReport?.conclusion) {
+ setConclusion(fullReport.conclusion);
}
}, [fullReport]);
@@ -467,36 +591,7 @@ export function DiagnosticReportForm({
});
}
- function handleCreateReport() {
- // Only create a new report if no reports exist
- if (!hasReport) {
- if (!hasCollectedSpecimens) {
- toast.error(t("specimen_collection_required"));
- return;
- }
-
- const category: Code = {
- code: "LAB",
- display: "Laboratory",
- system: "http://terminology.hl7.org/CodeSystem/v2-0074",
- };
-
- createDiagnosticReport({
- status: DiagnosticReportStatus.preliminary,
- category,
- service_request: serviceRequestId,
- code: selectedReportCode || undefined,
- });
- }
- }
-
function handleSubmit() {
- if (!hasReport) {
- // First create a report if none exists
- handleCreateReport();
- return;
- }
-
try {
// Check if all observations have values
const hasObservationValue = Object.values(observations).some((obsList) =>
@@ -645,23 +740,21 @@ export function DiagnosticReportForm({
)
.filter((obs): obs is ObservationUpsertRequest => obs !== null);
- if (fullReport) {
- // Upsert observations
- if (formattedObservations.length > 0) {
- upsertObservations({
- observations: formattedObservations,
- });
- }
-
- updateDiagnosticReport({
- id: fullReport.id,
- status: fullReport.status,
- category: fullReport.category,
- code: fullReport.code,
- note: fullReport.note,
- conclusion,
+ // Upsert observations
+ if (formattedObservations.length > 0) {
+ upsertObservations({
+ observations: formattedObservations,
});
}
+
+ updateDiagnosticReport({
+ id: report.id,
+ status: report.status,
+ category: report.category,
+ code: report.code,
+ note: report.note,
+ conclusion,
+ });
} catch (_error) {
toast.error(t("error_validating_form"));
}
@@ -808,23 +901,7 @@ export function DiagnosticReportForm({
);
}
- const isSubmitting =
- isCreatingReport || isUpsertingObservations || isUpdatingReport;
-
- // Show loading state while fetching the report
- if (hasReport && isLoadingReport) {
- return (
-
-
-
-
-
- );
- }
+ const isSubmitting = isUpsertingObservations || isUpdatingReport;
return (
- {t(fullReport.status)}
-
)}
+
+ {formatName(report.created_by)}
+
+
+
+
+ {t(report.status)}
+
- {hasReport && fullReport ? (
-
- {fullReport.status !== DiagnosticReportStatus.final && (
-
-
-
-
-
-
+
+ {report.status !== DiagnosticReportStatus.final && (
+
+
+
+
+
+
- {observationsList.map((observationData, index) => {
- const hasComponents =
- definition.component &&
- definition.component.length > 0;
- const isErrored =
- observationData.status ===
- ObservationStatus.ENTERED_IN_ERROR;
- return (
- {
+ const hasComponents =
+ definition.component &&
+ definition.component.length > 0;
+ const isErrored =
+ observationData.status ===
+ ObservationStatus.ENTERED_IN_ERROR;
+ return (
+
+
+
+ {isErrored ? (
+
+ {t("marked_for_deletion")}
+
+ ) : (
+ !disableEdit && (
+
+ )
)}
- >
-
-
- {isErrored ? (
-
- {t("marked_for_deletion")}
-
- ) : (
- !disableEdit && (
-
- )
- )}
-
+
- {/* For blood pressure and similar observations with components, we may or may not need to show the main value field */}
- {!hasComponents && (
-
- {definition.permitted_unit && (
-
-
-
-
- )}
-
-
+ {/* For blood pressure and similar observations with components, we may or may not need to show the main value field */}
+ {!hasComponents && (
+
+ {definition.permitted_unit && (
+
-
- handleValueChange(
+
+ )}
+
+
+
+
+ handleValueChange(
+ definition.id,
+ index,
+ e.target.value,
+ observationData.unit,
+ )
+ }
+ placeholder={t("result_value")}
+ type={
+ definition.permitted_data_type ===
+ "decimal" ||
+ definition.permitted_data_type ===
+ "integer"
+ ? "number"
+ : "text"
+ }
+ disabled={isErrored || disableEdit}
+ />
+
+ )}
+
+ {/* Render component inputs for multi-component observations */}
+ {hasComponents &&
+ renderComponentInputs(
+ definition,
+ observationData,
+ index,
)}
+
+ );
+ })}
+
+ {/* Add button for multiple observations */}
+
+
+
+
+ );
+ })}
+
+
+ {files?.results && files.results.length > 0 && (
+
+
+ {t("uploaded_files")}
+
+
+
+
+
+
+
+ )}
+ {report.status !== DiagnosticReportStatus.final && (
)}
+ {report?.status === DiagnosticReportStatus.preliminary && (
+
+
+
+ )}
+
+
+
+
+
-
- {fullReport?.status ===
- DiagnosticReportStatus.preliminary && (
-
-
-
- )}
+ {fileUpload.Dialogues}
+
-
-
-
- (
+ null,
+ );
- {fileUpload.files.length > 0 && (
-
- )}
-
-
-
- )}
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- ) : (
-
-
-
- {!hasCollectedSpecimens
- ? t("collect_specimen_before_report")
- : t("no_test_results_recorded")}
+
+
+
+
+
+
+ {!hasCollectedSpecimens
+ ? t("collect_specimen_before_report")
+ : t("no_test_results_recorded")}
+
+ {isMultipleDiagnosticReport && (
+
+ {t("select_report_type_to_create")}
-
-
- {activityDefinition?.diagnostic_report_codes &&
- activityDefinition.diagnostic_report_codes.length > 0 && (
-
-
-
- )}
+ )}
+ {!isMultipleDiagnosticReport && (
-
+ )}
- )}
+ {isMultipleDiagnosticReport && (
+
+
+
+
+
+
+
+
+
+
+
+ )}
+
-
- {fileUpload.Dialogues}
- {t("review_test_results")}
+ )}
+
+ {diagnosticReports.map((report) => (
+ ("");
+ const [conclusion, setConclusion] = useState(report.conclusion || "");
const [showApproveDialog, setShowApproveDialog] = useState(false);
- const queryClient = useQueryClient();
- const latestReport = diagnosticReports[0];
- // Fetch the full diagnostic report to get observations
- const { data: fullReport, isLoading: isLoadingReport } = useQuery({
- queryKey: ["diagnosticReport", latestReport?.id],
+ const { data: fullReport } = useQuery({
+ queryKey: ["diagnosticReport", report.id],
queryFn: query(diagnosticReportApi.retrieveDiagnosticReport, {
pathParams: {
patient_external_id: patientId,
- external_id: latestReport?.id || "",
+ external_id: report.id,
},
}),
- enabled: !!latestReport?.id,
+ enabled: !!report.id,
});
- useEffect(() => {
- if (fullReport?.conclusion) {
- setConclusion(fullReport.conclusion);
- }
- }, [fullReport]);
-
const { data: files = { results: [], count: 0 } } = useQuery<
PaginatedResponse
>({
- queryKey: ["files", "diagnostic_report", fullReport?.id],
+ queryKey: ["files", "diagnostic_report", report.id],
queryFn: query(fileApi.list, {
queryParams: {
file_type: "diagnostic_report",
- associating_id: fullReport?.id,
+ associating_id: report.id,
limit: 100,
offset: 0,
},
}),
- enabled: !!fullReport?.id,
+ enabled: !!report.id,
});
const { mutate: updateDiagnosticReport, isPending: isUpdatingReport } =
@@ -102,7 +127,7 @@ export function DiagnosticReportReview({
mutationFn: mutate(diagnosticReportApi.updateDiagnosticReport, {
pathParams: {
patient_external_id: patientId,
- external_id: latestReport?.id || "",
+ external_id: report.id,
},
}),
onSuccess: () => {
@@ -118,56 +143,39 @@ export function DiagnosticReportReview({
queryKey: ["files"],
});
},
- onError: (err: any) => {
+ onError: (err: Error) => {
toast.error(
- `Failed to approve diagnostic report: ${err.message || "Unknown error"}`,
+ t("failed_to_approve_diagnostic_report", { error: err.message }),
);
},
});
+ // Prefer the full detail (with observations); fall back to the list report
+ // while the detail request is still loading.
+ const reportDetail = fullReport ?? report;
+
const handleApprove = () => {
- if (latestReport) {
- updateDiagnosticReport({
- ...latestReport,
- status: DiagnosticReportStatus.final,
- conclusion,
- });
- }
+ updateDiagnosticReport({
+ id: reportDetail.id,
+ status: DiagnosticReportStatus.final,
+ category: reportDetail.category,
+ code: reportDetail.code,
+ note: reportDetail.note,
+ conclusion: conclusion || reportDetail.conclusion,
+ });
};
- if (!latestReport) {
- return null;
- }
-
- // Show loading state while fetching the report
- if (isLoadingReport) {
- return (
-
-
-
-
-
- );
- }
-
- // Don't show the report review if there are no observations and no files and no conclusion
- if (
- (!fullReport?.observations || fullReport.observations.length === 0) &&
+ const isReportNotReviewable =
+ (!reportDetail.observations || reportDetail.observations.length === 0) &&
(!files?.results || files.results.length === 0) &&
- !fullReport?.conclusion
- ) {
- return null;
- }
+ !reportDetail.conclusion;
return (
@@ -175,35 +183,41 @@ export function DiagnosticReportReview({
-
-
-
+
+
- {fullReport?.created_by && (
+ {isReportNotReviewable && (
+
+ {t("no_observations_entered")}
+
+ )}
+ {report.created_by && (
- {t(fullReport.status)}
-
- )}
+
+ {t(report.status)}
+