diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormDirGerRh.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormDirGerRh.jsp
index 2c0c36f1..f0374089 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/FormDirGerRh.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/FormDirGerRh.jsp
@@ -105,7 +105,8 @@
                                                         sort="analise_nr" style="width: 10%" width="10%">
                                                         <ui:hyperlink action="#{FormDirGerRh.lnkNrSeg_action}" binding="#{FormDirGerRh.lnkNrSeg}" id="lnkNrSeg" text="#{currentRow.value['analise_nr']}"/>
                                                     </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormDirGerRh.tableColumn3}" headerText="POR" id="tableColumn3" width="10%">
+                                                    <ui:tableColumn binding="#{FormDirGerRh.tableColumn3}" headerText="POR" id="tableColumn3" width="10%"
+														sort="numero_mecanografico">
                                                         <ui:hyperlink action="#{FormDirGerRh.lnkPorSeg_action}" binding="#{FormDirGerRh.lnkPorSeg}"
                                                             id="lnkPorSeg" style="" text="#{currentRow.value['numero_mecanografico']}"/>
                                                     </ui:tableColumn>
@@ -114,16 +115,16 @@
                                                         <ui:hyperlink action="#{FormDirGerRh.lnkNomeAcidentadoSeg_action}"
                                                             binding="#{FormDirGerRh.lnkNomeAcidentadoSeg}" id="lnkNomeAcidentadoSeg" text="#{currentRow.value['nome_acidentado']}"/>
                                                     </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormDirGerRh.tableColumn5}" headerText="Fase" id="tableColumn5" width="20%">
+                                                    <ui:tableColumn binding="#{FormDirGerRh.tableColumn5}" headerText="Fase" id="tableColumn5" width="20%"
+														sort="fase">
                                                         <ui:hyperlink action="#{FormDirGerRh.lnkFaseSeg_action}" binding="#{FormDirGerRh.lnkFaseSeg}"
                                                             id="lnkFaseSeg" style="height: 24px" text="#{currentRow.value['fase']}"/>
                                                     </ui:tableColumn>
-
-                                                    <ui:tableColumn binding="#{FormDirGerRh.tableColumn13}" headerText="Estabelecimento" id="tableColumn13" width="20%">
+                                                    <ui:tableColumn binding="#{FormDirGerRh.tableColumn13}" headerText="Estabelecimento" id="tableColumn13" width="20%"
+														sort="nome_estabelecimento">
                                                         <ui:hyperlink action="#{FormDirGerRh.lnkEstabelecimentoSeg_action}" binding="#{FormDirGerRh.lnkEstabelecimentoSeg}"
                                                             id="lnkEstabelecimentoSeg" style="height: 24px" text="#{currentRow.value['nome_estabelecimento']}"/>
                                                     </ui:tableColumn>
-
                                                 </ui:tableRowGroup>
                                             </ui:table>
                                         </h:panelGrid>
@@ -197,7 +198,8 @@
                                                     <ui:hyperlink action="#{FormDirGerRh.lnkNrConcluida_action}" binding="#{FormDirGerRh.lnkNrConcluida}"
                                                         id="lnkNrConcluida" text="#{currentRow.value['analise_nr']}"/>
                                                 </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormDirGerRh.tableColumn8}" headerText="POR" id="tableColumn8" width="8%">
+                                                <ui:tableColumn binding="#{FormDirGerRh.tableColumn8}" headerText="POR" id="tableColumn8" width="8%"
+													sort="numero_mecanografico">
                                                     <ui:hyperlink action="#{FormDirGerRh.lnkPorConcluida_action}" binding="#{FormDirGerRh.lnkPorConcluida}"
                                                         id="lnkPorConcluida" style="" text="#{currentRow.value['numero_mecanografico']}"/>
                                                 </ui:tableColumn>
@@ -206,7 +208,8 @@
                                                     <ui:hyperlink action="#{FormDirGerRh.lnkNomeConcluida_action}" binding="#{FormDirGerRh.lnkNomeConcluida}"
                                                         id="lnkNomeConcluida" text="#{currentRow.value['nome_acidentado']}"/>
                                                 </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormDirGerRh.tableColumn10}" headerText="Estabelecimento" id="tableColumn10" width="15%">
+                                                <ui:tableColumn binding="#{FormDirGerRh.tableColumn10}" headerText="Estabelecimento" id="tableColumn10" width="15%"
+													sort="nome_estabelecimento">
                                                     <ui:hyperlink action="#{FormDirGerRh.lnkEstabConcluida_action}" binding="#{FormDirGerRh.lnkEstabConcluida}"
                                                         id="lnkEstabConcluida" style="" text="#{currentRow.value['nome_estabelecimento']}"/>
                                                 </ui:tableColumn>
diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormDirSiprp.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormDirSiprp.jsp
index 93771917..b1ffb955 100755
--- a/trunk/AnaliseAcidentesTrabalho/web/FormDirSiprp.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/FormDirSiprp.jsp
@@ -112,7 +112,8 @@
                                                         sort="analise_nr" style="width: 10%" width="10%">
                                                         <ui:hyperlink action="#{FormDirSiprp.lnkNrSeg_action}" binding="#{FormDirSiprp.lnkNrSeg}" id="lnkNrSeg" text="#{currentRow.value['analise_nr']}"/>
                                                     </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormDirSiprp.tableColumn8}" headerText="POR" id="tableColumn8" width="10%">
