diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html.tar.gz b/trunk/SiprpWebFichasClinicas/WebContent/static/html.tar.gz
new file mode 100644
index 00000000..434d218b
Binary files /dev/null and b/trunk/SiprpWebFichasClinicas/WebContent/static/html.tar.gz differ
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1Controller.js b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1Controller.js
index aaf23688..921064a9 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1Controller.js
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1Controller.js
@@ -17,10 +17,10 @@
             '    <li><a href="#section10">10 - Absentismo</a></li>' +   
             '    <li><a href="#section11">11 - Esquema Vacinal</a></li>' +   
             '    <li><a href="#section12">12 - Conclusões/Resumo</a></li>' + 
-            '    <li><a href="#section13">13 - Propostas de Solução</a></li>' +   
+            //'    <li><a href="#section13">13 - Propostas de Solução</a></li>' +   
             '    <li><a href="#section14">14 - Observações</a></li>' +   
-            '    <li><a href="#section15">15 - Parecer</a></li>' +   
-            '    <li><a href="#section16">16 - Reavaliação</a></li>' +   
+            '    <li><a href="#section15">15 - Parecer/Reavaliação</a></li>' +   
+            //'    <li><a href="#section16">16 - Reavaliação</a></li>' +   
             '    <li><a href="#section17">17 - Data do Exame</a></li>' +   
             '</ul>                                         ' + 
         '</div>'
@@ -97,6 +97,11 @@
         	sem_problemas_saude: true
         };
         
+        $scope.editing.conclusoesResumo = {
+			inapto_radio: 1,
+			reavaliacao_radio: 1
+        };
+        
         globals.plugins.buildFloatingSideMenu({
             title: 'Ficha Clinica',
             scrollspyItems: scrollspyItems,
@@ -114,21 +119,21 @@
     };
 
     $scope.edit = function(selected){
+    	
+        $scope.editForm.$reset();
 
-        $timeout(function () {
- 
-            $scope.editForm.$reset();
-
-            $scope.storeFichasClinicas.extraParams = {
-                fichaID: selected.id
-            };
+        $scope.storeFichasClinicas.extraParams = {
+            fichaID: selected.id
+        };
 
-            $scope.storeFichasClinicas.get(function(response, status, headers, config, items){
-          
-                $scope.selected = items;
+        $scope.storeFichasClinicas.get(function(response, status, headers, config, items){
+      
+            $scope.selected = items;
 
-                $scope.editing = angular.copy($scope.selected);
-                
+            $scope.editing = angular.copy($scope.selected);
+            
+            $timeout(function () {
+            	 
                 globals.plugins.buildFloatingSideMenu({
                     title: 'Ficha Clinica',
                     scrollspyItems: scrollspyItems,
@@ -143,9 +148,10 @@
                         $scope.openModalDocumentos();
                     }
                 });
-            }); 
 
-        }, 0);
+            }, 0);           
+
+        });
     };
 
     $scope.save = function(complete){
@@ -383,7 +389,7 @@
     		$scope.editing.classificacaoIndividualSaude.sem_problemas_saude = false;    		
     	}    	
     };
