diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1Controller.js b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1Controller.js
index 6b9eb324..c9c5cf18 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1Controller.js
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1Controller.js
@@ -389,6 +389,11 @@
     		$scope.editing.classificacaoIndividualSaude.sem_problemas_saude = false;    		
     	}    	
     };
+    
+    $scope.test = function(){
+    	
+    	alert('888');
+    };
      
     $scope.$on('afterrender', function(event, args){
 
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1View.html b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1View.html
index 776e2ce4..48c521ff 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1View.html
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1View.html
@@ -121,6 +121,8 @@
             <div class="col-md-12">
                 <button ng-click="save(false)" type="button" class="btn btn-primary col-md-2 m-r-5 m-b-5">Gravar</button>
                 <button ng-click="save(true)" type="button" class="btn btn-success col-md-2 m-b-5">Concluir</button>
+                
+                <!-- <button ng-click="cancel()" type="button" class="btn btn-link">Cancelar</button> -->
             </div>
         </div>
 
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form5/Form5Controller.js b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form5/Form5Controller.js
index 3214256a..2da9e0ac 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form5/Form5Controller.js
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form5/Form5Controller.js
@@ -6,12 +6,20 @@
 
     $scope.calculatedAge = 0;
 
+//    $scope.storeFichasClinicas = new globals.dataService.store({
+//        model: null,
+//        actions: {
+//            get: 'getFicha', 
+//            upsert: 'sendFicha',
+//            destroy: 'sendFicha'
+//        }
+//    });
+    
     $scope.storeFichasClinicas = new globals.dataService.store({
         model: null,
         actions: {
-            get: 'getFicha',
-            upsert: 'sendFicha',
-            destroy: 'sendFicha'
+            get: 'getFichaAptidao', 
+            upsert: 'sendFichaAptidao'
         }
     });
 
@@ -35,7 +43,7 @@
         $scope.editForm.$reset();
 
         $scope.storeFichasClinicas.extraParams = {
-            fichaID: selected.id
+        	fichaID: selected.id
         };
 
         $scope.storeFichasClinicas.get(function(response, status, headers, config, items){
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchController.js b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchController.js
index b99f4ae9..878e5840 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchController.js
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchController.js
@@ -174,8 +174,9 @@
         });
     };
     
-    $scope.possuiFichaAptidao = function(ficha){
-    	
+    //Indica se o tipo de ficha pode emitir Ficha de Aptidão
+    $scope.emiteFichaAptidao = function(ficha){
+    	    	
     	var possuiFichaAptidao = false;
     	
     	if(ficha){
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchView.html b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchView.html
index 8189569c..be5bdce9 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchView.html
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchView.html
@@ -113,12 +113,12 @@
                                         </button>
                                     </td>
                                     <td class="p-l-none">
-                                        <button ng-show="item.emissao_ficha_aptidao == null && possuiFichaAptidao(item)" data-toggle="tooltip" data-placement="right" title="Emitir Ficha de Aptidão" 
+                                        <button ng-show="!item.emissao_ficha_aptidao && emiteFichaAptidao(item)" data-toggle="tooltip" data-placement="right" title="Emitir Ficha de Aptidão" 
                                         	ng-click="emitirFichaAptidao(item)" type="button" class="btn btn-xs btn-default">
                                             <span class="glyphicon glyphicon-plus"></span> <span>Emitir</span>
                                         </button>
                                         
-                                        <span ng-show="item.emissao_ficha_aptidao != null && possuiFichaAptidao(item)" class="label label-success" data-toggle="tooltip" data-placement="right" title="Ficha de Aptidão Emitida">Emitida</span>
+                                        <span ng-show="item.emissao_ficha_aptidao && possuiFichaAptidao(item)" class="label label-success" data-toggle="tooltip" data-placement="right" title="Ficha de Aptidão Emitida">Emitida</span>
                                     </td>
                                 </tr>
                             </tbody>
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/partials/Habitos-1.html b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/partials/Habitos-1.html
index 3c54d81e..53645fef 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/partials/Habitos-1.html
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/partials/Habitos-1.html
@@ -104,56 +104,120 @@ usage example: <partials-renderer partial-id="Habitos-1"></partials-renderer>
 							</div>
 						</div>
 					</div>
+					
+					<div class="form-group">
+					
+						<label class="control-label">Alcoólicos</label>
+						<div class="radio">
+							<label> 
+								<input ng-model="editing.habitos.alcoolicos_id"
+								name="rb-habitos-alcoolicos"
+								value="0" type="radio" /> 
+								Nunca Bebeu
+							</label>
+						</div>
+						
+						<div class="radio">
+							<div class="row">
+								<div class="col-md-5">
+									<label> 
+										<input ng-model="editing.habitos.alcoolicos_id" 										
+										name="rb-habitos-alcoolicos"											
+										value="1" type="radio" />
+										Deixou de Beber no Ano
+									</label>
+								</div>
+								<div class="col-md-7 p-l-none">
+									<div ng-show="editing.habitos.alcoolicos_id == 1" class="row">
+										<div class="col-md-12">
+											<input ng-model="editing.habitos.alcoolicos_deixou_quando" type="text" class="form-control input-sm" />
+										</div>
+									</div>
+								</div>
+							</div>
+						</div>
+						
+						<div class="radio">
+							<div class="row">
+								<div class="col-md-5">
+									<label> 
+										<input ng-model="editing.habitos.alcoolicos_id"
+										name="rb-habitos-alcoolicos"	
+										value="2" type="radio" />
+										Bebe
+									</label>
+								</div>
+								<div class="col-md-7 p-l-none">
+									<div ng-show="editing.habitos.alcoolicos_id == 2" class="row">
+										<div class="col-md-12">
+											<input ng-model="editing.habitos.alcoolicos_consome_detalhe" type="text" class="form-control input-sm" />
+										</div>
+									</div>
+								</div>
+							</div>
+						</div>
+						
+					</div>
 
 				</div>
 				<div class="col-md-6">
 
 					<div class="form-group">
+					
 						<label class="control-label">Tabágicos</label>
 						<div class="radio">
 							<label> 
-								<input ng-model="editing.habitos.tabagicos_nunca" value="true" type="radio" /> 
+								<input ng-model="editing.habitos.tabagicos_id"
+								name="rb-habitos-tabagicos"
+								value="0" type="radio" /> 
 								Nunca Fumou
 							</label>
 						</div>
+						
 						<div class="radio">
 							<div class="row">
 								<div class="col-md-5">
 									<label> 
-										<input ng-model="editing.habitos.tabagicos_id" value="2" type="radio" />
+										<input ng-model="editing.habitos.tabagicos_id" 										
+										name="rb-habitos-tabagicos"											
+										value="1" type="radio" />
 										Deixou de Fumar no Ano
 									</label>
 								</div>
 								<div class="col-md-7 p-l-none">
-									<div ng-show="editing.habitos.tabagicos_id == 2" class="row">
+									<div ng-show="editing.habitos.tabagicos_id == 1" class="row">
 										<div class="col-md-12">
-											<input ng-model="editing.habitos.tabagicos_ano_desistencia" type="text" class="form-control input-sm" />
+											<input ng-model="editing.habitos.tabagicos_deixou_quando" type="text" class="form-control input-sm" />
 										</div>
 									</div>
 								</div>
 							</div>
 						</div>
+						
 						<div class="radio">
 							<div class="row">
 								<div class="col-md-5">
 									<label> 
-										<input ng-model="editing.habitos.tabagicos_id" value="3" type="radio" />
+										<input ng-model="editing.habitos.tabagicos_id"
+										name="rb-habitos-tabagicos"	
+										value="2" type="radio" />
 										Fuma
 									</label>
 								</div>
 								<div class="col-md-7 p-l-none">
-									<div ng-show="editing.habitos.tabagicos_id == 3" class="row">
+									<div ng-show="editing.habitos.tabagicos_id == 2" class="row">
 										<div class="col-md-12">
-											<input ng-model="editing.habitos.tabagicos_fuma_quantidade" type="text" class="form-control input-sm" />
+											<input ng-model="editing.tabagicos_fuma_detalhe" type="text" class="form-control input-sm" />
 										</div>
 									</div>
 								</div>
 							</div>
 						</div>
+						
 					</div>
 
 					<div class="form-group">
-						<label class="control-label">5.4 - Exercicio Físico</label>
+						<label class="control-label">Exercicio Físico</label>
 						<div class="radio">
 							<label> <input
 								ng-model="editing.habitos.exercicio_fisico"
@@ -216,20 +280,4 @@ usage example: <partials-renderer partial-id="Habitos-1"></partials-renderer>
 		</div>
 	</div>
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 </div>
\ No newline at end of file