[ENG-500] Support for creating multiple diagnostic reports in a service request

public/locale/en.json

@@ -693,6 +693,7 @@
   "and_more_medications": "+{{count}} more medication(s)",
   "and_more_service_requests": "+{{count}} more service request(s)",
   "and_the_status_of_request_is": "and the status of request is",
+  "another_diagnostic_report": "Another Diagnostic Report",
   "answer": "Answer",
   "answer_options": "Answer options",
   "answer_options_description": "Define possible answers for this question",
@@ -1854,12 +1855,19 @@
   "diagnosis_history": "Diagnosis History",
   "diagnosis_status_placeholder": "Select diagnosis status",
   "diagnosis_verification_placeholder": "Select verification status",
+  "diagnostic": "Diagnostic",
   "diagnostic_report": "Diagnostic Report",
+  "diagnostic_report_approved": "Diagnostic Report Approved",
+  "diagnostic_report_approved_description": "{{name}} report approved and finalized",
   "diagnostic_report_approved_successfully": "Diagnostic report approved successfully",
   "diagnostic_report_codes": "Diagnostic Report Codes",
   "diagnostic_report_codes_description": "Diagnostic Reports that will be generated.",
+  "diagnostic_report_created": "Diagnostic Report Created",
+  "diagnostic_report_created_description": "{{name}} report created",
   "diagnostic_report_created_successfully": "Diagnostic report created successfully",
   "diagnostic_report_image": "Diagnostic Report Image",
+  "diagnostic_report_in_progress": "Diagnostic Report In Progress",
+  "diagnostic_report_in_progress_description": "{{name}} report created and pending approval",
   "diagnostic_report_not_found": "Diagnostic Report Not Found",
   "diagnostic_report_one": "Diagnostic Report",
   "diagnostic_report_other": "Diagnostic Reports",
@@ -2579,7 +2587,6 @@
   "failed_to_stop_camera": "Failed to stop camera",
   "failed_to_unlock_invoice": "Failed to unlock invoice",
   "failed_to_update_category": "Failed to update category",
-  "failed_to_update_conclusion": "Failed to update conclusion",
   "failed_to_update_invoice": "Failed to update invoice",
   "failed_to_update_order": "Failed to update location order",
   "failed_to_update_questionnaire": "Failed to update Questionnaire",
@@ -4568,6 +4575,7 @@
   "print_prescriptions": "Print Prescriptions",
   "print_qr_codes": "Print QR Codes",
   "print_receipt": "Print Receipt",
+  "print_report": "Print Report",
   "print_selected": "Print Selected",
   "print_setup": "Print Setup",
   "print_templates": "Print Templates",
@@ -4933,6 +4941,7 @@
   "report_type": "Report Type",
   "reported_by": "Reported by",
   "reports": "Reports",
+  "reports_pending_final_review": "{{pending}} of {{total}} reports pending final review",
   "repository": "Repository",
   "req_atleast_one_digit": "Require at least one digit",
   "req_atleast_one_lowercase": "Require at least one lower case letter",
@@ -4945,6 +4954,7 @@
   "request_details": "Request Details",
   "request_for": "Request for",
   "request_id": "Request ID",
+  "request_initiated_by": "Request initiated by {{name}}",
   "request_letter": "Request Letter",
   "request_order": "Request Order",
   "request_order_details": "Request Order Details",
@@ -5051,7 +5061,6 @@
   "result_date": "Result Date",
   "result_details": "Result details",
   "result_on": "Result on",
-  "result_review": "Result Review",
   "result_value": "Result value",
   "resume": "Resume",
   "retake": "Retake",
@@ -5083,6 +5092,7 @@
   "review_and_finalise_request_description": "Add more items if needed, or approve to mark this delivery as requested.",
   "review_before": "Review Before",
   "review_missed": "Review Missed",
+  "review_test_results": "Review Test Results",
   "revisit_days_non_negative": "Re-visit allowed days cannot be negative",
   "revoke": "Revoke",
   "revoke_token": "Revoke Token",
@@ -5549,6 +5559,7 @@
   "select_register_patient": "Select/Register Patient",
   "select_report": "Select Report",
   "select_report_type": "Select Report Type",
+  "select_report_type_to_create": "Select a diagnostic report type to create a new report",
   "select_requester": "Select requester",
   "select_resource": "Select the resource",
   "select_resource_category": "Select resource category",
@@ -5685,6 +5696,7 @@
   "service_request_completed": "Service request marked as completed",
   "service_request_completion_confirmation": "Are you sure you want to mark this service request as complete? This action cannot be undone.",
   "service_request_completion_note_description": "Document key findings or remarks before completing this request.",
