Correcciones en clases VisiJPA y VisitTO para que compile el proyecto.

1.sources/MyHealth/src/jpa/VisitJPA.java

@@ -1,23 +1,17 @@
-<<<<<<< HEAD
 package jpa;
 
 import java.io.Serializable;
-import java.sql.time;
+import java.sql.Time;
 import java.util.Date;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.Table;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
-@ManyToOne
-@JoinColumn (name="FamilyDoctorId")
-private FamilyDoctorJPA familyDoctor;
-@ManyToOne
-@JoinColumn (name="PatientId")
-private PatientJPA patient;
+import javax.persistence.Table;
+
 
 /**
  * 
@@ -36,12 +30,17 @@ public class VisitJPA implements Serializable {
 	private Time time;
 	private String observations;
 	private String result;
-	 
+	@ManyToOne
+	@JoinColumn (name="FamilyDoctorId")
+	private FamilyDoctorJPA familyDoctor;
+	@ManyToOne
+	@JoinColumn (name="PatientId")
+	private PatientJPA patient;	 
 
 	/**
 	 * Class constructor methods
 	 */
-	public VistitJPA() {
+	public VisitJPA() {
 		super();
 	}
 
@@ -63,19 +62,19 @@ public class VisitJPA implements Serializable {
 		this.id = value;
 	}
 
-	public String getDate() {
+	public Date getDate() {
 		return date;
 	}
 
-	public void setDate(String value) {
+	public void setDate(Date value) {
 		this.date = value;
 	}
 
-	public String getTime() {
+	public Time getTime() {
 		return time;
 	}
 
-	public void setTime(String value) {
+	public void setTime(Time value) {
 		this.time = value;
 	}
 
@@ -103,4 +102,4 @@ public class VisitJPA implements Serializable {
 	public void setPatient (PatientJPA pat) {
 		this.patient=pat;
 	}
-}
+}