diff --git a/trunk/common/src/SIPRPMap.map.xml b/trunk/common/src/SIPRPMap.map.xml
index eadfd18e..83fae952 100644
--- a/trunk/common/src/SIPRPMap.map.xml
+++ b/trunk/common/src/SIPRPMap.map.xml
@@ -264,6 +264,22 @@
 			<db-key-cache-size>1</db-key-cache-size>
 		</db-key-generator>
 	</db-entity>
+	<db-entity name="hs_posto_estabelecimento" schema="public">
+		<db-attribute name="estabelecimento_id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
+		<db-attribute name="posto_id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
+	</db-entity>
+	<db-entity name="hs_posto_medida" schema="public">
+		<db-attribute name="medida_id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
+		<db-attribute name="posto_id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
+	</db-entity>
+	<db-entity name="hs_posto_risco" schema="public">
+		<db-attribute name="is_plano_actuacao" type="CHAR" length="1"/>
+		<db-attribute name="posto_id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
+		<db-attribute name="probabilidade" type="INTEGER" length="10"/>
+		<db-attribute name="risco_id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
+		<db-attribute name="severidade" type="INTEGER" length="10"/>
+		<db-attribute name="valor_qualitativo" type="INTEGER" length="10"/>
+	</db-entity>
 	<db-entity name="hs_relatorio" schema="public">
 		<db-attribute name="data" type="DATE" isMandatory="true" length="13"/>
 		<db-attribute name="deleted_date" type="TIMESTAMP" length="29"/>
@@ -276,46 +292,55 @@
 			<db-key-cache-size>1</db-key-cache-size>
 		</db-key-generator>
 	</db-entity>
-	<db-entity name="hs_relatorio_medida" schema="public">
-		<db-attribute name="deleted_date" type="TIMESTAMP"/>
-		<db-attribute name="description" type="VARCHAR" isMandatory="true" length="1024"/>
+	<db-entity name="hs_relatorio_area" schema="public">
+		<db-attribute name="deleted_date" type="TIMESTAMP" length="29"/>
+		<db-attribute name="description" type="VARCHAR" isMandatory="true" length="256"/>
 		<db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
-		<db-attribute name="requesitos_legais" type="VARCHAR" isMandatory="true" length="1024"/>
-		<db-attribute name="risco_id" type="INTEGER" isMandatory="true" length="10"/>
 		<db-key-generator>
 			<db-generator-type>ORACLE</db-generator-type>
-			<db-generator-name>hs_relatorio_medida_id_seq</db-generator-name>
+			<db-generator-name>hs_relatorio_area_id_seq</db-generator-name>
 			<db-key-cache-size>1</db-key-cache-size>
 		</db-key-generator>
 	</db-entity>
-	<db-entity name="hs_relatorio_medida_area" schema="public">
-		<db-attribute name="description" type="VARCHAR" isMandatory="true" length="256"/>
+	<db-entity name="hs_relatorio_medida" schema="public">
+		<db-attribute name="deleted_date" type="TIMESTAMP"/>
+		<db-attribute name="description" type="VARCHAR" isMandatory="true" length="1024"/>
 		<db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
+		<db-attribute name="requesitos_legais" type="VARCHAR" isMandatory="true" length="1024"/>
+		<db-attribute name="risco_id" type="INTEGER" isMandatory="true" length="10"/>
 		<db-key-generator>
 			<db-generator-type>ORACLE</db-generator-type>
-			<db-generator-name>hs_relatorio_medida_area_id_seq</db-generator-name>
+			<db-generator-name>hs_relatorio_medida_id_seq</db-generator-name>
 			<db-key-cache-size>1</db-key-cache-size>
 		</db-key-generator>
 	</db-entity>
-	<db-entity name="hs_relatorio_medida_posto" schema="public">
+	<db-entity name="hs_relatorio_posto" schema="public">
 		<db-attribute name="area_id" type="INTEGER" length="10"/>
+		<db-attribute name="deleted_date" type="TIMESTAMP" length="29"/>
 		<db-attribute name="description" type="VARCHAR" isMandatory="true" length="256"/>
 		<db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
 		<db-key-generator>
 			<db-generator-type>ORACLE</db-generator-type>
