diff --git a/trunk/common/src/SIPRPMap.map.xml b/trunk/common/src/SIPRPMap.map.xml
index 83fae952..bbb9bec1 100644
--- a/trunk/common/src/SIPRPMap.map.xml
+++ b/trunk/common/src/SIPRPMap.map.xml
@@ -972,6 +972,7 @@
 		<obj-attribute name="data" type="java.util.Date" db-attribute-path="data"/>
 		<obj-attribute name="dataEmail" type="java.util.Date" db-attribute-path="data_email"/>
 		<obj-attribute name="dataRelatorio" type="java.util.Date" db-attribute-path="data_relatorio"/>
+		<obj-attribute name="estabelecimentoID" type="java.lang.Integer" db-attribute-path="estabelecimento_id"/>
 		<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-attribute name="observacoes" type="java.lang.String" db-attribute-path="observacoes"/>
diff --git a/trunk/common/src/siprp/database/cayenne/objects/auto/_MarcacoesEstabelecimento.java b/trunk/common/src/siprp/database/cayenne/objects/auto/_MarcacoesEstabelecimento.java
index 55c28df4..4b268a0f 100644
--- a/trunk/common/src/siprp/database/cayenne/objects/auto/_MarcacoesEstabelecimento.java
+++ b/trunk/common/src/siprp/database/cayenne/objects/auto/_MarcacoesEstabelecimento.java
@@ -20,6 +20,7 @@ public abstract class _MarcacoesEstabelecimento extends BaseObject {
     public static final String DATA_PROPERTY = "data";
     public static final String DATA_EMAIL_PROPERTY = "dataEmail";
     public static final String DATA_RELATORIO_PROPERTY = "dataRelatorio";
+    public static final String ESTABELECIMENTO_ID_PROPERTY = "estabelecimentoID";
     public static final String ESTADO_PROPERTY = "estado";
     public static final String ID_PROPERTY = "id";
     public static final String OBSERVACOES_PROPERTY = "observacoes";
@@ -52,6 +53,13 @@ public abstract class _MarcacoesEstabelecimento extends BaseObject {
         return (Date)readProperty("dataRelatorio");
     }
 
+    public void setEstabelecimentoID(Integer estabelecimentoID) {
+        writeProperty("estabelecimentoID", estabelecimentoID);
+    }
+    public Integer getEstabelecimentoID() {
+        return (Integer)readProperty("estabelecimentoID");
+    }
+
     public void setEstado(Integer estado) {
         writeProperty("estado", estado);
     }
diff --git a/trunk/common/src/siprp/database/cayenne/providers/PlanoActuacaoDAO.java b/trunk/common/src/siprp/database/cayenne/providers/PlanoActuacaoDAO.java
index 19d54a4a..eb286ec6 100644
--- a/trunk/common/src/siprp/database/cayenne/providers/PlanoActuacaoDAO.java
+++ b/trunk/common/src/siprp/database/cayenne/providers/PlanoActuacaoDAO.java
@@ -74,23 +74,35 @@ public class PlanoActuacaoDAO extends MainDAO
 		return context.performQuery( query );
 	}
 
-	public List<HsRelatorio> getRelatoriosNotIn( List<Date> dates )
+	/**
+	 * Get 
+	 * @param dates
+	 * @param estabelecimentoID
+	 * @return
+	 */
+	public List<HsRelatorio> getRelatoriosNotIn( List<Date> dates, Integer estabelecimentoID )
 	{
 		List<HsRelatorio> result = new LinkedList<HsRelatorio>();
 		if( dates != null )
 		{
 			SelectQuery query = new SelectQuery( HsRelatorio.class );
 			query.andQualifier( ExpressionFactory.noMatchExp( HsRelatorio.IS_SUBMETIDO_PROPERTY, null ) );
+			query.andQualifier( ExpressionFactory.matchExp( HsRelatorio.DELETED_DATE_PROPERTY, null ) );
 			List<HsRelatorio> all = context.performQuery( query );
 			for( HsRelatorio relatorio : all )
 			{
 				MarcacoesEstabelecimento visita = relatorio.getToHsMarcacoesEstabelecimento();
 				if( visita != null )
 				{
-					Date dateVisita = visita.getData();
-					if( dateVisita != null && !dates.contains( dateVisita ) )
+					if( estabelecimentoID == null
+							||
+							estabelecimentoID != null && estabelecimentoID.equals( visita.getEstabelecimentoID() ) )
 					{
-						result.add( relatorio );
+						Date dateVisita = visita.getData();
+						if( dateVisita != null && !dates.contains( dateVisita ) )
+						{
+							result.add( relatorio );
+						}
 					}
 				}
 			}