diff --git a/trunk/SIPRPSoft/src/SIPRPMap.map.xml b/trunk/SIPRPSoft/src/SIPRPMap.map.xml
index b5f8b9d3..25d0f359 100644
--- a/trunk/SIPRPSoft/src/SIPRPMap.map.xml
+++ b/trunk/SIPRPSoft/src/SIPRPMap.map.xml
@@ -38,6 +38,16 @@
 			<db-key-cache-size>1</db-key-cache-size>
 		</db-key-generator>
 	</db-entity>
+	<db-entity name="email_plano_de_actuacao" schema="public">
+		<db-attribute name="description" type="VARCHAR" isMandatory="true" length="255"/>
+		<db-attribute name="estabelecimento_id" type="INTEGER" length="10"/>
+		<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>email_plano_de_actuacao_id_seq</db-generator-name>
+			<db-key-cache-size>1</db-key-cache-size>
+		</db-key-generator>
+	</db-entity>
 	<db-entity name="empresas" schema="public">
 		<db-attribute name="a_consultas" type="CHAR" length="1"/>
 		<db-attribute name="a_exames" type="CHAR" length="1"/>
@@ -65,6 +75,7 @@
 		<db-attribute name="designacao_social_plain" type="VARCHAR" length="255"/>
 		<db-attribute name="distrito" type="VARCHAR" length="255"/>
 		<db-attribute name="duracao" type="INTEGER" length="10"/>
+		<db-attribute name="empresa_logo_id" type="INTEGER"/>
 		<db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
 		<db-attribute name="inactivo" type="CHAR" isMandatory="true" length="1"/>
 		<db-attribute name="inicio_contrato" type="DATE" length="13"/>
@@ -169,8 +180,28 @@
 		<db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
 		<db-attribute name="texto" type="VARCHAR" length="65535"/>
 	</db-entity>
-	<db-entity name="ids" schema="public">
+	<db-entity name="image" schema="public">
+		<db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
+		<db-attribute name="image_data" type="LONGVARBINARY" isMandatory="true" length="2147483647"/>
+		<db-attribute name="name" type="VARCHAR" isMandatory="true" length="255"/>
+		<db-key-generator>
+			<db-generator-type>ORACLE</db-generator-type>
+			<db-generator-name>image_id_seq</db-generator-name>
+			<db-key-cache-size>1</db-key-cache-size>
+		</db-key-generator>
+	</db-entity>
+	<db-entity name="legislacao" schema="public">
+		<db-attribute name="description" type="VARCHAR" isMandatory="true" length="1024"/>
 		<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>legislacao_id_seq</db-generator-name>
+			<db-key-cache-size>1</db-key-cache-size>
+		</db-key-generator>
+	</db-entity>
+	<db-entity name="legislacao_estabelecimento" schema="public">
+		<db-attribute name="estabelecimento_id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
+		<db-attribute name="legislacao_id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
 	</db-entity>
 	<db-entity name="lembretes" schema="public">
 		<db-attribute name="data" type="DATE" isMandatory="true" length="13"/>
@@ -273,6 +304,28 @@
 		<db-attribute name="nome" type="VARCHAR" isMandatory="true" length="255"/>
 		<db-attribute name="numero_cedula" type="VARCHAR" isMandatory="true" length="255"/>
 	</db-entity>
+	<db-entity name="medida" schema="public">
+		<db-attribute name="description" type="VARCHAR" isMandatory="true" length="255"/>
+		<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>medida_id_seq</db-generator-name>
+			<db-key-cache-size>1</db-key-cache-size>
+		</db-key-generator>
+	</db-entity>
+	<db-entity name="posto_de_trabalho" schema="public">
+		<db-attribute name="description" type="VARCHAR" isMandatory="true" length="1024"/>
+		<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>posto_de_trabalho_id_seq</db-generator-name>
+			<db-key-cache-size>1</db-key-cache-size>
+		</db-key-generator>
+	</db-entity>
+	<db-entity name="posto_de_trabalho_estabelecimento" schema="public">
+		<db-attribute name="estabelecimento_id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
+		<db-attribute name="posto_de_trabalho_id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
+	</db-entity>
 	<db-entity name="prestadores" schema="public">
 		<db-attribute name="activo" type="CHAR" length="1"/>
 		<db-attribute name="codigo_postal" type="VARCHAR" length="16"/>
