Index: backend/src/main/java/medora/controller/LabController.java =================================================================== --- backend/src/main/java/medora/controller/LabController.java (revision f18b11be234397c492a2b9b7384cd8e3ce7a31dd) +++ backend/src/main/java/medora/controller/LabController.java (revision 6c00695efaeff79d43ec7934ae4e04fac7bd67a0) @@ -92,6 +92,18 @@ @GetMapping - public ResponseEntity getAllLabTests() { - try { + public ResponseEntity getAllLabTests(HttpServletRequest httpRequest) { + try { + String role = securityUtil.getRoleFromRequest(httpRequest); + if (role == null) { + return ResponseEntity.status(HttpStatus.UNAUTHORIZED) + .body(Map.of("error", "Unauthorized")); + } + + // BILLING_ADMIN cannot access lab tests + if (role.equals("BILLING_ADMIN")) { + return ResponseEntity.status(HttpStatus.FORBIDDEN) + .body(Map.of("error", "You do not have permission to access lab tests")); + } + logger.info("Fetching all lab tests"); List tests = labService.getAllLabTests(); @@ -307,4 +319,55 @@ return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) .body(Map.of("error", "Failed to fetch pending lab tests: " + e.getMessage())); + } + } + + @GetMapping("/results") + public ResponseEntity getAllSubmittedLabResults(HttpServletRequest httpRequest) { + try { + String role = securityUtil.getRoleFromRequest(httpRequest); + if (role == null) { + return ResponseEntity.status(HttpStatus.UNAUTHORIZED) + .body(Map.of("error", "Unauthorized")); + } + + if (!role.equals("LAB_TECHNICIAN")) { + return ResponseEntity.status(HttpStatus.FORBIDDEN) + .body(Map.of("error", "Only lab technicians can view submitted results")); + } + + logger.info("Fetching all submitted lab results"); + List results = labService.getAllSubmittedLabResults(); + List> dtos = results.stream() + .map(recordResult -> { + LabResults labResult = recordResult.getLabResult(); + MedicalRecord medicalRecord = recordResult.getMedicalRecord(); + String patientName = "N/A"; + if (medicalRecord != null && medicalRecord.getPatient() != null) { + Patient patient = medicalRecord.getPatient(); + patientName = patient.getFirstName() + " " + patient.getLastName(); + } + Map resultMap = new java.util.HashMap<>(); + resultMap.put("resultId", labResult.getResultId()); + resultMap.put("testId", labResult.getLabTest().getTestId()); + resultMap.put("testName", labResult.getLabTest().getTestName()); + resultMap.put("patientName", patientName); + resultMap.put("doctorName", ""); + resultMap.put("testDate", labResult.getResultDate()); + resultMap.put("resultDate", labResult.getResultDate()); + resultMap.put("createdDate", labResult.getResultDate()); + resultMap.put("results", labResult.getResults()); + resultMap.put("description", labResult.getLabTest().getDescription() != null ? labResult.getLabTest().getDescription() : ""); + return resultMap; + }) + .collect(Collectors.toList()); + return ResponseEntity.ok(dtos); + } catch (RuntimeException e) { + logger.error("Error fetching submitted lab results: {}", e.getMessage()); + return ResponseEntity.badRequest() + .body(Map.of("error", e.getMessage())); + } catch (Exception e) { + logger.error("Unexpected error fetching submitted lab results: {}", e.getMessage()); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(Map.of("error", "Failed to fetch submitted lab results: " + e.getMessage())); } } Index: backend/src/main/java/medora/service/LabService.java =================================================================== --- backend/src/main/java/medora/service/LabService.java (revision f18b11be234397c492a2b9b7384cd8e3ce7a31dd) +++ backend/src/main/java/medora/service/LabService.java (revision 6c00695efaeff79d43ec7934ae4e04fac7bd67a0) @@ -13,5 +13,5 @@ /** - * + * LabService handles lab test and lab result operations. * UC013 – Record Lab Test Request * UC014 – Store Lab Results @@ -53,5 +53,5 @@ } - + // ================= LAB TEST ================= @Transactional @@ -107,5 +107,5 @@ } - // UC013 + // ================= LAB TEST REQUESTS (UC013) ================= @Transactional @@ -172,5 +172,5 @@ } - //UC014, UC015 + // ================= LAB RESULTS (UC014, UC015) ================= @Transactional @@ -245,3 +245,9 @@ .toList(); } + + @Transactional(readOnly = true) + public List getAllSubmittedLabResults() { + logger.info("Fetching all submitted lab results"); + return medicalRecordLabResultRepository.findAll(); + } } Index: frontend/src/pages/lab-tests/LabTestList.js =================================================================== --- frontend/src/pages/lab-tests/LabTestList.js (revision f18b11be234397c492a2b9b7384cd8e3ce7a31dd) +++ frontend/src/pages/lab-tests/LabTestList.js (revision 6c00695efaeff79d43ec7934ae4e04fac7bd67a0) @@ -18,4 +18,5 @@ const [labResults, setLabResults] = useState([]); const [pendingTests, setPendingTests] = useState([]); + const [submittedTests, setSubmittedTests] = useState([]); const [selectedTest, setSelectedTest] = useState(null); @@ -32,17 +33,44 @@ }); + // Filter states for pending tests + const [pendingFilters, setPendingFilters] = useState({ + testName: '', + patientName: '', + testDate: '', + }); + + // Filter states for submitted tests + const [submittedFilters, setSubmittedFilters] = useState({ + testName: '', + patientName: '', + testDate: '', + }); + useEffect(() => { if (isLabTechnician) { - loadPendingTests(); + loadLabTestsData(); } }, [isLabTechnician]); - const loadPendingTests = async () => { + const loadLabTestsData = async () => { try { setLoading(true); - const response = await labService.getPendingLabTests(); - setPendingTests(response.data || []); + setError(null); + + // Load pending tests + const pendingRes = await labService.getPendingLabTests(); + setPendingTests(pendingRes.data || []); + + // Try to load submitted tests, but don't fail if this endpoint doesn't exist + try { + const submittedRes = await labService.getAllSubmittedLabResults(); + setSubmittedTests(submittedRes.data || []); + } catch (err) { + console.warn('Could not load submitted tests:', err); + setSubmittedTests([]); + } } catch (err) { setError('Failed to load pending lab tests'); + setPendingTests([]); } finally { setLoading(false); @@ -169,5 +197,5 @@ // Refresh pending tests - await loadPendingTests(); + await loadLabTestsData(); // Reset form @@ -181,4 +209,14 @@ setError(null); alert('Lab result submitted successfully!'); + + // Refresh the lab tests data + await loadLabTestsData(); + + // Reset form + setSelectedTest(null); + setSubmitFormData({ + results: '', + resultDate: new Date().toISOString().split('T')[0], + }); } catch (err) { setError('Failed to submit lab result: ' + (err.response?.data?.error || err.message)); @@ -190,338 +228,494 @@ if (isLabTechnician) { return ( +
+

Lab Tests - Submit Results

+ + {error && setError(null)} />} + + {selectedTest ? ( + // Submit Result Form +
+

Submit Lab Result

+
+

Test: {selectedTest.testName}

+

Patient: {selectedTest.patientName}

+

Doctor: {selectedTest.doctorName}

+

Test Date: {selectedTest.testDate}

+ {selectedTest.notes &&

Notes: {selectedTest.notes}

} +
+ +
+
+ +