diff --git a/trunk/SIPRPSoft/src/siprp/data/Marcacao.java b/trunk/SIPRPSoft/src/siprp/data/Marcacao.java
index 37f5ff99..5b8e7c03 100644
--- a/trunk/SIPRPSoft/src/siprp/data/Marcacao.java
+++ b/trunk/SIPRPSoft/src/siprp/data/Marcacao.java
@@ -343,6 +343,10 @@ public abstract class Marcacao extends BaseObject implements ColumnizedObject
 				}
 				result = true;
 			}
+			else 
+			{
+				result = true;
+			}
 		}
 		catch ( Exception e )
 		{
diff --git a/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacaoVisitaHSTPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacaoVisitaHSTPanel.java
index f25a11bb..15d0a55b 100644
--- a/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacaoVisitaHSTPanel.java
+++ b/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacaoVisitaHSTPanel.java
@@ -14,6 +14,7 @@ import javax.swing.JScrollPane;
 
 import siprp.data.outer.MarcacoesEstabelecimentoData;
 
+import com.evolute.swing.component.EvoDatePicker;
 import com.evolute.utils.Singleton;
 import com.evolute.utils.data.IDObject;
 import com.evolute.utils.data.MappableObject;
@@ -22,7 +23,6 @@ import com.evolute.utils.dataui.ComponentsHashtable;
 import com.evolute.utils.dataui.DataClassAware;
 import com.evolute.utils.db.DBManager;
 import com.evolute.utils.db.SQLExecuter;
-import com.evolute.utils.ui.calendar.JCalendarPanel;
 import com.evolute.utils.ui.panel.RadioButtonFixedPanel;
 import com.evolute.utils.ui.text.StateTextArea;
 
@@ -36,10 +36,10 @@ public class MarcacaoVisitaHSTPanel extends JPanel implements DataClassAware<Mar
 	protected final SQLExecuter EXECUTER;
 
 	private final JLabel dataLabel = new JLabel( "Data da visita", JLabel.RIGHT );
-	private final JCalendarPanel dataPanel = new JCalendarPanel( null );
+	private final EvoDatePicker dataPanel = new EvoDatePicker();
 	private final JButton emailButton = new JButton( "Enviar Email" );
 	private final JLabel dataFichaLabel = new JLabel( "Data do Relat\u00f3rio(externo)", JLabel.RIGHT );
-	private final JCalendarPanel dataFichaPanel = new JCalendarPanel( null );
+	private final EvoDatePicker dataFichaPanel = new EvoDatePicker();
 	private final JLabel tecnicoLabel = new JLabel( "T\u00e9cnico", JLabel.RIGHT );
 	private final JLabel tecnicoSuperiorLabel = new JLabel( "T\u00e9cnico Superior", JLabel.RIGHT );
 	private final JComboBox tecnicoList = new JComboBox();
@@ -305,7 +305,7 @@ public class MarcacaoVisitaHSTPanel extends JPanel implements DataClassAware<Mar
 		return dataFichaLabel;
 	}
 
-	public JCalendarPanel getDataFichaPanel()
+	public EvoDatePicker getDataFichaPanel()
 	{
 		return dataFichaPanel;
 	}
@@ -315,7 +315,7 @@ public class MarcacaoVisitaHSTPanel extends JPanel implements DataClassAware<Mar
 		return dataLabel;
 	}
 
-	public JCalendarPanel getDataPanel()
+	public EvoDatePicker getDataPanel()
 	{
 		return dataPanel;
 	}
diff --git a/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacoesHigieneWindow.java b/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacoesHigieneWindow.java
index 33dbbc54..c5a680ad 100644
--- a/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacoesHigieneWindow.java
+++ b/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacoesHigieneWindow.java
@@ -322,7 +322,7 @@ public class MarcacoesHigieneWindow extends SIPRPEditorWindow
 	{
 		int option = JOptionPane.showConfirmDialog( this, "Tem a certeza que quer apagar a marca\u00e7\u00e3o?",
 									"Apagar", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE );
-		if( option == 0 )
+		if( option == JOptionPane.OK_OPTION )
 		{
 			switch( index )
 			{