+                                                    <ui:tableColumn binding="#{FormDirSiprp.tableColumn8}" headerText="POR" id="tableColumn8" width="10%"
+														sort="numero_mecanografico">
                                                         <ui:hyperlink action="#{FormDirSiprp.lnkPorSeg_action}" binding="#{FormDirSiprp.lnkPorSeg}"
                                                             id="lnkPorSeg" style="" text="#{currentRow.value['numero_mecanografico']}"/>
                                                     </ui:tableColumn>
@@ -121,11 +122,13 @@
                                                         <ui:hyperlink action="#{FormDirSiprp.lnkNomeAcidentadoSeg_action}"
                                                             binding="#{FormDirSiprp.lnkNomeAcidentadoSeg}" id="lnkNomeAcidentadoSeg" text="#{currentRow.value['nome_acidentado']}"/>
                                                     </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormDirSiprp.tableColumn10}" headerText="Fase" id="tableColumn10" width="20%">
+                                                    <ui:tableColumn binding="#{FormDirSiprp.tableColumn10}" headerText="Fase" id="tableColumn10" width="20%"
+														sort="fase">
                                                         <ui:hyperlink action="#{FormDirSiprp.lnkFaseSeg_action}" binding="#{FormDirSiprp.lnkFaseSeg}"
                                                             id="lnkFaseSeg" style="height: 24px" text="#{currentRow.value['fase']}"/>
                                                     </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormDirSiprp.tableColumn3}" headerText="Estabelecimento" id="tableColumn3" width="15%">
+                                                    <ui:tableColumn binding="#{FormDirSiprp.tableColumn3}" headerText="Estabelecimento" id="tableColumn3" width="15%"
+														sort="nome_estabelecimento">
                                                         <ui:hyperlink action="#{FormDirSiprp.lnkEstabelecimentoSeg_action}"
                                                             binding="#{FormDirSiprp.lnkEstabelecimentoSeg1}" id="lnkEstabelecimentoSeg1" style="" text="#{currentRow.value['nome_estabelecimento']}"/>
                                                     </ui:tableColumn>
@@ -202,7 +205,8 @@
                                                     <ui:hyperlink action="#{FormDirSiprp.lnkNrConcluida_action}" binding="#{FormDirSiprp.lnkNrConcluida}"
                                                         id="lnkNrConcluida" text="#{currentRow.value['analise_nr']}"/>
                                                 </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormDirSiprp.tableColumn13}" headerText="POR" id="tableColumn13" width="8%">
+                                                <ui:tableColumn binding="#{FormDirSiprp.tableColumn13}" headerText="POR" id="tableColumn13" width="8%"
+													sort="numero_mecanografico">
                                                     <ui:hyperlink action="#{FormDirSiprp.lnkPorConcluida_action}" binding="#{FormDirSiprp.lnkPorConcluida}"
                                                         id="lnkPorConcluida" style="" text="#{currentRow.value['numero_mecanografico']}"/>
                                                 </ui:tableColumn>
@@ -211,7 +215,8 @@
                                                     <ui:hyperlink action="#{FormDirSiprp.lnkNomeConcluida_action}" binding="#{FormDirSiprp.lnkNomeConcluida}"
                                                         id="lnkNomeConcluida" text="#{currentRow.value['nome_acidentado']}"/>
                                                 </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormDirSiprp.tableColumn15}" headerText="Estabelecimento" id="tableColumn15" width="15%">
+                                                <ui:tableColumn binding="#{FormDirSiprp.tableColumn15}" headerText="Estabelecimento" id="tableColumn15" width="15%"
+													sort="nome_estabelecimento">
                                                     <ui:hyperlink action="#{FormDirSiprp.lnkEstabConcluida_action}" binding="#{FormDirSiprp.lnkEstabConcluida}"
                                                         id="lnkEstabConcluida" style="" text="#{currentRow.value['nome_estabelecimento']}"/>
                                                 </ui:tableColumn>
diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormGestor.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormGestor.jsp
index adfcc131..6de105cd 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/FormGestor.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/FormGestor.jsp
@@ -105,7 +105,8 @@
                                                         sort="analise_nr" style="width: 10%" width="10%">
                                                         <ui:hyperlink action="#{FormGestor.lnkNrSeg_action}" binding="#{FormGestor.lnkNrSeg}" id="lnkNrSeg" text="#{currentRow.value['analise_nr']}"/>
                                                     </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormGestor.tableColumn3}" headerText="POR" id="tableColumn3" width="10%">
+                                                    <ui:tableColumn binding="#{FormGestor.tableColumn3}" headerText="POR" id="tableColumn3" width="10%"
+														sort="numero_mecanografico">
                                                         <ui:hyperlink action="#{FormGestor.lnkPorSeg_action}" binding="#{FormGestor.lnkPorSeg}" id="lnkPorSeg"
                                                             style="" text="#{currentRow.value['numero_mecanografico']}"/>
                                                     </ui:tableColumn>
@@ -114,11 +115,13 @@
                                                         <ui:hyperlink action="#{FormGestor.lnkNomeAcidentadoSeg_action}"
                                                             binding="#{FormGestor.lnkNomeAcidentadoSeg}" id="lnkNomeAcidentadoSeg" text="#{currentRow.value['nome_acidentado']}"/>
                                                     </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormGestor.tableColumn5}" headerText="Fase" id="tableColumn5" width="20%">
