diff --git a/trunk/SiprpWebFichasClinicas/properties/fichasclinicas.fichasclinicas.xml b/trunk/SiprpWebFichasClinicas/properties/fichasclinicas.fichasclinicas.xml
index 2736598e..4d7a0ab5 100644
--- a/trunk/SiprpWebFichasClinicas/properties/fichasclinicas.fichasclinicas.xml
+++ b/trunk/SiprpWebFichasClinicas/properties/fichasclinicas.fichasclinicas.xml
@@ -161,16 +161,41 @@
 		<class-name>FcFichaProblemasSolucoes</class-name>
 		<super-class-name />
 	</table>
+	<table>
+		<name>fc_habitos_alcoolicos</name>
+		<class-name>FcHabitosAlcoolicos</class-name>
+		<super-class-name />
+	</table>
+	<table>
+		<name>fc_habitos_tabagicos</name>
+		<class-name>FcHabitosTabagicos</class-name>
+		<super-class-name />
+	</table>
 	<table>
 		<name>fc_motivos</name>
 		<class-name>FcMotivos</class-name>
 		<super-class-name />
 	</table>
+	<table>
+		<name>fc_parecer</name>
+		<class-name>FcParecer</class-name>
+		<super-class-name />
+	</table>
+	<table>
+		<name>fc_periodicidade_exame</name>
+		<class-name>FcPeriodicidadeExame</class-name>
+		<super-class-name />
+	</table>
 	<table>
 		<name>fc_tipo_ficha</name>
 		<class-name>FcTipoFicha</class-name>
 		<super-class-name />
 	</table>
+	<table>
+		<name>fc_user_id__medico_id</name>
+		<class-name>FcUserIdMedicoId</class-name>
+		<super-class-name />
+	</table>
 	<table>
 		<name>nomes</name>
 		<class-name>Nomes</class-name>
diff --git a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/FcUserIdMedicoIdBeanData.java b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/FcUserIdMedicoIdBeanData.java
new file mode 100644
index 00000000..f1e0f4cc
--- /dev/null
+++ b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/FcUserIdMedicoIdBeanData.java
@@ -0,0 +1,16 @@
+package shst.medicina.fichasclinicas.beans.fichasclinicas;
+
+import shst.medicina.fichasclinicas.beans.fichasclinicas.inner.FcUserIdMedicoIdBean;
+
+public class FcUserIdMedicoIdBeanData extends FcUserIdMedicoIdBean
+{
+
+	private static final long serialVersionUID = 1L;
+
+	public FcUserIdMedicoIdBeanData()
+	{
+		super();
+	}
+
+}
+
diff --git a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/FcFichaAptidaoBean.java b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/FcFichaAptidaoBean.java
index a009cd86..ed9d0b28 100644
--- a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/FcFichaAptidaoBean.java
+++ b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/FcFichaAptidaoBean.java
@@ -22,6 +22,7 @@ public class FcFichaAptidaoBean implements Serializable
 	private String observacoes;
 	private String outras_recomendacoes;
 	private Date proximo_exame;
+	private Timestamp imported_stamp;
 
 	public FcFichaAptidaoBean()
 	{
@@ -39,6 +40,7 @@ public class FcFichaAptidaoBean implements Serializable
 		setObservacoes( (String)map.get( "observacoes") );
 		setOutras_recomendacoes( (String)map.get( "outras_recomendacoes") );
 		setProximo_exame( (Date)map.get( "proximo_exame") );
+		setImported_stamp( (Timestamp)map.get( "imported_stamp") );
 	}
 
 	public Map<String,Object> getMapData()
@@ -54,6 +56,7 @@ public class FcFichaAptidaoBean implements Serializable
 		map.put( "observacoes", getObservacoes() );
 		map.put( "outras_recomendacoes", getOutras_recomendacoes() );
 		map.put( "proximo_exame", getProximo_exame() );
+		map.put( "imported_stamp", getImported_stamp() );
 		return map;
 	}
 
@@ -157,5 +160,15 @@ public class FcFichaAptidaoBean implements Serializable
 		this.proximo_exame = proximo_exame;
 	}
 
+	public Timestamp getImported_stamp()
+	{
+		return this.imported_stamp;
+	}
+
+	public void setImported_stamp(Timestamp imported_stamp)
+	{
+		this.imported_stamp = imported_stamp;
+	}
+
 }
 
diff --git a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/FcHabitosAlcoolicosBean.java b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/FcHabitosAlcoolicosBean.java
index c5d069c6..53a74725 100644
--- a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/FcHabitosAlcoolicosBean.java
+++ b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/FcHabitosAlcoolicosBean.java
@@ -17,6 +17,7 @@ public class FcHabitosAlcoolicosBean implements Serializable
 	private String codigo;
 	private String descricao;
 	private Boolean tem_info_extra;
+	private Integer ordem;
 
 	public FcHabitosAlcoolicosBean()
 	{
@@ -30,6 +31,7 @@ public class FcHabitosAlcoolicosBean implements Serializable
 		setCodigo( (String)map.get( "codigo") );
 		setDescricao( (String)map.get( "descricao") );
 		setTem_info_extra( (Boolean)map.get( "tem_info_extra") );
+		setOrdem( (Integer)map.get( "ordem") );
 	}
 
 	public Map<String,Object> getMapData()
@@ -41,6 +43,7 @@ public class FcHabitosAlcoolicosBean implements Serializable
 		map.put( "codigo", getCodigo() );
 		map.put( "descricao", getDescricao() );
 		map.put( "tem_info_extra", getTem_info_extra() );
+		map.put( "ordem", getOrdem() );
 		return map;
 	}
 
@@ -104,5 +107,15 @@ public class FcHabitosAlcoolicosBean implements Serializable
 		this.tem_info_extra = tem_info_extra;
 	}
 
+	public Integer getOrdem()
+	{
+		return this.ordem;
+	}
+
+	public void setOrdem(Integer ordem)
+	{
+		this.ordem = ordem;
+	}
+
 }
 
diff --git a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/FcHabitosTabagicosBean.java b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/FcHabitosTabagicosBean.java
index 6dc19d50..bf45e480 100644
--- a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/FcHabitosTabagicosBean.java
+++ b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/FcHabitosTabagicosBean.java
@@ -17,6 +17,7 @@ public class FcHabitosTabagicosBean implements Serializable
 	private String codigo;
 	private String descricao;
 	private Boolean tem_info_extra;
+	private Integer ordem;
 
 	public FcHabitosTabagicosBean()
 	{
@@ -30,6 +31,7 @@ public class FcHabitosTabagicosBean implements Serializable
 		setCodigo( (String)map.get( "codigo") );
 		setDescricao( (String)map.get( "descricao") );
 		setTem_info_extra( (Boolean)map.get( "tem_info_extra") );
+		setOrdem( (Integer)map.get( "ordem") );
 	}
 
 	public Map<String,Object> getMapData()
@@ -41,6 +43,7 @@ public class FcHabitosTabagicosBean implements Serializable
 		map.put( "codigo", getCodigo() );
 		map.put( "descricao", getDescricao() );
 		map.put( "tem_info_extra", getTem_info_extra() );
+		map.put( "ordem", getOrdem() );
 		return map;
 	}
 
@@ -104,5 +107,15 @@ public class FcHabitosTabagicosBean implements Serializable
 		this.tem_info_extra = tem_info_extra;
 	}
 
+	public Integer getOrdem()
+	{
+		return this.ordem;
+	}
+
+	public void setOrdem(Integer ordem)
+	{
+		this.ordem = ordem;
+	}
+
 }
 
diff --git a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/FcParecerBean.java b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/FcParecerBean.java
index 92b4538c..bb0545bc 100644
--- a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/FcParecerBean.java
+++ b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/FcParecerBean.java
@@ -17,6 +17,7 @@ public class FcParecerBean implements Serializable
 	private String codigo;
 	private String descricao;
 	private Boolean tem_info_extra;
+	private Integer ordem;
 
 	public FcParecerBean()
 	{
@@ -30,6 +31,7 @@ public class FcParecerBean implements Serializable
 		setCodigo( (String)map.get( "codigo") );
 		setDescricao( (String)map.get( "descricao") );
 		setTem_info_extra( (Boolean)map.get( "tem_info_extra") );
+		setOrdem( (Integer)map.get( "ordem") );
 	}
 
 	public Map<String,Object> getMapData()
@@ -41,6 +43,7 @@ public class FcParecerBean implements Serializable
 		map.put( "codigo", getCodigo() );
 		map.put( "descricao", getDescricao() );
 		map.put( "tem_info_extra", getTem_info_extra() );
+		map.put( "ordem", getOrdem() );
 		return map;
 	}
 
@@ -104,5 +107,15 @@ public class FcParecerBean implements Serializable
 		this.tem_info_extra = tem_info_extra;
 	}
 
+	public Integer getOrdem()
+	{
+		return this.ordem;
+	}
+
+	public void setOrdem(Integer ordem)
+	{
+		this.ordem = ordem;
+	}
+
 }
 
diff --git a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/FcPeriodicidadeExameBean.java b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/FcPeriodicidadeExameBean.java
index dfbf845f..55aae165 100644
--- a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/FcPeriodicidadeExameBean.java
+++ b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/FcPeriodicidadeExameBean.java
@@ -17,6 +17,7 @@ public class FcPeriodicidadeExameBean implements Serializable
 	private String codigo;
 	private String descricao;
 	private Boolean tem_info_extra;
+	private Integer ordem;
 
 	public FcPeriodicidadeExameBean()
 	{
@@ -30,6 +31,7 @@ public class FcPeriodicidadeExameBean implements Serializable
 		setCodigo( (String)map.get( "codigo") );
 		setDescricao( (String)map.get( "descricao") );
 		setTem_info_extra( (Boolean)map.get( "tem_info_extra") );
+		setOrdem( (Integer)map.get( "ordem") );
 	}
 
 	public Map<String,Object> getMapData()
@@ -41,6 +43,7 @@ public class FcPeriodicidadeExameBean implements Serializable
 		map.put( "codigo", getCodigo() );
 		map.put( "descricao", getDescricao() );
 		map.put( "tem_info_extra", getTem_info_extra() );
+		map.put( "ordem", getOrdem() );
 		return map;
 	}
 
@@ -104,5 +107,15 @@ public class FcPeriodicidadeExameBean implements Serializable
 		this.tem_info_extra = tem_info_extra;
 	}
 
+	public Integer getOrdem()
+	{
+		return this.ordem;
+	}
+
+	public void setOrdem(Integer ordem)
+	{
+		this.ordem = ordem;
+	}
+
 }
 
diff --git a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/FcTipoFichaBean.java b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/FcTipoFichaBean.java
index f687c30e..42e248e1 100644
--- a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/FcTipoFichaBean.java
+++ b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/FcTipoFichaBean.java
@@ -16,6 +16,7 @@ public class FcTipoFichaBean implements Serializable
 	private Timestamp deleted_stamp;
 	private String codigo;
 	private String descricao;
+	private Integer ordem;
 
 	public FcTipoFichaBean()
 	{
@@ -28,6 +29,7 @@ public class FcTipoFichaBean implements Serializable
 		setDeleted_stamp( (Timestamp)map.get( "deleted_stamp") );
 		setCodigo( (String)map.get( "codigo") );
 		setDescricao( (String)map.get( "descricao") );
+		setOrdem( (Integer)map.get( "ordem") );
 	}
 
 	public Map<String,Object> getMapData()
@@ -38,6 +40,7 @@ public class FcTipoFichaBean implements Serializable
 		map.put( "deleted_stamp", getDeleted_stamp() );
 		map.put( "codigo", getCodigo() );
 		map.put( "descricao", getDescricao() );
+		map.put( "ordem", getOrdem() );
 		return map;
 	}
 
@@ -91,5 +94,15 @@ public class FcTipoFichaBean implements Serializable
 		this.descricao = descricao;
 	}
 
+	public Integer getOrdem()
+	{
+		return this.ordem;
+	}
+
+	public void setOrdem(Integer ordem)
+	{
+		this.ordem = ordem;
+	}
+
 }
 
