Updates

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

@@ -10,13 +10,12 @@ import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
-import TO.FamilyDoctorTO;
-import TO.PatientTO;
 import common.QuestionStatus;
 
 /**
  * 
  * @author Marcos García Núñez (mgarcianun@uoc.edu)
+ * @author Roberto Orden Erena <rorden@uoc.edu>
  *
  */
 @Entity
@@ -34,23 +33,24 @@ public class QuestionJPA implements Serializable {
 	private String response;
 
 	@ManyToOne
-	@JoinColumn(name = "PatientId")
-	private PatientTO patient;
+	@JoinColumn(name = "patientid")
+	private PatientJPA patient;
+	
 	@ManyToOne
-	@JoinColumn(name = "FamilyDoctorId")
-	private FamilyDoctorTO doctor;
+	@JoinColumn(name = "familydoctorid")
+	private FamilyDoctorJPA familydoctor;
 
 	public QuestionJPA() {
 	}
 
-	public QuestionJPA(int id, String title, String message, QuestionStatus status, PatientTO patient,
-			FamilyDoctorTO doctor, String response) {
+	public QuestionJPA(int id, String title, String message, QuestionStatus status, PatientJPA patient,
+			FamilyDoctorJPA familydoctor, String response) {
 		this.id = id;
 		this.title = title;
 		this.message = message;
 		this.status = status;
 		this.patient = patient;
-		this.doctor = doctor;
+		this.familydoctor = familydoctor;
 		this.response = response;
 	}
 
@@ -78,11 +78,11 @@ public class QuestionJPA implements Serializable {
 		this.message = message;
 	}
 
-	public PatientTO getPatient() {
+	public PatientJPA getPatient() {
 		return patient;
 	}
 
-	public void setPatient(PatientTO patient) {
+	public void setPatient(PatientJPA patient) {
 		this.patient = patient;
 	}
 
@@ -94,12 +94,12 @@ public class QuestionJPA implements Serializable {
 		this.status = status;
 	}
 
-	public FamilyDoctorTO getDoctor() {
-		return doctor;
+	public FamilyDoctorJPA getDoctor() {
+		return familydoctor;
 	}
 
-	public void setDoctor(FamilyDoctorTO doctor) {
-		this.doctor = doctor;
+	public void setDoctor(FamilyDoctorJPA familydoctor) {
+		this.familydoctor = familydoctor;
 	}
 
 	public String getResponse() {