+                                                    <ui:tableColumn binding="#{FormGestor.tableColumn5}" headerText="Fase" id="tableColumn5" width="20%"
+														sort="fase">
                                                         <ui:hyperlink action="#{FormGestor.lnkFaseSeg_action}" binding="#{FormGestor.lnkFaseSeg}"
                                                             id="lnkFaseSeg" style="height: 24px" text="#{currentRow.value['fase']}"/>
                                                     </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormGestor.tableColumn13}" headerText="Estabelecimento" id="tableColumn13" width="15%">
+                                                    <ui:tableColumn binding="#{FormGestor.tableColumn13}" headerText="Estabelecimento" id="tableColumn13" width="15%"
+														sort="nome_estabelecimento">
                                                         <ui:hyperlink action="#{FormGestor.lnkEstabelecimentoSeg_action}"
                                                             binding="#{FormGestor.lnkEstabelecimentoSeg1}" id="lnkEstabelecimentoSeg1" style="" text="#{currentRow.value['nome_estabelecimento']}"/>
                                                     </ui:tableColumn>
@@ -195,7 +198,8 @@
                                                     <ui:hyperlink action="#{FormGestor.lnkNrConcluida_action}" binding="#{FormGestor.lnkNrConcluida}"
                                                         id="lnkNrConcluida" text="#{currentRow.value['analise_nr']}"/>
                                                 </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormGestor.tableColumn8}" headerText="POR" id="tableColumn8" width="8%">
+                                                <ui:tableColumn binding="#{FormGestor.tableColumn8}" headerText="POR" id="tableColumn8" width="8%"
+													sort="numero_mecanografico">
                                                     <ui:hyperlink action="#{FormGestor.lnkPorConcluida_action}" binding="#{FormGestor.lnkPorConcluida}"
                                                         id="lnkPorConcluida" style="" text="#{currentRow.value['numero_mecanografico']}"/>
                                                 </ui:tableColumn>
@@ -204,7 +208,8 @@
                                                     <ui:hyperlink action="#{FormGestor.lnkNomeConcluida_action}" binding="#{FormGestor.lnkNomeConcluida}"
                                                         id="lnkNomeConcluida" text="#{currentRow.value['nome_acidentado']}"/>
                                                 </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormGestor.tableColumn10}" headerText="Estabelecimento" id="tableColumn10" width="15%">
+                                                <ui:tableColumn binding="#{FormGestor.tableColumn10}" headerText="Estabelecimento" id="tableColumn10" width="15%"
+													sort="nome_estabelecimento">
                                                     <ui:hyperlink action="#{FormGestor.lnkEstabConcluida_action}" binding="#{FormGestor.lnkEstabConcluida}"
                                                         id="lnkEstabConcluida" style="" text="#{currentRow.value['nome_estabelecimento']}"/>
                                                 </ui:tableColumn>
diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormHS.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormHS.jsp
index 5501c87e..cbfdfaeb 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/FormHS.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/FormHS.jsp
@@ -110,7 +110,8 @@
                                                         sort="analise_nr" style="width: 10%" width="10%">
                                                         <ui:hyperlink action="#{FormHS.lnkNr_action}" binding="#{FormHS.lnkNr}" id="lnkNr" text="#{currentRow.value['analise_nr']}"/>
                                                     </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormHS.tableColumn12}" headerText="POR" id="tableColumn12" width="10%">
+                                                    <ui:tableColumn binding="#{FormHS.tableColumn12}" headerText="POR" id="tableColumn12" width="10%"
+														sort="numero_mecanografico">
                                                         <ui:hyperlink action="#{FormHS.lnkPor_action}" binding="#{FormHS.lnkPor}" id="lnkPor" style="" text="#{currentRow.value['numero_mecanografico']}"/>
                                                     </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormHS.tableColumn3}" headerText="Nome do acidentado" id="tableColumn3"
@@ -118,11 +119,13 @@
                                                         <ui:hyperlink action="#{FormHS.lnkNomeAcidentado_action}" binding="#{FormHS.lnkNomeAcidentado}"
                                                             id="lnkNomeAcidentado" text="#{currentRow.value['nome_acidentado']}"/>
                                                     </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormHS.tableColumn10}" headerText="Fase" id="tableColumn10" width="20%">
+                                                    <ui:tableColumn binding="#{FormHS.tableColumn10}" headerText="Fase" id="tableColumn10" width="20%"
+														sort="fase">
                                                         <ui:hyperlink action="#{FormHS.lnkFase_action}" binding="#{FormHS.lnkFase}" id="lnkFase"
                                                             style="height: 24px" text="#{currentRow.value['fase']}"/>
                                                     </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormHS.tableColumn19}" headerText="Estabelecimento" id="tableColumn19" width="15%">
+                                                    <ui:tableColumn binding="#{FormHS.tableColumn19}" headerText="Estabelecimento" id="tableColumn19" width="15%"
+														sort="nome_estabelecimento">
                                                         <ui:hyperlink action="#{FormHS.lnkEstabelecimento_action}" binding="#{FormHS.lnkEstabelecimento}"
                                                             id="lnkEstabelecimento" style="" text="#{currentRow.value['nome_estabelecimento']}"/>
                                                     </ui:tableColumn>
@@ -182,7 +185,8 @@
                                                         sort="analise_nr" style="width: 10%" width="10%">
                                                         <ui:hyperlink action="#{FormHS.lnkNrSeg_action}" binding="#{FormHS.lnkNrSeg}" id="lnkNrSeg" text="#{currentRow.value['analise_nr']}"/>
                                                     </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormHS.tableColumn13}" headerText="POR" id="tableColumn13" width="10%">
