Merge branch 'jansa'

admin/application/controllers/Webservice.php

@@ -3841,13 +3841,14 @@ class Webservice extends CI_Controller {
 		$static_string = 'IPOK_Doctor'.time();
 		$authToken = uniqid($static_string);
 		$result_authtoken = $this->Webservice_model->authtoken_registration_doctor($authToken,$result['userdata']['id']);
+	
 		if($result_authtoken){
 			$res = array(
 					"status"=> "success",
 					"data"=>array(
 					"auth_token"=>$authToken,
 					"doctor_id"=> $result['userdata']['id'],
-					"name"=> "",
+					"name"=> $result['userdata']['name'],
 					"username"=>"",
 					"email"=> $result['userdata']['email'],
 					"cpf" =>"",

admin/application/models/Webservice_model.php

@@ -787,7 +787,7 @@ class Webservice_model extends CI_Model {
 				$query['number'] = decrypt_data($query['number']);
 				$query['complement'] = decrypt_data($query['complement']);*/
 			
-
+				
 			    $return_array = array('status'=>'success','userdata'=>$query);
 		}
 		else{