Merge branch 'master' of http://pdp-pds.eimt.uoc.edu/pds19-grupo2/myhealth.git

1.sources/MyHealth/src/TO/VisitTO.java

@@ -17,13 +17,57 @@ import javax.xml.bind.annotation.XmlRootElement;
  */
 @XmlRootElement(name = "Visit")
 public class VisitTO implements Serializable {
+	
+
 
 	private static final long serialVersionUID = 1L;
-
+	private Integer id;
+	private Date date;
+	private Time time;
+	private String observations;
+	private String result;
+	private FamilyDoctorTO familyDoctor;
+	private PatientTO patient;
 
 	public VisitTO() {
 		super();
 	}
+	public VisitTO(Integer id, Date date, Time time, String observation, String result) {
+		this.setId(id);
+		this date=date;
+		this time
+	1}
+	public Integer getId() {
+		return this.id;
+	}
+	
+	public void setId(integer id) {
+		this.id=id;
+	}
+	
+	public Date getDate() {
+		return this.Date;
+	}
+	
+	public void setDate(Date date) {
+		this.date=date;
+	}
+	
+	public Time getTime() {
+		return this.time;
+	}
+	
+	public void setTime(Time time) {
+		this.time=time;
+	}
+	
+	public String getObservations() {
+		return this.observations;
+	}
+	
+	public void setObservations(String observations) {
+		this.observations=observations;
+	}
 
-
+ 	
 }