diff --git a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/FcUserIdMedicoIdBean.java b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/FcUserIdMedicoIdBean.java
new file mode 100644
index 00000000..ec429475
--- /dev/null
+++ b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/FcUserIdMedicoIdBean.java
@@ -0,0 +1,82 @@
+package shst.medicina.fichasclinicas.beans.fichasclinicas.inner;
+
+import java.sql.Timestamp;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+@javax.xml.bind.annotation.XmlAccessorType(javax.xml.bind.annotation.XmlAccessType.FIELD)
+
+public class FcUserIdMedicoIdBean implements Serializable
+{
+
+	private static final long serialVersionUID = 1L;
+	private Integer id;
+	private Integer user_id;
+	private Integer medico_id;
+	private Timestamp deleted_stamp;
+
+	public FcUserIdMedicoIdBean()
+	{
+	}
+
+	public void setMapData(Map<String,Object> map)
+	{
+		setId( (Integer)map.get( "id") );
+		setUser_id( (Integer)map.get( "user_id") );
+		setMedico_id( (Integer)map.get( "medico_id") );
+		setDeleted_stamp( (Timestamp)map.get( "deleted_stamp") );
+	}
+
+	public Map<String,Object> getMapData()
+	{
+		Map<String,Object> map = new HashMap<String,Object>();
+		map.put( "id", getId() );
+		map.put( "user_id", getUser_id() );
+		map.put( "medico_id", getMedico_id() );
+		map.put( "deleted_stamp", getDeleted_stamp() );
+		return map;
+	}
+
+	public Integer getId()
+	{
+		return this.id;
+	}
+
+	public void setId(Integer id)
+	{
+		this.id = id;
+	}
+
+	public Integer getUser_id()
+	{
+		return this.user_id;
+	}
+
+	public void setUser_id(Integer user_id)
+	{
+		this.user_id = user_id;
+	}
+
+	public Integer getMedico_id()
+	{
+		return this.medico_id;
+	}
+
+	public void setMedico_id(Integer medico_id)
+	{
+		this.medico_id = medico_id;
+	}
+
+	public Timestamp getDeleted_stamp()
+	{
+		return this.deleted_stamp;
+	}
+
+	public void setDeleted_stamp(Timestamp deleted_stamp)
+	{
+		this.deleted_stamp = deleted_stamp;
+	}
+
+}
+
diff --git a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/TrbEstadoCivilBean.java b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/TrbEstadoCivilBean.java
index fdb352f0..0a2431b5 100644
--- a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/TrbEstadoCivilBean.java
+++ b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/TrbEstadoCivilBean.java
@@ -16,6 +16,7 @@ public class TrbEstadoCivilBean implements Serializable
 	private Timestamp deleted_stamp;
 	private String codigo;
 	private String descricao;
+	private Integer ordem;
 
 	public TrbEstadoCivilBean()
 	{
@@ -28,6 +29,7 @@ public class TrbEstadoCivilBean implements Serializable
 		setDeleted_stamp( (Timestamp)map.get( "deleted_stamp") );
 		setCodigo( (String)map.get( "codigo") );
 		setDescricao( (String)map.get( "descricao") );
+		setOrdem( (Integer)map.get( "ordem") );
 	}
 
 	public Map<String,Object> getMapData()
@@ -38,6 +40,7 @@ public class TrbEstadoCivilBean implements Serializable
 		map.put( "deleted_stamp", getDeleted_stamp() );
 		map.put( "codigo", getCodigo() );
 		map.put( "descricao", getDescricao() );
+		map.put( "ordem", getOrdem() );
 		return map;
 	}
 
@@ -91,5 +94,15 @@ public class TrbEstadoCivilBean implements Serializable
 		this.descricao = descricao;
 	}
 
+	public Integer getOrdem()
+	{
+		return this.ordem;
+	}
+
+	public void setOrdem(Integer ordem)
+	{
+		this.ordem = ordem;
+	}
+
 }
 
diff --git a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/TrbHabilitacoesBean.java b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/TrbHabilitacoesBean.java
index a4f3d9c0..59fac4b2 100644
--- a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/TrbHabilitacoesBean.java
+++ b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/TrbHabilitacoesBean.java
@@ -17,6 +17,7 @@ public class TrbHabilitacoesBean implements Serializable
 	private String codigo;
 	private String descricao;
 	private Boolean tem_info_extra;
+	private Integer ordem;
 
 	public TrbHabilitacoesBean()
 	{
@@ -30,6 +31,7 @@ public class TrbHabilitacoesBean implements Serializable
 		setCodigo( (String)map.get( "codigo") );
 		setDescricao( (String)map.get( "descricao") );
 		setTem_info_extra( (Boolean)map.get( "tem_info_extra") );
+		setOrdem( (Integer)map.get( "ordem") );
 	}
 
 	public Map<String,Object> getMapData()
@@ -41,6 +43,7 @@ public class TrbHabilitacoesBean implements Serializable
 		map.put( "codigo", getCodigo() );
 		map.put( "descricao", getDescricao() );
 		map.put( "tem_info_extra", getTem_info_extra() );
+		map.put( "ordem", getOrdem() );
 		return map;
 	}
 
@@ -104,5 +107,15 @@ public class TrbHabilitacoesBean implements Serializable
 		this.tem_info_extra = tem_info_extra;
 	}
 
+	public Integer getOrdem()
+	{
+		return this.ordem;
+	}
+
+	public void setOrdem(Integer ordem)
+	{
+		this.ordem = ordem;
+	}
+
 }
 
diff --git a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/package.xml b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/package.xml
index 5fd5c874..6eed6193 100644
--- a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/package.xml
+++ b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/beans/fichasclinicas/inner/package.xml
@@ -1438,6 +1438,10 @@
 			<column name="proximo_exame"/>
 			<extension vendor-name="evolute" key="java-type" value="Date"/>
 		</field>
+		<field name="imported_stamp">
+			<column name="imported_stamp"/>
+			<extension vendor-name="evolute" key="java-type" value="Timestamp"/>
+		</field>
 	</class>
 	<class name="FcFichaClassificacaoIndividualSaude" identity-type="application" table="fc_ficha_classificacao_individual_saude" >
 		<extension vendor-name="evolute" key="import" value="java.sql.Timestamp"/>
@@ -2243,6 +2247,10 @@
 			<column name="tem_info_extra"/>
 			<extension vendor-name="evolute" key="java-type" value="Boolean"/>
 		</field>
+		<field name="ordem">
+			<column name="ordem"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+		</field>
 	</class>
 	<class name="FcHabitosTabagicos" identity-type="application" table="fc_habitos_tabagicos" >
 		<extension vendor-name="evolute" key="import" value="java.sql.Timestamp"/>
@@ -2272,6 +2280,10 @@
 			<column name="tem_info_extra"/>
 			<extension vendor-name="evolute" key="java-type" value="Boolean"/>
 		</field>
+		<field name="ordem">
+			<column name="ordem"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+		</field>
 	</class>
 	<class name="FcMotivos" identity-type="application" table="fc_motivos" >
 		<extension vendor-name="evolute" key="import" value="java.sql.Timestamp"/>
@@ -2334,6 +2346,10 @@
 			<column name="tem_info_extra"/>
 			<extension vendor-name="evolute" key="java-type" value="Boolean"/>
 		</field>
+		<field name="ordem">
+			<column name="ordem"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+		</field>
 	</class>
 	<class name="FcPeriodicidadeExame" identity-type="application" table="fc_periodicidade_exame" >
 		<extension vendor-name="evolute" key="import" value="java.sql.Timestamp"/>
@@ -2363,6 +2379,10 @@
 			<column name="tem_info_extra"/>
 			<extension vendor-name="evolute" key="java-type" value="Boolean"/>
 		</field>
+		<field name="ordem">
+			<column name="ordem"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+		</field>
 	</class>
 	<class name="FcTipoFicha" identity-type="application" table="fc_tipo_ficha" >
 		<extension vendor-name="evolute" key="import" value="java.sql.Timestamp"/>
@@ -2388,6 +2408,32 @@
 			<column name="descricao" length="1024"/>
 			<extension vendor-name="evolute" key="java-type" value="String"/>
 		</field>
+		<field name="ordem">
+			<column name="ordem"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+		</field>
+	</class>
+	<class name="FcUserIdMedicoId" identity-type="application" table="fc_user_id__medico_id" >
+		<extension vendor-name="evolute" key="import" value="java.sql.Timestamp"/>
+		<field name="id" primary-key="true" null-value="exception" value-strategy="sequence" sequence="fc_user_id__medico_id_id_seq">
+			<column name="id"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+			<extension vendor-name="evolute" key="visible" value="false"/>
+		</field>
+		<field name="user_id" null-value="exception">
+			<column name="user_id"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+			<extension vendor-name="evolute" key="referenced-table" value="evo_usr_user"/>
+			<extension vendor-name="evolute" key="referenced-column" value="id"/>
+		</field>
+		<field name="medico_id" null-value="exception">
+			<column name="medico_id"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+		</field>
+		<field name="deleted_stamp">
+			<column name="deleted_stamp"/>
+			<extension vendor-name="evolute" key="java-type" value="Timestamp"/>
+		</field>
 	</class>
 	<class name="Nomes" identity-type="application" table="nomes" >
 		<field name="id" primary-key="true" null-value="exception" value-strategy="sequence" sequence="nomes_id_seq">
@@ -2436,6 +2482,10 @@
 			<column name="descricao" length="512"/>
 			<extension vendor-name="evolute" key="java-type" value="String"/>
 		</field>
+		<field name="ordem">
+			<column name="ordem"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+		</field>
 	</class>
 	<class name="TrbHabilitacoes" identity-type="application" table="trb_habilitacoes" >
 		<extension vendor-name="evolute" key="import" value="java.sql.Timestamp"/>
@@ -2465,6 +2515,10 @@
 			<column name="tem_info_extra"/>
 			<extension vendor-name="evolute" key="java-type" value="Boolean"/>
 		</field>
+		<field name="ordem">
+			<column name="ordem"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+		</field>
 	</class>
 	<class name="Version" identity-type="application" table="version" >
 		<field name="id" primary-key="true" null-value="exception" value-strategy="sequence" sequence="version_id_seq">
diff --git a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/FcUserIdMedicoIdData.java b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/FcUserIdMedicoIdData.java
new file mode 100644
index 00000000..7d7d537f
--- /dev/null
+++ b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/FcUserIdMedicoIdData.java
@@ -0,0 +1,18 @@
+/*
+* FcUserIdMedicoIdData.java
+*
+* Generated by com.evutils.codegen.EntityObjectGenerator
+*
+* Edit at will
+*/
+package shst.medicina.fichasclinicas.data.fichasclinicas;
+
+
+public final class FcUserIdMedicoIdData extends shst.medicina.fichasclinicas.data.fichasclinicas.inner.FcUserIdMedicoId
+{
+
+	public FcUserIdMedicoIdData()
+	{
+		super();
+	}
+}
diff --git a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/EvoUsrUser.java b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/EvoUsrUser.java
index a7def7d4..1222aabd 100644
--- a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/EvoUsrUser.java
+++ b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/EvoUsrUser.java
@@ -332,6 +332,23 @@ public class EvoUsrUser extends com.evolute.entity.evo.EvoDataObject<com.evolute
 		return result;
 	}
 