-			<db-generator-name>hs_relatorio_medida_posto_id_seq</db-generator-name>
+			<db-generator-name>hs_relatorio_posto_id_seq</db-generator-name>
 			<db-key-cache-size>1</db-key-cache-size>
 		</db-key-generator>
 	</db-entity>
+	<db-entity name="hs_relatorio_posto_medida" schema="public">
+		<db-attribute name="medida_id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
+		<db-attribute name="posto_id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
+	</db-entity>
+	<db-entity name="hs_relatorio_posto_risco" schema="public">
+		<db-attribute name="posto_id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
+		<db-attribute name="probabilidade" type="INTEGER" length="10"/>
+		<db-attribute name="risco_id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
+		<db-attribute name="severidade" type="INTEGER" length="10"/>
+		<db-attribute name="valor_qualitativo_id" type="INTEGER" length="10"/>
+	</db-entity>
 	<db-entity name="hs_relatorio_risco" schema="public">
 		<db-attribute name="deleted_date" type="TIMESTAMP"/>
 		<db-attribute name="description" type="VARCHAR" isMandatory="true" length="255"/>
 		<db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
-		<db-attribute name="is_plano_actuacao" type="CHAR" length="1"/>
-		<db-attribute name="probabilidade" type="INTEGER" length="10"/>
 		<db-attribute name="relatorio_id" type="INTEGER" isMandatory="true" length="10"/>
-		<db-attribute name="severidade" type="INTEGER" length="10"/>
-		<db-attribute name="valor_qualitativo_id" type="INTEGER" length="10"/>
 		<db-key-generator>
 			<db-generator-type>ORACLE</db-generator-type>
 			<db-generator-name>hs_relatorio_risco_id_seq</db-generator-name>
@@ -865,28 +890,43 @@
 		<obj-attribute name="deletedDate" type="java.util.Date" db-attribute-path="deleted_date"/>
 		<obj-attribute name="description" type="java.lang.String" db-attribute-path="description"/>
 	</obj-entity>
+	<obj-entity name="HsPostoEstabelecimento" className="siprp.database.cayenne.objects.HsPostoEstabelecimento" dbEntityName="hs_posto_estabelecimento" superClassName="siprp.database.cayenne.objects.BaseObject">
+	</obj-entity>
+	<obj-entity name="HsPostoMedida" className="siprp.database.cayenne.objects.HsPostoMedida" dbEntityName="hs_posto_medida" superClassName="siprp.database.cayenne.objects.BaseObject">
+	</obj-entity>
+	<obj-entity name="HsPostoRisco" className="siprp.database.cayenne.objects.HsPostoRisco" dbEntityName="hs_posto_risco">
+		<obj-attribute name="isPlanoActuacao" type="java.lang.String" db-attribute-path="is_plano_actuacao"/>
+		<obj-attribute name="probabilidade" type="java.lang.Integer" db-attribute-path="probabilidade"/>
+		<obj-attribute name="severidade" type="java.lang.Integer" db-attribute-path="severidade"/>
+		<obj-attribute name="valorQualitativo" type="java.lang.Integer" db-attribute-path="valor_qualitativo"/>
+	</obj-entity>
 	<obj-entity name="HsRelatorio" className="siprp.database.cayenne.objects.HsRelatorio" dbEntityName="hs_relatorio" superClassName="siprp.database.cayenne.objects.BaseObject">
 		<obj-attribute name="data" type="java.util.Date" db-attribute-path="data"/>
 		<obj-attribute name="deletedDate" type="java.util.Date" db-attribute-path="deleted_date"/>
 		<obj-attribute name="isSubmetido" type="java.util.Date" db-attribute-path="is_submetido"/>
 	</obj-entity>
+	<obj-entity name="HsRelatorioArea" className="siprp.database.cayenne.objects.HsRelatorioArea" dbEntityName="hs_relatorio_area" superClassName="siprp.database.cayenne.objects.BaseObject">
+		<obj-attribute name="deletedDate" type="java.util.Date" db-attribute-path="deleted_date"/>
+		<obj-attribute name="description" type="java.lang.String" db-attribute-path="description"/>
+	</obj-entity>
 	<obj-entity name="HsRelatorioMedida" className="siprp.database.cayenne.objects.HsRelatorioMedida" dbEntityName="hs_relatorio_medida" superClassName="siprp.database.cayenne.objects.BaseObject">
 		<obj-attribute name="deletedDate" type="java.util.Date" db-attribute-path="deleted_date"/>
 		<obj-attribute name="description" type="java.lang.String" db-attribute-path="description"/>
 		<obj-attribute name="requesitosLegais" type="java.lang.String" db-attribute-path="requesitos_legais"/>
 	</obj-entity>
