Index: frontend/src/pages/doctors/DoctorDetail.js
===================================================================
--- frontend/src/pages/doctors/DoctorDetail.js	(revision 20468d38749c5a3ed89d6df4db22905a1d0c3df1)
+++ frontend/src/pages/doctors/DoctorDetail.js	(revision cdcff72e9765342b84a5e4b5d98ca5cb050a5500)
@@ -24,19 +24,19 @@
 
   useEffect(() => {
+    const fetchDoctor = async () => {
+      try {
+        setLoading(true);
+        const response = await doctorService.getDoctorById(id);
+        setDoctor(response.data);
+      } catch (err) {
+        setError('Failed to fetch doctor details');
+        console.error(err);
+      } finally {
+        setLoading(false);
+      }
+    };
+
     fetchDoctor();
   }, [id]);
-
-  const fetchDoctor = async () => {
-    try {
-      setLoading(true);
-      const response = await doctorService.getDoctorById(id);
-      setDoctor(response.data);
-    } catch (err) {
-      setError('Failed to fetch doctor details');
-      console.error(err);
-    } finally {
-      setLoading(false);
-    }
-  };
 
   if (loading) return <Loading />;
Index: frontend/src/pages/doctors/DoctorForm.js
===================================================================
--- frontend/src/pages/doctors/DoctorForm.js	(revision 20468d38749c5a3ed89d6df4db22905a1d0c3df1)
+++ frontend/src/pages/doctors/DoctorForm.js	(revision cdcff72e9765342b84a5e4b5d98ca5cb050a5500)
@@ -22,26 +22,26 @@
   useEffect(() => {
     if (id) {
+      const fetchDoctor = async () => {
+        try {
+          setLoading(true);
+          const response = await doctorService.getDoctorById(id);
+          setFormData({
+            firstName: response.data.firstName,
+            lastName: response.data.lastName,
+            emailAddress: response.data.emailAddress,
+            levelId: response.data.level?.levelId || '',
+            specializationId: response.data.specialization?.specializationId || '',
+            departmentId: response.data.department?.departmentId || '',
+          });
+        } catch (err) {
+          setError('Failed to fetch doctor');
+        } finally {
+          setLoading(false);
+        }
+      };
+
       fetchDoctor();
     }
   }, [id]);
-
-  const fetchDoctor = async () => {
-    try {
-      setLoading(true);
-      const response = await doctorService.getDoctorById(id);
-      setFormData({
-        firstName: response.data.firstName,
-        lastName: response.data.lastName,
-        emailAddress: response.data.emailAddress,
-        levelId: response.data.level?.levelId || '',
-        specializationId: response.data.specialization?.specializationId || '',
-        departmentId: response.data.department?.departmentId || '',
-      });
-    } catch (err) {
-      setError('Failed to fetch doctor');
-    } finally {
-      setLoading(false);
-    }
-  };
 
   const handleChange = (e) => {