diff --git a/src/js/controller.js b/src/js/controller.js
index fe791cf..23af938 100644
--- a/src/js/controller.js
+++ b/src/js/controller.js
@@ -101,6 +101,10 @@ angular.module('focaAbmChofer')
                 if (key === 13) $scope.focused++;
             };
 
+            focaAbmChoferService.getTiposDocumento().then(function(res) {
+                $scope.tiposDocumento = res.data;
+            });
+
             //SETEO BOTONERA LATERAL
             $timeout(function() {
                 focaBotoneraLateralService.showSalir(false);
@@ -144,7 +148,6 @@ angular.module('focaAbmChofer')
 
             $scope.guardar = function(key) {
                 key = (typeof key  === 'undefined') ? 13 : key;
-
                 if(key === 13) {
                     validaDni().then(function() {
                         $scope.chofer.idTransportista = $routeParams.idTransportista;
@@ -161,16 +164,11 @@ angular.module('focaAbmChofer')
             function validaDni() {
                 return new Promise(function(resolve, reject) {
                     focaAbmChoferService
-                        .getChoferPorTransportista(parseInt($routeParams.idTransportista))
+                        .getChoferPorDni($scope.chofer.dni)
                         .then(function(res) {
-                            //Valida si existe dni
-                            var existe = res.data.filter(function(chofer) {
-                                return chofer.dni === $scope.chofer.dni &&
-                                    chofer.id !== $scope.chofer.id;
-                            });
-
-                            if(existe.length) {
-                                reject(existe);
+                            if(res.data.id &&
+                                $scope.chofer.id !== res.data.id) {
+                                reject(res.data);
                             }else {
                                 resolve();
                             }
diff --git a/src/js/service.js b/src/js/service.js
index 0affb73..430e061 100644
--- a/src/js/service.js
+++ b/src/js/service.js
@@ -10,6 +10,9 @@ angular.module('focaAbmChofer')
             getChoferPorTransportista: function(id) {
                 return $http.get(API_ENDPOINT.URL + '/chofer/transportista/' + id);
             },
+            getChoferPorDni: function(dni) {
+                return $http.post(API_ENDPOINT.URL + '/chofer/dni', {dni: dni});
+            },
             guardarChofer: function(chofer) {
                 return $http.post(API_ENDPOINT.URL + '/chofer', {chofer: chofer});
             },
@@ -22,6 +25,9 @@ angular.module('focaAbmChofer')
             deleteChofer: function(id) {
                 return $http.delete(API_ENDPOINT.URL + '/chofer/' + id);
             },
+            getTiposDocumento: function() {
+                return $http.get(API_ENDPOINT.URL + '/tipo-documento');
+            },
             transportistaSeleccionado: {}
         };
     }]);
diff --git a/src/views/foca-abm-choferes-item.html b/src/views/foca-abm-choferes-item.html
index 36a8114..97e6eba 100644
--- a/src/views/foca-abm-choferes-item.html
+++ b/src/views/foca-abm-choferes-item.html
@@ -24,6 +24,16 @@
             </div>
         </div>
         <div class="form-group row">
+            <label class="offset-sm-1 col-sm-2 col-form-label">Tipo documento</label>
+            <div class="col-sm-4">
+                <select 
+                    class="form-control"
+                    ng-options="tipoDocumento.id as tipoDocumento.descripcion for tipoDocumento in tiposDocumento track by tipoDocumento.id"
+                    ng-model="chofer.idTipoDocumento">
+                </select>
+            </div>
+        </div>
+        <div class="form-group row">
             <label class="offset-sm-1 col-sm-2 col-form-label">DNI</label>
             <div class="col-sm-4">
                 <input
diff --git a/src/views/foca-abm-choferes-listado.html b/src/views/foca-abm-choferes-listado.html
index 55bd521..f660ac8 100644
--- a/src/views/foca-abm-choferes-listado.html
+++ b/src/views/foca-abm-choferes-listado.html
@@ -16,7 +16,7 @@
             <thead>
                 <tr>
                     <th>Nombre</th>
-                    <th>DNI</th>
+                    <th>Documento</th>
                     <th>Teléfono</th>
                     <th class="text-center">
                         <button