-	<obj-entity name="HsRelatorioMedidaArea" className="siprp.database.cayenne.objects.HsRelatorioMedidaArea" dbEntityName="hs_relatorio_medida_area" superClassName="siprp.database.cayenne.objects.BaseObject">
+	<obj-entity name="HsRelatorioPosto" className="siprp.database.cayenne.objects.HsRelatorioPosto" dbEntityName="hs_relatorio_posto" superClassName="siprp.database.cayenne.objects.BaseObject">
+		<obj-attribute name="deletedDate" type="java.util.Date" db-attribute-path="deleted_date"/>
 		<obj-attribute name="description" type="java.lang.String" db-attribute-path="description"/>
 	</obj-entity>
-	<obj-entity name="HsRelatorioMedidaPosto" className="siprp.database.cayenne.objects.HsRelatorioMedidaPosto" dbEntityName="hs_relatorio_medida_posto" superClassName="siprp.database.cayenne.objects.BaseObject">
-		<obj-attribute name="description" type="java.lang.String" db-attribute-path="description"/>
+	<obj-entity name="HsRelatorioPostoMedida" className="siprp.database.cayenne.objects.HsRelatorioPostoMedida" dbEntityName="hs_relatorio_posto_medida" superClassName="siprp.database.cayenne.objects.BaseObject">
+	</obj-entity>
+	<obj-entity name="HsRelatorioPostoRisco" className="siprp.database.cayenne.objects.HsRelatorioPostoRisco" dbEntityName="hs_relatorio_posto_risco" superClassName="siprp.database.cayenne.objects.BaseObject">
+		<obj-attribute name="probabilidade" type="java.lang.Integer" db-attribute-path="probabilidade"/>
+		<obj-attribute name="severidade" type="java.lang.Integer" db-attribute-path="severidade"/>
 	</obj-entity>
 	<obj-entity name="HsRelatorioRisco" className="siprp.database.cayenne.objects.HsRelatorioRisco" dbEntityName="hs_relatorio_risco" superClassName="siprp.database.cayenne.objects.BaseObject">
 		<obj-attribute name="deletedDate" type="java.util.Date" db-attribute-path="deleted_date"/>
 		<obj-attribute name="description" type="java.lang.String" db-attribute-path="description"/>
-		<obj-attribute name="isPlanoActuacao" type="java.lang.String" db-attribute-path="is_plano_actuacao"/>
-		<obj-attribute name="probabilidade" type="java.lang.Integer" db-attribute-path="probabilidade"/>
-		<obj-attribute name="severidade" type="java.lang.Integer" db-attribute-path="severidade"/>
 	</obj-entity>
 	<obj-entity name="HsRelatorioRiscoValorQualitativo" className="siprp.database.cayenne.objects.HsRelatorioRiscoValorQualitativo" dbEntityName="hs_relatorio_risco_valor_qualitativo" superClassName="siprp.database.cayenne.objects.BaseObject">
 		<obj-attribute name="description" type="java.lang.String" db-attribute-path="description"/>
@@ -1124,6 +1164,9 @@
 	<db-relationship name="estabelecimentosArray" source="empresas" target="estabelecimentos" toMany="true">
 		<db-attribute-pair source="id" target="empresa_id"/>
 	</db-relationship>
+	<db-relationship name="hsAreaArray" source="empresas" target="hs_area" toMany="true">
+		<db-attribute-pair source="id" target="empresa_id"/>
+	</db-relationship>
 	<db-relationship name="lembretesArray" source="empresas" target="lembretes" toMany="true">
 		<db-attribute-pair source="id" target="empresa_id"/>
 	</db-relationship>
@@ -1151,6 +1194,9 @@
 	<db-relationship name="historicoEstabelecimentoArray" source="estabelecimentos" target="historico_estabelecimento" toMany="true">
 		<db-attribute-pair source="id" target="estabelecimento_id"/>
 	</db-relationship>