+  "service_request_created": "Service Request Created",
   "service_request_detail_page_description_prefix": "{{count}} deliveries have been received",
   "service_request_details": "Service Request Details",
   "service_request_invoice_alert": "Back to Service Request",
@@ -5817,6 +5829,7 @@
   "specimen_collect_error": "Failed to collect specimen",
   "specimen_collect_success": "Specimen collected successfully",
   "specimen_collected": "Specimen Collected",
+  "specimen_collected_description": "{{specimen}} collected",
   "specimen_collection": "Specimen Collection",
   "specimen_collection_info": "Collection Information",
   "specimen_collection_instructions": "Specimen Collection Instructions",
@@ -5840,6 +5853,8 @@
   "specimen_id": "Specimen ID",
   "specimen_identification": "Sample Identification",
   "specimen_not_found": "Specimen not found",
+  "specimen_processed": "Specimen Processed",
+  "specimen_processed_description": "{{specimen}} processed",
   "specimen_qrcode_scan_info": "QR code scanning to be implemented",
   "specimen_requirements": "Specimen Requirements",
   "specimen_requirements_description": "Specimen that are the requird to be collected.",
@@ -6088,6 +6103,7 @@
   "test_results": "Test Results",
   "test_results_actions": "Test Results actions",
   "test_results_entry": "Test Results Entry",
+  "test_results_saved_successfully": "Test results saved successfully",
   "test_type": "Type of test done",
   "tested_on": "Tested on",
   "tests": "Tests",
@@ -6569,6 +6585,7 @@
   "view_facility": "View Facility",
   "view_facility_details": "View facility details",
   "view_files": "View Files",
+  "view_full_report": "View Full Report",
   "view_history": "View History",
   "view_intake_chart": "View Intake Chart",
   "view_inventory": "View Inventory",

src/Routers/routes/FacilityRoutes.tsx

