diff --git a/src/components/doctors/DoctorForm.jsx b/src/components/doctors/DoctorForm.jsx
index 7044d17..7e3681c 100644
--- a/src/components/doctors/DoctorForm.jsx
+++ b/src/components/doctors/DoctorForm.jsx
@@ -98,10 +98,10 @@ function DoctorForm({ onSave, onCancel, formData, setFormData }) {
         if (!data.erro) {
           setFormData((prev) => ({
             ...prev,
-            rua: data.logradouro || '',
-            bairro: data.bairro || '',
-            cidade: data.localidade || '',
-            estado: data.uf || ''
+            street: data.logradouro || '',
+            neighborhood: data.bairro || '',
+            city: data.localidade || '',
+            state: data.uf || ''
           }));
         } else {
           setModalMsg('CEP não encontrado!');
@@ -115,15 +115,16 @@ function DoctorForm({ onSave, onCancel, formData, setFormData }) {
   };
 
   const handleSubmit = () => {
-    if (!formData.nome || !formData.cpf || !formData.genero || !formData.dataNascimento ) {
-      setModalMsg('Por favor, preencha: Nome, CPF, Gênero, Data de Nascimento.');
+    if (!formData.full_name || !formData.cpf || !formData.birth_date ) {
+      setModalMsg('Por favor, preencha: Nome, CPF, Data de Nascimento.');
       setShowModal(true);
+     
       
     }
 
     onSave(
       {
-      ...formData, crm_uf:'SE',crm:'1234'
+      ...formData
       }
       
     );
@@ -210,69 +211,56 @@ function DoctorForm({ onSave, onCancel, formData, setFormData }) {
               <label style={{ fontSize: '1.1rem' }}>Nome: *</label>
               <input type="text" className="form-control" name="full_name" value={formData.full_name} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
             </div>
-            <div className="col-md-6 mb-3">
-              <label style={{ fontSize: '1.1rem' }}>Nome social:</label>
-              <input type="text" className="form-control" name="nomeSocial" value={formData.nomeSocial} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
-            </div>
             <div className="col-md-6 mb-3">
               <label style={{ fontSize: '1.1rem' }}>Data de nascimento: *</label>
               <input type="date" className="form-control" name="birth_date" value={formData.birth_date} onChange={handleChange} style={{ fontSize: '1.1rem' }}  min="1900-01-01" max="2025-09-24" />
             </div>
-            <div className="col-md-6 mb-3">
-              <label style={{ fontSize: '1.1rem' }}>Gênero: *</label>
-              <select className="form-control" name="sex" value={formData.sex} onChange={handleChange} style={{ fontSize: '1.1rem' }}>
-                <option value="">Selecione</option>
-                <option value="Masculino">Masculino</option>
-                <option value="Feminino">Feminino</option>
-                <option value="Outro">Outro</option>
-              </select>
-            </div>
-            <div className="col-md-6 mb-3">
-              <label style={{ fontSize: '1.1rem' }}>Identificador de outro sistema:</label>
-              <input type="text" className="form-control" name="outroId" value={formData.outroId} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
-            </div>
-            <div className="col-md-6 mb-3">
+              <div className="col-md-6 mb-3">
               <label style={{ fontSize: '1.1rem' }}>CPF: *</label>
               <input type="text" className="form-control" name="cpf" value={formData.cpf} onChange={ handleChange} style={{ fontSize: '1.1rem' }} />
-            </div>
-            <div className="col-md-6 mb-3">
-              <label style={{ fontSize: '1.1rem' }}>RG:</label>
-              <input type="text" className="form-control" name="rg" value={formData.rg} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
-            </div>
-            <div className="col-md-6 mb-3">
-              <label style={{ fontSize: '1.1rem' }}>Outros documentos:</label>
-              <select className="form-control" name="documentoTipo" value={formData.documentoTipo} onChange={handleChange} style={{ fontSize: '1.1rem' }}>
-                <option value="">Selecione</option>
-                <option value="CNH">CNH</option>
-                <option value="Passaporte">Passaporte</option>
+            </div>        
+
+             <div className="col-md-6 mb-3">
+              <label style={{ fontSize: '1.1rem' }}>Estado do CRM:</label>
+              <select className="form-control" name="crm_uf" value={formData.crm_uf} onChange={handleChange} style={{ fontSize: '1.1rem' }}>
+                <option value="" disabled selected>Selecione</option>
+                <option value="AP">AP</option>
+                <option value="AL">AL</option>
+                <option value="AM">AM</option>
+                <option value="BA">BA</option>
+                <option value="CE">CE</option>
+                <option value="DF">DF</option>
+                <option value="ES">ES</option>
+                <option value="GO">GO</option>
+                <option value="MA">MA</option>
+                <option value="MT">MT</option>
+                <option value="MS">MS</option>
+                <option value="MG">MG</option>
+                <option value="PA">PA</option>
+                <option value="PB">PB</option>
+                <option value="PR">PR</option>
+                <option value="PE">PE</option>
+                <option value="PI">PI</option>
+                <option value="RJ">RJ</option>
+                <option value="RN">RN</option>
+                <option value="RS">RS</option>
+                <option value="RO">RO</option>
+                <option value="RR">RR</option>
+                <option value="SC">SC</option>
+                <option value="SP">SP</option>
+                <option value="SE">SE</option>
+                <option value="TO">TO</option>
               </select>
             </div>
+
             <div className="col-md-6 mb-3">
-              <label style={{ fontSize: '1.1rem' }}>Número do documento:</label>
-              <input type="text" className="form-control" name="numeroDocumento" value={formData.numeroDocumento} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
-            </div>
-            <div className="col-md-6 mb-3">
-              <label style={{ fontSize: '1.1rem' }}>Etnia e Raça:</label>
-              <select className="form-control" name="etniaRaca" value={formData.etniaRaca} onChange={handleChange} style={{ fontSize: '1.1rem' }}>
-                <option value="">Selecione</option>
-                <option value="Branca">Branca</option>
-                <option value="Preta">Preta</option>
-                <option value="Parda">Parda</option>
-                <option value="Amarela">Amarela</option>
-                <option value="Indígena">Indígena</option>
-              </select>
-            </div>
-            <div className="col-md-6 mb-3">
-              <label style={{ fontSize: '1.1rem' }}>Naturalidade:</label>
-              <input type="text" className="form-control" name="naturalidade" value={formData.naturalidade} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
-            </div>
-            <div className="col-md-6 mb-3">
-              <label style={{ fontSize: '1.1rem' }}>Nacionalidade:</label>
-              <input type="text" className="form-control" name="nacionalidade" value={formData.nacionalidade} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
+              <label style={{ fontSize: '1.1rem' }}>CRM:</label>
+              <input type="text" className="form-control" name="crm" value={formData.crm} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
             </div>
+              
             <div className="col-md-6 mb-3">
               <label style={{ fontSize: '1.1rem' }}>Especialização:</label>
-              <select className="form-control" name="speciality" value={formData.speciality} onChange={handleChange} style={{ fontSize: '1.1rem' }}>
+              <select className="form-control" name="specialty" value={formData.specialty} onChange={handleChange} style={{ fontSize: '1.1rem' }}>
                 <option value="">Selecione</option>
                 <option value="Cardiologia">Clínica médica (clínico geral)</option>
                 <option value="Dermatologia">Pediatria</option>
@@ -289,34 +277,6 @@ function DoctorForm({ onSave, onCancel, formData, setFormData }) {
                 <option value="Oncologia">Urologia</option>    
               </select>
             </div>
-            <div className="col-md-6 mb-3">
-              <label style={{ fontSize: '1.1rem' }}>Estado civil:</label>
-              <select className="form-control" name="estadoCivil" value={formData.estadoCivil} onChange={handleChange} style={{ fontSize: '1.1rem' }}>
-                <option value="">Selecione</option>
-                <option value="Solteiro">Solteiro(a)</option>
-                <option value="Casado">Casado(a)</option>
-                <option value="Divorciado">Divorciado(a)</option>
-                <option value="Viuvo">Viúvo(a)</option>
-              </select>
-            </div>
-            <div className="col-md-6 mb-3">
-              <label style={{ fontSize: '1.1rem' }}>Nome do esposo(a):</label>
-              <input type="text" className="form-control" name="nomeConjuge" value={formData.nomeConjuge} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
-            </div>
-
-            {/* CAMPOS MOVIDOS */}
-            <div className="col-md-12 mb-3 mt-3">
-              <label style={{ fontSize: '1.1rem' }}>Observações:</label>
-              <textarea className="form-control" name="observacoes" value={formData.observacoes} onChange={handleChange} style={{ fontSize: '1.1rem' }}></textarea>
-            </div>
-            <div className="col-md-12 mb-3">
-              <label style={{ fontSize: '1.1rem' }}>Anexos do Médico:</label>
-              <div>
-                <label htmlFor="anexos-input" className="btn btn-secondary" style={{ fontSize: '1.1rem', background: '#9ca3af' }}>Escolher arquivo</label>
-                <input type="file" className="form-control d-none" name="anexos" id="anexos-input" onChange={handleChange} />
-                <span className="ms-2" style={{ fontSize: '1.1rem' }}>{formData.anexos ? formData.anexos.name : 'Nenhum arquivo escolhido'}</span>
-              </div>
-            </div>
 
           </div>
         </div>
@@ -338,27 +298,27 @@ function DoctorForm({ onSave, onCancel, formData, setFormData }) {
             </div>
             <div className="col-md-8 mb-3">
               <label style={{ fontSize: '1.1rem' }}>Rua:</label>
-              <input type="text" className="form-control" name="rua" value={formData.rua} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
+              <input type="text" className="form-control" name="street" value={formData.street} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
             </div>
             <div className="col-md-6 mb-3">
               <label style={{ fontSize: '1.1rem' }}>Bairro:</label>
-              <input type="text" className="form-control" name="bairro" value={formData.bairro} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
+              <input type="text" className="form-control" name="neighborhood" value={formData.neighborhood} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
             </div>
             <div className="col-md-4 mb-3">
               <label style={{ fontSize: '1.1rem' }}>Cidade:</label>
-              <input type="text" className="form-control" name="cidade" value={formData.cidade} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
+              <input type="text" className="form-control" name="city" value={formData.city} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
             </div>
             <div className="col-md-2 mb-3">
               <label style={{ fontSize: '1.1rem' }}>Estado:</label>
-              <input type="text" className="form-control" name="estado" value={formData.estado} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
+              <input type="text" className="form-control" name="state" value={formData.state} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
             </div>
             <div className="col-md-4 mb-3">
               <label style={{ fontSize: '1.1rem' }}>Número:</label>
-              <input type="text" className="form-control" name="numero" value={formData.numero} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
+              <input type="text" className="form-control" name="number" value={formData.number} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
             </div>
             <div className="col-md-8 mb-3">
               <label style={{ fontSize: '1.1rem' }}>Complemento:</label>
-              <input type="text" className="form-control" name="complemento" value={formData.complemento} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
+              <input type="text" className="form-control" name="complement" value={formData.complement} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
             </div>
           </div>
         </div>
@@ -380,16 +340,13 @@ function DoctorForm({ onSave, onCancel, formData, setFormData }) {
             </div>
             <div className="col-md-6 mb-3">
               <label style={{ fontSize: '1.1rem' }}>Telefone: </label>
-              <input type="text" className="form-control" name="telefone1" value={formData.telefone1} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
+              <input type="text" className="form-control" name="phone_mobile" value={formData.phone_mobile} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
             </div>
             <div className="col-md-6 mb-3">
               <label style={{ fontSize: '1.1rem' }}>Telefone 2:</label>
-              <input type="text" className="form-control" name="telefone2" value={formData.telefone2} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
-            </div>
-            <div className="col-md-6 mb-3">
-              <label style={{ fontSize: '1.1rem' }}>Celular:</label>
-              <input type="text" className="form-control" name="telefone3" value={formData.telefone3} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
+              <input type="text" className="form-control" name="phone2" value={formData.phone2} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
             </div>
+            
           </div>
         </div>
       </div>
diff --git a/src/components/patients/PatientForm.jsx b/src/components/patients/PatientForm.jsx
index 1c807c6..21f2887 100644
--- a/src/components/patients/PatientForm.jsx
+++ b/src/components/patients/PatientForm.jsx
@@ -1,5 +1,8 @@
 import React, { useState, useEffect } from 'react';
 import {Link} from 'react-router-dom'
+// formatar número 
+// formatar CPF
+import { FormatTelefones,FormatPeso } from '../utils/Formatar/Format';
 
 function PatientForm({ onSave, onCancel, formData, setFormData }) {
   const [errorModalMsg, setErrorModalMsg] = useState("");
@@ -9,15 +12,6 @@ function PatientForm({ onSave, onCancel, formData, setFormData }) {
   const [pacienteExistente, setPacienteExistente] = useState(null);
   const [showSuccessModal, setShowSuccessModal] = useState(false);
 
-  const FormatTelefones = (valor) => {
-    const digits = String(valor).replace(/\D/g, '').slice(0, 11);
-    return digits
-      .replace(/(\d)/, '($1')
-      .replace(/(\d{2})(\d)/, '$1) $2' )
-      .replace(/(\d)(\d{4})/, '$1 $2')
-      .replace(/(\d{4})(\d{4})/, '$1-$2')
-  }
-
   const ReceberRespostaAPIdoCPF = async (cpf) =>{
     var myHeaders = new Headers();
     myHeaders.append("Authorization", "Bearer <token>");
@@ -122,25 +116,16 @@ function PatientForm({ onSave, onCancel, formData, setFormData }) {
   };
 
   // Lógica para calcular o IMC
- /* useEffect(() => {
+  useEffect(() => {
     const peso = parseFloat(formData.peso);
-    const altura = parseFloat(formData.altura);
+    const altura = parseFloat(formData.height_m);
     if (peso > 0 && altura > 0) {
       const imcCalculado = peso / (altura * altura);
-      setFormData(prev => ({ ...prev, imc: imcCalculado.toFixed(2) }));
+      setFormData(prev => ({ ...prev, bmi: imcCalculado.toFixed(2) }));
     } else {
-      setFormData(prev => ({ ...prev, imc: '' }));
+      setFormData(prev => ({ ...prev, bmi: '' }));
     }
   }, [formData.peso, formData.altura]);
-*/
-
-  const [enderecoData, setEnderecoData] = useState({})
-  useEffect(() => {setEnderecoData(formData.endereco || {}); console.log(enderecoData)}, [formData.endereco])
-
-  const [contato, setContato] = useState({})
-
-  useEffect(() => {setContato(formData.contato || {})}, [formData.contato])
-
 
   const handleChange = (e) => {
     const { name, value, type, checked, files } = e.target;
@@ -166,11 +151,10 @@ function PatientForm({ onSave, onCancel, formData, setFormData }) {
 
     if (name.includes('cpf')) {
       setFormData({...formData, cpf:FormatCPF(value) });
-    } else if (name.includes('telefone')) {
-      let telefoneFormatado = FormatTelefones(value);
-      setContato(prev => ({ ...prev, [name]: telefoneFormatado }));
-    }else if(name.includes('endereco')) {
-      setEnderecoData(prev => ({ ...prev, [name.split('.')[1]]: value }));
+    } else if (name.includes('phone')) {
+      setFormData({ ...formData, [name]: FormatTelefones(value) });      
+    }else if(name.includes('weight') || name.includes('bmi') || name.includes('height')){
+      setFormData({...formData,[name]: FormatPeso(value) })
     }else{
       setFormData({ ...formData, [name]: value });
     }
@@ -185,10 +169,10 @@ function PatientForm({ onSave, onCancel, formData, setFormData }) {
         if (!data.erro) {
           setFormData((prev) => ({
             ...prev,
-            rua: data.logradouro || '',
-            bairro: data.bairro || '',
-            cidade: data.localidade || '',
-            estado: data.uf || ''
+            street: data.logradouro || '',
+            neighborhood: data.bairro || '',
+            city: data.localidade || '',
+            state: data.uf || ''
           }));
         } else {
           alert('CEP não encontrado!');
@@ -212,7 +196,7 @@ function PatientForm({ onSave, onCancel, formData, setFormData }) {
     }
 
     onSave({
-      ...formData,
+      ...formData,bmi:12.0
     });
     setShowSuccessModal(true);
   };
@@ -278,7 +262,7 @@ function PatientForm({ onSave, onCancel, formData, setFormData }) {
             </div>
             <div className="col-md-6 mb-3">
               <label style={{ fontSize: '1.1rem' }}>Nome social:</label>
-              <input type="text" className="form-control" name="nome_social" value={formData.nome_social} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
+              <input type="text" className="form-control" name="social_name" value={formData.social_name} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
             </div>
             <div className="col-md-6 mb-3">
               <label style={{ fontSize: '1.1rem' }}>Data de nascimento: *</label>
@@ -303,7 +287,7 @@ function PatientForm({ onSave, onCancel, formData, setFormData }) {
             </div>
             <div className="col-md-6 mb-3">
               <label style={{ fontSize: '1.1rem' }}>Outros documentos:</label>
-              <select className="form-control" name="documentoTipo" value={formData.documentoTipo} onChange={handleChange} style={{ fontSize: '1.1rem' }}>
+              <select className="form-control" name="document_type" value={formData.document_type} onChange={handleChange} style={{ fontSize: '1.1rem' }}>
                 <option value="">Selecione</option>
                 <option value="CNH">CNH</option>
                 <option value="Passaporte">Passaporte</option>
@@ -312,11 +296,11 @@ function PatientForm({ onSave, onCancel, formData, setFormData }) {
             </div>
             <div className="col-md-6 mb-3">
               <label style={{ fontSize: '1.1rem' }}>Número do documento:</label>
-              <input type="text" className="form-control" name="numero_documento" value={formData.numero_documento} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
+              <input type="text" className="form-control" name="document_number" value={formData.document_number} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
             </div>
             <div className="col-md-6 mb-3">
               <label style={{ fontSize: '1.1rem' }}>Etnia e Raça:</label>
-              <select className="form-control" name="etniaRaca" value={formData.etniaRaca} onChange={handleChange} style={{ fontSize: '1.1rem' }}>
+              <select className="form-control" name="race" value={formData.race} onChange={handleChange} style={{ fontSize: '1.1rem' }}>
                 <option value="">Selecione</option>
                 <option value="Branca">Branca</option>
                 <option value="Preta">Preta</option>
@@ -327,20 +311,20 @@ function PatientForm({ onSave, onCancel, formData, setFormData }) {
             </div>
             <div className="col-md-6 mb-3">
               <label style={{ fontSize: '1.1rem' }}>Naturalidade:</label>
-              <input type="text" className="form-control" name="naturalidade" value={formData.naturalidade} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
+              <input type="text" className="form-control" name="naturality" value={formData.naturalidade} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
             </div>
             <div className="col-md-6 mb-3">
               <label style={{ fontSize: '1.1rem' }}>Nacionalidade:</label>
-              <input type="text" className="form-control" name="nacionalidade" value={formData.nacionalidade} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
+              <input type="text" className="form-control" name="nationality" value={formData.nationality} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
             </div>
             <div className="col-md-6 mb-3">
               <label style={{ fontSize: '1.1rem' }}>Profissão:</label>
-              <input type="text" className="form-control" name="profissao" value={formData.profissao} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
+              <input type="text" className="form-control" name="profession" value={formData.profession} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
             </div>
             <div className="col-md-6 mb-3">
               <label style={{ fontSize: '1.1rem' }}>Estado civil:</label>
-              <select className="form-control" name="estado_civil" value={formData.estado_civil} onChange={handleChange} style={{ fontSize: '1.1rem' }}>
-                <option value="">Selecione</option>
+              <select className="form-control" name="marital_status" value={formData.marital_status} onChange={handleChange} style={{ fontSize: '1.1rem' }}>
+                <option value="" selected disabled invisible>Selecione</option>
                 <option value="Solteiro">Solteiro(a)</option>
                 <option value="Casado">Casado(a)</option>
                 <option value="Divorciado">Divorciado(a)</option>
@@ -349,40 +333,36 @@ function PatientForm({ onSave, onCancel, formData, setFormData }) {
             </div>
             <div className="col-md-6 mb-3">
               <label style={{ fontSize: '1.1rem' }}>Nome da Mãe:</label>
-              <input type="text" className="form-control" name="nomeMae" value={formData.nome_mae} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
+              <input type="text" className="form-control" name="mother_name" value={formData.mother_name} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
             </div>
             <div className="col-md-6 mb-3">
               <label style={{ fontSize: '1.1rem' }}>Profissão da mãe:</label>
-              <input type="text" className="form-control" name="profissaoMae" value={formData.profissao_mae} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
+              <input type="text" className="form-control" name="mother_profession" value={formData.mother_profession} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
             </div>
             <div className="col-md-6 mb-3">
               <label style={{ fontSize: '1.1rem' }}>Nome do Pai:</label>
-              <input type="text" className="form-control" name="nomePai" value={formData.nome_pai} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
+              <input type="text" className="form-control" name="father_name" value={formData.father_name} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
             </div>
             <div className="col-md-6 mb-3">
               <label style={{ fontSize: '1.1rem' }}>Profissão do pai:</label>
-              <input type="text" className="form-control" name="profissaoPai" value={formData.profissao_pai} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
+              <input type="text" className="form-control" name="father_profession" value={formData.father_profession} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
             </div>
             <div className="col-md-6 mb-3">
               <label style={{ fontSize: '1.1rem' }}>Nome do responsável:</label>
-              <input type="text" className="form-control" name="nomeResponsavel" value={formData.nome_responsavel} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
+              <input type="text" className="form-control" name="guardian_name" value={formData.guardian_name} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
             </div>
             <div className="col-md-6 mb-3">
               <label style={{ fontSize: '1.1rem' }}>CPF do responsável:</label>
-              <input type="text" className="form-control" name="cpfResponsavel" value={formData.cpf_responsavel} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
-            </div>
-            <div className="col-md-6 mb-3">
-              <label style={{ fontSize: '1.1rem' }}>Nome do esposo(a):</label>
-              <input type="text" className="form-control" name="nomeConjuge" value={formData.nome_conjuge} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
+              <input type="text" className="form-control" name="guardian_cpf" value={formData.guardian_cpf} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
             </div>
             <div className="col-md-6 mb-3">
               <label style={{ fontSize: '1.1rem' }}>Identificador de outro sistema:</label>
-              <input type="text" className="form-control" name="outroId" value={formData.outroId} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
+              <input type="text" className="form-control" name="legacy_code" value={formData.legacy_code} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
             </div>
             <div className="col-md-12 mb-3">
               <div className="form-check">
-                <input className="form-check-input" type="checkbox" name="rnConvenio" checked={formData.rnConvenio} onChange={handleChange} id="rnConvenio" style={{ transform: 'scale(1.2)' }} />
-                <label className="form-check-label ms-2" htmlFor="rnConvenio" style={{ fontSize: '1.1rem' }}>
+                <input className="form-check-input" type="checkbox" name="rn_in_insurance" checked={formData.rn_in_insurance} onChange={handleChange} id="rn_in_insurance" style={{ transform: 'scale(1.2)' }} />
+                <label className="form-check-label ms-2" htmlFor="rn_in_insurance" style={{ fontSize: '1.1rem' }}>
                   RN na Guia do convênio
                 </label>
               </div>
@@ -418,7 +398,7 @@ function PatientForm({ onSave, onCancel, formData, setFormData }) {
           <div className="row mt-3">
             <div className="col-md-6 mb-3">
               <label style={{ fontSize: '1.1rem' }}>Tipo Sanguíneo:</label>
-              <select className="form-control" name="tipoSanguineo" value={formData.tipoSanguineo} onChange={handleChange} style={{ fontSize: '1.1rem' }}>
+              <select className="form-control" name="blood_type" value={formData.blood_type} onChange={handleChange} style={{ fontSize: '1.1rem' }}>
                 <option value="">Selecione</option>
                 <option value="A+">A+</option>
                 <option value="A-">A-</option>
@@ -432,15 +412,15 @@ function PatientForm({ onSave, onCancel, formData, setFormData }) {
             </div>
             <div className="col-md-2 mb-3">
               <label style={{ fontSize: '1.1rem' }}>Peso (kg):</label>
-              <input type="number" step="0.1" className="form-control" name="peso" value={formData.peso} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
+              <input type="text" step="0.1" className="form-control" name="weight_kg" value={formData.weight_kg} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
             </div>
             <div className="col-md-2 mb-3">
               <label style={{ fontSize: '1.1rem' }}>Altura (m):</label>
-              <input type="number" step="0.01" className="form-control" name="altura" value={formData.altura} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
+              <input type="text" step="0.01" className="form-control" name="height_m" value={formData.height_m} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
             </div>
             <div className="col-md-2 mb-3">
               <label style={{ fontSize: '1.1rem' }}>IMC (kg/m²):</label>
-              <input type="text" className="form-control" name="imc" value={formData.imc} readOnly disabled style={{ fontSize: '1.1rem' }} />
+              <input type="text" className="form-control" name="bmi" value={formData.bmi} readOnly disabled style={{ fontSize: '1.1rem' }} />
             </div>
             <div className="col-md-12 mb-3">
               <label style={{ fontSize: '1.1rem' }}>Alergias:</label>
@@ -493,8 +473,8 @@ function PatientForm({ onSave, onCancel, formData, setFormData }) {
             {/* PACIENTE VIP */}
             <div className="col-md-12 mb-3 mt-3">
               <div className="form-check">
-                <input className="form-check-input" type="checkbox" name="pacienteVip" checked={formData.pacienteVip} onChange={handleChange} id="pacienteVip" style={{ transform: 'scale(1.2)' }} />
-                <label className="form-check-label ms-2" htmlFor="pacienteVip" style={{ fontSize: '1.1rem' }}>
+                <input className="form-check-input" type="checkbox" name="vip" checked={formData.vip} onChange={handleChange} id="pacienteVip" style={{ transform: 'scale(1.2)' }} />
+                <label className="form-check-label ms-2" htmlFor="vip" style={{ fontSize: '1.1rem' }}>
                   Paciente VIP
                 </label>
               </div>
@@ -519,27 +499,27 @@ function PatientForm({ onSave, onCancel, formData, setFormData }) {
             </div>
             <div className="col-md-8 mb-3">
               <label style={{ fontSize: '1.1rem' }}>Rua:</label>
-              <input type="text" className="form-control" name="city" value={formData.city} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
+              <input type="text" className="form-control" name="street" value={formData.street} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
             </div>
             <div className="col-md-6 mb-3">
               <label style={{ fontSize: '1.1rem' }}>Bairro:</label>
-              <input type="text" className="form-control" name="bairro" value={formData.bairro} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
+              <input type="text" className="form-control" name="neighborhood" value={formData.neighborhood} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
             </div>
             <div className="col-md-4 mb-3">
               <label style={{ fontSize: '1.1rem' }}>Cidade:</label>
-              <input type="text" className="form-control" name="cidade" value={formData.cidade} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
+              <input type="text" className="form-control" name="city" value={formData.city} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
             </div>
             <div className="col-md-2 mb-3">
               <label style={{ fontSize: '1.1rem' }}>Estado:</label>
-              <input type="text" className="form-control" name="estado" value={formData.estado} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
+              <input type="text" className="form-control" name="state" value={formData.state} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
             </div>
             <div className="col-md-4 mb-3">
               <label style={{ fontSize: '1.1rem' }}>Número:</label>
-              <input type="text" className="form-control" name="numero" value={formData.numero} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
+              <input type="text" className="form-control" name="number" value={formData.number} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
             </div>
             <div className="col-md-8 mb-3">
               <label style={{ fontSize: '1.1rem' }}>Complemento:</label>
-              <input type="text" className="form-control" name="complemento" value={formData.complemento} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
+              <input type="text" className="form-control" name="complement" value={formData.complement} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
             </div>
           </div>
         </div>
@@ -561,15 +541,15 @@ function PatientForm({ onSave, onCancel, formData, setFormData }) {
             </div>
             <div className="col-md-6 mb-3">
               <label style={{ fontSize: '1.1rem' }}>Telefone:</label>
-              <input type="text" className="form-control" name="phone_mobile" value={formData.phone_mobile || ''} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
+              <input type="text" className="form-control" name="phone_mobile" value={formData.phone_mobile} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
             </div>
             <div className="col-md-6 mb-3">
               <label style={{ fontSize: '1.1rem' }}>Telefone 2:</label>
-              <input type="text" className="form-control" name="telefone2" value={contato.telefone2 || ''} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
+              <input type="text" className="form-control" name="phone1" value={formData.phone1} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
             </div>
             <div className="col-md-6 mb-3">
               <label style={{ fontSize: '1.1rem' }}>Telefone 3:</label>
-              <input type="text" className="form-control" name="telefone3" value={contato.telefone3 || ''} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
+              <input type="text" className="form-control" name="phone2" value={formData.phone2} onChange={handleChange} style={{ fontSize: '1.1rem' }} />
             </div>
           </div>
         </div>
diff --git a/src/components/utils/Formatar/Format.js b/src/components/utils/Formatar/Format.js
new file mode 100644
index 0000000..47bf709
--- /dev/null
+++ b/src/components/utils/Formatar/Format.js
@@ -0,0 +1,23 @@
+
+const FormatPeso = (valor) => {
+      if (valor == null) return 0;
+  const str = String(valor).replace(',', '.');
+
+  const clean = str.replace(/[^0-9.]/g, '');
+  console.log(parseFloat(clean))
+  return parseFloat(clean);
+}
+
+
+
+const FormatTelefones = (valor) => {
+   const digits = String(valor).replace(/\D/g, '').slice(0, 11);
+   return digits
+     .replace(/(\d)/, '($1')
+      .replace(/(\d{2})(\d)/, '$1) $2' )
+      .replace(/(\d)(\d{4})/, '$1 $2')
+      .replace(/(\d{4})(\d{4})/, '$1-$2')
+  }
+
+
+  export {FormatTelefones, FormatPeso}
\ No newline at end of file
diff --git a/src/pages/DoctorDetails.jsx b/src/pages/DoctorDetails.jsx
index 6eff137..e3182c7 100644
--- a/src/pages/DoctorDetails.jsx
+++ b/src/pages/DoctorDetails.jsx
@@ -61,70 +61,27 @@ const Details = ({setCurrentPage }) => {
           <label className="font-extrabold">Nome:</label>
           <p>{doctor.full_name || "-"}</p>
         </div>
-        <div className="col-md-6 mb-3">
-          <label className="font-extrabold">Nome social:</label>
-          <p>{doctor.nomeSocial || "-"}</p>
-        </div>
         <div className="col-md-6 mb-3">
           <label className="font-extrabold">Data de nascimento:</label>
           <p>{doctor.birth_date || "-"}</p>
         </div>
-        <div className="col-md-6 mb-3">
-          <label className="font-extrabold">Gênero:</label>
-          <p>{doctor.sexo || "-"}</p>
-        </div>
+        
         <div className="col-md-6 mb-3">
           <label className="font-extrabold">CPF:</label>
           <p>{doctor.cpf || "-"}</p>
         </div>
         <div className="col-md-6 mb-3">
           <label className="font-extrabold">CRM:</label>
-          <p>{doctor.rg || "-"}</p>
+          <p>{doctor.crm || "-"}</p>
         </div>
         <div className="col-md-6 mb-3">
-          <label className="font-extrabold">Outro documento:</label>
-          <p>{doctor.documento || "-"}</p>
-        </div>
-        <div className="col-md-6 mb-3">
-          <label className="font-extrabold">Número do documento:</label>
-          <p>{doctor.numeroDocumento || "-"}</p>
-        </div>
-
-        <div className="col-md-6 mb-3">
-          <label className="font-extrabold">Etnia e Raça:</label>
-          <p>{doctor.etniaRaca || "-"}</p>
-        </div>
-        <div className="col-md-6 mb-3">
-          <label className="font-extrabold">Nacionalidade:</label>
-          <p>{doctor.etniaRaca || "-"}</p>
-        </div>
-        <div className="col-md-6 mb-3">
-          <label className="font-extrabold">Naturalidade:</label>
-          <p>{doctor.etniaRaca || "-"}</p>
+          <label className="font-extrabold">Estado do CRM:</label>
+          <p>{doctor.crm_uf || "-"}</p>
         </div>
+        
         <div className="col-md-6 mb-3">
           <label className="font-extrabold">Especialização:</label>
-          <p>{doctor.profissao || "-"}</p>
-        </div>
-        <div className="col-md-6 mb-3">
-          <label className="font-extrabold">Estado civil:</label>
-          <p>{doctor.estadoCivil || "-"}</p>
-        </div>
-        <div className="col-md-6 mb-3">
-          <label className="font-extrabold">Nome do esposo(a):</label>
-          <p>{doctor.nomeConjuge || "-"}</p>
-        </div>
-        <div className="col-md-6 mb-3">
-          <label className="font-extrabold">Identificador de outro sistema:</label>
-          <p>{doctor.outroId || "-"}</p>
-        </div>
-        <div className="col-md-6 mb-3">
-          <label className="font-extrabold">Observações:</label>
-          <p>{doctor.observacoes || "-"}</p>
-        </div>
-        <div className="col-md-6 mb-3">
-          <label className="font-extrabold">Anexos do Médico:</label>
-          <p>{ "-"}</p>
+          <p>{doctor.specialty || "-"}</p>
         </div>
       </div>
       </div>
@@ -140,27 +97,27 @@ const Details = ({setCurrentPage }) => {
         </div>
         <div className="col-md-8 mb-3">
           <label className="font-extrabold">Rua:</label>
-          <p>{doctor.rua || "-"}</p>
+          <p>{doctor.street || "-"}</p>
         </div>
         <div className="col-md-4 mb-3">
           <label className="font-extrabold">Bairro:</label>
-          <p>{doctor.bairro || "-"}</p>
+          <p>{doctor.neighborhood || "-"}</p>
         </div>
         <div className="col-md-4 mb-3">
           <label className="font-extrabold">Cidade:</label>
-          <p>{doctor.cidade || "-"}</p>
+          <p>{doctor.city || "-"}</p>
         </div>
         <div className="col-md-2 mb-3">
           <label className="font-extrabold">Estado:</label>
-          <p>{doctor.estado || "-"}</p>
+          <p>{doctor.state || "-"}</p>
         </div>
         <div className="col-md-4 mb-3">
           <label className="font-extrabold">Número:</label>
-          <p>{doctor.numero || "-"}</p>
+          <p>{doctor.number || "-"}</p>
         </div>
         <div className="col-md-8 mb-3">
           <label className="font-extrabold">Complemento:</label>
-          <p>{doctor.complemento || "-"}</p>
+          <p>{doctor.complement || "-"}</p>
         </div>
       </div>
       </div>
@@ -176,16 +133,13 @@ const Details = ({setCurrentPage }) => {
         </div>
         <div className="col-md-6 mb-3">
           <label className="font-extrabold">Telefone:</label>
-          <p>{doctor.telefone1 || "-"}</p>
+          <p>{doctor.phone_mobile || "-"}</p>
         </div>
         <div className="col-md-6 mb-3">
           <label className="font-extrabold">Telefone 2:</label>
-          <p>{doctor.telefone2 || "-"}</p>
-        </div>
-        <div className="col-md-6 mb-3">
-          <label className="font-extrabold">Celular:</label>
-          <p>{doctor.telefone3 || "-"}</p>
+          <p>{doctor.phone2 || "-"}</p>
         </div>
+        
       </div>
       </div>
     </>