diff --git a/components/appointment/detail/SubmitData.js b/components/appointment/detail/SubmitData.js
index ceff7f2..494c8eb 100644
--- a/components/appointment/detail/SubmitData.js
+++ b/components/appointment/detail/SubmitData.js
@@ -139,12 +139,13 @@ function SubmitData({ setStep, data, prevData, setErrors, doctor, isForAnother,
           slot_end: selectedSlot.end,
           for_self: !isForAnother,
           note: data?.patient_reason?.value || "",
+          // کد ملی و جنسیت در هر دو حالت (خودِ بیمار / شخص دیگر) الزامی است.
+          patient_national_code: data?.national_code?.value || "",
+          patient_gender: data?.gender?.value?.id || data?.gender?.value || "",
           ...(isForAnother
             ? {
                 patient_name: [data?.name?.value, data?.family?.value].filter(Boolean).join(" ").trim(),
                 patient_mobile: data?.phone?.value,
-                patient_national_code: data?.national_code?.value || "",
-                patient_gender: data?.gender?.value?.id || data?.gender?.value || "",
                 patient_reason: data?.patient_reason?.value || "",
               }
             : {}),