diff --git a/subprojects/shared/src/main/java/com/trifork/stamdata/views/sikrede/PatientDoctorRelation.java b/subprojects/shared/src/main/java/com/trifork/stamdata/views/sikrede/PatientDoctorRelation.java deleted file mode 100644 index 41f01a6c..00000000 --- a/subprojects/shared/src/main/java/com/trifork/stamdata/views/sikrede/PatientDoctorRelation.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.trifork.stamdata.views.sikrede; - -import static javax.persistence.TemporalType.TIMESTAMP; - -import java.math.BigInteger; -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Temporal; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; - -import com.trifork.stamdata.views.View; -import com.trifork.stamdata.views.ViewPath; - -@Entity -@XmlRootElement -@ViewPath("sikrede/patientdoctorrelation/v1") -public class PatientDoctorRelation extends View -{ - @Id - @GeneratedValue - @XmlTransient - @Column(name = "PatientDoctorRelationPID") - protected BigInteger recordID; - - @Temporal(TIMESTAMP) - @Column(name = "ValidFrom") - protected Date validFrom; - - @XmlTransient - @Temporal(TIMESTAMP) - @Column(name = "ModifiedDate") - protected Date modifiedDate; - - @XmlElement(required = true) - @Column(name = "CPR") - protected String cpr; - - - @Override - public String getId() - { - return "TODO: The unique key for this view. Such as CPR for a person."; - } - - @Override - public BigInteger getRecordID() - { - return recordID; - } - - @Override - public Date getUpdated() - { - return modifiedDate; - } -} diff --git a/subprojects/shared/src/main/java/com/trifork/stamdata/views/sikrede/SaerligSundhedskort.java b/subprojects/shared/src/main/java/com/trifork/stamdata/views/sikrede/SaerligSundhedskort.java index 2c2e739c..9cfaa5a5 100644 --- a/subprojects/shared/src/main/java/com/trifork/stamdata/views/sikrede/SaerligSundhedskort.java +++ b/subprojects/shared/src/main/java/com/trifork/stamdata/views/sikrede/SaerligSundhedskort.java @@ -14,26 +14,19 @@ @Entity @XmlRootElement -@ViewPath("sikrede/sikrede/v1") -@Table(name = "Sikrede") +@ViewPath("sikrede/saerligsundhedskort/v1") +@Table(name = "SaerligSundhedskort") public class SaerligSundhedskort extends View { @Id @GeneratedValue @XmlTransient - @Column(name = "SikredePID") + @Column(name = "SaerligSundhedskortPID") protected BigInteger recordID; @XmlElement(required = true) @Column(name = "CPR") protected String cpr; -/* protected YderRelation currentYderRelation; - protected YderRelation previousYderRelation; - protected YderRelation futureYderRelation; -*/ - - - @Temporal(TIMESTAMP) @Column(name = "ValidFrom") protected Date validFrom; diff --git a/subprojects/shared/src/main/java/com/trifork/stamdata/views/sikrede/Sikrede.java b/subprojects/shared/src/main/java/com/trifork/stamdata/views/sikrede/Sikrede.java index 9c0dab9b..061d489d 100644 --- a/subprojects/shared/src/main/java/com/trifork/stamdata/views/sikrede/Sikrede.java +++ b/subprojects/shared/src/main/java/com/trifork/stamdata/views/sikrede/Sikrede.java @@ -14,7 +14,7 @@ @Entity @XmlRootElement -@ViewPath("sikrede/patientdoctorrelation/v1") +@ViewPath("sikrede/sikrede/v1") @Table(name = "Sikrede") public class Sikrede extends View { @Id