@@ -329,6 +382,20 @@
 		<db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
 		<db-attribute name="ordem" type="INTEGER" length="10"/>
 	</db-entity>
+	<db-entity name="risco" schema="public">
+		<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="value" type="INTEGER" isMandatory="true" length="10"/>
+		<db-key-generator>
+			<db-generator-type>ORACLE</db-generator-type>
+			<db-generator-name>risco_id_seq</db-generator-name>
+			<db-key-cache-size>1</db-key-cache-size>
+		</db-key-generator>
+	</db-entity>
+	<db-entity name="risco_medida" schema="public">
+		<db-attribute name="medida_id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
+		<db-attribute name="risco_id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
+	</db-entity>
 	<db-entity name="tipos_exames_comp" schema="public">
 		<db-attribute name="descricao" type="VARCHAR" isMandatory="true" length="255"/>
 		<db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
@@ -432,6 +499,12 @@
 			<db-key-cache-size>1</db-key-cache-size>
 		</db-key-generator>
 	</db-entity>
+	<db-entity name="trabalhadores_ecds_analise" schema="public">
+		<db-attribute name="data" type="DATE" isMandatory="true" length="13"/>
+		<db-attribute name="grupo_ecds_id" type="INTEGER" isMandatory="true" length="10"/>
+		<db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
+		<db-attribute name="prestador_id" type="INTEGER" isMandatory="true" length="10"/>
+	</db-entity>
 	<db-entity name="trabalhadores_ecds_datas" schema="public">
 		<db-attribute name="analisador_id" type="INTEGER" length="10"/>
 		<db-attribute name="data" type="DATE" length="13"/>
@@ -520,6 +593,9 @@
 		<obj-attribute name="id" type="java.lang.Integer" db-attribute-path="id"/>
 		<obj-attribute name="ordem" type="java.lang.Integer" db-attribute-path="ordem"/>
 	</obj-entity>
+	<obj-entity name="EmailPlanoDeActuacao" className="siprp.database.cayenne.objects.EmailPlanoDeActuacao" dbEntityName="email_plano_de_actuacao">
+		<obj-attribute name="description" type="java.lang.String" db-attribute-path="description"/>
+	</obj-entity>
 	<obj-entity name="Empresas" className="siprp.database.cayenne.objects.Empresas" lock-type="optimistic" dbEntityName="empresas" superClassName="siprp.database.cayenne.objects.BaseObject">
 		<obj-attribute name="aConsultas" type="java.lang.String" db-attribute-path="a_consultas"/>
 		<obj-attribute name="aExames" type="java.lang.String" db-attribute-path="a_exames"/>
@@ -631,7 +707,14 @@
 		<obj-attribute name="id" type="java.lang.Integer" db-attribute-path="id"/>
 		<obj-attribute name="texto" type="java.lang.String" db-attribute-path="texto"/>
 	</obj-entity>
-	<obj-entity name="Ids" className="siprp.database.cayenne.objects.Ids" lock-type="optimistic" dbEntityName="ids" superClassName="siprp.database.cayenne.objects.BaseObject">
+	<obj-entity name="Image" className="siprp.database.cayenne.objects.Image" dbEntityName="image">
+		<obj-attribute name="imageData" type="byte[]" db-attribute-path="image_data"/>
+		<obj-attribute name="name" type="java.lang.String" db-attribute-path="name"/>
+	</obj-entity>
+	<obj-entity name="Legislacao" className="siprp.database.cayenne.objects.Legislacao" dbEntityName="legislacao">
+		<obj-attribute name="description" type="java.lang.String" db-attribute-path="description"/>
+	</obj-entity>
+	<obj-entity name="LegislacaoEstabelecimento" className="siprp.database.cayenne.objects.LegislacaoEstabelecimento" dbEntityName="legislacao_estabelecimento">
 	</obj-entity>
 	<obj-entity name="Lembretes" className="siprp.database.cayenne.objects.Lembretes" lock-type="optimistic" dbEntityName="lembretes" superClassName="siprp.database.cayenne.objects.BaseObject">
 		<obj-attribute name="data" type="java.util.Date" db-attribute-path="data"/>
