chore: update to DNPM-Datamodel 2.1 preview

src/main/java/dev/pcvolkmer/mv64e/mtb/Age.java

@@ -2,7 +2,7 @@ package dev.pcvolkmer.mv64e.mtb;
 
 import com.fasterxml.jackson.annotation.*;
 
-public class ValueWithUnit {
+public class Age {
     private Unit unit;
     private double value;
 

src/main/java/dev/pcvolkmer/mv64e/mtb/Chromosome.java

@@ -3,7 +3,7 @@ package dev.pcvolkmer.mv64e.mtb;
 import java.io.IOException;
 import com.fasterxml.jackson.annotation.*;
 
-public enum ChromosomeCode {
+public enum Chromosome {
     CHR1, CHR10, CHR11, CHR12, CHR13, CHR14, CHR15, CHR16, CHR17, CHR18, CHR19, CHR2, CHR20, CHR21, CHR22, CHR3, CHR4, CHR5, CHR6, CHR7, CHR8, CHR9, CHR_X, CHR_Y;
 
     @JsonValue
@@ -38,7 +38,7 @@ public enum ChromosomeCode {
     }
 
     @JsonCreator
-    public static ChromosomeCode forValue(String value) throws IOException {
+    public static Chromosome forValue(String value) throws IOException {
         if (value.equals("chr1")) return CHR1;
         if (value.equals("chr10")) return CHR10;
         if (value.equals("chr11")) return CHR11;
@@ -63,6 +63,6 @@ public enum ChromosomeCode {
         if (value.equals("chr9")) return CHR9;
         if (value.equals("chrX")) return CHR_X;
         if (value.equals("chrY")) return CHR_Y;
-        throw new IOException("Cannot deserialize ChromosomeCode");
+        throw new IOException("Cannot deserialize Chromosome");
     }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/ChromosomeSystem.java

@@ -1,22 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import java.io.IOException;
-import com.fasterxml.jackson.annotation.*;
-
-public enum ChromosomeSystem {
-    CHROMOSOME;
-
-    @JsonValue
-    public String toValue() {
-        switch (this) {
-            case CHROMOSOME: return "chromosome";
-        }
-        return null;
-    }
-
-    @JsonCreator
-    public static ChromosomeSystem forValue(String value) throws IOException {
-        if (value.equals("chromosome")) return CHROMOSOME;
-        throw new IOException("Cannot deserialize ChromosomeSystem");
-    }
-}

src/main/java/dev/pcvolkmer/mv64e/mtb/Claim.java

@@ -2,13 +2,15 @@ package dev.pcvolkmer.mv64e.mtb;
 
 import com.fasterxml.jackson.annotation.*;
 import java.util.Date;
+import java.util.List;
 
 public class Claim {
     private String id;
     private Date issuedOn;
-    private Patient patient;
+    private Reference patient;
-    private Recommendation recommendation;
+    private Reference recommendation;
-    private Coding stage;
+    private List<CodingAtcUnregisteredMedication> requestedMedication;
+    private CodingClaimStage stage;
 
     @JsonProperty("id")
     public String getId() { return id; }
@@ -23,17 +25,22 @@ public class Claim {
     public void setIssuedOn(Date value) { this.issuedOn = value; }
 
     @JsonProperty("patient")
-    public Patient getPatient() { return patient; }
+    public Reference getPatient() { return patient; }
     @JsonProperty("patient")
-    public void setPatient(Patient value) { this.patient = value; }
+    public void setPatient(Reference value) { this.patient = value; }
 
     @JsonProperty("recommendation")
-    public Recommendation getRecommendation() { return recommendation; }
+    public Reference getRecommendation() { return recommendation; }
     @JsonProperty("recommendation")
-    public void setRecommendation(Recommendation value) { this.recommendation = value; }
+    public void setRecommendation(Reference value) { this.recommendation = value; }
+
+    @JsonProperty("requestedMedication")
+    public List<CodingAtcUnregisteredMedication> getRequestedMedication() { return requestedMedication; }
+    @JsonProperty("requestedMedication")
+    public void setRequestedMedication(List<CodingAtcUnregisteredMedication> value) { this.requestedMedication = value; }
 
     @JsonProperty("stage")
-    public Coding getStage() { return stage; }
+    public CodingClaimStage getStage() { return stage; }
     @JsonProperty("stage")
-    public void setStage(Coding value) { this.stage = value; }
+    public void setStage(CodingClaimStage value) { this.stage = value; }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/ClaimResponse.java

@@ -4,17 +4,17 @@ import com.fasterxml.jackson.annotation.*;
 import java.util.Date;
 
 public class ClaimResponse {
-    private ClaimResponseClaim claim;
+    private Reference claim;
     private String id;
     private Date issuedOn;
-    private Patient patient;
+    private Reference patient;
     private CodingClaimResponseStatus status;
     private CodingClaimResponseStatusReason statusReason;
 
     @JsonProperty("claim")
-    public ClaimResponseClaim getClaim() { return claim; }
+    public Reference getClaim() { return claim; }
     @JsonProperty("claim")
-    public void setClaim(ClaimResponseClaim value) { this.claim = value; }
+    public void setClaim(Reference value) { this.claim = value; }
 
     @JsonProperty("id")
     public String getId() { return id; }
@@ -29,9 +29,9 @@ public class ClaimResponse {
     public void setIssuedOn(Date value) { this.issuedOn = value; }
 
     @JsonProperty("patient")
-    public Patient getPatient() { return patient; }
+    public Reference getPatient() { return patient; }
     @JsonProperty("patient")
-    public void setPatient(Patient value) { this.patient = value; }
+    public void setPatient(Reference value) { this.patient = value; }
 
     @JsonProperty("status")
     public CodingClaimResponseStatus getStatus() { return status; }

src/main/java/dev/pcvolkmer/mv64e/mtb/ClaimResponseClaim.java

@@ -1,18 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class ClaimResponseClaim {
-    private String id;
-    private ClaimResponseClaimType type;
-
-    @JsonProperty("id")
-    public String getId() { return id; }
-    @JsonProperty("id")
-    public void setId(String value) { this.id = value; }
-
-    @JsonProperty("type")
-    public ClaimResponseClaimType getType() { return type; }
-    @JsonProperty("type")
-    public void setType(ClaimResponseClaimType value) { this.type = value; }
-}

src/main/java/dev/pcvolkmer/mv64e/mtb/ClaimResponseClaimType.java

@@ -1,22 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import java.io.IOException;
-import com.fasterxml.jackson.annotation.*;
-
-public enum ClaimResponseClaimType {
-    CLAIM;
-
-    @JsonValue
-    public String toValue() {
-        switch (this) {
-            case CLAIM: return "Claim";
-        }
-        return null;
-    }
-
-    @JsonCreator
-    public static ClaimResponseClaimType forValue(String value) throws IOException {
-        if (value.equals("Claim")) return CLAIM;
-        throw new IOException("Cannot deserialize ClaimResponseClaimType");
-    }
-}

src/main/java/dev/pcvolkmer/mv64e/mtb/Cnv.java

@@ -4,25 +4,26 @@ import com.fasterxml.jackson.annotation.*;
 import java.util.List;
 
 public class Cnv {
-    private CodingChromosome chromosome;
+    private Chromosome chromosome;
     private Double cnA;
     private Double cnB;
-    private List<CodingGene> copyNumberNeutralLoH;
+    private List<Coding> copyNumberNeutralLoH;
     private EndRange endRange;
+    private List<VariantExternalId> externalIds;
     private String id;
-    private Reference indication;
+    private List<CodingBaseVariantLocalization> localization;
-    private Patient patient;
+    private Reference patient;
     private Double relativeCopyNumber;
-    private List<CodingGene> reportedAffectedGenes;
+    private List<Coding> reportedAffectedGenes;
     private String reportedFocality;
     private StartRange startRange;
     private Long totalCopyNumber;
-    private CodingCnvType type;
+    private CodingCnv type;
 
     @JsonProperty("chromosome")
-    public CodingChromosome getChromosome() { return chromosome; }
+    public Chromosome getChromosome() { return chromosome; }
     @JsonProperty("chromosome")
-    public void setChromosome(CodingChromosome value) { this.chromosome = value; }
+    public void setChromosome(Chromosome value) { this.chromosome = value; }
 
     @JsonProperty("cnA")
     public Double getCnA() { return cnA; }
@@ -35,29 +36,34 @@ public class Cnv {
     public void setCnB(Double value) { this.cnB = value; }
 
     @JsonProperty("copyNumberNeutralLoH")
-    public List<CodingGene> getCopyNumberNeutralLoH() { return copyNumberNeutralLoH; }
+    public List<Coding> getCopyNumberNeutralLoH() { return copyNumberNeutralLoH; }
     @JsonProperty("copyNumberNeutralLoH")
-    public void setCopyNumberNeutralLoH(List<CodingGene> value) { this.copyNumberNeutralLoH = value; }
+    public void setCopyNumberNeutralLoH(List<Coding> value) { this.copyNumberNeutralLoH = value; }
 
     @JsonProperty("endRange")
     public EndRange getEndRange() { return endRange; }
     @JsonProperty("endRange")
     public void setEndRange(EndRange value) { this.endRange = value; }
 
+    @JsonProperty("externalIds")
+    public List<VariantExternalId> getExternalIds() { return externalIds; }
+    @JsonProperty("externalIds")
+    public void setExternalIds(List<VariantExternalId> value) { this.externalIds = value; }
+
     @JsonProperty("id")
     public String getId() { return id; }
     @JsonProperty("id")
     public void setId(String value) { this.id = value; }
 
-    @JsonProperty("indication")
+    @JsonProperty("localization")
-    public Reference getIndication() { return indication; }
+    public List<CodingBaseVariantLocalization> getLocalization() { return localization; }
-    @JsonProperty("indication")
+    @JsonProperty("localization")
-    public void setIndication(Reference value) { this.indication = value; }
+    public void setLocalization(List<CodingBaseVariantLocalization> value) { this.localization = value; }
 
     @JsonProperty("patient")
-    public Patient getPatient() { return patient; }
+    public Reference getPatient() { return patient; }
     @JsonProperty("patient")
-    public void setPatient(Patient value) { this.patient = value; }
+    public void setPatient(Reference value) { this.patient = value; }
 
     @JsonProperty("relativeCopyNumber")
     public Double getRelativeCopyNumber() { return relativeCopyNumber; }
@@ -65,9 +71,9 @@ public class Cnv {
     public void setRelativeCopyNumber(Double value) { this.relativeCopyNumber = value; }
 
     @JsonProperty("reportedAffectedGenes")
-    public List<CodingGene> getReportedAffectedGenes() { return reportedAffectedGenes; }
+    public List<Coding> getReportedAffectedGenes() { return reportedAffectedGenes; }
     @JsonProperty("reportedAffectedGenes")
-    public void setReportedAffectedGenes(List<CodingGene> value) { this.reportedAffectedGenes = value; }
+    public void setReportedAffectedGenes(List<Coding> value) { this.reportedAffectedGenes = value; }
 
     @JsonProperty("reportedFocality")
     public String getReportedFocality() { return reportedFocality; }
@@ -85,7 +91,7 @@ public class Cnv {
     public void setTotalCopyNumber(Long value) { this.totalCopyNumber = value; }
 
     @JsonProperty("type")
-    public CodingCnvType getType() { return type; }
+    public CodingCnv getType() { return type; }
     @JsonProperty("type")
-    public void setType(CodingCnvType value) { this.type = value; }
+    public void setType(CodingCnv value) { this.type = value; }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingAtcUnregisteredMedication.java

@@ -2,10 +2,11 @@ package dev.pcvolkmer.mv64e.mtb;
 
 import com.fasterxml.jackson.annotation.*;
 
-public class CodingCarePlanStatusReason {
+public class CodingAtcUnregisteredMedication {
     private String code;
     private String display;
-    private String system;
+    private RequestedMedicationSystem system;
+    private String version;
 
     @JsonProperty("code")
     public String getCode() { return code; }
@@ -18,7 +19,12 @@ public class CodingCarePlanStatusReason {
     public void setDisplay(String value) { this.display = value; }
 
     @JsonProperty("system")
-    public String getSystem() { return system; }
+    public RequestedMedicationSystem getSystem() { return system; }
     @JsonProperty("system")
-    public void setSystem(String value) { this.system = value; }
+    public void setSystem(RequestedMedicationSystem value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingBaseVariantLocalization.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class CodingBaseVariantLocalization {
+    private CodingBaseVariantLocalizationCode code;
+    private String display;
+    private String system;
+    private String version;
+
+    @JsonProperty("code")
+    public CodingBaseVariantLocalizationCode getCode() { return code; }
+    @JsonProperty("code")
+    public void setCode(CodingBaseVariantLocalizationCode value) { this.code = value; }
+
+    @JsonProperty("display")
+    public String getDisplay() { return display; }
+    @JsonProperty("display")
+    public void setDisplay(String value) { this.display = value; }
+
+    @JsonProperty("system")
+    public String getSystem() { return system; }
+    @JsonProperty("system")
+    public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingBaseVariantLocalizationCode.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import java.io.IOException;
+import com.fasterxml.jackson.annotation.*;
+
+public enum CodingBaseVariantLocalizationCode {
+    CODING_REGION, INTERGENIC, INTRONIC, REGULATORY_REGION, SPLICING_REGION;
+
+    @JsonValue
+    public String toValue() {
+        switch (this) {
+            case CODING_REGION: return "coding-region";
+            case INTERGENIC: return "intergenic";
+            case INTRONIC: return "intronic";
+            case REGULATORY_REGION: return "regulatory-region";
+            case SPLICING_REGION: return "splicing-region";
+        }
+        return null;
+    }
+
+    @JsonCreator
+    public static CodingBaseVariantLocalizationCode forValue(String value) throws IOException {
+        if (value.equals("coding-region")) return CODING_REGION;
+        if (value.equals("intergenic")) return INTERGENIC;
+        if (value.equals("intronic")) return INTRONIC;
+        if (value.equals("regulatory-region")) return REGULATORY_REGION;
+        if (value.equals("splicing-region")) return SPLICING_REGION;
+        throw new IOException("Cannot deserialize CodingBaseVariantLocalizationCode");
+    }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingChromosome.java

@@ -1,24 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class CodingChromosome {
-    private ChromosomeCode code;
-    private String display;
-    private ChromosomeSystem system;
-
-    @JsonProperty("code")
-    public ChromosomeCode getCode() { return code; }
-    @JsonProperty("code")
-    public void setCode(ChromosomeCode value) { this.code = value; }
-
-    @JsonProperty("display")
-    public String getDisplay() { return display; }
-    @JsonProperty("display")
-    public void setDisplay(String value) { this.display = value; }
-
-    @JsonProperty("system")
-    public ChromosomeSystem getSystem() { return system; }
-    @JsonProperty("system")
-    public void setSystem(ChromosomeSystem value) { this.system = value; }
-}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingClaimResponseStatus.java

@@ -3,14 +3,15 @@ package dev.pcvolkmer.mv64e.mtb;
 import com.fasterxml.jackson.annotation.*;
 
 public class CodingClaimResponseStatus {
-    private ClaimResponseStatus code;
+    private StickyCode code;
     private String display;
     private String system;
+    private String version;
 
     @JsonProperty("code")
-    public ClaimResponseStatus getCode() { return code; }
+    public StickyCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(ClaimResponseStatus value) { this.code = value; }
+    public void setCode(StickyCode value) { this.code = value; }
 
     @JsonProperty("display")
     public String getDisplay() { return display; }
@@ -21,4 +22,9 @@ public class CodingClaimResponseStatus {
     public String getSystem() { return system; }
     @JsonProperty("system")
     public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingClaimResponseStatusReason.java

@@ -3,14 +3,15 @@ package dev.pcvolkmer.mv64e.mtb;
 import com.fasterxml.jackson.annotation.*;
 
 public class CodingClaimResponseStatusReason {
-    private ClaimResponseStatusReason code;
+    private CodingClaimResponseStatusReasonCode code;
     private String display;
     private String system;
+    private String version;
 
     @JsonProperty("code")
-    public ClaimResponseStatusReason getCode() { return code; }
+    public CodingClaimResponseStatusReasonCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(ClaimResponseStatusReason value) { this.code = value; }
+    public void setCode(CodingClaimResponseStatusReasonCode value) { this.code = value; }
 
     @JsonProperty("display")
     public String getDisplay() { return display; }
@@ -21,4 +22,9 @@ public class CodingClaimResponseStatusReason {
     public String getSystem() { return system; }
     @JsonProperty("system")
     public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingClaimResponseStatusReasonCode.java

@@ -3,7 +3,7 @@ package dev.pcvolkmer.mv64e.mtb;
 import java.io.IOException;
 import com.fasterxml.jackson.annotation.*;
 
-public enum ClaimResponseStatusReason {
+public enum CodingClaimResponseStatusReasonCode {
     APPROVAL_REVOCATION, FORMAL_REASONS, INCLUSION_IN_STUDY, INSUFFICIENT_EVIDENCE, OTHER, OTHER_THERAPY_RECOMMENDED, STANDARD_THERAPY_NOT_EXHAUSTED, UNKNOWN;
 
     @JsonValue
@@ -22,25 +22,15 @@ public enum ClaimResponseStatusReason {
     }
 
     @JsonCreator
-    public static ClaimResponseStatusReason forValue(String value) throws IOException {
+    public static CodingClaimResponseStatusReasonCode forValue(String value) throws IOException {
-        switch (value) {
+        if (value.equals("approval-revocation")) return APPROVAL_REVOCATION;
-            case "approval-revocation":
+        if (value.equals("formal-reasons")) return FORMAL_REASONS;
-                return APPROVAL_REVOCATION;
+        if (value.equals("inclusion-in-study")) return INCLUSION_IN_STUDY;
-            case "formal-reasons":
+        if (value.equals("insufficient-evidence")) return INSUFFICIENT_EVIDENCE;
-                return FORMAL_REASONS;
+        if (value.equals("other")) return OTHER;
-            case "inclusion-in-study":
+        if (value.equals("other-therapy-recommended")) return OTHER_THERAPY_RECOMMENDED;
-                return INCLUSION_IN_STUDY;
+        if (value.equals("standard-therapy-not-exhausted")) return STANDARD_THERAPY_NOT_EXHAUSTED;
-            case "insufficient-evidence":
+        if (value.equals("unknown")) return UNKNOWN;
-                return INSUFFICIENT_EVIDENCE;
+        throw new IOException("Cannot deserialize CodingClaimResponseStatusReasonCode");
-            case "other":
-                return OTHER;
-            case "other-therapy-recommended":
-                return OTHER_THERAPY_RECOMMENDED;
-            case "standard-therapy-not-exhausted":
-                return STANDARD_THERAPY_NOT_EXHAUSTED;
-            case "unknown":
-                return UNKNOWN;
-        }
-        throw new IOException("Cannot deserialize ClaimResponseStatusReason");
     }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingClaimStage.java

@@ -2,16 +2,16 @@ package dev.pcvolkmer.mv64e.mtb;
 
 import com.fasterxml.jackson.annotation.*;
 
-public class CodingTumorGrade {
+public class CodingClaimStage {
-    private TumorGradeCode code;
+    private StageCode code;
     private String display;
     private String system;
     private String version;
 
     @JsonProperty("code")
-    public TumorGradeCode getCode() { return code; }
+    public StageCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(TumorGradeCode value) { this.code = value; }
+    public void setCode(StageCode value) { this.code = value; }
 
     @JsonProperty("display")
     public String getDisplay() { return display; }

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingClinVar.java

@@ -2,16 +2,16 @@ package dev.pcvolkmer.mv64e.mtb;
 
 import com.fasterxml.jackson.annotation.*;
 
-public class CodingTherapyStatusReason {
+public class CodingClinVar {
-    private StatusReasonCode code;
+    private CodingClinVarCode code;
     private String display;
     private String system;
     private String version;
 
     @JsonProperty("code")
-    public StatusReasonCode getCode() { return code; }
+    public CodingClinVarCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(StatusReasonCode value) { this.code = value; }
+    public void setCode(CodingClinVarCode value) { this.code = value; }
 
     @JsonProperty("display")
     public String getDisplay() { return display; }

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingClinVarCode.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import java.io.IOException;
+import com.fasterxml.jackson.annotation.*;
+
+public enum CodingClinVarCode {
+    THE_1, THE_2, THE_3, THE_4, THE_5;
+
+    @JsonValue
+    public String toValue() {
+        switch (this) {
+            case THE_1: return "1";
+            case THE_2: return "2";
+            case THE_3: return "3";
+            case THE_4: return "4";
+            case THE_5: return "5";
+        }
+        return null;
+    }
+
+    @JsonCreator
+    public static CodingClinVarCode forValue(String value) throws IOException {
+        if (value.equals("1")) return THE_1;
+        if (value.equals("2")) return THE_2;
+        if (value.equals("3")) return THE_3;
+        if (value.equals("4")) return THE_4;
+        if (value.equals("5")) return THE_5;
+        throw new IOException("Cannot deserialize CodingClinVarCode");
+    }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingCnv.java

@@ -2,15 +2,16 @@ package dev.pcvolkmer.mv64e.mtb;
 
 import com.fasterxml.jackson.annotation.*;
 
-public class CodingTherapyRecommendationPriority {
+public class CodingCnv {
-    private TherapyRecommendationPriority code;
+    private CodingCnvCode code;
     private String display;
     private String system;
+    private String version;
 
     @JsonProperty("code")
-    public TherapyRecommendationPriority getCode() { return code; }
+    public CodingCnvCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(TherapyRecommendationPriority value) { this.code = value; }
+    public void setCode(CodingCnvCode value) { this.code = value; }
 
     @JsonProperty("display")
     public String getDisplay() { return display; }
@@ -21,4 +22,9 @@ public class CodingTherapyRecommendationPriority {
     public String getSystem() { return system; }
     @JsonProperty("system")
     public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingCnvCode.java

@@ -3,7 +3,7 @@ package dev.pcvolkmer.mv64e.mtb;
 import java.io.IOException;
 import com.fasterxml.jackson.annotation.*;
 
-public enum CNVType {
+public enum CodingCnvCode {
     HIGH_LEVEL_GAIN, LOSS, LOW_LEVEL_GAIN;
 
     @JsonValue
@@ -17,15 +17,10 @@ public enum CNVType {
     }
 
     @JsonCreator
-    public static CNVType forValue(String value) throws IOException {
+    public static CodingCnvCode forValue(String value) throws IOException {
-        switch (value) {
+        if (value.equals("high-level-gain")) return HIGH_LEVEL_GAIN;
-            case "high-level-gain":
+        if (value.equals("loss")) return LOSS;
-                return HIGH_LEVEL_GAIN;
+        if (value.equals("low-level-gain")) return LOW_LEVEL_GAIN;
-            case "loss":
+        throw new IOException("Cannot deserialize CodingCnvCode");
-                return LOSS;
-            case "low-level-gain":
-                return LOW_LEVEL_GAIN;
-        }
-        throw new IOException("Cannot deserialize CNVType");
     }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingEcog.java

@@ -3,15 +3,15 @@ package dev.pcvolkmer.mv64e.mtb;
 import com.fasterxml.jackson.annotation.*;
 
 public class CodingEcog {
-    private EcogCode code;
+    private CodingEcogCode code;
     private String display;
     private String system;
     private String version;
 
     @JsonProperty("code")
-    public EcogCode getCode() { return code; }
+    public CodingEcogCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(EcogCode value) { this.code = value; }
+    public void setCode(CodingEcogCode value) { this.code = value; }
 
     @JsonProperty("display")
     public String getDisplay() { return display; }

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingEcogCode.java

@@ -0,0 +1,32 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import java.io.IOException;
+import com.fasterxml.jackson.annotation.*;
+
+public enum CodingEcogCode {
+    THE_0, THE_1, THE_2, THE_3, THE_4, THE_5;
+
+    @JsonValue
+    public String toValue() {
+        switch (this) {
+            case THE_0: return "0";
+            case THE_1: return "1";
+            case THE_2: return "2";
+            case THE_3: return "3";
+            case THE_4: return "4";
+            case THE_5: return "5";
+        }
+        return null;
+    }
+
+    @JsonCreator
+    public static CodingEcogCode forValue(String value) throws IOException {
+        if (value.equals("0")) return THE_0;
+        if (value.equals("1")) return THE_1;
+        if (value.equals("2")) return THE_2;
+        if (value.equals("3")) return THE_3;
+        if (value.equals("4")) return THE_4;
+        if (value.equals("5")) return THE_5;
+        throw new IOException("Cannot deserialize CodingEcogCode");
+    }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingFollowUpPatientStatus.java

@@ -2,15 +2,16 @@ package dev.pcvolkmer.mv64e.mtb;
 
 import com.fasterxml.jackson.annotation.*;
 
-public class CodingTumorSpecimenType {
+public class CodingFollowUpPatientStatus {
-    private TumorSpecimenType code;
+    private PatientStatusCode code;
     private String display;
     private String system;
+    private String version;
 
     @JsonProperty("code")
-    public TumorSpecimenType getCode() { return code; }
+    public PatientStatusCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(TumorSpecimenType value) { this.code = value; }
+    public void setCode(PatientStatusCode value) { this.code = value; }
 
     @JsonProperty("display")
     public String getDisplay() { return display; }
@@ -21,4 +22,9 @@ public class CodingTumorSpecimenType {
     public String getSystem() { return system; }
     @JsonProperty("system")
     public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingGender.java

@@ -3,15 +3,15 @@ package dev.pcvolkmer.mv64e.mtb;
 import com.fasterxml.jackson.annotation.*;
 
 public class CodingGender {
-    private Gender code;
+    private GenderCode code;
     private String display;
     private String system;
     private String version;
 
     @JsonProperty("code")
-    public Gender getCode() { return code; }
+    public GenderCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(Gender value) { this.code = value; }
+    public void setCode(GenderCode value) { this.code = value; }
 
     @JsonProperty("display")
     public String getDisplay() { return display; }

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingGene.java

@@ -1,24 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class CodingGene {
-    private String code;
-    private String display;
-    private GeneSystem system;
-
-    @JsonProperty("code")
-    public String getCode() { return code; }
-    @JsonProperty("code")
-    public void setCode(String value) { this.code = value; }
-
-    @JsonProperty("display")
-    public String getDisplay() { return display; }
-    @JsonProperty("display")
-    public void setDisplay(String value) { this.display = value; }
-
-    @JsonProperty("system")
-    public GeneSystem getSystem() { return system; }
-    @JsonProperty("system")
-    public void setSystem(GeneSystem value) { this.system = value; }
-}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingGeneticCounselingRecommendationReason.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class CodingGeneticCounselingRecommendationReason {
+    private ReasonCode code;
+    private String display;
+    private String system;
+    private String version;
+
+    @JsonProperty("code")
+    public ReasonCode getCode() { return code; }
+    @JsonProperty("code")
+    public void setCode(ReasonCode value) { this.code = value; }
+
+    @JsonProperty("display")
+    public String getDisplay() { return display; }
+    @JsonProperty("display")
+    public void setDisplay(String value) { this.display = value; }
+
+    @JsonProperty("system")
+    public String getSystem() { return system; }
+    @JsonProperty("system")
+    public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingHealthInsurance.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class CodingHealthInsurance {
+    private CodingHealthInsuranceCode code;
+    private String display;
+    private String system;
+    private String version;
+
+    @JsonProperty("code")
+    public CodingHealthInsuranceCode getCode() { return code; }
+    @JsonProperty("code")
+    public void setCode(CodingHealthInsuranceCode value) { this.code = value; }
+
+    @JsonProperty("display")
+    public String getDisplay() { return display; }
+    @JsonProperty("display")
+    public void setDisplay(String value) { this.display = value; }
+
+    @JsonProperty("system")
+    public String getSystem() { return system; }
+    @JsonProperty("system")
+    public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingHealthInsuranceCode.java

@@ -0,0 +1,38 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import java.io.IOException;
+import com.fasterxml.jackson.annotation.*;
+
+public enum CodingHealthInsuranceCode {
+    BEI, BG, GKV, GPV, PKV, PPV, SEL, SOZ, UNK;
+
+    @JsonValue
+    public String toValue() {
+        switch (this) {
+            case BEI: return "BEI";
+            case BG: return "BG";
+            case GKV: return "GKV";
+            case GPV: return "GPV";
+            case PKV: return "PKV";
+            case PPV: return "PPV";
+            case SEL: return "SEL";
+            case SOZ: return "SOZ";
+            case UNK: return "UNK";
+        }
+        return null;
+    }
+
+    @JsonCreator
+    public static CodingHealthInsuranceCode forValue(String value) throws IOException {
+        if (value.equals("BEI")) return BEI;
+        if (value.equals("BG")) return BG;
+        if (value.equals("GKV")) return GKV;
+        if (value.equals("GPV")) return GPV;
+        if (value.equals("PKV")) return PKV;
+        if (value.equals("PPV")) return PPV;
+        if (value.equals("SEL")) return SEL;
+        if (value.equals("SOZ")) return SOZ;
+        if (value.equals("UNK")) return UNK;
+        throw new IOException("Cannot deserialize CodingHealthInsuranceCode");
+    }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingHrdScoreInterpretation.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class CodingHrdScoreInterpretation {
+    private InterpretationCode code;
+    private String display;
+    private String system;
+    private String version;
+
+    @JsonProperty("code")
+    public InterpretationCode getCode() { return code; }
+    @JsonProperty("code")
+    public void setCode(InterpretationCode value) { this.code = value; }
+
+    @JsonProperty("display")
+    public String getDisplay() { return display; }
+    @JsonProperty("display")
+    public void setDisplay(String value) { this.display = value; }
+
+    @JsonProperty("system")
+    public String getSystem() { return system; }
+    @JsonProperty("system")
+    public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingLevelOfEvidenceGrading.java

@@ -3,15 +3,15 @@ package dev.pcvolkmer.mv64e.mtb;
 import com.fasterxml.jackson.annotation.*;
 
 public class CodingLevelOfEvidenceGrading {
-    private GradingCode code;
+    private LevelOfEvidenceCode code;
     private String display;
     private String system;
     private String version;
 
     @JsonProperty("code")
-    public GradingCode getCode() { return code; }
+    public LevelOfEvidenceCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(GradingCode value) { this.code = value; }
+    public void setCode(LevelOfEvidenceCode value) { this.code = value; }
 
     @JsonProperty("display")
     public String getDisplay() { return display; }

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingMolecularDiagnosticReport.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class CodingMolecularDiagnosticReport {
+    private CodingMolecularDiagnosticReportCode code;
+    private String display;
+    private String system;
+    private String version;
+
+    @JsonProperty("code")
+    public CodingMolecularDiagnosticReportCode getCode() { return code; }
+    @JsonProperty("code")
+    public void setCode(CodingMolecularDiagnosticReportCode value) { this.code = value; }
+
+    @JsonProperty("display")
+    public String getDisplay() { return display; }
+    @JsonProperty("display")
+    public void setDisplay(String value) { this.display = value; }
+
+    @JsonProperty("system")
+    public String getSystem() { return system; }
+    @JsonProperty("system")
+    public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingMolecularDiagnosticReportCode.java

@@ -0,0 +1,44 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import java.io.IOException;
+import com.fasterxml.jackson.annotation.*;
+
+public enum CodingMolecularDiagnosticReportCode {
+    ARRAY, EXOME, FISH, FUSION_PANEL, GENE_PANEL, GENOME_LONG_READ, GENOME_SHORT_READ, KARYOTYPING, OTHER, PANEL, PCR, SINGLE;
+
+    @JsonValue
+    public String toValue() {
+        switch (this) {
+            case ARRAY: return "array";
+            case EXOME: return "exome";
+            case FISH: return "FISH";
+            case FUSION_PANEL: return "fusion-panel";
+            case GENE_PANEL: return "gene-panel";
+            case GENOME_LONG_READ: return "genome-long-read";
+            case GENOME_SHORT_READ: return "genome-short-read";
+            case KARYOTYPING: return "karyotyping";
+            case OTHER: return "other";
+            case PANEL: return "panel";
+            case PCR: return "PCR";
+            case SINGLE: return "single";
+        }
+        return null;
+    }
+
+    @JsonCreator
+    public static CodingMolecularDiagnosticReportCode forValue(String value) throws IOException {
+        if (value.equals("array")) return ARRAY;
+        if (value.equals("exome")) return EXOME;
+        if (value.equals("FISH")) return FISH;
+        if (value.equals("fusion-panel")) return FUSION_PANEL;
+        if (value.equals("gene-panel")) return GENE_PANEL;
+        if (value.equals("genome-long-read")) return GENOME_LONG_READ;
+        if (value.equals("genome-short-read")) return GENOME_SHORT_READ;
+        if (value.equals("karyotyping")) return KARYOTYPING;
+        if (value.equals("other")) return OTHER;
+        if (value.equals("panel")) return PANEL;
+        if (value.equals("PCR")) return PCR;
+        if (value.equals("single")) return SINGLE;
+        throw new IOException("Cannot deserialize CodingMolecularDiagnosticReportCode");
+    }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingMtbCarePlanStatusReason.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class CodingMtbCarePlanStatusReason {
+    private CodingMtbCarePlanStatusReasonCode code;
+    private String display;
+    private String system;
+    private String version;
+
+    @JsonProperty("code")
+    public CodingMtbCarePlanStatusReasonCode getCode() { return code; }
+    @JsonProperty("code")
+    public void setCode(CodingMtbCarePlanStatusReasonCode value) { this.code = value; }
+
+    @JsonProperty("display")
+    public String getDisplay() { return display; }
+    @JsonProperty("display")
+    public void setDisplay(String value) { this.display = value; }
+
+    @JsonProperty("system")
+    public String getSystem() { return system; }
+    @JsonProperty("system")
+    public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingMtbCarePlanStatusReasonCode.java

@@ -0,0 +1,32 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import java.io.IOException;
+import com.fasterxml.jackson.annotation.*;
+
+public enum CodingMtbCarePlanStatusReasonCode {
+    NON_GENETIC_CAUSE, NOT_RARE_DISEASE, NO_TARGET, OTHER, PSYCHOSOMATIC, TARGETED_DIAGNOSTICS_RECOMMENDED;
+
+    @JsonValue
+    public String toValue() {
+        switch (this) {
+            case NON_GENETIC_CAUSE: return "non-genetic-cause";
+            case NOT_RARE_DISEASE: return "not-rare-disease";
+            case NO_TARGET: return "no-target";
+            case OTHER: return "other";
+            case PSYCHOSOMATIC: return "psychosomatic";
+            case TARGETED_DIAGNOSTICS_RECOMMENDED: return "targeted-diagnostics-recommended";
+        }
+        return null;
+    }
+
+    @JsonCreator
+    public static CodingMtbCarePlanStatusReasonCode forValue(String value) throws IOException {
+        if (value.equals("non-genetic-cause")) return NON_GENETIC_CAUSE;
+        if (value.equals("not-rare-disease")) return NOT_RARE_DISEASE;
+        if (value.equals("no-target")) return NO_TARGET;
+        if (value.equals("other")) return OTHER;
+        if (value.equals("psychosomatic")) return PSYCHOSOMATIC;
+        if (value.equals("targeted-diagnostics-recommended")) return TARGETED_DIAGNOSTICS_RECOMMENDED;
+        throw new IOException("Cannot deserialize CodingMtbCarePlanStatusReasonCode");
+    }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingMtbDiagnosis.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class CodingMtbDiagnosis {
+    private CodingMtbDiagnosisCode code;
+    private String display;
+    private String system;
+    private String version;
+
+    @JsonProperty("code")
+    public CodingMtbDiagnosisCode getCode() { return code; }
+    @JsonProperty("code")
+    public void setCode(CodingMtbDiagnosisCode value) { this.code = value; }
+
+    @JsonProperty("display")
+    public String getDisplay() { return display; }
+    @JsonProperty("display")
+    public void setDisplay(String value) { this.display = value; }
+
+    @JsonProperty("system")
+    public String getSystem() { return system; }
+    @JsonProperty("system")
+    public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingMtbDiagnosisCode.java

@@ -0,0 +1,26 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import java.io.IOException;
+import com.fasterxml.jackson.annotation.*;
+
+public enum CodingMtbDiagnosisCode {
+    MAIN, METACHRONOUS, SECONDARY;
+
+    @JsonValue
+    public String toValue() {
+        switch (this) {
+            case MAIN: return "main";
+            case METACHRONOUS: return "metachronous";
+            case SECONDARY: return "secondary";
+        }
+        return null;
+    }
+
+    @JsonCreator
+    public static CodingMtbDiagnosisCode forValue(String value) throws IOException {
+        if (value.equals("main")) return MAIN;
+        if (value.equals("metachronous")) return METACHRONOUS;
+        if (value.equals("secondary")) return SECONDARY;
+        throw new IOException("Cannot deserialize CodingMtbDiagnosisCode");
+    }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingMtbDiagnosisGuidelineTreatmentStatus.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class CodingMtbDiagnosisGuidelineTreatmentStatus {
+    private GuidelineTreatmentStatusCode code;
+    private String display;
+    private String system;
+    private String version;
+
+    @JsonProperty("code")
+    public GuidelineTreatmentStatusCode getCode() { return code; }
+    @JsonProperty("code")
+    public void setCode(GuidelineTreatmentStatusCode value) { this.code = value; }
+
+    @JsonProperty("display")
+    public String getDisplay() { return display; }
+    @JsonProperty("display")
+    public void setDisplay(String value) { this.display = value; }
+
+    @JsonProperty("system")
+    public String getSystem() { return system; }
+    @JsonProperty("system")
+    public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingMtbMedicationRecommendationCategory.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class CodingMtbMedicationRecommendationCategory {
+    private CodingMtbMedicationRecommendationCategoryCode code;
+    private String display;
+    private String system;
+    private String version;
+
+    @JsonProperty("code")
+    public CodingMtbMedicationRecommendationCategoryCode getCode() { return code; }
+    @JsonProperty("code")
+    public void setCode(CodingMtbMedicationRecommendationCategoryCode value) { this.code = value; }
+
+    @JsonProperty("display")
+    public String getDisplay() { return display; }
+    @JsonProperty("display")
+    public void setDisplay(String value) { this.display = value; }
+
+    @JsonProperty("system")
+    public String getSystem() { return system; }
+    @JsonProperty("system")
+    public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingMtbMedicationRecommendationCategoryCode.java

@@ -0,0 +1,32 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import java.io.IOException;
+import com.fasterxml.jackson.annotation.*;
+
+public enum CodingMtbMedicationRecommendationCategoryCode {
+    CH, HO, IM, SO, SZ, ZS;
+
+    @JsonValue
+    public String toValue() {
+        switch (this) {
+            case CH: return "CH";
+            case HO: return "HO";
+            case IM: return "IM";
+            case SO: return "SO";
+            case SZ: return "SZ";
+            case ZS: return "ZS";
+        }
+        return null;
+    }
+
+    @JsonCreator
+    public static CodingMtbMedicationRecommendationCategoryCode forValue(String value) throws IOException {
+        if (value.equals("CH")) return CH;
+        if (value.equals("HO")) return HO;
+        if (value.equals("IM")) return IM;
+        if (value.equals("SO")) return SO;
+        if (value.equals("SZ")) return SZ;
+        if (value.equals("ZS")) return ZS;
+        throw new IOException("Cannot deserialize CodingMtbMedicationRecommendationCategoryCode");
+    }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingMtbMedicationRecommendationUseType.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class CodingMtbMedicationRecommendationUseType {
+    private UseTypeCode code;
+    private String display;
+    private String system;
+    private String version;
+
+    @JsonProperty("code")
+    public UseTypeCode getCode() { return code; }
+    @JsonProperty("code")
+    public void setCode(UseTypeCode value) { this.code = value; }
+
+    @JsonProperty("display")
+    public String getDisplay() { return display; }
+    @JsonProperty("display")
+    public void setDisplay(String value) { this.display = value; }
+
+    @JsonProperty("system")
+    public String getSystem() { return system; }
+    @JsonProperty("system")
+    public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingMtbProcedureRecommendationCategory.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class CodingMtbProcedureRecommendationCategory {
+    private CodingMtbProcedureRecommendationCategoryCode code;
+    private String display;
+    private String system;
+    private String version;
+
+    @JsonProperty("code")
+    public CodingMtbProcedureRecommendationCategoryCode getCode() { return code; }
+    @JsonProperty("code")
+    public void setCode(CodingMtbProcedureRecommendationCategoryCode value) { this.code = value; }
+
+    @JsonProperty("display")
+    public String getDisplay() { return display; }
+    @JsonProperty("display")
+    public void setDisplay(String value) { this.display = value; }
+
+    @JsonProperty("system")
+    public String getSystem() { return system; }
+    @JsonProperty("system")
+    public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingMtbProcedureRecommendationCategoryCode.java

@@ -0,0 +1,32 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import java.io.IOException;
+import com.fasterxml.jackson.annotation.*;
+
+public enum CodingMtbProcedureRecommendationCategoryCode {
+    AS, OP, SO, ST, WS, WW;
+
+    @JsonValue
+    public String toValue() {
+        switch (this) {
+            case AS: return "AS";
+            case OP: return "OP";
+            case SO: return "SO";
+            case ST: return "ST";
+            case WS: return "WS";
+            case WW: return "WW";
+        }
+        return null;
+    }
+
+    @JsonCreator
+    public static CodingMtbProcedureRecommendationCategoryCode forValue(String value) throws IOException {
+        if (value.equals("AS")) return AS;
+        if (value.equals("OP")) return OP;
+        if (value.equals("SO")) return SO;
+        if (value.equals("ST")) return ST;
+        if (value.equals("WS")) return WS;
+        if (value.equals("WW")) return WW;
+        throw new IOException("Cannot deserialize CodingMtbProcedureRecommendationCategoryCode");
+    }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingMtbSystemicTherapyCategory.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class CodingMtbSystemicTherapyCategory {
+    private CodingMtbSystemicTherapyCategoryCode code;
+    private String display;
+    private String system;
+    private String version;
+
+    @JsonProperty("code")
+    public CodingMtbSystemicTherapyCategoryCode getCode() { return code; }
+    @JsonProperty("code")
+    public void setCode(CodingMtbSystemicTherapyCategoryCode value) { this.code = value; }
+
+    @JsonProperty("display")
+    public String getDisplay() { return display; }
+    @JsonProperty("display")
+    public void setDisplay(String value) { this.display = value; }
+
+    @JsonProperty("system")
+    public String getSystem() { return system; }
+    @JsonProperty("system")
+    public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingMtbSystemicTherapyCategoryCode.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import java.io.IOException;
+import com.fasterxml.jackson.annotation.*;
+
+public enum CodingMtbSystemicTherapyCategoryCode {
+    A, I, N, O, S;
+
+    @JsonValue
+    public String toValue() {
+        switch (this) {
+            case A: return "A";
+            case I: return "I";
+            case N: return "N";
+            case O: return "O";
+            case S: return "S";
+        }
+        return null;
+    }
+
+    @JsonCreator
+    public static CodingMtbSystemicTherapyCategoryCode forValue(String value) throws IOException {
+        if (value.equals("A")) return A;
+        if (value.equals("I")) return I;
+        if (value.equals("N")) return N;
+        if (value.equals("O")) return O;
+        if (value.equals("S")) return S;
+        throw new IOException("Cannot deserialize CodingMtbSystemicTherapyCategoryCode");
+    }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingMtbSystemicTherapyRecommendationFulfillmentStatus.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class CodingMtbSystemicTherapyRecommendationFulfillmentStatus {
+    private RecommendationFulfillmentStatusCode code;
+    private String display;
+    private String system;
+    private String version;
+
+    @JsonProperty("code")
+    public RecommendationFulfillmentStatusCode getCode() { return code; }
+    @JsonProperty("code")
+    public void setCode(RecommendationFulfillmentStatusCode value) { this.code = value; }
+
+    @JsonProperty("display")
+    public String getDisplay() { return display; }
+    @JsonProperty("display")
+    public void setDisplay(String value) { this.display = value; }
+
+    @JsonProperty("system")
+    public String getSystem() { return system; }
+    @JsonProperty("system")
+    public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingMtbTherapyIntent.java

@@ -2,15 +2,16 @@ package dev.pcvolkmer.mv64e.mtb;
 
 import com.fasterxml.jackson.annotation.*;
 
-public class CodingCnvType {
+public class CodingMtbTherapyIntent {
-    private CNVType code;
+    private IntentCode code;
     private String display;
     private String system;
+    private String version;
 
     @JsonProperty("code")
-    public CNVType getCode() { return code; }
+    public IntentCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(CNVType value) { this.code = value; }
+    public void setCode(IntentCode value) { this.code = value; }
 
     @JsonProperty("display")
     public String getDisplay() { return display; }
@@ -21,4 +22,9 @@ public class CodingCnvType {
     public String getSystem() { return system; }
     @JsonProperty("system")
     public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingMtbTherapyStatusReason.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class CodingMtbTherapyStatusReason {
+    private CodingMtbTherapyStatusReasonCode code;
+    private String display;
+    private String system;
+    private String version;
+
+    @JsonProperty("code")
+    public CodingMtbTherapyStatusReasonCode getCode() { return code; }
+    @JsonProperty("code")
+    public void setCode(CodingMtbTherapyStatusReasonCode value) { this.code = value; }
+
+    @JsonProperty("display")
+    public String getDisplay() { return display; }
+    @JsonProperty("display")
+    public void setDisplay(String value) { this.display = value; }
+
+    @JsonProperty("system")
+    public String getSystem() { return system; }
+    @JsonProperty("system")
+    public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingMtbTherapyStatusReasonCode.java

@@ -0,0 +1,58 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import java.io.IOException;
+import com.fasterxml.jackson.annotation.*;
+
+public enum CodingMtbTherapyStatusReasonCode {
+    BEST_SUPPORTIVE_CARE, CHRONIC_REMISSION, DETERIORATION, LOST_TO_FU, MEDICAL_REASONS, NO_INDICATION, OTHER, OTHER_THERAPY_CHOSEN, PATIENT_DEATH, PATIENT_REFUSAL, PATIENT_WISH, PAYMENT_ENDED, PAYMENT_PENDING, PAYMENT_REFUSED, PROGRESSION, REGULAR_COMPLETION, REGULAR_COMPLETION_WITH_DOSAGE_REDUCTION, REGULAR_COMPLETION_WITH_SUBSTANCE_CHANGE, TOXICITY;
+
+    @JsonValue
+    public String toValue() {
+        switch (this) {
+            case BEST_SUPPORTIVE_CARE: return "best-supportive-care";
+            case CHRONIC_REMISSION: return "chronic-remission";
+            case DETERIORATION: return "deterioration";
+            case LOST_TO_FU: return "lost-to-fu";
+            case MEDICAL_REASONS: return "medical-reasons";
+            case NO_INDICATION: return "no-indication";
+            case OTHER: return "other";
+            case OTHER_THERAPY_CHOSEN: return "other-therapy-chosen";
+            case PATIENT_DEATH: return "patient-death";
+            case PATIENT_REFUSAL: return "patient-refusal";
+            case PATIENT_WISH: return "patient-wish";
+            case PAYMENT_ENDED: return "payment-ended";
+            case PAYMENT_PENDING: return "payment-pending";
+            case PAYMENT_REFUSED: return "payment-refused";
+            case PROGRESSION: return "progression";
+            case REGULAR_COMPLETION: return "regular-completion";
+            case REGULAR_COMPLETION_WITH_DOSAGE_REDUCTION: return "regular-completion-with-dosage-reduction";
+            case REGULAR_COMPLETION_WITH_SUBSTANCE_CHANGE: return "regular-completion-with-substance-change";
+            case TOXICITY: return "toxicity";
+        }
+        return null;
+    }
+
+    @JsonCreator
+    public static CodingMtbTherapyStatusReasonCode forValue(String value) throws IOException {
+        if (value.equals("best-supportive-care")) return BEST_SUPPORTIVE_CARE;
+        if (value.equals("chronic-remission")) return CHRONIC_REMISSION;
+        if (value.equals("deterioration")) return DETERIORATION;
+        if (value.equals("lost-to-fu")) return LOST_TO_FU;
+        if (value.equals("medical-reasons")) return MEDICAL_REASONS;
+        if (value.equals("no-indication")) return NO_INDICATION;
+        if (value.equals("other")) return OTHER;
+        if (value.equals("other-therapy-chosen")) return OTHER_THERAPY_CHOSEN;
+        if (value.equals("patient-death")) return PATIENT_DEATH;
+        if (value.equals("patient-refusal")) return PATIENT_REFUSAL;
+        if (value.equals("patient-wish")) return PATIENT_WISH;
+        if (value.equals("payment-ended")) return PAYMENT_ENDED;
+        if (value.equals("payment-pending")) return PAYMENT_PENDING;
+        if (value.equals("payment-refused")) return PAYMENT_REFUSED;
+        if (value.equals("progression")) return PROGRESSION;
+        if (value.equals("regular-completion")) return REGULAR_COMPLETION;
+        if (value.equals("regular-completion-with-dosage-reduction")) return REGULAR_COMPLETION_WITH_DOSAGE_REDUCTION;
+        if (value.equals("regular-completion-with-substance-change")) return REGULAR_COMPLETION_WITH_SUBSTANCE_CHANGE;
+        if (value.equals("toxicity")) return TOXICITY;
+        throw new IOException("Cannot deserialize CodingMtbTherapyStatusReasonCode");
+    }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingNgsReport.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class CodingNgsReport {
+    private CodingNgsReportCode code;
+    private String display;
+    private String system;
+    private String version;
+
+    @JsonProperty("code")
+    public CodingNgsReportCode getCode() { return code; }
+    @JsonProperty("code")
+    public void setCode(CodingNgsReportCode value) { this.code = value; }
+
+    @JsonProperty("display")
+    public String getDisplay() { return display; }
+    @JsonProperty("display")
+    public void setDisplay(String value) { this.display = value; }
+
+    @JsonProperty("system")
+    public String getSystem() { return system; }
+    @JsonProperty("system")
+    public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingNgsReportCode.java

@@ -0,0 +1,36 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import java.io.IOException;
+import com.fasterxml.jackson.annotation.*;
+
+public enum CodingNgsReportCode {
+    ARRAY, EXOME, GENOME_LONG_READ, GENOME_SHORT_READ, KARYOTYPING, OTHER, PANEL, SINGLE;
+
+    @JsonValue
+    public String toValue() {
+        switch (this) {
+            case ARRAY: return "array";
+            case EXOME: return "exome";
+            case GENOME_LONG_READ: return "genome-long-read";
+            case GENOME_SHORT_READ: return "genome-short-read";
+            case KARYOTYPING: return "karyotyping";
+            case OTHER: return "other";
+            case PANEL: return "panel";
+            case SINGLE: return "single";
+        }
+        return null;
+    }
+
+    @JsonCreator
+    public static CodingNgsReportCode forValue(String value) throws IOException {
+        if (value.equals("array")) return ARRAY;
+        if (value.equals("exome")) return EXOME;
+        if (value.equals("genome-long-read")) return GENOME_LONG_READ;
+        if (value.equals("genome-short-read")) return GENOME_SHORT_READ;
+        if (value.equals("karyotyping")) return KARYOTYPING;
+        if (value.equals("other")) return OTHER;
+        if (value.equals("panel")) return PANEL;
+        if (value.equals("single")) return SINGLE;
+        throw new IOException("Cannot deserialize CodingNgsReportCode");
+    }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingOncoProcedure.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class CodingOncoProcedure {
+    private CodingOncoProcedureCode code;
+    private String display;
+    private String system;
+    private String version;
+
+    @JsonProperty("code")
+    public CodingOncoProcedureCode getCode() { return code; }
+    @JsonProperty("code")
+    public void setCode(CodingOncoProcedureCode value) { this.code = value; }
+
+    @JsonProperty("display")
+    public String getDisplay() { return display; }
+    @JsonProperty("display")
+    public void setDisplay(String value) { this.display = value; }
+
+    @JsonProperty("system")
+    public String getSystem() { return system; }
+    @JsonProperty("system")
+    public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingOncoProcedureCode.java

@@ -0,0 +1,26 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import java.io.IOException;
+import com.fasterxml.jackson.annotation.*;
+
+public enum CodingOncoProcedureCode {
+    NUCLEAR_MEDICINE, RADIO_THERAPY, SURGERY;
+
+    @JsonValue
+    public String toValue() {
+        switch (this) {
+            case NUCLEAR_MEDICINE: return "nuclear-medicine";
+            case RADIO_THERAPY: return "radio-therapy";
+            case SURGERY: return "surgery";
+        }
+        return null;
+    }
+
+    @JsonCreator
+    public static CodingOncoProcedureCode forValue(String value) throws IOException {
+        if (value.equals("nuclear-medicine")) return NUCLEAR_MEDICINE;
+        if (value.equals("radio-therapy")) return RADIO_THERAPY;
+        if (value.equals("surgery")) return SURGERY;
+        throw new IOException("Cannot deserialize CodingOncoProcedureCode");
+    }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingProteinExpressionResult.java

@@ -3,15 +3,15 @@ package dev.pcvolkmer.mv64e.mtb;
 import com.fasterxml.jackson.annotation.*;
 
 public class CodingProteinExpressionResult {
-    private ProteinExpressionResultCode code;
+    private CodingProteinExpressionResultCode code;
     private String display;
     private String system;
     private String version;
 
     @JsonProperty("code")
-    public ProteinExpressionResultCode getCode() { return code; }
+    public CodingProteinExpressionResultCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(ProteinExpressionResultCode value) { this.code = value; }
+    public void setCode(CodingProteinExpressionResultCode value) { this.code = value; }
 
     @JsonProperty("display")
     public String getDisplay() { return display; }

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingProteinExpressionResultCode.java

@@ -0,0 +1,32 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import java.io.IOException;
+import com.fasterxml.jackson.annotation.*;
+
+public enum CodingProteinExpressionResultCode {
+    EXP, NOT_EXP, THE_1, THE_2, THE_3, UNKNOWN;
+
+    @JsonValue
+    public String toValue() {
+        switch (this) {
+            case EXP: return "exp";
+            case NOT_EXP: return "not-exp";
+            case THE_1: return "1+";
+            case THE_2: return "2+";
+            case THE_3: return "3+";
+            case UNKNOWN: return "unknown";
+        }
+        return null;
+    }
+
+    @JsonCreator
+    public static CodingProteinExpressionResultCode forValue(String value) throws IOException {
+        if (value.equals("exp")) return EXP;
+        if (value.equals("not-exp")) return NOT_EXP;
+        if (value.equals("1+")) return THE_1;
+        if (value.equals("2+")) return THE_2;
+        if (value.equals("3+")) return THE_3;
+        if (value.equals("unknown")) return UNKNOWN;
+        throw new IOException("Cannot deserialize CodingProteinExpressionResultCode");
+    }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingRecist.java

@@ -3,15 +3,15 @@ package dev.pcvolkmer.mv64e.mtb;
 import com.fasterxml.jackson.annotation.*;
 
 public class CodingRecist {
-    private RecistCode code;
+    private CodingRecistCode code;
     private String display;
     private String system;
     private String version;
 
     @JsonProperty("code")
-    public RecistCode getCode() { return code; }
+    public CodingRecistCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(RecistCode value) { this.code = value; }
+    public void setCode(CodingRecistCode value) { this.code = value; }
 
     @JsonProperty("display")
     public String getDisplay() { return display; }

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingRecistCode.java

@@ -0,0 +1,32 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import java.io.IOException;
+import com.fasterxml.jackson.annotation.*;
+
+public enum CodingRecistCode {
+    CR, MR, NA, PD, PR, SD;
+
+    @JsonValue
+    public String toValue() {
+        switch (this) {
+            case CR: return "CR";
+            case MR: return "MR";
+            case NA: return "NA";
+            case PD: return "PD";
+            case PR: return "PR";
+            case SD: return "SD";
+        }
+        return null;
+    }
+
+    @JsonCreator
+    public static CodingRecistCode forValue(String value) throws IOException {
+        if (value.equals("CR")) return CR;
+        if (value.equals("MR")) return MR;
+        if (value.equals("NA")) return NA;
+        if (value.equals("PD")) return PD;
+        if (value.equals("PR")) return PR;
+        if (value.equals("SD")) return SD;
+        throw new IOException("Cannot deserialize CodingRecistCode");
+    }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingRecommendationPriority.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class CodingRecommendationPriority {
+    private PriorityCode code;
+    private String display;
+    private String system;
+    private String version;
+
+    @JsonProperty("code")
+    public PriorityCode getCode() { return code; }
+    @JsonProperty("code")
+    public void setCode(PriorityCode value) { this.code = value; }
+
+    @JsonProperty("display")
+    public String getDisplay() { return display; }
+    @JsonProperty("display")
+    public void setDisplay(String value) { this.display = value; }
+
+    @JsonProperty("system")
+    public String getSystem() { return system; }
+    @JsonProperty("system")
+    public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingResponseMethod.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class CodingResponseMethod {
+    private CodingResponseMethodCode code;
+    private String display;
+    private String system;
+    private String version;
+
+    @JsonProperty("code")
+    public CodingResponseMethodCode getCode() { return code; }
+    @JsonProperty("code")
+    public void setCode(CodingResponseMethodCode value) { this.code = value; }
+
+    @JsonProperty("display")
+    public String getDisplay() { return display; }
+    @JsonProperty("display")
+    public void setDisplay(String value) { this.display = value; }
+
+    @JsonProperty("system")
+    public String getSystem() { return system; }
+    @JsonProperty("system")
+    public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingResponseMethodCode.java

@@ -0,0 +1,24 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import java.io.IOException;
+import com.fasterxml.jackson.annotation.*;
+
+public enum CodingResponseMethodCode {
+    RANO, RECIST;
+
+    @JsonValue
+    public String toValue() {
+        switch (this) {
+            case RANO: return "RANO";
+            case RECIST: return "RECIST";
+        }
+        return null;
+    }
+
+    @JsonCreator
+    public static CodingResponseMethodCode forValue(String value) throws IOException {
+        if (value.equals("RANO")) return RANO;
+        if (value.equals("RECIST")) return RECIST;
+        throw new IOException("Cannot deserialize CodingResponseMethodCode");
+    }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingTherapyStatus.java

@@ -3,14 +3,15 @@ package dev.pcvolkmer.mv64e.mtb;
 import com.fasterxml.jackson.annotation.*;
 
 public class CodingTherapyStatus {
-    private TherapyStatus code;
+    private CodingTherapyStatusCode code;
     private String display;
     private String system;
+    private String version;
 
     @JsonProperty("code")
-    public TherapyStatus getCode() { return code; }
+    public CodingTherapyStatusCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(TherapyStatus value) { this.code = value; }
+    public void setCode(CodingTherapyStatusCode value) { this.code = value; }
 
     @JsonProperty("display")
     public String getDisplay() { return display; }
@@ -21,4 +22,9 @@ public class CodingTherapyStatus {
     public String getSystem() { return system; }
     @JsonProperty("system")
     public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingTherapyStatusCode.java

@@ -3,7 +3,7 @@ package dev.pcvolkmer.mv64e.mtb;
 import java.io.IOException;
 import com.fasterxml.jackson.annotation.*;
 
-public enum TherapyStatus {
+public enum CodingTherapyStatusCode {
     COMPLETED, NOT_DONE, ON_GOING, STOPPED, UNKNOWN;
 
     @JsonValue
@@ -19,19 +19,12 @@ public enum TherapyStatus {
     }
 
     @JsonCreator
-    public static TherapyStatus forValue(String value) throws IOException {
+    public static CodingTherapyStatusCode forValue(String value) throws IOException {
-        switch (value) {
+        if (value.equals("completed")) return COMPLETED;
-            case "completed":
+        if (value.equals("not-done")) return NOT_DONE;
-                return COMPLETED;
+        if (value.equals("on-going")) return ON_GOING;
-            case "not-done":
+        if (value.equals("stopped")) return STOPPED;
-                return NOT_DONE;
+        if (value.equals("unknown")) return UNKNOWN;
-            case "on-going":
+        throw new IOException("Cannot deserialize CodingTherapyStatusCode");
-                return ON_GOING;
-            case "stopped":
-                return STOPPED;
-            case "unknown":
-                return UNKNOWN;
-        }
-        throw new IOException("Cannot deserialize TherapyStatus");
     }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingTmbInterpretation.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class CodingTmbInterpretation {
+    private InterpretationCode code;
+    private String display;
+    private String system;
+    private String version;
+
+    @JsonProperty("code")
+    public InterpretationCode getCode() { return code; }
+    @JsonProperty("code")
+    public void setCode(InterpretationCode value) { this.code = value; }
+
+    @JsonProperty("display")
+    public String getDisplay() { return display; }
+    @JsonProperty("display")
+    public void setDisplay(String value) { this.display = value; }
+
+    @JsonProperty("system")
+    public String getSystem() { return system; }
+    @JsonProperty("system")
+    public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingTumorCellContentMethod.java

@@ -3,14 +3,15 @@ package dev.pcvolkmer.mv64e.mtb;
 import com.fasterxml.jackson.annotation.*;
 
 public class CodingTumorCellContentMethod {
-    private TumorCellContentMethod code;
+    private CodingTumorCellContentMethodCode code;
     private String display;
     private String system;
+    private String version;
 
     @JsonProperty("code")
-    public TumorCellContentMethod getCode() { return code; }
+    public CodingTumorCellContentMethodCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(TumorCellContentMethod value) { this.code = value; }
+    public void setCode(CodingTumorCellContentMethodCode value) { this.code = value; }
 
     @JsonProperty("display")
     public String getDisplay() { return display; }
@@ -21,4 +22,9 @@ public class CodingTumorCellContentMethod {
     public String getSystem() { return system; }
     @JsonProperty("system")
     public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingTumorCellContentMethodCode.java

@@ -3,7 +3,7 @@ package dev.pcvolkmer.mv64e.mtb;
 import java.io.IOException;
 import com.fasterxml.jackson.annotation.*;
 
-public enum TumorCellContentMethod {
+public enum CodingTumorCellContentMethodCode {
     BIOINFORMATIC, HISTOLOGIC;
 
     @JsonValue
@@ -16,9 +16,9 @@ public enum TumorCellContentMethod {
     }
 
     @JsonCreator
-    public static TumorCellContentMethod forValue(String value) throws IOException {
+    public static CodingTumorCellContentMethodCode forValue(String value) throws IOException {
         if (value.equals("bioinformatic")) return BIOINFORMATIC;
         if (value.equals("histologic")) return HISTOLOGIC;
-        throw new IOException("Cannot deserialize TumorCellContentMethod");
+        throw new IOException("Cannot deserialize CodingTumorCellContentMethodCode");
     }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingTumorSpecimen.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class CodingTumorSpecimen {
+    private CodingTumorSpecimenCode code;
+    private String display;
+    private String system;
+    private String version;
+
+    @JsonProperty("code")
+    public CodingTumorSpecimenCode getCode() { return code; }
+    @JsonProperty("code")
+    public void setCode(CodingTumorSpecimenCode value) { this.code = value; }
+
+    @JsonProperty("display")
+    public String getDisplay() { return display; }
+    @JsonProperty("display")
+    public void setDisplay(String value) { this.display = value; }
+
+    @JsonProperty("system")
+    public String getSystem() { return system; }
+    @JsonProperty("system")
+    public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingTumorSpecimenCode.java

@@ -3,7 +3,7 @@ package dev.pcvolkmer.mv64e.mtb;
 import java.io.IOException;
 import com.fasterxml.jackson.annotation.*;
 
-public enum TumorSpecimenType {
+public enum CodingTumorSpecimenCode {
     CRYO_FROZEN, FFPE, FRESH_TISSUE, LIQUID_BIOPSY, UNKNOWN;
 
     @JsonValue
@@ -19,19 +19,12 @@ public enum TumorSpecimenType {
     }
 
     @JsonCreator
-    public static TumorSpecimenType forValue(String value) throws IOException {
+    public static CodingTumorSpecimenCode forValue(String value) throws IOException {
-        switch (value) {
+        if (value.equals("cryo-frozen")) return CRYO_FROZEN;
-            case "cryo-frozen":
+        if (value.equals("FFPE")) return FFPE;
-                return CRYO_FROZEN;
+        if (value.equals("fresh-tissue")) return FRESH_TISSUE;
-            case "FFPE":
+        if (value.equals("liquid-biopsy")) return LIQUID_BIOPSY;
-                return FFPE;
+        if (value.equals("unknown")) return UNKNOWN;
-            case "fresh-tissue":
+        throw new IOException("Cannot deserialize CodingTumorSpecimenCode");
-                return FRESH_TISSUE;
-            case "liquid-biopsy":
-                return LIQUID_BIOPSY;
-            case "unknown":
-                return UNKNOWN;
-        }
-        throw new IOException("Cannot deserialize TumorSpecimenType");
     }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingTumorSpecimenCollectionLocalization.java

@@ -3,14 +3,15 @@ package dev.pcvolkmer.mv64e.mtb;
 import com.fasterxml.jackson.annotation.*;
 
 public class CodingTumorSpecimenCollectionLocalization {
-    private TumorSpecimenCollectionLocalization code;
+    private CodingTumorSpecimenCollectionLocalizationCode code;
     private String display;
     private String system;
+    private String version;
 
     @JsonProperty("code")
-    public TumorSpecimenCollectionLocalization getCode() { return code; }
+    public CodingTumorSpecimenCollectionLocalizationCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(TumorSpecimenCollectionLocalization value) { this.code = value; }
+    public void setCode(CodingTumorSpecimenCollectionLocalizationCode value) { this.code = value; }
 
     @JsonProperty("display")
     public String getDisplay() { return display; }
@@ -21,4 +22,9 @@ public class CodingTumorSpecimenCollectionLocalization {
     public String getSystem() { return system; }
     @JsonProperty("system")
     public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingTumorSpecimenCollectionLocalizationCode.java

@@ -0,0 +1,32 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import java.io.IOException;
+import com.fasterxml.jackson.annotation.*;
+
+public enum CodingTumorSpecimenCollectionLocalizationCode {
+    CELLFREE_DNA, LOCAL_RECURRENCE, METASTASIS, PRIMARY_TUMOR, REGIONAL_LYMPH_NODES, UNKNOWN;
+
+    @JsonValue
+    public String toValue() {
+        switch (this) {
+            case CELLFREE_DNA: return "cellfree-dna";
+            case LOCAL_RECURRENCE: return "local-recurrence";
+            case METASTASIS: return "metastasis";
+            case PRIMARY_TUMOR: return "primary-tumor";
+            case REGIONAL_LYMPH_NODES: return "regional-lymph-nodes";
+            case UNKNOWN: return "unknown";
+        }
+        return null;
+    }
+
+    @JsonCreator
+    public static CodingTumorSpecimenCollectionLocalizationCode forValue(String value) throws IOException {
+        if (value.equals("cellfree-dna")) return CELLFREE_DNA;
+        if (value.equals("local-recurrence")) return LOCAL_RECURRENCE;
+        if (value.equals("metastasis")) return METASTASIS;
+        if (value.equals("primary-tumor")) return PRIMARY_TUMOR;
+        if (value.equals("regional-lymph-nodes")) return REGIONAL_LYMPH_NODES;
+        if (value.equals("unknown")) return UNKNOWN;
+        throw new IOException("Cannot deserialize CodingTumorSpecimenCollectionLocalizationCode");
+    }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingTumorSpecimenCollectionMethod.java

@@ -3,14 +3,15 @@ package dev.pcvolkmer.mv64e.mtb;
 import com.fasterxml.jackson.annotation.*;
 
 public class CodingTumorSpecimenCollectionMethod {
-    private TumorSpecimenCollectionMethod code;
+    private CodingTumorSpecimenCollectionMethodCode code;
     private String display;
     private String system;
+    private String version;
 
     @JsonProperty("code")
-    public TumorSpecimenCollectionMethod getCode() { return code; }
+    public CodingTumorSpecimenCollectionMethodCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(TumorSpecimenCollectionMethod value) { this.code = value; }
+    public void setCode(CodingTumorSpecimenCollectionMethodCode value) { this.code = value; }
 
     @JsonProperty("display")
     public String getDisplay() { return display; }
@@ -21,4 +22,9 @@ public class CodingTumorSpecimenCollectionMethod {
     public String getSystem() { return system; }
     @JsonProperty("system")
     public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingTumorSpecimenCollectionMethodCode.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import java.io.IOException;
+import com.fasterxml.jackson.annotation.*;
+
+public enum CodingTumorSpecimenCollectionMethodCode {
+    BIOPSY, CYTOLOGY, LIQUID_BIOPSY, RESECTION, UNKNOWN;
+
+    @JsonValue
+    public String toValue() {
+        switch (this) {
+            case BIOPSY: return "biopsy";
+            case CYTOLOGY: return "cytology";
+            case LIQUID_BIOPSY: return "liquid-biopsy";
+            case RESECTION: return "resection";
+            case UNKNOWN: return "unknown";
+        }
+        return null;
+    }
+
+    @JsonCreator
+    public static CodingTumorSpecimenCollectionMethodCode forValue(String value) throws IOException {
+        if (value.equals("biopsy")) return BIOPSY;
+        if (value.equals("cytology")) return CYTOLOGY;
+        if (value.equals("liquid-biopsy")) return LIQUID_BIOPSY;
+        if (value.equals("resection")) return RESECTION;
+        if (value.equals("unknown")) return UNKNOWN;
+        throw new IOException("Cannot deserialize CodingTumorSpecimenCollectionMethodCode");
+    }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingTumorSpread.java

@@ -1,24 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class CodingTumorSpread {
-    private StageCode code;
-    private String display;
-    private String system;
-
-    @JsonProperty("code")
-    public StageCode getCode() { return code; }
-    @JsonProperty("code")
-    public void setCode(StageCode value) { this.code = value; }
-
-    @JsonProperty("display")
-    public String getDisplay() { return display; }
-    @JsonProperty("display")
-    public void setDisplay(String value) { this.display = value; }
-
-    @JsonProperty("system")
-    public String getSystem() { return system; }
-    @JsonProperty("system")
-    public void setSystem(String value) { this.system = value; }
-}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingTumorStagingMethod.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class CodingTumorStagingMethod {
+    private CodingTumorStagingMethodCode code;
+    private String display;
+    private String system;
+    private String version;
+
+    @JsonProperty("code")
+    public CodingTumorStagingMethodCode getCode() { return code; }
+    @JsonProperty("code")
+    public void setCode(CodingTumorStagingMethodCode value) { this.code = value; }
+
+    @JsonProperty("display")
+    public String getDisplay() { return display; }
+    @JsonProperty("display")
+    public void setDisplay(String value) { this.display = value; }
+
+    @JsonProperty("system")
+    public String getSystem() { return system; }
+    @JsonProperty("system")
+    public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingTumorStagingMethodCode.java

@@ -0,0 +1,24 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import java.io.IOException;
+import com.fasterxml.jackson.annotation.*;
+
+public enum CodingTumorStagingMethodCode {
+    CLINICAL, PATHOLOGIC;
+
+    @JsonValue
+    public String toValue() {
+        switch (this) {
+            case CLINICAL: return "clinical";
+            case PATHOLOGIC: return "pathologic";
+        }
+        return null;
+    }
+
+    @JsonCreator
+    public static CodingTumorStagingMethodCode forValue(String value) throws IOException {
+        if (value.equals("clinical")) return CLINICAL;
+        if (value.equals("pathologic")) return PATHOLOGIC;
+        throw new IOException("Cannot deserialize CodingTumorStagingMethodCode");
+    }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingVitalStatus.java

@@ -2,10 +2,11 @@ package dev.pcvolkmer.mv64e.mtb;
 
 import com.fasterxml.jackson.annotation.*;
 
-public class VitalStatus {
+public class CodingVitalStatus {
     private VitalStatusCode code;
     private String display;
     private String system;
+    private String version;
 
     @JsonProperty("code")
     public VitalStatusCode getCode() { return code; }
@@ -21,4 +22,9 @@ public class VitalStatus {
     public String getSystem() { return system; }
     @JsonProperty("system")
     public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/Collection.java

@@ -9,10 +9,8 @@ public class Collection {
     private CodingTumorSpecimenCollectionMethod method;
 
     @JsonProperty("date")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     public Date getDate() { return date; }
     @JsonProperty("date")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     public void setDate(Date value) { this.date = value; }
 
     @JsonProperty("localization")

src/main/java/dev/pcvolkmer/mv64e/mtb/DNAFusion.java

@@ -1,13 +1,22 @@
 package dev.pcvolkmer.mv64e.mtb;
 
 import com.fasterxml.jackson.annotation.*;
+import java.util.List;
 
 public class DNAFusion {
+    private List<VariantExternalId> externalIds;
     private DnaFusionFusionPartner3Prime fusionPartner3Prime;
     private DnaFusionFusionPartner5Prime fusionPartner5Prime;
     private String id;
+    private List<CodingBaseVariantLocalization> localization;
+    private Reference patient;
     private long reportedNumReads;
 
+    @JsonProperty("externalIds")
+    public List<VariantExternalId> getExternalIds() { return externalIds; }
+    @JsonProperty("externalIds")
+    public void setExternalIds(List<VariantExternalId> value) { this.externalIds = value; }
+
     @JsonProperty("fusionPartner3prime")
     public DnaFusionFusionPartner3Prime getFusionPartner3Prime() { return fusionPartner3Prime; }
     @JsonProperty("fusionPartner3prime")
@@ -23,6 +32,16 @@ public class DNAFusion {
     @JsonProperty("id")
     public void setId(String value) { this.id = value; }
 
+    @JsonProperty("localization")
+    public List<CodingBaseVariantLocalization> getLocalization() { return localization; }
+    @JsonProperty("localization")
+    public void setLocalization(List<CodingBaseVariantLocalization> value) { this.localization = value; }
+
+    @JsonProperty("patient")
+    public Reference getPatient() { return patient; }
+    @JsonProperty("patient")
+    public void setPatient(Reference value) { this.patient = value; }
+
     @JsonProperty("reportedNumReads")
     public long getReportedNumReads() { return reportedNumReads; }
     @JsonProperty("reportedNumReads")

src/main/java/dev/pcvolkmer/mv64e/mtb/Diagnosis.java

@@ -1,18 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class Diagnosis {
-    private String id;
-    private String type;
-
-    @JsonProperty("id")
-    public String getId() { return id; }
-    @JsonProperty("id")
-    public void setId(String value) { this.id = value; }
-
-    @JsonProperty("type")
-    public String getType() { return type; }
-    @JsonProperty("type")
-    public void setType(String value) { this.type = value; }
-}

src/main/java/dev/pcvolkmer/mv64e/mtb/DnaFusionFusionPartner3Prime.java

@@ -3,19 +3,19 @@ package dev.pcvolkmer.mv64e.mtb;
 import com.fasterxml.jackson.annotation.*;
 
 public class DnaFusionFusionPartner3Prime {
-    private CodingChromosome chromosome;
+    private Chromosome chromosome;
-    private CodingGene gene;
+    private Coding gene;
     private double position;
 
     @JsonProperty("chromosome")
-    public CodingChromosome getChromosome() { return chromosome; }
+    public Chromosome getChromosome() { return chromosome; }
     @JsonProperty("chromosome")
-    public void setChromosome(CodingChromosome value) { this.chromosome = value; }
+    public void setChromosome(Chromosome value) { this.chromosome = value; }
 
     @JsonProperty("gene")
-    public CodingGene getGene() { return gene; }
+    public Coding getGene() { return gene; }
     @JsonProperty("gene")
-    public void setGene(CodingGene value) { this.gene = value; }
+    public void setGene(Coding value) { this.gene = value; }
 
     @JsonProperty("position")
     public double getPosition() { return position; }

src/main/java/dev/pcvolkmer/mv64e/mtb/DnaFusionFusionPartner5Prime.java

@@ -3,19 +3,19 @@ package dev.pcvolkmer.mv64e.mtb;
 import com.fasterxml.jackson.annotation.*;
 
 public class DnaFusionFusionPartner5Prime {
-    private CodingChromosome chromosome;
+    private Chromosome chromosome;
-    private Gene gene;
+    private Coding gene;
     private double position;
 
     @JsonProperty("chromosome")
-    public CodingChromosome getChromosome() { return chromosome; }
+    public Chromosome getChromosome() { return chromosome; }
     @JsonProperty("chromosome")
-    public void setChromosome(CodingChromosome value) { this.chromosome = value; }
+    public void setChromosome(Chromosome value) { this.chromosome = value; }
 
     @JsonProperty("gene")
-    public Gene getGene() { return gene; }
+    public Coding getGene() { return gene; }
     @JsonProperty("gene")
-    public void setGene(Gene value) { this.gene = value; }
+    public void setGene(Coding value) { this.gene = value; }
 
     @JsonProperty("position")
     public double getPosition() { return position; }

src/main/java/dev/pcvolkmer/mv64e/mtb/EXTIdSystem.java

@@ -1,22 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import java.io.IOException;
-import com.fasterxml.jackson.annotation.*;
-
-public enum EXTIdSystem {
-    HTTPS_PUBMED_NCBI_NLM_NIH_GOV;
-
-    @JsonValue
-    public String toValue() {
-        switch (this) {
-            case HTTPS_PUBMED_NCBI_NLM_NIH_GOV: return "https://pubmed.ncbi.nlm.nih.gov/";
-        }
-        return null;
-    }
-
-    @JsonCreator
-    public static EXTIdSystem forValue(String value) throws IOException {
-        if (value.equals("https://pubmed.ncbi.nlm.nih.gov/")) return HTTPS_PUBMED_NCBI_NLM_NIH_GOV;
-        throw new IOException("Cannot deserialize EXTIdSystem");
-    }
-}

src/main/java/dev/pcvolkmer/mv64e/mtb/EcogCode.java

@@ -1,37 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import java.io.IOException;
-import com.fasterxml.jackson.annotation.*;
-
-public enum EcogCode {
-    CODE_0, CODE_1, CODE_2, CODE_3, CODE_4;
-
-    @JsonValue
-    public String toValue() {
-        switch (this) {
-            case CODE_0: return "0";
-            case CODE_1: return "1";
-            case CODE_2: return "2";
-            case CODE_3: return "3";
-            case CODE_4: return "4";
-        }
-        return null;
-    }
-
-    @JsonCreator
-    public static EcogCode forValue(String value) throws IOException {
-        switch (value) {
-            case "0":
-                return CODE_0;
-            case "1":
-                return CODE_1;
-            case "2":
-                return CODE_2;
-            case "3":
-                return CODE_3;
-            case "4":
-                return CODE_4;
-        }
-        throw new IOException("Cannot deserialize EcogCode");
-    }
-}

src/main/java/dev/pcvolkmer/mv64e/mtb/ExternalIdSystem.java

@@ -0,0 +1,28 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import java.io.IOException;
+import com.fasterxml.jackson.annotation.*;
+
+public enum ExternalIdSystem {
+    HTTPS_CANCER_SANGER_Ac_UK_COSMIC, HTTPS_Www_ENSEMBL_ORG, HTTPS_Www_NCBI_NLM_NIH_GOV_ENTREZ, HTTPS_Www_NCBI_NLM_NIH_GOV_SNP;
+
+    @JsonValue
+    public String toValue() {
+        switch (this) {
+            case HTTPS_CANCER_SANGER_Ac_UK_COSMIC: return "https://cancer.sanger.ac.uk/cosmic";
+            case HTTPS_Www_ENSEMBL_ORG: return "https://www.ensembl.org";
+            case HTTPS_Www_NCBI_NLM_NIH_GOV_ENTREZ: return "https://www.ncbi.nlm.nih.gov/entrez";
+            case HTTPS_Www_NCBI_NLM_NIH_GOV_SNP: return "https://www.ncbi.nlm.nih.gov/snp";
+        }
+        return null;
+    }
+
+    @JsonCreator
+    public static ExternalIdSystem forValue(String value) throws IOException {
+        if (value.equals("https://cancer.sanger.ac.uk/cosmic")) return HTTPS_CANCER_SANGER_Ac_UK_COSMIC;
+        if (value.equals("https://www.ensembl.org")) return HTTPS_Www_ENSEMBL_ORG;
+        if (value.equals("https://www.ncbi.nlm.nih.gov/entrez")) return HTTPS_Www_NCBI_NLM_NIH_GOV_ENTREZ;
+        if (value.equals("https://www.ncbi.nlm.nih.gov/snp")) return HTTPS_Www_NCBI_NLM_NIH_GOV_SNP;
+        throw new IOException("Cannot deserialize ExternalIdSystem");
+    }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/FollowUp.java

@@ -0,0 +1,21 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+import java.util.Date;
+
+public class FollowUp {
+    private Date date;
+    private CodingFollowUpPatientStatus patientStatus;
+
+    @JsonProperty("date")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    public Date getDate() { return date; }
+    @JsonProperty("date")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    public void setDate(Date value) { this.date = value; }
+
+    @JsonProperty("patientStatus")
+    public CodingFollowUpPatientStatus getPatientStatus() { return patientStatus; }
+    @JsonProperty("patientStatus")
+    public void setPatientStatus(CodingFollowUpPatientStatus value) { this.patientStatus = value; }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/GenderCode.java

@@ -3,7 +3,7 @@ package dev.pcvolkmer.mv64e.mtb;
 import java.io.IOException;
 import com.fasterxml.jackson.annotation.*;
 
-public enum Gender {
+public enum GenderCode {
     FEMALE, MALE, OTHER, UNKNOWN;
 
     @JsonValue
@@ -18,17 +18,11 @@ public enum Gender {
     }
 
     @JsonCreator
-    public static Gender forValue(String value) throws IOException {
+    public static GenderCode forValue(String value) throws IOException {
-        switch (value) {
+        if (value.equals("female")) return FEMALE;
-            case "female":
+        if (value.equals("male")) return MALE;
-                return FEMALE;
+        if (value.equals("other")) return OTHER;
-            case "male":
+        if (value.equals("unknown")) return UNKNOWN;
-                return MALE;
+        throw new IOException("Cannot deserialize GenderCode");
-            case "other":
-                return OTHER;
-            case "unknown":
-                return UNKNOWN;
-        }
-        throw new IOException("Cannot deserialize Gender");
     }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/Gene.java

@@ -1,18 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class Gene {
-    private String ensemblId;
-    private String hgncId;
-
-    @JsonProperty("ensemblId")
-    public String getEnsemblId() { return ensemblId; }
-    @JsonProperty("ensemblId")
-    public void setEnsemblId(String value) { this.ensemblId = value; }
-
-    @JsonProperty("hgncId")
-    public String getHgncId() { return hgncId; }
-    @JsonProperty("hgncId")
-    public void setHgncId(String value) { this.hgncId = value; }
-}

src/main/java/dev/pcvolkmer/mv64e/mtb/GeneAlterationReference.java

@@ -0,0 +1,24 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class GeneAlterationReference {
+    private String display;
+    private Coding gene;
+    private Reference variant;
+
+    @JsonProperty("display")
+    public String getDisplay() { return display; }
+    @JsonProperty("display")
+    public void setDisplay(String value) { this.display = value; }
+
+    @JsonProperty("gene")
+    public Coding getGene() { return gene; }
+    @JsonProperty("gene")
+    public void setGene(Coding value) { this.gene = value; }
+
+    @JsonProperty("variant")
+    public Reference getVariant() { return variant; }
+    @JsonProperty("variant")
+    public void setVariant(Reference value) { this.variant = value; }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/GeneSystem.java

@@ -1,22 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import java.io.IOException;
-import com.fasterxml.jackson.annotation.*;
-
-public enum GeneSystem {
-    HTTPS_Www_GENENAMES_ORG;
-
-    @JsonValue
-    public String toValue() {
-        switch (this) {
-            case HTTPS_Www_GENENAMES_ORG: return "https://www.genenames.org/";
-        }
-        return null;
-    }
-
-    @JsonCreator
-    public static GeneSystem forValue(String value) throws IOException {
-        if (value.equals("https://www.genenames.org/")) return HTTPS_Www_GENENAMES_ORG;
-        throw new IOException("Cannot deserialize GeneSystem");
-    }
-}

src/main/java/dev/pcvolkmer/mv64e/mtb/GeneticCounselingRecommendation.java

@@ -6,8 +6,8 @@ import java.util.Date;
 public class GeneticCounselingRecommendation {
     private String id;
     private Date issuedOn;
-    private Patient patient;
+    private Reference patient;
-    private Coding reason;
+    private CodingGeneticCounselingRecommendationReason reason;
 
     @JsonProperty("id")
     public String getId() { return id; }
@@ -15,17 +15,19 @@ public class GeneticCounselingRecommendation {
     public void setId(String value) { this.id = value; }
 
     @JsonProperty("issuedOn")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     public Date getIssuedOn() { return issuedOn; }
     @JsonProperty("issuedOn")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     public void setIssuedOn(Date value) { this.issuedOn = value; }
 
     @JsonProperty("patient")
-    public Patient getPatient() { return patient; }
+    public Reference getPatient() { return patient; }
     @JsonProperty("patient")
-    public void setPatient(Patient value) { this.patient = value; }
+    public void setPatient(Reference value) { this.patient = value; }
 
     @JsonProperty("reason")
-    public Coding getReason() { return reason; }
+    public CodingGeneticCounselingRecommendationReason getReason() { return reason; }
     @JsonProperty("reason")
-    public void setReason(Coding value) { this.reason = value; }
+    public void setReason(CodingGeneticCounselingRecommendationReason value) { this.reason = value; }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/Grading.java

@@ -0,0 +1,13 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+import java.util.List;
+
+public class Grading {
+    private List<TumorGrading> history;
+
+    @JsonProperty("history")
+    public List<TumorGrading> getHistory() { return history; }
+    @JsonProperty("history")
+    public void setHistory(List<TumorGrading> value) { this.history = value; }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/GradingCode.java

@@ -1,49 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import java.io.IOException;
-import com.fasterxml.jackson.annotation.*;
-
-public enum GradingCode {
-    M1_A, M1_B, M1_C, M2_A, M2_B, M2_C, M3, M4, UNDEFINED;
-
-    @JsonValue
-    public String toValue() {
-        switch (this) {
-            case M1_A: return "m1A";
-            case M1_B: return "m1B";
-            case M1_C: return "m1C";
-            case M2_A: return "m2A";
-            case M2_B: return "m2B";
-            case M2_C: return "m2C";
-            case M3: return "m3";
-            case M4: return "m4";
-            case UNDEFINED: return "undefined";
-        }
-        return null;
-    }
-
-    @JsonCreator
-    public static GradingCode forValue(String value) throws IOException {
-        switch (value) {
-            case "m1A":
-                return M1_A;
-            case "m1B":
-                return M1_B;
-            case "m1C":
-                return M1_C;
-            case "m2A":
-                return M2_A;
-            case "m2B":
-                return M2_B;
-            case "m2C":
-                return M2_C;
-            case "m3":
-                return M3;
-            case "m4":
-                return M4;
-            case "undefined":
-                return UNDEFINED;
-        }
-        throw new IOException("Cannot deserialize GradingCode");
-    }
-}

src/main/java/dev/pcvolkmer/mv64e/mtb/GuidelineTreatmentStatusCode.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import java.io.IOException;
+import com.fasterxml.jackson.annotation.*;
+
+public enum GuidelineTreatmentStatusCode {
+    EXHAUSTED, IMPOSSIBLE, NON_EXHAUSTED, NO_GUIDELINES_AVAILABLE, UNKNOWN;
+
+    @JsonValue
+    public String toValue() {
+        switch (this) {
+            case EXHAUSTED: return "exhausted";
+            case IMPOSSIBLE: return "impossible";
+            case NON_EXHAUSTED: return "non-exhausted";
+            case NO_GUIDELINES_AVAILABLE: return "no-guidelines-available";
+            case UNKNOWN: return "unknown";
+        }
+        return null;
+    }
+
+    @JsonCreator
+    public static GuidelineTreatmentStatusCode forValue(String value) throws IOException {
+        if (value.equals("exhausted")) return EXHAUSTED;
+        if (value.equals("impossible")) return IMPOSSIBLE;
+        if (value.equals("non-exhausted")) return NON_EXHAUSTED;
+        if (value.equals("no-guidelines-available")) return NO_GUIDELINES_AVAILABLE;
+        if (value.equals("unknown")) return UNKNOWN;
+        throw new IOException("Cannot deserialize GuidelineTreatmentStatusCode");
+    }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/HRDScore.java

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.*;
 public class HRDScore {
     private Components components;
     private String id;
-    private Coding interpretation;
+    private CodingHrdScoreInterpretation interpretation;
     private Reference patient;
     private Reference specimen;
     private double value;
@@ -21,9 +21,9 @@ public class HRDScore {
     public void setId(String value) { this.id = value; }
 
     @JsonProperty("interpretation")
-    public Coding getInterpretation() { return interpretation; }
+    public CodingHrdScoreInterpretation getInterpretation() { return interpretation; }
     @JsonProperty("interpretation")
-    public void setInterpretation(Coding value) { this.interpretation = value; }
+    public void setInterpretation(CodingHrdScoreInterpretation value) { this.interpretation = value; }
 
     @JsonProperty("patient")
     public Reference getPatient() { return patient; }

src/main/java/dev/pcvolkmer/mv64e/mtb/HealthInsurance.java

@@ -3,22 +3,16 @@ package dev.pcvolkmer.mv64e.mtb;
 import com.fasterxml.jackson.annotation.*;
 
 public class HealthInsurance {
-    private String display;
+    private Reference reference;
-    private ExternalId extId;
+    private CodingHealthInsurance type;
-    private Type type;
 
-    @JsonProperty("display")
+    @JsonProperty("reference")
-    public String getDisplay() { return display; }
+    public Reference getReference() { return reference; }
-    @JsonProperty("display")
+    @JsonProperty("reference")
-    public void setDisplay(String value) { this.display = value; }
+    public void setReference(Reference value) { this.reference = value; }
-
-    @JsonProperty("extId")
-    public ExternalId getExtId() { return extId; }
-    @JsonProperty("extId")
-    public void setExtId(ExternalId value) { this.extId = value; }
 
     @JsonProperty("type")
-    public Type getType() { return type; }
+    public CodingHealthInsurance getType() { return type; }
     @JsonProperty("type")
-    public void setType(Type value) { this.type = value; }
+    public void setType(CodingHealthInsurance value) { this.type = value; }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/HistologyReevaluationRequest.java

@@ -0,0 +1,33 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+import java.util.Date;
+
+public class HistologyReevaluationRequest {
+    private String id;
+    private Date issuedOn;
+    private Reference patient;
+    private Reference specimen;
+
+    @JsonProperty("id")
+    public String getId() { return id; }
+    @JsonProperty("id")
+    public void setId(String value) { this.id = value; }
+
+    @JsonProperty("issuedOn")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    public Date getIssuedOn() { return issuedOn; }
+    @JsonProperty("issuedOn")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    public void setIssuedOn(Date value) { this.issuedOn = value; }
+
+    @JsonProperty("patient")
+    public Reference getPatient() { return patient; }
+    @JsonProperty("patient")
+    public void setPatient(Reference value) { this.patient = value; }
+
+    @JsonProperty("specimen")
+    public Reference getSpecimen() { return specimen; }
+    @JsonProperty("specimen")
+    public void setSpecimen(Reference value) { this.specimen = value; }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/HistologyReport.java

@@ -6,9 +6,9 @@ import java.util.Date;
 public class HistologyReport {
     private String id;
     private Date issuedOn;
-    private Patient patient;
+    private Reference patient;
     private HistologyReportResults results;
-    private HistologyReportSpecimen specimen;
+    private Reference specimen;
 
     @JsonProperty("id")
     public String getId() { return id; }
@@ -23,9 +23,9 @@ public class HistologyReport {
     public void setIssuedOn(Date value) { this.issuedOn = value; }
 
     @JsonProperty("patient")
-    public Patient getPatient() { return patient; }
+    public Reference getPatient() { return patient; }
     @JsonProperty("patient")
-    public void setPatient(Patient value) { this.patient = value; }
+    public void setPatient(Reference value) { this.patient = value; }
 
     @JsonProperty("results")
     public HistologyReportResults getResults() { return results; }
@@ -33,7 +33,7 @@ public class HistologyReport {
     public void setResults(HistologyReportResults value) { this.results = value; }
 
     @JsonProperty("specimen")
-    public HistologyReportSpecimen getSpecimen() { return specimen; }
+    public Reference getSpecimen() { return specimen; }
     @JsonProperty("specimen")
-    public void setSpecimen(HistologyReportSpecimen value) { this.specimen = value; }
+    public void setSpecimen(Reference value) { this.specimen = value; }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/HistologyReportSpecimen.java

@@ -1,18 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class HistologyReportSpecimen {
-    private String id;
-    private SpecimenType type;
-
-    @JsonProperty("id")
-    public String getId() { return id; }
-    @JsonProperty("id")
-    public void setId(String value) { this.id = value; }
-
-    @JsonProperty("type")
-    public SpecimenType getType() { return type; }
-    @JsonProperty("type")
-    public void setType(SpecimenType value) { this.type = value; }
-}

src/main/java/dev/pcvolkmer/mv64e/mtb/History.java

@@ -3,9 +3,9 @@ package dev.pcvolkmer.mv64e.mtb;
 import com.fasterxml.jackson.annotation.*;
 import java.util.Date;
 
-public class StageHistory {
+public class History {
     private Date date;
-    private CodingTumorSpread stage;
+    private CodingMtbDiagnosis value;
 
     @JsonProperty("date")
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -14,8 +14,8 @@ public class StageHistory {
     @JsonFormat(pattern = "yyyy-MM-dd")
     public void setDate(Date value) { this.date = value; }
 
-    @JsonProperty("stage")
+    @JsonProperty("value")
-    public CodingTumorSpread getStage() { return stage; }
+    public CodingMtbDiagnosis getValue() { return value; }
-    @JsonProperty("stage")
+    @JsonProperty("value")
-    public void setStage(CodingTumorSpread value) { this.stage = value; }
+    public void setValue(CodingMtbDiagnosis value) { this.value = value; }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/ICScoreCode.java

@@ -4,31 +4,25 @@ import java.io.IOException;
 import com.fasterxml.jackson.annotation.*;
 
 public enum ICScoreCode {
-    CODE_0, CODE_1, CODE_2, CODE_3;
+    THE_0, THE_1, THE_2, THE_3;
 
     @JsonValue
     public String toValue() {
         switch (this) {
-            case CODE_0: return "0";
+            case THE_0: return "0";
-            case CODE_1: return "1";
+            case THE_1: return "1";
-            case CODE_2: return "2";
+            case THE_2: return "2";
-            case CODE_3: return "3";
+            case THE_3: return "3";
         }
         return null;
     }
 
     @JsonCreator
     public static ICScoreCode forValue(String value) throws IOException {
-        switch (value) {
+        if (value.equals("0")) return THE_0;
-            case "0":
+        if (value.equals("1")) return THE_1;
-                return CODE_0;
+        if (value.equals("2")) return THE_2;
-            case "1":
+        if (value.equals("3")) return THE_3;
-                return CODE_1;
-            case "2":
-                return CODE_2;
-            case "3":
-                return CODE_3;
-        }
         throw new IOException("Cannot deserialize ICScoreCode");
     }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/IHCReport.java

@@ -5,51 +5,45 @@ import java.util.Date;
 import java.util.List;
 
 public class IHCReport {
-    private ExternalId blockId;
+    private List<String> blockIds;
-    private Date date;
     private String id;
-    private ExternalId journalId;
+    private Date issuedOn;
-    private List<MSIMmrResult> msiMmrResults;
+    private String journalId;
     private Reference patient;
-    private List<ProteinExpressionResult> proteinExpressionResults;
+    private IhcReportResults results;
     private Reference specimen;
 
-    @JsonProperty("blockId")
+    @JsonProperty("blockIds")
-    public ExternalId getBlockId() { return blockId; }
+    public List<String> getBlockIds() { return blockIds; }
-    @JsonProperty("blockId")
+    @JsonProperty("blockIds")
-    public void setBlockId(ExternalId value) { this.blockId = value; }
+    public void setBlockIds(List<String> value) { this.blockIds = value; }
-
-    @JsonProperty("date")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    public Date getDate() { return date; }
-    @JsonProperty("date")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    public void setDate(Date value) { this.date = value; }
 
     @JsonProperty("id")
     public String getId() { return id; }
     @JsonProperty("id")
     public void setId(String value) { this.id = value; }
 
-    @JsonProperty("journalId")
+    @JsonProperty("issuedOn")
-    public ExternalId getJournalId() { return journalId; }
+    @JsonFormat(pattern = "yyyy-MM-dd")
-    @JsonProperty("journalId")
+    public Date getIssuedOn() { return issuedOn; }
-    public void setJournalId(ExternalId value) { this.journalId = value; }
+    @JsonProperty("issuedOn")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    public void setIssuedOn(Date value) { this.issuedOn = value; }
 
-    @JsonProperty("msiMmrResults")
+    @JsonProperty("journalId")
-    public List<MSIMmrResult> getMsiMmrResults() { return msiMmrResults; }
+    public String getJournalId() { return journalId; }
-    @JsonProperty("msiMmrResults")
+    @JsonProperty("journalId")
-    public void setMsiMmrResults(List<MSIMmrResult> value) { this.msiMmrResults = value; }
+    public void setJournalId(String value) { this.journalId = value; }
 
     @JsonProperty("patient")
     public Reference getPatient() { return patient; }
     @JsonProperty("patient")
     public void setPatient(Reference value) { this.patient = value; }
 
-    @JsonProperty("proteinExpressionResults")
+    @JsonProperty("results")
-    public List<ProteinExpressionResult> getProteinExpressionResults() { return proteinExpressionResults; }
+    public IhcReportResults getResults() { return results; }
-    @JsonProperty("proteinExpressionResults")
+    @JsonProperty("results")
-    public void setProteinExpressionResults(List<ProteinExpressionResult> value) { this.proteinExpressionResults = value; }
+    public void setResults(IhcReportResults value) { this.results = value; }
 
     @JsonProperty("specimen")
     public Reference getSpecimen() { return specimen; }

src/main/java/dev/pcvolkmer/mv64e/mtb/IhcReportResults.java

@@ -0,0 +1,19 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+import java.util.List;
+
+public class IhcReportResults {
+    private List<MSIMmr> msiMmr;
+    private List<ProteinExpression> proteinExpression;
+
+    @JsonProperty("msiMmr")
+    public List<MSIMmr> getMsiMmr() { return msiMmr; }
+    @JsonProperty("msiMmr")
+    public void setMsiMmr(List<MSIMmr> value) { this.msiMmr = value; }
+
+    @JsonProperty("proteinExpression")
+    public List<ProteinExpression> getProteinExpression() { return proteinExpression; }
+    @JsonProperty("proteinExpression")
+    public void setProteinExpression(List<ProteinExpression> value) { this.proteinExpression = value; }
+}