From ea0a158ae8e5b14dd42048151e6577662f08dc4f Mon Sep 17 00:00:00 2001 From: dotasek Date: Fri, 19 Jul 2024 11:39:46 -0400 Subject: [PATCH] Return null for all toCode enum params that are Enum.NULL (dstu3) --- .../org/hl7/fhir/dstu3/model/Account.java | 14 +- .../fhir/dstu3/model/ActivityDefinition.java | 28 +- .../org/hl7/fhir/dstu3/model/Address.java | 28 +- .../hl7/fhir/dstu3/model/AdverseEvent.java | 28 +- .../fhir/dstu3/model/AllergyIntolerance.java | 84 ++--- .../org/hl7/fhir/dstu3/model/Appointment.java | 42 +-- .../fhir/dstu3/model/AppointmentResponse.java | 14 +- .../org/hl7/fhir/dstu3/model/AuditEvent.java | 42 +-- .../java/org/hl7/fhir/dstu3/model/Bundle.java | 42 +-- .../fhir/dstu3/model/CapabilityStatement.java | 168 +++++----- .../org/hl7/fhir/dstu3/model/CarePlan.java | 42 +-- .../org/hl7/fhir/dstu3/model/CareTeam.java | 14 +- .../org/hl7/fhir/dstu3/model/ChargeItem.java | 14 +- .../java/org/hl7/fhir/dstu3/model/Claim.java | 28 +- .../hl7/fhir/dstu3/model/ClaimResponse.java | 14 +- .../fhir/dstu3/model/ClinicalImpression.java | 14 +- .../org/hl7/fhir/dstu3/model/CodeSystem.java | 56 ++-- .../hl7/fhir/dstu3/model/Communication.java | 14 +- .../dstu3/model/CommunicationRequest.java | 28 +- .../dstu3/model/CompartmentDefinition.java | 14 +- .../org/hl7/fhir/dstu3/model/Composition.java | 70 +++-- .../org/hl7/fhir/dstu3/model/ConceptMap.java | 14 +- .../org/hl7/fhir/dstu3/model/Condition.java | 28 +- .../org/hl7/fhir/dstu3/model/Consent.java | 42 +-- .../hl7/fhir/dstu3/model/ContactPoint.java | 28 +- .../org/hl7/fhir/dstu3/model/Contract.java | 14 +- .../org/hl7/fhir/dstu3/model/Contributor.java | 14 +- .../org/hl7/fhir/dstu3/model/Coverage.java | 14 +- .../org/hl7/fhir/dstu3/model/DataElement.java | 14 +- .../hl7/fhir/dstu3/model/DetectedIssue.java | 28 +- .../java/org/hl7/fhir/dstu3/model/Device.java | 28 +- .../hl7/fhir/dstu3/model/DeviceComponent.java | 14 +- .../hl7/fhir/dstu3/model/DeviceMetric.java | 70 +++-- .../hl7/fhir/dstu3/model/DeviceRequest.java | 28 +- .../fhir/dstu3/model/DeviceUseStatement.java | 14 +- .../fhir/dstu3/model/DiagnosticReport.java | 14 +- .../fhir/dstu3/model/DocumentReference.java | 28 +- .../fhir/dstu3/model/ElementDefinition.java | 84 ++--- .../fhir/dstu3/model/EligibilityRequest.java | 14 +- .../fhir/dstu3/model/EligibilityResponse.java | 14 +- .../org/hl7/fhir/dstu3/model/Encounter.java | 28 +- .../org/hl7/fhir/dstu3/model/Endpoint.java | 14 +- .../fhir/dstu3/model/EnrollmentRequest.java | 14 +- .../fhir/dstu3/model/EnrollmentResponse.java | 14 +- .../hl7/fhir/dstu3/model/Enumerations.java | 294 ++++++++++-------- .../hl7/fhir/dstu3/model/EpisodeOfCare.java | 14 +- .../fhir/dstu3/model/ExpansionProfile.java | 14 +- .../dstu3/model/ExplanationOfBenefit.java | 14 +- .../fhir/dstu3/model/FamilyMemberHistory.java | 14 +- .../java/org/hl7/fhir/dstu3/model/Flag.java | 14 +- .../java/org/hl7/fhir/dstu3/model/Goal.java | 14 +- .../hl7/fhir/dstu3/model/GraphDefinition.java | 28 +- .../java/org/hl7/fhir/dstu3/model/Group.java | 14 +- .../fhir/dstu3/model/GuidanceResponse.java | 14 +- .../fhir/dstu3/model/HealthcareService.java | 14 +- .../org/hl7/fhir/dstu3/model/HumanName.java | 6 +- .../org/hl7/fhir/dstu3/model/Identifier.java | 14 +- .../hl7/fhir/dstu3/model/ImagingStudy.java | 14 +- .../hl7/fhir/dstu3/model/Immunization.java | 14 +- .../fhir/dstu3/model/ImplementationGuide.java | 28 +- .../org/hl7/fhir/dstu3/model/Linkage.java | 14 +- .../hl7/fhir/dstu3/model/ListResource.java | 28 +- .../org/hl7/fhir/dstu3/model/Location.java | 28 +- .../hl7/fhir/dstu3/model/MeasureReport.java | 28 +- .../java/org/hl7/fhir/dstu3/model/Media.java | 14 +- .../org/hl7/fhir/dstu3/model/Medication.java | 14 +- .../dstu3/model/MedicationAdministration.java | 14 +- .../fhir/dstu3/model/MedicationDispense.java | 14 +- .../fhir/dstu3/model/MedicationRequest.java | 42 +-- .../fhir/dstu3/model/MedicationStatement.java | 28 +- .../fhir/dstu3/model/MessageDefinition.java | 14 +- .../hl7/fhir/dstu3/model/MessageHeader.java | 14 +- .../hl7/fhir/dstu3/model/NamingSystem.java | 28 +- .../org/hl7/fhir/dstu3/model/Narrative.java | 14 +- .../hl7/fhir/dstu3/model/NutritionOrder.java | 14 +- .../org/hl7/fhir/dstu3/model/Observation.java | 28 +- .../fhir/dstu3/model/OperationDefinition.java | 28 +- .../fhir/dstu3/model/OperationOutcome.java | 28 +- .../fhir/dstu3/model/ParameterDefinition.java | 14 +- .../org/hl7/fhir/dstu3/model/Patient.java | 14 +- .../hl7/fhir/dstu3/model/PaymentNotice.java | 14 +- .../dstu3/model/PaymentReconciliation.java | 14 +- .../java/org/hl7/fhir/dstu3/model/Person.java | 14 +- .../hl7/fhir/dstu3/model/PlanDefinition.java | 112 ++++--- .../fhir/dstu3/model/PractitionerRole.java | 14 +- .../org/hl7/fhir/dstu3/model/Procedure.java | 14 +- .../fhir/dstu3/model/ProcedureRequest.java | 42 +-- .../hl7/fhir/dstu3/model/ProcessRequest.java | 28 +- .../hl7/fhir/dstu3/model/ProcessResponse.java | 14 +- .../org/hl7/fhir/dstu3/model/Provenance.java | 14 +- .../org/hl7/fhir/dstu3/model/Quantity.java | 14 +- .../hl7/fhir/dstu3/model/Questionnaire.java | 14 +- .../dstu3/model/QuestionnaireResponse.java | 14 +- .../hl7/fhir/dstu3/model/ReferralRequest.java | 42 +-- .../hl7/fhir/dstu3/model/RelatedArtifact.java | 14 +- .../hl7/fhir/dstu3/model/RequestGroup.java | 140 +++++---- .../hl7/fhir/dstu3/model/ResearchStudy.java | 14 +- .../hl7/fhir/dstu3/model/ResearchSubject.java | 14 +- .../hl7/fhir/dstu3/model/RiskAssessment.java | 14 +- .../hl7/fhir/dstu3/model/SearchParameter.java | 42 +-- .../org/hl7/fhir/dstu3/model/Sequence.java | 42 +-- .../java/org/hl7/fhir/dstu3/model/Slot.java | 14 +- .../org/hl7/fhir/dstu3/model/Specimen.java | 14 +- .../fhir/dstu3/model/StructureDefinition.java | 42 +-- .../hl7/fhir/dstu3/model/StructureMap.java | 98 +++--- .../hl7/fhir/dstu3/model/Subscription.java | 28 +- .../org/hl7/fhir/dstu3/model/Substance.java | 14 +- .../hl7/fhir/dstu3/model/SupplyDelivery.java | 14 +- .../hl7/fhir/dstu3/model/SupplyRequest.java | 28 +- .../java/org/hl7/fhir/dstu3/model/Task.java | 42 +-- .../org/hl7/fhir/dstu3/model/TestReport.java | 56 ++-- .../org/hl7/fhir/dstu3/model/TestScript.java | 70 +++-- .../java/org/hl7/fhir/dstu3/model/Timing.java | 42 +-- .../fhir/dstu3/model/TriggerDefinition.java | 14 +- .../org/hl7/fhir/dstu3/model/ValueSet.java | 14 +- .../fhir/dstu3/model/VisionPrescription.java | 42 +-- .../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 +- .../codesystems/ActionlistEnumFactory.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 +- .../AdverseEventCategoryEnumFactory.java | 6 +- ...dverseEventCausalityAssessEnumFactory.java | 6 +- .../AdverseEventCausalityEnumFactory.java | 6 +- ...dverseEventCausalityMethodEnumFactory.java | 6 +- ...dverseEventCausalityResultEnumFactory.java | 6 +- .../AdverseEventOutcomeEnumFactory.java | 6 +- .../AdverseEventSeriousnessEnumFactory.java | 6 +- ...llergIntolSubstanceExpRiskEnumFactory.java | 6 +- .../AllergyClinicalStatusEnumFactory.java | 6 +- ...AllergyIntoleranceCategoryEnumFactory.java | 6 +- ...ergyIntoleranceCriticalityEnumFactory.java | 6 +- .../AllergyIntoleranceStatusEnumFactory.java | 6 +- .../AllergyIntoleranceTypeEnumFactory.java | 6 +- .../AllergyVerificationStatusEnumFactory.java | 6 +- .../AnimalGenderstatusEnumFactory.java | 6 +- .../codesystems/AnimalSpeciesEnumFactory.java | 6 +- .../AnzscoOccupationsEnumFactory.java | 6 +- .../AppointmentstatusEnumFactory.java | 6 +- .../AssertDirectionCodesEnumFactory.java | 6 +- .../AssertOperatorCodesEnumFactory.java | 6 +- .../AssertResponseCodeTypesEnumFactory.java | 6 +- .../AuditEntityTypeEnumFactory.java | 6 +- .../AuditEventActionEnumFactory.java | 6 +- .../AuditEventOutcomeEnumFactory.java | 6 +- .../AuditEventTypeEnumFactory.java | 6 +- .../AuditSourceTypeEnumFactory.java | 6 +- .../BasicResourceTypeEnumFactory.java | 6 +- .../BenefitCategoryEnumFactory.java | 6 +- .../BenefitNetworkEnumFactory.java | 6 +- .../BenefitSubcategoryEnumFactory.java | 6 +- .../codesystems/BenefitTermEnumFactory.java | 6 +- .../codesystems/BenefitTypeEnumFactory.java | 6 +- .../codesystems/BenefitUnitEnumFactory.java | 6 +- .../BindingStrengthEnumFactory.java | 6 +- .../codesystems/BundleTypeEnumFactory.java | 6 +- .../CapabilityStatementKindEnumFactory.java | 6 +- .../CarePlanActivityCategoryEnumFactory.java | 6 +- .../CarePlanActivityStatusEnumFactory.java | 6 +- .../CarePlanIntentEnumFactory.java | 6 +- .../CarePlanRelationshipEnumFactory.java | 6 +- .../CarePlanStatusEnumFactory.java | 6 +- .../CareTeamCategoryEnumFactory.java | 6 +- .../CareTeamStatusEnumFactory.java | 6 +- .../CatalogContentStatusEnumFactory.java | 6 +- .../CatalogContentTypeEnumFactory.java | 6 +- .../CatalogEntryStatusEnumFactory.java | 6 +- .../CatalogEntryTypeEnumFactory.java | 6 +- .../CatalogItemRelationTypeEnumFactory.java | 6 +- .../CatalogUpdateModeEnumFactory.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/ClaimStatusEnumFactory.java | 6 +- .../codesystems/ClaimSubtypeEnumFactory.java | 6 +- .../codesystems/ClaimTypeEnumFactory.java | 6 +- .../codesystems/ClaimUseEnumFactory.java | 6 +- .../ClaimresponseStatusEnumFactory.java | 6 +- .../ClassificationOrContextEnumFactory.java | 6 +- .../ClinicalImpressionStatusEnumFactory.java | 6 +- .../CodesystemContentModeEnumFactory.java | 6 +- ...CodesystemHierarchyMeaningEnumFactory.java | 6 +- .../codesystems/CommonTagsEnumFactory.java | 6 +- .../CommunicationCategoryEnumFactory.java | 6 +- ...CommunicationNotDoneReasonEnumFactory.java | 6 +- ...CommunicationRequestStatusEnumFactory.java | 6 +- .../CommunicationStatusEnumFactory.java | 6 +- .../CompartmentTypeEnumFactory.java | 6 +- .../CompositeMeasureScoringEnumFactory.java | 6 +- ...CompositionAttestationModeEnumFactory.java | 6 +- .../CompositionStatusEnumFactory.java | 6 +- .../ConceptMapEquivalenceEnumFactory.java | 6 +- .../ConceptPropertiesEnumFactory.java | 6 +- .../ConceptPropertyTypeEnumFactory.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 +- .../ConsentExceptTypeEnumFactory.java | 6 +- .../ConsentStateCodesEnumFactory.java | 6 +- .../codesystems/ConsentStatusEnumFactory.java | 6 +- .../ConstraintSeverityEnumFactory.java | 6 +- .../ContactPointSystemEnumFactory.java | 6 +- .../ContactPointUseEnumFactory.java | 6 +- .../ContactentityTypeEnumFactory.java | 6 +- .../codesystems/ContentTypeEnumFactory.java | 6 +- .../ContractActionEnumFactory.java | 6 +- .../ContractActorroleEnumFactory.java | 6 +- .../ContractContentDerivativeEnumFactory.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 +- .../CoverageExceptionEnumFactory.java | 6 +- .../codesystems/CoverageLevelEnumFactory.java | 6 +- .../CoverageSelfpayEnumFactory.java | 6 +- .../CoverageStatusEnumFactory.java | 6 +- .../CqifEvidenceQualityEnumFactory.java | 6 +- ...CqifRecommendationStrengthEnumFactory.java | 6 +- .../CqifTriggerTypeEnumFactory.java | 6 +- .../codesystems/DWebTypeEnumFactory.java | 6 +- .../DataAbsentReasonEnumFactory.java | 6 +- .../codesystems/DataTypesEnumFactory.java | 6 +- .../DataelementStringencyEnumFactory.java | 6 +- .../codesystems/DaysOfWeekEnumFactory.java | 6 +- .../DefinitionStatusEnumFactory.java | 6 +- .../DefinitionTopicEnumFactory.java | 6 +- .../DetectedissueSeverityEnumFactory.java | 6 +- .../codesystems/DeviceActionEnumFactory.java | 6 +- .../codesystems/DeviceSafetyEnumFactory.java | 6 +- .../DeviceStatementStatusEnumFactory.java | 6 +- .../codesystems/DeviceStatusEnumFactory.java | 6 +- .../codesystems/DiagnosisRoleEnumFactory.java | 6 +- .../DiagnosticReportStatusEnumFactory.java | 6 +- .../DicomAuditLifecycleEnumFactory.java | 6 +- .../DigitalMediaSubtypeEnumFactory.java | 6 +- .../DigitalMediaTypeEnumFactory.java | 6 +- .../DiscriminatorTypeEnumFactory.java | 6 +- .../codesystems/DocumentModeEnumFactory.java | 6 +- .../DocumentReferenceStatusEnumFactory.java | 6 +- .../DocumentRelationshipTypeEnumFactory.java | 6 +- .../EligibilityrequestStatusEnumFactory.java | 6 +- .../EligibilityresponseStatusEnumFactory.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 +- .../EnrollmentrequestStatusEnumFactory.java | 6 +- .../EnrollmentresponseStatusEnumFactory.java | 6 +- .../EntformulaAdditiveEnumFactory.java | 6 +- .../EpisodeOfCareStatusEnumFactory.java | 6 +- .../EpisodeofcareTypeEnumFactory.java | 6 +- .../EventCapabilityModeEnumFactory.java | 6 +- .../codesystems/EventStatusEnumFactory.java | 6 +- .../codesystems/EventTimingEnumFactory.java | 6 +- .../ExDiagnosisrelatedgroupEnumFactory.java | 6 +- .../ExDiagnosistypeEnumFactory.java | 6 +- .../codesystems/ExOnsettypeEnumFactory.java | 6 +- .../ExPayeeResourceTypeEnumFactory.java | 6 +- .../codesystems/ExPaymenttypeEnumFactory.java | 6 +- .../codesystems/ExProgramCodeEnumFactory.java | 6 +- .../ExRevenueCenterEnumFactory.java | 6 +- ...ExplanationofbenefitStatusEnumFactory.java | 6 +- .../ExtensionContextEnumFactory.java | 6 +- .../ExtraActivityTypeEnumFactory.java | 6 +- .../ExtraSecurityRoleTypeEnumFactory.java | 6 +- .../FilterOperatorEnumFactory.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 +- .../GoalAcceptanceStatusEnumFactory.java | 6 +- .../codesystems/GoalCategoryEnumFactory.java | 6 +- .../codesystems/GoalPriorityEnumFactory.java | 6 +- .../GoalRelationshipTypeEnumFactory.java | 6 +- .../codesystems/GoalStatusEnumFactory.java | 6 +- .../GoalStatusReasonEnumFactory.java | 6 +- .../GraphCompartmentRuleEnumFactory.java | 6 +- .../codesystems/GroupTypeEnumFactory.java | 6 +- .../GuidanceResponseStatusEnumFactory.java | 6 +- .../GuideDependencyTypeEnumFactory.java | 6 +- .../codesystems/GuidePageKindEnumFactory.java | 6 +- .../HistoryNotDoneReasonEnumFactory.java | 6 +- .../codesystems/HistoryStatusEnumFactory.java | 6 +- .../codesystems/Hl7WorkGroupEnumFactory.java | 6 +- .../HttpOperationsEnumFactory.java | 6 +- .../codesystems/HttpVerbEnumFactory.java | 6 +- .../Icd10ProceduresEnumFactory.java | 6 +- .../IdentifierTypeEnumFactory.java | 6 +- .../codesystems/IdentifierUseEnumFactory.java | 6 +- .../IdentityAssuranceLevelEnumFactory.java | 6 +- .../ImmunizationOriginEnumFactory.java | 6 +- ...ecommendationDateCriterionEnumFactory.java | 6 +- ...zationRecommendationStatusEnumFactory.java | 6 +- .../codesystems/ImplantStatusEnumFactory.java | 6 +- .../codesystems/InterventionEnumFactory.java | 6 +- .../Iso21089LifecycleEnumFactory.java | 6 +- .../codesystems/IssueSeverityEnumFactory.java | 6 +- .../codesystems/IssueTypeEnumFactory.java | 6 +- .../codesystems/ItemTypeEnumFactory.java | 6 +- .../LOINC480020AnswerlistEnumFactory.java | 6 +- .../LOINC480194AnswerlistEnumFactory.java | 6 +- .../LOINC530345AnswerlistEnumFactory.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/MapListModeEnumFactory.java | 6 +- .../codesystems/MapModelModeEnumFactory.java | 6 +- .../MapSourceListModeEnumFactory.java | 6 +- .../MapTargetListModeEnumFactory.java | 6 +- .../codesystems/MapTransformEnumFactory.java | 6 +- .../codesystems/MaritalStatusEnumFactory.java | 6 +- .../codesystems/MatchGradeEnumFactory.java | 6 +- .../MeasureDataUsageEnumFactory.java | 6 +- .../MeasurePopulationEnumFactory.java | 6 +- .../MeasureReportStatusEnumFactory.java | 6 +- .../MeasureReportTypeEnumFactory.java | 6 +- .../MeasureScoringEnumFactory.java | 6 +- .../codesystems/MeasureTypeEnumFactory.java | 6 +- .../MeasurementPrincipleEnumFactory.java | 6 +- .../MedicationAdminCategoryEnumFactory.java | 6 +- .../MedicationAdminStatusEnumFactory.java | 6 +- ...MedicationDispenseCategoryEnumFactory.java | 6 +- .../MedicationDispenseStatusEnumFactory.java | 6 +- .../MedicationPackageFormEnumFactory.java | 6 +- .../MedicationRequestCategoryEnumFactory.java | 6 +- .../MedicationRequestIntentEnumFactory.java | 6 +- .../MedicationRequestPriorityEnumFactory.java | 6 +- .../MedicationRequestStatusEnumFactory.java | 6 +- ...edicationStatementCategoryEnumFactory.java | 6 +- ...edicationStatementNottakenEnumFactory.java | 6 +- .../MedicationStatementStatusEnumFactory.java | 6 +- .../MedicationStatementTakenEnumFactory.java | 6 +- .../MedicationStatusEnumFactory.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 +- .../NutritionRequestStatusEnumFactory.java | 6 +- .../ObjectLifecycleEnumFactory.java | 6 +- .../codesystems/ObjectRoleEnumFactory.java | 6 +- .../codesystems/ObjectTypeEnumFactory.java | 6 +- .../ObservationCategoryEnumFactory.java | 6 +- .../ObservationParamcodeEnumFactory.java | 6 +- ...servationRelationshiptypesEnumFactory.java | 6 +- .../ObservationStatisticsEnumFactory.java | 6 +- .../ObservationStatusEnumFactory.java | 6 +- .../OccurrenceCodesEnumFactory.java | 6 +- .../OccurrenceSpanCodesEnumFactory.java | 6 +- .../codesystems/OperationKindEnumFactory.java | 6 +- .../OperationOutcomeEnumFactory.java | 6 +- .../OperationParameterUseEnumFactory.java | 6 +- .../OperationalStatusEnumFactory.java | 6 +- .../OralProsthodonticMaterialEnumFactory.java | 6 +- .../OrganizationTypeEnumFactory.java | 6 +- .../ParameterGroupEnumFactory.java | 6 +- .../ParticipantrequiredEnumFactory.java | 6 +- .../ParticipationstatusEnumFactory.java | 6 +- .../PatientMpiMatchEnumFactory.java | 6 +- .../codesystems/PayeetypeEnumFactory.java | 6 +- .../PaymentAdjustmentReasonEnumFactory.java | 6 +- .../codesystems/PaymentStatusEnumFactory.java | 6 +- .../codesystems/PaymentTypeEnumFactory.java | 6 +- .../PaymentnoticeStatusEnumFactory.java | 6 +- ...aymentreconciliationStatusEnumFactory.java | 6 +- .../PlanDefinitionTypeEnumFactory.java | 6 +- .../PolicyholderRelationshipEnumFactory.java | 6 +- .../PractitionerRoleEnumFactory.java | 6 +- .../PractitionerSpecialtyEnumFactory.java | 6 +- ...ocedureProgressStatusCodesEnumFactory.java | 6 +- .../ProcedureRelationshipTypeEnumFactory.java | 6 +- .../ProcedureRequestPriorityEnumFactory.java | 6 +- .../ProcedureRequestStatusEnumFactory.java | 6 +- .../ProcedureStatusEnumFactory.java | 6 +- .../ProcessOutcomeEnumFactory.java | 6 +- .../ProcessPriorityEnumFactory.java | 6 +- .../ProcessrequestStatusEnumFactory.java | 6 +- .../ProcessresponseStatusEnumFactory.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 +- .../QuestionnaireItemControlEnumFactory.java | 6 +- .../QuestionnaireStatusEnumFactory.java | 6 +- .../QuestionnaireUsageModeEnumFactory.java | 6 +- .../ReactionEventCertaintyEnumFactory.java | 6 +- .../ReactionEventSeverityEnumFactory.java | 6 +- ...ReasonMedicationGivenCodesEnumFactory.java | 6 +- ...sonMedicationNotGivenCodesEnumFactory.java | 6 +- .../ReferenceHandlingPolicyEnumFactory.java | 6 +- .../ReferenceVersionRulesEnumFactory.java | 6 +- .../ReferencerangeMeaningEnumFactory.java | 6 +- .../ReferralRequestStatusEnumFactory.java | 6 +- .../ReferralcategoryEnumFactory.java | 6 +- .../ReferralstatusEnumFactory.java | 6 +- .../RelatedArtifactTypeEnumFactory.java | 6 +- .../RelatedClaimRelationshipEnumFactory.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 +- .../codesystems/RequestStageEnumFactory.java | 6 +- .../codesystems/RequestStatusEnumFactory.java | 6 +- .../ResearchStudyStatusEnumFactory.java | 6 +- .../ResearchSubjectStatusEnumFactory.java | 6 +- .../ResourceAggregationModeEnumFactory.java | 6 +- .../ResourceSlicingRulesEnumFactory.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 +- .../RiskProbabilityEnumFactory.java | 6 +- .../model/codesystems/RulesetEnumFactory.java | 6 +- .../SearchComparatorEnumFactory.java | 6 +- .../SearchEntryModeEnumFactory.java | 6 +- .../SearchModifierCodeEnumFactory.java | 6 +- .../SearchParamTypeEnumFactory.java | 6 +- .../SearchXpathUsageEnumFactory.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 +- .../codesystems/SpecialValuesEnumFactory.java | 6 +- .../SpecificationTypeEnumFactory.java | 6 +- .../SpecimenStatusEnumFactory.java | 6 +- .../StructureDefinitionKindEnumFactory.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 +- ...ystemVersionProcessingModeEnumFactory.java | 6 +- .../TaskPerformerTypeEnumFactory.java | 6 +- .../codesystems/TaskPriorityEnumFactory.java | 6 +- .../codesystems/TaskStageEnumFactory.java | 6 +- .../codesystems/TaskStatusEnumFactory.java | 6 +- .../model/codesystems/TeethEnumFactory.java | 6 +- .../TestscriptOperationCodesEnumFactory.java | 6 +- ...iptProfileDestinationTypesEnumFactory.java | 6 +- ...stscriptProfileOriginTypesEnumFactory.java | 6 +- .../model/codesystems/ToothEnumFactory.java | 6 +- .../TransactionModeEnumFactory.java | 6 +- .../codesystems/TriggerTypeEnumFactory.java | 6 +- .../TypeDerivationRuleEnumFactory.java | 6 +- .../codesystems/UdiEntryTypeEnumFactory.java | 6 +- .../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 +- .../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 +- .../V3HL7UpdateModeEnumFactory.java | 6 +- .../codesystems/V3Hl7RealmEnumFactory.java | 6 +- .../V3Hl7V3ConformanceEnumFactory.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 +- ...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 +- ...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 +- ...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 +- .../V3VaccineManufacturerEnumFactory.java | 6 +- ...cinationProtocolDoseStatusEnumFactory.java | 6 +- ...onProtocolDoseStatusReasonEnumFactory.java | 6 +- .../codesystems/ValueCodesEnumFactory.java | 6 +- .../codesystems/VariantStateEnumFactory.java | 6 +- .../VersioningPolicyEnumFactory.java | 6 +- .../VisionBaseCodesEnumFactory.java | 6 +- .../VisionEyeCodesEnumFactory.java | 6 +- .../codesystems/VisionProductEnumFactory.java | 6 +- .../codesystems/VisionStatusEnumFactory.java | 6 +- .../W3cProvenanceActivityTypeEnumFactory.java | 6 +- .../XdsRelationshipTypeEnumFactory.java | 6 +- 683 files changed, 4260 insertions(+), 2634 deletions(-) diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Account.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Account.java index 8d3ca0054..9638b02f2 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Account.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Account.java @@ -86,7 +86,7 @@ public class Account extends DomainResource { case ACTIVE: return "active"; case INACTIVE: return "inactive"; case ENTEREDINERROR: return "entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -95,7 +95,7 @@ public class Account extends DomainResource { case ACTIVE: return "http://hl7.org/fhir/account-status"; case INACTIVE: return "http://hl7.org/fhir/account-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/account-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -104,7 +104,7 @@ public class Account extends DomainResource { case ACTIVE: return "This account is active and may be used."; case INACTIVE: return "This account is inactive and should not be used to track financial information."; case ENTEREDINERROR: return "This instance should not have been part of this patient's medical record."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -113,7 +113,7 @@ public class Account extends DomainResource { case ACTIVE: return "Active"; case INACTIVE: return "Inactive"; case ENTEREDINERROR: return "Entered in error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -149,14 +149,16 @@ public class Account extends DomainResource { throw new FHIRException("Unknown AccountStatus code '"+codeString+"'"); } 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"; if (code == AccountStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(AccountStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ActivityDefinition.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ActivityDefinition.java index 9bca8a3f9..6a061811b 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ActivityDefinition.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ActivityDefinition.java @@ -907,7 +907,7 @@ The primary difference between a medication statement and a medication administr case TESTSCRIPT: return "TestScript"; case VALUESET: return "ValueSet"; case VISIONPRESCRIPTION: return "VisionPrescription"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1032,7 +1032,7 @@ The primary difference between a medication statement and a medication administr case TESTSCRIPT: return "http://hl7.org/fhir/resource-types"; case VALUESET: return "http://hl7.org/fhir/resource-types"; case VISIONPRESCRIPTION: return "http://hl7.org/fhir/resource-types"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1157,7 +1157,7 @@ The primary difference between a medication statement and a medication administr case TESTSCRIPT: return "A structured set of tests against a FHIR server implementation to determine compliance against the FHIR specification."; case VALUESET: return "A value set specifies a set of codes drawn from one or more code systems."; case VISIONPRESCRIPTION: return "An authorization for the supply of glasses and/or contact lenses to a patient."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1282,7 +1282,7 @@ The primary difference between a medication statement and a medication administr case TESTSCRIPT: return "TestScript"; case VALUESET: return "ValueSet"; case VISIONPRESCRIPTION: return "VisionPrescription"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1782,7 +1782,9 @@ The primary difference between a medication statement and a medication administr throw new FHIRException("Unknown ActivityDefinitionKind code '"+codeString+"'"); } public String toCode(ActivityDefinitionKind code) { - if (code == ActivityDefinitionKind.ACCOUNT) + if (code == ActivityDefinitionKind.NULL) + return null; + if (code == ActivityDefinitionKind.ACCOUNT) return "Account"; if (code == ActivityDefinitionKind.ACTIVITYDEFINITION) return "ActivityDefinition"; @@ -2021,7 +2023,7 @@ The primary difference between a medication statement and a medication administr if (code == ActivityDefinitionKind.VISIONPRESCRIPTION) return "VisionPrescription"; return "?"; - } + } public String toSystem(ActivityDefinitionKind code) { return code.getSystem(); } @@ -2063,7 +2065,7 @@ The primary difference between a medication statement and a medication administr case PATIENT: return "patient"; case PRACTITIONER: return "practitioner"; case RELATEDPERSON: return "related-person"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -2072,7 +2074,7 @@ The primary difference between a medication statement and a medication administr case PATIENT: return "http://hl7.org/fhir/action-participant-type"; case PRACTITIONER: return "http://hl7.org/fhir/action-participant-type"; case RELATEDPERSON: return "http://hl7.org/fhir/action-participant-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -2081,7 +2083,7 @@ The primary difference between a medication statement and a medication administr case PATIENT: return "The participant is the patient under evaluation"; case PRACTITIONER: return "The participant is a practitioner involved in the patient's care"; case RELATEDPERSON: return "The participant is a person related to the patient"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -2090,7 +2092,7 @@ The primary difference between a medication statement and a medication administr case PATIENT: return "Patient"; case PRACTITIONER: return "Practitioner"; case RELATEDPERSON: return "Related Person"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -2126,14 +2128,16 @@ The primary difference between a medication statement and a medication administr throw new FHIRException("Unknown ActivityParticipantType code '"+codeString+"'"); } 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"; if (code == ActivityParticipantType.RELATEDPERSON) return "related-person"; return "?"; - } + } public String toSystem(ActivityParticipantType code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Address.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Address.java index 4ce4ddbb5..1a04eb41e 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Address.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Address.java @@ -92,7 +92,7 @@ public class Address extends Type implements ICompositeType { case WORK: return "work"; case TEMP: return "temp"; case OLD: return "old"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -102,7 +102,7 @@ public class Address extends Type implements ICompositeType { case WORK: return "http://hl7.org/fhir/address-use"; case TEMP: return "http://hl7.org/fhir/address-use"; case OLD: return "http://hl7.org/fhir/address-use"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -112,7 +112,7 @@ public class Address extends Type implements ICompositeType { case WORK: return "An office address. First choice for business related contacts during business hours."; case TEMP: return "A temporary address. The period can provide more detailed information."; case OLD: return "This address is no longer in use (or was never correct, but retained for records)."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -122,7 +122,7 @@ public class Address extends Type implements ICompositeType { case WORK: return "Work"; case TEMP: return "Temporary"; case OLD: return "Old / Incorrect"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -162,7 +162,9 @@ public class Address extends Type implements ICompositeType { throw new FHIRException("Unknown AddressUse code '"+codeString+"'"); } 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"; @@ -171,7 +173,7 @@ public class Address extends Type implements ICompositeType { if (code == AddressUse.OLD) return "old"; return "?"; - } + } public String toSystem(AddressUse code) { return code.getSystem(); } @@ -213,7 +215,7 @@ public class Address extends Type implements ICompositeType { case POSTAL: return "postal"; case PHYSICAL: return "physical"; case BOTH: return "both"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -222,7 +224,7 @@ public class Address extends Type implements ICompositeType { case POSTAL: return "http://hl7.org/fhir/address-type"; case PHYSICAL: return "http://hl7.org/fhir/address-type"; case BOTH: return "http://hl7.org/fhir/address-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -231,7 +233,7 @@ public class Address extends Type implements ICompositeType { case POSTAL: return "Mailing addresses - PO Boxes and care-of addresses."; case PHYSICAL: return "A physical address that can be visited."; case BOTH: return "An address that is both physical and postal."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -240,7 +242,7 @@ public class Address extends Type implements ICompositeType { case POSTAL: return "Postal"; case PHYSICAL: return "Physical"; case BOTH: return "Postal & Physical"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -276,14 +278,16 @@ public class Address extends Type implements ICompositeType { throw new FHIRException("Unknown AddressType code '"+codeString+"'"); } 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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/AdverseEvent.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/AdverseEvent.java index 970457bd7..34efee2b0 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/AdverseEvent.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/AdverseEvent.java @@ -80,7 +80,7 @@ public class AdverseEvent extends DomainResource { switch (this) { case AE: return "AE"; case PAE: return "PAE"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -88,7 +88,7 @@ public class AdverseEvent extends DomainResource { switch (this) { case AE: return "http://hl7.org/fhir/adverse-event-category"; case PAE: return "http://hl7.org/fhir/adverse-event-category"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -96,7 +96,7 @@ public class AdverseEvent extends DomainResource { switch (this) { case AE: return ""; case PAE: return ""; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -104,7 +104,7 @@ public class AdverseEvent extends DomainResource { switch (this) { case AE: return "Adverse Event"; case PAE: return "Potential Adverse Event"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -136,12 +136,14 @@ public class AdverseEvent extends DomainResource { throw new FHIRException("Unknown AdverseEventCategory code '"+codeString+"'"); } public String toCode(AdverseEventCategory code) { - if (code == AdverseEventCategory.AE) + if (code == AdverseEventCategory.NULL) + return null; + if (code == AdverseEventCategory.AE) return "AE"; if (code == AdverseEventCategory.PAE) return "PAE"; return "?"; - } + } public String toSystem(AdverseEventCategory code) { return code.getSystem(); } @@ -176,7 +178,7 @@ public class AdverseEvent extends DomainResource { switch (this) { case CAUSALITY1: return "causality1"; case CAUSALITY2: return "causality2"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -184,7 +186,7 @@ public class AdverseEvent extends DomainResource { switch (this) { case CAUSALITY1: return "http://hl7.org/fhir/adverse-event-causality"; case CAUSALITY2: return "http://hl7.org/fhir/adverse-event-causality"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -192,7 +194,7 @@ public class AdverseEvent extends DomainResource { switch (this) { case CAUSALITY1: return ""; case CAUSALITY2: return ""; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -200,7 +202,7 @@ public class AdverseEvent extends DomainResource { switch (this) { case CAUSALITY1: return "causality1 placeholder"; case CAUSALITY2: return "causality2 placeholder"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -232,12 +234,14 @@ public class AdverseEvent extends DomainResource { throw new FHIRException("Unknown AdverseEventCausality code '"+codeString+"'"); } public String toCode(AdverseEventCausality code) { - if (code == AdverseEventCausality.CAUSALITY1) + if (code == AdverseEventCausality.NULL) + return null; + if (code == AdverseEventCausality.CAUSALITY1) return "causality1"; if (code == AdverseEventCausality.CAUSALITY2) return "causality2"; return "?"; - } + } public String toSystem(AdverseEventCausality code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/AllergyIntolerance.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/AllergyIntolerance.java index 8fd955513..f57b28501 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/AllergyIntolerance.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/AllergyIntolerance.java @@ -88,7 +88,7 @@ public class AllergyIntolerance extends DomainResource { case ACTIVE: return "active"; case INACTIVE: return "inactive"; case RESOLVED: return "resolved"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -97,7 +97,7 @@ public class AllergyIntolerance extends DomainResource { case ACTIVE: return "http://hl7.org/fhir/allergy-clinical-status"; case INACTIVE: return "http://hl7.org/fhir/allergy-clinical-status"; case RESOLVED: return "http://hl7.org/fhir/allergy-clinical-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -106,7 +106,7 @@ public class AllergyIntolerance extends DomainResource { case ACTIVE: return "An active record of a risk of a reaction to the identified substance."; case INACTIVE: return "An inactivated record of a risk of a reaction to the identified substance."; case RESOLVED: return "A reaction to the identified substance has been clinically reassessed by testing or re-exposure and considered to be resolved."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -115,7 +115,7 @@ public class AllergyIntolerance extends DomainResource { case ACTIVE: return "Active"; case INACTIVE: return "Inactive"; case RESOLVED: return "Resolved"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -151,14 +151,16 @@ public class AllergyIntolerance extends DomainResource { throw new FHIRException("Unknown AllergyIntoleranceClinicalStatus code '"+codeString+"'"); } public String toCode(AllergyIntoleranceClinicalStatus code) { - if (code == AllergyIntoleranceClinicalStatus.ACTIVE) + if (code == AllergyIntoleranceClinicalStatus.NULL) + return null; + if (code == AllergyIntoleranceClinicalStatus.ACTIVE) return "active"; if (code == AllergyIntoleranceClinicalStatus.INACTIVE) return "inactive"; if (code == AllergyIntoleranceClinicalStatus.RESOLVED) return "resolved"; return "?"; - } + } public String toSystem(AllergyIntoleranceClinicalStatus code) { return code.getSystem(); } @@ -207,7 +209,7 @@ public class AllergyIntolerance extends DomainResource { case CONFIRMED: return "confirmed"; case REFUTED: return "refuted"; case ENTEREDINERROR: return "entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -217,7 +219,7 @@ public class AllergyIntolerance extends DomainResource { case CONFIRMED: return "http://hl7.org/fhir/allergy-verification-status"; case REFUTED: return "http://hl7.org/fhir/allergy-verification-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/allergy-verification-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -227,7 +229,7 @@ public class AllergyIntolerance extends DomainResource { case CONFIRMED: return "A high level of certainty about the propensity for a reaction to the identified substance, which may include clinical evidence by testing or rechallenge."; case REFUTED: return "A propensity for a reaction to the identified substance has been disproven with a high level of clinical certainty, which may include testing or rechallenge, and is refuted."; case ENTEREDINERROR: return "The statement was entered in error and is not valid."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -237,7 +239,7 @@ public class AllergyIntolerance extends DomainResource { case CONFIRMED: return "Confirmed"; case REFUTED: return "Refuted"; case ENTEREDINERROR: return "Entered In Error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -277,7 +279,9 @@ public class AllergyIntolerance extends DomainResource { throw new FHIRException("Unknown AllergyIntoleranceVerificationStatus code '"+codeString+"'"); } public String toCode(AllergyIntoleranceVerificationStatus code) { - if (code == AllergyIntoleranceVerificationStatus.UNCONFIRMED) + if (code == AllergyIntoleranceVerificationStatus.NULL) + return null; + if (code == AllergyIntoleranceVerificationStatus.UNCONFIRMED) return "unconfirmed"; if (code == AllergyIntoleranceVerificationStatus.CONFIRMED) return "confirmed"; @@ -286,7 +290,7 @@ public class AllergyIntolerance extends DomainResource { if (code == AllergyIntoleranceVerificationStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(AllergyIntoleranceVerificationStatus code) { return code.getSystem(); } @@ -321,7 +325,7 @@ public class AllergyIntolerance extends DomainResource { switch (this) { case ALLERGY: return "allergy"; case INTOLERANCE: return "intolerance"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -329,7 +333,7 @@ public class AllergyIntolerance extends DomainResource { switch (this) { case ALLERGY: return "http://hl7.org/fhir/allergy-intolerance-type"; case INTOLERANCE: return "http://hl7.org/fhir/allergy-intolerance-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -337,7 +341,7 @@ public class AllergyIntolerance extends DomainResource { switch (this) { case ALLERGY: return "A propensity for hypersensitivity reaction(s) to a substance. These reactions are most typically type I hypersensitivity, plus other \"allergy-like\" reactions, including pseudoallergy."; case INTOLERANCE: return "A propensity for adverse reactions to a substance that is not judged to be allergic or \"allergy-like\". These reactions are typically (but not necessarily) non-immune. They are to some degree idiosyncratic and/or individually specific (i.e. are not a reaction that is expected to occur with most or all patients given similar circumstances)."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -345,7 +349,7 @@ public class AllergyIntolerance extends DomainResource { switch (this) { case ALLERGY: return "Allergy"; case INTOLERANCE: return "Intolerance"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -377,12 +381,14 @@ public class AllergyIntolerance extends DomainResource { throw new FHIRException("Unknown AllergyIntoleranceType code '"+codeString+"'"); } 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(); } @@ -431,7 +437,7 @@ public class AllergyIntolerance extends DomainResource { case MEDICATION: return "medication"; case ENVIRONMENT: return "environment"; case BIOLOGIC: return "biologic"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -441,7 +447,7 @@ public class AllergyIntolerance extends DomainResource { case MEDICATION: return "http://hl7.org/fhir/allergy-intolerance-category"; case ENVIRONMENT: return "http://hl7.org/fhir/allergy-intolerance-category"; case BIOLOGIC: return "http://hl7.org/fhir/allergy-intolerance-category"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -451,7 +457,7 @@ public class AllergyIntolerance extends DomainResource { case MEDICATION: return "Substances administered to achieve a physiological effect."; case ENVIRONMENT: return "Any substances that are encountered in the environment, including any substance not already classified as food, medication, or biologic."; case BIOLOGIC: return "A preparation that is synthesized from living organisms or their products, especially a human or animal protein, such as a hormone or antitoxin, that is used as a diagnostic, preventive, or therapeutic agent. Examples of biologic medications include: vaccines; allergenic extracts, which are used for both diagnosis and treatment (for example, allergy shots); gene therapies; cellular therapies. There are other biologic products, such as tissues, that are not typically associated with allergies."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -461,7 +467,7 @@ public class AllergyIntolerance extends DomainResource { case MEDICATION: return "Medication"; case ENVIRONMENT: return "Environment"; case BIOLOGIC: return "Biologic"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -501,7 +507,9 @@ public class AllergyIntolerance extends DomainResource { throw new FHIRException("Unknown AllergyIntoleranceCategory code '"+codeString+"'"); } 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"; @@ -510,7 +518,7 @@ public class AllergyIntolerance extends DomainResource { if (code == AllergyIntoleranceCategory.BIOLOGIC) return "biologic"; return "?"; - } + } public String toSystem(AllergyIntoleranceCategory code) { return code.getSystem(); } @@ -552,7 +560,7 @@ public class AllergyIntolerance extends DomainResource { case LOW: return "low"; case HIGH: return "high"; case UNABLETOASSESS: return "unable-to-assess"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -561,7 +569,7 @@ public class AllergyIntolerance extends DomainResource { case LOW: return "http://hl7.org/fhir/allergy-intolerance-criticality"; case HIGH: return "http://hl7.org/fhir/allergy-intolerance-criticality"; case UNABLETOASSESS: return "http://hl7.org/fhir/allergy-intolerance-criticality"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -570,7 +578,7 @@ public class AllergyIntolerance extends DomainResource { case LOW: return "Worst case result of a future exposure is not assessed to be life-threatening or having high potential for organ system failure."; case HIGH: return "Worst case result of a future exposure is assessed to be life-threatening or having high potential for organ system failure."; case UNABLETOASSESS: return "Unable to assess the worst case result of a future exposure."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -579,7 +587,7 @@ public class AllergyIntolerance extends DomainResource { case LOW: return "Low Risk"; case HIGH: return "High Risk"; case UNABLETOASSESS: return "Unable to Assess Risk"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -615,14 +623,16 @@ public class AllergyIntolerance extends DomainResource { throw new FHIRException("Unknown AllergyIntoleranceCriticality code '"+codeString+"'"); } 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(); } @@ -664,7 +674,7 @@ public class AllergyIntolerance extends DomainResource { case MILD: return "mild"; case MODERATE: return "moderate"; case SEVERE: return "severe"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -673,7 +683,7 @@ public class AllergyIntolerance extends DomainResource { case MILD: return "http://hl7.org/fhir/reaction-event-severity"; case MODERATE: return "http://hl7.org/fhir/reaction-event-severity"; case SEVERE: return "http://hl7.org/fhir/reaction-event-severity"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -682,7 +692,7 @@ public class AllergyIntolerance extends DomainResource { case MILD: return "Causes mild physiological effects."; case MODERATE: return "Causes moderate physiological effects."; case SEVERE: return "Causes severe physiological effects."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -691,7 +701,7 @@ public class AllergyIntolerance extends DomainResource { case MILD: return "Mild"; case MODERATE: return "Moderate"; case SEVERE: return "Severe"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -727,14 +737,16 @@ public class AllergyIntolerance extends DomainResource { throw new FHIRException("Unknown AllergyIntoleranceSeverity code '"+codeString+"'"); } 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(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Appointment.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Appointment.java index 64439789d..797c96131 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Appointment.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Appointment.java @@ -122,7 +122,7 @@ public class Appointment extends DomainResource { case CANCELLED: return "cancelled"; case NOSHOW: return "noshow"; case ENTEREDINERROR: return "entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -136,7 +136,7 @@ public class Appointment extends DomainResource { case CANCELLED: return "http://hl7.org/fhir/appointmentstatus"; case NOSHOW: return "http://hl7.org/fhir/appointmentstatus"; case ENTEREDINERROR: return "http://hl7.org/fhir/appointmentstatus"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -150,7 +150,7 @@ public class Appointment extends DomainResource { case CANCELLED: return "The appointment has been cancelled."; case NOSHOW: return "Some or all of the participant(s) have not/did not appear for the appointment (usually the patient)."; case ENTEREDINERROR: return "This instance should not have been part of this patient's medical record."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -164,7 +164,7 @@ public class Appointment extends DomainResource { case CANCELLED: return "Cancelled"; case NOSHOW: return "No Show"; case ENTEREDINERROR: return "Entered in error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -220,7 +220,9 @@ public class Appointment extends DomainResource { throw new FHIRException("Unknown AppointmentStatus code '"+codeString+"'"); } 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"; @@ -237,7 +239,7 @@ public class Appointment extends DomainResource { if (code == AppointmentStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(AppointmentStatus code) { return code.getSystem(); } @@ -279,7 +281,7 @@ public class Appointment extends DomainResource { case REQUIRED: return "required"; case OPTIONAL: return "optional"; case INFORMATIONONLY: return "information-only"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -288,7 +290,7 @@ public class Appointment extends DomainResource { case REQUIRED: return "http://hl7.org/fhir/participantrequired"; case OPTIONAL: return "http://hl7.org/fhir/participantrequired"; case INFORMATIONONLY: return "http://hl7.org/fhir/participantrequired"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -297,7 +299,7 @@ public class Appointment extends DomainResource { case REQUIRED: return "The participant is required to attend the appointment."; case OPTIONAL: return "The participant may optionally attend the appointment."; case INFORMATIONONLY: return "The participant is excluded from the appointment, and may not be informed of the appointment taking place. (Appointment is about them, not for them - such as 2 doctors discussing results about a patient's test)."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -306,7 +308,7 @@ public class Appointment extends DomainResource { case REQUIRED: return "Required"; case OPTIONAL: return "Optional"; case INFORMATIONONLY: return "Information Only"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -342,14 +344,16 @@ public class Appointment extends DomainResource { throw new FHIRException("Unknown ParticipantRequired code '"+codeString+"'"); } 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(); } @@ -398,7 +402,7 @@ public class Appointment extends DomainResource { case DECLINED: return "declined"; case TENTATIVE: return "tentative"; case NEEDSACTION: return "needs-action"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -408,7 +412,7 @@ public class Appointment extends DomainResource { case DECLINED: return "http://hl7.org/fhir/participationstatus"; case TENTATIVE: return "http://hl7.org/fhir/participationstatus"; case NEEDSACTION: return "http://hl7.org/fhir/participationstatus"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -418,7 +422,7 @@ public class Appointment extends DomainResource { case DECLINED: return "The participant has declined the appointment and will not participate in the appointment."; case TENTATIVE: return "The participant has tentatively accepted the appointment. This could be automatically created by a system and requires further processing before it can be accepted. There is no commitment that attendance will occur."; case NEEDSACTION: return "The participant needs to indicate if they accept the appointment by changing this status to one of the other statuses."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -428,7 +432,7 @@ public class Appointment extends DomainResource { case DECLINED: return "Declined"; case TENTATIVE: return "Tentative"; case NEEDSACTION: return "Needs Action"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -468,7 +472,9 @@ public class Appointment extends DomainResource { throw new FHIRException("Unknown ParticipationStatus code '"+codeString+"'"); } 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"; @@ -477,7 +483,7 @@ public class Appointment extends DomainResource { if (code == ParticipationStatus.NEEDSACTION) return "needs-action"; return "?"; - } + } public String toSystem(ParticipationStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/AppointmentResponse.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/AppointmentResponse.java index 3fa90c760..200fce715 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/AppointmentResponse.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/AppointmentResponse.java @@ -92,7 +92,7 @@ public class AppointmentResponse extends DomainResource { case DECLINED: return "declined"; case TENTATIVE: return "tentative"; case NEEDSACTION: return "needs-action"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -102,7 +102,7 @@ public class AppointmentResponse extends DomainResource { case DECLINED: return "http://hl7.org/fhir/participationstatus"; case TENTATIVE: return "http://hl7.org/fhir/participationstatus"; case NEEDSACTION: return "http://hl7.org/fhir/participationstatus"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -112,7 +112,7 @@ public class AppointmentResponse extends DomainResource { case DECLINED: return "The participant has declined the appointment and will not participate in the appointment."; case TENTATIVE: return "The participant has tentatively accepted the appointment. This could be automatically created by a system and requires further processing before it can be accepted. There is no commitment that attendance will occur."; case NEEDSACTION: return "The participant needs to indicate if they accept the appointment by changing this status to one of the other statuses."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -122,7 +122,7 @@ public class AppointmentResponse extends DomainResource { case DECLINED: return "Declined"; case TENTATIVE: return "Tentative"; case NEEDSACTION: return "Needs Action"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -162,7 +162,9 @@ public class AppointmentResponse extends DomainResource { throw new FHIRException("Unknown ParticipantStatus code '"+codeString+"'"); } 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"; @@ -171,7 +173,7 @@ public class AppointmentResponse extends DomainResource { if (code == ParticipantStatus.NEEDSACTION) return "needs-action"; return "?"; - } + } public String toSystem(ParticipantStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/AuditEvent.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/AuditEvent.java index a61e7edb9..5cc08c539 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/AuditEvent.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/AuditEvent.java @@ -101,7 +101,7 @@ public class AuditEvent extends DomainResource { case U: return "U"; case D: return "D"; case E: return "E"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -112,7 +112,7 @@ public class AuditEvent extends DomainResource { case U: return "http://hl7.org/fhir/audit-event-action"; case D: return "http://hl7.org/fhir/audit-event-action"; case E: return "http://hl7.org/fhir/audit-event-action"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -123,7 +123,7 @@ public class AuditEvent extends DomainResource { case U: return "Update data, such as revise patient information."; case D: return "Delete items, such as a doctor master file record."; case E: return "Perform a system or application function such as log-on, program execution or use of an object's method, or perform a query/search operation."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -134,7 +134,7 @@ public class AuditEvent extends DomainResource { case U: return "Update"; case D: return "Delete"; case E: return "Execute"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -178,7 +178,9 @@ public class AuditEvent extends DomainResource { throw new FHIRException("Unknown AuditEventAction code '"+codeString+"'"); } 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"; @@ -189,7 +191,7 @@ public class AuditEvent extends DomainResource { if (code == AuditEventAction.E) return "E"; return "?"; - } + } public String toSystem(AuditEventAction code) { return code.getSystem(); } @@ -238,7 +240,7 @@ public class AuditEvent extends DomainResource { case _4: return "4"; case _8: return "8"; case _12: return "12"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -248,7 +250,7 @@ public class AuditEvent extends DomainResource { case _4: return "http://hl7.org/fhir/audit-event-outcome"; case _8: return "http://hl7.org/fhir/audit-event-outcome"; case _12: return "http://hl7.org/fhir/audit-event-outcome"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -258,7 +260,7 @@ public class AuditEvent extends DomainResource { case _4: return "The action was not successful due to some kind of catered for error (often equivalent to an HTTP 400 response)."; case _8: return "The action was not successful due to some kind of unexpected error (often equivalent to an HTTP 500 response)."; case _12: return "An error of such magnitude occurred that the system is no longer available for use (i.e. the system died)."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -268,7 +270,7 @@ public class AuditEvent extends DomainResource { case _4: return "Minor failure"; case _8: return "Serious failure"; case _12: return "Major failure"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -308,7 +310,9 @@ public class AuditEvent extends DomainResource { throw new FHIRException("Unknown AuditEventOutcome code '"+codeString+"'"); } 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"; @@ -317,7 +321,7 @@ public class AuditEvent extends DomainResource { if (code == AuditEventOutcome._12) return "12"; return "?"; - } + } public String toSystem(AuditEventOutcome code) { return code.getSystem(); } @@ -373,7 +377,7 @@ public class AuditEvent extends DomainResource { case _3: return "3"; case _4: return "4"; case _5: return "5"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -384,7 +388,7 @@ public class AuditEvent extends DomainResource { case _3: return "http://hl7.org/fhir/network-type"; case _4: return "http://hl7.org/fhir/network-type"; case _5: return "http://hl7.org/fhir/network-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -395,7 +399,7 @@ public class AuditEvent extends DomainResource { case _3: return "The assigned telephone number."; case _4: return "The assigned email address."; case _5: return "URI (User directory, HTTP-PUT, ftp, etc.)."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -406,7 +410,7 @@ public class AuditEvent extends DomainResource { case _3: return "Telephone Number"; case _4: return "Email address"; case _5: return "URI"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -450,7 +454,9 @@ public class AuditEvent extends DomainResource { throw new FHIRException("Unknown AuditEventAgentNetworkType code '"+codeString+"'"); } 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"; @@ -461,7 +467,7 @@ public class AuditEvent extends DomainResource { if (code == AuditEventAgentNetworkType._5) return "5"; return "?"; - } + } public String toSystem(AuditEventAgentNetworkType code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Bundle.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Bundle.java index 27dfad958..526f9d933 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Bundle.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Bundle.java @@ -130,7 +130,7 @@ public class Bundle extends Resource implements IBaseBundle { case HISTORY: return "history"; case SEARCHSET: return "searchset"; case COLLECTION: return "collection"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -145,7 +145,7 @@ public class Bundle extends Resource implements IBaseBundle { case HISTORY: return "http://hl7.org/fhir/bundle-type"; case SEARCHSET: return "http://hl7.org/fhir/bundle-type"; case COLLECTION: return "http://hl7.org/fhir/bundle-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -160,7 +160,7 @@ public class Bundle extends Resource implements IBaseBundle { case HISTORY: return "The bundle is a list of resources from a history interaction on a server."; case SEARCHSET: return "The bundle is a list of resources returned as a result of a search/query interaction, operation, or message."; case COLLECTION: return "The bundle is a set of resources collected into a single package for ease of distribution."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -175,7 +175,7 @@ public class Bundle extends Resource implements IBaseBundle { case HISTORY: return "History List"; case SEARCHSET: return "Search Results"; case COLLECTION: return "Collection"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -235,7 +235,9 @@ public class Bundle extends Resource implements IBaseBundle { throw new FHIRException("Unknown BundleType code '"+codeString+"'"); } 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"; @@ -254,7 +256,7 @@ public class Bundle extends Resource implements IBaseBundle { if (code == BundleType.COLLECTION) return "collection"; return "?"; - } + } public String toSystem(BundleType code) { return code.getSystem(); } @@ -296,7 +298,7 @@ public class Bundle extends Resource implements IBaseBundle { case MATCH: return "match"; case INCLUDE: return "include"; case OUTCOME: return "outcome"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -305,7 +307,7 @@ public class Bundle extends Resource implements IBaseBundle { case MATCH: return "http://hl7.org/fhir/search-entry-mode"; case INCLUDE: return "http://hl7.org/fhir/search-entry-mode"; case OUTCOME: return "http://hl7.org/fhir/search-entry-mode"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -314,7 +316,7 @@ public class Bundle extends Resource implements IBaseBundle { case MATCH: return "This resource matched the search specification."; case INCLUDE: return "This resource is returned because it is referred to from another resource in the search set."; case OUTCOME: return "An OperationOutcome that provides additional information about the processing of a search."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -323,7 +325,7 @@ public class Bundle extends Resource implements IBaseBundle { case MATCH: return "Match"; case INCLUDE: return "Include"; case OUTCOME: return "Outcome"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -359,14 +361,16 @@ public class Bundle extends Resource implements IBaseBundle { throw new FHIRException("Unknown SearchEntryMode code '"+codeString+"'"); } 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(); } @@ -415,7 +419,7 @@ public class Bundle extends Resource implements IBaseBundle { case POST: return "POST"; case PUT: return "PUT"; case DELETE: return "DELETE"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -425,7 +429,7 @@ public class Bundle extends Resource implements IBaseBundle { case POST: return "http://hl7.org/fhir/http-verb"; case PUT: return "http://hl7.org/fhir/http-verb"; case DELETE: return "http://hl7.org/fhir/http-verb"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -435,7 +439,7 @@ public class Bundle extends Resource implements IBaseBundle { case POST: return "HTTP POST"; case PUT: return "HTTP PUT"; case DELETE: return "HTTP DELETE"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -445,7 +449,7 @@ public class Bundle extends Resource implements IBaseBundle { case POST: return "POST"; case PUT: return "PUT"; case DELETE: return "DELETE"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -485,7 +489,9 @@ public class Bundle extends Resource implements IBaseBundle { throw new FHIRException("Unknown HTTPVerb code '"+codeString+"'"); } public String toCode(HTTPVerb code) { - if (code == HTTPVerb.GET) + if (code == HTTPVerb.NULL) + return null; + if (code == HTTPVerb.GET) return "GET"; if (code == HTTPVerb.POST) return "POST"; @@ -494,7 +500,7 @@ public class Bundle extends Resource implements IBaseBundle { if (code == HTTPVerb.DELETE) return "DELETE"; return "?"; - } + } public String toSystem(HTTPVerb code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CapabilityStatement.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CapabilityStatement.java index 0148bb9b2..ee9aa3eb1 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CapabilityStatement.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CapabilityStatement.java @@ -95,7 +95,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor case INSTANCE: return "instance"; case CAPABILITY: return "capability"; case REQUIREMENTS: return "requirements"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -104,7 +104,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor case INSTANCE: return "http://hl7.org/fhir/capability-statement-kind"; case CAPABILITY: return "http://hl7.org/fhir/capability-statement-kind"; case REQUIREMENTS: return "http://hl7.org/fhir/capability-statement-kind"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -113,7 +113,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor case INSTANCE: return "The CapabilityStatement instance represents the present capabilities of a specific system instance. This is the kind returned by OPTIONS for a FHIR server end-point."; case CAPABILITY: return "The CapabilityStatement instance represents the capabilities of a system or piece of software, independent of a particular installation."; case REQUIREMENTS: return "The CapabilityStatement instance represents a set of requirements for other systems to meet; e.g. as part of an implementation guide or 'request for proposal'."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -122,7 +122,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor case INSTANCE: return "Instance"; case CAPABILITY: return "Capability"; case REQUIREMENTS: return "Requirements"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -158,14 +158,16 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor throw new FHIRException("Unknown CapabilityStatementKind code '"+codeString+"'"); } 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(); } @@ -214,7 +216,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor case EXTENSIONS: return "extensions"; case ELEMENTS: return "elements"; case BOTH: return "both"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -224,7 +226,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor case EXTENSIONS: return "http://hl7.org/fhir/unknown-content-code"; case ELEMENTS: return "http://hl7.org/fhir/unknown-content-code"; case BOTH: return "http://hl7.org/fhir/unknown-content-code"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -234,7 +236,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor case EXTENSIONS: return "The application accepts unknown extensions, but not unknown elements."; case ELEMENTS: return "The application accepts unknown elements, but not unknown extensions."; case BOTH: return "The application accepts unknown elements and extensions."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -244,7 +246,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor case EXTENSIONS: return "Unknown Extensions"; case ELEMENTS: return "Unknown Elements"; case BOTH: return "Unknown Elements and Extensions"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -284,7 +286,9 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor throw new FHIRException("Unknown UnknownContentCode code '"+codeString+"'"); } public String toCode(UnknownContentCode code) { - if (code == UnknownContentCode.NO) + if (code == UnknownContentCode.NULL) + return null; + if (code == UnknownContentCode.NO) return "no"; if (code == UnknownContentCode.EXTENSIONS) return "extensions"; @@ -293,7 +297,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor if (code == UnknownContentCode.BOTH) return "both"; return "?"; - } + } public String toSystem(UnknownContentCode code) { return code.getSystem(); } @@ -328,7 +332,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor switch (this) { case CLIENT: return "client"; case SERVER: return "server"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -336,7 +340,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor switch (this) { case CLIENT: return "http://hl7.org/fhir/restful-capability-mode"; case SERVER: return "http://hl7.org/fhir/restful-capability-mode"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -344,7 +348,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor switch (this) { case CLIENT: return "The application acts as a client for this resource."; case SERVER: return "The application acts as a server for this resource."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -352,7 +356,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor switch (this) { case CLIENT: return "Client"; case SERVER: return "Server"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -384,12 +388,14 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor throw new FHIRException("Unknown RestfulCapabilityMode code '"+codeString+"'"); } 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(); } @@ -473,7 +479,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor case HISTORYTYPE: return "history-type"; case CREATE: return "create"; case SEARCHTYPE: return "search-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -488,7 +494,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor case HISTORYTYPE: return "http://hl7.org/fhir/restful-interaction"; case CREATE: return "http://hl7.org/fhir/restful-interaction"; case SEARCHTYPE: return "http://hl7.org/fhir/restful-interaction"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -503,7 +509,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor case HISTORYTYPE: return ""; case CREATE: return ""; case SEARCHTYPE: return ""; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -518,7 +524,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor case HISTORYTYPE: return "history-type"; case CREATE: return "create"; case SEARCHTYPE: return "search-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -578,7 +584,9 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor throw new FHIRException("Unknown TypeRestfulInteraction code '"+codeString+"'"); } 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"; @@ -597,7 +605,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor if (code == TypeRestfulInteraction.SEARCHTYPE) return "search-type"; return "?"; - } + } public String toSystem(TypeRestfulInteraction code) { return code.getSystem(); } @@ -639,7 +647,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor case NOVERSION: return "no-version"; case VERSIONED: return "versioned"; case VERSIONEDUPDATE: return "versioned-update"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -648,7 +656,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor case NOVERSION: return "http://hl7.org/fhir/versioning-policy"; case VERSIONED: return "http://hl7.org/fhir/versioning-policy"; case VERSIONEDUPDATE: return "http://hl7.org/fhir/versioning-policy"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -657,7 +665,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor case NOVERSION: return "VersionId meta-property is not supported (server) or used (client)."; case VERSIONED: return "VersionId meta-property is supported (server) or used (client)."; case VERSIONEDUPDATE: return "VersionId must be correct for updates (server) or will be specified (If-match header) for updates (client)."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -666,7 +674,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor case NOVERSION: return "No VersionId Support"; case VERSIONED: return "Versioned"; case VERSIONEDUPDATE: return "VersionId tracked fully"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -702,14 +710,16 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor throw new FHIRException("Unknown ResourceVersionPolicy code '"+codeString+"'"); } 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(); } @@ -758,7 +768,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor case MODIFIEDSINCE: return "modified-since"; case NOTMATCH: return "not-match"; case FULLSUPPORT: return "full-support"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -768,7 +778,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor case MODIFIEDSINCE: return "http://hl7.org/fhir/conditional-read-status"; case NOTMATCH: return "http://hl7.org/fhir/conditional-read-status"; case FULLSUPPORT: return "http://hl7.org/fhir/conditional-read-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -778,7 +788,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor case MODIFIEDSINCE: return "Conditional reads are supported, but only with the If-Modified-Since HTTP Header."; case NOTMATCH: return "Conditional reads are supported, but only with the If-None-Match HTTP Header."; case FULLSUPPORT: return "Conditional reads are supported, with both If-Modified-Since and If-None-Match HTTP Headers."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -788,7 +798,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor case MODIFIEDSINCE: return "If-Modified-Since"; case NOTMATCH: return "If-None-Match"; case FULLSUPPORT: return "Full Support"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -828,7 +838,9 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor throw new FHIRException("Unknown ConditionalReadStatus code '"+codeString+"'"); } 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"; @@ -837,7 +849,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor if (code == ConditionalReadStatus.FULLSUPPORT) return "full-support"; return "?"; - } + } public String toSystem(ConditionalReadStatus code) { return code.getSystem(); } @@ -879,7 +891,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor case NOTSUPPORTED: return "not-supported"; case SINGLE: return "single"; case MULTIPLE: return "multiple"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -888,7 +900,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor case NOTSUPPORTED: return "http://hl7.org/fhir/conditional-delete-status"; case SINGLE: return "http://hl7.org/fhir/conditional-delete-status"; case MULTIPLE: return "http://hl7.org/fhir/conditional-delete-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -897,7 +909,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor case NOTSUPPORTED: return "No support for conditional deletes."; case SINGLE: return "Conditional deletes are supported, but only single resources at a time."; case MULTIPLE: return "Conditional deletes are supported, and multiple resources can be deleted in a single interaction."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -906,7 +918,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor case NOTSUPPORTED: return "Not Supported"; case SINGLE: return "Single Deletes Supported"; case MULTIPLE: return "Multiple Deletes Supported"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -942,14 +954,16 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor throw new FHIRException("Unknown ConditionalDeleteStatus code '"+codeString+"'"); } 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(); } @@ -1005,7 +1019,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor case RESOLVES: return "resolves"; case ENFORCED: return "enforced"; case LOCAL: return "local"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1016,7 +1030,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor case RESOLVES: return "http://hl7.org/fhir/reference-handling-policy"; case ENFORCED: return "http://hl7.org/fhir/reference-handling-policy"; case LOCAL: return "http://hl7.org/fhir/reference-handling-policy"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1027,7 +1041,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor case RESOLVES: return "The server will attempt to resolve logical references to literal references (if resolution fails, the server may still accept resources; see logical)"; case ENFORCED: return "The server enforces that references have integrity - e.g. it ensures that references can always be resolved. This is typically the case for clinical record systems, but often not the case for middleware/proxy systems"; case LOCAL: return "The server does not support references that point to other servers"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1038,7 +1052,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor case RESOLVES: return "Resolves References"; case ENFORCED: return "Reference Integrity Enforced"; case LOCAL: return "Local References Only"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1082,7 +1096,9 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor throw new FHIRException("Unknown ReferenceHandlingPolicy code '"+codeString+"'"); } 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"; @@ -1093,7 +1109,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor if (code == ReferenceHandlingPolicy.LOCAL) return "local"; return "?"; - } + } public String toSystem(ReferenceHandlingPolicy code) { return code.getSystem(); } @@ -1142,7 +1158,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor case BATCH: return "batch"; case SEARCHSYSTEM: return "search-system"; case HISTORYSYSTEM: return "history-system"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1152,7 +1168,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor case BATCH: return "http://hl7.org/fhir/restful-interaction"; case SEARCHSYSTEM: return "http://hl7.org/fhir/restful-interaction"; case HISTORYSYSTEM: return "http://hl7.org/fhir/restful-interaction"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1162,7 +1178,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor case BATCH: return ""; case SEARCHSYSTEM: return ""; case HISTORYSYSTEM: return ""; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1172,7 +1188,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor case BATCH: return "batch"; case SEARCHSYSTEM: return "search-system"; case HISTORYSYSTEM: return "history-system"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1212,7 +1228,9 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor throw new FHIRException("Unknown SystemRestfulInteraction code '"+codeString+"'"); } 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"; @@ -1221,7 +1239,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor if (code == SystemRestfulInteraction.HISTORYSYSTEM) return "history-system"; return "?"; - } + } public String toSystem(SystemRestfulInteraction code) { return code.getSystem(); } @@ -1256,7 +1274,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor switch (this) { case SENDER: return "sender"; case RECEIVER: return "receiver"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1264,7 +1282,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor switch (this) { case SENDER: return "http://hl7.org/fhir/event-capability-mode"; case RECEIVER: return "http://hl7.org/fhir/event-capability-mode"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1272,7 +1290,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor switch (this) { case SENDER: return "The application sends requests and receives responses."; case RECEIVER: return "The application receives requests and sends responses."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1280,7 +1298,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor switch (this) { case SENDER: return "Sender"; case RECEIVER: return "Receiver"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1312,12 +1330,14 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor throw new FHIRException("Unknown EventCapabilityMode code '"+codeString+"'"); } 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(); } @@ -1359,7 +1379,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor case CONSEQUENCE: return "Consequence"; case CURRENCY: return "Currency"; case NOTIFICATION: return "Notification"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1368,7 +1388,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor case CONSEQUENCE: return "http://hl7.org/fhir/message-significance-category"; case CURRENCY: return "http://hl7.org/fhir/message-significance-category"; case NOTIFICATION: return "http://hl7.org/fhir/message-significance-category"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1377,7 +1397,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor case CONSEQUENCE: return "The message represents/requests a change that should not be processed more than once; e.g., making a booking for an appointment."; case CURRENCY: return "The message represents a response to query for current information. Retrospective processing is wrong and/or wasteful."; case NOTIFICATION: return "The content is not necessarily intended to be current, and it can be reprocessed, though there may be version issues created by processing old notifications."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1386,7 +1406,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor case CONSEQUENCE: return "Consequence"; case CURRENCY: return "Currency"; case NOTIFICATION: return "Notification"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1422,14 +1442,16 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor throw new FHIRException("Unknown MessageSignificanceCategory code '"+codeString+"'"); } 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(); } @@ -1464,7 +1486,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor switch (this) { case PRODUCER: return "producer"; case CONSUMER: return "consumer"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1472,7 +1494,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor switch (this) { case PRODUCER: return "http://hl7.org/fhir/document-mode"; case CONSUMER: return "http://hl7.org/fhir/document-mode"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1480,7 +1502,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor switch (this) { case PRODUCER: return "The application produces documents of the specified type."; case CONSUMER: return "The application consumes documents of the specified type."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1488,7 +1510,7 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor switch (this) { case PRODUCER: return "Producer"; case CONSUMER: return "Consumer"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1520,12 +1542,14 @@ public class CapabilityStatement extends MetadataResource implements IBaseConfor throw new FHIRException("Unknown DocumentMode code '"+codeString+"'"); } 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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CarePlan.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CarePlan.java index f3364354d..e78d418e5 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CarePlan.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CarePlan.java @@ -115,7 +115,7 @@ public class CarePlan extends DomainResource { case ENTEREDINERROR: return "entered-in-error"; case CANCELLED: return "cancelled"; case UNKNOWN: return "unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -128,7 +128,7 @@ public class CarePlan extends DomainResource { case ENTEREDINERROR: return "http://hl7.org/fhir/care-plan-status"; case CANCELLED: return "http://hl7.org/fhir/care-plan-status"; case UNKNOWN: return "http://hl7.org/fhir/care-plan-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -141,7 +141,7 @@ public class CarePlan extends DomainResource { case ENTEREDINERROR: return "The plan was entered in error and voided."; case CANCELLED: return "The plan has been terminated prior to reaching completion (though it may have been replaced by a new plan)."; case UNKNOWN: return "The authoring system doesn't know the current state of the care plan."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -154,7 +154,7 @@ public class CarePlan extends DomainResource { case ENTEREDINERROR: return "Entered In Error"; case CANCELLED: return "Cancelled"; case UNKNOWN: return "Unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -206,7 +206,9 @@ public class CarePlan extends DomainResource { throw new FHIRException("Unknown CarePlanStatus code '"+codeString+"'"); } 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"; @@ -221,7 +223,7 @@ public class CarePlan extends DomainResource { if (code == CarePlanStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(CarePlanStatus code) { return code.getSystem(); } @@ -272,7 +274,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case PLAN: return "plan"; case ORDER: return "order"; case OPTION: return "option"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -282,7 +284,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case PLAN: return "http://hl7.org/fhir/care-plan-intent"; case ORDER: return "http://hl7.org/fhir/care-plan-intent"; case OPTION: return "http://hl7.org/fhir/care-plan-intent"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -292,7 +294,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case PLAN: return "The care plan represents an intention to ensure something occurs without providing an authorization for others to act"; case ORDER: return "The care plan represents a request/demand and authorization for action"; case OPTION: return "The care plan represents a component or option for a RequestGroup that establishes timing, conditionality and/or other constraints among a set of requests.\n\nRefer to [[[RequestGroup]]] for additional information on how this status is used"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -302,7 +304,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case PLAN: return "Plan"; case ORDER: return "Order"; case OPTION: return "Option"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -342,7 +344,9 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use throw new FHIRException("Unknown CarePlanIntent code '"+codeString+"'"); } 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"; @@ -351,7 +355,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use if (code == CarePlanIntent.OPTION) return "option"; return "?"; - } + } public String toSystem(CarePlanIntent code) { return code.getSystem(); } @@ -421,7 +425,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case COMPLETED: return "completed"; case CANCELLED: return "cancelled"; case UNKNOWN: return "unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -434,7 +438,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case COMPLETED: return "http://hl7.org/fhir/care-plan-activity-status"; case CANCELLED: return "http://hl7.org/fhir/care-plan-activity-status"; case UNKNOWN: return "http://hl7.org/fhir/care-plan-activity-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -447,7 +451,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case COMPLETED: return "The activities have been completed (more or less) as planned."; case CANCELLED: return "The activities have been ended prior to completion (perhaps even before they were started)."; case UNKNOWN: return "The authoring system doesn't know the current state of the activity."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -460,7 +464,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case COMPLETED: return "Completed"; case CANCELLED: return "Cancelled"; case UNKNOWN: return "Unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -512,7 +516,9 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use throw new FHIRException("Unknown CarePlanActivityStatus code '"+codeString+"'"); } 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"; @@ -527,7 +533,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use if (code == CarePlanActivityStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(CarePlanActivityStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CareTeam.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CareTeam.java index d9c6b01c6..dbdbeceea 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CareTeam.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CareTeam.java @@ -100,7 +100,7 @@ public class CareTeam extends DomainResource { case SUSPENDED: return "suspended"; case INACTIVE: return "inactive"; case ENTEREDINERROR: return "entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -111,7 +111,7 @@ public class CareTeam extends DomainResource { case SUSPENDED: return "http://hl7.org/fhir/care-team-status"; case INACTIVE: return "http://hl7.org/fhir/care-team-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/care-team-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -122,7 +122,7 @@ public class CareTeam extends DomainResource { case SUSPENDED: return "The care team is temporarily on hold or suspended and not participating in the coordination and delivery of care."; case INACTIVE: return "The care team was, but is no longer, participating in the coordination and delivery of care."; case ENTEREDINERROR: return "The care team should have never existed."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -133,7 +133,7 @@ public class CareTeam extends DomainResource { case SUSPENDED: return "Suspended"; case INACTIVE: return "Inactive"; case ENTEREDINERROR: return "Entered In Error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -177,7 +177,9 @@ public class CareTeam extends DomainResource { throw new FHIRException("Unknown CareTeamStatus code '"+codeString+"'"); } 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"; @@ -188,7 +190,7 @@ public class CareTeam extends DomainResource { if (code == CareTeamStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(CareTeamStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ChargeItem.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ChargeItem.java index 6734b0081..3bfd212f7 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ChargeItem.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ChargeItem.java @@ -119,7 +119,7 @@ public class ChargeItem extends DomainResource { case BILLED: return "billed"; case ENTEREDINERROR: return "entered-in-error"; case UNKNOWN: return "unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -132,7 +132,7 @@ public class ChargeItem extends DomainResource { case BILLED: return "http://hl7.org/fhir/chargeitem-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/chargeitem-status"; case UNKNOWN: return "http://hl7.org/fhir/chargeitem-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -145,7 +145,7 @@ public class ChargeItem extends DomainResource { case BILLED: return "The charge item has been billed (e.g. a billing engine has generated financial transactions by applying the associated ruled for the charge item to the context of the Encounter, and placed them into Claims/Invoices"; case ENTEREDINERROR: return "The charge item has been entered in error and should not be processed for billing"; case UNKNOWN: return "The authoring system does not know which of the status values currently applies for this charge item Note: This concept is not to be used for \"other\" - one of the listed statuses is presumed to apply, it's just not known which one."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -158,7 +158,7 @@ public class ChargeItem extends DomainResource { case BILLED: return "Billed"; case ENTEREDINERROR: return "Entered in Error"; case UNKNOWN: return "Unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -210,7 +210,9 @@ public class ChargeItem extends DomainResource { throw new FHIRException("Unknown ChargeItemStatus code '"+codeString+"'"); } 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"; @@ -225,7 +227,7 @@ public class ChargeItem extends DomainResource { if (code == ChargeItemStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(ChargeItemStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Claim.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Claim.java index 243b21880..6879458fb 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Claim.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Claim.java @@ -95,7 +95,7 @@ public class Claim extends DomainResource { case CANCELLED: return "cancelled"; case DRAFT: return "draft"; case ENTEREDINERROR: return "entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -105,7 +105,7 @@ public class Claim extends DomainResource { case CANCELLED: return "http://hl7.org/fhir/fm-status"; case DRAFT: return "http://hl7.org/fhir/fm-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/fm-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -115,7 +115,7 @@ public class Claim extends DomainResource { case CANCELLED: return "The instance is withdrawn, rescinded or reversed."; case DRAFT: return "A new instance the contents of which is not complete."; case ENTEREDINERROR: return "The instance was entered in error."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -125,7 +125,7 @@ public class Claim extends DomainResource { case CANCELLED: return "Cancelled"; case DRAFT: return "Draft"; case ENTEREDINERROR: return "Entered in Error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -165,7 +165,9 @@ public class Claim extends DomainResource { throw new FHIRException("Unknown ClaimStatus code '"+codeString+"'"); } 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"; @@ -174,7 +176,7 @@ public class Claim extends DomainResource { if (code == ClaimStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(ClaimStatus code) { return code.getSystem(); } @@ -223,7 +225,7 @@ public class Claim extends DomainResource { case PROPOSED: return "proposed"; case EXPLORATORY: return "exploratory"; case OTHER: return "other"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -233,7 +235,7 @@ public class Claim extends DomainResource { case PROPOSED: return "http://hl7.org/fhir/claim-use"; case EXPLORATORY: return "http://hl7.org/fhir/claim-use"; case OTHER: return "http://hl7.org/fhir/claim-use"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -243,7 +245,7 @@ public class Claim extends DomainResource { case PROPOSED: return "The treatment is proposed and this represents a Pre-authorization for the services."; case EXPLORATORY: return "The treatment is proposed and this represents a Pre-determination for the services."; case OTHER: return "A locally defined or otherwise resolved status."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -253,7 +255,7 @@ public class Claim extends DomainResource { case PROPOSED: return "Proposed"; case EXPLORATORY: return "Exploratory"; case OTHER: return "Other"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -293,7 +295,9 @@ public class Claim extends DomainResource { throw new FHIRException("Unknown Use code '"+codeString+"'"); } public String toCode(Use code) { - if (code == Use.COMPLETE) + if (code == Use.NULL) + return null; + if (code == Use.COMPLETE) return "complete"; if (code == Use.PROPOSED) return "proposed"; @@ -302,7 +306,7 @@ public class Claim extends DomainResource { if (code == Use.OTHER) return "other"; return "?"; - } + } public String toSystem(Use code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ClaimResponse.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ClaimResponse.java index 527aef624..7337ca863 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ClaimResponse.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ClaimResponse.java @@ -94,7 +94,7 @@ public class ClaimResponse extends DomainResource { case CANCELLED: return "cancelled"; case DRAFT: return "draft"; case ENTEREDINERROR: return "entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -104,7 +104,7 @@ public class ClaimResponse extends DomainResource { case CANCELLED: return "http://hl7.org/fhir/fm-status"; case DRAFT: return "http://hl7.org/fhir/fm-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/fm-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -114,7 +114,7 @@ public class ClaimResponse extends DomainResource { case CANCELLED: return "The instance is withdrawn, rescinded or reversed."; case DRAFT: return "A new instance the contents of which is not complete."; case ENTEREDINERROR: return "The instance was entered in error."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -124,7 +124,7 @@ public class ClaimResponse extends DomainResource { case CANCELLED: return "Cancelled"; case DRAFT: return "Draft"; case ENTEREDINERROR: return "Entered in Error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -164,7 +164,9 @@ public class ClaimResponse extends DomainResource { throw new FHIRException("Unknown ClaimResponseStatus code '"+codeString+"'"); } 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"; @@ -173,7 +175,7 @@ public class ClaimResponse extends DomainResource { if (code == ClaimResponseStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(ClaimResponseStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ClinicalImpression.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ClinicalImpression.java index ab1484fb3..071d92d47 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ClinicalImpression.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ClinicalImpression.java @@ -89,7 +89,7 @@ public class ClinicalImpression extends DomainResource { case DRAFT: return "draft"; case COMPLETED: return "completed"; case ENTEREDINERROR: return "entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -98,7 +98,7 @@ public class ClinicalImpression extends DomainResource { case DRAFT: return "http://hl7.org/fhir/clinical-impression-status"; case COMPLETED: return "http://hl7.org/fhir/clinical-impression-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/clinical-impression-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -107,7 +107,7 @@ public class ClinicalImpression extends DomainResource { case DRAFT: return "The assessment is still on-going and results are not yet final."; case COMPLETED: return "The assessment is done and the results are final."; case ENTEREDINERROR: return "This assessment was never actually done and the record is erroneous (e.g. Wrong patient)."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -116,7 +116,7 @@ public class ClinicalImpression extends DomainResource { case DRAFT: return "In progress"; case COMPLETED: return "Completed"; case ENTEREDINERROR: return "Entered in Error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -152,14 +152,16 @@ public class ClinicalImpression extends DomainResource { throw new FHIRException("Unknown ClinicalImpressionStatus code '"+codeString+"'"); } public String toCode(ClinicalImpressionStatus code) { - if (code == ClinicalImpressionStatus.DRAFT) + if (code == ClinicalImpressionStatus.NULL) + return null; + if (code == ClinicalImpressionStatus.DRAFT) return "draft"; if (code == ClinicalImpressionStatus.COMPLETED) return "completed"; if (code == ClinicalImpressionStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(ClinicalImpressionStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CodeSystem.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CodeSystem.java index ebf62f7d3..2f6aab50f 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CodeSystem.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CodeSystem.java @@ -99,7 +99,7 @@ public class CodeSystem extends MetadataResource { case ISA: return "is-a"; case PARTOF: return "part-of"; case CLASSIFIEDWITH: return "classified-with"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -109,7 +109,7 @@ public class CodeSystem extends MetadataResource { case ISA: return "http://hl7.org/fhir/codesystem-hierarchy-meaning"; case PARTOF: return "http://hl7.org/fhir/codesystem-hierarchy-meaning"; case CLASSIFIEDWITH: return "http://hl7.org/fhir/codesystem-hierarchy-meaning"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -119,7 +119,7 @@ public class CodeSystem extends MetadataResource { case ISA: return "A hierarchy where the child concepts have an IS-A relationship with the parents - that is, all the properties of the parent are also true for its child concepts"; case PARTOF: return "Child elements list the individual parts of a composite whole (e.g. body site)"; case CLASSIFIEDWITH: return "Child concepts in the hierarchy may have only one parent, and there is a presumption that the code system is a \"closed world\" meaning all things must be in the hierarchy. This results in concepts such as \"not otherwise classified.\""; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -129,7 +129,7 @@ public class CodeSystem extends MetadataResource { case ISA: return "Is-A"; case PARTOF: return "Part Of"; case CLASSIFIEDWITH: return "Classified With"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -169,7 +169,9 @@ public class CodeSystem extends MetadataResource { throw new FHIRException("Unknown CodeSystemHierarchyMeaning code '"+codeString+"'"); } 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"; @@ -178,7 +180,7 @@ public class CodeSystem extends MetadataResource { if (code == CodeSystemHierarchyMeaning.CLASSIFIEDWITH) return "classified-with"; return "?"; - } + } public String toSystem(CodeSystemHierarchyMeaning code) { return code.getSystem(); } @@ -227,7 +229,7 @@ public class CodeSystem extends MetadataResource { case EXAMPLE: return "example"; case FRAGMENT: return "fragment"; case COMPLETE: return "complete"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -237,7 +239,7 @@ public class CodeSystem extends MetadataResource { case EXAMPLE: return "http://hl7.org/fhir/codesystem-content-mode"; case FRAGMENT: return "http://hl7.org/fhir/codesystem-content-mode"; case COMPLETE: return "http://hl7.org/fhir/codesystem-content-mode"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -247,7 +249,7 @@ public class CodeSystem extends MetadataResource { case EXAMPLE: return "A few representative concepts are included in the code system resource"; case FRAGMENT: return "A subset of the code system concepts are included in the code system resource"; case COMPLETE: return "All the concepts defined by the code system are included in the code system resource"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -257,7 +259,7 @@ public class CodeSystem extends MetadataResource { case EXAMPLE: return "Example"; case FRAGMENT: return "Fragment"; case COMPLETE: return "Complete"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -297,7 +299,9 @@ public class CodeSystem extends MetadataResource { throw new FHIRException("Unknown CodeSystemContentMode code '"+codeString+"'"); } 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"; @@ -306,7 +310,7 @@ public class CodeSystem extends MetadataResource { if (code == CodeSystemContentMode.COMPLETE) return "complete"; return "?"; - } + } public String toSystem(CodeSystemContentMode code) { return code.getSystem(); } @@ -390,7 +394,7 @@ public class CodeSystem extends MetadataResource { case NOTIN: return "not-in"; case GENERALIZES: return "generalizes"; case EXISTS: return "exists"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -405,7 +409,7 @@ public class CodeSystem extends MetadataResource { case NOTIN: return "http://hl7.org/fhir/filter-operator"; case GENERALIZES: return "http://hl7.org/fhir/filter-operator"; case EXISTS: return "http://hl7.org/fhir/filter-operator"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -420,7 +424,7 @@ public class CodeSystem extends MetadataResource { case NOTIN: return "The specified property of the code is not in the set of codes or concepts specified in the provided value (comma separated list)."; case GENERALIZES: return "Includes all concept ids that have a transitive is-a relationship from the concept Id provided as the value, including the provided concept itself (e.g. include parent codes)"; case EXISTS: return "The specified property of the code has at least one value (if the specified value is true; if the specified value is false, then matches when the specified property of the code has no values)"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -435,7 +439,7 @@ public class CodeSystem extends MetadataResource { case NOTIN: return "Not in Set"; case GENERALIZES: return "Generalizes (by Subsumption)"; case EXISTS: return "Exists"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -495,7 +499,9 @@ public class CodeSystem extends MetadataResource { throw new FHIRException("Unknown FilterOperator code '"+codeString+"'"); } 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"; @@ -514,7 +520,7 @@ public class CodeSystem extends MetadataResource { if (code == FilterOperator.EXISTS) return "exists"; return "?"; - } + } public String toSystem(FilterOperator code) { return code.getSystem(); } @@ -577,7 +583,7 @@ public class CodeSystem extends MetadataResource { case INTEGER: return "integer"; case BOOLEAN: return "boolean"; case DATETIME: return "dateTime"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -589,7 +595,7 @@ public class CodeSystem extends MetadataResource { case INTEGER: return "http://hl7.org/fhir/concept-property-type"; case BOOLEAN: return "http://hl7.org/fhir/concept-property-type"; case DATETIME: return "http://hl7.org/fhir/concept-property-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -601,7 +607,7 @@ public class CodeSystem extends MetadataResource { case INTEGER: return "The property value is a string (often used to assign ranking values to concepts for supporting score assessments)"; case BOOLEAN: return "The property value is a boolean true | false"; case DATETIME: return "The property is a date or a date + time"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -613,7 +619,7 @@ public class CodeSystem extends MetadataResource { case INTEGER: return "integer"; case BOOLEAN: return "boolean"; case DATETIME: return "dateTime"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -661,7 +667,9 @@ public class CodeSystem extends MetadataResource { throw new FHIRException("Unknown PropertyType code '"+codeString+"'"); } 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"; @@ -674,7 +682,7 @@ public class CodeSystem extends MetadataResource { if (code == PropertyType.DATETIME) return "dateTime"; return "?"; - } + } public String toSystem(PropertyType code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Communication.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Communication.java index 51b0f4c2c..e6bf8e25f 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Communication.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Communication.java @@ -115,7 +115,7 @@ public class Communication extends DomainResource { case COMPLETED: return "completed"; case ENTEREDINERROR: return "entered-in-error"; case UNKNOWN: return "unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -128,7 +128,7 @@ public class Communication extends DomainResource { case COMPLETED: return "http://hl7.org/fhir/event-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/event-status"; case UNKNOWN: return "http://hl7.org/fhir/event-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -141,7 +141,7 @@ public class Communication extends DomainResource { case COMPLETED: return "The event has now concluded"; case ENTEREDINERROR: return "This electronic record should never have existed, though it is possible that real-world decisions were based on it. (If real-world activity has occurred, the status should be \"cancelled\" rather than \"entered-in-error\".)"; case UNKNOWN: return "The authoring system does not know which of the status values currently applies for this request. Note: This concept is not to be used for \"other\" - one of the listed statuses is presumed to apply, it's just not known which one."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -154,7 +154,7 @@ public class Communication extends DomainResource { case COMPLETED: return "Completed"; case ENTEREDINERROR: return "Entered in Error"; case UNKNOWN: return "Unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -206,7 +206,9 @@ public class Communication extends DomainResource { throw new FHIRException("Unknown CommunicationStatus code '"+codeString+"'"); } 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"; @@ -221,7 +223,7 @@ public class Communication extends DomainResource { if (code == CommunicationStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(CommunicationStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CommunicationRequest.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CommunicationRequest.java index f79d3aebb..478a99dc3 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CommunicationRequest.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CommunicationRequest.java @@ -115,7 +115,7 @@ public class CommunicationRequest extends DomainResource { case COMPLETED: return "completed"; case ENTEREDINERROR: return "entered-in-error"; case UNKNOWN: return "unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -128,7 +128,7 @@ public class CommunicationRequest extends DomainResource { case COMPLETED: return "http://hl7.org/fhir/request-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/request-status"; case UNKNOWN: return "http://hl7.org/fhir/request-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -141,7 +141,7 @@ public class CommunicationRequest extends DomainResource { case COMPLETED: return "Activity against the request has been sufficiently completed to the satisfaction of the requester"; case ENTEREDINERROR: return "This electronic record should never have existed, though it is possible that real-world decisions were based on it. (If real-world activity has occurred, the status should be \"cancelled\" rather than \"entered-in-error\".)"; case UNKNOWN: return "The authoring system does not know which of the status values currently applies for this request. Note: This concept is not to be used for \"other\" . One of the listed statuses is presumed to apply, but the system creating the request doesn't know."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -154,7 +154,7 @@ public class CommunicationRequest extends DomainResource { case COMPLETED: return "Completed"; case ENTEREDINERROR: return "Entered in Error"; case UNKNOWN: return "Unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -206,7 +206,9 @@ public class CommunicationRequest extends DomainResource { throw new FHIRException("Unknown CommunicationRequestStatus code '"+codeString+"'"); } 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"; @@ -221,7 +223,7 @@ public class CommunicationRequest extends DomainResource { if (code == CommunicationRequestStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(CommunicationRequestStatus code) { return code.getSystem(); } @@ -270,7 +272,7 @@ public class CommunicationRequest extends DomainResource { case URGENT: return "urgent"; case ASAP: return "asap"; case STAT: return "stat"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -280,7 +282,7 @@ public class CommunicationRequest extends DomainResource { case URGENT: return "http://hl7.org/fhir/request-priority"; case ASAP: return "http://hl7.org/fhir/request-priority"; case STAT: return "http://hl7.org/fhir/request-priority"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -290,7 +292,7 @@ public class CommunicationRequest extends DomainResource { case URGENT: return "The request should be actioned promptly - higher priority than routine"; case ASAP: return "The request should be actioned as soon as possible - higher priority than urgent"; case STAT: return "The request should be actioned immediately - highest possible priority. E.g. an emergency"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -300,7 +302,7 @@ public class CommunicationRequest extends DomainResource { case URGENT: return "Urgent"; case ASAP: return "ASAP"; case STAT: return "STAT"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -340,7 +342,9 @@ public class CommunicationRequest extends DomainResource { throw new FHIRException("Unknown CommunicationPriority code '"+codeString+"'"); } 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"; @@ -349,7 +353,7 @@ public class CommunicationRequest extends DomainResource { if (code == CommunicationPriority.STAT) return "stat"; return "?"; - } + } public String toSystem(CommunicationPriority code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CompartmentDefinition.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CompartmentDefinition.java index 1fc5d4f97..68da20da6 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CompartmentDefinition.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CompartmentDefinition.java @@ -105,7 +105,7 @@ public class CompartmentDefinition extends MetadataResource { case RELATEDPERSON: return "RelatedPerson"; case PRACTITIONER: return "Practitioner"; case DEVICE: return "Device"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -116,7 +116,7 @@ public class CompartmentDefinition extends MetadataResource { case RELATEDPERSON: return "http://hl7.org/fhir/compartment-type"; case PRACTITIONER: return "http://hl7.org/fhir/compartment-type"; case DEVICE: return "http://hl7.org/fhir/compartment-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -127,7 +127,7 @@ public class CompartmentDefinition extends MetadataResource { case RELATEDPERSON: return "The compartment definition is for the related-person compartment"; case PRACTITIONER: return "The compartment definition is for the practitioner compartment"; case DEVICE: return "The compartment definition is for the device compartment"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -138,7 +138,7 @@ public class CompartmentDefinition extends MetadataResource { case RELATEDPERSON: return "RelatedPerson"; case PRACTITIONER: return "Practitioner"; case DEVICE: return "Device"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -182,7 +182,9 @@ public class CompartmentDefinition extends MetadataResource { throw new FHIRException("Unknown CompartmentType code '"+codeString+"'"); } 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"; @@ -193,7 +195,7 @@ public class CompartmentDefinition extends MetadataResource { if (code == CompartmentType.DEVICE) return "Device"; return "?"; - } + } public String toSystem(CompartmentType code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Composition.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Composition.java index 6fe7d3d2b..6b47e23c4 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Composition.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Composition.java @@ -95,7 +95,7 @@ public class Composition extends DomainResource { case FINAL: return "final"; case AMENDED: return "amended"; case ENTEREDINERROR: return "entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -105,7 +105,7 @@ public class Composition extends DomainResource { case FINAL: return "http://hl7.org/fhir/composition-status"; case AMENDED: return "http://hl7.org/fhir/composition-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/composition-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -115,7 +115,7 @@ public class Composition extends DomainResource { case FINAL: return "This version of the composition is complete and verified by an appropriate person and no further work is planned. Any subsequent updates would be on a new version of the composition."; case AMENDED: return "The composition content or the referenced resources have been modified (edited or added to) subsequent to being released as \"final\" and the composition is complete and verified by an authorized person."; case ENTEREDINERROR: return "The composition or document was originally created/issued in error, and this is an amendment that marks that the entire series should not be considered as valid."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -125,7 +125,7 @@ public class Composition extends DomainResource { case FINAL: return "Final"; case AMENDED: return "Amended"; case ENTEREDINERROR: return "Entered in Error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -165,7 +165,9 @@ public class Composition extends DomainResource { throw new FHIRException("Unknown CompositionStatus code '"+codeString+"'"); } 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"; @@ -174,7 +176,7 @@ public class Composition extends DomainResource { if (code == CompositionStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(CompositionStatus code) { return code.getSystem(); } @@ -237,7 +239,7 @@ public class Composition extends DomainResource { case N: return "N"; case R: return "R"; case V: return "V"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -249,7 +251,7 @@ public class Composition extends DomainResource { case N: return "http://hl7.org/fhir/v3/Confidentiality"; case R: return "http://hl7.org/fhir/v3/Confidentiality"; case V: return "http://hl7.org/fhir/v3/Confidentiality"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -261,7 +263,7 @@ public class Composition extends DomainResource { case N: return ""; case R: return ""; case V: return ""; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -273,7 +275,7 @@ public class Composition extends DomainResource { case N: return "N"; case R: return "R"; case V: return "V"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -321,7 +323,9 @@ public class Composition extends DomainResource { throw new FHIRException("Unknown DocumentConfidentiality code '"+codeString+"'"); } 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"; @@ -334,7 +338,7 @@ public class Composition extends DomainResource { if (code == DocumentConfidentiality.V) return "V"; return "?"; - } + } public String toSystem(DocumentConfidentiality code) { return code.getSystem(); } @@ -383,7 +387,7 @@ public class Composition extends DomainResource { case PROFESSIONAL: return "professional"; case LEGAL: return "legal"; case OFFICIAL: return "official"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -393,7 +397,7 @@ public class Composition extends DomainResource { case PROFESSIONAL: return "http://hl7.org/fhir/composition-attestation-mode"; case LEGAL: return "http://hl7.org/fhir/composition-attestation-mode"; case OFFICIAL: return "http://hl7.org/fhir/composition-attestation-mode"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -403,7 +407,7 @@ public class Composition extends DomainResource { case PROFESSIONAL: return "The person authenticated the content in their professional capacity."; case LEGAL: return "The person authenticated the content and accepted legal responsibility for its content."; case OFFICIAL: return "The organization authenticated the content as consistent with their policies and procedures."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -413,7 +417,7 @@ public class Composition extends DomainResource { case PROFESSIONAL: return "Professional"; case LEGAL: return "Legal"; case OFFICIAL: return "Official"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -453,7 +457,9 @@ public class Composition extends DomainResource { throw new FHIRException("Unknown CompositionAttestationMode code '"+codeString+"'"); } 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"; @@ -462,7 +468,7 @@ public class Composition extends DomainResource { if (code == CompositionAttestationMode.OFFICIAL) return "official"; return "?"; - } + } public String toSystem(CompositionAttestationMode code) { return code.getSystem(); } @@ -511,7 +517,7 @@ public class Composition extends DomainResource { case TRANSFORMS: return "transforms"; case SIGNS: return "signs"; case APPENDS: return "appends"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -521,7 +527,7 @@ public class Composition extends DomainResource { case TRANSFORMS: return "http://hl7.org/fhir/document-relationship-type"; case SIGNS: return "http://hl7.org/fhir/document-relationship-type"; case APPENDS: return "http://hl7.org/fhir/document-relationship-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -531,7 +537,7 @@ public class Composition extends DomainResource { case TRANSFORMS: return "This document was generated by transforming the target document (e.g. format or language conversion)."; case SIGNS: return "This document is a signature of the target document."; case APPENDS: return "This document adds additional information to the target document."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -541,7 +547,7 @@ public class Composition extends DomainResource { case TRANSFORMS: return "Transforms"; case SIGNS: return "Signs"; case APPENDS: return "Appends"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -581,7 +587,9 @@ public class Composition extends DomainResource { throw new FHIRException("Unknown DocumentRelationshipType code '"+codeString+"'"); } 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"; @@ -590,7 +598,7 @@ public class Composition extends DomainResource { if (code == DocumentRelationshipType.APPENDS) return "appends"; return "?"; - } + } public String toSystem(DocumentRelationshipType code) { return code.getSystem(); } @@ -632,7 +640,7 @@ public class Composition extends DomainResource { case WORKING: return "working"; case SNAPSHOT: return "snapshot"; case CHANGES: return "changes"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -641,7 +649,7 @@ public class Composition extends DomainResource { case WORKING: return "http://hl7.org/fhir/list-mode"; case SNAPSHOT: return "http://hl7.org/fhir/list-mode"; case CHANGES: return "http://hl7.org/fhir/list-mode"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -650,7 +658,7 @@ public class Composition extends DomainResource { case WORKING: return "This list is the master list, maintained in an ongoing fashion with regular updates as the real world list it is tracking changes"; case SNAPSHOT: return "This list was prepared as a snapshot. It should not be assumed to be current"; case CHANGES: return "A list that indicates where changes have been made or recommended"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -659,7 +667,7 @@ public class Composition extends DomainResource { case WORKING: return "Working List"; case SNAPSHOT: return "Snapshot List"; case CHANGES: return "Change List"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -695,14 +703,16 @@ public class Composition extends DomainResource { throw new FHIRException("Unknown SectionMode code '"+codeString+"'"); } 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(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ConceptMap.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ConceptMap.java index d0f284d05..ae33fcdb6 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ConceptMap.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ConceptMap.java @@ -95,7 +95,7 @@ public class ConceptMap extends MetadataResource { case PROVIDED: return "provided"; case FIXED: return "fixed"; case OTHERMAP: return "other-map"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -104,7 +104,7 @@ public class ConceptMap extends MetadataResource { case PROVIDED: return "http://hl7.org/fhir/conceptmap-unmapped-mode"; case FIXED: return "http://hl7.org/fhir/conceptmap-unmapped-mode"; case OTHERMAP: return "http://hl7.org/fhir/conceptmap-unmapped-mode"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -113,7 +113,7 @@ public class ConceptMap extends MetadataResource { case PROVIDED: return "Use the code as provided in the $translate request"; case FIXED: return "Use the code explicitly provided in the group.unmapped"; case OTHERMAP: return "Use the map identified by the canonical URL in URL"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -122,7 +122,7 @@ public class ConceptMap extends MetadataResource { case PROVIDED: return "Provided Code"; case FIXED: return "Fixed Code"; case OTHERMAP: return "Other Map"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -158,14 +158,16 @@ public class ConceptMap extends MetadataResource { throw new FHIRException("Unknown ConceptMapGroupUnmappedMode code '"+codeString+"'"); } 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(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Condition.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Condition.java index 68ad9f741..b4d09fb92 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Condition.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Condition.java @@ -101,7 +101,7 @@ public class Condition extends DomainResource { case INACTIVE: return "inactive"; case REMISSION: return "remission"; case RESOLVED: return "resolved"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -112,7 +112,7 @@ public class Condition extends DomainResource { case INACTIVE: return "http://hl7.org/fhir/condition-clinical"; case REMISSION: return "http://hl7.org/fhir/condition-clinical"; case RESOLVED: return "http://hl7.org/fhir/condition-clinical"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -123,7 +123,7 @@ public class Condition extends DomainResource { case INACTIVE: return "The subject is no longer experiencing the symptoms of the condition or there is no longer evidence of the condition."; case REMISSION: return "The subject is no longer experiencing the symptoms of the condition, but there is a risk of the symptoms returning."; case RESOLVED: return "The subject is no longer experiencing the symptoms of the condition and there is a negligible perceived risk of the symptoms returning."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -134,7 +134,7 @@ public class Condition extends DomainResource { case INACTIVE: return "Inactive"; case REMISSION: return "Remission"; case RESOLVED: return "Resolved"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -178,7 +178,9 @@ public class Condition extends DomainResource { throw new FHIRException("Unknown ConditionClinicalStatus code '"+codeString+"'"); } public String toCode(ConditionClinicalStatus code) { - if (code == ConditionClinicalStatus.ACTIVE) + if (code == ConditionClinicalStatus.NULL) + return null; + if (code == ConditionClinicalStatus.ACTIVE) return "active"; if (code == ConditionClinicalStatus.RECURRENCE) return "recurrence"; @@ -189,7 +191,7 @@ public class Condition extends DomainResource { if (code == ConditionClinicalStatus.RESOLVED) return "resolved"; return "?"; - } + } public String toSystem(ConditionClinicalStatus code) { return code.getSystem(); } @@ -252,7 +254,7 @@ public class Condition extends DomainResource { case REFUTED: return "refuted"; case ENTEREDINERROR: return "entered-in-error"; case UNKNOWN: return "unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -264,7 +266,7 @@ public class Condition extends DomainResource { case REFUTED: return "http://hl7.org/fhir/condition-ver-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/condition-ver-status"; case UNKNOWN: return "http://hl7.org/fhir/condition-ver-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -276,7 +278,7 @@ public class Condition extends DomainResource { case REFUTED: return "This condition has been ruled out by diagnostic and clinical evidence."; case ENTEREDINERROR: return "The statement was entered in error and is not valid."; case UNKNOWN: return "The condition status is unknown. Note that \"unknown\" is a value of last resort and every attempt should be made to provide a meaningful value other than \"unknown\"."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -288,7 +290,7 @@ public class Condition extends DomainResource { case REFUTED: return "Refuted"; case ENTEREDINERROR: return "Entered In Error"; case UNKNOWN: return "Unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -336,7 +338,9 @@ public class Condition extends DomainResource { throw new FHIRException("Unknown ConditionVerificationStatus code '"+codeString+"'"); } public String toCode(ConditionVerificationStatus code) { - if (code == ConditionVerificationStatus.PROVISIONAL) + if (code == ConditionVerificationStatus.NULL) + return null; + if (code == ConditionVerificationStatus.PROVISIONAL) return "provisional"; if (code == ConditionVerificationStatus.DIFFERENTIAL) return "differential"; @@ -349,7 +353,7 @@ public class Condition extends DomainResource { if (code == ConditionVerificationStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(ConditionVerificationStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Consent.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Consent.java index 493a38dc7..d5209a585 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Consent.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Consent.java @@ -109,7 +109,7 @@ public class Consent extends DomainResource { case REJECTED: return "rejected"; case INACTIVE: return "inactive"; case ENTEREDINERROR: return "entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -121,7 +121,7 @@ public class Consent extends DomainResource { case REJECTED: return "http://hl7.org/fhir/consent-state-codes"; case INACTIVE: return "http://hl7.org/fhir/consent-state-codes"; case ENTEREDINERROR: return "http://hl7.org/fhir/consent-state-codes"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -133,7 +133,7 @@ public class Consent extends DomainResource { case REJECTED: return "The consent has been rejected by one or more of the parties."; case INACTIVE: return "The consent is terminated or replaced."; case ENTEREDINERROR: return "The consent was created wrongly (e.g. wrong patient) and should be ignored"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -145,7 +145,7 @@ public class Consent extends DomainResource { case REJECTED: return "Rejected"; case INACTIVE: return "Inactive"; case ENTEREDINERROR: return "Entered in Error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -193,7 +193,9 @@ public class Consent extends DomainResource { throw new FHIRException("Unknown ConsentState code '"+codeString+"'"); } 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"; @@ -206,7 +208,7 @@ public class Consent extends DomainResource { if (code == ConsentState.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(ConsentState code) { return code.getSystem(); } @@ -255,7 +257,7 @@ public class Consent extends DomainResource { case RELATED: return "related"; case DEPENDENTS: return "dependents"; case AUTHOREDBY: return "authoredby"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -265,7 +267,7 @@ public class Consent extends DomainResource { case RELATED: return "http://hl7.org/fhir/consent-data-meaning"; case DEPENDENTS: return "http://hl7.org/fhir/consent-data-meaning"; case AUTHOREDBY: return "http://hl7.org/fhir/consent-data-meaning"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -275,7 +277,7 @@ public class Consent extends DomainResource { case RELATED: return "The consent applies directly to the instance of the resource and instances it refers to"; case DEPENDENTS: return "The consent applies directly to the instance of the resource and instances that refer to it"; case AUTHOREDBY: return "The consent applies to instances of resources that are authored by"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -285,7 +287,7 @@ public class Consent extends DomainResource { case RELATED: return "Related"; case DEPENDENTS: return "Dependents"; case AUTHOREDBY: return "AuthoredBy"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -325,7 +327,9 @@ public class Consent extends DomainResource { throw new FHIRException("Unknown ConsentDataMeaning code '"+codeString+"'"); } 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"; @@ -334,7 +338,7 @@ public class Consent extends DomainResource { if (code == ConsentDataMeaning.AUTHOREDBY) return "authoredby"; return "?"; - } + } public String toSystem(ConsentDataMeaning code) { return code.getSystem(); } @@ -369,7 +373,7 @@ public class Consent extends DomainResource { switch (this) { case DENY: return "deny"; case PERMIT: return "permit"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -377,7 +381,7 @@ public class Consent extends DomainResource { switch (this) { case DENY: return "http://hl7.org/fhir/consent-except-type"; case PERMIT: return "http://hl7.org/fhir/consent-except-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -385,7 +389,7 @@ public class Consent extends DomainResource { switch (this) { case DENY: return "Consent is denied for actions meeting these rules"; case PERMIT: return "Consent is provided for actions meeting these rules"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -393,7 +397,7 @@ public class Consent extends DomainResource { switch (this) { case DENY: return "Opt Out"; case PERMIT: return "Opt In"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -425,12 +429,14 @@ public class Consent extends DomainResource { throw new FHIRException("Unknown ConsentExceptType code '"+codeString+"'"); } public String toCode(ConsentExceptType code) { - if (code == ConsentExceptType.DENY) + if (code == ConsentExceptType.NULL) + return null; + if (code == ConsentExceptType.DENY) return "deny"; if (code == ConsentExceptType.PERMIT) return "permit"; return "?"; - } + } public String toSystem(ConsentExceptType code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ContactPoint.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ContactPoint.java index e6348b0df..145bd81dd 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ContactPoint.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ContactPoint.java @@ -111,7 +111,7 @@ public class ContactPoint extends Type implements ICompositeType { case URL: return "url"; case SMS: return "sms"; case OTHER: return "other"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -124,7 +124,7 @@ public class ContactPoint extends Type implements ICompositeType { case URL: return "http://hl7.org/fhir/contact-point-system"; case SMS: return "http://hl7.org/fhir/contact-point-system"; case OTHER: return "http://hl7.org/fhir/contact-point-system"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -137,7 +137,7 @@ public class ContactPoint extends Type implements ICompositeType { case URL: return "A contact that is not a phone, fax, pager or email address and is expressed as a URL. This is intended for various personal contacts including blogs, Skype, Twitter, Facebook, etc. Do not use for email addresses."; case SMS: return "A contact that can be used for sending an sms message (e.g. mobide phones, some landlines)"; case OTHER: return "A contact that is not a phone, fax, page or email address and is not expressible as a URL. E.g. Internal mail address. This SHOULD NOT be used for contacts that are expressible as a URL (e.g. Skype, Twitter, Facebook, etc.) Extensions may be used to distinguish \"other\" contact types."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -150,7 +150,7 @@ public class ContactPoint extends Type implements ICompositeType { case URL: return "URL"; case SMS: return "SMS"; case OTHER: return "Other"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -202,7 +202,9 @@ public class ContactPoint extends Type implements ICompositeType { throw new FHIRException("Unknown ContactPointSystem code '"+codeString+"'"); } 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"; @@ -217,7 +219,7 @@ public class ContactPoint extends Type implements ICompositeType { if (code == ContactPointSystem.OTHER) return "other"; return "?"; - } + } public String toSystem(ContactPointSystem code) { return code.getSystem(); } @@ -273,7 +275,7 @@ public class ContactPoint extends Type implements ICompositeType { case TEMP: return "temp"; case OLD: return "old"; case MOBILE: return "mobile"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -284,7 +286,7 @@ public class ContactPoint extends Type implements ICompositeType { case TEMP: return "http://hl7.org/fhir/contact-point-use"; case OLD: return "http://hl7.org/fhir/contact-point-use"; case MOBILE: return "http://hl7.org/fhir/contact-point-use"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -295,7 +297,7 @@ public class ContactPoint extends Type implements ICompositeType { case TEMP: return "A temporary contact point. The period can provide more detailed information."; case OLD: return "This contact point is no longer in use (or was never correct, but retained for records)."; case MOBILE: return "A telecommunication device that moves and stays with its owner. May have characteristics of all other use codes, suitable for urgent matters, not the first choice for routine business."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -306,7 +308,7 @@ public class ContactPoint extends Type implements ICompositeType { case TEMP: return "Temp"; case OLD: return "Old"; case MOBILE: return "Mobile"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -350,7 +352,9 @@ public class ContactPoint extends Type implements ICompositeType { throw new FHIRException("Unknown ContactPointUse code '"+codeString+"'"); } 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"; @@ -361,7 +365,7 @@ public class ContactPoint extends Type implements ICompositeType { if (code == ContactPointUse.MOBILE) return "mobile"; return "?"; - } + } public String toSystem(ContactPointUse code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Contract.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Contract.java index 150696eb2..fc85c90d7 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Contract.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Contract.java @@ -175,7 +175,7 @@ public class Contract extends DomainResource { case REVOKED: return "revoked"; case RESOLVED: return "resolved"; case TERMINATED: return "terminated"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -196,7 +196,7 @@ public class Contract extends DomainResource { case REVOKED: return "http://hl7.org/fhir/contract-status"; case RESOLVED: return "http://hl7.org/fhir/contract-status"; case TERMINATED: return "http://hl7.org/fhir/contract-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -217,7 +217,7 @@ public class Contract extends DomainResource { case REVOKED: return "A Contract that is rescinded. May be required prior to replacing with an updated Contract. Comparable FHIR and v.3 status codes: nullified."; case RESOLVED: return "Contract is reactivated after being pended because of faulty execution. *E.g., competency of the signer(s), or where the policy is substantially different from and did not accompany the application/form so that the applicant could not compare them. Aka - ''reactivated''. Usage: Optional stage where a pended contract is reactivated. Precedence Order = 8. Comparable FHIR and v.3 status codes: reactivated."; case TERMINATED: return "Contract reaches its expiry date. It may or may not be renewed or renegotiated. Usage: Normal end of contract period. Precedence Order = 12. Comparable FHIR and v.3 status codes: Obsoleted."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -238,7 +238,7 @@ public class Contract extends DomainResource { case REVOKED: return "Revoked"; case RESOLVED: return "Resolved"; case TERMINATED: return "Terminated"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -322,7 +322,9 @@ public class Contract extends DomainResource { throw new FHIRException("Unknown ContractStatus code '"+codeString+"'"); } 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"; @@ -353,7 +355,7 @@ public class Contract extends DomainResource { if (code == ContractStatus.TERMINATED) return "terminated"; return "?"; - } + } public String toSystem(ContractStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Contributor.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Contributor.java index 64a25a978..c29912df6 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Contributor.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Contributor.java @@ -91,7 +91,7 @@ public class Contributor extends Type implements ICompositeType { case EDITOR: return "editor"; case REVIEWER: return "reviewer"; case ENDORSER: return "endorser"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -101,7 +101,7 @@ public class Contributor extends Type implements ICompositeType { case EDITOR: return "http://hl7.org/fhir/contributor-type"; case REVIEWER: return "http://hl7.org/fhir/contributor-type"; case ENDORSER: return "http://hl7.org/fhir/contributor-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -111,7 +111,7 @@ public class Contributor extends Type implements ICompositeType { case EDITOR: return "An editor of the content of the module"; case REVIEWER: return "A reviewer of the content of the module"; case ENDORSER: return "An endorser of the content of the module"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -121,7 +121,7 @@ public class Contributor extends Type implements ICompositeType { case EDITOR: return "Editor"; case REVIEWER: return "Reviewer"; case ENDORSER: return "Endorser"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -161,7 +161,9 @@ public class Contributor extends Type implements ICompositeType { throw new FHIRException("Unknown ContributorType code '"+codeString+"'"); } 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"; @@ -170,7 +172,7 @@ public class Contributor extends Type implements ICompositeType { if (code == ContributorType.ENDORSER) return "endorser"; return "?"; - } + } public String toSystem(ContributorType code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Coverage.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Coverage.java index fe0b27c03..14065292a 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Coverage.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Coverage.java @@ -93,7 +93,7 @@ public class Coverage extends DomainResource { case CANCELLED: return "cancelled"; case DRAFT: return "draft"; case ENTEREDINERROR: return "entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -103,7 +103,7 @@ public class Coverage extends DomainResource { case CANCELLED: return "http://hl7.org/fhir/fm-status"; case DRAFT: return "http://hl7.org/fhir/fm-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/fm-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -113,7 +113,7 @@ public class Coverage extends DomainResource { case CANCELLED: return "The instance is withdrawn, rescinded or reversed."; case DRAFT: return "A new instance the contents of which is not complete."; case ENTEREDINERROR: return "The instance was entered in error."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -123,7 +123,7 @@ public class Coverage extends DomainResource { case CANCELLED: return "Cancelled"; case DRAFT: return "Draft"; case ENTEREDINERROR: return "Entered in Error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -163,7 +163,9 @@ public class Coverage extends DomainResource { throw new FHIRException("Unknown CoverageStatus code '"+codeString+"'"); } 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"; @@ -172,7 +174,7 @@ public class Coverage extends DomainResource { if (code == CoverageStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(CoverageStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DataElement.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DataElement.java index 167d89253..9e43a308b 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DataElement.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DataElement.java @@ -112,7 +112,7 @@ public class DataElement extends MetadataResource { case CONVERTABLE: return "convertable"; case SCALEABLE: return "scaleable"; case FLEXIBLE: return "flexible"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -124,7 +124,7 @@ public class DataElement extends MetadataResource { case CONVERTABLE: return "http://hl7.org/fhir/dataelement-stringency"; case SCALEABLE: return "http://hl7.org/fhir/dataelement-stringency"; case FLEXIBLE: return "http://hl7.org/fhir/dataelement-stringency"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -136,7 +136,7 @@ public class DataElement extends MetadataResource { case CONVERTABLE: return "The data element allows multiple units of measure that are convertable between each other (e.g. inches and centimeters) and/or allows data to be captured in multiple value sets for which a known mapping exists allowing conversion of meaning."; case SCALEABLE: return "A convertable data element where unit conversions are different only by a power of 10; e.g. g, mg, kg."; case FLEXIBLE: return "The data element is unconstrained in units, choice of data types and/or choice of vocabulary such that automated comparison of data captured using the data element is not possible."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -148,7 +148,7 @@ public class DataElement extends MetadataResource { case CONVERTABLE: return "Convertable"; case SCALEABLE: return "Scaleable"; case FLEXIBLE: return "Flexible"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -196,7 +196,9 @@ public class DataElement extends MetadataResource { throw new FHIRException("Unknown DataElementStringency code '"+codeString+"'"); } public String toCode(DataElementStringency code) { - if (code == DataElementStringency.COMPARABLE) + if (code == DataElementStringency.NULL) + return null; + if (code == DataElementStringency.COMPARABLE) return "comparable"; if (code == DataElementStringency.FULLYSPECIFIED) return "fully-specified"; @@ -209,7 +211,7 @@ public class DataElement extends MetadataResource { if (code == DataElementStringency.FLEXIBLE) return "flexible"; return "?"; - } + } public String toSystem(DataElementStringency code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DetectedIssue.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DetectedIssue.java index 13b33e4b1..cca19de55 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DetectedIssue.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DetectedIssue.java @@ -122,7 +122,7 @@ public class DetectedIssue extends DomainResource { case CANCELLED: return "cancelled"; case ENTEREDINERROR: return "entered-in-error"; case UNKNOWN: return "unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -136,7 +136,7 @@ public class DetectedIssue extends DomainResource { case CANCELLED: return "http://hl7.org/fhir/observation-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/observation-status"; case UNKNOWN: return "http://hl7.org/fhir/observation-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -150,7 +150,7 @@ public class DetectedIssue extends DomainResource { case CANCELLED: return "The observation is unavailable because the measurement was not started or not completed (also sometimes called \"aborted\")."; case ENTEREDINERROR: return "The observation has been withdrawn following previous final release. This electronic record should never have existed, though it is possible that real-world decisions were based on it. (If real-world activity has occurred, the status should be \"cancelled\" rather than \"entered-in-error\".)"; case UNKNOWN: return "The authoring system does not know which of the status values currently applies for this request. Note: This concept is not to be used for \"other\" - one of the listed statuses is presumed to apply, but the authoring system does not know which."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -164,7 +164,7 @@ public class DetectedIssue extends DomainResource { case CANCELLED: return "Cancelled"; case ENTEREDINERROR: return "Entered in Error"; case UNKNOWN: return "Unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -220,7 +220,9 @@ public class DetectedIssue extends DomainResource { throw new FHIRException("Unknown DetectedIssueStatus code '"+codeString+"'"); } 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"; @@ -237,7 +239,7 @@ public class DetectedIssue extends DomainResource { if (code == DetectedIssueStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(DetectedIssueStatus code) { return code.getSystem(); } @@ -279,7 +281,7 @@ public class DetectedIssue extends DomainResource { case HIGH: return "high"; case MODERATE: return "moderate"; case LOW: return "low"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -288,7 +290,7 @@ public class DetectedIssue extends DomainResource { case HIGH: return "http://hl7.org/fhir/detectedissue-severity"; case MODERATE: return "http://hl7.org/fhir/detectedissue-severity"; case LOW: return "http://hl7.org/fhir/detectedissue-severity"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -297,7 +299,7 @@ public class DetectedIssue extends DomainResource { case HIGH: return "Indicates the issue may be life-threatening or has the potential to cause permanent injury."; case MODERATE: return "Indicates the issue may result in noticeable adverse consequences but is unlikely to be life-threatening or cause permanent injury."; case LOW: return "Indicates the issue may result in some adverse consequences but is unlikely to substantially affect the situation of the subject."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -306,7 +308,7 @@ public class DetectedIssue extends DomainResource { case HIGH: return "High"; case MODERATE: return "Moderate"; case LOW: return "Low"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -342,14 +344,16 @@ public class DetectedIssue extends DomainResource { throw new FHIRException("Unknown DetectedIssueSeverity code '"+codeString+"'"); } 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(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Device.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Device.java index 3f55abcf1..86be5d404 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Device.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Device.java @@ -109,7 +109,7 @@ public class Device extends DomainResource { case CARD: return "card"; case SELFREPORTED: return "self-reported"; case UNKNOWN: return "unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -121,7 +121,7 @@ public class Device extends DomainResource { case CARD: return "http://hl7.org/fhir/udi-entry-type"; case SELFREPORTED: return "http://hl7.org/fhir/udi-entry-type"; case UNKNOWN: return "http://hl7.org/fhir/udi-entry-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -133,7 +133,7 @@ public class Device extends DomainResource { case CARD: return "The data originated from a patient's implant card and read by an operator."; case SELFREPORTED: return "The data originated from a patient source and not directly scanned or read from a label or card."; case UNKNOWN: return "The method of data capture has not been determined"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -145,7 +145,7 @@ public class Device extends DomainResource { case CARD: return "Card"; case SELFREPORTED: return "Self Reported"; case UNKNOWN: return "Unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -193,7 +193,9 @@ public class Device extends DomainResource { throw new FHIRException("Unknown UDIEntryType code '"+codeString+"'"); } 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"; @@ -206,7 +208,7 @@ public class Device extends DomainResource { if (code == UDIEntryType.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(UDIEntryType code) { return code.getSystem(); } @@ -255,7 +257,7 @@ public class Device extends DomainResource { case INACTIVE: return "inactive"; case ENTEREDINERROR: return "entered-in-error"; case UNKNOWN: return "unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -265,7 +267,7 @@ public class Device extends DomainResource { case INACTIVE: return "http://hl7.org/fhir/device-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/device-status"; case UNKNOWN: return "http://hl7.org/fhir/device-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -275,7 +277,7 @@ public class Device extends DomainResource { case INACTIVE: return "The Device is no longer available for use (e.g. lost, expired, damaged). Note: This means for *implanted devices* the device has been removed from the patient."; case ENTEREDINERROR: return "The Device was entered in error and voided."; case UNKNOWN: return "The status of the device has not been determined."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -285,7 +287,7 @@ public class Device extends DomainResource { case INACTIVE: return "Inactive"; case ENTEREDINERROR: return "Entered in Error"; case UNKNOWN: return "Unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -325,7 +327,9 @@ public class Device extends DomainResource { throw new FHIRException("Unknown FHIRDeviceStatus code '"+codeString+"'"); } 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"; @@ -334,7 +338,7 @@ public class Device extends DomainResource { if (code == FHIRDeviceStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(FHIRDeviceStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceComponent.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceComponent.java index f9021ea1f..f3129b523 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceComponent.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceComponent.java @@ -143,7 +143,7 @@ public class DeviceComponent extends DomainResource { case MECHANICAL: return "mechanical"; case ACOUSTICAL: return "acoustical"; case MANUAL: return "manual"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -160,7 +160,7 @@ public class DeviceComponent extends DomainResource { case MECHANICAL: return "http://hl7.org/fhir/measurement-principle"; case ACOUSTICAL: return "http://hl7.org/fhir/measurement-principle"; case MANUAL: return "http://hl7.org/fhir/measurement-principle"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -177,7 +177,7 @@ public class DeviceComponent extends DomainResource { case MECHANICAL: return "Measurement is done using the mechanical principle."; case ACOUSTICAL: return "Measurement is done using the acoustical principle."; case MANUAL: return "Measurement is done using the manual principle."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -194,7 +194,7 @@ public class DeviceComponent extends DomainResource { case MECHANICAL: return "MSP Mechanical"; case ACOUSTICAL: return "MSP Acoustical"; case MANUAL: return "MSP Manual"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -262,7 +262,9 @@ public class DeviceComponent extends DomainResource { throw new FHIRException("Unknown MeasmntPrinciple code '"+codeString+"'"); } public String toCode(MeasmntPrinciple code) { - if (code == MeasmntPrinciple.OTHER) + if (code == MeasmntPrinciple.NULL) + return null; + if (code == MeasmntPrinciple.OTHER) return "other"; if (code == MeasmntPrinciple.CHEMICAL) return "chemical"; @@ -285,7 +287,7 @@ public class DeviceComponent extends DomainResource { if (code == MeasmntPrinciple.MANUAL) return "manual"; return "?"; - } + } public String toSystem(MeasmntPrinciple code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceMetric.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceMetric.java index 099a3278d..94e234a9b 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceMetric.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceMetric.java @@ -93,7 +93,7 @@ public class DeviceMetric extends DomainResource { case OFF: return "off"; case STANDBY: return "standby"; case ENTEREDINERROR: return "entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -103,7 +103,7 @@ public class DeviceMetric extends DomainResource { case OFF: return "http://hl7.org/fhir/metric-operational-status"; case STANDBY: return "http://hl7.org/fhir/metric-operational-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/metric-operational-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -113,7 +113,7 @@ public class DeviceMetric extends DomainResource { case OFF: return "The DeviceMetric is not operating."; case STANDBY: return "The DeviceMetric is operating, but will not generate any DeviceObservations."; case ENTEREDINERROR: return "The DeviceMetric was entered in error."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -123,7 +123,7 @@ public class DeviceMetric extends DomainResource { case OFF: return "Off"; case STANDBY: return "Standby"; case ENTEREDINERROR: return "Entered In Error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -163,7 +163,9 @@ public class DeviceMetric extends DomainResource { throw new FHIRException("Unknown DeviceMetricOperationalStatus code '"+codeString+"'"); } 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"; @@ -172,7 +174,7 @@ public class DeviceMetric extends DomainResource { if (code == DeviceMetricOperationalStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(DeviceMetricOperationalStatus code) { return code.getSystem(); } @@ -249,7 +251,7 @@ public class DeviceMetric extends DomainResource { case MAGENTA: return "magenta"; case CYAN: return "cyan"; case WHITE: return "white"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -263,7 +265,7 @@ public class DeviceMetric extends DomainResource { case MAGENTA: return "http://hl7.org/fhir/metric-color"; case CYAN: return "http://hl7.org/fhir/metric-color"; case WHITE: return "http://hl7.org/fhir/metric-color"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -277,7 +279,7 @@ public class DeviceMetric extends DomainResource { case MAGENTA: return "Color for representation - magenta."; case CYAN: return "Color for representation - cyan."; case WHITE: return "Color for representation - white."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -291,7 +293,7 @@ public class DeviceMetric extends DomainResource { case MAGENTA: return "Color Magenta"; case CYAN: return "Color Cyan"; case WHITE: return "Color White"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -347,7 +349,9 @@ public class DeviceMetric extends DomainResource { throw new FHIRException("Unknown DeviceMetricColor code '"+codeString+"'"); } 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"; @@ -364,7 +368,7 @@ public class DeviceMetric extends DomainResource { if (code == DeviceMetricColor.WHITE) return "white"; return "?"; - } + } public String toSystem(DeviceMetricColor code) { return code.getSystem(); } @@ -413,7 +417,7 @@ public class DeviceMetric extends DomainResource { case SETTING: return "setting"; case CALCULATION: return "calculation"; case UNSPECIFIED: return "unspecified"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -423,7 +427,7 @@ public class DeviceMetric extends DomainResource { case SETTING: return "http://hl7.org/fhir/metric-category"; case CALCULATION: return "http://hl7.org/fhir/metric-category"; case UNSPECIFIED: return "http://hl7.org/fhir/metric-category"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -433,7 +437,7 @@ public class DeviceMetric extends DomainResource { case SETTING: return "DeviceObservations generated for this DeviceMetric is a setting that will influence the behavior of the Device."; case CALCULATION: return "DeviceObservations generated for this DeviceMetric are calculated."; case UNSPECIFIED: return "The category of this DeviceMetric is unspecified."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -443,7 +447,7 @@ public class DeviceMetric extends DomainResource { case SETTING: return "Setting"; case CALCULATION: return "Calculation"; case UNSPECIFIED: return "Unspecified"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -483,7 +487,9 @@ public class DeviceMetric extends DomainResource { throw new FHIRException("Unknown DeviceMetricCategory code '"+codeString+"'"); } 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"; @@ -492,7 +498,7 @@ public class DeviceMetric extends DomainResource { if (code == DeviceMetricCategory.UNSPECIFIED) return "unspecified"; return "?"; - } + } public String toSystem(DeviceMetricCategory code) { return code.getSystem(); } @@ -541,7 +547,7 @@ public class DeviceMetric extends DomainResource { case OFFSET: return "offset"; case GAIN: return "gain"; case TWOPOINT: return "two-point"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -551,7 +557,7 @@ public class DeviceMetric extends DomainResource { case OFFSET: return "http://hl7.org/fhir/metric-calibration-type"; case GAIN: return "http://hl7.org/fhir/metric-calibration-type"; case TWOPOINT: return "http://hl7.org/fhir/metric-calibration-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -561,7 +567,7 @@ public class DeviceMetric extends DomainResource { case OFFSET: return "Offset metric calibration method"; case GAIN: return "Gain metric calibration method"; case TWOPOINT: return "Two-point metric calibration method"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -571,7 +577,7 @@ public class DeviceMetric extends DomainResource { case OFFSET: return "Offset"; case GAIN: return "Gain"; case TWOPOINT: return "Two Point"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -611,7 +617,9 @@ public class DeviceMetric extends DomainResource { throw new FHIRException("Unknown DeviceMetricCalibrationType code '"+codeString+"'"); } 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"; @@ -620,7 +628,7 @@ public class DeviceMetric extends DomainResource { if (code == DeviceMetricCalibrationType.TWOPOINT) return "two-point"; return "?"; - } + } public String toSystem(DeviceMetricCalibrationType code) { return code.getSystem(); } @@ -669,7 +677,7 @@ public class DeviceMetric extends DomainResource { case CALIBRATIONREQUIRED: return "calibration-required"; case CALIBRATED: return "calibrated"; case UNSPECIFIED: return "unspecified"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -679,7 +687,7 @@ public class DeviceMetric extends DomainResource { case CALIBRATIONREQUIRED: return "http://hl7.org/fhir/metric-calibration-state"; case CALIBRATED: return "http://hl7.org/fhir/metric-calibration-state"; case UNSPECIFIED: return "http://hl7.org/fhir/metric-calibration-state"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -689,7 +697,7 @@ public class DeviceMetric extends DomainResource { case CALIBRATIONREQUIRED: return "The metric needs to be calibrated."; case CALIBRATED: return "The metric has been calibrated."; case UNSPECIFIED: return "The state of calibration of this metric is unspecified."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -699,7 +707,7 @@ public class DeviceMetric extends DomainResource { case CALIBRATIONREQUIRED: return "Calibration Required"; case CALIBRATED: return "Calibrated"; case UNSPECIFIED: return "Unspecified"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -739,7 +747,9 @@ public class DeviceMetric extends DomainResource { throw new FHIRException("Unknown DeviceMetricCalibrationState code '"+codeString+"'"); } 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"; @@ -748,7 +758,7 @@ public class DeviceMetric extends DomainResource { if (code == DeviceMetricCalibrationState.UNSPECIFIED) return "unspecified"; return "?"; - } + } public String toSystem(DeviceMetricCalibrationState code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceRequest.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceRequest.java index 7831b10d1..45b2bbd93 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceRequest.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceRequest.java @@ -115,7 +115,7 @@ public class DeviceRequest extends DomainResource { case COMPLETED: return "completed"; case ENTEREDINERROR: return "entered-in-error"; case UNKNOWN: return "unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -128,7 +128,7 @@ public class DeviceRequest extends DomainResource { case COMPLETED: return "http://hl7.org/fhir/request-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/request-status"; case UNKNOWN: return "http://hl7.org/fhir/request-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -141,7 +141,7 @@ public class DeviceRequest extends DomainResource { case COMPLETED: return "Activity against the request has been sufficiently completed to the satisfaction of the requester"; case ENTEREDINERROR: return "This electronic record should never have existed, though it is possible that real-world decisions were based on it. (If real-world activity has occurred, the status should be \"cancelled\" rather than \"entered-in-error\".)"; case UNKNOWN: return "The authoring system does not know which of the status values currently applies for this request. Note: This concept is not to be used for \"other\" . One of the listed statuses is presumed to apply, but the system creating the request doesn't know."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -154,7 +154,7 @@ public class DeviceRequest extends DomainResource { case COMPLETED: return "Completed"; case ENTEREDINERROR: return "Entered in Error"; case UNKNOWN: return "Unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -206,7 +206,9 @@ public class DeviceRequest extends DomainResource { throw new FHIRException("Unknown DeviceRequestStatus code '"+codeString+"'"); } 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"; @@ -221,7 +223,7 @@ public class DeviceRequest extends DomainResource { if (code == DeviceRequestStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(DeviceRequestStatus code) { return code.getSystem(); } @@ -270,7 +272,7 @@ public class DeviceRequest extends DomainResource { case URGENT: return "urgent"; case ASAP: return "asap"; case STAT: return "stat"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -280,7 +282,7 @@ public class DeviceRequest extends DomainResource { case URGENT: return "http://hl7.org/fhir/request-priority"; case ASAP: return "http://hl7.org/fhir/request-priority"; case STAT: return "http://hl7.org/fhir/request-priority"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -290,7 +292,7 @@ public class DeviceRequest extends DomainResource { case URGENT: return "The request should be actioned promptly - higher priority than routine"; case ASAP: return "The request should be actioned as soon as possible - higher priority than urgent"; case STAT: return "The request should be actioned immediately - highest possible priority. E.g. an emergency"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -300,7 +302,7 @@ public class DeviceRequest extends DomainResource { case URGENT: return "Urgent"; case ASAP: return "ASAP"; case STAT: return "STAT"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -340,7 +342,9 @@ public class DeviceRequest extends DomainResource { throw new FHIRException("Unknown RequestPriority code '"+codeString+"'"); } 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"; @@ -349,7 +353,7 @@ public class DeviceRequest extends DomainResource { if (code == RequestPriority.STAT) return "stat"; return "?"; - } + } public String toSystem(RequestPriority code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceUseStatement.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceUseStatement.java index 8b0fda213..e33f79213 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceUseStatement.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceUseStatement.java @@ -106,7 +106,7 @@ public class DeviceUseStatement extends DomainResource { case INTENDED: return "intended"; case STOPPED: return "stopped"; case ONHOLD: return "on-hold"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -118,7 +118,7 @@ public class DeviceUseStatement extends DomainResource { case INTENDED: return "http://hl7.org/fhir/device-statement-status"; case STOPPED: return "http://hl7.org/fhir/device-statement-status"; case ONHOLD: return "http://hl7.org/fhir/device-statement-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -130,7 +130,7 @@ public class DeviceUseStatement extends DomainResource { case INTENDED: return "The device may be used at some time in the future."; case STOPPED: return "Actions implied by the statement have been permanently halted, before all of them occurred."; case ONHOLD: return "Actions implied by the statement have been temporarily halted, but are expected to continue later. May also be called \"suspended\"."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -142,7 +142,7 @@ public class DeviceUseStatement extends DomainResource { case INTENDED: return "Intended"; case STOPPED: return "Stopped"; case ONHOLD: return "On Hold"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -190,7 +190,9 @@ public class DeviceUseStatement extends DomainResource { throw new FHIRException("Unknown DeviceUseStatementStatus code '"+codeString+"'"); } 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"; @@ -203,7 +205,7 @@ public class DeviceUseStatement extends DomainResource { if (code == DeviceUseStatementStatus.ONHOLD) return "on-hold"; return "?"; - } + } public String toSystem(DeviceUseStatementStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DiagnosticReport.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DiagnosticReport.java index ad61a0185..1402379b1 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DiagnosticReport.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DiagnosticReport.java @@ -137,7 +137,7 @@ public class DiagnosticReport extends DomainResource { case CANCELLED: return "cancelled"; case ENTEREDINERROR: return "entered-in-error"; case UNKNOWN: return "unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -153,7 +153,7 @@ public class DiagnosticReport extends DomainResource { case CANCELLED: return "http://hl7.org/fhir/diagnostic-report-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/diagnostic-report-status"; case UNKNOWN: return "http://hl7.org/fhir/diagnostic-report-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -169,7 +169,7 @@ public class DiagnosticReport extends DomainResource { case CANCELLED: return "The report is unavailable because the measurement was not started or not completed (also sometimes called \"aborted\")."; case ENTEREDINERROR: return "The report has been withdrawn following a previous final release. This electronic record should never have existed, though it is possible that real-world decisions were based on it. (If real-world activity has occurred, the status should be \"cancelled\" rather than \"entered-in-error\".)"; case UNKNOWN: return "The authoring system does not know which of the status values currently applies for this request. Note: This concept is not to be used for \"other\" - one of the listed statuses is presumed to apply, it's just not known which one."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -185,7 +185,7 @@ public class DiagnosticReport extends DomainResource { case CANCELLED: return "Cancelled"; case ENTEREDINERROR: return "Entered in Error"; case UNKNOWN: return "Unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -249,7 +249,9 @@ public class DiagnosticReport extends DomainResource { throw new FHIRException("Unknown DiagnosticReportStatus code '"+codeString+"'"); } 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"; @@ -270,7 +272,7 @@ public class DiagnosticReport extends DomainResource { if (code == DiagnosticReportStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(DiagnosticReportStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DocumentReference.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DocumentReference.java index 0de1e9b56..0414ab06c 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DocumentReference.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DocumentReference.java @@ -96,7 +96,7 @@ public class DocumentReference extends DomainResource { case FINAL: return "final"; case AMENDED: return "amended"; case ENTEREDINERROR: return "entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -106,7 +106,7 @@ public class DocumentReference extends DomainResource { case FINAL: return "http://hl7.org/fhir/composition-status"; case AMENDED: return "http://hl7.org/fhir/composition-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/composition-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -116,7 +116,7 @@ public class DocumentReference extends DomainResource { case FINAL: return "This version of the composition is complete and verified by an appropriate person and no further work is planned. Any subsequent updates would be on a new version of the composition."; case AMENDED: return "The composition content or the referenced resources have been modified (edited or added to) subsequent to being released as \"final\" and the composition is complete and verified by an authorized person."; case ENTEREDINERROR: return "The composition or document was originally created/issued in error, and this is an amendment that marks that the entire series should not be considered as valid."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -126,7 +126,7 @@ public class DocumentReference extends DomainResource { case FINAL: return "Final"; case AMENDED: return "Amended"; case ENTEREDINERROR: return "Entered in Error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -166,7 +166,9 @@ public class DocumentReference extends DomainResource { throw new FHIRException("Unknown ReferredDocumentStatus code '"+codeString+"'"); } 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"; @@ -175,7 +177,7 @@ public class DocumentReference extends DomainResource { if (code == ReferredDocumentStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(ReferredDocumentStatus code) { return code.getSystem(); } @@ -224,7 +226,7 @@ public class DocumentReference extends DomainResource { case TRANSFORMS: return "transforms"; case SIGNS: return "signs"; case APPENDS: return "appends"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -234,7 +236,7 @@ public class DocumentReference extends DomainResource { case TRANSFORMS: return "http://hl7.org/fhir/document-relationship-type"; case SIGNS: return "http://hl7.org/fhir/document-relationship-type"; case APPENDS: return "http://hl7.org/fhir/document-relationship-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -244,7 +246,7 @@ public class DocumentReference extends DomainResource { case TRANSFORMS: return "This document was generated by transforming the target document (e.g. format or language conversion)."; case SIGNS: return "This document is a signature of the target document."; case APPENDS: return "This document adds additional information to the target document."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -254,7 +256,7 @@ public class DocumentReference extends DomainResource { case TRANSFORMS: return "Transforms"; case SIGNS: return "Signs"; case APPENDS: return "Appends"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -294,7 +296,9 @@ public class DocumentReference extends DomainResource { throw new FHIRException("Unknown DocumentRelationshipType code '"+codeString+"'"); } 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"; @@ -303,7 +307,7 @@ public class DocumentReference extends DomainResource { if (code == DocumentRelationshipType.APPENDS) return "appends"; return "?"; - } + } public String toSystem(DocumentRelationshipType code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ElementDefinition.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ElementDefinition.java index 850082162..0f57386cf 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ElementDefinition.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ElementDefinition.java @@ -104,7 +104,7 @@ public class ElementDefinition extends Type implements ICompositeType { case TYPEATTR: return "typeAttr"; case CDATEXT: return "cdaText"; case XHTML: return "xhtml"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -115,7 +115,7 @@ public class ElementDefinition extends Type implements ICompositeType { case TYPEATTR: return "http://hl7.org/fhir/property-representation"; case CDATEXT: return "http://hl7.org/fhir/property-representation"; case XHTML: return "http://hl7.org/fhir/property-representation"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -126,7 +126,7 @@ public class ElementDefinition extends Type implements ICompositeType { case TYPEATTR: return "The type of this element is indicated using xsi:type"; case CDATEXT: return "Use CDA narrative instead of XHTML"; case XHTML: return "The property is represented using XHTML"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -137,7 +137,7 @@ public class ElementDefinition extends Type implements ICompositeType { case TYPEATTR: return "Type Attribute"; case CDATEXT: return "CDA Text Format"; case XHTML: return "XHTML"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -181,7 +181,9 @@ public class ElementDefinition extends Type implements ICompositeType { throw new FHIRException("Unknown PropertyRepresentation code '"+codeString+"'"); } 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"; @@ -192,7 +194,7 @@ public class ElementDefinition extends Type implements ICompositeType { if (code == PropertyRepresentation.XHTML) return "xhtml"; return "?"; - } + } public String toSystem(PropertyRepresentation code) { return code.getSystem(); } @@ -248,7 +250,7 @@ public class ElementDefinition extends Type implements ICompositeType { case PATTERN: return "pattern"; case TYPE: return "type"; case PROFILE: return "profile"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -259,7 +261,7 @@ public class ElementDefinition extends Type implements ICompositeType { case PATTERN: return "http://hl7.org/fhir/discriminator-type"; case TYPE: return "http://hl7.org/fhir/discriminator-type"; case PROFILE: return "http://hl7.org/fhir/discriminator-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -270,7 +272,7 @@ public class ElementDefinition extends Type implements ICompositeType { case PATTERN: return "The slices have different values in the nominated element, as determined by testing them against the applicable ElementDefinition.pattern[x]"; case TYPE: return "The slices are differentiated by type of the nominated element to a specifed profile"; case PROFILE: return "The slices are differentiated by conformance of the nominated element to a specifed profile"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -281,7 +283,7 @@ public class ElementDefinition extends Type implements ICompositeType { case PATTERN: return "Pattern"; case TYPE: return "Type"; case PROFILE: return "Profile"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -325,7 +327,9 @@ public class ElementDefinition extends Type implements ICompositeType { throw new FHIRException("Unknown DiscriminatorType code '"+codeString+"'"); } 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"; @@ -336,7 +340,7 @@ public class ElementDefinition extends Type implements ICompositeType { if (code == DiscriminatorType.PROFILE) return "profile"; return "?"; - } + } public String toSystem(DiscriminatorType code) { return code.getSystem(); } @@ -378,7 +382,7 @@ public class ElementDefinition extends Type implements ICompositeType { case CLOSED: return "closed"; case OPEN: return "open"; case OPENATEND: return "openAtEnd"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -387,7 +391,7 @@ public class ElementDefinition extends Type implements ICompositeType { case CLOSED: return "http://hl7.org/fhir/resource-slicing-rules"; case OPEN: return "http://hl7.org/fhir/resource-slicing-rules"; case OPENATEND: return "http://hl7.org/fhir/resource-slicing-rules"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -396,7 +400,7 @@ public class ElementDefinition extends Type implements ICompositeType { case CLOSED: return "No additional content is allowed other than that described by the slices in this profile."; case OPEN: return "Additional content is allowed anywhere in the list."; case OPENATEND: return "Additional content is allowed, but only at the end of the list. Note that using this requires that the slices be ordered, which makes it hard to share uses. This should only be done where absolutely required."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -405,7 +409,7 @@ public class ElementDefinition extends Type implements ICompositeType { case CLOSED: return "Closed"; case OPEN: return "Open"; case OPENATEND: return "Open at End"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -441,14 +445,16 @@ public class ElementDefinition extends Type implements ICompositeType { throw new FHIRException("Unknown SlicingRules code '"+codeString+"'"); } 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(); } @@ -490,7 +496,7 @@ public class ElementDefinition extends Type implements ICompositeType { case CONTAINED: return "contained"; case REFERENCED: return "referenced"; case BUNDLED: return "bundled"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -499,7 +505,7 @@ public class ElementDefinition extends Type implements ICompositeType { case CONTAINED: return "http://hl7.org/fhir/resource-aggregation-mode"; case REFERENCED: return "http://hl7.org/fhir/resource-aggregation-mode"; case BUNDLED: return "http://hl7.org/fhir/resource-aggregation-mode"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -508,7 +514,7 @@ public class ElementDefinition extends Type implements ICompositeType { case CONTAINED: return "The reference is a local reference to a contained resource."; case REFERENCED: return "The reference to a resource that has to be resolved externally to the resource that includes the reference."; case BUNDLED: return "The resource the reference points to will be found in the same bundle as the resource that includes the reference."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -517,7 +523,7 @@ public class ElementDefinition extends Type implements ICompositeType { case CONTAINED: return "Contained"; case REFERENCED: return "Referenced"; case BUNDLED: return "Bundled"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -553,14 +559,16 @@ public class ElementDefinition extends Type implements ICompositeType { throw new FHIRException("Unknown AggregationMode code '"+codeString+"'"); } 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(); } @@ -602,7 +610,7 @@ public class ElementDefinition extends Type implements ICompositeType { case EITHER: return "either"; case INDEPENDENT: return "independent"; case SPECIFIC: return "specific"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -611,7 +619,7 @@ public class ElementDefinition extends Type implements ICompositeType { case EITHER: return "http://hl7.org/fhir/reference-version-rules"; case INDEPENDENT: return "http://hl7.org/fhir/reference-version-rules"; case SPECIFIC: return "http://hl7.org/fhir/reference-version-rules"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -620,7 +628,7 @@ public class ElementDefinition extends Type implements ICompositeType { case EITHER: return "The reference may be either version independent or version specific"; case INDEPENDENT: return "The reference must be version independent"; case SPECIFIC: return "The reference must be version specific"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -629,7 +637,7 @@ public class ElementDefinition extends Type implements ICompositeType { case EITHER: return "Either Specific or independent"; case INDEPENDENT: return "Version independent"; case SPECIFIC: return "Version Specific"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -665,14 +673,16 @@ public class ElementDefinition extends Type implements ICompositeType { throw new FHIRException("Unknown ReferenceVersionRules code '"+codeString+"'"); } 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(); } @@ -707,7 +717,7 @@ public class ElementDefinition extends Type implements ICompositeType { switch (this) { case ERROR: return "error"; case WARNING: return "warning"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -715,7 +725,7 @@ public class ElementDefinition extends Type implements ICompositeType { switch (this) { case ERROR: return "http://hl7.org/fhir/constraint-severity"; case WARNING: return "http://hl7.org/fhir/constraint-severity"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -723,7 +733,7 @@ public class ElementDefinition extends Type implements ICompositeType { switch (this) { case ERROR: return "If the constraint is violated, the resource is not conformant."; case WARNING: return "If the constraint is violated, the resource is conformant, but it is not necessarily following best practice."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -731,7 +741,7 @@ public class ElementDefinition extends Type implements ICompositeType { switch (this) { case ERROR: return "Error"; case WARNING: return "Warning"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -763,12 +773,14 @@ public class ElementDefinition extends Type implements ICompositeType { throw new FHIRException("Unknown ConstraintSeverity code '"+codeString+"'"); } 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(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EligibilityRequest.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EligibilityRequest.java index fdcf7a507..675df3f5e 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EligibilityRequest.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EligibilityRequest.java @@ -93,7 +93,7 @@ public class EligibilityRequest extends DomainResource { case CANCELLED: return "cancelled"; case DRAFT: return "draft"; case ENTEREDINERROR: return "entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -103,7 +103,7 @@ public class EligibilityRequest extends DomainResource { case CANCELLED: return "http://hl7.org/fhir/fm-status"; case DRAFT: return "http://hl7.org/fhir/fm-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/fm-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -113,7 +113,7 @@ public class EligibilityRequest extends DomainResource { case CANCELLED: return "The instance is withdrawn, rescinded or reversed."; case DRAFT: return "A new instance the contents of which is not complete."; case ENTEREDINERROR: return "The instance was entered in error."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -123,7 +123,7 @@ public class EligibilityRequest extends DomainResource { case CANCELLED: return "Cancelled"; case DRAFT: return "Draft"; case ENTEREDINERROR: return "Entered in Error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -163,7 +163,9 @@ public class EligibilityRequest extends DomainResource { throw new FHIRException("Unknown EligibilityRequestStatus code '"+codeString+"'"); } 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"; @@ -172,7 +174,7 @@ public class EligibilityRequest extends DomainResource { if (code == EligibilityRequestStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(EligibilityRequestStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EligibilityResponse.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EligibilityResponse.java index 650b52983..c2e9c2f8e 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EligibilityResponse.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EligibilityResponse.java @@ -95,7 +95,7 @@ public class EligibilityResponse extends DomainResource { case CANCELLED: return "cancelled"; case DRAFT: return "draft"; case ENTEREDINERROR: return "entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -105,7 +105,7 @@ public class EligibilityResponse extends DomainResource { case CANCELLED: return "http://hl7.org/fhir/fm-status"; case DRAFT: return "http://hl7.org/fhir/fm-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/fm-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -115,7 +115,7 @@ public class EligibilityResponse extends DomainResource { case CANCELLED: return "The instance is withdrawn, rescinded or reversed."; case DRAFT: return "A new instance the contents of which is not complete."; case ENTEREDINERROR: return "The instance was entered in error."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -125,7 +125,7 @@ public class EligibilityResponse extends DomainResource { case CANCELLED: return "Cancelled"; case DRAFT: return "Draft"; case ENTEREDINERROR: return "Entered in Error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -165,7 +165,9 @@ public class EligibilityResponse extends DomainResource { throw new FHIRException("Unknown EligibilityResponseStatus code '"+codeString+"'"); } 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"; @@ -174,7 +176,7 @@ public class EligibilityResponse extends DomainResource { if (code == EligibilityResponseStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(EligibilityResponseStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Encounter.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Encounter.java index e104cf860..9bc58f810 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Encounter.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Encounter.java @@ -127,7 +127,7 @@ public class Encounter extends DomainResource { case CANCELLED: return "cancelled"; case ENTEREDINERROR: return "entered-in-error"; case UNKNOWN: return "unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -142,7 +142,7 @@ public class Encounter extends DomainResource { case CANCELLED: return "http://hl7.org/fhir/encounter-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/encounter-status"; case UNKNOWN: return "http://hl7.org/fhir/encounter-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -157,7 +157,7 @@ public class Encounter extends DomainResource { case CANCELLED: return "The Encounter has ended before it has begun."; case ENTEREDINERROR: return "This instance should not have been part of this patient's medical record."; case UNKNOWN: return "The encounter status is unknown. Note that \"unknown\" is a value of last resort and every attempt should be made to provide a meaningful value other than \"unknown\"."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -172,7 +172,7 @@ public class Encounter extends DomainResource { case CANCELLED: return "Cancelled"; case ENTEREDINERROR: return "Entered in Error"; case UNKNOWN: return "Unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -232,7 +232,9 @@ public class Encounter extends DomainResource { throw new FHIRException("Unknown EncounterStatus code '"+codeString+"'"); } 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"; @@ -251,7 +253,7 @@ public class Encounter extends DomainResource { if (code == EncounterStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(EncounterStatus code) { return code.getSystem(); } @@ -304,7 +306,7 @@ Not to be used when the patient is currently at the location case ACTIVE: return "active"; case RESERVED: return "reserved"; case COMPLETED: return "completed"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -314,7 +316,7 @@ Not to be used when the patient is currently at the location case ACTIVE: return "http://hl7.org/fhir/encounter-location-status"; case RESERVED: return "http://hl7.org/fhir/encounter-location-status"; case COMPLETED: return "http://hl7.org/fhir/encounter-location-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -324,7 +326,7 @@ Not to be used when the patient is currently at the location case ACTIVE: return "The patient is currently at this location, or was between the period specified.\r\rA system may update these records when the patient leaves the location to either reserved, or completed"; case RESERVED: return "This location is held empty for this patient."; case COMPLETED: return "The patient was at this location during the period specified.\r\rNot to be used when the patient is currently at the location"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -334,7 +336,7 @@ Not to be used when the patient is currently at the location case ACTIVE: return "Active"; case RESERVED: return "Reserved"; case COMPLETED: return "Completed"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -374,7 +376,9 @@ Not to be used when the patient is currently at the location throw new FHIRException("Unknown EncounterLocationStatus code '"+codeString+"'"); } 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"; @@ -383,7 +387,7 @@ Not to be used when the patient is currently at the location if (code == EncounterLocationStatus.COMPLETED) return "completed"; return "?"; - } + } public String toSystem(EncounterLocationStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Endpoint.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Endpoint.java index fb52741bf..deb26671c 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Endpoint.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Endpoint.java @@ -105,7 +105,7 @@ public class Endpoint extends DomainResource { case OFF: return "off"; case ENTEREDINERROR: return "entered-in-error"; case TEST: return "test"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -117,7 +117,7 @@ public class Endpoint extends DomainResource { case OFF: return "http://hl7.org/fhir/endpoint-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/endpoint-status"; case TEST: return "http://hl7.org/fhir/endpoint-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -129,7 +129,7 @@ public class Endpoint extends DomainResource { case OFF: return "This endpoint is no longer to be used"; case ENTEREDINERROR: return "This instance should not have been part of this patient's medical record."; case TEST: return "This endpoint is not intended for production usage."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -141,7 +141,7 @@ public class Endpoint extends DomainResource { case OFF: return "Off"; case ENTEREDINERROR: return "Entered in error"; case TEST: return "Test"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -189,7 +189,9 @@ public class Endpoint extends DomainResource { throw new FHIRException("Unknown EndpointStatus code '"+codeString+"'"); } 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"; @@ -202,7 +204,7 @@ public class Endpoint extends DomainResource { if (code == EndpointStatus.TEST) return "test"; return "?"; - } + } public String toSystem(EndpointStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EnrollmentRequest.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EnrollmentRequest.java index cfc4e39ca..f8d89d0e8 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EnrollmentRequest.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EnrollmentRequest.java @@ -91,7 +91,7 @@ public class EnrollmentRequest extends DomainResource { case CANCELLED: return "cancelled"; case DRAFT: return "draft"; case ENTEREDINERROR: return "entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -101,7 +101,7 @@ public class EnrollmentRequest extends DomainResource { case CANCELLED: return "http://hl7.org/fhir/fm-status"; case DRAFT: return "http://hl7.org/fhir/fm-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/fm-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -111,7 +111,7 @@ public class EnrollmentRequest extends DomainResource { case CANCELLED: return "The instance is withdrawn, rescinded or reversed."; case DRAFT: return "A new instance the contents of which is not complete."; case ENTEREDINERROR: return "The instance was entered in error."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -121,7 +121,7 @@ public class EnrollmentRequest extends DomainResource { case CANCELLED: return "Cancelled"; case DRAFT: return "Draft"; case ENTEREDINERROR: return "Entered in Error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -161,7 +161,9 @@ public class EnrollmentRequest extends DomainResource { throw new FHIRException("Unknown EnrollmentRequestStatus code '"+codeString+"'"); } 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"; @@ -170,7 +172,7 @@ public class EnrollmentRequest extends DomainResource { if (code == EnrollmentRequestStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(EnrollmentRequestStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EnrollmentResponse.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EnrollmentResponse.java index 37ca34f7f..a9c228864 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EnrollmentResponse.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EnrollmentResponse.java @@ -92,7 +92,7 @@ public class EnrollmentResponse extends DomainResource { case CANCELLED: return "cancelled"; case DRAFT: return "draft"; case ENTEREDINERROR: return "entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -102,7 +102,7 @@ public class EnrollmentResponse extends DomainResource { case CANCELLED: return "http://hl7.org/fhir/fm-status"; case DRAFT: return "http://hl7.org/fhir/fm-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/fm-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -112,7 +112,7 @@ public class EnrollmentResponse extends DomainResource { case CANCELLED: return "The instance is withdrawn, rescinded or reversed."; case DRAFT: return "A new instance the contents of which is not complete."; case ENTEREDINERROR: return "The instance was entered in error."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -122,7 +122,7 @@ public class EnrollmentResponse extends DomainResource { case CANCELLED: return "Cancelled"; case DRAFT: return "Draft"; case ENTEREDINERROR: return "Entered in Error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -162,7 +162,9 @@ public class EnrollmentResponse extends DomainResource { throw new FHIRException("Unknown EnrollmentResponseStatus code '"+codeString+"'"); } 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"; @@ -171,7 +173,7 @@ public class EnrollmentResponse extends DomainResource { if (code == EnrollmentResponseStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(EnrollmentResponseStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Enumerations.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Enumerations.java index 69f678f33..0e434591a 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Enumerations.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Enumerations.java @@ -1,33 +1,33 @@ package org.hl7.fhir.dstu3.model; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - - */ +/* + Copyright (c) 2011+, HL7, Inc. + All rights reserved. + + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of HL7 nor the names of its contributors may be used to + endorse or promote products derived from this software without specific + prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + + */ import org.hl7.fhir.exceptions.FHIRException; @@ -80,7 +80,7 @@ public class Enumerations { switch (this) { case TYPE: return "Type"; case ANY: return "Any"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -88,7 +88,7 @@ public class Enumerations { switch (this) { case TYPE: return "http://hl7.org/fhir/abstract-types"; case ANY: return "http://hl7.org/fhir/abstract-types"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -96,7 +96,7 @@ public class Enumerations { switch (this) { case TYPE: return "A place holder that means any kind of data type"; case ANY: return "A place holder that means any kind of resource"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -104,7 +104,7 @@ public class Enumerations { switch (this) { case TYPE: return "Type"; case ANY: return "Any"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -136,12 +136,14 @@ public class Enumerations { throw new FHIRException("Unknown AbstractType code '"+codeString+"'"); } 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(); } @@ -187,7 +189,7 @@ public class Enumerations { case FEMALE: return "female"; case OTHER: return "other"; case UNKNOWN: return "unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -197,7 +199,7 @@ public class Enumerations { case FEMALE: return "http://hl7.org/fhir/administrative-gender"; case OTHER: return "http://hl7.org/fhir/administrative-gender"; case UNKNOWN: return "http://hl7.org/fhir/administrative-gender"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -207,7 +209,7 @@ public class Enumerations { case FEMALE: return "Female"; case OTHER: return "Other"; case UNKNOWN: return "Unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -217,7 +219,7 @@ public class Enumerations { case FEMALE: return "Female"; case OTHER: return "Other"; case UNKNOWN: return "Unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -257,7 +259,9 @@ public class Enumerations { throw new FHIRException("Unknown AdministrativeGender code '"+codeString+"'"); } 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"; @@ -266,7 +270,7 @@ public class Enumerations { if (code == AdministrativeGender.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(AdministrativeGender code) { return code.getSystem(); } @@ -326,7 +330,7 @@ public class Enumerations { case WK: return "wk"; case MO: return "mo"; case A: return "a"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -338,7 +342,7 @@ public class Enumerations { case WK: return "http://unitsofmeasure.org"; case MO: return "http://unitsofmeasure.org"; case A: return "http://unitsofmeasure.org"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -350,7 +354,7 @@ public class Enumerations { case WK: return ""; case MO: return ""; case A: return ""; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -362,7 +366,7 @@ public class Enumerations { case WK: return "Week"; case MO: return "Month"; case A: return "Year"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -410,7 +414,9 @@ public class Enumerations { throw new FHIRException("Unknown AgeUnits code '"+codeString+"'"); } 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"; @@ -423,7 +429,7 @@ public class Enumerations { if (code == AgeUnits.A) return "a"; return "?"; - } + } public String toSystem(AgeUnits code) { return code.getSystem(); } @@ -469,7 +475,7 @@ public class Enumerations { case EXTENSIBLE: return "extensible"; case PREFERRED: return "preferred"; case EXAMPLE: return "example"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -479,7 +485,7 @@ public class Enumerations { case EXTENSIBLE: return "http://hl7.org/fhir/binding-strength"; case PREFERRED: return "http://hl7.org/fhir/binding-strength"; case EXAMPLE: return "http://hl7.org/fhir/binding-strength"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -489,7 +495,7 @@ public class Enumerations { case EXTENSIBLE: return "To be conformant, the concept in this element SHALL be from the specified value set if any of the codes within the value set can apply to the concept being communicated. If the value set does not cover the concept (based on human review), alternate codings (or, data type allowing, text) may be included instead."; case PREFERRED: return "Instances are encouraged to draw from the specified codes for interoperability purposes but are not required to do so to be considered conformant."; case EXAMPLE: return "Instances are not expected or even encouraged to draw from the specified value set. The value set merely provides examples of the types of concepts intended to be included."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -499,7 +505,7 @@ public class Enumerations { case EXTENSIBLE: return "Extensible"; case PREFERRED: return "Preferred"; case EXAMPLE: return "Example"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -539,7 +545,9 @@ public class Enumerations { throw new FHIRException("Unknown BindingStrength code '"+codeString+"'"); } 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"; @@ -548,7 +556,7 @@ public class Enumerations { if (code == BindingStrength.EXAMPLE) return "example"; return "?"; - } + } public String toSystem(BindingStrength code) { return code.getSystem(); } @@ -636,7 +644,7 @@ public class Enumerations { case INEXACT: return "inexact"; case UNMATCHED: return "unmatched"; case DISJOINT: return "disjoint"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -652,7 +660,7 @@ public class Enumerations { case INEXACT: return "http://hl7.org/fhir/concept-map-equivalence"; case UNMATCHED: return "http://hl7.org/fhir/concept-map-equivalence"; case DISJOINT: return "http://hl7.org/fhir/concept-map-equivalence"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -668,7 +676,7 @@ public class Enumerations { case INEXACT: return "The target mapping overlaps with the source concept, but both source and target cover additional meaning, or the definitions are imprecise and it is uncertain whether they have the same boundaries to their meaning. The sense in which the mapping is narrower SHALL be described in the comments in this case, and applications should be careful when attempting to use these mappings operationally."; case UNMATCHED: return "There is no match for this concept in the destination concept system."; case DISJOINT: return "This is an explicit assertion that there is no mapping between the source and target concept."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -684,7 +692,7 @@ public class Enumerations { case INEXACT: return "Inexact"; case UNMATCHED: return "Unmatched"; case DISJOINT: return "Disjoint"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -748,7 +756,9 @@ public class Enumerations { throw new FHIRException("Unknown ConceptMapEquivalence code '"+codeString+"'"); } 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"; @@ -769,7 +779,7 @@ public class Enumerations { if (code == ConceptMapEquivalence.DISJOINT) return "disjoint"; return "?"; - } + } public String toSystem(ConceptMapEquivalence code) { return code.getSystem(); } @@ -857,7 +867,7 @@ public class Enumerations { case ERROR: return "error"; case NAN: return "NaN"; case NOTPERFORMED: return "not-performed"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -873,7 +883,7 @@ public class Enumerations { case ERROR: return "http://hl7.org/fhir/data-absent-reason"; case NAN: return "http://hl7.org/fhir/data-absent-reason"; case NOTPERFORMED: return "http://hl7.org/fhir/data-absent-reason"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -889,7 +899,7 @@ public class Enumerations { case ERROR: return "Some system or workflow process error means that the information is not available."; case NAN: return "NaN, standing for not a number, is a numeric data type value representing an undefined or unrepresentable value."; case NOTPERFORMED: return "The value is not available because the observation procedure (test, etc.) was not performed."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -905,7 +915,7 @@ public class Enumerations { case ERROR: return "Error"; case NAN: return "Not a Number"; case NOTPERFORMED: return "Not Performed"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -969,7 +979,9 @@ public class Enumerations { throw new FHIRException("Unknown DataAbsentReason code '"+codeString+"'"); } public String toCode(DataAbsentReason code) { - if (code == DataAbsentReason.UNKNOWN) + if (code == DataAbsentReason.NULL) + return null; + if (code == DataAbsentReason.UNKNOWN) return "unknown"; if (code == DataAbsentReason.ASKED) return "asked"; @@ -990,7 +1002,7 @@ public class Enumerations { if (code == DataAbsentReason.NOTPERFORMED) return "not-performed"; return "?"; - } + } public String toSystem(DataAbsentReason code) { return code.getSystem(); } @@ -1386,7 +1398,7 @@ public class Enumerations { case URI: return "uri"; case UUID: return "uuid"; case XHTML: return "xhtml"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1446,7 +1458,7 @@ public class Enumerations { case URI: return "http://hl7.org/fhir/data-types"; case UUID: return "http://hl7.org/fhir/data-types"; case XHTML: return "http://hl7.org/fhir/data-types"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1506,7 +1518,7 @@ public class Enumerations { case URI: return "String of characters used to identify a name or a resource"; case UUID: return "A UUID, represented as a URI"; case XHTML: return "XHTML format, as defined by W3C, but restricted usage (mainly, no active content)"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1566,7 +1578,7 @@ public class Enumerations { case URI: return "uri"; case UUID: return "uuid"; case XHTML: return "XHTML"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1806,7 +1818,9 @@ public class Enumerations { throw new FHIRException("Unknown DataType code '"+codeString+"'"); } 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"; @@ -1915,7 +1929,7 @@ public class Enumerations { if (code == DataType.XHTML) return "xhtml"; return "?"; - } + } public String toSystem(DataType code) { return code.getSystem(); } @@ -1954,7 +1968,7 @@ public class Enumerations { case CURRENT: return "current"; case SUPERSEDED: return "superseded"; case ENTEREDINERROR: return "entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1963,7 +1977,7 @@ public class Enumerations { case CURRENT: return "http://hl7.org/fhir/document-reference-status"; case SUPERSEDED: return "http://hl7.org/fhir/document-reference-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/document-reference-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1972,7 +1986,7 @@ public class Enumerations { case CURRENT: return "This is the current reference for this document."; case SUPERSEDED: return "This reference has been superseded by another reference."; case ENTEREDINERROR: return "This reference was created in error."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1981,7 +1995,7 @@ public class Enumerations { case CURRENT: return "Current"; case SUPERSEDED: return "Superseded"; case ENTEREDINERROR: return "Entered in Error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -2017,14 +2031,16 @@ public class Enumerations { throw new FHIRException("Unknown DocumentReferenceStatus code '"+codeString+"'"); } 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(); } @@ -3269,7 +3285,7 @@ The primary difference between a medication statement and a medication administr case VISIONPRESCRIPTION: return "VisionPrescription"; case TYPE: return "Type"; case ANY: return "Any"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -3450,7 +3466,7 @@ The primary difference between a medication statement and a medication administr case VISIONPRESCRIPTION: return "http://hl7.org/fhir/resource-types"; case TYPE: return "http://hl7.org/fhir/abstract-types"; case ANY: return "http://hl7.org/fhir/abstract-types"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -3631,7 +3647,7 @@ The primary difference between a medication statement and a medication administr case VISIONPRESCRIPTION: return "An authorization for the supply of glasses and/or contact lenses to a patient."; case TYPE: return "A place holder that means any kind of data type"; case ANY: return "A place holder that means any kind of resource"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -3812,7 +3828,7 @@ The primary difference between a medication statement and a medication administr case VISIONPRESCRIPTION: return "VisionPrescription"; case TYPE: return "Type"; case ANY: return "Any"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -4536,7 +4552,9 @@ The primary difference between a medication statement and a medication administr throw new FHIRException("Unknown FHIRAllTypes code '"+codeString+"'"); } 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"; @@ -4887,7 +4905,7 @@ The primary difference between a medication statement and a medication administr if (code == FHIRAllTypes.ANY) return "Any"; return "?"; - } + } public String toSystem(FHIRAllTypes code) { return code.getSystem(); } @@ -6118,7 +6136,7 @@ The primary difference between a medication statement and a medication administr case TESTSCRIPT: return "TestScript"; case VALUESET: return "ValueSet"; case VISIONPRESCRIPTION: return "VisionPrescription"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -6297,7 +6315,7 @@ The primary difference between a medication statement and a medication administr case TESTSCRIPT: return "http://hl7.org/fhir/resource-types"; case VALUESET: return "http://hl7.org/fhir/resource-types"; case VISIONPRESCRIPTION: return "http://hl7.org/fhir/resource-types"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -6476,7 +6494,7 @@ The primary difference between a medication statement and a medication administr case TESTSCRIPT: return "A structured set of tests against a FHIR server implementation to determine compliance against the FHIR specification."; case VALUESET: return "A value set specifies a set of codes drawn from one or more code systems."; case VISIONPRESCRIPTION: return "An authorization for the supply of glasses and/or contact lenses to a patient."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -6655,7 +6673,7 @@ The primary difference between a medication statement and a medication administr case TESTSCRIPT: return "TestScript"; case VALUESET: return "ValueSet"; case VISIONPRESCRIPTION: return "VisionPrescription"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -7371,7 +7389,9 @@ The primary difference between a medication statement and a medication administr throw new FHIRException("Unknown FHIRDefinedType code '"+codeString+"'"); } 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"; @@ -7718,7 +7738,7 @@ The primary difference between a medication statement and a medication administr if (code == FHIRDefinedType.VISIONPRESCRIPTION) return "VisionPrescription"; return "?"; - } + } public String toSystem(FHIRDefinedType code) { return code.getSystem(); } @@ -7820,7 +7840,7 @@ The primary difference between a medication statement and a medication administr case PATIENTLINK: return "patient-link"; case PATIENTUNLINK: return "patient-unlink"; case VALUESETEXPAND: return "valueset-expand"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -7838,7 +7858,7 @@ The primary difference between a medication statement and a medication administr case PATIENTLINK: return "http://hl7.org/fhir/message-events"; case PATIENTUNLINK: return "http://hl7.org/fhir/message-events"; case VALUESETEXPAND: return "http://hl7.org/fhir/message-events"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -7856,7 +7876,7 @@ The primary difference between a medication statement and a medication administr case PATIENTLINK: return "Notification that two patient records actually identify the same patient."; case PATIENTUNLINK: return "Notification that previous advice that two patient records concern the same patient is now considered incorrect."; case VALUESETEXPAND: return "The definition of a value set is used to create a simple collection of codes suitable for use for data entry or validation. An expanded value set will be returned, or an error message."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -7874,7 +7894,7 @@ The primary difference between a medication statement and a medication administr case PATIENTLINK: return "patient-link"; case PATIENTUNLINK: return "patient-unlink"; case VALUESETEXPAND: return "valueset-expand"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -7946,7 +7966,9 @@ The primary difference between a medication statement and a medication administr throw new FHIRException("Unknown MessageEvent code '"+codeString+"'"); } public String toCode(MessageEvent code) { - if (code == MessageEvent.CODESYSTEMEXPAND) + if (code == MessageEvent.NULL) + return null; + if (code == MessageEvent.CODESYSTEMEXPAND) return "CodeSystem-expand"; if (code == MessageEvent.MEDICATIONADMINISTRATIONCOMPLETE) return "MedicationAdministration-Complete"; @@ -7971,7 +7993,7 @@ The primary difference between a medication statement and a medication administr if (code == MessageEvent.VALUESETEXPAND) return "valueset-expand"; return "?"; - } + } public String toSystem(MessageEvent code) { return code.getSystem(); } @@ -8010,7 +8032,7 @@ The primary difference between a medication statement and a medication administr case DISPLAY: return "display"; case PRINT: return "print"; case PRINTOPER: return "printoper"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -8019,7 +8041,7 @@ The primary difference between a medication statement and a medication administr case DISPLAY: return "http://hl7.org/fhir/note-type"; case PRINT: return "http://hl7.org/fhir/note-type"; case PRINTOPER: return "http://hl7.org/fhir/note-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -8028,7 +8050,7 @@ The primary difference between a medication statement and a medication administr case DISPLAY: return "Display the note."; case PRINT: return "Print the note on the form."; case PRINTOPER: return "Print the note for the operator."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -8037,7 +8059,7 @@ The primary difference between a medication statement and a medication administr case DISPLAY: return "Display"; case PRINT: return "Print (Form)"; case PRINTOPER: return "Print (Operator)"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -8073,14 +8095,16 @@ The primary difference between a medication statement and a medication administr throw new FHIRException("Unknown NoteType code '"+codeString+"'"); } 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(); } @@ -8126,7 +8150,7 @@ The primary difference between a medication statement and a medication administr case ACTIVE: return "active"; case RETIRED: return "retired"; case UNKNOWN: return "unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -8136,7 +8160,7 @@ The primary difference between a medication statement and a medication administr case ACTIVE: return "http://hl7.org/fhir/publication-status"; case RETIRED: return "http://hl7.org/fhir/publication-status"; case UNKNOWN: return "http://hl7.org/fhir/publication-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -8146,7 +8170,7 @@ The primary difference between a medication statement and a medication administr case ACTIVE: return "This resource is ready for normal use."; case RETIRED: return "This resource has been withdrawn or superseded and should no longer be used."; case UNKNOWN: return "The authoring system does not know which of the status values currently applies for this resource. Note: This concept is not to be used for \"other\" - one of the listed statuses is presumed to apply, it's just not known which one."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -8156,7 +8180,7 @@ The primary difference between a medication statement and a medication administr case ACTIVE: return "Active"; case RETIRED: return "Retired"; case UNKNOWN: return "Unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -8196,7 +8220,9 @@ The primary difference between a medication statement and a medication administr throw new FHIRException("Unknown PublicationStatus code '"+codeString+"'"); } 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"; @@ -8205,7 +8231,7 @@ The primary difference between a medication statement and a medication administr if (code == PublicationStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(PublicationStatus code) { return code.getSystem(); } @@ -8244,7 +8270,7 @@ The primary difference between a medication statement and a medication administr case COMPLETE: return "complete"; case ERROR: return "error"; case PARTIAL: return "partial"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -8253,7 +8279,7 @@ The primary difference between a medication statement and a medication administr case COMPLETE: return "http://hl7.org/fhir/remittance-outcome"; case ERROR: return "http://hl7.org/fhir/remittance-outcome"; case PARTIAL: return "http://hl7.org/fhir/remittance-outcome"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -8262,7 +8288,7 @@ The primary difference between a medication statement and a medication administr case COMPLETE: return "The processing has completed without errors"; case ERROR: return "One or more errors have been detected in the Claim"; case PARTIAL: return "No errors have been detected in the Claim and some of the adjudication has been performed."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -8271,7 +8297,7 @@ The primary difference between a medication statement and a medication administr case COMPLETE: return "Processing Complete"; case ERROR: return "Error"; case PARTIAL: return "Partial Processing"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -8307,14 +8333,16 @@ The primary difference between a medication statement and a medication administr throw new FHIRException("Unknown RemittanceOutcome code '"+codeString+"'"); } public String toCode(RemittanceOutcome code) { - if (code == RemittanceOutcome.COMPLETE) + if (code == RemittanceOutcome.NULL) + return null; + if (code == RemittanceOutcome.COMPLETE) return "complete"; if (code == RemittanceOutcome.ERROR) return "error"; if (code == RemittanceOutcome.PARTIAL) return "partial"; return "?"; - } + } public String toSystem(RemittanceOutcome code) { return code.getSystem(); } @@ -9167,7 +9195,7 @@ The primary difference between a medication statement and a medication administr case TESTSCRIPT: return "TestScript"; case VALUESET: return "ValueSet"; case VISIONPRESCRIPTION: return "VisionPrescription"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -9292,7 +9320,7 @@ The primary difference between a medication statement and a medication administr case TESTSCRIPT: return "http://hl7.org/fhir/resource-types"; case VALUESET: return "http://hl7.org/fhir/resource-types"; case VISIONPRESCRIPTION: return "http://hl7.org/fhir/resource-types"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -9417,7 +9445,7 @@ The primary difference between a medication statement and a medication administr case TESTSCRIPT: return "A structured set of tests against a FHIR server implementation to determine compliance against the FHIR specification."; case VALUESET: return "A value set specifies a set of codes drawn from one or more code systems."; case VISIONPRESCRIPTION: return "An authorization for the supply of glasses and/or contact lenses to a patient."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -9542,7 +9570,7 @@ The primary difference between a medication statement and a medication administr case TESTSCRIPT: return "TestScript"; case VALUESET: return "ValueSet"; case VISIONPRESCRIPTION: return "VisionPrescription"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -10042,7 +10070,9 @@ The primary difference between a medication statement and a medication administr throw new FHIRException("Unknown ResourceType code '"+codeString+"'"); } 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"; @@ -10281,7 +10311,7 @@ The primary difference between a medication statement and a medication administr if (code == ResourceType.VISIONPRESCRIPTION) return "VisionPrescription"; return "?"; - } + } public String toSystem(ResourceType code) { return code.getSystem(); } @@ -10355,7 +10385,7 @@ The primary difference between a medication statement and a medication administr case COMPOSITE: return "composite"; case QUANTITY: return "quantity"; case URI: return "uri"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -10369,7 +10399,7 @@ The primary difference between a medication statement and a medication administr case COMPOSITE: return "http://hl7.org/fhir/search-param-type"; case QUANTITY: return "http://hl7.org/fhir/search-param-type"; case URI: return "http://hl7.org/fhir/search-param-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -10383,7 +10413,7 @@ The primary difference between a medication statement and a medication administr case COMPOSITE: return "A composite search parameter that combines a search on two values together."; case QUANTITY: return "A search parameter that searches on a quantity."; case URI: return "A search parameter that searches on a URI (RFC 3986)."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -10397,7 +10427,7 @@ The primary difference between a medication statement and a medication administr case COMPOSITE: return "Composite"; case QUANTITY: return "Quantity"; case URI: return "URI"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -10453,7 +10483,9 @@ The primary difference between a medication statement and a medication administr throw new FHIRException("Unknown SearchParamType code '"+codeString+"'"); } 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"; @@ -10470,7 +10502,7 @@ The primary difference between a medication statement and a medication administr if (code == SearchParamType.URI) return "uri"; return "?"; - } + } public String toSystem(SearchParamType code) { return code.getSystem(); } @@ -10530,7 +10562,7 @@ The primary difference between a medication statement and a medication administr case SUFFICIENT: return "sufficient"; case WITHDRAWN: return "withdrawn"; case NILKNOWN: return "nil-known"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -10542,7 +10574,7 @@ The primary difference between a medication statement and a medication administr case SUFFICIENT: return "http://hl7.org/fhir/special-values"; case WITHDRAWN: return "http://hl7.org/fhir/special-values"; case NILKNOWN: return "http://hl7.org/fhir/special-values"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -10554,7 +10586,7 @@ The primary difference between a medication statement and a medication administr case SUFFICIENT: return "The specific quantity is not known, but is known to be non-zero and is not specified because it makes up the bulk of the material."; case WITHDRAWN: return "The value is no longer available."; case NILKNOWN: return "The are no known applicable values in this context."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -10566,7 +10598,7 @@ The primary difference between a medication statement and a medication administr case SUFFICIENT: return "Sufficient Quantity"; case WITHDRAWN: return "Value Withdrawn"; case NILKNOWN: return "Nil Known"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -10614,7 +10646,9 @@ The primary difference between a medication statement and a medication administr throw new FHIRException("Unknown SpecialValues code '"+codeString+"'"); } 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"; @@ -10627,7 +10661,7 @@ The primary difference between a medication statement and a medication administr if (code == SpecialValues.NILKNOWN) return "nil-known"; return "?"; - } + } public String toSystem(SpecialValues code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EpisodeOfCare.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EpisodeOfCare.java index b2c7a81f4..628f4142c 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EpisodeOfCare.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EpisodeOfCare.java @@ -113,7 +113,7 @@ public class EpisodeOfCare extends DomainResource { case FINISHED: return "finished"; case CANCELLED: return "cancelled"; case ENTEREDINERROR: return "entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -126,7 +126,7 @@ public class EpisodeOfCare extends DomainResource { case FINISHED: return "http://hl7.org/fhir/episode-of-care-status"; case CANCELLED: return "http://hl7.org/fhir/episode-of-care-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/episode-of-care-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -139,7 +139,7 @@ public class EpisodeOfCare extends DomainResource { case FINISHED: return "This episode of care is finished and the organization is not expecting to be providing further care to the patient. Can also be known as \"closed\", \"completed\" or other similar terms."; case CANCELLED: return "The episode of care was cancelled, or withdrawn from service, often selected during the planned stage as the patient may have gone elsewhere, or the circumstances have changed and the organization is unable to provide the care. It indicates that services terminated outside the planned/expected workflow."; case ENTEREDINERROR: return "This instance should not have been part of this patient's medical record."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -152,7 +152,7 @@ public class EpisodeOfCare extends DomainResource { case FINISHED: return "Finished"; case CANCELLED: return "Cancelled"; case ENTEREDINERROR: return "Entered in Error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -204,7 +204,9 @@ public class EpisodeOfCare extends DomainResource { throw new FHIRException("Unknown EpisodeOfCareStatus code '"+codeString+"'"); } 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"; @@ -219,7 +221,7 @@ public class EpisodeOfCare extends DomainResource { if (code == EpisodeOfCareStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(EpisodeOfCareStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ExpansionProfile.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ExpansionProfile.java index b4850b9b7..f8aa8cae1 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ExpansionProfile.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ExpansionProfile.java @@ -91,7 +91,7 @@ public class ExpansionProfile extends MetadataResource { case DEFAULT: return "default"; case CHECK: return "check"; case OVERRIDE: return "override"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -100,7 +100,7 @@ public class ExpansionProfile extends MetadataResource { case DEFAULT: return "http://hl7.org/fhir/system-version-processing-mode"; case CHECK: return "http://hl7.org/fhir/system-version-processing-mode"; case OVERRIDE: return "http://hl7.org/fhir/system-version-processing-mode"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -109,7 +109,7 @@ public class ExpansionProfile extends MetadataResource { case DEFAULT: return "Use this version of the code system if a value set doesn't specify a version"; case CHECK: return "Use this version of the code system. If a value set specifies a different version, the expansion operation should fail"; case OVERRIDE: return "Use this version of the code system irrespective of which version is specified by a value set. Note that this has obvious safety issues, in that it may result in a value set expansion giving a different list of codes that is both wrong and unsafe, and implementers should only use this capability reluctantly. It primarily exists to deal with situations where specifications have fallen into decay as time passes. If a version is override, the version used SHALL explicitly be represented in the expansion parameters"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -118,7 +118,7 @@ public class ExpansionProfile extends MetadataResource { case DEFAULT: return "Default Version"; case CHECK: return "Check ValueSet Version"; case OVERRIDE: return "Override ValueSet Version"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -154,14 +154,16 @@ public class ExpansionProfile extends MetadataResource { throw new FHIRException("Unknown SystemVersionProcessingMode code '"+codeString+"'"); } public String toCode(SystemVersionProcessingMode code) { - if (code == SystemVersionProcessingMode.DEFAULT) + if (code == SystemVersionProcessingMode.NULL) + return null; + if (code == SystemVersionProcessingMode.DEFAULT) return "default"; if (code == SystemVersionProcessingMode.CHECK) return "check"; if (code == SystemVersionProcessingMode.OVERRIDE) return "override"; return "?"; - } + } public String toSystem(SystemVersionProcessingMode code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ExplanationOfBenefit.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ExplanationOfBenefit.java index fc6f43b5e..8836c82bf 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ExplanationOfBenefit.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ExplanationOfBenefit.java @@ -95,7 +95,7 @@ public class ExplanationOfBenefit extends DomainResource { case CANCELLED: return "cancelled"; case DRAFT: return "draft"; case ENTEREDINERROR: return "entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -105,7 +105,7 @@ public class ExplanationOfBenefit extends DomainResource { case CANCELLED: return "http://hl7.org/fhir/explanationofbenefit-status"; case DRAFT: return "http://hl7.org/fhir/explanationofbenefit-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/explanationofbenefit-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -115,7 +115,7 @@ public class ExplanationOfBenefit extends DomainResource { case CANCELLED: return "The resource instance is withdrawn, rescinded or reversed."; case DRAFT: return "A new resource instance the contents of which is not complete."; case ENTEREDINERROR: return "The resource instance was entered in error."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -125,7 +125,7 @@ public class ExplanationOfBenefit extends DomainResource { case CANCELLED: return "Cancelled"; case DRAFT: return "Draft"; case ENTEREDINERROR: return "Entered In Error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -165,7 +165,9 @@ public class ExplanationOfBenefit extends DomainResource { throw new FHIRException("Unknown ExplanationOfBenefitStatus code '"+codeString+"'"); } 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"; @@ -174,7 +176,7 @@ public class ExplanationOfBenefit extends DomainResource { if (code == ExplanationOfBenefitStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(ExplanationOfBenefitStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/FamilyMemberHistory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/FamilyMemberHistory.java index e6d8a2b3b..27f34d692 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/FamilyMemberHistory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/FamilyMemberHistory.java @@ -97,7 +97,7 @@ public class FamilyMemberHistory extends DomainResource { case COMPLETED: return "completed"; case ENTEREDINERROR: return "entered-in-error"; case HEALTHUNKNOWN: return "health-unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -107,7 +107,7 @@ public class FamilyMemberHistory extends DomainResource { case COMPLETED: return "http://hl7.org/fhir/history-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/history-status"; case HEALTHUNKNOWN: return "http://hl7.org/fhir/history-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -117,7 +117,7 @@ public class FamilyMemberHistory extends DomainResource { case COMPLETED: return "All available related health information is captured as of the date (and possibly time) when the family member history was taken."; case ENTEREDINERROR: return "This instance should not have been part of this patient's medical record."; case HEALTHUNKNOWN: return "Health information for this individual is unavailable/unknown."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -127,7 +127,7 @@ public class FamilyMemberHistory extends DomainResource { case COMPLETED: return "Completed"; case ENTEREDINERROR: return "Entered in error"; case HEALTHUNKNOWN: return "Health unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -167,7 +167,9 @@ public class FamilyMemberHistory extends DomainResource { throw new FHIRException("Unknown FamilyHistoryStatus code '"+codeString+"'"); } 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"; @@ -176,7 +178,7 @@ public class FamilyMemberHistory extends DomainResource { if (code == FamilyHistoryStatus.HEALTHUNKNOWN) return "health-unknown"; return "?"; - } + } public String toSystem(FamilyHistoryStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Flag.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Flag.java index faa1a91f9..f12083ef3 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Flag.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Flag.java @@ -83,7 +83,7 @@ public class Flag extends DomainResource { case ACTIVE: return "active"; case INACTIVE: return "inactive"; case ENTEREDINERROR: return "entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -92,7 +92,7 @@ public class Flag extends DomainResource { case ACTIVE: return "http://hl7.org/fhir/flag-status"; case INACTIVE: return "http://hl7.org/fhir/flag-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/flag-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -101,7 +101,7 @@ public class Flag extends DomainResource { case ACTIVE: return "A current flag that should be displayed to a user. A system may use the category to determine which roles should view the flag."; case INACTIVE: return "The flag does not need to be displayed any more."; case ENTEREDINERROR: return "The flag was added in error, and should no longer be displayed."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -110,7 +110,7 @@ public class Flag extends DomainResource { case ACTIVE: return "Active"; case INACTIVE: return "Inactive"; case ENTEREDINERROR: return "Entered in Error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -146,14 +146,16 @@ public class Flag extends DomainResource { throw new FHIRException("Unknown FlagStatus code '"+codeString+"'"); } 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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Goal.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Goal.java index 5b03d0694..ad341edc5 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Goal.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Goal.java @@ -158,7 +158,7 @@ public class Goal extends DomainResource { case CANCELLED: return "cancelled"; case ENTEREDINERROR: return "entered-in-error"; case REJECTED: return "rejected"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -177,7 +177,7 @@ public class Goal extends DomainResource { case CANCELLED: return "http://hl7.org/fhir/goal-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/goal-status"; case REJECTED: return "http://hl7.org/fhir/goal-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -196,7 +196,7 @@ public class Goal extends DomainResource { case CANCELLED: return "The previously accepted goal is no longer being sought"; case ENTEREDINERROR: return "The goal was entered in error and voided."; case REJECTED: return "A proposed goal was rejected"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -215,7 +215,7 @@ public class Goal extends DomainResource { case CANCELLED: return "Cancelled"; case ENTEREDINERROR: return "Entered In Error"; case REJECTED: return "Rejected"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -291,7 +291,9 @@ public class Goal extends DomainResource { throw new FHIRException("Unknown GoalStatus code '"+codeString+"'"); } public String toCode(GoalStatus code) { - if (code == GoalStatus.PROPOSED) + if (code == GoalStatus.NULL) + return null; + if (code == GoalStatus.PROPOSED) return "proposed"; if (code == GoalStatus.ACCEPTED) return "accepted"; @@ -318,7 +320,7 @@ public class Goal extends DomainResource { if (code == GoalStatus.REJECTED) return "rejected"; return "?"; - } + } public String toSystem(GoalStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/GraphDefinition.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/GraphDefinition.java index cd5c7c45f..0239d5087 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/GraphDefinition.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/GraphDefinition.java @@ -106,7 +106,7 @@ public class GraphDefinition extends MetadataResource { case RELATEDPERSON: return "RelatedPerson"; case PRACTITIONER: return "Practitioner"; case DEVICE: return "Device"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -117,7 +117,7 @@ public class GraphDefinition extends MetadataResource { case RELATEDPERSON: return "http://hl7.org/fhir/compartment-type"; case PRACTITIONER: return "http://hl7.org/fhir/compartment-type"; case DEVICE: return "http://hl7.org/fhir/compartment-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -128,7 +128,7 @@ public class GraphDefinition extends MetadataResource { case RELATEDPERSON: return "The compartment definition is for the related-person compartment"; case PRACTITIONER: return "The compartment definition is for the practitioner compartment"; case DEVICE: return "The compartment definition is for the device compartment"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -139,7 +139,7 @@ public class GraphDefinition extends MetadataResource { case RELATEDPERSON: return "RelatedPerson"; case PRACTITIONER: return "Practitioner"; case DEVICE: return "Device"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -183,7 +183,9 @@ public class GraphDefinition extends MetadataResource { throw new FHIRException("Unknown CompartmentCode code '"+codeString+"'"); } 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"; @@ -194,7 +196,7 @@ public class GraphDefinition extends MetadataResource { if (code == CompartmentCode.DEVICE) return "Device"; return "?"; - } + } public String toSystem(CompartmentCode code) { return code.getSystem(); } @@ -243,7 +245,7 @@ public class GraphDefinition extends MetadataResource { case MATCHING: return "matching"; case DIFFERENT: return "different"; case CUSTOM: return "custom"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -253,7 +255,7 @@ public class GraphDefinition extends MetadataResource { case MATCHING: return "http://hl7.org/fhir/graph-compartment-rule"; case DIFFERENT: return "http://hl7.org/fhir/graph-compartment-rule"; case CUSTOM: return "http://hl7.org/fhir/graph-compartment-rule"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -263,7 +265,7 @@ public class GraphDefinition extends MetadataResource { case MATCHING: return "The compartment must be the same - the record must be about the same patient, but the reference may be different"; case DIFFERENT: return "The compartment must be different"; case CUSTOM: return "The compartment rule is defined in the accompanying FHIRPath expression"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -273,7 +275,7 @@ public class GraphDefinition extends MetadataResource { case MATCHING: return "Matching"; case DIFFERENT: return "Different"; case CUSTOM: return "Custom"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -313,7 +315,9 @@ public class GraphDefinition extends MetadataResource { throw new FHIRException("Unknown GraphCompartmentRule code '"+codeString+"'"); } 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"; @@ -322,7 +326,7 @@ public class GraphDefinition extends MetadataResource { if (code == GraphCompartmentRule.CUSTOM) return "custom"; return "?"; - } + } public String toSystem(GraphCompartmentRule code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Group.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Group.java index 30e695237..6a20bb07e 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Group.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Group.java @@ -108,7 +108,7 @@ public class Group extends DomainResource { case DEVICE: return "device"; case MEDICATION: return "medication"; case SUBSTANCE: return "substance"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -120,7 +120,7 @@ public class Group extends DomainResource { case DEVICE: return "http://hl7.org/fhir/group-type"; case MEDICATION: return "http://hl7.org/fhir/group-type"; case SUBSTANCE: return "http://hl7.org/fhir/group-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -132,7 +132,7 @@ public class Group extends DomainResource { case DEVICE: return "Group contains Device resources"; case MEDICATION: return "Group contains Medication resources"; case SUBSTANCE: return "Group contains Substance resources"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -144,7 +144,7 @@ public class Group extends DomainResource { case DEVICE: return "Device"; case MEDICATION: return "Medication"; case SUBSTANCE: return "Substance"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -192,7 +192,9 @@ public class Group extends DomainResource { throw new FHIRException("Unknown GroupType code '"+codeString+"'"); } 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"; @@ -205,7 +207,7 @@ public class Group extends DomainResource { if (code == GroupType.SUBSTANCE) return "substance"; return "?"; - } + } public String toSystem(GroupType code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/GuidanceResponse.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/GuidanceResponse.java index fac2192a2..36d9edc77 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/GuidanceResponse.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/GuidanceResponse.java @@ -107,7 +107,7 @@ public class GuidanceResponse extends DomainResource { case INPROGRESS: return "in-progress"; case FAILURE: return "failure"; case ENTEREDINERROR: return "entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -119,7 +119,7 @@ public class GuidanceResponse extends DomainResource { case INPROGRESS: return "http://hl7.org/fhir/guidance-response-status"; case FAILURE: return "http://hl7.org/fhir/guidance-response-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/guidance-response-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -131,7 +131,7 @@ public class GuidanceResponse extends DomainResource { case INPROGRESS: return "The request is currently being processed"; case FAILURE: return "The request was not processed successfully"; case ENTEREDINERROR: return "The response was entered in error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -143,7 +143,7 @@ public class GuidanceResponse extends DomainResource { case INPROGRESS: return "In Progress"; case FAILURE: return "Failure"; case ENTEREDINERROR: return "Entered In Error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -191,7 +191,9 @@ public class GuidanceResponse extends DomainResource { throw new FHIRException("Unknown GuidanceResponseStatus code '"+codeString+"'"); } 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"; @@ -204,7 +206,7 @@ public class GuidanceResponse extends DomainResource { if (code == GuidanceResponseStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(GuidanceResponseStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/HealthcareService.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/HealthcareService.java index 56f745e13..0e83e4100 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/HealthcareService.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/HealthcareService.java @@ -115,7 +115,7 @@ public class HealthcareService extends DomainResource { case FRI: return "fri"; case SAT: return "sat"; case SUN: return "sun"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -128,7 +128,7 @@ public class HealthcareService extends DomainResource { case FRI: return "http://hl7.org/fhir/days-of-week"; case SAT: return "http://hl7.org/fhir/days-of-week"; case SUN: return "http://hl7.org/fhir/days-of-week"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -141,7 +141,7 @@ public class HealthcareService extends DomainResource { case FRI: return "Friday"; case SAT: return "Saturday"; case SUN: return "Sunday"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -154,7 +154,7 @@ public class HealthcareService extends DomainResource { case FRI: return "Friday"; case SAT: return "Saturday"; case SUN: return "Sunday"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -206,7 +206,9 @@ public class HealthcareService extends DomainResource { throw new FHIRException("Unknown DaysOfWeek code '"+codeString+"'"); } 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"; @@ -221,7 +223,7 @@ public class HealthcareService extends DomainResource { if (code == DaysOfWeek.SUN) return "sun"; return "?"; - } + } public String toSystem(DaysOfWeek code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/HumanName.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/HumanName.java index af196dfb4..16294c8b4 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/HumanName.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/HumanName.java @@ -205,7 +205,9 @@ public class HumanName extends Type implements ICompositeType { throw new FHIRException("Unknown NameUse code '"+codeString+"'"); } 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"; @@ -220,7 +222,7 @@ public class HumanName extends Type implements ICompositeType { if (code == NameUse.MAIDEN) return "maiden"; return "?"; - } + } public String toSystem(NameUse code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Identifier.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Identifier.java index 6dcb1984a..7d356eea3 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Identifier.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Identifier.java @@ -90,7 +90,7 @@ public class Identifier extends Type implements ICompositeType { case OFFICIAL: return "official"; case TEMP: return "temp"; case SECONDARY: return "secondary"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -100,7 +100,7 @@ public class Identifier extends Type implements ICompositeType { case OFFICIAL: return "http://hl7.org/fhir/identifier-use"; case TEMP: return "http://hl7.org/fhir/identifier-use"; case SECONDARY: return "http://hl7.org/fhir/identifier-use"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -110,7 +110,7 @@ public class Identifier extends Type implements ICompositeType { case OFFICIAL: return "The identifier considered to be most trusted for the identification of this item."; case TEMP: return "A temporary identifier."; case SECONDARY: return "An identifier that was assigned in secondary use - it serves to identify the object in a relative context, but cannot be consistently assigned to the same object again in a different context."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -120,7 +120,7 @@ public class Identifier extends Type implements ICompositeType { case OFFICIAL: return "Official"; case TEMP: return "Temp"; case SECONDARY: return "Secondary"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -160,7 +160,9 @@ public class Identifier extends Type implements ICompositeType { throw new FHIRException("Unknown IdentifierUse code '"+codeString+"'"); } 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"; @@ -169,7 +171,7 @@ public class Identifier extends Type implements ICompositeType { if (code == IdentifierUse.SECONDARY) return "secondary"; return "?"; - } + } public String toSystem(IdentifierUse code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImagingStudy.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImagingStudy.java index 8a15f5f79..5c9f31f77 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImagingStudy.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImagingStudy.java @@ -94,7 +94,7 @@ public class ImagingStudy extends DomainResource { case OFFLINE: return "OFFLINE"; case NEARLINE: return "NEARLINE"; case UNAVAILABLE: return "UNAVAILABLE"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -104,7 +104,7 @@ public class ImagingStudy extends DomainResource { case OFFLINE: return "http://dicom.nema.org/resources/ontology/DCM"; case NEARLINE: return "http://dicom.nema.org/resources/ontology/DCM"; case UNAVAILABLE: return "http://dicom.nema.org/resources/ontology/DCM"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -114,7 +114,7 @@ public class ImagingStudy extends DomainResource { case OFFLINE: return ""; case NEARLINE: return ""; case UNAVAILABLE: return ""; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -124,7 +124,7 @@ public class ImagingStudy extends DomainResource { case OFFLINE: return "OFFLINE"; case NEARLINE: return "NEARLINE"; case UNAVAILABLE: return "UNAVAILABLE"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -164,7 +164,9 @@ public class ImagingStudy extends DomainResource { throw new FHIRException("Unknown InstanceAvailability code '"+codeString+"'"); } public String toCode(InstanceAvailability code) { - if (code == InstanceAvailability.ONLINE) + if (code == InstanceAvailability.NULL) + return null; + if (code == InstanceAvailability.ONLINE) return "ONLINE"; if (code == InstanceAvailability.OFFLINE) return "OFFLINE"; @@ -173,7 +175,7 @@ public class ImagingStudy extends DomainResource { if (code == InstanceAvailability.UNAVAILABLE) return "UNAVAILABLE"; return "?"; - } + } public String toSystem(InstanceAvailability code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Immunization.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Immunization.java index 79d325109..29896b43f 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Immunization.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Immunization.java @@ -80,7 +80,7 @@ public class Immunization extends DomainResource { switch (this) { case COMPLETED: return "completed"; case ENTEREDINERROR: return "entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -88,7 +88,7 @@ public class Immunization extends DomainResource { switch (this) { case COMPLETED: return "http://hl7.org/fhir/medication-admin-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/medication-admin-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -96,7 +96,7 @@ public class Immunization extends DomainResource { switch (this) { case COMPLETED: return ""; case ENTEREDINERROR: return ""; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -104,7 +104,7 @@ public class Immunization extends DomainResource { switch (this) { case COMPLETED: return "completed"; case ENTEREDINERROR: return "entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -136,12 +136,14 @@ public class Immunization extends DomainResource { throw new FHIRException("Unknown ImmunizationStatus code '"+codeString+"'"); } 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"; return "?"; - } + } public String toSystem(ImmunizationStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImplementationGuide.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImplementationGuide.java index 4b3434ccf..81d5e8961 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImplementationGuide.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImplementationGuide.java @@ -85,7 +85,7 @@ public class ImplementationGuide extends MetadataResource { switch (this) { case REFERENCE: return "reference"; case INCLUSION: return "inclusion"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -93,7 +93,7 @@ public class ImplementationGuide extends MetadataResource { switch (this) { case REFERENCE: return "http://hl7.org/fhir/guide-dependency-type"; case INCLUSION: return "http://hl7.org/fhir/guide-dependency-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -101,7 +101,7 @@ public class ImplementationGuide extends MetadataResource { switch (this) { case REFERENCE: return "The guide is referred to by URL."; case INCLUSION: return "The guide is embedded in this guide when published."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -109,7 +109,7 @@ public class ImplementationGuide extends MetadataResource { switch (this) { case REFERENCE: return "Reference"; case INCLUSION: return "Inclusion"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -141,12 +141,14 @@ public class ImplementationGuide extends MetadataResource { throw new FHIRException("Unknown GuideDependencyType code '"+codeString+"'"); } public String toCode(GuideDependencyType code) { - if (code == GuideDependencyType.REFERENCE) + if (code == GuideDependencyType.NULL) + return null; + if (code == GuideDependencyType.REFERENCE) return "reference"; if (code == GuideDependencyType.INCLUSION) return "inclusion"; return "?"; - } + } public String toSystem(GuideDependencyType code) { return code.getSystem(); } @@ -223,7 +225,7 @@ public class ImplementationGuide extends MetadataResource { case DICTIONARY: return "dictionary"; case TOC: return "toc"; case RESOURCE: return "resource"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -237,7 +239,7 @@ public class ImplementationGuide extends MetadataResource { case DICTIONARY: return "http://hl7.org/fhir/guide-page-kind"; case TOC: return "http://hl7.org/fhir/guide-page-kind"; case RESOURCE: return "http://hl7.org/fhir/guide-page-kind"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -251,7 +253,7 @@ public class ImplementationGuide extends MetadataResource { case DICTIONARY: return "This is a page that creates the listed resources as a dictionary."; case TOC: return "This is a generated page that contains the table of contents."; case RESOURCE: return "This is a page that represents a presented resource. This is typically used for generated conformance resource presentations."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -265,7 +267,7 @@ public class ImplementationGuide extends MetadataResource { case DICTIONARY: return "Dictionary"; case TOC: return "Table Of Contents"; case RESOURCE: return "Resource"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -321,7 +323,9 @@ public class ImplementationGuide extends MetadataResource { throw new FHIRException("Unknown GuidePageKind code '"+codeString+"'"); } public String toCode(GuidePageKind code) { - if (code == GuidePageKind.PAGE) + if (code == GuidePageKind.NULL) + return null; + if (code == GuidePageKind.PAGE) return "page"; if (code == GuidePageKind.EXAMPLE) return "example"; @@ -338,7 +342,7 @@ public class ImplementationGuide extends MetadataResource { if (code == GuidePageKind.RESOURCE) return "resource"; return "?"; - } + } public String toSystem(GuidePageKind code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Linkage.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Linkage.java index 69575cbe7..a5464a02f 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Linkage.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Linkage.java @@ -86,7 +86,7 @@ public class Linkage extends DomainResource { case SOURCE: return "source"; case ALTERNATE: return "alternate"; case HISTORICAL: return "historical"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -95,7 +95,7 @@ public class Linkage extends DomainResource { case SOURCE: return "http://hl7.org/fhir/linkage-type"; case ALTERNATE: return "http://hl7.org/fhir/linkage-type"; case HISTORICAL: return "http://hl7.org/fhir/linkage-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -104,7 +104,7 @@ public class Linkage extends DomainResource { case SOURCE: return "The record represents the \"source of truth\" (from the perspective of this Linkage resource) for the underlying event/condition/etc."; case ALTERNATE: return "The record represents the alternative view of the underlying event/condition/etc. The record may still be actively maintained, even though it is not considered to be the source of truth."; case HISTORICAL: return "The record represents an obsolete record of the underlyng event/condition/etc. It is not expected to be actively maintained."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -113,7 +113,7 @@ public class Linkage extends DomainResource { case SOURCE: return "Source of truth"; case ALTERNATE: return "Alternate record"; case HISTORICAL: return "Historical/obsolete record"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -149,14 +149,16 @@ public class Linkage extends DomainResource { throw new FHIRException("Unknown LinkageType code '"+codeString+"'"); } 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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ListResource.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ListResource.java index 5ece3d229..bd70f6354 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ListResource.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ListResource.java @@ -87,7 +87,7 @@ public class ListResource extends DomainResource { case CURRENT: return "current"; case RETIRED: return "retired"; case ENTEREDINERROR: return "entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -96,7 +96,7 @@ public class ListResource extends DomainResource { case CURRENT: return "http://hl7.org/fhir/list-status"; case RETIRED: return "http://hl7.org/fhir/list-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/list-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -105,7 +105,7 @@ public class ListResource extends DomainResource { case CURRENT: return "The list is considered to be an active part of the patient's record."; case RETIRED: return "The list is \"old\" and should no longer be considered accurate or relevant."; case ENTEREDINERROR: return "The list was never accurate. It is retained for medico-legal purposes only."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -114,7 +114,7 @@ public class ListResource extends DomainResource { case CURRENT: return "Current"; case RETIRED: return "Retired"; case ENTEREDINERROR: return "Entered In Error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -150,14 +150,16 @@ public class ListResource extends DomainResource { throw new FHIRException("Unknown ListStatus code '"+codeString+"'"); } 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(); } @@ -199,7 +201,7 @@ public class ListResource extends DomainResource { case WORKING: return "working"; case SNAPSHOT: return "snapshot"; case CHANGES: return "changes"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -208,7 +210,7 @@ public class ListResource extends DomainResource { case WORKING: return "http://hl7.org/fhir/list-mode"; case SNAPSHOT: return "http://hl7.org/fhir/list-mode"; case CHANGES: return "http://hl7.org/fhir/list-mode"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -217,7 +219,7 @@ public class ListResource extends DomainResource { case WORKING: return "This list is the master list, maintained in an ongoing fashion with regular updates as the real world list it is tracking changes"; case SNAPSHOT: return "This list was prepared as a snapshot. It should not be assumed to be current"; case CHANGES: return "A list that indicates where changes have been made or recommended"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -226,7 +228,7 @@ public class ListResource extends DomainResource { case WORKING: return "Working List"; case SNAPSHOT: return "Snapshot List"; case CHANGES: return "Change List"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -262,14 +264,16 @@ public class ListResource extends DomainResource { throw new FHIRException("Unknown ListMode code '"+codeString+"'"); } 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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Location.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Location.java index 53bd55509..bfed60e01 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Location.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Location.java @@ -89,7 +89,7 @@ public class Location extends DomainResource { case ACTIVE: return "active"; case SUSPENDED: return "suspended"; case INACTIVE: return "inactive"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -98,7 +98,7 @@ public class Location extends DomainResource { case ACTIVE: return "http://hl7.org/fhir/location-status"; case SUSPENDED: return "http://hl7.org/fhir/location-status"; case INACTIVE: return "http://hl7.org/fhir/location-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -107,7 +107,7 @@ public class Location extends DomainResource { case ACTIVE: return "The location is operational."; case SUSPENDED: return "The location is temporarily closed."; case INACTIVE: return "The location is no longer used."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -116,7 +116,7 @@ public class Location extends DomainResource { case ACTIVE: return "Active"; case SUSPENDED: return "Suspended"; case INACTIVE: return "Inactive"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -152,14 +152,16 @@ public class Location extends DomainResource { throw new FHIRException("Unknown LocationStatus code '"+codeString+"'"); } 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(); } @@ -194,7 +196,7 @@ public class Location extends DomainResource { switch (this) { case INSTANCE: return "instance"; case KIND: return "kind"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -202,7 +204,7 @@ public class Location extends DomainResource { switch (this) { case INSTANCE: return "http://hl7.org/fhir/location-mode"; case KIND: return "http://hl7.org/fhir/location-mode"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -210,7 +212,7 @@ public class Location extends DomainResource { switch (this) { case INSTANCE: return "The Location resource represents a specific instance of a location (e.g. Operating Theatre 1A)."; case KIND: return "The Location represents a class of locations (e.g. Any Operating Theatre) although this class of locations could be constrained within a specific boundary (such as organization, or parent location, address etc.)."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -218,7 +220,7 @@ public class Location extends DomainResource { switch (this) { case INSTANCE: return "Instance"; case KIND: return "Kind"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -250,12 +252,14 @@ public class Location extends DomainResource { throw new FHIRException("Unknown LocationMode code '"+codeString+"'"); } 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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MeasureReport.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MeasureReport.java index 3bd55295d..c014d39be 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MeasureReport.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MeasureReport.java @@ -89,7 +89,7 @@ public class MeasureReport extends DomainResource { case COMPLETE: return "complete"; case PENDING: return "pending"; case ERROR: return "error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -98,7 +98,7 @@ public class MeasureReport extends DomainResource { case COMPLETE: return "http://hl7.org/fhir/measure-report-status"; case PENDING: return "http://hl7.org/fhir/measure-report-status"; case ERROR: return "http://hl7.org/fhir/measure-report-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -107,7 +107,7 @@ public class MeasureReport extends DomainResource { case COMPLETE: return "The report is complete and ready for use"; case PENDING: return "The report is currently being generated"; case ERROR: return "An error occurred attempting to generate the report"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -116,7 +116,7 @@ public class MeasureReport extends DomainResource { case COMPLETE: return "Complete"; case PENDING: return "Pending"; case ERROR: return "Error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -152,14 +152,16 @@ public class MeasureReport extends DomainResource { throw new FHIRException("Unknown MeasureReportStatus code '"+codeString+"'"); } 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(); } @@ -201,7 +203,7 @@ public class MeasureReport extends DomainResource { case INDIVIDUAL: return "individual"; case PATIENTLIST: return "patient-list"; case SUMMARY: return "summary"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -210,7 +212,7 @@ public class MeasureReport extends DomainResource { case INDIVIDUAL: return "http://hl7.org/fhir/measure-report-type"; case PATIENTLIST: return "http://hl7.org/fhir/measure-report-type"; case SUMMARY: return "http://hl7.org/fhir/measure-report-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -219,7 +221,7 @@ public class MeasureReport extends DomainResource { case INDIVIDUAL: return "An individual report that provides information on the performance for a given measure with respect to a single patient"; case PATIENTLIST: return "A patient list report that includes a listing of patients that satisfied each population criteria in the measure"; case SUMMARY: return "A summary report that returns the number of patients in each population criteria for the measure"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -228,7 +230,7 @@ public class MeasureReport extends DomainResource { case INDIVIDUAL: return "Individual"; case PATIENTLIST: return "Patient List"; case SUMMARY: return "Summary"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -264,14 +266,16 @@ public class MeasureReport extends DomainResource { throw new FHIRException("Unknown MeasureReportType code '"+codeString+"'"); } public String toCode(MeasureReportType code) { - if (code == MeasureReportType.INDIVIDUAL) + if (code == MeasureReportType.NULL) + return null; + if (code == MeasureReportType.INDIVIDUAL) return "individual"; if (code == MeasureReportType.PATIENTLIST) return "patient-list"; if (code == MeasureReportType.SUMMARY) return "summary"; return "?"; - } + } public String toSystem(MeasureReportType code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Media.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Media.java index 884dad718..13173b6e4 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Media.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Media.java @@ -85,7 +85,7 @@ public class Media extends DomainResource { case PHOTO: return "photo"; case VIDEO: return "video"; case AUDIO: return "audio"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -94,7 +94,7 @@ public class Media extends DomainResource { case PHOTO: return "http://hl7.org/fhir/digital-media-type"; case VIDEO: return "http://hl7.org/fhir/digital-media-type"; case AUDIO: return "http://hl7.org/fhir/digital-media-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -103,7 +103,7 @@ public class Media extends DomainResource { case PHOTO: return "The media consists of one or more unmoving images, including photographs, computer-generated graphs and charts, and scanned documents"; case VIDEO: return "The media consists of a series of frames that capture a moving image"; case AUDIO: return "The media consists of a sound recording"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -112,7 +112,7 @@ public class Media extends DomainResource { case PHOTO: return "Photo"; case VIDEO: return "Video"; case AUDIO: return "Audio"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -148,14 +148,16 @@ public class Media extends DomainResource { throw new FHIRException("Unknown DigitalMediaType code '"+codeString+"'"); } public String toCode(DigitalMediaType code) { - if (code == DigitalMediaType.PHOTO) + if (code == DigitalMediaType.NULL) + return null; + if (code == DigitalMediaType.PHOTO) return "photo"; if (code == DigitalMediaType.VIDEO) return "video"; if (code == DigitalMediaType.AUDIO) return "audio"; return "?"; - } + } public String toSystem(DigitalMediaType code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Medication.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Medication.java index e28ee67e6..922dc0ffc 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Medication.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Medication.java @@ -88,7 +88,7 @@ public class Medication extends DomainResource { case ACTIVE: return "active"; case INACTIVE: return "inactive"; case ENTEREDINERROR: return "entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -97,7 +97,7 @@ public class Medication extends DomainResource { case ACTIVE: return "http://hl7.org/fhir/medication-status"; case INACTIVE: return "http://hl7.org/fhir/medication-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/medication-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -106,7 +106,7 @@ public class Medication extends DomainResource { case ACTIVE: return "The medication is available for use"; case INACTIVE: return "The medication is not available for use"; case ENTEREDINERROR: return "The medication was entered in error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -115,7 +115,7 @@ public class Medication extends DomainResource { case ACTIVE: return "Active"; case INACTIVE: return "Inactive"; case ENTEREDINERROR: return "Entered in Error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -151,14 +151,16 @@ public class Medication extends DomainResource { throw new FHIRException("Unknown MedicationStatus code '"+codeString+"'"); } 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(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationAdministration.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationAdministration.java index acb26b5d3..86848d67e 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationAdministration.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationAdministration.java @@ -109,7 +109,7 @@ public class MedicationAdministration extends DomainResource { case ENTEREDINERROR: return "entered-in-error"; case STOPPED: return "stopped"; case UNKNOWN: return "unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -121,7 +121,7 @@ public class MedicationAdministration extends DomainResource { case ENTEREDINERROR: return "http://hl7.org/fhir/medication-admin-status"; case STOPPED: return "http://hl7.org/fhir/medication-admin-status"; case UNKNOWN: return "http://hl7.org/fhir/medication-admin-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -133,7 +133,7 @@ public class MedicationAdministration extends DomainResource { case ENTEREDINERROR: return "The administration was entered in error and therefore nullified."; case STOPPED: return "Actions implied by the administration have been permanently halted, before all of them occurred."; case UNKNOWN: return "The authoring system does not know which of the status values currently applies for this request. Note: This concept is not to be used for \"other\" - one of the listed statuses is presumed to apply, it's just not known which one."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -145,7 +145,7 @@ public class MedicationAdministration extends DomainResource { case ENTEREDINERROR: return "Entered in Error"; case STOPPED: return "Stopped"; case UNKNOWN: return "Unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -193,7 +193,9 @@ public class MedicationAdministration extends DomainResource { throw new FHIRException("Unknown MedicationAdministrationStatus code '"+codeString+"'"); } 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.ONHOLD) return "on-hold"; @@ -206,7 +208,7 @@ public class MedicationAdministration extends DomainResource { if (code == MedicationAdministrationStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(MedicationAdministrationStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationDispense.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationDispense.java index 9945c961c..238e02773 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationDispense.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationDispense.java @@ -109,7 +109,7 @@ public class MedicationDispense extends DomainResource { case COMPLETED: return "completed"; case ENTEREDINERROR: return "entered-in-error"; case STOPPED: return "stopped"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -121,7 +121,7 @@ public class MedicationDispense extends DomainResource { case COMPLETED: return "http://hl7.org/fhir/medication-dispense-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/medication-dispense-status"; case STOPPED: return "http://hl7.org/fhir/medication-dispense-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -133,7 +133,7 @@ public class MedicationDispense extends DomainResource { case COMPLETED: return "All actions that are implied by the dispense have occurred."; case ENTEREDINERROR: return "The dispense was entered in error and therefore nullified."; case STOPPED: return "Actions implied by the dispense have been permanently halted, before all of them occurred."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -145,7 +145,7 @@ public class MedicationDispense extends DomainResource { case COMPLETED: return "Completed"; case ENTEREDINERROR: return "Entered in-Error"; case STOPPED: return "Stopped"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -193,7 +193,9 @@ public class MedicationDispense extends DomainResource { throw new FHIRException("Unknown MedicationDispenseStatus code '"+codeString+"'"); } 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"; @@ -206,7 +208,7 @@ public class MedicationDispense extends DomainResource { if (code == MedicationDispenseStatus.STOPPED) return "stopped"; return "?"; - } + } public String toSystem(MedicationDispenseStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationRequest.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationRequest.java index 04795f875..0f9eb9a3e 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationRequest.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationRequest.java @@ -123,7 +123,7 @@ public class MedicationRequest extends DomainResource { case STOPPED: return "stopped"; case DRAFT: return "draft"; case UNKNOWN: return "unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -137,7 +137,7 @@ public class MedicationRequest extends DomainResource { case STOPPED: return "http://hl7.org/fhir/medication-request-status"; case DRAFT: return "http://hl7.org/fhir/medication-request-status"; case UNKNOWN: return "http://hl7.org/fhir/medication-request-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -151,7 +151,7 @@ public class MedicationRequest extends DomainResource { case STOPPED: return "Actions implied by the prescription are to be permanently halted, before all of them occurred."; case DRAFT: return "The prescription is not yet 'actionable', i.e. it is a work in progress, requires sign-off or verification, and needs to be run through decision support process."; case UNKNOWN: return "The authoring system does not know which of the status values currently applies for this request"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -165,7 +165,7 @@ public class MedicationRequest extends DomainResource { case STOPPED: return "Stopped"; case DRAFT: return "Draft"; case UNKNOWN: return "Unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -221,7 +221,9 @@ public class MedicationRequest extends DomainResource { throw new FHIRException("Unknown MedicationRequestStatus code '"+codeString+"'"); } 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"; @@ -238,7 +240,7 @@ public class MedicationRequest extends DomainResource { if (code == MedicationRequestStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(MedicationRequestStatus code) { return code.getSystem(); } @@ -287,7 +289,7 @@ public class MedicationRequest extends DomainResource { case PLAN: return "plan"; case ORDER: return "order"; case INSTANCEORDER: return "instance-order"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -297,7 +299,7 @@ public class MedicationRequest extends DomainResource { case PLAN: return "http://hl7.org/fhir/medication-request-intent"; case ORDER: return "http://hl7.org/fhir/medication-request-intent"; case INSTANCEORDER: return "http://hl7.org/fhir/medication-request-intent"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -307,7 +309,7 @@ public class MedicationRequest extends DomainResource { case PLAN: return "The request represents an intension to ensure something occurs without providing an authorization for others to act"; case ORDER: return "The request represents a request/demand and authorization for action"; case INSTANCEORDER: return "The request represents an instance for the particular order, for example a medication administration record."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -317,7 +319,7 @@ public class MedicationRequest extends DomainResource { case PLAN: return "Plan"; case ORDER: return "Order"; case INSTANCEORDER: return "Instance Order"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -357,7 +359,9 @@ public class MedicationRequest extends DomainResource { throw new FHIRException("Unknown MedicationRequestIntent code '"+codeString+"'"); } 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"; @@ -366,7 +370,7 @@ public class MedicationRequest extends DomainResource { if (code == MedicationRequestIntent.INSTANCEORDER) return "instance-order"; return "?"; - } + } public String toSystem(MedicationRequestIntent code) { return code.getSystem(); } @@ -415,7 +419,7 @@ public class MedicationRequest extends DomainResource { case URGENT: return "urgent"; case STAT: return "stat"; case ASAP: return "asap"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -425,7 +429,7 @@ public class MedicationRequest extends DomainResource { case URGENT: return "http://hl7.org/fhir/medication-request-priority"; case STAT: return "http://hl7.org/fhir/medication-request-priority"; case ASAP: return "http://hl7.org/fhir/medication-request-priority"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -435,7 +439,7 @@ public class MedicationRequest extends DomainResource { case URGENT: return "The order should be urgently."; case STAT: return "The order is time-critical."; case ASAP: return "The order should be acted on as soon as possible."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -445,7 +449,7 @@ public class MedicationRequest extends DomainResource { case URGENT: return "Urgent"; case STAT: return "Stat"; case ASAP: return "ASAP"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -485,7 +489,9 @@ public class MedicationRequest extends DomainResource { throw new FHIRException("Unknown MedicationRequestPriority code '"+codeString+"'"); } 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"; @@ -494,7 +500,7 @@ public class MedicationRequest extends DomainResource { if (code == MedicationRequestPriority.ASAP) return "asap"; return "?"; - } + } public String toSystem(MedicationRequestPriority code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationStatement.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationStatement.java index 50273f7f6..0a339e15c 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationStatement.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationStatement.java @@ -108,7 +108,7 @@ public class MedicationStatement extends DomainResource { case INTENDED: return "intended"; case STOPPED: return "stopped"; case ONHOLD: return "on-hold"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -120,7 +120,7 @@ public class MedicationStatement extends DomainResource { case INTENDED: return "http://hl7.org/fhir/medication-statement-status"; case STOPPED: return "http://hl7.org/fhir/medication-statement-status"; case ONHOLD: return "http://hl7.org/fhir/medication-statement-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -132,7 +132,7 @@ public class MedicationStatement extends DomainResource { case INTENDED: return "The medication may be taken at some time in the future."; case STOPPED: return "Actions implied by the statement have been permanently halted, before all of them occurred."; case ONHOLD: return "Actions implied by the statement have been temporarily halted, but are expected to continue later. May also be called \"suspended\"."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -144,7 +144,7 @@ public class MedicationStatement extends DomainResource { case INTENDED: return "Intended"; case STOPPED: return "Stopped"; case ONHOLD: return "On Hold"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -192,7 +192,9 @@ public class MedicationStatement extends DomainResource { throw new FHIRException("Unknown MedicationStatementStatus code '"+codeString+"'"); } 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"; @@ -205,7 +207,7 @@ public class MedicationStatement extends DomainResource { if (code == MedicationStatementStatus.ONHOLD) return "on-hold"; return "?"; - } + } public String toSystem(MedicationStatementStatus code) { return code.getSystem(); } @@ -254,7 +256,7 @@ public class MedicationStatement extends DomainResource { case N: return "n"; case UNK: return "unk"; case NA: return "na"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -264,7 +266,7 @@ public class MedicationStatement extends DomainResource { case N: return "http://hl7.org/fhir/medication-statement-taken"; case UNK: return "http://hl7.org/fhir/medication-statement-taken"; case NA: return "http://hl7.org/fhir/medication-statement-taken"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -274,7 +276,7 @@ public class MedicationStatement extends DomainResource { case N: return "Negative assertion that patient has not taken medication"; case UNK: return "Unknown assertion if patient has taken medication"; case NA: return "Patient reporting does not apply"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -284,7 +286,7 @@ public class MedicationStatement extends DomainResource { case N: return "No"; case UNK: return "Unknown"; case NA: return "Not Applicable"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -324,7 +326,9 @@ public class MedicationStatement extends DomainResource { throw new FHIRException("Unknown MedicationStatementTaken code '"+codeString+"'"); } public String toCode(MedicationStatementTaken code) { - if (code == MedicationStatementTaken.Y) + if (code == MedicationStatementTaken.NULL) + return null; + if (code == MedicationStatementTaken.Y) return "y"; if (code == MedicationStatementTaken.N) return "n"; @@ -333,7 +337,7 @@ public class MedicationStatement extends DomainResource { if (code == MedicationStatementTaken.NA) return "na"; return "?"; - } + } public String toSystem(MedicationStatementTaken code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MessageDefinition.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MessageDefinition.java index 9d0828cd3..59bd4985d 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MessageDefinition.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MessageDefinition.java @@ -91,7 +91,7 @@ public class MessageDefinition extends MetadataResource { case CONSEQUENCE: return "Consequence"; case CURRENCY: return "Currency"; case NOTIFICATION: return "Notification"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -100,7 +100,7 @@ public class MessageDefinition extends MetadataResource { case CONSEQUENCE: return "http://hl7.org/fhir/message-significance-category"; case CURRENCY: return "http://hl7.org/fhir/message-significance-category"; case NOTIFICATION: return "http://hl7.org/fhir/message-significance-category"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -109,7 +109,7 @@ public class MessageDefinition extends MetadataResource { case CONSEQUENCE: return "The message represents/requests a change that should not be processed more than once; e.g., making a booking for an appointment."; case CURRENCY: return "The message represents a response to query for current information. Retrospective processing is wrong and/or wasteful."; case NOTIFICATION: return "The content is not necessarily intended to be current, and it can be reprocessed, though there may be version issues created by processing old notifications."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -118,7 +118,7 @@ public class MessageDefinition extends MetadataResource { case CONSEQUENCE: return "Consequence"; case CURRENCY: return "Currency"; case NOTIFICATION: return "Notification"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -154,14 +154,16 @@ public class MessageDefinition extends MetadataResource { throw new FHIRException("Unknown MessageSignificanceCategory code '"+codeString+"'"); } 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(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MessageHeader.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MessageHeader.java index 2c34b035c..873110777 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MessageHeader.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MessageHeader.java @@ -87,7 +87,7 @@ public class MessageHeader extends DomainResource { case OK: return "ok"; case TRANSIENTERROR: return "transient-error"; case FATALERROR: return "fatal-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -96,7 +96,7 @@ public class MessageHeader extends DomainResource { case OK: return "http://hl7.org/fhir/response-code"; case TRANSIENTERROR: return "http://hl7.org/fhir/response-code"; case FATALERROR: return "http://hl7.org/fhir/response-code"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -105,7 +105,7 @@ public class MessageHeader extends DomainResource { case OK: return "The message was accepted and processed without error."; case TRANSIENTERROR: return "Some internal unexpected error occurred - wait and try again. Note - this is usually used for things like database unavailable, which may be expected to resolve, though human intervention may be required."; case FATALERROR: return "The message was rejected because of a problem with the content. There is no point in re-sending without change. The response narrative SHALL describe the issue."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -114,7 +114,7 @@ public class MessageHeader extends DomainResource { case OK: return "OK"; case TRANSIENTERROR: return "Transient Error"; case FATALERROR: return "Fatal Error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -150,14 +150,16 @@ public class MessageHeader extends DomainResource { throw new FHIRException("Unknown ResponseType code '"+codeString+"'"); } 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(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/NamingSystem.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/NamingSystem.java index 56749af6b..be98cf4ef 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/NamingSystem.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/NamingSystem.java @@ -91,7 +91,7 @@ public class NamingSystem extends MetadataResource { case CODESYSTEM: return "codesystem"; case IDENTIFIER: return "identifier"; case ROOT: return "root"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -100,7 +100,7 @@ public class NamingSystem extends MetadataResource { case CODESYSTEM: return "http://hl7.org/fhir/namingsystem-type"; case IDENTIFIER: return "http://hl7.org/fhir/namingsystem-type"; case ROOT: return "http://hl7.org/fhir/namingsystem-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -109,7 +109,7 @@ public class NamingSystem extends MetadataResource { case CODESYSTEM: return "The naming system is used to define concepts and symbols to represent those concepts; e.g. UCUM, LOINC, NDC code, local lab codes, etc."; case IDENTIFIER: return "The naming system is used to manage identifiers (e.g. license numbers, order numbers, etc.)."; case ROOT: return "The naming system is used as the root for other identifiers and naming systems."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -118,7 +118,7 @@ public class NamingSystem extends MetadataResource { case CODESYSTEM: return "Code System"; case IDENTIFIER: return "Identifier"; case ROOT: return "Root"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -154,14 +154,16 @@ public class NamingSystem extends MetadataResource { throw new FHIRException("Unknown NamingSystemType code '"+codeString+"'"); } 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(); } @@ -210,7 +212,7 @@ public class NamingSystem extends MetadataResource { case UUID: return "uuid"; case URI: return "uri"; case OTHER: return "other"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -220,7 +222,7 @@ public class NamingSystem extends MetadataResource { case UUID: return "http://hl7.org/fhir/namingsystem-identifier-type"; case URI: return "http://hl7.org/fhir/namingsystem-identifier-type"; case OTHER: return "http://hl7.org/fhir/namingsystem-identifier-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -230,7 +232,7 @@ public class NamingSystem extends MetadataResource { case UUID: return "A universally unique identifier of the form a5afddf4-e880-459b-876e-e4591b0acc11."; case URI: return "A uniform resource identifier (ideally a URL - uniform resource locator); e.g. http://unitsofmeasure.org."; case OTHER: return "Some other type of unique identifier; e.g. HL7-assigned reserved string such as LN for LOINC."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -240,7 +242,7 @@ public class NamingSystem extends MetadataResource { case UUID: return "UUID"; case URI: return "URI"; case OTHER: return "Other"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -280,7 +282,9 @@ public class NamingSystem extends MetadataResource { throw new FHIRException("Unknown NamingSystemIdentifierType code '"+codeString+"'"); } public String toCode(NamingSystemIdentifierType code) { - if (code == NamingSystemIdentifierType.OID) + if (code == NamingSystemIdentifierType.NULL) + return null; + if (code == NamingSystemIdentifierType.OID) return "oid"; if (code == NamingSystemIdentifierType.UUID) return "uuid"; @@ -289,7 +293,7 @@ public class NamingSystem extends MetadataResource { if (code == NamingSystemIdentifierType.OTHER) return "other"; return "?"; - } + } public String toSystem(NamingSystemIdentifierType code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Narrative.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Narrative.java index bb1aca3e8..bef957f47 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Narrative.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Narrative.java @@ -90,7 +90,7 @@ public class Narrative extends BaseNarrative implements INarrative { case EXTENSIONS: return "extensions"; case ADDITIONAL: return "additional"; case EMPTY: return "empty"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -100,7 +100,7 @@ public class Narrative extends BaseNarrative implements INarrative { case EXTENSIONS: return "http://hl7.org/fhir/narrative-status"; case ADDITIONAL: return "http://hl7.org/fhir/narrative-status"; case EMPTY: return "http://hl7.org/fhir/narrative-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -110,7 +110,7 @@ public class Narrative extends BaseNarrative implements INarrative { case EXTENSIONS: return "The contents of the narrative are entirely generated from the structured data in the content and some of the content is generated from extensions"; case ADDITIONAL: return "The contents of the narrative may contain additional information not found in the structured data. Note that there is no computable way to determine what the extra information is, other than by human inspection"; case EMPTY: return "The contents of the narrative are some equivalent of \"No human-readable text provided in this case\""; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -120,7 +120,7 @@ public class Narrative extends BaseNarrative implements INarrative { case EXTENSIONS: return "Extensions"; case ADDITIONAL: return "Additional"; case EMPTY: return "Empty"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -160,7 +160,9 @@ public class Narrative extends BaseNarrative implements INarrative { throw new FHIRException("Unknown NarrativeStatus code '"+codeString+"'"); } 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"; @@ -169,7 +171,7 @@ public class Narrative extends BaseNarrative implements INarrative { if (code == NarrativeStatus.EMPTY) return "empty"; return "?"; - } + } public String toSystem(NarrativeStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/NutritionOrder.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/NutritionOrder.java index cb439cb48..d07399ac7 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/NutritionOrder.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/NutritionOrder.java @@ -130,7 +130,7 @@ public class NutritionOrder extends DomainResource { case COMPLETED: return "completed"; case CANCELLED: return "cancelled"; case ENTEREDINERROR: return "entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -145,7 +145,7 @@ public class NutritionOrder extends DomainResource { case COMPLETED: return "http://hl7.org/fhir/nutrition-request-status"; case CANCELLED: return "http://hl7.org/fhir/nutrition-request-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/nutrition-request-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -160,7 +160,7 @@ public class NutritionOrder extends DomainResource { case COMPLETED: return "All actions that are implied by the order have occurred and no continuation is planned (this will rarely be made explicit)."; case CANCELLED: return "The request has been withdrawn and is no longer actionable."; case ENTEREDINERROR: return "The request was entered in error and voided."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -175,7 +175,7 @@ public class NutritionOrder extends DomainResource { case COMPLETED: return "Completed"; case CANCELLED: return "Cancelled"; case ENTEREDINERROR: return "Entered in Error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -235,7 +235,9 @@ public class NutritionOrder extends DomainResource { throw new FHIRException("Unknown NutritionOrderStatus code '"+codeString+"'"); } public String toCode(NutritionOrderStatus code) { - if (code == NutritionOrderStatus.PROPOSED) + if (code == NutritionOrderStatus.NULL) + return null; + if (code == NutritionOrderStatus.PROPOSED) return "proposed"; if (code == NutritionOrderStatus.DRAFT) return "draft"; @@ -254,7 +256,7 @@ public class NutritionOrder extends DomainResource { if (code == NutritionOrderStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(NutritionOrderStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Observation.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Observation.java index 54b19c2f6..cbcadcca5 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Observation.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Observation.java @@ -124,7 +124,7 @@ public class Observation extends DomainResource { case CANCELLED: return "cancelled"; case ENTEREDINERROR: return "entered-in-error"; case UNKNOWN: return "unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -138,7 +138,7 @@ public class Observation extends DomainResource { case CANCELLED: return "http://hl7.org/fhir/observation-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/observation-status"; case UNKNOWN: return "http://hl7.org/fhir/observation-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -152,7 +152,7 @@ public class Observation extends DomainResource { case CANCELLED: return "The observation is unavailable because the measurement was not started or not completed (also sometimes called \"aborted\")."; case ENTEREDINERROR: return "The observation has been withdrawn following previous final release. This electronic record should never have existed, though it is possible that real-world decisions were based on it. (If real-world activity has occurred, the status should be \"cancelled\" rather than \"entered-in-error\".)"; case UNKNOWN: return "The authoring system does not know which of the status values currently applies for this request. Note: This concept is not to be used for \"other\" - one of the listed statuses is presumed to apply, but the authoring system does not know which."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -166,7 +166,7 @@ public class Observation extends DomainResource { case CANCELLED: return "Cancelled"; case ENTEREDINERROR: return "Entered in Error"; case UNKNOWN: return "Unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -222,7 +222,9 @@ public class Observation extends DomainResource { throw new FHIRException("Unknown ObservationStatus code '"+codeString+"'"); } 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"; @@ -239,7 +241,7 @@ public class Observation extends DomainResource { if (code == ObservationStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(ObservationStatus code) { return code.getSystem(); } @@ -302,7 +304,7 @@ public class Observation extends DomainResource { case REPLACES: return "replaces"; case QUALIFIEDBY: return "qualified-by"; case INTERFEREDBY: return "interfered-by"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -314,7 +316,7 @@ public class Observation extends DomainResource { case REPLACES: return "http://hl7.org/fhir/observation-relationshiptypes"; case QUALIFIEDBY: return "http://hl7.org/fhir/observation-relationshiptypes"; case INTERFEREDBY: return "http://hl7.org/fhir/observation-relationshiptypes"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -326,7 +328,7 @@ public class Observation extends DomainResource { case REPLACES: return "This observation replaces a previous observation (i.e. a revised value). The target observation is now obsolete."; case QUALIFIEDBY: return "The value of the target observation qualifies (refines) the semantics of the source observation (e.g. a lipemia measure target from a plasma measure)."; case INTERFEREDBY: return "The value of the target observation interferes (degrades quality, or prevents valid observation) with the semantics of the source observation (e.g. a hemolysis measure target from a plasma potassium measure, which has no value)."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -338,7 +340,7 @@ public class Observation extends DomainResource { case REPLACES: return "Replaces"; case QUALIFIEDBY: return "Qualified By"; case INTERFEREDBY: return "Interfered By"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -386,7 +388,9 @@ public class Observation extends DomainResource { throw new FHIRException("Unknown ObservationRelationshipType code '"+codeString+"'"); } public String toCode(ObservationRelationshipType code) { - if (code == ObservationRelationshipType.HASMEMBER) + if (code == ObservationRelationshipType.NULL) + return null; + if (code == ObservationRelationshipType.HASMEMBER) return "has-member"; if (code == ObservationRelationshipType.DERIVEDFROM) return "derived-from"; @@ -399,7 +403,7 @@ public class Observation extends DomainResource { if (code == ObservationRelationshipType.INTERFEREDBY) return "interfered-by"; return "?"; - } + } public String toSystem(ObservationRelationshipType code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/OperationDefinition.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/OperationDefinition.java index cfb70ced8..3a61d8b14 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/OperationDefinition.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/OperationDefinition.java @@ -89,7 +89,7 @@ public class OperationDefinition extends MetadataResource { switch (this) { case OPERATION: return "operation"; case QUERY: return "query"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -97,7 +97,7 @@ public class OperationDefinition extends MetadataResource { switch (this) { case OPERATION: return "http://hl7.org/fhir/operation-kind"; case QUERY: return "http://hl7.org/fhir/operation-kind"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -105,7 +105,7 @@ public class OperationDefinition extends MetadataResource { switch (this) { case OPERATION: return "This operation is invoked as an operation."; case QUERY: return "This operation is a named query, invoked using the search mechanism."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -113,7 +113,7 @@ public class OperationDefinition extends MetadataResource { switch (this) { case OPERATION: return "Operation"; case QUERY: return "Query"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -145,12 +145,14 @@ public class OperationDefinition extends MetadataResource { throw new FHIRException("Unknown OperationKind code '"+codeString+"'"); } 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(); } @@ -185,7 +187,7 @@ public class OperationDefinition extends MetadataResource { switch (this) { case IN: return "in"; case OUT: return "out"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -193,7 +195,7 @@ public class OperationDefinition extends MetadataResource { switch (this) { case IN: return "http://hl7.org/fhir/operation-parameter-use"; case OUT: return "http://hl7.org/fhir/operation-parameter-use"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -201,7 +203,7 @@ public class OperationDefinition extends MetadataResource { switch (this) { case IN: return "This is an input parameter."; case OUT: return "This is an output parameter."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -209,7 +211,7 @@ public class OperationDefinition extends MetadataResource { switch (this) { case IN: return "In"; case OUT: return "Out"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -241,12 +243,14 @@ public class OperationDefinition extends MetadataResource { throw new FHIRException("Unknown OperationParameterUse code '"+codeString+"'"); } 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(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/OperationOutcome.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/OperationOutcome.java index 40e8e6dd5..792b9d364 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/OperationOutcome.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/OperationOutcome.java @@ -94,7 +94,7 @@ public class OperationOutcome extends DomainResource implements IBaseOperationOu case ERROR: return "error"; case WARNING: return "warning"; case INFORMATION: return "information"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -104,7 +104,7 @@ public class OperationOutcome extends DomainResource implements IBaseOperationOu case ERROR: return "http://hl7.org/fhir/issue-severity"; case WARNING: return "http://hl7.org/fhir/issue-severity"; case INFORMATION: return "http://hl7.org/fhir/issue-severity"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -114,7 +114,7 @@ public class OperationOutcome extends DomainResource implements IBaseOperationOu case ERROR: return "The issue is sufficiently important to cause the action to fail."; case WARNING: return "The issue is not important enough to cause the action to fail, but may cause it to be performed suboptimally or in a way that is not as desired."; case INFORMATION: return "The issue has no relation to the degree of success of the action."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -124,7 +124,7 @@ public class OperationOutcome extends DomainResource implements IBaseOperationOu case ERROR: return "Error"; case WARNING: return "Warning"; case INFORMATION: return "Information"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -164,7 +164,9 @@ public class OperationOutcome extends DomainResource implements IBaseOperationOu throw new FHIRException("Unknown IssueSeverity code '"+codeString+"'"); } 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"; @@ -173,7 +175,7 @@ public class OperationOutcome extends DomainResource implements IBaseOperationOu if (code == IssueSeverity.INFORMATION) return "information"; return "?"; - } + } public String toSystem(IssueSeverity code) { return code.getSystem(); } @@ -397,7 +399,7 @@ public class OperationOutcome extends DomainResource implements IBaseOperationOu case TIMEOUT: return "timeout"; case THROTTLED: return "throttled"; case INFORMATIONAL: return "informational"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -432,7 +434,7 @@ public class OperationOutcome extends DomainResource implements IBaseOperationOu case TIMEOUT: return "http://hl7.org/fhir/issue-type"; case THROTTLED: return "http://hl7.org/fhir/issue-type"; case INFORMATIONAL: return "http://hl7.org/fhir/issue-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -467,7 +469,7 @@ public class OperationOutcome extends DomainResource implements IBaseOperationOu case TIMEOUT: return "An internal timeout has occurred."; case THROTTLED: return "The system is not prepared to handle this request due to load management."; case INFORMATIONAL: return "A message unrelated to the processing success of the completed operation (examples of the latter include things like reminders of password expiry, system maintenance times, etc.)."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -502,7 +504,7 @@ public class OperationOutcome extends DomainResource implements IBaseOperationOu case TIMEOUT: return "Timeout"; case THROTTLED: return "Throttled"; case INFORMATIONAL: return "Informational Note"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -642,7 +644,9 @@ public class OperationOutcome extends DomainResource implements IBaseOperationOu throw new FHIRException("Unknown IssueType code '"+codeString+"'"); } 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"; @@ -701,7 +705,7 @@ public class OperationOutcome extends DomainResource implements IBaseOperationOu if (code == IssueType.INFORMATIONAL) return "informational"; return "?"; - } + } public String toSystem(IssueType code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ParameterDefinition.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ParameterDefinition.java index 88867bda9..6b041af7d 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ParameterDefinition.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ParameterDefinition.java @@ -76,7 +76,7 @@ public class ParameterDefinition extends Type implements ICompositeType { switch (this) { case IN: return "in"; case OUT: return "out"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -84,7 +84,7 @@ public class ParameterDefinition extends Type implements ICompositeType { switch (this) { case IN: return "http://hl7.org/fhir/operation-parameter-use"; case OUT: return "http://hl7.org/fhir/operation-parameter-use"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -92,7 +92,7 @@ public class ParameterDefinition extends Type implements ICompositeType { switch (this) { case IN: return "This is an input parameter."; case OUT: return "This is an output parameter."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -100,7 +100,7 @@ public class ParameterDefinition extends Type implements ICompositeType { switch (this) { case IN: return "In"; case OUT: return "Out"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -132,12 +132,14 @@ public class ParameterDefinition extends Type implements ICompositeType { throw new FHIRException("Unknown ParameterUse code '"+codeString+"'"); } 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(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Patient.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Patient.java index b0a97c07d..a880c9090 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Patient.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Patient.java @@ -96,7 +96,7 @@ public class Patient extends DomainResource { case REPLACES: return "replaces"; case REFER: return "refer"; case SEEALSO: return "seealso"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -106,7 +106,7 @@ public class Patient extends DomainResource { case REPLACES: return "http://hl7.org/fhir/link-type"; case REFER: return "http://hl7.org/fhir/link-type"; case SEEALSO: return "http://hl7.org/fhir/link-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -116,7 +116,7 @@ public class Patient extends DomainResource { case REPLACES: return "The patient resource containing this link is the current active patient record. The link points back to an inactive patient resource that has been merged into this resource, and should be consulted to retrieve additional referenced information."; case REFER: return "The patient resource containing this link is in use and valid but not considered the main source of information about a patient. The link points forward to another patient resource that should be consulted to retrieve additional patient information."; case SEEALSO: return "The patient resource containing this link is in use and valid, but points to another patient resource that is known to contain data about the same person. Data in this resource might overlap or contradict information found in the other patient resource. This link does not indicate any relative importance of the resources concerned, and both should be regarded as equally valid."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -126,7 +126,7 @@ public class Patient extends DomainResource { case REPLACES: return "Replaces"; case REFER: return "Refer"; case SEEALSO: return "See also"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -166,7 +166,9 @@ public class Patient extends DomainResource { throw new FHIRException("Unknown LinkType code '"+codeString+"'"); } 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"; @@ -175,7 +177,7 @@ public class Patient extends DomainResource { if (code == LinkType.SEEALSO) return "seealso"; return "?"; - } + } public String toSystem(LinkType code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/PaymentNotice.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/PaymentNotice.java index e6b95ad74..38320425f 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/PaymentNotice.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/PaymentNotice.java @@ -91,7 +91,7 @@ public class PaymentNotice extends DomainResource { case CANCELLED: return "cancelled"; case DRAFT: return "draft"; case ENTEREDINERROR: return "entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -101,7 +101,7 @@ public class PaymentNotice extends DomainResource { case CANCELLED: return "http://hl7.org/fhir/fm-status"; case DRAFT: return "http://hl7.org/fhir/fm-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/fm-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -111,7 +111,7 @@ public class PaymentNotice extends DomainResource { case CANCELLED: return "The instance is withdrawn, rescinded or reversed."; case DRAFT: return "A new instance the contents of which is not complete."; case ENTEREDINERROR: return "The instance was entered in error."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -121,7 +121,7 @@ public class PaymentNotice extends DomainResource { case CANCELLED: return "Cancelled"; case DRAFT: return "Draft"; case ENTEREDINERROR: return "Entered in Error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -161,7 +161,9 @@ public class PaymentNotice extends DomainResource { throw new FHIRException("Unknown PaymentNoticeStatus code '"+codeString+"'"); } 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"; @@ -170,7 +172,7 @@ public class PaymentNotice extends DomainResource { if (code == PaymentNoticeStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(PaymentNoticeStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/PaymentReconciliation.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/PaymentReconciliation.java index 567d39a62..492ebc8a5 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/PaymentReconciliation.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/PaymentReconciliation.java @@ -94,7 +94,7 @@ public class PaymentReconciliation extends DomainResource { case CANCELLED: return "cancelled"; case DRAFT: return "draft"; case ENTEREDINERROR: return "entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -104,7 +104,7 @@ public class PaymentReconciliation extends DomainResource { case CANCELLED: return "http://hl7.org/fhir/fm-status"; case DRAFT: return "http://hl7.org/fhir/fm-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/fm-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -114,7 +114,7 @@ public class PaymentReconciliation extends DomainResource { case CANCELLED: return "The instance is withdrawn, rescinded or reversed."; case DRAFT: return "A new instance the contents of which is not complete."; case ENTEREDINERROR: return "The instance was entered in error."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -124,7 +124,7 @@ public class PaymentReconciliation extends DomainResource { case CANCELLED: return "Cancelled"; case DRAFT: return "Draft"; case ENTEREDINERROR: return "Entered in Error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -164,7 +164,9 @@ public class PaymentReconciliation extends DomainResource { throw new FHIRException("Unknown PaymentReconciliationStatus code '"+codeString+"'"); } 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"; @@ -173,7 +175,7 @@ public class PaymentReconciliation extends DomainResource { if (code == PaymentReconciliationStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(PaymentReconciliationStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Person.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Person.java index 381ab03ac..9643be7db 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Person.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Person.java @@ -95,7 +95,7 @@ public class Person extends DomainResource { case LEVEL2: return "level2"; case LEVEL3: return "level3"; case LEVEL4: return "level4"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -105,7 +105,7 @@ public class Person extends DomainResource { case LEVEL2: return "http://hl7.org/fhir/identity-assuranceLevel"; case LEVEL3: return "http://hl7.org/fhir/identity-assuranceLevel"; case LEVEL4: return "http://hl7.org/fhir/identity-assuranceLevel"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -115,7 +115,7 @@ public class Person extends DomainResource { case LEVEL2: return "Some confidence in the asserted identity's accuracy."; case LEVEL3: return "High confidence in the asserted identity's accuracy."; case LEVEL4: return "Very high confidence in the asserted identity's accuracy."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -125,7 +125,7 @@ public class Person extends DomainResource { case LEVEL2: return "Level 2"; case LEVEL3: return "Level 3"; case LEVEL4: return "Level 4"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -165,7 +165,9 @@ public class Person extends DomainResource { throw new FHIRException("Unknown IdentityAssuranceLevel code '"+codeString+"'"); } 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"; @@ -174,7 +176,7 @@ public class Person extends DomainResource { if (code == IdentityAssuranceLevel.LEVEL4) return "level4"; return "?"; - } + } public String toSystem(IdentityAssuranceLevel code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/PlanDefinition.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/PlanDefinition.java index 104aa1646..1974e4c36 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/PlanDefinition.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/PlanDefinition.java @@ -92,7 +92,7 @@ public class PlanDefinition extends MetadataResource { case APPLICABILITY: return "applicability"; case START: return "start"; case STOP: return "stop"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -101,7 +101,7 @@ public class PlanDefinition extends MetadataResource { case APPLICABILITY: return "http://hl7.org/fhir/action-condition-kind"; case START: return "http://hl7.org/fhir/action-condition-kind"; case STOP: return "http://hl7.org/fhir/action-condition-kind"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -110,7 +110,7 @@ public class PlanDefinition extends MetadataResource { case APPLICABILITY: return "The condition describes whether or not a given action is applicable"; case START: return "The condition is a starting condition for the action"; case STOP: return "The condition is a stop, or exit condition for the action"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -119,7 +119,7 @@ public class PlanDefinition extends MetadataResource { case APPLICABILITY: return "Applicability"; case START: return "Start"; case STOP: return "Stop"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -155,14 +155,16 @@ public class PlanDefinition extends MetadataResource { throw new FHIRException("Unknown ActionConditionKind code '"+codeString+"'"); } 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(); } @@ -246,7 +248,7 @@ public class PlanDefinition extends MetadataResource { case AFTERSTART: return "after-start"; case AFTER: return "after"; case AFTEREND: return "after-end"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -261,7 +263,7 @@ public class PlanDefinition extends MetadataResource { case AFTERSTART: return "http://hl7.org/fhir/action-relationship-type"; case AFTER: return "http://hl7.org/fhir/action-relationship-type"; case AFTEREND: return "http://hl7.org/fhir/action-relationship-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -276,7 +278,7 @@ public class PlanDefinition extends MetadataResource { case AFTERSTART: return "The action must be performed after the start of the related action"; case AFTER: return "The action must be performed after the related action"; case AFTEREND: return "The action must be performed after the end of the related action"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -291,7 +293,7 @@ public class PlanDefinition extends MetadataResource { case AFTERSTART: return "After Start"; case AFTER: return "After"; case AFTEREND: return "After End"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -351,7 +353,9 @@ public class PlanDefinition extends MetadataResource { throw new FHIRException("Unknown ActionRelationshipType code '"+codeString+"'"); } 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"; @@ -370,7 +374,7 @@ public class PlanDefinition extends MetadataResource { if (code == ActionRelationshipType.AFTEREND) return "after-end"; return "?"; - } + } public String toSystem(ActionRelationshipType code) { return code.getSystem(); } @@ -412,7 +416,7 @@ public class PlanDefinition extends MetadataResource { case PATIENT: return "patient"; case PRACTITIONER: return "practitioner"; case RELATEDPERSON: return "related-person"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -421,7 +425,7 @@ public class PlanDefinition extends MetadataResource { case PATIENT: return "http://hl7.org/fhir/action-participant-type"; case PRACTITIONER: return "http://hl7.org/fhir/action-participant-type"; case RELATEDPERSON: return "http://hl7.org/fhir/action-participant-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -430,7 +434,7 @@ public class PlanDefinition extends MetadataResource { case PATIENT: return "The participant is the patient under evaluation"; case PRACTITIONER: return "The participant is a practitioner involved in the patient's care"; case RELATEDPERSON: return "The participant is a person related to the patient"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -439,7 +443,7 @@ public class PlanDefinition extends MetadataResource { case PATIENT: return "Patient"; case PRACTITIONER: return "Practitioner"; case RELATEDPERSON: return "Related Person"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -475,14 +479,16 @@ public class PlanDefinition extends MetadataResource { throw new FHIRException("Unknown ActionParticipantType code '"+codeString+"'"); } 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"; if (code == ActionParticipantType.RELATEDPERSON) return "related-person"; return "?"; - } + } public String toSystem(ActionParticipantType code) { return code.getSystem(); } @@ -524,7 +530,7 @@ public class PlanDefinition extends MetadataResource { case VISUALGROUP: return "visual-group"; case LOGICALGROUP: return "logical-group"; case SENTENCEGROUP: return "sentence-group"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -533,7 +539,7 @@ public class PlanDefinition extends MetadataResource { case VISUALGROUP: return "http://hl7.org/fhir/action-grouping-behavior"; case LOGICALGROUP: return "http://hl7.org/fhir/action-grouping-behavior"; case SENTENCEGROUP: return "http://hl7.org/fhir/action-grouping-behavior"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -542,7 +548,7 @@ public class PlanDefinition extends MetadataResource { case VISUALGROUP: return "Any group marked with this behavior should be displayed as a visual group to the end user"; case LOGICALGROUP: return "A group with this behavior logically groups its sub-elements, and may be shown as a visual group to the end user, but it is not required to do so"; case SENTENCEGROUP: return "A group of related alternative actions is a sentence group if the target referenced by the action is the same in all the actions and each action simply constitutes a different variation on how to specify the details for the target. For example, two actions that could be in a SentenceGroup are \"aspirin, 500 mg, 2 times per day\" and \"aspirin, 300 mg, 3 times per day\". In both cases, aspirin is the target referenced by the action, and the two actions represent different options for how aspirin might be ordered for the patient. Note that a SentenceGroup would almost always have an associated selection behavior of \"AtMostOne\", unless it's a required action, in which case, it would be \"ExactlyOne\""; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -551,7 +557,7 @@ public class PlanDefinition extends MetadataResource { case VISUALGROUP: return "Visual Group"; case LOGICALGROUP: return "Logical Group"; case SENTENCEGROUP: return "Sentence Group"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -587,14 +593,16 @@ public class PlanDefinition extends MetadataResource { throw new FHIRException("Unknown ActionGroupingBehavior code '"+codeString+"'"); } 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(); } @@ -657,7 +665,7 @@ public class PlanDefinition extends MetadataResource { case EXACTLYONE: return "exactly-one"; case ATMOSTONE: return "at-most-one"; case ONEORMORE: return "one-or-more"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -669,7 +677,7 @@ public class PlanDefinition extends MetadataResource { case EXACTLYONE: return "http://hl7.org/fhir/action-selection-behavior"; case ATMOSTONE: return "http://hl7.org/fhir/action-selection-behavior"; case ONEORMORE: return "http://hl7.org/fhir/action-selection-behavior"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -681,7 +689,7 @@ public class PlanDefinition extends MetadataResource { case EXACTLYONE: return "The end user must choose one and only one of the selectable actions in the group. The user may not choose none of the actions in the group"; case ATMOSTONE: return "The end user may choose zero or at most one of the actions in the group"; case ONEORMORE: return "The end user must choose a minimum of one, and as many additional as desired"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -693,7 +701,7 @@ public class PlanDefinition extends MetadataResource { case EXACTLYONE: return "Exactly One"; case ATMOSTONE: return "At Most One"; case ONEORMORE: return "One Or More"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -741,7 +749,9 @@ public class PlanDefinition extends MetadataResource { throw new FHIRException("Unknown ActionSelectionBehavior code '"+codeString+"'"); } 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"; @@ -754,7 +764,7 @@ public class PlanDefinition extends MetadataResource { if (code == ActionSelectionBehavior.ONEORMORE) return "one-or-more"; return "?"; - } + } public String toSystem(ActionSelectionBehavior code) { return code.getSystem(); } @@ -796,7 +806,7 @@ public class PlanDefinition extends MetadataResource { case MUST: return "must"; case COULD: return "could"; case MUSTUNLESSDOCUMENTED: return "must-unless-documented"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -805,7 +815,7 @@ public class PlanDefinition extends MetadataResource { case MUST: return "http://hl7.org/fhir/action-required-behavior"; case COULD: return "http://hl7.org/fhir/action-required-behavior"; case MUSTUNLESSDOCUMENTED: return "http://hl7.org/fhir/action-required-behavior"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -814,7 +824,7 @@ public class PlanDefinition extends MetadataResource { case MUST: return "An action with this behavior must be included in the actions processed by the end user; the end user may not choose not to include this action"; case COULD: return "An action with this behavior may be included in the set of actions processed by the end user"; case MUSTUNLESSDOCUMENTED: return "An action with this behavior must be included in the set of actions processed by the end user, unless the end user provides documentation as to why the action was not included"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -823,7 +833,7 @@ public class PlanDefinition extends MetadataResource { case MUST: return "Must"; case COULD: return "Could"; case MUSTUNLESSDOCUMENTED: return "Must Unless Documented"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -859,14 +869,16 @@ public class PlanDefinition extends MetadataResource { throw new FHIRException("Unknown ActionRequiredBehavior code '"+codeString+"'"); } 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(); } @@ -901,7 +913,7 @@ public class PlanDefinition extends MetadataResource { switch (this) { case YES: return "yes"; case NO: return "no"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -909,7 +921,7 @@ public class PlanDefinition extends MetadataResource { switch (this) { case YES: return "http://hl7.org/fhir/action-precheck-behavior"; case NO: return "http://hl7.org/fhir/action-precheck-behavior"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -917,7 +929,7 @@ public class PlanDefinition extends MetadataResource { switch (this) { case YES: return "An action with this behavior is one of the most frequent action that is, or should be, included by an end user, for the particular context in which the action occurs. The system displaying the action to the end user should consider \"pre-checking\" such an action as a convenience for the user"; case NO: return "An action with this behavior is one of the less frequent actions included by the end user, for the particular context in which the action occurs. The system displaying the actions to the end user would typically not \"pre-check\" such an action"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -925,7 +937,7 @@ public class PlanDefinition extends MetadataResource { switch (this) { case YES: return "Yes"; case NO: return "No"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -957,12 +969,14 @@ public class PlanDefinition extends MetadataResource { throw new FHIRException("Unknown ActionPrecheckBehavior code '"+codeString+"'"); } 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(); } @@ -997,7 +1011,7 @@ public class PlanDefinition extends MetadataResource { switch (this) { case SINGLE: return "single"; case MULTIPLE: return "multiple"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1005,7 +1019,7 @@ public class PlanDefinition extends MetadataResource { switch (this) { case SINGLE: return "http://hl7.org/fhir/action-cardinality-behavior"; case MULTIPLE: return "http://hl7.org/fhir/action-cardinality-behavior"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1013,7 +1027,7 @@ public class PlanDefinition extends MetadataResource { switch (this) { case SINGLE: return "The action may only be selected one time"; case MULTIPLE: return "The action may be selected multiple times"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1021,7 +1035,7 @@ public class PlanDefinition extends MetadataResource { switch (this) { case SINGLE: return "Single"; case MULTIPLE: return "Multiple"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1053,12 +1067,14 @@ public class PlanDefinition extends MetadataResource { throw new FHIRException("Unknown ActionCardinalityBehavior code '"+codeString+"'"); } 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(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/PractitionerRole.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/PractitionerRole.java index ba33ca70d..251e0cb6d 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/PractitionerRole.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/PractitionerRole.java @@ -115,7 +115,7 @@ public class PractitionerRole extends DomainResource { case FRI: return "fri"; case SAT: return "sat"; case SUN: return "sun"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -128,7 +128,7 @@ public class PractitionerRole extends DomainResource { case FRI: return "http://hl7.org/fhir/days-of-week"; case SAT: return "http://hl7.org/fhir/days-of-week"; case SUN: return "http://hl7.org/fhir/days-of-week"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -141,7 +141,7 @@ public class PractitionerRole extends DomainResource { case FRI: return "Friday"; case SAT: return "Saturday"; case SUN: return "Sunday"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -154,7 +154,7 @@ public class PractitionerRole extends DomainResource { case FRI: return "Friday"; case SAT: return "Saturday"; case SUN: return "Sunday"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -206,7 +206,9 @@ public class PractitionerRole extends DomainResource { throw new FHIRException("Unknown DaysOfWeek code '"+codeString+"'"); } 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"; @@ -221,7 +223,7 @@ public class PractitionerRole extends DomainResource { if (code == DaysOfWeek.SUN) return "sun"; return "?"; - } + } public String toSystem(DaysOfWeek code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Procedure.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Procedure.java index 6fbc24a2a..a15c6c99c 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Procedure.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Procedure.java @@ -114,7 +114,7 @@ public class Procedure extends DomainResource { case COMPLETED: return "completed"; case ENTEREDINERROR: return "entered-in-error"; case UNKNOWN: return "unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -127,7 +127,7 @@ public class Procedure extends DomainResource { case COMPLETED: return "http://hl7.org/fhir/event-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/event-status"; case UNKNOWN: return "http://hl7.org/fhir/event-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -140,7 +140,7 @@ public class Procedure extends DomainResource { case COMPLETED: return "The event has now concluded"; case ENTEREDINERROR: return "This electronic record should never have existed, though it is possible that real-world decisions were based on it. (If real-world activity has occurred, the status should be \"cancelled\" rather than \"entered-in-error\".)"; case UNKNOWN: return "The authoring system does not know which of the status values currently applies for this request. Note: This concept is not to be used for \"other\" - one of the listed statuses is presumed to apply, it's just not known which one."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -153,7 +153,7 @@ public class Procedure extends DomainResource { case COMPLETED: return "Completed"; case ENTEREDINERROR: return "Entered in Error"; case UNKNOWN: return "Unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -205,7 +205,9 @@ public class Procedure extends DomainResource { throw new FHIRException("Unknown ProcedureStatus code '"+codeString+"'"); } 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"; @@ -220,7 +222,7 @@ public class Procedure extends DomainResource { if (code == ProcedureStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(ProcedureStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ProcedureRequest.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ProcedureRequest.java index 9b1842620..cd442a04c 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ProcedureRequest.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ProcedureRequest.java @@ -115,7 +115,7 @@ public class ProcedureRequest extends DomainResource { case COMPLETED: return "completed"; case ENTEREDINERROR: return "entered-in-error"; case UNKNOWN: return "unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -128,7 +128,7 @@ public class ProcedureRequest extends DomainResource { case COMPLETED: return "http://hl7.org/fhir/request-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/request-status"; case UNKNOWN: return "http://hl7.org/fhir/request-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -141,7 +141,7 @@ public class ProcedureRequest extends DomainResource { case COMPLETED: return "Activity against the request has been sufficiently completed to the satisfaction of the requester"; case ENTEREDINERROR: return "This electronic record should never have existed, though it is possible that real-world decisions were based on it. (If real-world activity has occurred, the status should be \"cancelled\" rather than \"entered-in-error\".)"; case UNKNOWN: return "The authoring system does not know which of the status values currently applies for this request. Note: This concept is not to be used for \"other\" . One of the listed statuses is presumed to apply, but the system creating the request doesn't know."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -154,7 +154,7 @@ public class ProcedureRequest extends DomainResource { case COMPLETED: return "Completed"; case ENTEREDINERROR: return "Entered in Error"; case UNKNOWN: return "Unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -206,7 +206,9 @@ public class ProcedureRequest extends DomainResource { throw new FHIRException("Unknown ProcedureRequestStatus code '"+codeString+"'"); } public String toCode(ProcedureRequestStatus code) { - if (code == ProcedureRequestStatus.DRAFT) + if (code == ProcedureRequestStatus.NULL) + return null; + if (code == ProcedureRequestStatus.DRAFT) return "draft"; if (code == ProcedureRequestStatus.ACTIVE) return "active"; @@ -221,7 +223,7 @@ public class ProcedureRequest extends DomainResource { if (code == ProcedureRequestStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(ProcedureRequestStatus code) { return code.getSystem(); } @@ -300,7 +302,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case FILLERORDER: return "filler-order"; case INSTANCEORDER: return "instance-order"; case OPTION: return "option"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -314,7 +316,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case FILLERORDER: return "http://hl7.org/fhir/request-intent"; case INSTANCEORDER: return "http://hl7.org/fhir/request-intent"; case OPTION: return "http://hl7.org/fhir/request-intent"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -328,7 +330,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case FILLERORDER: return "The request represents the view of an authorization instantiated by a fulfilling system representing the details of the fulfiller's intention to act upon a submitted order"; case INSTANCEORDER: return "An order created in fulfillment of a broader order that represents the authorization for a single activity occurrence. E.g. The administration of a single dose of a drug."; case OPTION: return "The request represents a component or option for a RequestGroup that establishes timing, conditionality and/or other constraints among a set of requests.\n\nRefer to [[[RequestGroup]]] for additional information on how this status is used"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -342,7 +344,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case FILLERORDER: return "Filler Order"; case INSTANCEORDER: return "Instance Order"; case OPTION: return "Option"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -398,7 +400,9 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use throw new FHIRException("Unknown ProcedureRequestIntent code '"+codeString+"'"); } public String toCode(ProcedureRequestIntent code) { - if (code == ProcedureRequestIntent.PROPOSAL) + if (code == ProcedureRequestIntent.NULL) + return null; + if (code == ProcedureRequestIntent.PROPOSAL) return "proposal"; if (code == ProcedureRequestIntent.PLAN) return "plan"; @@ -415,7 +419,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use if (code == ProcedureRequestIntent.OPTION) return "option"; return "?"; - } + } public String toSystem(ProcedureRequestIntent code) { return code.getSystem(); } @@ -464,7 +468,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case URGENT: return "urgent"; case ASAP: return "asap"; case STAT: return "stat"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -474,7 +478,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case URGENT: return "http://hl7.org/fhir/request-priority"; case ASAP: return "http://hl7.org/fhir/request-priority"; case STAT: return "http://hl7.org/fhir/request-priority"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -484,7 +488,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case URGENT: return "The request should be actioned promptly - higher priority than routine"; case ASAP: return "The request should be actioned as soon as possible - higher priority than urgent"; case STAT: return "The request should be actioned immediately - highest possible priority. E.g. an emergency"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -494,7 +498,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case URGENT: return "Urgent"; case ASAP: return "ASAP"; case STAT: return "STAT"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -534,7 +538,9 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use throw new FHIRException("Unknown ProcedureRequestPriority code '"+codeString+"'"); } public String toCode(ProcedureRequestPriority code) { - if (code == ProcedureRequestPriority.ROUTINE) + if (code == ProcedureRequestPriority.NULL) + return null; + if (code == ProcedureRequestPriority.ROUTINE) return "routine"; if (code == ProcedureRequestPriority.URGENT) return "urgent"; @@ -543,7 +549,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use if (code == ProcedureRequestPriority.STAT) return "stat"; return "?"; - } + } public String toSystem(ProcedureRequestPriority code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ProcessRequest.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ProcessRequest.java index 3bd7d6f86..f601d138e 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ProcessRequest.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ProcessRequest.java @@ -95,7 +95,7 @@ public class ProcessRequest extends DomainResource { case CANCELLED: return "cancelled"; case DRAFT: return "draft"; case ENTEREDINERROR: return "entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -105,7 +105,7 @@ public class ProcessRequest extends DomainResource { case CANCELLED: return "http://hl7.org/fhir/fm-status"; case DRAFT: return "http://hl7.org/fhir/fm-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/fm-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -115,7 +115,7 @@ public class ProcessRequest extends DomainResource { case CANCELLED: return "The instance is withdrawn, rescinded or reversed."; case DRAFT: return "A new instance the contents of which is not complete."; case ENTEREDINERROR: return "The instance was entered in error."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -125,7 +125,7 @@ public class ProcessRequest extends DomainResource { case CANCELLED: return "Cancelled"; case DRAFT: return "Draft"; case ENTEREDINERROR: return "Entered in Error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -165,7 +165,9 @@ public class ProcessRequest extends DomainResource { throw new FHIRException("Unknown ProcessRequestStatus code '"+codeString+"'"); } public String toCode(ProcessRequestStatus code) { - if (code == ProcessRequestStatus.ACTIVE) + if (code == ProcessRequestStatus.NULL) + return null; + if (code == ProcessRequestStatus.ACTIVE) return "active"; if (code == ProcessRequestStatus.CANCELLED) return "cancelled"; @@ -174,7 +176,7 @@ public class ProcessRequest extends DomainResource { if (code == ProcessRequestStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(ProcessRequestStatus code) { return code.getSystem(); } @@ -223,7 +225,7 @@ public class ProcessRequest extends DomainResource { case POLL: return "poll"; case REPROCESS: return "reprocess"; case STATUS: return "status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -233,7 +235,7 @@ public class ProcessRequest extends DomainResource { case POLL: return "http://hl7.org/fhir/actionlist"; case REPROCESS: return "http://hl7.org/fhir/actionlist"; case STATUS: return "http://hl7.org/fhir/actionlist"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -243,7 +245,7 @@ public class ProcessRequest extends DomainResource { case POLL: return "Check for previously un-read/ not-retrieved resources."; case REPROCESS: return "Re-process the target resource."; case STATUS: return "Retrieve the processing status of the target resource."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -253,7 +255,7 @@ public class ProcessRequest extends DomainResource { case POLL: return "Poll"; case REPROCESS: return "Re-Process"; case STATUS: return "Status Check"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -293,7 +295,9 @@ public class ProcessRequest extends DomainResource { throw new FHIRException("Unknown ActionList code '"+codeString+"'"); } public String toCode(ActionList code) { - if (code == ActionList.CANCEL) + if (code == ActionList.NULL) + return null; + if (code == ActionList.CANCEL) return "cancel"; if (code == ActionList.POLL) return "poll"; @@ -302,7 +306,7 @@ public class ProcessRequest extends DomainResource { if (code == ActionList.STATUS) return "status"; return "?"; - } + } public String toSystem(ActionList code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ProcessResponse.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ProcessResponse.java index 18484bd4f..55f419922 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ProcessResponse.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ProcessResponse.java @@ -94,7 +94,7 @@ public class ProcessResponse extends DomainResource { case CANCELLED: return "cancelled"; case DRAFT: return "draft"; case ENTEREDINERROR: return "entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -104,7 +104,7 @@ public class ProcessResponse extends DomainResource { case CANCELLED: return "http://hl7.org/fhir/fm-status"; case DRAFT: return "http://hl7.org/fhir/fm-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/fm-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -114,7 +114,7 @@ public class ProcessResponse extends DomainResource { case CANCELLED: return "The instance is withdrawn, rescinded or reversed."; case DRAFT: return "A new instance the contents of which is not complete."; case ENTEREDINERROR: return "The instance was entered in error."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -124,7 +124,7 @@ public class ProcessResponse extends DomainResource { case CANCELLED: return "Cancelled"; case DRAFT: return "Draft"; case ENTEREDINERROR: return "Entered in Error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -164,7 +164,9 @@ public class ProcessResponse extends DomainResource { throw new FHIRException("Unknown ProcessResponseStatus code '"+codeString+"'"); } public String toCode(ProcessResponseStatus code) { - if (code == ProcessResponseStatus.ACTIVE) + if (code == ProcessResponseStatus.NULL) + return null; + if (code == ProcessResponseStatus.ACTIVE) return "active"; if (code == ProcessResponseStatus.CANCELLED) return "cancelled"; @@ -173,7 +175,7 @@ public class ProcessResponse extends DomainResource { if (code == ProcessResponseStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(ProcessResponseStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Provenance.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Provenance.java index 77f93c256..862bb4e87 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Provenance.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Provenance.java @@ -102,7 +102,7 @@ public class Provenance extends DomainResource { case QUOTATION: return "quotation"; case SOURCE: return "source"; case REMOVAL: return "removal"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -113,7 +113,7 @@ public class Provenance extends DomainResource { case QUOTATION: return "http://hl7.org/fhir/provenance-entity-role"; case SOURCE: return "http://hl7.org/fhir/provenance-entity-role"; case REMOVAL: return "http://hl7.org/fhir/provenance-entity-role"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -124,7 +124,7 @@ public class Provenance extends DomainResource { case QUOTATION: return "The repeat of (some or all of) an entity, such as text or image, by someone who may or may not be its original author."; case SOURCE: return "A primary source for a topic refers to something produced by some agent with direct experience and knowledge about the topic, at the time of the topic's study, without benefit from hindsight."; case REMOVAL: return "A derivation for which the entity is removed from accessibility usually through the use of the Delete operation."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -135,7 +135,7 @@ public class Provenance extends DomainResource { case QUOTATION: return "Quotation"; case SOURCE: return "Source"; case REMOVAL: return "Removal"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -179,7 +179,9 @@ public class Provenance extends DomainResource { throw new FHIRException("Unknown ProvenanceEntityRole code '"+codeString+"'"); } 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"; @@ -190,7 +192,7 @@ public class Provenance extends DomainResource { if (code == ProvenanceEntityRole.REMOVAL) return "removal"; return "?"; - } + } public String toSystem(ProvenanceEntityRole code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Quantity.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Quantity.java index c9480b026..fd3912594 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Quantity.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Quantity.java @@ -90,7 +90,7 @@ public class Quantity extends Type implements ICompositeType { case LESS_OR_EQUAL: return "<="; case GREATER_OR_EQUAL: return ">="; case GREATER_THAN: return ">"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -100,7 +100,7 @@ public class Quantity extends Type implements ICompositeType { case LESS_OR_EQUAL: return "http://hl7.org/fhir/quantity-comparator"; case GREATER_OR_EQUAL: return "http://hl7.org/fhir/quantity-comparator"; case GREATER_THAN: return "http://hl7.org/fhir/quantity-comparator"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -110,7 +110,7 @@ public class Quantity extends Type implements ICompositeType { case LESS_OR_EQUAL: return "The actual value is less than or equal to the given value."; case GREATER_OR_EQUAL: return "The actual value is greater than or equal to the given value."; case GREATER_THAN: return "The actual value is greater than the given value."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -120,7 +120,7 @@ public class Quantity extends Type implements ICompositeType { case LESS_OR_EQUAL: return "Less or Equal to"; case GREATER_OR_EQUAL: return "Greater or Equal to"; case GREATER_THAN: return "Greater than"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -160,7 +160,9 @@ public class Quantity extends Type implements ICompositeType { throw new FHIRException("Unknown QuantityComparator code '"+codeString+"'"); } 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 "<="; @@ -169,7 +171,7 @@ public class Quantity extends Type implements ICompositeType { if (code == QuantityComparator.GREATER_THAN) return ">"; return "?"; - } + } public String toSystem(QuantityComparator code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Questionnaire.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Questionnaire.java index 54afaec6c..f3b8f58a9 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Questionnaire.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Questionnaire.java @@ -193,7 +193,7 @@ There is an extension 'http://hl7.org/fhir/StructureDefinition/questionnaire-uni case ATTACHMENT: return "attachment"; case REFERENCE: return "reference"; case QUANTITY: return "quantity"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -216,7 +216,7 @@ There is an extension 'http://hl7.org/fhir/StructureDefinition/questionnaire-uni case ATTACHMENT: return "http://hl7.org/fhir/item-type"; case REFERENCE: return "http://hl7.org/fhir/item-type"; case QUANTITY: return "http://hl7.org/fhir/item-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -239,7 +239,7 @@ There is an extension 'http://hl7.org/fhir/StructureDefinition/questionnaire-uni case ATTACHMENT: return "Question with binary content such as a image, PDF, etc. as an answer (valueAttachment)"; case REFERENCE: return "Question with a reference to another resource (practitioner, organization, etc.) as an answer (valueReference)"; case QUANTITY: return "Question with a combination of a numeric value and unit, potentially with a comparator (<, >, etc.) as an answer. (valueQuantity)\nThere is an extension 'http://hl7.org/fhir/StructureDefinition/questionnaire-unit' that can be used to define what unit whould be captured (or the a unit that has a ucum conversion from the provided unit)"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -262,7 +262,7 @@ There is an extension 'http://hl7.org/fhir/StructureDefinition/questionnaire-uni case ATTACHMENT: return "Attachment"; case REFERENCE: return "Reference"; case QUANTITY: return "Quantity"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -354,7 +354,9 @@ There is an extension 'http://hl7.org/fhir/StructureDefinition/questionnaire-uni throw new FHIRException("Unknown QuestionnaireItemType code '"+codeString+"'"); } 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"; @@ -389,7 +391,7 @@ There is an extension 'http://hl7.org/fhir/StructureDefinition/questionnaire-uni if (code == QuestionnaireItemType.QUANTITY) return "quantity"; return "?"; - } + } public String toSystem(QuestionnaireItemType code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/QuestionnaireResponse.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/QuestionnaireResponse.java index cd1641c0e..d944fcf07 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/QuestionnaireResponse.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/QuestionnaireResponse.java @@ -103,7 +103,7 @@ public class QuestionnaireResponse extends DomainResource { case AMENDED: return "amended"; case ENTEREDINERROR: return "entered-in-error"; case STOPPED: return "stopped"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -114,7 +114,7 @@ public class QuestionnaireResponse extends DomainResource { case AMENDED: return "http://hl7.org/fhir/questionnaire-answers-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/questionnaire-answers-status"; case STOPPED: return "http://hl7.org/fhir/questionnaire-answers-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -125,7 +125,7 @@ public class QuestionnaireResponse extends DomainResource { case AMENDED: return "This QuestionnaireResponse has been filled out with answers, then marked as complete, yet changes or additions have been made to it afterwards."; case ENTEREDINERROR: return "This QuestionnaireResponse was entered in error and voided."; case STOPPED: return "This QuestionnaireResponse has been partially filled out with answers, but has been abandoned. It is unknown whether changes or additions are expected to be made to it."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -136,7 +136,7 @@ public class QuestionnaireResponse extends DomainResource { case AMENDED: return "Amended"; case ENTEREDINERROR: return "Entered in Error"; case STOPPED: return "Stopped"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -180,7 +180,9 @@ public class QuestionnaireResponse extends DomainResource { throw new FHIRException("Unknown QuestionnaireResponseStatus code '"+codeString+"'"); } 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"; @@ -191,7 +193,7 @@ public class QuestionnaireResponse extends DomainResource { if (code == QuestionnaireResponseStatus.STOPPED) return "stopped"; return "?"; - } + } public String toSystem(QuestionnaireResponseStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ReferralRequest.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ReferralRequest.java index 91e8b3e47..7cfb7ec7f 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ReferralRequest.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ReferralRequest.java @@ -117,7 +117,7 @@ public class ReferralRequest extends DomainResource { case COMPLETED: return "completed"; case ENTEREDINERROR: return "entered-in-error"; case UNKNOWN: return "unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -130,7 +130,7 @@ public class ReferralRequest extends DomainResource { case COMPLETED: return "http://hl7.org/fhir/request-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/request-status"; case UNKNOWN: return "http://hl7.org/fhir/request-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -143,7 +143,7 @@ public class ReferralRequest extends DomainResource { case COMPLETED: return "Activity against the request has been sufficiently completed to the satisfaction of the requester"; case ENTEREDINERROR: return "This electronic record should never have existed, though it is possible that real-world decisions were based on it. (If real-world activity has occurred, the status should be \"cancelled\" rather than \"entered-in-error\".)"; case UNKNOWN: return "The authoring system does not know which of the status values currently applies for this request. Note: This concept is not to be used for \"other\" . One of the listed statuses is presumed to apply, but the system creating the request doesn't know."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -156,7 +156,7 @@ public class ReferralRequest extends DomainResource { case COMPLETED: return "Completed"; case ENTEREDINERROR: return "Entered in Error"; case UNKNOWN: return "Unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -208,7 +208,9 @@ public class ReferralRequest extends DomainResource { throw new FHIRException("Unknown ReferralRequestStatus code '"+codeString+"'"); } public String toCode(ReferralRequestStatus code) { - if (code == ReferralRequestStatus.DRAFT) + if (code == ReferralRequestStatus.NULL) + return null; + if (code == ReferralRequestStatus.DRAFT) return "draft"; if (code == ReferralRequestStatus.ACTIVE) return "active"; @@ -223,7 +225,7 @@ public class ReferralRequest extends DomainResource { if (code == ReferralRequestStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(ReferralRequestStatus code) { return code.getSystem(); } @@ -302,7 +304,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case FILLERORDER: return "filler-order"; case INSTANCEORDER: return "instance-order"; case OPTION: return "option"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -316,7 +318,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case FILLERORDER: return "http://hl7.org/fhir/request-intent"; case INSTANCEORDER: return "http://hl7.org/fhir/request-intent"; case OPTION: return "http://hl7.org/fhir/request-intent"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -330,7 +332,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case FILLERORDER: return "The request represents the view of an authorization instantiated by a fulfilling system representing the details of the fulfiller's intention to act upon a submitted order"; case INSTANCEORDER: return "An order created in fulfillment of a broader order that represents the authorization for a single activity occurrence. E.g. The administration of a single dose of a drug."; case OPTION: return "The request represents a component or option for a RequestGroup that establishes timing, conditionality and/or other constraints among a set of requests.\n\nRefer to [[[RequestGroup]]] for additional information on how this status is used"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -344,7 +346,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case FILLERORDER: return "Filler Order"; case INSTANCEORDER: return "Instance Order"; case OPTION: return "Option"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -400,7 +402,9 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use throw new FHIRException("Unknown ReferralCategory code '"+codeString+"'"); } public String toCode(ReferralCategory code) { - if (code == ReferralCategory.PROPOSAL) + if (code == ReferralCategory.NULL) + return null; + if (code == ReferralCategory.PROPOSAL) return "proposal"; if (code == ReferralCategory.PLAN) return "plan"; @@ -417,7 +421,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use if (code == ReferralCategory.OPTION) return "option"; return "?"; - } + } public String toSystem(ReferralCategory code) { return code.getSystem(); } @@ -466,7 +470,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case URGENT: return "urgent"; case ASAP: return "asap"; case STAT: return "stat"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -476,7 +480,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case URGENT: return "http://hl7.org/fhir/request-priority"; case ASAP: return "http://hl7.org/fhir/request-priority"; case STAT: return "http://hl7.org/fhir/request-priority"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -486,7 +490,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case URGENT: return "The request should be actioned promptly - higher priority than routine"; case ASAP: return "The request should be actioned as soon as possible - higher priority than urgent"; case STAT: return "The request should be actioned immediately - highest possible priority. E.g. an emergency"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -496,7 +500,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case URGENT: return "Urgent"; case ASAP: return "ASAP"; case STAT: return "STAT"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -536,7 +540,9 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use throw new FHIRException("Unknown ReferralPriority code '"+codeString+"'"); } public String toCode(ReferralPriority code) { - if (code == ReferralPriority.ROUTINE) + if (code == ReferralPriority.NULL) + return null; + if (code == ReferralPriority.ROUTINE) return "routine"; if (code == ReferralPriority.URGENT) return "urgent"; @@ -545,7 +551,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use if (code == ReferralPriority.STAT) return "stat"; return "?"; - } + } public String toSystem(ReferralPriority code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/RelatedArtifact.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/RelatedArtifact.java index 98cecf5b0..e0d066db1 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/RelatedArtifact.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/RelatedArtifact.java @@ -118,7 +118,7 @@ public class RelatedArtifact extends Type implements ICompositeType { case DERIVEDFROM: return "derived-from"; case DEPENDSON: return "depends-on"; case COMPOSEDOF: return "composed-of"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -132,7 +132,7 @@ public class RelatedArtifact extends Type implements ICompositeType { case DERIVEDFROM: return "http://hl7.org/fhir/related-artifact-type"; case DEPENDSON: return "http://hl7.org/fhir/related-artifact-type"; case COMPOSEDOF: return "http://hl7.org/fhir/related-artifact-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -146,7 +146,7 @@ public class RelatedArtifact extends Type implements ICompositeType { case DERIVEDFROM: return "The knowledge resource is derived from the related artifact. This is intended to capture the relationship in which a particular knowledge resource is based on the content of another artifact, but is modified to capture either a different set of overall requirements, or a more specific set of requirements such as those involved in a particular institution or clinical setting"; case DEPENDSON: return "The knowledge resource depends on the given related artifact"; case COMPOSEDOF: return "The knowledge resource is composed of the given related artifact"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -160,7 +160,7 @@ public class RelatedArtifact extends Type implements ICompositeType { case DERIVEDFROM: return "Derived From"; case DEPENDSON: return "Depends On"; case COMPOSEDOF: return "Composed Of"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -216,7 +216,9 @@ public class RelatedArtifact extends Type implements ICompositeType { throw new FHIRException("Unknown RelatedArtifactType code '"+codeString+"'"); } 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"; @@ -233,7 +235,7 @@ public class RelatedArtifact extends Type implements ICompositeType { if (code == RelatedArtifactType.COMPOSEDOF) return "composed-of"; return "?"; - } + } public String toSystem(RelatedArtifactType code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/RequestGroup.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/RequestGroup.java index d5309df15..568c62b50 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/RequestGroup.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/RequestGroup.java @@ -117,7 +117,7 @@ public class RequestGroup extends DomainResource { case COMPLETED: return "completed"; case ENTEREDINERROR: return "entered-in-error"; case UNKNOWN: return "unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -130,7 +130,7 @@ public class RequestGroup extends DomainResource { case COMPLETED: return "http://hl7.org/fhir/request-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/request-status"; case UNKNOWN: return "http://hl7.org/fhir/request-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -143,7 +143,7 @@ public class RequestGroup extends DomainResource { case COMPLETED: return "Activity against the request has been sufficiently completed to the satisfaction of the requester"; case ENTEREDINERROR: return "This electronic record should never have existed, though it is possible that real-world decisions were based on it. (If real-world activity has occurred, the status should be \"cancelled\" rather than \"entered-in-error\".)"; case UNKNOWN: return "The authoring system does not know which of the status values currently applies for this request. Note: This concept is not to be used for \"other\" . One of the listed statuses is presumed to apply, but the system creating the request doesn't know."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -156,7 +156,7 @@ public class RequestGroup extends DomainResource { case COMPLETED: return "Completed"; case ENTEREDINERROR: return "Entered in Error"; case UNKNOWN: return "Unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -208,7 +208,9 @@ public class RequestGroup extends DomainResource { throw new FHIRException("Unknown RequestStatus code '"+codeString+"'"); } 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"; @@ -223,7 +225,7 @@ public class RequestGroup extends DomainResource { if (code == RequestStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(RequestStatus code) { return code.getSystem(); } @@ -302,7 +304,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case FILLERORDER: return "filler-order"; case INSTANCEORDER: return "instance-order"; case OPTION: return "option"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -316,7 +318,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case FILLERORDER: return "http://hl7.org/fhir/request-intent"; case INSTANCEORDER: return "http://hl7.org/fhir/request-intent"; case OPTION: return "http://hl7.org/fhir/request-intent"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -330,7 +332,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case FILLERORDER: return "The request represents the view of an authorization instantiated by a fulfilling system representing the details of the fulfiller's intention to act upon a submitted order"; case INSTANCEORDER: return "An order created in fulfillment of a broader order that represents the authorization for a single activity occurrence. E.g. The administration of a single dose of a drug."; case OPTION: return "The request represents a component or option for a RequestGroup that establishes timing, conditionality and/or other constraints among a set of requests.\n\nRefer to [[[RequestGroup]]] for additional information on how this status is used"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -344,7 +346,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case FILLERORDER: return "Filler Order"; case INSTANCEORDER: return "Instance Order"; case OPTION: return "Option"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -400,7 +402,9 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use throw new FHIRException("Unknown RequestIntent code '"+codeString+"'"); } 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"; @@ -417,7 +421,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use if (code == RequestIntent.OPTION) return "option"; return "?"; - } + } public String toSystem(RequestIntent code) { return code.getSystem(); } @@ -466,7 +470,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case URGENT: return "urgent"; case ASAP: return "asap"; case STAT: return "stat"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -476,7 +480,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case URGENT: return "http://hl7.org/fhir/request-priority"; case ASAP: return "http://hl7.org/fhir/request-priority"; case STAT: return "http://hl7.org/fhir/request-priority"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -486,7 +490,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case URGENT: return "The request should be actioned promptly - higher priority than routine"; case ASAP: return "The request should be actioned as soon as possible - higher priority than urgent"; case STAT: return "The request should be actioned immediately - highest possible priority. E.g. an emergency"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -496,7 +500,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case URGENT: return "Urgent"; case ASAP: return "ASAP"; case STAT: return "STAT"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -536,7 +540,9 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use throw new FHIRException("Unknown RequestPriority code '"+codeString+"'"); } 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"; @@ -545,7 +551,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use if (code == RequestPriority.STAT) return "stat"; return "?"; - } + } public String toSystem(RequestPriority code) { return code.getSystem(); } @@ -587,7 +593,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case APPLICABILITY: return "applicability"; case START: return "start"; case STOP: return "stop"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -596,7 +602,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case APPLICABILITY: return "http://hl7.org/fhir/action-condition-kind"; case START: return "http://hl7.org/fhir/action-condition-kind"; case STOP: return "http://hl7.org/fhir/action-condition-kind"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -605,7 +611,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case APPLICABILITY: return "The condition describes whether or not a given action is applicable"; case START: return "The condition is a starting condition for the action"; case STOP: return "The condition is a stop, or exit condition for the action"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -614,7 +620,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case APPLICABILITY: return "Applicability"; case START: return "Start"; case STOP: return "Stop"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -650,14 +656,16 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use throw new FHIRException("Unknown ActionConditionKind code '"+codeString+"'"); } 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(); } @@ -741,7 +749,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case AFTERSTART: return "after-start"; case AFTER: return "after"; case AFTEREND: return "after-end"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -756,7 +764,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case AFTERSTART: return "http://hl7.org/fhir/action-relationship-type"; case AFTER: return "http://hl7.org/fhir/action-relationship-type"; case AFTEREND: return "http://hl7.org/fhir/action-relationship-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -771,7 +779,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case AFTERSTART: return "The action must be performed after the start of the related action"; case AFTER: return "The action must be performed after the related action"; case AFTEREND: return "The action must be performed after the end of the related action"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -786,7 +794,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case AFTERSTART: return "After Start"; case AFTER: return "After"; case AFTEREND: return "After End"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -846,7 +854,9 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use throw new FHIRException("Unknown ActionRelationshipType code '"+codeString+"'"); } 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"; @@ -865,7 +875,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use if (code == ActionRelationshipType.AFTEREND) return "after-end"; return "?"; - } + } public String toSystem(ActionRelationshipType code) { return code.getSystem(); } @@ -907,7 +917,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case VISUALGROUP: return "visual-group"; case LOGICALGROUP: return "logical-group"; case SENTENCEGROUP: return "sentence-group"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -916,7 +926,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case VISUALGROUP: return "http://hl7.org/fhir/action-grouping-behavior"; case LOGICALGROUP: return "http://hl7.org/fhir/action-grouping-behavior"; case SENTENCEGROUP: return "http://hl7.org/fhir/action-grouping-behavior"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -925,7 +935,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case VISUALGROUP: return "Any group marked with this behavior should be displayed as a visual group to the end user"; case LOGICALGROUP: return "A group with this behavior logically groups its sub-elements, and may be shown as a visual group to the end user, but it is not required to do so"; case SENTENCEGROUP: return "A group of related alternative actions is a sentence group if the target referenced by the action is the same in all the actions and each action simply constitutes a different variation on how to specify the details for the target. For example, two actions that could be in a SentenceGroup are \"aspirin, 500 mg, 2 times per day\" and \"aspirin, 300 mg, 3 times per day\". In both cases, aspirin is the target referenced by the action, and the two actions represent different options for how aspirin might be ordered for the patient. Note that a SentenceGroup would almost always have an associated selection behavior of \"AtMostOne\", unless it's a required action, in which case, it would be \"ExactlyOne\""; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -934,7 +944,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case VISUALGROUP: return "Visual Group"; case LOGICALGROUP: return "Logical Group"; case SENTENCEGROUP: return "Sentence Group"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -970,14 +980,16 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use throw new FHIRException("Unknown ActionGroupingBehavior code '"+codeString+"'"); } 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(); } @@ -1040,7 +1052,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case EXACTLYONE: return "exactly-one"; case ATMOSTONE: return "at-most-one"; case ONEORMORE: return "one-or-more"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1052,7 +1064,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case EXACTLYONE: return "http://hl7.org/fhir/action-selection-behavior"; case ATMOSTONE: return "http://hl7.org/fhir/action-selection-behavior"; case ONEORMORE: return "http://hl7.org/fhir/action-selection-behavior"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1064,7 +1076,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case EXACTLYONE: return "The end user must choose one and only one of the selectable actions in the group. The user may not choose none of the actions in the group"; case ATMOSTONE: return "The end user may choose zero or at most one of the actions in the group"; case ONEORMORE: return "The end user must choose a minimum of one, and as many additional as desired"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1076,7 +1088,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case EXACTLYONE: return "Exactly One"; case ATMOSTONE: return "At Most One"; case ONEORMORE: return "One Or More"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1124,7 +1136,9 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use throw new FHIRException("Unknown ActionSelectionBehavior code '"+codeString+"'"); } 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"; @@ -1137,7 +1151,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use if (code == ActionSelectionBehavior.ONEORMORE) return "one-or-more"; return "?"; - } + } public String toSystem(ActionSelectionBehavior code) { return code.getSystem(); } @@ -1179,7 +1193,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case MUST: return "must"; case COULD: return "could"; case MUSTUNLESSDOCUMENTED: return "must-unless-documented"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1188,7 +1202,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case MUST: return "http://hl7.org/fhir/action-required-behavior"; case COULD: return "http://hl7.org/fhir/action-required-behavior"; case MUSTUNLESSDOCUMENTED: return "http://hl7.org/fhir/action-required-behavior"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1197,7 +1211,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case MUST: return "An action with this behavior must be included in the actions processed by the end user; the end user may not choose not to include this action"; case COULD: return "An action with this behavior may be included in the set of actions processed by the end user"; case MUSTUNLESSDOCUMENTED: return "An action with this behavior must be included in the set of actions processed by the end user, unless the end user provides documentation as to why the action was not included"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1206,7 +1220,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case MUST: return "Must"; case COULD: return "Could"; case MUSTUNLESSDOCUMENTED: return "Must Unless Documented"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1242,14 +1256,16 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use throw new FHIRException("Unknown ActionRequiredBehavior code '"+codeString+"'"); } 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(); } @@ -1284,7 +1300,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use switch (this) { case YES: return "yes"; case NO: return "no"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1292,7 +1308,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use switch (this) { case YES: return "http://hl7.org/fhir/action-precheck-behavior"; case NO: return "http://hl7.org/fhir/action-precheck-behavior"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1300,7 +1316,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use switch (this) { case YES: return "An action with this behavior is one of the most frequent action that is, or should be, included by an end user, for the particular context in which the action occurs. The system displaying the action to the end user should consider \"pre-checking\" such an action as a convenience for the user"; case NO: return "An action with this behavior is one of the less frequent actions included by the end user, for the particular context in which the action occurs. The system displaying the actions to the end user would typically not \"pre-check\" such an action"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1308,7 +1324,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use switch (this) { case YES: return "Yes"; case NO: return "No"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1340,12 +1356,14 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use throw new FHIRException("Unknown ActionPrecheckBehavior code '"+codeString+"'"); } 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(); } @@ -1380,7 +1398,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use switch (this) { case SINGLE: return "single"; case MULTIPLE: return "multiple"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1388,7 +1406,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use switch (this) { case SINGLE: return "http://hl7.org/fhir/action-cardinality-behavior"; case MULTIPLE: return "http://hl7.org/fhir/action-cardinality-behavior"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1396,7 +1414,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use switch (this) { case SINGLE: return "The action may only be selected one time"; case MULTIPLE: return "The action may be selected multiple times"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1404,7 +1422,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use switch (this) { case SINGLE: return "Single"; case MULTIPLE: return "Multiple"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1436,12 +1454,14 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use throw new FHIRException("Unknown ActionCardinalityBehavior code '"+codeString+"'"); } 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(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ResearchStudy.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ResearchStudy.java index e4de2f436..d6a176b22 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ResearchStudy.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ResearchStudy.java @@ -107,7 +107,7 @@ public class ResearchStudy extends DomainResource { case STOPPED: return "stopped"; case COMPLETED: return "completed"; case ENTEREDINERROR: return "entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -119,7 +119,7 @@ public class ResearchStudy extends DomainResource { case STOPPED: return "http://hl7.org/fhir/research-study-status"; case COMPLETED: return "http://hl7.org/fhir/research-study-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/research-study-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -131,7 +131,7 @@ public class ResearchStudy extends DomainResource { case STOPPED: return "The study was terminated prior to the final determination of results"; case COMPLETED: return "The information sought by the study has been gathered and compiled and no further work is being performed"; case ENTEREDINERROR: return "This study never actually existed. The record is retained for tracking purposes in the event decisions may have been made based on this erroneous information."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -143,7 +143,7 @@ public class ResearchStudy extends DomainResource { case STOPPED: return "Stopped"; case COMPLETED: return "Completed"; case ENTEREDINERROR: return "Entered in error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -191,7 +191,9 @@ public class ResearchStudy extends DomainResource { throw new FHIRException("Unknown ResearchStudyStatus code '"+codeString+"'"); } public String toCode(ResearchStudyStatus code) { - if (code == ResearchStudyStatus.DRAFT) + if (code == ResearchStudyStatus.NULL) + return null; + if (code == ResearchStudyStatus.DRAFT) return "draft"; if (code == ResearchStudyStatus.INPROGRESS) return "in-progress"; @@ -204,7 +206,7 @@ public class ResearchStudy extends DomainResource { if (code == ResearchStudyStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(ResearchStudyStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ResearchSubject.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ResearchSubject.java index 5350233db..e5f9c3718 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ResearchSubject.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ResearchSubject.java @@ -104,7 +104,7 @@ public class ResearchSubject extends DomainResource { case SUSPENDED: return "suspended"; case WITHDRAWN: return "withdrawn"; case COMPLETED: return "completed"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -116,7 +116,7 @@ public class ResearchSubject extends DomainResource { case SUSPENDED: return "http://hl7.org/fhir/research-subject-status"; case WITHDRAWN: return "http://hl7.org/fhir/research-subject-status"; case COMPLETED: return "http://hl7.org/fhir/research-subject-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -128,7 +128,7 @@ public class ResearchSubject extends DomainResource { case SUSPENDED: return "The subject has temporarily discontinued monitoring/treatment as part of the study"; case WITHDRAWN: return "The subject has permanently ended participation in the study prior to completion of the intended monitoring/treatment"; case COMPLETED: return "All intended monitoring/treatment of the subject has been completed and their engagement with the study is now ended"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -140,7 +140,7 @@ public class ResearchSubject extends DomainResource { case SUSPENDED: return "Suspended"; case WITHDRAWN: return "Withdrawn"; case COMPLETED: return "Completed"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -188,7 +188,9 @@ public class ResearchSubject extends DomainResource { throw new FHIRException("Unknown ResearchSubjectStatus code '"+codeString+"'"); } public String toCode(ResearchSubjectStatus code) { - if (code == ResearchSubjectStatus.CANDIDATE) + if (code == ResearchSubjectStatus.NULL) + return null; + if (code == ResearchSubjectStatus.CANDIDATE) return "candidate"; if (code == ResearchSubjectStatus.ENROLLED) return "enrolled"; @@ -201,7 +203,7 @@ public class ResearchSubject extends DomainResource { if (code == ResearchSubjectStatus.COMPLETED) return "completed"; return "?"; - } + } public String toSystem(ResearchSubjectStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/RiskAssessment.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/RiskAssessment.java index c29b74a39..1f6bb72c2 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/RiskAssessment.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/RiskAssessment.java @@ -125,7 +125,7 @@ public class RiskAssessment extends DomainResource { case CANCELLED: return "cancelled"; case ENTEREDINERROR: return "entered-in-error"; case UNKNOWN: return "unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -139,7 +139,7 @@ public class RiskAssessment extends DomainResource { case CANCELLED: return "http://hl7.org/fhir/observation-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/observation-status"; case UNKNOWN: return "http://hl7.org/fhir/observation-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -153,7 +153,7 @@ public class RiskAssessment extends DomainResource { case CANCELLED: return "The observation is unavailable because the measurement was not started or not completed (also sometimes called \"aborted\")."; case ENTEREDINERROR: return "The observation has been withdrawn following previous final release. This electronic record should never have existed, though it is possible that real-world decisions were based on it. (If real-world activity has occurred, the status should be \"cancelled\" rather than \"entered-in-error\".)"; case UNKNOWN: return "The authoring system does not know which of the status values currently applies for this request. Note: This concept is not to be used for \"other\" - one of the listed statuses is presumed to apply, but the authoring system does not know which."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -167,7 +167,7 @@ public class RiskAssessment extends DomainResource { case CANCELLED: return "Cancelled"; case ENTEREDINERROR: return "Entered in Error"; case UNKNOWN: return "Unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -223,7 +223,9 @@ public class RiskAssessment extends DomainResource { throw new FHIRException("Unknown RiskAssessmentStatus code '"+codeString+"'"); } 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"; @@ -240,7 +242,7 @@ public class RiskAssessment extends DomainResource { if (code == RiskAssessmentStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(RiskAssessmentStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/SearchParameter.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/SearchParameter.java index 30ae00ac9..46873c703 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/SearchParameter.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/SearchParameter.java @@ -107,7 +107,7 @@ public class SearchParameter extends MetadataResource { case NEARBY: return "nearby"; case DISTANCE: return "distance"; case OTHER: return "other"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -118,7 +118,7 @@ public class SearchParameter extends MetadataResource { case NEARBY: return "http://hl7.org/fhir/search-xpath-usage"; case DISTANCE: return "http://hl7.org/fhir/search-xpath-usage"; case OTHER: return "http://hl7.org/fhir/search-xpath-usage"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -129,7 +129,7 @@ public class SearchParameter extends MetadataResource { case NEARBY: return "The search parameter is based on a spatial transform of the selected nodes."; case DISTANCE: return "The search parameter is based on a spatial transform of the selected nodes, using physical distance from the middle."; case OTHER: return "The interpretation of the xpath statement is unknown (and can't be automated)."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -140,7 +140,7 @@ public class SearchParameter extends MetadataResource { case NEARBY: return "Nearby"; case DISTANCE: return "Distance"; case OTHER: return "Other"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -184,7 +184,9 @@ public class SearchParameter extends MetadataResource { throw new FHIRException("Unknown XPathUsageType code '"+codeString+"'"); } 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"; @@ -195,7 +197,7 @@ public class SearchParameter extends MetadataResource { if (code == XPathUsageType.OTHER) return "other"; return "?"; - } + } public String toSystem(XPathUsageType code) { return code.getSystem(); } @@ -279,7 +281,7 @@ public class SearchParameter extends MetadataResource { case SA: return "sa"; case EB: return "eb"; case AP: return "ap"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -294,7 +296,7 @@ public class SearchParameter extends MetadataResource { case SA: return "http://hl7.org/fhir/search-comparator"; case EB: return "http://hl7.org/fhir/search-comparator"; case AP: return "http://hl7.org/fhir/search-comparator"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -309,7 +311,7 @@ public class SearchParameter extends MetadataResource { case SA: return "the value for the parameter in the resource starts after the provided value"; case EB: return "the value for the parameter in the resource ends before the provided value"; case AP: return "the value for the parameter in the resource is approximately the same to the provided value."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -324,7 +326,7 @@ public class SearchParameter extends MetadataResource { case SA: return "Starts After"; case EB: return "Ends Before"; case AP: return "Approximately"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -384,7 +386,9 @@ public class SearchParameter extends MetadataResource { throw new FHIRException("Unknown SearchComparator code '"+codeString+"'"); } 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"; @@ -403,7 +407,7 @@ public class SearchParameter extends MetadataResource { if (code == SearchComparator.AP) return "ap"; return "?"; - } + } public String toSystem(SearchComparator code) { return code.getSystem(); } @@ -494,7 +498,7 @@ public class SearchParameter extends MetadataResource { case BELOW: return "below"; case ABOVE: return "above"; case TYPE: return "type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -510,7 +514,7 @@ public class SearchParameter extends MetadataResource { case BELOW: return "http://hl7.org/fhir/search-modifier-code"; case ABOVE: return "http://hl7.org/fhir/search-modifier-code"; case TYPE: return "http://hl7.org/fhir/search-modifier-code"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -526,7 +530,7 @@ public class SearchParameter extends MetadataResource { case BELOW: return "The search parameter tests whether the value in a resource is subsumed by the specified value (is-a, or hierarchical relationships)."; case ABOVE: return "The search parameter tests whether the value in a resource subsumes the specified value (is-a, or hierarchical relationships)."; case TYPE: return "The search parameter only applies to the Resource Type specified as a modifier (e.g. the modifier is not actually :type, but :Patient etc.)."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -542,7 +546,7 @@ public class SearchParameter extends MetadataResource { case BELOW: return "Below"; case ABOVE: return "Above"; case TYPE: return "Type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -606,7 +610,9 @@ public class SearchParameter extends MetadataResource { throw new FHIRException("Unknown SearchModifierCode code '"+codeString+"'"); } 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"; @@ -627,7 +633,7 @@ public class SearchParameter extends MetadataResource { if (code == SearchModifierCode.TYPE) return "type"; return "?"; - } + } public String toSystem(SearchModifierCode code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Sequence.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Sequence.java index 50cd5a713..3d3eaf157 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Sequence.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Sequence.java @@ -86,7 +86,7 @@ public class Sequence extends DomainResource { case AA: return "aa"; case DNA: return "dna"; case RNA: return "rna"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -95,7 +95,7 @@ public class Sequence extends DomainResource { case AA: return "http://hl7.org/fhir/sequence-type"; case DNA: return "http://hl7.org/fhir/sequence-type"; case RNA: return "http://hl7.org/fhir/sequence-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -104,7 +104,7 @@ public class Sequence extends DomainResource { case AA: return "Amino acid sequence"; case DNA: return "DNA Sequence"; case RNA: return "RNA Sequence"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -113,7 +113,7 @@ public class Sequence extends DomainResource { case AA: return "AA Sequence"; case DNA: return "DNA Sequence"; case RNA: return "RNA Sequence"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -149,14 +149,16 @@ public class Sequence extends DomainResource { throw new FHIRException("Unknown SequenceType code '"+codeString+"'"); } 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(); } @@ -198,7 +200,7 @@ public class Sequence extends DomainResource { case INDEL: return "indel"; case SNP: return "snp"; case UNKNOWN: return "unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -207,7 +209,7 @@ public class Sequence extends DomainResource { case INDEL: return "http://hl7.org/fhir/quality-type"; case SNP: return "http://hl7.org/fhir/quality-type"; case UNKNOWN: return "http://hl7.org/fhir/quality-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -216,7 +218,7 @@ public class Sequence extends DomainResource { case INDEL: return "INDEL Comparison"; case SNP: return "SNP Comparison"; case UNKNOWN: return "UNKNOWN Comparison"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -225,7 +227,7 @@ public class Sequence extends DomainResource { case INDEL: return "INDEL Comparison"; case SNP: return "SNP Comparison"; case UNKNOWN: return "UNKNOWN Comparison"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -261,14 +263,16 @@ public class Sequence extends DomainResource { throw new FHIRException("Unknown QualityType code '"+codeString+"'"); } 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(); } @@ -324,7 +328,7 @@ public class Sequence extends DomainResource { case LOGIN: return "login"; case OAUTH: return "oauth"; case OTHER: return "other"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -335,7 +339,7 @@ public class Sequence extends DomainResource { case LOGIN: return "http://hl7.org/fhir/repository-type"; case OAUTH: return "http://hl7.org/fhir/repository-type"; case OTHER: return "http://hl7.org/fhir/repository-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -346,7 +350,7 @@ public class Sequence extends DomainResource { case LOGIN: return "When logged into the website, the resource can be seen."; case OAUTH: return "When logged in and follow the API in the website related with URL, the resource can be seen."; case OTHER: return "Some other complicated or particular way to get resource from URL."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -357,7 +361,7 @@ public class Sequence extends DomainResource { case LOGIN: return "Result cannot be access unless an account is logged in"; case OAUTH: return "Result need to be fetched with API and need LOGIN( or cookies are required when visiting the link of resource)"; case OTHER: return "Some other complicated or particular way to get resource from URL."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -401,7 +405,9 @@ public class Sequence extends DomainResource { throw new FHIRException("Unknown RepositoryType code '"+codeString+"'"); } 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"; @@ -412,7 +418,7 @@ public class Sequence extends DomainResource { if (code == RepositoryType.OTHER) return "other"; return "?"; - } + } public String toSystem(RepositoryType code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Slot.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Slot.java index 05f13abb6..2448cf2a8 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Slot.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Slot.java @@ -99,7 +99,7 @@ public class Slot extends DomainResource { case BUSYUNAVAILABLE: return "busy-unavailable"; case BUSYTENTATIVE: return "busy-tentative"; case ENTEREDINERROR: return "entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -110,7 +110,7 @@ public class Slot extends DomainResource { case BUSYUNAVAILABLE: return "http://hl7.org/fhir/slotstatus"; case BUSYTENTATIVE: return "http://hl7.org/fhir/slotstatus"; case ENTEREDINERROR: return "http://hl7.org/fhir/slotstatus"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -121,7 +121,7 @@ public class Slot extends DomainResource { case BUSYUNAVAILABLE: return "Indicates that the time interval is busy and that the interval can not be scheduled."; case BUSYTENTATIVE: return "Indicates that the time interval is busy because one or more events have been tentatively scheduled for that interval."; case ENTEREDINERROR: return "This instance should not have been part of this patient's medical record."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -132,7 +132,7 @@ public class Slot extends DomainResource { case BUSYUNAVAILABLE: return "Busy (Unavailable)"; case BUSYTENTATIVE: return "Busy (Tentative)"; case ENTEREDINERROR: return "Entered in error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -176,7 +176,9 @@ public class Slot extends DomainResource { throw new FHIRException("Unknown SlotStatus code '"+codeString+"'"); } 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"; @@ -187,7 +189,7 @@ public class Slot extends DomainResource { if (code == SlotStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(SlotStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Specimen.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Specimen.java index 5f935e5a3..7420b5f4e 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Specimen.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Specimen.java @@ -95,7 +95,7 @@ public class Specimen extends DomainResource { case UNAVAILABLE: return "unavailable"; case UNSATISFACTORY: return "unsatisfactory"; case ENTEREDINERROR: return "entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -105,7 +105,7 @@ public class Specimen extends DomainResource { case UNAVAILABLE: return "http://hl7.org/fhir/specimen-status"; case UNSATISFACTORY: return "http://hl7.org/fhir/specimen-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/specimen-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -115,7 +115,7 @@ public class Specimen extends DomainResource { case UNAVAILABLE: return "There is no physical specimen because it is either lost, destroyed or consumed."; case UNSATISFACTORY: return "The specimen cannot be used because of a quality issue such as a broken container, contamination, or too old."; case ENTEREDINERROR: return "The specimen was entered in error and therefore nullified."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -125,7 +125,7 @@ public class Specimen extends DomainResource { case UNAVAILABLE: return "Unavailable"; case UNSATISFACTORY: return "Unsatisfactory"; case ENTEREDINERROR: return "Entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -165,7 +165,9 @@ public class Specimen extends DomainResource { throw new FHIRException("Unknown SpecimenStatus code '"+codeString+"'"); } 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"; @@ -174,7 +176,7 @@ public class Specimen extends DomainResource { if (code == SpecimenStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(SpecimenStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/StructureDefinition.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/StructureDefinition.java index b480ed937..bcf5395ae 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/StructureDefinition.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/StructureDefinition.java @@ -99,7 +99,7 @@ public class StructureDefinition extends MetadataResource { case COMPLEXTYPE: return "complex-type"; case RESOURCE: return "resource"; case LOGICAL: return "logical"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -109,7 +109,7 @@ public class StructureDefinition extends MetadataResource { case COMPLEXTYPE: return "http://hl7.org/fhir/structure-definition-kind"; case RESOURCE: return "http://hl7.org/fhir/structure-definition-kind"; case LOGICAL: return "http://hl7.org/fhir/structure-definition-kind"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -119,7 +119,7 @@ public class StructureDefinition extends MetadataResource { case COMPLEXTYPE: return "A complex structure that defines a set of data elements. These can be used throughout Resource and extension definitions, and in logical models."; case RESOURCE: return "A resource defined by the FHIR specification."; case LOGICAL: return "A conceptual package of data that will be mapped to resources for implementation."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -129,7 +129,7 @@ public class StructureDefinition extends MetadataResource { case COMPLEXTYPE: return "Complex Data Type"; case RESOURCE: return "Resource"; case LOGICAL: return "Logical Model"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -169,7 +169,9 @@ public class StructureDefinition extends MetadataResource { throw new FHIRException("Unknown StructureDefinitionKind code '"+codeString+"'"); } 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"; @@ -178,7 +180,7 @@ public class StructureDefinition extends MetadataResource { if (code == StructureDefinitionKind.LOGICAL) return "logical"; return "?"; - } + } public String toSystem(StructureDefinitionKind code) { return code.getSystem(); } @@ -220,7 +222,7 @@ public class StructureDefinition extends MetadataResource { case RESOURCE: return "resource"; case DATATYPE: return "datatype"; case EXTENSION: return "extension"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -229,7 +231,7 @@ public class StructureDefinition extends MetadataResource { case RESOURCE: return "http://hl7.org/fhir/extension-context"; case DATATYPE: return "http://hl7.org/fhir/extension-context"; case EXTENSION: return "http://hl7.org/fhir/extension-context"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -238,7 +240,7 @@ public class StructureDefinition extends MetadataResource { case RESOURCE: return "The context is all elements matching a particular resource element path."; case DATATYPE: return "The context is all nodes matching a particular data type element path (root or repeating element) or all elements referencing a particular primitive data type (expressed as the datatype name)."; case EXTENSION: return "The context is a particular extension from a particular profile, a uri that identifies the extension definition."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -247,7 +249,7 @@ public class StructureDefinition extends MetadataResource { case RESOURCE: return "Resource"; case DATATYPE: return "Datatype"; case EXTENSION: return "Extension"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -283,14 +285,16 @@ public class StructureDefinition extends MetadataResource { throw new FHIRException("Unknown ExtensionContext code '"+codeString+"'"); } public String toCode(ExtensionContext code) { - if (code == ExtensionContext.RESOURCE) + if (code == ExtensionContext.NULL) + return null; + if (code == ExtensionContext.RESOURCE) return "resource"; if (code == ExtensionContext.DATATYPE) return "datatype"; if (code == ExtensionContext.EXTENSION) return "extension"; return "?"; - } + } public String toSystem(ExtensionContext code) { return code.getSystem(); } @@ -325,7 +329,7 @@ public class StructureDefinition extends MetadataResource { switch (this) { case SPECIALIZATION: return "specialization"; case CONSTRAINT: return "constraint"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -333,7 +337,7 @@ public class StructureDefinition extends MetadataResource { switch (this) { case SPECIALIZATION: return "http://hl7.org/fhir/type-derivation-rule"; case CONSTRAINT: return "http://hl7.org/fhir/type-derivation-rule"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -341,7 +345,7 @@ public class StructureDefinition extends MetadataResource { switch (this) { case SPECIALIZATION: return "This definition defines a new type that adds additional elements to the base type"; case CONSTRAINT: return "This definition adds additional rules to an existing concrete type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -349,7 +353,7 @@ public class StructureDefinition extends MetadataResource { switch (this) { case SPECIALIZATION: return "Specialization"; case CONSTRAINT: return "Constraint"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -381,12 +385,14 @@ public class StructureDefinition extends MetadataResource { throw new FHIRException("Unknown TypeDerivationRule code '"+codeString+"'"); } 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(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/StructureMap.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/StructureMap.java index 2b76885c9..15ff2e4a4 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/StructureMap.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/StructureMap.java @@ -103,7 +103,7 @@ public class StructureMap extends MetadataResource { case QUERIED: return "queried"; case TARGET: return "target"; case PRODUCED: return "produced"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -113,7 +113,7 @@ public class StructureMap extends MetadataResource { case QUERIED: return "http://hl7.org/fhir/map-model-mode"; case TARGET: return "http://hl7.org/fhir/map-model-mode"; case PRODUCED: return "http://hl7.org/fhir/map-model-mode"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -123,7 +123,7 @@ public class StructureMap extends MetadataResource { case QUERIED: return "This structure describes an instance that the mapping engine may ask for that is used a source of data"; case TARGET: return "This structure describes an instance passed to the mapping engine that is used a target of data"; case PRODUCED: return "This structure describes an instance that the mapping engine may ask to create that is used a target of data"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -133,7 +133,7 @@ public class StructureMap extends MetadataResource { case QUERIED: return "Queried Structure Definition"; case TARGET: return "Target Structure Definition"; case PRODUCED: return "Produced Structure Definition"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -173,7 +173,9 @@ public class StructureMap extends MetadataResource { throw new FHIRException("Unknown StructureMapModelMode code '"+codeString+"'"); } 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"; @@ -182,7 +184,7 @@ public class StructureMap extends MetadataResource { if (code == StructureMapModelMode.PRODUCED) return "produced"; return "?"; - } + } public String toSystem(StructureMapModelMode code) { return code.getSystem(); } @@ -224,7 +226,7 @@ public class StructureMap extends MetadataResource { case NONE: return "none"; case TYPES: return "types"; case TYPEANDTYPES: return "type-and-types"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -233,7 +235,7 @@ public class StructureMap extends MetadataResource { case NONE: return "http://hl7.org/fhir/map-group-type-mode"; case TYPES: return "http://hl7.org/fhir/map-group-type-mode"; case TYPEANDTYPES: return "http://hl7.org/fhir/map-group-type-mode"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -242,7 +244,7 @@ public class StructureMap extends MetadataResource { case NONE: return "This group is not a default group for the types"; case TYPES: return "This group is a default mapping group for the specified types and for the primary source type"; case TYPEANDTYPES: return "This group is a default mapping group for the specified types"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -251,7 +253,7 @@ public class StructureMap extends MetadataResource { case NONE: return "Not a Default"; case TYPES: return "Default for Type Combination"; case TYPEANDTYPES: return "Default for type + combination"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -287,14 +289,16 @@ public class StructureMap extends MetadataResource { throw new FHIRException("Unknown StructureMapGroupTypeMode code '"+codeString+"'"); } 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(); } @@ -329,7 +333,7 @@ public class StructureMap extends MetadataResource { switch (this) { case SOURCE: return "source"; case TARGET: return "target"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -337,7 +341,7 @@ public class StructureMap extends MetadataResource { switch (this) { case SOURCE: return "http://hl7.org/fhir/map-input-mode"; case TARGET: return "http://hl7.org/fhir/map-input-mode"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -345,7 +349,7 @@ public class StructureMap extends MetadataResource { switch (this) { case SOURCE: return "Names an input instance used a source for mapping"; case TARGET: return "Names an instance that is being populated"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -353,7 +357,7 @@ public class StructureMap extends MetadataResource { switch (this) { case SOURCE: return "Source Instance"; case TARGET: return "Target Instance"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -385,12 +389,14 @@ public class StructureMap extends MetadataResource { throw new FHIRException("Unknown StructureMapInputMode code '"+codeString+"'"); } 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(); } @@ -446,7 +452,7 @@ public class StructureMap extends MetadataResource { case LAST: return "last"; case NOTLAST: return "not_last"; case ONLYONE: return "only_one"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -457,7 +463,7 @@ public class StructureMap extends MetadataResource { case LAST: return "http://hl7.org/fhir/map-source-list-mode"; case NOTLAST: return "http://hl7.org/fhir/map-source-list-mode"; case ONLYONE: return "http://hl7.org/fhir/map-source-list-mode"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -468,7 +474,7 @@ public class StructureMap extends MetadataResource { case LAST: return "Only process this rule for the last in the list"; case NOTLAST: return "Process this rule for all but the last"; case ONLYONE: return "Only process this rule is there is only item"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -479,7 +485,7 @@ public class StructureMap extends MetadataResource { case LAST: return "Last"; case NOTLAST: return "All but the last"; case ONLYONE: return "Enforce only one"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -523,7 +529,9 @@ public class StructureMap extends MetadataResource { throw new FHIRException("Unknown StructureMapSourceListMode code '"+codeString+"'"); } 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"; @@ -534,7 +542,7 @@ public class StructureMap extends MetadataResource { if (code == StructureMapSourceListMode.ONLYONE) return "only_one"; return "?"; - } + } public String toSystem(StructureMapSourceListMode code) { return code.getSystem(); } @@ -569,7 +577,7 @@ public class StructureMap extends MetadataResource { switch (this) { case TYPE: return "type"; case VARIABLE: return "variable"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -577,7 +585,7 @@ public class StructureMap extends MetadataResource { switch (this) { case TYPE: return "http://hl7.org/fhir/map-context-type"; case VARIABLE: return "http://hl7.org/fhir/map-context-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -585,7 +593,7 @@ public class StructureMap extends MetadataResource { switch (this) { case TYPE: return "The context specifies a type"; case VARIABLE: return "The context specifies a variable"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -593,7 +601,7 @@ public class StructureMap extends MetadataResource { switch (this) { case TYPE: return "Type"; case VARIABLE: return "Variable"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -625,12 +633,14 @@ public class StructureMap extends MetadataResource { throw new FHIRException("Unknown StructureMapContextType code '"+codeString+"'"); } 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(); } @@ -679,7 +689,7 @@ public class StructureMap extends MetadataResource { case SHARE: return "share"; case LAST: return "last"; case COLLATE: return "collate"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -689,7 +699,7 @@ public class StructureMap extends MetadataResource { case SHARE: return "http://hl7.org/fhir/map-target-list-mode"; case LAST: return "http://hl7.org/fhir/map-target-list-mode"; case COLLATE: return "http://hl7.org/fhir/map-target-list-mode"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -699,7 +709,7 @@ public class StructureMap extends MetadataResource { case SHARE: return "the target instance is shared with the target instances generated by another rule (up to the first common n items, then create new ones)"; case LAST: return "when the target list is being assembled, the items for this rule go last. If more that one rule defines a last item (for a given instance of mapping) then this is an error"; case COLLATE: return "re-use the first item in the list, and keep adding content to it"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -709,7 +719,7 @@ public class StructureMap extends MetadataResource { case SHARE: return "Share"; case LAST: return "Last"; case COLLATE: return "Collate"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -749,7 +759,9 @@ public class StructureMap extends MetadataResource { throw new FHIRException("Unknown StructureMapTargetListMode code '"+codeString+"'"); } 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"; @@ -758,7 +770,7 @@ public class StructureMap extends MetadataResource { if (code == StructureMapTargetListMode.COLLATE) return "collate"; return "?"; - } + } public String toSystem(StructureMapTargetListMode code) { return code.getSystem(); } @@ -898,7 +910,7 @@ public class StructureMap extends MetadataResource { case QTY: return "qty"; case ID: return "id"; case CP: return "cp"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -921,7 +933,7 @@ public class StructureMap extends MetadataResource { case QTY: return "http://hl7.org/fhir/map-transform"; case ID: return "http://hl7.org/fhir/map-transform"; case CP: return "http://hl7.org/fhir/map-transform"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -944,7 +956,7 @@ public class StructureMap extends MetadataResource { case QTY: return "Create a quantity. Parameters = (text) or (value, unit, [system, code]) where text is the natural representation e.g. [comparator]value[space]unit"; case ID: return "Create an identifier. Parameters = (system, value[, type]) where type is a code from the identifier type value set"; case CP: return "Create a contact details. Parameters = (value) or (system, value). If no system is provided, the system should be inferred from the content of the value"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -967,7 +979,7 @@ public class StructureMap extends MetadataResource { case QTY: return "qty"; case ID: return "id"; case CP: return "cp"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -1059,7 +1071,9 @@ public class StructureMap extends MetadataResource { throw new FHIRException("Unknown StructureMapTransform code '"+codeString+"'"); } 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"; @@ -1094,7 +1108,7 @@ public class StructureMap extends MetadataResource { if (code == StructureMapTransform.CP) return "cp"; return "?"; - } + } public String toSystem(StructureMapTransform code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Subscription.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Subscription.java index 6c34d1298..174fb4079 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Subscription.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Subscription.java @@ -94,7 +94,7 @@ public class Subscription extends DomainResource { case ACTIVE: return "active"; case ERROR: return "error"; case OFF: return "off"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -104,7 +104,7 @@ public class Subscription extends DomainResource { case ACTIVE: return "http://hl7.org/fhir/subscription-status"; case ERROR: return "http://hl7.org/fhir/subscription-status"; case OFF: return "http://hl7.org/fhir/subscription-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -114,7 +114,7 @@ public class Subscription extends DomainResource { case ACTIVE: return "The subscription is active."; case ERROR: return "The server has an error executing the notification."; case OFF: return "Too many errors have occurred or the subscription has expired."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -124,7 +124,7 @@ public class Subscription extends DomainResource { case ACTIVE: return "Active"; case ERROR: return "Error"; case OFF: return "Off"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -164,7 +164,9 @@ public class Subscription extends DomainResource { throw new FHIRException("Unknown SubscriptionStatus code '"+codeString+"'"); } 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"; @@ -173,7 +175,7 @@ public class Subscription extends DomainResource { if (code == SubscriptionStatus.OFF) return "off"; return "?"; - } + } public String toSystem(SubscriptionStatus code) { return code.getSystem(); } @@ -229,7 +231,7 @@ public class Subscription extends DomainResource { case EMAIL: return "email"; case SMS: return "sms"; case MESSAGE: return "message"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -240,7 +242,7 @@ public class Subscription extends DomainResource { case EMAIL: return "http://hl7.org/fhir/subscription-channel-type"; case SMS: return "http://hl7.org/fhir/subscription-channel-type"; case MESSAGE: return "http://hl7.org/fhir/subscription-channel-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -251,7 +253,7 @@ public class Subscription extends DomainResource { case EMAIL: return "The channel is executed by sending an email to the email addressed in the URI (which must be a mailto:)."; case SMS: return "The channel is executed by sending an SMS message to the phone number identified in the URL (tel:)."; case MESSAGE: return "The channel is executed by sending a message (e.g. a Bundle with a MessageHeader resource etc.) to the application identified in the URI."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -262,7 +264,7 @@ public class Subscription extends DomainResource { case EMAIL: return "Email"; case SMS: return "SMS"; case MESSAGE: return "Message"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -306,7 +308,9 @@ public class Subscription extends DomainResource { throw new FHIRException("Unknown SubscriptionChannelType code '"+codeString+"'"); } 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"; @@ -317,7 +321,7 @@ public class Subscription extends DomainResource { if (code == SubscriptionChannelType.MESSAGE) return "message"; return "?"; - } + } public String toSystem(SubscriptionChannelType code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Substance.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Substance.java index ba376921b..6c7e87f4a 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Substance.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Substance.java @@ -89,7 +89,7 @@ public class Substance extends DomainResource { case ACTIVE: return "active"; case INACTIVE: return "inactive"; case ENTEREDINERROR: return "entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -98,7 +98,7 @@ public class Substance extends DomainResource { case ACTIVE: return "http://hl7.org/fhir/substance-status"; case INACTIVE: return "http://hl7.org/fhir/substance-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/substance-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -107,7 +107,7 @@ public class Substance extends DomainResource { case ACTIVE: return "The substance is considered for use or reference"; case INACTIVE: return "The substance is considered for reference, but not for use"; case ENTEREDINERROR: return "The substance was entered in error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -116,7 +116,7 @@ public class Substance extends DomainResource { case ACTIVE: return "Active"; case INACTIVE: return "Inactive"; case ENTEREDINERROR: return "Entered in Error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -152,14 +152,16 @@ public class Substance extends DomainResource { throw new FHIRException("Unknown FHIRSubstanceStatus code '"+codeString+"'"); } 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(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/SupplyDelivery.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/SupplyDelivery.java index 7807d9870..b4f81ae4d 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/SupplyDelivery.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/SupplyDelivery.java @@ -93,7 +93,7 @@ public class SupplyDelivery extends DomainResource { case COMPLETED: return "completed"; case ABANDONED: return "abandoned"; case ENTEREDINERROR: return "entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -103,7 +103,7 @@ public class SupplyDelivery extends DomainResource { case COMPLETED: return "http://hl7.org/fhir/supplydelivery-status"; case ABANDONED: return "http://hl7.org/fhir/supplydelivery-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/supplydelivery-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -113,7 +113,7 @@ public class SupplyDelivery extends DomainResource { case COMPLETED: return "Supply has been delivered (\"completed\")."; case ABANDONED: return "Delivery was not completed."; case ENTEREDINERROR: return "This electronic record should never have existed, though it is possible that real-world decisions were based on it. (If real-world activity has occurred, the status should be \"cancelled\" rather than \"entered-in-error\".)"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -123,7 +123,7 @@ public class SupplyDelivery extends DomainResource { case COMPLETED: return "Delivered"; case ABANDONED: return "Abandoned"; case ENTEREDINERROR: return "Entered In Error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -163,7 +163,9 @@ public class SupplyDelivery extends DomainResource { throw new FHIRException("Unknown SupplyDeliveryStatus code '"+codeString+"'"); } 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"; @@ -172,7 +174,7 @@ public class SupplyDelivery extends DomainResource { if (code == SupplyDeliveryStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(SupplyDeliveryStatus code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/SupplyRequest.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/SupplyRequest.java index b90fd39ba..59ba835c7 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/SupplyRequest.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/SupplyRequest.java @@ -116,7 +116,7 @@ public class SupplyRequest extends DomainResource { case COMPLETED: return "completed"; case ENTEREDINERROR: return "entered-in-error"; case UNKNOWN: return "unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -129,7 +129,7 @@ public class SupplyRequest extends DomainResource { case COMPLETED: return "http://hl7.org/fhir/supplyrequest-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/supplyrequest-status"; case UNKNOWN: return "http://hl7.org/fhir/supplyrequest-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -142,7 +142,7 @@ public class SupplyRequest extends DomainResource { case COMPLETED: return "Activity against the request has been sufficiently completed to the satisfaction of the requester"; case ENTEREDINERROR: return "This electronic record should never have existed, though it is possible that real-world decisions were based on it. (If real-world activity has occurred, the status should be \"cancelled\" rather than \"entered-in-error\".)"; case UNKNOWN: return "The authoring system does not know which of the status values currently applies for this request. Note: This concept is not to be used for \"other\" - one of the listed statuses is presumed to apply, it's just not known which one."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -155,7 +155,7 @@ public class SupplyRequest extends DomainResource { case COMPLETED: return "Completed"; case ENTEREDINERROR: return "Entered in Error"; case UNKNOWN: return "Unknown"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -207,7 +207,9 @@ public class SupplyRequest extends DomainResource { throw new FHIRException("Unknown SupplyRequestStatus code '"+codeString+"'"); } 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"; @@ -222,7 +224,7 @@ public class SupplyRequest extends DomainResource { if (code == SupplyRequestStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(SupplyRequestStatus code) { return code.getSystem(); } @@ -271,7 +273,7 @@ public class SupplyRequest extends DomainResource { case URGENT: return "urgent"; case ASAP: return "asap"; case STAT: return "stat"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -281,7 +283,7 @@ public class SupplyRequest extends DomainResource { case URGENT: return "http://hl7.org/fhir/request-priority"; case ASAP: return "http://hl7.org/fhir/request-priority"; case STAT: return "http://hl7.org/fhir/request-priority"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -291,7 +293,7 @@ public class SupplyRequest extends DomainResource { case URGENT: return "The request should be actioned promptly - higher priority than routine"; case ASAP: return "The request should be actioned as soon as possible - higher priority than urgent"; case STAT: return "The request should be actioned immediately - highest possible priority. E.g. an emergency"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -301,7 +303,7 @@ public class SupplyRequest extends DomainResource { case URGENT: return "Urgent"; case ASAP: return "ASAP"; case STAT: return "STAT"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -341,7 +343,9 @@ public class SupplyRequest extends DomainResource { throw new FHIRException("Unknown RequestPriority code '"+codeString+"'"); } 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"; @@ -350,7 +354,7 @@ public class SupplyRequest extends DomainResource { if (code == RequestPriority.STAT) return "stat"; return "?"; - } + } public String toSystem(RequestPriority code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Task.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Task.java index 5a46a2055..001bd4f78 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Task.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Task.java @@ -151,7 +151,7 @@ public class Task extends DomainResource { case FAILED: return "failed"; case COMPLETED: return "completed"; case ENTEREDINERROR: return "entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -169,7 +169,7 @@ public class Task extends DomainResource { case FAILED: return "http://hl7.org/fhir/task-status"; case COMPLETED: return "http://hl7.org/fhir/task-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/task-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -187,7 +187,7 @@ public class Task extends DomainResource { case FAILED: return "The task was attempted but could not be completed due to some error."; case COMPLETED: return "The task has been completed."; case ENTEREDINERROR: return "The task should never have existed and is retained only because of the possibility it may have used."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -205,7 +205,7 @@ public class Task extends DomainResource { case FAILED: return "Failed"; case COMPLETED: return "Completed"; case ENTEREDINERROR: return "Entered in Error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -277,7 +277,9 @@ public class Task extends DomainResource { throw new FHIRException("Unknown TaskStatus code '"+codeString+"'"); } 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"; @@ -302,7 +304,7 @@ public class Task extends DomainResource { if (code == TaskStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(TaskStatus code) { return code.getSystem(); } @@ -381,7 +383,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case FILLERORDER: return "filler-order"; case INSTANCEORDER: return "instance-order"; case OPTION: return "option"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -395,7 +397,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case FILLERORDER: return "http://hl7.org/fhir/request-intent"; case INSTANCEORDER: return "http://hl7.org/fhir/request-intent"; case OPTION: return "http://hl7.org/fhir/request-intent"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -409,7 +411,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case FILLERORDER: return "The request represents the view of an authorization instantiated by a fulfilling system representing the details of the fulfiller's intention to act upon a submitted order"; case INSTANCEORDER: return "An order created in fulfillment of a broader order that represents the authorization for a single activity occurrence. E.g. The administration of a single dose of a drug."; case OPTION: return "The request represents a component or option for a RequestGroup that establishes timing, conditionality and/or other constraints among a set of requests.\n\nRefer to [[[RequestGroup]]] for additional information on how this status is used"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -423,7 +425,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case FILLERORDER: return "Filler Order"; case INSTANCEORDER: return "Instance Order"; case OPTION: return "Option"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -479,7 +481,9 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use throw new FHIRException("Unknown TaskIntent code '"+codeString+"'"); } public String toCode(TaskIntent code) { - if (code == TaskIntent.PROPOSAL) + if (code == TaskIntent.NULL) + return null; + if (code == TaskIntent.PROPOSAL) return "proposal"; if (code == TaskIntent.PLAN) return "plan"; @@ -496,7 +500,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use if (code == TaskIntent.OPTION) return "option"; return "?"; - } + } public String toSystem(TaskIntent code) { return code.getSystem(); } @@ -545,7 +549,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case URGENT: return "urgent"; case ASAP: return "asap"; case STAT: return "stat"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -555,7 +559,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case URGENT: return "http://hl7.org/fhir/request-priority"; case ASAP: return "http://hl7.org/fhir/request-priority"; case STAT: return "http://hl7.org/fhir/request-priority"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -565,7 +569,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case URGENT: return "The request should be actioned promptly - higher priority than routine"; case ASAP: return "The request should be actioned as soon as possible - higher priority than urgent"; case STAT: return "The request should be actioned immediately - highest possible priority. E.g. an emergency"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -575,7 +579,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use case URGENT: return "Urgent"; case ASAP: return "ASAP"; case STAT: return "STAT"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -615,7 +619,9 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use throw new FHIRException("Unknown TaskPriority code '"+codeString+"'"); } 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"; @@ -624,7 +630,7 @@ Refer to [[[RequestGroup]]] for additional information on how this status is use if (code == TaskPriority.STAT) return "stat"; return "?"; - } + } public String toSystem(TaskPriority code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/TestReport.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/TestReport.java index 10c46b88a..ce9307b53 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/TestReport.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/TestReport.java @@ -101,7 +101,7 @@ public class TestReport extends DomainResource { case WAITING: return "waiting"; case STOPPED: return "stopped"; case ENTEREDINERROR: return "entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -112,7 +112,7 @@ public class TestReport extends DomainResource { case WAITING: return "http://hl7.org/fhir/report-status-codes"; case STOPPED: return "http://hl7.org/fhir/report-status-codes"; case ENTEREDINERROR: return "http://hl7.org/fhir/report-status-codes"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -123,7 +123,7 @@ public class TestReport extends DomainResource { case WAITING: return "A test operation is waiting for an external client request"; case STOPPED: return "The test script execution was manually stopped"; case ENTEREDINERROR: return "This test report was entered or created in error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -134,7 +134,7 @@ public class TestReport extends DomainResource { case WAITING: return "Waiting"; case STOPPED: return "Stopped"; case ENTEREDINERROR: return "Entered In Error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -178,7 +178,9 @@ public class TestReport extends DomainResource { throw new FHIRException("Unknown TestReportStatus code '"+codeString+"'"); } 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"; @@ -189,7 +191,7 @@ public class TestReport extends DomainResource { if (code == TestReportStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(TestReportStatus code) { return code.getSystem(); } @@ -231,7 +233,7 @@ public class TestReport extends DomainResource { case PASS: return "pass"; case FAIL: return "fail"; case PENDING: return "pending"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -240,7 +242,7 @@ public class TestReport extends DomainResource { case PASS: return "http://hl7.org/fhir/report-result-codes"; case FAIL: return "http://hl7.org/fhir/report-result-codes"; case PENDING: return "http://hl7.org/fhir/report-result-codes"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -249,7 +251,7 @@ public class TestReport extends DomainResource { case PASS: return "All test operations successfully passed all asserts"; case FAIL: return "One or more test operations failed one or more asserts"; case PENDING: return "One or more test operations is pending execution completion"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -258,7 +260,7 @@ public class TestReport extends DomainResource { case PASS: return "Pass"; case FAIL: return "Fail"; case PENDING: return "Pending"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -294,14 +296,16 @@ public class TestReport extends DomainResource { throw new FHIRException("Unknown TestReportResult code '"+codeString+"'"); } 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(); } @@ -343,7 +347,7 @@ public class TestReport extends DomainResource { case TESTENGINE: return "test-engine"; case CLIENT: return "client"; case SERVER: return "server"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -352,7 +356,7 @@ public class TestReport extends DomainResource { case TESTENGINE: return "http://hl7.org/fhir/report-participant-type"; case CLIENT: return "http://hl7.org/fhir/report-participant-type"; case SERVER: return "http://hl7.org/fhir/report-participant-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -361,7 +365,7 @@ public class TestReport extends DomainResource { case TESTENGINE: return "The test execution engine."; case CLIENT: return "A FHIR Client"; case SERVER: return "A FHIR Server"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -370,7 +374,7 @@ public class TestReport extends DomainResource { case TESTENGINE: return "Test Engine"; case CLIENT: return "Client"; case SERVER: return "Server"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -406,14 +410,16 @@ public class TestReport extends DomainResource { throw new FHIRException("Unknown TestReportParticipantType code '"+codeString+"'"); } 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(); } @@ -469,7 +475,7 @@ public class TestReport extends DomainResource { case FAIL: return "fail"; case WARNING: return "warning"; case ERROR: return "error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -480,7 +486,7 @@ public class TestReport extends DomainResource { case FAIL: return "http://hl7.org/fhir/report-action-result-codes"; case WARNING: return "http://hl7.org/fhir/report-action-result-codes"; case ERROR: return "http://hl7.org/fhir/report-action-result-codes"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -491,7 +497,7 @@ public class TestReport extends DomainResource { case FAIL: return "The action failed."; case WARNING: return "The action passed but with warnings."; case ERROR: return "The action encountered a fatal error and the engine was unable to process."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -502,7 +508,7 @@ public class TestReport extends DomainResource { case FAIL: return "Fail"; case WARNING: return "Warning"; case ERROR: return "Error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -546,7 +552,9 @@ public class TestReport extends DomainResource { throw new FHIRException("Unknown TestReportActionResult code '"+codeString+"'"); } 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"; @@ -557,7 +565,7 @@ public class TestReport extends DomainResource { if (code == TestReportActionResult.ERROR) return "error"; return "?"; - } + } public String toSystem(TestReportActionResult code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/TestScript.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/TestScript.java index 86f885492..dd4f42164 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/TestScript.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/TestScript.java @@ -98,7 +98,7 @@ public class TestScript extends MetadataResource { case JSON: return "json"; case TTL: return "ttl"; case NONE: return "none"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -108,7 +108,7 @@ public class TestScript extends MetadataResource { case JSON: return "http://hl7.org/fhir/content-type"; case TTL: return "http://hl7.org/fhir/content-type"; case NONE: return "http://hl7.org/fhir/content-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -118,7 +118,7 @@ public class TestScript extends MetadataResource { case JSON: return "JSON content-type corresponding to the application/fhir+json mime-type."; case TTL: return "RDF content-type corresponding to the text/turtle mime-type."; case NONE: return "Prevent the use of the corresponding http header."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -128,7 +128,7 @@ public class TestScript extends MetadataResource { case JSON: return "json"; case TTL: return "ttl"; case NONE: return "none"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -168,7 +168,9 @@ public class TestScript extends MetadataResource { throw new FHIRException("Unknown ContentType code '"+codeString+"'"); } public String toCode(ContentType code) { - if (code == ContentType.XML) + if (code == ContentType.NULL) + return null; + if (code == ContentType.XML) return "xml"; if (code == ContentType.JSON) return "json"; @@ -177,7 +179,7 @@ public class TestScript extends MetadataResource { if (code == ContentType.NONE) return "none"; return "?"; - } + } public String toSystem(ContentType code) { return code.getSystem(); } @@ -212,7 +214,7 @@ public class TestScript extends MetadataResource { switch (this) { case RESPONSE: return "response"; case REQUEST: return "request"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -220,7 +222,7 @@ public class TestScript extends MetadataResource { switch (this) { case RESPONSE: return "http://hl7.org/fhir/assert-direction-codes"; case REQUEST: return "http://hl7.org/fhir/assert-direction-codes"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -228,7 +230,7 @@ public class TestScript extends MetadataResource { switch (this) { case RESPONSE: return "The assertion is evaluated on the response. This is the default value."; case REQUEST: return "The assertion is evaluated on the request."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -236,7 +238,7 @@ public class TestScript extends MetadataResource { switch (this) { case RESPONSE: return "response"; case REQUEST: return "request"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -268,12 +270,14 @@ public class TestScript extends MetadataResource { throw new FHIRException("Unknown AssertionDirectionType code '"+codeString+"'"); } 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(); } @@ -371,7 +375,7 @@ public class TestScript extends MetadataResource { case CONTAINS: return "contains"; case NOTCONTAINS: return "notContains"; case EVAL: return "eval"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -388,7 +392,7 @@ public class TestScript extends MetadataResource { case CONTAINS: return "http://hl7.org/fhir/assert-operator-codes"; case NOTCONTAINS: return "http://hl7.org/fhir/assert-operator-codes"; case EVAL: return "http://hl7.org/fhir/assert-operator-codes"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -405,7 +409,7 @@ public class TestScript extends MetadataResource { case CONTAINS: return "Compare value string contains a known value."; case NOTCONTAINS: return "Compare value string does not contain a known value."; case EVAL: return "Evaluate the fluentpath expression as a boolean condition."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -422,7 +426,7 @@ public class TestScript extends MetadataResource { case CONTAINS: return "contains"; case NOTCONTAINS: return "notContains"; case EVAL: return "evaluate"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -490,7 +494,9 @@ public class TestScript extends MetadataResource { throw new FHIRException("Unknown AssertionOperatorType code '"+codeString+"'"); } 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"; @@ -513,7 +519,7 @@ public class TestScript extends MetadataResource { if (code == AssertionOperatorType.EVAL) return "eval"; return "?"; - } + } public String toSystem(AssertionOperatorType code) { return code.getSystem(); } @@ -576,7 +582,7 @@ public class TestScript extends MetadataResource { case PATCH: return "patch"; case POST: return "post"; case PUT: return "put"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -588,7 +594,7 @@ public class TestScript extends MetadataResource { case PATCH: return "http://hl7.org/fhir/http-operations"; case POST: return "http://hl7.org/fhir/http-operations"; case PUT: return "http://hl7.org/fhir/http-operations"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -600,7 +606,7 @@ public class TestScript extends MetadataResource { case PATCH: return "HTTP PATCH operation"; case POST: return "HTTP POST operation"; case PUT: return "HTTP PUT operation"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -612,7 +618,7 @@ public class TestScript extends MetadataResource { case PATCH: return "PATCH"; case POST: return "POST"; case PUT: return "PUT"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -660,7 +666,9 @@ public class TestScript extends MetadataResource { throw new FHIRException("Unknown TestScriptRequestMethodCode code '"+codeString+"'"); } 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"; @@ -673,7 +681,7 @@ public class TestScript extends MetadataResource { if (code == TestScriptRequestMethodCode.PUT) return "put"; return "?"; - } + } public String toSystem(TestScriptRequestMethodCode code) { return code.getSystem(); } @@ -778,7 +786,7 @@ public class TestScript extends MetadataResource { case GONE: return "gone"; case PRECONDITIONFAILED: return "preconditionFailed"; case UNPROCESSABLE: return "unprocessable"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -796,7 +804,7 @@ public class TestScript extends MetadataResource { case GONE: return "http://hl7.org/fhir/assert-response-code-types"; case PRECONDITIONFAILED: return "http://hl7.org/fhir/assert-response-code-types"; case UNPROCESSABLE: return "http://hl7.org/fhir/assert-response-code-types"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -814,7 +822,7 @@ public class TestScript extends MetadataResource { case GONE: return "Response code is 410."; case PRECONDITIONFAILED: return "Response code is 412."; case UNPROCESSABLE: return "Response code is 422."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -832,7 +840,7 @@ public class TestScript extends MetadataResource { case GONE: return "gone"; case PRECONDITIONFAILED: return "preconditionFailed"; case UNPROCESSABLE: return "unprocessable"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -904,7 +912,9 @@ public class TestScript extends MetadataResource { throw new FHIRException("Unknown AssertionResponseTypes code '"+codeString+"'"); } 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"; @@ -929,7 +939,7 @@ public class TestScript extends MetadataResource { if (code == AssertionResponseTypes.UNPROCESSABLE) return "unprocessable"; return "?"; - } + } public String toSystem(AssertionResponseTypes code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Timing.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Timing.java index 00b5f6a23..ffc6fe4a2 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Timing.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Timing.java @@ -118,7 +118,7 @@ public class Timing extends Type implements ICompositeType { case WK: return "wk"; case MO: return "mo"; case A: return "a"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -131,7 +131,7 @@ public class Timing extends Type implements ICompositeType { case WK: return "http://unitsofmeasure.org"; case MO: return "http://unitsofmeasure.org"; case A: return "http://unitsofmeasure.org"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -144,7 +144,7 @@ public class Timing extends Type implements ICompositeType { case WK: return ""; case MO: return ""; case A: return ""; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -157,7 +157,7 @@ public class Timing extends Type implements ICompositeType { case WK: return "week"; case MO: return "month"; case A: return "year"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -209,7 +209,9 @@ public class Timing extends Type implements ICompositeType { throw new FHIRException("Unknown UnitsOfTime code '"+codeString+"'"); } 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"; @@ -224,7 +226,7 @@ public class Timing extends Type implements ICompositeType { if (code == UnitsOfTime.A) return "a"; return "?"; - } + } public String toSystem(UnitsOfTime code) { return code.getSystem(); } @@ -294,7 +296,7 @@ public class Timing extends Type implements ICompositeType { case FRI: return "fri"; case SAT: return "sat"; case SUN: return "sun"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -307,7 +309,7 @@ public class Timing extends Type implements ICompositeType { case FRI: return "http://hl7.org/fhir/days-of-week"; case SAT: return "http://hl7.org/fhir/days-of-week"; case SUN: return "http://hl7.org/fhir/days-of-week"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -320,7 +322,7 @@ public class Timing extends Type implements ICompositeType { case FRI: return "Friday"; case SAT: return "Saturday"; case SUN: return "Sunday"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -333,7 +335,7 @@ public class Timing extends Type implements ICompositeType { case FRI: return "Friday"; case SAT: return "Saturday"; case SUN: return "Sunday"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -385,7 +387,9 @@ public class Timing extends Type implements ICompositeType { throw new FHIRException("Unknown DayOfWeek code '"+codeString+"'"); } 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"; @@ -400,7 +404,7 @@ public class Timing extends Type implements ICompositeType { if (code == DayOfWeek.SUN) return "sun"; return "?"; - } + } public String toSystem(DayOfWeek code) { return code.getSystem(); } @@ -554,7 +558,7 @@ public class Timing extends Type implements ICompositeType { case PCM: return "PCM"; case PCD: return "PCD"; case PCV: return "PCV"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -579,7 +583,7 @@ public class Timing extends Type implements ICompositeType { case PCM: return "http://hl7.org/fhir/v3/TimingEvent"; case PCD: return "http://hl7.org/fhir/v3/TimingEvent"; case PCV: return "http://hl7.org/fhir/v3/TimingEvent"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -604,7 +608,7 @@ public class Timing extends Type implements ICompositeType { case PCM: return ""; case PCD: return ""; case PCV: return ""; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -629,7 +633,7 @@ public class Timing extends Type implements ICompositeType { case PCM: return "PCM"; case PCD: return "PCD"; case PCV: return "PCV"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -729,7 +733,9 @@ public class Timing extends Type implements ICompositeType { throw new FHIRException("Unknown EventTiming code '"+codeString+"'"); } public String toCode(EventTiming code) { - if (code == EventTiming.MORN) + if (code == EventTiming.NULL) + return null; + if (code == EventTiming.MORN) return "MORN"; if (code == EventTiming.AFT) return "AFT"; @@ -768,7 +774,7 @@ public class Timing extends Type implements ICompositeType { if (code == EventTiming.PCV) return "PCV"; return "?"; - } + } public String toSystem(EventTiming code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/TriggerDefinition.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/TriggerDefinition.java index 9a6b664ea..4ff115ec7 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/TriggerDefinition.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/TriggerDefinition.java @@ -113,7 +113,7 @@ public class TriggerDefinition extends Type implements ICompositeType { case DATAREMOVED: return "data-removed"; case DATAACCESSED: return "data-accessed"; case DATAACCESSENDED: return "data-access-ended"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -126,7 +126,7 @@ public class TriggerDefinition extends Type implements ICompositeType { case DATAREMOVED: return "http://hl7.org/fhir/trigger-type"; case DATAACCESSED: return "http://hl7.org/fhir/trigger-type"; case DATAACCESSENDED: return "http://hl7.org/fhir/trigger-type"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -139,7 +139,7 @@ public class TriggerDefinition extends Type implements ICompositeType { case DATAREMOVED: return "The trigger occurs whenever data of a particular type is removed"; case DATAACCESSED: return "The trigger occurs whenever data of a particular type is accessed"; case DATAACCESSENDED: return "The trigger occurs whenever access to data of a particular type is completed"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -152,7 +152,7 @@ public class TriggerDefinition extends Type implements ICompositeType { case DATAREMOVED: return "Data Removed"; case DATAACCESSED: return "Data Accessed"; case DATAACCESSENDED: return "Data Access Ended"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -204,7 +204,9 @@ public class TriggerDefinition extends Type implements ICompositeType { throw new FHIRException("Unknown TriggerType code '"+codeString+"'"); } 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"; @@ -219,7 +221,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(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ValueSet.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ValueSet.java index 07f4b6c05..b7c6588dc 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ValueSet.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ValueSet.java @@ -134,7 +134,7 @@ public class ValueSet extends MetadataResource { case NOTIN: return "not-in"; case GENERALIZES: return "generalizes"; case EXISTS: return "exists"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -149,7 +149,7 @@ public class ValueSet extends MetadataResource { case NOTIN: return "http://hl7.org/fhir/filter-operator"; case GENERALIZES: return "http://hl7.org/fhir/filter-operator"; case EXISTS: return "http://hl7.org/fhir/filter-operator"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -164,7 +164,7 @@ public class ValueSet extends MetadataResource { case NOTIN: return "The specified property of the code is not in the set of codes or concepts specified in the provided value (comma separated list)."; case GENERALIZES: return "Includes all concept ids that have a transitive is-a relationship from the concept Id provided as the value, including the provided concept itself (e.g. include parent codes)"; case EXISTS: return "The specified property of the code has at least one value (if the specified value is true; if the specified value is false, then matches when the specified property of the code has no values)"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -179,7 +179,7 @@ public class ValueSet extends MetadataResource { case NOTIN: return "Not in Set"; case GENERALIZES: return "Generalizes (by Subsumption)"; case EXISTS: return "Exists"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -239,7 +239,9 @@ public class ValueSet extends MetadataResource { throw new FHIRException("Unknown FilterOperator code '"+codeString+"'"); } 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"; @@ -258,7 +260,7 @@ public class ValueSet extends MetadataResource { if (code == FilterOperator.EXISTS) return "exists"; return "?"; - } + } public String toSystem(FilterOperator code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/VisionPrescription.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/VisionPrescription.java index 73fc8683f..a5ab38ea9 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/VisionPrescription.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/VisionPrescription.java @@ -95,7 +95,7 @@ public class VisionPrescription extends DomainResource { case CANCELLED: return "cancelled"; case DRAFT: return "draft"; case ENTEREDINERROR: return "entered-in-error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -105,7 +105,7 @@ public class VisionPrescription extends DomainResource { case CANCELLED: return "http://hl7.org/fhir/fm-status"; case DRAFT: return "http://hl7.org/fhir/fm-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/fm-status"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -115,7 +115,7 @@ public class VisionPrescription extends DomainResource { case CANCELLED: return "The instance is withdrawn, rescinded or reversed."; case DRAFT: return "A new instance the contents of which is not complete."; case ENTEREDINERROR: return "The instance was entered in error."; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -125,7 +125,7 @@ public class VisionPrescription extends DomainResource { case CANCELLED: return "Cancelled"; case DRAFT: return "Draft"; case ENTEREDINERROR: return "Entered in Error"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -165,7 +165,9 @@ public class VisionPrescription extends DomainResource { throw new FHIRException("Unknown VisionStatus code '"+codeString+"'"); } 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"; @@ -174,7 +176,7 @@ public class VisionPrescription extends DomainResource { if (code == VisionStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(VisionStatus code) { return code.getSystem(); } @@ -209,7 +211,7 @@ public class VisionPrescription extends DomainResource { switch (this) { case RIGHT: return "right"; case LEFT: return "left"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -217,7 +219,7 @@ public class VisionPrescription extends DomainResource { switch (this) { case RIGHT: return "http://hl7.org/fhir/vision-eye-codes"; case LEFT: return "http://hl7.org/fhir/vision-eye-codes"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -225,7 +227,7 @@ public class VisionPrescription extends DomainResource { switch (this) { case RIGHT: return "Right Eye"; case LEFT: return "Left Eye"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -233,7 +235,7 @@ public class VisionPrescription extends DomainResource { switch (this) { case RIGHT: return "Right Eye"; case LEFT: return "Left Eye"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -265,12 +267,14 @@ public class VisionPrescription extends DomainResource { throw new FHIRException("Unknown VisionEyes code '"+codeString+"'"); } 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(); } @@ -319,7 +323,7 @@ public class VisionPrescription extends DomainResource { case DOWN: return "down"; case IN: return "in"; case OUT: return "out"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -329,7 +333,7 @@ public class VisionPrescription extends DomainResource { case DOWN: return "http://hl7.org/fhir/vision-base-codes"; case IN: return "http://hl7.org/fhir/vision-base-codes"; case OUT: return "http://hl7.org/fhir/vision-base-codes"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -339,7 +343,7 @@ public class VisionPrescription extends DomainResource { case DOWN: return "bottom"; case IN: return "inner edge"; case OUT: return "outer edge"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -349,7 +353,7 @@ public class VisionPrescription extends DomainResource { case DOWN: return "Down"; case IN: return "In"; case OUT: return "Out"; - case NULL: return null; + case NULL: return null; default: return "?"; } } @@ -389,7 +393,9 @@ public class VisionPrescription extends DomainResource { throw new FHIRException("Unknown VisionBase code '"+codeString+"'"); } 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"; @@ -398,7 +404,7 @@ public class VisionPrescription extends DomainResource { if (code == VisionBase.OUT) return "out"; return "?"; - } + } public String toSystem(VisionBase code) { return code.getSystem(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/AbstractTypesEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/AbstractTypesEnumFactory.java index 1973c1051..e8eda7585 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/AbstractTypesEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/AbstractTypesEnumFactory.java @@ -50,12 +50,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/AccountStatusEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/AccountStatusEnumFactory.java index b3b593f5f..0c15b1d39 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/AccountStatusEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/AccountStatusEnumFactory.java @@ -52,14 +52,16 @@ 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"; if (code == AccountStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(AccountStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ActionCardinalityBehaviorEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ActionCardinalityBehaviorEnumFactory.java index 3f8874cfb..83ad99266 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ActionCardinalityBehaviorEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ActionCardinalityBehaviorEnumFactory.java @@ -50,12 +50,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"; @@ -63,7 +65,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ActionlistEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ActionlistEnumFactory.java index 1c954ddd3..f44055214 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ActionlistEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ActionlistEnumFactory.java @@ -54,7 +54,9 @@ public class ActionlistEnumFactory implements EnumFactory { } public String toCode(Actionlist code) { - if (code == Actionlist.CANCEL) + if (code == Actionlist.NULL) + return null; + if (code == Actionlist.CANCEL) return "cancel"; if (code == Actionlist.POLL) return "poll"; @@ -63,7 +65,7 @@ public class ActionlistEnumFactory implements EnumFactory { if (code == Actionlist.STATUS) return "status"; return "?"; - } + } public String toSystem(Actionlist code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ActivityDefinitionCategoryEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ActivityDefinitionCategoryEnumFactory.java index 6238fd677..da347ef8e 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ActivityDefinitionCategoryEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ActivityDefinitionCategoryEnumFactory.java @@ -52,14 +52,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/AddressUseEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/AddressUseEnumFactory.java index 30d245c79..810ff2439 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/AddressUseEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/AddressUseEnumFactory.java @@ -54,7 +54,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.OLD) return "old"; return "?"; - } + } public String toSystem(AddressUse code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/AdjudicationEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/AdjudicationEnumFactory.java index c7685409e..17a79b12d 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/AdjudicationEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/AdjudicationEnumFactory.java @@ -60,7 +60,9 @@ public class AdjudicationEnumFactory implements EnumFactory { } public String toCode(Adjudication code) { - if (code == Adjudication.TOTAL) + if (code == Adjudication.NULL) + return null; + if (code == Adjudication.TOTAL) return "total"; 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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/AdjudicationErrorEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/AdjudicationErrorEnumFactory.java index b1b38c05e..a983e1603 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/AdjudicationErrorEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/AdjudicationErrorEnumFactory.java @@ -50,12 +50,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/AnzscoOccupationsEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/AnzscoOccupationsEnumFactory.java index 3ebeeaf2a..0e2c3b5d1 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/AnzscoOccupationsEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/AnzscoOccupationsEnumFactory.java @@ -2698,7 +2698,9 @@ public class AnzscoOccupationsEnumFactory 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"; @@ -63,7 +65,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/AuditEventActionEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/AuditEventActionEnumFactory.java index 8f7c8c1a0..0f3ae1fdf 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/AuditEventActionEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/AuditEventActionEnumFactory.java @@ -56,7 +56,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/AuditSourceTypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/AuditSourceTypeEnumFactory.java index a8868e60d..7d5b9782d 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/AuditSourceTypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/AuditSourceTypeEnumFactory.java @@ -64,7 +64,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"; @@ -83,7 +85,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/BasicResourceTypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/BasicResourceTypeEnumFactory.java index aba4b0ebb..5ce5d3bcc 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/BasicResourceTypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/BasicResourceTypeEnumFactory.java @@ -78,7 +78,9 @@ public class BasicResourceTypeEnumFactory implements EnumFactory } public String toCode(BenefitCategory code) { - if (code == BenefitCategory.ORAL) + if (code == BenefitCategory.NULL) + return null; + if (code == BenefitCategory.ORAL) return "oral"; if (code == BenefitCategory.VISION) return "vision"; @@ -63,7 +65,7 @@ public class BenefitCategoryEnumFactory implements EnumFactory if (code == BenefitCategory.PHARMACY) return "pharmacy"; return "?"; - } + } public String toSystem(BenefitCategory code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/BenefitNetworkEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/BenefitNetworkEnumFactory.java index da6e9e969..84e7a2515 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/BenefitNetworkEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/BenefitNetworkEnumFactory.java @@ -50,12 +50,14 @@ public class BenefitNetworkEnumFactory 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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/BenefitSubcategoryEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/BenefitSubcategoryEnumFactory.java index 41a032888..b26987fd5 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/BenefitSubcategoryEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/BenefitSubcategoryEnumFactory.java @@ -102,7 +102,9 @@ public class BenefitSubcategoryEnumFactory 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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/BenefitTypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/BenefitTypeEnumFactory.java index bf1ac34da..a6894fdaf 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/BenefitTypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/BenefitTypeEnumFactory.java @@ -70,7 +70,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.DEDUCTABLE) return "deductable"; @@ -95,7 +97,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/BenefitUnitEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/BenefitUnitEnumFactory.java index d6fdf2959..c040c368b 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/BenefitUnitEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/BenefitUnitEnumFactory.java @@ -50,12 +50,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/BindingStrengthEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/BindingStrengthEnumFactory.java index 02daebb17..ac38c3405 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/BindingStrengthEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/BindingStrengthEnumFactory.java @@ -54,7 +54,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"; @@ -63,7 +65,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/BundleTypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/BundleTypeEnumFactory.java index 99537d4ea..c69135fcc 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/BundleTypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/BundleTypeEnumFactory.java @@ -64,7 +64,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"; @@ -83,7 +85,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CapabilityStatementKindEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CapabilityStatementKindEnumFactory.java index bb6c6f598..edf91569f 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CapabilityStatementKindEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CapabilityStatementKindEnumFactory.java @@ -52,14 +52,16 @@ public class CapabilityStatementKindEnumFactory implements EnumFactory { } 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"; @@ -63,7 +65,7 @@ public class CarePlanIntentEnumFactory implements EnumFactory { if (code == CarePlanIntent.OPTION) return "option"; return "?"; - } + } public String toSystem(CarePlanIntent code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CarePlanRelationshipEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CarePlanRelationshipEnumFactory.java index 893dc8194..23fac4897 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CarePlanRelationshipEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CarePlanRelationshipEnumFactory.java @@ -52,14 +52,16 @@ public class CarePlanRelationshipEnumFactory implements EnumFactory { } 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"; @@ -75,7 +77,7 @@ public class CarePlanStatusEnumFactory implements EnumFactory { if (code == CarePlanStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(CarePlanStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CareTeamCategoryEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CareTeamCategoryEnumFactory.java index 44ac85eca..cfd62d467 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CareTeamCategoryEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CareTeamCategoryEnumFactory.java @@ -58,7 +58,9 @@ public class CareTeamCategoryEnumFactory 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"; @@ -67,7 +69,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CatalogContentStatusEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CatalogContentStatusEnumFactory.java index f457fcc41..f191a1434 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CatalogContentStatusEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CatalogContentStatusEnumFactory.java @@ -54,7 +54,9 @@ public class CatalogContentStatusEnumFactory 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"; @@ -143,7 +145,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ClaimCareteamroleEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ClaimCareteamroleEnumFactory.java index 513685032..7d56ff7f6 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ClaimCareteamroleEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ClaimCareteamroleEnumFactory.java @@ -54,7 +54,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ClaimInformationcategoryEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ClaimInformationcategoryEnumFactory.java index 2754b4c68..6c549aaa0 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ClaimInformationcategoryEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ClaimInformationcategoryEnumFactory.java @@ -66,7 +66,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"; @@ -71,7 +73,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ClaimStatusEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ClaimStatusEnumFactory.java index 070504db5..3d1326b11 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ClaimStatusEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ClaimStatusEnumFactory.java @@ -54,7 +54,9 @@ public class ClaimStatusEnumFactory implements EnumFactory { } 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"; @@ -63,7 +65,7 @@ public class ClaimStatusEnumFactory implements EnumFactory { if (code == ClaimStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(ClaimStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ClaimSubtypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ClaimSubtypeEnumFactory.java index 72d8d8937..3e3811105 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ClaimSubtypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ClaimSubtypeEnumFactory.java @@ -50,12 +50,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ClaimTypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ClaimTypeEnumFactory.java index 08a4c1f63..284e64757 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ClaimTypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ClaimTypeEnumFactory.java @@ -56,7 +56,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"; @@ -67,7 +69,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ClaimUseEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ClaimUseEnumFactory.java index f49c009c7..72f485f37 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ClaimUseEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ClaimUseEnumFactory.java @@ -54,7 +54,9 @@ public class ClaimUseEnumFactory implements EnumFactory { } public String toCode(ClaimUse code) { - if (code == ClaimUse.COMPLETE) + if (code == ClaimUse.NULL) + return null; + if (code == ClaimUse.COMPLETE) return "complete"; if (code == ClaimUse.PROPOSED) return "proposed"; @@ -63,7 +65,7 @@ public class ClaimUseEnumFactory implements EnumFactory { if (code == ClaimUse.OTHER) return "other"; return "?"; - } + } public String toSystem(ClaimUse code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ClaimresponseStatusEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ClaimresponseStatusEnumFactory.java index 226b23dc5..b051e7a4e 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ClaimresponseStatusEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ClaimresponseStatusEnumFactory.java @@ -54,7 +54,9 @@ public class ClaimresponseStatusEnumFactory 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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CommunicationCategoryEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CommunicationCategoryEnumFactory.java index 9ee70bfee..b478d4ed4 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CommunicationCategoryEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CommunicationCategoryEnumFactory.java @@ -54,7 +54,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"; @@ -67,7 +69,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CompositeMeasureScoringEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CompositeMeasureScoringEnumFactory.java index 9bf21b533..e126ff1b4 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CompositeMeasureScoringEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CompositeMeasureScoringEnumFactory.java @@ -54,7 +54,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ConditionVerStatusEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ConditionVerStatusEnumFactory.java index 803c19081..e6d46f6d8 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ConditionVerStatusEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ConditionVerStatusEnumFactory.java @@ -58,7 +58,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"; @@ -67,7 +69,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ConsentCategoryEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ConsentCategoryEnumFactory.java index b553e8385..7515cbe93 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ConsentCategoryEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ConsentCategoryEnumFactory.java @@ -100,7 +100,9 @@ public class ConsentCategoryEnumFactory implements EnumFactory } public String toCode(ConsentCategory code) { - if (code == ConsentCategory._42CFR2) + if (code == ConsentCategory.NULL) + return null; + if (code == ConsentCategory._42CFR2) return "42-CFR-2"; if (code == ConsentCategory.ACD) return "ACD"; @@ -155,7 +157,7 @@ public class ConsentCategoryEnumFactory implements EnumFactory if (code == ConsentCategory.VA214142) return "VA-21-4142"; return "?"; - } + } public String toSystem(ConsentCategory code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ConsentDataMeaningEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ConsentDataMeaningEnumFactory.java index a3d096816..c7ac9f366 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ConsentDataMeaningEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ConsentDataMeaningEnumFactory.java @@ -54,7 +54,9 @@ public class ConsentDataMeaningEnumFactory implements EnumFactory { } public String toCode(ConsentStatus code) { - if (code == ConsentStatus.DRAFT) + if (code == ConsentStatus.NULL) + return null; + if (code == ConsentStatus.DRAFT) return "draft"; if (code == ConsentStatus.PROPOSED) return "proposed"; @@ -71,7 +73,7 @@ public class ConsentStatusEnumFactory implements EnumFactory { if (code == ConsentStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(ConsentStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ConstraintSeverityEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ConstraintSeverityEnumFactory.java index 62fb007b8..24b6ceebb 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ConstraintSeverityEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ConstraintSeverityEnumFactory.java @@ -50,12 +50,14 @@ public class ConstraintSeverityEnumFactory 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"; @@ -67,7 +69,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ContactentityTypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ContactentityTypeEnumFactory.java index 49ceea5e5..754544cca 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ContactentityTypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ContactentityTypeEnumFactory.java @@ -58,7 +58,9 @@ public class ContactentityTypeEnumFactory implements EnumFactory { } public String toCode(ContentType code) { - if (code == ContentType.XML) + if (code == ContentType.NULL) + return null; + if (code == ContentType.XML) return "xml"; if (code == ContentType.JSON) return "json"; @@ -63,7 +65,7 @@ public class ContentTypeEnumFactory implements EnumFactory { if (code == ContentType.NONE) return "none"; return "?"; - } + } public String toSystem(ContentType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ContractActionEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ContractActionEnumFactory.java index dde07bb5d..f8f8c9a9c 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ContractActionEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ContractActionEnumFactory.java @@ -50,12 +50,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ContractActorroleEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ContractActorroleEnumFactory.java index 112331486..a5025674c 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ContractActorroleEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ContractActorroleEnumFactory.java @@ -50,12 +50,14 @@ public class ContractActorroleEnumFactory 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"; @@ -107,7 +109,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ContractSubtypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ContractSubtypeEnumFactory.java index c8c224657..e89d5faa9 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ContractSubtypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ContractSubtypeEnumFactory.java @@ -50,12 +50,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ContractTermSubtypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ContractTermSubtypeEnumFactory.java index 3db263fbb..4b3e0a2bb 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ContractTermSubtypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ContractTermSubtypeEnumFactory.java @@ -52,14 +52,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"; @@ -67,7 +69,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ContributorTypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ContributorTypeEnumFactory.java index 6b0a85d0f..e135bff99 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ContributorTypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ContributorTypeEnumFactory.java @@ -54,7 +54,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"; @@ -63,7 +65,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CopyNumberEventEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CopyNumberEventEnumFactory.java index 1ec711ab8..357c662cb 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CopyNumberEventEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CopyNumberEventEnumFactory.java @@ -52,14 +52,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CoverageExceptionEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CoverageExceptionEnumFactory.java index b2b875798..54cfadfe0 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CoverageExceptionEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CoverageExceptionEnumFactory.java @@ -50,12 +50,14 @@ public class CoverageExceptionEnumFactory implements EnumFactory { } public String toCode(CoverageLevel code) { - if (code == CoverageLevel.GROUP) + if (code == CoverageLevel.NULL) + return null; + if (code == CoverageLevel.GROUP) return "group"; if (code == CoverageLevel.SUBGROUP) return "subgroup"; @@ -71,7 +73,7 @@ public class CoverageLevelEnumFactory implements EnumFactory { if (code == CoverageLevel.SUBCLASS) return "subclass"; return "?"; - } + } public String toSystem(CoverageLevel code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CoverageSelfpayEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CoverageSelfpayEnumFactory.java index 2da4b5ae6..bba4b26ed 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CoverageSelfpayEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CoverageSelfpayEnumFactory.java @@ -48,10 +48,12 @@ public class CoverageSelfpayEnumFactory 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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CoverageStatusEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CoverageStatusEnumFactory.java index 7e1303e2a..af5205c04 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CoverageStatusEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CoverageStatusEnumFactory.java @@ -54,7 +54,9 @@ public class CoverageStatusEnumFactory implements EnumFactory { } 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"; @@ -63,7 +65,7 @@ public class CoverageStatusEnumFactory implements EnumFactory { if (code == CoverageStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(CoverageStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CqifEvidenceQualityEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CqifEvidenceQualityEnumFactory.java index a74cb0926..8fc8548bb 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CqifEvidenceQualityEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/CqifEvidenceQualityEnumFactory.java @@ -54,7 +54,9 @@ public class CqifEvidenceQualityEnumFactory implements EnumFactory } public String toCode(CqifTriggerType code) { - if (code == CqifTriggerType.NAMEDEVENT) + if (code == CqifTriggerType.NULL) + return null; + if (code == CqifTriggerType.NAMEDEVENT) return "named-event"; if (code == CqifTriggerType.PERIODIC) return "periodic"; @@ -75,7 +77,7 @@ public class CqifTriggerTypeEnumFactory implements EnumFactory if (code == CqifTriggerType.DATAACCESSENDED) return "data-access-ended"; return "?"; - } + } public String toSystem(CqifTriggerType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DWebTypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DWebTypeEnumFactory.java index 3379844a6..3d97e6871 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DWebTypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DWebTypeEnumFactory.java @@ -52,14 +52,16 @@ public class DWebTypeEnumFactory implements EnumFactory { } public String toCode(DWebType code) { - if (code == DWebType.WADORS) + if (code == DWebType.NULL) + return null; + if (code == DWebType.WADORS) return "WADO-RS"; if (code == DWebType.WADOURI) return "WADO-URI"; if (code == DWebType.IID) return "IID"; return "?"; - } + } public String toSystem(DWebType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DataAbsentReasonEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DataAbsentReasonEnumFactory.java index a55e62ee7..5caa7455c 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DataAbsentReasonEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DataAbsentReasonEnumFactory.java @@ -66,7 +66,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"; @@ -263,7 +265,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DataelementStringencyEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DataelementStringencyEnumFactory.java index 76f138749..1a61aa7de 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DataelementStringencyEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DataelementStringencyEnumFactory.java @@ -58,7 +58,9 @@ public class DataelementStringencyEnumFactory 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"; @@ -75,7 +77,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DefinitionStatusEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DefinitionStatusEnumFactory.java index 85577a019..465f72da5 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DefinitionStatusEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DefinitionStatusEnumFactory.java @@ -54,7 +54,9 @@ public class DefinitionStatusEnumFactory 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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DetectedissueSeverityEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DetectedissueSeverityEnumFactory.java index 270d98b5a..577ba3152 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DetectedissueSeverityEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DetectedissueSeverityEnumFactory.java @@ -52,14 +52,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DeviceSafetyEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DeviceSafetyEnumFactory.java index 7e5e5a459..2779f7b34 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DeviceSafetyEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DeviceSafetyEnumFactory.java @@ -60,7 +60,9 @@ public class DeviceSafetyEnumFactory implements EnumFactory { } public String toCode(DeviceSafety code) { - if (code == DeviceSafety.CONTAINSLATEX) + if (code == DeviceSafety.NULL) + return null; + if (code == DeviceSafety.CONTAINSLATEX) return "contains-latex"; if (code == DeviceSafety.LATEXFREE) return "latex-free"; @@ -75,7 +77,7 @@ public class DeviceSafetyEnumFactory implements EnumFactory { if (code == DeviceSafety.MRUNKNOWN) return "mr-unknown"; return "?"; - } + } public String toSystem(DeviceSafety code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DeviceStatementStatusEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DeviceStatementStatusEnumFactory.java index b3f74a603..c0b5c633c 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DeviceStatementStatusEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DeviceStatementStatusEnumFactory.java @@ -58,7 +58,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"; @@ -62,7 +64,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DiagnosisRoleEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DiagnosisRoleEnumFactory.java index 8759d3654..51a0837a0 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DiagnosisRoleEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DiagnosisRoleEnumFactory.java @@ -60,7 +60,9 @@ public class DiagnosisRoleEnumFactory 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"; @@ -75,7 +77,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DiagnosticReportStatusEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DiagnosticReportStatusEnumFactory.java index 0b2ccf223..336254f24 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DiagnosticReportStatusEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DiagnosticReportStatusEnumFactory.java @@ -66,7 +66,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DocumentReferenceStatusEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DocumentReferenceStatusEnumFactory.java index c26780558..0fc9c9116 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DocumentReferenceStatusEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DocumentReferenceStatusEnumFactory.java @@ -52,14 +52,16 @@ public class DocumentReferenceStatusEnumFactory 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"; @@ -75,7 +77,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/EncounterDischargeDispositionEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/EncounterDischargeDispositionEnumFactory.java index e513ef53d..3dc97fc51 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/EncounterDischargeDispositionEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/EncounterDischargeDispositionEnumFactory.java @@ -66,7 +66,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"; @@ -83,7 +85,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/EncounterTypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/EncounterTypeEnumFactory.java index 32e35a46c..12255a0c7 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/EncounterTypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/EncounterTypeEnumFactory.java @@ -54,7 +54,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"; @@ -63,7 +65,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/EndpointConnectionTypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/EndpointConnectionTypeEnumFactory.java index 2febd975d..7cec3c4d5 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/EndpointConnectionTypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/EndpointConnectionTypeEnumFactory.java @@ -74,7 +74,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"; @@ -71,7 +73,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/EnrollmentrequestStatusEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/EnrollmentrequestStatusEnumFactory.java index dad02a474..089e110a8 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/EnrollmentrequestStatusEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/EnrollmentrequestStatusEnumFactory.java @@ -54,7 +54,9 @@ public class EnrollmentrequestStatusEnumFactory 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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/EventTimingEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/EventTimingEnumFactory.java index e870f491f..f7027bfa1 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/EventTimingEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/EventTimingEnumFactory.java @@ -56,7 +56,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.AFT) return "AFT"; @@ -67,7 +69,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ExDiagnosisrelatedgroupEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ExDiagnosisrelatedgroupEnumFactory.java index 148ca2408..31825e520 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ExDiagnosisrelatedgroupEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ExDiagnosisrelatedgroupEnumFactory.java @@ -54,7 +54,9 @@ public class ExDiagnosisrelatedgroupEnumFactory 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"; @@ -95,7 +97,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ExOnsettypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ExOnsettypeEnumFactory.java index 707464871..f5815de0a 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ExOnsettypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ExOnsettypeEnumFactory.java @@ -52,14 +52,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ExPayeeResourceTypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ExPayeeResourceTypeEnumFactory.java index ab8dff010..e28c77c55 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ExPayeeResourceTypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ExPayeeResourceTypeEnumFactory.java @@ -54,7 +54,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ExProgramCodeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ExProgramCodeEnumFactory.java index 1267a85f0..1114b30a2 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ExProgramCodeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ExProgramCodeEnumFactory.java @@ -54,7 +54,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"; @@ -63,7 +65,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ExRevenueCenterEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ExRevenueCenterEnumFactory.java index 9556b9dba..b5de442a0 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ExRevenueCenterEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ExRevenueCenterEnumFactory.java @@ -64,7 +64,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"; @@ -83,7 +85,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ExplanationofbenefitStatusEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ExplanationofbenefitStatusEnumFactory.java index d6e4b9ba5..0589a5780 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ExplanationofbenefitStatusEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ExplanationofbenefitStatusEnumFactory.java @@ -54,7 +54,9 @@ public class ExplanationofbenefitStatusEnumFactory 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"; @@ -83,7 +85,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/FlagCategoryEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/FlagCategoryEnumFactory.java index 26ee56d27..125de5526 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/FlagCategoryEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/FlagCategoryEnumFactory.java @@ -56,7 +56,9 @@ public class FlagCategoryEnumFactory 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"; @@ -67,7 +69,7 @@ public class FlagCategoryEnumFactory implements EnumFactory { if (code == FlagCategory.CONTACT) return "contact"; return "?"; - } + } public String toSystem(FlagCategory code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/FlagPriorityEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/FlagPriorityEnumFactory.java index 76196e8d0..12c88dd9e 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/FlagPriorityEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/FlagPriorityEnumFactory.java @@ -54,7 +54,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"; @@ -63,7 +65,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/FlagStatusEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/FlagStatusEnumFactory.java index 0486cfdf6..22a1b502f 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/FlagStatusEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/FlagStatusEnumFactory.java @@ -52,14 +52,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/FmConditionsEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/FmConditionsEnumFactory.java index 51829ab8d..96b43f2a4 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/FmConditionsEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/FmConditionsEnumFactory.java @@ -48,10 +48,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/FmItemtypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/FmItemtypeEnumFactory.java index 52835e9e1..c0caeb90f 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/FmItemtypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/FmItemtypeEnumFactory.java @@ -52,14 +52,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/FmStatusEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/FmStatusEnumFactory.java index 16d295e63..e915d42a3 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/FmStatusEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/FmStatusEnumFactory.java @@ -54,7 +54,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"; @@ -63,7 +65,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/FormsEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/FormsEnumFactory.java index d5f257d05..0cc334e83 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/FormsEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/FormsEnumFactory.java @@ -50,12 +50,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/FundsreserveEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/FundsreserveEnumFactory.java index 496d0f9e6..a33009821 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/FundsreserveEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/FundsreserveEnumFactory.java @@ -52,14 +52,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/GoalAcceptanceStatusEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/GoalAcceptanceStatusEnumFactory.java index 7036a0126..07ed5d0c4 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/GoalAcceptanceStatusEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/GoalAcceptanceStatusEnumFactory.java @@ -52,14 +52,16 @@ public class GoalAcceptanceStatusEnumFactory 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"; @@ -67,7 +69,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/GoalPriorityEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/GoalPriorityEnumFactory.java index 7e5ac213e..2cb704399 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/GoalPriorityEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/GoalPriorityEnumFactory.java @@ -52,14 +52,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/GoalRelationshipTypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/GoalRelationshipTypeEnumFactory.java index 4df31e958..2cb396767 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/GoalRelationshipTypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/GoalRelationshipTypeEnumFactory.java @@ -56,7 +56,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.ACCEPTED) return "accepted"; @@ -99,7 +101,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/GoalStatusReasonEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/GoalStatusReasonEnumFactory.java index 50e0a960e..b2906b95f 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/GoalStatusReasonEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/GoalStatusReasonEnumFactory.java @@ -64,7 +64,9 @@ public class GoalStatusReasonEnumFactory 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"; @@ -71,7 +73,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/GuidanceResponseStatusEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/GuidanceResponseStatusEnumFactory.java index 5c38b5a8e..1014ac461 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/GuidanceResponseStatusEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/GuidanceResponseStatusEnumFactory.java @@ -58,7 +58,9 @@ public class GuidanceResponseStatusEnumFactory implements EnumFactory { } public String toCode(GuidePageKind code) { - if (code == GuidePageKind.PAGE) + if (code == GuidePageKind.NULL) + return null; + if (code == GuidePageKind.PAGE) return "page"; if (code == GuidePageKind.EXAMPLE) return "example"; @@ -79,7 +81,7 @@ public class GuidePageKindEnumFactory implements EnumFactory { if (code == GuidePageKind.RESOURCE) return "resource"; return "?"; - } + } public String toSystem(GuidePageKind code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/HistoryNotDoneReasonEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/HistoryNotDoneReasonEnumFactory.java index 31927d9e8..4c478b8d7 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/HistoryNotDoneReasonEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/HistoryNotDoneReasonEnumFactory.java @@ -54,7 +54,9 @@ public class HistoryNotDoneReasonEnumFactory 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"; @@ -63,7 +65,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/Hl7WorkGroupEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/Hl7WorkGroupEnumFactory.java index 68e924f0f..8cf775961 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/Hl7WorkGroupEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/Hl7WorkGroupEnumFactory.java @@ -92,7 +92,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/HttpOperationsEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/HttpOperationsEnumFactory.java index 67c4d0813..51f48a2da 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/HttpOperationsEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/HttpOperationsEnumFactory.java @@ -58,7 +58,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.PUT) return "put"; return "?"; - } + } public String toSystem(HttpOperations code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/HttpVerbEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/HttpVerbEnumFactory.java index 4a30c7537..dd616ed3f 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/HttpVerbEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/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.POST) return "POST"; @@ -63,7 +65,7 @@ public class HttpVerbEnumFactory implements EnumFactory { if (code == HttpVerb.DELETE) return "DELETE"; return "?"; - } + } public String toSystem(HttpVerb code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/Icd10ProceduresEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/Icd10ProceduresEnumFactory.java index 616830514..f41cd3228 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/Icd10ProceduresEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/Icd10ProceduresEnumFactory.java @@ -52,14 +52,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/IdentifierTypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/IdentifierTypeEnumFactory.java index d76f64940..2011d316a 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/IdentifierTypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/IdentifierTypeEnumFactory.java @@ -56,7 +56,9 @@ public class IdentifierTypeEnumFactory implements EnumFactory { } public String toCode(IdentifierType code) { - if (code == IdentifierType.UDI) + if (code == IdentifierType.NULL) + return null; + if (code == IdentifierType.UDI) return "UDI"; if (code == IdentifierType.SNO) return "SNO"; @@ -67,7 +69,7 @@ public class IdentifierTypeEnumFactory implements EnumFactory { if (code == IdentifierType.FILL) return "FILL"; return "?"; - } + } public String toSystem(IdentifierType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/IdentifierUseEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/IdentifierUseEnumFactory.java index 2c2f65922..4d22a7b8f 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/IdentifierUseEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/IdentifierUseEnumFactory.java @@ -54,7 +54,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.SECONDARY) return "secondary"; return "?"; - } + } public String toSystem(IdentifierUse code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/IdentityAssuranceLevelEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/IdentityAssuranceLevelEnumFactory.java index a2d5ae44f..9b5868d28 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/IdentityAssuranceLevelEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/IdentityAssuranceLevelEnumFactory.java @@ -54,7 +54,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"; @@ -63,7 +65,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/InterventionEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/InterventionEnumFactory.java index ada846be9..3544351df 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/InterventionEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/InterventionEnumFactory.java @@ -50,12 +50,14 @@ public class InterventionEnumFactory 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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/Iso21089LifecycleEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/Iso21089LifecycleEnumFactory.java index fc2084cd3..fc995fdcd 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/Iso21089LifecycleEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/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"; @@ -63,7 +65,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/IssueTypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/IssueTypeEnumFactory.java index ee832d727..f75614e9b 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/IssueTypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/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"; @@ -163,7 +165,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ItemTypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ItemTypeEnumFactory.java index f92d21212..50155e570 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ItemTypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ItemTypeEnumFactory.java @@ -80,7 +80,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"; @@ -115,7 +117,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/LOINC480020AnswerlistEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/LOINC480020AnswerlistEnumFactory.java index 2b4b8013d..68f01de50 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/LOINC480020AnswerlistEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/LOINC480020AnswerlistEnumFactory.java @@ -60,7 +60,9 @@ public class LOINC480020AnswerlistEnumFactory 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"; @@ -63,7 +65,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/LinkTypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/LinkTypeEnumFactory.java index 3d910fd37..f84e97031 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/LinkTypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/LinkTypeEnumFactory.java @@ -54,7 +54,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"; @@ -63,7 +65,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/LinkageTypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/LinkageTypeEnumFactory.java index c262880ce..2483da461 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/LinkageTypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/LinkageTypeEnumFactory.java @@ -52,14 +52,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ListEmptyReasonEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ListEmptyReasonEnumFactory.java index 67a6d7f34..4c14709e8 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ListEmptyReasonEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ListEmptyReasonEnumFactory.java @@ -58,7 +58,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"; @@ -71,7 +73,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ListExampleCodesEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ListExampleCodesEnumFactory.java index f505783a5..cd4bc4e90 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ListExampleCodesEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ListExampleCodesEnumFactory.java @@ -64,7 +64,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"; @@ -71,7 +73,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ListModeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ListModeEnumFactory.java index 73e27c7ed..201a46e18 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ListModeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ListModeEnumFactory.java @@ -52,14 +52,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ListOrderEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ListOrderEnumFactory.java index 472bbbf3b..1d267489c 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ListOrderEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ListOrderEnumFactory.java @@ -62,7 +62,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"; @@ -79,7 +81,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ListStatusEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ListStatusEnumFactory.java index 2d4514aa0..1e651a546 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ListStatusEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ListStatusEnumFactory.java @@ -52,14 +52,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/LocationModeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/LocationModeEnumFactory.java index 07c9e307e..b302945f6 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/LocationModeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/LocationModeEnumFactory.java @@ -50,12 +50,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/LocationPhysicalTypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/LocationPhysicalTypeEnumFactory.java index 26c40ea02..4c5a3a0b9 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/LocationPhysicalTypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/LocationPhysicalTypeEnumFactory.java @@ -74,7 +74,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MapContextTypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MapContextTypeEnumFactory.java index b35efce93..d420d53c9 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MapContextTypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MapContextTypeEnumFactory.java @@ -50,12 +50,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MapGroupTypeModeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MapGroupTypeModeEnumFactory.java index aaa61251d..314473076 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MapGroupTypeModeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MapGroupTypeModeEnumFactory.java @@ -52,14 +52,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MapListModeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MapListModeEnumFactory.java index 3b59c3a62..7718d5d74 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MapListModeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MapListModeEnumFactory.java @@ -52,14 +52,16 @@ public class MapListModeEnumFactory implements EnumFactory { } public String toCode(MapListMode code) { - if (code == MapListMode.FIRST) + if (code == MapListMode.NULL) + return null; + if (code == MapListMode.FIRST) return "first"; if (code == MapListMode.SHARE) return "share"; if (code == MapListMode.LAST) return "last"; return "?"; - } + } public String toSystem(MapListMode code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MapModelModeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MapModelModeEnumFactory.java index ada122159..de90e8dfb 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MapModelModeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MapModelModeEnumFactory.java @@ -54,7 +54,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"; @@ -63,7 +65,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MapSourceListModeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MapSourceListModeEnumFactory.java index a632e6e7e..5000ecee3 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MapSourceListModeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MapSourceListModeEnumFactory.java @@ -56,7 +56,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"; @@ -114,7 +116,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MaritalStatusEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MaritalStatusEnumFactory.java index 3c597503f..d3454733c 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MaritalStatusEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MaritalStatusEnumFactory.java @@ -48,10 +48,12 @@ public class MaritalStatusEnumFactory implements EnumFactory { } public String toCode(MaritalStatus code) { - if (code == MaritalStatus.U) + if (code == MaritalStatus.NULL) + return null; + if (code == MaritalStatus.U) return "U"; return "?"; - } + } public String toSystem(MaritalStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MatchGradeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MatchGradeEnumFactory.java index 5ba7b387d..578048842 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MatchGradeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MatchGradeEnumFactory.java @@ -54,7 +54,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"; @@ -63,7 +65,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MeasureDataUsageEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MeasureDataUsageEnumFactory.java index b0566cab4..b72ef4d3c 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MeasureDataUsageEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MeasureDataUsageEnumFactory.java @@ -50,12 +50,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"; @@ -63,7 +65,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MeasureTypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MeasureTypeEnumFactory.java index 2b1cf377b..2cf089c69 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MeasureTypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MeasureTypeEnumFactory.java @@ -56,7 +56,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"; @@ -67,7 +69,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MeasurementPrincipleEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MeasurementPrincipleEnumFactory.java index e05c2bbd6..de8ab1ccc 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MeasurementPrincipleEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MeasurementPrincipleEnumFactory.java @@ -68,7 +68,9 @@ public class MeasurementPrincipleEnumFactory implements EnumFactory { } public String toCode(MessageEvents code) { - if (code == MessageEvents.CODESYSTEMEXPAND) + if (code == MessageEvents.NULL) + return null; + if (code == MessageEvents.CODESYSTEMEXPAND) return "CodeSystem-expand"; if (code == MessageEvents.MEDICATIONADMINISTRATIONCOMPLETE) return "MedicationAdministration-Complete"; @@ -95,7 +97,7 @@ public class MessageEventsEnumFactory implements EnumFactory { if (code == MessageEvents.VALUESETEXPAND) return "valueset-expand"; return "?"; - } + } public String toSystem(MessageEvents code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MessageReasonEncounterEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MessageReasonEncounterEnumFactory.java index a6574dfed..b508a0131 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MessageReasonEncounterEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MessageReasonEncounterEnumFactory.java @@ -58,7 +58,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"; @@ -63,7 +65,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MetricColorEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MetricColorEnumFactory.java index 85ef166d0..bb1dbbac2 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MetricColorEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MetricColorEnumFactory.java @@ -62,7 +62,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"; @@ -79,7 +81,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MetricOperationalStatusEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MetricOperationalStatusEnumFactory.java index a6d5db365..2a9faaae1 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MetricOperationalStatusEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/MetricOperationalStatusEnumFactory.java @@ -54,7 +54,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"; @@ -75,7 +77,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/NamingsystemIdentifierTypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/NamingsystemIdentifierTypeEnumFactory.java index d43804af5..16fafb441 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/NamingsystemIdentifierTypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/NamingsystemIdentifierTypeEnumFactory.java @@ -54,7 +54,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"; @@ -63,7 +65,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/NetworkTypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/NetworkTypeEnumFactory.java index 1dcbb626c..8980aceba 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/NetworkTypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/NetworkTypeEnumFactory.java @@ -56,7 +56,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"; @@ -67,7 +69,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/NoteTypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/NoteTypeEnumFactory.java index a173288e5..45ad3c7fe 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/NoteTypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/NoteTypeEnumFactory.java @@ -52,14 +52,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/NutritionRequestStatusEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/NutritionRequestStatusEnumFactory.java index 2b20394bd..775b00f52 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/NutritionRequestStatusEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/NutritionRequestStatusEnumFactory.java @@ -64,7 +64,9 @@ public class NutritionRequestStatusEnumFactory implements EnumFactory } public String toCode(ObjectLifecycle code) { - if (code == ObjectLifecycle._1) + if (code == ObjectLifecycle.NULL) + return null; + if (code == ObjectLifecycle._1) return "1"; if (code == ObjectLifecycle._2) return "2"; @@ -107,7 +109,7 @@ public class ObjectLifecycleEnumFactory implements EnumFactory if (code == ObjectLifecycle._15) return "15"; return "?"; - } + } public String toSystem(ObjectLifecycle code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ObjectRoleEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ObjectRoleEnumFactory.java index 857d4380b..c662a8e1e 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ObjectRoleEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ObjectRoleEnumFactory.java @@ -94,7 +94,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"; @@ -143,7 +145,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ObjectTypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ObjectTypeEnumFactory.java index 0a25bd44e..92306f361 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ObjectTypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ObjectTypeEnumFactory.java @@ -54,7 +54,9 @@ public class ObjectTypeEnumFactory implements EnumFactory { } public String toCode(ObjectType code) { - if (code == ObjectType._1) + if (code == ObjectType.NULL) + return null; + if (code == ObjectType._1) return "1"; if (code == ObjectType._2) return "2"; @@ -63,7 +65,7 @@ public class ObjectTypeEnumFactory implements EnumFactory { if (code == ObjectType._4) return "4"; return "?"; - } + } public String toSystem(ObjectType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ObservationCategoryEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ObservationCategoryEnumFactory.java index 2e75e1fea..8af3625f1 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ObservationCategoryEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ObservationCategoryEnumFactory.java @@ -62,7 +62,9 @@ public class ObservationCategoryEnumFactory implements EnumFactory } public String toCode(OccurrenceCodes code) { - if (code == OccurrenceCodes._1001) + if (code == OccurrenceCodes.NULL) + return null; + if (code == OccurrenceCodes._1001) return "1001"; if (code == OccurrenceCodes._1002) return "1002"; return "?"; - } + } public String toSystem(OccurrenceCodes code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/OccurrenceSpanCodesEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/OccurrenceSpanCodesEnumFactory.java index e34591cab..286e78e8a 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/OccurrenceSpanCodesEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/OccurrenceSpanCodesEnumFactory.java @@ -50,12 +50,14 @@ public class OccurrenceSpanCodesEnumFactory 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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/OperationOutcomeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/OperationOutcomeEnumFactory.java index 78ab6bcc8..4d0a0be21 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/OperationOutcomeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/OperationOutcomeEnumFactory.java @@ -146,7 +146,9 @@ public class OperationOutcomeEnumFactory 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"; @@ -83,7 +85,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ParticipantrequiredEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ParticipantrequiredEnumFactory.java index c787aaad8..2bf64f138 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ParticipantrequiredEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ParticipantrequiredEnumFactory.java @@ -52,14 +52,16 @@ public class ParticipantrequiredEnumFactory implements EnumFactory } public String toCode(PatientMpiMatch code) { - if (code == PatientMpiMatch.CERTAIN) + if (code == PatientMpiMatch.NULL) + return null; + if (code == PatientMpiMatch.CERTAIN) return "certain"; if (code == PatientMpiMatch.PROBABLE) return "probable"; @@ -63,7 +65,7 @@ public class PatientMpiMatchEnumFactory implements EnumFactory if (code == PatientMpiMatch.CERTAINLYNOT) return "certainly-not"; return "?"; - } + } public String toSystem(PatientMpiMatch code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/PayeetypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/PayeetypeEnumFactory.java index c11a8c370..523edac5e 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/PayeetypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/PayeetypeEnumFactory.java @@ -52,14 +52,16 @@ public class PayeetypeEnumFactory 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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/PaymentAdjustmentReasonEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/PaymentAdjustmentReasonEnumFactory.java index b62901aa6..40352a2af 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/PaymentAdjustmentReasonEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/PaymentAdjustmentReasonEnumFactory.java @@ -50,12 +50,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/PaymentTypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/PaymentTypeEnumFactory.java index 2e0c942e1..d944cf1a2 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/PaymentTypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/PaymentTypeEnumFactory.java @@ -52,14 +52,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/PaymentnoticeStatusEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/PaymentnoticeStatusEnumFactory.java index 0670a0994..6ccfacbcc 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/PaymentnoticeStatusEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/PaymentnoticeStatusEnumFactory.java @@ -54,7 +54,9 @@ public class PaymentnoticeStatusEnumFactory implements EnumFactory } 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"; @@ -75,7 +77,7 @@ public class ProcedureStatusEnumFactory implements EnumFactory if (code == ProcedureStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(ProcedureStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ProcessOutcomeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ProcessOutcomeEnumFactory.java index 42bdade7b..61328723e 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ProcessOutcomeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ProcessOutcomeEnumFactory.java @@ -52,14 +52,16 @@ public class ProcessOutcomeEnumFactory implements EnumFactory { } public String toCode(ProcessOutcome code) { - if (code == ProcessOutcome.COMPLETE) + if (code == ProcessOutcome.NULL) + return null; + if (code == ProcessOutcome.COMPLETE) return "complete"; if (code == ProcessOutcome.PENDED) return "pended"; if (code == ProcessOutcome.ERROR) return "error"; return "?"; - } + } public String toSystem(ProcessOutcome code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ProcessPriorityEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ProcessPriorityEnumFactory.java index 3b993007b..2558eaff7 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ProcessPriorityEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ProcessPriorityEnumFactory.java @@ -52,14 +52,16 @@ public class ProcessPriorityEnumFactory 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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ProcessrequestStatusEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ProcessrequestStatusEnumFactory.java index 3949d456d..1e81d40ee 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ProcessrequestStatusEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ProcessrequestStatusEnumFactory.java @@ -54,7 +54,9 @@ public class ProcessrequestStatusEnumFactory 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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/QuantityComparatorEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/QuantityComparatorEnumFactory.java index 4df53fa7a..66a7c98af 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/QuantityComparatorEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/QuantityComparatorEnumFactory.java @@ -54,7 +54,9 @@ public class QuantityComparatorEnumFactory implements EnumFactory"; return "?"; - } + } public String toSystem(QuantityComparator code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/QuestionMaxOccursEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/QuestionMaxOccursEnumFactory.java index e9ee8df1f..ae7a438ec 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/QuestionMaxOccursEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/QuestionMaxOccursEnumFactory.java @@ -48,10 +48,12 @@ public class QuestionMaxOccursEnumFactory implements EnumFactory { } public String toCode(Referralstatus code) { - if (code == Referralstatus.DRAFT) + if (code == Referralstatus.NULL) + return null; + if (code == Referralstatus.DRAFT) return "draft"; if (code == Referralstatus.ACTIVE) return "active"; @@ -67,7 +69,7 @@ public class ReferralstatusEnumFactory implements EnumFactory { if (code == Referralstatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(Referralstatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/RelatedArtifactTypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/RelatedArtifactTypeEnumFactory.java index c15a9301f..b042fe112 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/RelatedArtifactTypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/RelatedArtifactTypeEnumFactory.java @@ -62,7 +62,9 @@ public class RelatedArtifactTypeEnumFactory 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"; @@ -67,7 +69,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/RemittanceOutcomeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/RemittanceOutcomeEnumFactory.java index ecdeb53d2..08d51fa97 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/RemittanceOutcomeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/RemittanceOutcomeEnumFactory.java @@ -52,14 +52,16 @@ 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"; @@ -67,7 +69,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/RequestIntentEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/RequestIntentEnumFactory.java index 01abc30a1..e211697b8 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/RequestIntentEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/RequestIntentEnumFactory.java @@ -62,7 +62,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/RequestPriorityEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/RequestPriorityEnumFactory.java index 26fd8cd9e..a4d792eb7 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/RequestPriorityEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/RequestPriorityEnumFactory.java @@ -54,7 +54,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"; @@ -63,7 +65,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/RequestStageEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/RequestStageEnumFactory.java index f894ee7d4..af952c9c7 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/RequestStageEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/RequestStageEnumFactory.java @@ -56,7 +56,9 @@ public class RequestStageEnumFactory implements EnumFactory { } public String toCode(RequestStage code) { - if (code == RequestStage.PROPOSAL) + if (code == RequestStage.NULL) + return null; + if (code == RequestStage.PROPOSAL) return "proposal"; if (code == RequestStage.PLAN) return "plan"; @@ -67,7 +69,7 @@ public class RequestStageEnumFactory implements EnumFactory { if (code == RequestStage.REFLEXORDER) return "reflex-order"; return "?"; - } + } public String toSystem(RequestStage code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/RequestStatusEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/RequestStatusEnumFactory.java index 1c53cc847..174534e2c 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/RequestStatusEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/RequestStatusEnumFactory.java @@ -60,7 +60,9 @@ public class RequestStatusEnumFactory 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"; @@ -75,7 +77,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ResearchStudyStatusEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ResearchStudyStatusEnumFactory.java index 7461f10bc..8c38f60dd 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ResearchStudyStatusEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ResearchStudyStatusEnumFactory.java @@ -58,7 +58,9 @@ public class ResearchStudyStatusEnumFactory 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"; @@ -523,7 +525,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ResourceValidationModeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ResourceValidationModeEnumFactory.java index 6e08b4f3a..930e93c4f 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ResourceValidationModeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ResourceValidationModeEnumFactory.java @@ -52,14 +52,16 @@ 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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/RestfulCapabilityModeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/RestfulCapabilityModeEnumFactory.java index c283aa570..95c9d2591 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/RestfulCapabilityModeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/RestfulCapabilityModeEnumFactory.java @@ -50,12 +50,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"; @@ -67,7 +69,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/RulesetEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/RulesetEnumFactory.java index 0d7b0dc3e..3c6000ab7 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/RulesetEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/RulesetEnumFactory.java @@ -58,7 +58,9 @@ public class RulesetEnumFactory implements EnumFactory { } public String toCode(Ruleset code) { - if (code == Ruleset.X124010) + if (code == Ruleset.NULL) + return null; + if (code == Ruleset.X124010) return "x12-4010"; if (code == Ruleset.X125010) return "x12-5010"; @@ -71,7 +73,7 @@ public class RulesetEnumFactory implements EnumFactory { if (code == Ruleset.CPHA3) return "cpha-3"; return "?"; - } + } public String toSystem(Ruleset code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SearchComparatorEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SearchComparatorEnumFactory.java index edcd84f7a..52f39c8b8 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SearchComparatorEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SearchComparatorEnumFactory.java @@ -64,7 +64,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SearchModifierCodeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SearchModifierCodeEnumFactory.java index 418fef478..19e33e97c 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SearchModifierCodeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/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.URI) return "uri"; return "?"; - } + } public String toSystem(SearchParamType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SearchXpathUsageEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SearchXpathUsageEnumFactory.java index ec541e158..4200f365f 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SearchXpathUsageEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SearchXpathUsageEnumFactory.java @@ -56,7 +56,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ServiceCategoryEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ServiceCategoryEnumFactory.java index d4f8e80ae..f143a1112 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ServiceCategoryEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ServiceCategoryEnumFactory.java @@ -122,7 +122,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"; @@ -199,7 +201,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ServiceModifiersEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ServiceModifiersEnumFactory.java index 23d66e253..f46a27073 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ServiceModifiersEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ServiceModifiersEnumFactory.java @@ -50,12 +50,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"; @@ -71,7 +73,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ServicePlaceEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ServicePlaceEnumFactory.java index e697f8741..c52843ebc 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ServicePlaceEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ServicePlaceEnumFactory.java @@ -80,7 +80,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"; @@ -115,7 +117,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ServiceProductEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ServiceProductEnumFactory.java index 27ee4c9ac..7617c89ae 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ServiceProductEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ServiceProductEnumFactory.java @@ -50,12 +50,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ServiceProvisionConditionsEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ServiceProvisionConditionsEnumFactory.java index 95bbcd8e1..58c977ca8 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ServiceProvisionConditionsEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ServiceProvisionConditionsEnumFactory.java @@ -52,14 +52,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"; @@ -2431,7 +2433,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ServiceUsclsEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ServiceUsclsEnumFactory.java index 369c9be85..2f74ab1ce 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ServiceUsclsEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/ServiceUsclsEnumFactory.java @@ -86,7 +86,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"; @@ -127,7 +129,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SignatureTypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SignatureTypeEnumFactory.java index 4b1d5a5c9..c2f3b8f60 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SignatureTypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SignatureTypeEnumFactory.java @@ -82,7 +82,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"; @@ -119,7 +121,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SlotstatusEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SlotstatusEnumFactory.java index f1ef41581..dbf2a6a97 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SlotstatusEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SlotstatusEnumFactory.java @@ -56,7 +56,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"; @@ -67,7 +69,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SpecialValuesEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SpecialValuesEnumFactory.java index 838aa4fe9..803f6578d 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SpecialValuesEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SpecialValuesEnumFactory.java @@ -58,7 +58,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"; @@ -71,7 +73,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SpecificationTypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SpecificationTypeEnumFactory.java index b32fe1c0a..9e80724ff 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SpecificationTypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SpecificationTypeEnumFactory.java @@ -62,7 +62,9 @@ public class SpecificationTypeEnumFactory 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"; @@ -63,7 +65,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/StructureDefinitionKindEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/StructureDefinitionKindEnumFactory.java index 004f6bd44..7b339081b 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/StructureDefinitionKindEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/StructureDefinitionKindEnumFactory.java @@ -54,7 +54,9 @@ public class StructureDefinitionKindEnumFactory 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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SubstanceCategoryEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SubstanceCategoryEnumFactory.java index 7605e3077..84dcb6a78 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SubstanceCategoryEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SubstanceCategoryEnumFactory.java @@ -60,7 +60,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SupplydeliveryStatusEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SupplydeliveryStatusEnumFactory.java index fdc27a93f..127efbb3e 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SupplydeliveryStatusEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SupplydeliveryStatusEnumFactory.java @@ -54,7 +54,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"; @@ -91,7 +93,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SystemVersionProcessingModeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SystemVersionProcessingModeEnumFactory.java index 5d62431f9..90fb06b79 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SystemVersionProcessingModeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/SystemVersionProcessingModeEnumFactory.java @@ -52,14 +52,16 @@ public class SystemVersionProcessingModeEnumFactory implements EnumFactory { } public String toCode(TaskPriority code) { - if (code == TaskPriority.LOW) + if (code == TaskPriority.NULL) + return null; + if (code == TaskPriority.LOW) return "low"; if (code == TaskPriority.NORMAL) return "normal"; if (code == TaskPriority.HIGH) return "high"; return "?"; - } + } public String toSystem(TaskPriority code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/TaskStageEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/TaskStageEnumFactory.java index 661b4a283..330ec00d4 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/TaskStageEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/TaskStageEnumFactory.java @@ -52,14 +52,16 @@ public class TaskStageEnumFactory implements EnumFactory { } public String toCode(TaskStage code) { - if (code == TaskStage.PROPOSAL) + if (code == TaskStage.NULL) + return null; + if (code == TaskStage.PROPOSAL) return "proposal"; if (code == TaskStage.PLANNED) return "planned"; if (code == TaskStage.ACTIONABLE) return "actionable"; return "?"; - } + } public String toSystem(TaskStage code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/TaskStatusEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/TaskStatusEnumFactory.java index ceda4a32e..eb76e68bc 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/TaskStatusEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/TaskStatusEnumFactory.java @@ -70,7 +70,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"; @@ -95,7 +97,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/TeethEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/TeethEnumFactory.java index da7f4dd77..2469f7b7d 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/TeethEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/TeethEnumFactory.java @@ -110,7 +110,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"; @@ -175,7 +177,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/TestscriptOperationCodesEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/TestscriptOperationCodesEnumFactory.java index 1dc50cda6..26b02a71b 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/TestscriptOperationCodesEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/TestscriptOperationCodesEnumFactory.java @@ -152,7 +152,9 @@ public class TestscriptOperationCodesEnumFactory 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"; @@ -211,7 +213,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/TransactionModeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/TransactionModeEnumFactory.java index 5ed0e25e7..4750c60a5 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/TransactionModeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/TransactionModeEnumFactory.java @@ -54,7 +54,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"; @@ -63,7 +65,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/TriggerTypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/TriggerTypeEnumFactory.java index b9006e5ad..e000a0d93 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/TriggerTypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/TriggerTypeEnumFactory.java @@ -60,7 +60,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/TypeDerivationRuleEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/TypeDerivationRuleEnumFactory.java index 74ce392cb..f2b41fd43 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/TypeDerivationRuleEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/TypeDerivationRuleEnumFactory.java @@ -50,12 +50,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"; @@ -71,7 +73,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/UdiEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/UdiEnumFactory.java index bf24847ba..fb876d072 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/UdiEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/UdiEnumFactory.java @@ -48,10 +48,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/UnknownContentCodeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/UnknownContentCodeEnumFactory.java index 407f2c479..38beb4454 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/UnknownContentCodeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/UnknownContentCodeEnumFactory.java @@ -54,7 +54,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"; @@ -543,7 +545,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ActCodeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ActCodeEnumFactory.java index 0a14c47af..6c6bf80f0 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ActCodeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ActCodeEnumFactory.java @@ -2234,7 +2234,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"; @@ -4423,7 +4425,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ActExposureLevelCodeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ActExposureLevelCodeEnumFactory.java index 5ae9ace88..e1ffd1388 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ActExposureLevelCodeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ActExposureLevelCodeEnumFactory.java @@ -54,7 +54,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"; @@ -159,7 +161,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ActPriorityEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ActPriorityEnumFactory.java index 68afd1c7b..20658b72d 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ActPriorityEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ActPriorityEnumFactory.java @@ -76,7 +76,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"; @@ -107,7 +109,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ActReasonEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ActReasonEnumFactory.java index 7a71b00dc..b0135576a 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ActReasonEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ActReasonEnumFactory.java @@ -570,7 +570,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"; @@ -1095,7 +1097,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ActRelationshipCheckpointEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ActRelationshipCheckpointEnumFactory.java index a3381e2bd..8679da610 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ActRelationshipCheckpointEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ActRelationshipCheckpointEnumFactory.java @@ -56,7 +56,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"; @@ -263,7 +265,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ActStatusEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ActStatusEnumFactory.java index 8cd331b53..8a7a851ad 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ActStatusEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ActStatusEnumFactory.java @@ -66,7 +66,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"; @@ -87,7 +89,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ActUSPrivacyLawEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ActUSPrivacyLawEnumFactory.java index e71224ae9..34ee2fcce 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ActUSPrivacyLawEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ActUSPrivacyLawEnumFactory.java @@ -60,7 +60,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"; @@ -123,7 +125,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3AdministrativeGenderEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3AdministrativeGenderEnumFactory.java index c0a41a1ab..85733cf3f 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3AdministrativeGenderEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3AdministrativeGenderEnumFactory.java @@ -52,14 +52,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"; @@ -119,7 +121,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3CalendarEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3CalendarEnumFactory.java index 17326b96e..250ff2b03 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3CalendarEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3CalendarEnumFactory.java @@ -48,10 +48,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3CalendarTypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3CalendarTypeEnumFactory.java index 4721bde22..2c4e3511c 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3CalendarTypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3CalendarTypeEnumFactory.java @@ -48,10 +48,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3CharsetEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3CharsetEnumFactory.java index 9b6f0d473..200ce0124 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3CharsetEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3CharsetEnumFactory.java @@ -66,7 +66,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"; @@ -87,7 +89,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3CodingRationaleEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3CodingRationaleEnumFactory.java index ae9a69b26..da6fd6711 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3CodingRationaleEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3CodingRationaleEnumFactory.java @@ -62,7 +62,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"; @@ -75,7 +77,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ContainerSeparatorEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ContainerSeparatorEnumFactory.java index d83fa7564..5d7706d33 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ContainerSeparatorEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ContainerSeparatorEnumFactory.java @@ -50,12 +50,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"; @@ -127,7 +129,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3DeviceAlertLevelEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3DeviceAlertLevelEnumFactory.java index a884c86fa..c873e51fc 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3DeviceAlertLevelEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3DeviceAlertLevelEnumFactory.java @@ -54,7 +54,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"; @@ -155,7 +157,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3EntityCodeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3EntityCodeEnumFactory.java index 205275bab..5ff700751 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3EntityCodeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3EntityCodeEnumFactory.java @@ -336,7 +336,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"; @@ -627,7 +629,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3EntityDeterminerEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3EntityDeterminerEnumFactory.java index dc65235b6..b7d22ddc6 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3EntityDeterminerEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3EntityDeterminerEnumFactory.java @@ -56,7 +56,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"; @@ -107,7 +109,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3EntityNameUseR2EnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3EntityNameUseR2EnumFactory.java index 71de39f93..7a8a70cbb 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3EntityNameUseR2EnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3EntityNameUseR2EnumFactory.java @@ -82,7 +82,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"; @@ -91,7 +93,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3EntityStatusEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3EntityStatusEnumFactory.java index 6b6854328..d80c1140c 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3EntityStatusEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3EntityStatusEnumFactory.java @@ -56,7 +56,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"; @@ -67,7 +69,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3EquipmentAlertLevelEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3EquipmentAlertLevelEnumFactory.java index 29777315a..43d534697 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3EquipmentAlertLevelEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3EquipmentAlertLevelEnumFactory.java @@ -54,7 +54,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"; @@ -219,7 +221,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ExposureModeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ExposureModeEnumFactory.java index 6fc91a10d..8a5d959fb 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ExposureModeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ExposureModeEnumFactory.java @@ -56,7 +56,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"; @@ -67,7 +69,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3GTSAbbreviationEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3GTSAbbreviationEnumFactory.java index 4494bba17..2165aab11 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3GTSAbbreviationEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3GTSAbbreviationEnumFactory.java @@ -120,7 +120,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3HL7UpdateModeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3HL7UpdateModeEnumFactory.java index a1cf3817b..ade922931 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3HL7UpdateModeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3HL7UpdateModeEnumFactory.java @@ -78,7 +78,9 @@ public class V3HL7UpdateModeEnumFactory 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"; @@ -111,7 +113,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3Hl7RealmEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3Hl7RealmEnumFactory.java index 6f31bd1e1..2afb4e978 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3Hl7RealmEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3Hl7RealmEnumFactory.java @@ -136,7 +136,9 @@ public class V3Hl7RealmEnumFactory 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"; @@ -227,7 +229,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3Hl7V3ConformanceEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3Hl7V3ConformanceEnumFactory.java index 2244d1bf6..28ba09c7d 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3Hl7V3ConformanceEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3Hl7V3ConformanceEnumFactory.java @@ -58,7 +58,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"; @@ -107,7 +109,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3IdentifierReliabilityEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3IdentifierReliabilityEnumFactory.java index ddf191f31..cb52cca32 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3IdentifierReliabilityEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3IdentifierReliabilityEnumFactory.java @@ -52,14 +52,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"; @@ -87,7 +89,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3MessageWaitingPriorityEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3MessageWaitingPriorityEnumFactory.java index f39294ffb..5c75b3aec 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3MessageWaitingPriorityEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3MessageWaitingPriorityEnumFactory.java @@ -52,14 +52,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"; @@ -115,7 +117,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ObservationInterpretationEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ObservationInterpretationEnumFactory.java index c72200c21..297bd62b6 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ObservationInterpretationEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ObservationInterpretationEnumFactory.java @@ -158,7 +158,9 @@ public class V3ObservationInterpretationEnumFactory 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"; @@ -63,7 +65,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3PersonDisabilityTypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3PersonDisabilityTypeEnumFactory.java index 7289ab3ee..ba7d1781e 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3PersonDisabilityTypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3PersonDisabilityTypeEnumFactory.java @@ -66,7 +66,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ProcessingModeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ProcessingModeEnumFactory.java index 63483a991..2149234ee 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ProcessingModeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ProcessingModeEnumFactory.java @@ -54,7 +54,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3QueryRequestLimitEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3QueryRequestLimitEnumFactory.java index 1806bda28..1f8f411a1 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3QueryRequestLimitEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3QueryRequestLimitEnumFactory.java @@ -50,12 +50,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"; @@ -63,7 +65,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3QueryStatusCodeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3QueryStatusCodeEnumFactory.java index 048f090e8..84226d306 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3QueryStatusCodeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3QueryStatusCodeEnumFactory.java @@ -56,7 +56,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"; @@ -3731,7 +3733,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3RelationalOperatorEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3RelationalOperatorEnumFactory.java index 3e28fa8b3..2ddb12efa 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3RelationalOperatorEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3RelationalOperatorEnumFactory.java @@ -62,7 +62,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"; @@ -75,7 +77,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ResponseModalityEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ResponseModalityEnumFactory.java index 00119556f..e127c65f6 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ResponseModalityEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3ResponseModalityEnumFactory.java @@ -52,14 +52,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3RoleClassEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3RoleClassEnumFactory.java index aa8c3b47a..3a62bfe25 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3RoleClassEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3RoleClassEnumFactory.java @@ -270,7 +270,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"; @@ -495,7 +497,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3RoleCodeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3RoleCodeEnumFactory.java index 9be0e0613..d3db5a0d5 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3RoleCodeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3RoleCodeEnumFactory.java @@ -840,7 +840,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"; @@ -1635,7 +1637,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3RoleLinkStatusEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3RoleLinkStatusEnumFactory.java index f43375408..6c29851bb 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3RoleLinkStatusEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3RoleLinkStatusEnumFactory.java @@ -58,7 +58,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"; @@ -79,7 +81,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3RoleStatusEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3RoleStatusEnumFactory.java index 2917991e6..113679a10 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3RoleStatusEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3RoleStatusEnumFactory.java @@ -60,7 +60,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"; @@ -75,7 +77,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3RouteOfAdministrationEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3RouteOfAdministrationEnumFactory.java index 49709d280..2c4850897 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3RouteOfAdministrationEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3RouteOfAdministrationEnumFactory.java @@ -818,7 +818,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3SetOperatorEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3SetOperatorEnumFactory.java index cd19f6d03..d670c5165 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3SetOperatorEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3SetOperatorEnumFactory.java @@ -58,7 +58,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"; @@ -71,7 +73,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3SpecimenTypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3SpecimenTypeEnumFactory.java index a3cda605e..d808e28ed 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3SpecimenTypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3SpecimenTypeEnumFactory.java @@ -294,7 +294,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"; @@ -543,7 +545,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3SubstanceAdminSubstitutionEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3SubstanceAdminSubstitutionEnumFactory.java index 7771f1203..19b21b1df 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3SubstanceAdminSubstitutionEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3SubstanceAdminSubstitutionEnumFactory.java @@ -66,7 +66,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"; @@ -83,7 +85,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3TableRulesEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3TableRulesEnumFactory.java index 851d5342d..6e40cdeb7 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3TableRulesEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3TableRulesEnumFactory.java @@ -56,7 +56,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"; @@ -67,7 +69,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3TargetAwarenessEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3TargetAwarenessEnumFactory.java index ccd572c8d..2475fcb5a 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3TargetAwarenessEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3TargetAwarenessEnumFactory.java @@ -58,7 +58,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"; @@ -119,7 +121,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3TransmissionRelationshipTypeCodeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3TransmissionRelationshipTypeCodeEnumFactory.java index c426cf6bc..d6e8f9bc7 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3TransmissionRelationshipTypeCodeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3TransmissionRelationshipTypeCodeEnumFactory.java @@ -48,10 +48,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3TribalEntityUSEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3TribalEntityUSEnumFactory.java index 2a473d783..46bb65892 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3TribalEntityUSEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/V3TribalEntityUSEnumFactory.java @@ -1182,7 +1182,9 @@ public class V3TribalEntityUSEnumFactory implements EnumFactory { } public String toCode(ValueCodes code) { - if (code == ValueCodes._1001) + if (code == ValueCodes.NULL) + return null; + if (code == ValueCodes._1001) return "1001"; if (code == ValueCodes._1002) return "1002"; return "?"; - } + } public String toSystem(ValueCodes code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/VariantStateEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/VariantStateEnumFactory.java index ce7222c8f..9e246f560 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/VariantStateEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/VariantStateEnumFactory.java @@ -52,14 +52,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/VersioningPolicyEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/VersioningPolicyEnumFactory.java index e88dd894b..a9502406e 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/VersioningPolicyEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/VersioningPolicyEnumFactory.java @@ -52,14 +52,16 @@ public class VersioningPolicyEnumFactory 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"; @@ -63,7 +65,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/VisionEyeCodesEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/VisionEyeCodesEnumFactory.java index c65034da8..89bd4aefd 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/VisionEyeCodesEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/VisionEyeCodesEnumFactory.java @@ -50,12 +50,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/VisionProductEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/VisionProductEnumFactory.java index 852b5c201..b8060578e 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/VisionProductEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/VisionProductEnumFactory.java @@ -50,12 +50,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.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/VisionStatusEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/VisionStatusEnumFactory.java index 149473c17..43d8400c0 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/VisionStatusEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/VisionStatusEnumFactory.java @@ -54,7 +54,9 @@ public class VisionStatusEnumFactory implements EnumFactory { } 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"; @@ -63,7 +65,7 @@ public class VisionStatusEnumFactory implements EnumFactory { if (code == VisionStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(VisionStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/W3cProvenanceActivityTypeEnumFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/W3cProvenanceActivityTypeEnumFactory.java index ec0698151..e2ed6e756 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/W3cProvenanceActivityTypeEnumFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/W3cProvenanceActivityTypeEnumFactory.java @@ -70,7 +70,9 @@ public class W3cProvenanceActivityTypeEnumFactory implements EnumFactory