+	<db-relationship name="hsPostoEstabelecimentoArray" source="estabelecimentos" target="hs_posto_estabelecimento" toDependentPK="true" toMany="true">
+		<db-attribute-pair source="id" target="estabelecimento_id"/>
+	</db-relationship>
 	<db-relationship name="lembretesArray" source="estabelecimentos" target="lembretes" toMany="true">
 		<db-attribute-pair source="id" target="estabelecimento_id"/>
 	</db-relationship>
@@ -1190,6 +1236,9 @@
 	<db-relationship name="hsPostoArray" source="hs_area" target="hs_posto" toMany="true">
 		<db-attribute-pair source="id" target="area_id"/>
 	</db-relationship>
+	<db-relationship name="toEmpresas" source="hs_area" target="empresas" toMany="false">
+		<db-attribute-pair source="empresa_id" target="id"/>
+	</db-relationship>
 	<db-relationship name="hsLegislacaoEmpresaArray" source="hs_legislacao" target="hs_legislacao_empresa" toDependentPK="true" toMany="true">
 		<db-attribute-pair source="id" target="legislacao_id"/>
 	</db-relationship>
@@ -1208,39 +1257,102 @@
 	<db-relationship name="toHsLegislacao" source="hs_legislacao_estabelecimento" target="hs_legislacao" toMany="false">
 		<db-attribute-pair source="legislacao_id" target="id"/>
 	</db-relationship>
+	<db-relationship name="hsPostoMedidaArray" source="hs_medida" target="hs_posto_medida" toDependentPK="true" toMany="true">
+		<db-attribute-pair source="id" target="medida_id"/>
+	</db-relationship>
 	<db-relationship name="hsRiscoMedidaArray" source="hs_medida" target="hs_risco_medida" toDependentPK="true" toMany="true">
 		<db-attribute-pair source="id" target="medida_id"/>
 	</db-relationship>
+	<db-relationship name="hsPostoEstabelecimentoArray" source="hs_posto" target="hs_posto_estabelecimento" toDependentPK="true" toMany="true">
+		<db-attribute-pair source="id" target="posto_id"/>
+	</db-relationship>
+	<db-relationship name="hsPostoMedidaArray" source="hs_posto" target="hs_posto_medida" toDependentPK="true" toMany="true">
+		<db-attribute-pair source="id" target="posto_id"/>
+	</db-relationship>
+	<db-relationship name="hsPostoRiscoArray" source="hs_posto" target="hs_posto_risco" toDependentPK="true" toMany="true">
+		<db-attribute-pair source="id" target="posto_id"/>
+	</db-relationship>
 	<db-relationship name="toHsArea" source="hs_posto" target="hs_area" toMany="false">
 		<db-attribute-pair source="area_id" target="id"/>
 	</db-relationship>
+	<db-relationship name="toEstabelecimentos" source="hs_posto_estabelecimento" target="estabelecimentos" toMany="false">
+		<db-attribute-pair source="estabelecimento_id" target="id"/>
+	</db-relationship>
+	<db-relationship name="toHsPosto" source="hs_posto_estabelecimento" target="hs_posto" toMany="false">
+		<db-attribute-pair source="posto_id" target="id"/>
+	</db-relationship>
+	<db-relationship name="toHsMedida" source="hs_posto_medida" target="hs_medida" toMany="false">
+		<db-attribute-pair source="medida_id" target="id"/>
+	</db-relationship>
+	<db-relationship name="toHsPosto" source="hs_posto_medida" target="hs_posto" toMany="false">
+		<db-attribute-pair source="posto_id" target="id"/>
+	</db-relationship>
+	<db-relationship name="toHsPosto" source="hs_posto_risco" target="hs_posto" toMany="false">
+		<db-attribute-pair source="posto_id" target="id"/>
+	</db-relationship>
+	<db-relationship name="toHsRelatorioRiscoValorQualitativo" source="hs_posto_risco" target="hs_relatorio_risco_valor_qualitativo" toMany="false">
+		<db-attribute-pair source="valor_qualitativo" target="id"/>
+	</db-relationship>
+	<db-relationship name="toHsRisco" source="hs_posto_risco" target="hs_risco" toMany="false">
+		<db-attribute-pair source="risco_id" target="id"/>
+	</db-relationship>
 	<db-relationship name="hsRelatorioRiscoArray" source="hs_relatorio" target="hs_relatorio_risco" toMany="true">
 		<db-attribute-pair source="id" target="relatorio_id"/>
 	</db-relationship>
 	<db-relationship name="toHsMarcacoesEstabelecimento" source="hs_relatorio" target="marcacoes_estabelecimento" toMany="false">
 		<db-attribute-pair source="marcacao_id" target="id"/>
 	</db-relationship>
