Index: frontend/src/pages/lab-tests/LabResultForm.js
===================================================================
--- frontend/src/pages/lab-tests/LabResultForm.js	(revision 6c00695efaeff79d43ec7934ae4e04fac7bd67a0)
+++ frontend/src/pages/lab-tests/LabResultForm.js	(revision cdcff72e9765342b84a5e4b5d98ca5cb050a5500)
@@ -1,3 +1,3 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { labService } from '../../services/labService';
Index: frontend/src/pages/lab-tests/LabTestList.js
===================================================================
--- frontend/src/pages/lab-tests/LabTestList.js	(revision 6c00695efaeff79d43ec7934ae4e04fac7bd67a0)
+++ frontend/src/pages/lab-tests/LabTestList.js	(revision cdcff72e9765342b84a5e4b5d98ca5cb050a5500)
@@ -5,5 +5,5 @@
 
 function LabTestList() {
-  const user = JSON.parse(localStorage.getItem('user') || '{}');
+  const [user, setUser] = useState({});
   const isLabTechnician = user.role === 'LAB_TECHNICIAN';
 
@@ -46,4 +46,39 @@
     testDate: '',
   });
+
+  // Load user from localStorage and listen for changes
+  useEffect(() => {
+    const loadUser = () => {
+      const userStr = localStorage.getItem('user');
+      console.log('[LabTestList] Loading user from localStorage:', userStr);
+      if (userStr) {
+        try {
+          const parsedUser = JSON.parse(userStr);
+          console.log('[LabTestList] Parsed user:', parsedUser);
+          setUser(parsedUser);
+        } catch (err) {
+          console.error('Failed to parse user:', err);
+          setUser({});
+        }
+      } else {
+        console.log('[LabTestList] No user in localStorage');
+        setUser({});
+      }
+    };
+
+    console.log('[LabTestList] useEffect running - loading user');
+    loadUser();
+
+    // Listen for storage changes (other tabs/windows)
+    window.addEventListener('storage', loadUser);
+
+    // Listen for custom event (same tab changes)
+    window.addEventListener('userStorageChange', loadUser);
+
+    return () => {
+      window.removeEventListener('storage', loadUser);
+      window.removeEventListener('userStorageChange', loadUser);
+    };
+  }, []);
 
   useEffect(() => {
@@ -134,6 +169,6 @@
       setLoading(true);
 
-      // Get doctor ID from localStorage (set during login)
-      const doctorId = localStorage.getItem('doctorId') || 1;
+      // Get doctor ID from logged-in user
+      const doctorId = user.doctorId;
 
       const request = {
@@ -145,4 +180,7 @@
         notes: requestData.notes,
       };
+
+      console.log('User object:', user);
+      console.log('Sending lab test request with doctorId:', doctorId, 'Full request:', request);
 
       await labService.requestLabTest(request);
@@ -228,494 +266,494 @@
   if (isLabTechnician) {
     return (
-        <div>
-          <h1 className="text-3xl font-bold mb-6" style={{ color: '#7c3aed' }}>Lab Tests - Submit Results</h1>
-
-          {error && <ErrorAlert message={error} onClose={() => setError(null)} />}
-
-          {selectedTest ? (
-              // Submit Result Form
-              <div className="bg-white rounded-lg shadow p-6 mb-6">
-                <h2 className="text-xl font-bold mb-4">Submit Lab Result</h2>
-                <div className="mb-4 p-4 bg-gray-50 rounded-lg">
-                  <p className="mb-2"><strong>Test:</strong> {selectedTest.testName}</p>
-                  <p className="mb-2"><strong>Patient:</strong> {selectedTest.patientName}</p>
-                  <p className="mb-2"><strong>Doctor:</strong> {selectedTest.doctorName}</p>
-                  <p className="mb-2"><strong>Test Date:</strong> {selectedTest.testDate}</p>
-                  {selectedTest.notes && <p><strong>Notes:</strong> {selectedTest.notes}</p>}
+      <div>
+        <h1 className="text-3xl font-bold mb-6" style={{ color: '#7c3aed' }}>Lab Tests - Submit Results</h1>
+
+        {error && <ErrorAlert message={error} onClose={() => setError(null)} />}
+
+        {selectedTest ? (
+          // Submit Result Form
+          <div className="bg-white rounded-lg shadow p-6 mb-6">
+            <h2 className="text-xl font-bold mb-4">Submit Lab Result</h2>
+            <div className="mb-4 p-4 bg-gray-50 rounded-lg">
+              <p className="mb-2"><strong>Test:</strong> {selectedTest.testName}</p>
+              <p className="mb-2"><strong>Patient:</strong> {selectedTest.patientName}</p>
+              <p className="mb-2"><strong>Doctor:</strong> {selectedTest.doctorName}</p>
+              <p className="mb-2"><strong>Test Date:</strong> {selectedTest.testDate}</p>
+              {selectedTest.notes && <p><strong>Notes:</strong> {selectedTest.notes}</p>}
+            </div>
+
+            <form onSubmit={handleSubmitResult} className="space-y-4">
+              <div>
+                <label className="block text-sm font-semibold mb-2">Test Results *</label>
+                <textarea
+                  value={submitFormData.results}
+                  onChange={(e) => setSubmitFormData({ ...submitFormData, results: e.target.value })}
+                  placeholder="Enter detailed test results"
+                  className="w-full px-4 py-2 border rounded-lg"
+                  rows="4"
+                  required
+                />
+              </div>
+
+              <div>
+                <label className="block text-sm font-semibold mb-2">Result Date *</label>
+                <input
+                  type="date"
+                  value={submitFormData.resultDate}
+                  onChange={(e) => setSubmitFormData({ ...submitFormData, resultDate: e.target.value })}
+                  className="w-full px-4 py-2 border rounded-lg"
+                  required
+                />
+              </div>
+
+              <div className="flex gap-4">
+                <button
+                  type="submit"
+                  disabled={loading}
+                  style={{
+                    background: loading ? '#d1d5db' : '#bfdbfe',
+                    color: '#1e1035',
+                    padding: '8px 24px',
+                    borderRadius: '6px',
+                    border: 'none',
+                    cursor: loading ? 'not-allowed' : 'pointer',
+                    fontSize: '14px',
+                    fontWeight: '400'
+                  }}
+                  onMouseEnter={(e) => !loading && (e.currentTarget.style.background = '#93c5fd')}
+                  onMouseLeave={(e) => !loading && (e.currentTarget.style.background = '#bfdbfe')}
+                >
+                  {loading ? 'Submitting...' : 'Submit Result'}
+                </button>
+                <button
+                  type="button"
+                  onClick={() => {
+                    setSelectedTest(null);
+                    setSubmitFormData({
+                      results: '',
+                      resultDate: new Date().toISOString().split('T')[0],
+                    });
+                  }}
+                  className="bg-gray-400 text-white px-6 py-2 rounded hover:bg-gray-500"
+                >
+                  Cancel
+                </button>
+              </div>
+            </form>
+          </div>
+        ) : (
+          // Pending Tests List
+          <div className="bg-white rounded-lg shadow overflow-hidden">
+            <div className="p-6 border-b">
+              <h2 className="text-xl font-bold">Pending Lab Tests ({pendingTests.length})</h2>
+            </div>
+
+            {pendingTests.length === 0 ? (
+              <div className="p-6 text-center text-gray-600">
+                No pending lab tests
+              </div>
+            ) : (
+              <>
+                {/* Filters */}
+                <div className="p-6 border-b bg-gray-50">
+                  <h3 className="text-sm font-semibold mb-4">Filters</h3>
+                  <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
+                    <div>
+                      <label className="block text-sm font-semibold mb-2">Test</label>
+                      <input
+                        type="text"
+                        placeholder="Filter by test name..."
+                        value={pendingFilters.testName}
+                        onChange={(e) => setPendingFilters({...pendingFilters, testName: e.target.value})}
+                        className="w-full px-3 py-2 border rounded-lg text-sm"
+                      />
+                    </div>
+                    <div>
+                      <label className="block text-sm font-semibold mb-2">Patient</label>
+                      <input
+                        type="text"
+                        placeholder="Filter by patient name..."
+                        value={pendingFilters.patientName}
+                        onChange={(e) => setPendingFilters({...pendingFilters, patientName: e.target.value})}
+                        className="w-full px-3 py-2 border rounded-lg text-sm"
+                      />
+                    </div>
+                    <div>
+                      <label className="block text-sm font-semibold mb-2">Test Date</label>
+                      <input
+                        type="date"
+                        value={pendingFilters.testDate}
+                        onChange={(e) => setPendingFilters({...pendingFilters, testDate: e.target.value})}
+                        className="w-full px-3 py-2 border rounded-lg text-sm"
+                      />
+                    </div>
+                  </div>
+                  <button
+                    onClick={() => setPendingFilters({testName: '', patientName: '', testDate: ''})}
+                    className="mt-4 bg-gray-300 text-gray-700 px-4 py-2 rounded text-sm hover:bg-gray-400"
+                  >
+                    Clear Filters
+                  </button>
                 </div>
 
-                <form onSubmit={handleSubmitResult} className="space-y-4">
-                  <div>
-                    <label className="block text-sm font-semibold mb-2">Test Results *</label>
-                    <textarea
-                        value={submitFormData.results}
-                        onChange={(e) => setSubmitFormData({ ...submitFormData, results: e.target.value })}
-                        placeholder="Enter detailed test results"
-                        className="w-full px-4 py-2 border rounded-lg"
-                        rows="4"
-                        required
-                    />
+                {/* Filtered Table */}
+                <table className="w-full">
+                  <thead className="bg-gray-100">
+                    <tr>
+                      <th className="px-6 py-3 text-left text-sm font-semibold">Test</th>
+                      <th className="px-6 py-3 text-left text-sm font-semibold">Patient</th>
+                      <th className="px-6 py-3 text-left text-sm font-semibold">Doctor</th>
+                      <th className="px-6 py-3 text-left text-sm font-semibold">Requested</th>
+                      <th className="px-6 py-3 text-left text-sm font-semibold">Test Date</th>
+                      <th className="px-6 py-3 text-left text-sm font-semibold">Notes</th>
+                      <th className="px-6 py-3 text-left text-sm font-semibold">Action</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    {pendingTests
+                      .filter((test) => {
+                        const testName = (test.testName || '').toLowerCase();
+                        const patientName = (test.patientName || '').toLowerCase();
+                        const testDate = (test.testDate || '');
+
+                        return (
+                          testName.includes(pendingFilters.testName.toLowerCase()) &&
+                          patientName.includes(pendingFilters.patientName.toLowerCase()) &&
+                          (pendingFilters.testDate === '' || testDate === pendingFilters.testDate)
+                        );
+                      })
+                      .map((test, index) => (
+                    <tr key={index} className="border-t hover:bg-gray-50">
+                      <td className="px-6 py-3 font-medium">{test.testName}</td>
+                      <td className="px-6 py-3">{test.patientName}</td>
+                      <td className="px-6 py-3">{test.doctorName}</td>
+                      <td className="px-6 py-3 text-green-600">{test.requestDate}</td>
+                      <td className="px-6 py-3 text-purple-600">{test.testDate}</td>
+                      <td className="px-6 py-3 text-gray-600 text-sm">{test.notes || '-'}</td>
+                      <td className="px-6 py-3">
+                        <button
+                          onClick={() => setSelectedTest(test)}
+                          style={{
+                            background: '#bfdbfe',
+                            color: '#1e1035',
+                            padding: '6px 12px',
+                            borderRadius: '4px',
+                            border: 'none',
+                            cursor: 'pointer',
+                            fontSize: '12px',
+                            fontWeight: '400'
+                          }}
+                          onMouseEnter={(e) => e.currentTarget.style.background = '#93c5fd'}
+                          onMouseLeave={(e) => e.currentTarget.style.background = '#bfdbfe'}
+                        >
+                          Submit Result
+                        </button>
+                      </td>
+                    </tr>
+                  ))}
+                  </tbody>
+                </table>
+              </>
+            )}
+          </div>
+        )}
+
+        {/* Submitted Tests History */}
+        {!selectedTest && (
+          <div className="bg-white rounded-lg shadow overflow-hidden mt-6">
+            <div className="p-6 border-b">
+              <h2 className="text-xl font-bold">Submitted Lab Results History ({submittedTests.length})</h2>
+            </div>
+
+            {submittedTests.length === 0 ? (
+              <div className="p-6 text-center text-gray-600">
+                No submitted lab results yet
+              </div>
+            ) : (
+              <>
+                {/* Filters */}
+                <div className="p-6 border-b bg-gray-50">
+                  <h3 className="text-sm font-semibold mb-4">Filters</h3>
+                  <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
+                    <div>
+                      <label className="block text-sm font-semibold mb-2">Test</label>
+                      <input
+                        type="text"
+                        placeholder="Filter by test name..."
+                        value={submittedFilters.testName}
+                        onChange={(e) => setSubmittedFilters({...submittedFilters, testName: e.target.value})}
+                        className="w-full px-3 py-2 border rounded-lg text-sm"
+                      />
+                    </div>
+                    <div>
+                      <label className="block text-sm font-semibold mb-2">Patient</label>
+                      <input
+                        type="text"
+                        placeholder="Filter by patient name..."
+                        value={submittedFilters.patientName}
+                        onChange={(e) => setSubmittedFilters({...submittedFilters, patientName: e.target.value})}
+                        className="w-full px-3 py-2 border rounded-lg text-sm"
+                      />
+                    </div>
+                    <div>
+                      <label className="block text-sm font-semibold mb-2">Test Date</label>
+                      <input
+                        type="date"
+                        value={submittedFilters.testDate}
+                        onChange={(e) => setSubmittedFilters({...submittedFilters, testDate: e.target.value})}
+                        className="w-full px-3 py-2 border rounded-lg text-sm"
+                      />
+                    </div>
                   </div>
-
-                  <div>
-                    <label className="block text-sm font-semibold mb-2">Result Date *</label>
-                    <input
-                        type="date"
-                        value={submitFormData.resultDate}
-                        onChange={(e) => setSubmitFormData({ ...submitFormData, resultDate: e.target.value })}
-                        className="w-full px-4 py-2 border rounded-lg"
-                        required
-                    />
-                  </div>
-
-                  <div className="flex gap-4">
-                    <button
-                        type="submit"
-                        disabled={loading}
-                        style={{
-                          background: loading ? '#d1d5db' : '#bfdbfe',
-                          color: '#1e1035',
-                          padding: '8px 24px',
-                          borderRadius: '6px',
-                          border: 'none',
-                          cursor: loading ? 'not-allowed' : 'pointer',
-                          fontSize: '14px',
-                          fontWeight: '400'
-                        }}
-                        onMouseEnter={(e) => !loading && (e.currentTarget.style.background = '#93c5fd')}
-                        onMouseLeave={(e) => !loading && (e.currentTarget.style.background = '#bfdbfe')}
-                    >
-                      {loading ? 'Submitting...' : 'Submit Result'}
-                    </button>
-                    <button
-                        type="button"
-                        onClick={() => {
-                          setSelectedTest(null);
-                          setSubmitFormData({
-                            results: '',
-                            resultDate: new Date().toISOString().split('T')[0],
-                          });
-                        }}
-                        className="bg-gray-400 text-white px-6 py-2 rounded hover:bg-gray-500"
-                    >
-                      Cancel
-                    </button>
-                  </div>
-                </form>
-              </div>
-          ) : (
-              // Pending Tests List
-              <div className="bg-white rounded-lg shadow overflow-hidden">
-                <div className="p-6 border-b">
-                  <h2 className="text-xl font-bold">Pending Lab Tests ({pendingTests.length})</h2>
+                  <button
+                    onClick={() => setSubmittedFilters({testName: '', patientName: '', testDate: ''})}
+                    className="mt-4 bg-gray-300 text-gray-700 px-4 py-2 rounded text-sm hover:bg-gray-400"
+                  >
+                    Clear Filters
+                  </button>
                 </div>
 
-                {pendingTests.length === 0 ? (
-                    <div className="p-6 text-center text-gray-600">
-                      No pending lab tests
-                    </div>
-                ) : (
-                    <>
-                      {/* Filters */}
-                      <div className="p-6 border-b bg-gray-50">
-                        <h3 className="text-sm font-semibold mb-4">Filters</h3>
-                        <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
-                          <div>
-                            <label className="block text-sm font-semibold mb-2">Test</label>
-                            <input
-                                type="text"
-                                placeholder="Filter by test name..."
-                                value={pendingFilters.testName}
-                                onChange={(e) => setPendingFilters({...pendingFilters, testName: e.target.value})}
-                                className="w-full px-3 py-2 border rounded-lg text-sm"
-                            />
-                          </div>
-                          <div>
-                            <label className="block text-sm font-semibold mb-2">Patient</label>
-                            <input
-                                type="text"
-                                placeholder="Filter by patient name..."
-                                value={pendingFilters.patientName}
-                                onChange={(e) => setPendingFilters({...pendingFilters, patientName: e.target.value})}
-                                className="w-full px-3 py-2 border rounded-lg text-sm"
-                            />
-                          </div>
-                          <div>
-                            <label className="block text-sm font-semibold mb-2">Test Date</label>
-                            <input
-                                type="date"
-                                value={pendingFilters.testDate}
-                                onChange={(e) => setPendingFilters({...pendingFilters, testDate: e.target.value})}
-                                className="w-full px-3 py-2 border rounded-lg text-sm"
-                            />
-                          </div>
-                        </div>
-                        <button
-                            onClick={() => setPendingFilters({testName: '', patientName: '', testDate: ''})}
-                            className="mt-4 bg-gray-300 text-gray-700 px-4 py-2 rounded text-sm hover:bg-gray-400"
-                        >
-                          Clear Filters
-                        </button>
-                      </div>
-
-                      {/* Filtered Table */}
-                      <table className="w-full">
-                        <thead className="bg-gray-100">
-                        <tr>
-                          <th className="px-6 py-3 text-left text-sm font-semibold">Test</th>
-                          <th className="px-6 py-3 text-left text-sm font-semibold">Patient</th>
-                          <th className="px-6 py-3 text-left text-sm font-semibold">Doctor</th>
-                          <th className="px-6 py-3 text-left text-sm font-semibold">Requested</th>
-                          <th className="px-6 py-3 text-left text-sm font-semibold">Test Date</th>
-                          <th className="px-6 py-3 text-left text-sm font-semibold">Notes</th>
-                          <th className="px-6 py-3 text-left text-sm font-semibold">Action</th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        {pendingTests
-                            .filter((test) => {
-                              const testName = (test.testName || '').toLowerCase();
-                              const patientName = (test.patientName || '').toLowerCase();
-                              const testDate = (test.testDate || '');
-
-                              return (
-                                  testName.includes(pendingFilters.testName.toLowerCase()) &&
-                                  patientName.includes(pendingFilters.patientName.toLowerCase()) &&
-                                  (pendingFilters.testDate === '' || testDate === pendingFilters.testDate)
-                              );
-                            })
-                            .map((test, index) => (
-                                <tr key={index} className="border-t hover:bg-gray-50">
-                                  <td className="px-6 py-3 font-medium">{test.testName}</td>
-                                  <td className="px-6 py-3">{test.patientName}</td>
-                                  <td className="px-6 py-3">{test.doctorName}</td>
-                                  <td className="px-6 py-3 text-green-600">{test.requestDate}</td>
-                                  <td className="px-6 py-3 text-purple-600">{test.testDate}</td>
-                                  <td className="px-6 py-3 text-gray-600 text-sm">{test.notes || '-'}</td>
-                                  <td className="px-6 py-3">
-                                    <button
-                                        onClick={() => setSelectedTest(test)}
-                                        style={{
-                                          background: '#bfdbfe',
-                                          color: '#1e1035',
-                                          padding: '6px 12px',
-                                          borderRadius: '4px',
-                                          border: 'none',
-                                          cursor: 'pointer',
-                                          fontSize: '12px',
-                                          fontWeight: '400'
-                                        }}
-                                        onMouseEnter={(e) => e.currentTarget.style.background = '#93c5fd'}
-                                        onMouseLeave={(e) => e.currentTarget.style.background = '#bfdbfe'}
-                                    >
-                                      Submit Result
-                                    </button>
-                                  </td>
-                                </tr>
-                            ))}
-                        </tbody>
-                      </table>
-                    </>
-                )}
-              </div>
-          )}
-
-          {/* Submitted Tests History */}
-          {!selectedTest && (
-              <div className="bg-white rounded-lg shadow overflow-hidden mt-6">
-                <div className="p-6 border-b">
-                  <h2 className="text-xl font-bold">Submitted Lab Results History ({submittedTests.length})</h2>
-                </div>
-
-                {submittedTests.length === 0 ? (
-                    <div className="p-6 text-center text-gray-600">
-                      No submitted lab results yet
-                    </div>
-                ) : (
-                    <>
-                      {/* Filters */}
-                      <div className="p-6 border-b bg-gray-50">
-                        <h3 className="text-sm font-semibold mb-4">Filters</h3>
-                        <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
-                          <div>
-                            <label className="block text-sm font-semibold mb-2">Test</label>
-                            <input
-                                type="text"
-                                placeholder="Filter by test name..."
-                                value={submittedFilters.testName}
-                                onChange={(e) => setSubmittedFilters({...submittedFilters, testName: e.target.value})}
-                                className="w-full px-3 py-2 border rounded-lg text-sm"
-                            />
-                          </div>
-                          <div>
-                            <label className="block text-sm font-semibold mb-2">Patient</label>
-                            <input
-                                type="text"
-                                placeholder="Filter by patient name..."
-                                value={submittedFilters.patientName}
-                                onChange={(e) => setSubmittedFilters({...submittedFilters, patientName: e.target.value})}
-                                className="w-full px-3 py-2 border rounded-lg text-sm"
-                            />
-                          </div>
-                          <div>
-                            <label className="block text-sm font-semibold mb-2">Test Date</label>
-                            <input
-                                type="date"
-                                value={submittedFilters.testDate}
-                                onChange={(e) => setSubmittedFilters({...submittedFilters, testDate: e.target.value})}
-                                className="w-full px-3 py-2 border rounded-lg text-sm"
-                            />
-                          </div>
-                        </div>
-                        <button
-                            onClick={() => setSubmittedFilters({testName: '', patientName: '', testDate: ''})}
-                            className="mt-4 bg-gray-300 text-gray-700 px-4 py-2 rounded text-sm hover:bg-gray-400"
-                        >
-                          Clear Filters
-                        </button>
-                      </div>
-
-                      {/* Filtered Results Table */}
-                      <table className="w-full">
-                        <thead className="bg-gray-100">
-                        <tr>
-                          <th className="px-6 py-3 text-left text-sm font-semibold">Test</th>
-                          <th className="px-6 py-3 text-left text-sm font-semibold">Patient</th>
-                          <th className="px-6 py-3 text-left text-sm font-semibold">Test Date</th>
-                          <th className="px-6 py-3 text-left text-sm font-semibold">Result Date</th>
-                          <th className="px-6 py-3 text-left text-sm font-semibold">Status</th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        {submittedTests
-                            .filter((test) => {
-                              const testName = (test.testName || '').toLowerCase();
-                              const patientName = (test.patientName || '').toLowerCase();
-                              const testDate = (test.testDate || '');
-
-                              return (
-                                  testName.includes(submittedFilters.testName.toLowerCase()) &&
-                                  patientName.includes(submittedFilters.patientName.toLowerCase()) &&
-                                  (submittedFilters.testDate === '' || testDate === submittedFilters.testDate)
-                              );
-                            })
-                            .map((test, index) => (
-                                <tr key={index} className="border-t hover:bg-gray-50">
-                                  <td className="px-6 py-3 font-medium">{test.testName || test.description || 'Lab Test'}</td>
-                                  <td className="px-6 py-3">{test.patientName || 'N/A'}</td>
-                                  <td className="px-6 py-3">{test.testDate || 'N/A'}</td>
-                                  <td className="px-6 py-3 text-green-600">{test.resultDate || test.createdDate || 'N/A'}</td>
-                                  <td className="px-6 py-3">
+                {/* Filtered Results Table */}
+                <table className="w-full">
+                  <thead className="bg-gray-100">
+                    <tr>
+                      <th className="px-6 py-3 text-left text-sm font-semibold">Test</th>
+                      <th className="px-6 py-3 text-left text-sm font-semibold">Patient</th>
+                      <th className="px-6 py-3 text-left text-sm font-semibold">Test Date</th>
+                      <th className="px-6 py-3 text-left text-sm font-semibold">Result Date</th>
+                      <th className="px-6 py-3 text-left text-sm font-semibold">Status</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    {submittedTests
+                      .filter((test) => {
+                        const testName = (test.testName || '').toLowerCase();
+                        const patientName = (test.patientName || '').toLowerCase();
+                        const testDate = (test.testDate || '');
+
+                        return (
+                          testName.includes(submittedFilters.testName.toLowerCase()) &&
+                          patientName.includes(submittedFilters.patientName.toLowerCase()) &&
+                          (submittedFilters.testDate === '' || testDate === submittedFilters.testDate)
+                        );
+                      })
+                      .map((test, index) => (
+                        <tr key={index} className="border-t hover:bg-gray-50">
+                          <td className="px-6 py-3 font-medium">{test.testName || test.description || 'Lab Test'}</td>
+                          <td className="px-6 py-3">{test.patientName || 'N/A'}</td>
+                          <td className="px-6 py-3">{test.testDate || 'N/A'}</td>
+                          <td className="px-6 py-3 text-green-600">{test.resultDate || test.createdDate || 'N/A'}</td>
+                          <td className="px-6 py-3">
                             <span className="px-3 py-1 bg-green-100 text-green-800 rounded-full text-sm font-semibold">
                               Submitted
                             </span>
-                                  </td>
-                                </tr>
-                            ))}
-                        </tbody>
-                      </table>
-                    </>
-                )}
-              </div>
+                          </td>
+                        </tr>
+                      ))}
+                  </tbody>
+                </table>
+              </>
+            )}
+          </div>
+        )}
+      </div>
+    );
+  }
+
+  return (
+    <div>
+      <h1 className="text-3xl font-bold mb-6" style={{ color: '#7c3aed' }}>Lab Tests</h1>
+
+      {error && <ErrorAlert message={error} onClose={() => setError(null)} />}
+
+      {/* Search Form */}
+      <div className="bg-white rounded-lg shadow p-6 mb-6">
+        <h2 className="text-xl font-bold mb-4">Search Patient</h2>
+        <form onSubmit={handleSearch} className="space-y-4">
+          <div className="flex gap-4">
+            <div className="flex-1">
+              <label className="block text-sm font-semibold mb-2">Patient EMBG</label>
+              <input
+                type="text"
+                value={embg}
+                onChange={(e) => setEmbg(e.target.value)}
+                placeholder="e.g., 1402994123456"
+                className="w-full px-4 py-2 border rounded-lg"
+              />
+            </div>
+            <div className="flex items-end">
+              <button
+                type="submit"
+                disabled={loading}
+                className="bg-purple-600 text-white px-8 py-2 rounded-full hover:bg-purple-700 disabled:bg-gray-400"
+              >
+                {loading ? 'Searching...' : 'Search'}
+              </button>
+            </div>
+          </div>
+        </form>
+      </div>
+
+      {/* Patient Lab Tests */}
+      {searched && patient && (
+        <div className="space-y-6">
+          {/* Patient Info */}
+          <div className="bg-white rounded-lg shadow p-6">
+            <div className="flex justify-between items-start mb-4">
+              <h2 className="text-2xl font-bold">{patient.firstName} {patient.lastName}</h2>
+              {!showRequestForm && (
+                <button
+                  onClick={() => setShowRequestForm(true)}
+                  className="bg-green-600 text-white px-4 py-2 rounded hover:bg-green-700"
+                >
+                  Request Lab Test
+                </button>
+              )}
+            </div>
+            <div className="grid grid-cols-4 gap-4">
+              <div>
+                <p className="text-sm text-gray-600">EMBG</p>
+                <p className="font-semibold">{patient.embg}</p>
+              </div>
+              <div>
+                <p className="text-sm text-gray-600">Blood Type</p>
+                <p className="font-semibold">{patient.bloodType || 'N/A'}</p>
+              </div>
+              <div>
+                <p className="text-sm text-gray-600">Date of Birth</p>
+                <p className="font-semibold">{patient.dateOfBirth}</p>
+              </div>
+            </div>
+          </div>
+
+          {/* Request Lab Test Form */}
+          {showRequestForm && (
+            <div className="bg-white rounded-lg shadow p-6">
+              <h3 className="text-xl font-bold mb-4">Request Lab Test</h3>
+              <form onSubmit={handleRequestTest} className="space-y-4">
+                <div className="grid grid-cols-2 gap-4">
+                  <div>
+                    <label className="block text-sm font-semibold mb-2">Test</label>
+                    <select
+                      value={requestData.testId}
+                      onChange={(e) => setRequestData({ ...requestData, testId: e.target.value })}
+                      className="w-full px-4 py-2 border rounded-lg"
+                      required
+                    >
+                      <option value="">Select a test</option>
+                      {availableTests.map((test) => (
+                        <option key={test.testId} value={test.testId}>
+                          {test.testName} (${test.cost})
+                        </option>
+                      ))}
+                    </select>
+                  </div>
+                  <div>
+                    <label className="block text-sm font-semibold mb-2">Test Date</label>
+                    <input
+                      type="date"
+                      value={requestData.testDate}
+                      onChange={(e) => setRequestData({ ...requestData, testDate: e.target.value })}
+                      className="w-full px-4 py-2 border rounded-lg"
+                    />
+                  </div>
+                </div>
+                <div>
+                  <label className="block text-sm font-semibold mb-2">Notes</label>
+                  <textarea
+                    value={requestData.notes}
+                    onChange={(e) => setRequestData({ ...requestData, notes: e.target.value })}
+                    placeholder="Additional notes for the lab technician"
+                    className="w-full px-4 py-2 border rounded-lg"
+                    rows="3"
+                  />
+                </div>
+                <div className="flex gap-4">
+                  <button
+                    type="submit"
+                    disabled={loading}
+                    className="bg-green-600 text-white px-6 py-2 rounded hover:bg-green-700 disabled:bg-gray-400"
+                  >
+                    {loading ? 'Requesting...' : 'Request Test'}
+                  </button>
+                  <button
+                    type="button"
+                    onClick={() => setShowRequestForm(false)}
+                    className="bg-gray-400 text-white px-6 py-2 rounded hover:bg-gray-500"
+                  >
+                    Cancel
+                  </button>
+                </div>
+              </form>
+            </div>
+          )}
+
+          {/* Test Requests */}
+          {labTestRequests && labTestRequests.length > 0 && (
+            <div className="bg-white rounded-lg shadow p-6">
+              <h3 className="text-xl font-bold mb-4">Lab Test Requests</h3>
+              <div className="space-y-3">
+                {labTestRequests.map((request) => (
+                  <div key={request.testId} className="border-l-4 border-purple-500 pl-4 py-2">
+                    <p className="font-semibold text-lg">{request.testName}</p>
+                    <p className="text-sm text-gray-600">Requested by: {request.doctorName}</p>
+                    <p className="text-sm text-gray-600">Test Date: {request.requestDate}</p>
+                    {request.notes && (
+                      <p className="text-sm text-gray-600">Notes: {request.notes}</p>
+                    )}
+                  </div>
+                ))}
+              </div>
+            </div>
+          )}
+
+          {/* Lab Test Results */}
+          {labResults && labResults.length > 0 && (
+            <div className="bg-white rounded-lg shadow p-6">
+              <h3 className="text-xl font-bold mb-4">Lab Test Results</h3>
+              <div className="space-y-4">
+                {labResults.map((result) => (
+                  <div key={result.resultId} className="border-l-4 border-green-500 pl-4 py-3 bg-green-50 rounded">
+                    <p className="font-semibold text-lg text-green-700">{result.testName}</p>
+                    <p className="text-sm text-gray-700 mt-2"><strong>Results:</strong> {result.results}</p>
+                    <p className="text-sm text-gray-600">Result Date: {result.resultDate}</p>
+                  </div>
+                ))}
+              </div>
+            </div>
+          )}
+
+          {/* Link to submit results */}
+          {labTestRequests && labTestRequests.length > 0 && (
+            <div className="bg-yellow-50 rounded-lg p-6">
+              <h3 className="text-lg font-semibold text-yellow-800 mb-3">Lab Technician: Submit Test Results</h3>
+              <p className="text-sm text-gray-700 mb-4">
+                {labTestRequests.length} test{labTestRequests.length !== 1 ? 's' : ''} awaiting results
+              </p>
+              <a
+                href="/lab-tests/results"
+                className="inline-block bg-yellow-600 text-white px-6 py-2 rounded hover:bg-yellow-700"
+              >
+                Submit Lab Results
+              </a>
+            </div>
+          )}
+
+          {/* No requests message */}
+          {(!labTestRequests || labTestRequests.length === 0) && !labResults?.length && (
+            <div className="bg-blue-50 rounded-lg p-6 text-center">
+              <p className="text-gray-600">No lab test requests for this patient</p>
+            </div>
           )}
         </div>
-    );
-  }
-
-  return (
-      <div>
-        <h1 className="text-3xl font-bold mb-6" style={{ color: '#7c3aed' }}>Lab Tests</h1>
-
-        {error && <ErrorAlert message={error} onClose={() => setError(null)} />}
-
-        {/* Search Form */}
-        <div className="bg-white rounded-lg shadow p-6 mb-6">
-          <h2 className="text-xl font-bold mb-4">Search Patient</h2>
-          <form onSubmit={handleSearch} className="space-y-4">
-            <div className="flex gap-4">
-              <div className="flex-1">
-                <label className="block text-sm font-semibold mb-2">Patient EMBG</label>
-                <input
-                    type="text"
-                    value={embg}
-                    onChange={(e) => setEmbg(e.target.value)}
-                    placeholder="e.g., 1402994123456"
-                    className="w-full px-4 py-2 border rounded-lg"
-                />
-              </div>
-              <div className="flex items-end">
-                <button
-                    type="submit"
-                    disabled={loading}
-                    className="bg-purple-600 text-white px-8 py-2 rounded-full hover:bg-purple-700 disabled:bg-gray-400"
-                >
-                  {loading ? 'Searching...' : 'Search'}
-                </button>
-              </div>
-            </div>
-          </form>
+      )}
+
+      {/* No search performed */}
+      {!searched && (
+        <div className="bg-gray-50 rounded-lg p-12 text-center">
+          <p className="text-gray-600 text-lg">Enter a patient EMBG to request lab tests</p>
         </div>
-
-        {/* Patient Lab Tests */}
-        {searched && patient && (
-            <div className="space-y-6">
-              {/* Patient Info */}
-              <div className="bg-white rounded-lg shadow p-6">
-                <div className="flex justify-between items-start mb-4">
-                  <h2 className="text-2xl font-bold">{patient.firstName} {patient.lastName}</h2>
-                  {!showRequestForm && (
-                      <button
-                          onClick={() => setShowRequestForm(true)}
-                          className="bg-green-600 text-white px-4 py-2 rounded hover:bg-green-700"
-                      >
-                        Request Lab Test
-                      </button>
-                  )}
-                </div>
-                <div className="grid grid-cols-4 gap-4">
-                  <div>
-                    <p className="text-sm text-gray-600">EMBG</p>
-                    <p className="font-semibold">{patient.embg}</p>
-                  </div>
-                  <div>
-                    <p className="text-sm text-gray-600">Blood Type</p>
-                    <p className="font-semibold">{patient.bloodType || 'N/A'}</p>
-                  </div>
-                  <div>
-                    <p className="text-sm text-gray-600">Date of Birth</p>
-                    <p className="font-semibold">{patient.dateOfBirth}</p>
-                  </div>
-                </div>
-              </div>
-
-              {/* Request Lab Test Form */}
-              {showRequestForm && (
-                  <div className="bg-white rounded-lg shadow p-6">
-                    <h3 className="text-xl font-bold mb-4">Request Lab Test</h3>
-                    <form onSubmit={handleRequestTest} className="space-y-4">
-                      <div className="grid grid-cols-2 gap-4">
-                        <div>
-                          <label className="block text-sm font-semibold mb-2">Test</label>
-                          <select
-                              value={requestData.testId}
-                              onChange={(e) => setRequestData({ ...requestData, testId: e.target.value })}
-                              className="w-full px-4 py-2 border rounded-lg"
-                              required
-                          >
-                            <option value="">Select a test</option>
-                            {availableTests.map((test) => (
-                                <option key={test.testId} value={test.testId}>
-                                  {test.testName} (${test.cost})
-                                </option>
-                            ))}
-                          </select>
-                        </div>
-                        <div>
-                          <label className="block text-sm font-semibold mb-2">Test Date</label>
-                          <input
-                              type="date"
-                              value={requestData.testDate}
-                              onChange={(e) => setRequestData({ ...requestData, testDate: e.target.value })}
-                              className="w-full px-4 py-2 border rounded-lg"
-                          />
-                        </div>
-                      </div>
-                      <div>
-                        <label className="block text-sm font-semibold mb-2">Notes</label>
-                        <textarea
-                            value={requestData.notes}
-                            onChange={(e) => setRequestData({ ...requestData, notes: e.target.value })}
-                            placeholder="Additional notes for the lab technician"
-                            className="w-full px-4 py-2 border rounded-lg"
-                            rows="3"
-                        />
-                      </div>
-                      <div className="flex gap-4">
-                        <button
-                            type="submit"
-                            disabled={loading}
-                            className="bg-green-600 text-white px-6 py-2 rounded hover:bg-green-700 disabled:bg-gray-400"
-                        >
-                          {loading ? 'Requesting...' : 'Request Test'}
-                        </button>
-                        <button
-                            type="button"
-                            onClick={() => setShowRequestForm(false)}
-                            className="bg-gray-400 text-white px-6 py-2 rounded hover:bg-gray-500"
-                        >
-                          Cancel
-                        </button>
-                      </div>
-                    </form>
-                  </div>
-              )}
-
-              {/* Test Requests */}
-              {labTestRequests && labTestRequests.length > 0 && (
-                  <div className="bg-white rounded-lg shadow p-6">
-                    <h3 className="text-xl font-bold mb-4">Lab Test Requests</h3>
-                    <div className="space-y-3">
-                      {labTestRequests.map((request) => (
-                          <div key={request.testId} className="border-l-4 border-purple-500 pl-4 py-2">
-                            <p className="font-semibold text-lg">{request.testName}</p>
-                            <p className="text-sm text-gray-600">Requested by: {request.doctorName}</p>
-                            <p className="text-sm text-gray-600">Test Date: {request.requestDate}</p>
-                            {request.notes && (
-                                <p className="text-sm text-gray-600">Notes: {request.notes}</p>
-                            )}
-                          </div>
-                      ))}
-                    </div>
-                  </div>
-              )}
-
-              {/* Lab Test Results */}
-              {labResults && labResults.length > 0 && (
-                  <div className="bg-white rounded-lg shadow p-6">
-                    <h3 className="text-xl font-bold mb-4">Lab Test Results</h3>
-                    <div className="space-y-4">
-                      {labResults.map((result) => (
-                          <div key={result.resultId} className="border-l-4 border-green-500 pl-4 py-3 bg-green-50 rounded">
-                            <p className="font-semibold text-lg text-green-700">{result.testName}</p>
-                            <p className="text-sm text-gray-700 mt-2"><strong>Results:</strong> {result.results}</p>
-                            <p className="text-sm text-gray-600">Result Date: {result.resultDate}</p>
-                          </div>
-                      ))}
-                    </div>
-                  </div>
-              )}
-
-              {/* Link to submit results */}
-              {labTestRequests && labTestRequests.length > 0 && (
-                  <div className="bg-yellow-50 rounded-lg p-6">
-                    <h3 className="text-lg font-semibold text-yellow-800 mb-3">Lab Technician: Submit Test Results</h3>
-                    <p className="text-sm text-gray-700 mb-4">
-                      {labTestRequests.length} test{labTestRequests.length !== 1 ? 's' : ''} awaiting results
-                    </p>
-                    <a
-                        href="/lab-tests/results"
-                        className="inline-block bg-yellow-600 text-white px-6 py-2 rounded hover:bg-yellow-700"
-                    >
-                      Submit Lab Results
-                    </a>
-                  </div>
-              )}
-
-              {/* No requests message */}
-              {!labTestRequests || labTestRequests.length === 0 && !labResults?.length && (
-                  <div className="bg-blue-50 rounded-lg p-6 text-center">
-                    <p className="text-gray-600">No lab test requests for this patient</p>
-                  </div>
-              )}
-            </div>
-        )}
-
-        {/* No search performed */}
-        {!searched && (
-            <div className="bg-gray-50 rounded-lg p-12 text-center">
-              <p className="text-gray-600 text-lg">Enter a patient EMBG to request lab tests</p>
-            </div>
-        )}
-      </div>
+      )}
+    </div>
   );
 }