+                                                    <ui:tableColumn binding="#{FormHS.tableColumn13}" headerText="POR" id="tableColumn13" width="10%"
+														sort="numero_mecanografico">
                                                         <ui:hyperlink action="#{FormHS.lnkPorSeg_action}" binding="#{FormHS.lnkPorSeg}" id="lnkPorSeg" style="" text="#{currentRow.value['numero_mecanografico']}"/>
                                                     </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormHS.tableColumn6}" headerText="Nome do acidentado" id="tableColumn6"
@@ -190,11 +194,13 @@
                                                         <ui:hyperlink action="#{FormHS.lnkNomeAcidentadoSeg_action}" binding="#{FormHS.lnkNomeAcidentadoSeg}"
                                                             id="lnkNomeAcidentadoSeg" text="#{currentRow.value['nome_acidentado']}"/>
                                                     </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormHS.tableColumn11}" headerText="Fase" id="tableColumn11" width="20%">
+                                                    <ui:tableColumn binding="#{FormHS.tableColumn11}" headerText="Fase" id="tableColumn11" width="20%"
+														sort="fase">
                                                         <ui:hyperlink action="#{FormHS.lnkFaseSeg_action}" binding="#{FormHS.lnkFaseSeg}" id="lnkFaseSeg"
                                                             style="height: 24px" text="#{currentRow.value['fase']}"/>
                                                     </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormHS.tableColumn20}" headerText="Estabelecimento" id="tableColumn20" width="15%">
+                                                    <ui:tableColumn binding="#{FormHS.tableColumn20}" headerText="Estabelecimento" id="tableColumn20" width="15%"
+														sort="nome_estabelecimento">
                                                         <ui:hyperlink action="#{FormHS.lnkEstabelecimentoSeg_action}" binding="#{FormHS.lnkEstabelecimentoSeg}"
                                                             id="lnkEstabelecimentoSeg" style="" text="#{currentRow.value['nome_estabelecimento']}"/>
                                                     </ui:tableColumn>
@@ -267,7 +273,8 @@
                                                     <ui:hyperlink action="#{FormHS.lnkNrConcluida_action}" binding="#{FormHS.lnkNrConcluida}"
                                                         id="lnkNrConcluida" text="#{currentRow.value['analise_nr']}"/>
                                                 </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormHS.tableColumn14}" headerText="POR" id="tableColumn14" width="200">
+                                                <ui:tableColumn binding="#{FormHS.tableColumn14}" headerText="POR" id="tableColumn14" width="200"
+													sort="numero_mecanografico">
                                                     <ui:hyperlink action="#{FormHS.lnkPorConcluida_action}" binding="#{FormHS.lnkPorConcluida}"
                                                         id="lnkPorConcluida" style="" text="#{currentRow.value['numero_mecanografico']}"/>
                                                 </ui:tableColumn>
@@ -276,7 +283,8 @@
                                                     <ui:hyperlink action="#{FormHS.lnkNomeConcluida_action}" binding="#{FormHS.lnkNomeConcluida}"
                                                         id="lnkNomeConcluida" text="#{currentRow.value['nome_acidentado']}"/>
                                                 </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormHS.tableColumn15}" headerText="Estabelecimento" id="tableColumn15" width="200">
+                                                <ui:tableColumn binding="#{FormHS.tableColumn15}" headerText="Estabelecimento" id="tableColumn15" width="200"
+													sort="nome_estabelecimento">
                                                     <ui:hyperlink action="#{FormHS.lnkEstabConcluida_action}" binding="#{FormHS.lnkEstabConcluida}"
                                                         id="lnkEstabConcluida" style="" text="#{currentRow.value['nome_estabelecimento']}"/>
                                                 </ui:tableColumn>
diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormMedico.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormMedico.jsp
index 9e8d3a63..d5bb4e45 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/FormMedico.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/FormMedico.jsp
@@ -72,11 +72,12 @@
                                                         <ui:hyperlink action="#{FormMedico.lnkDataAcidente_action}" binding="#{FormMedico.lnkDataAcidente}"
                                                             id="lnkDataAcidente" text="#{currentRow.value['data_acidente']}"/>
                                                     </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormMedico.tableColumn2}" headerText="Nº acidente" id="tableColumn2" sort="nr"
+                                                    <ui:tableColumn binding="#{FormMedico.tableColumn2}" headerText="Nº acidente" id="tableColumn2" sort="analise_nr"
                                                         style="width: 10%" width="10%">
                                                         <ui:hyperlink action="#{FormMedico.lnkNr_action}" binding="#{FormMedico.lnkNr}" id="lnkNr" text="#{currentRow.value['analise_nr']}"/>
                                                     </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormMedico.tableColumn12}" headerText="POR" id="tableColumn12" width="10%">
+                                                    <ui:tableColumn binding="#{FormMedico.tableColumn12}" headerText="POR" id="tableColumn12" width="10%"
+														sort="numero_mecanografico">
                                                         <ui:hyperlink action="#{FormMedico.lnkPor_action}" binding="#{FormMedico.lnkPor}" id="lnkPor" style="" text="#{currentRow.value['numero_mecanografico']}"/>
                                                     </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormMedico.tableColumn3}" headerText="Nome do acidentado" id="tableColumn3"