+	<db-relationship name="hsRelatorioPostoArray" source="hs_relatorio_area" target="hs_relatorio_posto" toMany="true">
+		<db-attribute-pair source="id" target="area_id"/>
+	</db-relationship>
+	<db-relationship name="hsRelatorioPostoMedidaArray" source="hs_relatorio_medida" target="hs_relatorio_posto_medida" toDependentPK="true" toMany="true">
+		<db-attribute-pair source="id" target="medida_id"/>
+	</db-relationship>
 	<db-relationship name="toHsRelatorioRisco" source="hs_relatorio_medida" target="hs_relatorio_risco" toMany="false">
 		<db-attribute-pair source="risco_id" target="id"/>
 	</db-relationship>
-	<db-relationship name="hsRelatorioMedidaPostoArray" source="hs_relatorio_medida_area" target="hs_relatorio_medida_posto" toMany="true">
-		<db-attribute-pair source="id" target="area_id"/>
+	<db-relationship name="hsRelatorioPostoMedidaArray" source="hs_relatorio_posto" target="hs_relatorio_posto_medida" toDependentPK="true" toMany="true">
+		<db-attribute-pair source="id" target="posto_id"/>
 	</db-relationship>
-	<db-relationship name="toHsRelatorioMedidaArea" source="hs_relatorio_medida_posto" target="hs_relatorio_medida_area" toMany="false">
+	<db-relationship name="hsRelatorioPostoRiscoArray" source="hs_relatorio_posto" target="hs_relatorio_posto_risco" toDependentPK="true" toMany="true">
+		<db-attribute-pair source="id" target="posto_id"/>
+	</db-relationship>
+	<db-relationship name="toHsRelatorioArea" source="hs_relatorio_posto" target="hs_relatorio_area" toMany="false">
 		<db-attribute-pair source="area_id" target="id"/>
 	</db-relationship>
+	<db-relationship name="toHsRelatorioMedida" source="hs_relatorio_posto_medida" target="hs_relatorio_medida" toMany="false">
+		<db-attribute-pair source="medida_id" target="id"/>
+	</db-relationship>
+	<db-relationship name="toHsRelatorioPosto" source="hs_relatorio_posto_medida" target="hs_relatorio_posto" toMany="false">
+		<db-attribute-pair source="posto_id" target="id"/>
+	</db-relationship>
+	<db-relationship name="toHsRelatorioPosto" source="hs_relatorio_posto_risco" target="hs_relatorio_posto" toMany="false">
+		<db-attribute-pair source="posto_id" target="id"/>
+	</db-relationship>
+	<db-relationship name="toHsRelatorioRisco" source="hs_relatorio_posto_risco" target="hs_relatorio_risco" toMany="false">
+		<db-attribute-pair source="risco_id" target="id"/>
+	</db-relationship>
+	<db-relationship name="toHsRelatorioRiscoValorQualitativo" source="hs_relatorio_posto_risco" target="hs_relatorio_risco_valor_qualitativo" toMany="false">
+		<db-attribute-pair source="valor_qualitativo_id" target="id"/>
+	</db-relationship>
 	<db-relationship name="hsRelatorioMedidaArray" source="hs_relatorio_risco" target="hs_relatorio_medida" toMany="true">
 		<db-attribute-pair source="id" target="risco_id"/>
 	</db-relationship>
+	<db-relationship name="hsRelatorioPostoRiscoArray" source="hs_relatorio_risco" target="hs_relatorio_posto_risco" toDependentPK="true" toMany="true">
+		<db-attribute-pair source="id" target="risco_id"/>
+	</db-relationship>
 	<db-relationship name="toHsRelatorio" source="hs_relatorio_risco" target="hs_relatorio" toMany="false">
 		<db-attribute-pair source="relatorio_id" target="id"/>
 	</db-relationship>