-    
+     
     $scope.$on('afterrender', function(event, args){
 
         //listeners
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1View.html b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1View.html
index 99ffdd38..c7b80976 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1View.html
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1View.html
@@ -1094,34 +1094,32 @@
         <h4 class="section-title" id="section11">11 - Esquema Vacinal</h4>
         <partials-renderer partial-id="EsquemaVacinal-1"></partials-renderer>
 
-        <h4 class="section-title" id="section12">12 - Conclusões/Resumo</h4>
+        <h4 class="section-title" id="section12">Conclusões/Resumo/Propostas Solução</h4>
         <div class="panel panel-default">
-            <div class="panel-body">
+            <div class="panel-body">            
                 <div class="form-group">
-                    <label class="control-label">12.1 - Problemas de Saúde</label>
+                    <label class="control-label">Problemas relacionados com Saúde</label>
                     <textarea ng-model="editing.problemasSolucoes.problemas_saude" rows="3" class="form-control"></textarea>
                 </div>
                 <div class="form-group">
-                    <label class="control-label">12.2 - Problemas Relacionados com o Trabalho</label>
-                    <textarea ng-model="editing.problemasSolucoes.problemas_trabalho" rows="3" class="form-control"></textarea>
-                </div>
+                    <label class="control-label">Soluções para problemas relacionados com Saúde</label>
+                    <textarea ng-model="editing.problemasSolucoes.solucoes_problemas_saude" rows="3" class="form-control"></textarea>
+                </div>                
             </div>
         </div>
-
-        <h4 class="section-title" id="section13">13 - Propostas de Solução</h4>
         <div class="panel panel-default">
             <div class="panel-body">
                 <div class="form-group">
-                    <label class="control-label">13.1 - Para Problemas de Saúde</label>
-                    <textarea ng-model="editing.problemasSolucoes.solucoes_problemas_saude" rows="3" class="form-control"></textarea>
+                    <label class="control-label">Problemas relacionados com o Trabalho</label>
+                    <textarea ng-model="editing.problemasSolucoes.problemas_trabalho" rows="3" class="form-control"></textarea>
                 </div>
                 <div class="form-group">
-                    <label class="control-label">13.2 - Para Problemas Relacionados com o Trabalho</label>
+                    <label class="control-label">Soluções para problemas relacionados com o Trabalho</label>
                     <textarea ng-model="editing.problemasSolucoes.solucoes_problemas_trabalho" rows="3" class="form-control"></textarea>
                 </div>
             </div>
         </div>
-        
+             
         <!--  TODO: rever novas grelhas -->
         <div class="panel panel-default">
            	<div class="panel-heading">Cirurgias</div>
@@ -1290,6 +1288,15 @@
 
     </form>
 
+	<!-- we need to add some extra space to the bottom of the page for the scrollspy to work properly -->
+    <p>&nbsp;</p>
+    <p>&nbsp;</p>
+    <p>&nbsp;</p>
+    
+    <p>&nbsp;</p>
+    <p>&nbsp;</p>
+    <p>&nbsp;</p>
+    
     <p>&nbsp;</p>
     <p>&nbsp;</p>
     <p>&nbsp;</p>
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form3/Form3Controller.js b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form3/Form3Controller.js
index 29a99ad9..e0d092a4 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form3/Form3Controller.js
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form3/Form3Controller.js
@@ -25,30 +25,27 @@
     });
 
     $scope.add = function(selected){
+ 
+        $scope.editForm.$reset();
 
+        $scope.editing = angular.copy(selected);
+        
+        $scope.editing.conclusoesResumo = {
+			inapto_radio: 1,
+			reavaliacao_radio: 1
+        };
+        
         globals.plugins.buildFloatingSideMenu({
             title: 'Ficha Clinica',
             documentclick: function(){
 
                 $scope.openModalDocumentos();
             }
-        });
-    
-        $scope.editForm.$reset();
-
-        $scope.editing = angular.copy(selected);
+        });            
     };
 
     $scope.edit = function(selected){
 
-        globals.plugins.buildFloatingSideMenu({
-            title: 'Ficha Clinica',
-            documentclick: function(){
-
-                $scope.openModalDocumentos();
-            }
-        });
-
         $timeout(function () {
  
             $scope.editForm.$reset();
@@ -62,6 +59,14 @@
                 $scope.selected = items;
 
                 $scope.editing = angular.copy($scope.selected);
+                
+                globals.plugins.buildFloatingSideMenu({
+                    title: 'Ficha Clinica',
+                    documentclick: function(){
+
+                        $scope.openModalDocumentos();
+                    }
+                });
             }); 
 
         }, 0);
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form4/Form4Controller.js b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form4/Form4Controller.js
index 2567b878..2a7c45c7 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form4/Form4Controller.js
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form4/Form4Controller.js
@@ -44,6 +44,11 @@
         	relaciona_trabalho_saude: false
         };
         