+	public java.util.List<shst.medicina.fichasclinicas.data.fichasclinicas.FcUserIdMedicoIdData>fromFcUserIdMedicoId_user_id()
+	{
+		java.util.List<shst.medicina.fichasclinicas.data.fichasclinicas.FcUserIdMedicoIdData> result = new java.util.LinkedList< shst.medicina.fichasclinicas.data.fichasclinicas.FcUserIdMedicoIdData >();
+		if ( getPrimaryKey() != null ) 
+		{
+			try
+			{
+				result = fromReference( shst.medicina.fichasclinicas.data.fichasclinicas.FcUserIdMedicoIdData.class , getPrimaryKey().getMap().get("id"), "user_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
+		}
+		return result;
+	}
+
 	public java.util.List<shst.medicina.fichasclinicas.data.fichasclinicas.WebRegisterRequestData>fromWebRegisterRequest_user_id()
 	{
 		java.util.List<shst.medicina.fichasclinicas.data.fichasclinicas.WebRegisterRequestData> result = new java.util.LinkedList< shst.medicina.fichasclinicas.data.fichasclinicas.WebRegisterRequestData >();
diff --git a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/FcFichaAptidao.java b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/FcFichaAptidao.java
index ed09860a..38c2c301 100644
--- a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/FcFichaAptidao.java
+++ b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/FcFichaAptidao.java
@@ -37,6 +37,8 @@ public class FcFichaAptidao extends com.evolute.entity.evo.EvoDataObject<com.evo
 		FIELD_INDEXES.put( FcFichaAptidao.OUTRAS_RECOMENDACOES_FULL, FcFichaAptidao.OUTRAS_RECOMENDACOES_INDEX );
 		FIELD_INDEXES.put( FcFichaAptidao.PROXIMO_EXAME, FcFichaAptidao.PROXIMO_EXAME_INDEX );
 		FIELD_INDEXES.put( FcFichaAptidao.PROXIMO_EXAME_FULL, FcFichaAptidao.PROXIMO_EXAME_INDEX );
+		FIELD_INDEXES.put( FcFichaAptidao.IMPORTED_STAMP, FcFichaAptidao.IMPORTED_STAMP_INDEX );
+		FIELD_INDEXES.put( FcFichaAptidao.IMPORTED_STAMP_FULL, FcFichaAptidao.IMPORTED_STAMP_INDEX );
 	}
 
 	private final java.util.HashMap< String, Boolean > LAZY_LOADED_OBJECTS = new java.util.HashMap< String, Boolean >();
@@ -78,21 +80,24 @@ public class FcFichaAptidao extends com.evolute.entity.evo.EvoDataObject<com.evo
 	public static final String PROXIMO_EXAME = "proximo_exame";
 	public static final String PROXIMO_EXAME_FULL = "fc_ficha_aptidao.proximo_exame";
 	public static final int PROXIMO_EXAME_INDEX = 9;
+	public static final String IMPORTED_STAMP = "imported_stamp";
+	public static final String IMPORTED_STAMP_FULL = "fc_ficha_aptidao.imported_stamp";
+	public static final int IMPORTED_STAMP_INDEX = 10;
 
 	public static final String FIELD_NAMES[] = new String[]{
 		CREATED_STAMP, CREATED_USER_ID, CREATED_USER_NAME, DELETED_STAMP, 
 		DELETED_USER_ID, DELETED_USER_NAME, OBSERVACOES, OUTRAS_RECOMENDACOES, 
-		PROXIMO_EXAME, };
+		PROXIMO_EXAME, IMPORTED_STAMP, };
 
 	public static final String FIELD_NAMES_FULL[] = new String[]{
 		TABLENAME + "." + CREATED_STAMP, TABLENAME + "." + CREATED_USER_ID, TABLENAME + "." + CREATED_USER_NAME, TABLENAME + "." + DELETED_STAMP, 
 		TABLENAME + "." + DELETED_USER_ID, TABLENAME + "." + DELETED_USER_NAME, TABLENAME + "." + OBSERVACOES, TABLENAME + "." + OUTRAS_RECOMENDACOES, 
-		TABLENAME + "." + PROXIMO_EXAME, };
+		TABLENAME + "." + PROXIMO_EXAME, TABLENAME + "." + IMPORTED_STAMP, };
 
 	protected static final String DB_FIELD_NAMES[] = new String[]{
 		ID, CREATED_STAMP, CREATED_USER_ID, CREATED_USER_NAME, DELETED_STAMP, 
 		DELETED_USER_ID, DELETED_USER_NAME, OBSERVACOES, OUTRAS_RECOMENDACOES, 
-		PROXIMO_EXAME, };
+		PROXIMO_EXAME, IMPORTED_STAMP, };
 
 
 	protected static final String PK_FIELD_NAMES[] = new String[]{
@@ -101,7 +106,7 @@ public class FcFichaAptidao extends com.evolute.entity.evo.EvoDataObject<com.evo
 
 	public static final String DEFAULT_LOAD_SET[] = new String[] {
 		ID, CREATED_STAMP, CREATED_USER_ID, CREATED_USER_NAME, DELETED_STAMP, 
-		DELETED_USER_ID, DELETED_USER_NAME, PROXIMO_EXAME, };
+		DELETED_USER_ID, DELETED_USER_NAME, PROXIMO_EXAME, IMPORTED_STAMP, };
 
 	private Integer id;
 	private Timestamp created_stamp;
@@ -113,6 +118,7 @@ public class FcFichaAptidao extends com.evolute.entity.evo.EvoDataObject<com.evo
 	private String observacoes;
 	private String outras_recomendacoes;
 	private Date proximo_exame;
+	private Timestamp imported_stamp;
 
 	protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey;
 
@@ -120,7 +126,7 @@ public class FcFichaAptidao extends com.evolute.entity.evo.EvoDataObject<com.evo
 	{
 		super();
 		dirtyProperties = new boolean[]{ false, false, false, 
-			false, false, false, false, false, false, false };
+			false, false, false, false, false, false, false, false };
 	}
 
 	public Integer getId()
@@ -432,6 +438,34 @@ public class FcFichaAptidao extends com.evolute.entity.evo.EvoDataObject<com.evo
 		LAZY_LOADED_OBJECTS.put( PROXIMO_EXAME, Boolean.TRUE );
 	}
 
+	public Timestamp getImported_stamp()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( IMPORTED_STAMP );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.imported_stamp;
+	}
+
+	public void setImported_stamp( Timestamp imported_stamp )
+	{
+		try
+		{
+			preProcess( IMPORTED_STAMP, imported_stamp );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.imported_stamp = imported_stamp;
+		LAZY_LOADED_OBJECTS.put( IMPORTED_STAMP, Boolean.TRUE );
+	}
+
 	public Object get( String fieldName )
 	{
 		Object value = null;
@@ -468,6 +502,9 @@ public class FcFichaAptidao extends com.evolute.entity.evo.EvoDataObject<com.evo
 			case FcFichaAptidao.PROXIMO_EXAME_INDEX:
 				value = getProximo_exame();
 				break;
+			case FcFichaAptidao.IMPORTED_STAMP_INDEX:
+				value = getImported_stamp();
+				break;
 		}
 		return value;
 	}
@@ -508,6 +545,9 @@ public class FcFichaAptidao extends com.evolute.entity.evo.EvoDataObject<com.evo
 			case FcFichaAptidao.PROXIMO_EXAME_INDEX:
 				value = this.proximo_exame;
 				break;
+			case FcFichaAptidao.IMPORTED_STAMP_INDEX:
+				value = this.imported_stamp;
+				break;
 		}
 		return value;
 	}
@@ -547,6 +587,9 @@ public class FcFichaAptidao extends com.evolute.entity.evo.EvoDataObject<com.evo
 			case FcFichaAptidao.PROXIMO_EXAME_INDEX:
 				setProximo_exame( ( Date ) value );
 				break;
+			case FcFichaAptidao.IMPORTED_STAMP_INDEX:
+				setImported_stamp( ( Timestamp ) value );
+				break;
 		}
 	}
 
@@ -585,6 +628,9 @@ public class FcFichaAptidao extends com.evolute.entity.evo.EvoDataObject<com.evo
 			case FcFichaAptidao.PROXIMO_EXAME_INDEX:
 				this.proximo_exame = ( Date ) value;
 				break;
+			case FcFichaAptidao.IMPORTED_STAMP_INDEX:
+				this.imported_stamp = ( Timestamp ) value;
+				break;
 		}
 	}
 
@@ -654,6 +700,9 @@ public class FcFichaAptidao extends com.evolute.entity.evo.EvoDataObject<com.evo
 			case FcFichaAptidao.PROXIMO_EXAME_INDEX:
 				theClass = Date.class;
 				break;
+			case FcFichaAptidao.IMPORTED_STAMP_INDEX:
+				theClass = Timestamp.class;
+				break;
 		}
 		return theClass;
 	}
diff --git a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/FcHabitosAlcoolicos.java b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/FcHabitosAlcoolicos.java
index 3e335bd4..f04ab0c9 100644
--- a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/FcHabitosAlcoolicos.java
+++ b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/FcHabitosAlcoolicos.java
@@ -28,6 +28,8 @@ public class FcHabitosAlcoolicos extends com.evolute.entity.evo.EvoDataObject<co
 		FIELD_INDEXES.put( FcHabitosAlcoolicos.DESCRICAO_FULL, FcHabitosAlcoolicos.DESCRICAO_INDEX );
 		FIELD_INDEXES.put( FcHabitosAlcoolicos.TEM_INFO_EXTRA, FcHabitosAlcoolicos.TEM_INFO_EXTRA_INDEX );
 		FIELD_INDEXES.put( FcHabitosAlcoolicos.TEM_INFO_EXTRA_FULL, FcHabitosAlcoolicos.TEM_INFO_EXTRA_INDEX );
+		FIELD_INDEXES.put( FcHabitosAlcoolicos.ORDEM, FcHabitosAlcoolicos.ORDEM_INDEX );
+		FIELD_INDEXES.put( FcHabitosAlcoolicos.ORDEM_FULL, FcHabitosAlcoolicos.ORDEM_INDEX );
 	}
 
 	private final java.util.HashMap< String, Boolean > LAZY_LOADED_OBJECTS = new java.util.HashMap< String, Boolean >();
@@ -57,15 +59,18 @@ public class FcHabitosAlcoolicos extends com.evolute.entity.evo.EvoDataObject<co
 	public static final String TEM_INFO_EXTRA = "tem_info_extra";
 	public static final String TEM_INFO_EXTRA_FULL = "fc_habitos_alcoolicos.tem_info_extra";
 	public static final int TEM_INFO_EXTRA_INDEX = 5;
+	public static final String ORDEM = "ordem";
+	public static final String ORDEM_FULL = "fc_habitos_alcoolicos.ordem";
+	public static final int ORDEM_INDEX = 6;
 
 	public static final String FIELD_NAMES[] = new String[]{
-		CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, TEM_INFO_EXTRA, };
+		CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, TEM_INFO_EXTRA, ORDEM, };
 
 	public static final String FIELD_NAMES_FULL[] = new String[]{
-		TABLENAME + "." + CREATED_STAMP, TABLENAME + "." + DELETED_STAMP, TABLENAME + "." + CODIGO, TABLENAME + "." + DESCRICAO, TABLENAME + "." + TEM_INFO_EXTRA, };
+		TABLENAME + "." + CREATED_STAMP, TABLENAME + "." + DELETED_STAMP, TABLENAME + "." + CODIGO, TABLENAME + "." + DESCRICAO, TABLENAME + "." + TEM_INFO_EXTRA, TABLENAME + "." + ORDEM, };
 
 	protected static final String DB_FIELD_NAMES[] = new String[]{
-		ID, CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, TEM_INFO_EXTRA, };
+		ID, CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, TEM_INFO_EXTRA, ORDEM, };
 
 
 	protected static final String PK_FIELD_NAMES[] = new String[]{
@@ -73,7 +78,7 @@ public class FcHabitosAlcoolicos extends com.evolute.entity.evo.EvoDataObject<co
 
 
 	public static final String DEFAULT_LOAD_SET[] = new String[] {
-		ID, CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, TEM_INFO_EXTRA, };
+		ID, CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, TEM_INFO_EXTRA, ORDEM, };
 
 	private Integer id;
 	private Timestamp created_stamp;
@@ -81,6 +86,7 @@ public class FcHabitosAlcoolicos extends com.evolute.entity.evo.EvoDataObject<co
 	private String codigo;
 	private String descricao;
 	private Boolean tem_info_extra;
+	private Integer ordem;
 
 	protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey;
 
@@ -88,7 +94,7 @@ public class FcHabitosAlcoolicos extends com.evolute.entity.evo.EvoDataObject<co
 	{
 		super();
 		dirtyProperties = new boolean[]{ false, false, false, 
-			false, false, false };
+			false, false, false, false };
 	}
 
 	public Integer getId()
@@ -276,6 +282,34 @@ public class FcHabitosAlcoolicos extends com.evolute.entity.evo.EvoDataObject<co
 		LAZY_LOADED_OBJECTS.put( TEM_INFO_EXTRA, Boolean.TRUE );
 	}
 
+	public Integer getOrdem()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( ORDEM );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.ordem;
+	}
+
+	public void setOrdem( Integer ordem )
+	{
+		try
+		{
+			preProcess( ORDEM, ordem );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.ordem = ordem;
+		LAZY_LOADED_OBJECTS.put( ORDEM, Boolean.TRUE );
+	}
+
 	public Object get( String fieldName )
 	{
 		Object value = null;
@@ -300,6 +334,9 @@ public class FcHabitosAlcoolicos extends com.evolute.entity.evo.EvoDataObject<co
 			case FcHabitosAlcoolicos.TEM_INFO_EXTRA_INDEX:
 				value = getTem_info_extra();
 				break;
+			case FcHabitosAlcoolicos.ORDEM_INDEX:
+				value = getOrdem();
+				break;
 		}
 		return value;
 	}
