diff --git a/1.sources/MyHealth/docroot/medicaltest/MedicalTests.xhtml b/1.sources/MyHealth/docroot/medicaltest/MedicalTests.xhtml
index 9dec409..4f61d2b 100644
--- a/1.sources/MyHealth/docroot/medicaltest/MedicalTests.xhtml
+++ b/1.sources/MyHealth/docroot/medicaltest/MedicalTests.xhtml
@@ -46,7 +46,10 @@
 							<p:ajax event="select" listener="#{mt.onSelectMT}" update="frmNEW,frmImage" />
 							<o:converter converterId="omnifaces.ListConverter" list="#{mt.medicalTests}" />
 							<p:column>
-								<h:outputText value="#{el.onlyDate} - #{el.type.testTypeName}" />
+								<h:outputText value="#{el.date}">
+									<f:convertDateTime type="localDate" pattern="dd/MM/yyyy" />
+								</h:outputText>
+								 - <h:outputText value="#{el.type.testTypeName}" />
 								<br />
 								<h:outputText rendered="#{mt.patientFilterSelected == null}" value="#{el.patient.displayName}" style="font-size: 0.8em !important; font-style: italic;" />
 							</p:column>
@@ -66,7 +69,7 @@
 							<div class="ui-g-3">Fecha:</div>
 							<div class="ui-g-9">
 								<h:outputText value="#{mt.selected.date}">
-									<f:convertDateTime type="Date" pattern="dd/MM/yyyy" timeStyle="short" />
+									<f:convertDateTime type="localDate" pattern="dd/MM/yyyy" timeStyle="short" />
 								</h:outputText>
 							</div>
 							<div class="ui-g-3">Hora:</div>
@@ -134,7 +137,9 @@
 							<div class="ui-g-3">Fecha:</div>
 							<div class="ui-g-9">
 								<p:datePicker id="fecha" value="#{mt.selected.date}" pattern="dd/MM/yyyy" showIcon="true" showButtonBar="true" autocomplete="true" required="true"
-									requiredMessage="Especifique la fecha de la prueba médica" />
+									requiredMessage="Especifique la fecha de la prueba médica">
+									<f:convertDateTime type="localDate" pattern="dd/MM/yyyy" timeStyle="short" />
+								</p:datePicker>
 							</div>
 
 							<div class="ui-g-3">Hora:</div>
diff --git a/1.sources/MyHealth/src/TO/MedicalTestTO.java b/1.sources/MyHealth/src/TO/MedicalTestTO.java
index add4ed5..9cbe435 100644
--- a/1.sources/MyHealth/src/TO/MedicalTestTO.java
+++ b/1.sources/MyHealth/src/TO/MedicalTestTO.java
@@ -1,11 +1,8 @@
 package TO;
 
 import java.io.Serializable;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
+import java.time.LocalDate;
 import java.time.LocalTime;
-import java.util.Date;
-import java.util.Locale;
 
 import javax.xml.bind.annotation.XmlRootElement;
 
@@ -22,7 +19,7 @@ public class MedicalTestTO implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	private int id;
-	private Date date;
+	private LocalDate date;
 	private LocalTime time;
 	private String observations;
 	private String highresimage;