-	<db-relationship name="toHsRelatorioRiscoValorQualitativo" source="hs_relatorio_risco" target="hs_relatorio_risco_valor_qualitativo" toMany="false">
-		<db-attribute-pair source="valor_qualitativo_id" target="id"/>
+	<db-relationship name="hsPostoRiscoArray" source="hs_relatorio_risco_valor_qualitativo" target="hs_posto_risco" toMany="true">
+		<db-attribute-pair source="id" target="valor_qualitativo"/>
 	</db-relationship>
-	<db-relationship name="hsRelatorioRiscoArray" source="hs_relatorio_risco_valor_qualitativo" target="hs_relatorio_risco" toMany="true">
+	<db-relationship name="hsRelatorioPostoRiscoArray" source="hs_relatorio_risco_valor_qualitativo" target="hs_relatorio_posto_risco" toMany="true">
 		<db-attribute-pair source="id" target="valor_qualitativo_id"/>
 	</db-relationship>
+	<db-relationship name="hsPostoRiscoArray" source="hs_risco" target="hs_posto_risco" toDependentPK="true" toMany="true">
+		<db-attribute-pair source="id" target="risco_id"/>
+	</db-relationship>
 	<db-relationship name="hsRiscoMedidaArray" source="hs_risco" target="hs_risco_medida" toDependentPK="true" toMany="true">
 		<db-attribute-pair source="id" target="risco_id"/>
 	</db-relationship>
@@ -1533,6 +1645,7 @@
 	<obj-relationship name="toEstabelecimentos" source="EmailPlanoDeActuacao" target="Estabelecimentos" deleteRule="Nullify" db-relationship-path="toEstabelecimentos"/>
 	<obj-relationship name="avisosArray" source="Empresas" target="Avisos" db-relationship-path="avisosArray"/>
 	<obj-relationship name="estabelecimentosArray" source="Empresas" target="Estabelecimentos" db-relationship-path="estabelecimentosArray"/>
+	<obj-relationship name="hsAreaArray" source="Empresas" target="HsArea" db-relationship-path="hsAreaArray"/>
 	<obj-relationship name="lembretesArray" source="Empresas" target="Lembretes" db-relationship-path="lembretesArray"/>
 	<obj-relationship name="marcacoesEmpresaArray" source="Empresas" target="MarcacoesEmpresa" db-relationship-path="marcacoesEmpresaArray"/>
 	<obj-relationship name="prtElementosProtocoloArray" source="Empresas" target="PrtElementosProtocolo" db-relationship-path="prtElementosProtocoloArray"/>
@@ -1542,6 +1655,7 @@
 	<obj-relationship name="avisosArray" source="Estabelecimentos" target="Avisos" db-relationship-path="avisosArray"/>
 	<obj-relationship name="emailPlanoDeActuacaoArray" source="Estabelecimentos" target="EmailPlanoDeActuacao" db-relationship-path="emailPlanoDeActuacaoArray"/>
 	<obj-relationship name="historicoEstabelecimentoArray" source="Estabelecimentos" target="HistoricoEstabelecimento" db-relationship-path="historicoEstabelecimentoArray"/>
+	<obj-relationship name="hsPostoEstabelecimentoArray" source="Estabelecimentos" target="HsPostoEstabelecimento" db-relationship-path="hsPostoEstabelecimentoArray"/>
 	<obj-relationship name="lembretesArray" source="Estabelecimentos" target="Lembretes" db-relationship-path="lembretesArray"/>
 	<obj-relationship name="marcacoesEstabelecimentoArray" source="Estabelecimentos" target="MarcacoesEstabelecimento" db-relationship-path="marcacoesEstabelecimentoArray"/>
 	<obj-relationship name="toContactos" source="Estabelecimentos" target="Contactos" db-relationship-path="toContactos"/>
@@ -1555,23 +1669,45 @@
 	<obj-relationship name="toTiposExamesComp" source="ExamesPerfis" target="TiposExamesComp" db-relationship-path="toTiposExamesComp"/>
 	<obj-relationship name="toEstabelecimentos" source="HistoricoEstabelecimento" target="Estabelecimentos" db-relationship-path="toEstabelecimentos"/>
 	<obj-relationship name="hsPostoArray" source="HsArea" target="HsPosto" db-relationship-path="hsPostoArray"/>
