diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form5/Form5Controller.js b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form5/Form5Controller.js
index 0b88ff42..4dace434 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form5/Form5Controller.js
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form5/Form5Controller.js
@@ -19,7 +19,9 @@
         $scope.editForm.$reset();
 
         $scope.storeFichasClinicas.extraParams = {
-    		fichaID: selected.ficha.aptidao.id
+    		fichaID: selected.ficha.aptidao.id,
+    		trabalhadorID: null,
+    		tipoFichaID: null
         };
 
         $scope.storeFichasClinicas.get(function(response, status, headers, config, items){
@@ -40,7 +42,30 @@
     };
 
     $scope.edit = function(selected){
-    		
+    	
+        $scope.editForm.$reset();
+
+        $scope.storeFichasClinicas.extraParams = {
+            fichaID: selected.id,
+            trabalhadorID: null,
+            tipoFichaID: null            
+        };
+
+        $scope.storeFichasClinicas.get(function(response, status, headers, config, items){
+        	    
+            $scope.selected = items.fichaData; 
+
+            $scope.editing = angular.copy($scope.selected);
+            
+            globals.plugins.buildFloatingSideMenu({
+            	title: 'Ficha de Aptidão',
+            	documentclick: function(){
+  
+            		$scope.openModalDocumentos();
+            	}
+            });        
+
+        });
     };
 
     $scope.save = function(complete){
@@ -53,7 +78,12 @@
 
             	if(response.success)
             	{
-            		
+                    globals.plugins.hideFloatingSideMenu();
+
+                    $scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){
+                
+                        angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change');
+                    }); 
             	}
             }); 
         }
@@ -116,6 +146,14 @@
             //$scope.modalDocumentos.hide();
         });
     };
+    
+    $scope.$watch('storeFichasClinicas.items', function(newVal, oldVal){
+    	
+		if(newVal.fieldsData)
+		{
+			
+		}    	
+    });
 
     $scope.$on('afterrender', function(event, args){
     	
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form5/Form5View.html b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form5/Form5View.html
index f3b55008..24fea086 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form5/Form5View.html
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form5/Form5View.html
@@ -283,7 +283,7 @@
 
         <div class="row">
             <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(false)" type="button" class="btn btn-success col-md-2 m-r-5 m-b-5">Concluir</button>
             </div>
         </div>
 
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchController.js b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchController.js
index e505dce1..4ffda2e4 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchController.js
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchController.js
@@ -177,19 +177,19 @@
     //Indica se o tipo de ficha pode emitir Ficha de Aptidão
     $scope.emiteFichaAptidao = function(ficha){
     	    	
-    	var possuiFichaAptidao = false;
+    	var emite = false;
     	
     	if(ficha){
     		
     		var tipo_id = ficha.tipo_id;
     		
-    		possuiFichaAptidao = (
+    		emite = (
 				tipo_id != 8 && //Enfermagem
 				tipo_id != 9	//Medicina Curativa
     		); 		
     	}
     	
-    	return possuiFichaAptidao;
+    	return emite;
     };
     
     $scope.emitirFichaAptidao = function(ficha){
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchView.html b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchView.html
index be5bdce9..13f7d3e4 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchView.html
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchView.html
@@ -98,7 +98,7 @@
                                     <th class="col-md-3">Autor</th>
                                     <th class="col-md-2">Estado</th>
                                     <th class="col-md-1">&nbsp;</th>
-                                    <th class="col-md-1">F.A.</th>
+                                    <th class="col-md-1">Ficha A.</th>
                                 </tr>
                             </thead>
                             <tbody>
@@ -118,7 +118,7 @@
                                             <span class="glyphicon glyphicon-plus"></span> <span>Emitir</span>
                                         </button>
                                         
-                                        <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>
+                                        <span ng-show="item.emissao_ficha_aptidao && emiteFichaAptidao(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/DoencasActivas-1.html b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/partials/DoencasActivas-1.html
index 62260f41..cba2a708 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/partials/DoencasActivas-1.html
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/partials/DoencasActivas-1.html
@@ -17,13 +17,13 @@ usage example: <partials-renderer partial-id="DoencasActivas-1"></partials-rende
 
 						<div class="checkbox">
 							<label> <input
-								ng-model="editing.doencasActivas.diabetes_tipo1" value="true"
+								ng-model="editing.doencasActivas.diabetes_tipo_i" value="true"
 								type="checkbox" /> Diabetes Tipo I
 							</label>
 						</div>
 						<div class="checkbox">
 							<label> <input
-								ng-model="editing.doencasActivas.diabetes_tipo2" value="true"
+								ng-model="editing.doencasActivas.diabetes_tipo_ii" value="true"
 								type="checkbox" /> Diabetes Tipo II
 							</label>
 						</div>
@@ -40,13 +40,13 @@ usage example: <partials-renderer partial-id="DoencasActivas-1"></partials-rende
 						</div>
 						<div class="checkbox">
 							<label> <input
-								ng-model="editing.doencasActivas.lombalgias" value="true"
+								ng-model="editing.doencasActivas.lombalgia" value="true"
 								type="checkbox" /> Lombalgias
 							</label>
 						</div>
 						<div class="checkbox">
 							<label> <input
-								ng-model="editing.doencasActivas.tendinites" value="true"
+								ng-model="editing.doencasActivas.tendinite" value="true"
 								type="checkbox" /> Tendinites
 							</label>
 						</div>
@@ -58,7 +58,7 @@ usage example: <partials-renderer partial-id="DoencasActivas-1"></partials-rende
 						</div>
 						<div class="checkbox">
 							<label> <input
-								ng-model="editing.doencasActivas.dermatites" value="true"
+								ng-model="editing.doencasActivas.dermatite" value="true"
 								type="checkbox" /> Dermatites
 							</label>
 						</div>
@@ -86,7 +86,7 @@ usage example: <partials-renderer partial-id="DoencasActivas-1"></partials-rende
 											<label class="control-label">Quais</label>
 										</div>
 										<div class="col-md-10">
-											<textarea ng-model="editing.doencasActivas.outras_detalhe"
+											<textarea ng-model="editing.doencasActivas.outras_quais"
 												rows="3" class="form-control"></textarea>
 										</div>
 									</div>
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/services/Plugins.js b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/services/Plugins.js
index 49059b5b..04685a2a 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/services/Plugins.js
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/services/Plugins.js
@@ -10,22 +10,21 @@
 
 			// Append Button
 			$("body").append($("<a />")
-							.addClass("scroll-to-top")
-							.attr({
-								"href": "#",
-								"id": "scrollToTop"
-							})
-							.append(
-								$("<i />")
-									.addClass("glyphicon glyphicon-chevron-up icon-white")
-							));
+				.addClass("scroll-to-top")
+				.attr({
+					"href": "#",
+					"id": "scrollToTop"
+				})
+				.append(
+					$("<i />")
+						.addClass("glyphicon glyphicon-chevron-up icon-white")
+				));
 
 			$("#scrollToTop").click(function(e) {
 
 				e.preventDefault();
 				$("body, html").animate({scrollTop : 0}, 500);
 				return false;
-
 			});
 
 			// Show/Hide Button on Window Scroll event.