diff --git a/src/main/java/de/uksh/medic/etl/OpenEhrObds.java b/src/main/java/de/uksh/medic/etl/OpenEhrObds.java index f57d67d..5ca84f6 100644 --- a/src/main/java/de/uksh/medic/etl/OpenEhrObds.java +++ b/src/main/java/de/uksh/medic/etl/OpenEhrObds.java @@ -123,9 +123,9 @@ public static void main(String[] args) throws IOException { // ToDo: Replace with Kafka consumer // File f = new File("file_1705482004-clean.xml"); - File f = new File("file_1705482019-clean.xml"); + // File f = new File("file_1705482019-clean.xml"); // File f = new File("file_1705482057-clean.xml"); - // File f = new File("syst.xml"); + File f = new File("tod.xml"); Map m = new LinkedHashMap<>(); walkXmlTree(xmlMapper.readValue(f, new TypeReference>() { diff --git a/src/main/java/de/uksh/medic/etl/model/mdr/centraxx/RelationConvert.java b/src/main/java/de/uksh/medic/etl/model/mdr/centraxx/RelationConvert.java index eaafb94..3c73114 100644 --- a/src/main/java/de/uksh/medic/etl/model/mdr/centraxx/RelationConvert.java +++ b/src/main/java/de/uksh/medic/etl/model/mdr/centraxx/RelationConvert.java @@ -14,11 +14,11 @@ public class RelationConvert { @JsonProperty("srcProfileCode") private String sourceProfileCode; @JsonProperty("srcProfileVersion") - private String sourceProfileVersion; + private Integer sourceProfileVersion; @JsonProperty("trgProfileCode") private String targetProfileCode; @JsonProperty("trgProfileVersion") - private String targetProfileVersion; + private Integer targetProfileVersion; @JsonProperty("values") private Map values; @JsonProperty("logMessages") @@ -32,11 +32,11 @@ public void setSourceProfileCode(String sourceProfileCode) { this.sourceProfileCode = sourceProfileCode; } - public String getSourceProfileVersion() { + public Integer getSourceProfileVersion() { return sourceProfileVersion; } - public void setSourceProfileVersion(String sourceProfileVersion) { + public void setSourceProfileVersion(Integer sourceProfileVersion) { this.sourceProfileVersion = sourceProfileVersion; } @@ -48,11 +48,11 @@ public void setTargetProfileCode(String targetProfileCode) { this.targetProfileCode = targetProfileCode; } - public String getTargetProfileVersion() { + public Integer getTargetProfileVersion() { return targetProfileVersion; } - public void setTargetProfileVersion(String targetProfileVersion) { + public void setTargetProfileVersion(Integer targetProfileVersion) { this.targetProfileVersion = targetProfileVersion; } diff --git a/src/main/java/de/uksh/medic/etl/settings/Mapping.java b/src/main/java/de/uksh/medic/etl/settings/Mapping.java index da31df5..4f52f27 100644 --- a/src/main/java/de/uksh/medic/etl/settings/Mapping.java +++ b/src/main/java/de/uksh/medic/etl/settings/Mapping.java @@ -6,9 +6,9 @@ public class Mapping { private String source; - private String sourceVersion; + private Integer sourceVersion; private String target; - private String targetVersion; + private Integer targetVersion; private boolean split; private String templateId; @@ -20,11 +20,11 @@ public void setSource(String source) { this.source = source; } - public String getSourceVersion() { + public Integer getSourceVersion() { return sourceVersion; } - public void setSourceVersion(String sourceVersion) { + public void setSourceVersion(Integer sourceVersion) { this.sourceVersion = sourceVersion; } @@ -36,11 +36,11 @@ public void setTarget(String target) { this.target = target; } - public String getTargetVersion() { + public Integer getTargetVersion() { return targetVersion; } - public void setTargetVersion(String targetVersion) { + public void setTargetVersion(Integer targetVersion) { this.targetVersion = targetVersion; }