@@ -698,6 +781,14 @@
 		<obj-attribute name="nome" type="java.lang.String" db-attribute-path="nome"/>
 		<obj-attribute name="numeroCedula" type="java.lang.String" db-attribute-path="numero_cedula"/>
 	</obj-entity>
+	<obj-entity name="Medida" className="siprp.database.cayenne.objects.Medida" dbEntityName="medida">
+		<obj-attribute name="description" type="java.lang.String" db-attribute-path="description"/>
+	</obj-entity>
+	<obj-entity name="PostoDeTrabalho" className="siprp.database.cayenne.objects.PostoDeTrabalho" dbEntityName="posto_de_trabalho">
+		<obj-attribute name="description" type="java.lang.String" db-attribute-path="description"/>
+	</obj-entity>
+	<obj-entity name="PostoDeTrabalhoEstabelecimento" className="siprp.database.cayenne.objects.PostoDeTrabalhoEstabelecimento" dbEntityName="posto_de_trabalho_estabelecimento">
+	</obj-entity>
 	<obj-entity name="Prestadores" className="siprp.database.cayenne.objects.Prestadores" lock-type="optimistic" dbEntityName="prestadores" superClassName="siprp.database.cayenne.objects.BaseObject">
 		<obj-attribute name="activo" type="java.lang.String" db-attribute-path="activo"/>
 		<obj-attribute name="codigoPostal" type="java.lang.String" db-attribute-path="codigo_postal"/>
@@ -731,6 +822,12 @@
 		<obj-attribute name="id" type="java.lang.Integer" db-attribute-path="id"/>
 		<obj-attribute name="ordem" type="java.lang.Integer" db-attribute-path="ordem"/>
 	</obj-entity>
+	<obj-entity name="Risco" className="siprp.database.cayenne.objects.Risco" dbEntityName="risco">
+		<obj-attribute name="description" type="java.lang.String" db-attribute-path="description"/>
+		<obj-attribute name="value" type="java.lang.Integer" db-attribute-path="value"/>
+	</obj-entity>
+	<obj-entity name="RiscoMedida" className="siprp.database.cayenne.objects.RiscoMedida" dbEntityName="risco_medida">
+	</obj-entity>
 	<obj-entity name="TiposExamesComp" className="siprp.database.cayenne.objects.TiposExamesComp" lock-type="optimistic" dbEntityName="tipos_exames_comp" superClassName="siprp.database.cayenne.objects.BaseObject">
 		<obj-attribute name="descricao" type="java.lang.String" db-attribute-path="descricao"/>
 		<obj-attribute name="id" type="java.lang.Integer" db-attribute-path="id"/>
@@ -789,6 +886,9 @@
 		<obj-attribute name="estado" type="java.lang.Integer" db-attribute-path="estado"/>
 		<obj-attribute name="id" type="java.lang.Integer" db-attribute-path="id"/>
 	</obj-entity>
+	<obj-entity name="TrabalhadoresEcdsAnalise" className="siprp.database.cayenne.objects.TrabalhadoresEcdsAnalise" dbEntityName="trabalhadores_ecds_analise">
+		<obj-attribute name="data" type="java.util.Date" db-attribute-path="data"/>
+	</obj-entity>
 	<obj-entity name="TrabalhadoresEcdsDatas" className="siprp.database.cayenne.objects.TrabalhadoresEcdsDatas" lock-type="optimistic" dbEntityName="trabalhadores_ecds_datas" superClassName="siprp.database.cayenne.objects.BaseObject">
 		<obj-attribute name="data" type="java.util.Date" db-attribute-path="data"/>
 		<obj-attribute name="dataEnvio" type="java.util.Date" db-attribute-path="data_envio"/>
@@ -840,6 +940,9 @@
 	<db-relationship name="trabalhadoresEcdArray" source="ecd_oficial" target="trabalhadores_ecd" toMany="true">
 		<db-attribute-pair source="id" target="ecd_oficial_id"/>
 	</db-relationship>