@@ -328,6 +365,9 @@ public class FcHabitosAlcoolicos extends com.evolute.entity.evo.EvoDataObject<co
 			case FcHabitosAlcoolicos.TEM_INFO_EXTRA_INDEX:
 				value = this.tem_info_extra;
 				break;
+			case FcHabitosAlcoolicos.ORDEM_INDEX:
+				value = this.ordem;
+				break;
 		}
 		return value;
 	}
@@ -355,6 +395,9 @@ public class FcHabitosAlcoolicos extends com.evolute.entity.evo.EvoDataObject<co
 			case FcHabitosAlcoolicos.TEM_INFO_EXTRA_INDEX:
 				setTem_info_extra( ( Boolean ) value );
 				break;
+			case FcHabitosAlcoolicos.ORDEM_INDEX:
+				setOrdem( ( Integer ) value );
+				break;
 		}
 	}
 
@@ -381,6 +424,9 @@ public class FcHabitosAlcoolicos extends com.evolute.entity.evo.EvoDataObject<co
 			case FcHabitosAlcoolicos.TEM_INFO_EXTRA_INDEX:
 				this.tem_info_extra = ( Boolean ) value;
 				break;
+			case FcHabitosAlcoolicos.ORDEM_INDEX:
+				this.ordem = ( Integer ) value;
+				break;
 		}
 	}
 
@@ -438,6 +484,9 @@ public class FcHabitosAlcoolicos extends com.evolute.entity.evo.EvoDataObject<co
 			case FcHabitosAlcoolicos.TEM_INFO_EXTRA_INDEX:
 				theClass = Boolean.class;
 				break;
+			case FcHabitosAlcoolicos.ORDEM_INDEX:
+				theClass = Integer.class;
+				break;
 		}
 		return theClass;
 	}
diff --git a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/FcHabitosTabagicos.java b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/FcHabitosTabagicos.java
index 503dbd9b..fde85657 100644
--- a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/FcHabitosTabagicos.java
+++ b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/FcHabitosTabagicos.java
@@ -28,6 +28,8 @@ public class FcHabitosTabagicos extends com.evolute.entity.evo.EvoDataObject<com
 		FIELD_INDEXES.put( FcHabitosTabagicos.DESCRICAO_FULL, FcHabitosTabagicos.DESCRICAO_INDEX );
 		FIELD_INDEXES.put( FcHabitosTabagicos.TEM_INFO_EXTRA, FcHabitosTabagicos.TEM_INFO_EXTRA_INDEX );
 		FIELD_INDEXES.put( FcHabitosTabagicos.TEM_INFO_EXTRA_FULL, FcHabitosTabagicos.TEM_INFO_EXTRA_INDEX );
+		FIELD_INDEXES.put( FcHabitosTabagicos.ORDEM, FcHabitosTabagicos.ORDEM_INDEX );
+		FIELD_INDEXES.put( FcHabitosTabagicos.ORDEM_FULL, FcHabitosTabagicos.ORDEM_INDEX );
 	}
 
 	private final java.util.HashMap< String, Boolean > LAZY_LOADED_OBJECTS = new java.util.HashMap< String, Boolean >();
@@ -57,15 +59,18 @@ public class FcHabitosTabagicos extends com.evolute.entity.evo.EvoDataObject<com
 	public static final String TEM_INFO_EXTRA = "tem_info_extra";
 	public static final String TEM_INFO_EXTRA_FULL = "fc_habitos_tabagicos.tem_info_extra";
 	public static final int TEM_INFO_EXTRA_INDEX = 5;
+	public static final String ORDEM = "ordem";
+	public static final String ORDEM_FULL = "fc_habitos_tabagicos.ordem";
+	public static final int ORDEM_INDEX = 6;
 
 	public static final String FIELD_NAMES[] = new String[]{
-		CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, TEM_INFO_EXTRA, };
+		CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, TEM_INFO_EXTRA, ORDEM, };
 
 	public static final String FIELD_NAMES_FULL[] = new String[]{
-		TABLENAME + "." + CREATED_STAMP, TABLENAME + "." + DELETED_STAMP, TABLENAME + "." + CODIGO, TABLENAME + "." + DESCRICAO, TABLENAME + "." + TEM_INFO_EXTRA, };
+		TABLENAME + "." + CREATED_STAMP, TABLENAME + "." + DELETED_STAMP, TABLENAME + "." + CODIGO, TABLENAME + "." + DESCRICAO, TABLENAME + "." + TEM_INFO_EXTRA, TABLENAME + "." + ORDEM, };
 
 	protected static final String DB_FIELD_NAMES[] = new String[]{
-		ID, CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, TEM_INFO_EXTRA, };
+		ID, CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, TEM_INFO_EXTRA, ORDEM, };
 
 
 	protected static final String PK_FIELD_NAMES[] = new String[]{
@@ -73,7 +78,7 @@ public class FcHabitosTabagicos extends com.evolute.entity.evo.EvoDataObject<com
 
 
 	public static final String DEFAULT_LOAD_SET[] = new String[] {
-		ID, CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, TEM_INFO_EXTRA, };
+		ID, CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, TEM_INFO_EXTRA, ORDEM, };
 
 	private Integer id;
 	private Timestamp created_stamp;
@@ -81,6 +86,7 @@ public class FcHabitosTabagicos extends com.evolute.entity.evo.EvoDataObject<com
 	private String codigo;
 	private String descricao;
 	private Boolean tem_info_extra;
+	private Integer ordem;
 
 	protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey;
 
@@ -88,7 +94,7 @@ public class FcHabitosTabagicos extends com.evolute.entity.evo.EvoDataObject<com
 	{
 		super();
 		dirtyProperties = new boolean[]{ false, false, false, 
-			false, false, false };
+			false, false, false, false };
 	}
 
 	public Integer getId()
@@ -276,6 +282,34 @@ public class FcHabitosTabagicos extends com.evolute.entity.evo.EvoDataObject<com
 		LAZY_LOADED_OBJECTS.put( TEM_INFO_EXTRA, Boolean.TRUE );
 	}
 
+	public Integer getOrdem()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( ORDEM );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.ordem;
+	}
+
+	public void setOrdem( Integer ordem )
+	{
+		try
+		{
+			preProcess( ORDEM, ordem );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.ordem = ordem;
+		LAZY_LOADED_OBJECTS.put( ORDEM, Boolean.TRUE );
+	}
+
 	public Object get( String fieldName )
 	{
 		Object value = null;
@@ -300,6 +334,9 @@ public class FcHabitosTabagicos extends com.evolute.entity.evo.EvoDataObject<com
 			case FcHabitosTabagicos.TEM_INFO_EXTRA_INDEX:
 				value = getTem_info_extra();
 				break;
+			case FcHabitosTabagicos.ORDEM_INDEX:
+				value = getOrdem();
+				break;
 		}
 		return value;
 	}
@@ -328,6 +365,9 @@ public class FcHabitosTabagicos extends com.evolute.entity.evo.EvoDataObject<com
 			case FcHabitosTabagicos.TEM_INFO_EXTRA_INDEX:
 				value = this.tem_info_extra;
 				break;
+			case FcHabitosTabagicos.ORDEM_INDEX:
+				value = this.ordem;
+				break;
 		}
 		return value;
 	}
@@ -355,6 +395,9 @@ public class FcHabitosTabagicos extends com.evolute.entity.evo.EvoDataObject<com
 			case FcHabitosTabagicos.TEM_INFO_EXTRA_INDEX:
 				setTem_info_extra( ( Boolean ) value );
 				break;
+			case FcHabitosTabagicos.ORDEM_INDEX:
+				setOrdem( ( Integer ) value );
+				break;
 		}
 	}
 
@@ -381,6 +424,9 @@ public class FcHabitosTabagicos extends com.evolute.entity.evo.EvoDataObject<com
 			case FcHabitosTabagicos.TEM_INFO_EXTRA_INDEX:
 				this.tem_info_extra = ( Boolean ) value;
 				break;
+			case FcHabitosTabagicos.ORDEM_INDEX:
+				this.ordem = ( Integer ) value;
+				break;
 		}
 	}
 
@@ -438,6 +484,9 @@ public class FcHabitosTabagicos extends com.evolute.entity.evo.EvoDataObject<com
 			case FcHabitosTabagicos.TEM_INFO_EXTRA_INDEX:
 				theClass = Boolean.class;
 				break;
+			case FcHabitosTabagicos.ORDEM_INDEX:
+				theClass = Integer.class;
+				break;
 		}
 		return theClass;
 	}
diff --git a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/FcParecer.java b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/FcParecer.java
index baa5e0d2..b98e5245 100644
--- a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/FcParecer.java
+++ b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/FcParecer.java
@@ -28,6 +28,8 @@ public class FcParecer extends com.evolute.entity.evo.EvoDataObject<com.evolute.
 		FIELD_INDEXES.put( FcParecer.DESCRICAO_FULL, FcParecer.DESCRICAO_INDEX );
 		FIELD_INDEXES.put( FcParecer.TEM_INFO_EXTRA, FcParecer.TEM_INFO_EXTRA_INDEX );
 		FIELD_INDEXES.put( FcParecer.TEM_INFO_EXTRA_FULL, FcParecer.TEM_INFO_EXTRA_INDEX );
+		FIELD_INDEXES.put( FcParecer.ORDEM, FcParecer.ORDEM_INDEX );
+		FIELD_INDEXES.put( FcParecer.ORDEM_FULL, FcParecer.ORDEM_INDEX );
 	}
 
 	private final java.util.HashMap< String, Boolean > LAZY_LOADED_OBJECTS = new java.util.HashMap< String, Boolean >();
@@ -57,15 +59,18 @@ public class FcParecer extends com.evolute.entity.evo.EvoDataObject<com.evolute.
 	public static final String TEM_INFO_EXTRA = "tem_info_extra";
 	public static final String TEM_INFO_EXTRA_FULL = "fc_parecer.tem_info_extra";
 	public static final int TEM_INFO_EXTRA_INDEX = 5;
+	public static final String ORDEM = "ordem";
+	public static final String ORDEM_FULL = "fc_parecer.ordem";
+	public static final int ORDEM_INDEX = 6;
 
 	public static final String FIELD_NAMES[] = new String[]{
-		CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, TEM_INFO_EXTRA, };
+		CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, TEM_INFO_EXTRA, ORDEM, };
 
 	public static final String FIELD_NAMES_FULL[] = new String[]{
-		TABLENAME + "." + CREATED_STAMP, TABLENAME + "." + DELETED_STAMP, TABLENAME + "." + CODIGO, TABLENAME + "." + DESCRICAO, TABLENAME + "." + TEM_INFO_EXTRA, };
+		TABLENAME + "." + CREATED_STAMP, TABLENAME + "." + DELETED_STAMP, TABLENAME + "." + CODIGO, TABLENAME + "." + DESCRICAO, TABLENAME + "." + TEM_INFO_EXTRA, TABLENAME + "." + ORDEM, };
 
 	protected static final String DB_FIELD_NAMES[] = new String[]{
-		ID, CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, TEM_INFO_EXTRA, };
+		ID, CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, TEM_INFO_EXTRA, ORDEM, };
 
 
 	protected static final String PK_FIELD_NAMES[] = new String[]{
@@ -73,7 +78,7 @@ public class FcParecer extends com.evolute.entity.evo.EvoDataObject<com.evolute.
 
 
 	public static final String DEFAULT_LOAD_SET[] = new String[] {
-		ID, CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, TEM_INFO_EXTRA, };
+		ID, CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, TEM_INFO_EXTRA, ORDEM, };
 
 	private Integer id;
 	private Timestamp created_stamp;
@@ -81,6 +86,7 @@ public class FcParecer extends com.evolute.entity.evo.EvoDataObject<com.evolute.
 	private String codigo;
 	private String descricao;
 	private Boolean tem_info_extra;
+	private Integer ordem;
 
 	protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey;
 
@@ -88,7 +94,7 @@ public class FcParecer extends com.evolute.entity.evo.EvoDataObject<com.evolute.
 	{
 		super();
 		dirtyProperties = new boolean[]{ false, false, false, 
-			false, false, false };
+			false, false, false, false };
 	}
 
 	public Integer getId()
@@ -276,6 +282,34 @@ public class FcParecer extends com.evolute.entity.evo.EvoDataObject<com.evolute.
 		LAZY_LOADED_OBJECTS.put( TEM_INFO_EXTRA, Boolean.TRUE );
 	}
 
