From 1f9c999770d331d0650a4bf8bee71a9f9dcb9e36 Mon Sep 17 00:00:00 2001 From: dotasek Date: Fri, 19 Jul 2024 12:14:03 -0400 Subject: [PATCH] Return null for all toCode enum params that are Enum.NULL (r4b) --- .../java/org/hl7/fhir/r4b/model/Account.java | 24 +- .../fhir/r4b/model/ActivityDefinition.java | 24 +- .../java/org/hl7/fhir/r4b/model/Address.java | 18 +- .../org/hl7/fhir/r4b/model/AdverseEvent.java | 24 +- .../fhir/r4b/model/AllergyIntolerance.java | 36 ++- .../org/hl7/fhir/r4b/model/Appointment.java | 24 +- .../org/hl7/fhir/r4b/model/AuditEvent.java | 54 ++-- .../r4b/model/BiologicallyDerivedProduct.java | 48 ++-- .../java/org/hl7/fhir/r4b/model/Bundle.java | 54 ++-- .../fhir/r4b/model/CapabilityStatement.java | 138 +++++----- .../java/org/hl7/fhir/r4b/model/CarePlan.java | 36 +-- .../java/org/hl7/fhir/r4b/model/CareTeam.java | 18 +- .../org/hl7/fhir/r4b/model/CatalogEntry.java | 18 +- .../org/hl7/fhir/r4b/model/ChargeItem.java | 18 +- .../fhir/r4b/model/ClinicalImpression.java | 24 +- .../fhir/r4b/model/ClinicalUseDefinition.java | 54 ++-- .../org/hl7/fhir/r4b/model/CodeSystem.java | 54 ++-- .../org/hl7/fhir/r4b/model/Composition.java | 36 +-- .../org/hl7/fhir/r4b/model/ConceptMap.java | 48 ++-- .../java/org/hl7/fhir/r4b/model/Consent.java | 54 ++-- .../org/hl7/fhir/r4b/model/ContactPoint.java | 18 +- .../java/org/hl7/fhir/r4b/model/Contract.java | 108 ++++---- .../org/hl7/fhir/r4b/model/Contributor.java | 12 +- .../r4b/model/CoverageEligibilityRequest.java | 36 +-- .../model/CoverageEligibilityResponse.java | 36 +-- .../hl7/fhir/r4b/model/DataRequirement.java | 30 ++- .../org/hl7/fhir/r4b/model/DetectedIssue.java | 24 +- .../java/org/hl7/fhir/r4b/model/Device.java | 48 ++-- .../org/hl7/fhir/r4b/model/DeviceMetric.java | 42 +-- .../fhir/r4b/model/DeviceUseStatement.java | 12 +- .../hl7/fhir/r4b/model/DiagnosticReport.java | 18 +- .../hl7/fhir/r4b/model/ElementDefinition.java | 90 ++++--- .../org/hl7/fhir/r4b/model/Encounter.java | 54 ++-- .../java/org/hl7/fhir/r4b/model/Endpoint.java | 12 +- .../org/hl7/fhir/r4b/model/Enumerations.java | 252 ++++++++++++------ .../org/hl7/fhir/r4b/model/EpisodeOfCare.java | 24 +- .../hl7/fhir/r4b/model/EvidenceReport.java | 36 +-- .../hl7/fhir/r4b/model/EvidenceVariable.java | 30 ++- .../hl7/fhir/r4b/model/ExampleScenario.java | 60 +++-- .../fhir/r4b/model/ExplanationOfBenefit.java | 132 ++++----- .../fhir/r4b/model/FamilyMemberHistory.java | 18 +- .../java/org/hl7/fhir/r4b/model/Flag.java | 12 +- .../java/org/hl7/fhir/r4b/model/Goal.java | 18 +- .../hl7/fhir/r4b/model/GraphDefinition.java | 36 +-- .../java/org/hl7/fhir/r4b/model/Group.java | 24 +- .../hl7/fhir/r4b/model/GuidanceResponse.java | 12 +- .../org/hl7/fhir/r4b/model/HumanName.java | 12 +- .../org/hl7/fhir/r4b/model/Identifier.java | 12 +- .../org/hl7/fhir/r4b/model/ImagingStudy.java | 30 ++- .../org/hl7/fhir/r4b/model/Immunization.java | 36 +-- .../r4b/model/ImmunizationEvaluation.java | 12 +- .../fhir/r4b/model/ImplementationGuide.java | 90 ++++--- .../java/org/hl7/fhir/r4b/model/Invoice.java | 30 ++- .../java/org/hl7/fhir/r4b/model/Linkage.java | 18 +- .../org/hl7/fhir/r4b/model/ListResource.java | 18 +- .../java/org/hl7/fhir/r4b/model/Location.java | 30 ++- .../org/hl7/fhir/r4b/model/MeasureReport.java | 54 ++-- .../org/hl7/fhir/r4b/model/Medication.java | 24 +- .../r4b/model/MedicationAdministration.java | 24 +- .../fhir/r4b/model/MedicationDispense.java | 24 +- .../fhir/r4b/model/MedicationKnowledge.java | 108 ++++---- .../hl7/fhir/r4b/model/MedicationRequest.java | 36 +-- .../fhir/r4b/model/MedicationStatement.java | 12 +- .../hl7/fhir/r4b/model/MessageDefinition.java | 30 ++- .../org/hl7/fhir/r4b/model/MessageHeader.java | 30 ++- .../hl7/fhir/r4b/model/MolecularSequence.java | 84 +++--- .../org/hl7/fhir/r4b/model/NamingSystem.java | 24 +- .../org/hl7/fhir/r4b/model/Narrative.java | 12 +- .../hl7/fhir/r4b/model/NutritionProduct.java | 36 +-- .../fhir/r4b/model/ObservationDefinition.java | 30 ++- .../fhir/r4b/model/OperationDefinition.java | 36 +-- .../hl7/fhir/r4b/model/OperationOutcome.java | 24 +- .../java/org/hl7/fhir/r4b/model/Patient.java | 30 ++- .../java/org/hl7/fhir/r4b/model/Person.java | 18 +- .../org/hl7/fhir/r4b/model/Provenance.java | 24 +- .../org/hl7/fhir/r4b/model/Questionnaire.java | 48 ++-- .../fhir/r4b/model/QuestionnaireResponse.java | 24 +- .../hl7/fhir/r4b/model/RelatedArtifact.java | 12 +- .../r4b/model/ResearchElementDefinition.java | 24 +- .../org/hl7/fhir/r4b/model/ResearchStudy.java | 24 +- .../hl7/fhir/r4b/model/ResearchSubject.java | 12 +- .../hl7/fhir/r4b/model/SearchParameter.java | 30 ++- .../java/org/hl7/fhir/r4b/model/Slot.java | 12 +- .../java/org/hl7/fhir/r4b/model/Specimen.java | 30 ++- .../fhir/r4b/model/SpecimenDefinition.java | 36 +-- .../fhir/r4b/model/StructureDefinition.java | 48 ++-- .../org/hl7/fhir/r4b/model/StructureMap.java | 96 ++++--- .../org/hl7/fhir/r4b/model/Subscription.java | 18 +- .../fhir/r4b/model/SubscriptionStatus.java | 18 +- .../hl7/fhir/r4b/model/SubscriptionTopic.java | 54 ++-- .../org/hl7/fhir/r4b/model/Substance.java | 24 +- .../hl7/fhir/r4b/model/SupplyDelivery.java | 18 +- .../org/hl7/fhir/r4b/model/SupplyRequest.java | 18 +- .../java/org/hl7/fhir/r4b/model/Task.java | 36 +-- .../r4b/model/TerminologyCapabilities.java | 72 ++--- .../org/hl7/fhir/r4b/model/TestReport.java | 84 +++--- .../org/hl7/fhir/r4b/model/TestScript.java | 132 ++++----- .../java/org/hl7/fhir/r4b/model/Timing.java | 24 +- .../hl7/fhir/r4b/model/TriggerDefinition.java | 12 +- .../fhir/r4b/model/VerificationResult.java | 30 ++- .../fhir/r4b/model/VisionPrescription.java | 30 ++- .../java/org/hl7/fhir/r4b/patterns/Event.java | 6 +- .../org/hl7/fhir/r4b/patterns/Fivews.java | 6 +- .../org/hl7/fhir/r4b/patterns/Request.java | 18 +- .../fhir/r4b/utils/GuideParameterCode.java | 6 +- 105 files changed, 2200 insertions(+), 1748 deletions(-) diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Account.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Account.java index 3b7bf072a..83d3cbaee 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Account.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Account.java @@ -216,7 +216,9 @@ public class Account extends DomainResource { } public String toCode(AccountStatus code) { - if (code == AccountStatus.ACTIVE) + if (code == AccountStatus.NULL) + return null; + if (code == AccountStatus.ACTIVE) return "active"; if (code == AccountStatus.INACTIVE) return "inactive"; @@ -227,7 +229,7 @@ public class Account extends DomainResource { if (code == AccountStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(AccountStatus code) { return code.getSystem(); @@ -421,9 +423,9 @@ public class Account extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("coverage")) { this.coverage = null; @@ -735,9 +737,9 @@ public class Account extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("party")) { this.party = null; @@ -1618,9 +1620,9 @@ public class Account extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ActivityDefinition.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ActivityDefinition.java index 33dc042e0..bb1baac41 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ActivityDefinition.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ActivityDefinition.java @@ -400,7 +400,9 @@ public class ActivityDefinition extends CanonicalResource { } public String toCode(RequestResourceType code) { - if (code == RequestResourceType.APPOINTMENT) + if (code == RequestResourceType.NULL) + return null; + if (code == RequestResourceType.APPOINTMENT) return "Appointment"; if (code == RequestResourceType.APPOINTMENTRESPONSE) return "AppointmentResponse"; @@ -431,7 +433,7 @@ public class ActivityDefinition extends CanonicalResource { if (code == RequestResourceType.VISIONPRESCRIPTION) return "VisionPrescription"; return "?"; - } + } public String toSystem(RequestResourceType code) { return code.getSystem(); @@ -609,9 +611,9 @@ public class ActivityDefinition extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -915,9 +917,9 @@ public class ActivityDefinition extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("path")) { this.path = null; @@ -4912,9 +4914,9 @@ public class ActivityDefinition extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("url")) { this.url = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Address.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Address.java index e3106d747..fd1fbb14b 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Address.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Address.java @@ -180,14 +180,16 @@ public class Address extends DataType implements ICompositeType { } public String toCode(AddressType code) { - if (code == AddressType.POSTAL) + if (code == AddressType.NULL) + return null; + if (code == AddressType.POSTAL) return "postal"; if (code == AddressType.PHYSICAL) return "physical"; if (code == AddressType.BOTH) return "both"; return "?"; - } + } public String toSystem(AddressType code) { return code.getSystem(); @@ -358,7 +360,9 @@ public class Address extends DataType implements ICompositeType { } public String toCode(AddressUse code) { - if (code == AddressUse.HOME) + if (code == AddressUse.NULL) + return null; + if (code == AddressUse.HOME) return "home"; if (code == AddressUse.WORK) return "work"; @@ -369,7 +373,7 @@ public class Address extends DataType implements ICompositeType { if (code == AddressUse.BILLING) return "billing"; return "?"; - } + } public String toSystem(AddressUse code) { return code.getSystem(); @@ -1180,9 +1184,9 @@ public class Address extends DataType implements ICompositeType { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("use")) { this.use = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/AdverseEvent.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/AdverseEvent.java index d9b8a7664..cbcbed272 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/AdverseEvent.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/AdverseEvent.java @@ -164,12 +164,14 @@ public class AdverseEvent extends DomainResource { } public String toCode(AdverseEventActuality code) { - if (code == AdverseEventActuality.ACTUAL) + if (code == AdverseEventActuality.NULL) + return null; + if (code == AdverseEventActuality.ACTUAL) return "actual"; if (code == AdverseEventActuality.POTENTIAL) return "potential"; return "?"; - } + } public String toSystem(AdverseEventActuality code) { return code.getSystem(); @@ -361,9 +363,9 @@ public class AdverseEvent extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("instance")) { this.instance = null; @@ -718,9 +720,9 @@ public class AdverseEvent extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("assessment")) { this.assessment = null; @@ -2185,9 +2187,9 @@ public class AdverseEvent extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.identifier = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/AllergyIntolerance.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/AllergyIntolerance.java index 83f8d1377..8c5ac1881 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/AllergyIntolerance.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/AllergyIntolerance.java @@ -204,7 +204,9 @@ public class AllergyIntolerance extends DomainResource { } public String toCode(AllergyIntoleranceCategory code) { - if (code == AllergyIntoleranceCategory.FOOD) + if (code == AllergyIntoleranceCategory.NULL) + return null; + if (code == AllergyIntoleranceCategory.FOOD) return "food"; if (code == AllergyIntoleranceCategory.MEDICATION) return "medication"; @@ -213,7 +215,7 @@ public class AllergyIntolerance extends DomainResource { if (code == AllergyIntoleranceCategory.BIOLOGIC) return "biologic"; return "?"; - } + } public String toSystem(AllergyIntoleranceCategory code) { return code.getSystem(); @@ -348,14 +350,16 @@ public class AllergyIntolerance extends DomainResource { } public String toCode(AllergyIntoleranceCriticality code) { - if (code == AllergyIntoleranceCriticality.LOW) + if (code == AllergyIntoleranceCriticality.NULL) + return null; + if (code == AllergyIntoleranceCriticality.LOW) return "low"; if (code == AllergyIntoleranceCriticality.HIGH) return "high"; if (code == AllergyIntoleranceCriticality.UNABLETOASSESS) return "unable-to-assess"; return "?"; - } + } public String toSystem(AllergyIntoleranceCriticality code) { return code.getSystem(); @@ -488,14 +492,16 @@ public class AllergyIntolerance extends DomainResource { } public String toCode(AllergyIntoleranceSeverity code) { - if (code == AllergyIntoleranceSeverity.MILD) + if (code == AllergyIntoleranceSeverity.NULL) + return null; + if (code == AllergyIntoleranceSeverity.MILD) return "mild"; if (code == AllergyIntoleranceSeverity.MODERATE) return "moderate"; if (code == AllergyIntoleranceSeverity.SEVERE) return "severe"; return "?"; - } + } public String toSystem(AllergyIntoleranceSeverity code) { return code.getSystem(); @@ -616,12 +622,14 @@ public class AllergyIntolerance extends DomainResource { } public String toCode(AllergyIntoleranceType code) { - if (code == AllergyIntoleranceType.ALLERGY) + if (code == AllergyIntoleranceType.NULL) + return null; + if (code == AllergyIntoleranceType.ALLERGY) return "allergy"; if (code == AllergyIntoleranceType.INTOLERANCE) return "intolerance"; return "?"; - } + } public String toSystem(AllergyIntoleranceType code) { return code.getSystem(); @@ -1208,9 +1216,9 @@ public class AllergyIntolerance extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("substance")) { this.substance = null; @@ -2588,9 +2596,9 @@ public class AllergyIntolerance extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Appointment.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Appointment.java index e175ac13c..eb5e7d31c 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Appointment.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Appointment.java @@ -317,7 +317,9 @@ public class Appointment extends DomainResource { } public String toCode(AppointmentStatus code) { - if (code == AppointmentStatus.PROPOSED) + if (code == AppointmentStatus.NULL) + return null; + if (code == AppointmentStatus.PROPOSED) return "proposed"; if (code == AppointmentStatus.PENDING) return "pending"; @@ -338,7 +340,7 @@ public class Appointment extends DomainResource { if (code == AppointmentStatus.WAITLIST) return "waitlist"; return "?"; - } + } public String toSystem(AppointmentStatus code) { return code.getSystem(); @@ -473,14 +475,16 @@ public class Appointment extends DomainResource { } public String toCode(ParticipantRequired code) { - if (code == ParticipantRequired.REQUIRED) + if (code == ParticipantRequired.NULL) + return null; + if (code == ParticipantRequired.REQUIRED) return "required"; if (code == ParticipantRequired.OPTIONAL) return "optional"; if (code == ParticipantRequired.INFORMATIONONLY) return "information-only"; return "?"; - } + } public String toSystem(ParticipantRequired code) { return code.getSystem(); @@ -868,9 +872,9 @@ public class Appointment extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.getType().remove(value); @@ -2804,9 +2808,9 @@ public class Appointment extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/AuditEvent.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/AuditEvent.java index 8a1c3157d..172489c95 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/AuditEvent.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/AuditEvent.java @@ -217,7 +217,9 @@ public class AuditEvent extends DomainResource { } public String toCode(AuditEventAction code) { - if (code == AuditEventAction.C) + if (code == AuditEventAction.NULL) + return null; + if (code == AuditEventAction.C) return "C"; if (code == AuditEventAction.R) return "R"; @@ -228,7 +230,7 @@ public class AuditEvent extends DomainResource { if (code == AuditEventAction.E) return "E"; return "?"; - } + } public String toSystem(AuditEventAction code) { return code.getSystem(); @@ -397,7 +399,9 @@ public class AuditEvent extends DomainResource { } public String toCode(AuditEventAgentNetworkType code) { - if (code == AuditEventAgentNetworkType._1) + if (code == AuditEventAgentNetworkType.NULL) + return null; + if (code == AuditEventAgentNetworkType._1) return "1"; if (code == AuditEventAgentNetworkType._2) return "2"; @@ -408,7 +412,7 @@ public class AuditEvent extends DomainResource { if (code == AuditEventAgentNetworkType._5) return "5"; return "?"; - } + } public String toSystem(AuditEventAgentNetworkType code) { return code.getSystem(); @@ -562,7 +566,9 @@ public class AuditEvent extends DomainResource { } public String toCode(AuditEventOutcome code) { - if (code == AuditEventOutcome._0) + if (code == AuditEventOutcome.NULL) + return null; + if (code == AuditEventOutcome._0) return "0"; if (code == AuditEventOutcome._4) return "4"; @@ -571,7 +577,7 @@ public class AuditEvent extends DomainResource { if (code == AuditEventOutcome._12) return "12"; return "?"; - } + } public String toSystem(AuditEventOutcome code) { return code.getSystem(); @@ -1358,9 +1364,9 @@ public class AuditEvent extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -1762,9 +1768,9 @@ public class AuditEvent extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("address")) { this.address = null; @@ -2117,9 +2123,9 @@ public class AuditEvent extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("site")) { this.site = null; @@ -2827,9 +2833,9 @@ public class AuditEvent extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("what")) { this.what = null; @@ -3203,9 +3209,9 @@ public class AuditEvent extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -4091,9 +4097,9 @@ public class AuditEvent extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/BiologicallyDerivedProduct.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/BiologicallyDerivedProduct.java index b1e41dac2..29a6035ae 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/BiologicallyDerivedProduct.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/BiologicallyDerivedProduct.java @@ -224,7 +224,9 @@ public class BiologicallyDerivedProduct extends DomainResource { } public String toCode(BiologicallyDerivedProductCategory code) { - if (code == BiologicallyDerivedProductCategory.ORGAN) + if (code == BiologicallyDerivedProductCategory.NULL) + return null; + if (code == BiologicallyDerivedProductCategory.ORGAN) return "organ"; if (code == BiologicallyDerivedProductCategory.TISSUE) return "tissue"; @@ -235,7 +237,7 @@ public class BiologicallyDerivedProduct extends DomainResource { if (code == BiologicallyDerivedProductCategory.BIOLOGICALAGENT) return "biologicalAgent"; return "?"; - } + } public String toSystem(BiologicallyDerivedProductCategory code) { return code.getSystem(); @@ -353,12 +355,14 @@ public class BiologicallyDerivedProduct extends DomainResource { } public String toCode(BiologicallyDerivedProductStatus code) { - if (code == BiologicallyDerivedProductStatus.AVAILABLE) + if (code == BiologicallyDerivedProductStatus.NULL) + return null; + if (code == BiologicallyDerivedProductStatus.AVAILABLE) return "available"; if (code == BiologicallyDerivedProductStatus.UNAVAILABLE) return "unavailable"; return "?"; - } + } public String toSystem(BiologicallyDerivedProductStatus code) { return code.getSystem(); @@ -497,14 +501,16 @@ public class BiologicallyDerivedProduct extends DomainResource { } public String toCode(BiologicallyDerivedProductStorageScale code) { - if (code == BiologicallyDerivedProductStorageScale.FARENHEIT) + if (code == BiologicallyDerivedProductStorageScale.NULL) + return null; + if (code == BiologicallyDerivedProductStorageScale.FARENHEIT) return "farenheit"; if (code == BiologicallyDerivedProductStorageScale.CELSIUS) return "celsius"; if (code == BiologicallyDerivedProductStorageScale.KELVIN) return "kelvin"; return "?"; - } + } public String toSystem(BiologicallyDerivedProductStorageScale code) { return code.getSystem(); @@ -738,9 +744,9 @@ public class BiologicallyDerivedProduct extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("collector")) { this.collector = null; @@ -1132,9 +1138,9 @@ public class BiologicallyDerivedProduct extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("description")) { this.description = null; @@ -1449,9 +1455,9 @@ public class BiologicallyDerivedProduct extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("description")) { this.description = null; @@ -1873,9 +1879,9 @@ public class BiologicallyDerivedProduct extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("description")) { this.description = null; @@ -2780,9 +2786,9 @@ public class BiologicallyDerivedProduct extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Bundle.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Bundle.java index 25946dbf7..b14547c98 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Bundle.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Bundle.java @@ -296,7 +296,9 @@ public class Bundle extends Resource implements IBaseBundle { } public String toCode(BundleType code) { - if (code == BundleType.DOCUMENT) + if (code == BundleType.NULL) + return null; + if (code == BundleType.DOCUMENT) return "document"; if (code == BundleType.MESSAGE) return "message"; @@ -315,7 +317,7 @@ public class Bundle extends Resource implements IBaseBundle { if (code == BundleType.COLLECTION) return "collection"; return "?"; - } + } public String toSystem(BundleType code) { return code.getSystem(); @@ -502,7 +504,9 @@ public class Bundle extends Resource implements IBaseBundle { } public String toCode(HTTPVerb code) { - if (code == HTTPVerb.GET) + if (code == HTTPVerb.NULL) + return null; + if (code == HTTPVerb.GET) return "GET"; if (code == HTTPVerb.HEAD) return "HEAD"; @@ -515,7 +519,7 @@ public class Bundle extends Resource implements IBaseBundle { if (code == HTTPVerb.PATCH) return "PATCH"; return "?"; - } + } public String toSystem(HTTPVerb code) { return code.getSystem(); @@ -650,14 +654,16 @@ public class Bundle extends Resource implements IBaseBundle { } public String toCode(SearchEntryMode code) { - if (code == SearchEntryMode.MATCH) + if (code == SearchEntryMode.NULL) + return null; + if (code == SearchEntryMode.MATCH) return "match"; if (code == SearchEntryMode.INCLUDE) return "include"; if (code == SearchEntryMode.OUTCOME) return "outcome"; return "?"; - } + } public String toSystem(SearchEntryMode code) { return code.getSystem(); @@ -864,9 +870,9 @@ public class Bundle extends Resource implements IBaseBundle { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("relation")) { this.relation = null; @@ -1383,9 +1389,9 @@ public class Bundle extends Resource implements IBaseBundle { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("link")) { this.getLink().remove((BundleLinkComponent) value); @@ -1802,9 +1808,9 @@ public class Bundle extends Resource implements IBaseBundle { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("mode")) { this.mode = null; @@ -2445,9 +2451,9 @@ public class Bundle extends Resource implements IBaseBundle { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("method")) { this.method = null; @@ -3001,9 +3007,9 @@ public class Bundle extends Resource implements IBaseBundle { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("status")) { this.status = null; @@ -3663,9 +3669,9 @@ public class Bundle extends Resource implements IBaseBundle { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.identifier = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CapabilityStatement.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CapabilityStatement.java index ad96b8c09..61f5aada8 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CapabilityStatement.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CapabilityStatement.java @@ -184,14 +184,16 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo } public String toCode(ConditionalDeleteStatus code) { - if (code == ConditionalDeleteStatus.NOTSUPPORTED) + if (code == ConditionalDeleteStatus.NULL) + return null; + if (code == ConditionalDeleteStatus.NOTSUPPORTED) return "not-supported"; if (code == ConditionalDeleteStatus.SINGLE) return "single"; if (code == ConditionalDeleteStatus.MULTIPLE) return "multiple"; return "?"; - } + } public String toSystem(ConditionalDeleteStatus code) { return code.getSystem(); @@ -344,7 +346,9 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo } public String toCode(ConditionalReadStatus code) { - if (code == ConditionalReadStatus.NOTSUPPORTED) + if (code == ConditionalReadStatus.NULL) + return null; + if (code == ConditionalReadStatus.NOTSUPPORTED) return "not-supported"; if (code == ConditionalReadStatus.MODIFIEDSINCE) return "modified-since"; @@ -353,7 +357,7 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo if (code == ConditionalReadStatus.FULLSUPPORT) return "full-support"; return "?"; - } + } public String toSystem(ConditionalReadStatus code) { return code.getSystem(); @@ -468,12 +472,14 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo } public String toCode(DocumentMode code) { - if (code == DocumentMode.PRODUCER) + if (code == DocumentMode.NULL) + return null; + if (code == DocumentMode.PRODUCER) return "producer"; if (code == DocumentMode.CONSUMER) return "consumer"; return "?"; - } + } public String toSystem(DocumentMode code) { return code.getSystem(); @@ -588,12 +594,14 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo } public String toCode(EventCapabilityMode code) { - if (code == EventCapabilityMode.SENDER) + if (code == EventCapabilityMode.NULL) + return null; + if (code == EventCapabilityMode.SENDER) return "sender"; if (code == EventCapabilityMode.RECEIVER) return "receiver"; return "?"; - } + } public String toSystem(EventCapabilityMode code) { return code.getSystem(); @@ -768,7 +776,9 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo } public String toCode(ReferenceHandlingPolicy code) { - if (code == ReferenceHandlingPolicy.LITERAL) + if (code == ReferenceHandlingPolicy.NULL) + return null; + if (code == ReferenceHandlingPolicy.LITERAL) return "literal"; if (code == ReferenceHandlingPolicy.LOGICAL) return "logical"; @@ -779,7 +789,7 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo if (code == ReferenceHandlingPolicy.LOCAL) return "local"; return "?"; - } + } public String toSystem(ReferenceHandlingPolicy code) { return code.getSystem(); @@ -913,14 +923,16 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo } public String toCode(ResourceVersionPolicy code) { - if (code == ResourceVersionPolicy.NOVERSION) + if (code == ResourceVersionPolicy.NULL) + return null; + if (code == ResourceVersionPolicy.NOVERSION) return "no-version"; if (code == ResourceVersionPolicy.VERSIONED) return "versioned"; if (code == ResourceVersionPolicy.VERSIONEDUPDATE) return "versioned-update"; return "?"; - } + } public String toSystem(ResourceVersionPolicy code) { return code.getSystem(); @@ -1035,12 +1047,14 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo } public String toCode(RestfulCapabilityMode code) { - if (code == RestfulCapabilityMode.CLIENT) + if (code == RestfulCapabilityMode.NULL) + return null; + if (code == RestfulCapabilityMode.CLIENT) return "client"; if (code == RestfulCapabilityMode.SERVER) return "server"; return "?"; - } + } public String toSystem(RestfulCapabilityMode code) { return code.getSystem(); @@ -1191,7 +1205,9 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo } public String toCode(SystemRestfulInteraction code) { - if (code == SystemRestfulInteraction.TRANSACTION) + if (code == SystemRestfulInteraction.NULL) + return null; + if (code == SystemRestfulInteraction.TRANSACTION) return "transaction"; if (code == SystemRestfulInteraction.BATCH) return "batch"; @@ -1200,7 +1216,7 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo if (code == SystemRestfulInteraction.HISTORYSYSTEM) return "history-system"; return "?"; - } + } public String toSystem(SystemRestfulInteraction code) { return code.getSystem(); @@ -1441,7 +1457,9 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo } public String toCode(TypeRestfulInteraction code) { - if (code == TypeRestfulInteraction.READ) + if (code == TypeRestfulInteraction.NULL) + return null; + if (code == TypeRestfulInteraction.READ) return "read"; if (code == TypeRestfulInteraction.VREAD) return "vread"; @@ -1460,7 +1478,7 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo if (code == TypeRestfulInteraction.SEARCHTYPE) return "search-type"; return "?"; - } + } public String toSystem(TypeRestfulInteraction code) { return code.getSystem(); @@ -1738,9 +1756,9 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("name")) { this.name = null; @@ -2104,9 +2122,9 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("description")) { this.description = null; @@ -2885,9 +2903,9 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("mode")) { this.mode = null; @@ -3337,9 +3355,9 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("cors")) { this.cors = null; @@ -4949,9 +4967,9 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -5463,9 +5481,9 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("code")) { this.code = null; @@ -5948,9 +5966,9 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("name")) { this.name = null; @@ -6401,9 +6419,9 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("name")) { this.name = null; @@ -6720,9 +6738,9 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("code")) { this.code = null; @@ -7188,9 +7206,9 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("endpoint")) { this.getEndpoint().remove((CapabilityStatementMessagingEndpointComponent) value); @@ -7492,9 +7510,9 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("protocol")) { this.protocol = null; @@ -7797,9 +7815,9 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("mode")) { this.mode = null; @@ -8185,9 +8203,9 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("mode")) { this.mode = null; @@ -10538,9 +10556,9 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("url")) { this.url = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CarePlan.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CarePlan.java index f52c6b5d7..cd7dde24e 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CarePlan.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CarePlan.java @@ -283,7 +283,9 @@ public class CarePlan extends DomainResource { } public String toCode(CarePlanActivityKind code) { - if (code == CarePlanActivityKind.APPOINTMENT) + if (code == CarePlanActivityKind.NULL) + return null; + if (code == CarePlanActivityKind.APPOINTMENT) return "Appointment"; if (code == CarePlanActivityKind.COMMUNICATIONREQUEST) return "CommunicationRequest"; @@ -300,7 +302,7 @@ public class CarePlan extends DomainResource { if (code == CarePlanActivityKind.VISIONPRESCRIPTION) return "VisionPrescription"; return "?"; - } + } public String toSystem(CarePlanActivityKind code) { return code.getSystem(); @@ -545,7 +547,9 @@ public class CarePlan extends DomainResource { } public String toCode(CarePlanActivityStatus code) { - if (code == CarePlanActivityStatus.NOTSTARTED) + if (code == CarePlanActivityStatus.NULL) + return null; + if (code == CarePlanActivityStatus.NOTSTARTED) return "not-started"; if (code == CarePlanActivityStatus.SCHEDULED) return "scheduled"; @@ -564,7 +568,7 @@ public class CarePlan extends DomainResource { if (code == CarePlanActivityStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(CarePlanActivityStatus code) { return code.getSystem(); @@ -721,7 +725,9 @@ public class CarePlan extends DomainResource { } public String toCode(CarePlanIntent code) { - if (code == CarePlanIntent.PROPOSAL) + if (code == CarePlanIntent.NULL) + return null; + if (code == CarePlanIntent.PROPOSAL) return "proposal"; if (code == CarePlanIntent.PLAN) return "plan"; @@ -730,7 +736,7 @@ public class CarePlan extends DomainResource { if (code == CarePlanIntent.OPTION) return "option"; return "?"; - } + } public String toSystem(CarePlanIntent code) { return code.getSystem(); @@ -1129,9 +1135,9 @@ public class CarePlan extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("outcomeCodeableConcept")) { this.getOutcomeCodeableConcept().remove(value); @@ -2627,9 +2633,9 @@ public class CarePlan extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("kind")) { this.kind = null; @@ -4687,9 +4693,9 @@ public class CarePlan extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CareTeam.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CareTeam.java index 4377de52d..03052e1bc 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CareTeam.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CareTeam.java @@ -219,7 +219,9 @@ public class CareTeam extends DomainResource { } public String toCode(CareTeamStatus code) { - if (code == CareTeamStatus.PROPOSED) + if (code == CareTeamStatus.NULL) + return null; + if (code == CareTeamStatus.PROPOSED) return "proposed"; if (code == CareTeamStatus.ACTIVE) return "active"; @@ -230,7 +232,7 @@ public class CareTeam extends DomainResource { if (code == CareTeamStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(CareTeamStatus code) { return code.getSystem(); @@ -508,9 +510,9 @@ public class CareTeam extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("role")) { this.getRole().remove(value); @@ -1585,9 +1587,9 @@ public class CareTeam extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CatalogEntry.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CatalogEntry.java index 662cbc60c..0686d2627 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CatalogEntry.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CatalogEntry.java @@ -161,12 +161,14 @@ public class CatalogEntry extends DomainResource { } public String toCode(CatalogEntryRelationType code) { - if (code == CatalogEntryRelationType.TRIGGERS) + if (code == CatalogEntryRelationType.NULL) + return null; + if (code == CatalogEntryRelationType.TRIGGERS) return "triggers"; if (code == CatalogEntryRelationType.ISREPLACEDBY) return "is-replaced-by"; return "?"; - } + } public String toSystem(CatalogEntryRelationType code) { return code.getSystem(); @@ -352,9 +354,9 @@ public class CatalogEntry extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("relationtype")) { this.relationtype = null; @@ -1417,9 +1419,9 @@ public class CatalogEntry extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ChargeItem.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ChargeItem.java index 7994a72d3..9177a344b 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ChargeItem.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ChargeItem.java @@ -264,7 +264,9 @@ public class ChargeItem extends DomainResource { } public String toCode(ChargeItemStatus code) { - if (code == ChargeItemStatus.PLANNED) + if (code == ChargeItemStatus.NULL) + return null; + if (code == ChargeItemStatus.PLANNED) return "planned"; if (code == ChargeItemStatus.BILLABLE) return "billable"; @@ -279,7 +281,7 @@ public class ChargeItem extends DomainResource { if (code == ChargeItemStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(ChargeItemStatus code) { return code.getSystem(); @@ -440,9 +442,9 @@ public class ChargeItem extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("function")) { this.function = null; @@ -2403,9 +2405,9 @@ public class ChargeItem extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ClinicalImpression.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ClinicalImpression.java index 52cc21571..863cac29c 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ClinicalImpression.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ClinicalImpression.java @@ -186,14 +186,16 @@ public class ClinicalImpression extends DomainResource { } public String toCode(ClinicalImpressionStatus code) { - if (code == ClinicalImpressionStatus.INPROGRESS) + if (code == ClinicalImpressionStatus.NULL) + return null; + if (code == ClinicalImpressionStatus.INPROGRESS) return "in-progress"; if (code == ClinicalImpressionStatus.COMPLETED) return "completed"; if (code == ClinicalImpressionStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(ClinicalImpressionStatus code) { return code.getSystem(); @@ -391,9 +393,9 @@ public class ClinicalImpression extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("code")) { this.code = null; @@ -709,9 +711,9 @@ public class ClinicalImpression extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("itemCodeableConcept")) { this.itemCodeableConcept = null; @@ -2261,9 +2263,9 @@ public class ClinicalImpression extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ClinicalUseDefinition.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ClinicalUseDefinition.java index 15347a807..a19486012 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ClinicalUseDefinition.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ClinicalUseDefinition.java @@ -215,7 +215,9 @@ public class ClinicalUseDefinition extends DomainResource { } public String toCode(ClinicalUseIssueType code) { - if (code == ClinicalUseIssueType.INDICATION) + if (code == ClinicalUseIssueType.NULL) + return null; + if (code == ClinicalUseIssueType.INDICATION) return "indication"; if (code == ClinicalUseIssueType.CONTRAINDICATION) return "contraindication"; @@ -226,7 +228,7 @@ public class ClinicalUseDefinition extends DomainResource { if (code == ClinicalUseIssueType.WARNING) return "warning"; return "?"; - } + } public String toSystem(ClinicalUseIssueType code) { return code.getSystem(); @@ -611,9 +613,9 @@ public class ClinicalUseDefinition extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("diseaseSymptomProcedure")) { this.diseaseSymptomProcedure = null; @@ -914,9 +916,9 @@ public class ClinicalUseDefinition extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("relationshipType")) { this.relationshipType = null; @@ -1475,9 +1477,9 @@ public class ClinicalUseDefinition extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("diseaseSymptomProcedure")) { this.diseaseSymptomProcedure = null; @@ -1982,9 +1984,9 @@ public class ClinicalUseDefinition extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("interactant")) { this.getInteractant().remove((ClinicalUseDefinitionInteractionInteractantComponent) value); @@ -2264,9 +2266,9 @@ public class ClinicalUseDefinition extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("item[x]")) { this.item = null; @@ -2541,9 +2543,9 @@ public class ClinicalUseDefinition extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("symptomConditionEffect")) { this.symptomConditionEffect = null; @@ -2817,9 +2819,9 @@ public class ClinicalUseDefinition extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("description")) { this.description = null; @@ -3625,9 +3627,9 @@ public class ClinicalUseDefinition extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CodeSystem.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CodeSystem.java index ba753bab7..fb91ce0f0 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CodeSystem.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CodeSystem.java @@ -225,7 +225,9 @@ public class CodeSystem extends CanonicalResource { } public String toCode(CodeSystemContentMode code) { - if (code == CodeSystemContentMode.NOTPRESENT) + if (code == CodeSystemContentMode.NULL) + return null; + if (code == CodeSystemContentMode.NOTPRESENT) return "not-present"; if (code == CodeSystemContentMode.EXAMPLE) return "example"; @@ -236,7 +238,7 @@ public class CodeSystem extends CanonicalResource { if (code == CodeSystemContentMode.SUPPLEMENT) return "supplement"; return "?"; - } + } public String toSystem(CodeSystemContentMode code) { return code.getSystem(); @@ -398,7 +400,9 @@ public class CodeSystem extends CanonicalResource { } public String toCode(CodeSystemHierarchyMeaning code) { - if (code == CodeSystemHierarchyMeaning.GROUPEDBY) + if (code == CodeSystemHierarchyMeaning.NULL) + return null; + if (code == CodeSystemHierarchyMeaning.GROUPEDBY) return "grouped-by"; if (code == CodeSystemHierarchyMeaning.ISA) return "is-a"; @@ -407,7 +411,7 @@ public class CodeSystem extends CanonicalResource { if (code == CodeSystemHierarchyMeaning.CLASSIFIEDWITH) return "classified-with"; return "?"; - } + } public String toSystem(CodeSystemHierarchyMeaning code) { return code.getSystem(); @@ -615,7 +619,9 @@ public class CodeSystem extends CanonicalResource { } public String toCode(PropertyType code) { - if (code == PropertyType.CODE) + if (code == PropertyType.NULL) + return null; + if (code == PropertyType.CODE) return "code"; if (code == PropertyType.CODING) return "Coding"; @@ -630,7 +636,7 @@ public class CodeSystem extends CanonicalResource { if (code == PropertyType.DECIMAL) return "decimal"; return "?"; - } + } public String toSystem(PropertyType code) { return code.getSystem(); @@ -1002,9 +1008,9 @@ public class CodeSystem extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("code")) { this.code = null; @@ -1499,9 +1505,9 @@ public class CodeSystem extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("code")) { this.code = null; @@ -2145,9 +2151,9 @@ public class CodeSystem extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("code")) { this.code = null; @@ -2537,9 +2543,9 @@ public class CodeSystem extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("language")) { this.language = null; @@ -2938,9 +2944,9 @@ public class CodeSystem extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("code")) { this.code = null; @@ -5242,9 +5248,9 @@ public class CodeSystem extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("url")) { this.url = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Composition.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Composition.java index 1bf995132..da15e4a62 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Composition.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Composition.java @@ -206,7 +206,9 @@ public class Composition extends DomainResource { } public String toCode(CompositionAttestationMode code) { - if (code == CompositionAttestationMode.PERSONAL) + if (code == CompositionAttestationMode.NULL) + return null; + if (code == CompositionAttestationMode.PERSONAL) return "personal"; if (code == CompositionAttestationMode.PROFESSIONAL) return "professional"; @@ -215,7 +217,7 @@ public class Composition extends DomainResource { if (code == CompositionAttestationMode.OFFICIAL) return "official"; return "?"; - } + } public String toSystem(CompositionAttestationMode code) { return code.getSystem(); @@ -464,9 +466,9 @@ public class Composition extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("mode")) { this.mode = null; @@ -784,9 +786,9 @@ public class Composition extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("code")) { this.code = null; @@ -1146,9 +1148,9 @@ public class Composition extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("code")) { this.getCode().remove(value); @@ -1994,9 +1996,9 @@ public class Composition extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("title")) { this.title = null; @@ -3259,9 +3261,9 @@ public class Composition extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.identifier = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ConceptMap.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ConceptMap.java index b6f96991f..e845d8f94 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ConceptMap.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ConceptMap.java @@ -322,7 +322,9 @@ public class ConceptMap extends CanonicalResource { } public String toCode(ConceptMapEquivalence code) { - if (code == ConceptMapEquivalence.RELATEDTO) + if (code == ConceptMapEquivalence.NULL) + return null; + if (code == ConceptMapEquivalence.RELATEDTO) return "relatedto"; if (code == ConceptMapEquivalence.EQUIVALENT) return "equivalent"; @@ -343,7 +345,7 @@ public class ConceptMap extends CanonicalResource { if (code == ConceptMapEquivalence.DISJOINT) return "disjoint"; return "?"; - } + } public String toSystem(ConceptMapEquivalence code) { return code.getSystem(); @@ -476,14 +478,16 @@ public class ConceptMap extends CanonicalResource { } public String toCode(ConceptMapGroupUnmappedMode code) { - if (code == ConceptMapGroupUnmappedMode.PROVIDED) + if (code == ConceptMapGroupUnmappedMode.NULL) + return null; + if (code == ConceptMapGroupUnmappedMode.PROVIDED) return "provided"; if (code == ConceptMapGroupUnmappedMode.FIXED) return "fixed"; if (code == ConceptMapGroupUnmappedMode.OTHERMAP) return "other-map"; return "?"; - } + } public String toSystem(ConceptMapGroupUnmappedMode code) { return code.getSystem(); @@ -989,9 +993,9 @@ public class ConceptMap extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("source")) { this.source = null; @@ -1401,9 +1405,9 @@ public class ConceptMap extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("code")) { this.code = null; @@ -2048,9 +2052,9 @@ public class ConceptMap extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("code")) { this.code = null; @@ -2570,9 +2574,9 @@ public class ConceptMap extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("property")) { this.property = null; @@ -3085,9 +3089,9 @@ public class ConceptMap extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("mode")) { this.mode = null; @@ -4793,9 +4797,9 @@ public class ConceptMap extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("url")) { this.url = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Consent.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Consent.java index 0e82ce5ce..21febafba 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Consent.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Consent.java @@ -200,7 +200,9 @@ public class Consent extends DomainResource { } public String toCode(ConsentDataMeaning code) { - if (code == ConsentDataMeaning.INSTANCE) + if (code == ConsentDataMeaning.NULL) + return null; + if (code == ConsentDataMeaning.INSTANCE) return "instance"; if (code == ConsentDataMeaning.RELATED) return "related"; @@ -209,7 +211,7 @@ public class Consent extends DomainResource { if (code == ConsentDataMeaning.AUTHOREDBY) return "authoredby"; return "?"; - } + } public String toSystem(ConsentDataMeaning code) { return code.getSystem(); @@ -324,12 +326,14 @@ public class Consent extends DomainResource { } public String toCode(ConsentProvisionType code) { - if (code == ConsentProvisionType.DENY) + if (code == ConsentProvisionType.NULL) + return null; + if (code == ConsentProvisionType.DENY) return "deny"; if (code == ConsentProvisionType.PERMIT) return "permit"; return "?"; - } + } public String toSystem(ConsentProvisionType code) { return code.getSystem(); @@ -518,7 +522,9 @@ public class Consent extends DomainResource { } public String toCode(ConsentState code) { - if (code == ConsentState.DRAFT) + if (code == ConsentState.NULL) + return null; + if (code == ConsentState.DRAFT) return "draft"; if (code == ConsentState.PROPOSED) return "proposed"; @@ -531,7 +537,7 @@ public class Consent extends DomainResource { if (code == ConsentState.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(ConsentState code) { return code.getSystem(); @@ -752,9 +758,9 @@ public class Consent extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("authority")) { this.authority = null; @@ -1086,9 +1092,9 @@ public class Consent extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("verified")) { this.verified = null; @@ -2032,9 +2038,9 @@ public class Consent extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -2411,9 +2417,9 @@ public class Consent extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("role")) { this.role = null; @@ -2685,9 +2691,9 @@ public class Consent extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("meaning")) { this.meaning = null; @@ -3754,9 +3760,9 @@ public class Consent extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ContactPoint.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ContactPoint.java index 4195bdc43..193777788 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ContactPoint.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ContactPoint.java @@ -261,7 +261,9 @@ public class ContactPoint extends DataType implements ICompositeType { } public String toCode(ContactPointSystem code) { - if (code == ContactPointSystem.PHONE) + if (code == ContactPointSystem.NULL) + return null; + if (code == ContactPointSystem.PHONE) return "phone"; if (code == ContactPointSystem.FAX) return "fax"; @@ -276,7 +278,7 @@ public class ContactPoint extends DataType implements ICompositeType { if (code == ContactPointSystem.OTHER) return "other"; return "?"; - } + } public String toSystem(ContactPointSystem code) { return code.getSystem(); @@ -452,7 +454,9 @@ public class ContactPoint extends DataType implements ICompositeType { } public String toCode(ContactPointUse code) { - if (code == ContactPointUse.HOME) + if (code == ContactPointUse.NULL) + return null; + if (code == ContactPointUse.HOME) return "home"; if (code == ContactPointUse.WORK) return "work"; @@ -463,7 +467,7 @@ public class ContactPoint extends DataType implements ICompositeType { if (code == ContactPointUse.MOBILE) return "mobile"; return "?"; - } + } public String toSystem(ContactPointUse code) { return code.getSystem(); @@ -874,9 +878,9 @@ public class ContactPoint extends DataType implements ICompositeType { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("system")) { this.system = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Contract.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Contract.java index 77308ed5b..61e7ca7c3 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Contract.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Contract.java @@ -469,7 +469,9 @@ public class Contract extends DomainResource { } public String toCode(ContractResourcePublicationStatusCodes code) { - if (code == ContractResourcePublicationStatusCodes.AMENDED) + if (code == ContractResourcePublicationStatusCodes.NULL) + return null; + if (code == ContractResourcePublicationStatusCodes.AMENDED) return "amended"; if (code == ContractResourcePublicationStatusCodes.APPENDED) return "appended"; @@ -500,7 +502,7 @@ public class Contract extends DomainResource { if (code == ContractResourcePublicationStatusCodes.TERMINATED) return "terminated"; return "?"; - } + } public String toSystem(ContractResourcePublicationStatusCodes code) { return code.getSystem(); @@ -904,7 +906,9 @@ public class Contract extends DomainResource { } public String toCode(ContractResourceStatusCodes code) { - if (code == ContractResourceStatusCodes.AMENDED) + if (code == ContractResourceStatusCodes.NULL) + return null; + if (code == ContractResourceStatusCodes.AMENDED) return "amended"; if (code == ContractResourceStatusCodes.APPENDED) return "appended"; @@ -935,7 +939,7 @@ public class Contract extends DomainResource { if (code == ContractResourceStatusCodes.TERMINATED) return "terminated"; return "?"; - } + } public String toSystem(ContractResourceStatusCodes code) { return code.getSystem(); @@ -1411,9 +1415,9 @@ public class Contract extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -2371,9 +2375,9 @@ public class Contract extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.identifier = null; @@ -2945,9 +2949,9 @@ public class Contract extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("number")) { this.getNumber().remove(value); @@ -3814,9 +3818,9 @@ public class Contract extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); @@ -4195,9 +4199,9 @@ public class Contract extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("reference")) { this.getReference().remove(value); @@ -4689,9 +4693,9 @@ public class Contract extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("value[x]")) { this.value = null; @@ -5964,9 +5968,9 @@ public class Contract extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("scope")) { this.scope = null; @@ -6487,9 +6491,9 @@ public class Contract extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("reference")) { this.reference = null; @@ -7650,9 +7654,9 @@ public class Contract extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("entity[x]")) { this.entity = null; @@ -9507,9 +9511,9 @@ public class Contract extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("doNotPerform")) { this.doNotPerform = null; @@ -10048,9 +10052,9 @@ public class Contract extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("reference")) { this.getReference().remove(value); @@ -10368,9 +10372,9 @@ public class Contract extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -10632,9 +10636,9 @@ public class Contract extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("content[x]")) { this.content = null; @@ -10862,9 +10866,9 @@ public class Contract extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("content[x]")) { this.content = null; @@ -11093,9 +11097,9 @@ public class Contract extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("content[x]")) { this.content = null; @@ -13677,9 +13681,9 @@ public class Contract extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Contributor.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Contributor.java index 332c46e8d..b00929740 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Contributor.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Contributor.java @@ -195,7 +195,9 @@ public class Contributor extends DataType implements ICompositeType { } public String toCode(ContributorType code) { - if (code == ContributorType.AUTHOR) + if (code == ContributorType.NULL) + return null; + if (code == ContributorType.AUTHOR) return "author"; if (code == ContributorType.EDITOR) return "editor"; @@ -204,7 +206,7 @@ public class Contributor extends DataType implements ICompositeType { if (code == ContributorType.ENDORSER) return "endorser"; return "?"; - } + } public String toSystem(ContributorType code) { return code.getSystem(); @@ -484,9 +486,9 @@ public class Contributor extends DataType implements ICompositeType { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CoverageEligibilityRequest.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CoverageEligibilityRequest.java index ddce51a1f..d70bc04bc 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CoverageEligibilityRequest.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CoverageEligibilityRequest.java @@ -204,7 +204,9 @@ public class CoverageEligibilityRequest extends DomainResource { } public String toCode(EligibilityRequestPurpose code) { - if (code == EligibilityRequestPurpose.AUTHREQUIREMENTS) + if (code == EligibilityRequestPurpose.NULL) + return null; + if (code == EligibilityRequestPurpose.AUTHREQUIREMENTS) return "auth-requirements"; if (code == EligibilityRequestPurpose.BENEFITS) return "benefits"; @@ -213,7 +215,7 @@ public class CoverageEligibilityRequest extends DomainResource { if (code == EligibilityRequestPurpose.VALIDATION) return "validation"; return "?"; - } + } public String toSystem(EligibilityRequestPurpose code) { return code.getSystem(); @@ -475,9 +477,9 @@ public class CoverageEligibilityRequest extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("sequence")) { this.sequence = null; @@ -846,9 +848,9 @@ public class CoverageEligibilityRequest extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("focal")) { this.focal = null; @@ -1601,9 +1603,9 @@ public class CoverageEligibilityRequest extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("supportingInfoSequence")) { this.getSupportingInfoSequence().remove(value); @@ -1939,9 +1941,9 @@ public class CoverageEligibilityRequest extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("diagnosis[x]")) { this.diagnosis = null; @@ -3010,9 +3012,9 @@ public class CoverageEligibilityRequest extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CoverageEligibilityResponse.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CoverageEligibilityResponse.java index 4fdc7bdab..0fad65d37 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CoverageEligibilityResponse.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CoverageEligibilityResponse.java @@ -201,7 +201,9 @@ public class CoverageEligibilityResponse extends DomainResource { } public String toCode(EligibilityResponsePurpose code) { - if (code == EligibilityResponsePurpose.AUTHREQUIREMENTS) + if (code == EligibilityResponsePurpose.NULL) + return null; + if (code == EligibilityResponsePurpose.AUTHREQUIREMENTS) return "auth-requirements"; if (code == EligibilityResponsePurpose.BENEFITS) return "benefits"; @@ -210,7 +212,7 @@ public class CoverageEligibilityResponse extends DomainResource { if (code == EligibilityResponsePurpose.VALIDATION) return "validation"; return "?"; - } + } public String toSystem(EligibilityResponsePurpose code) { return code.getSystem(); @@ -528,9 +530,9 @@ public class CoverageEligibilityResponse extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("coverage")) { this.coverage = null; @@ -1604,9 +1606,9 @@ public class CoverageEligibilityResponse extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("category")) { this.category = null; @@ -2155,9 +2157,9 @@ public class CoverageEligibilityResponse extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -2381,9 +2383,9 @@ public class CoverageEligibilityResponse extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("code")) { this.code = null; @@ -3548,9 +3550,9 @@ public class CoverageEligibilityResponse extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/DataRequirement.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/DataRequirement.java index 87f789e1f..f8b88518f 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/DataRequirement.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/DataRequirement.java @@ -160,12 +160,14 @@ public class DataRequirement extends DataType implements ICompositeType { } public String toCode(SortDirection code) { - if (code == SortDirection.ASCENDING) + if (code == SortDirection.NULL) + return null; + if (code == SortDirection.ASCENDING) return "ascending"; if (code == SortDirection.DESCENDING) return "descending"; return "?"; - } + } public String toSystem(SortDirection code) { return code.getSystem(); @@ -599,9 +601,9 @@ public class DataRequirement extends DataType implements ICompositeType { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("path")) { this.path = null; @@ -1107,9 +1109,9 @@ public class DataRequirement extends DataType implements ICompositeType { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("path")) { this.path = null; @@ -1437,9 +1439,9 @@ public class DataRequirement extends DataType implements ICompositeType { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("path")) { this.path = null; @@ -2290,9 +2292,9 @@ public class DataRequirement extends DataType implements ICompositeType { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/DetectedIssue.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/DetectedIssue.java index 613b22a78..4eb8b9709 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/DetectedIssue.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/DetectedIssue.java @@ -184,14 +184,16 @@ public class DetectedIssue extends DomainResource { } public String toCode(DetectedIssueSeverity code) { - if (code == DetectedIssueSeverity.HIGH) + if (code == DetectedIssueSeverity.NULL) + return null; + if (code == DetectedIssueSeverity.HIGH) return "high"; if (code == DetectedIssueSeverity.MODERATE) return "moderate"; if (code == DetectedIssueSeverity.LOW) return "low"; return "?"; - } + } public String toSystem(DetectedIssueSeverity code) { return code.getSystem(); @@ -399,9 +401,9 @@ public class DetectedIssue extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("code")) { this.getCode().remove(value); @@ -732,9 +734,9 @@ public class DetectedIssue extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("action")) { this.action = null; @@ -1735,9 +1737,9 @@ public class DetectedIssue extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Device.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Device.java index d5cd182cf..9b63db050 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Device.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Device.java @@ -201,7 +201,9 @@ public class Device extends DomainResource { } public String toCode(FHIRDeviceStatus code) { - if (code == FHIRDeviceStatus.ACTIVE) + if (code == FHIRDeviceStatus.NULL) + return null; + if (code == FHIRDeviceStatus.ACTIVE) return "active"; if (code == FHIRDeviceStatus.INACTIVE) return "inactive"; @@ -210,7 +212,7 @@ public class Device extends DomainResource { if (code == FHIRDeviceStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(FHIRDeviceStatus code) { return code.getSystem(); @@ -400,7 +402,9 @@ public class Device extends DomainResource { } public String toCode(UDIEntryType code) { - if (code == UDIEntryType.BARCODE) + if (code == UDIEntryType.NULL) + return null; + if (code == UDIEntryType.BARCODE) return "barcode"; if (code == UDIEntryType.RFID) return "rfid"; @@ -413,7 +417,7 @@ public class Device extends DomainResource { if (code == UDIEntryType.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(UDIEntryType code) { return code.getSystem(); @@ -1009,9 +1013,9 @@ public class Device extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("deviceIdentifier")) { this.deviceIdentifier = null; @@ -1343,9 +1347,9 @@ public class Device extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("name")) { this.name = null; @@ -1612,9 +1616,9 @@ public class Device extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("systemType")) { this.systemType = null; @@ -1916,9 +1920,9 @@ public class Device extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -2272,9 +2276,9 @@ public class Device extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -4243,9 +4247,9 @@ public class Device extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/DeviceMetric.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/DeviceMetric.java index 773d95ebc..0eb989486 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/DeviceMetric.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/DeviceMetric.java @@ -198,7 +198,9 @@ public class DeviceMetric extends DomainResource { } public String toCode(DeviceMetricCalibrationState code) { - if (code == DeviceMetricCalibrationState.NOTCALIBRATED) + if (code == DeviceMetricCalibrationState.NULL) + return null; + if (code == DeviceMetricCalibrationState.NOTCALIBRATED) return "not-calibrated"; if (code == DeviceMetricCalibrationState.CALIBRATIONREQUIRED) return "calibration-required"; @@ -207,7 +209,7 @@ public class DeviceMetric extends DomainResource { if (code == DeviceMetricCalibrationState.UNSPECIFIED) return "unspecified"; return "?"; - } + } public String toSystem(DeviceMetricCalibrationState code) { return code.getSystem(); @@ -358,7 +360,9 @@ public class DeviceMetric extends DomainResource { } public String toCode(DeviceMetricCalibrationType code) { - if (code == DeviceMetricCalibrationType.UNSPECIFIED) + if (code == DeviceMetricCalibrationType.NULL) + return null; + if (code == DeviceMetricCalibrationType.UNSPECIFIED) return "unspecified"; if (code == DeviceMetricCalibrationType.OFFSET) return "offset"; @@ -367,7 +371,7 @@ public class DeviceMetric extends DomainResource { if (code == DeviceMetricCalibrationType.TWOPOINT) return "two-point"; return "?"; - } + } public String toSystem(DeviceMetricCalibrationType code) { return code.getSystem(); @@ -519,7 +523,9 @@ public class DeviceMetric extends DomainResource { } public String toCode(DeviceMetricCategory code) { - if (code == DeviceMetricCategory.MEASUREMENT) + if (code == DeviceMetricCategory.NULL) + return null; + if (code == DeviceMetricCategory.MEASUREMENT) return "measurement"; if (code == DeviceMetricCategory.SETTING) return "setting"; @@ -528,7 +534,7 @@ public class DeviceMetric extends DomainResource { if (code == DeviceMetricCategory.UNSPECIFIED) return "unspecified"; return "?"; - } + } public String toSystem(DeviceMetricCategory code) { return code.getSystem(); @@ -751,7 +757,9 @@ public class DeviceMetric extends DomainResource { } public String toCode(DeviceMetricColor code) { - if (code == DeviceMetricColor.BLACK) + if (code == DeviceMetricColor.NULL) + return null; + if (code == DeviceMetricColor.BLACK) return "black"; if (code == DeviceMetricColor.RED) return "red"; @@ -768,7 +776,7 @@ public class DeviceMetric extends DomainResource { if (code == DeviceMetricColor.WHITE) return "white"; return "?"; - } + } public String toSystem(DeviceMetricColor code) { return code.getSystem(); @@ -919,7 +927,9 @@ public class DeviceMetric extends DomainResource { } public String toCode(DeviceMetricOperationalStatus code) { - if (code == DeviceMetricOperationalStatus.ON) + if (code == DeviceMetricOperationalStatus.NULL) + return null; + if (code == DeviceMetricOperationalStatus.ON) return "on"; if (code == DeviceMetricOperationalStatus.OFF) return "off"; @@ -928,7 +938,7 @@ public class DeviceMetric extends DomainResource { if (code == DeviceMetricOperationalStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(DeviceMetricOperationalStatus code) { return code.getSystem(); @@ -1201,9 +1211,9 @@ public class DeviceMetric extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -2064,9 +2074,9 @@ public class DeviceMetric extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/DeviceUseStatement.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/DeviceUseStatement.java index 83ac71d64..38f46283d 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/DeviceUseStatement.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/DeviceUseStatement.java @@ -235,7 +235,9 @@ public class DeviceUseStatement extends DomainResource { } public String toCode(DeviceUseStatementStatus code) { - if (code == DeviceUseStatementStatus.ACTIVE) + if (code == DeviceUseStatementStatus.NULL) + return null; + if (code == DeviceUseStatementStatus.ACTIVE) return "active"; if (code == DeviceUseStatementStatus.COMPLETED) return "completed"; @@ -248,7 +250,7 @@ public class DeviceUseStatement extends DomainResource { if (code == DeviceUseStatementStatus.ONHOLD) return "on-hold"; return "?"; - } + } public String toSystem(DeviceUseStatementStatus code) { return code.getSystem(); @@ -1223,9 +1225,9 @@ public class DeviceUseStatement extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/DiagnosticReport.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/DiagnosticReport.java index c64ea6d56..ee1cb5f62 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/DiagnosticReport.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/DiagnosticReport.java @@ -321,7 +321,9 @@ public class DiagnosticReport extends DomainResource { } public String toCode(DiagnosticReportStatus code) { - if (code == DiagnosticReportStatus.REGISTERED) + if (code == DiagnosticReportStatus.NULL) + return null; + if (code == DiagnosticReportStatus.REGISTERED) return "registered"; if (code == DiagnosticReportStatus.PARTIAL) return "partial"; @@ -342,7 +344,7 @@ public class DiagnosticReport extends DomainResource { if (code == DiagnosticReportStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(DiagnosticReportStatus code) { return code.getSystem(); @@ -530,9 +532,9 @@ public class DiagnosticReport extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("comment")) { this.comment = null; @@ -2040,9 +2042,9 @@ public class DiagnosticReport extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ElementDefinition.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ElementDefinition.java index ad465325e..bd26de91a 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ElementDefinition.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ElementDefinition.java @@ -186,14 +186,16 @@ public class ElementDefinition extends BackboneType implements ICompositeType { } public String toCode(AggregationMode code) { - if (code == AggregationMode.CONTAINED) + if (code == AggregationMode.NULL) + return null; + if (code == AggregationMode.CONTAINED) return "contained"; if (code == AggregationMode.REFERENCED) return "referenced"; if (code == AggregationMode.BUNDLED) return "bundled"; return "?"; - } + } public String toSystem(AggregationMode code) { return code.getSystem(); @@ -309,12 +311,14 @@ public class ElementDefinition extends BackboneType implements ICompositeType { } public String toCode(ConstraintSeverity code) { - if (code == ConstraintSeverity.ERROR) + if (code == ConstraintSeverity.NULL) + return null; + if (code == ConstraintSeverity.ERROR) return "error"; if (code == ConstraintSeverity.WARNING) return "warning"; return "?"; - } + } public String toSystem(ConstraintSeverity code) { return code.getSystem(); @@ -488,7 +492,9 @@ public class ElementDefinition extends BackboneType implements ICompositeType { } public String toCode(DiscriminatorType code) { - if (code == DiscriminatorType.VALUE) + if (code == DiscriminatorType.NULL) + return null; + if (code == DiscriminatorType.VALUE) return "value"; if (code == DiscriminatorType.EXISTS) return "exists"; @@ -499,7 +505,7 @@ public class ElementDefinition extends BackboneType implements ICompositeType { if (code == DiscriminatorType.PROFILE) return "profile"; return "?"; - } + } public String toSystem(DiscriminatorType code) { return code.getSystem(); @@ -668,7 +674,9 @@ public class ElementDefinition extends BackboneType implements ICompositeType { } public String toCode(PropertyRepresentation code) { - if (code == PropertyRepresentation.XMLATTR) + if (code == PropertyRepresentation.NULL) + return null; + if (code == PropertyRepresentation.XMLATTR) return "xmlAttr"; if (code == PropertyRepresentation.XMLTEXT) return "xmlText"; @@ -679,7 +687,7 @@ public class ElementDefinition extends BackboneType implements ICompositeType { if (code == PropertyRepresentation.XHTML) return "xhtml"; return "?"; - } + } public String toSystem(PropertyRepresentation code) { return code.getSystem(); @@ -812,14 +820,16 @@ public class ElementDefinition extends BackboneType implements ICompositeType { } public String toCode(ReferenceVersionRules code) { - if (code == ReferenceVersionRules.EITHER) + if (code == ReferenceVersionRules.NULL) + return null; + if (code == ReferenceVersionRules.EITHER) return "either"; if (code == ReferenceVersionRules.INDEPENDENT) return "independent"; if (code == ReferenceVersionRules.SPECIFIC) return "specific"; return "?"; - } + } public String toSystem(ReferenceVersionRules code) { return code.getSystem(); @@ -955,14 +965,16 @@ public class ElementDefinition extends BackboneType implements ICompositeType { } public String toCode(SlicingRules code) { - if (code == SlicingRules.CLOSED) + if (code == SlicingRules.NULL) + return null; + if (code == SlicingRules.CLOSED) return "closed"; if (code == SlicingRules.OPEN) return "open"; if (code == SlicingRules.OPENATEND) return "openAtEnd"; return "?"; - } + } public String toSystem(SlicingRules code) { return code.getSystem(); @@ -1356,9 +1368,9 @@ public class ElementDefinition extends BackboneType implements ICompositeType { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("discriminator")) { this.getDiscriminator().remove((ElementDefinitionSlicingDiscriminatorComponent) value); @@ -1684,9 +1696,9 @@ public class ElementDefinition extends BackboneType implements ICompositeType { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -2066,9 +2078,9 @@ public class ElementDefinition extends BackboneType implements ICompositeType { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("path")) { this.path = null; @@ -2743,9 +2755,9 @@ public class ElementDefinition extends BackboneType implements ICompositeType { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("code")) { this.code = null; @@ -4213,9 +4225,9 @@ public class ElementDefinition extends BackboneType implements ICompositeType { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("label")) { this.label = null; @@ -5066,9 +5078,9 @@ public class ElementDefinition extends BackboneType implements ICompositeType { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("key")) { this.key = null; @@ -5502,9 +5514,9 @@ public class ElementDefinition extends BackboneType implements ICompositeType { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("strength")) { this.strength = null; @@ -5953,9 +5965,9 @@ public class ElementDefinition extends BackboneType implements ICompositeType { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identity")) { this.identity = null; @@ -13748,9 +13760,9 @@ public class ElementDefinition extends BackboneType implements ICompositeType { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("path")) { this.path = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Encounter.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Encounter.java index e39902a35..440a728f3 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Encounter.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Encounter.java @@ -202,7 +202,9 @@ public class Encounter extends DomainResource { } public String toCode(EncounterLocationStatus code) { - if (code == EncounterLocationStatus.PLANNED) + if (code == EncounterLocationStatus.NULL) + return null; + if (code == EncounterLocationStatus.PLANNED) return "planned"; if (code == EncounterLocationStatus.ACTIVE) return "active"; @@ -211,7 +213,7 @@ public class Encounter extends DomainResource { if (code == EncounterLocationStatus.COMPLETED) return "completed"; return "?"; - } + } public String toSystem(EncounterLocationStatus code) { return code.getSystem(); @@ -457,7 +459,9 @@ public class Encounter extends DomainResource { } public String toCode(EncounterStatus code) { - if (code == EncounterStatus.PLANNED) + if (code == EncounterStatus.NULL) + return null; + if (code == EncounterStatus.PLANNED) return "planned"; if (code == EncounterStatus.ARRIVED) return "arrived"; @@ -476,7 +480,7 @@ public class Encounter extends DomainResource { if (code == EncounterStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(EncounterStatus code) { return code.getSystem(); @@ -659,9 +663,9 @@ public class Encounter extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("status")) { this.status = null; @@ -897,9 +901,9 @@ public class Encounter extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("class")) { this.class_ = null; @@ -1210,9 +1214,9 @@ public class Encounter extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.getType().remove(value); @@ -1547,9 +1551,9 @@ public class Encounter extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("condition")) { this.condition = null; @@ -2210,9 +2214,9 @@ public class Encounter extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("preAdmissionIdentifier")) { this.preAdmissionIdentifier = null; @@ -2678,9 +2682,9 @@ public class Encounter extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("location")) { this.location = null; @@ -4385,9 +4389,9 @@ public class Encounter extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Endpoint.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Endpoint.java index eaafd6d04..396368bc2 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Endpoint.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Endpoint.java @@ -236,7 +236,9 @@ public class Endpoint extends DomainResource { } public String toCode(EndpointStatus code) { - if (code == EndpointStatus.ACTIVE) + if (code == EndpointStatus.NULL) + return null; + if (code == EndpointStatus.ACTIVE) return "active"; if (code == EndpointStatus.SUSPENDED) return "suspended"; @@ -249,7 +251,7 @@ public class Endpoint extends DomainResource { if (code == EndpointStatus.TEST) return "test"; return "?"; - } + } public String toSystem(EndpointStatus code) { return code.getSystem(); @@ -1101,9 +1103,9 @@ public class Endpoint extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Enumerations.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Enumerations.java index aee4ac867..f9bf76982 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Enumerations.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Enumerations.java @@ -185,12 +185,14 @@ public class Enumerations { } public String toCode(ActionCardinalityBehavior code) { - if (code == ActionCardinalityBehavior.SINGLE) + if (code == ActionCardinalityBehavior.NULL) + return null; + if (code == ActionCardinalityBehavior.SINGLE) return "single"; if (code == ActionCardinalityBehavior.MULTIPLE) return "multiple"; return "?"; - } + } public String toSystem(ActionCardinalityBehavior code) { return code.getSystem(); @@ -320,14 +322,16 @@ public class Enumerations { } public String toCode(ActionConditionKind code) { - if (code == ActionConditionKind.APPLICABILITY) + if (code == ActionConditionKind.NULL) + return null; + if (code == ActionConditionKind.APPLICABILITY) return "applicability"; if (code == ActionConditionKind.START) return "start"; if (code == ActionConditionKind.STOP) return "stop"; return "?"; - } + } public String toSystem(ActionConditionKind code) { return code.getSystem(); @@ -468,14 +472,16 @@ public class Enumerations { } public String toCode(ActionGroupingBehavior code) { - if (code == ActionGroupingBehavior.VISUALGROUP) + if (code == ActionGroupingBehavior.NULL) + return null; + if (code == ActionGroupingBehavior.VISUALGROUP) return "visual-group"; if (code == ActionGroupingBehavior.LOGICALGROUP) return "logical-group"; if (code == ActionGroupingBehavior.SENTENCEGROUP) return "sentence-group"; return "?"; - } + } public String toSystem(ActionGroupingBehavior code) { return code.getSystem(); @@ -623,7 +629,9 @@ public class Enumerations { } public String toCode(ActionParticipantType code) { - if (code == ActionParticipantType.PATIENT) + if (code == ActionParticipantType.NULL) + return null; + if (code == ActionParticipantType.PATIENT) return "patient"; if (code == ActionParticipantType.PRACTITIONER) return "practitioner"; @@ -632,7 +640,7 @@ public class Enumerations { if (code == ActionParticipantType.DEVICE) return "device"; return "?"; - } + } public String toSystem(ActionParticipantType code) { return code.getSystem(); @@ -750,12 +758,14 @@ public class Enumerations { } public String toCode(ActionPrecheckBehavior code) { - if (code == ActionPrecheckBehavior.YES) + if (code == ActionPrecheckBehavior.NULL) + return null; + if (code == ActionPrecheckBehavior.YES) return "yes"; if (code == ActionPrecheckBehavior.NO) return "no"; return "?"; - } + } public String toSystem(ActionPrecheckBehavior code) { return code.getSystem(); @@ -993,7 +1003,9 @@ public class Enumerations { } public String toCode(ActionRelationshipType code) { - if (code == ActionRelationshipType.BEFORESTART) + if (code == ActionRelationshipType.NULL) + return null; + if (code == ActionRelationshipType.BEFORESTART) return "before-start"; if (code == ActionRelationshipType.BEFORE) return "before"; @@ -1012,7 +1024,7 @@ public class Enumerations { if (code == ActionRelationshipType.AFTEREND) return "after-end"; return "?"; - } + } public String toSystem(ActionRelationshipType code) { return code.getSystem(); @@ -1146,14 +1158,16 @@ public class Enumerations { } public String toCode(ActionRequiredBehavior code) { - if (code == ActionRequiredBehavior.MUST) + if (code == ActionRequiredBehavior.NULL) + return null; + if (code == ActionRequiredBehavior.MUST) return "must"; if (code == ActionRequiredBehavior.COULD) return "could"; if (code == ActionRequiredBehavior.MUSTUNLESSDOCUMENTED) return "must-unless-documented"; return "?"; - } + } public String toSystem(ActionRequiredBehavior code) { return code.getSystem(); @@ -1339,7 +1353,9 @@ public class Enumerations { } public String toCode(ActionSelectionBehavior code) { - if (code == ActionSelectionBehavior.ANY) + if (code == ActionSelectionBehavior.NULL) + return null; + if (code == ActionSelectionBehavior.ANY) return "any"; if (code == ActionSelectionBehavior.ALL) return "all"; @@ -1352,7 +1368,7 @@ public class Enumerations { if (code == ActionSelectionBehavior.ONEORMORE) return "one-or-more"; return "?"; - } + } public String toSystem(ActionSelectionBehavior code) { return code.getSystem(); @@ -1500,7 +1516,9 @@ public class Enumerations { } public String toCode(AdministrativeGender code) { - if (code == AdministrativeGender.MALE) + if (code == AdministrativeGender.NULL) + return null; + if (code == AdministrativeGender.MALE) return "male"; if (code == AdministrativeGender.FEMALE) return "female"; @@ -1509,7 +1527,7 @@ public class Enumerations { if (code == AdministrativeGender.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(AdministrativeGender code) { return code.getSystem(); @@ -1666,7 +1684,9 @@ public class Enumerations { } public String toCode(BindingStrength code) { - if (code == BindingStrength.REQUIRED) + if (code == BindingStrength.NULL) + return null; + if (code == BindingStrength.REQUIRED) return "required"; if (code == BindingStrength.EXTENSIBLE) return "extensible"; @@ -1675,7 +1695,7 @@ public class Enumerations { if (code == BindingStrength.EXAMPLE) return "example"; return "?"; - } + } public String toSystem(BindingStrength code) { return code.getSystem(); @@ -1810,14 +1830,16 @@ public class Enumerations { } public String toCode(CapabilityStatementKind code) { - if (code == CapabilityStatementKind.INSTANCE) + if (code == CapabilityStatementKind.NULL) + return null; + if (code == CapabilityStatementKind.INSTANCE) return "instance"; if (code == CapabilityStatementKind.CAPABILITY) return "capability"; if (code == CapabilityStatementKind.REQUIREMENTS) return "requirements"; return "?"; - } + } public String toSystem(CapabilityStatementKind code) { return code.getSystem(); @@ -1983,7 +2005,9 @@ public class Enumerations { } public String toCode(CompartmentType code) { - if (code == CompartmentType.PATIENT) + if (code == CompartmentType.NULL) + return null; + if (code == CompartmentType.PATIENT) return "Patient"; if (code == CompartmentType.ENCOUNTER) return "Encounter"; @@ -1994,7 +2018,7 @@ public class Enumerations { if (code == CompartmentType.DEVICE) return "Device"; return "?"; - } + } public String toSystem(CompartmentType code) { return code.getSystem(); @@ -2149,7 +2173,9 @@ public class Enumerations { } public String toCode(CompositionStatus code) { - if (code == CompositionStatus.PRELIMINARY) + if (code == CompositionStatus.NULL) + return null; + if (code == CompositionStatus.PRELIMINARY) return "preliminary"; if (code == CompositionStatus.FINAL) return "final"; @@ -2158,7 +2184,7 @@ public class Enumerations { if (code == CompositionStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(CompositionStatus code) { return code.getSystem(); @@ -2360,7 +2386,9 @@ public class Enumerations { } public String toCode(DaysOfWeek code) { - if (code == DaysOfWeek.MON) + if (code == DaysOfWeek.NULL) + return null; + if (code == DaysOfWeek.MON) return "mon"; if (code == DaysOfWeek.TUE) return "tue"; @@ -2375,7 +2403,7 @@ public class Enumerations { if (code == DaysOfWeek.SUN) return "sun"; return "?"; - } + } public String toSystem(DaysOfWeek code) { return code.getSystem(); @@ -2559,7 +2587,9 @@ public class Enumerations { } public String toCode(DeviceNameType code) { - if (code == DeviceNameType.UDILABELNAME) + if (code == DeviceNameType.NULL) + return null; + if (code == DeviceNameType.UDILABELNAME) return "udi-label-name"; if (code == DeviceNameType.USERFRIENDLYNAME) return "user-friendly-name"; @@ -2572,7 +2602,7 @@ public class Enumerations { if (code == DeviceNameType.OTHER) return "other"; return "?"; - } + } public String toSystem(DeviceNameType code) { return code.getSystem(); @@ -2702,14 +2732,16 @@ public class Enumerations { } public String toCode(DocumentReferenceStatus code) { - if (code == DocumentReferenceStatus.CURRENT) + if (code == DocumentReferenceStatus.NULL) + return null; + if (code == DocumentReferenceStatus.CURRENT) return "current"; if (code == DocumentReferenceStatus.SUPERSEDED) return "superseded"; if (code == DocumentReferenceStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(DocumentReferenceStatus code) { return code.getSystem(); @@ -2858,7 +2890,9 @@ public class Enumerations { } public String toCode(DocumentRelationshipType code) { - if (code == DocumentRelationshipType.REPLACES) + if (code == DocumentRelationshipType.NULL) + return null; + if (code == DocumentRelationshipType.REPLACES) return "replaces"; if (code == DocumentRelationshipType.TRANSFORMS) return "transforms"; @@ -2867,7 +2901,7 @@ public class Enumerations { if (code == DocumentRelationshipType.APPENDS) return "appends"; return "?"; - } + } public String toSystem(DocumentRelationshipType code) { return code.getSystem(); @@ -3099,7 +3133,9 @@ public class Enumerations { } public String toCode(EventStatus code) { - if (code == EventStatus.PREPARATION) + if (code == EventStatus.NULL) + return null; + if (code == EventStatus.PREPARATION) return "preparation"; if (code == EventStatus.INPROGRESS) return "in-progress"; @@ -3116,7 +3152,7 @@ public class Enumerations { if (code == EventStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(EventStatus code) { return code.getSystem(); @@ -3273,7 +3309,9 @@ public class Enumerations { } public String toCode(EvidenceVariableHandling code) { - if (code == EvidenceVariableHandling.CONTINUOUS) + if (code == EvidenceVariableHandling.NULL) + return null; + if (code == EvidenceVariableHandling.CONTINUOUS) return "continuous"; if (code == EvidenceVariableHandling.DICHOTOMOUS) return "dichotomous"; @@ -3282,7 +3320,7 @@ public class Enumerations { if (code == EvidenceVariableHandling.POLYCHOTOMOUS) return "polychotomous"; return "?"; - } + } public String toSystem(EvidenceVariableHandling code) { return code.getSystem(); @@ -7457,7 +7495,9 @@ public class Enumerations { } public String toCode(FHIRAllTypes code) { - if (code == FHIRAllTypes.ADDRESS) + if (code == FHIRAllTypes.NULL) + return null; + if (code == FHIRAllTypes.ADDRESS) return "Address"; if (code == FHIRAllTypes.AGE) return "Age"; @@ -7878,7 +7918,7 @@ public class Enumerations { if (code == FHIRAllTypes.ANY) return "Any"; return "?"; - } + } public String toSystem(FHIRAllTypes code) { return code.getSystem(); @@ -9048,7 +9088,9 @@ public class Enumerations { } public String toCode(FHIRVersion code) { - if (code == FHIRVersion._0_01) + if (code == FHIRVersion.NULL) + return null; + if (code == FHIRVersion._0_01) return "0.01"; if (code == FHIRVersion._0_05) return "0.05"; @@ -9159,7 +9201,7 @@ public class Enumerations { if (code == FHIRVersion._5_0_0BALLOT) return "5.0.0-ballot"; return "?"; - } + } public String toSystem(FHIRVersion code) { return code.getSystem(); @@ -9409,7 +9451,9 @@ public class Enumerations { } public String toCode(FilterOperator code) { - if (code == FilterOperator.EQUAL) + if (code == FilterOperator.NULL) + return null; + if (code == FilterOperator.EQUAL) return "="; if (code == FilterOperator.ISA) return "is-a"; @@ -9428,7 +9472,7 @@ public class Enumerations { if (code == FilterOperator.EXISTS) return "exists"; return "?"; - } + } public String toSystem(FilterOperator code) { return code.getSystem(); @@ -9576,7 +9620,9 @@ public class Enumerations { } public String toCode(FinancialResourceStatusCodes code) { - if (code == FinancialResourceStatusCodes.ACTIVE) + if (code == FinancialResourceStatusCodes.NULL) + return null; + if (code == FinancialResourceStatusCodes.ACTIVE) return "active"; if (code == FinancialResourceStatusCodes.CANCELLED) return "cancelled"; @@ -9585,7 +9631,7 @@ public class Enumerations { if (code == FinancialResourceStatusCodes.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(FinancialResourceStatusCodes code) { return code.getSystem(); @@ -9769,7 +9815,9 @@ public class Enumerations { } public String toCode(GroupMeasure code) { - if (code == GroupMeasure.MEAN) + if (code == GroupMeasure.NULL) + return null; + if (code == GroupMeasure.MEAN) return "mean"; if (code == GroupMeasure.MEDIAN) return "median"; @@ -9782,7 +9830,7 @@ public class Enumerations { if (code == GroupMeasure.MEDIANOFMEDIAN) return "median-of-median"; return "?"; - } + } public String toSystem(GroupMeasure code) { return code.getSystem(); @@ -9968,7 +10016,9 @@ public class Enumerations { } public String toCode(InvoicePriceComponentType code) { - if (code == InvoicePriceComponentType.BASE) + if (code == InvoicePriceComponentType.NULL) + return null; + if (code == InvoicePriceComponentType.BASE) return "base"; if (code == InvoicePriceComponentType.SURCHARGE) return "surcharge"; @@ -9981,7 +10031,7 @@ public class Enumerations { if (code == InvoicePriceComponentType.INFORMATIONAL) return "informational"; return "?"; - } + } public String toSystem(InvoicePriceComponentType code) { return code.getSystem(); @@ -10114,14 +10164,16 @@ public class Enumerations { } public String toCode(ListMode code) { - if (code == ListMode.WORKING) + if (code == ListMode.NULL) + return null; + if (code == ListMode.WORKING) return "working"; if (code == ListMode.SNAPSHOT) return "snapshot"; if (code == ListMode.CHANGES) return "changes"; return "?"; - } + } public String toSystem(ListMode code) { return code.getSystem(); @@ -10235,12 +10287,14 @@ public class Enumerations { } public String toCode(MeasureImprovementNotation code) { - if (code == MeasureImprovementNotation.INCREASE) + if (code == MeasureImprovementNotation.NULL) + return null; + if (code == MeasureImprovementNotation.INCREASE) return "increase"; if (code == MeasureImprovementNotation.DECREASE) return "decrease"; return "?"; - } + } public String toSystem(MeasureImprovementNotation code) { return code.getSystem(); @@ -10316,8 +10370,10 @@ public class Enumerations { } public String toCode(MimeTypes code) { - return "?"; - } + if (code == MimeTypes.NULL) + return null; + return "?"; + } public String toSystem(MimeTypes code) { return code.getSystem(); @@ -10447,14 +10503,16 @@ public class Enumerations { } public String toCode(NoteType code) { - if (code == NoteType.DISPLAY) + if (code == NoteType.NULL) + return null; + if (code == NoteType.DISPLAY) return "display"; if (code == NoteType.PRINT) return "print"; if (code == NoteType.PRINTOPER) return "printoper"; return "?"; - } + } public String toSystem(NoteType code) { return code.getSystem(); @@ -10690,7 +10748,9 @@ public class Enumerations { } public String toCode(ObservationStatus code) { - if (code == ObservationStatus.REGISTERED) + if (code == ObservationStatus.NULL) + return null; + if (code == ObservationStatus.REGISTERED) return "registered"; if (code == ObservationStatus.PRELIMINARY) return "preliminary"; @@ -10707,7 +10767,7 @@ public class Enumerations { if (code == ObservationStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(ObservationStatus code) { return code.getSystem(); @@ -10819,12 +10879,14 @@ public class Enumerations { } public String toCode(OperationParameterUse code) { - if (code == OperationParameterUse.IN) + if (code == OperationParameterUse.NULL) + return null; + if (code == OperationParameterUse.IN) return "in"; if (code == OperationParameterUse.OUT) return "out"; return "?"; - } + } public String toSystem(OperationParameterUse code) { return code.getSystem(); @@ -10976,7 +11038,9 @@ public class Enumerations { } public String toCode(ParticipationStatus code) { - if (code == ParticipationStatus.ACCEPTED) + if (code == ParticipationStatus.NULL) + return null; + if (code == ParticipationStatus.ACCEPTED) return "accepted"; if (code == ParticipationStatus.DECLINED) return "declined"; @@ -10985,7 +11049,7 @@ public class Enumerations { if (code == ParticipationStatus.NEEDSACTION) return "needs-action"; return "?"; - } + } public String toSystem(ParticipationStatus code) { return code.getSystem(); @@ -11137,7 +11201,9 @@ public class Enumerations { } public String toCode(PublicationStatus code) { - if (code == PublicationStatus.DRAFT) + if (code == PublicationStatus.NULL) + return null; + if (code == PublicationStatus.DRAFT) return "draft"; if (code == PublicationStatus.ACTIVE) return "active"; @@ -11146,7 +11212,7 @@ public class Enumerations { if (code == PublicationStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(PublicationStatus code) { return code.getSystem(); @@ -11294,7 +11360,9 @@ public class Enumerations { } public String toCode(QuantityComparator code) { - if (code == QuantityComparator.LESS_THAN) + if (code == QuantityComparator.NULL) + return null; + if (code == QuantityComparator.LESS_THAN) return "<"; if (code == QuantityComparator.LESS_OR_EQUAL) return "<="; @@ -11303,7 +11371,7 @@ public class Enumerations { if (code == QuantityComparator.GREATER_THAN) return ">"; return "?"; - } + } public String toSystem(QuantityComparator code) { return code.getSystem(); @@ -11452,7 +11520,9 @@ public class Enumerations { } public String toCode(RemittanceOutcome code) { - if (code == RemittanceOutcome.QUEUED) + if (code == RemittanceOutcome.NULL) + return null; + if (code == RemittanceOutcome.QUEUED) return "queued"; if (code == RemittanceOutcome.COMPLETE) return "complete"; @@ -11461,7 +11531,7 @@ public class Enumerations { if (code == RemittanceOutcome.PARTIAL) return "partial"; return "?"; - } + } public String toSystem(RemittanceOutcome code) { return code.getSystem(); @@ -11712,7 +11782,9 @@ public class Enumerations { } public String toCode(RequestIntent code) { - if (code == RequestIntent.PROPOSAL) + if (code == RequestIntent.NULL) + return null; + if (code == RequestIntent.PROPOSAL) return "proposal"; if (code == RequestIntent.PLAN) return "plan"; @@ -11731,7 +11803,7 @@ public class Enumerations { if (code == RequestIntent.OPTION) return "option"; return "?"; - } + } public String toSystem(RequestIntent code) { return code.getSystem(); @@ -11881,7 +11953,9 @@ public class Enumerations { } public String toCode(RequestPriority code) { - if (code == RequestPriority.ROUTINE) + if (code == RequestPriority.NULL) + return null; + if (code == RequestPriority.ROUTINE) return "routine"; if (code == RequestPriority.URGENT) return "urgent"; @@ -11890,7 +11964,7 @@ public class Enumerations { if (code == RequestPriority.STAT) return "stat"; return "?"; - } + } public String toSystem(RequestPriority code) { return code.getSystem(); @@ -12102,7 +12176,9 @@ public class Enumerations { } public String toCode(RequestStatus code) { - if (code == RequestStatus.DRAFT) + if (code == RequestStatus.NULL) + return null; + if (code == RequestStatus.DRAFT) return "draft"; if (code == RequestStatus.ACTIVE) return "active"; @@ -12117,7 +12193,7 @@ public class Enumerations { if (code == RequestStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(RequestStatus code) { return code.getSystem(); @@ -15031,7 +15107,9 @@ public class Enumerations { } public String toCode(ResourceTypeEnum code) { - if (code == ResourceTypeEnum.RESOURCE) + if (code == ResourceTypeEnum.NULL) + return null; + if (code == ResourceTypeEnum.RESOURCE) return "Resource"; if (code == ResourceTypeEnum.BINARY) return "Binary"; @@ -15318,7 +15396,7 @@ public class Enumerations { if (code == ResourceTypeEnum.PARAMETERS) return "Parameters"; return "?"; - } + } public String toSystem(ResourceTypeEnum code) { return code.getSystem(); @@ -15563,7 +15641,9 @@ public class Enumerations { } public String toCode(SearchParamType code) { - if (code == SearchParamType.NUMBER) + if (code == SearchParamType.NULL) + return null; + if (code == SearchParamType.NUMBER) return "number"; if (code == SearchParamType.DATE) return "date"; @@ -15582,7 +15662,7 @@ public class Enumerations { if (code == SearchParamType.SPECIAL) return "special"; return "?"; - } + } public String toSystem(SearchParamType code) { return code.getSystem(); @@ -15731,7 +15811,9 @@ public class Enumerations { } public String toCode(SubscriptionStatus code) { - if (code == SubscriptionStatus.REQUESTED) + if (code == SubscriptionStatus.NULL) + return null; + if (code == SubscriptionStatus.REQUESTED) return "requested"; if (code == SubscriptionStatus.ACTIVE) return "active"; @@ -15740,7 +15822,7 @@ public class Enumerations { if (code == SubscriptionStatus.OFF) return "off"; return "?"; - } + } public String toSystem(SubscriptionStatus code) { return code.getSystem(); @@ -15872,14 +15954,16 @@ public class Enumerations { } public String toCode(Use code) { - if (code == Use.CLAIM) + if (code == Use.NULL) + return null; + if (code == Use.CLAIM) return "claim"; if (code == Use.PREAUTHORIZATION) return "preauthorization"; if (code == Use.PREDETERMINATION) return "predetermination"; return "?"; - } + } public String toSystem(Use code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/EpisodeOfCare.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/EpisodeOfCare.java index 491645a8a..9f098f2d7 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/EpisodeOfCare.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/EpisodeOfCare.java @@ -263,7 +263,9 @@ public class EpisodeOfCare extends DomainResource { } public String toCode(EpisodeOfCareStatus code) { - if (code == EpisodeOfCareStatus.PLANNED) + if (code == EpisodeOfCareStatus.NULL) + return null; + if (code == EpisodeOfCareStatus.PLANNED) return "planned"; if (code == EpisodeOfCareStatus.WAITLIST) return "waitlist"; @@ -278,7 +280,7 @@ public class EpisodeOfCare extends DomainResource { if (code == EpisodeOfCareStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(EpisodeOfCareStatus code) { return code.getSystem(); @@ -458,9 +460,9 @@ public class EpisodeOfCare extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("status")) { this.status = null; @@ -773,9 +775,9 @@ public class EpisodeOfCare extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("condition")) { this.condition = null; @@ -1738,9 +1740,9 @@ public class EpisodeOfCare extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/EvidenceReport.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/EvidenceReport.java index 15b0e9d5e..ec765052c 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/EvidenceReport.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/EvidenceReport.java @@ -272,7 +272,9 @@ public class EvidenceReport extends DomainResource { } public String toCode(ReportRelationshipType code) { - if (code == ReportRelationshipType.REPLACES) + if (code == ReportRelationshipType.NULL) + return null; + if (code == ReportRelationshipType.REPLACES) return "replaces"; if (code == ReportRelationshipType.AMENDS) return "amends"; @@ -289,7 +291,7 @@ public class EvidenceReport extends DomainResource { if (code == ReportRelationshipType.TRANSFORMEDWITH) return "transformedWith"; return "?"; - } + } public String toSystem(ReportRelationshipType code) { return code.getSystem(); @@ -493,9 +495,9 @@ public class EvidenceReport extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("characteristic")) { this.getCharacteristic().remove((EvidenceReportSubjectCharacteristicComponent) value); @@ -940,9 +942,9 @@ public class EvidenceReport extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("code")) { this.code = null; @@ -1287,9 +1289,9 @@ public class EvidenceReport extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("code")) { this.code = null; @@ -2255,9 +2257,9 @@ public class EvidenceReport extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("title")) { this.title = null; @@ -3908,9 +3910,9 @@ public class EvidenceReport extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("url")) { this.url = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/EvidenceVariable.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/EvidenceVariable.java index a1d3b49e9..423fc9459 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/EvidenceVariable.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/EvidenceVariable.java @@ -161,12 +161,14 @@ public class EvidenceVariable extends DomainResource { } public String toCode(CharacteristicCombination code) { - if (code == CharacteristicCombination.INTERSECTION) + if (code == CharacteristicCombination.NULL) + return null; + if (code == CharacteristicCombination.INTERSECTION) return "intersection"; if (code == CharacteristicCombination.UNION) return "union"; return "?"; - } + } public String toSystem(CharacteristicCombination code) { return code.getSystem(); @@ -759,9 +761,9 @@ public class EvidenceVariable extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("description")) { this.description = null; @@ -1205,9 +1207,9 @@ public class EvidenceVariable extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("description")) { this.description = null; @@ -1546,9 +1548,9 @@ public class EvidenceVariable extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("name")) { this.name = null; @@ -3685,9 +3687,9 @@ public class EvidenceVariable extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("url")) { this.url = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ExampleScenario.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ExampleScenario.java index cfb873165..ddd0c5480 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ExampleScenario.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ExampleScenario.java @@ -160,12 +160,14 @@ public class ExampleScenario extends CanonicalResource { } public String toCode(ExampleScenarioActorType code) { - if (code == ExampleScenarioActorType.PERSON) + if (code == ExampleScenarioActorType.NULL) + return null; + if (code == ExampleScenarioActorType.PERSON) return "person"; if (code == ExampleScenarioActorType.ENTITY) return "entity"; return "?"; - } + } public String toSystem(ExampleScenarioActorType code) { return code.getSystem(); @@ -506,9 +508,9 @@ public class ExampleScenario extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("actorId")) { this.actorId = null; @@ -1107,9 +1109,9 @@ public class ExampleScenario extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("resourceId")) { this.resourceId = null; @@ -1445,9 +1447,9 @@ public class ExampleScenario extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("versionId")) { this.versionId = null; @@ -1737,9 +1739,9 @@ public class ExampleScenario extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("resourceId")) { this.resourceId = null; @@ -2249,9 +2251,9 @@ public class ExampleScenario extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("title")) { this.title = null; @@ -2686,9 +2688,9 @@ public class ExampleScenario extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("process")) { this.getProcess().remove((ExampleScenarioProcessComponent) value); @@ -3522,9 +3524,9 @@ public class ExampleScenario extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("number")) { this.number = null; @@ -3990,9 +3992,9 @@ public class ExampleScenario extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("title")) { this.title = null; @@ -5578,9 +5580,9 @@ public class ExampleScenario extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("url")) { this.url = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ExplanationOfBenefit.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ExplanationOfBenefit.java index 162634867..21f31d89c 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ExplanationOfBenefit.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ExplanationOfBenefit.java @@ -199,7 +199,9 @@ public class ExplanationOfBenefit extends DomainResource { } public String toCode(ExplanationOfBenefitStatus code) { - if (code == ExplanationOfBenefitStatus.ACTIVE) + if (code == ExplanationOfBenefitStatus.NULL) + return null; + if (code == ExplanationOfBenefitStatus.ACTIVE) return "active"; if (code == ExplanationOfBenefitStatus.CANCELLED) return "cancelled"; @@ -208,7 +210,7 @@ public class ExplanationOfBenefit extends DomainResource { if (code == ExplanationOfBenefitStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(ExplanationOfBenefitStatus code) { return code.getSystem(); @@ -398,9 +400,9 @@ public class ExplanationOfBenefit extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("claim")) { this.claim = null; @@ -644,9 +646,9 @@ public class ExplanationOfBenefit extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -1081,9 +1083,9 @@ public class ExplanationOfBenefit extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("sequence")) { this.sequence = null; @@ -1735,9 +1737,9 @@ public class ExplanationOfBenefit extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("sequence")) { this.sequence = null; @@ -2287,9 +2289,9 @@ public class ExplanationOfBenefit extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("sequence")) { this.sequence = null; @@ -2865,9 +2867,9 @@ public class ExplanationOfBenefit extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("sequence")) { this.sequence = null; @@ -3282,9 +3284,9 @@ public class ExplanationOfBenefit extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("focal")) { this.focal = null; @@ -3649,9 +3651,9 @@ public class ExplanationOfBenefit extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("date")) { this.date = null; @@ -5506,9 +5508,9 @@ public class ExplanationOfBenefit extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("sequence")) { this.sequence = null; @@ -6196,9 +6198,9 @@ public class ExplanationOfBenefit extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("category")) { this.category = null; @@ -7321,9 +7323,9 @@ public class ExplanationOfBenefit extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("sequence")) { this.sequence = null; @@ -8501,9 +8503,9 @@ public class ExplanationOfBenefit extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("sequence")) { this.sequence = null; @@ -10156,9 +10158,9 @@ public class ExplanationOfBenefit extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("itemSequence")) { this.getItemSequence().remove(value); @@ -11160,9 +11162,9 @@ public class ExplanationOfBenefit extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("productOrService")) { this.productOrService = null; @@ -11954,9 +11956,9 @@ public class ExplanationOfBenefit extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("productOrService")) { this.productOrService = null; @@ -12286,9 +12288,9 @@ public class ExplanationOfBenefit extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("category")) { this.category = null; @@ -12735,9 +12737,9 @@ public class ExplanationOfBenefit extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -13179,9 +13181,9 @@ public class ExplanationOfBenefit extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("number")) { this.number = null; @@ -13842,9 +13844,9 @@ public class ExplanationOfBenefit extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("category")) { this.category = null; @@ -14297,9 +14299,9 @@ public class ExplanationOfBenefit extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -17152,9 +17154,9 @@ public class ExplanationOfBenefit extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/FamilyMemberHistory.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/FamilyMemberHistory.java index 4956f0aad..3cd39f43a 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/FamilyMemberHistory.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/FamilyMemberHistory.java @@ -199,7 +199,9 @@ public class FamilyMemberHistory extends DomainResource { } public String toCode(FamilyHistoryStatus code) { - if (code == FamilyHistoryStatus.PARTIAL) + if (code == FamilyHistoryStatus.NULL) + return null; + if (code == FamilyHistoryStatus.PARTIAL) return "partial"; if (code == FamilyHistoryStatus.COMPLETED) return "completed"; @@ -208,7 +210,7 @@ public class FamilyMemberHistory extends DomainResource { if (code == FamilyHistoryStatus.HEALTHUNKNOWN) return "health-unknown"; return "?"; - } + } public String toSystem(FamilyHistoryStatus code) { return code.getSystem(); @@ -678,9 +680,9 @@ public class FamilyMemberHistory extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("code")) { this.code = null; @@ -2335,9 +2337,9 @@ public class FamilyMemberHistory extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Flag.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Flag.java index 13d7f496d..3b1303895 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Flag.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Flag.java @@ -179,14 +179,16 @@ public class Flag extends DomainResource { } public String toCode(FlagStatus code) { - if (code == FlagStatus.ACTIVE) + if (code == FlagStatus.NULL) + return null; + if (code == FlagStatus.ACTIVE) return "active"; if (code == FlagStatus.INACTIVE) return "inactive"; if (code == FlagStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(FlagStatus code) { return code.getSystem(); @@ -720,9 +722,9 @@ public class Flag extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Goal.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Goal.java index a11c4209c..db828300c 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Goal.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Goal.java @@ -290,7 +290,9 @@ public class Goal extends DomainResource { } public String toCode(GoalLifecycleStatus code) { - if (code == GoalLifecycleStatus.PROPOSED) + if (code == GoalLifecycleStatus.NULL) + return null; + if (code == GoalLifecycleStatus.PROPOSED) return "proposed"; if (code == GoalLifecycleStatus.PLANNED) return "planned"; @@ -309,7 +311,7 @@ public class Goal extends DomainResource { if (code == GoalLifecycleStatus.REJECTED) return "rejected"; return "?"; - } + } public String toSystem(GoalLifecycleStatus code) { return code.getSystem(); @@ -749,9 +751,9 @@ public class Goal extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("measure")) { this.measure = null; @@ -2037,9 +2039,9 @@ public class Goal extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/GraphDefinition.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/GraphDefinition.java index 1b8856567..2bc6d4d99 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/GraphDefinition.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/GraphDefinition.java @@ -199,7 +199,9 @@ public class GraphDefinition extends CanonicalResource { } public String toCode(GraphCompartmentRule code) { - if (code == GraphCompartmentRule.IDENTICAL) + if (code == GraphCompartmentRule.NULL) + return null; + if (code == GraphCompartmentRule.IDENTICAL) return "identical"; if (code == GraphCompartmentRule.MATCHING) return "matching"; @@ -208,7 +210,7 @@ public class GraphDefinition extends CanonicalResource { if (code == GraphCompartmentRule.CUSTOM) return "custom"; return "?"; - } + } public String toSystem(GraphCompartmentRule code) { return code.getSystem(); @@ -324,12 +326,14 @@ public class GraphDefinition extends CanonicalResource { } public String toCode(GraphCompartmentUse code) { - if (code == GraphCompartmentUse.CONDITION) + if (code == GraphCompartmentUse.NULL) + return null; + if (code == GraphCompartmentUse.CONDITION) return "condition"; if (code == GraphCompartmentUse.REQUIREMENT) return "requirement"; return "?"; - } + } public String toSystem(GraphCompartmentUse code) { return code.getSystem(); @@ -816,9 +820,9 @@ public class GraphDefinition extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("path")) { this.path = null; @@ -1367,9 +1371,9 @@ public class GraphDefinition extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -1925,9 +1929,9 @@ public class GraphDefinition extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("use")) { this.use = null; @@ -3345,9 +3349,9 @@ public class GraphDefinition extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("url")) { this.url = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Group.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Group.java index 0bb215d71..53016cc4d 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Group.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Group.java @@ -236,7 +236,9 @@ public class Group extends DomainResource { } public String toCode(GroupType code) { - if (code == GroupType.PERSON) + if (code == GroupType.NULL) + return null; + if (code == GroupType.PERSON) return "person"; if (code == GroupType.ANIMAL) return "animal"; @@ -249,7 +251,7 @@ public class Group extends DomainResource { if (code == GroupType.SUBSTANCE) return "substance"; return "?"; - } + } public String toSystem(GroupType code) { return code.getSystem(); @@ -638,9 +640,9 @@ public class Group extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("code")) { this.code = null; @@ -997,9 +999,9 @@ public class Group extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("entity")) { this.entity = null; @@ -1856,9 +1858,9 @@ public class Group extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/GuidanceResponse.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/GuidanceResponse.java index 084b6e70e..288c0a5af 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/GuidanceResponse.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/GuidanceResponse.java @@ -236,7 +236,9 @@ public class GuidanceResponse extends DomainResource { } public String toCode(GuidanceResponseStatus code) { - if (code == GuidanceResponseStatus.SUCCESS) + if (code == GuidanceResponseStatus.NULL) + return null; + if (code == GuidanceResponseStatus.SUCCESS) return "success"; if (code == GuidanceResponseStatus.DATAREQUESTED) return "data-requested"; @@ -249,7 +251,7 @@ public class GuidanceResponse extends DomainResource { if (code == GuidanceResponseStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(GuidanceResponseStatus code) { return code.getSystem(); @@ -1398,9 +1400,9 @@ public class GuidanceResponse extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("requestIdentifier")) { this.requestIdentifier = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/HumanName.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/HumanName.java index cd71da4d5..53f21300e 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/HumanName.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/HumanName.java @@ -262,7 +262,9 @@ public class HumanName extends DataType implements ICompositeType { } public String toCode(NameUse code) { - if (code == NameUse.USUAL) + if (code == NameUse.NULL) + return null; + if (code == NameUse.USUAL) return "usual"; if (code == NameUse.OFFICIAL) return "official"; @@ -277,7 +279,7 @@ public class HumanName extends DataType implements ICompositeType { if (code == NameUse.MAIDEN) return "maiden"; return "?"; - } + } public String toSystem(NameUse code) { return code.getSystem(); @@ -877,9 +879,9 @@ public class HumanName extends DataType implements ICompositeType { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("use")) { this.use = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Identifier.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Identifier.java index c65dc6d24..e3c9b0edb 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Identifier.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Identifier.java @@ -220,7 +220,9 @@ public class Identifier extends DataType implements ICompositeType { } public String toCode(IdentifierUse code) { - if (code == IdentifierUse.USUAL) + if (code == IdentifierUse.NULL) + return null; + if (code == IdentifierUse.USUAL) return "usual"; if (code == IdentifierUse.OFFICIAL) return "official"; @@ -231,7 +233,7 @@ public class Identifier extends DataType implements ICompositeType { if (code == IdentifierUse.OLD) return "old"; return "?"; - } + } public String toSystem(IdentifierUse code) { return code.getSystem(); @@ -654,9 +656,9 @@ public class Identifier extends DataType implements ICompositeType { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("use")) { this.use = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ImagingStudy.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ImagingStudy.java index 98c2f9bd5..93c53c7b4 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ImagingStudy.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ImagingStudy.java @@ -225,7 +225,9 @@ public class ImagingStudy extends DomainResource { } public String toCode(ImagingStudyStatus code) { - if (code == ImagingStudyStatus.REGISTERED) + if (code == ImagingStudyStatus.NULL) + return null; + if (code == ImagingStudyStatus.REGISTERED) return "registered"; if (code == ImagingStudyStatus.AVAILABLE) return "available"; @@ -236,7 +238,7 @@ public class ImagingStudy extends DomainResource { if (code == ImagingStudyStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(ImagingStudyStatus code) { return code.getSystem(); @@ -1144,9 +1146,9 @@ public class ImagingStudy extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("uid")) { this.uid = null; @@ -1506,9 +1508,9 @@ public class ImagingStudy extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("function")) { this.function = null; @@ -1906,9 +1908,9 @@ public class ImagingStudy extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("uid")) { this.uid = null; @@ -3495,9 +3497,9 @@ public class ImagingStudy extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Immunization.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Immunization.java index ebd73a733..431851fc1 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Immunization.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Immunization.java @@ -183,14 +183,16 @@ public class Immunization extends DomainResource { } public String toCode(ImmunizationStatusCodes code) { - if (code == ImmunizationStatusCodes.COMPLETED) + if (code == ImmunizationStatusCodes.NULL) + return null; + if (code == ImmunizationStatusCodes.COMPLETED) return "completed"; if (code == ImmunizationStatusCodes.ENTEREDINERROR) return "entered-in-error"; if (code == ImmunizationStatusCodes.NOTDONE) return "not-done"; return "?"; - } + } public String toSystem(ImmunizationStatusCodes code) { return code.getSystem(); @@ -347,9 +349,9 @@ public class Immunization extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("function")) { this.function = null; @@ -793,9 +795,9 @@ public class Immunization extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("documentType")) { this.documentType = null; @@ -1134,9 +1136,9 @@ public class Immunization extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("date")) { this.date = null; @@ -1665,9 +1667,9 @@ public class Immunization extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("series")) { this.series = null; @@ -3705,9 +3707,9 @@ public class Immunization extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ImmunizationEvaluation.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ImmunizationEvaluation.java index 4cb3bde39..6e193e771 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ImmunizationEvaluation.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ImmunizationEvaluation.java @@ -165,12 +165,14 @@ public class ImmunizationEvaluation extends DomainResource { } public String toCode(ImmunizationEvaluationStatusCodes code) { - if (code == ImmunizationEvaluationStatusCodes.COMPLETED) + if (code == ImmunizationEvaluationStatusCodes.NULL) + return null; + if (code == ImmunizationEvaluationStatusCodes.COMPLETED) return "completed"; if (code == ImmunizationEvaluationStatusCodes.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(ImmunizationEvaluationStatusCodes code) { return code.getSystem(); @@ -1104,9 +1106,9 @@ public class ImmunizationEvaluation extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ImplementationGuide.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ImplementationGuide.java index b23f18e28..2127fae60 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ImplementationGuide.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ImplementationGuide.java @@ -204,7 +204,9 @@ public class ImplementationGuide extends CanonicalResource { } public String toCode(GuidePageGeneration code) { - if (code == GuidePageGeneration.HTML) + if (code == GuidePageGeneration.NULL) + return null; + if (code == GuidePageGeneration.HTML) return "html"; if (code == GuidePageGeneration.MARKDOWN) return "markdown"; @@ -213,7 +215,7 @@ public class ImplementationGuide extends CanonicalResource { if (code == GuidePageGeneration.GENERATED) return "generated"; return "?"; - } + } public String toSystem(GuidePageGeneration code) { return code.getSystem(); @@ -494,7 +496,9 @@ public class ImplementationGuide extends CanonicalResource { } public String toCode(GuideParameterCode code) { - if (code == GuideParameterCode.APPLY) + if (code == GuideParameterCode.NULL) + return null; + if (code == GuideParameterCode.APPLY) return "apply"; if (code == GuideParameterCode.PATHRESOURCE) return "path-resource"; @@ -515,7 +519,7 @@ public class ImplementationGuide extends CanonicalResource { if (code == GuideParameterCode.HTMLTEMPLATE) return "html-template"; return "?"; - } + } public String toSystem(GuideParameterCode code) { return code.getSystem(); @@ -10722,7 +10726,9 @@ public class ImplementationGuide extends CanonicalResource { } public String toCode(SPDXLicense code) { - if (code == SPDXLicense._0BSD) + if (code == SPDXLicense.NULL) + return null; + if (code == SPDXLicense._0BSD) return "0BSD"; if (code == SPDXLicense.AAL) return "AAL"; @@ -11839,7 +11845,7 @@ public class ImplementationGuide extends CanonicalResource { if (code == SPDXLicense.ZPL_2_1) return "ZPL-2.1"; return "?"; - } + } public String toSystem(SPDXLicense code) { return code.getSystem(); @@ -12127,9 +12133,9 @@ public class ImplementationGuide extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("uri")) { this.uri = null; @@ -12427,9 +12433,9 @@ public class ImplementationGuide extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -12933,9 +12939,9 @@ public class ImplementationGuide extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("grouping")) { this.getGrouping().remove((ImplementationGuideDefinitionGroupingComponent) value); @@ -13280,9 +13286,9 @@ public class ImplementationGuide extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("name")) { this.name = null; @@ -13910,9 +13916,9 @@ public class ImplementationGuide extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("reference")) { this.reference = null; @@ -14424,9 +14430,9 @@ public class ImplementationGuide extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("name[x]")) { this.name = null; @@ -14751,9 +14757,9 @@ public class ImplementationGuide extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("code")) { this.code = null; @@ -15104,9 +15110,9 @@ public class ImplementationGuide extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("code")) { this.code = null; @@ -15679,9 +15685,9 @@ public class ImplementationGuide extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("rendering")) { this.rendering = null; @@ -16091,9 +16097,9 @@ public class ImplementationGuide extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("reference")) { this.reference = null; @@ -16477,9 +16483,9 @@ public class ImplementationGuide extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("name")) { this.name = null; @@ -18278,9 +18284,9 @@ public class ImplementationGuide extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("url")) { this.url = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Invoice.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Invoice.java index 1a1f665dc..a780e0b6b 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Invoice.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Invoice.java @@ -216,7 +216,9 @@ public class Invoice extends DomainResource { } public String toCode(InvoiceStatus code) { - if (code == InvoiceStatus.DRAFT) + if (code == InvoiceStatus.NULL) + return null; + if (code == InvoiceStatus.DRAFT) return "draft"; if (code == InvoiceStatus.ISSUED) return "issued"; @@ -227,7 +229,7 @@ public class Invoice extends DomainResource { if (code == InvoiceStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(InvoiceStatus code) { return code.getSystem(); @@ -391,9 +393,9 @@ public class Invoice extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("role")) { this.role = null; @@ -800,9 +802,9 @@ public class Invoice extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("sequence")) { this.sequence = null; @@ -1227,9 +1229,9 @@ public class Invoice extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -2404,9 +2406,9 @@ public class Invoice extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Linkage.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Linkage.java index 6cae006af..fecf0db74 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Linkage.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Linkage.java @@ -183,14 +183,16 @@ public class Linkage extends DomainResource { } public String toCode(LinkageType code) { - if (code == LinkageType.SOURCE) + if (code == LinkageType.NULL) + return null; + if (code == LinkageType.SOURCE) return "source"; if (code == LinkageType.ALTERNATE) return "alternate"; if (code == LinkageType.HISTORICAL) return "historical"; return "?"; - } + } public String toSystem(LinkageType code) { return code.getSystem(); @@ -377,9 +379,9 @@ public class Linkage extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -729,9 +731,9 @@ public class Linkage extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("active")) { this.active = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ListResource.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ListResource.java index bc2909df6..ee05ac7ce 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ListResource.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ListResource.java @@ -178,14 +178,16 @@ public class ListResource extends DomainResource { } public String toCode(ListStatus code) { - if (code == ListStatus.CURRENT) + if (code == ListStatus.NULL) + return null; + if (code == ListStatus.CURRENT) return "current"; if (code == ListStatus.RETIRED) return "retired"; if (code == ListStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(ListStatus code) { return code.getSystem(); @@ -482,9 +484,9 @@ public class ListResource extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("flag")) { this.flag = null; @@ -1455,9 +1457,9 @@ public class ListResource extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Location.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Location.java index 2872a87e5..27c1162a1 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Location.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Location.java @@ -166,12 +166,14 @@ public class Location extends DomainResource { } public String toCode(LocationMode code) { - if (code == LocationMode.INSTANCE) + if (code == LocationMode.NULL) + return null; + if (code == LocationMode.INSTANCE) return "instance"; if (code == LocationMode.KIND) return "kind"; return "?"; - } + } public String toSystem(LocationMode code) { return code.getSystem(); @@ -304,14 +306,16 @@ public class Location extends DomainResource { } public String toCode(LocationStatus code) { - if (code == LocationStatus.ACTIVE) + if (code == LocationStatus.NULL) + return null; + if (code == LocationStatus.ACTIVE) return "active"; if (code == LocationStatus.SUSPENDED) return "suspended"; if (code == LocationStatus.INACTIVE) return "inactive"; return "?"; - } + } public String toSystem(LocationStatus code) { return code.getSystem(); @@ -681,9 +685,9 @@ public class Location extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("longitude")) { this.longitude = null; @@ -1134,9 +1138,9 @@ public class Location extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("daysOfWeek")) { this.getDaysOfWeek().remove((Enumeration) value); @@ -2470,9 +2474,9 @@ public class Location extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/MeasureReport.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/MeasureReport.java index 07165dc07..76ea772ee 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/MeasureReport.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/MeasureReport.java @@ -180,14 +180,16 @@ public class MeasureReport extends DomainResource { } public String toCode(MeasureReportStatus code) { - if (code == MeasureReportStatus.COMPLETE) + if (code == MeasureReportStatus.NULL) + return null; + if (code == MeasureReportStatus.COMPLETE) return "complete"; if (code == MeasureReportStatus.PENDING) return "pending"; if (code == MeasureReportStatus.ERROR) return "error"; return "?"; - } + } public String toSystem(MeasureReportStatus code) { return code.getSystem(); @@ -341,7 +343,9 @@ public class MeasureReport extends DomainResource { } public String toCode(MeasureReportType code) { - if (code == MeasureReportType.INDIVIDUAL) + if (code == MeasureReportType.NULL) + return null; + if (code == MeasureReportType.INDIVIDUAL) return "individual"; if (code == MeasureReportType.SUBJECTLIST) return "subject-list"; @@ -350,7 +354,7 @@ public class MeasureReport extends DomainResource { if (code == MeasureReportType.DATACOLLECTION) return "data-collection"; return "?"; - } + } public String toSystem(MeasureReportType code) { return code.getSystem(); @@ -661,9 +665,9 @@ public class MeasureReport extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("code")) { this.code = null; @@ -991,9 +995,9 @@ public class MeasureReport extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("code")) { this.code = null; @@ -1300,9 +1304,9 @@ public class MeasureReport extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("code")) { this.getCode().remove(value); @@ -1707,9 +1711,9 @@ public class MeasureReport extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("value")) { this.value = null; @@ -1973,9 +1977,9 @@ public class MeasureReport extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("code")) { this.code = null; @@ -2277,9 +2281,9 @@ public class MeasureReport extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("code")) { this.code = null; @@ -3190,9 +3194,9 @@ public class MeasureReport extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Medication.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Medication.java index 361c58777..34ea5f3a6 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Medication.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Medication.java @@ -180,14 +180,16 @@ public class Medication extends DomainResource { } public String toCode(MedicationStatusCodes code) { - if (code == MedicationStatusCodes.ACTIVE) + if (code == MedicationStatusCodes.NULL) + return null; + if (code == MedicationStatusCodes.ACTIVE) return "active"; if (code == MedicationStatusCodes.INACTIVE) return "inactive"; if (code == MedicationStatusCodes.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(MedicationStatusCodes code) { return code.getSystem(); @@ -468,9 +470,9 @@ public class Medication extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("item[x]")) { this.item = null; @@ -774,9 +776,9 @@ public class Medication extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("lotNumber")) { this.lotNumber = null; @@ -1397,9 +1399,9 @@ public class Medication extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/MedicationAdministration.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/MedicationAdministration.java index b386b022b..2bce39352 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/MedicationAdministration.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/MedicationAdministration.java @@ -270,7 +270,9 @@ public class MedicationAdministration extends DomainResource { } public String toCode(MedicationAdministrationStatusCodes code) { - if (code == MedicationAdministrationStatusCodes.INPROGRESS) + if (code == MedicationAdministrationStatusCodes.NULL) + return null; + if (code == MedicationAdministrationStatusCodes.INPROGRESS) return "in-progress"; if (code == MedicationAdministrationStatusCodes.NOTDONE) return "not-done"; @@ -285,7 +287,7 @@ public class MedicationAdministration extends DomainResource { if (code == MedicationAdministrationStatusCodes.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(MedicationAdministrationStatusCodes code) { return code.getSystem(); @@ -443,9 +445,9 @@ public class MedicationAdministration extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("function")) { this.function = null; @@ -1006,9 +1008,9 @@ public class MedicationAdministration extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("text")) { this.text = null; @@ -2617,9 +2619,9 @@ public class MedicationAdministration extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/MedicationDispense.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/MedicationDispense.java index b31d13436..33378f9da 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/MedicationDispense.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/MedicationDispense.java @@ -298,7 +298,9 @@ public class MedicationDispense extends DomainResource { } public String toCode(MedicationDispenseStatusCodes code) { - if (code == MedicationDispenseStatusCodes.PREPARATION) + if (code == MedicationDispenseStatusCodes.NULL) + return null; + if (code == MedicationDispenseStatusCodes.PREPARATION) return "preparation"; if (code == MedicationDispenseStatusCodes.INPROGRESS) return "in-progress"; @@ -317,7 +319,7 @@ public class MedicationDispense extends DomainResource { if (code == MedicationDispenseStatusCodes.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(MedicationDispenseStatusCodes code) { return code.getSystem(); @@ -482,9 +484,9 @@ public class MedicationDispense extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("function")) { this.function = null; @@ -913,9 +915,9 @@ public class MedicationDispense extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("wasSubstituted")) { this.wasSubstituted = null; @@ -2738,9 +2740,9 @@ public class MedicationDispense extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/MedicationKnowledge.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/MedicationKnowledge.java index 2fc3d0d6b..ff0d8ff4b 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/MedicationKnowledge.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/MedicationKnowledge.java @@ -179,14 +179,16 @@ public class MedicationKnowledge extends DomainResource { } public String toCode(MedicationKnowledgeStatusCodes code) { - if (code == MedicationKnowledgeStatusCodes.ACTIVE) + if (code == MedicationKnowledgeStatusCodes.NULL) + return null; + if (code == MedicationKnowledgeStatusCodes.ACTIVE) return "active"; if (code == MedicationKnowledgeStatusCodes.INACTIVE) return "inactive"; if (code == MedicationKnowledgeStatusCodes.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(MedicationKnowledgeStatusCodes code) { return code.getSystem(); @@ -374,9 +376,9 @@ public class MedicationKnowledge extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -613,9 +615,9 @@ public class MedicationKnowledge extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -976,9 +978,9 @@ public class MedicationKnowledge extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("item[x]")) { this.item = null; @@ -1306,9 +1308,9 @@ public class MedicationKnowledge extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -1573,9 +1575,9 @@ public class MedicationKnowledge extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -1961,9 +1963,9 @@ public class MedicationKnowledge extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("dosage")) { this.getDosage().remove((MedicationKnowledgeAdministrationGuidelinesDosageComponent) value); @@ -2259,9 +2261,9 @@ public class MedicationKnowledge extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -2595,9 +2597,9 @@ public class MedicationKnowledge extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("characteristic[x]")) { this.characteristic = null; @@ -2885,9 +2887,9 @@ public class MedicationKnowledge extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -3127,9 +3129,9 @@ public class MedicationKnowledge extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -3440,9 +3442,9 @@ public class MedicationKnowledge extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -3850,9 +3852,9 @@ public class MedicationKnowledge extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("regulatoryAuthority")) { this.regulatoryAuthority = null; @@ -4148,9 +4150,9 @@ public class MedicationKnowledge extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -4342,9 +4344,9 @@ public class MedicationKnowledge extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("schedule")) { this.schedule = null; @@ -4572,9 +4574,9 @@ public class MedicationKnowledge extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("quantity")) { this.quantity = null; @@ -4917,9 +4919,9 @@ public class MedicationKnowledge extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("areaUnderCurve")) { this.getAreaUnderCurve().remove(value); @@ -6678,9 +6680,9 @@ public class MedicationKnowledge extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("code")) { this.code = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/MedicationRequest.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/MedicationRequest.java index 7efe5babb..0ec5fc71d 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/MedicationRequest.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/MedicationRequest.java @@ -281,7 +281,9 @@ public class MedicationRequest extends DomainResource { } public String toCode(MedicationRequestIntent code) { - if (code == MedicationRequestIntent.PROPOSAL) + if (code == MedicationRequestIntent.NULL) + return null; + if (code == MedicationRequestIntent.PROPOSAL) return "proposal"; if (code == MedicationRequestIntent.PLAN) return "plan"; @@ -298,7 +300,7 @@ public class MedicationRequest extends DomainResource { if (code == MedicationRequestIntent.OPTION) return "option"; return "?"; - } + } public String toSystem(MedicationRequestIntent code) { return code.getSystem(); @@ -533,7 +535,9 @@ public class MedicationRequest extends DomainResource { } public String toCode(MedicationrequestStatus code) { - if (code == MedicationrequestStatus.ACTIVE) + if (code == MedicationrequestStatus.NULL) + return null; + if (code == MedicationrequestStatus.ACTIVE) return "active"; if (code == MedicationrequestStatus.ONHOLD) return "on-hold"; @@ -550,7 +554,7 @@ public class MedicationRequest extends DomainResource { if (code == MedicationrequestStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(MedicationrequestStatus code) { return code.getSystem(); @@ -998,9 +1002,9 @@ public class MedicationRequest extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("initialFill")) { this.initialFill = (MedicationRequestDispenseRequestInitialFillComponent) value; // MedicationRequestDispenseRequestInitialFillComponent @@ -1286,9 +1290,9 @@ public class MedicationRequest extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("quantity")) { this.quantity = null; @@ -1573,9 +1577,9 @@ public class MedicationRequest extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("allowed[x]")) { this.allowed = null; @@ -4014,9 +4018,9 @@ public class MedicationRequest extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/MedicationStatement.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/MedicationStatement.java index d67ac8ea3..2cfa7598b 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/MedicationStatement.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/MedicationStatement.java @@ -294,7 +294,9 @@ public class MedicationStatement extends DomainResource { } public String toCode(MedicationStatusCodes code) { - if (code == MedicationStatusCodes.ACTIVE) + if (code == MedicationStatusCodes.NULL) + return null; + if (code == MedicationStatusCodes.ACTIVE) return "active"; if (code == MedicationStatusCodes.COMPLETED) return "completed"; @@ -311,7 +313,7 @@ public class MedicationStatement extends DomainResource { if (code == MedicationStatusCodes.NOTTAKEN) return "not-taken"; return "?"; - } + } public String toSystem(MedicationStatusCodes code) { return code.getSystem(); @@ -1648,9 +1650,9 @@ public class MedicationStatement extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/MessageDefinition.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/MessageDefinition.java index 3ba7b09c1..3593922fa 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/MessageDefinition.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/MessageDefinition.java @@ -184,14 +184,16 @@ public class MessageDefinition extends CanonicalResource { } public String toCode(MessageSignificanceCategory code) { - if (code == MessageSignificanceCategory.CONSEQUENCE) + if (code == MessageSignificanceCategory.NULL) + return null; + if (code == MessageSignificanceCategory.CONSEQUENCE) return "consequence"; if (code == MessageSignificanceCategory.CURRENCY) return "currency"; if (code == MessageSignificanceCategory.NOTIFICATION) return "notification"; return "?"; - } + } public String toSystem(MessageSignificanceCategory code) { return code.getSystem(); @@ -342,7 +344,9 @@ public class MessageDefinition extends CanonicalResource { } public String toCode(MessageheaderResponseRequest code) { - if (code == MessageheaderResponseRequest.ALWAYS) + if (code == MessageheaderResponseRequest.NULL) + return null; + if (code == MessageheaderResponseRequest.ALWAYS) return "always"; if (code == MessageheaderResponseRequest.ONERROR) return "on-error"; @@ -351,7 +355,7 @@ public class MessageDefinition extends CanonicalResource { if (code == MessageheaderResponseRequest.ONSUCCESS) return "on-success"; return "?"; - } + } public String toSystem(MessageheaderResponseRequest code) { return code.getSystem(); @@ -727,9 +731,9 @@ public class MessageDefinition extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("code")) { this.code = null; @@ -1052,9 +1056,9 @@ public class MessageDefinition extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("message")) { this.message = null; @@ -3198,9 +3202,9 @@ public class MessageDefinition extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("url")) { this.url = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/MessageHeader.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/MessageHeader.java index 3035ba34a..51c180cf1 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/MessageHeader.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/MessageHeader.java @@ -186,14 +186,16 @@ public class MessageHeader extends DomainResource { } public String toCode(ResponseType code) { - if (code == ResponseType.OK) + if (code == ResponseType.NULL) + return null; + if (code == ResponseType.OK) return "ok"; if (code == ResponseType.TRANSIENTERROR) return "transient-error"; if (code == ResponseType.FATALERROR) return "fatal-error"; return "?"; - } + } public String toSystem(ResponseType code) { return code.getSystem(); @@ -493,9 +495,9 @@ public class MessageHeader extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("name")) { this.name = null; @@ -1005,9 +1007,9 @@ public class MessageHeader extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("name")) { this.name = null; @@ -1381,9 +1383,9 @@ public class MessageHeader extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.identifier = null; @@ -2229,9 +2231,9 @@ public class MessageHeader extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("event[x]")) { this.event = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/MolecularSequence.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/MolecularSequence.java index a76ec0a7f..9f5ae012b 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/MolecularSequence.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/MolecularSequence.java @@ -161,12 +161,14 @@ public class MolecularSequence extends DomainResource { } public String toCode(OrientationType code) { - if (code == OrientationType.SENSE) + if (code == OrientationType.NULL) + return null; + if (code == OrientationType.SENSE) return "sense"; if (code == OrientationType.ANTISENSE) return "antisense"; return "?"; - } + } public String toSystem(OrientationType code) { return code.getSystem(); @@ -299,14 +301,16 @@ public class MolecularSequence extends DomainResource { } public String toCode(QualityType code) { - if (code == QualityType.INDEL) + if (code == QualityType.NULL) + return null; + if (code == QualityType.INDEL) return "indel"; if (code == QualityType.SNP) return "snp"; if (code == QualityType.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(QualityType code) { return code.getSystem(); @@ -479,7 +483,9 @@ public class MolecularSequence extends DomainResource { } public String toCode(RepositoryType code) { - if (code == RepositoryType.DIRECTLINK) + if (code == RepositoryType.NULL) + return null; + if (code == RepositoryType.DIRECTLINK) return "directlink"; if (code == RepositoryType.OPENAPI) return "openapi"; @@ -490,7 +496,7 @@ public class MolecularSequence extends DomainResource { if (code == RepositoryType.OTHER) return "other"; return "?"; - } + } public String toSystem(RepositoryType code) { return code.getSystem(); @@ -623,14 +629,16 @@ public class MolecularSequence extends DomainResource { } public String toCode(SequenceType code) { - if (code == SequenceType.AA) + if (code == SequenceType.NULL) + return null; + if (code == SequenceType.AA) return "aa"; if (code == SequenceType.DNA) return "dna"; if (code == SequenceType.RNA) return "rna"; return "?"; - } + } public String toSystem(SequenceType code) { return code.getSystem(); @@ -745,12 +753,14 @@ public class MolecularSequence extends DomainResource { } public String toCode(StrandType code) { - if (code == StrandType.WATSON) + if (code == StrandType.NULL) + return null; + if (code == StrandType.WATSON) return "watson"; if (code == StrandType.CRICK) return "crick"; return "?"; - } + } public String toSystem(StrandType code) { return code.getSystem(); @@ -1472,9 +1482,9 @@ public class MolecularSequence extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("chromosome")) { this.chromosome = null; @@ -2194,9 +2204,9 @@ public class MolecularSequence extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("start")) { this.start = null; @@ -3662,9 +3672,9 @@ public class MolecularSequence extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -4550,9 +4560,9 @@ public class MolecularSequence extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("score")) { this.getScore().remove(value); @@ -5257,9 +5267,9 @@ public class MolecularSequence extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -5706,9 +5716,9 @@ public class MolecularSequence extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("variantType")) { this.variantType = null; @@ -6038,9 +6048,9 @@ public class MolecularSequence extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("start")) { this.start = null; @@ -6340,9 +6350,9 @@ public class MolecularSequence extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("start")) { this.start = null; @@ -7557,9 +7567,9 @@ public class MolecularSequence extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/NamingSystem.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/NamingSystem.java index b96c5e5c5..6b394ef6c 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/NamingSystem.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/NamingSystem.java @@ -201,7 +201,9 @@ public class NamingSystem extends CanonicalResource { } public String toCode(NamingSystemIdentifierType code) { - if (code == NamingSystemIdentifierType.OID) + if (code == NamingSystemIdentifierType.NULL) + return null; + if (code == NamingSystemIdentifierType.OID) return "oid"; if (code == NamingSystemIdentifierType.UUID) return "uuid"; @@ -210,7 +212,7 @@ public class NamingSystem extends CanonicalResource { if (code == NamingSystemIdentifierType.OTHER) return "other"; return "?"; - } + } public String toSystem(NamingSystemIdentifierType code) { return code.getSystem(); @@ -346,14 +348,16 @@ public class NamingSystem extends CanonicalResource { } public String toCode(NamingSystemType code) { - if (code == NamingSystemType.CODESYSTEM) + if (code == NamingSystemType.NULL) + return null; + if (code == NamingSystemType.CODESYSTEM) return "codesystem"; if (code == NamingSystemType.IDENTIFIER) return "identifier"; if (code == NamingSystemType.ROOT) return "root"; return "?"; - } + } public String toSystem(NamingSystemType code) { return code.getSystem(); @@ -766,9 +770,9 @@ public class NamingSystem extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -1963,9 +1967,9 @@ public class NamingSystem extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("name")) { this.name = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Narrative.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Narrative.java index 5163668bf..a5313fb30 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Narrative.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Narrative.java @@ -206,7 +206,9 @@ public class Narrative extends BaseNarrative implements INarrative { } public String toCode(NarrativeStatus code) { - if (code == NarrativeStatus.GENERATED) + if (code == NarrativeStatus.NULL) + return null; + if (code == NarrativeStatus.GENERATED) return "generated"; if (code == NarrativeStatus.EXTENSIONS) return "extensions"; @@ -215,7 +217,7 @@ public class Narrative extends BaseNarrative implements INarrative { if (code == NarrativeStatus.EMPTY) return "empty"; return "?"; - } + } public String toSystem(NarrativeStatus code) { return code.getSystem(); @@ -401,9 +403,9 @@ public class Narrative extends BaseNarrative implements INarrative { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("status")) { this.status = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/NutritionProduct.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/NutritionProduct.java index 3dff5b456..40ef3fa36 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/NutritionProduct.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/NutritionProduct.java @@ -180,14 +180,16 @@ public class NutritionProduct extends DomainResource { } public String toCode(NutritionProductStatus code) { - if (code == NutritionProductStatus.ACTIVE) + if (code == NutritionProductStatus.NULL) + return null; + if (code == NutritionProductStatus.ACTIVE) return "active"; if (code == NutritionProductStatus.INACTIVE) return "inactive"; if (code == NutritionProductStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(NutritionProductStatus code) { return code.getSystem(); @@ -364,9 +366,9 @@ public class NutritionProduct extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("item")) { this.item = null; @@ -635,9 +637,9 @@ public class NutritionProduct extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("item")) { this.item = null; @@ -1009,9 +1011,9 @@ public class NutritionProduct extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -1533,9 +1535,9 @@ public class NutritionProduct extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("quantity")) { this.quantity = null; @@ -2419,9 +2421,9 @@ public class NutritionProduct extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("status")) { this.status = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ObservationDefinition.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ObservationDefinition.java index 617d08916..92d091b16 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ObservationDefinition.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ObservationDefinition.java @@ -325,7 +325,9 @@ public class ObservationDefinition extends DomainResource { } public String toCode(ObservationDataType code) { - if (code == ObservationDataType.QUANTITY) + if (code == ObservationDataType.NULL) + return null; + if (code == ObservationDataType.QUANTITY) return "Quantity"; if (code == ObservationDataType.CODEABLECONCEPT) return "CodeableConcept"; @@ -348,7 +350,7 @@ public class ObservationDefinition extends DomainResource { if (code == ObservationDataType.PERIOD) return "Period"; return "?"; - } + } public String toSystem(ObservationDataType code) { return code.getSystem(); @@ -482,14 +484,16 @@ public class ObservationDefinition extends DomainResource { } public String toCode(ObservationRangeCategory code) { - if (code == ObservationRangeCategory.REFERENCE) + if (code == ObservationRangeCategory.NULL) + return null; + if (code == ObservationRangeCategory.REFERENCE) return "reference"; if (code == ObservationRangeCategory.CRITICAL) return "critical"; if (code == ObservationRangeCategory.ABSOLUTE) return "absolute"; return "?"; - } + } public String toSystem(ObservationRangeCategory code) { return code.getSystem(); @@ -824,9 +828,9 @@ public class ObservationDefinition extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("customaryUnit")) { this.customaryUnit = null; @@ -1496,9 +1500,9 @@ public class ObservationDefinition extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("category")) { this.category = null; @@ -2546,9 +2550,9 @@ public class ObservationDefinition extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("category")) { this.getCategory().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/OperationDefinition.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/OperationDefinition.java index f91c5e356..fecd7dc59 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/OperationDefinition.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/OperationDefinition.java @@ -161,12 +161,14 @@ public class OperationDefinition extends CanonicalResource { } public String toCode(OperationKind code) { - if (code == OperationKind.OPERATION) + if (code == OperationKind.NULL) + return null; + if (code == OperationKind.OPERATION) return "operation"; if (code == OperationKind.QUERY) return "query"; return "?"; - } + } public String toSystem(OperationKind code) { return code.getSystem(); @@ -1070,9 +1072,9 @@ public class OperationDefinition extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("name")) { this.name = null; @@ -1485,9 +1487,9 @@ public class OperationDefinition extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("strength")) { this.strength = null; @@ -1795,9 +1797,9 @@ public class OperationDefinition extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("source")) { this.source = null; @@ -2091,9 +2093,9 @@ public class OperationDefinition extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("parameterName")) { this.getParameterName().remove(value); @@ -4368,9 +4370,9 @@ public class OperationDefinition extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("url")) { this.url = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/OperationOutcome.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/OperationOutcome.java index 20116b694..751465b04 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/OperationOutcome.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/OperationOutcome.java @@ -201,7 +201,9 @@ public class OperationOutcome extends DomainResource implements IBaseOperationOu } public String toCode(IssueSeverity code) { - if (code == IssueSeverity.FATAL) + if (code == IssueSeverity.NULL) + return null; + if (code == IssueSeverity.FATAL) return "fatal"; if (code == IssueSeverity.ERROR) return "error"; @@ -210,7 +212,7 @@ public class OperationOutcome extends DomainResource implements IBaseOperationOu if (code == IssueSeverity.INFORMATION) return "information"; return "?"; - } + } public String toSystem(IssueSeverity code) { return code.getSystem(); @@ -870,7 +872,9 @@ public class OperationOutcome extends DomainResource implements IBaseOperationOu } public String toCode(IssueType code) { - if (code == IssueType.INVALID) + if (code == IssueType.NULL) + return null; + if (code == IssueType.INVALID) return "invalid"; if (code == IssueType.STRUCTURE) return "structure"; @@ -933,7 +937,7 @@ public class OperationOutcome extends DomainResource implements IBaseOperationOu if (code == IssueType.INFORMATIONAL) return "informational"; return "?"; - } + } public String toSystem(IssueType code) { return code.getSystem(); @@ -1504,9 +1508,9 @@ public class OperationOutcome extends DomainResource implements IBaseOperationOu } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("severity")) { this.severity = null; @@ -1777,9 +1781,9 @@ public class OperationOutcome extends DomainResource implements IBaseOperationOu } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("issue")) { this.getIssue().remove((OperationOutcomeIssueComponent) value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Patient.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Patient.java index 1d005f2e5..12fe0f424 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Patient.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Patient.java @@ -209,7 +209,9 @@ public class Patient extends DomainResource { } public String toCode(LinkType code) { - if (code == LinkType.REPLACEDBY) + if (code == LinkType.NULL) + return null; + if (code == LinkType.REPLACEDBY) return "replaced-by"; if (code == LinkType.REPLACES) return "replaces"; @@ -218,7 +220,7 @@ public class Patient extends DomainResource { if (code == LinkType.SEEALSO) return "seealso"; return "?"; - } + } public String toSystem(LinkType code) { return code.getSystem(); @@ -691,9 +693,9 @@ public class Patient extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("relationship")) { this.getRelationship().remove(value); @@ -1035,9 +1037,9 @@ public class Patient extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("language")) { this.language = null; @@ -1304,9 +1306,9 @@ public class Patient extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("other")) { this.other = null; @@ -2655,9 +2657,9 @@ public class Patient extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Person.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Person.java index 789609a08..318e4e4a0 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Person.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Person.java @@ -197,7 +197,9 @@ public class Person extends DomainResource { } public String toCode(IdentityAssuranceLevel code) { - if (code == IdentityAssuranceLevel.LEVEL1) + if (code == IdentityAssuranceLevel.NULL) + return null; + if (code == IdentityAssuranceLevel.LEVEL1) return "level1"; if (code == IdentityAssuranceLevel.LEVEL2) return "level2"; @@ -206,7 +208,7 @@ public class Person extends DomainResource { if (code == IdentityAssuranceLevel.LEVEL4) return "level4"; return "?"; - } + } public String toSystem(IdentityAssuranceLevel code) { return code.getSystem(); @@ -394,9 +396,9 @@ public class Person extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("target")) { this.target = null; @@ -1213,9 +1215,9 @@ public class Person extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Provenance.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Provenance.java index 63d03357b..c1e106ae5 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Provenance.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Provenance.java @@ -230,7 +230,9 @@ public class Provenance extends DomainResource { } public String toCode(ProvenanceEntityRole code) { - if (code == ProvenanceEntityRole.DERIVATION) + if (code == ProvenanceEntityRole.NULL) + return null; + if (code == ProvenanceEntityRole.DERIVATION) return "derivation"; if (code == ProvenanceEntityRole.REVISION) return "revision"; @@ -241,7 +243,7 @@ public class Provenance extends DomainResource { if (code == ProvenanceEntityRole.REMOVAL) return "removal"; return "?"; - } + } public String toSystem(ProvenanceEntityRole code) { return code.getSystem(); @@ -526,9 +528,9 @@ public class Provenance extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -901,9 +903,9 @@ public class Provenance extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("role")) { this.role = null; @@ -1794,9 +1796,9 @@ public class Provenance extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("target")) { this.getTarget().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Questionnaire.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Questionnaire.java index 85d542c16..f4b8d879b 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Questionnaire.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Questionnaire.java @@ -163,12 +163,14 @@ public class Questionnaire extends CanonicalResource { } public String toCode(EnableWhenBehavior code) { - if (code == EnableWhenBehavior.ALL) + if (code == EnableWhenBehavior.NULL) + return null; + if (code == EnableWhenBehavior.ALL) return "all"; if (code == EnableWhenBehavior.ANY) return "any"; return "?"; - } + } public String toSystem(EnableWhenBehavior code) { return code.getSystem(); @@ -380,7 +382,9 @@ public class Questionnaire extends CanonicalResource { } public String toCode(QuestionnaireItemOperator code) { - if (code == QuestionnaireItemOperator.EXISTS) + if (code == QuestionnaireItemOperator.NULL) + return null; + if (code == QuestionnaireItemOperator.EXISTS) return "exists"; if (code == QuestionnaireItemOperator.EQUAL) return "="; @@ -395,7 +399,7 @@ public class Questionnaire extends CanonicalResource { if (code == QuestionnaireItemOperator.LESS_OR_EQUAL) return "<="; return "?"; - } + } public String toSystem(QuestionnaireItemOperator code) { return code.getSystem(); @@ -794,7 +798,9 @@ public class Questionnaire extends CanonicalResource { } public String toCode(QuestionnaireItemType code) { - if (code == QuestionnaireItemType.GROUP) + if (code == QuestionnaireItemType.NULL) + return null; + if (code == QuestionnaireItemType.GROUP) return "group"; if (code == QuestionnaireItemType.DISPLAY) return "display"; @@ -829,7 +835,7 @@ public class Questionnaire extends CanonicalResource { if (code == QuestionnaireItemType.QUANTITY) return "quantity"; return "?"; - } + } public String toSystem(QuestionnaireItemType code) { return code.getSystem(); @@ -2226,9 +2232,9 @@ public class Questionnaire extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("linkId")) { this.linkId = null; @@ -2995,9 +3001,9 @@ public class Questionnaire extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("question")) { this.question = null; @@ -3427,9 +3433,9 @@ public class Questionnaire extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("value[x]")) { this.value = null; @@ -3874,9 +3880,9 @@ public class Questionnaire extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("value[x]")) { this.value = null; @@ -5862,9 +5868,9 @@ public class Questionnaire extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("url")) { this.url = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/QuestionnaireResponse.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/QuestionnaireResponse.java index 8cbe5f66a..1b5e992ab 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/QuestionnaireResponse.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/QuestionnaireResponse.java @@ -221,7 +221,9 @@ public class QuestionnaireResponse extends DomainResource { } public String toCode(QuestionnaireResponseStatus code) { - if (code == QuestionnaireResponseStatus.INPROGRESS) + if (code == QuestionnaireResponseStatus.NULL) + return null; + if (code == QuestionnaireResponseStatus.INPROGRESS) return "in-progress"; if (code == QuestionnaireResponseStatus.COMPLETED) return "completed"; @@ -232,7 +234,7 @@ public class QuestionnaireResponse extends DomainResource { if (code == QuestionnaireResponseStatus.STOPPED) return "stopped"; return "?"; - } + } public String toSystem(QuestionnaireResponseStatus code) { return code.getSystem(); @@ -679,9 +681,9 @@ public class QuestionnaireResponse extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("linkId")) { this.linkId = null; @@ -1229,9 +1231,9 @@ public class QuestionnaireResponse extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("value[x]")) { this.value = null; @@ -2135,9 +2137,9 @@ public class QuestionnaireResponse extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.identifier = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/RelatedArtifact.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/RelatedArtifact.java index 1b409e273..00d3c7cfd 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/RelatedArtifact.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/RelatedArtifact.java @@ -280,7 +280,9 @@ public class RelatedArtifact extends DataType implements ICompositeType { } public String toCode(RelatedArtifactType code) { - if (code == RelatedArtifactType.DOCUMENTATION) + if (code == RelatedArtifactType.NULL) + return null; + if (code == RelatedArtifactType.DOCUMENTATION) return "documentation"; if (code == RelatedArtifactType.JUSTIFICATION) return "justification"; @@ -297,7 +299,7 @@ public class RelatedArtifact extends DataType implements ICompositeType { if (code == RelatedArtifactType.COMPOSEDOF) return "composed-of"; return "?"; - } + } public String toSystem(RelatedArtifactType code) { return code.getSystem(); @@ -871,9 +873,9 @@ public class RelatedArtifact extends DataType implements ICompositeType { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ResearchElementDefinition.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ResearchElementDefinition.java index 7aa3820c1..76aaae5d5 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ResearchElementDefinition.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ResearchElementDefinition.java @@ -181,14 +181,16 @@ public class ResearchElementDefinition extends CanonicalResource { } public String toCode(ResearchElementType code) { - if (code == ResearchElementType.POPULATION) + if (code == ResearchElementType.NULL) + return null; + if (code == ResearchElementType.POPULATION) return "population"; if (code == ResearchElementType.EXPOSURE) return "exposure"; if (code == ResearchElementType.OUTCOME) return "outcome"; return "?"; - } + } public String toSystem(ResearchElementType code) { return code.getSystem(); @@ -321,14 +323,16 @@ public class ResearchElementDefinition extends CanonicalResource { } public String toCode(VariableType code) { - if (code == VariableType.DICHOTOMOUS) + if (code == VariableType.NULL) + return null; + if (code == VariableType.DICHOTOMOUS) return "dichotomous"; if (code == VariableType.CONTINUOUS) return "continuous"; if (code == VariableType.DESCRIPTIVE) return "descriptive"; return "?"; - } + } public String toSystem(VariableType code) { return code.getSystem(); @@ -1428,9 +1432,9 @@ public class ResearchElementDefinition extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("definition[x]")) { this.definition = null; @@ -4494,9 +4498,9 @@ public class ResearchElementDefinition extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("url")) { this.url = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ResearchStudy.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ResearchStudy.java index 4c9e7fa06..f6971a77f 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ResearchStudy.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ResearchStudy.java @@ -335,7 +335,9 @@ public class ResearchStudy extends DomainResource { } public String toCode(ResearchStudyStatus code) { - if (code == ResearchStudyStatus.ACTIVE) + if (code == ResearchStudyStatus.NULL) + return null; + if (code == ResearchStudyStatus.ACTIVE) return "active"; if (code == ResearchStudyStatus.ADMINISTRATIVELYCOMPLETED) return "administratively-completed"; @@ -358,7 +360,7 @@ public class ResearchStudy extends DomainResource { if (code == ResearchStudyStatus.WITHDRAWN) return "withdrawn"; return "?"; - } + } public String toSystem(ResearchStudyStatus code) { return code.getSystem(); @@ -617,9 +619,9 @@ public class ResearchStudy extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("name")) { this.name = null; @@ -883,9 +885,9 @@ public class ResearchStudy extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("name")) { this.name = null; @@ -2727,9 +2729,9 @@ public class ResearchStudy extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ResearchSubject.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ResearchSubject.java index 4c3c84d60..8c597ead5 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ResearchSubject.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ResearchSubject.java @@ -370,7 +370,9 @@ public class ResearchSubject extends DomainResource { } public String toCode(ResearchSubjectStatus code) { - if (code == ResearchSubjectStatus.CANDIDATE) + if (code == ResearchSubjectStatus.NULL) + return null; + if (code == ResearchSubjectStatus.CANDIDATE) return "candidate"; if (code == ResearchSubjectStatus.ELIGIBLE) return "eligible"; @@ -397,7 +399,7 @@ public class ResearchSubject extends DomainResource { if (code == ResearchSubjectStatus.WITHDRAWN) return "withdrawn"; return "?"; - } + } public String toSystem(ResearchSubjectStatus code) { return code.getSystem(); @@ -942,9 +944,9 @@ public class ResearchSubject extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/SearchParameter.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/SearchParameter.java index c6bdd36a8..93847835f 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/SearchParameter.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/SearchParameter.java @@ -292,7 +292,9 @@ public class SearchParameter extends CanonicalResource { } public String toCode(SearchComparator code) { - if (code == SearchComparator.EQ) + if (code == SearchComparator.NULL) + return null; + if (code == SearchComparator.EQ) return "eq"; if (code == SearchComparator.NE) return "ne"; @@ -311,7 +313,7 @@ public class SearchParameter extends CanonicalResource { if (code == SearchComparator.AP) return "ap"; return "?"; - } + } public String toSystem(SearchComparator code) { return code.getSystem(); @@ -620,7 +622,9 @@ public class SearchParameter extends CanonicalResource { } public String toCode(SearchModifierCode code) { - if (code == SearchModifierCode.MISSING) + if (code == SearchModifierCode.NULL) + return null; + if (code == SearchModifierCode.MISSING) return "missing"; if (code == SearchModifierCode.EXACT) return "exact"; @@ -645,7 +649,7 @@ public class SearchParameter extends CanonicalResource { if (code == SearchModifierCode.OFTYPE) return "ofType"; return "?"; - } + } public String toSystem(SearchModifierCode code) { return code.getSystem(); @@ -818,7 +822,9 @@ public class SearchParameter extends CanonicalResource { } public String toCode(XPathUsageType code) { - if (code == XPathUsageType.NORMAL) + if (code == XPathUsageType.NULL) + return null; + if (code == XPathUsageType.NORMAL) return "normal"; if (code == XPathUsageType.PHONETIC) return "phonetic"; @@ -829,7 +835,7 @@ public class SearchParameter extends CanonicalResource { if (code == XPathUsageType.OTHER) return "other"; return "?"; - } + } public String toSystem(XPathUsageType code) { return code.getSystem(); @@ -1042,9 +1048,9 @@ public class SearchParameter extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("definition")) { this.definition = null; @@ -3380,9 +3386,9 @@ public class SearchParameter extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("url")) { this.url = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Slot.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Slot.java index 60b6c8ed6..aea1cad8c 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Slot.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Slot.java @@ -217,7 +217,9 @@ public class Slot extends DomainResource { } public String toCode(SlotStatus code) { - if (code == SlotStatus.BUSY) + if (code == SlotStatus.NULL) + return null; + if (code == SlotStatus.BUSY) return "busy"; if (code == SlotStatus.FREE) return "free"; @@ -228,7 +230,7 @@ public class Slot extends DomainResource { if (code == SlotStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(SlotStatus code) { return code.getSystem(); @@ -1066,9 +1068,9 @@ public class Slot extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Specimen.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Specimen.java index 73ff2974d..77326ceac 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Specimen.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Specimen.java @@ -198,7 +198,9 @@ public class Specimen extends DomainResource { } public String toCode(SpecimenStatus code) { - if (code == SpecimenStatus.AVAILABLE) + if (code == SpecimenStatus.NULL) + return null; + if (code == SpecimenStatus.AVAILABLE) return "available"; if (code == SpecimenStatus.UNAVAILABLE) return "unavailable"; @@ -207,7 +209,7 @@ public class Specimen extends DomainResource { if (code == SpecimenStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(SpecimenStatus code) { return code.getSystem(); @@ -684,9 +686,9 @@ public class Specimen extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("collector")) { this.collector = null; @@ -1180,9 +1182,9 @@ public class Specimen extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("description")) { this.description = null; @@ -1741,9 +1743,9 @@ public class Specimen extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); @@ -2816,9 +2818,9 @@ public class Specimen extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/SpecimenDefinition.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/SpecimenDefinition.java index 271af83c1..42855b64b 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/SpecimenDefinition.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/SpecimenDefinition.java @@ -161,12 +161,14 @@ public class SpecimenDefinition extends DomainResource { } public String toCode(SpecimenContainedPreference code) { - if (code == SpecimenContainedPreference.PREFERRED) + if (code == SpecimenContainedPreference.NULL) + return null; + if (code == SpecimenContainedPreference.PREFERRED) return "preferred"; if (code == SpecimenContainedPreference.ALTERNATE) return "alternate"; return "?"; - } + } public String toSystem(SpecimenContainedPreference code) { return code.getSystem(); @@ -745,9 +747,9 @@ public class SpecimenDefinition extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("isDerived")) { this.isDerived = null; @@ -1458,9 +1460,9 @@ public class SpecimenDefinition extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("material")) { this.material = null; @@ -1779,9 +1781,9 @@ public class SpecimenDefinition extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("additive[x]")) { this.additive = null; @@ -2149,9 +2151,9 @@ public class SpecimenDefinition extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("temperatureQualifier")) { this.temperatureQualifier = null; @@ -2708,9 +2710,9 @@ public class SpecimenDefinition extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.identifier = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/StructureDefinition.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/StructureDefinition.java index c68bb9e49..074719d9e 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/StructureDefinition.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/StructureDefinition.java @@ -185,14 +185,16 @@ public class StructureDefinition extends CanonicalResource { } public String toCode(ExtensionContextType code) { - if (code == ExtensionContextType.FHIRPATH) + if (code == ExtensionContextType.NULL) + return null; + if (code == ExtensionContextType.FHIRPATH) return "fhirpath"; if (code == ExtensionContextType.ELEMENT) return "element"; if (code == ExtensionContextType.EXTENSION) return "extension"; return "?"; - } + } public String toSystem(ExtensionContextType code) { return code.getSystem(); @@ -355,7 +357,9 @@ public class StructureDefinition extends CanonicalResource { } public String toCode(StructureDefinitionKind code) { - if (code == StructureDefinitionKind.PRIMITIVETYPE) + if (code == StructureDefinitionKind.NULL) + return null; + if (code == StructureDefinitionKind.PRIMITIVETYPE) return "primitive-type"; if (code == StructureDefinitionKind.COMPLEXTYPE) return "complex-type"; @@ -364,7 +368,7 @@ public class StructureDefinition extends CanonicalResource { if (code == StructureDefinitionKind.LOGICAL) return "logical"; return "?"; - } + } public String toSystem(StructureDefinitionKind code) { return code.getSystem(); @@ -480,12 +484,14 @@ public class StructureDefinition extends CanonicalResource { } public String toCode(TypeDerivationRule code) { - if (code == TypeDerivationRule.SPECIALIZATION) + if (code == TypeDerivationRule.NULL) + return null; + if (code == TypeDerivationRule.SPECIALIZATION) return "specialization"; if (code == TypeDerivationRule.CONSTRAINT) return "constraint"; return "?"; - } + } public String toSystem(TypeDerivationRule code) { return code.getSystem(); @@ -851,9 +857,9 @@ public class StructureDefinition extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identity")) { this.identity = null; @@ -1168,9 +1174,9 @@ public class StructureDefinition extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -1390,9 +1396,9 @@ public class StructureDefinition extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("element")) { this.getElement().remove(value); @@ -1608,9 +1614,9 @@ public class StructureDefinition extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("element")) { this.getElement().remove(value); @@ -3975,9 +3981,9 @@ public class StructureDefinition extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("url")) { this.url = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/StructureMap.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/StructureMap.java index 71717f8e1..73372593f 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/StructureMap.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/StructureMap.java @@ -163,12 +163,14 @@ public class StructureMap extends CanonicalResource { } public String toCode(StructureMapContextType code) { - if (code == StructureMapContextType.TYPE) + if (code == StructureMapContextType.NULL) + return null; + if (code == StructureMapContextType.TYPE) return "type"; if (code == StructureMapContextType.VARIABLE) return "variable"; return "?"; - } + } public String toSystem(StructureMapContextType code) { return code.getSystem(); @@ -302,14 +304,16 @@ public class StructureMap extends CanonicalResource { } public String toCode(StructureMapGroupTypeMode code) { - if (code == StructureMapGroupTypeMode.NONE) + if (code == StructureMapGroupTypeMode.NULL) + return null; + if (code == StructureMapGroupTypeMode.NONE) return "none"; if (code == StructureMapGroupTypeMode.TYPES) return "types"; if (code == StructureMapGroupTypeMode.TYPEANDTYPES) return "type-and-types"; return "?"; - } + } public String toSystem(StructureMapGroupTypeMode code) { return code.getSystem(); @@ -424,12 +428,14 @@ public class StructureMap extends CanonicalResource { } public String toCode(StructureMapInputMode code) { - if (code == StructureMapInputMode.SOURCE) + if (code == StructureMapInputMode.NULL) + return null; + if (code == StructureMapInputMode.SOURCE) return "source"; if (code == StructureMapInputMode.TARGET) return "target"; return "?"; - } + } public String toSystem(StructureMapInputMode code) { return code.getSystem(); @@ -584,7 +590,9 @@ public class StructureMap extends CanonicalResource { } public String toCode(StructureMapModelMode code) { - if (code == StructureMapModelMode.SOURCE) + if (code == StructureMapModelMode.NULL) + return null; + if (code == StructureMapModelMode.SOURCE) return "source"; if (code == StructureMapModelMode.QUERIED) return "queried"; @@ -593,7 +601,7 @@ public class StructureMap extends CanonicalResource { if (code == StructureMapModelMode.PRODUCED) return "produced"; return "?"; - } + } public String toSystem(StructureMapModelMode code) { return code.getSystem(); @@ -762,7 +770,9 @@ public class StructureMap extends CanonicalResource { } public String toCode(StructureMapSourceListMode code) { - if (code == StructureMapSourceListMode.FIRST) + if (code == StructureMapSourceListMode.NULL) + return null; + if (code == StructureMapSourceListMode.FIRST) return "first"; if (code == StructureMapSourceListMode.NOTFIRST) return "not_first"; @@ -773,7 +783,7 @@ public class StructureMap extends CanonicalResource { if (code == StructureMapSourceListMode.ONLYONE) return "only_one"; return "?"; - } + } public String toSystem(StructureMapSourceListMode code) { return code.getSystem(); @@ -929,7 +939,9 @@ public class StructureMap extends CanonicalResource { } public String toCode(StructureMapTargetListMode code) { - if (code == StructureMapTargetListMode.FIRST) + if (code == StructureMapTargetListMode.NULL) + return null; + if (code == StructureMapTargetListMode.FIRST) return "first"; if (code == StructureMapTargetListMode.SHARE) return "share"; @@ -938,7 +950,7 @@ public class StructureMap extends CanonicalResource { if (code == StructureMapTargetListMode.COLLATE) return "collate"; return "?"; - } + } public String toSystem(StructureMapTargetListMode code) { return code.getSystem(); @@ -1333,7 +1345,9 @@ public class StructureMap extends CanonicalResource { } public String toCode(StructureMapTransform code) { - if (code == StructureMapTransform.CREATE) + if (code == StructureMapTransform.NULL) + return null; + if (code == StructureMapTransform.CREATE) return "create"; if (code == StructureMapTransform.COPY) return "copy"; @@ -1368,7 +1382,7 @@ public class StructureMap extends CanonicalResource { if (code == StructureMapTransform.CP) return "cp"; return "?"; - } + } public String toSystem(StructureMapTransform code) { return code.getSystem(); @@ -1717,9 +1731,9 @@ public class StructureMap extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("url")) { this.url = null; @@ -2339,9 +2353,9 @@ public class StructureMap extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("name")) { this.name = null; @@ -2821,9 +2835,9 @@ public class StructureMap extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("name")) { this.name = null; @@ -3423,9 +3437,9 @@ public class StructureMap extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("name")) { this.name = null; @@ -5467,9 +5481,9 @@ public class StructureMap extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("context")) { this.context = null; @@ -6454,9 +6468,9 @@ public class StructureMap extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("context")) { this.context = null; @@ -6818,9 +6832,9 @@ public class StructureMap extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("value[x]")) { this.value = null; @@ -7125,9 +7139,9 @@ public class StructureMap extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("name")) { this.name = null; @@ -8769,9 +8783,9 @@ public class StructureMap extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("url")) { this.url = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Subscription.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Subscription.java index b1a0e7306..183713d9f 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Subscription.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Subscription.java @@ -225,7 +225,9 @@ public class Subscription extends DomainResource { } public String toCode(SubscriptionChannelType code) { - if (code == SubscriptionChannelType.RESTHOOK) + if (code == SubscriptionChannelType.NULL) + return null; + if (code == SubscriptionChannelType.RESTHOOK) return "rest-hook"; if (code == SubscriptionChannelType.WEBSOCKET) return "websocket"; @@ -236,7 +238,7 @@ public class Subscription extends DomainResource { if (code == SubscriptionChannelType.MESSAGE) return "message"; return "?"; - } + } public String toSystem(SubscriptionChannelType code) { return code.getSystem(); @@ -621,9 +623,9 @@ public class Subscription extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -1293,9 +1295,9 @@ public class Subscription extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("status")) { value = new org.hl7.fhir.r4b.model.Enumerations.SubscriptionStatusEnumFactory() diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/SubscriptionStatus.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/SubscriptionStatus.java index 4f1d1e7bd..cda403548 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/SubscriptionStatus.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/SubscriptionStatus.java @@ -218,7 +218,9 @@ public class SubscriptionStatus extends DomainResource { } public String toCode(SubscriptionNotificationType code) { - if (code == SubscriptionNotificationType.HANDSHAKE) + if (code == SubscriptionNotificationType.NULL) + return null; + if (code == SubscriptionNotificationType.HANDSHAKE) return "handshake"; if (code == SubscriptionNotificationType.HEARTBEAT) return "heartbeat"; @@ -229,7 +231,7 @@ public class SubscriptionStatus extends DomainResource { if (code == SubscriptionNotificationType.QUERYEVENT) return "query-event"; return "?"; - } + } public String toSystem(SubscriptionNotificationType code) { return code.getSystem(); @@ -578,9 +580,9 @@ public class SubscriptionStatus extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("eventNumber")) { this.eventNumber = null; @@ -1372,9 +1374,9 @@ public class SubscriptionStatus extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("status")) { value = new org.hl7.fhir.r4b.model.Enumerations.SubscriptionStatusEnumFactory() diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/SubscriptionTopic.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/SubscriptionTopic.java index a86d16017..b55527144 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/SubscriptionTopic.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/SubscriptionTopic.java @@ -163,12 +163,14 @@ public class SubscriptionTopic extends DomainResource { } public String toCode(CriteriaNotExistsBehavior code) { - if (code == CriteriaNotExistsBehavior.TESTPASSES) + if (code == CriteriaNotExistsBehavior.NULL) + return null; + if (code == CriteriaNotExistsBehavior.TESTPASSES) return "test-passes"; if (code == CriteriaNotExistsBehavior.TESTFAILS) return "test-fails"; return "?"; - } + } public String toSystem(CriteriaNotExistsBehavior code) { return code.getSystem(); @@ -301,14 +303,16 @@ public class SubscriptionTopic extends DomainResource { } public String toCode(InteractionTrigger code) { - if (code == InteractionTrigger.CREATE) + if (code == InteractionTrigger.NULL) + return null; + if (code == InteractionTrigger.CREATE) return "create"; if (code == InteractionTrigger.UPDATE) return "update"; if (code == InteractionTrigger.DELETE) return "delete"; return "?"; - } + } public String toSystem(InteractionTrigger code) { return code.getSystem(); @@ -677,7 +681,9 @@ public class SubscriptionTopic extends DomainResource { } public String toCode(SubscriptionSearchModifier code) { - if (code == SubscriptionSearchModifier.EQUAL) + if (code == SubscriptionSearchModifier.NULL) + return null; + if (code == SubscriptionSearchModifier.EQUAL) return "="; if (code == SubscriptionSearchModifier.EQ) return "eq"; @@ -708,7 +714,7 @@ public class SubscriptionTopic extends DomainResource { if (code == SubscriptionSearchModifier.OFTYPE) return "of-type"; return "?"; - } + } public String toSystem(SubscriptionSearchModifier code) { return code.getSystem(); @@ -1189,9 +1195,9 @@ public class SubscriptionTopic extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("description")) { this.description = null; @@ -1787,9 +1793,9 @@ public class SubscriptionTopic extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("previous")) { this.previous = null; @@ -2213,9 +2219,9 @@ public class SubscriptionTopic extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("description")) { this.description = null; @@ -2719,9 +2725,9 @@ public class SubscriptionTopic extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("description")) { this.description = null; @@ -3193,9 +3199,9 @@ public class SubscriptionTopic extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("resource")) { this.resource = null; @@ -5151,9 +5157,9 @@ public class SubscriptionTopic extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("url")) { this.url = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Substance.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Substance.java index 284ae6522..abe3162d8 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Substance.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Substance.java @@ -178,14 +178,16 @@ public class Substance extends DomainResource { } public String toCode(FHIRSubstanceStatus code) { - if (code == FHIRSubstanceStatus.ACTIVE) + if (code == FHIRSubstanceStatus.NULL) + return null; + if (code == FHIRSubstanceStatus.ACTIVE) return "active"; if (code == FHIRSubstanceStatus.INACTIVE) return "inactive"; if (code == FHIRSubstanceStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(FHIRSubstanceStatus code) { return code.getSystem(); @@ -408,9 +410,9 @@ public class Substance extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.identifier = null; @@ -699,9 +701,9 @@ public class Substance extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("quantity")) { this.quantity = null; @@ -1359,9 +1361,9 @@ public class Substance extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/SupplyDelivery.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/SupplyDelivery.java index f5fd42eff..4d7551c3b 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/SupplyDelivery.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/SupplyDelivery.java @@ -198,7 +198,9 @@ public class SupplyDelivery extends DomainResource { } public String toCode(SupplyDeliveryStatus code) { - if (code == SupplyDeliveryStatus.INPROGRESS) + if (code == SupplyDeliveryStatus.NULL) + return null; + if (code == SupplyDeliveryStatus.INPROGRESS) return "in-progress"; if (code == SupplyDeliveryStatus.COMPLETED) return "completed"; @@ -207,7 +209,7 @@ public class SupplyDelivery extends DomainResource { if (code == SupplyDeliveryStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(SupplyDeliveryStatus code) { return code.getSystem(); @@ -408,9 +410,9 @@ public class SupplyDelivery extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("quantity")) { this.quantity = null; @@ -1273,9 +1275,9 @@ public class SupplyDelivery extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/SupplyRequest.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/SupplyRequest.java index 2de6e3522..0a61a3d62 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/SupplyRequest.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/SupplyRequest.java @@ -259,7 +259,9 @@ public class SupplyRequest extends DomainResource { } public String toCode(SupplyRequestStatus code) { - if (code == SupplyRequestStatus.DRAFT) + if (code == SupplyRequestStatus.NULL) + return null; + if (code == SupplyRequestStatus.DRAFT) return "draft"; if (code == SupplyRequestStatus.ACTIVE) return "active"; @@ -274,7 +276,7 @@ public class SupplyRequest extends DomainResource { if (code == SupplyRequestStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(SupplyRequestStatus code) { return code.getSystem(); @@ -492,9 +494,9 @@ public class SupplyRequest extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("code")) { this.code = null; @@ -1697,9 +1699,9 @@ public class SupplyRequest extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Task.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Task.java index 7c0c0d1f5..e471fd370 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Task.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Task.java @@ -300,7 +300,9 @@ public class Task extends DomainResource { } public String toCode(TaskIntent code) { - if (code == TaskIntent.UNKNOWN) + if (code == TaskIntent.NULL) + return null; + if (code == TaskIntent.UNKNOWN) return "unknown"; if (code == TaskIntent.PROPOSAL) return "proposal"; @@ -319,7 +321,7 @@ public class Task extends DomainResource { if (code == TaskIntent.OPTION) return "option"; return "?"; - } + } public String toSystem(TaskIntent code) { return code.getSystem(); @@ -620,7 +622,9 @@ public class Task extends DomainResource { } public String toCode(TaskStatus code) { - if (code == TaskStatus.DRAFT) + if (code == TaskStatus.NULL) + return null; + if (code == TaskStatus.DRAFT) return "draft"; if (code == TaskStatus.REQUESTED) return "requested"; @@ -645,7 +649,7 @@ public class Task extends DomainResource { if (code == TaskStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(TaskStatus code) { return code.getSystem(); @@ -894,9 +898,9 @@ public class Task extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("repetitions")) { this.repetitions = null; @@ -2129,9 +2133,9 @@ public class Task extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -3498,9 +3502,9 @@ public class Task extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -5789,9 +5793,9 @@ public class Task extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/TerminologyCapabilities.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/TerminologyCapabilities.java index 7c0b9c24a..df5e34876 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/TerminologyCapabilities.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/TerminologyCapabilities.java @@ -165,12 +165,14 @@ public class TerminologyCapabilities extends CanonicalResource { } public String toCode(CodeSearchSupport code) { - if (code == CodeSearchSupport.EXPLICIT) + if (code == CodeSearchSupport.NULL) + return null; + if (code == CodeSearchSupport.EXPLICIT) return "explicit"; if (code == CodeSearchSupport.ALL) return "all"; return "?"; - } + } public String toSystem(CodeSearchSupport code) { return code.getSystem(); @@ -373,9 +375,9 @@ public class TerminologyCapabilities extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("name")) { this.name = null; @@ -668,9 +670,9 @@ public class TerminologyCapabilities extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("description")) { this.description = null; @@ -1028,9 +1030,9 @@ public class TerminologyCapabilities extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("uri")) { this.uri = null; @@ -1642,9 +1644,9 @@ public class TerminologyCapabilities extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("code")) { this.code = null; @@ -1999,9 +2001,9 @@ public class TerminologyCapabilities extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("code")) { this.code = null; @@ -2502,9 +2504,9 @@ public class TerminologyCapabilities extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("hierarchical")) { this.hierarchical = null; @@ -2828,9 +2830,9 @@ public class TerminologyCapabilities extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("name")) { this.name = null; @@ -3046,9 +3048,9 @@ public class TerminologyCapabilities extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("translations")) { this.translations = null; @@ -3254,9 +3256,9 @@ public class TerminologyCapabilities extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("needsMap")) { this.needsMap = null; @@ -3453,9 +3455,9 @@ public class TerminologyCapabilities extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("translation")) { this.translation = null; @@ -5412,9 +5414,9 @@ public class TerminologyCapabilities extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("url")) { this.url = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/TestReport.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/TestReport.java index dae0fb41e..395a19a52 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/TestReport.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/TestReport.java @@ -215,7 +215,9 @@ public class TestReport extends DomainResource { } public String toCode(TestReportActionResult code) { - if (code == TestReportActionResult.PASS) + if (code == TestReportActionResult.NULL) + return null; + if (code == TestReportActionResult.PASS) return "pass"; if (code == TestReportActionResult.SKIP) return "skip"; @@ -226,7 +228,7 @@ public class TestReport extends DomainResource { if (code == TestReportActionResult.ERROR) return "error"; return "?"; - } + } public String toSystem(TestReportActionResult code) { return code.getSystem(); @@ -359,14 +361,16 @@ public class TestReport extends DomainResource { } public String toCode(TestReportParticipantType code) { - if (code == TestReportParticipantType.TESTENGINE) + if (code == TestReportParticipantType.NULL) + return null; + if (code == TestReportParticipantType.TESTENGINE) return "test-engine"; if (code == TestReportParticipantType.CLIENT) return "client"; if (code == TestReportParticipantType.SERVER) return "server"; return "?"; - } + } public String toSystem(TestReportParticipantType code) { return code.getSystem(); @@ -499,14 +503,16 @@ public class TestReport extends DomainResource { } public String toCode(TestReportResult code) { - if (code == TestReportResult.PASS) + if (code == TestReportResult.NULL) + return null; + if (code == TestReportResult.PASS) return "pass"; if (code == TestReportResult.FAIL) return "fail"; if (code == TestReportResult.PENDING) return "pending"; return "?"; - } + } public String toSystem(TestReportResult code) { return code.getSystem(); @@ -675,7 +681,9 @@ public class TestReport extends DomainResource { } public String toCode(TestReportStatus code) { - if (code == TestReportStatus.COMPLETED) + if (code == TestReportStatus.NULL) + return null; + if (code == TestReportStatus.COMPLETED) return "completed"; if (code == TestReportStatus.INPROGRESS) return "in-progress"; @@ -686,7 +694,7 @@ public class TestReport extends DomainResource { if (code == TestReportStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(TestReportStatus code) { return code.getSystem(); @@ -957,9 +965,9 @@ public class TestReport extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -1188,9 +1196,9 @@ public class TestReport extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("action")) { this.getAction().remove((SetupActionComponent) value); @@ -1409,9 +1417,9 @@ public class TestReport extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("operation")) { this.operation = (SetupActionOperationComponent) value; // SetupActionOperationComponent @@ -1772,9 +1780,9 @@ public class TestReport extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("result")) { this.result = null; @@ -2144,9 +2152,9 @@ public class TestReport extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("result")) { this.result = null; @@ -2532,9 +2540,9 @@ public class TestReport extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("name")) { this.name = null; @@ -2778,9 +2786,9 @@ public class TestReport extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("operation")) { this.operation = (SetupActionOperationComponent) value; // SetupActionOperationComponent @@ -3000,9 +3008,9 @@ public class TestReport extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("action")) { this.getAction().remove((TeardownActionComponent) value); @@ -3189,9 +3197,9 @@ public class TestReport extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("operation")) { this.operation = (SetupActionOperationComponent) value; // SetupActionOperationComponent @@ -4138,9 +4146,9 @@ public class TestReport extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.identifier = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/TestScript.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/TestScript.java index e7bd27263..29c1e84d2 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/TestScript.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/TestScript.java @@ -161,12 +161,14 @@ public class TestScript extends CanonicalResource { } public String toCode(AssertionDirectionType code) { - if (code == AssertionDirectionType.RESPONSE) + if (code == AssertionDirectionType.NULL) + return null; + if (code == AssertionDirectionType.RESPONSE) return "response"; if (code == AssertionDirectionType.REQUEST) return "request"; return "?"; - } + } public String toSystem(AssertionDirectionType code) { return code.getSystem(); @@ -443,7 +445,9 @@ public class TestScript extends CanonicalResource { } public String toCode(AssertionOperatorType code) { - if (code == AssertionOperatorType.EQUALS) + if (code == AssertionOperatorType.NULL) + return null; + if (code == AssertionOperatorType.EQUALS) return "equals"; if (code == AssertionOperatorType.NOTEQUALS) return "notEquals"; @@ -466,7 +470,7 @@ public class TestScript extends CanonicalResource { if (code == AssertionOperatorType.EVAL) return "eval"; return "?"; - } + } public String toSystem(AssertionOperatorType code) { return code.getSystem(); @@ -761,7 +765,9 @@ public class TestScript extends CanonicalResource { } public String toCode(AssertionResponseTypes code) { - if (code == AssertionResponseTypes.OKAY) + if (code == AssertionResponseTypes.NULL) + return null; + if (code == AssertionResponseTypes.OKAY) return "okay"; if (code == AssertionResponseTypes.CREATED) return "created"; @@ -786,7 +792,7 @@ public class TestScript extends CanonicalResource { if (code == AssertionResponseTypes.UNPROCESSABLE) return "unprocessable"; return "?"; - } + } public String toSystem(AssertionResponseTypes code) { return code.getSystem(); @@ -4928,7 +4934,9 @@ public class TestScript extends CanonicalResource { } public String toCode(FHIRDefinedType code) { - if (code == FHIRDefinedType.ADDRESS) + if (code == FHIRDefinedType.NULL) + return null; + if (code == FHIRDefinedType.ADDRESS) return "Address"; if (code == FHIRDefinedType.AGE) return "Age"; @@ -5345,7 +5353,7 @@ public class TestScript extends CanonicalResource { if (code == FHIRDefinedType.PARAMETERS) return "Parameters"; return "?"; - } + } public String toSystem(FHIRDefinedType code) { return code.getSystem(); @@ -5550,7 +5558,9 @@ public class TestScript extends CanonicalResource { } public String toCode(TestScriptRequestMethodCode code) { - if (code == TestScriptRequestMethodCode.DELETE) + if (code == TestScriptRequestMethodCode.NULL) + return null; + if (code == TestScriptRequestMethodCode.DELETE) return "delete"; if (code == TestScriptRequestMethodCode.GET) return "get"; @@ -5565,7 +5575,7 @@ public class TestScript extends CanonicalResource { if (code == TestScriptRequestMethodCode.HEAD) return "head"; return "?"; - } + } public String toSystem(TestScriptRequestMethodCode code) { return code.getSystem(); @@ -5749,9 +5759,9 @@ public class TestScript extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("index")) { this.index = null; @@ -6020,9 +6030,9 @@ public class TestScript extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("index")) { this.index = null; @@ -6320,9 +6330,9 @@ public class TestScript extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("link")) { this.getLink().remove((TestScriptMetadataLinkComponent) value); @@ -6621,9 +6631,9 @@ public class TestScript extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("url")) { this.url = null; @@ -7333,9 +7343,9 @@ public class TestScript extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("required")) { this.required = null; @@ -7767,9 +7777,9 @@ public class TestScript extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("autocreate")) { this.autocreate = null; @@ -8549,9 +8559,9 @@ public class TestScript extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("name")) { this.name = null; @@ -8831,9 +8841,9 @@ public class TestScript extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("action")) { this.getAction().remove((SetupActionComponent) value); @@ -9055,9 +9065,9 @@ public class TestScript extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("operation")) { this.operation = (SetupActionOperationComponent) value; // SetupActionOperationComponent @@ -10481,9 +10491,9 @@ public class TestScript extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; @@ -10929,9 +10939,9 @@ public class TestScript extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("field")) { this.field = null; @@ -12826,9 +12836,9 @@ public class TestScript extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("label")) { this.label = null; @@ -13414,9 +13424,9 @@ public class TestScript extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("name")) { this.name = null; @@ -13663,9 +13673,9 @@ public class TestScript extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("operation")) { this.operation = (SetupActionOperationComponent) value; // SetupActionOperationComponent @@ -13885,9 +13895,9 @@ public class TestScript extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("action")) { this.getAction().remove((TeardownActionComponent) value); @@ -14074,9 +14084,9 @@ public class TestScript extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("operation")) { this.operation = (SetupActionOperationComponent) value; // SetupActionOperationComponent @@ -16073,9 +16083,9 @@ public class TestScript extends CanonicalResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("url")) { this.url = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Timing.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Timing.java index 01b71ee7c..51bf5c76f 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Timing.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Timing.java @@ -609,7 +609,9 @@ public class Timing extends BackboneType implements ICompositeType { } public String toCode(EventTiming code) { - if (code == EventTiming.MORN) + if (code == EventTiming.NULL) + return null; + if (code == EventTiming.MORN) return "MORN"; if (code == EventTiming.MORN_EARLY) return "MORN.early"; @@ -662,7 +664,7 @@ public class Timing extends BackboneType implements ICompositeType { if (code == EventTiming.PCV) return "PCV"; return "?"; - } + } public String toSystem(EventTiming code) { return code.getSystem(); @@ -867,7 +869,9 @@ public class Timing extends BackboneType implements ICompositeType { } public String toCode(UnitsOfTime code) { - if (code == UnitsOfTime.S) + if (code == UnitsOfTime.NULL) + return null; + if (code == UnitsOfTime.S) return "s"; if (code == UnitsOfTime.MIN) return "min"; @@ -882,7 +886,7 @@ public class Timing extends BackboneType implements ICompositeType { if (code == UnitsOfTime.A) return "a"; return "?"; - } + } public String toSystem(UnitsOfTime code) { return code.getSystem(); @@ -2321,9 +2325,9 @@ public class Timing extends BackboneType implements ICompositeType { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("bounds[x]")) { this.bounds = null; @@ -2807,9 +2811,9 @@ public class Timing extends BackboneType implements ICompositeType { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("event")) { this.getEvent().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/TriggerDefinition.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/TriggerDefinition.java index 5c72a85f4..cd45fb221 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/TriggerDefinition.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/TriggerDefinition.java @@ -273,7 +273,9 @@ public class TriggerDefinition extends DataType implements ICompositeType { } public String toCode(TriggerType code) { - if (code == TriggerType.NAMEDEVENT) + if (code == TriggerType.NULL) + return null; + if (code == TriggerType.NAMEDEVENT) return "named-event"; if (code == TriggerType.PERIODIC) return "periodic"; @@ -290,7 +292,7 @@ public class TriggerDefinition extends DataType implements ICompositeType { if (code == TriggerType.DATAACCESSENDED) return "data-access-ended"; return "?"; - } + } public String toSystem(TriggerType code) { return code.getSystem(); @@ -762,9 +764,9 @@ public class TriggerDefinition extends DataType implements ICompositeType { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("type")) { this.type = null; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/VerificationResult.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/VerificationResult.java index a01eb4e4e..002eb8f2e 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/VerificationResult.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/VerificationResult.java @@ -233,7 +233,9 @@ public class VerificationResult extends DomainResource { } public String toCode(Status code) { - if (code == Status.ATTESTED) + if (code == Status.NULL) + return null; + if (code == Status.ATTESTED) return "attested"; if (code == Status.VALIDATED) return "validated"; @@ -246,7 +248,7 @@ public class VerificationResult extends DomainResource { if (code == Status.REVALFAIL) return "reval-fail"; return "?"; - } + } public String toSystem(Status code) { return code.getSystem(); @@ -761,9 +763,9 @@ public class VerificationResult extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("who")) { this.who = null; @@ -1445,9 +1447,9 @@ public class VerificationResult extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("who")) { this.who = null; @@ -1830,9 +1832,9 @@ public class VerificationResult extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("organization")) { this.organization = null; @@ -2917,9 +2919,9 @@ public class VerificationResult extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("target")) { this.getTarget().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/VisionPrescription.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/VisionPrescription.java index 6960b1802..639066bff 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/VisionPrescription.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/VisionPrescription.java @@ -198,7 +198,9 @@ public class VisionPrescription extends DomainResource { } public String toCode(VisionBase code) { - if (code == VisionBase.UP) + if (code == VisionBase.NULL) + return null; + if (code == VisionBase.UP) return "up"; if (code == VisionBase.DOWN) return "down"; @@ -207,7 +209,7 @@ public class VisionPrescription extends DomainResource { if (code == VisionBase.OUT) return "out"; return "?"; - } + } public String toSystem(VisionBase code) { return code.getSystem(); @@ -322,12 +324,14 @@ public class VisionPrescription extends DomainResource { } public String toCode(VisionEyes code) { - if (code == VisionEyes.RIGHT) + if (code == VisionEyes.NULL) + return null; + if (code == VisionEyes.RIGHT) return "right"; if (code == VisionEyes.LEFT) return "left"; return "?"; - } + } public String toSystem(VisionEyes code) { return code.getSystem(); @@ -1467,9 +1471,9 @@ public class VisionPrescription extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("product")) { this.product = null; @@ -1911,9 +1915,9 @@ public class VisionPrescription extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("amount")) { this.amount = null; @@ -2568,9 +2572,9 @@ public class VisionPrescription extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().remove(value); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/patterns/Event.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/patterns/Event.java index 35cdbc9c3..83c24a46d 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/patterns/Event.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/patterns/Event.java @@ -286,7 +286,9 @@ public interface Event extends PatternBase { } public String toCode(EventStatus code) { - if (code == EventStatus.PREPARATION) + if (code == EventStatus.NULL) + return null; + if (code == EventStatus.PREPARATION) return "preparation"; if (code == EventStatus.INPROGRESS) return "in-progress"; @@ -303,7 +305,7 @@ public interface Event extends PatternBase { if (code == EventStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(EventStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/patterns/Fivews.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/patterns/Fivews.java index e963e9170..290181835 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/patterns/Fivews.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/patterns/Fivews.java @@ -700,7 +700,9 @@ public interface Fivews extends PatternBase { } public String toCode(CanonicalStatus code) { - if (code == CanonicalStatus.ERROR) + if (code == CanonicalStatus.NULL) + return null; + if (code == CanonicalStatus.ERROR) return "error"; if (code == CanonicalStatus.PROPOSED) return "proposed"; @@ -763,7 +765,7 @@ public interface Fivews extends PatternBase { if (code == CanonicalStatus.HWDISCON) return "hw-discon"; return "?"; - } + } public String toSystem(CanonicalStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/patterns/Request.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/patterns/Request.java index 329731068..af3901fa9 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/patterns/Request.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/patterns/Request.java @@ -266,7 +266,9 @@ public interface Request extends PatternBase { } public String toCode(RequestStatus code) { - if (code == RequestStatus.DRAFT) + if (code == RequestStatus.NULL) + return null; + if (code == RequestStatus.DRAFT) return "draft"; if (code == RequestStatus.ACTIVE) return "active"; @@ -281,7 +283,7 @@ public interface Request extends PatternBase { if (code == RequestStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(RequestStatus code) { return code.getSystem(); @@ -535,7 +537,9 @@ public interface Request extends PatternBase { } public String toCode(RequestIntent code) { - if (code == RequestIntent.PROPOSAL) + if (code == RequestIntent.NULL) + return null; + if (code == RequestIntent.PROPOSAL) return "proposal"; if (code == RequestIntent.PLAN) return "plan"; @@ -554,7 +558,7 @@ public interface Request extends PatternBase { if (code == RequestIntent.OPTION) return "option"; return "?"; - } + } public String toSystem(RequestIntent code) { return code.getSystem(); @@ -707,7 +711,9 @@ public interface Request extends PatternBase { } public String toCode(RequestPriority code) { - if (code == RequestPriority.ROUTINE) + if (code == RequestPriority.NULL) + return null; + if (code == RequestPriority.ROUTINE) return "routine"; if (code == RequestPriority.URGENT) return "urgent"; @@ -716,7 +722,7 @@ public interface Request extends PatternBase { if (code == RequestPriority.STAT) return "stat"; return "?"; - } + } public String toSystem(RequestPriority code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/utils/GuideParameterCode.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/utils/GuideParameterCode.java index 081ce8326..756ea35f8 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/utils/GuideParameterCode.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/utils/GuideParameterCode.java @@ -280,7 +280,9 @@ public enum GuideParameterCode { } public String toCode(GuideParameterCode code) { - if (code == GuideParameterCode.APPLY) + if (code == GuideParameterCode.NULL) + return null; + if (code == GuideParameterCode.APPLY) return "apply"; if (code == GuideParameterCode.PATHRESOURCE) return "path-resource"; @@ -301,7 +303,7 @@ public enum GuideParameterCode { if (code == GuideParameterCode.HTMLTEMPLATE) return "html-template"; return "?"; - } + } public String toSystem(GuideParameterCode code) { return code.getSystem();