+	<db-relationship name="toEstabelecimentos" source="email_plano_de_actuacao" target="estabelecimentos" toMany="false">
+		<db-attribute-pair source="estabelecimento_id" target="id"/>
+	</db-relationship>
 	<db-relationship name="avisosArray" source="empresas" target="avisos" toMany="true">
 		<db-attribute-pair source="id" target="empresa_id"/>
 	</db-relationship>
@@ -861,18 +964,30 @@
 	<db-relationship name="toContactos1" source="empresas" target="contactos" toMany="false">
 		<db-attribute-pair source="contacto_2" target="id"/>
 	</db-relationship>
+	<db-relationship name="toImage" source="empresas" target="image" toMany="false">
+		<db-attribute-pair source="empresa_logo_id" target="id"/>
+	</db-relationship>
 	<db-relationship name="avisosArray" source="estabelecimentos" target="avisos" toMany="true">
 		<db-attribute-pair source="id" target="estabelecimento_id"/>
 	</db-relationship>
+	<db-relationship name="emailPlanoDeActuacaoArray" source="estabelecimentos" target="email_plano_de_actuacao" toMany="true">
+		<db-attribute-pair source="id" target="estabelecimento_id"/>
+	</db-relationship>
 	<db-relationship name="historicoEstabelecimentoArray" source="estabelecimentos" target="historico_estabelecimento" toMany="true">
 		<db-attribute-pair source="id" target="estabelecimento_id"/>
 	</db-relationship>
+	<db-relationship name="legislacaoEstabelecimentoArray" source="estabelecimentos" target="legislacao_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>
 	<db-relationship name="marcacoesEstabelecimentoArray" source="estabelecimentos" target="marcacoes_estabelecimento" toMany="true">
 		<db-attribute-pair source="id" target="estabelecimento_id"/>
 	</db-relationship>
+	<db-relationship name="postoDeTrabalhoEstabelecimentoArray" source="estabelecimentos" target="posto_de_trabalho_estabelecimento" toDependentPK="true" toMany="true">
+		<db-attribute-pair source="id" target="estabelecimento_id"/>
+	</db-relationship>
 	<db-relationship name="toContactos" source="estabelecimentos" target="contactos" toMany="false">
 		<db-attribute-pair source="contacto_id" target="id"/>
 	</db-relationship>
@@ -903,6 +1018,18 @@
 	<db-relationship name="toEstabelecimentos" source="historico_estabelecimento" target="estabelecimentos" toMany="false">
 		<db-attribute-pair source="estabelecimento_id" target="id"/>
 	</db-relationship>
+	<db-relationship name="empresasArray" source="image" target="empresas" toMany="true">
+		<db-attribute-pair source="id" target="empresa_logo_id"/>
+	</db-relationship>
+	<db-relationship name="legislacaoEstabelecimentoArray" source="legislacao" target="legislacao_estabelecimento" toDependentPK="true" toMany="true">
+		<db-attribute-pair source="id" target="legislacao_id"/>
+	</db-relationship>
+	<db-relationship name="toEstabelecimentos" source="legislacao_estabelecimento" target="estabelecimentos" toMany="false">
+		<db-attribute-pair source="estabelecimento_id" target="id"/>
+	</db-relationship>
+	<db-relationship name="toLegislacao" source="legislacao_estabelecimento" target="legislacao" toMany="false">
+		<db-attribute-pair source="legislacao_id" target="id"/>
+	</db-relationship>
 	<db-relationship name="toEmpresas" source="lembretes" target="empresas" toMany="false">
 		<db-attribute-pair source="empresa_id" target="id"/>
 	</db-relationship>
@@ -975,6 +1102,18 @@
 	<db-relationship name="examesArray" source="medicos" target="exames" toMany="true">
 		<db-attribute-pair source="id" target="medico_id"/>
 	</db-relationship>