+	public Integer getOrdem()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( ORDEM );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.ordem;
+	}
+
+	public void setOrdem( Integer ordem )
+	{
+		try
+		{
+			preProcess( ORDEM, ordem );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.ordem = ordem;
+		LAZY_LOADED_OBJECTS.put( ORDEM, Boolean.TRUE );
+	}
+
 	public Object get( String fieldName )
 	{
 		Object value = null;
@@ -300,6 +334,9 @@ public class FcParecer extends com.evolute.entity.evo.EvoDataObject<com.evolute.
 			case FcParecer.TEM_INFO_EXTRA_INDEX:
 				value = getTem_info_extra();
 				break;
+			case FcParecer.ORDEM_INDEX:
+				value = getOrdem();
+				break;
 		}
 		return value;
 	}
@@ -328,6 +365,9 @@ public class FcParecer extends com.evolute.entity.evo.EvoDataObject<com.evolute.
 			case FcParecer.TEM_INFO_EXTRA_INDEX:
 				value = this.tem_info_extra;
 				break;
+			case FcParecer.ORDEM_INDEX:
+				value = this.ordem;
+				break;
 		}
 		return value;
 	}
@@ -355,6 +395,9 @@ public class FcParecer extends com.evolute.entity.evo.EvoDataObject<com.evolute.
 			case FcParecer.TEM_INFO_EXTRA_INDEX:
 				setTem_info_extra( ( Boolean ) value );
 				break;
+			case FcParecer.ORDEM_INDEX:
+				setOrdem( ( Integer ) value );
+				break;
 		}
 	}
 
@@ -381,6 +424,9 @@ public class FcParecer extends com.evolute.entity.evo.EvoDataObject<com.evolute.
 			case FcParecer.TEM_INFO_EXTRA_INDEX:
 				this.tem_info_extra = ( Boolean ) value;
 				break;
+			case FcParecer.ORDEM_INDEX:
+				this.ordem = ( Integer ) value;
+				break;
 		}
 	}
 
@@ -438,6 +484,9 @@ public class FcParecer extends com.evolute.entity.evo.EvoDataObject<com.evolute.
 			case FcParecer.TEM_INFO_EXTRA_INDEX:
 				theClass = Boolean.class;
 				break;
+			case FcParecer.ORDEM_INDEX:
+				theClass = Integer.class;
+				break;
 		}
 		return theClass;
 	}
diff --git a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/FcPeriodicidadeExame.java b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/FcPeriodicidadeExame.java
index fc7d2fc4..9b8f5117 100644
--- a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/FcPeriodicidadeExame.java
+++ b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/FcPeriodicidadeExame.java
@@ -28,6 +28,8 @@ public class FcPeriodicidadeExame extends com.evolute.entity.evo.EvoDataObject<c
 		FIELD_INDEXES.put( FcPeriodicidadeExame.DESCRICAO_FULL, FcPeriodicidadeExame.DESCRICAO_INDEX );
 		FIELD_INDEXES.put( FcPeriodicidadeExame.TEM_INFO_EXTRA, FcPeriodicidadeExame.TEM_INFO_EXTRA_INDEX );
 		FIELD_INDEXES.put( FcPeriodicidadeExame.TEM_INFO_EXTRA_FULL, FcPeriodicidadeExame.TEM_INFO_EXTRA_INDEX );
+		FIELD_INDEXES.put( FcPeriodicidadeExame.ORDEM, FcPeriodicidadeExame.ORDEM_INDEX );
+		FIELD_INDEXES.put( FcPeriodicidadeExame.ORDEM_FULL, FcPeriodicidadeExame.ORDEM_INDEX );
 	}
 
 	private final java.util.HashMap< String, Boolean > LAZY_LOADED_OBJECTS = new java.util.HashMap< String, Boolean >();
@@ -57,15 +59,18 @@ public class FcPeriodicidadeExame extends com.evolute.entity.evo.EvoDataObject<c
 	public static final String TEM_INFO_EXTRA = "tem_info_extra";
 	public static final String TEM_INFO_EXTRA_FULL = "fc_periodicidade_exame.tem_info_extra";
 	public static final int TEM_INFO_EXTRA_INDEX = 5;
+	public static final String ORDEM = "ordem";
+	public static final String ORDEM_FULL = "fc_periodicidade_exame.ordem";
+	public static final int ORDEM_INDEX = 6;
 
 	public static final String FIELD_NAMES[] = new String[]{
-		CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, TEM_INFO_EXTRA, };
+		CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, TEM_INFO_EXTRA, ORDEM, };
 
 	public static final String FIELD_NAMES_FULL[] = new String[]{
-		TABLENAME + "." + CREATED_STAMP, TABLENAME + "." + DELETED_STAMP, TABLENAME + "." + CODIGO, TABLENAME + "." + DESCRICAO, TABLENAME + "." + TEM_INFO_EXTRA, };
+		TABLENAME + "." + CREATED_STAMP, TABLENAME + "." + DELETED_STAMP, TABLENAME + "." + CODIGO, TABLENAME + "." + DESCRICAO, TABLENAME + "." + TEM_INFO_EXTRA, TABLENAME + "." + ORDEM, };
 
 	protected static final String DB_FIELD_NAMES[] = new String[]{
-		ID, CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, TEM_INFO_EXTRA, };
+		ID, CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, TEM_INFO_EXTRA, ORDEM, };
 
 
 	protected static final String PK_FIELD_NAMES[] = new String[]{
@@ -73,7 +78,7 @@ public class FcPeriodicidadeExame extends com.evolute.entity.evo.EvoDataObject<c
 
 
 	public static final String DEFAULT_LOAD_SET[] = new String[] {
-		ID, CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, TEM_INFO_EXTRA, };
+		ID, CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, TEM_INFO_EXTRA, ORDEM, };
 
 	private Integer id;
 	private Timestamp created_stamp;
@@ -81,6 +86,7 @@ public class FcPeriodicidadeExame extends com.evolute.entity.evo.EvoDataObject<c
 	private String codigo;
 	private String descricao;
 	private Boolean tem_info_extra;
+	private Integer ordem;
 
 	protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey;
 
@@ -88,7 +94,7 @@ public class FcPeriodicidadeExame extends com.evolute.entity.evo.EvoDataObject<c
 	{
 		super();
 		dirtyProperties = new boolean[]{ false, false, false, 
-			false, false, false };
+			false, false, false, false };
 	}
 
 	public Integer getId()
@@ -276,6 +282,34 @@ public class FcPeriodicidadeExame extends com.evolute.entity.evo.EvoDataObject<c
 		LAZY_LOADED_OBJECTS.put( TEM_INFO_EXTRA, Boolean.TRUE );
 	}
 
+	public Integer getOrdem()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( ORDEM );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.ordem;
+	}
+
+	public void setOrdem( Integer ordem )
+	{
+		try
+		{
+			preProcess( ORDEM, ordem );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.ordem = ordem;
+		LAZY_LOADED_OBJECTS.put( ORDEM, Boolean.TRUE );
+	}
+
 	public Object get( String fieldName )
 	{
 		Object value = null;
@@ -300,6 +334,9 @@ public class FcPeriodicidadeExame extends com.evolute.entity.evo.EvoDataObject<c
 			case FcPeriodicidadeExame.TEM_INFO_EXTRA_INDEX:
 				value = getTem_info_extra();
 				break;
+			case FcPeriodicidadeExame.ORDEM_INDEX:
+				value = getOrdem();
+				break;
 		}
 		return value;
 	}
@@ -328,6 +365,9 @@ public class FcPeriodicidadeExame extends com.evolute.entity.evo.EvoDataObject<c
 			case FcPeriodicidadeExame.TEM_INFO_EXTRA_INDEX:
 				value = this.tem_info_extra;
 				break;
+			case FcPeriodicidadeExame.ORDEM_INDEX:
+				value = this.ordem;
+				break;
 		}
 		return value;
 	}
@@ -355,6 +395,9 @@ public class FcPeriodicidadeExame extends com.evolute.entity.evo.EvoDataObject<c
 			case FcPeriodicidadeExame.TEM_INFO_EXTRA_INDEX:
 				setTem_info_extra( ( Boolean ) value );
 				break;
+			case FcPeriodicidadeExame.ORDEM_INDEX:
+				setOrdem( ( Integer ) value );
+				break;
 		}
 	}
 
@@ -381,6 +424,9 @@ public class FcPeriodicidadeExame extends com.evolute.entity.evo.EvoDataObject<c
 			case FcPeriodicidadeExame.TEM_INFO_EXTRA_INDEX:
 				this.tem_info_extra = ( Boolean ) value;
 				break;
+			case FcPeriodicidadeExame.ORDEM_INDEX:
+				this.ordem = ( Integer ) value;
+				break;
 		}
 	}
 
@@ -438,6 +484,9 @@ public class FcPeriodicidadeExame extends com.evolute.entity.evo.EvoDataObject<c
 			case FcPeriodicidadeExame.TEM_INFO_EXTRA_INDEX:
 				theClass = Boolean.class;
 				break;
+			case FcPeriodicidadeExame.ORDEM_INDEX:
+				theClass = Integer.class;
+				break;
 		}
 		return theClass;
 	}
diff --git a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/FcTipoFicha.java b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/FcTipoFicha.java
index fcc33de6..48a4b55b 100644
--- a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/FcTipoFicha.java
+++ b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/FcTipoFicha.java
@@ -26,6 +26,8 @@ public class FcTipoFicha extends com.evolute.entity.evo.EvoDataObject<com.evolut
 		FIELD_INDEXES.put( FcTipoFicha.CODIGO_FULL, FcTipoFicha.CODIGO_INDEX );
 		FIELD_INDEXES.put( FcTipoFicha.DESCRICAO, FcTipoFicha.DESCRICAO_INDEX );
 		FIELD_INDEXES.put( FcTipoFicha.DESCRICAO_FULL, FcTipoFicha.DESCRICAO_INDEX );
+		FIELD_INDEXES.put( FcTipoFicha.ORDEM, FcTipoFicha.ORDEM_INDEX );
+		FIELD_INDEXES.put( FcTipoFicha.ORDEM_FULL, FcTipoFicha.ORDEM_INDEX );
 	}
 
 	private final java.util.HashMap< String, Boolean > LAZY_LOADED_OBJECTS = new java.util.HashMap< String, Boolean >();
@@ -52,15 +54,18 @@ public class FcTipoFicha extends com.evolute.entity.evo.EvoDataObject<com.evolut
 	public static final String DESCRICAO = "descricao";
 	public static final String DESCRICAO_FULL = "fc_tipo_ficha.descricao";
 	public static final int DESCRICAO_INDEX = 4;
+	public static final String ORDEM = "ordem";
+	public static final String ORDEM_FULL = "fc_tipo_ficha.ordem";
+	public static final int ORDEM_INDEX = 5;
 
 	public static final String FIELD_NAMES[] = new String[]{
-		CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, };
+		CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, ORDEM, };
 
 	public static final String FIELD_NAMES_FULL[] = new String[]{
-		TABLENAME + "." + CREATED_STAMP, TABLENAME + "." + DELETED_STAMP, TABLENAME + "." + CODIGO, TABLENAME + "." + DESCRICAO, };
+		TABLENAME + "." + CREATED_STAMP, TABLENAME + "." + DELETED_STAMP, TABLENAME + "." + CODIGO, TABLENAME + "." + DESCRICAO, TABLENAME + "." + ORDEM, };
 
 	protected static final String DB_FIELD_NAMES[] = new String[]{
-		ID, CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, };
+		ID, CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, ORDEM, };
 
 
 	protected static final String PK_FIELD_NAMES[] = new String[]{
@@ -68,13 +73,14 @@ public class FcTipoFicha extends com.evolute.entity.evo.EvoDataObject<com.evolut
 
 
 	public static final String DEFAULT_LOAD_SET[] = new String[] {
-		ID, CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, };
+		ID, CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, ORDEM, };
 
 	private Integer id;
 	private Timestamp created_stamp;
 	private Timestamp deleted_stamp;
 	private String codigo;
 	private String descricao;
+	private Integer ordem;
 
 	protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey;
 
@@ -82,7 +88,7 @@ public class FcTipoFicha extends com.evolute.entity.evo.EvoDataObject<com.evolut
 	{
 		super();
 		dirtyProperties = new boolean[]{ false, false, false, 
-			false, false };
+			false, false, false };
 	}
 
 	public Integer getId()