@@ -84,16 +85,16 @@
                                                         <ui:hyperlink action="#{FormMedico.lnkNomeAcidentado_action}" binding="#{FormMedico.lnkNomeAcidentado}"
                                                             id="lnkNomeAcidentado" text="#{currentRow.value['nome_acidentado']}"/>
                                                     </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormMedico.tableColumn10}" headerText="Fase" id="tableColumn10" width="10%">
+                                                    <ui:tableColumn binding="#{FormMedico.tableColumn10}" headerText="Fase" id="tableColumn10" width="10%"
+														sort="fase">
                                                         <ui:hyperlink action="#{FormMedico.lnkFase_action}" binding="#{FormMedico.lnkFase}" id="lnkFase"
                                                             style="width: 96px; height: 24px" text="#{currentRow.value['fase']}"/>
                                                     </ui:tableColumn>
-
-                                                    <ui:tableColumn binding="#{FormMedico.tableColumn16}" headerText="Estabelecimento" id="tableColumn16" width="10%">
+                                                    <ui:tableColumn binding="#{FormMedico.tableColumn16}" headerText="Estabelecimento" id="tableColumn16" width="10%"
+														sort="nome_estabelecimento">
                                                         <ui:hyperlink action="#{FormMedico.lnkEstabelecimento_action}" binding="#{FormMedico.lnkEstabelecimento}" id="lnkEstabelecimento"
                                                             style="width: 96px; height: 24px" text="#{currentRow.value['nome_estabelecimento']}"/>
                                                     </ui:tableColumn>
-
                                                 </ui:tableRowGroup>
                                             </ui:table>
                                         </h:panelGrid>
@@ -132,33 +133,34 @@
                                                 <ui:tableRowGroup binding="#{FormMedico.tableRowGroup2}" id="tableRowGroup2"
                                                     sourceData="#{SessionBean1.analisesSeguimentoDataProvider}" sourceVar="currentRow">
                                                     <ui:tableColumn binding="#{FormMedico.tableColumn4}" headerText="Data do acidente" id="tableColumn4"
-                                                        sort="column1" style="width: 10%" width="10%">
+                                                        sort="data_acidente" style="width: 10%" width="10%">
                                                         <ui:hyperlink action="#{FormMedico.lnkDataAcidenteSeg_action}"
                                                             binding="#{FormMedico.lnkDataAcidenteSeg}" id="lnkDataAcidenteSeg" text="#{currentRow.value['data_acidente']}"/>
                                                     </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormMedico.tableColumn5}" headerText="Nº acidente" id="tableColumn5"
-                                                        sort="column2" style="width: 10%" width="10%">
+                                                        sort="analise_nr" style="width: 10%" width="10%">
                                                         <ui:hyperlink action="#{FormMedico.lnkNrSeg_action}" binding="#{FormMedico.lnkNrSeg}" id="lnkNrSeg" text="#{currentRow.value['analise_nr']}"/>
                                                     </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormMedico.tableColumn13}" headerText="POR" id="tableColumn13" width="10%">
+                                                    <ui:tableColumn binding="#{FormMedico.tableColumn13}" headerText="POR" id="tableColumn13" width="10%"
+														sort="numero_mecanografico">
                                                         <ui:hyperlink action="#{FormMedico.lnkPorSeg_action}" binding="#{FormMedico.lnkPorSeg}" id="lnkPorSeg"
                                                             style="" text="#{currentRow.value['numero_mecanografico']}"/>
                                                     </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormMedico.tableColumn6}" headerText="Nome do acidentado" id="tableColumn6"
-                                                        sort="column3" style="width: 80%" width="60%">
+                                                        sort="nome_acidentado" style="width: 80%" width="60%">
                                                         <ui:hyperlink action="#{FormMedico.lnkNomeAcidentadoSeg_action}"
                                                             binding="#{FormMedico.lnkNomeAcidentadoSeg}" id="lnkNomeAcidentadoSeg" text="#{currentRow.value['nome_acidentado']}"/>
                                                     </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormMedico.tableColumn11}" headerText="Fase" id="tableColumn11" width="10%">
+                                                    <ui:tableColumn binding="#{FormMedico.tableColumn11}" headerText="Fase" id="tableColumn11" width="10%"
+														sort="fase">
                                                         <ui:hyperlink action="#{FormMedico.lnkFaseSeg_action}" binding="#{FormMedico.lnkFaseSeg}"
                                                             id="lnkFaseSeg" style="width: 96px; height: 24px" text="#{currentRow.value['fase']}"/>
                                                     </ui:tableColumn>
-
-                                                    <ui:tableColumn binding="#{FormMedico.tableColumn17}" headerText="Estabelecimento" id="tableColumn17" width="10%">
+                                                    <ui:tableColumn binding="#{FormMedico.tableColumn17}" headerText="Estabelecimento" id="tableColumn17" width="10%"
+														sort="nome_estabelecimento">
                                                         <ui:hyperlink action="#{FormMedico.lnkEstabelecimentoSeg_action}" binding="#{FormMedico.lnkEstabelecimentoSeg}"
                                                             id="lnkEstabelecimentoSeg" style="width: 96px; height: 24px" text="#{currentRow.value['nome_estabelecimento']}"/>
                                                     </ui:tableColumn>
-
                                                 </ui:tableRowGroup>
                                             </ui:table>
                                         </h:panelGrid>