@@ -33,13 +30,13 @@ public class MedicalTestTO implements Serializable {
 
 	public MedicalTestTO() {
 		super();
-		this.date = new Date();
+		this.date = LocalDate.now();
 		this.time = LocalTime.now();
 		this.patient = new PatientTO();
 		this.specialistDoctor = new SpecialistDoctorTO();
 	}
 	
-	public MedicalTestTO(int id, Date date, LocalTime time, String observations, String highresimage, MedicalTestType type,
+	public MedicalTestTO(int id, LocalDate date, LocalTime time, String observations, String highresimage, MedicalTestType type,
 			PatientTO patiend, SpecialistDoctorTO specialistDoctor) {
 		this.setId(id);
 		this.setDate(date);
@@ -59,11 +56,11 @@ public class MedicalTestTO implements Serializable {
 		this.id = id;
 	}
 
-	public Date getDate() {
+	public LocalDate getDate() {
 		return date;
 	}
 
-	public void setDate(Date date) {
+	public void setDate(LocalDate date) {
 		this.date = date;
 	}
 
@@ -119,11 +116,4 @@ public class MedicalTestTO implements Serializable {
 	public String toString() {
 		return Integer.toString(this.getId());
 	}
-	
-	public String getOnlyDate() {
-		DateFormat df = DateFormat.getDateInstance(DateFormat.DATE_FIELD, new Locale("es", "ES"));
-		SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
-		return sdf.format(this.getDate());
-	}
-
 }
diff --git a/1.sources/MyHealth/src/TO/VisitTO.java b/1.sources/MyHealth/src/TO/VisitTO.java
index 2aaaf70..a0db0e6 100644
--- a/1.sources/MyHealth/src/TO/VisitTO.java
+++ b/1.sources/MyHealth/src/TO/VisitTO.java
@@ -3,7 +3,6 @@ package TO;
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalTime;
-import java.util.Date;
 
 import javax.xml.bind.annotation.XmlRootElement;
 
diff --git a/1.sources/MyHealth/src/ejb/common/CommonFacadeBean.java b/1.sources/MyHealth/src/ejb/common/CommonFacadeBean.java
index 0da8246..779bd4b 100644
--- a/1.sources/MyHealth/src/ejb/common/CommonFacadeBean.java
+++ b/1.sources/MyHealth/src/ejb/common/CommonFacadeBean.java
@@ -619,19 +619,19 @@ public class CommonFacadeBean implements CommonFacadeRemote, CommonFacadeLocal {
 		return qsTO;
 	}
 
-	public MedicalTestTO getPOJOforMedicalTestJPA(MedicalTestJPA vi, int nestedProps) {
+	public MedicalTestTO getPOJOforMedicalTestJPA(MedicalTestJPA mt, int nestedProps) {
 		MedicalTestTO qsTO = null;
 
-		if (vi != null) {
+		if (mt != null) {
 			SpecialistDoctorJPA fd = null;
 			PatientJPA pat = null;
 			if (nestedProps > 0) {
-				fd = vi.getSpecialistDoctor();
-				pat = vi.getPatient();
+				fd = mt.getSpecialistDoctor();
+				pat = mt.getPatient();
 			}
 
 			nestedProps--;
-			qsTO = new MedicalTestTO(vi.getId(), vi.getDate(), vi.getTime(), vi.getObservations(), vi.getHighresimage(), vi.getType(),
+			qsTO = new MedicalTestTO(mt.getId(), mt.getDate(), mt.getTime(), mt.getObservations(), mt.getHighresimage(), mt.getType(),
 					this.getPOJOforPatientJPA(pat, nestedProps), this.getPOJOforSpecialistDoctorJPA(fd, nestedProps));
 		}
 
diff --git a/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeBean.java b/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeBean.java
index d4664fe..ca972e3 100644
--- a/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeBean.java
+++ b/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeBean.java
@@ -1,8 +1,8 @@
 package ejb.medicalTest;
 
+import java.time.LocalDate;
 import java.time.LocalTime;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 import javax.ejb.EJB;
@@ -158,7 +158,7 @@ public class MedicalTestFacadeBean implements MedicalTestFacadeRemote {
 	 * @param testType     Pudiera llegar a ser: Análisis de sangre, resonancias magnéticas y TAC
 	 * @param observations
 	 */
-	public MedicalTestTO addMedicalTest(int patientID, int doctorSpecialistID, Date date, LocalTime time, MedicalTestType testType, String observations) throws Exception {
+	public MedicalTestTO addMedicalTest(int patientID, int doctorSpecialistID, LocalDate date, LocalTime time, MedicalTestType testType, String observations) throws Exception {
 		SpecialistDoctorJPA specDoctor = entman.find(SpecialistDoctorJPA.class, doctorSpecialistID);
 		PatientJPA pat = entman.find(PatientJPA.class, patientID);
 
diff --git a/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeRemote.java b/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeRemote.java
index a8b3202..58e71fd 100644
--- a/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeRemote.java
+++ b/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeRemote.java
@@ -1,7 +1,7 @@
 package ejb.medicalTest;
 
+import java.time.LocalDate;
 import java.time.LocalTime;
-import java.util.Date;
 import java.util.List;
 
 import javax.ejb.Remote;
@@ -88,7 +88,7 @@ public interface MedicalTestFacadeRemote {
 	 * @param testType      Pudiera llegar a ser: Análisis de sangre, resonancias magnéticas y TAC
 	 * @param observations
 	 */
-	public MedicalTestTO addMedicalTest(int patientID, int doctorSpecialistID, Date date, LocalTime time, MedicalTestType testType, String observations) throws Exception;
+	public MedicalTestTO addMedicalTest(int patientID, int doctorSpecialistID, LocalDate date, LocalTime time, MedicalTestType testType, String observations) throws Exception;
 
 	/**
 	 * Recuperar una prueba médica por ID
diff --git a/1.sources/MyHealth/src/jpa/MedicalTestJPA.java b/1.sources/MyHealth/src/jpa/MedicalTestJPA.java
index fa06fa0..3c08053 100644
--- a/1.sources/MyHealth/src/jpa/MedicalTestJPA.java
+++ b/1.sources/MyHealth/src/jpa/MedicalTestJPA.java
@@ -1,8 +1,8 @@
 package jpa;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.time.LocalTime;
-import java.util.Date;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -36,7 +36,7 @@ public class MedicalTestJPA implements Serializable {
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	private int id;
-	private Date date;
+	private LocalDate date;
 	private LocalTime time;
 	private String observations;
 	private String highresimage;
@@ -57,7 +57,7 @@ public class MedicalTestJPA implements Serializable {
 		super();
 	}
 
-	public MedicalTestJPA(Date date, LocalTime time, String observations, String highresimage, MedicalTestType type, PatientJPA patient, SpecialistDoctorJPA specialistDoctor) {
+	public MedicalTestJPA(LocalDate date, LocalTime time, String observations, String highresimage, MedicalTestType type, PatientJPA patient, SpecialistDoctorJPA specialistDoctor) {
 		this.date = date;
 		this.time = time;
 		this.observations = observations;
@@ -75,11 +75,11 @@ public class MedicalTestJPA implements Serializable {
 		this.id = id;
 	}
 
-	public Date getDate() {
+	public LocalDate getDate() {
 		return date;
 	}
 
-	public void setDate(Date date) {
+	public void setDate(LocalDate date) {
 		this.date = date;
 	}
 
diff --git a/1.sources/MyHealth/src/managedbean/visit/AddVisitMBean.java b/1.sources/MyHealth/src/managedbean/visit/AddVisitMBean.java
index c9c84c8..69243e5 100644
--- a/1.sources/MyHealth/src/managedbean/visit/AddVisitMBean.java
+++ b/1.sources/MyHealth/src/managedbean/visit/AddVisitMBean.java
@@ -3,8 +3,6 @@ package managedbean.visit;
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalTime;
-import java.time.ZoneId;
-import java.util.Date;
 
 import javax.annotation.PostConstruct;
 import javax.faces.application.FacesMessage;
@@ -54,7 +52,6 @@ public class AddVisitMBean extends ManagedBeanBase implements Serializable {
 	public void saveData() {
 		// Comprobamos que la fecha fijada para la visita no sea anterior a la actual
 		int error = 0;
-		LocalTime midnight = LocalTime.MIDNIGHT;
 		LocalDate today = LocalDate.now();
 
 		if (this.date.isBefore(today)) {
diff --git a/1.sources/MyHealth/src/managedbean/visit/PatientVisitListMBean.java b/1.sources/MyHealth/src/managedbean/visit/PatientVisitListMBean.java
index bfae5e4..2cd5bf1 100644
--- a/1.sources/MyHealth/src/managedbean/visit/PatientVisitListMBean.java
+++ b/1.sources/MyHealth/src/managedbean/visit/PatientVisitListMBean.java
@@ -3,7 +3,6 @@ package managedbean.visit;
 import java.io.IOException;
 import java.io.Serializable;
 import java.time.LocalDate;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
diff --git a/1.sources/MyHealth/src/managedbean/visit/UpdateVisitMBean.java b/1.sources/MyHealth/src/managedbean/visit/UpdateVisitMBean.java
index ab60699..28bab11 100644
--- a/1.sources/MyHealth/src/managedbean/visit/UpdateVisitMBean.java
+++ b/1.sources/MyHealth/src/managedbean/visit/UpdateVisitMBean.java
@@ -3,7 +3,6 @@ package managedbean.visit;
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalTime;
-import java.util.Date;
 import java.util.Map;
 
 import javax.annotation.PostConstruct;
@@ -37,7 +36,6 @@ public class UpdateVisitMBean extends ManagedBeanBase implements Serializable {
 	public UpdateVisitMBean() {
 	}
 
-	@SuppressWarnings("deprecation")
 	@PostConstruct
 	public void init() {
 		FacesContext context = FacesContext.getCurrentInstance();
@@ -95,7 +93,6 @@ public class UpdateVisitMBean extends ManagedBeanBase implements Serializable {
 				// Administrador y paciente pueden actualizar la fecha y hora de la visita (excepto el resultado)
 				// Comprobamos que la fecha fijada para la visita no sea anterior a la actual
 				int error = 0;
-				LocalTime midnight = LocalTime.MIDNIGHT;
 				LocalDate today = LocalDate.now();
 
 				if (this.date.isBefore(today)) {
diff --git a/1.sources/MyHealth/src/managedbean/visit/VisitListMBean.java b/1.sources/MyHealth/src/managedbean/visit/VisitListMBean.java
index e0fcabd..895e7c5 100644
--- a/1.sources/MyHealth/src/managedbean/visit/VisitListMBean.java
+++ b/1.sources/MyHealth/src/managedbean/visit/VisitListMBean.java
@@ -3,7 +3,6 @@ package managedbean.visit;
 import java.io.IOException;
 import java.io.Serializable;
 import java.time.LocalDate;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
diff --git a/1.sources/MyHealth/src/managedbean/visit/VisitMBean.java b/1.sources/MyHealth/src/managedbean/visit/VisitMBean.java
index de533de..cf07192 100644
--- a/1.sources/MyHealth/src/managedbean/visit/VisitMBean.java
+++ b/1.sources/MyHealth/src/managedbean/visit/VisitMBean.java
@@ -35,7 +35,6 @@ public class VisitMBean extends ManagedBeanBase implements Serializable {
 	public VisitMBean() {
 	}
 
-	@SuppressWarnings("deprecation")
 	@PostConstruct
 	public void init() {
 		// Inicialización de variables y propiedades van aquí.