@@ -242,6 +248,34 @@ public class FcTipoFicha extends com.evolute.entity.evo.EvoDataObject<com.evolut
 		LAZY_LOADED_OBJECTS.put( DESCRICAO, Boolean.TRUE );
 	}
 
+	public Integer getOrdem()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( ORDEM );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.ordem;
+	}
+
+	public void setOrdem( Integer ordem )
+	{
+		try
+		{
+			preProcess( ORDEM, ordem );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.ordem = ordem;
+		LAZY_LOADED_OBJECTS.put( ORDEM, Boolean.TRUE );
+	}
+
 	public Object get( String fieldName )
 	{
 		Object value = null;
@@ -263,6 +297,9 @@ public class FcTipoFicha extends com.evolute.entity.evo.EvoDataObject<com.evolut
 			case FcTipoFicha.DESCRICAO_INDEX:
 				value = getDescricao();
 				break;
+			case FcTipoFicha.ORDEM_INDEX:
+				value = getOrdem();
+				break;
 		}
 		return value;
 	}
@@ -288,6 +325,9 @@ public class FcTipoFicha extends com.evolute.entity.evo.EvoDataObject<com.evolut
 			case FcTipoFicha.DESCRICAO_INDEX:
 				value = this.descricao;
 				break;
+			case FcTipoFicha.ORDEM_INDEX:
+				value = this.ordem;
+				break;
 		}
 		return value;
 	}
@@ -312,6 +352,9 @@ public class FcTipoFicha extends com.evolute.entity.evo.EvoDataObject<com.evolut
 			case FcTipoFicha.DESCRICAO_INDEX:
 				setDescricao( ( String ) value );
 				break;
+			case FcTipoFicha.ORDEM_INDEX:
+				setOrdem( ( Integer ) value );
+				break;
 		}
 	}
 
@@ -335,6 +378,9 @@ public class FcTipoFicha extends com.evolute.entity.evo.EvoDataObject<com.evolut
 			case FcTipoFicha.DESCRICAO_INDEX:
 				this.descricao = ( String ) value;
 				break;
+			case FcTipoFicha.ORDEM_INDEX:
+				this.ordem = ( Integer ) value;
+				break;
 		}
 	}
 
@@ -389,6 +435,9 @@ public class FcTipoFicha extends com.evolute.entity.evo.EvoDataObject<com.evolut
 			case FcTipoFicha.DESCRICAO_INDEX:
 				theClass = String.class;
 				break;
+			case FcTipoFicha.ORDEM_INDEX:
+				theClass = Integer.class;
+				break;
 		}
 		return theClass;
 	}
diff --git a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/FcUserIdMedicoId.java b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/FcUserIdMedicoId.java
new file mode 100644
index 00000000..8515e759
--- /dev/null
+++ b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/FcUserIdMedicoId.java
@@ -0,0 +1,443 @@
+/*
+* FcUserIdMedicoId.java
+*
+* Generated by com.evutils.codegen.EntityObjectGenerator
+*
+* Use but DON'T TOUCH
+* -> (can't touch this)
+*/
+package shst.medicina.fichasclinicas.data.fichasclinicas.inner;
+
+import java.sql.Timestamp;
+
+public class FcUserIdMedicoId extends com.evolute.entity.evo.EvoDataObject<com.evolute.entity.utils.IntegerPrimaryKey>
+{
+	private static final java.util.HashMap<String,Integer> FIELD_INDEXES = new java.util.HashMap<String,Integer>();
+
+	static
+	{
+		FIELD_INDEXES.put( FcUserIdMedicoId.ID, FcUserIdMedicoId.ID_INDEX );
+		FIELD_INDEXES.put( FcUserIdMedicoId.ID_FULL, FcUserIdMedicoId.ID_INDEX );
+		com.evolute.entity.evo.EvoDataObject.register( FcUserIdMedicoId.CLASS_IDENTIFIER, FcUserIdMedicoId.USER_ID, FcUserIdMedicoId.TO_USER_ID ); 
+		FIELD_INDEXES.put( FcUserIdMedicoId.USER_ID, FcUserIdMedicoId.USER_ID_INDEX );
+		FIELD_INDEXES.put( FcUserIdMedicoId.USER_ID_FULL, FcUserIdMedicoId.USER_ID_INDEX );
+		FIELD_INDEXES.put( FcUserIdMedicoId.TO_USER_ID, FcUserIdMedicoId.TO_USER_ID_INDEX );
+		FIELD_INDEXES.put( FcUserIdMedicoId.MEDICO_ID, FcUserIdMedicoId.MEDICO_ID_INDEX );
+		FIELD_INDEXES.put( FcUserIdMedicoId.MEDICO_ID_FULL, FcUserIdMedicoId.MEDICO_ID_INDEX );
+		FIELD_INDEXES.put( FcUserIdMedicoId.DELETED_STAMP, FcUserIdMedicoId.DELETED_STAMP_INDEX );
+		FIELD_INDEXES.put( FcUserIdMedicoId.DELETED_STAMP_FULL, FcUserIdMedicoId.DELETED_STAMP_INDEX );
+	}
+
+	private final java.util.HashMap< String, Boolean > LAZY_LOADED_OBJECTS = new java.util.HashMap< String, Boolean >();
+
+
+	public static final com.evolute.entity.ForeignKey ForeignKeyuser_idToevo_usr_user = 
+		new com.evolute.entity.ForeignKey( FcUserIdMedicoId.class, FcUserIdMedicoId.USER_ID, shst.medicina.fichasclinicas.data.fichasclinicas.EvoUsrUserData.class, shst.medicina.fichasclinicas.data.fichasclinicas.EvoUsrUserData.ID );
+
+	public static final String TABLENAME = "fc_user_id__medico_id";
+
+
+	public static final String CLASS_IDENTIFIER = "shst.medicina.fichasclinicas.data.fichasclinicas.inner.fc_user_id__medico_id";
+
+	public static final int _INVALID__INDEX = -1;
+	public static final String ID = "id";
+	public static final String ID_FULL = "fc_user_id__medico_id.id";
+	public static final int ID_INDEX = 0;
+	public static final String USER_ID = "user_id";
+	public static final String USER_ID_FULL = "fc_user_id__medico_id.user_id";
+	public static final int USER_ID_INDEX = 1;
+	public static final String TO_USER_ID = "to_user_id";
+	public static final String TO_USER_ID_FULL = "fc_user_id__medico_id.to_user_id";
+	public static final int TO_USER_ID_INDEX = 2;
+	public static final String MEDICO_ID = "medico_id";
+	public static final String MEDICO_ID_FULL = "fc_user_id__medico_id.medico_id";
+	public static final int MEDICO_ID_INDEX = 3;
+	public static final String DELETED_STAMP = "deleted_stamp";
+	public static final String DELETED_STAMP_FULL = "fc_user_id__medico_id.deleted_stamp";
+	public static final int DELETED_STAMP_INDEX = 4;
+
+	public static final String FIELD_NAMES[] = new String[]{
+		USER_ID, TO_USER_ID, MEDICO_ID, DELETED_STAMP, };
+
+	public static final String FIELD_NAMES_FULL[] = new String[]{
+		TABLENAME + "." + USER_ID, TABLENAME + "." + TO_USER_ID, TABLENAME + "." + MEDICO_ID, TABLENAME + "." + DELETED_STAMP, };
+
+	protected static final String DB_FIELD_NAMES[] = new String[]{
+		ID, USER_ID, MEDICO_ID, DELETED_STAMP, };
+
+
+	protected static final String PK_FIELD_NAMES[] = new String[]{
+		ID, };
+
+
+	public static final String DEFAULT_LOAD_SET[] = new String[] {
+		ID, USER_ID, MEDICO_ID, DELETED_STAMP, };
+
+	private Integer id;
+	private Integer user_id;
+	private shst.medicina.fichasclinicas.data.fichasclinicas.EvoUsrUserData to_user_id;
+	private Integer medico_id;
+	private Timestamp deleted_stamp;
+
+	protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey;
+
+	public FcUserIdMedicoId()
+	{
+		super();
+		dirtyProperties = new boolean[]{ false, false, false, 
+			false, false };
+	}
+
+	public Integer getId()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( ID );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.id;
+	}
+
+	public void setId( Integer id )
+	{
+		try
+		{
+			preProcess( ID, id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.id = id;
+		LAZY_LOADED_OBJECTS.put( ID, Boolean.TRUE );
+	}
+
+	public Integer getUser_id()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( USER_ID );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.user_id;
+	}
+
+	public void setUser_id( Integer user_id )
+	{
+		try
+		{
+			preProcess( USER_ID, user_id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.user_id = user_id;
+		LAZY_LOADED_OBJECTS.put( USER_ID, Boolean.TRUE );
+	}
+
+	public shst.medicina.fichasclinicas.data.fichasclinicas.EvoUsrUserData toUser_id()
+	{
+		try
+		{
+			prepare( TO_USER_ID );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		return this.to_user_id;
+	}
+
+	public void setToUser_id( shst.medicina.fichasclinicas.data.fichasclinicas.EvoUsrUserData to_user_id )
+	{
+		try
+		{
+			preProcess( TO_USER_ID, to_user_id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.to_user_id = to_user_id;
+	}
+
+	public Integer getMedico_id()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( MEDICO_ID );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.medico_id;
+	}
+
+	public void setMedico_id( Integer medico_id )
+	{
+		try
+		{
+			preProcess( MEDICO_ID, medico_id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.medico_id = medico_id;
+		LAZY_LOADED_OBJECTS.put( MEDICO_ID, Boolean.TRUE );
+	}
+
+	public Timestamp getDeleted_stamp()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( DELETED_STAMP );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.deleted_stamp;
+	}
+
+	public void setDeleted_stamp( Timestamp deleted_stamp )
+	{
+		try
+		{
+			preProcess( DELETED_STAMP, deleted_stamp );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.deleted_stamp = deleted_stamp;
+		LAZY_LOADED_OBJECTS.put( DELETED_STAMP, Boolean.TRUE );
+	}
+
+	public Object get( String fieldName )
+	{
+		Object value = null;
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case FcUserIdMedicoId.ID_INDEX:
+				value = getId();
+				break;
+			case FcUserIdMedicoId.USER_ID_INDEX:
+				value = getUser_id();
+				break;
+			case FcUserIdMedicoId.TO_USER_ID_INDEX:
+				value = toUser_id();
+				break;
+			case FcUserIdMedicoId.MEDICO_ID_INDEX:
+				value = getMedico_id();
+				break;
+			case FcUserIdMedicoId.DELETED_STAMP_INDEX:
+				value = getDeleted_stamp();
+				break;
+		}
+		return value;
+	}
+
+	public Object rawGet( String fieldName )
+	{
+		Object value = null;
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case FcUserIdMedicoId.ID_INDEX:
+				value = this.id;
+				break;
+			case FcUserIdMedicoId.USER_ID_INDEX:
+				value = this.user_id;
+				break;
+			case FcUserIdMedicoId.TO_USER_ID_INDEX:
+				value = this.to_user_id;
+				break;
+			case FcUserIdMedicoId.MEDICO_ID_INDEX:
+				value = this.medico_id;
+				break;
+			case FcUserIdMedicoId.DELETED_STAMP_INDEX:
+				value = this.deleted_stamp;
+				break;
+		}
+		return value;
+	}
+
+	public void set( String fieldName, Object value )
+	{
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case FcUserIdMedicoId.ID_INDEX:
+				setId( ( Integer ) value );
+				break;
+			case FcUserIdMedicoId.USER_ID_INDEX:
+				setUser_id( ( Integer ) value );
+				break;
+			case FcUserIdMedicoId.TO_USER_ID_INDEX:
+				setToUser_id( ( shst.medicina.fichasclinicas.data.fichasclinicas.EvoUsrUserData ) value );
+				break;
+			case FcUserIdMedicoId.MEDICO_ID_INDEX:
+				setMedico_id( ( Integer ) value );
+				break;
+			case FcUserIdMedicoId.DELETED_STAMP_INDEX:
+				setDeleted_stamp( ( Timestamp ) value );
+				break;
+		}
+	}
+
+	public void rawSet( String fieldName, Object value )
+	{
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case FcUserIdMedicoId.ID_INDEX:
+				this.id = ( Integer ) value;
+				break;
+			case FcUserIdMedicoId.USER_ID_INDEX:
+				this.user_id = ( Integer ) value;
+				break;
+			case FcUserIdMedicoId.TO_USER_ID_INDEX:
+				this.to_user_id = ( shst.medicina.fichasclinicas.data.fichasclinicas.EvoUsrUserData ) value;
+				break;
+			case FcUserIdMedicoId.MEDICO_ID_INDEX:
+				this.medico_id = ( Integer ) value;
+				break;
+			case FcUserIdMedicoId.DELETED_STAMP_INDEX:
+				this.deleted_stamp = ( Timestamp ) value;
+				break;
+		}
+	}
+
+	public String []getFieldNames()
+	{
+		return FIELD_NAMES;
+	}
+
+	public String []getFieldNamesFull()
+	{
+		return FIELD_NAMES_FULL;
+	}
+
+	public String []getDBFieldNames()
+	{
+		return DB_FIELD_NAMES;
+	}
+
+	public String []getPrimaryKeyNames()
+	{
+		return PK_FIELD_NAMES;
+	}
+
+	public String []getDefaultLoadSet()
+	{
+		return DEFAULT_LOAD_SET;
+	}
+
+	public String getPrimaryKeyName()
+	{
+		return PK_FIELD_NAMES[ 0 ];
+	}
+
+	public Class<?> getFieldClass( String fieldName )
+	{
+		Integer index = getFieldIndex( fieldName );
+		Class<?> theClass = null;
+		switch( index )
+		{
+			case FcUserIdMedicoId.ID_INDEX:
+				theClass = Integer.class;
+				break;
+			case FcUserIdMedicoId.USER_ID_INDEX:
+				theClass = Integer.class;
+				break;
+			case FcUserIdMedicoId.TO_USER_ID_INDEX:
+				theClass = shst.medicina.fichasclinicas.data.fichasclinicas.EvoUsrUserData.class;
+				break;
+			case FcUserIdMedicoId.MEDICO_ID_INDEX:
+				theClass = Integer.class;
+				break;
+			case FcUserIdMedicoId.DELETED_STAMP_INDEX:
+				theClass = Timestamp.class;
+				break;
+		}
+		return theClass;
+	}
+
+	public Integer getFieldIndex( String fieldName )
+	{
+		Integer index = FIELD_INDEXES.get( fieldName );
+		return index != null ? index : FcUserIdMedicoId._INVALID__INDEX;
+	}
+
+	public String getTableName()
+	{
+		return TABLENAME;
+	}
+
+	public String getClassIdentifier()
+	{
+		return CLASS_IDENTIFIER;
+	}
+
+	@Override
+	protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col )
+	{
+		if( primaryKey == null )
+		{
+			primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, FcUserIdMedicoId.PK_FIELD_NAMES );
+			Object idObject = array.get( row, col + 0 );
+			try
+			{
+				primaryKey.set( 0, ( Integer ) idObject );
+				setId( ( Integer ) idObject );
+			}
+			catch( ClassCastException ex )
+			{
+				if( idObject instanceof Number )
+				{
+					primaryKey.set( 0, ((Number)idObject).intValue() );
+					setId( ((Number)idObject).intValue() );
+				}
+				else {
+					throw ex;
+				}
+			}
+		}
+	}
+
+	@Override
+	public com.evolute.entity.utils.IntegerPrimaryKey getPrimaryKey()
+	{
+		return primaryKey;
+	}
+
+	public void initLazyLoadFields()
+	{
+	}
+
+	public boolean isPropertyLoaded( String fieldName )
+	{
+		if ( LAZY_LOADED_OBJECTS.get( fieldName ) == null )
+		{
+			return true;
+		}
+		else
+		{
+			return LAZY_LOADED_OBJECTS.get( fieldName );
+		}
+	}
+}
diff --git a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/TrbEstadoCivil.java b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/TrbEstadoCivil.java
index c25f5dba..ddbc72e8 100644
--- a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/TrbEstadoCivil.java
+++ b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/TrbEstadoCivil.java
@@ -26,6 +26,8 @@ public class TrbEstadoCivil extends com.evolute.entity.evo.EvoDataObject<com.evo
 		FIELD_INDEXES.put( TrbEstadoCivil.CODIGO_FULL, TrbEstadoCivil.CODIGO_INDEX );
 		FIELD_INDEXES.put( TrbEstadoCivil.DESCRICAO, TrbEstadoCivil.DESCRICAO_INDEX );
 		FIELD_INDEXES.put( TrbEstadoCivil.DESCRICAO_FULL, TrbEstadoCivil.DESCRICAO_INDEX );