+	<db-relationship name="riscoMedidaArray" source="medida" target="risco_medida" toDependentPK="true" toMany="true">
+		<db-attribute-pair source="id" target="medida_id"/>
+	</db-relationship>
+	<db-relationship name="postoDeTrabalhoEstabelecimentoArray" source="posto_de_trabalho" target="posto_de_trabalho_estabelecimento" toDependentPK="true" toMany="true">
+		<db-attribute-pair source="id" target="posto_de_trabalho_id"/>
+	</db-relationship>
+	<db-relationship name="toEstabelecimentos" source="posto_de_trabalho_estabelecimento" target="estabelecimentos" toMany="false">
+		<db-attribute-pair source="estabelecimento_id" target="id"/>
+	</db-relationship>
+	<db-relationship name="toPostoDeTrabalho" source="posto_de_trabalho_estabelecimento" target="posto_de_trabalho" toMany="false">
+		<db-attribute-pair source="posto_de_trabalho_id" target="id"/>
+	</db-relationship>
 	<db-relationship name="estabelecimentosArray" source="prestadores" target="estabelecimentos" toMany="true">
 		<db-attribute-pair source="id" target="prestador_consulta_id"/>
 	</db-relationship>
@@ -1005,6 +1144,9 @@
 	<db-relationship name="trabalhadoresEcdArray" source="prestadores" target="trabalhadores_ecd" toMany="true">
 		<db-attribute-pair source="id" target="analisador_id"/>
 	</db-relationship>
+	<db-relationship name="trabalhadoresEcdsAnaliseArray" source="prestadores" target="trabalhadores_ecds_analise" toMany="true">
+		<db-attribute-pair source="id" target="prestador_id"/>
+	</db-relationship>
 	<db-relationship name="trabalhadoresEcdsDatasArray1" source="prestadores" target="trabalhadores_ecds_datas" toMany="true">
 		<db-attribute-pair source="id" target="analisador_id"/>
 	</db-relationship>
@@ -1032,6 +1174,9 @@
 	<db-relationship name="toAnalisador" source="prt_grupos_protocolo" target="prestadores" toMany="false">
 		<db-attribute-pair source="analisador_id" target="id"/>
 	</db-relationship>
+	<db-relationship name="trabalhadoresEcdsAnaliseArray" source="prt_grupos_protocolo" target="trabalhadores_ecds_analise" toMany="true">
+		<db-attribute-pair source="id" target="grupo_ecds_id"/>
+	</db-relationship>
 	<db-relationship name="prtElementosProtocoloArray" source="prt_tipos_elementos_protocolo" target="prt_elementos_protocolo" toMany="true">
 		<db-attribute-pair source="id" target="tipo_elemento_protocolo_id"/>
 	</db-relationship>
@@ -1041,6 +1186,15 @@
 	<db-relationship name="trabalhadoresEcdArray" source="prt_tipos_elementos_protocolo" target="trabalhadores_ecd" toMany="true">
 		<db-attribute-pair source="id" target="ecd_id"/>
 	</db-relationship>
+	<db-relationship name="riscoMedidaArray" source="risco" target="risco_medida" toDependentPK="true" toMany="true">
+		<db-attribute-pair source="id" target="risco_id"/>
+	</db-relationship>
+	<db-relationship name="toMedida" source="risco_medida" target="medida" toMany="false">
+		<db-attribute-pair source="medida_id" target="id"/>
+	</db-relationship>
+	<db-relationship name="toRisco" source="risco_medida" target="risco" toMany="false">
+		<db-attribute-pair source="risco_id" target="id"/>
+	</db-relationship>
 	<db-relationship name="examesPerfisArray" source="tipos_exames_comp" target="exames_perfis" toMany="true">
 		<db-attribute-pair source="id" target="tipo"/>
 	</db-relationship>
@@ -1110,6 +1264,12 @@
 	<db-relationship name="trabalhadoresEcdsDatasArray" source="trabalhadores_ecds" target="trabalhadores_ecds_datas" toMany="true">
 		<db-attribute-pair source="id" target="trabalhadores_ecds_id"/>
 	</db-relationship>
+	<db-relationship name="toPrestadores" source="trabalhadores_ecds_analise" target="prestadores" toMany="false">
+		<db-attribute-pair source="prestador_id" target="id"/>
+	</db-relationship>
+	<db-relationship name="toPrtGruposProtocolo" source="trabalhadores_ecds_analise" target="prt_grupos_protocolo" toMany="false">
+		<db-attribute-pair source="grupo_ecds_id" target="id"/>
+	</db-relationship>
 	<db-relationship name="toAnalisador" source="trabalhadores_ecds_datas" target="prestadores" toMany="false">
 		<db-attribute-pair source="analisador_id" target="id"/>
 	</db-relationship>
