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 53645fef..de3079e4 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/partials/Habitos-1.html
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/partials/Habitos-1.html
@@ -81,7 +81,7 @@ usage example: <partials-renderer partial-id="Habitos-1"></partials-renderer>
 						<label class="control-label">Alimentação</label>						
 						<div class="radio">
 							<label> 
-								<input ng-model="editing.habitos.alimentacao_variada" ng-value="true" type="radio" /> 
+								<input ng-model="editing.habitos.alimentacao_tendenciosa" ng-value="false" type="radio" /> 
 								Variada
 							</label>
 						</div>
@@ -89,14 +89,14 @@ usage example: <partials-renderer partial-id="Habitos-1"></partials-renderer>
 							<div class="row">
 								<div class="col-md-4">
 									<label> 
-										<input ng-model="editing.habitos.alimentacao_variada" ng-value="false" type="radio" />
+										<input ng-model="editing.habitos.alimentacao_tendenciosa" ng-value="true" type="radio" />
 										Outra
 									</label>
 								</div>
 								<div class="col-md-8 p-l-none">
-									<div ng-show="!editing.habitos.alimentacao_variada" class="row">
+									<div ng-show="editing.habitos.alimentacao_tendenciosa" class="row">
 										<div class="col-md-12">
-						    				<textarea ng-model="editing.habitos.alimentacao_outra_detalhe" rows="3" class="form-control">
+						    				<textarea ng-model="editing.habitos.alimentacao_tendenciosa_detalhe" rows="3" class="form-control">
 	    									</textarea> 
 										</div>
 									</div>
@@ -110,9 +110,9 @@ usage example: <partials-renderer partial-id="Habitos-1"></partials-renderer>
 						<label class="control-label">Alcoólicos</label>
 						<div class="radio">
 							<label> 
-								<input ng-model="editing.habitos.alcoolicos_id"
+								<input ng-model="editing.habitos.habitos_alcoolicos_id"
 								name="rb-habitos-alcoolicos"
-								value="0" type="radio" /> 
+								value="1" type="radio" /> 
 								Nunca Bebeu
 							</label>
 						</div>
@@ -121,14 +121,14 @@ usage example: <partials-renderer partial-id="Habitos-1"></partials-renderer>
 							<div class="row">
 								<div class="col-md-5">
 									<label> 
-										<input ng-model="editing.habitos.alcoolicos_id" 										
+										<input ng-model="editing.habitos.habitos_alcoolicos_id" 										
 										name="rb-habitos-alcoolicos"											
-										value="1" type="radio" />
+										value="2" 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 ng-show="editing.habitos.habitos_alcoolicos_id == 2" class="row">
 										<div class="col-md-12">
 											<input ng-model="editing.habitos.alcoolicos_deixou_quando" type="text" class="form-control input-sm" />
 										</div>
@@ -141,14 +141,14 @@ usage example: <partials-renderer partial-id="Habitos-1"></partials-renderer>
 							<div class="row">
 								<div class="col-md-5">
 									<label> 
-										<input ng-model="editing.habitos.alcoolicos_id"
+										<input ng-model="editing.habitos.habitos_alcoolicos_id"
 										name="rb-habitos-alcoolicos"	
-										value="2" type="radio" />
+										value="3" type="radio" />
 										Bebe
 									</label>
 								</div>
 								<div class="col-md-7 p-l-none">
-									<div ng-show="editing.habitos.alcoolicos_id == 2" class="row">
+									<div ng-show="editing.habitos.habitos_alcoolicos_id == 3" class="row">
 										<div class="col-md-12">
 											<input ng-model="editing.habitos.alcoolicos_consome_detalhe" type="text" class="form-control input-sm" />
 										</div>
@@ -163,13 +163,13 @@ usage example: <partials-renderer partial-id="Habitos-1"></partials-renderer>
 				<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_id"
+								<input ng-model="editing.habitos.habitos_tabagicos_id"
 								name="rb-habitos-tabagicos"
-								value="0" type="radio" /> 
+								value="1" type="radio" /> 
 								Nunca Fumou
 							</label>
 						</div>
@@ -178,14 +178,14 @@ usage example: <partials-renderer partial-id="Habitos-1"></partials-renderer>
 							<div class="row">
 								<div class="col-md-5">
 									<label> 
-										<input ng-model="editing.habitos.tabagicos_id" 										
+										<input ng-model="editing.habitos.habitos_tabagicos_id" 										
 										name="rb-habitos-tabagicos"											
-										value="1" type="radio" />
+										value="2" type="radio" />
 										Deixou de Fumar no Ano
 									</label>
 								</div>
 								<div class="col-md-7 p-l-none">
-									<div ng-show="editing.habitos.tabagicos_id == 1" class="row">
+									<div ng-show="editing.habitos.habitos_tabagicos_id == 2" class="row">
 										<div class="col-md-12">
 											<input ng-model="editing.habitos.tabagicos_deixou_quando" type="text" class="form-control input-sm" />
 										</div>
@@ -198,16 +198,16 @@ usage example: <partials-renderer partial-id="Habitos-1"></partials-renderer>
 							<div class="row">
 								<div class="col-md-5">
 									<label> 
-										<input ng-model="editing.habitos.tabagicos_id"
+										<input ng-model="editing.habitos.habitos_tabagicos_id"
 										name="rb-habitos-tabagicos"	
-										value="2" type="radio" />
+										value="3" type="radio" />
 										Fuma
 									</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.habitos_tabagicos_id == 3" class="row">
 										<div class="col-md-12">
-											<input ng-model="editing.tabagicos_fuma_detalhe" type="text" class="form-control input-sm" />
+											<input ng-model="editing.habitos.tabagicos_fuma_detalhe" type="text" class="form-control input-sm" />
 										</div>
 									</div>
 								</div>
@@ -251,20 +251,20 @@ usage example: <partials-renderer partial-id="Habitos-1"></partials-renderer>
 					<div class="form-group">
 						<label class="control-label">Sono</label>
 						<div class="radio">
-							<label> <input ng-model="editing.habitos.sono_regular"
+							<label> <input ng-model="editing.habitos.sono_irregular"
 								name="rb_sono_regular" ng-value="false" type="radio" /> Regular
 							</label>
 						</div>
 						<div class="radio">
 							<div class="row">
 								<div class="col-md-5">
-									<label> <input ng-model="editing.habitos.sono_regular"
+									<label> <input ng-model="editing.habitos.sono_irregular"
 										name="rb_sono_regular" ng-value="true" type="radio" />
 										Irregular
 									</label>
 								</div>
 								<div class="col-md-7 p-l-none">
-									<div ng-show="editing.habitos.sono_regular" class="row">
+									<div ng-show="editing.habitos.sono_irregular" class="row">
 										<div class="col-md-12">
 											<input ng-model="editing.habitos.sono_irregular_detalhe"
 												type="text" class="form-control input-sm" />