Cambiar nombre a TestType por MedicalTestType para ser más explicito
y refactorización de todos sus usos.
This commit is contained in:
@@ -5,6 +5,8 @@ import java.util.Date;
|
||||
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
import common.MedicalTestType;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Roberto Orden Erena <rorden@uoc.edu>
|
||||
@@ -23,10 +25,7 @@ public class MedicalTestTO implements Serializable {
|
||||
private MedicalTestType type;
|
||||
private PatientTO patient;
|
||||
private SpecialistDoctorTO specialistDoctor;
|
||||
|
||||
public static enum MedicalTestType {
|
||||
BLOD_TEST, MAGNETIC_RESONANCE, TAC
|
||||
}
|
||||
|
||||
|
||||
public MedicalTestTO(int id, Date date, int time, String observations, String highresimage, MedicalTestType type,
|
||||
PatientTO patiend, SpecialistDoctorTO specialistDoctor) {
|
||||
|
||||
@@ -5,12 +5,12 @@ package common;
|
||||
* @author Marcos García Núñez (mgarcianun@uoc.edu)
|
||||
*
|
||||
*/
|
||||
public enum TestType {
|
||||
public enum MedicalTestType {
|
||||
MAGNETIC_RESONANCE_IMAGING("Imagen por Resonancia Magnética"), CT_SCAN("Tomografía Áxial Computerizada"), BLOOD_TEST("Análisis de sangre");
|
||||
|
||||
private String testTypeName;
|
||||
|
||||
private TestType(String typeName) {
|
||||
private MedicalTestType(String typeName) {
|
||||
this.testTypeName = typeName;
|
||||
}
|
||||
|
||||
|
||||
@@ -12,8 +12,8 @@ import javax.persistence.TypedQuery;
|
||||
|
||||
import TO.LoggedUserTO;
|
||||
import TO.MedicalSpecialtyTO;
|
||||
import TO.MedicalTestTO.MedicalTestType;
|
||||
import TO.QuestionTO;
|
||||
import common.MedicalTestType;
|
||||
import common.QuestionStatus;
|
||||
import common.UserType;
|
||||
import ejb.common.CommonFacadeLocal;
|
||||
|
||||
@@ -6,8 +6,8 @@ import java.util.List;
|
||||
import javax.ejb.Remote;
|
||||
|
||||
import TO.MedicalSpecialtyTO;
|
||||
import TO.MedicalTestTO.MedicalTestType;
|
||||
import TO.QuestionTO;
|
||||
import common.MedicalTestType;
|
||||
|
||||
/**
|
||||
* Interfaz remota del EJB Definimos los métodos que estarán disponibles para
|
||||
|
||||
@@ -14,7 +14,7 @@ import javax.persistence.JoinColumn;
|
||||
import javax.persistence.ManyToOne;
|
||||
import javax.persistence.Table;
|
||||
|
||||
import common.TestType;
|
||||
import common.MedicalTestType;
|
||||
|
||||
/**
|
||||
* Los nombres de los decortadores relacionados con la BBDD pueden estar en
|
||||
@@ -42,7 +42,7 @@ public class MedicalTestJPA implements Serializable {
|
||||
@Enumerated(EnumType.STRING)
|
||||
@Column(name = "type") // Con esto podríamos cambiar los nombres de las propiedades de la clase y
|
||||
// mantener la relación con la BBDD a través de JPA
|
||||
private TestType type;
|
||||
private MedicalTestType type;
|
||||
|
||||
@ManyToOne
|
||||
@JoinColumn(name = "patientid")
|
||||
@@ -56,7 +56,7 @@ public class MedicalTestJPA implements Serializable {
|
||||
super();
|
||||
}
|
||||
|
||||
public MedicalTestJPA(int id, Date date, long time, String observations, String highresimage, TestType type, PatientJPA patient, SpecialistDoctorJPA specialistDoctor) {
|
||||
public MedicalTestJPA(int id, Date date, long time, String observations, String highresimage, MedicalTestType type, PatientJPA patient, SpecialistDoctorJPA specialistDoctor) {
|
||||
this.id = id;
|
||||
this.date = date;
|
||||
this.time = time;
|
||||
@@ -107,11 +107,11 @@ public class MedicalTestJPA implements Serializable {
|
||||
this.highresimage = highresimage;
|
||||
}
|
||||
|
||||
public TestType getType() {
|
||||
public MedicalTestType getType() {
|
||||
return type;
|
||||
}
|
||||
|
||||
public void setType(TestType type) {
|
||||
public void setType(MedicalTestType type) {
|
||||
this.type = type;
|
||||
}
|
||||
|
||||
|
||||
@@ -9,7 +9,6 @@ import javax.inject.Named;
|
||||
|
||||
import org.primefaces.event.SelectEvent;
|
||||
|
||||
import TO.PatientTO;
|
||||
import TO.QuestionTO;
|
||||
import common.QuestionStatus;
|
||||
import common.UserType;
|
||||
|
||||
Reference in New Issue
Block a user