From 5f2398caba20a94159fdac83088e3d7fc0794ad5 Mon Sep 17 00:00:00 2001 From: dotasek Date: Fri, 19 Jul 2024 11:56:20 -0400 Subject: [PATCH] Return null for all toCode enum params that are Enum.NULL (r4) --- .../java/org/hl7/fhir/r4/model/Account.java | 24 +-- .../hl7/fhir/r4/model/ActivityDefinition.java | 42 ++--- .../java/org/hl7/fhir/r4/model/Address.java | 18 ++- .../org/hl7/fhir/r4/model/AdverseEvent.java | 24 +-- .../hl7/fhir/r4/model/AllergyIntolerance.java | 36 +++-- .../org/hl7/fhir/r4/model/Appointment.java | 30 ++-- .../fhir/r4/model/AppointmentResponse.java | 12 +- .../org/hl7/fhir/r4/model/AuditEvent.java | 54 ++++--- .../r4/model/BiologicallyDerivedProduct.java | 48 +++--- .../java/org/hl7/fhir/r4/model/Bundle.java | 54 ++++--- .../fhir/r4/model/CapabilityStatement.java | 144 ++++++++++-------- .../java/org/hl7/fhir/r4/model/CarePlan.java | 42 ++--- .../java/org/hl7/fhir/r4/model/CareTeam.java | 18 ++- .../org/hl7/fhir/r4/model/CatalogEntry.java | 18 ++- .../org/hl7/fhir/r4/model/ChargeItem.java | 18 ++- .../fhir/r4/model/ChargeItemDefinition.java | 30 ++-- .../java/org/hl7/fhir/r4/model/Claim.java | 84 +++++----- .../org/hl7/fhir/r4/model/ClaimResponse.java | 96 ++++++------ .../hl7/fhir/r4/model/ClinicalImpression.java | 24 +-- .../org/hl7/fhir/r4/model/CodeSystem.java | 60 ++++---- .../org/hl7/fhir/r4/model/Communication.java | 24 +-- .../fhir/r4/model/CommunicationRequest.java | 24 +-- .../fhir/r4/model/CompartmentDefinition.java | 18 ++- .../org/hl7/fhir/r4/model/Composition.java | 60 +++++--- .../org/hl7/fhir/r4/model/ConceptMap.java | 42 ++--- .../java/org/hl7/fhir/r4/model/Consent.java | 54 ++++--- .../org/hl7/fhir/r4/model/ContactPoint.java | 18 ++- .../java/org/hl7/fhir/r4/model/Contract.java | 108 ++++++------- .../org/hl7/fhir/r4/model/Contributor.java | 12 +- .../java/org/hl7/fhir/r4/model/Coverage.java | 30 ++-- .../r4/model/CoverageEligibilityRequest.java | 42 ++--- .../r4/model/CoverageEligibilityResponse.java | 42 ++--- .../hl7/fhir/r4/model/DataRequirement.java | 30 ++-- .../org/hl7/fhir/r4/model/DetectedIssue.java | 30 ++-- .../java/org/hl7/fhir/r4/model/Device.java | 54 ++++--- .../hl7/fhir/r4/model/DeviceDefinition.java | 48 +++--- .../org/hl7/fhir/r4/model/DeviceMetric.java | 42 +++-- .../org/hl7/fhir/r4/model/DeviceRequest.java | 30 ++-- .../hl7/fhir/r4/model/DeviceUseStatement.java | 12 +- .../hl7/fhir/r4/model/DiagnosticReport.java | 18 ++- .../hl7/fhir/r4/model/DocumentReference.java | 36 +++-- .../r4/model/EffectEvidenceSynthesis.java | 48 +++--- .../hl7/fhir/r4/model/ElementDefinition.java | 90 ++++++----- .../java/org/hl7/fhir/r4/model/Encounter.java | 54 ++++--- .../java/org/hl7/fhir/r4/model/Endpoint.java | 12 +- .../hl7/fhir/r4/model/EnrollmentRequest.java | 12 +- .../hl7/fhir/r4/model/EnrollmentResponse.java | 12 +- .../org/hl7/fhir/r4/model/Enumerations.java | 132 ++++++++++------ .../org/hl7/fhir/r4/model/EpisodeOfCare.java | 24 +-- .../hl7/fhir/r4/model/EvidenceVariable.java | 24 +-- .../hl7/fhir/r4/model/ExampleScenario.java | 66 ++++---- .../fhir/r4/model/ExplanationOfBenefit.java | 144 +++++++++--------- .../org/hl7/fhir/r4/model/Expression.java | 12 +- .../fhir/r4/model/FamilyMemberHistory.java | 18 ++- .../main/java/org/hl7/fhir/r4/model/Flag.java | 12 +- .../main/java/org/hl7/fhir/r4/model/Goal.java | 18 ++- .../hl7/fhir/r4/model/GraphDefinition.java | 42 ++--- .../java/org/hl7/fhir/r4/model/Group.java | 24 +-- .../hl7/fhir/r4/model/GuidanceResponse.java | 12 +- .../hl7/fhir/r4/model/HealthcareService.java | 30 ++-- .../java/org/hl7/fhir/r4/model/HumanName.java | 12 +- .../org/hl7/fhir/r4/model/Identifier.java | 12 +- .../org/hl7/fhir/r4/model/ImagingStudy.java | 30 ++-- .../org/hl7/fhir/r4/model/Immunization.java | 36 ++--- .../fhir/r4/model/ImmunizationEvaluation.java | 12 +- .../fhir/r4/model/ImplementationGuide.java | 90 ++++++----- .../java/org/hl7/fhir/r4/model/Invoice.java | 36 +++-- .../java/org/hl7/fhir/r4/model/Linkage.java | 18 ++- .../org/hl7/fhir/r4/model/ListResource.java | 24 +-- .../java/org/hl7/fhir/r4/model/Location.java | 36 +++-- .../org/hl7/fhir/r4/model/MeasureReport.java | 54 ++++--- .../java/org/hl7/fhir/r4/model/Media.java | 12 +- .../org/hl7/fhir/r4/model/Medication.java | 24 +-- .../r4/model/MedicationAdministration.java | 24 +-- .../hl7/fhir/r4/model/MedicationDispense.java | 24 +-- .../fhir/r4/model/MedicationKnowledge.java | 108 ++++++------- .../hl7/fhir/r4/model/MedicationRequest.java | 42 ++--- .../fhir/r4/model/MedicationStatement.java | 12 +- .../hl7/fhir/r4/model/MessageDefinition.java | 30 ++-- .../org/hl7/fhir/r4/model/MessageHeader.java | 30 ++-- .../hl7/fhir/r4/model/MolecularSequence.java | 84 +++++----- .../org/hl7/fhir/r4/model/NamingSystem.java | 24 +-- .../java/org/hl7/fhir/r4/model/Narrative.java | 12 +- .../org/hl7/fhir/r4/model/NutritionOrder.java | 54 ++++--- .../org/hl7/fhir/r4/model/Observation.java | 24 +-- .../fhir/r4/model/ObservationDefinition.java | 30 ++-- .../fhir/r4/model/OperationDefinition.java | 42 ++--- .../hl7/fhir/r4/model/OperationOutcome.java | 24 +-- .../fhir/r4/model/ParameterDefinition.java | 12 +- .../java/org/hl7/fhir/r4/model/Patient.java | 30 ++-- .../org/hl7/fhir/r4/model/PaymentNotice.java | 12 +- .../fhir/r4/model/PaymentReconciliation.java | 24 +-- .../java/org/hl7/fhir/r4/model/Person.java | 18 ++- .../org/hl7/fhir/r4/model/PlanDefinition.java | 102 ++++++++----- .../hl7/fhir/r4/model/PractitionerRole.java | 24 +-- .../java/org/hl7/fhir/r4/model/Procedure.java | 24 +-- .../org/hl7/fhir/r4/model/Provenance.java | 24 +-- .../java/org/hl7/fhir/r4/model/Quantity.java | 12 +- .../org/hl7/fhir/r4/model/Questionnaire.java | 48 +++--- .../fhir/r4/model/QuestionnaireResponse.java | 24 +-- .../hl7/fhir/r4/model/RelatedArtifact.java | 12 +- .../org/hl7/fhir/r4/model/RequestGroup.java | 84 ++++++---- .../r4/model/ResearchElementDefinition.java | 30 ++-- .../org/hl7/fhir/r4/model/ResearchStudy.java | 24 +-- .../hl7/fhir/r4/model/ResearchSubject.java | 12 +- .../org/hl7/fhir/r4/model/RiskAssessment.java | 18 ++- .../hl7/fhir/r4/model/SearchParameter.java | 30 ++-- .../org/hl7/fhir/r4/model/ServiceRequest.java | 24 +-- .../main/java/org/hl7/fhir/r4/model/Slot.java | 12 +- .../java/org/hl7/fhir/r4/model/Specimen.java | 30 ++-- .../hl7/fhir/r4/model/SpecimenDefinition.java | 36 ++--- .../fhir/r4/model/StructureDefinition.java | 48 +++--- .../org/hl7/fhir/r4/model/StructureMap.java | 96 +++++++----- .../org/hl7/fhir/r4/model/Subscription.java | 24 +-- .../java/org/hl7/fhir/r4/model/Substance.java | 24 +-- .../org/hl7/fhir/r4/model/SupplyDelivery.java | 18 ++- .../org/hl7/fhir/r4/model/SupplyRequest.java | 24 +-- .../main/java/org/hl7/fhir/r4/model/Task.java | 42 ++--- .../r4/model/TerminologyCapabilities.java | 78 +++++----- .../org/hl7/fhir/r4/model/TestReport.java | 84 +++++----- .../org/hl7/fhir/r4/model/TestScript.java | 126 ++++++++------- .../java/org/hl7/fhir/r4/model/Timing.java | 30 ++-- .../hl7/fhir/r4/model/TriggerDefinition.java | 12 +- .../java/org/hl7/fhir/r4/model/ValueSet.java | 60 ++++---- .../hl7/fhir/r4/model/VerificationResult.java | 30 ++-- .../hl7/fhir/r4/model/VisionPrescription.java | 36 +++-- .../codesystems/AbstractTypesEnumFactory.java | 6 +- .../codesystems/AccountStatusEnumFactory.java | 6 +- .../ActionCardinalityBehaviorEnumFactory.java | 6 +- .../ActionConditionKindEnumFactory.java | 6 +- .../ActionGroupingBehaviorEnumFactory.java | 6 +- .../ActionParticipantTypeEnumFactory.java | 6 +- .../ActionPrecheckBehaviorEnumFactory.java | 6 +- .../ActionRelationshipTypeEnumFactory.java | 6 +- .../ActionRequiredBehaviorEnumFactory.java | 6 +- .../ActionSelectionBehaviorEnumFactory.java | 6 +- .../codesystems/ActionTypeEnumFactory.java | 6 +- ...ActivityDefinitionCategoryEnumFactory.java | 6 +- .../AdditionalmaterialsEnumFactory.java | 6 +- .../codesystems/AddressTypeEnumFactory.java | 6 +- .../codesystems/AddressUseEnumFactory.java | 6 +- .../codesystems/AdjudicationEnumFactory.java | 6 +- .../AdjudicationErrorEnumFactory.java | 6 +- .../AdjudicationReasonEnumFactory.java | 6 +- .../AdministrativeGenderEnumFactory.java | 6 +- .../AdverseEventActualityEnumFactory.java | 6 +- .../AdverseEventCategoryEnumFactory.java | 6 +- ...dverseEventCausalityAssessEnumFactory.java | 6 +- ...dverseEventCausalityMethodEnumFactory.java | 6 +- .../AdverseEventOutcomeEnumFactory.java | 6 +- .../AdverseEventSeriousnessEnumFactory.java | 6 +- .../AdverseEventSeverityEnumFactory.java | 6 +- ...llergIntolSubstanceExpRiskEnumFactory.java | 6 +- ...AllergyIntoleranceCategoryEnumFactory.java | 6 +- ...ergyIntoleranceCriticalityEnumFactory.java | 6 +- .../AllergyIntoleranceTypeEnumFactory.java | 6 +- ...AllergyintoleranceClinicalEnumFactory.java | 6 +- ...rgyintoleranceVerificationEnumFactory.java | 6 +- .../AnimalGenderstatusEnumFactory.java | 6 +- .../codesystems/AnimalSpeciesEnumFactory.java | 6 +- ...ointmentCancellationReasonEnumFactory.java | 6 +- .../AppointmentstatusEnumFactory.java | 6 +- .../AssertDirectionCodesEnumFactory.java | 6 +- .../AssertOperatorCodesEnumFactory.java | 6 +- .../AssertResponseCodeTypesEnumFactory.java | 6 +- .../AssetAvailabilityEnumFactory.java | 6 +- .../AuditEntityTypeEnumFactory.java | 6 +- .../AuditEventActionEnumFactory.java | 6 +- .../AuditEventOutcomeEnumFactory.java | 6 +- .../AuditEventTypeEnumFactory.java | 6 +- .../AuditSourceTypeEnumFactory.java | 6 +- .../BasicResourceTypeEnumFactory.java | 6 +- .../BenefitNetworkEnumFactory.java | 6 +- .../codesystems/BenefitTermEnumFactory.java | 6 +- .../codesystems/BenefitTypeEnumFactory.java | 6 +- .../codesystems/BenefitUnitEnumFactory.java | 6 +- .../BindingStrengthEnumFactory.java | 6 +- .../codesystems/BundleTypeEnumFactory.java | 6 +- .../CapabilityStatementKindEnumFactory.java | 6 +- .../CarePlanActivityStatusEnumFactory.java | 6 +- .../CareTeamStatusEnumFactory.java | 6 +- .../codesystems/CatalogTypeEnumFactory.java | 6 +- .../CdshooksIndicatorEnumFactory.java | 6 +- ...ertaintySubcomponentRatingEnumFactory.java | 6 +- .../CertaintySubcomponentTypeEnumFactory.java | 6 +- .../ChargeitemBillingcodesEnumFactory.java | 6 +- .../ChargeitemStatusEnumFactory.java | 6 +- .../ChoiceListOrientationEnumFactory.java | 6 +- .../ChromosomeHumanEnumFactory.java | 6 +- .../ClaimCareteamroleEnumFactory.java | 6 +- .../ClaimExceptionEnumFactory.java | 6 +- .../ClaimInformationcategoryEnumFactory.java | 6 +- .../ClaimModifiersEnumFactory.java | 6 +- .../codesystems/ClaimSubtypeEnumFactory.java | 6 +- .../codesystems/ClaimTypeEnumFactory.java | 6 +- .../codesystems/ClaimUseEnumFactory.java | 6 +- .../CodeSearchSupportEnumFactory.java | 6 +- .../CodesystemAltcodeKindEnumFactory.java | 6 +- .../CodesystemContentModeEnumFactory.java | 6 +- ...CodesystemHierarchyMeaningEnumFactory.java | 6 +- .../codesystems/CommonTagsEnumFactory.java | 6 +- .../CommunicationCategoryEnumFactory.java | 6 +- ...CommunicationNotDoneReasonEnumFactory.java | 6 +- .../CommunicationTopicEnumFactory.java | 6 +- .../CompartmentTypeEnumFactory.java | 6 +- .../CompositeMeasureScoringEnumFactory.java | 6 +- .../CompositionAltcodeKindEnumFactory.java | 6 +- ...CompositionAttestationModeEnumFactory.java | 6 +- .../CompositionStatusEnumFactory.java | 6 +- .../ConceptMapEquivalenceEnumFactory.java | 6 +- .../ConceptPropertiesEnumFactory.java | 6 +- .../ConceptPropertyTypeEnumFactory.java | 6 +- .../ConceptSubsumptionOutcomeEnumFactory.java | 6 +- .../ConceptmapUnmappedModeEnumFactory.java | 6 +- .../ConditionCategoryEnumFactory.java | 6 +- .../ConditionClinicalEnumFactory.java | 6 +- .../ConditionStateEnumFactory.java | 6 +- .../ConditionVerStatusEnumFactory.java | 6 +- .../ConditionalDeleteStatusEnumFactory.java | 6 +- .../ConditionalReadStatusEnumFactory.java | 6 +- .../ConformanceExpectationEnumFactory.java | 6 +- .../codesystems/ConsentActionEnumFactory.java | 6 +- .../ConsentCategoryEnumFactory.java | 6 +- .../ConsentDataMeaningEnumFactory.java | 6 +- .../ConsentPerformerEnumFactory.java | 6 +- .../codesystems/ConsentPolicyEnumFactory.java | 6 +- .../ConsentProvisionTypeEnumFactory.java | 6 +- .../codesystems/ConsentScopeEnumFactory.java | 6 +- .../ConsentStateCodesEnumFactory.java | 6 +- .../ConstraintSeverityEnumFactory.java | 6 +- .../ContactPointSystemEnumFactory.java | 6 +- .../ContactPointUseEnumFactory.java | 6 +- .../ContactentityTypeEnumFactory.java | 6 +- .../codesystems/ContainerCapEnumFactory.java | 6 +- .../ContractActionEnumFactory.java | 6 +- .../ContractActionstatusEnumFactory.java | 6 +- .../ContractActorroleEnumFactory.java | 6 +- .../ContractAssetcontextEnumFactory.java | 6 +- .../ContractAssetscopeEnumFactory.java | 6 +- .../ContractAssetsubtypeEnumFactory.java | 6 +- .../ContractAssettypeEnumFactory.java | 6 +- .../ContractContentDerivativeEnumFactory.java | 6 +- .../ContractDataMeaningEnumFactory.java | 6 +- .../ContractDecisionModeEnumFactory.java | 6 +- .../ContractDefinitionSubtypeEnumFactory.java | 6 +- .../ContractDefinitionTypeEnumFactory.java | 6 +- .../ContractExpirationTypeEnumFactory.java | 6 +- .../ContractLegalstateEnumFactory.java | 6 +- .../ContractPartyRoleEnumFactory.java | 6 +- .../ContractPublicationstatusEnumFactory.java | 6 +- .../codesystems/ContractScopeEnumFactory.java | 6 +- .../ContractSecurityCategoryEnumFactory.java | 6 +- ...ractSecurityClassificationEnumFactory.java | 6 +- .../ContractSecurityControlEnumFactory.java | 6 +- .../ContractSignerTypeEnumFactory.java | 6 +- .../ContractStatusEnumFactory.java | 6 +- .../ContractSubtypeEnumFactory.java | 6 +- .../ContractTermSubtypeEnumFactory.java | 6 +- .../ContractTermTypeEnumFactory.java | 6 +- .../codesystems/ContractTypeEnumFactory.java | 6 +- .../ContributorTypeEnumFactory.java | 6 +- .../CopyNumberEventEnumFactory.java | 6 +- .../codesystems/CoverageClassEnumFactory.java | 6 +- .../CoverageCopayTypeEnumFactory.java | 6 +- ...CoverageFinancialExceptionEnumFactory.java | 6 +- .../CoverageSelfpayEnumFactory.java | 6 +- ...ilityresponseExAuthSupportEnumFactory.java | 6 +- .../DataAbsentReasonEnumFactory.java | 6 +- .../codesystems/DataTypesEnumFactory.java | 6 +- .../codesystems/DaysOfWeekEnumFactory.java | 6 +- .../DefinitionResourceTypesEnumFactory.java | 6 +- .../DefinitionStatusEnumFactory.java | 6 +- .../DefinitionTopicEnumFactory.java | 6 +- .../codesystems/DefinitionUseEnumFactory.java | 6 +- .../DetectedissueSeverityEnumFactory.java | 6 +- .../codesystems/DeviceActionEnumFactory.java | 6 +- .../DeviceDefinitionStatusEnumFactory.java | 6 +- .../DeviceNametypeEnumFactory.java | 6 +- .../DeviceStatementStatusEnumFactory.java | 6 +- .../codesystems/DeviceStatusEnumFactory.java | 6 +- .../DeviceStatusReasonEnumFactory.java | 6 +- .../codesystems/DiagnosisRoleEnumFactory.java | 6 +- .../DiagnosticReportStatusEnumFactory.java | 6 +- .../DicomAuditLifecycleEnumFactory.java | 6 +- .../DiscriminatorTypeEnumFactory.java | 6 +- .../codesystems/DocumentModeEnumFactory.java | 6 +- .../DocumentReferenceStatusEnumFactory.java | 6 +- .../DocumentRelationshipTypeEnumFactory.java | 6 +- .../codesystems/DoseRateTypeEnumFactory.java | 6 +- .../EffectEstimateTypeEnumFactory.java | 6 +- .../EligibilityrequestPurposeEnumFactory.java | 6 +- ...EligibilityresponsePurposeEnumFactory.java | 6 +- .../EncounterAdmitSourceEnumFactory.java | 6 +- .../codesystems/EncounterDietEnumFactory.java | 6 +- ...ounterDischargeDispositionEnumFactory.java | 6 +- .../EncounterLocationStatusEnumFactory.java | 6 +- .../EncounterParticipantTypeEnumFactory.java | 6 +- ...counterSpecialArrangementsEnumFactory.java | 6 +- .../EncounterStatusEnumFactory.java | 6 +- .../codesystems/EncounterTypeEnumFactory.java | 6 +- .../EndpointConnectionTypeEnumFactory.java | 6 +- .../EndpointPayloadTypeEnumFactory.java | 6 +- .../EndpointStatusEnumFactory.java | 6 +- .../EntformulaAdditiveEnumFactory.java | 6 +- .../EpisodeOfCareStatusEnumFactory.java | 6 +- .../EpisodeofcareTypeEnumFactory.java | 6 +- .../EventCapabilityModeEnumFactory.java | 6 +- .../EventResourceTypesEnumFactory.java | 6 +- .../codesystems/EventStatusEnumFactory.java | 6 +- .../codesystems/EventTimingEnumFactory.java | 6 +- .../EvidenceQualityEnumFactory.java | 6 +- .../EvidenceVariantStateEnumFactory.java | 6 +- .../ExBenefitcategoryEnumFactory.java | 6 +- .../ExDiagnosisOnAdmissionEnumFactory.java | 6 +- .../ExDiagnosisrelatedgroupEnumFactory.java | 6 +- .../ExDiagnosistypeEnumFactory.java | 6 +- .../codesystems/ExOnsettypeEnumFactory.java | 6 +- .../ExPayeeResourceTypeEnumFactory.java | 6 +- .../codesystems/ExPaymenttypeEnumFactory.java | 6 +- .../ExProcedureTypeEnumFactory.java | 6 +- .../codesystems/ExProgramCodeEnumFactory.java | 6 +- .../ExRevenueCenterEnumFactory.java | 6 +- .../ExamplescenarioActorTypeEnumFactory.java | 6 +- .../ExpansionParameterSourceEnumFactory.java | 6 +- .../ExpansionProcessingRuleEnumFactory.java | 6 +- ...ExplanationofbenefitStatusEnumFactory.java | 6 +- .../codesystems/ExposureStateEnumFactory.java | 6 +- .../ExpressionLanguageEnumFactory.java | 6 +- .../ExtensionContextTypeEnumFactory.java | 6 +- .../ExtraActivityTypeEnumFactory.java | 6 +- .../ExtraSecurityRoleTypeEnumFactory.java | 6 +- .../codesystems/FHIRVersionEnumFactory.java | 6 +- .../codesystems/FeedingDeviceEnumFactory.java | 6 +- .../FilterOperatorEnumFactory.java | 6 +- .../FinancialTaskcodeEnumFactory.java | 6 +- .../FinancialTaskinputtypeEnumFactory.java | 6 +- .../codesystems/FlagCategoryEnumFactory.java | 6 +- .../codesystems/FlagPriorityEnumFactory.java | 6 +- .../codesystems/FlagStatusEnumFactory.java | 6 +- .../codesystems/FmConditionsEnumFactory.java | 6 +- .../codesystems/FmItemtypeEnumFactory.java | 6 +- .../codesystems/FmStatusEnumFactory.java | 6 +- .../model/codesystems/FormsEnumFactory.java | 6 +- .../codesystems/FundsreserveEnumFactory.java | 6 +- .../GenderIdentityEnumFactory.java | 6 +- .../GoalAcceptanceStatusEnumFactory.java | 6 +- .../GoalAchievementEnumFactory.java | 6 +- .../codesystems/GoalCategoryEnumFactory.java | 6 +- .../codesystems/GoalPriorityEnumFactory.java | 6 +- .../GoalRelationshipTypeEnumFactory.java | 6 +- .../codesystems/GoalStatusEnumFactory.java | 6 +- .../GoalStatusReasonEnumFactory.java | 6 +- .../GraphCompartmentRuleEnumFactory.java | 6 +- .../GraphCompartmentUseEnumFactory.java | 6 +- .../codesystems/GroupMeasureEnumFactory.java | 6 +- .../codesystems/GroupTypeEnumFactory.java | 6 +- .../GuidanceResponseStatusEnumFactory.java | 6 +- .../GuidePageGenerationEnumFactory.java | 6 +- .../GuideParameterCodeEnumFactory.java | 6 +- .../HandlingConditionEnumFactory.java | 6 +- .../HistoryAbsentReasonEnumFactory.java | 6 +- .../codesystems/HistoryStatusEnumFactory.java | 6 +- .../codesystems/Hl7WorkGroupEnumFactory.java | 6 +- .../HttpOperationsEnumFactory.java | 6 +- .../codesystems/HttpVerbEnumFactory.java | 6 +- .../IHEFormatcodeCsEnumFactory.java | 6 +- .../Icd10ProceduresEnumFactory.java | 6 +- .../codesystems/IdentifierUseEnumFactory.java | 6 +- .../IdentityAssuranceLevelEnumFactory.java | 6 +- .../ImagingstudyStatusEnumFactory.java | 6 +- ...zationEvaluationDoseStatusEnumFactory.java | 6 +- ...EvaluationDoseStatusReasonEnumFactory.java | 6 +- .../ImmunizationFundingSourceEnumFactory.java | 6 +- .../ImmunizationOriginEnumFactory.java | 6 +- ...nizationProgramEligibilityEnumFactory.java | 6 +- ...zationRecommendationStatusEnumFactory.java | 6 +- ...mmunizationSubpotentReasonEnumFactory.java | 6 +- .../codesystems/ImplantStatusEnumFactory.java | 6 +- ...InsuranceplanApplicabilityEnumFactory.java | 6 +- .../InsuranceplanTypeEnumFactory.java | 6 +- .../codesystems/InterventionEnumFactory.java | 6 +- .../InvoicePriceComponentTypeEnumFactory.java | 6 +- .../codesystems/InvoiceStatusEnumFactory.java | 6 +- .../Iso21089LifecycleEnumFactory.java | 6 +- .../codesystems/IssueSeverityEnumFactory.java | 6 +- .../codesystems/IssueTypeEnumFactory.java | 6 +- .../codesystems/ItemTypeEnumFactory.java | 6 +- .../KnowledgeResourceTypesEnumFactory.java | 6 +- .../LanguagePreferenceTypeEnumFactory.java | 6 +- .../codesystems/LibraryTypeEnumFactory.java | 6 +- .../codesystems/LinkTypeEnumFactory.java | 6 +- .../codesystems/LinkageTypeEnumFactory.java | 6 +- .../ListEmptyReasonEnumFactory.java | 6 +- .../ListExampleCodesEnumFactory.java | 6 +- .../codesystems/ListItemFlagEnumFactory.java | 6 +- .../codesystems/ListModeEnumFactory.java | 6 +- .../codesystems/ListOrderEnumFactory.java | 6 +- .../codesystems/ListStatusEnumFactory.java | 6 +- .../codesystems/LocationModeEnumFactory.java | 6 +- .../LocationPhysicalTypeEnumFactory.java | 6 +- .../LocationStatusEnumFactory.java | 6 +- .../MapContextTypeEnumFactory.java | 6 +- .../MapGroupTypeModeEnumFactory.java | 6 +- .../codesystems/MapInputModeEnumFactory.java | 6 +- .../codesystems/MapModelModeEnumFactory.java | 6 +- .../MapSourceListModeEnumFactory.java | 6 +- .../MapTargetListModeEnumFactory.java | 6 +- .../codesystems/MapTransformEnumFactory.java | 6 +- .../codesystems/MatchGradeEnumFactory.java | 6 +- .../MeasureDataUsageEnumFactory.java | 6 +- ...MeasureImprovementNotationEnumFactory.java | 6 +- .../MeasurePopulationEnumFactory.java | 6 +- .../MeasureReportStatusEnumFactory.java | 6 +- .../MeasureReportTypeEnumFactory.java | 6 +- .../MeasureScoringEnumFactory.java | 6 +- .../codesystems/MeasureTypeEnumFactory.java | 6 +- .../MedAdminPerformFunctionEnumFactory.java | 6 +- .../codesystems/MediaModalityEnumFactory.java | 6 +- .../codesystems/MediaTypeEnumFactory.java | 6 +- .../MedicationAdminCategoryEnumFactory.java | 6 +- .../MedicationAdminStatusEnumFactory.java | 6 +- ...edicationStatementCategoryEnumFactory.java | 6 +- .../MedicationStatementStatusEnumFactory.java | 6 +- .../MedicationStatusEnumFactory.java | 6 +- ...MedicationdispenseCategoryEnumFactory.java | 6 +- ...ndispensePerformerFunctionEnumFactory.java | 6 +- .../MedicationdispenseStatusEnumFactory.java | 6 +- ...cationdispenseStatusReasonEnumFactory.java | 6 +- ...ionknowledgeCharacteristicEnumFactory.java | 6 +- ...cationknowledgePackageTypeEnumFactory.java | 6 +- .../MedicationknowledgeStatusEnumFactory.java | 6 +- .../MedicationrequestCategoryEnumFactory.java | 6 +- ...tionrequestCourseOfTherapyEnumFactory.java | 6 +- .../MedicationrequestIntentEnumFactory.java | 6 +- .../MedicationrequestStatusEnumFactory.java | 6 +- ...icationrequestStatusReasonEnumFactory.java | 6 +- .../codesystems/MessageEventsEnumFactory.java | 6 +- .../MessageReasonEncounterEnumFactory.java | 6 +- ...essageSignificanceCategoryEnumFactory.java | 6 +- .../MessageTransportEnumFactory.java | 6 +- ...ssageheaderResponseRequestEnumFactory.java | 6 +- .../MetricCalibrationStateEnumFactory.java | 6 +- .../MetricCalibrationTypeEnumFactory.java | 6 +- .../MetricCategoryEnumFactory.java | 6 +- .../codesystems/MetricColorEnumFactory.java | 6 +- .../MetricOperationalStatusEnumFactory.java | 6 +- .../MissingToothReasonEnumFactory.java | 6 +- .../NameAssemblyOrderEnumFactory.java | 6 +- .../model/codesystems/NameUseEnumFactory.java | 6 +- ...NamingsystemIdentifierTypeEnumFactory.java | 6 +- .../NamingsystemTypeEnumFactory.java | 6 +- .../NarrativeStatusEnumFactory.java | 6 +- .../codesystems/NetworkTypeEnumFactory.java | 6 +- .../codesystems/NoteTypeEnumFactory.java | 6 +- .../codesystems/ObjectRoleEnumFactory.java | 6 +- .../ObservationCategoryEnumFactory.java | 6 +- .../ObservationRangeCategoryEnumFactory.java | 6 +- .../ObservationStatisticsEnumFactory.java | 6 +- .../ObservationStatusEnumFactory.java | 6 +- .../codesystems/OperationKindEnumFactory.java | 6 +- .../OperationOutcomeEnumFactory.java | 6 +- .../OperationParameterUseEnumFactory.java | 6 +- .../OralProsthodonticMaterialEnumFactory.java | 6 +- .../OrganizationRoleEnumFactory.java | 6 +- .../OrganizationTypeEnumFactory.java | 6 +- .../OrientationTypeEnumFactory.java | 6 +- .../ParameterGroupEnumFactory.java | 6 +- .../ParticipantrequiredEnumFactory.java | 6 +- .../ParticipationstatusEnumFactory.java | 6 +- .../codesystems/PayeetypeEnumFactory.java | 6 +- .../PaymentAdjustmentReasonEnumFactory.java | 6 +- .../codesystems/PaymentStatusEnumFactory.java | 6 +- .../codesystems/PaymentTypeEnumFactory.java | 6 +- .../PermittedDataTypeEnumFactory.java | 6 +- .../PlanDefinitionTypeEnumFactory.java | 6 +- .../PractitionerRoleEnumFactory.java | 6 +- .../PractitionerSpecialtyEnumFactory.java | 6 +- .../PrecisionEstimateTypeEnumFactory.java | 6 +- ...ocedureProgressStatusCodesEnumFactory.java | 6 +- .../ProcessPriorityEnumFactory.java | 6 +- .../ProductCategoryEnumFactory.java | 6 +- .../codesystems/ProductStatusEnumFactory.java | 6 +- .../ProductStorageScaleEnumFactory.java | 6 +- .../model/codesystems/ProgramEnumFactory.java | 6 +- .../PropertyRepresentationEnumFactory.java | 6 +- .../ProvenanceAgentRoleEnumFactory.java | 6 +- .../ProvenanceAgentTypeEnumFactory.java | 6 +- .../ProvenanceEntityRoleEnumFactory.java | 6 +- .../ProviderQualificationEnumFactory.java | 6 +- .../PublicationStatusEnumFactory.java | 6 +- .../codesystems/QualityTypeEnumFactory.java | 6 +- .../QuantityComparatorEnumFactory.java | 6 +- .../QuestionMaxOccursEnumFactory.java | 6 +- ...QuestionnaireAnswersStatusEnumFactory.java | 6 +- ...estionnaireDisplayCategoryEnumFactory.java | 6 +- ...uestionnaireEnableBehaviorEnumFactory.java | 6 +- ...uestionnaireEnableOperatorEnumFactory.java | 6 +- .../QuestionnaireItemControlEnumFactory.java | 6 +- .../QuestionnaireUsageModeEnumFactory.java | 6 +- .../ReactionEventCertaintyEnumFactory.java | 6 +- .../ReactionEventSeverityEnumFactory.java | 6 +- ...ReasonMedicationGivenCodesEnumFactory.java | 6 +- ...sonMedicationNotGivenCodesEnumFactory.java | 6 +- .../RecommendationStrengthEnumFactory.java | 6 +- .../ReferenceHandlingPolicyEnumFactory.java | 6 +- .../ReferenceVersionRulesEnumFactory.java | 6 +- .../ReferencerangeMeaningEnumFactory.java | 6 +- .../RejectionCriteriaEnumFactory.java | 6 +- .../RelatedArtifactTypeEnumFactory.java | 6 +- .../RelatedClaimRelationshipEnumFactory.java | 6 +- .../codesystems/RelationTypeEnumFactory.java | 6 +- .../codesystems/RelationshipEnumFactory.java | 6 +- .../RemittanceOutcomeEnumFactory.java | 6 +- .../ReportActionResultCodesEnumFactory.java | 6 +- .../ReportParticipantTypeEnumFactory.java | 6 +- .../ReportResultCodesEnumFactory.java | 6 +- .../ReportStatusCodesEnumFactory.java | 6 +- .../RepositoryTypeEnumFactory.java | 6 +- .../codesystems/RequestIntentEnumFactory.java | 6 +- .../RequestPriorityEnumFactory.java | 6 +- .../RequestResourceTypesEnumFactory.java | 6 +- .../codesystems/RequestStatusEnumFactory.java | 6 +- .../ResearchElementTypeEnumFactory.java | 6 +- ...ResearchStudyObjectiveTypeEnumFactory.java | 6 +- .../ResearchStudyPhaseEnumFactory.java | 6 +- .../ResearchStudyPrimPurpTypeEnumFactory.java | 6 +- ...ResearchStudyReasonStoppedEnumFactory.java | 6 +- .../ResearchStudyStatusEnumFactory.java | 6 +- .../ResearchSubjectStatusEnumFactory.java | 6 +- .../ResourceAggregationModeEnumFactory.java | 6 +- .../ResourceSecurityCategoryEnumFactory.java | 6 +- .../ResourceSlicingRulesEnumFactory.java | 6 +- .../ResourceStatusEnumFactory.java | 6 +- .../ResourceTypeLinkEnumFactory.java | 6 +- .../codesystems/ResourceTypesEnumFactory.java | 6 +- .../ResourceValidationModeEnumFactory.java | 6 +- .../codesystems/ResponseCodeEnumFactory.java | 6 +- .../RestfulCapabilityModeEnumFactory.java | 6 +- .../RestfulInteractionEnumFactory.java | 6 +- .../RestfulSecurityServiceEnumFactory.java | 6 +- .../RiskEstimateTypeEnumFactory.java | 6 +- .../RiskProbabilityEnumFactory.java | 6 +- .../SearchComparatorEnumFactory.java | 6 +- .../SearchEntryModeEnumFactory.java | 6 +- .../SearchModifierCodeEnumFactory.java | 6 +- .../SearchParamTypeEnumFactory.java | 6 +- .../SearchXpathUsageEnumFactory.java | 6 +- .../SecondaryFindingEnumFactory.java | 6 +- .../codesystems/SequenceTypeEnumFactory.java | 6 +- .../ServiceCategoryEnumFactory.java | 6 +- .../ServiceModifiersEnumFactory.java | 6 +- .../ServicePharmacyEnumFactory.java | 6 +- .../codesystems/ServicePlaceEnumFactory.java | 6 +- .../ServiceProductEnumFactory.java | 6 +- ...ServiceProvisionConditionsEnumFactory.java | 6 +- .../ServiceReferralMethodEnumFactory.java | 6 +- .../codesystems/ServiceTypeEnumFactory.java | 6 +- .../codesystems/ServiceUsclsEnumFactory.java | 6 +- .../codesystems/SignatureTypeEnumFactory.java | 6 +- .../codesystems/SlotstatusEnumFactory.java | 6 +- .../SmartCapabilitiesEnumFactory.java | 6 +- .../codesystems/SortDirectionEnumFactory.java | 6 +- .../codesystems/SpdxLicenseEnumFactory.java | 6 +- .../codesystems/SpecialValuesEnumFactory.java | 6 +- ...pecimenContainedPreferenceEnumFactory.java | 6 +- .../SpecimenStatusEnumFactory.java | 6 +- .../StandardsStatusEnumFactory.java | 6 +- .../codesystems/StrandTypeEnumFactory.java | 6 +- .../StructureDefinitionKindEnumFactory.java | 6 +- .../codesystems/StudyTypeEnumFactory.java | 6 +- .../SubscriberRelationshipEnumFactory.java | 6 +- .../SubscriptionChannelTypeEnumFactory.java | 6 +- .../SubscriptionStatusEnumFactory.java | 6 +- .../SubscriptionTagEnumFactory.java | 6 +- .../SubstanceCategoryEnumFactory.java | 6 +- .../SubstanceStatusEnumFactory.java | 6 +- .../SupplydeliveryStatusEnumFactory.java | 6 +- .../SupplydeliveryTypeEnumFactory.java | 6 +- .../SupplyrequestKindEnumFactory.java | 6 +- .../SupplyrequestReasonEnumFactory.java | 6 +- .../SupplyrequestStatusEnumFactory.java | 6 +- .../model/codesystems/SurfaceEnumFactory.java | 6 +- .../codesystems/SynthesisTypeEnumFactory.java | 6 +- .../codesystems/TaskCodeEnumFactory.java | 6 +- .../codesystems/TaskIntentEnumFactory.java | 6 +- .../codesystems/TaskStatusEnumFactory.java | 6 +- .../model/codesystems/TeethEnumFactory.java | 6 +- .../TestscriptOperationCodesEnumFactory.java | 6 +- ...iptProfileDestinationTypesEnumFactory.java | 6 +- ...stscriptProfileOriginTypesEnumFactory.java | 6 +- .../r4/model/codesystems/TldcEnumFactory.java | 6 +- .../model/codesystems/ToothEnumFactory.java | 6 +- .../TransactionModeEnumFactory.java | 6 +- .../codesystems/TriggerTypeEnumFactory.java | 6 +- .../TypeDerivationRuleEnumFactory.java | 6 +- .../codesystems/UdiEntryTypeEnumFactory.java | 6 +- .../r4/model/codesystems/UdiEnumFactory.java | 6 +- .../UnknownContentCodeEnumFactory.java | 6 +- .../UsageContextTypeEnumFactory.java | 6 +- ...V3AcknowledgementConditionEnumFactory.java | 6 +- ...3AcknowledgementDetailCodeEnumFactory.java | 6 +- ...3AcknowledgementDetailTypeEnumFactory.java | 6 +- .../V3AcknowledgementTypeEnumFactory.java | 6 +- .../codesystems/V3ActClassEnumFactory.java | 6 +- .../codesystems/V3ActCodeEnumFactory.java | 6 +- .../V3ActExposureLevelCodeEnumFactory.java | 6 +- ...3ActInvoiceElementModifierEnumFactory.java | 6 +- .../codesystems/V3ActMoodEnumFactory.java | 6 +- .../codesystems/V3ActPriorityEnumFactory.java | 6 +- .../codesystems/V3ActReasonEnumFactory.java | 6 +- ...3ActRelationshipCheckpointEnumFactory.java | 6 +- .../V3ActRelationshipJoinEnumFactory.java | 6 +- .../V3ActRelationshipSplitEnumFactory.java | 6 +- .../V3ActRelationshipSubsetEnumFactory.java | 6 +- .../V3ActRelationshipTypeEnumFactory.java | 6 +- .../codesystems/V3ActSiteEnumFactory.java | 6 +- .../codesystems/V3ActStatusEnumFactory.java | 6 +- .../V3ActUSPrivacyLawEnumFactory.java | 6 +- .../V3ActUncertaintyEnumFactory.java | 6 +- .../V3AddressPartTypeEnumFactory.java | 6 +- .../codesystems/V3AddressUseEnumFactory.java | 6 +- .../V3AdministrativeGenderEnumFactory.java | 6 +- ...ndianAlaskaNativeLanguagesEnumFactory.java | 6 +- .../V3CalendarCycleEnumFactory.java | 6 +- .../codesystems/V3CalendarEnumFactory.java | 6 +- .../V3CalendarTypeEnumFactory.java | 6 +- .../codesystems/V3CharsetEnumFactory.java | 6 +- .../V3CodingRationaleEnumFactory.java | 6 +- ...3CommunicationFunctionTypeEnumFactory.java | 6 +- .../V3CompressionAlgorithmEnumFactory.java | 6 +- .../V3ConfidentialityEnumFactory.java | 6 +- .../V3ContainerCapEnumFactory.java | 6 +- .../V3ContainerSeparatorEnumFactory.java | 6 +- .../V3ContentProcessingModeEnumFactory.java | 6 +- .../V3ContextControlEnumFactory.java | 6 +- .../V3DataOperationEnumFactory.java | 6 +- .../codesystems/V3DentitionEnumFactory.java | 6 +- .../V3DeviceAlertLevelEnumFactory.java | 6 +- .../V3DocumentCompletionEnumFactory.java | 6 +- .../V3DocumentStorageEnumFactory.java | 6 +- .../V3EducationLevelEnumFactory.java | 6 +- .../V3EmployeeJobClassEnumFactory.java | 6 +- ...V3EncounterAdmissionSourceEnumFactory.java | 6 +- ...V3EncounterSpecialCourtesyEnumFactory.java | 6 +- .../codesystems/V3EntityClassEnumFactory.java | 6 +- .../codesystems/V3EntityCodeEnumFactory.java | 6 +- .../V3EntityDeterminerEnumFactory.java | 6 +- .../V3EntityHandlingEnumFactory.java | 6 +- .../V3EntityNamePartQualifierEnumFactory.java | 6 +- ...3EntityNamePartQualifierR2EnumFactory.java | 6 +- .../V3EntityNamePartTypeEnumFactory.java | 6 +- .../V3EntityNamePartTypeR2EnumFactory.java | 6 +- .../V3EntityNameUseEnumFactory.java | 6 +- .../V3EntityNameUseR2EnumFactory.java | 6 +- .../codesystems/V3EntityRiskEnumFactory.java | 6 +- .../V3EntityStatusEnumFactory.java | 6 +- .../V3EquipmentAlertLevelEnumFactory.java | 6 +- .../codesystems/V3EthnicityEnumFactory.java | 6 +- .../V3ExposureModeEnumFactory.java | 6 +- .../V3GTSAbbreviationEnumFactory.java | 6 +- .../V3GenderStatusEnumFactory.java | 6 +- ...3HL7ContextConductionStyleEnumFactory.java | 6 +- .../V3HL7StandardVersionCodeEnumFactory.java | 6 +- .../V3HL7UpdateModeEnumFactory.java | 6 +- .../V3Hl7ApprovalStatusEnumFactory.java | 6 +- .../V3Hl7CMETAttributionEnumFactory.java | 6 +- .../codesystems/V3Hl7ITSTypeEnumFactory.java | 6 +- .../V3Hl7ITSVersionCodeEnumFactory.java | 6 +- .../V3Hl7PublishingDomainEnumFactory.java | 6 +- .../V3Hl7PublishingSectionEnumFactory.java | 6 +- .../V3Hl7PublishingSubSectionEnumFactory.java | 6 +- .../codesystems/V3Hl7RealmEnumFactory.java | 6 +- .../V3Hl7V3ConformanceEnumFactory.java | 6 +- .../V3Hl7VoteResolutionEnumFactory.java | 6 +- .../V3HtmlLinkTypeEnumFactory.java | 6 +- .../V3IdentifierReliabilityEnumFactory.java | 6 +- .../V3IdentifierScopeEnumFactory.java | 6 +- .../V3IntegrityCheckAlgorithmEnumFactory.java | 6 +- .../V3LanguageAbilityModeEnumFactory.java | 6 +- ...LanguageAbilityProficiencyEnumFactory.java | 6 +- .../V3LivingArrangementEnumFactory.java | 6 +- .../V3LocalMarkupIgnoreEnumFactory.java | 6 +- .../V3LocalRemoteControlStateEnumFactory.java | 6 +- ...ManagedParticipationStatusEnumFactory.java | 6 +- .../V3MapRelationshipEnumFactory.java | 6 +- .../V3MaritalStatusEnumFactory.java | 6 +- .../V3MessageWaitingPriorityEnumFactory.java | 6 +- .../V3ModifyIndicatorEnumFactory.java | 6 +- .../codesystems/V3NullFlavorEnumFactory.java | 6 +- .../V3ObservationCategoryEnumFactory.java | 6 +- ...3ObservationInterpretationEnumFactory.java | 6 +- .../V3ObservationMethodEnumFactory.java | 6 +- .../V3ObservationValueEnumFactory.java | 6 +- .../V3OrderableDrugFormEnumFactory.java | 6 +- .../V3ParticipationFunctionEnumFactory.java | 6 +- .../V3ParticipationModeEnumFactory.java | 6 +- .../V3ParticipationSignatureEnumFactory.java | 6 +- .../V3ParticipationTypeEnumFactory.java | 6 +- .../V3PatientImportanceEnumFactory.java | 6 +- .../V3PaymentTermsEnumFactory.java | 6 +- .../V3PersonDisabilityTypeEnumFactory.java | 6 +- .../V3PolicyHolderRoleEnumFactory.java | 6 +- ...robabilityDistributionTypeEnumFactory.java | 6 +- .../V3ProcessingIDEnumFactory.java | 6 +- .../V3ProcessingModeEnumFactory.java | 6 +- .../V3QueryParameterValueEnumFactory.java | 6 +- .../V3QueryPriorityEnumFactory.java | 6 +- .../V3QueryRequestLimitEnumFactory.java | 6 +- .../V3QueryResponseEnumFactory.java | 6 +- .../V3QueryStatusCodeEnumFactory.java | 6 +- .../model/codesystems/V3RaceEnumFactory.java | 6 +- .../V3RelationalOperatorEnumFactory.java | 6 +- .../V3RelationshipConjunctionEnumFactory.java | 6 +- .../V3ReligiousAffiliationEnumFactory.java | 6 +- .../V3ResponseLevelEnumFactory.java | 6 +- .../V3ResponseModalityEnumFactory.java | 6 +- .../V3ResponseModeEnumFactory.java | 6 +- .../codesystems/V3RoleClassEnumFactory.java | 6 +- .../codesystems/V3RoleCodeEnumFactory.java | 6 +- .../V3RoleLinkStatusEnumFactory.java | 6 +- .../V3RoleLinkTypeEnumFactory.java | 6 +- .../codesystems/V3RoleStatusEnumFactory.java | 6 +- .../V3RouteOfAdministrationEnumFactory.java | 6 +- .../codesystems/V3SequencingEnumFactory.java | 6 +- .../codesystems/V3SetOperatorEnumFactory.java | 6 +- .../V3SpecimenTypeEnumFactory.java | 6 +- .../codesystems/V3StyleTypeEnumFactory.java | 6 +- ...SubstanceAdminSubstitutionEnumFactory.java | 6 +- .../V3SubstitutionConditionEnumFactory.java | 6 +- ...V3TableCellHorizontalAlignEnumFactory.java | 6 +- .../V3TableCellScopeEnumFactory.java | 6 +- .../V3TableCellVerticalAlignEnumFactory.java | 6 +- .../codesystems/V3TableFrameEnumFactory.java | 6 +- .../codesystems/V3TableRulesEnumFactory.java | 6 +- .../V3TargetAwarenessEnumFactory.java | 6 +- ...ecommunicationCapabilitiesEnumFactory.java | 6 +- .../codesystems/V3TimingEventEnumFactory.java | 6 +- ...issionRelationshipTypeCodeEnumFactory.java | 6 +- .../V3TribalEntityUSEnumFactory.java | 6 +- .../V3TriggerEventIDEnumFactory.java | 6 +- .../V3VaccineManufacturerEnumFactory.java | 6 +- .../V3WorkClassificationODHEnumFactory.java | 6 +- .../codesystems/VariableTypeEnumFactory.java | 6 +- .../codesystems/VariantStateEnumFactory.java | 6 +- ...cationresultCanPushUpdatesEnumFactory.java | 6 +- ...nresultCommunicationMethodEnumFactory.java | 6 +- ...icationresultFailureActionEnumFactory.java | 6 +- .../VerificationresultNeedEnumFactory.java | 6 +- ...ionresultPrimarySourceTypeEnumFactory.java | 6 +- ...ionresultPushTypeAvailableEnumFactory.java | 6 +- .../VerificationresultStatusEnumFactory.java | 6 +- ...ionresultValidationProcessEnumFactory.java | 6 +- ...tionresultValidationStatusEnumFactory.java | 6 +- ...cationresultValidationTypeEnumFactory.java | 6 +- .../VersioningPolicyEnumFactory.java | 6 +- .../VisionBaseCodesEnumFactory.java | 6 +- .../VisionEyeCodesEnumFactory.java | 6 +- .../codesystems/VisionProductEnumFactory.java | 6 +- .../W3cProvenanceActivityTypeEnumFactory.java | 6 +- 759 files changed, 5210 insertions(+), 3382 deletions(-) diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Account.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Account.java index 30267b6d3..a16674d92 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Account.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Account.java @@ -213,7 +213,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"; @@ -224,7 +226,7 @@ public class Account extends DomainResource { if (code == AccountStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(AccountStatus code) { return code.getSystem(); @@ -465,9 +467,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; @@ -805,9 +807,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; @@ -1772,9 +1774,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ActivityDefinition.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ActivityDefinition.java index c94eec1fa..ad26db1d4 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ActivityDefinition.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ActivityDefinition.java @@ -407,7 +407,9 @@ public class ActivityDefinition extends MetadataResource { } public String toCode(ActivityDefinitionKind code) { - if (code == ActivityDefinitionKind.APPOINTMENT) + if (code == ActivityDefinitionKind.NULL) + return null; + if (code == ActivityDefinitionKind.APPOINTMENT) return "Appointment"; if (code == ActivityDefinitionKind.APPOINTMENTRESPONSE) return "AppointmentResponse"; @@ -438,7 +440,7 @@ public class ActivityDefinition extends MetadataResource { if (code == ActivityDefinitionKind.VISIONPRESCRIPTION) return "VisionPrescription"; return "?"; - } + } public String toSystem(ActivityDefinitionKind code) { return code.getSystem(); @@ -692,7 +694,9 @@ public class ActivityDefinition extends MetadataResource { } 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"; @@ -711,7 +715,7 @@ public class ActivityDefinition extends MetadataResource { if (code == RequestIntent.OPTION) return "option"; return "?"; - } + } public String toSystem(RequestIntent code) { return code.getSystem(); @@ -864,7 +868,9 @@ public class ActivityDefinition extends MetadataResource { } 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"; @@ -873,7 +879,7 @@ public class ActivityDefinition extends MetadataResource { if (code == RequestPriority.STAT) return "stat"; return "?"; - } + } public String toSystem(RequestPriority code) { return code.getSystem(); @@ -1024,7 +1030,9 @@ public class ActivityDefinition extends MetadataResource { } public String toCode(ActivityParticipantType code) { - if (code == ActivityParticipantType.PATIENT) + if (code == ActivityParticipantType.NULL) + return null; + if (code == ActivityParticipantType.PATIENT) return "patient"; if (code == ActivityParticipantType.PRACTITIONER) return "practitioner"; @@ -1033,7 +1041,7 @@ public class ActivityDefinition extends MetadataResource { if (code == ActivityParticipantType.DEVICE) return "device"; return "?"; - } + } public String toSystem(ActivityParticipantType code) { return code.getSystem(); @@ -1211,9 +1219,9 @@ public class ActivityDefinition extends MetadataResource { } 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; @@ -1517,9 +1525,9 @@ public class ActivityDefinition extends MetadataResource { } 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; @@ -5452,9 +5460,9 @@ public class ActivityDefinition extends MetadataResource { } 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.r4/src/main/java/org/hl7/fhir/r4/model/Address.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Address.java index 7689abd70..9ea0ead47 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Address.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Address.java @@ -215,7 +215,9 @@ public class Address extends Type 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"; @@ -226,7 +228,7 @@ public class Address extends Type implements ICompositeType { if (code == AddressUse.BILLING) return "billing"; return "?"; - } + } public String toSystem(AddressUse code) { return code.getSystem(); @@ -359,14 +361,16 @@ public class Address extends Type 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(); @@ -1177,9 +1181,9 @@ public class Address extends Type 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.r4/src/main/java/org/hl7/fhir/r4/model/AdverseEvent.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/AdverseEvent.java index 28cb5fed6..90fa21e87 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/AdverseEvent.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/AdverseEvent.java @@ -162,12 +162,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(); @@ -391,9 +393,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; @@ -775,9 +777,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; @@ -2479,9 +2481,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.r4/src/main/java/org/hl7/fhir/r4/model/AllergyIntolerance.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/AllergyIntolerance.java index 93b39576d..fc9ed3f75 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/AllergyIntolerance.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/AllergyIntolerance.java @@ -165,12 +165,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(); @@ -328,7 +330,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"; @@ -337,7 +341,7 @@ public class AllergyIntolerance extends DomainResource { if (code == AllergyIntoleranceCategory.BIOLOGIC) return "biologic"; return "?"; - } + } public String toSystem(AllergyIntoleranceCategory code) { return code.getSystem(); @@ -472,14 +476,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(); @@ -612,14 +618,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(); @@ -1198,9 +1206,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; @@ -2696,9 +2704,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Appointment.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Appointment.java index d6d748fd8..4f6272977 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Appointment.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Appointment.java @@ -315,7 +315,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"; @@ -336,7 +338,7 @@ public class Appointment extends DomainResource { if (code == AppointmentStatus.WAITLIST) return "waitlist"; return "?"; - } + } public String toSystem(AppointmentStatus code) { return code.getSystem(); @@ -471,14 +473,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(); @@ -633,7 +637,9 @@ public class Appointment extends DomainResource { } 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"; @@ -642,7 +648,7 @@ public class Appointment extends DomainResource { if (code == ParticipationStatus.NEEDSACTION) return "needs-action"; return "?"; - } + } public String toSystem(ParticipationStatus code) { return code.getSystem(); @@ -1060,9 +1066,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(castToCodeableConcept(value)); @@ -3084,9 +3090,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/AppointmentResponse.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/AppointmentResponse.java index 4aa8df4aa..7f559f15a 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/AppointmentResponse.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/AppointmentResponse.java @@ -197,7 +197,9 @@ public class AppointmentResponse extends DomainResource { } public String toCode(ParticipantStatus code) { - if (code == ParticipantStatus.ACCEPTED) + if (code == ParticipantStatus.NULL) + return null; + if (code == ParticipantStatus.ACCEPTED) return "accepted"; if (code == ParticipantStatus.DECLINED) return "declined"; @@ -206,7 +208,7 @@ public class AppointmentResponse extends DomainResource { if (code == ParticipantStatus.NEEDSACTION) return "needs-action"; return "?"; - } + } public String toSystem(ParticipantStatus code) { return code.getSystem(); @@ -911,9 +913,9 @@ public class AppointmentResponse 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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/AuditEvent.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/AuditEvent.java index 4c6c8dfbd..fa228fe38 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/AuditEvent.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/AuditEvent.java @@ -215,7 +215,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"; @@ -226,7 +228,7 @@ public class AuditEvent extends DomainResource { if (code == AuditEventAction.E) return "E"; return "?"; - } + } public String toSystem(AuditEventAction code) { return code.getSystem(); @@ -380,7 +382,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"; @@ -389,7 +393,7 @@ public class AuditEvent extends DomainResource { if (code == AuditEventOutcome._12) return "12"; return "?"; - } + } public String toSystem(AuditEventOutcome code) { return code.getSystem(); @@ -558,7 +562,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"; @@ -569,7 +575,7 @@ public class AuditEvent extends DomainResource { if (code == AuditEventAgentNetworkType._5) return "5"; return "?"; - } + } public String toSystem(AuditEventAgentNetworkType code) { return code.getSystem(); @@ -1415,9 +1421,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; @@ -1819,9 +1825,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; @@ -2201,9 +2207,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; @@ -2939,9 +2945,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; @@ -3316,9 +3322,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; @@ -4203,9 +4209,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.r4/src/main/java/org/hl7/fhir/r4/model/BiologicallyDerivedProduct.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/BiologicallyDerivedProduct.java index 1dec3a31c..a1d91a7cd 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/BiologicallyDerivedProduct.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/BiologicallyDerivedProduct.java @@ -221,7 +221,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"; @@ -232,7 +234,7 @@ public class BiologicallyDerivedProduct extends DomainResource { if (code == BiologicallyDerivedProductCategory.BIOLOGICALAGENT) return "biologicalAgent"; return "?"; - } + } public String toSystem(BiologicallyDerivedProductCategory code) { return code.getSystem(); @@ -350,12 +352,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(); @@ -494,14 +498,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(); @@ -793,9 +799,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; @@ -1219,9 +1225,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; @@ -1535,9 +1541,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; @@ -1958,9 +1964,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; @@ -2917,9 +2923,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Bundle.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Bundle.java index b75b4e055..d69243681 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Bundle.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Bundle.java @@ -294,7 +294,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"; @@ -313,7 +315,7 @@ public class Bundle extends Resource implements IBaseBundle { if (code == BundleType.COLLECTION) return "collection"; return "?"; - } + } public String toSystem(BundleType code) { return code.getSystem(); @@ -448,14 +450,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(); @@ -642,7 +646,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"; @@ -655,7 +661,7 @@ public class Bundle extends Resource implements IBaseBundle { if (code == HTTPVerb.PATCH) return "PATCH"; return "?"; - } + } public String toSystem(HTTPVerb code) { return code.getSystem(); @@ -862,9 +868,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; @@ -1434,9 +1440,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); @@ -1799,9 +1805,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; @@ -2442,9 +2448,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; @@ -2998,9 +3004,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; @@ -3713,9 +3719,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.r4/src/main/java/org/hl7/fhir/r4/model/CapabilityStatement.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/CapabilityStatement.java index 134e235ad..6270e89ee 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/CapabilityStatement.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/CapabilityStatement.java @@ -195,14 +195,16 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor } 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(); @@ -317,12 +319,14 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor } 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(); @@ -563,7 +567,9 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor } 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"; @@ -582,7 +588,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor if (code == TypeRestfulInteraction.SEARCHTYPE) return "search-type"; return "?"; - } + } public String toSystem(TypeRestfulInteraction code) { return code.getSystem(); @@ -716,14 +722,16 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor } 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(); @@ -876,7 +884,9 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor } 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"; @@ -885,7 +895,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor if (code == ConditionalReadStatus.FULLSUPPORT) return "full-support"; return "?"; - } + } public String toSystem(ConditionalReadStatus code) { return code.getSystem(); @@ -1019,14 +1029,16 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor } 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(); @@ -1201,7 +1213,9 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor } 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"; @@ -1212,7 +1226,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor if (code == ReferenceHandlingPolicy.LOCAL) return "local"; return "?"; - } + } public String toSystem(ReferenceHandlingPolicy code) { return code.getSystem(); @@ -1363,7 +1377,9 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor } 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"; @@ -1372,7 +1388,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor if (code == SystemRestfulInteraction.HISTORYSYSTEM) return "history-system"; return "?"; - } + } public String toSystem(SystemRestfulInteraction code) { return code.getSystem(); @@ -1487,12 +1503,14 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor } 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(); @@ -1607,12 +1625,14 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor } 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(); @@ -1890,9 +1910,9 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor } 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; @@ -2291,9 +2311,9 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor } 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; @@ -3071,9 +3091,9 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor } 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; @@ -3522,9 +3542,9 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor } 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; @@ -5133,9 +5153,9 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor } 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; @@ -5634,9 +5654,9 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor } 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; @@ -6110,9 +6130,9 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor } 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; @@ -6559,9 +6579,9 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor } 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; @@ -6874,9 +6894,9 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor } 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; @@ -7341,9 +7361,9 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor } 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); @@ -7645,9 +7665,9 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor } 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; @@ -7950,9 +7970,9 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor } 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; @@ -8336,9 +8356,9 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor } 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; @@ -10565,9 +10585,9 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor } 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.r4/src/main/java/org/hl7/fhir/r4/model/CarePlan.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/CarePlan.java index 9b2a11cd0..4106328cd 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/CarePlan.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/CarePlan.java @@ -260,7 +260,9 @@ public class CarePlan extends DomainResource { } public String toCode(CarePlanStatus code) { - if (code == CarePlanStatus.DRAFT) + if (code == CarePlanStatus.NULL) + return null; + if (code == CarePlanStatus.DRAFT) return "draft"; if (code == CarePlanStatus.ACTIVE) return "active"; @@ -275,7 +277,7 @@ public class CarePlan extends DomainResource { if (code == CarePlanStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(CarePlanStatus code) { return code.getSystem(); @@ -426,7 +428,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"; @@ -435,7 +439,7 @@ public class CarePlan extends DomainResource { if (code == CarePlanIntent.OPTION) return "option"; return "?"; - } + } public String toSystem(CarePlanIntent code) { return code.getSystem(); @@ -658,7 +662,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"; @@ -675,7 +681,7 @@ public class CarePlan extends DomainResource { if (code == CarePlanActivityKind.VISIONPRESCRIPTION) return "VisionPrescription"; return "?"; - } + } public String toSystem(CarePlanActivityKind code) { return code.getSystem(); @@ -920,7 +926,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"; @@ -939,7 +947,7 @@ public class CarePlan extends DomainResource { if (code == CarePlanActivityStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(CarePlanActivityStatus code) { return code.getSystem(); @@ -1384,9 +1392,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(castToCodeableConcept(value)); @@ -2978,9 +2986,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; @@ -5325,9 +5333,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/CareTeam.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/CareTeam.java index 06a6c10a8..259b14487 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/CareTeam.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/CareTeam.java @@ -216,7 +216,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"; @@ -227,7 +229,7 @@ public class CareTeam extends DomainResource { if (code == CareTeamStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(CareTeamStatus code) { return code.getSystem(); @@ -566,9 +568,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(castToCodeableConcept(value)); @@ -1759,9 +1761,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/CatalogEntry.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/CatalogEntry.java index 0e614fdee..b86e3ae94 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/CatalogEntry.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/CatalogEntry.java @@ -159,12 +159,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(); @@ -382,9 +384,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; @@ -1474,9 +1476,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ChargeItem.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ChargeItem.java index 84f99f2d6..cfeac0d58 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ChargeItem.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ChargeItem.java @@ -263,7 +263,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"; @@ -278,7 +280,7 @@ public class ChargeItem extends DomainResource { if (code == ChargeItemStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(ChargeItemStatus code) { return code.getSystem(); @@ -467,9 +469,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; @@ -2692,9 +2694,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ChargeItemDefinition.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ChargeItemDefinition.java index 45a1145fa..685649d69 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ChargeItemDefinition.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ChargeItemDefinition.java @@ -253,7 +253,9 @@ public class ChargeItemDefinition extends MetadataResource { } public String toCode(ChargeItemDefinitionPriceComponentType code) { - if (code == ChargeItemDefinitionPriceComponentType.BASE) + if (code == ChargeItemDefinitionPriceComponentType.NULL) + return null; + if (code == ChargeItemDefinitionPriceComponentType.BASE) return "base"; if (code == ChargeItemDefinitionPriceComponentType.SURCHARGE) return "surcharge"; @@ -266,7 +268,7 @@ public class ChargeItemDefinition extends MetadataResource { if (code == ChargeItemDefinitionPriceComponentType.INFORMATIONAL) return "informational"; return "?"; - } + } public String toSystem(ChargeItemDefinitionPriceComponentType code) { return code.getSystem(); @@ -579,9 +581,9 @@ public class ChargeItemDefinition extends MetadataResource { } 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; @@ -898,9 +900,9 @@ public class ChargeItemDefinition extends MetadataResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("applicability")) { this.getApplicability().remove((ChargeItemDefinitionApplicabilityComponent) value); @@ -1320,9 +1322,9 @@ public class ChargeItemDefinition extends MetadataResource { } 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; @@ -3290,9 +3292,9 @@ public class ChargeItemDefinition extends MetadataResource { } 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.r4/src/main/java/org/hl7/fhir/r4/model/Claim.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Claim.java index 18ba69282..fe3eabf8e 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Claim.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Claim.java @@ -198,7 +198,9 @@ public class Claim extends DomainResource { } public String toCode(ClaimStatus code) { - if (code == ClaimStatus.ACTIVE) + if (code == ClaimStatus.NULL) + return null; + if (code == ClaimStatus.ACTIVE) return "active"; if (code == ClaimStatus.CANCELLED) return "cancelled"; @@ -207,7 +209,7 @@ public class Claim extends DomainResource { if (code == ClaimStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(ClaimStatus code) { return code.getSystem(); @@ -342,14 +344,16 @@ public class Claim extends DomainResource { } 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(); @@ -570,9 +574,9 @@ public class Claim 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; @@ -851,9 +855,9 @@ public class Claim 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; @@ -1315,9 +1319,9 @@ public class Claim 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; @@ -1970,9 +1974,9 @@ public class Claim 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; @@ -2521,9 +2525,9 @@ public class Claim 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; @@ -3126,9 +3130,9 @@ public class Claim 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; @@ -3875,9 +3879,9 @@ public class Claim 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; @@ -4289,9 +4293,9 @@ public class Claim 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; @@ -6037,9 +6041,9 @@ public class Claim 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; @@ -7256,9 +7260,9 @@ public class Claim 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; @@ -8261,9 +8265,9 @@ public class Claim 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; @@ -10370,9 +10374,9 @@ public class Claim 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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ClaimResponse.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ClaimResponse.java index 040708ed5..fd4d3e706 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ClaimResponse.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ClaimResponse.java @@ -199,7 +199,9 @@ public class ClaimResponse extends DomainResource { } public String toCode(ClaimResponseStatus code) { - if (code == ClaimResponseStatus.ACTIVE) + if (code == ClaimResponseStatus.NULL) + return null; + if (code == ClaimResponseStatus.ACTIVE) return "active"; if (code == ClaimResponseStatus.CANCELLED) return "cancelled"; @@ -208,7 +210,7 @@ public class ClaimResponse extends DomainResource { if (code == ClaimResponseStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(ClaimResponseStatus code) { return code.getSystem(); @@ -343,14 +345,16 @@ public class ClaimResponse extends DomainResource { } 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(); @@ -503,7 +507,9 @@ public class ClaimResponse extends DomainResource { } 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"; @@ -512,7 +518,7 @@ public class ClaimResponse extends DomainResource { if (code == RemittanceOutcome.PARTIAL) return "partial"; return "?"; - } + } public String toSystem(RemittanceOutcome code) { return code.getSystem(); @@ -892,9 +898,9 @@ public class ClaimResponse 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.itemSequence = null; @@ -1326,9 +1332,9 @@ public class ClaimResponse 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; @@ -1805,9 +1811,9 @@ public class ClaimResponse extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("detailSequence")) { this.detailSequence = null; @@ -2223,9 +2229,9 @@ public class ClaimResponse extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("subDetailSequence")) { this.subDetailSequence = null; @@ -3774,9 +3780,9 @@ public class ClaimResponse 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(castToPositiveInt(value)); @@ -4777,9 +4783,9 @@ public class ClaimResponse 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; @@ -5570,9 +5576,9 @@ public class ClaimResponse 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; @@ -5900,9 +5906,9 @@ public class ClaimResponse 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; @@ -6358,9 +6364,9 @@ public class ClaimResponse 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; @@ -6806,9 +6812,9 @@ public class ClaimResponse 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; @@ -7386,9 +7392,9 @@ public class ClaimResponse 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; @@ -7862,9 +7868,9 @@ public class ClaimResponse 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.itemSequence = null; @@ -9912,9 +9918,9 @@ public class ClaimResponse 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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ClinicalImpression.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ClinicalImpression.java index 9f845cd1e..c54f8551b 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ClinicalImpression.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ClinicalImpression.java @@ -182,14 +182,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(); @@ -402,9 +404,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; @@ -749,9 +751,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; @@ -2488,9 +2490,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/CodeSystem.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/CodeSystem.java index 2d467c042..1c32c2aef 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/CodeSystem.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/CodeSystem.java @@ -216,7 +216,9 @@ public class CodeSystem extends MetadataResource { } 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"; @@ -225,7 +227,7 @@ public class CodeSystem extends MetadataResource { if (code == CodeSystemHierarchyMeaning.CLASSIFIEDWITH) return "classified-with"; return "?"; - } + } public String toSystem(CodeSystemHierarchyMeaning code) { return code.getSystem(); @@ -403,7 +405,9 @@ public class CodeSystem extends MetadataResource { } 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"; @@ -414,7 +418,7 @@ public class CodeSystem extends MetadataResource { if (code == CodeSystemContentMode.SUPPLEMENT) return "supplement"; return "?"; - } + } public String toSystem(CodeSystemContentMode code) { return code.getSystem(); @@ -667,7 +671,9 @@ public class CodeSystem extends MetadataResource { } 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"; @@ -686,7 +692,7 @@ public class CodeSystem extends MetadataResource { if (code == FilterOperator.EXISTS) return "exists"; return "?"; - } + } public String toSystem(FilterOperator code) { return code.getSystem(); @@ -894,7 +900,9 @@ public class CodeSystem extends MetadataResource { } 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"; @@ -909,7 +917,7 @@ public class CodeSystem extends MetadataResource { if (code == PropertyType.DECIMAL) return "decimal"; return "?"; - } + } public String toSystem(PropertyType code) { return code.getSystem(); @@ -1279,9 +1287,9 @@ public class CodeSystem extends MetadataResource { } 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; @@ -1776,9 +1784,9 @@ public class CodeSystem extends MetadataResource { } 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; @@ -2422,9 +2430,9 @@ public class CodeSystem extends MetadataResource { } 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; @@ -2817,9 +2825,9 @@ public class CodeSystem extends MetadataResource { } 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; @@ -3225,9 +3233,9 @@ public class CodeSystem extends MetadataResource { } 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; @@ -5412,9 +5420,9 @@ public class CodeSystem extends MetadataResource { } 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.r4/src/main/java/org/hl7/fhir/r4/model/Communication.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Communication.java index bde5fe411..7db27fa5f 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Communication.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Communication.java @@ -279,7 +279,9 @@ public class Communication extends DomainResource { } public String toCode(CommunicationStatus code) { - if (code == CommunicationStatus.PREPARATION) + if (code == CommunicationStatus.NULL) + return null; + if (code == CommunicationStatus.PREPARATION) return "preparation"; if (code == CommunicationStatus.INPROGRESS) return "in-progress"; @@ -296,7 +298,7 @@ public class Communication extends DomainResource { if (code == CommunicationStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(CommunicationStatus code) { return code.getSystem(); @@ -449,7 +451,9 @@ public class Communication extends DomainResource { } public String toCode(CommunicationPriority code) { - if (code == CommunicationPriority.ROUTINE) + if (code == CommunicationPriority.NULL) + return null; + if (code == CommunicationPriority.ROUTINE) return "routine"; if (code == CommunicationPriority.URGENT) return "urgent"; @@ -458,7 +462,7 @@ public class Communication extends DomainResource { if (code == CommunicationPriority.STAT) return "stat"; return "?"; - } + } public String toSystem(CommunicationPriority code) { return code.getSystem(); @@ -633,9 +637,9 @@ public class Communication 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; @@ -2656,9 +2660,9 @@ public class Communication 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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/CommunicationRequest.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/CommunicationRequest.java index 9b3c90f38..54975036e 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/CommunicationRequest.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/CommunicationRequest.java @@ -259,7 +259,9 @@ public class CommunicationRequest extends DomainResource { } public String toCode(CommunicationRequestStatus code) { - if (code == CommunicationRequestStatus.DRAFT) + if (code == CommunicationRequestStatus.NULL) + return null; + if (code == CommunicationRequestStatus.DRAFT) return "draft"; if (code == CommunicationRequestStatus.ACTIVE) return "active"; @@ -274,7 +276,7 @@ public class CommunicationRequest extends DomainResource { if (code == CommunicationRequestStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(CommunicationRequestStatus code) { return code.getSystem(); @@ -427,7 +429,9 @@ public class CommunicationRequest extends DomainResource { } public String toCode(CommunicationPriority code) { - if (code == CommunicationPriority.ROUTINE) + if (code == CommunicationPriority.NULL) + return null; + if (code == CommunicationPriority.ROUTINE) return "routine"; if (code == CommunicationPriority.URGENT) return "urgent"; @@ -436,7 +440,7 @@ public class CommunicationRequest extends DomainResource { if (code == CommunicationPriority.STAT) return "stat"; return "?"; - } + } public String toSystem(CommunicationPriority code) { return code.getSystem(); @@ -611,9 +615,9 @@ public class CommunicationRequest 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; @@ -2528,9 +2532,9 @@ public class CommunicationRequest 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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/CompartmentDefinition.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/CompartmentDefinition.java index 64c87b8d3..5dc4f1f02 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/CompartmentDefinition.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/CompartmentDefinition.java @@ -217,7 +217,9 @@ public class CompartmentDefinition extends MetadataResource { } 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"; @@ -228,7 +230,7 @@ public class CompartmentDefinition extends MetadataResource { if (code == CompartmentType.DEVICE) return "Device"; return "?"; - } + } public String toSystem(CompartmentType code) { return code.getSystem(); @@ -527,9 +529,9 @@ public class CompartmentDefinition extends MetadataResource { } 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; @@ -1747,9 +1749,9 @@ public class CompartmentDefinition extends MetadataResource { } 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.r4/src/main/java/org/hl7/fhir/r4/model/Composition.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Composition.java index 43a25a28d..c78dda038 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Composition.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Composition.java @@ -209,7 +209,9 @@ public class Composition extends DomainResource { } 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"; @@ -218,7 +220,7 @@ public class Composition extends DomainResource { if (code == CompositionStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(CompositionStatus code) { return code.getSystem(); @@ -405,7 +407,9 @@ public class Composition extends DomainResource { } public String toCode(DocumentConfidentiality code) { - if (code == DocumentConfidentiality.U) + if (code == DocumentConfidentiality.NULL) + return null; + if (code == DocumentConfidentiality.U) return "U"; if (code == DocumentConfidentiality.L) return "L"; @@ -418,7 +422,7 @@ public class Composition extends DomainResource { if (code == DocumentConfidentiality.V) return "V"; return "?"; - } + } public String toSystem(DocumentConfidentiality code) { return code.getSystem(); @@ -571,7 +575,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"; @@ -580,7 +586,7 @@ public class Composition extends DomainResource { if (code == CompositionAttestationMode.OFFICIAL) return "official"; return "?"; - } + } public String toSystem(CompositionAttestationMode code) { return code.getSystem(); @@ -732,7 +738,9 @@ public class Composition extends DomainResource { } 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"; @@ -741,7 +749,7 @@ public class Composition extends DomainResource { if (code == DocumentRelationshipType.APPENDS) return "appends"; return "?"; - } + } public String toSystem(DocumentRelationshipType code) { return code.getSystem(); @@ -877,14 +885,16 @@ public class Composition extends DomainResource { } public String toCode(SectionMode code) { - if (code == SectionMode.WORKING) + if (code == SectionMode.NULL) + return null; + if (code == SectionMode.WORKING) return "working"; if (code == SectionMode.SNAPSHOT) return "snapshot"; if (code == SectionMode.CHANGES) return "changes"; return "?"; - } + } public String toSystem(SectionMode code) { return code.getSystem(); @@ -1160,9 +1170,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; @@ -1480,9 +1490,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; @@ -1858,9 +1868,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(castToCodeableConcept(value)); @@ -2788,9 +2798,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; @@ -4175,9 +4185,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.r4/src/main/java/org/hl7/fhir/r4/model/ConceptMap.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ConceptMap.java index 3fe1a659c..af5b40fac 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ConceptMap.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ConceptMap.java @@ -185,14 +185,16 @@ public class ConceptMap extends MetadataResource { } 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(); @@ -690,9 +692,9 @@ public class ConceptMap extends MetadataResource { } 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; @@ -1102,9 +1104,9 @@ public class ConceptMap extends MetadataResource { } 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; @@ -1749,9 +1751,9 @@ public class ConceptMap extends MetadataResource { } 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; @@ -2271,9 +2273,9 @@ public class ConceptMap extends MetadataResource { } 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; @@ -2782,9 +2784,9 @@ public class ConceptMap extends MetadataResource { } 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; @@ -4336,9 +4338,9 @@ public class ConceptMap extends MetadataResource { } 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.r4/src/main/java/org/hl7/fhir/r4/model/Consent.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Consent.java index c2abe1adf..1560c3f27 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Consent.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Consent.java @@ -234,7 +234,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"; @@ -247,7 +249,7 @@ public class Consent extends DomainResource { if (code == ConsentState.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(ConsentState code) { return code.getSystem(); @@ -362,12 +364,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(); @@ -520,7 +524,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"; @@ -529,7 +535,7 @@ public class Consent extends DomainResource { if (code == ConsentDataMeaning.AUTHOREDBY) return "authoredby"; return "?"; - } + } public String toSystem(ConsentDataMeaning code) { return code.getSystem(); @@ -750,9 +756,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; @@ -1111,9 +1117,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; @@ -2057,9 +2063,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; @@ -2468,9 +2474,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; @@ -2771,9 +2777,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; @@ -3917,9 +3923,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ContactPoint.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ContactPoint.java index d94fb4047..5cbd76cfa 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ContactPoint.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ContactPoint.java @@ -256,7 +256,9 @@ public class ContactPoint extends Type 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"; @@ -271,7 +273,7 @@ public class ContactPoint extends Type implements ICompositeType { if (code == ContactPointSystem.OTHER) return "other"; return "?"; - } + } public String toSystem(ContactPointSystem code) { return code.getSystem(); @@ -447,7 +449,9 @@ public class ContactPoint extends Type 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"; @@ -458,7 +462,7 @@ public class ContactPoint extends Type implements ICompositeType { if (code == ContactPointUse.MOBILE) return "mobile"; return "?"; - } + } public String toSystem(ContactPointUse code) { return code.getSystem(); @@ -869,9 +873,9 @@ public class ContactPoint extends Type 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.r4/src/main/java/org/hl7/fhir/r4/model/Contract.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Contract.java index b70d32e66..49b436620 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Contract.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Contract.java @@ -450,7 +450,9 @@ public class Contract extends DomainResource { } public String toCode(ContractStatus code) { - if (code == ContractStatus.AMENDED) + if (code == ContractStatus.NULL) + return null; + if (code == ContractStatus.AMENDED) return "amended"; if (code == ContractStatus.APPENDED) return "appended"; @@ -481,7 +483,7 @@ public class Contract extends DomainResource { if (code == ContractStatus.TERMINATED) return "terminated"; return "?"; - } + } public String toSystem(ContractStatus code) { return code.getSystem(); @@ -885,7 +887,9 @@ public class Contract extends DomainResource { } public String toCode(ContractPublicationStatus code) { - if (code == ContractPublicationStatus.AMENDED) + if (code == ContractPublicationStatus.NULL) + return null; + if (code == ContractPublicationStatus.AMENDED) return "amended"; if (code == ContractPublicationStatus.APPENDED) return "appended"; @@ -916,7 +920,7 @@ public class Contract extends DomainResource { if (code == ContractPublicationStatus.TERMINATED) return "terminated"; return "?"; - } + } public String toSystem(ContractPublicationStatus code) { return code.getSystem(); @@ -1417,9 +1421,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; @@ -2376,9 +2380,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; @@ -2950,9 +2954,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(castToUnsignedInt(value)); @@ -3852,9 +3856,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(castToIdentifier(value)); @@ -4247,9 +4251,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(castToReference(value)); @@ -4753,9 +4757,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; @@ -6043,9 +6047,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; @@ -6599,9 +6603,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; @@ -7816,9 +7820,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; @@ -9757,9 +9761,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; @@ -10305,9 +10309,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(castToReference(value)); @@ -10651,9 +10655,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; @@ -10916,9 +10920,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; @@ -11147,9 +11151,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; @@ -11378,9 +11382,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; @@ -14177,9 +14181,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Contributor.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Contributor.java index 8f853310a..6b336809e 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Contributor.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Contributor.java @@ -191,7 +191,9 @@ public class Contributor extends Type 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"; @@ -200,7 +202,7 @@ public class Contributor extends Type implements ICompositeType { if (code == ContributorType.ENDORSER) return "endorser"; return "?"; - } + } public String toSystem(ContributorType code) { return code.getSystem(); @@ -480,9 +482,9 @@ public class Contributor extends Type 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.r4/src/main/java/org/hl7/fhir/r4/model/Coverage.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Coverage.java index 0d1ca1c44..60c38c95d 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Coverage.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Coverage.java @@ -194,7 +194,9 @@ public class Coverage extends DomainResource { } public String toCode(CoverageStatus code) { - if (code == CoverageStatus.ACTIVE) + if (code == CoverageStatus.NULL) + return null; + if (code == CoverageStatus.ACTIVE) return "active"; if (code == CoverageStatus.CANCELLED) return "cancelled"; @@ -203,7 +205,7 @@ public class Coverage extends DomainResource { if (code == CoverageStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(CoverageStatus code) { return code.getSystem(); @@ -463,9 +465,9 @@ public class Coverage 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; @@ -831,9 +833,9 @@ public class Coverage 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; @@ -1088,9 +1090,9 @@ public class Coverage 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; @@ -2527,9 +2529,9 @@ public class Coverage 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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/CoverageEligibilityRequest.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/CoverageEligibilityRequest.java index 62db41c93..97a9dece1 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/CoverageEligibilityRequest.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/CoverageEligibilityRequest.java @@ -198,7 +198,9 @@ public class CoverageEligibilityRequest extends DomainResource { } public String toCode(EligibilityRequestStatus code) { - if (code == EligibilityRequestStatus.ACTIVE) + if (code == EligibilityRequestStatus.NULL) + return null; + if (code == EligibilityRequestStatus.ACTIVE) return "active"; if (code == EligibilityRequestStatus.CANCELLED) return "cancelled"; @@ -207,7 +209,7 @@ public class CoverageEligibilityRequest extends DomainResource { if (code == EligibilityRequestStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(EligibilityRequestStatus code) { return code.getSystem(); @@ -362,7 +364,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"; @@ -371,7 +375,7 @@ public class CoverageEligibilityRequest extends DomainResource { if (code == EligibilityRequestPurpose.VALIDATION) return "validation"; return "?"; - } + } public String toSystem(EligibilityRequestPurpose code) { return code.getSystem(); @@ -664,9 +668,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; @@ -1072,9 +1076,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; @@ -1898,9 +1902,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(castToPositiveInt(value)); @@ -2236,9 +2240,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; @@ -3459,9 +3463,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/CoverageEligibilityResponse.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/CoverageEligibilityResponse.java index c07683f1e..9942f69a7 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/CoverageEligibilityResponse.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/CoverageEligibilityResponse.java @@ -197,7 +197,9 @@ public class CoverageEligibilityResponse extends DomainResource { } public String toCode(EligibilityResponseStatus code) { - if (code == EligibilityResponseStatus.ACTIVE) + if (code == EligibilityResponseStatus.NULL) + return null; + if (code == EligibilityResponseStatus.ACTIVE) return "active"; if (code == EligibilityResponseStatus.CANCELLED) return "cancelled"; @@ -206,7 +208,7 @@ public class CoverageEligibilityResponse extends DomainResource { if (code == EligibilityResponseStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(EligibilityResponseStatus code) { return code.getSystem(); @@ -361,7 +363,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"; @@ -370,7 +374,7 @@ public class CoverageEligibilityResponse extends DomainResource { if (code == EligibilityResponsePurpose.VALIDATION) return "validation"; return "?"; - } + } public String toSystem(EligibilityResponsePurpose code) { return code.getSystem(); @@ -727,9 +731,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; @@ -1829,9 +1833,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; @@ -2377,9 +2381,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; @@ -2603,9 +2607,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; @@ -3895,9 +3899,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/DataRequirement.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/DataRequirement.java index 8fd59a371..fa0dcfefb 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/DataRequirement.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/DataRequirement.java @@ -158,12 +158,14 @@ public class DataRequirement extends Type 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(); @@ -597,9 +599,9 @@ public class DataRequirement extends Type 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; @@ -1104,9 +1106,9 @@ public class DataRequirement extends Type 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; @@ -1434,9 +1436,9 @@ public class DataRequirement extends Type 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; @@ -2285,9 +2287,9 @@ public class DataRequirement extends Type 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.r4/src/main/java/org/hl7/fhir/r4/model/DetectedIssue.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/DetectedIssue.java index f0874c350..a78a29312 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/DetectedIssue.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/DetectedIssue.java @@ -285,7 +285,9 @@ public class DetectedIssue extends DomainResource { } public String toCode(DetectedIssueStatus code) { - if (code == DetectedIssueStatus.REGISTERED) + if (code == DetectedIssueStatus.NULL) + return null; + if (code == DetectedIssueStatus.REGISTERED) return "registered"; if (code == DetectedIssueStatus.PRELIMINARY) return "preliminary"; @@ -302,7 +304,7 @@ public class DetectedIssue extends DomainResource { if (code == DetectedIssueStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(DetectedIssueStatus code) { return code.getSystem(); @@ -438,14 +440,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(); @@ -669,9 +673,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(castToCodeableConcept(value)); @@ -1032,9 +1036,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; @@ -2114,9 +2118,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Device.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Device.java index ab2053494..573e4926e 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Device.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Device.java @@ -235,7 +235,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"; @@ -248,7 +250,7 @@ public class Device extends DomainResource { if (code == UDIEntryType.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(UDIEntryType code) { return code.getSystem(); @@ -402,7 +404,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"; @@ -411,7 +415,7 @@ public class Device extends DomainResource { if (code == FHIRDeviceStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(FHIRDeviceStatus code) { return code.getSystem(); @@ -598,7 +602,9 @@ public class Device extends DomainResource { } 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"; @@ -611,7 +617,7 @@ public class Device extends DomainResource { if (code == DeviceNameType.OTHER) return "other"; return "?"; - } + } public String toSystem(DeviceNameType code) { return code.getSystem(); @@ -1207,9 +1213,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; @@ -1541,9 +1547,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; @@ -1810,9 +1816,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; @@ -2110,9 +2116,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; @@ -2466,9 +2472,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; @@ -4585,9 +4591,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/DeviceDefinition.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/DeviceDefinition.java index e0f4a5553..2317eaae9 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/DeviceDefinition.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/DeviceDefinition.java @@ -230,7 +230,9 @@ public class DeviceDefinition extends DomainResource { } 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"; @@ -243,7 +245,7 @@ public class DeviceDefinition extends DomainResource { if (code == DeviceNameType.OTHER) return "other"; return "?"; - } + } public String toSystem(DeviceNameType code) { return code.getSystem(); @@ -534,9 +536,9 @@ public class DeviceDefinition 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; @@ -838,9 +840,9 @@ public class DeviceDefinition 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; @@ -1132,9 +1134,9 @@ public class DeviceDefinition 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; @@ -1396,9 +1398,9 @@ public class DeviceDefinition 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; @@ -1746,9 +1748,9 @@ public class DeviceDefinition 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; @@ -2100,9 +2102,9 @@ public class DeviceDefinition 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; @@ -3861,9 +3863,9 @@ public class DeviceDefinition 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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/DeviceMetric.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/DeviceMetric.java index 30eed31a1..a480c122d 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/DeviceMetric.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/DeviceMetric.java @@ -194,7 +194,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"; @@ -203,7 +205,7 @@ public class DeviceMetric extends DomainResource { if (code == DeviceMetricOperationalStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(DeviceMetricOperationalStatus code) { return code.getSystem(); @@ -426,7 +428,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"; @@ -443,7 +447,7 @@ public class DeviceMetric extends DomainResource { if (code == DeviceMetricColor.WHITE) return "white"; return "?"; - } + } public String toSystem(DeviceMetricColor code) { return code.getSystem(); @@ -595,7 +599,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"; @@ -604,7 +610,7 @@ public class DeviceMetric extends DomainResource { if (code == DeviceMetricCategory.UNSPECIFIED) return "unspecified"; return "?"; - } + } public String toSystem(DeviceMetricCategory code) { return code.getSystem(); @@ -755,7 +761,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"; @@ -764,7 +772,7 @@ public class DeviceMetric extends DomainResource { if (code == DeviceMetricCalibrationType.TWOPOINT) return "two-point"; return "?"; - } + } public String toSystem(DeviceMetricCalibrationType code) { return code.getSystem(); @@ -916,7 +924,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"; @@ -925,7 +935,7 @@ public class DeviceMetric extends DomainResource { if (code == DeviceMetricCalibrationState.UNSPECIFIED) return "unspecified"; return "?"; - } + } public String toSystem(DeviceMetricCalibrationState code) { return code.getSystem(); @@ -1198,9 +1208,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; @@ -2146,9 +2156,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/DeviceRequest.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/DeviceRequest.java index 029b40813..7a9f10879 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/DeviceRequest.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/DeviceRequest.java @@ -258,7 +258,9 @@ public class DeviceRequest extends DomainResource { } public String toCode(DeviceRequestStatus code) { - if (code == DeviceRequestStatus.DRAFT) + if (code == DeviceRequestStatus.NULL) + return null; + if (code == DeviceRequestStatus.DRAFT) return "draft"; if (code == DeviceRequestStatus.ACTIVE) return "active"; @@ -273,7 +275,7 @@ public class DeviceRequest extends DomainResource { if (code == DeviceRequestStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(DeviceRequestStatus code) { return code.getSystem(); @@ -527,7 +529,9 @@ public class DeviceRequest extends DomainResource { } 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"; @@ -546,7 +550,7 @@ public class DeviceRequest extends DomainResource { if (code == RequestIntent.OPTION) return "option"; return "?"; - } + } public String toSystem(RequestIntent code) { return code.getSystem(); @@ -699,7 +703,9 @@ public class DeviceRequest extends DomainResource { } 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"; @@ -708,7 +714,7 @@ public class DeviceRequest extends DomainResource { if (code == RequestPriority.STAT) return "stat"; return "?"; - } + } public String toSystem(RequestPriority code) { return code.getSystem(); @@ -929,9 +935,9 @@ public class DeviceRequest 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; @@ -3069,9 +3075,9 @@ public class DeviceRequest 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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/DeviceUseStatement.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/DeviceUseStatement.java index 7b20749cc..99dd033d3 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/DeviceUseStatement.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/DeviceUseStatement.java @@ -230,7 +230,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"; @@ -243,7 +245,7 @@ public class DeviceUseStatement extends DomainResource { if (code == DeviceUseStatementStatus.ONHOLD) return "on-hold"; return "?"; - } + } public String toSystem(DeviceUseStatementStatus code) { return code.getSystem(); @@ -1365,9 +1367,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/DiagnosticReport.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/DiagnosticReport.java index ccb6ca7d3..a9475f453 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/DiagnosticReport.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/DiagnosticReport.java @@ -319,7 +319,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"; @@ -340,7 +342,7 @@ public class DiagnosticReport extends DomainResource { if (code == DiagnosticReportStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(DiagnosticReportStatus code) { return code.getSystem(); @@ -559,9 +561,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; @@ -2264,9 +2266,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/DocumentReference.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/DocumentReference.java index 99354d878..a204a8c77 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/DocumentReference.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/DocumentReference.java @@ -207,7 +207,9 @@ public class DocumentReference extends DomainResource { } public String toCode(ReferredDocumentStatus code) { - if (code == ReferredDocumentStatus.PRELIMINARY) + if (code == ReferredDocumentStatus.NULL) + return null; + if (code == ReferredDocumentStatus.PRELIMINARY) return "preliminary"; if (code == ReferredDocumentStatus.FINAL) return "final"; @@ -216,7 +218,7 @@ public class DocumentReference extends DomainResource { if (code == ReferredDocumentStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(ReferredDocumentStatus code) { return code.getSystem(); @@ -368,7 +370,9 @@ public class DocumentReference extends DomainResource { } 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"; @@ -377,7 +381,7 @@ public class DocumentReference extends DomainResource { if (code == DocumentRelationshipType.APPENDS) return "appends"; return "?"; - } + } public String toSystem(DocumentRelationshipType code) { return code.getSystem(); @@ -589,9 +593,9 @@ public class DocumentReference 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; @@ -837,9 +841,9 @@ public class DocumentReference extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("attachment")) { this.attachment = null; @@ -1481,9 +1485,9 @@ public class DocumentReference extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("encounter")) { this.getEncounter().remove(castToReference(value)); @@ -2882,9 +2886,9 @@ public class DocumentReference extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("masterIdentifier")) { this.masterIdentifier = null; diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/EffectEvidenceSynthesis.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/EffectEvidenceSynthesis.java index d05026e15..aac61871e 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/EffectEvidenceSynthesis.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/EffectEvidenceSynthesis.java @@ -172,12 +172,14 @@ public class EffectEvidenceSynthesis extends MetadataResource { } public String toCode(ExposureState code) { - if (code == ExposureState.EXPOSURE) + if (code == ExposureState.NULL) + return null; + if (code == ExposureState.EXPOSURE) return "exposure"; if (code == ExposureState.EXPOSUREALTERNATIVE) return "exposure-alternative"; return "?"; - } + } public String toSystem(ExposureState code) { return code.getSystem(); @@ -448,9 +450,9 @@ public class EffectEvidenceSynthesis extends MetadataResource { } 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; @@ -893,9 +895,9 @@ public class EffectEvidenceSynthesis extends MetadataResource { } 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; @@ -1436,9 +1438,9 @@ public class EffectEvidenceSynthesis extends MetadataResource { } 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; @@ -1938,9 +1940,9 @@ public class EffectEvidenceSynthesis extends MetadataResource { } 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; @@ -2329,9 +2331,9 @@ public class EffectEvidenceSynthesis extends MetadataResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("rating")) { this.getRating().remove(castToCodeableConcept(value)); @@ -2690,9 +2692,9 @@ public class EffectEvidenceSynthesis extends MetadataResource { } 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; @@ -5332,9 +5334,9 @@ public class EffectEvidenceSynthesis extends MetadataResource { } 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.r4/src/main/java/org/hl7/fhir/r4/model/ElementDefinition.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ElementDefinition.java index 58b849ded..f539ff4cf 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ElementDefinition.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ElementDefinition.java @@ -218,7 +218,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"; @@ -229,7 +231,7 @@ public class ElementDefinition extends BackboneType implements ICompositeType { if (code == PropertyRepresentation.XHTML) return "xhtml"; return "?"; - } + } public String toSystem(PropertyRepresentation code) { return code.getSystem(); @@ -403,7 +405,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"; @@ -414,7 +418,7 @@ public class ElementDefinition extends BackboneType implements ICompositeType { if (code == DiscriminatorType.PROFILE) return "profile"; return "?"; - } + } public String toSystem(DiscriminatorType code) { return code.getSystem(); @@ -550,14 +554,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(); @@ -692,14 +698,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(); @@ -832,14 +840,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,12 +965,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(); @@ -1354,9 +1366,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); @@ -1682,9 +1694,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; @@ -2058,9 +2070,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; @@ -2735,9 +2747,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; @@ -3203,9 +3215,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; @@ -4045,9 +4057,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; @@ -4480,9 +4492,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; @@ -4930,9 +4942,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; @@ -8662,9 +8674,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.r4/src/main/java/org/hl7/fhir/r4/model/Encounter.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Encounter.java index 9dc5a323d..3876934ed 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Encounter.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Encounter.java @@ -289,7 +289,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"; @@ -308,7 +310,7 @@ public class Encounter extends DomainResource { if (code == EncounterStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(EncounterStatus code) { return code.getSystem(); @@ -466,7 +468,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"; @@ -475,7 +479,7 @@ public class Encounter extends DomainResource { if (code == EncounterLocationStatus.COMPLETED) return "completed"; return "?"; - } + } public String toSystem(EncounterLocationStatus code) { return code.getSystem(); @@ -658,9 +662,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; @@ -896,9 +900,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; @@ -1236,9 +1240,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(castToCodeableConcept(value)); @@ -1610,9 +1614,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; @@ -2328,9 +2332,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; @@ -2828,9 +2832,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; @@ -4773,9 +4777,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Endpoint.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Endpoint.java index 6e460bb21..ce2aa0dcb 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Endpoint.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Endpoint.java @@ -231,7 +231,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"; @@ -244,7 +246,7 @@ public class Endpoint extends DomainResource { if (code == EndpointStatus.TEST) return "test"; return "?"; - } + } public String toSystem(EndpointStatus code) { return code.getSystem(); @@ -1132,9 +1134,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/EnrollmentRequest.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/EnrollmentRequest.java index fe4324fd5..93fa06e14 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/EnrollmentRequest.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/EnrollmentRequest.java @@ -192,7 +192,9 @@ public class EnrollmentRequest extends DomainResource { } public String toCode(EnrollmentRequestStatus code) { - if (code == EnrollmentRequestStatus.ACTIVE) + if (code == EnrollmentRequestStatus.NULL) + return null; + if (code == EnrollmentRequestStatus.ACTIVE) return "active"; if (code == EnrollmentRequestStatus.CANCELLED) return "cancelled"; @@ -201,7 +203,7 @@ public class EnrollmentRequest extends DomainResource { if (code == EnrollmentRequestStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(EnrollmentRequestStatus code) { return code.getSystem(); @@ -770,9 +772,9 @@ public class EnrollmentRequest 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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/EnrollmentResponse.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/EnrollmentResponse.java index 201fd9e2e..5006ff7b5 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/EnrollmentResponse.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/EnrollmentResponse.java @@ -195,7 +195,9 @@ public class EnrollmentResponse extends DomainResource { } public String toCode(EnrollmentResponseStatus code) { - if (code == EnrollmentResponseStatus.ACTIVE) + if (code == EnrollmentResponseStatus.NULL) + return null; + if (code == EnrollmentResponseStatus.ACTIVE) return "active"; if (code == EnrollmentResponseStatus.CANCELLED) return "cancelled"; @@ -204,7 +206,7 @@ public class EnrollmentResponse extends DomainResource { if (code == EnrollmentResponseStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(EnrollmentResponseStatus code) { return code.getSystem(); @@ -858,9 +860,9 @@ public class EnrollmentResponse 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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Enumerations.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Enumerations.java index 9f2a7b27e..d2ce3d418 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Enumerations.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Enumerations.java @@ -133,12 +133,14 @@ public class Enumerations { } public String toCode(AbstractType code) { - if (code == AbstractType.TYPE) + if (code == AbstractType.NULL) + return null; + if (code == AbstractType.TYPE) return "Type"; if (code == AbstractType.ANY) return "Any"; return "?"; - } + } public String toSystem(AbstractType code) { return code.getSystem(); @@ -286,7 +288,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"; @@ -295,7 +299,7 @@ public class Enumerations { if (code == AdministrativeGender.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(AdministrativeGender code) { return code.getSystem(); @@ -479,7 +483,9 @@ public class Enumerations { } public String toCode(AgeUnits code) { - if (code == AgeUnits.MIN) + if (code == AgeUnits.NULL) + return null; + if (code == AgeUnits.MIN) return "min"; if (code == AgeUnits.H) return "h"; @@ -492,7 +498,7 @@ public class Enumerations { if (code == AgeUnits.A) return "a"; return "?"; - } + } public String toSystem(AgeUnits code) { return code.getSystem(); @@ -649,7 +655,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"; @@ -658,7 +666,7 @@ public class Enumerations { if (code == BindingStrength.EXAMPLE) return "example"; return "?"; - } + } public String toSystem(BindingStrength code) { return code.getSystem(); @@ -930,7 +938,9 @@ public class Enumerations { } 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"; @@ -951,7 +961,7 @@ public class Enumerations { if (code == ConceptMapEquivalence.DISJOINT) return "disjoint"; return "?"; - } + } public String toSystem(ConceptMapEquivalence code) { return code.getSystem(); @@ -1305,7 +1315,9 @@ public class Enumerations { } public String toCode(DataAbsentReason code) { - if (code == DataAbsentReason.UNKNOWN) + if (code == DataAbsentReason.NULL) + return null; + if (code == DataAbsentReason.UNKNOWN) return "unknown"; if (code == DataAbsentReason.ASKEDUNKNOWN) return "asked-unknown"; @@ -1336,7 +1348,7 @@ public class Enumerations { if (code == DataAbsentReason.NOTPERMITTED) return "not-permitted"; return "?"; - } + } public String toSystem(DataAbsentReason code) { return code.getSystem(); @@ -2605,7 +2617,9 @@ public class Enumerations { } public String toCode(DataType code) { - if (code == DataType.ADDRESS) + if (code == DataType.NULL) + return null; + if (code == DataType.ADDRESS) return "Address"; if (code == DataType.AGE) return "Age"; @@ -2732,7 +2746,7 @@ public class Enumerations { if (code == DataType.XHTML) return "xhtml"; return "?"; - } + } public String toSystem(DataType code) { return code.getSystem(); @@ -2926,7 +2940,9 @@ public class Enumerations { } public String toCode(DefinitionResourceType code) { - if (code == DefinitionResourceType.ACTIVITYDEFINITION) + if (code == DefinitionResourceType.NULL) + return null; + if (code == DefinitionResourceType.ACTIVITYDEFINITION) return "ActivityDefinition"; if (code == DefinitionResourceType.EVENTDEFINITION) return "EventDefinition"; @@ -2939,7 +2955,7 @@ public class Enumerations { if (code == DefinitionResourceType.QUESTIONNAIRE) return "Questionnaire"; return "?"; - } + } public String toSystem(DefinitionResourceType code) { return code.getSystem(); @@ -3069,14 +3085,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(); @@ -3773,7 +3791,9 @@ public class Enumerations { } public String toCode(EventResourceType code) { - if (code == EventResourceType.CHARGEITEM) + if (code == EventResourceType.NULL) + return null; + if (code == EventResourceType.CHARGEITEM) return "ChargeItem"; if (code == EventResourceType.CLAIMRESPONSE) return "ClaimResponse"; @@ -3842,7 +3862,7 @@ public class Enumerations { if (code == EventResourceType.TASK) return "Task"; return "?"; - } + } public String toSystem(EventResourceType code) { return code.getSystem(); @@ -8085,7 +8105,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"; @@ -8512,7 +8534,7 @@ public class Enumerations { if (code == FHIRAllTypes.ANY) return "Any"; return "?"; - } + } public String toSystem(FHIRAllTypes code) { return code.getSystem(); @@ -12719,7 +12741,9 @@ public class Enumerations { } 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"; @@ -13142,7 +13166,7 @@ public class Enumerations { if (code == FHIRDefinedType.VISIONPRESCRIPTION) return "VisionPrescription"; return "?"; - } + } public String toSystem(FHIRDefinedType code) { return code.getSystem(); @@ -14340,7 +14364,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"; @@ -14455,7 +14481,7 @@ public class Enumerations { if (code == FHIRVersion._5_0_0DRAFTFINAL) return "5.0.0-draft-final"; return "?"; - } + } public String toSystem(FHIRVersion code) { return code.getSystem(); @@ -14696,7 +14722,9 @@ public class Enumerations { } public String toCode(KnowledgeResourceType code) { - if (code == KnowledgeResourceType.ACTIVITYDEFINITION) + if (code == KnowledgeResourceType.NULL) + return null; + if (code == KnowledgeResourceType.ACTIVITYDEFINITION) return "ActivityDefinition"; if (code == KnowledgeResourceType.CODESYSTEM) return "CodeSystem"; @@ -14715,7 +14743,7 @@ public class Enumerations { if (code == KnowledgeResourceType.VALUESET) return "ValueSet"; return "?"; - } + } public String toSystem(KnowledgeResourceType code) { return code.getSystem(); @@ -14791,8 +14819,10 @@ public class Enumerations { } public String toCode(MessageEvent code) { - return "?"; - } + if (code == MessageEvent.NULL) + return null; + return "?"; + } public String toSystem(MessageEvent code) { return code.getSystem(); @@ -14922,14 +14952,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(); @@ -15081,7 +15113,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"; @@ -15090,7 +15124,7 @@ public class Enumerations { if (code == PublicationStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(PublicationStatus code) { return code.getSystem(); @@ -15240,7 +15274,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"; @@ -15249,7 +15285,7 @@ public class Enumerations { if (code == RemittanceOutcome.PARTIAL) return "partial"; return "?"; - } + } public String toSystem(RemittanceOutcome code) { return code.getSystem(); @@ -15599,7 +15635,9 @@ public class Enumerations { } 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"; @@ -15630,7 +15668,7 @@ public class Enumerations { if (code == RequestResourceType.VISIONPRESCRIPTION) return "VisionPrescription"; return "?"; - } + } public String toSystem(RequestResourceType code) { return code.getSystem(); @@ -18644,7 +18682,9 @@ public class Enumerations { } public String toCode(ResourceType code) { - if (code == ResourceType.ACCOUNT) + if (code == ResourceType.NULL) + return null; + if (code == ResourceType.ACCOUNT) return "Account"; if (code == ResourceType.ACTIVITYDEFINITION) return "ActivityDefinition"; @@ -18941,7 +18981,7 @@ public class Enumerations { if (code == ResourceType.VISIONPRESCRIPTION) return "VisionPrescription"; return "?"; - } + } public String toSystem(ResourceType code) { return code.getSystem(); @@ -19186,7 +19226,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"; @@ -19205,7 +19247,7 @@ public class Enumerations { if (code == SearchParamType.SPECIAL) return "special"; return "?"; - } + } public String toSystem(SearchParamType code) { return code.getSystem(); @@ -19390,7 +19432,9 @@ public class Enumerations { } public String toCode(SpecialValues code) { - if (code == SpecialValues.TRUE) + if (code == SpecialValues.NULL) + return null; + if (code == SpecialValues.TRUE) return "true"; if (code == SpecialValues.FALSE) return "false"; @@ -19403,7 +19447,7 @@ public class Enumerations { if (code == SpecialValues.NILKNOWN) return "nil-known"; return "?"; - } + } public String toSystem(SpecialValues code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/EpisodeOfCare.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/EpisodeOfCare.java index ca778a5ef..adf3b458c 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/EpisodeOfCare.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/EpisodeOfCare.java @@ -259,7 +259,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"; @@ -274,7 +276,7 @@ public class EpisodeOfCare extends DomainResource { if (code == EpisodeOfCareStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(EpisodeOfCareStatus code) { return code.getSystem(); @@ -454,9 +456,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; @@ -804,9 +806,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; @@ -1944,9 +1946,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/EvidenceVariable.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/EvidenceVariable.java index 5f0a73cd8..33c540970 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/EvidenceVariable.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/EvidenceVariable.java @@ -184,14 +184,16 @@ public class EvidenceVariable extends MetadataResource { } public String toCode(EvidenceVariableType code) { - if (code == EvidenceVariableType.DICHOTOMOUS) + if (code == EvidenceVariableType.NULL) + return null; + if (code == EvidenceVariableType.DICHOTOMOUS) return "dichotomous"; if (code == EvidenceVariableType.CONTINUOUS) return "continuous"; if (code == EvidenceVariableType.DESCRIPTIVE) return "descriptive"; return "?"; - } + } public String toSystem(EvidenceVariableType code) { return code.getSystem(); @@ -378,7 +380,9 @@ public class EvidenceVariable extends MetadataResource { } 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"; @@ -391,7 +395,7 @@ public class EvidenceVariable extends MetadataResource { if (code == GroupMeasure.MEDIANOFMEDIAN) return "median-of-median"; return "?"; - } + } public String toSystem(GroupMeasure code) { return code.getSystem(); @@ -1159,9 +1163,9 @@ public class EvidenceVariable extends MetadataResource { } 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; @@ -3497,9 +3501,9 @@ public class EvidenceVariable extends MetadataResource { } 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.r4/src/main/java/org/hl7/fhir/r4/model/ExampleScenario.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ExampleScenario.java index 91060064e..680e7971c 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ExampleScenario.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ExampleScenario.java @@ -163,12 +163,14 @@ public class ExampleScenario extends MetadataResource { } 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(); @@ -3186,7 +3188,9 @@ public class ExampleScenario extends MetadataResource { } public String toCode(FHIRResourceType code) { - if (code == FHIRResourceType.ACCOUNT) + if (code == FHIRResourceType.NULL) + return null; + if (code == FHIRResourceType.ACCOUNT) return "Account"; if (code == FHIRResourceType.ACTIVITYDEFINITION) return "ActivityDefinition"; @@ -3483,7 +3487,7 @@ public class ExampleScenario extends MetadataResource { if (code == FHIRResourceType.VISIONPRESCRIPTION) return "VisionPrescription"; return "?"; - } + } public String toSystem(FHIRResourceType code) { return code.getSystem(); @@ -3824,9 +3828,9 @@ public class ExampleScenario extends MetadataResource { } 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; @@ -4427,9 +4431,9 @@ public class ExampleScenario extends MetadataResource { } 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; @@ -4765,9 +4769,9 @@ public class ExampleScenario extends MetadataResource { } 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; @@ -5056,9 +5060,9 @@ public class ExampleScenario extends MetadataResource { } 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; @@ -5566,9 +5570,9 @@ public class ExampleScenario extends MetadataResource { } 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; @@ -6003,9 +6007,9 @@ public class ExampleScenario extends MetadataResource { } 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); @@ -6839,9 +6843,9 @@ public class ExampleScenario extends MetadataResource { } 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; @@ -7301,9 +7305,9 @@ public class ExampleScenario extends MetadataResource { } 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; @@ -8784,9 +8788,9 @@ public class ExampleScenario extends MetadataResource { } 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.r4/src/main/java/org/hl7/fhir/r4/model/ExplanationOfBenefit.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ExplanationOfBenefit.java index b70f118f2..531be55a0 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ExplanationOfBenefit.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ExplanationOfBenefit.java @@ -200,7 +200,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"; @@ -209,7 +211,7 @@ public class ExplanationOfBenefit extends DomainResource { if (code == ExplanationOfBenefitStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(ExplanationOfBenefitStatus code) { return code.getSystem(); @@ -344,14 +346,16 @@ public class ExplanationOfBenefit extends DomainResource { } 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(); @@ -504,7 +508,9 @@ public class ExplanationOfBenefit extends DomainResource { } 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"; @@ -513,7 +519,7 @@ public class ExplanationOfBenefit extends DomainResource { if (code == RemittanceOutcome.PARTIAL) return "partial"; return "?"; - } + } public String toSystem(RemittanceOutcome code) { return code.getSystem(); @@ -734,9 +740,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; @@ -1007,9 +1013,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; @@ -1471,9 +1477,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; @@ -2125,9 +2131,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; @@ -2676,9 +2682,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; @@ -3281,9 +3287,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; @@ -3737,9 +3743,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; @@ -4104,9 +4110,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; @@ -6015,9 +6021,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; @@ -6704,9 +6710,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; @@ -7855,9 +7861,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; @@ -9062,9 +9068,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; @@ -10729,9 +10735,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(castToPositiveInt(value)); @@ -11732,9 +11738,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; @@ -12525,9 +12531,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; @@ -12855,9 +12861,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; @@ -13304,9 +13310,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; @@ -13748,9 +13754,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; @@ -14411,9 +14417,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; @@ -14864,9 +14870,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; @@ -18040,9 +18046,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Expression.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Expression.java index 413e6350a..e7f69318d 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Expression.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Expression.java @@ -174,14 +174,16 @@ public class Expression extends Type implements ICompositeType { } public String toCode(ExpressionLanguage code) { - if (code == ExpressionLanguage.TEXT_CQL) + if (code == ExpressionLanguage.NULL) + return null; + if (code == ExpressionLanguage.TEXT_CQL) return "text/cql"; if (code == ExpressionLanguage.TEXT_FHIRPATH) return "text/fhirpath"; if (code == ExpressionLanguage.APPLICATION_XFHIRQUERY) return "application/x-fhir-query"; return "?"; - } + } public String toSystem(ExpressionLanguage code) { return code.getSystem(); @@ -621,9 +623,9 @@ public class Expression extends Type implements ICompositeType { } 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; diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/FamilyMemberHistory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/FamilyMemberHistory.java index 4e0374e59..453663eaa 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/FamilyMemberHistory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/FamilyMemberHistory.java @@ -197,7 +197,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"; @@ -206,7 +208,7 @@ public class FamilyMemberHistory extends DomainResource { if (code == FamilyHistoryStatus.HEALTHUNKNOWN) return "health-unknown"; return "?"; - } + } public String toSystem(FamilyHistoryStatus code) { return code.getSystem(); @@ -676,9 +678,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; @@ -2380,9 +2382,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Flag.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Flag.java index f278c35ba..d243687eb 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Flag.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Flag.java @@ -173,14 +173,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(); @@ -803,9 +805,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Goal.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Goal.java index 9aa2f09a0..6c1eea284 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Goal.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Goal.java @@ -288,7 +288,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"; @@ -307,7 +309,7 @@ public class Goal extends DomainResource { if (code == GoalLifecycleStatus.REJECTED) return "rejected"; return "?"; - } + } public String toSystem(GoalLifecycleStatus code) { return code.getSystem(); @@ -754,9 +756,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; @@ -2141,9 +2143,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/GraphDefinition.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/GraphDefinition.java index e1a44db41..d03859ff2 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/GraphDefinition.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/GraphDefinition.java @@ -166,12 +166,14 @@ public class GraphDefinition extends MetadataResource { } 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(); @@ -340,7 +342,9 @@ public class GraphDefinition extends MetadataResource { } public String toCode(CompartmentCode code) { - if (code == CompartmentCode.PATIENT) + if (code == CompartmentCode.NULL) + return null; + if (code == CompartmentCode.PATIENT) return "Patient"; if (code == CompartmentCode.ENCOUNTER) return "Encounter"; @@ -351,7 +355,7 @@ public class GraphDefinition extends MetadataResource { if (code == CompartmentCode.DEVICE) return "Device"; return "?"; - } + } public String toSystem(CompartmentCode code) { return code.getSystem(); @@ -503,7 +507,9 @@ public class GraphDefinition extends MetadataResource { } 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"; @@ -512,7 +518,7 @@ public class GraphDefinition extends MetadataResource { if (code == GraphCompartmentRule.CUSTOM) return "custom"; return "?"; - } + } public String toSystem(GraphCompartmentRule code) { return code.getSystem(); @@ -999,9 +1005,9 @@ public class GraphDefinition extends MetadataResource { } 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; @@ -1550,9 +1556,9 @@ public class GraphDefinition extends MetadataResource { } 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; @@ -2107,9 +2113,9 @@ public class GraphDefinition extends MetadataResource { } 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; @@ -3412,9 +3418,9 @@ public class GraphDefinition extends MetadataResource { } 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.r4/src/main/java/org/hl7/fhir/r4/model/Group.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Group.java index e672fa4d3..7c49d1ec4 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Group.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Group.java @@ -233,7 +233,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"; @@ -246,7 +248,7 @@ public class Group extends DomainResource { if (code == GroupType.SUBSTANCE) return "substance"; return "?"; - } + } public String toSystem(GroupType code) { return code.getSystem(); @@ -635,9 +637,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; @@ -1026,9 +1028,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; @@ -1914,9 +1916,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/GuidanceResponse.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/GuidanceResponse.java index e04d52018..5f06eab11 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/GuidanceResponse.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/GuidanceResponse.java @@ -231,7 +231,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"; @@ -244,7 +246,7 @@ public class GuidanceResponse extends DomainResource { if (code == GuidanceResponseStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(GuidanceResponseStatus code) { return code.getSystem(); @@ -1606,9 +1608,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.r4/src/main/java/org/hl7/fhir/r4/model/HealthcareService.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/HealthcareService.java index e2f01bb67..0d20b1b90 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/HealthcareService.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/HealthcareService.java @@ -247,7 +247,9 @@ public class HealthcareService extends DomainResource { } 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"; @@ -262,7 +264,7 @@ public class HealthcareService extends DomainResource { if (code == DaysOfWeek.SUN) return "sun"; return "?"; - } + } public String toSystem(DaysOfWeek code) { return code.getSystem(); @@ -433,9 +435,9 @@ public class HealthcareService 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; @@ -900,9 +902,9 @@ public class HealthcareService 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); @@ -1194,9 +1196,9 @@ public class HealthcareService 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; @@ -3285,9 +3287,9 @@ public class HealthcareService 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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/HumanName.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/HumanName.java index 8b3b74cb5..bd1f8b16b 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/HumanName.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/HumanName.java @@ -257,7 +257,9 @@ public class HumanName extends Type 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"; @@ -272,7 +274,7 @@ public class HumanName extends Type implements ICompositeType { if (code == NameUse.MAIDEN) return "maiden"; return "?"; - } + } public String toSystem(NameUse code) { return code.getSystem(); @@ -955,9 +957,9 @@ public class HumanName extends Type 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.r4/src/main/java/org/hl7/fhir/r4/model/Identifier.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Identifier.java index c9a064348..4af61f585 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Identifier.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Identifier.java @@ -215,7 +215,9 @@ public class Identifier extends Type 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"; @@ -226,7 +228,7 @@ public class Identifier extends Type implements ICompositeType { if (code == IdentifierUse.OLD) return "old"; return "?"; - } + } public String toSystem(IdentifierUse code) { return code.getSystem(); @@ -681,9 +683,9 @@ public class Identifier extends Type 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.r4/src/main/java/org/hl7/fhir/r4/model/ImagingStudy.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ImagingStudy.java index f3c1cfa46..ac1e60e96 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ImagingStudy.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ImagingStudy.java @@ -223,7 +223,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"; @@ -234,7 +236,7 @@ public class ImagingStudy extends DomainResource { if (code == ImagingStudyStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(ImagingStudyStatus code) { return code.getSystem(); @@ -1199,9 +1201,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; @@ -1588,9 +1590,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; @@ -1987,9 +1989,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; @@ -3803,9 +3805,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Immunization.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Immunization.java index b3e7bfb45..1bc730ee5 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Immunization.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Immunization.java @@ -177,14 +177,16 @@ public class Immunization extends DomainResource { } public String toCode(ImmunizationStatus code) { - if (code == ImmunizationStatus.COMPLETED) + if (code == ImmunizationStatus.NULL) + return null; + if (code == ImmunizationStatus.COMPLETED) return "completed"; if (code == ImmunizationStatus.ENTEREDINERROR) return "entered-in-error"; if (code == ImmunizationStatus.NOTDONE) return "not-done"; return "?"; - } + } public String toSystem(ImmunizationStatus code) { return code.getSystem(); @@ -368,9 +370,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; @@ -814,9 +816,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; @@ -1187,9 +1189,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; @@ -1752,9 +1754,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; @@ -3939,9 +3941,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ImmunizationEvaluation.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ImmunizationEvaluation.java index f3dd08ccc..7c1ff90b0 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ImmunizationEvaluation.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ImmunizationEvaluation.java @@ -158,12 +158,14 @@ public class ImmunizationEvaluation extends DomainResource { } public String toCode(ImmunizationEvaluationStatus code) { - if (code == ImmunizationEvaluationStatus.COMPLETED) + if (code == ImmunizationEvaluationStatus.NULL) + return null; + if (code == ImmunizationEvaluationStatus.COMPLETED) return "completed"; if (code == ImmunizationEvaluationStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(ImmunizationEvaluationStatus code) { return code.getSystem(); @@ -1191,9 +1193,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ImplementationGuide.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ImplementationGuide.java index 13af3e856..3a4c7b48c 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ImplementationGuide.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ImplementationGuide.java @@ -10261,7 +10261,9 @@ public class ImplementationGuide extends MetadataResource { } 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"; @@ -11378,7 +11380,7 @@ public class ImplementationGuide extends MetadataResource { if (code == SPDXLicense.ZPL_2_1) return "ZPL-2.1"; return "?"; - } + } public String toSystem(SPDXLicense code) { return code.getSystem(); @@ -11534,7 +11536,9 @@ public class ImplementationGuide extends MetadataResource { } 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"; @@ -11543,7 +11547,7 @@ public class ImplementationGuide extends MetadataResource { if (code == GuidePageGeneration.GENERATED) return "generated"; return "?"; - } + } public String toSystem(GuidePageGeneration code) { return code.getSystem(); @@ -11824,7 +11828,9 @@ public class ImplementationGuide extends MetadataResource { } 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"; @@ -11845,7 +11851,7 @@ public class ImplementationGuide extends MetadataResource { if (code == GuideParameterCode.HTMLTEMPLATE) return "html-template"; return "?"; - } + } public String toSystem(GuideParameterCode code) { return code.getSystem(); @@ -12133,9 +12139,9 @@ public class ImplementationGuide extends MetadataResource { } 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; @@ -12432,9 +12438,9 @@ public class ImplementationGuide extends MetadataResource { } 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; @@ -12930,9 +12936,9 @@ public class ImplementationGuide extends MetadataResource { } 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); @@ -13277,9 +13283,9 @@ public class ImplementationGuide extends MetadataResource { } 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; @@ -13932,9 +13938,9 @@ public class ImplementationGuide extends MetadataResource { } 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; @@ -14441,9 +14447,9 @@ public class ImplementationGuide extends MetadataResource { } 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; @@ -14767,9 +14773,9 @@ public class ImplementationGuide extends MetadataResource { } 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; @@ -15118,9 +15124,9 @@ public class ImplementationGuide extends MetadataResource { } 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; @@ -15682,9 +15688,9 @@ public class ImplementationGuide extends MetadataResource { } 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; @@ -16121,9 +16127,9 @@ public class ImplementationGuide extends MetadataResource { } 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; @@ -16503,9 +16509,9 @@ public class ImplementationGuide extends MetadataResource { } 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; @@ -18184,9 +18190,9 @@ public class ImplementationGuide extends MetadataResource { } 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.r4/src/main/java/org/hl7/fhir/r4/model/Invoice.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Invoice.java index 500e0e86b..44b323964 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Invoice.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Invoice.java @@ -215,7 +215,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"; @@ -226,7 +228,7 @@ public class Invoice extends DomainResource { if (code == InvoiceStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(InvoiceStatus code) { return code.getSystem(); @@ -415,7 +417,9 @@ public class Invoice extends DomainResource { } 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"; @@ -428,7 +432,7 @@ public class Invoice extends DomainResource { if (code == InvoicePriceComponentType.INFORMATIONAL) return "informational"; return "?"; - } + } public String toSystem(InvoicePriceComponentType code) { return code.getSystem(); @@ -620,9 +624,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; @@ -1029,9 +1033,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; @@ -1456,9 +1460,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; @@ -2753,9 +2757,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Linkage.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Linkage.java index a85cb9255..0ac723ac0 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Linkage.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Linkage.java @@ -179,14 +179,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(); @@ -400,9 +402,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; @@ -777,9 +779,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.r4/src/main/java/org/hl7/fhir/r4/model/ListResource.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ListResource.java index 8e1ecd7c4..57e7d9456 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ListResource.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ListResource.java @@ -176,14 +176,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(); @@ -319,14 +321,16 @@ public class ListResource extends DomainResource { } 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(); @@ -650,9 +654,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; @@ -1715,9 +1719,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Location.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Location.java index 450dd3aa5..b5f066951 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Location.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Location.java @@ -179,14 +179,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(); @@ -304,12 +306,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(); @@ -514,7 +518,9 @@ public class Location extends DomainResource { } 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"; @@ -529,7 +535,7 @@ public class Location extends DomainResource { if (code == DaysOfWeek.SUN) return "sun"; return "?"; - } + } public String toSystem(DaysOfWeek code) { return code.getSystem(); @@ -899,9 +905,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; @@ -1352,9 +1358,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); @@ -2780,9 +2786,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/MeasureReport.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/MeasureReport.java index 38ad620c7..903b35957 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/MeasureReport.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/MeasureReport.java @@ -177,14 +177,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(); @@ -338,7 +340,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"; @@ -347,7 +351,7 @@ public class MeasureReport extends DomainResource { if (code == MeasureReportType.DATACOLLECTION) return "data-collection"; return "?"; - } + } public String toSystem(MeasureReportType code) { return code.getSystem(); @@ -657,9 +661,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; @@ -1022,9 +1026,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; @@ -1330,9 +1334,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(castToCodeableConcept(value)); @@ -1736,9 +1740,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; @@ -2000,9 +2004,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; @@ -2339,9 +2343,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; @@ -3322,9 +3326,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Media.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Media.java index ac7e98dc5..6d1eeddcb 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Media.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Media.java @@ -279,7 +279,9 @@ public class Media extends DomainResource { } public String toCode(MediaStatus code) { - if (code == MediaStatus.PREPARATION) + if (code == MediaStatus.NULL) + return null; + if (code == MediaStatus.PREPARATION) return "preparation"; if (code == MediaStatus.INPROGRESS) return "in-progress"; @@ -296,7 +298,7 @@ public class Media extends DomainResource { if (code == MediaStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(MediaStatus code) { return code.getSystem(); @@ -1957,9 +1959,9 @@ public class Media 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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Medication.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Medication.java index 035d3d3a3..53c14dfde 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Medication.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Medication.java @@ -178,14 +178,16 @@ public class Medication extends DomainResource { } public String toCode(MedicationStatus code) { - if (code == MedicationStatus.ACTIVE) + if (code == MedicationStatus.NULL) + return null; + if (code == MedicationStatus.ACTIVE) return "active"; if (code == MedicationStatus.INACTIVE) return "inactive"; if (code == MedicationStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(MedicationStatus code) { return code.getSystem(); @@ -466,9 +468,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; @@ -772,9 +774,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; @@ -1431,9 +1433,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/MedicationAdministration.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/MedicationAdministration.java index f52c5ed1d..4b1d67414 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/MedicationAdministration.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/MedicationAdministration.java @@ -258,7 +258,9 @@ public class MedicationAdministration extends DomainResource { } public String toCode(MedicationAdministrationStatus code) { - if (code == MedicationAdministrationStatus.INPROGRESS) + if (code == MedicationAdministrationStatus.NULL) + return null; + if (code == MedicationAdministrationStatus.INPROGRESS) return "in-progress"; if (code == MedicationAdministrationStatus.NOTDONE) return "not-done"; @@ -273,7 +275,7 @@ public class MedicationAdministration extends DomainResource { if (code == MedicationAdministrationStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(MedicationAdministrationStatus code) { return code.getSystem(); @@ -458,9 +460,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; @@ -1021,9 +1023,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; @@ -2823,9 +2825,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/MedicationDispense.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/MedicationDispense.java index 8d8339795..8aa4685ea 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/MedicationDispense.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/MedicationDispense.java @@ -295,7 +295,9 @@ public class MedicationDispense extends DomainResource { } public String toCode(MedicationDispenseStatus code) { - if (code == MedicationDispenseStatus.PREPARATION) + if (code == MedicationDispenseStatus.NULL) + return null; + if (code == MedicationDispenseStatus.PREPARATION) return "preparation"; if (code == MedicationDispenseStatus.INPROGRESS) return "in-progress"; @@ -314,7 +316,7 @@ public class MedicationDispense extends DomainResource { if (code == MedicationDispenseStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(MedicationDispenseStatus code) { return code.getSystem(); @@ -509,9 +511,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; @@ -955,9 +957,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; @@ -3045,9 +3047,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/MedicationKnowledge.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/MedicationKnowledge.java index 0383980a9..ceae999fe 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/MedicationKnowledge.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/MedicationKnowledge.java @@ -175,14 +175,16 @@ public class MedicationKnowledge extends DomainResource { } public String toCode(MedicationKnowledgeStatus code) { - if (code == MedicationKnowledgeStatus.ACTIVE) + if (code == MedicationKnowledgeStatus.NULL) + return null; + if (code == MedicationKnowledgeStatus.ACTIVE) return "active"; if (code == MedicationKnowledgeStatus.INACTIVE) return "inactive"; if (code == MedicationKnowledgeStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(MedicationKnowledgeStatus code) { return code.getSystem(); @@ -396,9 +398,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; @@ -662,9 +664,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; @@ -1025,9 +1027,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; @@ -1355,9 +1357,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; @@ -1622,9 +1624,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; @@ -2012,9 +2014,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); @@ -2309,9 +2311,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; @@ -2644,9 +2646,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; @@ -2933,9 +2935,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; @@ -3175,9 +3177,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; @@ -3489,9 +3491,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; @@ -3931,9 +3933,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; @@ -4229,9 +4231,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; @@ -4422,9 +4424,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; @@ -4652,9 +4654,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; @@ -4997,9 +4999,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(castToQuantity(value)); @@ -6852,9 +6854,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.r4/src/main/java/org/hl7/fhir/r4/model/MedicationRequest.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/MedicationRequest.java index a8c4ba62f..e6f0f8193 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/MedicationRequest.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/MedicationRequest.java @@ -281,7 +281,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"; @@ -298,7 +300,7 @@ public class MedicationRequest extends DomainResource { if (code == MedicationRequestStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(MedicationRequestStatus code) { return code.getSystem(); @@ -530,7 +532,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"; @@ -547,7 +551,7 @@ public class MedicationRequest extends DomainResource { if (code == MedicationRequestIntent.OPTION) return "option"; return "?"; - } + } public String toSystem(MedicationRequestIntent code) { return code.getSystem(); @@ -700,7 +704,9 @@ public class MedicationRequest extends DomainResource { } public String toCode(MedicationRequestPriority code) { - if (code == MedicationRequestPriority.ROUTINE) + if (code == MedicationRequestPriority.NULL) + return null; + if (code == MedicationRequestPriority.ROUTINE) return "routine"; if (code == MedicationRequestPriority.URGENT) return "urgent"; @@ -709,7 +715,7 @@ public class MedicationRequest extends DomainResource { if (code == MedicationRequestPriority.STAT) return "stat"; return "?"; - } + } public String toSystem(MedicationRequestPriority code) { return code.getSystem(); @@ -1189,9 +1195,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 @@ -1476,9 +1482,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; @@ -1763,9 +1769,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; @@ -4514,9 +4520,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/MedicationStatement.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/MedicationStatement.java index 2cd5fa313..ddf550728 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/MedicationStatement.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/MedicationStatement.java @@ -289,7 +289,9 @@ public class MedicationStatement extends DomainResource { } public String toCode(MedicationStatementStatus code) { - if (code == MedicationStatementStatus.ACTIVE) + if (code == MedicationStatementStatus.NULL) + return null; + if (code == MedicationStatementStatus.ACTIVE) return "active"; if (code == MedicationStatementStatus.COMPLETED) return "completed"; @@ -306,7 +308,7 @@ public class MedicationStatement extends DomainResource { if (code == MedicationStatementStatus.NOTTAKEN) return "not-taken"; return "?"; - } + } public String toSystem(MedicationStatementStatus code) { return code.getSystem(); @@ -1794,9 +1796,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/MessageDefinition.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/MessageDefinition.java index 791964078..aff76951f 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/MessageDefinition.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/MessageDefinition.java @@ -188,14 +188,16 @@ public class MessageDefinition extends MetadataResource { } 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(); @@ -346,7 +348,9 @@ public class MessageDefinition extends MetadataResource { } 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"; @@ -355,7 +359,7 @@ public class MessageDefinition extends MetadataResource { if (code == MessageheaderResponseRequest.ONSUCCESS) return "on-success"; return "?"; - } + } public String toSystem(MessageheaderResponseRequest code) { return code.getSystem(); @@ -731,9 +735,9 @@ public class MessageDefinition extends MetadataResource { } 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; @@ -1055,9 +1059,9 @@ public class MessageDefinition extends MetadataResource { } 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; @@ -3085,9 +3089,9 @@ public class MessageDefinition extends MetadataResource { } 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.r4/src/main/java/org/hl7/fhir/r4/model/MessageHeader.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/MessageHeader.java index 14aea6d67..f11122cfc 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/MessageHeader.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/MessageHeader.java @@ -183,14 +183,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(); @@ -556,9 +558,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; @@ -1068,9 +1070,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; @@ -1476,9 +1478,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; @@ -2467,9 +2469,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.r4/src/main/java/org/hl7/fhir/r4/model/MolecularSequence.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/MolecularSequence.java index f114a41e3..70afe1b2d 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/MolecularSequence.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/MolecularSequence.java @@ -177,14 +177,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(); @@ -299,12 +301,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(); @@ -419,12 +423,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(); @@ -557,14 +563,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(); @@ -737,7 +745,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"; @@ -748,7 +758,7 @@ public class MolecularSequence extends DomainResource { if (code == RepositoryType.OTHER) return "other"; return "?"; - } + } public String toSystem(RepositoryType code) { return code.getSystem(); @@ -1503,9 +1513,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; @@ -2256,9 +2266,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; @@ -3724,9 +3734,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; @@ -4612,9 +4622,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(castToInteger(value)); @@ -5319,9 +5329,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; @@ -5767,9 +5777,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; @@ -6099,9 +6109,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; @@ -6399,9 +6409,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; @@ -7769,9 +7779,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/NamingSystem.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/NamingSystem.java index 5313ee7a2..46391a4f7 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/NamingSystem.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/NamingSystem.java @@ -186,14 +186,16 @@ public class NamingSystem extends MetadataResource { } 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(); @@ -347,7 +349,9 @@ public class NamingSystem extends MetadataResource { } public String toCode(NamingSystemIdentifierType code) { - if (code == NamingSystemIdentifierType.NULL) + if (code == NamingSystemIdentifierType.NULL) + return null; + if (code == NamingSystemIdentifierType.NULL) return null; if (code == NamingSystemIdentifierType.OID) return "oid"; @@ -358,7 +362,7 @@ public class NamingSystem extends MetadataResource { if (code == NamingSystemIdentifierType.OTHER) return "other"; return "?"; - } + } public String toSystem(NamingSystemIdentifierType code) { return code.getSystem(); @@ -771,9 +775,9 @@ public class NamingSystem extends MetadataResource { } 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; @@ -1891,9 +1895,9 @@ public class NamingSystem extends MetadataResource { } 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.r4/src/main/java/org/hl7/fhir/r4/model/Narrative.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Narrative.java index d5cb09d02..336614914 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Narrative.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Narrative.java @@ -198,7 +198,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"; @@ -207,7 +209,7 @@ public class Narrative extends BaseNarrative implements INarrative { if (code == NarrativeStatus.EMPTY) return "empty"; return "?"; - } + } public String toSystem(NarrativeStatus code) { return code.getSystem(); @@ -393,9 +395,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.r4/src/main/java/org/hl7/fhir/r4/model/NutritionOrder.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/NutritionOrder.java index e30f871c8..60bc6616b 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/NutritionOrder.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/NutritionOrder.java @@ -259,7 +259,9 @@ public class NutritionOrder extends DomainResource { } public String toCode(NutritionOrderStatus code) { - if (code == NutritionOrderStatus.DRAFT) + if (code == NutritionOrderStatus.NULL) + return null; + if (code == NutritionOrderStatus.DRAFT) return "draft"; if (code == NutritionOrderStatus.ACTIVE) return "active"; @@ -274,7 +276,7 @@ public class NutritionOrder extends DomainResource { if (code == NutritionOrderStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(NutritionOrderStatus code) { return code.getSystem(); @@ -528,7 +530,9 @@ public class NutritionOrder extends DomainResource { } public String toCode(NutritiionOrderIntent code) { - if (code == NutritiionOrderIntent.PROPOSAL) + if (code == NutritiionOrderIntent.NULL) + return null; + if (code == NutritiionOrderIntent.PROPOSAL) return "proposal"; if (code == NutritiionOrderIntent.PLAN) return "plan"; @@ -547,7 +551,7 @@ public class NutritionOrder extends DomainResource { if (code == NutritiionOrderIntent.OPTION) return "option"; return "?"; - } + } public String toSystem(NutritiionOrderIntent code) { return code.getSystem(); @@ -1078,9 +1082,9 @@ public class NutritionOrder 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(castToCodeableConcept(value)); @@ -1374,9 +1378,9 @@ public class NutritionOrder extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("modifier")) { this.modifier = null; @@ -1617,9 +1621,9 @@ public class NutritionOrder extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("modifier")) { this.modifier = null; @@ -2094,9 +2098,9 @@ public class NutritionOrder 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; @@ -2871,9 +2875,9 @@ public class NutritionOrder extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("baseFormulaType")) { this.baseFormulaType = null; @@ -3286,9 +3290,9 @@ public class NutritionOrder 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; @@ -4827,9 +4831,9 @@ public class NutritionOrder 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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Observation.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Observation.java index 546d63534..58d54d5d8 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Observation.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Observation.java @@ -283,7 +283,9 @@ public class Observation extends DomainResource { } 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"; @@ -300,7 +302,7 @@ public class Observation extends DomainResource { if (code == ObservationStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(ObservationStatus code) { return code.getSystem(); @@ -744,9 +746,9 @@ public class Observation extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("low")) { this.low = null; @@ -1494,9 +1496,9 @@ public class Observation 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; @@ -3942,9 +3944,9 @@ public class Observation 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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ObservationDefinition.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ObservationDefinition.java index d197960a6..16a054a76 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ObservationDefinition.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ObservationDefinition.java @@ -324,7 +324,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"; @@ -347,7 +349,7 @@ public class ObservationDefinition extends DomainResource { if (code == ObservationDataType.PERIOD) return "Period"; return "?"; - } + } public String toSystem(ObservationDataType code) { return code.getSystem(); @@ -481,14 +483,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(); @@ -823,9 +827,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; @@ -1493,9 +1497,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; @@ -2676,9 +2680,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(castToCodeableConcept(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/OperationDefinition.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/OperationDefinition.java index 0d519aae1..ee7330c04 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/OperationDefinition.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/OperationDefinition.java @@ -169,12 +169,14 @@ public class OperationDefinition extends MetadataResource { } 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(); @@ -289,12 +291,14 @@ public class OperationDefinition extends MetadataResource { } 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(); @@ -1197,9 +1201,9 @@ public class OperationDefinition extends MetadataResource { } 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; @@ -1611,9 +1615,9 @@ public class OperationDefinition extends MetadataResource { } 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; @@ -1919,9 +1923,9 @@ public class OperationDefinition extends MetadataResource { } 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; @@ -2213,9 +2217,9 @@ public class OperationDefinition extends MetadataResource { } 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(castToString(value)); @@ -4370,9 +4374,9 @@ public class OperationDefinition extends MetadataResource { } 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.r4/src/main/java/org/hl7/fhir/r4/model/OperationOutcome.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/OperationOutcome.java index d205a0907..59fc2aa78 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/OperationOutcome.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/OperationOutcome.java @@ -196,7 +196,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"; @@ -205,7 +207,7 @@ public class OperationOutcome extends DomainResource implements IBaseOperationOu if (code == IssueSeverity.INFORMATION) return "information"; return "?"; - } + } public String toSystem(IssueSeverity code) { return code.getSystem(); @@ -865,7 +867,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"; @@ -928,7 +932,7 @@ public class OperationOutcome extends DomainResource implements IBaseOperationOu if (code == IssueType.INFORMATIONAL) return "informational"; return "?"; - } + } public String toSystem(IssueType code) { return code.getSystem(); @@ -1499,9 +1503,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; @@ -1764,9 +1768,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.r4/src/main/java/org/hl7/fhir/r4/model/ParameterDefinition.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ParameterDefinition.java index 268136410..a382511be 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ParameterDefinition.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ParameterDefinition.java @@ -156,12 +156,14 @@ public class ParameterDefinition extends Type implements ICompositeType { } public String toCode(ParameterUse code) { - if (code == ParameterUse.IN) + if (code == ParameterUse.NULL) + return null; + if (code == ParameterUse.IN) return "in"; if (code == ParameterUse.OUT) return "out"; return "?"; - } + } public String toSystem(ParameterUse code) { return code.getSystem(); @@ -748,9 +750,9 @@ public class ParameterDefinition extends Type implements ICompositeType { } 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.r4/src/main/java/org/hl7/fhir/r4/model/Patient.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Patient.java index 7503fa5a5..de9eb971d 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Patient.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Patient.java @@ -208,7 +208,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"; @@ -217,7 +219,7 @@ public class Patient extends DomainResource { if (code == LinkType.SEEALSO) return "seealso"; return "?"; - } + } public String toSystem(LinkType code) { return code.getSystem(); @@ -724,9 +726,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(castToCodeableConcept(value)); @@ -1068,9 +1070,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; @@ -1364,9 +1366,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; @@ -2762,9 +2764,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/PaymentNotice.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/PaymentNotice.java index e4a0f046a..b62f26e85 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/PaymentNotice.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/PaymentNotice.java @@ -192,7 +192,9 @@ public class PaymentNotice extends DomainResource { } public String toCode(PaymentNoticeStatus code) { - if (code == PaymentNoticeStatus.ACTIVE) + if (code == PaymentNoticeStatus.NULL) + return null; + if (code == PaymentNoticeStatus.ACTIVE) return "active"; if (code == PaymentNoticeStatus.CANCELLED) return "cancelled"; @@ -201,7 +203,7 @@ public class PaymentNotice extends DomainResource { if (code == PaymentNoticeStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(PaymentNoticeStatus code) { return code.getSystem(); @@ -1088,9 +1090,9 @@ public class PaymentNotice 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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/PaymentReconciliation.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/PaymentReconciliation.java index 0365685e1..e1b06fec2 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/PaymentReconciliation.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/PaymentReconciliation.java @@ -199,7 +199,9 @@ public class PaymentReconciliation extends DomainResource { } public String toCode(PaymentReconciliationStatus code) { - if (code == PaymentReconciliationStatus.ACTIVE) + if (code == PaymentReconciliationStatus.NULL) + return null; + if (code == PaymentReconciliationStatus.ACTIVE) return "active"; if (code == PaymentReconciliationStatus.CANCELLED) return "cancelled"; @@ -208,7 +210,7 @@ public class PaymentReconciliation extends DomainResource { if (code == PaymentReconciliationStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(PaymentReconciliationStatus code) { return code.getSystem(); @@ -899,9 +901,9 @@ public class PaymentReconciliation 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; @@ -1270,9 +1272,9 @@ public class PaymentReconciliation 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; @@ -2416,9 +2418,9 @@ public class PaymentReconciliation 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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Person.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Person.java index 639964fd2..f3b2dee3d 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Person.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Person.java @@ -196,7 +196,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"; @@ -205,7 +207,7 @@ public class Person extends DomainResource { if (code == IdentityAssuranceLevel.LEVEL4) return "level4"; return "?"; - } + } public String toSystem(IdentityAssuranceLevel code) { return code.getSystem(); @@ -420,9 +422,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; @@ -1272,9 +1274,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/PlanDefinition.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/PlanDefinition.java index 7997e3650..a0bb22f0f 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/PlanDefinition.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/PlanDefinition.java @@ -206,7 +206,9 @@ public class PlanDefinition extends MetadataResource { } 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"; @@ -215,7 +217,7 @@ public class PlanDefinition extends MetadataResource { if (code == RequestPriority.STAT) return "stat"; return "?"; - } + } public String toSystem(RequestPriority code) { return code.getSystem(); @@ -348,14 +350,16 @@ public class PlanDefinition extends MetadataResource { } 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(); @@ -596,7 +600,9 @@ public class PlanDefinition extends MetadataResource { } 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"; @@ -615,7 +621,7 @@ public class PlanDefinition extends MetadataResource { if (code == ActionRelationshipType.AFTEREND) return "after-end"; return "?"; - } + } public String toSystem(ActionRelationshipType code) { return code.getSystem(); @@ -766,7 +772,9 @@ public class PlanDefinition extends MetadataResource { } 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"; @@ -775,7 +783,7 @@ public class PlanDefinition extends MetadataResource { if (code == ActionParticipantType.DEVICE) return "device"; return "?"; - } + } public String toSystem(ActionParticipantType code) { return code.getSystem(); @@ -919,14 +927,16 @@ public class PlanDefinition extends MetadataResource { } 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(); @@ -1115,7 +1125,9 @@ public class PlanDefinition extends MetadataResource { } 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"; @@ -1128,7 +1140,7 @@ public class PlanDefinition extends MetadataResource { if (code == ActionSelectionBehavior.ONEORMORE) return "one-or-more"; return "?"; - } + } public String toSystem(ActionSelectionBehavior code) { return code.getSystem(); @@ -1265,14 +1277,16 @@ public class PlanDefinition extends MetadataResource { } 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(); @@ -1393,12 +1407,14 @@ public class PlanDefinition extends MetadataResource { } 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(); @@ -1513,12 +1529,14 @@ public class PlanDefinition extends MetadataResource { } 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(); @@ -2012,9 +2030,9 @@ public class PlanDefinition extends MetadataResource { } 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; @@ -2457,9 +2475,9 @@ public class PlanDefinition extends MetadataResource { } 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; @@ -4847,9 +4865,9 @@ public class PlanDefinition extends MetadataResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("prefix")) { this.prefix = null; @@ -5451,9 +5469,9 @@ public class PlanDefinition extends MetadataResource { } 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; @@ -5835,9 +5853,9 @@ public class PlanDefinition extends MetadataResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("actionId")) { this.actionId = null; @@ -6114,9 +6132,9 @@ public class PlanDefinition extends MetadataResource { } 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; @@ -6416,9 +6434,9 @@ public class PlanDefinition extends MetadataResource { } 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; @@ -8960,9 +8978,9 @@ public class PlanDefinition extends MetadataResource { } 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.r4/src/main/java/org/hl7/fhir/r4/model/PractitionerRole.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/PractitionerRole.java index c9d773f7c..f482d97c4 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/PractitionerRole.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/PractitionerRole.java @@ -248,7 +248,9 @@ public class PractitionerRole extends DomainResource { } 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"; @@ -263,7 +265,7 @@ public class PractitionerRole extends DomainResource { if (code == DaysOfWeek.SUN) return "sun"; return "?"; - } + } public String toSystem(DaysOfWeek code) { return code.getSystem(); @@ -644,9 +646,9 @@ public class PractitionerRole 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); @@ -938,9 +940,9 @@ public class PractitionerRole 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; @@ -2221,9 +2223,9 @@ public class PractitionerRole 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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Procedure.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Procedure.java index 7402eaec6..f2e252345 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Procedure.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Procedure.java @@ -278,7 +278,9 @@ public class Procedure extends DomainResource { } public String toCode(ProcedureStatus code) { - if (code == ProcedureStatus.PREPARATION) + if (code == ProcedureStatus.NULL) + return null; + if (code == ProcedureStatus.PREPARATION) return "preparation"; if (code == ProcedureStatus.INPROGRESS) return "in-progress"; @@ -295,7 +297,7 @@ public class Procedure extends DomainResource { if (code == ProcedureStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(ProcedureStatus code) { return code.getSystem(); @@ -561,9 +563,9 @@ public class Procedure 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; @@ -846,9 +848,9 @@ public class Procedure 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; @@ -3301,9 +3303,9 @@ public class Procedure 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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Provenance.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Provenance.java index 764560780..7cfe3fc1c 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Provenance.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Provenance.java @@ -227,7 +227,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"; @@ -238,7 +240,7 @@ public class Provenance extends DomainResource { if (code == ProvenanceEntityRole.REMOVAL) return "removal"; return "?"; - } + } public String toSystem(ProvenanceEntityRole code) { return code.getSystem(); @@ -577,9 +579,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; @@ -980,9 +982,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; @@ -1920,9 +1922,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(castToReference(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Quantity.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Quantity.java index 7649dfcb6..9cd8e7793 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Quantity.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Quantity.java @@ -194,7 +194,9 @@ public class Quantity extends Type implements ICompositeType, ICoding { } 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 "<="; @@ -203,7 +205,7 @@ public class Quantity extends Type implements ICompositeType, ICoding { if (code == QuantityComparator.GREATER_THAN) return ">"; return "?"; - } + } public String toSystem(QuantityComparator code) { return code.getSystem(); @@ -726,9 +728,9 @@ public class Quantity extends Type implements ICompositeType, ICoding { } 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; diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Questionnaire.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Questionnaire.java index e6e1dc638..6c41d4666 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Questionnaire.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Questionnaire.java @@ -451,7 +451,9 @@ public class Questionnaire extends MetadataResource { } 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"; @@ -486,7 +488,7 @@ public class Questionnaire extends MetadataResource { if (code == QuestionnaireItemType.QUANTITY) return "quantity"; return "?"; - } + } public String toSystem(QuestionnaireItemType code) { return code.getSystem(); @@ -698,7 +700,9 @@ public class Questionnaire extends MetadataResource { } 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 "="; @@ -713,7 +717,7 @@ public class Questionnaire extends MetadataResource { if (code == QuestionnaireItemOperator.LESS_OR_EQUAL) return "<="; return "?"; - } + } public String toSystem(QuestionnaireItemOperator code) { return code.getSystem(); @@ -828,12 +832,14 @@ public class Questionnaire extends MetadataResource { } 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(); @@ -2228,9 +2234,9 @@ public class Questionnaire extends MetadataResource { } 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; @@ -2970,9 +2976,9 @@ public class Questionnaire extends MetadataResource { } 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; @@ -3402,9 +3408,9 @@ public class Questionnaire extends MetadataResource { } 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; @@ -3860,9 +3866,9 @@ public class Questionnaire extends MetadataResource { } 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; @@ -5730,9 +5736,9 @@ public class Questionnaire extends MetadataResource { } 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.r4/src/main/java/org/hl7/fhir/r4/model/QuestionnaireResponse.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/QuestionnaireResponse.java index d2feced4d..c020a2f10 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/QuestionnaireResponse.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/QuestionnaireResponse.java @@ -219,7 +219,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"; @@ -230,7 +232,7 @@ public class QuestionnaireResponse extends DomainResource { if (code == QuestionnaireResponseStatus.STOPPED) return "stopped"; return "?"; - } + } public String toSystem(QuestionnaireResponseStatus code) { return code.getSystem(); @@ -673,9 +675,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; @@ -1235,9 +1237,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; @@ -2300,9 +2302,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.r4/src/main/java/org/hl7/fhir/r4/model/RelatedArtifact.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/RelatedArtifact.java index 16e5a8023..d638a284e 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/RelatedArtifact.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/RelatedArtifact.java @@ -276,7 +276,9 @@ public class RelatedArtifact extends Type 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"; @@ -293,7 +295,7 @@ public class RelatedArtifact extends Type implements ICompositeType { if (code == RelatedArtifactType.COMPOSEDOF) return "composed-of"; return "?"; - } + } public String toSystem(RelatedArtifactType code) { return code.getSystem(); @@ -867,9 +869,9 @@ public class RelatedArtifact extends Type 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.r4/src/main/java/org/hl7/fhir/r4/model/RequestGroup.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/RequestGroup.java index 0df2069d2..b20532191 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/RequestGroup.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/RequestGroup.java @@ -259,7 +259,9 @@ public class RequestGroup extends DomainResource { } 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"; @@ -274,7 +276,7 @@ public class RequestGroup extends DomainResource { if (code == RequestStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(RequestStatus code) { return code.getSystem(); @@ -528,7 +530,9 @@ public class RequestGroup extends DomainResource { } 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"; @@ -547,7 +551,7 @@ public class RequestGroup extends DomainResource { if (code == RequestIntent.OPTION) return "option"; return "?"; - } + } public String toSystem(RequestIntent code) { return code.getSystem(); @@ -700,7 +704,9 @@ public class RequestGroup extends DomainResource { } 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"; @@ -709,7 +715,7 @@ public class RequestGroup extends DomainResource { if (code == RequestPriority.STAT) return "stat"; return "?"; - } + } public String toSystem(RequestPriority code) { return code.getSystem(); @@ -842,14 +848,16 @@ public class RequestGroup extends DomainResource { } 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(); @@ -1090,7 +1098,9 @@ public class RequestGroup extends DomainResource { } 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"; @@ -1109,7 +1119,7 @@ public class RequestGroup extends DomainResource { if (code == ActionRelationshipType.AFTEREND) return "after-end"; return "?"; - } + } public String toSystem(ActionRelationshipType code) { return code.getSystem(); @@ -1253,14 +1263,16 @@ public class RequestGroup extends DomainResource { } 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(); @@ -1449,7 +1461,9 @@ public class RequestGroup extends DomainResource { } 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"; @@ -1462,7 +1476,7 @@ public class RequestGroup extends DomainResource { if (code == ActionSelectionBehavior.ONEORMORE) return "one-or-more"; return "?"; - } + } public String toSystem(ActionSelectionBehavior code) { return code.getSystem(); @@ -1599,14 +1613,16 @@ public class RequestGroup extends DomainResource { } 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(); @@ -1727,12 +1743,14 @@ public class RequestGroup extends DomainResource { } 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(); @@ -1847,12 +1865,14 @@ public class RequestGroup extends DomainResource { } 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(); @@ -3464,9 +3484,9 @@ public class RequestGroup extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("prefix")) { this.prefix = null; @@ -3951,9 +3971,9 @@ public class RequestGroup 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; @@ -4334,9 +4354,9 @@ public class RequestGroup extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("actionId")) { this.actionId = null; @@ -5905,9 +5925,9 @@ public class RequestGroup 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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ResearchElementDefinition.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ResearchElementDefinition.java index ac30834f8..0261648f8 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ResearchElementDefinition.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ResearchElementDefinition.java @@ -187,14 +187,16 @@ public class ResearchElementDefinition extends MetadataResource { } 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(); @@ -327,14 +329,16 @@ public class ResearchElementDefinition extends MetadataResource { } 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(); @@ -521,7 +525,9 @@ public class ResearchElementDefinition extends MetadataResource { } 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"; @@ -534,7 +540,7 @@ public class ResearchElementDefinition extends MetadataResource { if (code == GroupMeasure.MEDIANOFMEDIAN) return "median-of-median"; return "?"; - } + } public String toSystem(GroupMeasure code) { return code.getSystem(); @@ -1642,9 +1648,9 @@ public class ResearchElementDefinition extends MetadataResource { } 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; @@ -4580,9 +4586,9 @@ public class ResearchElementDefinition extends MetadataResource { } 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.r4/src/main/java/org/hl7/fhir/r4/model/ResearchStudy.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ResearchStudy.java index 288bda0be..1931d8399 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ResearchStudy.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ResearchStudy.java @@ -332,7 +332,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"; @@ -355,7 +357,7 @@ public class ResearchStudy extends DomainResource { if (code == ResearchStudyStatus.WITHDRAWN) return "withdrawn"; return "?"; - } + } public String toSystem(ResearchStudyStatus code) { return code.getSystem(); @@ -614,9 +616,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; @@ -880,9 +882,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; @@ -2905,9 +2907,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ResearchSubject.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ResearchSubject.java index 7db7ee16e..6780b7eb2 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ResearchSubject.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ResearchSubject.java @@ -365,7 +365,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"; @@ -392,7 +394,7 @@ public class ResearchSubject extends DomainResource { if (code == ResearchSubjectStatus.WITHDRAWN) return "withdrawn"; return "?"; - } + } public String toSystem(ResearchSubjectStatus code) { return code.getSystem(); @@ -1033,9 +1035,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/RiskAssessment.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/RiskAssessment.java index 9022d9cfa..3aa775e27 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/RiskAssessment.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/RiskAssessment.java @@ -284,7 +284,9 @@ public class RiskAssessment extends DomainResource { } public String toCode(RiskAssessmentStatus code) { - if (code == RiskAssessmentStatus.REGISTERED) + if (code == RiskAssessmentStatus.NULL) + return null; + if (code == RiskAssessmentStatus.REGISTERED) return "registered"; if (code == RiskAssessmentStatus.PRELIMINARY) return "preliminary"; @@ -301,7 +303,7 @@ public class RiskAssessment extends DomainResource { if (code == RiskAssessmentStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(RiskAssessmentStatus code) { return code.getSystem(); @@ -824,9 +826,9 @@ public class RiskAssessment extends DomainResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("outcome")) { this.outcome = null; @@ -2290,9 +2292,9 @@ public class RiskAssessment 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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/SearchParameter.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/SearchParameter.java index c8e147581..74242cc0a 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/SearchParameter.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/SearchParameter.java @@ -225,7 +225,9 @@ public class SearchParameter extends MetadataResource { } 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"; @@ -236,7 +238,7 @@ public class SearchParameter extends MetadataResource { if (code == XPathUsageType.OTHER) return "other"; return "?"; - } + } public String toSystem(XPathUsageType code) { return code.getSystem(); @@ -482,7 +484,9 @@ public class SearchParameter extends MetadataResource { } 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"; @@ -501,7 +505,7 @@ public class SearchParameter extends MetadataResource { if (code == SearchComparator.AP) return "ap"; return "?"; - } + } public String toSystem(SearchComparator code) { return code.getSystem(); @@ -810,7 +814,9 @@ public class SearchParameter extends MetadataResource { } 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"; @@ -835,7 +841,7 @@ public class SearchParameter extends MetadataResource { if (code == SearchModifierCode.OFTYPE) return "ofType"; return "?"; - } + } public String toSystem(SearchModifierCode code) { return code.getSystem(); @@ -1048,9 +1054,9 @@ public class SearchParameter extends MetadataResource { } 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; @@ -3274,9 +3280,9 @@ public class SearchParameter extends MetadataResource { } 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.r4/src/main/java/org/hl7/fhir/r4/model/ServiceRequest.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ServiceRequest.java index ce3a72326..bed72f257 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ServiceRequest.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ServiceRequest.java @@ -257,7 +257,9 @@ public class ServiceRequest extends DomainResource { } public String toCode(ServiceRequestStatus code) { - if (code == ServiceRequestStatus.DRAFT) + if (code == ServiceRequestStatus.NULL) + return null; + if (code == ServiceRequestStatus.DRAFT) return "draft"; if (code == ServiceRequestStatus.ACTIVE) return "active"; @@ -272,7 +274,7 @@ public class ServiceRequest extends DomainResource { if (code == ServiceRequestStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(ServiceRequestStatus code) { return code.getSystem(); @@ -526,7 +528,9 @@ public class ServiceRequest extends DomainResource { } public String toCode(ServiceRequestIntent code) { - if (code == ServiceRequestIntent.PROPOSAL) + if (code == ServiceRequestIntent.NULL) + return null; + if (code == ServiceRequestIntent.PROPOSAL) return "proposal"; if (code == ServiceRequestIntent.PLAN) return "plan"; @@ -545,7 +549,7 @@ public class ServiceRequest extends DomainResource { if (code == ServiceRequestIntent.OPTION) return "option"; return "?"; - } + } public String toSystem(ServiceRequestIntent code) { return code.getSystem(); @@ -698,7 +702,9 @@ public class ServiceRequest extends DomainResource { } public String toCode(ServiceRequestPriority code) { - if (code == ServiceRequestPriority.ROUTINE) + if (code == ServiceRequestPriority.NULL) + return null; + if (code == ServiceRequestPriority.ROUTINE) return "routine"; if (code == ServiceRequestPriority.URGENT) return "urgent"; @@ -707,7 +713,7 @@ public class ServiceRequest extends DomainResource { if (code == ServiceRequestPriority.STAT) return "stat"; return "?"; - } + } public String toSystem(ServiceRequestPriority code) { return code.getSystem(); @@ -3617,9 +3623,9 @@ public class ServiceRequest 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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Slot.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Slot.java index a8aa7b5c1..32829596e 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Slot.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Slot.java @@ -213,7 +213,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"; @@ -224,7 +226,7 @@ public class Slot extends DomainResource { if (code == SlotStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(SlotStatus code) { return code.getSystem(); @@ -1095,9 +1097,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Specimen.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Specimen.java index 53c7e12f5..1a2de3ff0 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Specimen.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Specimen.java @@ -196,7 +196,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"; @@ -205,7 +207,7 @@ public class Specimen extends DomainResource { if (code == SpecimenStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(SpecimenStatus code) { return code.getSystem(); @@ -709,9 +711,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; @@ -1232,9 +1234,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; @@ -1793,9 +1795,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(castToIdentifier(value)); @@ -2955,9 +2957,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/SpecimenDefinition.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/SpecimenDefinition.java index 8cf68118c..d9ca612a7 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/SpecimenDefinition.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/SpecimenDefinition.java @@ -158,12 +158,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(); @@ -742,9 +744,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; @@ -1455,9 +1457,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; @@ -1774,9 +1776,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; @@ -2144,9 +2146,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; @@ -2702,9 +2704,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.r4/src/main/java/org/hl7/fhir/r4/model/StructureDefinition.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/StructureDefinition.java index 775d24d43..6d61d654a 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/StructureDefinition.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/StructureDefinition.java @@ -217,7 +217,9 @@ public class StructureDefinition extends MetadataResource { } 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"; @@ -226,7 +228,7 @@ public class StructureDefinition extends MetadataResource { if (code == StructureDefinitionKind.LOGICAL) return "logical"; return "?"; - } + } public String toSystem(StructureDefinitionKind code) { return code.getSystem(); @@ -364,14 +366,16 @@ public class StructureDefinition extends MetadataResource { } 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(); @@ -487,12 +491,14 @@ public class StructureDefinition extends MetadataResource { } 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(); @@ -858,9 +864,9 @@ public class StructureDefinition extends MetadataResource { } 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; @@ -1175,9 +1181,9 @@ public class StructureDefinition extends MetadataResource { } 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; @@ -1389,9 +1395,9 @@ public class StructureDefinition extends MetadataResource { } 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(castToElementDefinition(value)); @@ -1624,9 +1630,9 @@ public class StructureDefinition extends MetadataResource { } 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(castToElementDefinition(value)); @@ -3866,9 +3872,9 @@ public class StructureDefinition extends MetadataResource { } 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.r4/src/main/java/org/hl7/fhir/r4/model/StructureMap.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/StructureMap.java index 16bef1f54..e5859e209 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/StructureMap.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/StructureMap.java @@ -207,7 +207,9 @@ public class StructureMap extends MetadataResource { } 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"; @@ -216,7 +218,7 @@ public class StructureMap extends MetadataResource { if (code == StructureMapModelMode.PRODUCED) return "produced"; return "?"; - } + } public String toSystem(StructureMapModelMode code) { return code.getSystem(); @@ -350,14 +352,16 @@ public class StructureMap extends MetadataResource { } 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(); @@ -472,12 +476,14 @@ public class StructureMap extends MetadataResource { } 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(); @@ -646,7 +652,9 @@ public class StructureMap extends MetadataResource { } 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"; @@ -657,7 +665,7 @@ public class StructureMap extends MetadataResource { if (code == StructureMapSourceListMode.ONLYONE) return "only_one"; return "?"; - } + } public String toSystem(StructureMapSourceListMode code) { return code.getSystem(); @@ -772,12 +780,14 @@ public class StructureMap extends MetadataResource { } 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(); @@ -933,7 +943,9 @@ public class StructureMap extends MetadataResource { } 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"; @@ -942,7 +954,7 @@ public class StructureMap extends MetadataResource { if (code == StructureMapTargetListMode.COLLATE) return "collate"; return "?"; - } + } public String toSystem(StructureMapTargetListMode code) { return code.getSystem(); @@ -1337,7 +1349,9 @@ public class StructureMap extends MetadataResource { } 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"; @@ -1372,7 +1386,7 @@ public class StructureMap extends MetadataResource { if (code == StructureMapTransform.CP) return "cp"; return "?"; - } + } public String toSystem(StructureMapTransform code) { return code.getSystem(); @@ -1721,9 +1735,9 @@ public class StructureMap extends MetadataResource { } 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; @@ -2340,9 +2354,9 @@ public class StructureMap extends MetadataResource { } 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; @@ -2824,9 +2838,9 @@ public class StructureMap extends MetadataResource { } 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; @@ -3425,9 +3439,9 @@ public class StructureMap extends MetadataResource { } 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; @@ -4549,9 +4563,9 @@ public class StructureMap extends MetadataResource { } 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; @@ -5532,9 +5546,9 @@ public class StructureMap extends MetadataResource { } 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; @@ -5899,9 +5913,9 @@ public class StructureMap extends MetadataResource { } 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; @@ -6207,9 +6221,9 @@ public class StructureMap extends MetadataResource { } 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; @@ -7733,9 +7747,9 @@ public class StructureMap extends MetadataResource { } 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.r4/src/main/java/org/hl7/fhir/r4/model/Subscription.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Subscription.java index da8da5aec..cf1c49b99 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Subscription.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Subscription.java @@ -199,7 +199,9 @@ public class Subscription extends DomainResource { } 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"; @@ -208,7 +210,7 @@ public class Subscription extends DomainResource { if (code == SubscriptionStatus.OFF) return "off"; return "?"; - } + } public String toSystem(SubscriptionStatus code) { return code.getSystem(); @@ -384,7 +386,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"; @@ -395,7 +399,7 @@ public class Subscription extends DomainResource { if (code == SubscriptionChannelType.MESSAGE) return "message"; return "?"; - } + } public String toSystem(SubscriptionChannelType code) { return code.getSystem(); @@ -780,9 +784,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; @@ -1448,9 +1452,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")) { this.status = null; diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Substance.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Substance.java index 74212dce8..3052b800f 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Substance.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Substance.java @@ -176,14 +176,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(); @@ -407,9 +409,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; @@ -698,9 +700,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; @@ -1358,9 +1360,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/SupplyDelivery.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/SupplyDelivery.java index 64d6a3be4..824161d87 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/SupplyDelivery.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/SupplyDelivery.java @@ -194,7 +194,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"; @@ -203,7 +205,7 @@ public class SupplyDelivery extends DomainResource { if (code == SupplyDeliveryStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(SupplyDeliveryStatus code) { return code.getSystem(); @@ -405,9 +407,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; @@ -1422,9 +1424,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/SupplyRequest.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/SupplyRequest.java index ca1ca3af3..e2cfa196b 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/SupplyRequest.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/SupplyRequest.java @@ -256,7 +256,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"; @@ -271,7 +273,7 @@ public class SupplyRequest extends DomainResource { if (code == SupplyRequestStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(SupplyRequestStatus code) { return code.getSystem(); @@ -424,7 +426,9 @@ public class SupplyRequest extends DomainResource { } 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"; @@ -433,7 +437,7 @@ public class SupplyRequest extends DomainResource { if (code == RequestPriority.STAT) return "stat"; return "?"; - } + } public String toSystem(RequestPriority code) { return code.getSystem(); @@ -654,9 +658,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; @@ -1970,9 +1974,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Task.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Task.java index a2d3e7956..7730c9b1e 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Task.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Task.java @@ -344,7 +344,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"; @@ -369,7 +371,7 @@ public class Task extends DomainResource { if (code == TaskStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(TaskStatus code) { return code.getSystem(); @@ -612,7 +614,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"; @@ -631,7 +635,7 @@ public class Task extends DomainResource { if (code == TaskIntent.OPTION) return "option"; return "?"; - } + } public String toSystem(TaskIntent code) { return code.getSystem(); @@ -784,7 +788,9 @@ public class Task extends DomainResource { } public String toCode(TaskPriority code) { - if (code == TaskPriority.ROUTINE) + if (code == TaskPriority.NULL) + return null; + if (code == TaskPriority.ROUTINE) return "routine"; if (code == TaskPriority.URGENT) return "urgent"; @@ -793,7 +799,7 @@ public class Task extends DomainResource { if (code == TaskPriority.STAT) return "stat"; return "?"; - } + } public String toSystem(TaskPriority code) { return code.getSystem(); @@ -1058,9 +1064,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; @@ -1420,9 +1426,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; @@ -1910,9 +1916,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; @@ -4494,9 +4500,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/TerminologyCapabilities.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/TerminologyCapabilities.java index 1c12b546a..acd815275 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/TerminologyCapabilities.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/TerminologyCapabilities.java @@ -190,14 +190,16 @@ public class TerminologyCapabilities extends MetadataResource { } 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(); @@ -314,12 +316,14 @@ public class TerminologyCapabilities extends MetadataResource { } 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(); @@ -522,9 +526,9 @@ public class TerminologyCapabilities extends MetadataResource { } 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; @@ -817,9 +821,9 @@ public class TerminologyCapabilities extends MetadataResource { } 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; @@ -1176,9 +1180,9 @@ public class TerminologyCapabilities extends MetadataResource { } 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; @@ -1789,9 +1793,9 @@ public class TerminologyCapabilities extends MetadataResource { } 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; @@ -2140,9 +2144,9 @@ public class TerminologyCapabilities extends MetadataResource { } 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; @@ -2641,9 +2645,9 @@ public class TerminologyCapabilities extends MetadataResource { } 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; @@ -2964,9 +2968,9 @@ public class TerminologyCapabilities extends MetadataResource { } 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; @@ -3180,9 +3184,9 @@ public class TerminologyCapabilities extends MetadataResource { } 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; @@ -3387,9 +3391,9 @@ public class TerminologyCapabilities extends MetadataResource { } 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; @@ -3585,9 +3589,9 @@ public class TerminologyCapabilities extends MetadataResource { } 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; @@ -5423,9 +5427,9 @@ public class TerminologyCapabilities extends MetadataResource { } 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.r4/src/main/java/org/hl7/fhir/r4/model/TestReport.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/TestReport.java index 21771b560..a6a8318a9 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/TestReport.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/TestReport.java @@ -214,7 +214,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"; @@ -225,7 +227,7 @@ public class TestReport extends DomainResource { if (code == TestReportStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(TestReportStatus code) { return code.getSystem(); @@ -358,14 +360,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(); @@ -498,14 +502,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(); @@ -674,7 +680,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"; @@ -685,7 +693,7 @@ public class TestReport extends DomainResource { if (code == TestReportActionResult.ERROR) return "error"; return "?"; - } + } public String toSystem(TestReportActionResult code) { return code.getSystem(); @@ -956,9 +964,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; @@ -1179,9 +1187,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); @@ -1400,9 +1408,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 @@ -1763,9 +1771,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; @@ -2135,9 +2143,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; @@ -2515,9 +2523,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; @@ -2761,9 +2769,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 @@ -2975,9 +2983,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); @@ -3164,9 +3172,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 @@ -4148,9 +4156,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.r4/src/main/java/org/hl7/fhir/r4/model/TestScript.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/TestScript.java index 3740cb82f..4f1898bbf 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/TestScript.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/TestScript.java @@ -255,7 +255,9 @@ public class TestScript extends MetadataResource { } 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"; @@ -270,7 +272,7 @@ public class TestScript extends MetadataResource { if (code == TestScriptRequestMethodCode.HEAD) return "head"; return "?"; - } + } public String toSystem(TestScriptRequestMethodCode code) { return code.getSystem(); @@ -385,12 +387,14 @@ public class TestScript extends MetadataResource { } 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(); @@ -667,7 +671,9 @@ public class TestScript extends MetadataResource { } 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"; @@ -690,7 +696,7 @@ public class TestScript extends MetadataResource { if (code == AssertionOperatorType.EVAL) return "eval"; return "?"; - } + } public String toSystem(AssertionOperatorType code) { return code.getSystem(); @@ -985,7 +991,9 @@ public class TestScript extends MetadataResource { } 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"; @@ -1010,7 +1018,7 @@ public class TestScript extends MetadataResource { if (code == AssertionResponseTypes.UNPROCESSABLE) return "unprocessable"; return "?"; - } + } public String toSystem(AssertionResponseTypes code) { return code.getSystem(); @@ -1194,9 +1202,9 @@ public class TestScript extends MetadataResource { } 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; @@ -1465,9 +1473,9 @@ public class TestScript extends MetadataResource { } 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; @@ -1757,9 +1765,9 @@ public class TestScript extends MetadataResource { } 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); @@ -2058,9 +2066,9 @@ public class TestScript extends MetadataResource { } 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; @@ -2771,9 +2779,9 @@ public class TestScript extends MetadataResource { } 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; @@ -3233,9 +3241,9 @@ public class TestScript extends MetadataResource { } 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; @@ -4015,9 +4023,9 @@ public class TestScript extends MetadataResource { } 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; @@ -4289,9 +4297,9 @@ public class TestScript extends MetadataResource { } 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); @@ -4513,9 +4521,9 @@ public class TestScript extends MetadataResource { } 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 @@ -5937,9 +5945,9 @@ public class TestScript extends MetadataResource { } 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; @@ -6380,9 +6388,9 @@ public class TestScript extends MetadataResource { } 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; @@ -8273,9 +8281,9 @@ public class TestScript extends MetadataResource { } 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; @@ -8847,9 +8855,9 @@ public class TestScript extends MetadataResource { } 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; @@ -9096,9 +9104,9 @@ public class TestScript extends MetadataResource { } 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 @@ -9310,9 +9318,9 @@ public class TestScript extends MetadataResource { } 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); @@ -9499,9 +9507,9 @@ public class TestScript extends MetadataResource { } 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 @@ -11359,9 +11367,9 @@ public class TestScript extends MetadataResource { } 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.r4/src/main/java/org/hl7/fhir/r4/model/Timing.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Timing.java index 049a4f278..5f3ff2c9e 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Timing.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Timing.java @@ -253,7 +253,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"; @@ -268,7 +270,7 @@ public class Timing extends BackboneType implements ICompositeType { if (code == UnitsOfTime.A) return "a"; return "?"; - } + } public String toSystem(UnitsOfTime code) { return code.getSystem(); @@ -473,7 +475,9 @@ public class Timing extends BackboneType implements ICompositeType { } public String toCode(DayOfWeek code) { - if (code == DayOfWeek.MON) + if (code == DayOfWeek.NULL) + return null; + if (code == DayOfWeek.MON) return "mon"; if (code == DayOfWeek.TUE) return "tue"; @@ -488,7 +492,7 @@ public class Timing extends BackboneType implements ICompositeType { if (code == DayOfWeek.SUN) return "sun"; return "?"; - } + } public String toSystem(DayOfWeek code) { return code.getSystem(); @@ -1048,7 +1052,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"; @@ -1101,7 +1107,7 @@ public class Timing extends BackboneType implements ICompositeType { if (code == EventTiming.PCV) return "PCV"; return "?"; - } + } public String toSystem(EventTiming code) { return code.getSystem(); @@ -2540,9 +2546,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; @@ -3026,9 +3032,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(castToDateTime(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/TriggerDefinition.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/TriggerDefinition.java index 93de6043a..5fa1b1eb1 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/TriggerDefinition.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/TriggerDefinition.java @@ -269,7 +269,9 @@ public class TriggerDefinition extends Type 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"; @@ -286,7 +288,7 @@ public class TriggerDefinition extends Type implements ICompositeType { if (code == TriggerType.DATAACCESSENDED) return "data-access-ended"; return "?"; - } + } public String toSystem(TriggerType code) { return code.getSystem(); @@ -758,9 +760,9 @@ public class TriggerDefinition extends Type 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.r4/src/main/java/org/hl7/fhir/r4/model/ValueSet.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ValueSet.java index 6a252670a..2da874116 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ValueSet.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ValueSet.java @@ -305,7 +305,9 @@ public class ValueSet extends MetadataResource { } 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"; @@ -324,7 +326,7 @@ public class ValueSet extends MetadataResource { if (code == FilterOperator.EXISTS) return "exists"; return "?"; - } + } public String toSystem(FilterOperator code) { return code.getSystem(); @@ -720,9 +722,9 @@ public class ValueSet extends MetadataResource { } else return super.setProperty(name, value); return value; - } - - @Override + } + + @Override public void removeChild(String name, Base value) throws FHIRException { if (name.equals("lockedDate")) { this.lockedDate = null; @@ -1301,9 +1303,9 @@ public class ValueSet extends MetadataResource { } 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; @@ -1729,9 +1731,9 @@ public class ValueSet extends MetadataResource { } 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; @@ -2074,9 +2076,9 @@ public class ValueSet extends MetadataResource { } 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; @@ -2476,9 +2478,9 @@ public class ValueSet extends MetadataResource { } 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; @@ -3128,9 +3130,9 @@ public class ValueSet extends MetadataResource { } 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; @@ -3595,9 +3597,9 @@ public class ValueSet extends MetadataResource { } 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; @@ -4424,9 +4426,9 @@ public class ValueSet extends MetadataResource { } 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; @@ -5980,9 +5982,9 @@ public class ValueSet extends MetadataResource { } 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.r4/src/main/java/org/hl7/fhir/r4/model/VerificationResult.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/VerificationResult.java index 34111e62e..9c4583dee 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/VerificationResult.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/VerificationResult.java @@ -231,7 +231,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"; @@ -244,7 +246,7 @@ public class VerificationResult extends DomainResource { if (code == Status.REVALFAIL) return "reval-fail"; return "?"; - } + } public String toSystem(Status code) { return code.getSystem(); @@ -786,9 +788,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; @@ -1523,9 +1525,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; @@ -1939,9 +1941,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; @@ -3040,9 +3042,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(castToReference(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/VisionPrescription.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/VisionPrescription.java index 2fe5c4b95..4f8df4ab8 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/VisionPrescription.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/VisionPrescription.java @@ -197,7 +197,9 @@ public class VisionPrescription extends DomainResource { } public String toCode(VisionStatus code) { - if (code == VisionStatus.ACTIVE) + if (code == VisionStatus.NULL) + return null; + if (code == VisionStatus.ACTIVE) return "active"; if (code == VisionStatus.CANCELLED) return "cancelled"; @@ -206,7 +208,7 @@ public class VisionPrescription extends DomainResource { if (code == VisionStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(VisionStatus code) { return code.getSystem(); @@ -321,12 +323,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(); @@ -477,7 +481,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"; @@ -486,7 +492,7 @@ public class VisionPrescription extends DomainResource { if (code == VisionBase.OUT) return "out"; return "?"; - } + } public String toSystem(VisionBase code) { return code.getSystem(); @@ -1626,9 +1632,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; @@ -2067,9 +2073,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; @@ -2818,9 +2824,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(castToIdentifier(value)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/AbstractTypesEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/AbstractTypesEnumFactory.java index 6110bee62..3a8cab9d2 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/AbstractTypesEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/AbstractTypesEnumFactory.java @@ -46,12 +46,14 @@ public class AbstractTypesEnumFactory implements EnumFactory { } public String toCode(AbstractTypes code) { - if (code == AbstractTypes.TYPE) + if (code == AbstractTypes.NULL) + return null; + if (code == AbstractTypes.TYPE) return "Type"; if (code == AbstractTypes.ANY) return "Any"; return "?"; - } + } public String toSystem(AbstractTypes code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/AccountStatusEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/AccountStatusEnumFactory.java index 7bd395d4a..d7f366352 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/AccountStatusEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/AccountStatusEnumFactory.java @@ -52,7 +52,9 @@ public class AccountStatusEnumFactory implements EnumFactory { } 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"; @@ -63,7 +65,7 @@ public class AccountStatusEnumFactory implements EnumFactory { if (code == AccountStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(AccountStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ActionCardinalityBehaviorEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ActionCardinalityBehaviorEnumFactory.java index c2f93f78f..e80f6fc77 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ActionCardinalityBehaviorEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ActionCardinalityBehaviorEnumFactory.java @@ -46,12 +46,14 @@ public class ActionCardinalityBehaviorEnumFactory implements EnumFactory { } public String toCode(ActionType code) { - if (code == ActionType.CREATE) + if (code == ActionType.NULL) + return null; + if (code == ActionType.CREATE) return "create"; if (code == ActionType.UPDATE) return "update"; @@ -59,7 +61,7 @@ public class ActionTypeEnumFactory implements EnumFactory { if (code == ActionType.FIREEVENT) return "fire-event"; return "?"; - } + } public String toSystem(ActionType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ActivityDefinitionCategoryEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ActivityDefinitionCategoryEnumFactory.java index d25b4ba15..019064b11 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ActivityDefinitionCategoryEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ActivityDefinitionCategoryEnumFactory.java @@ -48,14 +48,16 @@ public class ActivityDefinitionCategoryEnumFactory implements EnumFactory { } 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(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/AddressUseEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/AddressUseEnumFactory.java index 66eb9130b..7bf0cd8c0 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/AddressUseEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/AddressUseEnumFactory.java @@ -52,7 +52,9 @@ public class AddressUseEnumFactory implements EnumFactory { } 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"; @@ -63,7 +65,7 @@ public class AddressUseEnumFactory implements EnumFactory { if (code == AddressUse.BILLING) return "billing"; return "?"; - } + } public String toSystem(AddressUse code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/AdjudicationEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/AdjudicationEnumFactory.java index 4ac1016da..2f3f7c537 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/AdjudicationEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/AdjudicationEnumFactory.java @@ -58,7 +58,9 @@ public class AdjudicationEnumFactory implements EnumFactory { } public String toCode(Adjudication code) { - if (code == Adjudication.SUBMITTED) + if (code == Adjudication.NULL) + return null; + if (code == Adjudication.SUBMITTED) return "submitted"; if (code == Adjudication.COPAY) return "copay"; @@ -75,7 +77,7 @@ public class AdjudicationEnumFactory implements EnumFactory { if (code == Adjudication.BENEFIT) return "benefit"; return "?"; - } + } public String toSystem(Adjudication code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/AdjudicationErrorEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/AdjudicationErrorEnumFactory.java index 9ac668e1d..edfa7fa4f 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/AdjudicationErrorEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/AdjudicationErrorEnumFactory.java @@ -46,12 +46,14 @@ public class AdjudicationErrorEnumFactory implements EnumFactory { } public String toCode(AnimalSpecies code) { - if (code == AnimalSpecies.CANISLF) + if (code == AnimalSpecies.NULL) + return null; + if (code == AnimalSpecies.CANISLF) return "canislf"; if (code == AnimalSpecies.OVISA) return "ovisa"; if (code == AnimalSpecies.SERINUSCD) return "serinuscd"; return "?"; - } + } public String toSystem(AnimalSpecies code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/AppointmentCancellationReasonEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/AppointmentCancellationReasonEnumFactory.java index 8fe2273ec..ca7ac2cf8 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/AppointmentCancellationReasonEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/AppointmentCancellationReasonEnumFactory.java @@ -106,7 +106,9 @@ public class AppointmentCancellationReasonEnumFactory implements EnumFactory } public String toCode(AuditEntityType code) { - if (code == AuditEntityType._1) + if (code == AuditEntityType.NULL) + return null; + if (code == AuditEntityType._1) return "1"; if (code == AuditEntityType._2) return "2"; @@ -59,7 +61,7 @@ public class AuditEntityTypeEnumFactory implements EnumFactory if (code == AuditEntityType._4) return "4"; return "?"; - } + } public String toSystem(AuditEntityType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/AuditEventActionEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/AuditEventActionEnumFactory.java index 855727b0b..2242ac0b0 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/AuditEventActionEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/AuditEventActionEnumFactory.java @@ -52,7 +52,9 @@ public class AuditEventActionEnumFactory implements EnumFactory { } public String toCode(AuditEventType code) { - if (code == AuditEventType.REST) + if (code == AuditEventType.NULL) + return null; + if (code == AuditEventType.REST) return "rest"; return "?"; - } + } public String toSystem(AuditEventType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/AuditSourceTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/AuditSourceTypeEnumFactory.java index d3975c261..c53a4597f 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/AuditSourceTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/AuditSourceTypeEnumFactory.java @@ -60,7 +60,9 @@ public class AuditSourceTypeEnumFactory implements EnumFactory } public String toCode(AuditSourceType code) { - if (code == AuditSourceType._1) + if (code == AuditSourceType.NULL) + return null; + if (code == AuditSourceType._1) return "1"; if (code == AuditSourceType._2) return "2"; @@ -79,7 +81,7 @@ public class AuditSourceTypeEnumFactory implements EnumFactory if (code == AuditSourceType._9) return "9"; return "?"; - } + } public String toSystem(AuditSourceType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/BasicResourceTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/BasicResourceTypeEnumFactory.java index aff55f47e..0cbc0fab7 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/BasicResourceTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/BasicResourceTypeEnumFactory.java @@ -74,7 +74,9 @@ public class BasicResourceTypeEnumFactory implements EnumFactory { } public String toCode(BenefitNetwork code) { - if (code == BenefitNetwork.IN) + if (code == BenefitNetwork.NULL) + return null; + if (code == BenefitNetwork.IN) return "in"; if (code == BenefitNetwork.OUT) return "out"; return "?"; - } + } public String toSystem(BenefitNetwork code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/BenefitTermEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/BenefitTermEnumFactory.java index 80cf299c3..ce8fd4765 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/BenefitTermEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/BenefitTermEnumFactory.java @@ -48,14 +48,16 @@ public class BenefitTermEnumFactory implements EnumFactory { } public String toCode(BenefitTerm code) { - if (code == BenefitTerm.ANNUAL) + if (code == BenefitTerm.NULL) + return null; + if (code == BenefitTerm.ANNUAL) return "annual"; if (code == BenefitTerm.DAY) return "day"; if (code == BenefitTerm.LIFETIME) return "lifetime"; return "?"; - } + } public String toSystem(BenefitTerm code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/BenefitTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/BenefitTypeEnumFactory.java index 3e69691f8..beceb954f 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/BenefitTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/BenefitTypeEnumFactory.java @@ -66,7 +66,9 @@ public class BenefitTypeEnumFactory implements EnumFactory { } public String toCode(BenefitType code) { - if (code == BenefitType.BENEFIT) + if (code == BenefitType.NULL) + return null; + if (code == BenefitType.BENEFIT) return "benefit"; if (code == BenefitType.DEDUCTIBLE) return "deductible"; @@ -91,7 +93,7 @@ public class BenefitTypeEnumFactory implements EnumFactory { if (code == BenefitType.PHARMACYDISPENSE) return "pharmacy-dispense"; return "?"; - } + } public String toSystem(BenefitType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/BenefitUnitEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/BenefitUnitEnumFactory.java index e5135cbaf..35453c601 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/BenefitUnitEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/BenefitUnitEnumFactory.java @@ -46,12 +46,14 @@ public class BenefitUnitEnumFactory implements EnumFactory { } public String toCode(BenefitUnit code) { - if (code == BenefitUnit.INDIVIDUAL) + if (code == BenefitUnit.NULL) + return null; + if (code == BenefitUnit.INDIVIDUAL) return "individual"; if (code == BenefitUnit.FAMILY) return "family"; return "?"; - } + } public String toSystem(BenefitUnit code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/BindingStrengthEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/BindingStrengthEnumFactory.java index dfe685dc7..5974c1d25 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/BindingStrengthEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/BindingStrengthEnumFactory.java @@ -50,7 +50,9 @@ public class BindingStrengthEnumFactory implements EnumFactory } 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"; @@ -59,7 +61,7 @@ public class BindingStrengthEnumFactory implements EnumFactory if (code == BindingStrength.EXAMPLE) return "example"; return "?"; - } + } public String toSystem(BindingStrength code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/BundleTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/BundleTypeEnumFactory.java index b86dcd8cf..255a35b52 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/BundleTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/BundleTypeEnumFactory.java @@ -60,7 +60,9 @@ public class BundleTypeEnumFactory implements EnumFactory { } 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"; @@ -79,7 +81,7 @@ public class BundleTypeEnumFactory implements EnumFactory { if (code == BundleType.COLLECTION) return "collection"; return "?"; - } + } public String toSystem(BundleType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CapabilityStatementKindEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CapabilityStatementKindEnumFactory.java index f10b4420e..69dd6eddf 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CapabilityStatementKindEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CapabilityStatementKindEnumFactory.java @@ -48,14 +48,16 @@ public class CapabilityStatementKindEnumFactory implements EnumFactory { } 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"; @@ -63,7 +65,7 @@ public class CareTeamStatusEnumFactory implements EnumFactory { if (code == CareTeamStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(CareTeamStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CatalogTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CatalogTypeEnumFactory.java index 76b5168d2..adf8ec412 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CatalogTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CatalogTypeEnumFactory.java @@ -48,14 +48,16 @@ public class CatalogTypeEnumFactory implements EnumFactory { } public String toCode(CatalogType code) { - if (code == CatalogType.MEDICATION) + if (code == CatalogType.NULL) + return null; + if (code == CatalogType.MEDICATION) return "medication"; if (code == CatalogType.DEVICE) return "device"; if (code == CatalogType.PROTOCOL) return "protocol"; return "?"; - } + } public String toSystem(CatalogType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CdshooksIndicatorEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CdshooksIndicatorEnumFactory.java index c7207596b..8cee16114 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CdshooksIndicatorEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CdshooksIndicatorEnumFactory.java @@ -48,14 +48,16 @@ public class CdshooksIndicatorEnumFactory implements EnumFactory } public String toCode(ChromosomeHuman code) { - if (code == ChromosomeHuman._1) + if (code == ChromosomeHuman.NULL) + return null; + if (code == ChromosomeHuman._1) return "1"; if (code == ChromosomeHuman._2) return "2"; @@ -139,7 +141,7 @@ public class ChromosomeHumanEnumFactory implements EnumFactory if (code == ChromosomeHuman.Y) return "Y"; return "?"; - } + } public String toSystem(ChromosomeHuman code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ClaimCareteamroleEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ClaimCareteamroleEnumFactory.java index 2abd4c55c..856a765fe 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ClaimCareteamroleEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ClaimCareteamroleEnumFactory.java @@ -50,7 +50,9 @@ public class ClaimCareteamroleEnumFactory implements EnumFactory { } public String toCode(ClaimException code) { - if (code == ClaimException.STUDENT) + if (code == ClaimException.NULL) + return null; + if (code == ClaimException.STUDENT) return "student"; if (code == ClaimException.DISABLED) return "disabled"; return "?"; - } + } public String toSystem(ClaimException code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ClaimInformationcategoryEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ClaimInformationcategoryEnumFactory.java index 340fde998..5c85ba3e5 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ClaimInformationcategoryEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ClaimInformationcategoryEnumFactory.java @@ -70,7 +70,9 @@ public class ClaimInformationcategoryEnumFactory implements EnumFactory { } public String toCode(ClaimModifiers code) { - if (code == ClaimModifiers.A) + if (code == ClaimModifiers.NULL) + return null; + if (code == ClaimModifiers.A) return "a"; if (code == ClaimModifiers.B) return "b"; @@ -67,7 +69,7 @@ public class ClaimModifiersEnumFactory implements EnumFactory { if (code == ClaimModifiers.X) return "x"; return "?"; - } + } public String toSystem(ClaimModifiers code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ClaimSubtypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ClaimSubtypeEnumFactory.java index 4b1241414..aa5c5413b 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ClaimSubtypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ClaimSubtypeEnumFactory.java @@ -46,12 +46,14 @@ public class ClaimSubtypeEnumFactory implements EnumFactory { } public String toCode(ClaimSubtype code) { - if (code == ClaimSubtype.ORTHO) + if (code == ClaimSubtype.NULL) + return null; + if (code == ClaimSubtype.ORTHO) return "ortho"; if (code == ClaimSubtype.EMERGENCY) return "emergency"; return "?"; - } + } public String toSystem(ClaimSubtype code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ClaimTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ClaimTypeEnumFactory.java index 325e4a182..8ce17d84e 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ClaimTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ClaimTypeEnumFactory.java @@ -52,7 +52,9 @@ public class ClaimTypeEnumFactory implements EnumFactory { } public String toCode(ClaimType code) { - if (code == ClaimType.INSTITUTIONAL) + if (code == ClaimType.NULL) + return null; + if (code == ClaimType.INSTITUTIONAL) return "institutional"; if (code == ClaimType.ORAL) return "oral"; @@ -63,7 +65,7 @@ public class ClaimTypeEnumFactory implements EnumFactory { if (code == ClaimType.VISION) return "vision"; return "?"; - } + } public String toSystem(ClaimType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ClaimUseEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ClaimUseEnumFactory.java index 745ca716a..7a32d98af 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ClaimUseEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ClaimUseEnumFactory.java @@ -48,14 +48,16 @@ public class ClaimUseEnumFactory implements EnumFactory { } public String toCode(ClaimUse code) { - if (code == ClaimUse.CLAIM) + if (code == ClaimUse.NULL) + return null; + if (code == ClaimUse.CLAIM) return "claim"; if (code == ClaimUse.PREAUTHORIZATION) return "preauthorization"; if (code == ClaimUse.PREDETERMINATION) return "predetermination"; return "?"; - } + } public String toSystem(ClaimUse code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CodeSearchSupportEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CodeSearchSupportEnumFactory.java index 6e2d16271..7389644bb 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CodeSearchSupportEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CodeSearchSupportEnumFactory.java @@ -46,12 +46,14 @@ public class CodeSearchSupportEnumFactory implements EnumFactory { } public String toCode(CommonTags code) { - if (code == CommonTags.ACTIONABLE) + if (code == CommonTags.NULL) + return null; + if (code == CommonTags.ACTIONABLE) return "actionable"; return "?"; - } + } public String toSystem(CommonTags code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CommunicationCategoryEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CommunicationCategoryEnumFactory.java index a7175a39a..c84fb2c1a 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CommunicationCategoryEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CommunicationCategoryEnumFactory.java @@ -50,7 +50,9 @@ public class CommunicationCategoryEnumFactory implements EnumFactory } 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"; @@ -63,7 +65,7 @@ public class CompartmentTypeEnumFactory implements EnumFactory if (code == CompartmentType.DEVICE) return "Device"; return "?"; - } + } public String toSystem(CompartmentType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CompositeMeasureScoringEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CompositeMeasureScoringEnumFactory.java index 219925321..867001056 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CompositeMeasureScoringEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CompositeMeasureScoringEnumFactory.java @@ -50,7 +50,9 @@ public class CompositeMeasureScoringEnumFactory implements EnumFactory { } public String toCode(ConditionState code) { - if (code == ConditionState.ACTIVE) + if (code == ConditionState.NULL) + return null; + if (code == ConditionState.ACTIVE) return "active"; if (code == ConditionState.INACTIVE) return "inactive"; if (code == ConditionState.RESOLVED) return "resolved"; return "?"; - } + } public String toSystem(ConditionState code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ConditionVerStatusEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ConditionVerStatusEnumFactory.java index dd3650da4..2b3549f7c 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ConditionVerStatusEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ConditionVerStatusEnumFactory.java @@ -54,7 +54,9 @@ public class ConditionVerStatusEnumFactory implements EnumFactory { } public String toCode(ConsentAction code) { - if (code == ConsentAction.COLLECT) + if (code == ConsentAction.NULL) + return null; + if (code == ConsentAction.COLLECT) return "collect"; if (code == ConsentAction.ACCESS) return "access"; @@ -63,7 +65,7 @@ public class ConsentActionEnumFactory implements EnumFactory { if (code == ConsentAction.CORRECT) return "correct"; return "?"; - } + } public String toSystem(ConsentAction code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ConsentCategoryEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ConsentCategoryEnumFactory.java index b9380bbe3..fa0679fb8 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ConsentCategoryEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ConsentCategoryEnumFactory.java @@ -60,7 +60,9 @@ public class ConsentCategoryEnumFactory implements EnumFactory } public String toCode(ConsentCategory code) { - if (code == ConsentCategory.ACD) + if (code == ConsentCategory.NULL) + return null; + if (code == ConsentCategory.ACD) return "acd"; if (code == ConsentCategory.DNR) return "dnr"; @@ -79,7 +81,7 @@ public class ConsentCategoryEnumFactory implements EnumFactory if (code == ConsentCategory.RSREID) return "rsreid"; return "?"; - } + } public String toSystem(ConsentCategory code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ConsentDataMeaningEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ConsentDataMeaningEnumFactory.java index 1c7c54ec5..dd728619d 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ConsentDataMeaningEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ConsentDataMeaningEnumFactory.java @@ -50,7 +50,9 @@ public class ConsentDataMeaningEnumFactory implements EnumFactory { } public String toCode(ConsentPolicy code) { - if (code == ConsentPolicy.CRIC) + if (code == ConsentPolicy.NULL) + return null; + if (code == ConsentPolicy.CRIC) return "cric"; if (code == ConsentPolicy.ILLINOISMINORPROCEDURE) return "illinois-minor-procedure"; @@ -147,7 +149,7 @@ public class ConsentPolicyEnumFactory implements EnumFactory { if (code == ConsentPolicy.GA4GH) return "ga4gh"; return "?"; - } + } public String toSystem(ConsentPolicy code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ConsentProvisionTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ConsentProvisionTypeEnumFactory.java index 84165b50d..4129489fa 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ConsentProvisionTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ConsentProvisionTypeEnumFactory.java @@ -46,12 +46,14 @@ public class ConsentProvisionTypeEnumFactory implements EnumFactory { } public String toCode(ConsentScope code) { - if (code == ConsentScope.ADR) + if (code == ConsentScope.NULL) + return null; + if (code == ConsentScope.ADR) return "adr"; if (code == ConsentScope.RESEARCH) return "research"; @@ -59,7 +61,7 @@ public class ConsentScopeEnumFactory implements EnumFactory { if (code == ConsentScope.TREATMENT) return "treatment"; return "?"; - } + } public String toSystem(ConsentScope code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ConsentStateCodesEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ConsentStateCodesEnumFactory.java index 005423119..78d13e3ba 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ConsentStateCodesEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ConsentStateCodesEnumFactory.java @@ -54,7 +54,9 @@ public class ConsentStateCodesEnumFactory implements EnumFactory } 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"; @@ -63,7 +65,7 @@ public class ContactPointUseEnumFactory implements EnumFactory if (code == ContactPointUse.MOBILE) return "mobile"; return "?"; - } + } public String toSystem(ContactPointUse code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ContactentityTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ContactentityTypeEnumFactory.java index 4c78deb60..21f3f6f2e 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ContactentityTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ContactentityTypeEnumFactory.java @@ -54,7 +54,9 @@ public class ContactentityTypeEnumFactory implements EnumFactory { } public String toCode(ContainerCap code) { - if (code == ContainerCap.RED) + if (code == ContainerCap.NULL) + return null; + if (code == ContainerCap.RED) return "red"; if (code == ContainerCap.YELLOW) return "yellow"; @@ -91,7 +93,7 @@ public class ContainerCapEnumFactory implements EnumFactory { if (code == ContainerCap.PINK) return "pink"; return "?"; - } + } public String toSystem(ContainerCap code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ContractActionEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ContractActionEnumFactory.java index 114d0b9fd..b9cee9601 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ContractActionEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ContractActionEnumFactory.java @@ -46,12 +46,14 @@ public class ContractActionEnumFactory implements EnumFactory { } public String toCode(ContractAction code) { - if (code == ContractAction.ACTIONA) + if (code == ContractAction.NULL) + return null; + if (code == ContractAction.ACTIONA) return "action-a"; if (code == ContractAction.ACTIONB) return "action-b"; return "?"; - } + } public String toSystem(ContractAction code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ContractActionstatusEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ContractActionstatusEnumFactory.java index b92b321d5..3d1ea25db 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ContractActionstatusEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ContractActionstatusEnumFactory.java @@ -44,10 +44,12 @@ public class ContractActionstatusEnumFactory implements EnumFactory { } public String toCode(ContractScope code) { - if (code == ContractScope.POLICY) + if (code == ContractScope.NULL) + return null; + if (code == ContractScope.POLICY) return "policy"; return "?"; - } + } public String toSystem(ContractScope code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ContractSecurityCategoryEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ContractSecurityCategoryEnumFactory.java index fa1158b30..c1e4e797b 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ContractSecurityCategoryEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ContractSecurityCategoryEnumFactory.java @@ -44,10 +44,12 @@ public class ContractSecurityCategoryEnumFactory implements EnumFactory { } public String toCode(ContractStatus code) { - if (code == ContractStatus.AMENDED) + if (code == ContractStatus.NULL) + return null; + if (code == ContractStatus.AMENDED) return "amended"; if (code == ContractStatus.APPENDED) return "appended"; @@ -103,7 +105,7 @@ public class ContractStatusEnumFactory implements EnumFactory { if (code == ContractStatus.TERMINATED) return "terminated"; return "?"; - } + } public String toSystem(ContractStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ContractSubtypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ContractSubtypeEnumFactory.java index 44e59fa7c..28961ef01 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ContractSubtypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ContractSubtypeEnumFactory.java @@ -46,12 +46,14 @@ public class ContractSubtypeEnumFactory implements EnumFactory } public String toCode(ContractSubtype code) { - if (code == ContractSubtype.DISCLOSURECA) + if (code == ContractSubtype.NULL) + return null; + if (code == ContractSubtype.DISCLOSURECA) return "disclosure-ca"; if (code == ContractSubtype.DISCLOSUREUS) return "disclosure-us"; return "?"; - } + } public String toSystem(ContractSubtype code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ContractTermSubtypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ContractTermSubtypeEnumFactory.java index 5f8e3fd3b..0787d9e5b 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ContractTermSubtypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ContractTermSubtypeEnumFactory.java @@ -48,14 +48,16 @@ public class ContractTermSubtypeEnumFactory implements EnumFactory { } public String toCode(ContractType code) { - if (code == ContractType.PRIVACY) + if (code == ContractType.NULL) + return null; + if (code == ContractType.PRIVACY) return "privacy"; if (code == ContractType.DISCLOSURE) return "disclosure"; @@ -63,7 +65,7 @@ public class ContractTypeEnumFactory implements EnumFactory { if (code == ContractType.CONSENT) return "consent"; return "?"; - } + } public String toSystem(ContractType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ContributorTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ContributorTypeEnumFactory.java index 610b9604a..ceaeb49bd 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ContributorTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ContributorTypeEnumFactory.java @@ -50,7 +50,9 @@ public class ContributorTypeEnumFactory implements EnumFactory } 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"; @@ -59,7 +61,7 @@ public class ContributorTypeEnumFactory implements EnumFactory if (code == ContributorType.ENDORSER) return "endorser"; return "?"; - } + } public String toSystem(ContributorType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CopyNumberEventEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CopyNumberEventEnumFactory.java index 9267b9f4f..2b4031417 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CopyNumberEventEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CopyNumberEventEnumFactory.java @@ -48,14 +48,16 @@ public class CopyNumberEventEnumFactory implements EnumFactory } public String toCode(CopyNumberEvent code) { - if (code == CopyNumberEvent.AMP) + if (code == CopyNumberEvent.NULL) + return null; + if (code == CopyNumberEvent.AMP) return "amp"; if (code == CopyNumberEvent.DEL) return "del"; if (code == CopyNumberEvent.LOF) return "lof"; return "?"; - } + } public String toSystem(CopyNumberEvent code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CoverageClassEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CoverageClassEnumFactory.java index 395c5984c..d1a8968d7 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CoverageClassEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CoverageClassEnumFactory.java @@ -64,7 +64,9 @@ public class CoverageClassEnumFactory implements EnumFactory { } public String toCode(CoverageClass code) { - if (code == CoverageClass.GROUP) + if (code == CoverageClass.NULL) + return null; + if (code == CoverageClass.GROUP) return "group"; if (code == CoverageClass.SUBGROUP) return "subgroup"; @@ -87,7 +89,7 @@ public class CoverageClassEnumFactory implements EnumFactory { if (code == CoverageClass.RXGROUP) return "rxgroup"; return "?"; - } + } public String toSystem(CoverageClass code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CoverageCopayTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CoverageCopayTypeEnumFactory.java index 815af396f..aad5abded 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CoverageCopayTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CoverageCopayTypeEnumFactory.java @@ -62,7 +62,9 @@ public class CoverageCopayTypeEnumFactory implements EnumFactory } public String toCode(CoverageSelfpay code) { - if (code == CoverageSelfpay.PAY) + if (code == CoverageSelfpay.NULL) + return null; + if (code == CoverageSelfpay.PAY) return "pay"; return "?"; - } + } public String toSystem(CoverageSelfpay code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CoverageeligibilityresponseExAuthSupportEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CoverageeligibilityresponseExAuthSupportEnumFactory.java index bc3f14892..04588b30e 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CoverageeligibilityresponseExAuthSupportEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/CoverageeligibilityresponseExAuthSupportEnumFactory.java @@ -59,7 +59,9 @@ public class CoverageeligibilityresponseExAuthSupportEnumFactory } public String toCode(CoverageeligibilityresponseExAuthSupport code) { - if (code == CoverageeligibilityresponseExAuthSupport.LABORDER) + if (code == CoverageeligibilityresponseExAuthSupport.NULL) + return null; + if (code == CoverageeligibilityresponseExAuthSupport.LABORDER) return "laborder"; if (code == CoverageeligibilityresponseExAuthSupport.LABREPORT) return "labreport"; @@ -76,7 +78,7 @@ public class CoverageeligibilityresponseExAuthSupportEnumFactory if (code == CoverageeligibilityresponseExAuthSupport.PICTURE) return "picture"; return "?"; - } + } public String toSystem(CoverageeligibilityresponseExAuthSupport code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DataAbsentReasonEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DataAbsentReasonEnumFactory.java index 46df476d4..fe618e647 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DataAbsentReasonEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DataAbsentReasonEnumFactory.java @@ -72,7 +72,9 @@ public class DataAbsentReasonEnumFactory implements EnumFactory { } public String toCode(DataTypes code) { - if (code == DataTypes.ADDRESS) + if (code == DataTypes.NULL) + return null; + if (code == DataTypes.ADDRESS) return "Address"; if (code == DataTypes.AGE) return "Age"; @@ -295,7 +297,7 @@ public class DataTypesEnumFactory implements EnumFactory { if (code == DataTypes.XHTML) return "xhtml"; return "?"; - } + } public String toSystem(DataTypes code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DaysOfWeekEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DaysOfWeekEnumFactory.java index 5a9777905..f61f95264 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DaysOfWeekEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DaysOfWeekEnumFactory.java @@ -56,7 +56,9 @@ public class DaysOfWeekEnumFactory implements EnumFactory { } 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"; @@ -71,7 +73,7 @@ public class DaysOfWeekEnumFactory implements EnumFactory { if (code == DaysOfWeek.SUN) return "sun"; return "?"; - } + } public String toSystem(DaysOfWeek code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DefinitionResourceTypesEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DefinitionResourceTypesEnumFactory.java index 36a2af942..fc60873b7 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DefinitionResourceTypesEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DefinitionResourceTypesEnumFactory.java @@ -54,7 +54,9 @@ public class DefinitionResourceTypesEnumFactory implements EnumFactory } public String toCode(DefinitionTopic code) { - if (code == DefinitionTopic.TREATMENT) + if (code == DefinitionTopic.NULL) + return null; + if (code == DefinitionTopic.TREATMENT) return "treatment"; if (code == DefinitionTopic.EDUCATION) return "education"; if (code == DefinitionTopic.ASSESSMENT) return "assessment"; return "?"; - } + } public String toSystem(DefinitionTopic code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DefinitionUseEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DefinitionUseEnumFactory.java index e4db70ee7..82eec931a 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DefinitionUseEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DefinitionUseEnumFactory.java @@ -54,7 +54,9 @@ public class DefinitionUseEnumFactory implements EnumFactory { } public String toCode(DefinitionUse code) { - if (code == DefinitionUse.FHIRSTRUCTURE) + if (code == DefinitionUse.NULL) + return null; + if (code == DefinitionUse.FHIRSTRUCTURE) return "fhir-structure"; if (code == DefinitionUse.CUSTOMRESOURCE) return "custom-resource"; @@ -67,7 +69,7 @@ public class DefinitionUseEnumFactory implements EnumFactory { if (code == DefinitionUse.TEMPLATE) return "template"; return "?"; - } + } public String toSystem(DefinitionUse code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DetectedissueSeverityEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DetectedissueSeverityEnumFactory.java index a0cb9b4f2..3d1cec61b 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DetectedissueSeverityEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DetectedissueSeverityEnumFactory.java @@ -48,14 +48,16 @@ public class DetectedissueSeverityEnumFactory implements EnumFactory { } public String toCode(DeviceAction code) { - if (code == DeviceAction.IMPLANTED) + if (code == DeviceAction.NULL) + return null; + if (code == DeviceAction.IMPLANTED) return "implanted"; if (code == DeviceAction.EXPLANTED) return "explanted"; if (code == DeviceAction.MANIPULATED) return "manipulated"; return "?"; - } + } public String toSystem(DeviceAction code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DeviceDefinitionStatusEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DeviceDefinitionStatusEnumFactory.java index d4dbca6f6..172bc7860 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DeviceDefinitionStatusEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DeviceDefinitionStatusEnumFactory.java @@ -50,7 +50,9 @@ public class DeviceDefinitionStatusEnumFactory implements EnumFactory { } 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"; @@ -67,7 +69,7 @@ public class DeviceNametypeEnumFactory implements EnumFactory { if (code == DeviceNametype.OTHER) return "other"; return "?"; - } + } public String toSystem(DeviceNametype code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DeviceStatementStatusEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DeviceStatementStatusEnumFactory.java index 949477320..4c22db5e2 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DeviceStatementStatusEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DeviceStatementStatusEnumFactory.java @@ -54,7 +54,9 @@ public class DeviceStatementStatusEnumFactory implements EnumFactory { } public String toCode(DeviceStatus code) { - if (code == DeviceStatus.ACTIVE) + if (code == DeviceStatus.NULL) + return null; + if (code == DeviceStatus.ACTIVE) return "active"; if (code == DeviceStatus.INACTIVE) return "inactive"; @@ -59,7 +61,7 @@ public class DeviceStatusEnumFactory implements EnumFactory { if (code == DeviceStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(DeviceStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DeviceStatusReasonEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DeviceStatusReasonEnumFactory.java index 7985f0bae..bf55fc2c1 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DeviceStatusReasonEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DeviceStatusReasonEnumFactory.java @@ -58,7 +58,9 @@ public class DeviceStatusReasonEnumFactory implements EnumFactory { } public String toCode(DiagnosisRole code) { - if (code == DiagnosisRole.AD) + if (code == DiagnosisRole.NULL) + return null; + if (code == DiagnosisRole.AD) return "AD"; if (code == DiagnosisRole.DD) return "DD"; @@ -71,7 +73,7 @@ public class DiagnosisRoleEnumFactory implements EnumFactory { if (code == DiagnosisRole.BILLING) return "billing"; return "?"; - } + } public String toSystem(DiagnosisRole code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DiagnosticReportStatusEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DiagnosticReportStatusEnumFactory.java index acd019584..f2bc27bba 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DiagnosticReportStatusEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DiagnosticReportStatusEnumFactory.java @@ -62,7 +62,9 @@ public class DiagnosticReportStatusEnumFactory implements EnumFactory { } 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(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DocumentReferenceStatusEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DocumentReferenceStatusEnumFactory.java index fed6f3d51..30823bbda 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DocumentReferenceStatusEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/DocumentReferenceStatusEnumFactory.java @@ -48,14 +48,16 @@ public class DocumentReferenceStatusEnumFactory implements EnumFactory { } public String toCode(DoseRateType code) { - if (code == DoseRateType.CALCULATED) + if (code == DoseRateType.NULL) + return null; + if (code == DoseRateType.CALCULATED) return "calculated"; if (code == DoseRateType.ORDERED) return "ordered"; return "?"; - } + } public String toSystem(DoseRateType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/EffectEstimateTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/EffectEstimateTypeEnumFactory.java index bc83cc966..bd09354ef 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/EffectEstimateTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/EffectEstimateTypeEnumFactory.java @@ -56,7 +56,9 @@ public class EffectEstimateTypeEnumFactory implements EnumFactory { } public String toCode(EncounterDiet code) { - if (code == EncounterDiet.VEGETARIAN) + if (code == EncounterDiet.NULL) + return null; + if (code == EncounterDiet.VEGETARIAN) return "vegetarian"; if (code == EncounterDiet.DAIRYFREE) return "dairy-free"; @@ -71,7 +73,7 @@ public class EncounterDietEnumFactory implements EnumFactory { if (code == EncounterDiet.KOSHER) return "kosher"; return "?"; - } + } public String toSystem(EncounterDiet code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/EncounterDischargeDispositionEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/EncounterDischargeDispositionEnumFactory.java index 70c1528bb..47acac017 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/EncounterDischargeDispositionEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/EncounterDischargeDispositionEnumFactory.java @@ -64,7 +64,9 @@ public class EncounterDischargeDispositionEnumFactory implements EnumFactory } 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"; @@ -79,7 +81,7 @@ public class EncounterStatusEnumFactory implements EnumFactory if (code == EncounterStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(EncounterStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/EncounterTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/EncounterTypeEnumFactory.java index f674395c2..6e022b4a1 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/EncounterTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/EncounterTypeEnumFactory.java @@ -50,7 +50,9 @@ public class EncounterTypeEnumFactory implements EnumFactory { } public String toCode(EncounterType code) { - if (code == EncounterType.ADMS) + if (code == EncounterType.NULL) + return null; + if (code == EncounterType.ADMS) return "ADMS"; if (code == EncounterType.BD_BMCLIN) return "BD/BM-clin"; @@ -59,7 +61,7 @@ public class EncounterTypeEnumFactory implements EnumFactory { if (code == EncounterType.OKI) return "OKI"; return "?"; - } + } public String toSystem(EncounterType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/EndpointConnectionTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/EndpointConnectionTypeEnumFactory.java index 2cccb66bf..b6e9a596c 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/EndpointConnectionTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/EndpointConnectionTypeEnumFactory.java @@ -70,7 +70,9 @@ public class EndpointConnectionTypeEnumFactory implements EnumFactory { } 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"; @@ -67,7 +69,7 @@ public class EndpointStatusEnumFactory implements EnumFactory { if (code == EndpointStatus.TEST) return "test"; return "?"; - } + } public String toSystem(EndpointStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/EntformulaAdditiveEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/EntformulaAdditiveEnumFactory.java index e1175eedc..d9da7ce29 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/EntformulaAdditiveEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/EntformulaAdditiveEnumFactory.java @@ -52,7 +52,9 @@ public class EntformulaAdditiveEnumFactory implements EnumFactory { } 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"; @@ -75,7 +77,7 @@ public class EventStatusEnumFactory implements EnumFactory { if (code == EventStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(EventStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/EventTimingEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/EventTimingEnumFactory.java index 48d70c8b5..f95da4ef8 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/EventTimingEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/EventTimingEnumFactory.java @@ -66,7 +66,9 @@ public class EventTimingEnumFactory implements EnumFactory { } 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"; @@ -91,7 +93,7 @@ public class EventTimingEnumFactory implements EnumFactory { if (code == EventTiming.PHS) return "PHS"; return "?"; - } + } public String toSystem(EventTiming code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/EvidenceQualityEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/EvidenceQualityEnumFactory.java index f5fee9866..cee6456a2 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/EvidenceQualityEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/EvidenceQualityEnumFactory.java @@ -50,7 +50,9 @@ public class EvidenceQualityEnumFactory implements EnumFactory } public String toCode(EvidenceQuality code) { - if (code == EvidenceQuality.HIGH) + if (code == EvidenceQuality.NULL) + return null; + if (code == EvidenceQuality.HIGH) return "high"; if (code == EvidenceQuality.MODERATE) return "moderate"; @@ -59,7 +61,7 @@ public class EvidenceQualityEnumFactory implements EnumFactory if (code == EvidenceQuality.VERYLOW) return "very-low"; return "?"; - } + } public String toSystem(EvidenceQuality code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/EvidenceVariantStateEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/EvidenceVariantStateEnumFactory.java index 16fa5b9a1..2ea78e931 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/EvidenceVariantStateEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/EvidenceVariantStateEnumFactory.java @@ -48,14 +48,16 @@ public class EvidenceVariantStateEnumFactory implements EnumFactory } public String toCode(ExDiagnosistype code) { - if (code == ExDiagnosistype.ADMITTING) + if (code == ExDiagnosistype.NULL) + return null; + if (code == ExDiagnosistype.ADMITTING) return "admitting"; if (code == ExDiagnosistype.CLINICAL) return "clinical"; @@ -91,7 +93,7 @@ public class ExDiagnosistypeEnumFactory implements EnumFactory if (code == ExDiagnosistype.SELF) return "self"; return "?"; - } + } public String toSystem(ExDiagnosistype code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ExOnsettypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ExOnsettypeEnumFactory.java index a81efc8c1..613fa8706 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ExOnsettypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ExOnsettypeEnumFactory.java @@ -48,14 +48,16 @@ public class ExOnsettypeEnumFactory implements EnumFactory { } public String toCode(ExOnsettype code) { - if (code == ExOnsettype.LXM) + if (code == ExOnsettype.NULL) + return null; + if (code == ExOnsettype.LXM) return "lxm"; if (code == ExOnsettype.SYM) return "sym"; if (code == ExOnsettype.LMN) return "lmn"; return "?"; - } + } public String toSystem(ExOnsettype code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ExPayeeResourceTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ExPayeeResourceTypeEnumFactory.java index 6cc6efab5..a13b67df7 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ExPayeeResourceTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ExPayeeResourceTypeEnumFactory.java @@ -50,7 +50,9 @@ public class ExPayeeResourceTypeEnumFactory implements EnumFactory { } public String toCode(ExPaymenttype code) { - if (code == ExPaymenttype.COMPLETE) + if (code == ExPaymenttype.NULL) + return null; + if (code == ExPaymenttype.COMPLETE) return "complete"; if (code == ExPaymenttype.PARTIAL) return "partial"; return "?"; - } + } public String toSystem(ExPaymenttype code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ExProcedureTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ExProcedureTypeEnumFactory.java index a0533c640..a9ffe0225 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ExProcedureTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ExProcedureTypeEnumFactory.java @@ -46,12 +46,14 @@ public class ExProcedureTypeEnumFactory implements EnumFactory } public String toCode(ExProcedureType code) { - if (code == ExProcedureType.PRIMARY) + if (code == ExProcedureType.NULL) + return null; + if (code == ExProcedureType.PRIMARY) return "primary"; if (code == ExProcedureType.SECONDARY) return "secondary"; return "?"; - } + } public String toSystem(ExProcedureType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ExProgramCodeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ExProgramCodeEnumFactory.java index 15fc89001..ba81cbc91 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ExProgramCodeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ExProgramCodeEnumFactory.java @@ -50,7 +50,9 @@ public class ExProgramCodeEnumFactory implements EnumFactory { } public String toCode(ExProgramCode code) { - if (code == ExProgramCode.AS) + if (code == ExProgramCode.NULL) + return null; + if (code == ExProgramCode.AS) return "as"; if (code == ExProgramCode.HD) return "hd"; @@ -59,7 +61,7 @@ public class ExProgramCodeEnumFactory implements EnumFactory { if (code == ExProgramCode.NONE) return "none"; return "?"; - } + } public String toSystem(ExProgramCode code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ExRevenueCenterEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ExRevenueCenterEnumFactory.java index fa716ff37..3f742df4f 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ExRevenueCenterEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ExRevenueCenterEnumFactory.java @@ -60,7 +60,9 @@ public class ExRevenueCenterEnumFactory implements EnumFactory } public String toCode(ExRevenueCenter code) { - if (code == ExRevenueCenter._0370) + if (code == ExRevenueCenter.NULL) + return null; + if (code == ExRevenueCenter._0370) return "0370"; if (code == ExRevenueCenter._0420) return "0420"; @@ -79,7 +81,7 @@ public class ExRevenueCenterEnumFactory implements EnumFactory if (code == ExRevenueCenter._0010) return "0010"; return "?"; - } + } public String toSystem(ExRevenueCenter code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ExamplescenarioActorTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ExamplescenarioActorTypeEnumFactory.java index a2401c15f..c9a885110 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ExamplescenarioActorTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ExamplescenarioActorTypeEnumFactory.java @@ -46,12 +46,14 @@ public class ExamplescenarioActorTypeEnumFactory implements EnumFactory { } public String toCode(ExposureState code) { - if (code == ExposureState.EXPOSURE) + if (code == ExposureState.NULL) + return null; + if (code == ExposureState.EXPOSURE) return "exposure"; if (code == ExposureState.EXPOSUREALTERNATIVE) return "exposure-alternative"; return "?"; - } + } public String toSystem(ExposureState code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ExpressionLanguageEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ExpressionLanguageEnumFactory.java index 10516a689..5e5b84069 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ExpressionLanguageEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ExpressionLanguageEnumFactory.java @@ -48,14 +48,16 @@ public class ExpressionLanguageEnumFactory implements EnumFactory { } 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"; @@ -127,7 +129,7 @@ public class FHIRVersionEnumFactory implements EnumFactory { if (code == FHIRVersion._4_0_0) return "4.0.0"; return "?"; - } + } public String toSystem(FHIRVersion code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FeedingDeviceEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FeedingDeviceEnumFactory.java index aeb1ca93e..93c9f3aec 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FeedingDeviceEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FeedingDeviceEnumFactory.java @@ -86,7 +86,9 @@ public class FeedingDeviceEnumFactory implements EnumFactory { } public String toCode(FeedingDevice code) { - if (code == FeedingDevice.STANDARDNIPPLE) + if (code == FeedingDevice.NULL) + return null; + if (code == FeedingDevice.STANDARDNIPPLE) return "standard-nipple"; if (code == FeedingDevice.PREEMIENIPPLE) return "preemie-nipple"; @@ -131,7 +133,7 @@ public class FeedingDeviceEnumFactory implements EnumFactory { if (code == FeedingDevice.ROCKERKNIFE) return "rocker-knife"; return "?"; - } + } public String toSystem(FeedingDevice code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FilterOperatorEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FilterOperatorEnumFactory.java index 49f507aa6..be8c71d82 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FilterOperatorEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FilterOperatorEnumFactory.java @@ -60,7 +60,9 @@ public class FilterOperatorEnumFactory implements EnumFactory { } 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"; @@ -79,7 +81,7 @@ public class FilterOperatorEnumFactory implements EnumFactory { if (code == FilterOperator.EXISTS) return "exists"; return "?"; - } + } public String toSystem(FilterOperator code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FinancialTaskcodeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FinancialTaskcodeEnumFactory.java index 10be6dc8e..273713cdc 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FinancialTaskcodeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FinancialTaskcodeEnumFactory.java @@ -52,7 +52,9 @@ public class FinancialTaskcodeEnumFactory implements EnumFactory { } public String toCode(FlagCategory code) { - if (code == FlagCategory.DIET) + if (code == FlagCategory.NULL) + return null; + if (code == FlagCategory.DIET) return "diet"; if (code == FlagCategory.DRUG) return "drug"; @@ -83,7 +85,7 @@ public class FlagCategoryEnumFactory implements EnumFactory { if (code == FlagCategory.SAFETY) return "safety"; return "?"; - } + } public String toSystem(FlagCategory code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FlagPriorityEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FlagPriorityEnumFactory.java index 71dca5b57..2028515d8 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FlagPriorityEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FlagPriorityEnumFactory.java @@ -50,7 +50,9 @@ public class FlagPriorityEnumFactory implements EnumFactory { } public String toCode(FlagPriority code) { - if (code == FlagPriority.PN) + if (code == FlagPriority.NULL) + return null; + if (code == FlagPriority.PN) return "PN"; if (code == FlagPriority.PL) return "PL"; @@ -59,7 +61,7 @@ public class FlagPriorityEnumFactory implements EnumFactory { if (code == FlagPriority.PH) return "PH"; return "?"; - } + } public String toSystem(FlagPriority code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FlagStatusEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FlagStatusEnumFactory.java index 272dddb96..38f236891 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FlagStatusEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FlagStatusEnumFactory.java @@ -48,14 +48,16 @@ public class FlagStatusEnumFactory implements EnumFactory { } 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(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FmConditionsEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FmConditionsEnumFactory.java index cb111bdfb..3de87968b 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FmConditionsEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FmConditionsEnumFactory.java @@ -44,10 +44,12 @@ public class FmConditionsEnumFactory implements EnumFactory { } public String toCode(FmConditions code) { - if (code == FmConditions._123987) + if (code == FmConditions.NULL) + return null; + if (code == FmConditions._123987) return "123987"; return "?"; - } + } public String toSystem(FmConditions code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FmItemtypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FmItemtypeEnumFactory.java index ffa2ca7b8..cb3711215 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FmItemtypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FmItemtypeEnumFactory.java @@ -48,14 +48,16 @@ public class FmItemtypeEnumFactory implements EnumFactory { } public String toCode(FmItemtype code) { - if (code == FmItemtype.GROUP) + if (code == FmItemtype.NULL) + return null; + if (code == FmItemtype.GROUP) return "group"; if (code == FmItemtype.PRODUCT) return "product"; if (code == FmItemtype.SERVICE) return "service"; return "?"; - } + } public String toSystem(FmItemtype code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FmStatusEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FmStatusEnumFactory.java index 7ceb90839..5d3a4a464 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FmStatusEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FmStatusEnumFactory.java @@ -50,7 +50,9 @@ public class FmStatusEnumFactory implements EnumFactory { } public String toCode(FmStatus code) { - if (code == FmStatus.ACTIVE) + if (code == FmStatus.NULL) + return null; + if (code == FmStatus.ACTIVE) return "active"; if (code == FmStatus.CANCELLED) return "cancelled"; @@ -59,7 +61,7 @@ public class FmStatusEnumFactory implements EnumFactory { if (code == FmStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(FmStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FormsEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FormsEnumFactory.java index 3961c22a8..3f30eb2c9 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FormsEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FormsEnumFactory.java @@ -46,12 +46,14 @@ public class FormsEnumFactory implements EnumFactory { } public String toCode(Forms code) { - if (code == Forms._1) + if (code == Forms.NULL) + return null; + if (code == Forms._1) return "1"; if (code == Forms._2) return "2"; return "?"; - } + } public String toSystem(Forms code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FundsreserveEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FundsreserveEnumFactory.java index 154aa4635..41d071260 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FundsreserveEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/FundsreserveEnumFactory.java @@ -48,14 +48,16 @@ public class FundsreserveEnumFactory implements EnumFactory { } public String toCode(Fundsreserve code) { - if (code == Fundsreserve.PATIENT) + if (code == Fundsreserve.NULL) + return null; + if (code == Fundsreserve.PATIENT) return "patient"; if (code == Fundsreserve.PROVIDER) return "provider"; if (code == Fundsreserve.NONE) return "none"; return "?"; - } + } public String toSystem(Fundsreserve code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/GenderIdentityEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/GenderIdentityEnumFactory.java index b9720a603..05965968f 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/GenderIdentityEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/GenderIdentityEnumFactory.java @@ -56,7 +56,9 @@ public class GenderIdentityEnumFactory implements EnumFactory { } public String toCode(GenderIdentity code) { - if (code == GenderIdentity.TRANSGENDERFEMALE) + if (code == GenderIdentity.NULL) + return null; + if (code == GenderIdentity.TRANSGENDERFEMALE) return "transgender-female"; if (code == GenderIdentity.TRANSGENDERMALE) return "transgender-male"; @@ -71,7 +73,7 @@ public class GenderIdentityEnumFactory implements EnumFactory { if (code == GenderIdentity.NONDISCLOSE) return "non-disclose"; return "?"; - } + } public String toSystem(GenderIdentity code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/GoalAcceptanceStatusEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/GoalAcceptanceStatusEnumFactory.java index da9f6afa4..8c101d48a 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/GoalAcceptanceStatusEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/GoalAcceptanceStatusEnumFactory.java @@ -48,14 +48,16 @@ public class GoalAcceptanceStatusEnumFactory implements EnumFactory } public String toCode(GoalAchievement code) { - if (code == GoalAchievement.INPROGRESS) + if (code == GoalAchievement.NULL) + return null; + if (code == GoalAchievement.INPROGRESS) return "in-progress"; if (code == GoalAchievement.IMPROVING) return "improving"; @@ -79,7 +81,7 @@ public class GoalAchievementEnumFactory implements EnumFactory if (code == GoalAchievement.NOTATTAINABLE) return "not-attainable"; return "?"; - } + } public String toSystem(GoalAchievement code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/GoalCategoryEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/GoalCategoryEnumFactory.java index bad23d8b2..6843fcebf 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/GoalCategoryEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/GoalCategoryEnumFactory.java @@ -52,7 +52,9 @@ public class GoalCategoryEnumFactory implements EnumFactory { } public String toCode(GoalCategory code) { - if (code == GoalCategory.DIETARY) + if (code == GoalCategory.NULL) + return null; + if (code == GoalCategory.DIETARY) return "dietary"; if (code == GoalCategory.SAFETY) return "safety"; @@ -63,7 +65,7 @@ public class GoalCategoryEnumFactory implements EnumFactory { if (code == GoalCategory.PHYSIOTHERAPY) return "physiotherapy"; return "?"; - } + } public String toSystem(GoalCategory code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/GoalPriorityEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/GoalPriorityEnumFactory.java index 4cec78b89..d05c3bfc5 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/GoalPriorityEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/GoalPriorityEnumFactory.java @@ -48,14 +48,16 @@ public class GoalPriorityEnumFactory implements EnumFactory { } public String toCode(GoalPriority code) { - if (code == GoalPriority.HIGHPRIORITY) + if (code == GoalPriority.NULL) + return null; + if (code == GoalPriority.HIGHPRIORITY) return "high-priority"; if (code == GoalPriority.MEDIUMPRIORITY) return "medium-priority"; if (code == GoalPriority.LOWPRIORITY) return "low-priority"; return "?"; - } + } public String toSystem(GoalPriority code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/GoalRelationshipTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/GoalRelationshipTypeEnumFactory.java index 7e996b50f..fb7be222a 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/GoalRelationshipTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/GoalRelationshipTypeEnumFactory.java @@ -52,7 +52,9 @@ public class GoalRelationshipTypeEnumFactory implements EnumFactory { } public String toCode(GoalStatus code) { - if (code == GoalStatus.PROPOSED) + if (code == GoalStatus.NULL) + return null; + if (code == GoalStatus.PROPOSED) return "proposed"; if (code == GoalStatus.PLANNED) return "planned"; @@ -79,7 +81,7 @@ public class GoalStatusEnumFactory implements EnumFactory { if (code == GoalStatus.REJECTED) return "rejected"; return "?"; - } + } public String toSystem(GoalStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/GoalStatusReasonEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/GoalStatusReasonEnumFactory.java index eda9b84f1..e8fef27c8 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/GoalStatusReasonEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/GoalStatusReasonEnumFactory.java @@ -60,7 +60,9 @@ public class GoalStatusReasonEnumFactory implements EnumFactory { } 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"; @@ -67,7 +69,7 @@ public class GroupMeasureEnumFactory implements EnumFactory { if (code == GroupMeasure.MEDIANOFMEDIAN) return "median-of-median"; return "?"; - } + } public String toSystem(GroupMeasure code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/GroupTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/GroupTypeEnumFactory.java index 33c6c4957..7ffdd124e 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/GroupTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/GroupTypeEnumFactory.java @@ -54,7 +54,9 @@ public class GroupTypeEnumFactory implements EnumFactory { } 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"; @@ -67,7 +69,7 @@ public class GroupTypeEnumFactory implements EnumFactory { if (code == GroupType.SUBSTANCE) return "substance"; return "?"; - } + } public String toSystem(GroupType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/GuidanceResponseStatusEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/GuidanceResponseStatusEnumFactory.java index 7721db0fa..8c06d1f80 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/GuidanceResponseStatusEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/GuidanceResponseStatusEnumFactory.java @@ -54,7 +54,9 @@ public class GuidanceResponseStatusEnumFactory implements EnumFactory { } public String toCode(HistoryStatus code) { - if (code == HistoryStatus.PARTIAL) + if (code == HistoryStatus.NULL) + return null; + if (code == HistoryStatus.PARTIAL) return "partial"; if (code == HistoryStatus.COMPLETED) return "completed"; @@ -59,7 +61,7 @@ public class HistoryStatusEnumFactory implements EnumFactory { if (code == HistoryStatus.HEALTHUNKNOWN) return "health-unknown"; return "?"; - } + } public String toSystem(HistoryStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/Hl7WorkGroupEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/Hl7WorkGroupEnumFactory.java index fcdc7d3c5..7fdd0f2ad 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/Hl7WorkGroupEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/Hl7WorkGroupEnumFactory.java @@ -90,7 +90,9 @@ public class Hl7WorkGroupEnumFactory implements EnumFactory { } public String toCode(Hl7WorkGroup code) { - if (code == Hl7WorkGroup.CBCC) + if (code == Hl7WorkGroup.NULL) + return null; + if (code == Hl7WorkGroup.CBCC) return "cbcc"; if (code == Hl7WorkGroup.CDS) return "cds"; @@ -139,7 +141,7 @@ public class Hl7WorkGroupEnumFactory implements EnumFactory { if (code == Hl7WorkGroup.AID) return "aid"; return "?"; - } + } public String toSystem(Hl7WorkGroup code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/HttpOperationsEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/HttpOperationsEnumFactory.java index d6cd48e8b..967f6ea27 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/HttpOperationsEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/HttpOperationsEnumFactory.java @@ -56,7 +56,9 @@ public class HttpOperationsEnumFactory implements EnumFactory { } public String toCode(HttpOperations code) { - if (code == HttpOperations.DELETE) + if (code == HttpOperations.NULL) + return null; + if (code == HttpOperations.DELETE) return "delete"; if (code == HttpOperations.GET) return "get"; @@ -71,7 +73,7 @@ public class HttpOperationsEnumFactory implements EnumFactory { if (code == HttpOperations.HEAD) return "head"; return "?"; - } + } public String toSystem(HttpOperations code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/HttpVerbEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/HttpVerbEnumFactory.java index f7926a333..ee1e9870d 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/HttpVerbEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/HttpVerbEnumFactory.java @@ -54,7 +54,9 @@ public class HttpVerbEnumFactory implements EnumFactory { } 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"; @@ -67,7 +69,7 @@ public class HttpVerbEnumFactory implements EnumFactory { if (code == HttpVerb.PATCH) return "PATCH"; return "?"; - } + } public String toSystem(HttpVerb code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/IHEFormatcodeCsEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/IHEFormatcodeCsEnumFactory.java index da878a737..d510e5145 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/IHEFormatcodeCsEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/IHEFormatcodeCsEnumFactory.java @@ -190,7 +190,9 @@ public class IHEFormatcodeCsEnumFactory implements EnumFactory } public String toCode(IHEFormatcodeCs code) { - if (code == IHEFormatcodeCs.URN_IHE_PCC_XPHR_2007) + if (code == IHEFormatcodeCs.NULL) + return null; + if (code == IHEFormatcodeCs.URN_IHE_PCC_XPHR_2007) return "urn:ihe:pcc:xphr:2007"; if (code == IHEFormatcodeCs.URN_IHE_PCC_APS_2007) return "urn:ihe:pcc:aps:2007"; @@ -339,7 +341,7 @@ public class IHEFormatcodeCsEnumFactory implements EnumFactory if (code == IHEFormatcodeCs.URN_HL7ORG_SDWG_CCDANONXMLBODY_2_1) return "urn:hl7-org:sdwg:ccda-nonXMLBody:2.1"; return "?"; - } + } public String toSystem(IHEFormatcodeCs code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/Icd10ProceduresEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/Icd10ProceduresEnumFactory.java index 29e2aaf2e..0b3fcf943 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/Icd10ProceduresEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/Icd10ProceduresEnumFactory.java @@ -48,14 +48,16 @@ public class Icd10ProceduresEnumFactory implements EnumFactory } public String toCode(Icd10Procedures code) { - if (code == Icd10Procedures._123001) + if (code == Icd10Procedures.NULL) + return null; + if (code == Icd10Procedures._123001) return "123001"; if (code == Icd10Procedures._123002) return "123002"; if (code == Icd10Procedures._123003) return "123003"; return "?"; - } + } public String toSystem(Icd10Procedures code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/IdentifierUseEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/IdentifierUseEnumFactory.java index 07fea1ff8..dc80d9e02 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/IdentifierUseEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/IdentifierUseEnumFactory.java @@ -52,7 +52,9 @@ public class IdentifierUseEnumFactory implements EnumFactory { } 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"; @@ -63,7 +65,7 @@ public class IdentifierUseEnumFactory implements EnumFactory { if (code == IdentifierUse.OLD) return "old"; return "?"; - } + } public String toSystem(IdentifierUse code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/IdentityAssuranceLevelEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/IdentityAssuranceLevelEnumFactory.java index a7d25f2c5..e3d91faec 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/IdentityAssuranceLevelEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/IdentityAssuranceLevelEnumFactory.java @@ -50,7 +50,9 @@ public class IdentityAssuranceLevelEnumFactory implements EnumFactory { } public String toCode(ImplantStatus code) { - if (code == ImplantStatus.FUNCTIONAL) + if (code == ImplantStatus.NULL) + return null; + if (code == ImplantStatus.FUNCTIONAL) return "functional"; if (code == ImplantStatus.NONFUNCTIONAL) return "non-functional"; @@ -59,7 +61,7 @@ public class ImplantStatusEnumFactory implements EnumFactory { if (code == ImplantStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(ImplantStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/InsuranceplanApplicabilityEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/InsuranceplanApplicabilityEnumFactory.java index 84ac1a20a..253dcae9d 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/InsuranceplanApplicabilityEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/InsuranceplanApplicabilityEnumFactory.java @@ -48,14 +48,16 @@ public class InsuranceplanApplicabilityEnumFactory implements EnumFactory { } public String toCode(Intervention code) { - if (code == Intervention.UNKNOWN) + if (code == Intervention.NULL) + return null; + if (code == Intervention.UNKNOWN) return "unknown"; if (code == Intervention.OTHER) return "other"; return "?"; - } + } public String toSystem(Intervention code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/InvoicePriceComponentTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/InvoicePriceComponentTypeEnumFactory.java index ee9f8afd0..d9aec15f8 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/InvoicePriceComponentTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/InvoicePriceComponentTypeEnumFactory.java @@ -54,7 +54,9 @@ public class InvoicePriceComponentTypeEnumFactory implements EnumFactory { } 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"; @@ -63,7 +65,7 @@ public class InvoiceStatusEnumFactory implements EnumFactory { if (code == InvoiceStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(InvoiceStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/Iso21089LifecycleEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/Iso21089LifecycleEnumFactory.java index b76478cde..3f957679f 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/Iso21089LifecycleEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/Iso21089LifecycleEnumFactory.java @@ -96,7 +96,9 @@ public class Iso21089LifecycleEnumFactory implements EnumFactory { } 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"; @@ -59,7 +61,7 @@ public class IssueSeverityEnumFactory implements EnumFactory { if (code == IssueSeverity.INFORMATION) return "information"; return "?"; - } + } public String toSystem(IssueSeverity code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/IssueTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/IssueTypeEnumFactory.java index ae41364b3..046028f46 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/IssueTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/IssueTypeEnumFactory.java @@ -104,7 +104,9 @@ public class IssueTypeEnumFactory implements EnumFactory { } 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"; @@ -167,7 +169,7 @@ public class IssueTypeEnumFactory implements EnumFactory { if (code == IssueType.INFORMATIONAL) return "informational"; return "?"; - } + } public String toSystem(IssueType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ItemTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ItemTypeEnumFactory.java index 493250f8f..9b96cd332 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ItemTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ItemTypeEnumFactory.java @@ -76,7 +76,9 @@ public class ItemTypeEnumFactory implements EnumFactory { } public String toCode(ItemType code) { - if (code == ItemType.GROUP) + if (code == ItemType.NULL) + return null; + if (code == ItemType.GROUP) return "group"; if (code == ItemType.DISPLAY) return "display"; @@ -111,7 +113,7 @@ public class ItemTypeEnumFactory implements EnumFactory { if (code == ItemType.QUANTITY) return "quantity"; return "?"; - } + } public String toSystem(ItemType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/KnowledgeResourceTypesEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/KnowledgeResourceTypesEnumFactory.java index c2867ab2e..7e77516da 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/KnowledgeResourceTypesEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/KnowledgeResourceTypesEnumFactory.java @@ -60,7 +60,9 @@ public class KnowledgeResourceTypesEnumFactory implements EnumFactory { } public String toCode(LibraryType code) { - if (code == LibraryType.LOGICLIBRARY) + if (code == LibraryType.NULL) + return null; + if (code == LibraryType.LOGICLIBRARY) return "logic-library"; if (code == LibraryType.MODELDEFINITION) return "model-definition"; @@ -59,7 +61,7 @@ public class LibraryTypeEnumFactory implements EnumFactory { if (code == LibraryType.MODULEDEFINITION) return "module-definition"; return "?"; - } + } public String toSystem(LibraryType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/LinkTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/LinkTypeEnumFactory.java index d4b068683..7e220bd7e 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/LinkTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/LinkTypeEnumFactory.java @@ -50,7 +50,9 @@ public class LinkTypeEnumFactory implements EnumFactory { } 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"; @@ -59,7 +61,7 @@ public class LinkTypeEnumFactory implements EnumFactory { if (code == LinkType.SEEALSO) return "seealso"; return "?"; - } + } public String toSystem(LinkType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/LinkageTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/LinkageTypeEnumFactory.java index 44a93c1b5..0f5c5c2c3 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/LinkageTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/LinkageTypeEnumFactory.java @@ -48,14 +48,16 @@ public class LinkageTypeEnumFactory implements EnumFactory { } 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(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ListEmptyReasonEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ListEmptyReasonEnumFactory.java index 9465226cf..1a768a019 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ListEmptyReasonEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ListEmptyReasonEnumFactory.java @@ -54,7 +54,9 @@ public class ListEmptyReasonEnumFactory implements EnumFactory } public String toCode(ListEmptyReason code) { - if (code == ListEmptyReason.NILKNOWN) + if (code == ListEmptyReason.NULL) + return null; + if (code == ListEmptyReason.NILKNOWN) return "nilknown"; if (code == ListEmptyReason.NOTASKED) return "notasked"; @@ -67,7 +69,7 @@ public class ListEmptyReasonEnumFactory implements EnumFactory if (code == ListEmptyReason.CLOSED) return "closed"; return "?"; - } + } public String toSystem(ListEmptyReason code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ListExampleCodesEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ListExampleCodesEnumFactory.java index bd54997d0..6a9a931c0 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ListExampleCodesEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ListExampleCodesEnumFactory.java @@ -60,7 +60,9 @@ public class ListExampleCodesEnumFactory implements EnumFactory { } public String toCode(ListItemFlag code) { - if (code == ListItemFlag._01) + if (code == ListItemFlag.NULL) + return null; + if (code == ListItemFlag._01) return "01"; if (code == ListItemFlag._02) return "02"; @@ -67,7 +69,7 @@ public class ListItemFlagEnumFactory implements EnumFactory { if (code == ListItemFlag._06) return "06"; return "?"; - } + } public String toSystem(ListItemFlag code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ListModeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ListModeEnumFactory.java index 30601461b..140f81885 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ListModeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ListModeEnumFactory.java @@ -48,14 +48,16 @@ public class ListModeEnumFactory implements EnumFactory { } 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(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ListOrderEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ListOrderEnumFactory.java index 7768dc84f..581df5eda 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ListOrderEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ListOrderEnumFactory.java @@ -58,7 +58,9 @@ public class ListOrderEnumFactory implements EnumFactory { } public String toCode(ListOrder code) { - if (code == ListOrder.USER) + if (code == ListOrder.NULL) + return null; + if (code == ListOrder.USER) return "user"; if (code == ListOrder.SYSTEM) return "system"; @@ -75,7 +77,7 @@ public class ListOrderEnumFactory implements EnumFactory { if (code == ListOrder.PATIENT) return "patient"; return "?"; - } + } public String toSystem(ListOrder code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ListStatusEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ListStatusEnumFactory.java index 10f185a2b..6db23034f 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ListStatusEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ListStatusEnumFactory.java @@ -48,14 +48,16 @@ public class ListStatusEnumFactory implements EnumFactory { } 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(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/LocationModeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/LocationModeEnumFactory.java index 5e9f1628b..37b8f46ba 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/LocationModeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/LocationModeEnumFactory.java @@ -46,12 +46,14 @@ public class LocationModeEnumFactory implements EnumFactory { } 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(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/LocationPhysicalTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/LocationPhysicalTypeEnumFactory.java index f0ef967f0..b771c260a 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/LocationPhysicalTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/LocationPhysicalTypeEnumFactory.java @@ -70,7 +70,9 @@ public class LocationPhysicalTypeEnumFactory implements EnumFactory { } 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(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MapContextTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MapContextTypeEnumFactory.java index d09d4b29d..ac4270ca9 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MapContextTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MapContextTypeEnumFactory.java @@ -46,12 +46,14 @@ public class MapContextTypeEnumFactory implements EnumFactory { } public String toCode(MapContextType code) { - if (code == MapContextType.TYPE) + if (code == MapContextType.NULL) + return null; + if (code == MapContextType.TYPE) return "type"; if (code == MapContextType.VARIABLE) return "variable"; return "?"; - } + } public String toSystem(MapContextType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MapGroupTypeModeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MapGroupTypeModeEnumFactory.java index 70a60859b..4299860d7 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MapGroupTypeModeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MapGroupTypeModeEnumFactory.java @@ -48,14 +48,16 @@ public class MapGroupTypeModeEnumFactory implements EnumFactory { } public String toCode(MapInputMode code) { - if (code == MapInputMode.SOURCE) + if (code == MapInputMode.NULL) + return null; + if (code == MapInputMode.SOURCE) return "source"; if (code == MapInputMode.TARGET) return "target"; return "?"; - } + } public String toSystem(MapInputMode code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MapModelModeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MapModelModeEnumFactory.java index 979e510f4..7e8aad24c 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MapModelModeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MapModelModeEnumFactory.java @@ -50,7 +50,9 @@ public class MapModelModeEnumFactory implements EnumFactory { } public String toCode(MapModelMode code) { - if (code == MapModelMode.SOURCE) + if (code == MapModelMode.NULL) + return null; + if (code == MapModelMode.SOURCE) return "source"; if (code == MapModelMode.QUERIED) return "queried"; @@ -59,7 +61,7 @@ public class MapModelModeEnumFactory implements EnumFactory { if (code == MapModelMode.PRODUCED) return "produced"; return "?"; - } + } public String toSystem(MapModelMode code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MapSourceListModeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MapSourceListModeEnumFactory.java index de985a1f3..f1ee98337 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MapSourceListModeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MapSourceListModeEnumFactory.java @@ -52,7 +52,9 @@ public class MapSourceListModeEnumFactory implements EnumFactory { } public String toCode(MapTransform code) { - if (code == MapTransform.CREATE) + if (code == MapTransform.NULL) + return null; + if (code == MapTransform.CREATE) return "create"; if (code == MapTransform.COPY) return "copy"; @@ -111,7 +113,7 @@ public class MapTransformEnumFactory implements EnumFactory { if (code == MapTransform.CP) return "cp"; return "?"; - } + } public String toSystem(MapTransform code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MatchGradeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MatchGradeEnumFactory.java index d32251310..78186dcec 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MatchGradeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MatchGradeEnumFactory.java @@ -50,7 +50,9 @@ public class MatchGradeEnumFactory implements EnumFactory { } public String toCode(MatchGrade code) { - if (code == MatchGrade.CERTAIN) + if (code == MatchGrade.NULL) + return null; + if (code == MatchGrade.CERTAIN) return "certain"; if (code == MatchGrade.PROBABLE) return "probable"; @@ -59,7 +61,7 @@ public class MatchGradeEnumFactory implements EnumFactory { if (code == MatchGrade.CERTAINLYNOT) return "certainly-not"; return "?"; - } + } public String toSystem(MatchGrade code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MeasureDataUsageEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MeasureDataUsageEnumFactory.java index 1fb80f27e..f24945b67 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MeasureDataUsageEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MeasureDataUsageEnumFactory.java @@ -46,12 +46,14 @@ public class MeasureDataUsageEnumFactory implements EnumFactory { } public String toCode(MeasureScoring code) { - if (code == MeasureScoring.PROPORTION) + if (code == MeasureScoring.NULL) + return null; + if (code == MeasureScoring.PROPORTION) return "proportion"; if (code == MeasureScoring.RATIO) return "ratio"; @@ -59,7 +61,7 @@ public class MeasureScoringEnumFactory implements EnumFactory { if (code == MeasureScoring.COHORT) return "cohort"; return "?"; - } + } public String toSystem(MeasureScoring code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MeasureTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MeasureTypeEnumFactory.java index 75fc783b6..290b6e135 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MeasureTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MeasureTypeEnumFactory.java @@ -52,7 +52,9 @@ public class MeasureTypeEnumFactory implements EnumFactory { } public String toCode(MeasureType code) { - if (code == MeasureType.PROCESS) + if (code == MeasureType.NULL) + return null; + if (code == MeasureType.PROCESS) return "process"; if (code == MeasureType.OUTCOME) return "outcome"; @@ -63,7 +65,7 @@ public class MeasureTypeEnumFactory implements EnumFactory { if (code == MeasureType.COMPOSITE) return "composite"; return "?"; - } + } public String toSystem(MeasureType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MedAdminPerformFunctionEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MedAdminPerformFunctionEnumFactory.java index 902708848..979b6f951 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MedAdminPerformFunctionEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MedAdminPerformFunctionEnumFactory.java @@ -48,14 +48,16 @@ public class MedAdminPerformFunctionEnumFactory implements EnumFactory { } public String toCode(MediaModality code) { - if (code == MediaModality.DIAGRAM) + if (code == MediaModality.NULL) + return null; + if (code == MediaModality.DIAGRAM) return "diagram"; if (code == MediaModality.FAX) return "fax"; @@ -75,7 +77,7 @@ public class MediaModalityEnumFactory implements EnumFactory { if (code == MediaModality.FACE) return "face"; return "?"; - } + } public String toSystem(MediaModality code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MediaTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MediaTypeEnumFactory.java index 3da3df915..1a4d64418 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MediaTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MediaTypeEnumFactory.java @@ -48,14 +48,16 @@ public class MediaTypeEnumFactory implements EnumFactory { } public String toCode(MediaType code) { - if (code == MediaType.IMAGE) + if (code == MediaType.NULL) + return null; + if (code == MediaType.IMAGE) return "image"; if (code == MediaType.VIDEO) return "video"; if (code == MediaType.AUDIO) return "audio"; return "?"; - } + } public String toSystem(MediaType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MedicationAdminCategoryEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MedicationAdminCategoryEnumFactory.java index 5e5346a56..fa4049e3a 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MedicationAdminCategoryEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MedicationAdminCategoryEnumFactory.java @@ -48,14 +48,16 @@ public class MedicationAdminCategoryEnumFactory implements EnumFactory { } public String toCode(MessageEvents code) { - return "?"; - } + if (code == MessageEvents.NULL) + return null; + return "?"; + } public String toSystem(MessageEvents code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MessageReasonEncounterEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MessageReasonEncounterEnumFactory.java index 7d2bd14f5..d33d23436 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MessageReasonEncounterEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MessageReasonEncounterEnumFactory.java @@ -54,7 +54,9 @@ public class MessageReasonEncounterEnumFactory implements EnumFactory { } public String toCode(MetricCategory code) { - if (code == MetricCategory.MEASUREMENT) + if (code == MetricCategory.NULL) + return null; + if (code == MetricCategory.MEASUREMENT) return "measurement"; if (code == MetricCategory.SETTING) return "setting"; @@ -59,7 +61,7 @@ public class MetricCategoryEnumFactory implements EnumFactory { if (code == MetricCategory.UNSPECIFIED) return "unspecified"; return "?"; - } + } public String toSystem(MetricCategory code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MetricColorEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MetricColorEnumFactory.java index 83c19b2b0..aca45c4f0 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MetricColorEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MetricColorEnumFactory.java @@ -58,7 +58,9 @@ public class MetricColorEnumFactory implements EnumFactory { } public String toCode(MetricColor code) { - if (code == MetricColor.BLACK) + if (code == MetricColor.NULL) + return null; + if (code == MetricColor.BLACK) return "black"; if (code == MetricColor.RED) return "red"; @@ -75,7 +77,7 @@ public class MetricColorEnumFactory implements EnumFactory { if (code == MetricColor.WHITE) return "white"; return "?"; - } + } public String toSystem(MetricColor code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MetricOperationalStatusEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MetricOperationalStatusEnumFactory.java index 4c7e34add..e3d37ef66 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MetricOperationalStatusEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/MetricOperationalStatusEnumFactory.java @@ -50,7 +50,9 @@ public class MetricOperationalStatusEnumFactory implements EnumFactory { } 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"; @@ -71,7 +73,7 @@ public class NameUseEnumFactory implements EnumFactory { if (code == NameUse.MAIDEN) return "maiden"; return "?"; - } + } public String toSystem(NameUse code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/NamingsystemIdentifierTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/NamingsystemIdentifierTypeEnumFactory.java index 74faccf79..6ae596c74 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/NamingsystemIdentifierTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/NamingsystemIdentifierTypeEnumFactory.java @@ -50,7 +50,9 @@ public class NamingsystemIdentifierTypeEnumFactory implements EnumFactory } 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"; @@ -59,7 +61,7 @@ public class NarrativeStatusEnumFactory implements EnumFactory if (code == NarrativeStatus.EMPTY) return "empty"; return "?"; - } + } public String toSystem(NarrativeStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/NetworkTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/NetworkTypeEnumFactory.java index 1f23ddb51..c904cf349 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/NetworkTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/NetworkTypeEnumFactory.java @@ -52,7 +52,9 @@ public class NetworkTypeEnumFactory implements EnumFactory { } public String toCode(NetworkType code) { - if (code == NetworkType._1) + if (code == NetworkType.NULL) + return null; + if (code == NetworkType._1) return "1"; if (code == NetworkType._2) return "2"; @@ -63,7 +65,7 @@ public class NetworkTypeEnumFactory implements EnumFactory { if (code == NetworkType._5) return "5"; return "?"; - } + } public String toSystem(NetworkType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/NoteTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/NoteTypeEnumFactory.java index 8b88065ff..4fbf859b2 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/NoteTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/NoteTypeEnumFactory.java @@ -48,14 +48,16 @@ public class NoteTypeEnumFactory implements EnumFactory { } 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(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ObjectRoleEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ObjectRoleEnumFactory.java index bb3b3d6cd..9b99afd75 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ObjectRoleEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ObjectRoleEnumFactory.java @@ -90,7 +90,9 @@ public class ObjectRoleEnumFactory implements EnumFactory { } public String toCode(ObjectRole code) { - if (code == ObjectRole._1) + if (code == ObjectRole.NULL) + return null; + if (code == ObjectRole._1) return "1"; if (code == ObjectRole._2) return "2"; @@ -139,7 +141,7 @@ public class ObjectRoleEnumFactory implements EnumFactory { if (code == ObjectRole._24) return "24"; return "?"; - } + } public String toSystem(ObjectRole code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ObservationCategoryEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ObservationCategoryEnumFactory.java index 1986cfea2..7593aa567 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ObservationCategoryEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ObservationCategoryEnumFactory.java @@ -60,7 +60,9 @@ public class ObservationCategoryEnumFactory implements EnumFactory { } 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(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/OperationOutcomeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/OperationOutcomeEnumFactory.java index bf491fbd4..600fca0d2 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/OperationOutcomeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/OperationOutcomeEnumFactory.java @@ -142,7 +142,9 @@ public class OperationOutcomeEnumFactory implements EnumFactory } 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(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ParameterGroupEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ParameterGroupEnumFactory.java index 7448bf306..f35db2b4c 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ParameterGroupEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ParameterGroupEnumFactory.java @@ -60,7 +60,9 @@ public class ParameterGroupEnumFactory implements EnumFactory { } public String toCode(ParameterGroup code) { - if (code == ParameterGroup.HAEMODYNAMIC) + if (code == ParameterGroup.NULL) + return null; + if (code == ParameterGroup.HAEMODYNAMIC) return "haemodynamic"; if (code == ParameterGroup.ECG) return "ecg"; @@ -79,7 +81,7 @@ public class ParameterGroupEnumFactory implements EnumFactory { if (code == ParameterGroup.MISCELLANEOUS) return "miscellaneous"; return "?"; - } + } public String toSystem(ParameterGroup code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ParticipantrequiredEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ParticipantrequiredEnumFactory.java index c427a788d..19cea7ed3 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ParticipantrequiredEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ParticipantrequiredEnumFactory.java @@ -48,14 +48,16 @@ public class ParticipantrequiredEnumFactory implements EnumFactory { } public String toCode(Payeetype code) { - if (code == Payeetype.SUBSCRIBER) + if (code == Payeetype.NULL) + return null; + if (code == Payeetype.SUBSCRIBER) return "subscriber"; if (code == Payeetype.PROVIDER) return "provider"; if (code == Payeetype.OTHER) return "other"; return "?"; - } + } public String toSystem(Payeetype code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/PaymentAdjustmentReasonEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/PaymentAdjustmentReasonEnumFactory.java index 6e26178e9..797b3aaea 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/PaymentAdjustmentReasonEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/PaymentAdjustmentReasonEnumFactory.java @@ -46,12 +46,14 @@ public class PaymentAdjustmentReasonEnumFactory implements EnumFactory { } public String toCode(PaymentStatus code) { - if (code == PaymentStatus.PAID) + if (code == PaymentStatus.NULL) + return null; + if (code == PaymentStatus.PAID) return "paid"; if (code == PaymentStatus.CLEARED) return "cleared"; return "?"; - } + } public String toSystem(PaymentStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/PaymentTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/PaymentTypeEnumFactory.java index 0ac34778f..965267930 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/PaymentTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/PaymentTypeEnumFactory.java @@ -48,14 +48,16 @@ public class PaymentTypeEnumFactory implements EnumFactory { } public String toCode(PaymentType code) { - if (code == PaymentType.PAYMENT) + if (code == PaymentType.NULL) + return null; + if (code == PaymentType.PAYMENT) return "payment"; if (code == PaymentType.ADJUSTMENT) return "adjustment"; if (code == PaymentType.ADVANCE) return "advance"; return "?"; - } + } public String toSystem(PaymentType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/PermittedDataTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/PermittedDataTypeEnumFactory.java index 8a43c1e98..233d8d802 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/PermittedDataTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/PermittedDataTypeEnumFactory.java @@ -64,7 +64,9 @@ public class PermittedDataTypeEnumFactory implements EnumFactory } public String toCode(ProcessPriority code) { - if (code == ProcessPriority.STAT) + if (code == ProcessPriority.NULL) + return null; + if (code == ProcessPriority.STAT) return "stat"; if (code == ProcessPriority.NORMAL) return "normal"; if (code == ProcessPriority.DEFERRED) return "deferred"; return "?"; - } + } public String toSystem(ProcessPriority code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ProductCategoryEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ProductCategoryEnumFactory.java index 02a4c44c2..2cedbc1c4 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ProductCategoryEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ProductCategoryEnumFactory.java @@ -52,7 +52,9 @@ public class ProductCategoryEnumFactory implements EnumFactory } public String toCode(ProductCategory code) { - if (code == ProductCategory.ORGAN) + if (code == ProductCategory.NULL) + return null; + if (code == ProductCategory.ORGAN) return "organ"; if (code == ProductCategory.TISSUE) return "tissue"; @@ -63,7 +65,7 @@ public class ProductCategoryEnumFactory implements EnumFactory if (code == ProductCategory.BIOLOGICALAGENT) return "biologicalAgent"; return "?"; - } + } public String toSystem(ProductCategory code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ProductStatusEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ProductStatusEnumFactory.java index 769e7f312..21fe8be00 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ProductStatusEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ProductStatusEnumFactory.java @@ -46,12 +46,14 @@ public class ProductStatusEnumFactory implements EnumFactory { } public String toCode(ProductStatus code) { - if (code == ProductStatus.AVAILABLE) + if (code == ProductStatus.NULL) + return null; + if (code == ProductStatus.AVAILABLE) return "available"; if (code == ProductStatus.UNAVAILABLE) return "unavailable"; return "?"; - } + } public String toSystem(ProductStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ProductStorageScaleEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ProductStorageScaleEnumFactory.java index 859dabd12..e2b4ce1b9 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ProductStorageScaleEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ProductStorageScaleEnumFactory.java @@ -48,14 +48,16 @@ public class ProductStorageScaleEnumFactory implements EnumFactory { } public String toCode(Program code) { - if (code == Program._1) + if (code == Program.NULL) + return null; + if (code == Program._1) return "1"; if (code == Program._2) return "2"; @@ -223,7 +225,7 @@ public class ProgramEnumFactory implements EnumFactory { if (code == Program._45) return "45"; return "?"; - } + } public String toSystem(Program code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/PropertyRepresentationEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/PropertyRepresentationEnumFactory.java index c29348ccb..5fc4eeea6 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/PropertyRepresentationEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/PropertyRepresentationEnumFactory.java @@ -52,7 +52,9 @@ public class PropertyRepresentationEnumFactory implements EnumFactory { } 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(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/QuantityComparatorEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/QuantityComparatorEnumFactory.java index 01c6fefed..a31c997d0 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/QuantityComparatorEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/QuantityComparatorEnumFactory.java @@ -50,7 +50,9 @@ public class QuantityComparatorEnumFactory implements EnumFactory"; return "?"; - } + } public String toSystem(QuantityComparator code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/QuestionMaxOccursEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/QuestionMaxOccursEnumFactory.java index 692263864..335dcc806 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/QuestionMaxOccursEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/QuestionMaxOccursEnumFactory.java @@ -44,10 +44,12 @@ public class QuestionMaxOccursEnumFactory implements EnumFactory { } public String toCode(RelationType code) { - if (code == RelationType.TRIGGERS) + if (code == RelationType.NULL) + return null; + if (code == RelationType.TRIGGERS) return "triggers"; if (code == RelationType.ISREPLACEDBY) return "is-replaced-by"; return "?"; - } + } public String toSystem(RelationType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/RelationshipEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/RelationshipEnumFactory.java index d37674199..c19f8350e 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/RelationshipEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/RelationshipEnumFactory.java @@ -52,7 +52,9 @@ public class RelationshipEnumFactory implements EnumFactory { } public String toCode(Relationship code) { - if (code == Relationship._1) + if (code == Relationship.NULL) + return null; + if (code == Relationship._1) return "1"; if (code == Relationship._2) return "2"; @@ -63,7 +65,7 @@ public class RelationshipEnumFactory implements EnumFactory { if (code == Relationship._5) return "5"; return "?"; - } + } public String toSystem(Relationship code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/RemittanceOutcomeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/RemittanceOutcomeEnumFactory.java index ed713f94b..3f2b4550a 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/RemittanceOutcomeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/RemittanceOutcomeEnumFactory.java @@ -50,7 +50,9 @@ public class RemittanceOutcomeEnumFactory implements EnumFactory { } 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"; @@ -63,7 +65,7 @@ public class RepositoryTypeEnumFactory implements EnumFactory { if (code == RepositoryType.OTHER) return "other"; return "?"; - } + } public String toSystem(RepositoryType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/RequestIntentEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/RequestIntentEnumFactory.java index 0988f7f64..ecfdfb18f 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/RequestIntentEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/RequestIntentEnumFactory.java @@ -60,7 +60,9 @@ public class RequestIntentEnumFactory implements EnumFactory { } 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"; @@ -79,7 +81,7 @@ public class RequestIntentEnumFactory implements EnumFactory { if (code == RequestIntent.OPTION) return "option"; return "?"; - } + } public String toSystem(RequestIntent code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/RequestPriorityEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/RequestPriorityEnumFactory.java index 73cf3c680..cf80dbb5d 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/RequestPriorityEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/RequestPriorityEnumFactory.java @@ -50,7 +50,9 @@ public class RequestPriorityEnumFactory implements EnumFactory } 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"; @@ -59,7 +61,7 @@ public class RequestPriorityEnumFactory implements EnumFactory if (code == RequestPriority.STAT) return "stat"; return "?"; - } + } public String toSystem(RequestPriority code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/RequestResourceTypesEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/RequestResourceTypesEnumFactory.java index 42d0ad984..dc98220ed 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/RequestResourceTypesEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/RequestResourceTypesEnumFactory.java @@ -72,7 +72,9 @@ public class RequestResourceTypesEnumFactory implements EnumFactory { } 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"; @@ -71,7 +73,7 @@ public class RequestStatusEnumFactory implements EnumFactory { if (code == RequestStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(RequestStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ResearchElementTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ResearchElementTypeEnumFactory.java index 30c5ade75..b1e50456d 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ResearchElementTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ResearchElementTypeEnumFactory.java @@ -48,14 +48,16 @@ public class ResearchElementTypeEnumFactory implements EnumFactory { } public String toCode(ResourceStatus code) { - if (code == ResourceStatus.ERROR) + if (code == ResourceStatus.NULL) + return null; + if (code == ResourceStatus.ERROR) return "error"; if (code == ResourceStatus.PROPOSED) return "proposed"; @@ -167,7 +169,7 @@ public class ResourceStatusEnumFactory implements EnumFactory { if (code == ResourceStatus.HWDISCON) return "hw-discon"; return "?"; - } + } public String toSystem(ResourceStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ResourceTypeLinkEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ResourceTypeLinkEnumFactory.java index 97f55d308..841fb1b33 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ResourceTypeLinkEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ResourceTypeLinkEnumFactory.java @@ -50,7 +50,9 @@ public class ResourceTypeLinkEnumFactory implements EnumFactory { } public String toCode(ResourceTypes code) { - if (code == ResourceTypes.ACCOUNT) + if (code == ResourceTypes.NULL) + return null; + if (code == ResourceTypes.ACCOUNT) return "Account"; if (code == ResourceTypes.ACTIVITYDEFINITION) return "ActivityDefinition"; @@ -635,7 +637,7 @@ public class ResourceTypesEnumFactory implements EnumFactory { if (code == ResourceTypes.VISIONPRESCRIPTION) return "VisionPrescription"; return "?"; - } + } public String toSystem(ResourceTypes code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ResourceValidationModeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ResourceValidationModeEnumFactory.java index 86f97f747..90f54fafa 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ResourceValidationModeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ResourceValidationModeEnumFactory.java @@ -50,7 +50,9 @@ public class ResourceValidationModeEnumFactory implements EnumFactory { } public String toCode(ResponseCode code) { - if (code == ResponseCode.OK) + if (code == ResponseCode.NULL) + return null; + if (code == ResponseCode.OK) return "ok"; if (code == ResponseCode.TRANSIENTERROR) return "transient-error"; if (code == ResponseCode.FATALERROR) return "fatal-error"; return "?"; - } + } public String toSystem(ResponseCode code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/RestfulCapabilityModeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/RestfulCapabilityModeEnumFactory.java index 8ffc23574..e9718ef4a 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/RestfulCapabilityModeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/RestfulCapabilityModeEnumFactory.java @@ -46,12 +46,14 @@ public class RestfulCapabilityModeEnumFactory implements EnumFactory } public String toCode(RiskProbability code) { - if (code == RiskProbability.NEGLIGIBLE) + if (code == RiskProbability.NULL) + return null; + if (code == RiskProbability.NEGLIGIBLE) return "negligible"; if (code == RiskProbability.LOW) return "low"; @@ -63,7 +65,7 @@ public class RiskProbabilityEnumFactory implements EnumFactory if (code == RiskProbability.CERTAIN) return "certain"; return "?"; - } + } public String toSystem(RiskProbability code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SearchComparatorEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SearchComparatorEnumFactory.java index 7cbbe4efe..2a82ee574 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SearchComparatorEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SearchComparatorEnumFactory.java @@ -60,7 +60,9 @@ public class SearchComparatorEnumFactory implements EnumFactory } 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(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SearchModifierCodeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SearchModifierCodeEnumFactory.java index 50d650a4d..2e1639f5c 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SearchModifierCodeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SearchModifierCodeEnumFactory.java @@ -66,7 +66,9 @@ public class SearchModifierCodeEnumFactory implements EnumFactory } 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"; @@ -79,7 +81,7 @@ public class SearchParamTypeEnumFactory implements EnumFactory if (code == SearchParamType.SPECIAL) return "special"; return "?"; - } + } public String toSystem(SearchParamType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SearchXpathUsageEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SearchXpathUsageEnumFactory.java index feb9681cf..68f650f6c 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SearchXpathUsageEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SearchXpathUsageEnumFactory.java @@ -52,7 +52,9 @@ public class SearchXpathUsageEnumFactory implements EnumFactory { } 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(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ServiceCategoryEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ServiceCategoryEnumFactory.java index 832998cee..6606a34eb 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ServiceCategoryEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ServiceCategoryEnumFactory.java @@ -118,7 +118,9 @@ public class ServiceCategoryEnumFactory implements EnumFactory } public String toCode(ServiceCategory code) { - if (code == ServiceCategory._1) + if (code == ServiceCategory.NULL) + return null; + if (code == ServiceCategory._1) return "1"; if (code == ServiceCategory._2) return "2"; @@ -195,7 +197,7 @@ public class ServiceCategoryEnumFactory implements EnumFactory if (code == ServiceCategory._33) return "33"; return "?"; - } + } public String toSystem(ServiceCategory code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ServiceModifiersEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ServiceModifiersEnumFactory.java index 743e0d73e..5e010bdd2 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ServiceModifiersEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ServiceModifiersEnumFactory.java @@ -46,12 +46,14 @@ public class ServiceModifiersEnumFactory implements EnumFactory } public String toCode(ServicePharmacy code) { - if (code == ServicePharmacy.SMOKECESS) + if (code == ServicePharmacy.NULL) + return null; + if (code == ServicePharmacy.SMOKECESS) return "smokecess"; if (code == ServicePharmacy.FLUSHOT) return "flushot"; @@ -67,7 +69,7 @@ public class ServicePharmacyEnumFactory implements EnumFactory if (code == ServicePharmacy.COMPOUNDFEE) return "compoundfee"; return "?"; - } + } public String toSystem(ServicePharmacy code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ServicePlaceEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ServicePlaceEnumFactory.java index a6d53ccf0..216e84466 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ServicePlaceEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ServicePlaceEnumFactory.java @@ -76,7 +76,9 @@ public class ServicePlaceEnumFactory implements EnumFactory { } public String toCode(ServicePlace code) { - if (code == ServicePlace._01) + if (code == ServicePlace.NULL) + return null; + if (code == ServicePlace._01) return "01"; if (code == ServicePlace._03) return "03"; @@ -111,7 +113,7 @@ public class ServicePlaceEnumFactory implements EnumFactory { if (code == ServicePlace._41) return "41"; return "?"; - } + } public String toSystem(ServicePlace code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ServiceProductEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ServiceProductEnumFactory.java index b076d12ef..3f543ce13 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ServiceProductEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ServiceProductEnumFactory.java @@ -46,12 +46,14 @@ public class ServiceProductEnumFactory implements EnumFactory { } public String toCode(ServiceProduct code) { - if (code == ServiceProduct.EXAM) + if (code == ServiceProduct.NULL) + return null; + if (code == ServiceProduct.EXAM) return "exam"; if (code == ServiceProduct.FLUSHOT) return "flushot"; return "?"; - } + } public String toSystem(ServiceProduct code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ServiceProvisionConditionsEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ServiceProvisionConditionsEnumFactory.java index 50793e743..8cce2320f 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ServiceProvisionConditionsEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ServiceProvisionConditionsEnumFactory.java @@ -48,14 +48,16 @@ public class ServiceProvisionConditionsEnumFactory implements EnumFactory { } public String toCode(ServiceType code) { - if (code == ServiceType._1) + if (code == ServiceType.NULL) + return null; + if (code == ServiceType._1) return "1"; if (code == ServiceType._2) return "2"; @@ -2427,7 +2429,7 @@ public class ServiceTypeEnumFactory implements EnumFactory { if (code == ServiceType._629) return "629"; return "?"; - } + } public String toSystem(ServiceType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ServiceUsclsEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ServiceUsclsEnumFactory.java index e1e9113c5..826e4ea5f 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ServiceUsclsEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ServiceUsclsEnumFactory.java @@ -82,7 +82,9 @@ public class ServiceUsclsEnumFactory implements EnumFactory { } public String toCode(ServiceUscls code) { - if (code == ServiceUscls._1101) + if (code == ServiceUscls.NULL) + return null; + if (code == ServiceUscls._1101) return "1101"; if (code == ServiceUscls._1102) return "1102"; @@ -123,7 +125,7 @@ public class ServiceUsclsEnumFactory implements EnumFactory { if (code == ServiceUscls._99555) return "99555"; return "?"; - } + } public String toSystem(ServiceUscls code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SignatureTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SignatureTypeEnumFactory.java index 9aa6262f5..82f3e20e0 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SignatureTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SignatureTypeEnumFactory.java @@ -78,7 +78,9 @@ public class SignatureTypeEnumFactory implements EnumFactory { } public String toCode(SignatureType code) { - if (code == SignatureType.OID_1_2_840_10065_1_12_1_1) + if (code == SignatureType.NULL) + return null; + if (code == SignatureType.OID_1_2_840_10065_1_12_1_1) return "1.2.840.10065.1.12.1.1"; if (code == SignatureType.OID_1_2_840_10065_1_12_1_2) return "1.2.840.10065.1.12.1.2"; @@ -115,7 +117,7 @@ public class SignatureTypeEnumFactory implements EnumFactory { if (code == SignatureType.OID_1_2_840_10065_1_12_1_18) return "1.2.840.10065.1.12.1.18"; return "?"; - } + } public String toSystem(SignatureType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SlotstatusEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SlotstatusEnumFactory.java index 07fa79913..bf5a3cad0 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SlotstatusEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SlotstatusEnumFactory.java @@ -52,7 +52,9 @@ public class SlotstatusEnumFactory implements EnumFactory { } 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"; @@ -63,7 +65,7 @@ public class SlotstatusEnumFactory implements EnumFactory { if (code == Slotstatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(Slotstatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SmartCapabilitiesEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SmartCapabilitiesEnumFactory.java index 6fc987c79..f2668d688 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SmartCapabilitiesEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SmartCapabilitiesEnumFactory.java @@ -70,7 +70,9 @@ public class SmartCapabilitiesEnumFactory implements EnumFactory { } 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(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SpdxLicenseEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SpdxLicenseEnumFactory.java index 9710de302..438e6f9a6 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SpdxLicenseEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SpdxLicenseEnumFactory.java @@ -734,7 +734,9 @@ public class SpdxLicenseEnumFactory implements EnumFactory { } public String toCode(SpdxLicense code) { - if (code == SpdxLicense.NOTOPENSOURCE) + if (code == SpdxLicense.NULL) + return null; + if (code == SpdxLicense.NOTOPENSOURCE) return "not-open-source"; if (code == SpdxLicense._0BSD) return "0BSD"; @@ -1427,7 +1429,7 @@ public class SpdxLicenseEnumFactory implements EnumFactory { if (code == SpdxLicense.ZPL2_1) return "ZPL-2.1"; return "?"; - } + } public String toSystem(SpdxLicense code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SpecialValuesEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SpecialValuesEnumFactory.java index f46bc4452..507fecc98 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SpecialValuesEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SpecialValuesEnumFactory.java @@ -54,7 +54,9 @@ public class SpecialValuesEnumFactory implements EnumFactory { } public String toCode(SpecialValues code) { - if (code == SpecialValues.TRUE) + if (code == SpecialValues.NULL) + return null; + if (code == SpecialValues.TRUE) return "true"; if (code == SpecialValues.FALSE) return "false"; @@ -67,7 +69,7 @@ public class SpecialValuesEnumFactory implements EnumFactory { if (code == SpecialValues.NILKNOWN) return "nil-known"; return "?"; - } + } public String toSystem(SpecialValues code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SpecimenContainedPreferenceEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SpecimenContainedPreferenceEnumFactory.java index af87b653f..9d6d233af 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SpecimenContainedPreferenceEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SpecimenContainedPreferenceEnumFactory.java @@ -46,12 +46,14 @@ public class SpecimenContainedPreferenceEnumFactory implements EnumFactory { } 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"; @@ -59,7 +61,7 @@ public class SpecimenStatusEnumFactory implements EnumFactory { if (code == SpecimenStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(SpecimenStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/StandardsStatusEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/StandardsStatusEnumFactory.java index 58ebc14cf..220ad9e61 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/StandardsStatusEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/StandardsStatusEnumFactory.java @@ -54,7 +54,9 @@ public class StandardsStatusEnumFactory implements EnumFactory } public String toCode(StandardsStatus code) { - if (code == StandardsStatus.DRAFT) + if (code == StandardsStatus.NULL) + return null; + if (code == StandardsStatus.DRAFT) return "draft"; if (code == StandardsStatus.NORMATIVE) return "normative"; @@ -67,7 +69,7 @@ public class StandardsStatusEnumFactory implements EnumFactory if (code == StandardsStatus.EXTERNAL) return "external"; return "?"; - } + } public String toSystem(StandardsStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/StrandTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/StrandTypeEnumFactory.java index 141eb7bd4..fab3f9c72 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/StrandTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/StrandTypeEnumFactory.java @@ -46,12 +46,14 @@ public class StrandTypeEnumFactory implements EnumFactory { } 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(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/StructureDefinitionKindEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/StructureDefinitionKindEnumFactory.java index f03b8a6e5..f07a48bcf 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/StructureDefinitionKindEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/StructureDefinitionKindEnumFactory.java @@ -50,7 +50,9 @@ public class StructureDefinitionKindEnumFactory implements EnumFactory { } public String toCode(StudyType code) { - if (code == StudyType.RCT) + if (code == StudyType.NULL) + return null; + if (code == StudyType.RCT) return "RCT"; if (code == StudyType.CCT) return "CCT"; @@ -71,7 +73,7 @@ public class StudyTypeEnumFactory implements EnumFactory { if (code == StudyType.MIXED) return "mixed"; return "?"; - } + } public String toSystem(StudyType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SubscriberRelationshipEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SubscriberRelationshipEnumFactory.java index 61bc29e99..25f154fed 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SubscriberRelationshipEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SubscriberRelationshipEnumFactory.java @@ -56,7 +56,9 @@ public class SubscriberRelationshipEnumFactory implements EnumFactory } public String toCode(SubscriptionTag code) { - if (code == SubscriptionTag.QUEUED) + if (code == SubscriptionTag.NULL) + return null; + if (code == SubscriptionTag.QUEUED) return "queued"; if (code == SubscriptionTag.DELIVERED) return "delivered"; return "?"; - } + } public String toSystem(SubscriptionTag code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SubstanceCategoryEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SubstanceCategoryEnumFactory.java index 695db15c2..d465d3288 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SubstanceCategoryEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SubstanceCategoryEnumFactory.java @@ -56,7 +56,9 @@ public class SubstanceCategoryEnumFactory implements EnumFactory } public String toCode(SubstanceStatus code) { - if (code == SubstanceStatus.ACTIVE) + if (code == SubstanceStatus.NULL) + return null; + if (code == SubstanceStatus.ACTIVE) return "active"; if (code == SubstanceStatus.INACTIVE) return "inactive"; if (code == SubstanceStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(SubstanceStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SupplydeliveryStatusEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SupplydeliveryStatusEnumFactory.java index 0de37fac1..e1d58ca70 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SupplydeliveryStatusEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SupplydeliveryStatusEnumFactory.java @@ -50,7 +50,9 @@ public class SupplydeliveryStatusEnumFactory implements EnumFactory { } public String toCode(Surface code) { - if (code == Surface.M) + if (code == Surface.NULL) + return null; + if (code == Surface.M) return "M"; if (code == Surface.O) return "O"; @@ -87,7 +89,7 @@ public class SurfaceEnumFactory implements EnumFactory { if (code == Surface.MOD) return "MOD"; return "?"; - } + } public String toSystem(Surface code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SynthesisTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SynthesisTypeEnumFactory.java index c76fa8a62..015720a5d 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SynthesisTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/SynthesisTypeEnumFactory.java @@ -54,7 +54,9 @@ public class SynthesisTypeEnumFactory implements EnumFactory { } public String toCode(SynthesisType code) { - if (code == SynthesisType.STDMA) + if (code == SynthesisType.NULL) + return null; + if (code == SynthesisType.STDMA) return "std-MA"; if (code == SynthesisType.IPDMA) return "IPD-MA"; @@ -67,7 +69,7 @@ public class SynthesisTypeEnumFactory implements EnumFactory { if (code == SynthesisType.CLASSIFICATION) return "classification"; return "?"; - } + } public String toSystem(SynthesisType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/TaskCodeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/TaskCodeEnumFactory.java index e8f9309f7..24d3106cf 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/TaskCodeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/TaskCodeEnumFactory.java @@ -56,7 +56,9 @@ public class TaskCodeEnumFactory implements EnumFactory { } public String toCode(TaskCode code) { - if (code == TaskCode.APPROVE) + if (code == TaskCode.NULL) + return null; + if (code == TaskCode.APPROVE) return "approve"; if (code == TaskCode.FULFILL) return "fulfill"; @@ -71,7 +73,7 @@ public class TaskCodeEnumFactory implements EnumFactory { if (code == TaskCode.RESUME) return "resume"; return "?"; - } + } public String toSystem(TaskCode code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/TaskIntentEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/TaskIntentEnumFactory.java index ffd7ade91..3a277f4c5 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/TaskIntentEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/TaskIntentEnumFactory.java @@ -44,10 +44,12 @@ public class TaskIntentEnumFactory implements EnumFactory { } public String toCode(TaskIntent code) { - if (code == TaskIntent.UNKNOWN) + if (code == TaskIntent.NULL) + return null; + if (code == TaskIntent.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(TaskIntent code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/TaskStatusEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/TaskStatusEnumFactory.java index dd57586b0..8e8a79827 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/TaskStatusEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/TaskStatusEnumFactory.java @@ -66,7 +66,9 @@ public class TaskStatusEnumFactory implements EnumFactory { } 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"; @@ -91,7 +93,7 @@ public class TaskStatusEnumFactory implements EnumFactory { if (code == TaskStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(TaskStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/TeethEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/TeethEnumFactory.java index 864aab483..c4e7a4160 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/TeethEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/TeethEnumFactory.java @@ -106,7 +106,9 @@ public class TeethEnumFactory implements EnumFactory { } public String toCode(Teeth code) { - if (code == Teeth._11) + if (code == Teeth.NULL) + return null; + if (code == Teeth._11) return "11"; if (code == Teeth._12) return "12"; @@ -171,7 +173,7 @@ public class TeethEnumFactory implements EnumFactory { if (code == Teeth._48) return "48"; return "?"; - } + } public String toSystem(Teeth code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/TestscriptOperationCodesEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/TestscriptOperationCodesEnumFactory.java index 7628d16ae..8c51be6ef 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/TestscriptOperationCodesEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/TestscriptOperationCodesEnumFactory.java @@ -132,7 +132,9 @@ public class TestscriptOperationCodesEnumFactory implements EnumFactory { } public String toCode(Tldc code) { - if (code == Tldc.DRAFT) + if (code == Tldc.NULL) + return null; + if (code == Tldc.DRAFT) return "draft"; if (code == Tldc.PENDING) return "pending"; @@ -75,7 +77,7 @@ public class TldcEnumFactory implements EnumFactory { if (code == Tldc.TERMINATED) return "terminated"; return "?"; - } + } public String toSystem(Tldc code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ToothEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ToothEnumFactory.java index e5474014a..193411f32 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ToothEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/ToothEnumFactory.java @@ -124,7 +124,9 @@ public class ToothEnumFactory implements EnumFactory { } public String toCode(Tooth code) { - if (code == Tooth._0) + if (code == Tooth.NULL) + return null; + if (code == Tooth._0) return "0"; if (code == Tooth._1) return "1"; @@ -207,7 +209,7 @@ public class ToothEnumFactory implements EnumFactory { if (code == Tooth._48) return "48"; return "?"; - } + } public String toSystem(Tooth code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/TransactionModeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/TransactionModeEnumFactory.java index c09cb56d3..29a9b9a3e 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/TransactionModeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/TransactionModeEnumFactory.java @@ -50,7 +50,9 @@ public class TransactionModeEnumFactory implements EnumFactory } public String toCode(TransactionMode code) { - if (code == TransactionMode.NOTSUPPORTED) + if (code == TransactionMode.NULL) + return null; + if (code == TransactionMode.NOTSUPPORTED) return "not-supported"; if (code == TransactionMode.BATCH) return "batch"; @@ -59,7 +61,7 @@ public class TransactionModeEnumFactory implements EnumFactory if (code == TransactionMode.BOTH) return "both"; return "?"; - } + } public String toSystem(TransactionMode code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/TriggerTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/TriggerTypeEnumFactory.java index e7980a031..f9a04038d 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/TriggerTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/TriggerTypeEnumFactory.java @@ -58,7 +58,9 @@ public class TriggerTypeEnumFactory implements EnumFactory { } 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"; @@ -75,7 +77,7 @@ public class TriggerTypeEnumFactory implements EnumFactory { if (code == TriggerType.DATAACCESSENDED) return "data-access-ended"; return "?"; - } + } public String toSystem(TriggerType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/TypeDerivationRuleEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/TypeDerivationRuleEnumFactory.java index c3941f6a2..55b03adeb 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/TypeDerivationRuleEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/TypeDerivationRuleEnumFactory.java @@ -46,12 +46,14 @@ public class TypeDerivationRuleEnumFactory implements EnumFactory { } 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"; @@ -67,7 +69,7 @@ public class UdiEntryTypeEnumFactory implements EnumFactory { if (code == UdiEntryType.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(UdiEntryType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/UdiEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/UdiEnumFactory.java index 16788ede7..3410bfe38 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/UdiEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/UdiEnumFactory.java @@ -44,10 +44,12 @@ public class UdiEnumFactory implements EnumFactory { } public String toCode(Udi code) { - if (code == Udi.GUDID) + if (code == Udi.NULL) + return null; + if (code == Udi.GUDID) return "gudid"; return "?"; - } + } public String toSystem(Udi code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/UnknownContentCodeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/UnknownContentCodeEnumFactory.java index 76b330b4a..5c0f45ba2 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/UnknownContentCodeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/UnknownContentCodeEnumFactory.java @@ -50,7 +50,9 @@ public class UnknownContentCodeEnumFactory implements EnumFactory { } public String toCode(V3ActClass code) { - if (code == V3ActClass.ACT) + if (code == V3ActClass.NULL) + return null; + if (code == V3ActClass.ACT) return "ACT"; if (code == V3ActClass._ACTCLASSRECORDORGANIZER) return "_ActClassRecordOrganizer"; @@ -539,7 +541,7 @@ public class V3ActClassEnumFactory implements EnumFactory { if (code == V3ActClass.UNORDERED) return "unordered"; return "?"; - } + } public String toSystem(V3ActClass code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ActCodeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ActCodeEnumFactory.java index bdbb24356..beb87d3d6 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ActCodeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ActCodeEnumFactory.java @@ -2274,7 +2274,9 @@ public class V3ActCodeEnumFactory implements EnumFactory { } public String toCode(V3ActCode code) { - if (code == V3ActCode._ACTACCOUNTCODE) + if (code == V3ActCode.NULL) + return null; + if (code == V3ActCode._ACTACCOUNTCODE) return "_ActAccountCode"; if (code == V3ActCode.ACCTRECEIVABLE) return "ACCTRECEIVABLE"; @@ -4507,7 +4509,7 @@ public class V3ActCodeEnumFactory implements EnumFactory { if (code == V3ActCode.STORE) return "STORE"; return "?"; - } + } public String toSystem(V3ActCode code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ActExposureLevelCodeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ActExposureLevelCodeEnumFactory.java index 292576c49..12036bdc9 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ActExposureLevelCodeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ActExposureLevelCodeEnumFactory.java @@ -50,7 +50,9 @@ public class V3ActExposureLevelCodeEnumFactory implements EnumFactory { } public String toCode(V3ActMood code) { - if (code == V3ActMood._ACTMOODCOMPLETIONTRACK) + if (code == V3ActMood.NULL) + return null; + if (code == V3ActMood._ACTMOODCOMPLETIONTRACK) return "_ActMoodCompletionTrack"; if (code == V3ActMood._ACTMOODPOTENTIAL) return "_ActMoodPotential"; @@ -155,7 +157,7 @@ public class V3ActMoodEnumFactory implements EnumFactory { if (code == V3ActMood.OPT) return "OPT"; return "?"; - } + } public String toSystem(V3ActMood code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ActPriorityEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ActPriorityEnumFactory.java index 05be63405..336b10071 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ActPriorityEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ActPriorityEnumFactory.java @@ -72,7 +72,9 @@ public class V3ActPriorityEnumFactory implements EnumFactory { } public String toCode(V3ActPriority code) { - if (code == V3ActPriority.A) + if (code == V3ActPriority.NULL) + return null; + if (code == V3ActPriority.A) return "A"; if (code == V3ActPriority.CR) return "CR"; @@ -103,7 +105,7 @@ public class V3ActPriorityEnumFactory implements EnumFactory { if (code == V3ActPriority.UR) return "UR"; return "?"; - } + } public String toSystem(V3ActPriority code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ActReasonEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ActReasonEnumFactory.java index dc446c642..4af2fb9fb 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ActReasonEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ActReasonEnumFactory.java @@ -602,7 +602,9 @@ public class V3ActReasonEnumFactory implements EnumFactory { } public String toCode(V3ActReason code) { - if (code == V3ActReason._ACTACCOMMODATIONREASON) + if (code == V3ActReason.NULL) + return null; + if (code == V3ActReason._ACTACCOMMODATIONREASON) return "_ActAccommodationReason"; if (code == V3ActReason.ACCREQNA) return "ACCREQNA"; @@ -1163,7 +1165,7 @@ public class V3ActReasonEnumFactory implements EnumFactory { if (code == V3ActReason.TRAN) return "TRAN"; return "?"; - } + } public String toSystem(V3ActReason code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ActRelationshipCheckpointEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ActRelationshipCheckpointEnumFactory.java index e7fad9ec4..e3e4d6cad 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ActRelationshipCheckpointEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ActRelationshipCheckpointEnumFactory.java @@ -52,7 +52,9 @@ public class V3ActRelationshipCheckpointEnumFactory implements EnumFactory { } public String toCode(V3ActSite code) { - if (code == V3ActSite._HUMANACTSITE) + if (code == V3ActSite.NULL) + return null; + if (code == V3ActSite._HUMANACTSITE) return "_HumanActSite"; if (code == V3ActSite._HUMANSUBSTANCEADMINISTRATIONSITE) return "_HumanSubstanceAdministrationSite"; @@ -259,7 +261,7 @@ public class V3ActSiteEnumFactory implements EnumFactory { if (code == V3ActSite.RVL) return "RVL"; return "?"; - } + } public String toSystem(V3ActSite code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ActStatusEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ActStatusEnumFactory.java index 56e630eb3..13903cc2a 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ActStatusEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ActStatusEnumFactory.java @@ -62,7 +62,9 @@ public class V3ActStatusEnumFactory implements EnumFactory { } public String toCode(V3ActStatus code) { - if (code == V3ActStatus.NORMAL) + if (code == V3ActStatus.NULL) + return null; + if (code == V3ActStatus.NORMAL) return "normal"; if (code == V3ActStatus.ABORTED) return "aborted"; @@ -83,7 +85,7 @@ public class V3ActStatusEnumFactory implements EnumFactory { if (code == V3ActStatus.OBSOLETE) return "obsolete"; return "?"; - } + } public String toSystem(V3ActStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ActUSPrivacyLawEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ActUSPrivacyLawEnumFactory.java index 9afa8b09f..875ba15d7 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ActUSPrivacyLawEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ActUSPrivacyLawEnumFactory.java @@ -56,7 +56,9 @@ public class V3ActUSPrivacyLawEnumFactory implements EnumFactory { } public String toCode(V3AddressUse code) { - if (code == V3AddressUse._GENERALADDRESSUSE) + if (code == V3AddressUse.NULL) + return null; + if (code == V3AddressUse._GENERALADDRESSUSE) return "_GeneralAddressUse"; if (code == V3AddressUse.BAD) return "BAD"; @@ -119,7 +121,7 @@ public class V3AddressUseEnumFactory implements EnumFactory { if (code == V3AddressUse.PG) return "PG"; return "?"; - } + } public String toSystem(V3AddressUse code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3AdministrativeGenderEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3AdministrativeGenderEnumFactory.java index bf768212a..9ba12e6d6 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3AdministrativeGenderEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3AdministrativeGenderEnumFactory.java @@ -48,14 +48,16 @@ public class V3AdministrativeGenderEnumFactory implements EnumFactory } public String toCode(V3CalendarCycle code) { - if (code == V3CalendarCycle._CALENDARCYCLEONELETTER) + if (code == V3CalendarCycle.NULL) + return null; + if (code == V3CalendarCycle._CALENDARCYCLEONELETTER) return "_CalendarCycleOneLetter"; if (code == V3CalendarCycle.CW) return "CW"; @@ -115,7 +117,7 @@ public class V3CalendarCycleEnumFactory implements EnumFactory if (code == V3CalendarCycle.WM) return "WM"; return "?"; - } + } public String toSystem(V3CalendarCycle code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3CalendarEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3CalendarEnumFactory.java index ff5864279..09a221b1e 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3CalendarEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3CalendarEnumFactory.java @@ -44,10 +44,12 @@ public class V3CalendarEnumFactory implements EnumFactory { } public String toCode(V3Calendar code) { - if (code == V3Calendar.GREG) + if (code == V3Calendar.NULL) + return null; + if (code == V3Calendar.GREG) return "GREG"; return "?"; - } + } public String toSystem(V3Calendar code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3CalendarTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3CalendarTypeEnumFactory.java index 1dd7b2267..a4bae2276 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3CalendarTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3CalendarTypeEnumFactory.java @@ -44,10 +44,12 @@ public class V3CalendarTypeEnumFactory implements EnumFactory { } public String toCode(V3CalendarType code) { - if (code == V3CalendarType.GREG) + if (code == V3CalendarType.NULL) + return null; + if (code == V3CalendarType.GREG) return "GREG"; return "?"; - } + } public String toSystem(V3CalendarType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3CharsetEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3CharsetEnumFactory.java index 907823f94..cb016fc27 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3CharsetEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3CharsetEnumFactory.java @@ -62,7 +62,9 @@ public class V3CharsetEnumFactory implements EnumFactory { } public String toCode(V3Charset code) { - if (code == V3Charset.EBCDIC) + if (code == V3Charset.NULL) + return null; + if (code == V3Charset.EBCDIC) return "EBCDIC"; if (code == V3Charset.ISO10646UCS2) return "ISO-10646-UCS-2"; @@ -83,7 +85,7 @@ public class V3CharsetEnumFactory implements EnumFactory { if (code == V3Charset.UTF8) return "UTF-8"; return "?"; - } + } public String toSystem(V3Charset code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3CodingRationaleEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3CodingRationaleEnumFactory.java index 9476fa5e3..f9c132b7f 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3CodingRationaleEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3CodingRationaleEnumFactory.java @@ -58,7 +58,9 @@ public class V3CodingRationaleEnumFactory implements EnumFactory { } public String toCode(V3ContainerCap code) { - if (code == V3ContainerCap._MEDICATIONCAP) + if (code == V3ContainerCap.NULL) + return null; + if (code == V3ContainerCap._MEDICATIONCAP) return "_MedicationCap"; if (code == V3ContainerCap.CHILD) return "CHILD"; @@ -71,7 +73,7 @@ public class V3ContainerCapEnumFactory implements EnumFactory { if (code == V3ContainerCap.SCR) return "SCR"; return "?"; - } + } public String toSystem(V3ContainerCap code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ContainerSeparatorEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ContainerSeparatorEnumFactory.java index ff0b250df..644e15848 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ContainerSeparatorEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ContainerSeparatorEnumFactory.java @@ -46,12 +46,14 @@ public class V3ContainerSeparatorEnumFactory implements EnumFactory } public String toCode(V3DataOperation code) { - if (code == V3DataOperation.OPERATE) + if (code == V3DataOperation.NULL) + return null; + if (code == V3DataOperation.OPERATE) return "OPERATE"; if (code == V3DataOperation.CREATE) return "CREATE"; @@ -123,7 +125,7 @@ public class V3DataOperationEnumFactory implements EnumFactory if (code == V3DataOperation.SUSPEND) return "SUSPEND"; return "?"; - } + } public String toSystem(V3DataOperation code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3DentitionEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3DentitionEnumFactory.java index 4e9d872a7..d350e409c 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3DentitionEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3DentitionEnumFactory.java @@ -650,7 +650,9 @@ public class V3DentitionEnumFactory implements EnumFactory { } public String toCode(V3Dentition code) { - if (code == V3Dentition.ARTIFICIALDENTITION) + if (code == V3Dentition.NULL) + return null; + if (code == V3Dentition.ARTIFICIALDENTITION) return "ArtificialDentition"; if (code == V3Dentition.TID10A) return "TID10a"; @@ -1259,7 +1261,7 @@ public class V3DentitionEnumFactory implements EnumFactory { if (code == V3Dentition.TIDTS) return "TIDTs"; return "?"; - } + } public String toSystem(V3Dentition code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3DeviceAlertLevelEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3DeviceAlertLevelEnumFactory.java index c578066e3..b7c31d863 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3DeviceAlertLevelEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3DeviceAlertLevelEnumFactory.java @@ -50,7 +50,9 @@ public class V3DeviceAlertLevelEnumFactory implements EnumFactory { } public String toCode(V3EntityClass code) { - if (code == V3EntityClass.ENT) + if (code == V3EntityClass.NULL) + return null; + if (code == V3EntityClass.ENT) return "ENT"; if (code == V3EntityClass.HCE) return "HCE"; @@ -151,7 +153,7 @@ public class V3EntityClassEnumFactory implements EnumFactory { if (code == V3EntityClass.RGRP) return "RGRP"; return "?"; - } + } public String toSystem(V3EntityClass code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3EntityCodeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3EntityCodeEnumFactory.java index 12a22de72..2b5f3c5f5 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3EntityCodeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3EntityCodeEnumFactory.java @@ -332,7 +332,9 @@ public class V3EntityCodeEnumFactory implements EnumFactory { } public String toCode(V3EntityCode code) { - if (code == V3EntityCode._MATERIALENTITYCLASSTYPE) + if (code == V3EntityCode.NULL) + return null; + if (code == V3EntityCode._MATERIALENTITYCLASSTYPE) return "_MaterialEntityClassType"; if (code == V3EntityCode._CONTAINERENTITYTYPE) return "_ContainerEntityType"; @@ -623,7 +625,7 @@ public class V3EntityCodeEnumFactory implements EnumFactory { if (code == V3EntityCode.PRAC) return "PRAC"; return "?"; - } + } public String toSystem(V3EntityCode code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3EntityDeterminerEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3EntityDeterminerEnumFactory.java index ae9e9da38..60743607a 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3EntityDeterminerEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3EntityDeterminerEnumFactory.java @@ -52,7 +52,9 @@ public class V3EntityDeterminerEnumFactory implements EnumFactory } public String toCode(V3EntityNameUse code) { - if (code == V3EntityNameUse._NAMEREPRESENTATIONUSE) + if (code == V3EntityNameUse.NULL) + return null; + if (code == V3EntityNameUse._NAMEREPRESENTATIONUSE) return "_NameRepresentationUse"; if (code == V3EntityNameUse.ABC) return "ABC"; @@ -103,7 +105,7 @@ public class V3EntityNameUseEnumFactory implements EnumFactory if (code == V3EntityNameUse.SNDX) return "SNDX"; return "?"; - } + } public String toSystem(V3EntityNameUse code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3EntityNameUseR2EnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3EntityNameUseR2EnumFactory.java index 2523aa42f..0743066c0 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3EntityNameUseR2EnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3EntityNameUseR2EnumFactory.java @@ -78,7 +78,9 @@ public class V3EntityNameUseR2EnumFactory implements EnumFactory { } public String toCode(V3EntityRisk code) { - if (code == V3EntityRisk.AGG) + if (code == V3EntityRisk.NULL) + return null; + if (code == V3EntityRisk.AGG) return "AGG"; if (code == V3EntityRisk.BIO) return "BIO"; @@ -87,7 +89,7 @@ public class V3EntityRiskEnumFactory implements EnumFactory { if (code == V3EntityRisk.RAD) return "RAD"; return "?"; - } + } public String toSystem(V3EntityRisk code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3EntityStatusEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3EntityStatusEnumFactory.java index 59451b0b0..fb81ccc7b 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3EntityStatusEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3EntityStatusEnumFactory.java @@ -52,7 +52,9 @@ public class V3EntityStatusEnumFactory implements EnumFactory { } public String toCode(V3EntityStatus code) { - if (code == V3EntityStatus.NORMAL) + if (code == V3EntityStatus.NULL) + return null; + if (code == V3EntityStatus.NORMAL) return "normal"; if (code == V3EntityStatus.ACTIVE) return "active"; @@ -63,7 +65,7 @@ public class V3EntityStatusEnumFactory implements EnumFactory { if (code == V3EntityStatus.NULLIFIED) return "nullified"; return "?"; - } + } public String toSystem(V3EntityStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3EquipmentAlertLevelEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3EquipmentAlertLevelEnumFactory.java index 44fbfdeff..a2cbdfcb6 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3EquipmentAlertLevelEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3EquipmentAlertLevelEnumFactory.java @@ -50,7 +50,9 @@ public class V3EquipmentAlertLevelEnumFactory implements EnumFactory { } public String toCode(V3Ethnicity code) { - if (code == V3Ethnicity._21352) + if (code == V3Ethnicity.NULL) + return null; + if (code == V3Ethnicity._21352) return "2135-2"; if (code == V3Ethnicity._21378) return "2137-8"; @@ -215,7 +217,7 @@ public class V3EthnicityEnumFactory implements EnumFactory { if (code == V3Ethnicity._21865) return "2186-5"; return "?"; - } + } public String toSystem(V3Ethnicity code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ExposureModeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ExposureModeEnumFactory.java index 3f71cc5ef..f031988d9 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ExposureModeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ExposureModeEnumFactory.java @@ -52,7 +52,9 @@ public class V3ExposureModeEnumFactory implements EnumFactory { } public String toCode(V3ExposureMode code) { - if (code == V3ExposureMode._EXPOSUREMODE) + if (code == V3ExposureMode.NULL) + return null; + if (code == V3ExposureMode._EXPOSUREMODE) return "_ExposureMode"; if (code == V3ExposureMode.AIRBORNE) return "AIRBORNE"; @@ -63,7 +65,7 @@ public class V3ExposureModeEnumFactory implements EnumFactory { if (code == V3ExposureMode.WATERBORNE) return "WATERBORNE"; return "?"; - } + } public String toSystem(V3ExposureMode code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3GTSAbbreviationEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3GTSAbbreviationEnumFactory.java index e6d445d39..ad613be2b 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3GTSAbbreviationEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3GTSAbbreviationEnumFactory.java @@ -130,7 +130,9 @@ public class V3GTSAbbreviationEnumFactory implements EnumFactory { } public String toCode(V3GenderStatus code) { - if (code == V3GenderStatus.I) + if (code == V3GenderStatus.NULL) + return null; + if (code == V3GenderStatus.I) return "I"; if (code == V3GenderStatus.N) return "N"; return "?"; - } + } public String toSystem(V3GenderStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3HL7ContextConductionStyleEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3HL7ContextConductionStyleEnumFactory.java index e292070ce..a9106f213 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3HL7ContextConductionStyleEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3HL7ContextConductionStyleEnumFactory.java @@ -48,14 +48,16 @@ public class V3HL7ContextConductionStyleEnumFactory implements EnumFactory } public String toCode(V3HL7UpdateMode code) { - if (code == V3HL7UpdateMode.A) + if (code == V3HL7UpdateMode.NULL) + return null; + if (code == V3HL7UpdateMode.A) return "A"; if (code == V3HL7UpdateMode.AR) return "AR"; @@ -107,7 +109,7 @@ public class V3HL7UpdateModeEnumFactory implements EnumFactory if (code == V3HL7UpdateMode.V) return "V"; return "?"; - } + } public String toSystem(V3HL7UpdateMode code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3Hl7ApprovalStatusEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3Hl7ApprovalStatusEnumFactory.java index a1ba26154..55d4eeb41 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3Hl7ApprovalStatusEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3Hl7ApprovalStatusEnumFactory.java @@ -82,7 +82,9 @@ public class V3Hl7ApprovalStatusEnumFactory implements EnumFactory { } public String toCode(V3Hl7ITSType code) { - if (code == V3Hl7ITSType.UML) + if (code == V3Hl7ITSType.NULL) + return null; + if (code == V3Hl7ITSType.UML) return "UML"; if (code == V3Hl7ITSType.XML) return "XML"; return "?"; - } + } public String toSystem(V3Hl7ITSType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3Hl7ITSVersionCodeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3Hl7ITSVersionCodeEnumFactory.java index 992c2cea1..e3519835e 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3Hl7ITSVersionCodeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3Hl7ITSVersionCodeEnumFactory.java @@ -44,10 +44,12 @@ public class V3Hl7ITSVersionCodeEnumFactory implements EnumFactory { } public String toCode(V3Hl7Realm code) { - if (code == V3Hl7Realm.BINDINGREALMS) + if (code == V3Hl7Realm.NULL) + return null; + if (code == V3Hl7Realm.BINDINGREALMS) return "BindingRealms"; if (code == V3Hl7Realm.AFFILIATEREALMS) return "AffiliateRealms"; @@ -223,7 +225,7 @@ public class V3Hl7RealmEnumFactory implements EnumFactory { if (code == V3Hl7Realm.ZZ) return "ZZ"; return "?"; - } + } public String toSystem(V3Hl7Realm code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3Hl7V3ConformanceEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3Hl7V3ConformanceEnumFactory.java index 8f19b7b78..af344d75f 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3Hl7V3ConformanceEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3Hl7V3ConformanceEnumFactory.java @@ -54,7 +54,9 @@ public class V3Hl7V3ConformanceEnumFactory implements EnumFactory { } public String toCode(V3HtmlLinkType code) { - if (code == V3HtmlLinkType.ALTERNATE) + if (code == V3HtmlLinkType.NULL) + return null; + if (code == V3HtmlLinkType.ALTERNATE) return "alternate"; if (code == V3HtmlLinkType.APPENDIX) return "appendix"; @@ -103,7 +105,7 @@ public class V3HtmlLinkTypeEnumFactory implements EnumFactory { if (code == V3HtmlLinkType.SUBSECTION) return "subsection"; return "?"; - } + } public String toSystem(V3HtmlLinkType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3IdentifierReliabilityEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3IdentifierReliabilityEnumFactory.java index b238fb3a9..c39053e20 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3IdentifierReliabilityEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3IdentifierReliabilityEnumFactory.java @@ -48,14 +48,16 @@ public class V3IdentifierReliabilityEnumFactory implements EnumFactory } public String toCode(V3MaritalStatus code) { - if (code == V3MaritalStatus.A) + if (code == V3MaritalStatus.NULL) + return null; + if (code == V3MaritalStatus.A) return "A"; if (code == V3MaritalStatus.D) return "D"; @@ -83,7 +85,7 @@ public class V3MaritalStatusEnumFactory implements EnumFactory if (code == V3MaritalStatus.W) return "W"; return "?"; - } + } public String toSystem(V3MaritalStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3MessageWaitingPriorityEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3MessageWaitingPriorityEnumFactory.java index 6f41c3fe3..531cfa171 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3MessageWaitingPriorityEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3MessageWaitingPriorityEnumFactory.java @@ -48,14 +48,16 @@ public class V3MessageWaitingPriorityEnumFactory implements EnumFactory { } public String toCode(V3NullFlavor code) { - if (code == V3NullFlavor.NI) + if (code == V3NullFlavor.NULL) + return null; + if (code == V3NullFlavor.NI) return "NI"; if (code == V3NullFlavor.INV) return "INV"; @@ -111,7 +113,7 @@ public class V3NullFlavorEnumFactory implements EnumFactory { if (code == V3NullFlavor.NP) return "NP"; return "?"; - } + } public String toSystem(V3NullFlavor code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ObservationCategoryEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ObservationCategoryEnumFactory.java index b50626722..23b52cfc9 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ObservationCategoryEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ObservationCategoryEnumFactory.java @@ -58,7 +58,9 @@ public class V3ObservationCategoryEnumFactory implements EnumFactory { } public String toCode(V3PaymentTerms code) { - if (code == V3PaymentTerms.COD) + if (code == V3PaymentTerms.NULL) + return null; + if (code == V3PaymentTerms.COD) return "COD"; if (code == V3PaymentTerms.N30) return "N30"; @@ -59,7 +61,7 @@ public class V3PaymentTermsEnumFactory implements EnumFactory { if (code == V3PaymentTerms.N90) return "N90"; return "?"; - } + } public String toSystem(V3PaymentTerms code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3PersonDisabilityTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3PersonDisabilityTypeEnumFactory.java index df114e399..1d00cf6c3 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3PersonDisabilityTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3PersonDisabilityTypeEnumFactory.java @@ -62,7 +62,9 @@ public class V3PersonDisabilityTypeEnumFactory implements EnumFactory { } public String toCode(V3ProcessingID code) { - if (code == V3ProcessingID.D) + if (code == V3ProcessingID.NULL) + return null; + if (code == V3ProcessingID.D) return "D"; if (code == V3ProcessingID.P) return "P"; if (code == V3ProcessingID.T) return "T"; return "?"; - } + } public String toSystem(V3ProcessingID code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ProcessingModeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ProcessingModeEnumFactory.java index f86ba37a2..10b1deffe 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ProcessingModeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ProcessingModeEnumFactory.java @@ -50,7 +50,9 @@ public class V3ProcessingModeEnumFactory implements EnumFactory } public String toCode(V3QueryPriority code) { - if (code == V3QueryPriority.D) + if (code == V3QueryPriority.NULL) + return null; + if (code == V3QueryPriority.D) return "D"; if (code == V3QueryPriority.I) return "I"; return "?"; - } + } public String toSystem(V3QueryPriority code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3QueryRequestLimitEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3QueryRequestLimitEnumFactory.java index b40992076..18526246d 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3QueryRequestLimitEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3QueryRequestLimitEnumFactory.java @@ -46,12 +46,14 @@ public class V3QueryRequestLimitEnumFactory implements EnumFactory } public String toCode(V3QueryResponse code) { - if (code == V3QueryResponse.AE) + if (code == V3QueryResponse.NULL) + return null; + if (code == V3QueryResponse.AE) return "AE"; if (code == V3QueryResponse.NF) return "NF"; @@ -59,7 +61,7 @@ public class V3QueryResponseEnumFactory implements EnumFactory if (code == V3QueryResponse.QE) return "QE"; return "?"; - } + } public String toSystem(V3QueryResponse code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3QueryStatusCodeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3QueryStatusCodeEnumFactory.java index 15af302b2..33529e951 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3QueryStatusCodeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3QueryStatusCodeEnumFactory.java @@ -52,7 +52,9 @@ public class V3QueryStatusCodeEnumFactory implements EnumFactory { } public String toCode(V3Race code) { - if (code == V3Race._10025) + if (code == V3Race.NULL) + return null; + if (code == V3Race._10025) return "1002-5"; if (code == V3Race._10041) return "1004-1"; @@ -3727,7 +3729,7 @@ public class V3RaceEnumFactory implements EnumFactory { if (code == V3Race._21311) return "2131-1"; return "?"; - } + } public String toSystem(V3Race code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3RelationalOperatorEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3RelationalOperatorEnumFactory.java index 442183008..51be2850f 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3RelationalOperatorEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3RelationalOperatorEnumFactory.java @@ -58,7 +58,9 @@ public class V3RelationalOperatorEnumFactory implements EnumFactory } public String toCode(V3ResponseLevel code) { - if (code == V3ResponseLevel.C) + if (code == V3ResponseLevel.NULL) + return null; + if (code == V3ResponseLevel.C) return "C"; if (code == V3ResponseLevel.D) return "D"; @@ -71,7 +73,7 @@ public class V3ResponseLevelEnumFactory implements EnumFactory if (code == V3ResponseLevel.X) return "X"; return "?"; - } + } public String toSystem(V3ResponseLevel code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ResponseModalityEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ResponseModalityEnumFactory.java index 025f0bae7..e6940be6e 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ResponseModalityEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3ResponseModalityEnumFactory.java @@ -48,14 +48,16 @@ public class V3ResponseModalityEnumFactory implements EnumFactory { } public String toCode(V3ResponseMode code) { - if (code == V3ResponseMode.D) + if (code == V3ResponseMode.NULL) + return null; + if (code == V3ResponseMode.D) return "D"; if (code == V3ResponseMode.I) return "I"; if (code == V3ResponseMode.Q) return "Q"; return "?"; - } + } public String toSystem(V3ResponseMode code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3RoleClassEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3RoleClassEnumFactory.java index 122f2bd26..edc6ca234 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3RoleClassEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3RoleClassEnumFactory.java @@ -266,7 +266,9 @@ public class V3RoleClassEnumFactory implements EnumFactory { } public String toCode(V3RoleClass code) { - if (code == V3RoleClass.ROL) + if (code == V3RoleClass.NULL) + return null; + if (code == V3RoleClass.ROL) return "ROL"; if (code == V3RoleClass._ROLECLASSASSOCIATIVE) return "_RoleClassAssociative"; @@ -491,7 +493,7 @@ public class V3RoleClassEnumFactory implements EnumFactory { if (code == V3RoleClass.PHYS) return "PHYS"; return "?"; - } + } public String toSystem(V3RoleClass code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3RoleCodeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3RoleCodeEnumFactory.java index 717012afa..1cdd9b607 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3RoleCodeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3RoleCodeEnumFactory.java @@ -836,7 +836,9 @@ public class V3RoleCodeEnumFactory implements EnumFactory { } public String toCode(V3RoleCode code) { - if (code == V3RoleCode._AFFILIATIONROLETYPE) + if (code == V3RoleCode.NULL) + return null; + if (code == V3RoleCode._AFFILIATIONROLETYPE) return "_AffiliationRoleType"; if (code == V3RoleCode._AGENTROLETYPE) return "_AgentRoleType"; @@ -1631,7 +1633,7 @@ public class V3RoleCodeEnumFactory implements EnumFactory { if (code == V3RoleCode.SUBSCR) return "SUBSCR"; return "?"; - } + } public String toSystem(V3RoleCode code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3RoleLinkStatusEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3RoleLinkStatusEnumFactory.java index d6befccbc..1644afec1 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3RoleLinkStatusEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3RoleLinkStatusEnumFactory.java @@ -54,7 +54,9 @@ public class V3RoleLinkStatusEnumFactory implements EnumFactory { } public String toCode(V3RoleLinkType code) { - if (code == V3RoleLinkType.REL) + if (code == V3RoleLinkType.NULL) + return null; + if (code == V3RoleLinkType.REL) return "REL"; if (code == V3RoleLinkType.BACKUP) return "BACKUP"; @@ -75,7 +77,7 @@ public class V3RoleLinkTypeEnumFactory implements EnumFactory { if (code == V3RoleLinkType.REPL) return "REPL"; return "?"; - } + } public String toSystem(V3RoleLinkType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3RoleStatusEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3RoleStatusEnumFactory.java index a81a3ffac..08d498766 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3RoleStatusEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3RoleStatusEnumFactory.java @@ -56,7 +56,9 @@ public class V3RoleStatusEnumFactory implements EnumFactory { } public String toCode(V3RoleStatus code) { - if (code == V3RoleStatus.NORMAL) + if (code == V3RoleStatus.NULL) + return null; + if (code == V3RoleStatus.NORMAL) return "normal"; if (code == V3RoleStatus.ACTIVE) return "active"; @@ -71,7 +73,7 @@ public class V3RoleStatusEnumFactory implements EnumFactory { if (code == V3RoleStatus.NULLIFIED) return "nullified"; return "?"; - } + } public String toSystem(V3RoleStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3RouteOfAdministrationEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3RouteOfAdministrationEnumFactory.java index 0def20bc2..345dfa4ce 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3RouteOfAdministrationEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3RouteOfAdministrationEnumFactory.java @@ -814,7 +814,9 @@ public class V3RouteOfAdministrationEnumFactory implements EnumFactory { } public String toCode(V3Sequencing code) { - if (code == V3Sequencing.A) + if (code == V3Sequencing.NULL) + return null; + if (code == V3Sequencing.A) return "A"; if (code == V3Sequencing.D) return "D"; if (code == V3Sequencing.N) return "N"; return "?"; - } + } public String toSystem(V3Sequencing code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3SetOperatorEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3SetOperatorEnumFactory.java index cc0079f02..147ba043e 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3SetOperatorEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3SetOperatorEnumFactory.java @@ -54,7 +54,9 @@ public class V3SetOperatorEnumFactory implements EnumFactory { } public String toCode(V3SetOperator code) { - if (code == V3SetOperator._VALUESETOPERATOR) + if (code == V3SetOperator.NULL) + return null; + if (code == V3SetOperator._VALUESETOPERATOR) return "_ValueSetOperator"; if (code == V3SetOperator.E) return "E"; @@ -67,7 +69,7 @@ public class V3SetOperatorEnumFactory implements EnumFactory { if (code == V3SetOperator.P) return "P"; return "?"; - } + } public String toSystem(V3SetOperator code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3SpecimenTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3SpecimenTypeEnumFactory.java index 076abe75c..39b67a8ee 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3SpecimenTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3SpecimenTypeEnumFactory.java @@ -290,7 +290,9 @@ public class V3SpecimenTypeEnumFactory implements EnumFactory { } public String toCode(V3SpecimenType code) { - if (code == V3SpecimenType._SPECIMENENTITYTYPE) + if (code == V3SpecimenType.NULL) + return null; + if (code == V3SpecimenType._SPECIMENENTITYTYPE) return "_SpecimenEntityType"; if (code == V3SpecimenType.ABS) return "ABS"; @@ -539,7 +541,7 @@ public class V3SpecimenTypeEnumFactory implements EnumFactory { if (code == V3SpecimenType.WNDE) return "WNDE"; return "?"; - } + } public String toSystem(V3SpecimenType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3StyleTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3StyleTypeEnumFactory.java index 16c434b99..8ff6bff76 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3StyleTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3StyleTypeEnumFactory.java @@ -84,7 +84,9 @@ public class V3StyleTypeEnumFactory implements EnumFactory { } public String toCode(V3StyleType code) { - if (code == V3StyleType._FONTSTYLE) + if (code == V3StyleType.NULL) + return null; + if (code == V3StyleType._FONTSTYLE) return "_FontStyle"; if (code == V3StyleType.BOLD) return "bold"; @@ -127,7 +129,7 @@ public class V3StyleTypeEnumFactory implements EnumFactory { if (code == V3StyleType.TOPRULE) return "Toprule"; return "?"; - } + } public String toSystem(V3StyleType code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3SubstanceAdminSubstitutionEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3SubstanceAdminSubstitutionEnumFactory.java index 3a35fc6b0..a7c48cb87 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3SubstanceAdminSubstitutionEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3SubstanceAdminSubstitutionEnumFactory.java @@ -62,7 +62,9 @@ public class V3SubstanceAdminSubstitutionEnumFactory implements EnumFactory { } public String toCode(V3TableFrame code) { - if (code == V3TableFrame.ABOVE) + if (code == V3TableFrame.NULL) + return null; + if (code == V3TableFrame.ABOVE) return "above"; if (code == V3TableFrame.BELOW) return "below"; @@ -79,7 +81,7 @@ public class V3TableFrameEnumFactory implements EnumFactory { if (code == V3TableFrame.VSIDES) return "vsides"; return "?"; - } + } public String toSystem(V3TableFrame code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3TableRulesEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3TableRulesEnumFactory.java index 71bc7cf06..8310cce01 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3TableRulesEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3TableRulesEnumFactory.java @@ -52,7 +52,9 @@ public class V3TableRulesEnumFactory implements EnumFactory { } public String toCode(V3TableRules code) { - if (code == V3TableRules.ALL) + if (code == V3TableRules.NULL) + return null; + if (code == V3TableRules.ALL) return "all"; if (code == V3TableRules.COLS) return "cols"; @@ -63,7 +65,7 @@ public class V3TableRulesEnumFactory implements EnumFactory { if (code == V3TableRules.ROWS) return "rows"; return "?"; - } + } public String toSystem(V3TableRules code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3TargetAwarenessEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3TargetAwarenessEnumFactory.java index 9450f4711..43385a009 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3TargetAwarenessEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3TargetAwarenessEnumFactory.java @@ -54,7 +54,9 @@ public class V3TargetAwarenessEnumFactory implements EnumFactory { } public String toCode(V3TimingEvent code) { - if (code == V3TimingEvent.AC) + if (code == V3TimingEvent.NULL) + return null; + if (code == V3TimingEvent.AC) return "AC"; if (code == V3TimingEvent.ACD) return "ACD"; @@ -115,7 +117,7 @@ public class V3TimingEventEnumFactory implements EnumFactory { if (code == V3TimingEvent.WAKE) return "WAKE"; return "?"; - } + } public String toSystem(V3TimingEvent code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3TransmissionRelationshipTypeCodeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3TransmissionRelationshipTypeCodeEnumFactory.java index 5f43e046f..2d44dfb8b 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3TransmissionRelationshipTypeCodeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3TransmissionRelationshipTypeCodeEnumFactory.java @@ -44,10 +44,12 @@ public class V3TransmissionRelationshipTypeCodeEnumFactory implements EnumFactor } public String toCode(V3TransmissionRelationshipTypeCode code) { - if (code == V3TransmissionRelationshipTypeCode.SEQL) + if (code == V3TransmissionRelationshipTypeCode.NULL) + return null; + if (code == V3TransmissionRelationshipTypeCode.SEQL) return "SEQL"; return "?"; - } + } public String toSystem(V3TransmissionRelationshipTypeCode code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3TribalEntityUSEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3TribalEntityUSEnumFactory.java index 27fa2682a..86baed510 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3TribalEntityUSEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/V3TribalEntityUSEnumFactory.java @@ -1178,7 +1178,9 @@ public class V3TribalEntityUSEnumFactory implements EnumFactory { } 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(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/VariantStateEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/VariantStateEnumFactory.java index b168126b2..6cd9d8850 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/VariantStateEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/VariantStateEnumFactory.java @@ -48,14 +48,16 @@ public class VariantStateEnumFactory implements EnumFactory { } public String toCode(VariantState code) { - if (code == VariantState.POSITIVE) + if (code == VariantState.NULL) + return null; + if (code == VariantState.POSITIVE) return "positive"; if (code == VariantState.NEGATIVE) return "negative"; if (code == VariantState.ABSENT) return "absent"; return "?"; - } + } public String toSystem(VariantState code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/VerificationresultCanPushUpdatesEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/VerificationresultCanPushUpdatesEnumFactory.java index 11f1bcd18..57a22d9b1 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/VerificationresultCanPushUpdatesEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/VerificationresultCanPushUpdatesEnumFactory.java @@ -48,14 +48,16 @@ public class VerificationresultCanPushUpdatesEnumFactory implements EnumFactory< } public String toCode(VerificationresultCanPushUpdates code) { - if (code == VerificationresultCanPushUpdates.YES) + if (code == VerificationresultCanPushUpdates.NULL) + return null; + if (code == VerificationresultCanPushUpdates.YES) return "yes"; if (code == VerificationresultCanPushUpdates.NO) return "no"; if (code == VerificationresultCanPushUpdates.UNDETERMINED) return "undetermined"; return "?"; - } + } public String toSystem(VerificationresultCanPushUpdates code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/VerificationresultCommunicationMethodEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/VerificationresultCommunicationMethodEnumFactory.java index ee47cca84..b91396d84 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/VerificationresultCommunicationMethodEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/VerificationresultCommunicationMethodEnumFactory.java @@ -51,7 +51,9 @@ public class VerificationresultCommunicationMethodEnumFactory } public String toCode(VerificationresultCommunicationMethod code) { - if (code == VerificationresultCommunicationMethod.MANUAL) + if (code == VerificationresultCommunicationMethod.NULL) + return null; + if (code == VerificationresultCommunicationMethod.MANUAL) return "manual"; if (code == VerificationresultCommunicationMethod.PORTAL) return "portal"; @@ -60,7 +62,7 @@ public class VerificationresultCommunicationMethodEnumFactory if (code == VerificationresultCommunicationMethod.PUSH) return "push"; return "?"; - } + } public String toSystem(VerificationresultCommunicationMethod code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/VerificationresultFailureActionEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/VerificationresultFailureActionEnumFactory.java index debd4c6bc..dba77b9a9 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/VerificationresultFailureActionEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/VerificationresultFailureActionEnumFactory.java @@ -50,7 +50,9 @@ public class VerificationresultFailureActionEnumFactory implements EnumFactory } public String toCode(VisionBaseCodes code) { - if (code == VisionBaseCodes.UP) + if (code == VisionBaseCodes.NULL) + return null; + if (code == VisionBaseCodes.UP) return "up"; if (code == VisionBaseCodes.DOWN) return "down"; @@ -59,7 +61,7 @@ public class VisionBaseCodesEnumFactory implements EnumFactory if (code == VisionBaseCodes.OUT) return "out"; return "?"; - } + } public String toSystem(VisionBaseCodes code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/VisionEyeCodesEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/VisionEyeCodesEnumFactory.java index cafcf3459..d70e7da37 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/VisionEyeCodesEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/VisionEyeCodesEnumFactory.java @@ -46,12 +46,14 @@ public class VisionEyeCodesEnumFactory implements EnumFactory { } public String toCode(VisionEyeCodes code) { - if (code == VisionEyeCodes.RIGHT) + if (code == VisionEyeCodes.NULL) + return null; + if (code == VisionEyeCodes.RIGHT) return "right"; if (code == VisionEyeCodes.LEFT) return "left"; return "?"; - } + } public String toSystem(VisionEyeCodes code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/VisionProductEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/VisionProductEnumFactory.java index e53e78ffe..1f90205d0 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/VisionProductEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/VisionProductEnumFactory.java @@ -46,12 +46,14 @@ public class VisionProductEnumFactory implements EnumFactory { } public String toCode(VisionProduct code) { - if (code == VisionProduct.LENS) + if (code == VisionProduct.NULL) + return null; + if (code == VisionProduct.LENS) return "lens"; if (code == VisionProduct.CONTACT) return "contact"; return "?"; - } + } public String toSystem(VisionProduct code) { return code.getSystem(); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/W3cProvenanceActivityTypeEnumFactory.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/W3cProvenanceActivityTypeEnumFactory.java index 835b8fd6a..ea7730f54 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/W3cProvenanceActivityTypeEnumFactory.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/codesystems/W3cProvenanceActivityTypeEnumFactory.java @@ -66,7 +66,9 @@ public class W3cProvenanceActivityTypeEnumFactory implements EnumFactory