@@ -212,24 +214,26 @@
                                             <ui:tableRowGroup binding="#{FormMedico.tableRowGroup3}" id="tableRowGroup3"
                                                 sourceData="#{SessionBean1.analisesConcluidasDataProvider}" sourceVar="currentRow">
                                                 <ui:tableColumn binding="#{FormMedico.tableColumn7}" headerText="Data do acidente" id="tableColumn7"
-                                                    sort="column1" style="width: 10%">
+                                                    sort="data_acidente" style="width: 10%">
                                                     <ui:hyperlink action="#{FormMedico.lnkDataConcluida_action}" binding="#{FormMedico.lnkDataConcluida}"
                                                         id="lnkDataConcluida" text="#{currentRow.value['data_acidente']}"/>
                                                 </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormMedico.tableColumn8}" headerText="Nº acidente" id="tableColumn8" sort="column2" style="width: 10%">
+                                                <ui:tableColumn binding="#{FormMedico.tableColumn8}" headerText="Nº acidente" id="tableColumn8" sort="analise_nr" style="width: 10%">
                                                     <ui:hyperlink action="#{FormMedico.lnkNrConcluida_action}" binding="#{FormMedico.lnkNrConcluida}"
                                                         id="lnkNrConcluida" text="#{currentRow.value['analise_nr']}"/>
                                                 </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormMedico.tableColumn14}" headerText="POR" id="tableColumn14" width="200">
+                                                <ui:tableColumn binding="#{FormMedico.tableColumn14}" headerText="POR" id="tableColumn14" width="200"
+													sort="numero_mecanografico">
                                                     <ui:hyperlink action="#{FormMedico.lnkPorConcluida_action}" binding="#{FormMedico.lnkPorConcluida}"
                                                         id="lnkPorConcluida" style="" text="#{currentRow.value['numero_mecanografico']}"/>
                                                 </ui:tableColumn>
                                                 <ui:tableColumn binding="#{FormMedico.tableColumn9}" headerText="Nome do acidentado" id="tableColumn9"
-                                                    sort="column3" style="width: 80%">
+                                                    sort="nome_acidentado" style="width: 80%">
                                                     <ui:hyperlink action="#{FormMedico.lnkNomeConcluida_action}" binding="#{FormMedico.lnkNomeConcluida}"
                                                         id="lnkNomeConcluida" text="#{currentRow.value['nome_acidentado']}"/>
                                                 </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormMedico.tableColumn15}" headerText="Estabelecimento" id="tableColumn15" width="200">
+                                                <ui:tableColumn binding="#{FormMedico.tableColumn15}" headerText="Estabelecimento" id="tableColumn15" width="200"
+													sort="nome_estabelecimento">
                                                     <ui:hyperlink action="#{FormMedico.lnkEstabConcluida_action}" binding="#{FormMedico.lnkEstabConcluida}"
                                                         id="lnkEstabConcluida" style="" text="#{currentRow.value['nome_estabelecimento']}"/>
                                                 </ui:tableColumn>
diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormRH.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormRH.jsp
index 2ed21c81..18894590 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/FormRH.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/FormRH.jsp
@@ -106,7 +106,8 @@
                                                         sort="analise_nr" style="width: 10%" width="10%">
                                                         <ui:hyperlink action="#{FormRH.lnkNr_action}" binding="#{FormRH.lnkNr}" id="lnkNr" text="#{currentRow.value['analise_nr']}"/>
                                                     </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormRH.tableColumn12}" headerText="POR" id="tableColumn12" width="10%">
+                                                    <ui:tableColumn binding="#{FormRH.tableColumn12}" headerText="POR" id="tableColumn12" width="10%"
+														sort="numero_mecanografico">
                                                         <ui:hyperlink action="#{FormRH.lnkPor_action}" binding="#{FormRH.lnkPor}" id="lnkPor" style="" text="#{currentRow.value['numero_mecanografico']}"/>
                                                     </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormRH.tableColumn3}" headerText="Nome do acidentado" id="tableColumn3"
@@ -114,16 +115,16 @@
                                                         <ui:hyperlink action="#{FormRH.lnkNomeAcidentado_action}" binding="#{FormRH.lnkNomeAcidentado}"
                                                             id="lnkNomeAcidentado" text="#{currentRow.value['nome_acidentado']}"/>
                                                     </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormRH.tableColumn10}" headerText="Fase" id="tableColumn10" width="20%">
+                                                    <ui:tableColumn binding="#{FormRH.tableColumn10}" headerText="Fase" id="tableColumn10" width="20%"
+														sort="fase">
                                                         <ui:hyperlink action="#{FormRH.lnkFase_action}" binding="#{FormRH.lnkFase}" id="lnkFase"
                                                             style="height: 24px" text="#{currentRow.value['fase']}"/>
                                                     </ui:tableColumn>
-
-                                                    <ui:tableColumn binding="#{FormRH.tableColumn19}" headerText="Estabelecimento" id="tableColumn19" width="20%">
+                                                    <ui:tableColumn binding="#{FormRH.tableColumn19}" headerText="Estabelecimento" id="tableColumn19" width="20%"
+														sort="nome_estabelecimento">
                                                         <ui:hyperlink action="#{FormRH.lnkEstabelecimento_action}" binding="#{FormRH.lnkEstabelecimento}" id="lnkEstabelecimento"
                                                             style="height: 24px" text="#{currentRow.value['nome_estabelecimento']}"/>
                                                     </ui:tableColumn>
-
                                                 </ui:tableRowGroup>
                                             </ui:table>
                                         </h:panelGrid>