@@ -1159,6 +1319,7 @@
 	<obj-relationship name="estabelecimentosArray" source="Contactos" target="Estabelecimentos" db-relationship-path="estabelecimentosArray"/>
 	<obj-relationship name="prestadoresArray" source="Contactos" target="Prestadores" db-relationship-path="prestadoresArray"/>
 	<obj-relationship name="trabalhadoresEcdArray" source="EcdOficial" target="TrabalhadoresEcd" db-relationship-path="trabalhadoresEcdArray"/>
+	<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="lembretesArray" source="Empresas" target="Lembretes" db-relationship-path="lembretesArray"/>
@@ -1166,10 +1327,14 @@
 	<obj-relationship name="prtElementosProtocoloArray" source="Empresas" target="PrtElementosProtocolo" db-relationship-path="prtElementosProtocoloArray"/>
 	<obj-relationship name="toContactos" source="Empresas" target="Contactos" db-relationship-path="toContactos"/>
 	<obj-relationship name="toContactos1" source="Empresas" target="Contactos" db-relationship-path="toContactos1"/>
+	<obj-relationship name="toLogotipo" source="Empresas" target="Image" db-relationship-path="toImage"/>
 	<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="legislacaoEstabelecimentoArray" source="Estabelecimentos" target="LegislacaoEstabelecimento" db-relationship-path="legislacaoEstabelecimentoArray"/>
 	<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="postoDeTrabalhoEstabelecimentoArray" source="Estabelecimentos" target="PostoDeTrabalhoEstabelecimento" db-relationship-path="postoDeTrabalhoEstabelecimentoArray"/>
 	<obj-relationship name="toContactos" source="Estabelecimentos" target="Contactos" db-relationship-path="toContactos"/>
 	<obj-relationship name="toEmpresas" source="Estabelecimentos" target="Empresas" db-relationship-path="toEmpresas"/>
 	<obj-relationship name="toMedicos" source="Estabelecimentos" target="Medicos" db-relationship-path="toMedicos"/>
@@ -1180,6 +1345,10 @@
 	<obj-relationship name="trabalhadoresFichasAptidaoArray" source="Exames" target="TrabalhadoresFichasAptidao" db-relationship-path="trabalhadoresFichasAptidaoArray"/>
 	<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="empresasArray" source="Image" target="Empresas" db-relationship-path="empresasArray"/>
+	<obj-relationship name="legislacaoEstabelecimentoArray" source="Legislacao" target="LegislacaoEstabelecimento" db-relationship-path="legislacaoEstabelecimentoArray"/>
+	<obj-relationship name="toEstabelecimentos" source="LegislacaoEstabelecimento" target="Estabelecimentos" deleteRule="Nullify" db-relationship-path="toEstabelecimentos"/>
+	<obj-relationship name="toLegislacao" source="LegislacaoEstabelecimento" target="Legislacao" deleteRule="Nullify" db-relationship-path="toLegislacao"/>
 	<obj-relationship name="toEmpresas" source="Lembretes" target="Empresas" db-relationship-path="toEmpresas"/>
 	<obj-relationship name="toEstabelecimentos" source="Lembretes" target="Estabelecimentos" db-relationship-path="toEstabelecimentos"/>
 	<obj-relationship name="toLembretesTipos" source="Lembretes" target="LembretesTipos" db-relationship-path="toLembretesTipos"/>
@@ -1204,6 +1373,10 @@
 	<obj-relationship name="toPrestadores" source="MarcacoesTrabalhadorEstados" target="Prestadores" db-relationship-path="toPrestadores"/>
 	<obj-relationship name="estabelecimentosArray" source="Medicos" target="Estabelecimentos" db-relationship-path="estabelecimentosArray"/>
 	<obj-relationship name="examesArray" source="Medicos" target="Exames" db-relationship-path="examesArray"/>