+		FIELD_INDEXES.put( TrbEstadoCivil.ORDEM, TrbEstadoCivil.ORDEM_INDEX );
+		FIELD_INDEXES.put( TrbEstadoCivil.ORDEM_FULL, TrbEstadoCivil.ORDEM_INDEX );
 	}
 
 	private final java.util.HashMap< String, Boolean > LAZY_LOADED_OBJECTS = new java.util.HashMap< String, Boolean >();
@@ -52,15 +54,18 @@ public class TrbEstadoCivil extends com.evolute.entity.evo.EvoDataObject<com.evo
 	public static final String DESCRICAO = "descricao";
 	public static final String DESCRICAO_FULL = "trb_estado_civil.descricao";
 	public static final int DESCRICAO_INDEX = 4;
+	public static final String ORDEM = "ordem";
+	public static final String ORDEM_FULL = "trb_estado_civil.ordem";
+	public static final int ORDEM_INDEX = 5;
 
 	public static final String FIELD_NAMES[] = new String[]{
-		CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, };
+		CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, ORDEM, };
 
 	public static final String FIELD_NAMES_FULL[] = new String[]{
-		TABLENAME + "." + CREATED_STAMP, TABLENAME + "." + DELETED_STAMP, TABLENAME + "." + CODIGO, TABLENAME + "." + DESCRICAO, };
+		TABLENAME + "." + CREATED_STAMP, TABLENAME + "." + DELETED_STAMP, TABLENAME + "." + CODIGO, TABLENAME + "." + DESCRICAO, TABLENAME + "." + ORDEM, };
 
 	protected static final String DB_FIELD_NAMES[] = new String[]{
-		ID, CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, };
+		ID, CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, ORDEM, };
 
 
 	protected static final String PK_FIELD_NAMES[] = new String[]{
@@ -68,13 +73,14 @@ public class TrbEstadoCivil extends com.evolute.entity.evo.EvoDataObject<com.evo
 
 
 	public static final String DEFAULT_LOAD_SET[] = new String[] {
-		ID, CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, };
+		ID, CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, ORDEM, };
 
 	private Integer id;
 	private Timestamp created_stamp;
 	private Timestamp deleted_stamp;
 	private String codigo;
 	private String descricao;
+	private Integer ordem;
 
 	protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey;
 
@@ -82,7 +88,7 @@ public class TrbEstadoCivil extends com.evolute.entity.evo.EvoDataObject<com.evo
 	{
 		super();
 		dirtyProperties = new boolean[]{ false, false, false, 
-			false, false };
+			false, false, false };
 	}
 
 	public Integer getId()
@@ -242,6 +248,34 @@ public class TrbEstadoCivil extends com.evolute.entity.evo.EvoDataObject<com.evo
 		LAZY_LOADED_OBJECTS.put( DESCRICAO, Boolean.TRUE );
 	}
 
+	public Integer getOrdem()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( ORDEM );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.ordem;
+	}
+
+	public void setOrdem( Integer ordem )
+	{
+		try
+		{
+			preProcess( ORDEM, ordem );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.ordem = ordem;
+		LAZY_LOADED_OBJECTS.put( ORDEM, Boolean.TRUE );
+	}
+
 	public Object get( String fieldName )
 	{
 		Object value = null;
@@ -263,6 +297,9 @@ public class TrbEstadoCivil extends com.evolute.entity.evo.EvoDataObject<com.evo
 			case TrbEstadoCivil.DESCRICAO_INDEX:
 				value = getDescricao();
 				break;
+			case TrbEstadoCivil.ORDEM_INDEX:
+				value = getOrdem();
+				break;
 		}
 		return value;
 	}
@@ -288,6 +325,9 @@ public class TrbEstadoCivil extends com.evolute.entity.evo.EvoDataObject<com.evo
 			case TrbEstadoCivil.DESCRICAO_INDEX:
 				value = this.descricao;
 				break;
+			case TrbEstadoCivil.ORDEM_INDEX:
+				value = this.ordem;
+				break;
 		}
 		return value;
 	}
@@ -312,6 +352,9 @@ public class TrbEstadoCivil extends com.evolute.entity.evo.EvoDataObject<com.evo
 			case TrbEstadoCivil.DESCRICAO_INDEX:
 				setDescricao( ( String ) value );
 				break;
+			case TrbEstadoCivil.ORDEM_INDEX:
+				setOrdem( ( Integer ) value );
+				break;
 		}
 	}
 
@@ -335,6 +378,9 @@ public class TrbEstadoCivil extends com.evolute.entity.evo.EvoDataObject<com.evo
 			case TrbEstadoCivil.DESCRICAO_INDEX:
 				this.descricao = ( String ) value;
 				break;
+			case TrbEstadoCivil.ORDEM_INDEX:
+				this.ordem = ( Integer ) value;
+				break;
 		}
 	}
 
@@ -389,6 +435,9 @@ public class TrbEstadoCivil extends com.evolute.entity.evo.EvoDataObject<com.evo
 			case TrbEstadoCivil.DESCRICAO_INDEX:
 				theClass = String.class;
 				break;
+			case TrbEstadoCivil.ORDEM_INDEX:
+				theClass = Integer.class;
+				break;
 		}
 		return theClass;
 	}
diff --git a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/TrbHabilitacoes.java b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/TrbHabilitacoes.java
index e171e373..3a52323f 100644
--- a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/TrbHabilitacoes.java
+++ b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/TrbHabilitacoes.java
@@ -28,6 +28,8 @@ public class TrbHabilitacoes extends com.evolute.entity.evo.EvoDataObject<com.ev
 		FIELD_INDEXES.put( TrbHabilitacoes.DESCRICAO_FULL, TrbHabilitacoes.DESCRICAO_INDEX );
 		FIELD_INDEXES.put( TrbHabilitacoes.TEM_INFO_EXTRA, TrbHabilitacoes.TEM_INFO_EXTRA_INDEX );
 		FIELD_INDEXES.put( TrbHabilitacoes.TEM_INFO_EXTRA_FULL, TrbHabilitacoes.TEM_INFO_EXTRA_INDEX );
+		FIELD_INDEXES.put( TrbHabilitacoes.ORDEM, TrbHabilitacoes.ORDEM_INDEX );
+		FIELD_INDEXES.put( TrbHabilitacoes.ORDEM_FULL, TrbHabilitacoes.ORDEM_INDEX );
 	}
 
 	private final java.util.HashMap< String, Boolean > LAZY_LOADED_OBJECTS = new java.util.HashMap< String, Boolean >();
@@ -57,15 +59,18 @@ public class TrbHabilitacoes extends com.evolute.entity.evo.EvoDataObject<com.ev
 	public static final String TEM_INFO_EXTRA = "tem_info_extra";
 	public static final String TEM_INFO_EXTRA_FULL = "trb_habilitacoes.tem_info_extra";
 	public static final int TEM_INFO_EXTRA_INDEX = 5;
+	public static final String ORDEM = "ordem";
+	public static final String ORDEM_FULL = "trb_habilitacoes.ordem";
+	public static final int ORDEM_INDEX = 6;
 
 	public static final String FIELD_NAMES[] = new String[]{
-		CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, TEM_INFO_EXTRA, };
+		CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, TEM_INFO_EXTRA, ORDEM, };
 
 	public static final String FIELD_NAMES_FULL[] = new String[]{
-		TABLENAME + "." + CREATED_STAMP, TABLENAME + "." + DELETED_STAMP, TABLENAME + "." + CODIGO, TABLENAME + "." + DESCRICAO, TABLENAME + "." + TEM_INFO_EXTRA, };
+		TABLENAME + "." + CREATED_STAMP, TABLENAME + "." + DELETED_STAMP, TABLENAME + "." + CODIGO, TABLENAME + "." + DESCRICAO, TABLENAME + "." + TEM_INFO_EXTRA, TABLENAME + "." + ORDEM, };
 
 	protected static final String DB_FIELD_NAMES[] = new String[]{
-		ID, CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, TEM_INFO_EXTRA, };
+		ID, CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, TEM_INFO_EXTRA, ORDEM, };
 
 
 	protected static final String PK_FIELD_NAMES[] = new String[]{
@@ -73,7 +78,7 @@ public class TrbHabilitacoes extends com.evolute.entity.evo.EvoDataObject<com.ev
 
 
 	public static final String DEFAULT_LOAD_SET[] = new String[] {
-		ID, CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, TEM_INFO_EXTRA, };
+		ID, CREATED_STAMP, DELETED_STAMP, CODIGO, DESCRICAO, TEM_INFO_EXTRA, ORDEM, };
 
 	private Integer id;
 	private Timestamp created_stamp;