+        $scope.editing.conclusoesResumo = {
+			inapto_radio: 1,
+			reavaliacao_radio: 1
+        };
+        
         globals.plugins.buildFloatingSideMenu({
             title: 'Ficha Clinica',
             scrollspyItems: scrollspyItems,
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/partials/Parecer-1.html b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/partials/Parecer-1.html
index 59446b87..c74daed0 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/partials/Parecer-1.html
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/partials/Parecer-1.html
@@ -16,20 +16,20 @@ usage example: <partials-renderer partial-id="Parecer-1"></partials-renderer>
 	            
 	                <div class="radio">
 	                    <label>
-	                        <input ng-model="editing.conclusoesResumo.id" value="1" type="radio" />
+	                        <input ng-model="editing.conclusoesResumo.inapto_radio" value="0" name="rb_conclusoesResumo" type="radio" />
 	                        Apto
 	                    </label>
 	                </div>
 	                
 	                <div class="radio">
 	                    <label>
-	                        <input ng-model="editing.conclusoesResumo.id" value="2" type="radio" />
+	                        <input ng-model="editing.conclusoesResumo.inapto_radio" value="1" name="rb_conclusoesResumo" type="radio" />
 	                        Apto Condicionado</label>
 	                </div>
 	                
 	                <div class="radio">
 	                    <label>
-	                        <input ng-model="editing.conclusoesResumo.id" value="3" type="radio" />
+	                        <input ng-model="editing.conclusoesResumo.inapto_radio" value="2" name="rb_conclusoesResumo" type="radio" />
 	                        Inapto temporáriamente
 	                    </label>
 	                </div>
@@ -38,7 +38,7 @@ usage example: <partials-renderer partial-id="Parecer-1"></partials-renderer>
                         <div class="row">
                             <div class="col-md-4">
                                 <label>
-                                    <input ng-model="editing.conclusoesResumo.id" value="4" type="radio" />
+                                    <input ng-model="editing.conclusoesResumo.inapto_radio" value="3" name="rb_conclusoesResumo" type="radio" />
                                     Inapto definitivamente
                                 </label>
                             </div>
@@ -61,6 +61,5 @@ usage example: <partials-renderer partial-id="Parecer-1"></partials-renderer>
 	            </div>
 	        </div>
 	    </div>
-	</div>   
-        
+	</div>          
 </div>
\ No newline at end of file
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/partials/Reavaliacao-1.html b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/partials/Reavaliacao-1.html
index c2a707c4..028c73ad 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/partials/Reavaliacao-1.html
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/partials/Reavaliacao-1.html
@@ -13,18 +13,19 @@ usage example: <partials-renderer partial-id="Reavaliacao-1"></partials-renderer
 	    <div class="panel-body">
 	        <div class="row">
 	            <div class="col-md-12">
+	            
 	                <label class="m-b-none">
 	                    <strong>16.1- Exame Periódico</strong>
 	                </label>
 	                <div class="radio">
 	                    <label>
-	                        <input ng-model="editing.conclusoesResumo.reavaliacao_id" value="1" type="radio" />
+	                        <input ng-model="editing.conclusoesResumo.reavaliacao_radio" value="0" type="radio" />
 	                        Bianual
 	                    </label>
 	                </div>
 	                <div class="radio">
 	                    <label>
-	                        <input ng-model="editing.conclusoesResumo.reavaliacao_id" value="2" type="radio" />
+	                        <input ng-model="editing.conclusoesResumo.reavaliacao_radio" value="1" type="radio" />
 	                        Anual
 	                    </label>
 	                </div>
@@ -32,11 +33,11 @@ usage example: <partials-renderer partial-id="Reavaliacao-1"></partials-renderer
                 	 	<div class="row">
 	                        <div class="col-md-4">
 	                            <label>
-	                                <input ng-model="editing.conclusoesResumo.reavaliacao_id" value="3" type="radio" />
+	                                <input ng-model="editing.conclusoesResumo.reavaliacao_radio" value="2" type="radio" />
 	                                Outra Periodicidade </label>
 	                        </div>
 	                        <div class="col-md-8 p-l-none">
-	                            <div ng-show="editing.conclusoesResumo.reavaliacao_id == 3" class="row">
+	                            <div ng-show="editing.conclusoesResumo.reavaliacao_radio == 2" class="row">
 	                                <div class="col-md-2">
 	                                    <label class="control-label">Qual?</label>
 	                                </div>
@@ -47,6 +48,7 @@ usage example: <partials-renderer partial-id="Reavaliacao-1"></partials-renderer
 	                        </div>
                         </div>
 	                </div>
+	                
 	                <div class="checkbox">
 	                    <div class="row">
 	                        <div class="col-md-6">
@@ -64,6 +66,7 @@ usage example: <partials-renderer partial-id="Reavaliacao-1"></partials-renderer
 	                        </div>
 	                    </div>
 	                </div>
+	                
 	            </div>
 	        </div>
 	    </div>