+	<obj-relationship name="toEmpresas" source="HsArea" target="Empresas" db-relationship-path="toEmpresas"/>
 	<obj-relationship name="hsLegislacaoEmpresaArray" source="HsLegislacao" target="HsLegislacaoEmpresa" db-relationship-path="hsLegislacaoEmpresaArray"/>
 	<obj-relationship name="hsLegislacaoEstabelecimentoArray" source="HsLegislacao" target="HsLegislacaoEstabelecimento" db-relationship-path="hsLegislacaoEstabelecimentoArray"/>
 	<obj-relationship name="toHsLegislacaoCategoria" source="HsLegislacao" target="HsLegislacaoCategoria" db-relationship-path="toHsLegislacaoCategoria"/>
 	<obj-relationship name="hsLegislacaoArray" source="HsLegislacaoCategoria" target="HsLegislacao" db-relationship-path="hsLegislacaoArray"/>
 	<obj-relationship name="toHsLegislacao" source="HsLegislacaoEmpresa" target="HsLegislacao" db-relationship-path="toHsLegislacao"/>
 	<obj-relationship name="toHsLegislacao" source="HsLegislacaoEstabelecimento" target="HsLegislacao" db-relationship-path="toHsLegislacao"/>
+	<obj-relationship name="hsPostoMedidaArray" source="HsMedida" target="HsPostoMedida" db-relationship-path="hsPostoMedidaArray"/>
 	<obj-relationship name="hsRiscoMedidaArray" source="HsMedida" target="HsRiscoMedida" db-relationship-path="hsRiscoMedidaArray"/>
+	<obj-relationship name="hsPostoEstabelecimentoArray" source="HsPosto" target="HsPostoEstabelecimento" db-relationship-path="hsPostoEstabelecimentoArray"/>
+	<obj-relationship name="hsPostoMedidaArray" source="HsPosto" target="HsPostoMedida" db-relationship-path="hsPostoMedidaArray"/>
+	<obj-relationship name="hsPostoRiscoArray" source="HsPosto" target="HsPostoRisco" db-relationship-path="hsPostoRiscoArray"/>
 	<obj-relationship name="toHsArea" source="HsPosto" target="HsArea" db-relationship-path="toHsArea"/>
+	<obj-relationship name="toEstabelecimentos" source="HsPostoEstabelecimento" target="Estabelecimentos" db-relationship-path="toEstabelecimentos"/>
+	<obj-relationship name="toHsPosto" source="HsPostoEstabelecimento" target="HsPosto" db-relationship-path="toHsPosto"/>
+	<obj-relationship name="toHsMedida" source="HsPostoMedida" target="HsMedida" db-relationship-path="toHsMedida"/>
+	<obj-relationship name="toHsPosto" source="HsPostoMedida" target="HsPosto" db-relationship-path="toHsPosto"/>
+	<obj-relationship name="toHsPosto" source="HsPostoRisco" target="HsPosto" db-relationship-path="toHsPosto"/>
+	<obj-relationship name="toHsRelatorioRiscoValorQualitativo" source="HsPostoRisco" target="HsRelatorioRiscoValorQualitativo" db-relationship-path="toHsRelatorioRiscoValorQualitativo"/>
+	<obj-relationship name="toHsRisco" source="HsPostoRisco" target="HsRisco" db-relationship-path="toHsRisco"/>
 	<obj-relationship name="hsRelatorioRiscoArray" source="HsRelatorio" target="HsRelatorioRisco" db-relationship-path="hsRelatorioRiscoArray"/>
 	<obj-relationship name="toHsMarcacoesEstabelecimento" source="HsRelatorio" target="MarcacoesEstabelecimento" db-relationship-path="toHsMarcacoesEstabelecimento"/>
+	<obj-relationship name="hsRelatorioPostoArray" source="HsRelatorioArea" target="HsRelatorioPosto" db-relationship-path="hsRelatorioPostoArray"/>
+	<obj-relationship name="hsRelatorioPostoMedidaArray" source="HsRelatorioMedida" target="HsRelatorioPostoMedida" db-relationship-path="hsRelatorioPostoMedidaArray"/>
 	<obj-relationship name="toHsRelatorioRisco" source="HsRelatorioMedida" target="HsRelatorioRisco" db-relationship-path="toHsRelatorioRisco"/>