@@ -175,7 +176,8 @@
                                                         sort="analise_nr" style="width: 10%" width="10%">
                                                         <ui:hyperlink action="#{FormRH.lnkNrSeg_action}" binding="#{FormRH.lnkNrSeg}" id="lnkNrSeg" text="#{currentRow.value['analise_nr']}"/>
                                                     </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormRH.tableColumn13}" headerText="POR" id="tableColumn13" width="10%">
+                                                    <ui:tableColumn binding="#{FormRH.tableColumn13}" headerText="POR" id="tableColumn13" width="10%"
+														sort="numero_mecanografico">
                                                         <ui:hyperlink action="#{FormRH.lnkPorSeg_action}" binding="#{FormRH.lnkPorSeg}" id="lnkPorSeg" style="" text="#{currentRow.value['numero_mecanografico']}"/>
                                                     </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormRH.tableColumn6}" headerText="Nome do acidentado" id="tableColumn6"
@@ -183,12 +185,13 @@
                                                         <ui:hyperlink action="#{FormRH.lnkNomeAcidentadoSeg_action}" binding="#{FormRH.lnkNomeAcidentadoSeg}"
                                                             id="lnkNomeAcidentadoSeg" text="#{currentRow.value['nome_acidentado']}"/>
                                                     </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormRH.tableColumn11}" headerText="Fase" id="tableColumn11" width="20%">
+                                                    <ui:tableColumn binding="#{FormRH.tableColumn11}" headerText="Fase" id="tableColumn11" width="20%"
+														sort="fase">
                                                         <ui:hyperlink action="#{FormRH.lnkFaseSeg_action}" binding="#{FormRH.lnkFaseSeg}" id="lnkFaseSeg"
                                                             style="height: 24px" text="#{currentRow.value['fase']}"/>
                                                     </ui:tableColumn>
-
-                                                    <ui:tableColumn binding="#{FormRH.tableColumn20}" headerText="Estabelecimento" id="tableColumn20" width="20%">
+                                                    <ui:tableColumn binding="#{FormRH.tableColumn20}" headerText="Estabelecimento" id="tableColumn20" width="20%"
+														sort="nome_estabelecimento">
                                                         <ui:hyperlink action="#{FormRH.lnkEstabelecimentoSeg_action}" binding="#{FormRH.lnkEstabelecimentoSeg}" id="lnkEstabelecimentoSeg"
                                                             style="height: 24px" text="#{currentRow.value['nome_estabelecimento']}"/>
                                                     </ui:tableColumn>
@@ -261,7 +264,8 @@
                                                     <ui:hyperlink action="#{FormRH.lnkNrConcluida_action}" binding="#{FormRH.lnkNrConcluida}"
                                                         id="lnkNrConcluida" text="#{currentRow.value['analise_nr']}"/>
                                                 </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormRH.tableColumn14}" headerText="POR" id="tableColumn14" width="8%">
+                                                <ui:tableColumn binding="#{FormRH.tableColumn14}" headerText="POR" id="tableColumn14" width="8%"
+													sort="numero_mecanografico">
                                                     <ui:hyperlink action="#{FormRH.lnkPorConcluida_action}" binding="#{FormRH.lnkPorConcluida}"
                                                         id="lnkPorConcluida" style="" text="#{currentRow.value['numero_mecanografico']}"/>
                                                 </ui:tableColumn>
@@ -270,7 +274,8 @@
                                                     <ui:hyperlink action="#{FormRH.lnkNomeConcluida_action}" binding="#{FormRH.lnkNomeConcluida}"
                                                         id="lnkNomeConcluida" text="#{currentRow.value['nome_acidentado']}"/>
                                                 </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormRH.tableColumn15}" headerText="Estabelecimento" id="tableColumn15" width="15%">
+                                                <ui:tableColumn binding="#{FormRH.tableColumn15}" headerText="Estabelecimento" id="tableColumn15" width="15%"
+													sort="nome_estabelecimento">
                                                     <ui:hyperlink action="#{FormRH.lnkEstabConcluida_action}" binding="#{FormRH.lnkEstabConcluida}"
                                                         id="lnkEstabConcluida" style="" text="#{currentRow.value['nome_estabelecimento']}"/>
                                                 </ui:tableColumn>
diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormSeguranca.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormSeguranca.jsp
index 4c820152..12d2db0e 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/FormSeguranca.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/FormSeguranca.jsp
@@ -111,7 +111,8 @@
                                                         sort="analise_nr" style="width: 10%" width="10%">
                                                         <ui:hyperlink action="#{FormSeguranca.lnkNr_action}" binding="#{FormSeguranca.lnkNr}" id="lnkNr" text="#{currentRow.value['analise_nr']}"/>
                                                     </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormSeguranca.tableColumn12}" headerText="POR" id="tableColumn12" width="10%">
+                                                    <ui:tableColumn binding="#{FormSeguranca.tableColumn12}" headerText="POR" id="tableColumn12" width="10%"
+														sort="numero_mecanografico">
                                                         <ui:hyperlink action="#{FormSeguranca.lnkPor_action}" binding="#{FormSeguranca.lnkPor}" id="lnkPor"
                                                             style="" text="#{currentRow.value['numero_mecanografico']}"/>
                                                     </ui:tableColumn>
@@ -120,12 +121,14 @@
                                                         <ui:hyperlink action="#{FormSeguranca.lnkNomeAcidentado_action}"
                                                             binding="#{FormSeguranca.lnkNomeAcidentado}" id="lnkNomeAcidentado" text="#{currentRow.value['nome_acidentado']}"/>
                                                     </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormSeguranca.tableColumn10}" headerText="Fase" id="tableColumn10" width="20%">