@@ -68,7 +68,6 @@ const FacilityRoutes: AppRoutes = {
 
   ...[
     "/facility/:facilityId/patient/:patientId/diagnostic_reports/:diagnosticReportId",
-    "/organization/organizationId/patient/:patientId/diagnostic_reports/:diagnosticReportId",
   ].reduce((acc: AppRoutes, path) => {
     acc[path] = ({ facilityId, patientId, diagnosticReportId }) => (
       <DiagnosticReportView
@@ -80,13 +79,31 @@ const FacilityRoutes: AppRoutes = {
     return acc;
   }, {}),
   ...[
-    "/facility/:facilityId/patient/:patientId/diagnostic_reports/:diagnosticReportId/print",
-    "/organization/organizationId/patient/:patientId/diagnostic_reports/:diagnosticReportId/print",
+    "/facility/:facilityId/patient/:patientId/service_request/:serviceRequestId/diagnostic_report/:diagnosticReportId/print",
   ].reduce((acc: AppRoutes, path) => {
-    acc[path] = ({ patientId, diagnosticReportId }) => (
+    acc[path] = ({
+      patientId,
+      diagnosticReportId,
+      serviceRequestId,
+      facilityId,
+    }) => (
       <DiagnosticReportPrint
         patientId={patientId}
         diagnosticReportId={diagnosticReportId}
+        serviceRequestId={serviceRequestId}
+        facilityId={facilityId}
+      />
+    );
+    return acc;
+  }, {}),
+  ...[
+    "/facility/:facilityId/patient/:patientId/service_request/:serviceRequestId/diagnostic_reports/print",
+  ].reduce((acc: AppRoutes, path) => {
+    acc[path] = ({ patientId, serviceRequestId, facilityId }) => (
+      <DiagnosticReportPrint
+        patientId={patientId}
+        serviceRequestId={serviceRequestId}
+        facilityId={facilityId}
       />
     );
     return acc;

src/components/Files/FileUploadDialog.tsx

@@ -23,6 +23,7 @@ export default function FileUploadDialog({
   fileUpload,
   associatingId,
   type,
+  instanceId,
 }: {
   open: boolean;
   onOpenChange: (open: boolean) => void;
@@ -34,9 +35,11 @@ export default function FileUploadDialog({
     | "encounter"
     | "diagnostic_report"
     | "service_request";
+  instanceId?: string;
 }) {
   const { t } = useTranslation();
   const [isPdf, setIsPdf] = useState(false);
+  const idPrefix = instanceId ? `${instanceId}-` : "";
 
   const handleDialogClose = (open: boolean) => {
     if (!open) {
@@ -108,15 +111,15 @@ export default function FileUploadDialog({
               ))}
               <div>
                 <Label
-                  htmlFor="upload-file-name-0"
+                  htmlFor={`${idPrefix}upload-file-name-0`}
                   className="block text-sm font-medium text-gray-700"
                 >
                   {t("enter_file_name")}
                 </Label>
                 <Input
                   name="file_name_0"
                   type="text"
-                  id="upload-file-name-0"
+                  id={`${idPrefix}upload-file-name-0`}
                   required
                   value={fileUpload.fileNames[0] || ""}
                   disabled={fileUpload.uploading}
@@ -186,7 +189,7 @@ export default function FileUploadDialog({
                       <Input
                         name={`file_name_${index}`}
                         type="text"
-                        id={`upload-file-name-${index}`}
+                        id={`${idPrefix}upload-file-name-${index}`}
                         required
                         value={fileUpload.fileNames[index] || ""}
                         disabled={fileUpload.uploading}
@@ -212,13 +215,16 @@ export default function FileUploadDialog({
         {fileUpload.files.length > 1 && (
           <div className="flex items-center gap-2 mt-4">
             <Checkbox
-              id={`file_upload_${type}`}
+              id={`${idPrefix}combine_files_pdf_${type}`}
               checked={isPdf}
               onCheckedChange={(checked: boolean) => setIsPdf(checked)}
               disabled={fileUpload.uploading}
               className="cursor-pointer"
             />
-            <Label htmlFor={`file_upload_${type}`} className="cursor-pointer">
+            <Label
+              htmlFor={`${idPrefix}combine_files_pdf_${type}`}
+              className="cursor-pointer"
+            >
               {t("combine_files_pdf")}
             </Label>
           </div>
@@ -237,7 +243,7 @@ export default function FileUploadDialog({
             variant="outline_primary"
             onClick={() => fileUpload.handleFileUpload(associatingId, isPdf)}
             disabled={fileUpload.uploading}
-            id="upload_file_button"
+            id={`${idPrefix}upload_file_button`}
           >
             <CareIcon icon="l-check" className="mr-1" />
             {t("upload")}

src/hooks/useFileUpload.tsx

@@ -29,6 +29,7 @@ import fileApi from "@/types/files/fileApi";
 export type FileUploadOptions = {
   multiple?: boolean;
   type: FileType;
+  inputId?: string;
   category?: FileCategory;
   onUpload?: (file: FileReadMinimal) => void;
   // if allowed, will fallback to the name of the file if a seperate filename is not defined.
@@ -80,6 +81,7 @@ export default function useFileUpload(
     category = FileCategory.UNSPECIFIED,
     multiple,
     allowNameFallback = true,
+    inputId,
   } = options;
 
   const { t } = useTranslation();
@@ -355,7 +357,7 @@ export default function useFileUpload(
   const Input = (props: FileInputProps) => (
     <input
       {...props}
-      id={`file_upload_${fileType}`}
+      id={inputId ?? `file_upload_${fileType}`}
       title={t("change_file")}
       onChange={onFileChange}
       type="file"

src/pages/Encounters/tabs/diagnostic-reports.tsx

@@ -150,10 +150,12 @@ function DiagnosticReportDetailCard({
   return (
     <Card className="shadow-sm border rounded-lg">
       <CardHeader className="flex flex-row items-center justify-between py-3 px-4">
-        <CardTitle className="text-base font-medium">
-          {report.service_request?.title ||
-            report.code?.display ||
-            t("diagnostic_report", { count: 1 })}
+        <CardTitle className="flex items-center gap-2 text-gray-700 text-lg">
+          <span>
+            {report.service_request?.title ||
+              t("diagnostic_report", { count: 1 })}
+          </span>
+          {report.code?.display && <span> - {report.code.display}</span>}
         </CardTitle>
         <div className="flex items-center gap-2">
           <Badge variant={DIAGNOSTIC_REPORT_STATUS_COLORS[report.status]}>
@@ -170,12 +172,13 @@ function DiagnosticReportDetailCard({
                     navigate(
                       buildEncounterUrl(
                         patientId,
-                        `/diagnostic_reports/${report.id}/print`,
+                        `/service_request/${report.service_request?.id}/diagnostic_report/${report.id}/print`,
                         facilityId,
                       ),
                     )
                   }
                   data-shortcut-id="print-button"
+                  disabled={!report.service_request?.id}
                 >
                   <Printer className="size-4" />
                 </Button>
@@ -218,7 +221,7 @@ function DiagnosticReportDetailCard({
         {/* Report Details Grid */}
         <div className="grid grid-cols-1 md:grid-cols-2 gap-4 text-sm">
           {report.service_request?.code?.display && (
-            <div className="col-span-full">
+            <div>
               <div className="text-gray-500">{t("procedure")}</div>
               <div className="font-medium">
                 {report.service_request.code.display}