-	<obj-relationship name="hsRelatorioMedidaPostoArray" source="HsRelatorioMedidaArea" target="HsRelatorioMedidaPosto" db-relationship-path="hsRelatorioMedidaPostoArray"/>
-	<obj-relationship name="toHsRelatorioMedidaArea" source="HsRelatorioMedidaPosto" target="HsRelatorioMedidaArea" db-relationship-path="toHsRelatorioMedidaArea"/>
+	<obj-relationship name="hsRelatorioPostoMedidaArray" source="HsRelatorioPosto" target="HsRelatorioPostoMedida" db-relationship-path="hsRelatorioPostoMedidaArray"/>
+	<obj-relationship name="hsRelatorioPostoRiscoArray" source="HsRelatorioPosto" target="HsRelatorioPostoRisco" db-relationship-path="hsRelatorioPostoRiscoArray"/>
+	<obj-relationship name="toHsRelatorioArea" source="HsRelatorioPosto" target="HsRelatorioArea" db-relationship-path="toHsRelatorioArea"/>
+	<obj-relationship name="toHsRelatorioMedida" source="HsRelatorioPostoMedida" target="HsRelatorioMedida" db-relationship-path="toHsRelatorioMedida"/>
+	<obj-relationship name="toHsRelatorioPosto" source="HsRelatorioPostoMedida" target="HsRelatorioPosto" db-relationship-path="toHsRelatorioPosto"/>
+	<obj-relationship name="toHsRelatorioPosto" source="HsRelatorioPostoRisco" target="HsRelatorioPosto" db-relationship-path="toHsRelatorioPosto"/>
+	<obj-relationship name="toHsRelatorioRisco" source="HsRelatorioPostoRisco" target="HsRelatorioRisco" db-relationship-path="toHsRelatorioRisco"/>
+	<obj-relationship name="toHsRelatorioRiscoValorQualitativo" source="HsRelatorioPostoRisco" target="HsRelatorioRiscoValorQualitativo" db-relationship-path="toHsRelatorioRiscoValorQualitativo"/>
 	<obj-relationship name="hsRelatorioMedidaArray" source="HsRelatorioRisco" target="HsRelatorioMedida" db-relationship-path="hsRelatorioMedidaArray"/>
+	<obj-relationship name="hsRelatorioPostoRiscoArray" source="HsRelatorioRisco" target="HsRelatorioPostoRisco" db-relationship-path="hsRelatorioPostoRiscoArray"/>
 	<obj-relationship name="toHsRelatorio" source="HsRelatorioRisco" target="HsRelatorio" db-relationship-path="toHsRelatorio"/>
-	<obj-relationship name="toHsRelatorioRiscoValorQualitativo" source="HsRelatorioRisco" target="HsRelatorioRiscoValorQualitativo" db-relationship-path="toHsRelatorioRiscoValorQualitativo"/>
-	<obj-relationship name="hsRelatorioRiscoArray" source="HsRelatorioRiscoValorQualitativo" target="HsRelatorioRisco" db-relationship-path="hsRelatorioRiscoArray"/>
+	<obj-relationship name="hsPostoRiscoArray" source="HsRelatorioRiscoValorQualitativo" target="HsPostoRisco" db-relationship-path="hsPostoRiscoArray"/>
+	<obj-relationship name="hsRelatorioPostoRiscoArray" source="HsRelatorioRiscoValorQualitativo" target="HsRelatorioPostoRisco" db-relationship-path="hsRelatorioPostoRiscoArray"/>
+	<obj-relationship name="hsPostoRiscoArray" source="HsRisco" target="HsPostoRisco" db-relationship-path="hsPostoRiscoArray"/>
 	<obj-relationship name="hsRiscoMedidaArray" source="HsRisco" target="HsRiscoMedida" db-relationship-path="hsRiscoMedidaArray"/>
 	<obj-relationship name="toHsRiscoTema" source="HsRisco" target="HsRiscoTema" db-relationship-path="toHsRiscoTema"/>
 	<obj-relationship name="toHsMedida" source="HsRiscoMedida" target="HsMedida" deleteRule="Nullify" db-relationship-path="toHsMedida"/>