Merge branch 'master' into rorden

# Conflicts:
#	1.sources/MyHealth/src/ejb/common/CommonFacadeBean.java
This commit is contained in:
Roberto Orden Erena
2019-12-29 13:21:34 +01:00
27 changed files with 954 additions and 214 deletions

View File

@@ -49,8 +49,7 @@ public class VisitJPA implements Serializable {
super();
}
public VisitJPA(Integer id, Date date, LocalTime time, String observations, String result, PatientJPA patient, FamilyDoctorJPA familydoctor) {
this.id = id;
public VisitJPA(Date date, LocalTime time, String observations, String result, PatientJPA patient, FamilyDoctorJPA familydoctor) {
this.date = date;
this.time = time;
this.observations = observations;