droideparanoico/myhealth
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updates

Browse Source
This commit is contained in:
Roberto Orden Erena
2019-12-15 20:53:51 +01:00
parent 91f6bc396b
commit fbe7b34a32
6 changed files with 113 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeBean.java
View File

@@ -57,9 +57,9 @@ public class MedicalTestFacadeBean implements MedicalTestFacadeRemote {
if (SessionUtils.getUserType() == UserType.PATIENT) { if (SessionUtils.getUserType() == UserType.PATIENT) {
LoggedUserTO user = SessionUtils.getloggedOnUser(); LoggedUserTO user = SessionUtils.getloggedOnUser();
// 0. Conseguir el paciente en sesión // 0. Conseguir el paciente en sesión
PatientTO patient = this.commonServices.findPatientById(Integer.parseInt(user.getId())); PatientJPA patient = entman.find(PatientJPA.class, user.getId());
// 1. Buscar el médico de familia con ese professionalNumber // 1. Buscar el médico de familia con ese professionalNumber
FamilyDoctorTO fdoctor = this.commonServices.findFamilyDoctorById(professionalNumber); FamilyDoctorJPA fdoctor = entman.find(FamilyDoctorJPA.class, professionalNumber);
// 2. Crear un objeto de Question para ese médico desde el paciente en sesión // 2. Crear un objeto de Question para ese médico desde el paciente en sesión
QuestionJPA question = new QuestionJPA(0, title, message, QuestionStatus.PENDING, patient, fdoctor, null); QuestionJPA question = new QuestionJPA(0, title, message, QuestionStatus.PENDING, patient, fdoctor, null);
// 3. Guardar // 3. Guardar

69
1.sources/MyHealth/src/jpa/ImageJPA.java
View File

@@ -1,69 +0,0 @@
package jpa;
import java.io.Serializable;
import java.util.Date;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import TO.PatientTO;
import TO.SpecialistDoctorTO;
/**
*
* @author Marcos García Núñez (mgarcianun@uoc.edu)
*
*/
@Entity
@Table(name = "MyHealth.Question")
public class ImageJPA implements Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy=GenerationType.IDENTITY)
private int id;
private String response;
@ManyToOne
@JoinColumn (name="QuestionId")
private PatientTO question;
public ImageJPA() {
}
public ImageJPA(int id, String response, PatientTO question) {
this.id = id;
this.response = response;
this.question = question;
}
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public String getResponse() {
return response;
}
public void setResponse(String response) {
this.response = response;
}
public PatientTO getQuestion() {
return question;
}
public void setQuestion(PatientTO question) {
this.question = question;
}
}

31
1.sources/MyHealth/src/jpa/MedicalTestJPA.java
View File

@@ -3,6 +3,7 @@ package jpa;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.GeneratedValue; import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType; import javax.persistence.GenerationType;
@@ -11,16 +12,19 @@ import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne; import javax.persistence.ManyToOne;
import javax.persistence.Table; import javax.persistence.Table;
import TO.PatientTO;
import TO.SpecialistDoctorTO;
/** /**
* Los nombres de los decortadores relacionados con la BBDD pueden estar
* en camelCase, snakeCase o como se quiera, puesto que en persistence.xml
* se tiene dicho que se convierta a minúsculas.
* *
* @author Marcos García Núñez (mgarcianun@uoc.edu) * Lo uso en minúsculas para mejorar la trazabilidad de los campos.
*
* @author Roberto Orden Erena <rorden@uoc.edu>
* *
*/ */
@Entity @Entity
@Table(name = "MyHealth.MedicalTest") @Table(name = "myhealth.medicaltest")
public class MedicalTestJPA implements Serializable { public class MedicalTestJPA implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@@ -32,22 +36,23 @@ public class MedicalTestJPA implements Serializable {
private long time; private long time;
private String observations; private String observations;
private String highresimage; private String highresimage;
@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 int type; private int type;
@ManyToOne @ManyToOne
@JoinColumn (name="PatientId") @JoinColumn (name="patientid")
private PatientTO patient; private PatientJPA patient;
@ManyToOne @ManyToOne
@JoinColumn (name="SpecialistDoctorId") @JoinColumn (name="specialistdoctorid")
private SpecialistDoctorTO specialistDoctor; private SpecialistDoctorJPA specialistDoctor;
public MedicalTestJPA() { public MedicalTestJPA() {
super(); super();
} }
public MedicalTestJPA(int id, Date date, long time, String observations, String highresimage, int type, public MedicalTestJPA(int id, Date date, long time, String observations, String highresimage, int type,
PatientTO patient, SpecialistDoctorTO specialistDoctor) { PatientJPA patient, SpecialistDoctorJPA specialistDoctor) {
this.id = id; this.id = id;
this.date = date; this.date = date;
this.time = time; this.time = time;
@@ -106,19 +111,19 @@ public class MedicalTestJPA implements Serializable {
this.type = type; this.type = type;
} }
public PatientTO getPatient() { public PatientJPA getPatient() {
return patient; return patient;
} }
public void setPatient(PatientTO patient) { public void setPatient(PatientJPA patient) {
this.patient = patient; this.patient = patient;
} }
public SpecialistDoctorTO getSpecialistDoctor() { public SpecialistDoctorJPA getSpecialistDoctor() {
return specialistDoctor; return specialistDoctor;
} }
public void setSpecialistDoctor(SpecialistDoctorTO specialistDoctor) { public void setSpecialistDoctor(SpecialistDoctorJPA specialistDoctor) {
this.specialistDoctor = specialistDoctor; this.specialistDoctor = specialistDoctor;
} }

30
1.sources/MyHealth/src/jpa/QuestionJPA.java
View File

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

69
1.sources/MyHealth/src/jpa/ResponseJPA.java
View File

@@ -1,69 +0,0 @@
package jpa;
import java.io.Serializable;
import java.util.Date;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import TO.PatientTO;
import TO.SpecialistDoctorTO;
/**
*
* @author Marcos García Núñez (mgarcianun@uoc.edu)
*
*/
@Entity
@Table(name = "MyHealth.Question")
public class ResponseJPA implements Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy=GenerationType.IDENTITY)
private int id;
private String response;
@ManyToOne
@JoinColumn (name="QuestionId")
private PatientTO question;
public ResponseJPA() {
}
public ResponseJPA(int id, String response, PatientTO question) {
this.id = id;
this.response = response;
this.question = question;
}
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public String getResponse() {
return response;
}
public void setResponse(String response) {
this.response = response;
}
public PatientTO getQuestion() {
return question;
}
public void setQuestion(PatientTO question) {
this.question = question;
}
}

167
2.database/01.CreateTables.sql
View File

@@ -20,32 +20,33 @@ GRANT ALL ON SCHEMA myhealth TO usrmyhealth;
if exists (SELECT 1 FROM pg_tables WHERE schemaname='myhealth' and tablename='administrator') THEN if exists (SELECT 1 FROM pg_tables WHERE schemaname='myhealth' and tablename='administrator') THEN
drop table myhealth.administrator; drop table myhealth.administrator;
end if; end if;
if exists (SELECT 1 FROM pg_tables WHERE schemaname='myhealth' and tablename='familydoctor') THEN
drop table myhealth.familydoctor;
end if;
if exists (SELECT 1 FROM pg_tables WHERE schemaname='myhealth' and tablename='medicalspecialty') THEN
drop table myhealth.medicalspecialty;
end if;
if exists (SELECT 1 FROM pg_tables WHERE schemaname='myhealth' and tablename='medicaltest') THEN if exists (SELECT 1 FROM pg_tables WHERE schemaname='myhealth' and tablename='medicaltest') THEN
drop table myhealth.medicaltest; drop table myhealth.medicaltest;
end if; end if;
if exists (SELECT 1 FROM pg_tables WHERE schemaname='myhealth' and tablename='patient') THEN
drop table myhealth.patient;
end if;
if exists (SELECT 1 FROM pg_tables WHERE schemaname='myhealth' and tablename='primaryhealthcarecenter') THEN
drop table myhealth.primaryhealthcarecenter;
end if;
if exists (SELECT 1 FROM pg_tables WHERE schemaname='myhealth' and tablename='question') THEN if exists (SELECT 1 FROM pg_tables WHERE schemaname='myhealth' and tablename='question') THEN
drop table myhealth.question; drop table myhealth.question;
end if; end if;
if exists (SELECT 1 FROM pg_tables WHERE schemaname='myhealth' and tablename='response') THEN if exists (SELECT 1 FROM pg_tables WHERE schemaname='myhealth' and tablename='response') THEN
drop table myhealth.response; drop table myhealth.response;
end if; end if;
if exists (SELECT 1 FROM pg_tables WHERE schemaname='myhealth' and tablename='visit') THEN
drop table myhealth.visit;
end if;
if exists (SELECT 1 FROM pg_tables WHERE schemaname='myhealth' and tablename='patient') THEN
drop table myhealth.patient;
end if;
if exists (SELECT 1 FROM pg_tables WHERE schemaname='myhealth' and tablename='familydoctor') THEN
drop table myhealth.familydoctor;
end if;
if exists (SELECT 1 FROM pg_tables WHERE schemaname='myhealth' and tablename='primaryhealthcarecenter') THEN
drop table myhealth.primaryhealthcarecenter;
end if;
if exists (SELECT 1 FROM pg_tables WHERE schemaname='myhealth' and tablename='specialistdoctor') THEN if exists (SELECT 1 FROM pg_tables WHERE schemaname='myhealth' and tablename='specialistdoctor') THEN
drop table myhealth.specialistdoctor; drop table myhealth.specialistdoctor;
end if; end if;
if exists (SELECT 1 FROM pg_tables WHERE schemaname='myhealth' and tablename='visit') THEN if exists (SELECT 1 FROM pg_tables WHERE schemaname='myhealth' and tablename='medicalspecialty') THEN
drop table myhealth.visit; drop table myhealth.medicalspecialty;
end if; end if;
/* /*
@@ -94,6 +95,22 @@ TABLESPACE pg_default;
ALTER TABLE myhealth.administrator ALTER TABLE myhealth.administrator
OWNER to "USER"; OWNER to "USER";
-- Table: myhealth.primaryhealthcarecenter
-- DROP TABLE myhealth.primaryhealthcarecenter;
CREATE TABLE myhealth.primaryhealthcarecenter
(
id integer NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
name VARCHAR(150) COLLATE pg_catalog."default" NOT NULL,
location VARCHAR(512) COLLATE pg_catalog."default",
CONSTRAINT primaryhealthcarecenter_pkey PRIMARY KEY (id)
)
TABLESPACE pg_default;
ALTER TABLE myhealth.primaryhealthcarecenter
OWNER to "USER";
-- Table: myhealth.familydoctor -- Table: myhealth.familydoctor
-- DROP TABLE myhealth.familydoctor; -- DROP TABLE myhealth.familydoctor;
@@ -107,7 +124,7 @@ CREATE TABLE myhealth.familydoctor
name VARCHAR(100) NOT NULL COLLATE pg_catalog."default", name VARCHAR(100) NOT NULL COLLATE pg_catalog."default",
surname VARCHAR(100) NOT NULL COLLATE pg_catalog."default", surname VARCHAR(100) NOT NULL COLLATE pg_catalog."default",
email VARCHAR(120) COLLATE pg_catalog."default", email VARCHAR(120) COLLATE pg_catalog."default",
primaryhealthcarecenterid integer, primaryhealthcarecenterid integer REFERENCES myhealth.primaryhealthcarecenter(id) ,
CONSTRAINT familydoctor_pkey PRIMARY KEY (id) CONSTRAINT familydoctor_pkey PRIMARY KEY (id)
) )
TABLESPACE pg_default; TABLESPACE pg_default;
@@ -134,27 +151,6 @@ TABLESPACE pg_default;
ALTER TABLE myhealth.medicalspecialty ALTER TABLE myhealth.medicalspecialty
OWNER to "USER"; OWNER to "USER";
-- Table: myhealth.medicaltest
-- DROP TABLE myhealth.medicaltest;
CREATE TABLE myhealth.medicaltest
(
id INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
date date,
"time" abstime,
observations TEXT COLLATE pg_catalog."default",
highresimage bytea,
type INTEGER,
patientid INTEGER NOT NULL,
specialistdoctorid INTEGER NOT NULL,
CONSTRAINT medicaltest_pkey PRIMARY KEY (id)
)
TABLESPACE pg_default;
ALTER TABLE myhealth.medicaltest
OWNER to "USER";
-- Table: myhealth.patient -- Table: myhealth.patient
-- DROP TABLE myhealth.patient; -- DROP TABLE myhealth.patient;
@@ -168,7 +164,7 @@ CREATE TABLE myhealth.patient
name VARCHAR(100) NOT NULL COLLATE pg_catalog."default", name VARCHAR(100) NOT NULL COLLATE pg_catalog."default",
surname VARCHAR(100) NOT NULL COLLATE pg_catalog."default", surname VARCHAR(100) NOT NULL COLLATE pg_catalog."default",
email VARCHAR(120) COLLATE pg_catalog."default", email VARCHAR(120) COLLATE pg_catalog."default",
familydoctorid INTEGER, familydoctorid INTEGER REFERENCES myhealth.familydoctor(id),
CONSTRAINT patient_pkey PRIMARY KEY (id) CONSTRAINT patient_pkey PRIMARY KEY (id)
) )
TABLESPACE pg_default; TABLESPACE pg_default;
@@ -179,56 +175,6 @@ CREATE UNIQUE INDEX patient_pic_index
ALTER TABLE myhealth.patient ALTER TABLE myhealth.patient
OWNER to "USER"; OWNER to "USER";
-- Table: myhealth.primaryhealthcarecenter
-- DROP TABLE myhealth.primaryhealthcarecenter;
CREATE TABLE myhealth.primaryhealthcarecenter
(
id integer NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
name VARCHAR(150) COLLATE pg_catalog."default" NOT NULL,
location VARCHAR(512) COLLATE pg_catalog."default",
CONSTRAINT primaryhealthcarecenter_pkey PRIMARY KEY (id)
)
TABLESPACE pg_default;
ALTER TABLE myhealth.primaryhealthcarecenter
OWNER to "USER";
-- Table: myhealth.question
-- DROP TABLE myhealth.question;
CREATE TABLE myhealth.question
(
id INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
title VARCHAR(512) COLLATE pg_catalog."default" NOT NULL,
message TEXT COLLATE pg_catalog."default" NOT NULL,
status INTEGER,
patientid INTEGER NOT NULL,
CONSTRAINT question_pkey PRIMARY KEY (id)
)
TABLESPACE pg_default;
ALTER TABLE myhealth.question
OWNER to "USER";
-- Table: myhealth.response
-- DROP TABLE myhealth.response;
CREATE TABLE myhealth.response
(
id INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
response TEXT COLLATE pg_catalog."default",
questionid INTEGER NOT NULL,
CONSTRAINT response_pkey PRIMARY KEY (id)
)
TABLESPACE pg_default;
ALTER TABLE myhealth.response
OWNER to "USER";
-- Table: myhealth.specialistdoctor -- Table: myhealth.specialistdoctor
-- DROP TABLE myhealth.specialistdoctor; -- DROP TABLE myhealth.specialistdoctor;
@@ -242,7 +188,7 @@ CREATE TABLE myhealth.specialistdoctor
name VARCHAR(100) NOT NULL COLLATE pg_catalog."default", name VARCHAR(100) NOT NULL COLLATE pg_catalog."default",
surname VARCHAR(100) NOT NULL COLLATE pg_catalog."default", surname VARCHAR(100) NOT NULL COLLATE pg_catalog."default",
email VARCHAR(120) COLLATE pg_catalog."default", email VARCHAR(120) COLLATE pg_catalog."default",
medicalspecialtyid INTEGER, medicalspecialtyid INTEGER REFERENCES myhealth.medicalspecialty(id),
CONSTRAINT specialistdoctor_pkey PRIMARY KEY (id) CONSTRAINT specialistdoctor_pkey PRIMARY KEY (id)
) )
TABLESPACE pg_default; TABLESPACE pg_default;
@@ -264,8 +210,8 @@ CREATE TABLE myhealth.visit
"time" abstime NOT NULL, "time" abstime NOT NULL,
observations TEXT COLLATE pg_catalog."default", observations TEXT COLLATE pg_catalog."default",
result TEXT COLLATE pg_catalog."default", result TEXT COLLATE pg_catalog."default",
patientid INTEGER NOT NULL, patientid INTEGER REFERENCES myhealth.patient(id),
familydoctorid INTEGER NOT NULL, familydoctorid INTEGER REFERENCES myhealth.familydoctor(id),
CONSTRAINT visit_pkey PRIMARY KEY (id) CONSTRAINT visit_pkey PRIMARY KEY (id)
) )
TABLESPACE pg_default; TABLESPACE pg_default;
@@ -273,5 +219,46 @@ TABLESPACE pg_default;
ALTER TABLE myhealth.visit ALTER TABLE myhealth.visit
OWNER to "USER"; OWNER to "USER";
-- Table: myhealth.question
-- DROP TABLE myhealth.question;
CREATE TABLE myhealth.question
(
id INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
title VARCHAR(512) COLLATE pg_catalog."default" NOT NULL,
message TEXT COLLATE pg_catalog."default" NOT NULL,
status INTEGER,
response TEXT COLLATE pg_catalog."default",
patientid INTEGER REFERENCES myhealth.patient(id),
familydoctorid INTEGER REFERENCES myhealth.familydoctor(id),
CONSTRAINT question_pkey PRIMARY KEY (id)
)
TABLESPACE pg_default;
ALTER TABLE myhealth.question
OWNER to "USER";
-- Table: myhealth.medicaltest
-- DROP TABLE myhealth.medicaltest;
CREATE TABLE myhealth.medicaltest
(
id INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
date date,
"time" abstime,
observations TEXT COLLATE pg_catalog."default",
highresimage bytea,
type INTEGER,
patientid INTEGER REFERENCES myhealth.patient(id),
specialistdoctorid INTEGER REFERENCES myhealth.specialistdoctor(id),
CONSTRAINT medicaltest_pkey PRIMARY KEY (id)
)
TABLESPACE pg_default;
ALTER TABLE myhealth.medicaltest
OWNER to "USER";
END; END;
$$ $$