@@ -81,6 +86,7 @@ public class TrbHabilitacoes extends com.evolute.entity.evo.EvoDataObject<com.ev
 	private String codigo;
 	private String descricao;
 	private Boolean tem_info_extra;
+	private Integer ordem;
 
 	protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey;
 
@@ -88,7 +94,7 @@ public class TrbHabilitacoes extends com.evolute.entity.evo.EvoDataObject<com.ev
 	{
 		super();
 		dirtyProperties = new boolean[]{ false, false, false, 
-			false, false, false };
+			false, false, false, false };
 	}
 
 	public Integer getId()
@@ -276,6 +282,34 @@ public class TrbHabilitacoes extends com.evolute.entity.evo.EvoDataObject<com.ev
 		LAZY_LOADED_OBJECTS.put( TEM_INFO_EXTRA, Boolean.TRUE );
 	}
 
+	public Integer getOrdem()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( ORDEM );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.ordem;
+	}
+
+	public void setOrdem( Integer ordem )
+	{
+		try
+		{
+			preProcess( ORDEM, ordem );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.ordem = ordem;
+		LAZY_LOADED_OBJECTS.put( ORDEM, Boolean.TRUE );
+	}
+
 	public Object get( String fieldName )
 	{
 		Object value = null;
@@ -300,6 +334,9 @@ public class TrbHabilitacoes extends com.evolute.entity.evo.EvoDataObject<com.ev
 			case TrbHabilitacoes.TEM_INFO_EXTRA_INDEX:
 				value = getTem_info_extra();
 				break;
+			case TrbHabilitacoes.ORDEM_INDEX:
+				value = getOrdem();
+				break;
 		}
 		return value;
 	}
@@ -328,6 +365,9 @@ public class TrbHabilitacoes extends com.evolute.entity.evo.EvoDataObject<com.ev
 			case TrbHabilitacoes.TEM_INFO_EXTRA_INDEX:
 				value = this.tem_info_extra;
 				break;
+			case TrbHabilitacoes.ORDEM_INDEX:
+				value = this.ordem;
+				break;
 		}
 		return value;
 	}
@@ -355,6 +395,9 @@ public class TrbHabilitacoes extends com.evolute.entity.evo.EvoDataObject<com.ev
 			case TrbHabilitacoes.TEM_INFO_EXTRA_INDEX:
 				setTem_info_extra( ( Boolean ) value );
 				break;
+			case TrbHabilitacoes.ORDEM_INDEX:
+				setOrdem( ( Integer ) value );
+				break;
 		}
 	}
 
@@ -381,6 +424,9 @@ public class TrbHabilitacoes extends com.evolute.entity.evo.EvoDataObject<com.ev
 			case TrbHabilitacoes.TEM_INFO_EXTRA_INDEX:
 				this.tem_info_extra = ( Boolean ) value;
 				break;
+			case TrbHabilitacoes.ORDEM_INDEX:
+				this.ordem = ( Integer ) value;
+				break;
 		}
 	}
 
@@ -438,6 +484,9 @@ public class TrbHabilitacoes extends com.evolute.entity.evo.EvoDataObject<com.ev
 			case TrbHabilitacoes.TEM_INFO_EXTRA_INDEX:
 				theClass = Boolean.class;
 				break;
+			case TrbHabilitacoes.ORDEM_INDEX:
+				theClass = Integer.class;
+				break;
 		}
 		return theClass;
 	}
diff --git a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/package.xml b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/package.xml
index cb52c9c6..95be1149 100644
--- a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/package.xml
+++ b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/data/fichasclinicas/inner/package.xml
@@ -1438,6 +1438,10 @@
 			<column name="proximo_exame"/>
 			<extension vendor-name="evolute" key="java-type" value="Date"/>
 		</field>
+		<field name="imported_stamp">
+			<column name="imported_stamp"/>
+			<extension vendor-name="evolute" key="java-type" value="Timestamp"/>
+		</field>
 	</class>
 	<class name="FcFichaClassificacaoIndividualSaude" identity-type="application" table="fc_ficha_classificacao_individual_saude" >
 		<extension vendor-name="evolute" key="import" value="java.sql.Timestamp"/>
@@ -2243,6 +2247,10 @@
 			<column name="tem_info_extra"/>
 			<extension vendor-name="evolute" key="java-type" value="Boolean"/>
 		</field>
+		<field name="ordem">
+			<column name="ordem"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+		</field>
 	</class>
 	<class name="FcHabitosTabagicos" identity-type="application" table="fc_habitos_tabagicos" >
 		<extension vendor-name="evolute" key="import" value="java.sql.Timestamp"/>
@@ -2272,6 +2280,10 @@
 			<column name="tem_info_extra"/>
 			<extension vendor-name="evolute" key="java-type" value="Boolean"/>
 		</field>
+		<field name="ordem">
+			<column name="ordem"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+		</field>
 	</class>
 	<class name="FcMotivos" identity-type="application" table="fc_motivos" >
 		<extension vendor-name="evolute" key="import" value="java.sql.Timestamp"/>
@@ -2334,6 +2346,10 @@
 			<column name="tem_info_extra"/>
 			<extension vendor-name="evolute" key="java-type" value="Boolean"/>
 		</field>
+		<field name="ordem">
+			<column name="ordem"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+		</field>
 	</class>
 	<class name="FcPeriodicidadeExame" identity-type="application" table="fc_periodicidade_exame" >
 		<extension vendor-name="evolute" key="import" value="java.sql.Timestamp"/>
@@ -2363,6 +2379,10 @@
 			<column name="tem_info_extra"/>
 			<extension vendor-name="evolute" key="java-type" value="Boolean"/>
 		</field>
+		<field name="ordem">
+			<column name="ordem"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+		</field>
 	</class>
 	<class name="FcTipoFicha" identity-type="application" table="fc_tipo_ficha" >
 		<extension vendor-name="evolute" key="import" value="java.sql.Timestamp"/>
@@ -2388,6 +2408,32 @@
 			<column name="descricao" length="1024"/>
 			<extension vendor-name="evolute" key="java-type" value="String"/>
 		</field>
+		<field name="ordem">
+			<column name="ordem"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+		</field>
+	</class>
+	<class name="FcUserIdMedicoId" identity-type="application" table="fc_user_id__medico_id" >
+		<extension vendor-name="evolute" key="import" value="java.sql.Timestamp"/>
+		<field name="id" primary-key="true" null-value="exception" value-strategy="sequence" sequence="fc_user_id__medico_id_id_seq">
+			<column name="id"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+			<extension vendor-name="evolute" key="visible" value="false"/>
+		</field>
+		<field name="user_id" null-value="exception">
+			<column name="user_id"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+			<extension vendor-name="evolute" key="referenced-table" value="evo_usr_user"/>
+			<extension vendor-name="evolute" key="referenced-column" value="id"/>
+		</field>
+		<field name="medico_id" null-value="exception">
+			<column name="medico_id"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+		</field>
+		<field name="deleted_stamp">
+			<column name="deleted_stamp"/>
+			<extension vendor-name="evolute" key="java-type" value="Timestamp"/>
+		</field>
 	</class>
 	<class name="Nomes" identity-type="application" table="nomes" >
 		<field name="id" primary-key="true" null-value="exception" value-strategy="sequence" sequence="nomes_id_seq">
@@ -2436,6 +2482,10 @@
 			<column name="descricao" length="512"/>
 			<extension vendor-name="evolute" key="java-type" value="String"/>
 		</field>
+		<field name="ordem">
+			<column name="ordem"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+		</field>
 	</class>
 	<class name="TrbHabilitacoes" identity-type="application" table="trb_habilitacoes" >
 		<extension vendor-name="evolute" key="import" value="java.sql.Timestamp"/>
@@ -2465,6 +2515,10 @@
 			<column name="tem_info_extra"/>
 			<extension vendor-name="evolute" key="java-type" value="Boolean"/>
 		</field>
+		<field name="ordem">
+			<column name="ordem"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+		</field>
 	</class>
 	<class name="Version" identity-type="application" table="version" >
 		<field name="id" primary-key="true" null-value="exception" value-strategy="sequence" sequence="version_id_seq">
diff --git a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/provider/FichasClinicasDataProvider.java b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/provider/FichasClinicasDataProvider.java
index 34abfe5e..306d4df3 100644
--- a/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/provider/FichasClinicasDataProvider.java
+++ b/trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/provider/FichasClinicasDataProvider.java
@@ -93,7 +93,7 @@ public class FichasClinicasDataProvider
 
 		/* filtros  do utilizador */
 		
-		return  fichasProvidersBean.getENTITY_PROVIDER().listLoad(FcTipoFichaData.class, dataFilter, new String[]{FcTipoFichaData.DESCRICAO}, null);
+		return  fichasProvidersBean.getENTITY_PROVIDER().listLoad(FcTipoFichaData.class, dataFilter, new String[]{FcTipoFichaData.ORDEM}, null);
 		
 	}
 	
@@ -200,21 +200,21 @@ public class FichasClinicasDataProvider
 	{
 		Expression dataFilter  = new Field(TrbHabilitacoesData.DELETED_STAMP).isEqual(null);
 		
-		return fichasProvidersBean.getENTITY_PROVIDER().listLoad(TrbHabilitacoesData.class, dataFilter, new String[]{TrbHabilitacoesData.DESCRICAO}, null);
+		return fichasProvidersBean.getENTITY_PROVIDER().listLoad(TrbHabilitacoesData.class, dataFilter, new String[]{TrbHabilitacoesData.ORDEM}, null);
 	}
 
 	public List<TrbEstadoCivilData> getEstadosCivis() throws Exception
 	{
 		Expression dataFilter  = new Field(TrbEstadoCivilData.DELETED_STAMP).isEqual(null);
 		
-		return fichasProvidersBean.getENTITY_PROVIDER().listLoad(TrbEstadoCivilData.class, dataFilter, new String[]{TrbEstadoCivilData.DESCRICAO}, null);
+		return fichasProvidersBean.getENTITY_PROVIDER().listLoad(TrbEstadoCivilData.class, dataFilter, new String[]{TrbEstadoCivilData.ORDEM}, null);
 	}
 
 	public List<FcMotivosData> getMotivos(String prefix) throws Exception
 	{
 		Expression dataFilter  = new Field(FcMotivosData.DELETED_STAMP).isEqual(null).and(new Field("LEFT("+FcMotivosData.CODIGO+","+prefix.length()+")").isEqual(prefix));
 		
-		return fichasProvidersBean.getENTITY_PROVIDER().listLoad(FcMotivosData.class, dataFilter, new String[]{FcMotivosData.DESCRICAO}, null);
+		return fichasProvidersBean.getENTITY_PROVIDER().listLoad(FcMotivosData.class, dataFilter, new String[]{FcMotivosData.ORDEM}, null);
 	}
 
 	public FcFichaData getLastFicha(Integer trabalhadorID) throws Exception
@@ -237,12 +237,12 @@ public class FichasClinicasDataProvider
 
 	public List<FcHabitosTabagicosData> getHabitosTabagicos() throws Exception
 	{
-		return fichasProvidersBean.getENTITY_PROVIDER().listLoad(FcHabitosTabagicosData.class,(Expression)null,null,null);
+		return fichasProvidersBean.getENTITY_PROVIDER().listLoad(FcHabitosTabagicosData.class,(Expression)null,new String[]{FcHabitosTabagicosData.ORDEM},null);
 	}
 	
 	public List<FcHabitosAlcoolicosData> getHabitosAlcoolicos() throws Exception
 	{
-		return fichasProvidersBean.getENTITY_PROVIDER().listLoad(FcHabitosAlcoolicosData.class,(Expression)null,null,null);
+		return fichasProvidersBean.getENTITY_PROVIDER().listLoad(FcHabitosAlcoolicosData.class,(Expression)null,new String[]{FcHabitosAlcoolicosData.ORDEM},null);
 	}