Merge branch 'master' into rorden

This commit is contained in:
Roberto Orden Erena
2019-12-15 19:45:30 +01:00
40 changed files with 456 additions and 965 deletions

View File

@@ -86,7 +86,7 @@ public class FamilyDoctorTO implements Serializable {
}
public String getDisplayName() {
return String.format("[%d] %s %s", this.id, this.name, this.surname);
return String.format("[%s] %s %s", this.professionalNumber, this.name, this.surname);
}
public PrimaryHealthCareCenterTO getPrimaryHealthCareCenter() {

View File

@@ -90,6 +90,10 @@ public class PatientTO implements Serializable {
this.id = id;
}
public String getDisplayName() {
return String.format("[%s] %s %s", this.personalIdentificationCode, this.name, this.surname);
}
public FamilyDoctorTO getFamilyDoctor() {
return familyDoctor;
}

View File

@@ -85,6 +85,10 @@ public class SpecialistDoctorTO implements Serializable {
this.id = id;
}
public String getDisplayName() {
return String.format("[%s] %s %s", this.professionalNumber, this.name, this.surname);
}
public MedicalSpecialtyTO getMedicalSpecialty() {
return medicalSpecialty;
}