diff --git a/components/panel/addDoctor/Step.js b/components/panel/addDoctor/Step.js
index 1308176..74901b0 100644
--- a/components/panel/addDoctor/Step.js
+++ b/components/panel/addDoctor/Step.js
@@ -17,18 +17,18 @@ function Step({ value }) {
             <div
               className={`flex items-center bg-[#F6F6F6] justify-center p-[18px] 
                 w-[32px] h-[32px] sm:w-[46px] sm:h-[46px] md:w-[60px] md:h-[60px] lg:w-[75px] lg:h-[75px] rounded-full
-                relative overflow-hidden before:delay-500 before:transition-all before:duration-500 
+                relative overflow-hidden before:delay-500  before:transition-all before:duration-500 
                 before:absolute before:w-full before:h-full before:bg-[#5559CE] dark:bg-[#D7D8ED]
           ${
             value >= idx
-              ? "before:right-0 !bg-transparent"
+              ? "before:right-0 !bg-transparent delay-700"
               : "before:-right-full"
           }`}
             >
               <div className="z-10 delay-500">{item.icon}</div>
             </div>
             <p
-              className={`text-[10px] sm:text-[12px] md:text-[14px] lg:text-[16px] text-nowrap
+              className={`text-[10px] sm:text-[12px] md:text-[14px] lg:text-[16px] text-nowrap delay-500
            ${
              value >= idx
                ? "font-bold text-[#5559CE]"
diff --git a/components/panel/addDoctor/index.js b/components/panel/addDoctor/index.js
index 5235d97..cdfd35e 100644
--- a/components/panel/addDoctor/index.js
+++ b/components/panel/addDoctor/index.js
@@ -9,12 +9,16 @@ import GeneralInformation from "./listMenu/generalInformation";
 import Step from "./Step";
 
 function AddDoctorPage() {
-  const [value, setValue] = useState(0);
+  const [value, setValue] = useState(1);
   const [data, setData] = useState({
     general: {
-      name: { value: "احسان احمدی", isEdit: true },
-      medical_system_number: { value: 1741025645, isEdit: true },
-      expertise: { value: "دندان پزشکی", isEdit: true },
+      name: { value: "", placeholder: "احسان احمدی", isEdit: true },
+      medical_system_number: {
+        value: "",
+        placeholder: 1741025645,
+        isEdit: true,
+      },
+      expertise: { value: "", placeholder: "دندان پزشکی", isEdit: true },
       description: { value: "", isEdit: true },
       skills: { value: "", isEdit: true },
       time_work: { value: "", isEdit: true },
@@ -22,7 +26,7 @@ function AddDoctorPage() {
     },
     office: {
       address: { value: "", isEdit: true },
-      phone: { value: 1741025645, isEdit: true },
+      phone: { value: "", placeholder: 1741025645, isEdit: true },
       office_number1: { value: "", isEdit: true },
       office_number2: { value: "", isEdit: true },
       state: { value: "", isEdit: true },
diff --git a/components/panel/addDoctor/listMenu/generalInformation/form/index.js b/components/panel/addDoctor/listMenu/generalInformation/form/index.js
index e76b704..985d726 100644
--- a/components/panel/addDoctor/listMenu/generalInformation/form/index.js
+++ b/components/panel/addDoctor/listMenu/generalInformation/form/index.js
@@ -1,6 +1,6 @@
 import { Button } from "@mui/material";
 import FieldDate from "./FieldDate";
-import { degree } from "./listSelector";
+import { degree, expertise } from "./listSelector";
 import RadioGender from "./RadioGender";
 
 // Components
@@ -35,6 +35,7 @@ function Form({ setValue, parent, data, setData }) {
             iconGray={true}
             changeData={changeData}
             data={data?.name}
+            placeholder={data?.name.placeholder}
             name="name"
           />
         </ContentText>
@@ -44,16 +45,16 @@ function Form({ setValue, parent, data, setData }) {
             iconGray={true}
             changeData={changeData}
             data={data?.medical_system_number}
+            placeholder={data?.medical_system_number.placeholder}
             name="medical_system_number"
           />
         </ContentText>
         <ContentText text="تخصص">
-          <EditField
-            isTransparent={true}
-            iconGray={true}
-            changeData={changeData}
-            data={data?.expertise}
+          <AutoCompleteSelect
+            updateData={changeData}
+            label="انتخاب کنید..."
             name="expertise"
+            list={expertise}
           />
         </ContentText>
         <ContentText text="مدرک">
diff --git a/components/panel/addDoctor/listMenu/generalInformation/form/listSelector.js b/components/panel/addDoctor/listMenu/generalInformation/form/listSelector.js
index d39d259..6cd4d1e 100644
--- a/components/panel/addDoctor/listMenu/generalInformation/form/listSelector.js
+++ b/components/panel/addDoctor/listMenu/generalInformation/form/listSelector.js
@@ -4,3 +4,10 @@ export const degree = [
   { label: "مدرک 3", id: 30 },
   { label: "مدرک 4", id: 40 },
 ];
+
+export const expertise = [
+  { label: "فوق تخصص", id: 10 },
+  { label: "دکترای تخصصی", id: 20 },
+  { label: "متخصص", id: 30 },
+  { label: "دکتری", id: 40 },
+];
diff --git a/components/panel/addDoctor/listMenu/officeInformation/index.js b/components/panel/addDoctor/listMenu/officeInformation/index.js
index 090d2c3..470f06c 100644
--- a/components/panel/addDoctor/listMenu/officeInformation/index.js
+++ b/components/panel/addDoctor/listMenu/officeInformation/index.js
@@ -10,13 +10,17 @@ function OfficeInformation({ setValue, parent, data, setData }) {
       <div className="mt-[40px] w-full flex justify-end">
         <Button
           className={`!w-full md:!w-fit !shadow-none !rounded-[4px] !gap-[4px] !text-[#EFEFEF] !text-[14px] md:!text-[16px] !font-medium
-            ${!checkAllValues(data) && "opacity-60"}`}
-          disabled={!checkAllValues(data)}
+            ${!checkAllValues(data.office) && "opacity-60"}`}
+          disabled={!checkAllValues(data.office)}
           onClick={() => setValue((prev) => prev + 1)}
           variant="contained"
         >
           ثبت اطلاعات
-          <div className={!checkAllValues(data) ? "opacity-40" : "opacity-100"}>
+          <div
+            className={
+              !checkAllValues(data.office) ? "opacity-40" : "opacity-100"
+            }
+          >
             <ArrowLeftPA />
           </div>
         </Button>