+	<obj-relationship name="riscoMedidaArray" source="Medida" target="RiscoMedida" deleteRule="Cascade" db-relationship-path="riscoMedidaArray"/>
+	<obj-relationship name="postoDeTrabalhoEstabelecimentoArray" source="PostoDeTrabalho" target="PostoDeTrabalhoEstabelecimento" db-relationship-path="postoDeTrabalhoEstabelecimentoArray"/>
+	<obj-relationship name="toEstabelecimentos" source="PostoDeTrabalhoEstabelecimento" target="Estabelecimentos" deleteRule="Nullify" db-relationship-path="toEstabelecimentos"/>
+	<obj-relationship name="toPostoDeTrabalho" source="PostoDeTrabalhoEstabelecimento" target="PostoDeTrabalho" deleteRule="Nullify" db-relationship-path="toPostoDeTrabalho"/>
 	<obj-relationship name="estabelecimentosArray" source="Prestadores" target="Estabelecimentos" db-relationship-path="estabelecimentosArray"/>
 	<obj-relationship name="estabelecimentosArray1" source="Prestadores" target="Estabelecimentos" db-relationship-path="estabelecimentosArray1"/>
 	<obj-relationship name="marcacoesTrabalhadorArray" source="Prestadores" target="MarcacoesTrabalhador" db-relationship-path="marcacoesTrabalhadorArray"/>
@@ -1226,6 +1399,9 @@
 	<obj-relationship name="prtElementosProtocoloArray" source="PrtTiposElementosProtocolo" target="PrtElementosProtocolo" db-relationship-path="prtElementosProtocoloArray"/>
 	<obj-relationship name="toPrtGruposProtocolo" source="PrtTiposElementosProtocolo" target="PrtGruposProtocolo" db-relationship-path="toPrtGruposProtocolo"/>
 	<obj-relationship name="trabalhadoresEcdArray" source="PrtTiposElementosProtocolo" target="TrabalhadoresEcd" db-relationship-path="trabalhadoresEcdArray"/>
+	<obj-relationship name="riscoMedidaArray" source="Risco" target="RiscoMedida" deleteRule="Cascade" db-relationship-path="riscoMedidaArray"/>
+	<obj-relationship name="toMedida" source="RiscoMedida" target="Medida" deleteRule="Nullify" db-relationship-path="toMedida"/>
+	<obj-relationship name="toRisco" source="RiscoMedida" target="Risco" deleteRule="Nullify" db-relationship-path="toRisco"/>
 	<obj-relationship name="examesPerfisArray" source="TiposExamesComp" target="ExamesPerfis" db-relationship-path="examesPerfisArray"/>
 	<obj-relationship name="lembretesArray" source="Trabalhadores" target="Lembretes" db-relationship-path="lembretesArray"/>
 	<obj-relationship name="toEstabelecimentos" source="Trabalhadores" target="Estabelecimentos" db-relationship-path="toEstabelecimentos"/>
@@ -1249,6 +1425,8 @@
 	<obj-relationship name="toTrabalhadores" source="TrabalhadoresEcds" target="Trabalhadores" db-relationship-path="toTrabalhadores"/>
 	<obj-relationship name="toTrabalhadoresProcesso" source="TrabalhadoresEcds" target="TrabalhadoresProcesso" db-relationship-path="toTrabalhadoresProcesso"/>
 	<obj-relationship name="trabalhadoresEcdsDatasArray" source="TrabalhadoresEcds" target="TrabalhadoresEcdsDatas" db-relationship-path="trabalhadoresEcdsDatasArray"/>
+	<obj-relationship name="toPrestadores" source="TrabalhadoresEcdsAnalise" target="Prestadores" db-relationship-path="toPrestadores"/>
+	<obj-relationship name="toPrtGruposProtocolo" source="TrabalhadoresEcdsAnalise" target="PrtGruposProtocolo" db-relationship-path="toPrtGruposProtocolo"/>
 	<obj-relationship name="toAnalisador" source="TrabalhadoresEcdsDatas" target="Prestadores" db-relationship-path="toAnalisador"/>
 	<obj-relationship name="toPrestadores" source="TrabalhadoresEcdsDatas" target="Prestadores" db-relationship-path="toPrestadores"/>
 	<obj-relationship name="toTrabalhadoresEcds" source="TrabalhadoresEcdsDatas" target="TrabalhadoresEcds" db-relationship-path="toTrabalhadoresEcds"/>