+                                                    <ui:tableColumn binding="#{FormSeguranca.tableColumn10}" headerText="Fase" id="tableColumn10" width="20%"
+														sort="fase">
                                                         <ui:hyperlink action="#{FormSeguranca.lnkFase_action}" binding="#{FormSeguranca.lnkFase}" id="lnkFase"
                                                             style="height: 24px" text="#{currentRow.value['fase']}"/>
                                                     </ui:tableColumn>
 
-                                                    <ui:tableColumn binding="#{FormSeguranca.tableColumn19}" headerText="Estabelecimento" id="tableColumn19" width="20%">
+                                                    <ui:tableColumn binding="#{FormSeguranca.tableColumn19}" headerText="Estabelecimento" id="tableColumn19" width="20%"
+														sort="nome_estabelecimento">
                                                         <ui:hyperlink action="#{FormSeguranca.lnkEstabelecimento_action}" binding="#{FormSeguranca.lnkEstabelecimento}" id="lnkEstabelecimento"
                                                             style="height: 24px" text="#{currentRow.value['nome_estabelecimento']}"/>
                                                     </ui:tableColumn>
@@ -182,7 +185,8 @@
                                                         <ui:hyperlink action="#{FormSeguranca.lnkNrSeg_action}" binding="#{FormSeguranca.lnkNrSeg}"
                                                             id="lnkNrSeg" text="#{currentRow.value['analise_nr']}"/>
                                                     </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormSeguranca.tableColumn13}" headerText="POR" id="tableColumn13" width="10%">
+                                                    <ui:tableColumn binding="#{FormSeguranca.tableColumn13}" headerText="POR" id="tableColumn13" width="10%"
+														sort="numero_mecanografico">
                                                         <ui:hyperlink action="#{FormSeguranca.lnkPorSeg_action}" binding="#{FormSeguranca.lnkPorSeg}"
                                                             id="lnkPorSeg" style="" text="#{currentRow.value['numero_mecanografico']}"/>
                                                     </ui:tableColumn>
@@ -192,12 +196,13 @@
                                                             binding="#{FormSeguranca.lnkNomeAcidentadoSeg}" id="lnkNomeAcidentadoSeg" text="#{currentRow.value['nome_acidentado']}"/>
                                                     </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormSeguranca.tableColumn11}" headerText="Fase" id="tableColumn11"
-                                                        style="width: 20%" width="20%">
+                                                        sort="fase" style="width: 20%" width="20%">
                                                         <ui:hyperlink action="#{FormSeguranca.lnkFaseSeg_action}" binding="#{FormSeguranca.lnkFaseSeg}"
                                                             id="lnkFaseSeg" style="height: 24px" text="#{currentRow.value['fase']}"/>
                                                     </ui:tableColumn>
 
-                                                    <ui:tableColumn binding="#{FormSeguranca.tableColumn20}" headerText="Estabelecimento" id="tableColumn20" style="width: 20%" width="20%">
+                                                    <ui:tableColumn binding="#{FormSeguranca.tableColumn20}" headerText="Estabelecimento" id="tableColumn20" style="width: 20%" width="20%"
+														sort="nome_estabelecimento">
                                                         <ui:hyperlink action="#{FormSeguranca.lnkEstabelecimentoSeg_action}" binding="#{FormSeguranca.lnkEstabelecimentoSeg}"
                                                             id="lnkFaseSeg" style="height: 24px" text="#{currentRow.value['nome_estabelecimento']}"/>
                                                     </ui:tableColumn>
@@ -272,7 +277,8 @@
                                                     <ui:hyperlink action="#{FormSeguranca.lnkNrConcluida_action}" binding="#{FormSeguranca.lnkNrConcluida}"
                                                         id="lnkNrConcluida" text="#{currentRow.value['analise_nr']}"/>
                                                 </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormSeguranca.tableColumn14}" headerText="POR" id="tableColumn14" width="8%">
+                                                <ui:tableColumn binding="#{FormSeguranca.tableColumn14}" headerText="POR" id="tableColumn14" width="8%"
+													sort="numero_mecanografico">
                                                     <ui:hyperlink action="#{FormSeguranca.lnkPorConcluida_action}" binding="#{FormSeguranca.lnkPorConcluida}"
                                                         id="lnkPorConcluida" style="" text="#{currentRow.value['numero_mecanografico']}"/>
                                                 </ui:tableColumn>
@@ -281,7 +287,8 @@
                                                     <ui:hyperlink action="#{FormSeguranca.lnkNomeConcluida_action}" binding="#{FormSeguranca.lnkNomeConcluida}"
                                                         id="lnkNomeConcluida" text="#{currentRow.value['nome_acidentado']}"/>
                                                 </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormSeguranca.tableColumn15}" headerText="Estabelecimento" id="tableColumn15" width="15%">
+                                                <ui:tableColumn binding="#{FormSeguranca.tableColumn15}" headerText="Estabelecimento" id="tableColumn15" width="15%"
+													sort="nome_estabelecimento">
                                                     <ui:hyperlink action="#{FormSeguranca.lnkEstabConcluida_action}"
                                                         binding="#{FormSeguranca.lnkEstabConcluida}" id="lnkEstabConcluida" style="" text="#{currentRow.value['nome_estabelecimento']}"/>
                                                 </ui:tableColumn>