diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Account.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Account.java index 92fa9a25e..ca92ab2fb 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Account.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Account.java @@ -152,12 +152,14 @@ public class Account extends DomainResource { } public String toCode(AccountStatus code) { - if (code == AccountStatus.ACTIVE) + if (code == AccountStatus.NULL) + return null; + if (code == AccountStatus.ACTIVE) return "active"; if (code == AccountStatus.INACTIVE) return "inactive"; return "?"; - } + } public String toSystem(AccountStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ActionDefinition.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ActionDefinition.java index 99f058429..2569df318 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ActionDefinition.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ActionDefinition.java @@ -154,12 +154,14 @@ public class ActionDefinition extends Type implements ICompositeType { } public String toCode(ActionRelationshipType code) { - if (code == ActionRelationshipType.BEFORE) + if (code == ActionRelationshipType.NULL) + return null; + if (code == ActionRelationshipType.BEFORE) return "before"; if (code == ActionRelationshipType.AFTER) return "after"; return "?"; - } + } public String toSystem(ActionRelationshipType code) { return code.getSystem(); @@ -269,12 +271,14 @@ public class ActionDefinition extends Type implements ICompositeType { } public String toCode(ActionRelationshipAnchor code) { - if (code == ActionRelationshipAnchor.START) + if (code == ActionRelationshipAnchor.NULL) + return null; + if (code == ActionRelationshipAnchor.START) return "start"; if (code == ActionRelationshipAnchor.END) return "end"; return "?"; - } + } public String toSystem(ActionRelationshipAnchor code) { return code.getSystem(); @@ -402,14 +406,16 @@ public class ActionDefinition extends Type implements ICompositeType { } public String toCode(ParticipantType code) { - if (code == ParticipantType.PATIENT) + if (code == ParticipantType.NULL) + return null; + if (code == ParticipantType.PATIENT) return "patient"; if (code == ParticipantType.PRACTITIONER) return "practitioner"; if (code == ParticipantType.RELATEDPERSON) return "related-person"; return "?"; - } + } public String toSystem(ParticipantType code) { return code.getSystem(); @@ -555,7 +561,9 @@ public class ActionDefinition extends Type implements ICompositeType { } 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"; @@ -564,7 +572,7 @@ public class ActionDefinition extends Type implements ICompositeType { if (code == ActionType.FIREEVENT) return "fire-event"; return "?"; - } + } public String toSystem(ActionType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Address.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Address.java index 66f09586d..65e7099d2 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Address.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Address.java @@ -192,7 +192,9 @@ public class Address extends Type implements ICompositeType { } public String toCode(AddressUse code) { - if (code == AddressUse.HOME) + if (code == AddressUse.NULL) + return null; + if (code == AddressUse.HOME) return "home"; if (code == AddressUse.WORK) return "work"; @@ -201,7 +203,7 @@ public class Address extends Type implements ICompositeType { if (code == AddressUse.OLD) return "old"; return "?"; - } + } public String toSystem(AddressUse code) { return code.getSystem(); @@ -329,14 +331,16 @@ public class Address extends Type implements ICompositeType { } public String toCode(AddressType code) { - if (code == AddressType.POSTAL) + if (code == AddressType.NULL) + return null; + if (code == AddressType.POSTAL) return "postal"; if (code == AddressType.PHYSICAL) return "physical"; if (code == AddressType.BOTH) return "both"; return "?"; - } + } public String toSystem(AddressType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/AllergyIntolerance.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/AllergyIntolerance.java index 31fa41e19..545dbf497 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/AllergyIntolerance.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/AllergyIntolerance.java @@ -250,7 +250,9 @@ public class AllergyIntolerance extends DomainResource { } public String toCode(AllergyIntoleranceStatus code) { - if (code == AllergyIntoleranceStatus.ACTIVE) + if (code == AllergyIntoleranceStatus.NULL) + return null; + if (code == AllergyIntoleranceStatus.ACTIVE) return "active"; if (code == AllergyIntoleranceStatus.UNCONFIRMED) return "unconfirmed"; @@ -265,7 +267,7 @@ public class AllergyIntolerance extends DomainResource { if (code == AllergyIntoleranceStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(AllergyIntoleranceStatus code) { return code.getSystem(); @@ -381,12 +383,14 @@ public class AllergyIntolerance extends DomainResource { } public String toCode(AllergyIntoleranceType code) { - if (code == AllergyIntoleranceType.ALLERGY) + if (code == AllergyIntoleranceType.NULL) + return null; + if (code == AllergyIntoleranceType.ALLERGY) return "allergy"; if (code == AllergyIntoleranceType.INTOLERANCE) return "intolerance"; return "?"; - } + } public String toSystem(AllergyIntoleranceType code) { return code.getSystem(); @@ -532,7 +536,9 @@ public class AllergyIntolerance extends DomainResource { } public String toCode(AllergyIntoleranceCategory code) { - if (code == AllergyIntoleranceCategory.FOOD) + if (code == AllergyIntoleranceCategory.NULL) + return null; + if (code == AllergyIntoleranceCategory.FOOD) return "food"; if (code == AllergyIntoleranceCategory.MEDICATION) return "medication"; @@ -541,7 +547,7 @@ public class AllergyIntolerance extends DomainResource { if (code == AllergyIntoleranceCategory.OTHER) return "other"; return "?"; - } + } public String toSystem(AllergyIntoleranceCategory code) { return code.getSystem(); @@ -671,14 +677,16 @@ public class AllergyIntolerance extends DomainResource { } public String toCode(AllergyIntoleranceCriticality code) { - if (code == AllergyIntoleranceCriticality.LOW) + if (code == AllergyIntoleranceCriticality.NULL) + return null; + if (code == AllergyIntoleranceCriticality.LOW) return "low"; if (code == AllergyIntoleranceCriticality.HIGH) return "high"; if (code == AllergyIntoleranceCriticality.UNABLETOASSESS) return "unable-to-assess"; return "?"; - } + } public String toSystem(AllergyIntoleranceCriticality code) { return code.getSystem(); @@ -810,14 +818,16 @@ public class AllergyIntolerance extends DomainResource { } public String toCode(AllergyIntoleranceCertainty code) { - if (code == AllergyIntoleranceCertainty.UNLIKELY) + if (code == AllergyIntoleranceCertainty.NULL) + return null; + if (code == AllergyIntoleranceCertainty.UNLIKELY) return "unlikely"; if (code == AllergyIntoleranceCertainty.LIKELY) return "likely"; if (code == AllergyIntoleranceCertainty.CONFIRMED) return "confirmed"; return "?"; - } + } public String toSystem(AllergyIntoleranceCertainty code) { return code.getSystem(); @@ -945,14 +955,16 @@ public class AllergyIntolerance extends DomainResource { } public String toCode(AllergyIntoleranceSeverity code) { - if (code == AllergyIntoleranceSeverity.MILD) + if (code == AllergyIntoleranceSeverity.NULL) + return null; + if (code == AllergyIntoleranceSeverity.MILD) return "mild"; if (code == AllergyIntoleranceSeverity.MODERATE) return "moderate"; if (code == AllergyIntoleranceSeverity.SEVERE) return "severe"; return "?"; - } + } public String toSystem(AllergyIntoleranceSeverity code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Appointment.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Appointment.java index a6ca5a65d..e69dccc30 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Appointment.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Appointment.java @@ -249,7 +249,9 @@ public class Appointment extends DomainResource { } public String toCode(AppointmentStatus code) { - if (code == AppointmentStatus.PROPOSED) + if (code == AppointmentStatus.NULL) + return null; + if (code == AppointmentStatus.PROPOSED) return "proposed"; if (code == AppointmentStatus.PENDING) return "pending"; @@ -264,7 +266,7 @@ public class Appointment extends DomainResource { if (code == AppointmentStatus.NOSHOW) return "noshow"; return "?"; - } + } public String toSystem(AppointmentStatus code) { return code.getSystem(); @@ -394,14 +396,16 @@ public class Appointment extends DomainResource { } public String toCode(ParticipantRequired code) { - if (code == ParticipantRequired.REQUIRED) + if (code == ParticipantRequired.NULL) + return null; + if (code == ParticipantRequired.REQUIRED) return "required"; if (code == ParticipantRequired.OPTIONAL) return "optional"; if (code == ParticipantRequired.INFORMATIONONLY) return "information-only"; return "?"; - } + } public String toSystem(ParticipantRequired code) { return code.getSystem(); @@ -551,7 +555,9 @@ public class Appointment extends DomainResource { } public String toCode(ParticipationStatus code) { - if (code == ParticipationStatus.ACCEPTED) + if (code == ParticipationStatus.NULL) + return null; + if (code == ParticipationStatus.ACCEPTED) return "accepted"; if (code == ParticipationStatus.DECLINED) return "declined"; @@ -560,7 +566,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/AuditEvent.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/AuditEvent.java index d9b85909f..777f0c34b 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/AuditEvent.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/AuditEvent.java @@ -210,7 +210,9 @@ public class AuditEvent extends DomainResource { } public String toCode(AuditEventAction code) { - if (code == AuditEventAction.C) + if (code == AuditEventAction.NULL) + return null; + if (code == AuditEventAction.C) return "C"; if (code == AuditEventAction.R) return "R"; @@ -221,7 +223,7 @@ public class AuditEvent extends DomainResource { if (code == AuditEventAction.E) return "E"; return "?"; - } + } public String toSystem(AuditEventAction code) { return code.getSystem(); @@ -370,7 +372,9 @@ public class AuditEvent extends DomainResource { } public String toCode(AuditEventOutcome code) { - if (code == AuditEventOutcome._0) + if (code == AuditEventOutcome.NULL) + return null; + if (code == AuditEventOutcome._0) return "0"; if (code == AuditEventOutcome._4) return "4"; @@ -379,7 +383,7 @@ public class AuditEvent extends DomainResource { if (code == AuditEventOutcome._12) return "12"; return "?"; - } + } public String toSystem(AuditEventOutcome code) { return code.getSystem(); @@ -544,7 +548,9 @@ public class AuditEvent extends DomainResource { } public String toCode(AuditEventParticipantNetworkType code) { - if (code == AuditEventParticipantNetworkType._1) + if (code == AuditEventParticipantNetworkType.NULL) + return null; + if (code == AuditEventParticipantNetworkType._1) return "1"; if (code == AuditEventParticipantNetworkType._2) return "2"; @@ -555,7 +561,7 @@ public class AuditEvent extends DomainResource { if (code == AuditEventParticipantNetworkType._5) return "5"; return "?"; - } + } public String toSystem(AuditEventParticipantNetworkType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Bundle.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Bundle.java index 8ba653edc..aa26e7280 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Bundle.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Bundle.java @@ -288,7 +288,9 @@ public class Bundle extends Resource implements IBaseBundle { } public String toCode(BundleType code) { - if (code == BundleType.DOCUMENT) + if (code == BundleType.NULL) + return null; + if (code == BundleType.DOCUMENT) return "document"; if (code == BundleType.MESSAGE) return "message"; @@ -307,7 +309,7 @@ public class Bundle extends Resource implements IBaseBundle { if (code == BundleType.COLLECTION) return "collection"; return "?"; - } + } public String toSystem(BundleType code) { return code.getSystem(); @@ -437,14 +439,16 @@ public class Bundle extends Resource implements IBaseBundle { } public String toCode(SearchEntryMode code) { - if (code == SearchEntryMode.MATCH) + if (code == SearchEntryMode.NULL) + return null; + if (code == SearchEntryMode.MATCH) return "match"; if (code == SearchEntryMode.INCLUDE) return "include"; if (code == SearchEntryMode.OUTCOME) return "outcome"; return "?"; - } + } public String toSystem(SearchEntryMode code) { return code.getSystem(); @@ -590,7 +594,9 @@ public class Bundle extends Resource implements IBaseBundle { } public String toCode(HTTPVerb code) { - if (code == HTTPVerb.GET) + if (code == HTTPVerb.NULL) + return null; + if (code == HTTPVerb.GET) return "GET"; if (code == HTTPVerb.POST) return "POST"; @@ -599,7 +605,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/CarePlan.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/CarePlan.java index 775a350c0..b67c5d86f 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/CarePlan.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/CarePlan.java @@ -212,7 +212,9 @@ public class CarePlan extends DomainResource { } public String toCode(CarePlanStatus code) { - if (code == CarePlanStatus.PROPOSED) + if (code == CarePlanStatus.NULL) + return null; + if (code == CarePlanStatus.PROPOSED) return "proposed"; if (code == CarePlanStatus.DRAFT) return "draft"; @@ -223,7 +225,7 @@ public class CarePlan extends DomainResource { if (code == CarePlanStatus.CANCELLED) return "cancelled"; return "?"; - } + } public String toSystem(CarePlanStatus code) { return code.getSystem(); @@ -352,14 +354,16 @@ public class CarePlan extends DomainResource { } public String toCode(CarePlanRelationship code) { - if (code == CarePlanRelationship.INCLUDES) + if (code == CarePlanRelationship.NULL) + return null; + if (code == CarePlanRelationship.INCLUDES) return "includes"; if (code == CarePlanRelationship.REPLACES) return "replaces"; if (code == CarePlanRelationship.FULFILLS) return "fulfills"; return "?"; - } + } public String toSystem(CarePlanRelationship code) { return code.getSystem(); @@ -543,7 +547,9 @@ public class CarePlan extends DomainResource { } public String toCode(CarePlanActivityStatus code) { - if (code == CarePlanActivityStatus.NOTSTARTED) + if (code == CarePlanActivityStatus.NULL) + return null; + if (code == CarePlanActivityStatus.NOTSTARTED) return "not-started"; if (code == CarePlanActivityStatus.SCHEDULED) return "scheduled"; @@ -556,7 +562,7 @@ public class CarePlan extends DomainResource { if (code == CarePlanActivityStatus.CANCELLED) return "cancelled"; return "?"; - } + } public String toSystem(CarePlanActivityStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Claim.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Claim.java index 3c7c851b8..7566f8746 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Claim.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Claim.java @@ -211,7 +211,9 @@ public class Claim extends DomainResource { } 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"; @@ -222,7 +224,7 @@ public class Claim extends DomainResource { if (code == ClaimType.VISION) return "vision"; return "?"; - } + } public String toSystem(ClaimType code) { return code.getSystem(); @@ -370,7 +372,9 @@ public class Claim extends DomainResource { } 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"; @@ -379,7 +383,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ClinicalImpression.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ClinicalImpression.java index e8b505457..1f911a904 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ClinicalImpression.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ClinicalImpression.java @@ -178,14 +178,16 @@ public class ClinicalImpression extends DomainResource { } public String toCode(ClinicalImpressionStatus code) { - if (code == ClinicalImpressionStatus.INPROGRESS) + if (code == ClinicalImpressionStatus.NULL) + return null; + if (code == ClinicalImpressionStatus.INPROGRESS) return "in-progress"; if (code == ClinicalImpressionStatus.COMPLETED) return "completed"; if (code == ClinicalImpressionStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(ClinicalImpressionStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/CodeSystem.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/CodeSystem.java index 06abb52e5..c85d9a41f 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/CodeSystem.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/CodeSystem.java @@ -194,7 +194,9 @@ public class CodeSystem extends DomainResource { } 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.EXAMPLAR) return "examplar"; @@ -203,7 +205,7 @@ public class CodeSystem extends DomainResource { if (code == CodeSystemContentMode.COMPLETE) return "complete"; return "?"; - } + } public String toSystem(CodeSystemContentMode code) { return code.getSystem(); @@ -388,7 +390,9 @@ public class CodeSystem extends DomainResource { } 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"; @@ -401,7 +405,7 @@ public class CodeSystem extends DomainResource { if (code == PropertyType.DATETIME) return "dateTime"; return "?"; - } + } public String toSystem(PropertyType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Communication.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Communication.java index 29daff78b..d6ce9e7c6 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Communication.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Communication.java @@ -210,7 +210,9 @@ public class Communication extends DomainResource { } public String toCode(CommunicationStatus code) { - if (code == CommunicationStatus.INPROGRESS) + if (code == CommunicationStatus.NULL) + return null; + if (code == CommunicationStatus.INPROGRESS) return "in-progress"; if (code == CommunicationStatus.COMPLETED) return "completed"; @@ -221,7 +223,7 @@ public class Communication extends DomainResource { if (code == CommunicationStatus.FAILED) return "failed"; return "?"; - } + } public String toSystem(CommunicationStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/CommunicationRequest.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/CommunicationRequest.java index aea7ac9a7..b352badeb 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/CommunicationRequest.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/CommunicationRequest.java @@ -301,7 +301,9 @@ public class CommunicationRequest extends DomainResource { } public String toCode(CommunicationRequestStatus code) { - if (code == CommunicationRequestStatus.PROPOSED) + if (code == CommunicationRequestStatus.NULL) + return null; + if (code == CommunicationRequestStatus.PROPOSED) return "proposed"; if (code == CommunicationRequestStatus.PLANNED) return "planned"; @@ -322,7 +324,7 @@ public class CommunicationRequest extends DomainResource { if (code == CommunicationRequestStatus.FAILED) return "failed"; return "?"; - } + } public String toSystem(CommunicationRequestStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/CompartmentDefinition.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/CompartmentDefinition.java index 74ae51935..dfa7b9f55 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/CompartmentDefinition.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/CompartmentDefinition.java @@ -209,7 +209,9 @@ public class CompartmentDefinition extends DomainResource { } 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"; @@ -220,7 +222,7 @@ public class CompartmentDefinition extends DomainResource { if (code == CompartmentType.DEVICE) return "Device"; return "?"; - } + } public String toSystem(CompartmentType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Composition.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Composition.java index 006cd5554..d2e31d9af 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Composition.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Composition.java @@ -202,7 +202,9 @@ public class Composition extends DomainResource { } public String toCode(CompositionStatus code) { - if (code == CompositionStatus.PRELIMINARY) + if (code == CompositionStatus.NULL) + return null; + if (code == CompositionStatus.PRELIMINARY) return "preliminary"; if (code == CompositionStatus.FINAL) return "final"; @@ -211,7 +213,7 @@ public class Composition extends DomainResource { if (code == CompositionStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(CompositionStatus code) { return code.getSystem(); @@ -359,7 +361,9 @@ public class Composition extends DomainResource { } public String toCode(CompositionAttestationMode code) { - if (code == CompositionAttestationMode.PERSONAL) + if (code == CompositionAttestationMode.NULL) + return null; + if (code == CompositionAttestationMode.PERSONAL) return "personal"; if (code == CompositionAttestationMode.PROFESSIONAL) return "professional"; @@ -368,7 +372,7 @@ public class Composition extends DomainResource { if (code == CompositionAttestationMode.OFFICIAL) return "official"; return "?"; - } + } public String toSystem(CompositionAttestationMode code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Condition.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Condition.java index 712c04966..6db652593 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Condition.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Condition.java @@ -233,7 +233,9 @@ public class Condition extends DomainResource { } 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"; @@ -246,7 +248,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Conformance.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Conformance.java index 86e8e0506..7adaea573 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Conformance.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Conformance.java @@ -182,14 +182,16 @@ public class Conformance extends DomainResource implements IBaseConformance { } public String toCode(ConformanceStatementKind code) { - if (code == ConformanceStatementKind.INSTANCE) + if (code == ConformanceStatementKind.NULL) + return null; + if (code == ConformanceStatementKind.INSTANCE) return "instance"; if (code == ConformanceStatementKind.CAPABILITY) return "capability"; if (code == ConformanceStatementKind.REQUIREMENTS) return "requirements"; return "?"; - } + } public String toSystem(ConformanceStatementKind code) { return code.getSystem(); @@ -335,7 +337,9 @@ public class Conformance extends DomainResource implements IBaseConformance { } 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"; @@ -344,7 +348,7 @@ public class Conformance extends DomainResource implements IBaseConformance { if (code == UnknownContentCode.BOTH) return "both"; return "?"; - } + } public String toSystem(UnknownContentCode code) { return code.getSystem(); @@ -454,12 +458,14 @@ public class Conformance extends DomainResource implements IBaseConformance { } public String toCode(RestfulConformanceMode code) { - if (code == RestfulConformanceMode.CLIENT) + if (code == RestfulConformanceMode.NULL) + return null; + if (code == RestfulConformanceMode.CLIENT) return "client"; if (code == RestfulConformanceMode.SERVER) return "server"; return "?"; - } + } public String toSystem(RestfulConformanceMode code) { return code.getSystem(); @@ -677,7 +683,9 @@ public class Conformance extends DomainResource implements IBaseConformance { } 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"; @@ -694,7 +702,7 @@ public class Conformance extends DomainResource implements IBaseConformance { if (code == TypeRestfulInteraction.SEARCHTYPE) return "search-type"; return "?"; - } + } public String toSystem(TypeRestfulInteraction code) { return code.getSystem(); @@ -823,14 +831,16 @@ public class Conformance extends DomainResource implements IBaseConformance { } 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(); @@ -959,14 +969,16 @@ public class Conformance extends DomainResource implements IBaseConformance { } 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(); @@ -1231,7 +1243,9 @@ public class Conformance extends DomainResource implements IBaseConformance { } 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"; @@ -1252,7 +1266,7 @@ public class Conformance extends DomainResource implements IBaseConformance { if (code == SearchModifierCode.TYPE) return "type"; return "?"; - } + } public String toSystem(SearchModifierCode code) { return code.getSystem(); @@ -1380,14 +1394,16 @@ public class Conformance extends DomainResource implements IBaseConformance { } public String toCode(SystemRestfulInteraction code) { - if (code == SystemRestfulInteraction.TRANSACTION) + if (code == SystemRestfulInteraction.NULL) + return null; + if (code == SystemRestfulInteraction.TRANSACTION) return "transaction"; if (code == SystemRestfulInteraction.SEARCHSYSTEM) return "search-system"; if (code == SystemRestfulInteraction.HISTORYSYSTEM) return "history-system"; return "?"; - } + } public String toSystem(SystemRestfulInteraction code) { return code.getSystem(); @@ -1533,7 +1549,9 @@ public class Conformance extends DomainResource implements IBaseConformance { } 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"; @@ -1542,7 +1560,7 @@ public class Conformance extends DomainResource implements IBaseConformance { if (code == TransactionMode.BOTH) return "both"; return "?"; - } + } public String toSystem(TransactionMode code) { return code.getSystem(); @@ -1674,14 +1692,16 @@ public class Conformance extends DomainResource implements IBaseConformance { } 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(); @@ -1791,12 +1811,14 @@ public class Conformance extends DomainResource implements IBaseConformance { } public String toCode(ConformanceEventMode code) { - if (code == ConformanceEventMode.SENDER) + if (code == ConformanceEventMode.NULL) + return null; + if (code == ConformanceEventMode.SENDER) return "sender"; if (code == ConformanceEventMode.RECEIVER) return "receiver"; return "?"; - } + } public String toSystem(ConformanceEventMode code) { return code.getSystem(); @@ -1906,12 +1928,14 @@ public class Conformance extends DomainResource implements IBaseConformance { } 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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ContactPoint.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ContactPoint.java index ebe3089d7..8b26ef38a 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ContactPoint.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ContactPoint.java @@ -211,7 +211,9 @@ public class ContactPoint extends Type implements ICompositeType { } public String toCode(ContactPointSystem code) { - if (code == ContactPointSystem.PHONE) + if (code == ContactPointSystem.NULL) + return null; + if (code == ContactPointSystem.PHONE) return "phone"; if (code == ContactPointSystem.FAX) return "fax"; @@ -222,7 +224,7 @@ public class ContactPoint extends Type implements ICompositeType { if (code == ContactPointSystem.OTHER) return "other"; return "?"; - } + } public String toSystem(ContactPointSystem code) { return code.getSystem(); @@ -393,7 +395,9 @@ public class ContactPoint extends Type implements ICompositeType { } public String toCode(ContactPointUse code) { - if (code == ContactPointUse.HOME) + if (code == ContactPointUse.NULL) + return null; + if (code == ContactPointUse.HOME) return "home"; if (code == ContactPointUse.WORK) return "work"; @@ -404,7 +408,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/DataElement.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/DataElement.java index 5e8a085a1..13e8310b4 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/DataElement.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/DataElement.java @@ -240,7 +240,9 @@ public class DataElement extends DomainResource { } 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"; @@ -253,7 +255,7 @@ public class DataElement extends DomainResource { if (code == DataElementStringency.FLEXIBLE) return "flexible"; return "?"; - } + } public String toSystem(DataElementStringency code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/DetectedIssue.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/DetectedIssue.java index c546ad6ee..7d5275e95 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/DetectedIssue.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/DetectedIssue.java @@ -177,14 +177,16 @@ public class DetectedIssue extends DomainResource { } public String toCode(DetectedIssueSeverity code) { - if (code == DetectedIssueSeverity.HIGH) + if (code == DetectedIssueSeverity.NULL) + return null; + if (code == DetectedIssueSeverity.HIGH) return "high"; if (code == DetectedIssueSeverity.MODERATE) return "moderate"; if (code == DetectedIssueSeverity.LOW) return "low"; return "?"; - } + } public String toSystem(DetectedIssueSeverity code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Device.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Device.java index 3e2921969..968be62c9 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Device.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Device.java @@ -175,14 +175,16 @@ public class Device extends DomainResource { } public String toCode(DeviceStatus code) { - if (code == DeviceStatus.AVAILABLE) + if (code == DeviceStatus.NULL) + return null; + if (code == DeviceStatus.AVAILABLE) return "available"; if (code == DeviceStatus.NOTAVAILABLE) return "not-available"; if (code == DeviceStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(DeviceStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/DeviceComponent.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/DeviceComponent.java index e93f3a8bf..55dcf2f71 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/DeviceComponent.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/DeviceComponent.java @@ -316,7 +316,9 @@ public class DeviceComponent extends DomainResource { } 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"; @@ -339,7 +341,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/DeviceMetric.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/DeviceMetric.java index 7e73972d3..f4fef4eb9 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/DeviceMetric.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/DeviceMetric.java @@ -171,14 +171,16 @@ public class DeviceMetric extends DomainResource { } public String toCode(DeviceMetricOperationalStatus code) { - if (code == DeviceMetricOperationalStatus.ON) + if (code == DeviceMetricOperationalStatus.NULL) + return null; + if (code == DeviceMetricOperationalStatus.ON) return "on"; if (code == DeviceMetricOperationalStatus.OFF) return "off"; if (code == DeviceMetricOperationalStatus.STANDBY) return "standby"; return "?"; - } + } public String toSystem(DeviceMetricOperationalStatus code) { return code.getSystem(); @@ -396,7 +398,9 @@ public class DeviceMetric extends DomainResource { } public String toCode(DeviceMetricColor code) { - if (code == DeviceMetricColor.BLACK) + if (code == DeviceMetricColor.NULL) + return null; + if (code == DeviceMetricColor.BLACK) return "black"; if (code == DeviceMetricColor.RED) return "red"; @@ -413,7 +417,7 @@ public class DeviceMetric extends DomainResource { if (code == DeviceMetricColor.WHITE) return "white"; return "?"; - } + } public String toSystem(DeviceMetricColor code) { return code.getSystem(); @@ -560,7 +564,9 @@ public class DeviceMetric extends DomainResource { } public String toCode(DeviceMetricCategory code) { - if (code == DeviceMetricCategory.MEASUREMENT) + if (code == DeviceMetricCategory.NULL) + return null; + if (code == DeviceMetricCategory.MEASUREMENT) return "measurement"; if (code == DeviceMetricCategory.SETTING) return "setting"; @@ -569,7 +575,7 @@ public class DeviceMetric extends DomainResource { if (code == DeviceMetricCategory.UNSPECIFIED) return "unspecified"; return "?"; - } + } public String toSystem(DeviceMetricCategory code) { return code.getSystem(); @@ -715,7 +721,9 @@ public class DeviceMetric extends DomainResource { } public String toCode(DeviceMetricCalibrationType code) { - if (code == DeviceMetricCalibrationType.UNSPECIFIED) + if (code == DeviceMetricCalibrationType.NULL) + return null; + if (code == DeviceMetricCalibrationType.UNSPECIFIED) return "unspecified"; if (code == DeviceMetricCalibrationType.OFFSET) return "offset"; @@ -724,7 +732,7 @@ public class DeviceMetric extends DomainResource { if (code == DeviceMetricCalibrationType.TWOPOINT) return "two-point"; return "?"; - } + } public String toSystem(DeviceMetricCalibrationType code) { return code.getSystem(); @@ -870,7 +878,9 @@ public class DeviceMetric extends DomainResource { } public String toCode(DeviceMetricCalibrationState code) { - if (code == DeviceMetricCalibrationState.NOTCALIBRATED) + if (code == DeviceMetricCalibrationState.NULL) + return null; + if (code == DeviceMetricCalibrationState.NOTCALIBRATED) return "not-calibrated"; if (code == DeviceMetricCalibrationState.CALIBRATIONREQUIRED) return "calibration-required"; @@ -879,7 +889,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/DeviceUseRequest.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/DeviceUseRequest.java index 76793efaf..2ff2f961d 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/DeviceUseRequest.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/DeviceUseRequest.java @@ -298,7 +298,9 @@ public class DeviceUseRequest extends DomainResource { } public String toCode(DeviceUseRequestStatus code) { - if (code == DeviceUseRequestStatus.PROPOSED) + if (code == DeviceUseRequestStatus.NULL) + return null; + if (code == DeviceUseRequestStatus.PROPOSED) return "proposed"; if (code == DeviceUseRequestStatus.PLANNED) return "planned"; @@ -319,7 +321,7 @@ public class DeviceUseRequest extends DomainResource { if (code == DeviceUseRequestStatus.ABORTED) return "aborted"; return "?"; - } + } public String toSystem(DeviceUseRequestStatus code) { return code.getSystem(); @@ -465,7 +467,9 @@ public class DeviceUseRequest extends DomainResource { } public String toCode(DeviceUseRequestPriority code) { - if (code == DeviceUseRequestPriority.ROUTINE) + if (code == DeviceUseRequestPriority.NULL) + return null; + if (code == DeviceUseRequestPriority.ROUTINE) return "routine"; if (code == DeviceUseRequestPriority.URGENT) return "urgent"; @@ -474,7 +478,7 @@ public class DeviceUseRequest extends DomainResource { if (code == DeviceUseRequestPriority.ASAP) return "asap"; return "?"; - } + } public String toSystem(DeviceUseRequestPriority code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/DiagnosticOrder.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/DiagnosticOrder.java index d343e1235..1de28592d 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/DiagnosticOrder.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/DiagnosticOrder.java @@ -371,7 +371,9 @@ public class DiagnosticOrder extends DomainResource { } public String toCode(DiagnosticOrderStatus code) { - if (code == DiagnosticOrderStatus.PROPOSED) + if (code == DiagnosticOrderStatus.NULL) + return null; + if (code == DiagnosticOrderStatus.PROPOSED) return "proposed"; if (code == DiagnosticOrderStatus.DRAFT) return "draft"; @@ -400,7 +402,7 @@ public class DiagnosticOrder extends DomainResource { if (code == DiagnosticOrderStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(DiagnosticOrderStatus code) { return code.getSystem(); @@ -546,7 +548,9 @@ public class DiagnosticOrder extends DomainResource { } public String toCode(DiagnosticOrderPriority code) { - if (code == DiagnosticOrderPriority.ROUTINE) + if (code == DiagnosticOrderPriority.NULL) + return null; + if (code == DiagnosticOrderPriority.ROUTINE) return "routine"; if (code == DiagnosticOrderPriority.URGENT) return "urgent"; @@ -555,7 +559,7 @@ public class DiagnosticOrder extends DomainResource { if (code == DiagnosticOrderPriority.ASAP) return "asap"; return "?"; - } + } public String toSystem(DiagnosticOrderPriority code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/DiagnosticReport.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/DiagnosticReport.java index 5898282ea..4282fbbb7 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/DiagnosticReport.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/DiagnosticReport.java @@ -253,7 +253,9 @@ public class DiagnosticReport extends DomainResource { } public String toCode(DiagnosticReportStatus code) { - if (code == DiagnosticReportStatus.REGISTERED) + if (code == DiagnosticReportStatus.NULL) + return null; + if (code == DiagnosticReportStatus.REGISTERED) return "registered"; if (code == DiagnosticReportStatus.PARTIAL) return "partial"; @@ -268,7 +270,7 @@ public class DiagnosticReport extends DomainResource { if (code == DiagnosticReportStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(DiagnosticReportStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/DocumentReference.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/DocumentReference.java index 762747d16..3369b341a 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/DocumentReference.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/DocumentReference.java @@ -192,7 +192,9 @@ public class DocumentReference extends DomainResource { } public String toCode(DocumentRelationshipType code) { - if (code == DocumentRelationshipType.REPLACES) + if (code == DocumentRelationshipType.NULL) + return null; + if (code == DocumentRelationshipType.REPLACES) return "replaces"; if (code == DocumentRelationshipType.TRANSFORMS) return "transforms"; @@ -201,7 +203,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ElementDefinition.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ElementDefinition.java index 3d30b8d9b..f7ba63dfd 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ElementDefinition.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ElementDefinition.java @@ -191,7 +191,9 @@ public class ElementDefinition extends Type implements ICompositeType { } public String toCode(PropertyRepresentation code) { - if (code == PropertyRepresentation.XMLATTR) + if (code == PropertyRepresentation.NULL) + return null; + if (code == PropertyRepresentation.XMLATTR) return "xmlAttr"; if (code == PropertyRepresentation.XMLTEXT) return "xmlText"; @@ -200,7 +202,7 @@ public class ElementDefinition extends Type implements ICompositeType { if (code == PropertyRepresentation.CDATEXT) return "cdaText"; return "?"; - } + } public String toSystem(PropertyRepresentation code) { return code.getSystem(); @@ -331,14 +333,16 @@ public class ElementDefinition extends Type implements ICompositeType { } public String toCode(SlicingRules code) { - if (code == SlicingRules.CLOSED) + if (code == SlicingRules.NULL) + return null; + if (code == SlicingRules.CLOSED) return "closed"; if (code == SlicingRules.OPEN) return "open"; if (code == SlicingRules.OPENATEND) return "openAtEnd"; return "?"; - } + } public String toSystem(SlicingRules code) { return code.getSystem(); @@ -468,14 +472,16 @@ public class ElementDefinition extends Type implements ICompositeType { } public String toCode(AggregationMode code) { - if (code == AggregationMode.CONTAINED) + if (code == AggregationMode.NULL) + return null; + if (code == AggregationMode.CONTAINED) return "contained"; if (code == AggregationMode.REFERENCED) return "referenced"; if (code == AggregationMode.BUNDLED) return "bundled"; return "?"; - } + } public String toSystem(AggregationMode code) { return code.getSystem(); @@ -603,14 +609,16 @@ public class ElementDefinition extends Type implements ICompositeType { } public String toCode(ReferenceVersionRules code) { - if (code == ReferenceVersionRules.EITHER) + if (code == ReferenceVersionRules.NULL) + return null; + if (code == ReferenceVersionRules.EITHER) return "either"; if (code == ReferenceVersionRules.INDEPENDENT) return "independent"; if (code == ReferenceVersionRules.SPECIFIC) return "specific"; return "?"; - } + } public String toSystem(ReferenceVersionRules code) { return code.getSystem(); @@ -721,12 +729,14 @@ public class ElementDefinition extends Type implements ICompositeType { } public String toCode(ConstraintSeverity code) { - if (code == ConstraintSeverity.ERROR) + if (code == ConstraintSeverity.NULL) + return null; + if (code == ConstraintSeverity.ERROR) return "error"; if (code == ConstraintSeverity.WARNING) return "warning"; return "?"; - } + } public String toSystem(ConstraintSeverity code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Encounter.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Encounter.java index 81bfc8b41..2afdcd8a5 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Encounter.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Encounter.java @@ -227,7 +227,9 @@ public class Encounter extends DomainResource { } public String toCode(EncounterState code) { - if (code == EncounterState.PLANNED) + if (code == EncounterState.NULL) + return null; + if (code == EncounterState.PLANNED) return "planned"; if (code == EncounterState.ARRIVED) return "arrived"; @@ -240,7 +242,7 @@ public class Encounter extends DomainResource { if (code == EncounterState.CANCELLED) return "cancelled"; return "?"; - } + } public String toSystem(EncounterState code) { return code.getSystem(); @@ -482,7 +484,9 @@ public class Encounter extends DomainResource { } public String toCode(EncounterClass code) { - if (code == EncounterClass.INPATIENT) + if (code == EncounterClass.NULL) + return null; + if (code == EncounterClass.INPATIENT) return "inpatient"; if (code == EncounterClass.OUTPATIENT) return "outpatient"; @@ -501,7 +505,7 @@ public class Encounter extends DomainResource { if (code == EncounterClass.OTHER) return "other"; return "?"; - } + } public String toSystem(EncounterClass code) { return code.getSystem(); @@ -654,7 +658,9 @@ public class Encounter extends DomainResource { } public String toCode(EncounterLocationStatus code) { - if (code == EncounterLocationStatus.PLANNED) + if (code == EncounterLocationStatus.NULL) + return null; + if (code == EncounterLocationStatus.PLANNED) return "planned"; if (code == EncounterLocationStatus.ACTIVE) return "active"; @@ -663,7 +669,7 @@ public class Encounter extends DomainResource { if (code == EncounterLocationStatus.COMPLETED) return "completed"; return "?"; - } + } public String toSystem(EncounterLocationStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Enumerations.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Enumerations.java index 4a0655fb3..670b0d407 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Enumerations.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Enumerations.java @@ -155,12 +155,14 @@ public class Enumerations { } public String toCode(AbstractType code) { - if (code == AbstractType.TYPE) + if (code == AbstractType.NULL) + return null; + if (code == AbstractType.TYPE) return "Type"; if (code == AbstractType.ANY) return "Any"; return "?"; - } + } public String toSystem(AbstractType code) { return code.getSystem(); @@ -306,7 +308,9 @@ public class Enumerations { } public String toCode(AdministrativeGender code) { - if (code == AdministrativeGender.MALE) + if (code == AdministrativeGender.NULL) + return null; + if (code == AdministrativeGender.MALE) return "male"; if (code == AdministrativeGender.FEMALE) return "female"; @@ -315,7 +319,7 @@ public class Enumerations { if (code == AdministrativeGender.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(AdministrativeGender code) { return code.getSystem(); @@ -497,7 +501,9 @@ public class Enumerations { } public String toCode(AgeUnits code) { - if (code == AgeUnits.MIN) + if (code == AgeUnits.NULL) + return null; + if (code == AgeUnits.MIN) return "min"; if (code == AgeUnits.H) return "h"; @@ -510,7 +516,7 @@ public class Enumerations { if (code == AgeUnits.A) return "a"; return "?"; - } + } public String toSystem(AgeUnits code) { return code.getSystem(); @@ -665,7 +671,9 @@ public class Enumerations { } public String toCode(BindingStrength code) { - if (code == BindingStrength.REQUIRED) + if (code == BindingStrength.NULL) + return null; + if (code == BindingStrength.REQUIRED) return "required"; if (code == BindingStrength.EXTENSIBLE) return "extensible"; @@ -674,7 +682,7 @@ public class Enumerations { if (code == BindingStrength.EXAMPLE) return "example"; return "?"; - } + } public String toSystem(BindingStrength code) { return code.getSystem(); @@ -925,7 +933,9 @@ public class Enumerations { } public String toCode(ConceptMapEquivalence code) { - if (code == ConceptMapEquivalence.EQUIVALENT) + if (code == ConceptMapEquivalence.NULL) + return null; + if (code == ConceptMapEquivalence.EQUIVALENT) return "equivalent"; if (code == ConceptMapEquivalence.EQUAL) return "equal"; @@ -944,7 +954,7 @@ public class Enumerations { if (code == ConceptMapEquivalence.DISJOINT) return "disjoint"; return "?"; - } + } public String toSystem(ConceptMapEquivalence code) { return code.getSystem(); @@ -1072,14 +1082,16 @@ public class Enumerations { } public String toCode(ConformanceResourceStatus code) { - if (code == ConformanceResourceStatus.DRAFT) + if (code == ConformanceResourceStatus.NULL) + return null; + if (code == ConformanceResourceStatus.DRAFT) return "draft"; if (code == ConformanceResourceStatus.ACTIVE) return "active"; if (code == ConformanceResourceStatus.RETIRED) return "retired"; return "?"; - } + } public String toSystem(ConformanceResourceStatus code) { return code.getSystem(); @@ -1318,7 +1330,9 @@ public class Enumerations { } public String toCode(DataAbsentReason code) { - if (code == DataAbsentReason.UNKNOWN) + if (code == DataAbsentReason.NULL) + return null; + if (code == DataAbsentReason.UNKNOWN) return "unknown"; if (code == DataAbsentReason.ASKED) return "asked"; @@ -1337,7 +1351,7 @@ public class Enumerations { if (code == DataAbsentReason.NAN) return "NaN"; return "?"; - } + } public String toSystem(DataAbsentReason code) { return code.getSystem(); @@ -2370,7 +2384,9 @@ public class Enumerations { } public String toCode(DataType code) { - if (code == DataType.ACTIONDEFINITION) + if (code == DataType.NULL) + return null; + if (code == DataType.ACTIONDEFINITION) return "ActionDefinition"; if (code == DataType.ADDRESS) return "Address"; @@ -2473,7 +2489,7 @@ public class Enumerations { if (code == DataType.XHTML) return "xhtml"; return "?"; - } + } public String toSystem(DataType code) { return code.getSystem(); @@ -2601,14 +2617,16 @@ public class Enumerations { } public String toCode(DocumentReferenceStatus code) { - if (code == DocumentReferenceStatus.CURRENT) + if (code == DocumentReferenceStatus.NULL) + return null; + if (code == DocumentReferenceStatus.CURRENT) return "current"; if (code == DocumentReferenceStatus.SUPERSEDED) return "superseded"; if (code == DocumentReferenceStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(DocumentReferenceStatus code) { return code.getSystem(); @@ -5957,7 +5975,9 @@ public class Enumerations { } public String toCode(FHIRAllTypes code) { - if (code == FHIRAllTypes.ACTIONDEFINITION) + if (code == FHIRAllTypes.NULL) + return null; + if (code == FHIRAllTypes.ACTIONDEFINITION) return "ActionDefinition"; if (code == FHIRAllTypes.ADDRESS) return "Address"; @@ -6294,7 +6314,7 @@ public class Enumerations { if (code == FHIRAllTypes.ANY) return "Any"; return "?"; - } + } public String toSystem(FHIRAllTypes code) { return code.getSystem(); @@ -9607,7 +9627,9 @@ public class Enumerations { } public String toCode(FHIRDefinedType code) { - if (code == FHIRDefinedType.ACTIONDEFINITION) + if (code == FHIRDefinedType.NULL) + return null; + if (code == FHIRDefinedType.ACTIONDEFINITION) return "ActionDefinition"; if (code == FHIRDefinedType.ADDRESS) return "Address"; @@ -9940,7 +9962,7 @@ public class Enumerations { if (code == FHIRDefinedType.VISIONPRESCRIPTION) return "VisionPrescription"; return "?"; - } + } public String toSystem(FHIRDefinedType code) { return code.getSystem(); @@ -10222,7 +10244,9 @@ public class Enumerations { } 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"; @@ -10245,7 +10269,7 @@ public class Enumerations { if (code == MessageEvent.VALUESETEXPAND) return "valueset-expand"; return "?"; - } + } public String toSystem(MessageEvent code) { return code.getSystem(); @@ -10373,14 +10397,16 @@ public class Enumerations { } public String toCode(NoteType code) { - if (code == NoteType.DISPLAY) + if (code == NoteType.NULL) + return null; + if (code == NoteType.DISPLAY) return "display"; if (code == NoteType.PRINT) return "print"; if (code == NoteType.PRINTOPER) return "printoper"; return "?"; - } + } public String toSystem(NoteType code) { return code.getSystem(); @@ -10490,12 +10516,14 @@ public class Enumerations { } 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"; return "?"; - } + } public String toSystem(RemittanceOutcome code) { return code.getSystem(); @@ -12849,7 +12877,9 @@ public class Enumerations { } public String toCode(ResourceType code) { - if (code == ResourceType.ACCOUNT) + if (code == ResourceType.NULL) + return null; + if (code == ResourceType.ACCOUNT) return "Account"; if (code == ResourceType.ALLERGYINTOLERANCE) return "AllergyIntolerance"; @@ -13080,7 +13110,7 @@ public class Enumerations { if (code == ResourceType.VISIONPRESCRIPTION) return "VisionPrescription"; return "?"; - } + } public String toSystem(ResourceType code) { return code.getSystem(); @@ -13305,7 +13335,9 @@ public class Enumerations { } public String toCode(SearchParamType code) { - if (code == SearchParamType.NUMBER) + if (code == SearchParamType.NULL) + return null; + if (code == SearchParamType.NUMBER) return "number"; if (code == SearchParamType.DATE) return "date"; @@ -13322,7 +13354,7 @@ public class Enumerations { if (code == SearchParamType.URI) return "uri"; return "?"; - } + } public String toSystem(SearchParamType code) { return code.getSystem(); @@ -13505,7 +13537,9 @@ public class Enumerations { } public String toCode(SpecialValues code) { - if (code == SpecialValues.TRUE) + if (code == SpecialValues.NULL) + return null; + if (code == SpecialValues.TRUE) return "true"; if (code == SpecialValues.FALSE) return "false"; @@ -13518,7 +13552,7 @@ public class Enumerations { if (code == SpecialValues.NILKNOWN) return "nil-known"; return "?"; - } + } public String toSystem(SpecialValues code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/EpisodeOfCare.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/EpisodeOfCare.java index aaffb54cd..2556d685e 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/EpisodeOfCare.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/EpisodeOfCare.java @@ -236,7 +236,9 @@ public class EpisodeOfCare extends DomainResource { } public String toCode(EpisodeOfCareStatus code) { - if (code == EpisodeOfCareStatus.PLANNED) + if (code == EpisodeOfCareStatus.NULL) + return null; + if (code == EpisodeOfCareStatus.PLANNED) return "planned"; if (code == EpisodeOfCareStatus.WAITLIST) return "waitlist"; @@ -249,7 +251,7 @@ public class EpisodeOfCare extends DomainResource { if (code == EpisodeOfCareStatus.CANCELLED) return "cancelled"; return "?"; - } + } public String toSystem(EpisodeOfCareStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/FamilyMemberHistory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/FamilyMemberHistory.java index 069ed8109..15b3a4132 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/FamilyMemberHistory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/FamilyMemberHistory.java @@ -193,7 +193,9 @@ public class FamilyMemberHistory extends DomainResource { } public String toCode(FamilyHistoryStatus code) { - if (code == FamilyHistoryStatus.PARTIAL) + if (code == FamilyHistoryStatus.NULL) + return null; + if (code == FamilyHistoryStatus.PARTIAL) return "partial"; if (code == FamilyHistoryStatus.COMPLETED) return "completed"; @@ -202,7 +204,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Flag.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Flag.java index 7e078656e..bc60485c4 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Flag.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Flag.java @@ -168,14 +168,16 @@ public class Flag extends DomainResource { } public String toCode(FlagStatus code) { - if (code == FlagStatus.ACTIVE) + if (code == FlagStatus.NULL) + return null; + if (code == FlagStatus.ACTIVE) return "active"; if (code == FlagStatus.INACTIVE) return "inactive"; if (code == FlagStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(FlagStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Goal.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Goal.java index c86adfadf..59bc7ecf1 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Goal.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Goal.java @@ -285,7 +285,9 @@ public class Goal extends DomainResource { } public String toCode(GoalStatus code) { - if (code == GoalStatus.PROPOSED) + if (code == GoalStatus.NULL) + return null; + if (code == GoalStatus.PROPOSED) return "proposed"; if (code == GoalStatus.PLANNED) return "planned"; @@ -304,7 +306,7 @@ public class Goal extends DomainResource { if (code == GoalStatus.CANCELLED) return "cancelled"; return "?"; - } + } public String toSystem(GoalStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Group.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Group.java index e3de17bf6..8f6a0ad47 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Group.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Group.java @@ -227,7 +227,9 @@ public class Group extends DomainResource { } public String toCode(GroupType code) { - if (code == GroupType.PERSON) + if (code == GroupType.NULL) + return null; + if (code == GroupType.PERSON) return "person"; if (code == GroupType.ANIMAL) return "animal"; @@ -240,7 +242,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/GuidanceResponse.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/GuidanceResponse.java index 064c6cb38..dd42379c7 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/GuidanceResponse.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/GuidanceResponse.java @@ -209,7 +209,9 @@ public class GuidanceResponse extends DomainResource { } public String toCode(GuidanceResponseStatus code) { - if (code == GuidanceResponseStatus.SUCCESS) + if (code == GuidanceResponseStatus.NULL) + return null; + if (code == GuidanceResponseStatus.SUCCESS) return "success"; if (code == GuidanceResponseStatus.DATAREQUESTED) return "data-requested"; @@ -220,7 +222,7 @@ public class GuidanceResponse extends DomainResource { if (code == GuidanceResponseStatus.FAILURE) return "failure"; return "?"; - } + } public String toSystem(GuidanceResponseStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/HealthcareService.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/HealthcareService.java index 818014db8..e07e67c6d 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/HealthcareService.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/HealthcareService.java @@ -242,7 +242,9 @@ public class HealthcareService extends DomainResource { } public String toCode(DaysOfWeek code) { - if (code == DaysOfWeek.MON) + if (code == DaysOfWeek.NULL) + return null; + if (code == DaysOfWeek.MON) return "mon"; if (code == DaysOfWeek.TUE) return "tue"; @@ -257,7 +259,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/HumanName.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/HumanName.java index b828ca4c5..042f871eb 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/HumanName.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/HumanName.java @@ -253,7 +253,9 @@ public class HumanName extends Type implements ICompositeType { } public String toCode(NameUse code) { - if (code == NameUse.USUAL) + if (code == NameUse.NULL) + return null; + if (code == NameUse.USUAL) return "usual"; if (code == NameUse.OFFICIAL) return "official"; @@ -268,7 +270,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Identifier.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Identifier.java index d68532fe3..22e5b950a 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Identifier.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Identifier.java @@ -188,7 +188,9 @@ public class Identifier extends Type implements ICompositeType { } public String toCode(IdentifierUse code) { - if (code == IdentifierUse.USUAL) + if (code == IdentifierUse.NULL) + return null; + if (code == IdentifierUse.USUAL) return "usual"; if (code == IdentifierUse.OFFICIAL) return "official"; @@ -197,7 +199,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ImagingExcerpt.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ImagingExcerpt.java index 467bef0e3..3518b46aa 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ImagingExcerpt.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ImagingExcerpt.java @@ -198,7 +198,9 @@ public class ImagingExcerpt extends DomainResource { } 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"; @@ -207,7 +209,7 @@ public class ImagingExcerpt extends DomainResource { if (code == DWebType.WADOWS) return "WADO-WS"; return "?"; - } + } public String toSystem(DWebType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ImagingStudy.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ImagingStudy.java index 53529a236..f8086df24 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ImagingStudy.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ImagingStudy.java @@ -193,7 +193,9 @@ public class ImagingStudy extends DomainResource { } 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"; @@ -202,7 +204,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ImplementationGuide.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ImplementationGuide.java index 25b9f0831..d8341c8e9 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ImplementationGuide.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ImplementationGuide.java @@ -157,12 +157,14 @@ public class ImplementationGuide extends DomainResource { } 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(); @@ -383,7 +385,9 @@ public class ImplementationGuide extends DomainResource { } 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"; @@ -400,7 +404,7 @@ public class ImplementationGuide extends DomainResource { if (code == GuidePageKind.RESOURCE) return "resource"; return "?"; - } + } public String toSystem(GuidePageKind code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Linkage.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Linkage.java index e78843865..deae2e2ef 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Linkage.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Linkage.java @@ -174,14 +174,16 @@ public class Linkage extends DomainResource { } public String toCode(LinkageType code) { - if (code == LinkageType.SOURCE) + if (code == LinkageType.NULL) + return null; + if (code == LinkageType.SOURCE) return "source"; if (code == LinkageType.ALTERNATE) return "alternate"; if (code == LinkageType.HISTORICAL) return "historical"; return "?"; - } + } public String toSystem(LinkageType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ListResource.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ListResource.java index 8af39ead4..3dd979372 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ListResource.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ListResource.java @@ -171,14 +171,16 @@ public class ListResource extends DomainResource { } public String toCode(ListStatus code) { - if (code == ListStatus.CURRENT) + if (code == ListStatus.NULL) + return null; + if (code == ListStatus.CURRENT) return "current"; if (code == ListStatus.RETIRED) return "retired"; if (code == ListStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(ListStatus code) { return code.getSystem(); @@ -307,14 +309,16 @@ public class ListResource extends DomainResource { } public String toCode(ListMode code) { - if (code == ListMode.WORKING) + if (code == ListMode.NULL) + return null; + if (code == ListMode.WORKING) return "working"; if (code == ListMode.SNAPSHOT) return "snapshot"; if (code == ListMode.CHANGES) return "changes"; return "?"; - } + } public String toSystem(ListMode code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Location.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Location.java index 211c3bf45..fc4d50af5 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Location.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Location.java @@ -174,14 +174,16 @@ public class Location extends DomainResource { } public String toCode(LocationStatus code) { - if (code == LocationStatus.ACTIVE) + if (code == LocationStatus.NULL) + return null; + if (code == LocationStatus.ACTIVE) return "active"; if (code == LocationStatus.SUSPENDED) return "suspended"; if (code == LocationStatus.INACTIVE) return "inactive"; return "?"; - } + } public String toSystem(LocationStatus code) { return code.getSystem(); @@ -294,12 +296,14 @@ public class Location extends DomainResource { } public String toCode(LocationMode code) { - if (code == LocationMode.INSTANCE) + if (code == LocationMode.NULL) + return null; + if (code == LocationMode.INSTANCE) return "instance"; if (code == LocationMode.KIND) return "kind"; return "?"; - } + } public String toSystem(LocationMode code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Measure.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Measure.java index 8efb6086a..077e1017b 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Measure.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Measure.java @@ -188,7 +188,9 @@ public class Measure extends DomainResource { } 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"; @@ -197,7 +199,7 @@ public class Measure extends DomainResource { if (code == MeasureScoring.COHORT) return "cohort"; return "?"; - } + } public String toSystem(MeasureScoring code) { return code.getSystem(); @@ -307,12 +309,14 @@ public class Measure extends DomainResource { } 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"; return "?"; - } + } public String toSystem(MeasureType code) { return code.getSystem(); @@ -548,7 +552,9 @@ public class Measure extends DomainResource { } public String toCode(MeasurePopulationType code) { - if (code == MeasurePopulationType.INITIALPOPULATION) + if (code == MeasurePopulationType.NULL) + return null; + if (code == MeasurePopulationType.INITIALPOPULATION) return "initial-population"; if (code == MeasurePopulationType.NUMERATOR) return "numerator"; @@ -567,7 +573,7 @@ public class Measure extends DomainResource { if (code == MeasurePopulationType.MEASURESCORE) return "measure-score"; return "?"; - } + } public String toSystem(MeasurePopulationType code) { return code.getSystem(); @@ -679,12 +685,14 @@ public class Measure extends DomainResource { } public String toCode(MeasureDataUsage code) { - if (code == MeasureDataUsage.SUPPLEMENTALDATA) + if (code == MeasureDataUsage.NULL) + return null; + if (code == MeasureDataUsage.SUPPLEMENTALDATA) return "supplemental-data"; if (code == MeasureDataUsage.RISKADJUSTMENTFACTOR) return "risk-adjustment-factor"; return "?"; - } + } public String toSystem(MeasureDataUsage code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/MeasureReport.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/MeasureReport.java index 981af916e..bdb9b0492 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/MeasureReport.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/MeasureReport.java @@ -175,14 +175,16 @@ public class MeasureReport extends DomainResource { } public String toCode(MeasureReportType code) { - if (code == MeasureReportType.INDIVIDUAL) + if (code == MeasureReportType.NULL) + return null; + if (code == MeasureReportType.INDIVIDUAL) return "individual"; if (code == MeasureReportType.PATIENTLIST) return "patient-list"; if (code == MeasureReportType.SUMMARY) return "summary"; return "?"; - } + } public String toSystem(MeasureReportType code) { return code.getSystem(); @@ -310,14 +312,16 @@ public class MeasureReport extends DomainResource { } public String toCode(MeasureReportStatus code) { - if (code == MeasureReportStatus.COMPLETE) + if (code == MeasureReportStatus.NULL) + return null; + if (code == MeasureReportStatus.COMPLETE) return "complete"; if (code == MeasureReportStatus.PENDING) return "pending"; if (code == MeasureReportStatus.ERROR) return "error"; return "?"; - } + } public String toSystem(MeasureReportStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Media.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Media.java index dc603cabb..20edfb7b7 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Media.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Media.java @@ -170,14 +170,16 @@ public class Media extends DomainResource { } 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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/MedicationAdministration.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/MedicationAdministration.java index 1076c4b0c..46509a2e5 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/MedicationAdministration.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/MedicationAdministration.java @@ -212,7 +212,9 @@ public class MedicationAdministration extends DomainResource { } public String toCode(MedicationAdministrationStatus code) { - if (code == MedicationAdministrationStatus.INPROGRESS) + if (code == MedicationAdministrationStatus.NULL) + return null; + if (code == MedicationAdministrationStatus.INPROGRESS) return "in-progress"; if (code == MedicationAdministrationStatus.ONHOLD) return "on-hold"; @@ -223,7 +225,7 @@ public class MedicationAdministration extends DomainResource { if (code == MedicationAdministrationStatus.STOPPED) return "stopped"; return "?"; - } + } public String toSystem(MedicationAdministrationStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/MedicationDispense.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/MedicationDispense.java index 55cfdcd34..664bc58fa 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/MedicationDispense.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/MedicationDispense.java @@ -213,7 +213,9 @@ public class MedicationDispense extends DomainResource { } public String toCode(MedicationDispenseStatus code) { - if (code == MedicationDispenseStatus.INPROGRESS) + if (code == MedicationDispenseStatus.NULL) + return null; + if (code == MedicationDispenseStatus.INPROGRESS) return "in-progress"; if (code == MedicationDispenseStatus.ONHOLD) return "on-hold"; @@ -224,7 +226,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/MedicationOrder.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/MedicationOrder.java index 595ad91c3..3fb725b17 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/MedicationOrder.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/MedicationOrder.java @@ -233,7 +233,9 @@ public class MedicationOrder extends DomainResource { } public String toCode(MedicationOrderStatus code) { - if (code == MedicationOrderStatus.ACTIVE) + if (code == MedicationOrderStatus.NULL) + return null; + if (code == MedicationOrderStatus.ACTIVE) return "active"; if (code == MedicationOrderStatus.ONHOLD) return "on-hold"; @@ -246,7 +248,7 @@ public class MedicationOrder extends DomainResource { if (code == MedicationOrderStatus.DRAFT) return "draft"; return "?"; - } + } public String toSystem(MedicationOrderStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/MedicationStatement.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/MedicationStatement.java index 2834ac78e..9d3dcb771 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/MedicationStatement.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/MedicationStatement.java @@ -210,7 +210,9 @@ public class MedicationStatement extends DomainResource { } public String toCode(MedicationStatementStatus code) { - if (code == MedicationStatementStatus.ACTIVE) + if (code == MedicationStatementStatus.NULL) + return null; + if (code == MedicationStatementStatus.ACTIVE) return "active"; if (code == MedicationStatementStatus.COMPLETED) return "completed"; @@ -219,7 +221,7 @@ public class MedicationStatement extends DomainResource { if (code == MedicationStatementStatus.INTENDED) return "intended"; return "?"; - } + } public String toSystem(MedicationStatementStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/MessageHeader.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/MessageHeader.java index 34b0f3857..0bbbd8ca7 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/MessageHeader.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/MessageHeader.java @@ -178,14 +178,16 @@ public class MessageHeader extends DomainResource { } public String toCode(ResponseType code) { - if (code == ResponseType.OK) + if (code == ResponseType.NULL) + return null; + if (code == ResponseType.OK) return "ok"; if (code == ResponseType.TRANSIENTERROR) return "transient-error"; if (code == ResponseType.FATALERROR) return "fatal-error"; return "?"; - } + } public String toSystem(ResponseType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ModuleMetadata.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ModuleMetadata.java index ef6519e47..4f632a5b9 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ModuleMetadata.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ModuleMetadata.java @@ -210,7 +210,9 @@ public class ModuleMetadata extends Type implements ICompositeType { } public String toCode(ModuleMetadataType code) { - if (code == ModuleMetadataType.MODULE) + if (code == ModuleMetadataType.NULL) + return null; + if (code == ModuleMetadataType.MODULE) return "module"; if (code == ModuleMetadataType.LIBRARY) return "library"; @@ -221,7 +223,7 @@ public class ModuleMetadata extends Type implements ICompositeType { if (code == ModuleMetadataType.ORDERSET) return "order-set"; return "?"; - } + } public String toSystem(ModuleMetadataType code) { return code.getSystem(); @@ -350,14 +352,16 @@ public class ModuleMetadata extends Type implements ICompositeType { } public String toCode(ModuleMetadataStatus code) { - if (code == ModuleMetadataStatus.DRAFT) + if (code == ModuleMetadataStatus.NULL) + return null; + if (code == ModuleMetadataStatus.DRAFT) return "draft"; if (code == ModuleMetadataStatus.ACTIVE) return "active"; if (code == ModuleMetadataStatus.INACTIVE) return "inactive"; return "?"; - } + } public String toSystem(ModuleMetadataStatus code) { return code.getSystem(); @@ -503,7 +507,9 @@ public class ModuleMetadata extends Type implements ICompositeType { } public String toCode(ModuleMetadataContributorType code) { - if (code == ModuleMetadataContributorType.AUTHOR) + if (code == ModuleMetadataContributorType.NULL) + return null; + if (code == ModuleMetadataContributorType.AUTHOR) return "author"; if (code == ModuleMetadataContributorType.EDITOR) return "editor"; @@ -512,7 +518,7 @@ public class ModuleMetadata extends Type implements ICompositeType { if (code == ModuleMetadataContributorType.ENDORSER) return "endorser"; return "?"; - } + } public String toSystem(ModuleMetadataContributorType code) { return code.getSystem(); @@ -706,7 +712,9 @@ public class ModuleMetadata extends Type implements ICompositeType { } public String toCode(ModuleMetadataResourceType code) { - if (code == ModuleMetadataResourceType.DOCUMENTATION) + if (code == ModuleMetadataResourceType.NULL) + return null; + if (code == ModuleMetadataResourceType.DOCUMENTATION) return "documentation"; if (code == ModuleMetadataResourceType.JUSTIFICATION) return "justification"; @@ -719,7 +727,7 @@ public class ModuleMetadata extends Type implements ICompositeType { if (code == ModuleMetadataResourceType.DERIVEDFROM) return "derived-from"; return "?"; - } + } public String toSystem(ModuleMetadataResourceType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/NamingSystem.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/NamingSystem.java index 8beaea44a..81f8f3e48 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/NamingSystem.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/NamingSystem.java @@ -178,14 +178,16 @@ public class NamingSystem extends DomainResource { } 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(); @@ -334,7 +336,9 @@ public class NamingSystem extends DomainResource { } 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"; @@ -343,7 +347,7 @@ public class NamingSystem extends DomainResource { if (code == NamingSystemIdentifierType.OTHER) return "other"; return "?"; - } + } public String toSystem(NamingSystemIdentifierType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Narrative.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Narrative.java index f51565516..ee2b531bf 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Narrative.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Narrative.java @@ -189,7 +189,9 @@ public class Narrative extends BaseNarrative implements INarrative { } public String toCode(NarrativeStatus code) { - if (code == NarrativeStatus.GENERATED) + if (code == NarrativeStatus.NULL) + return null; + if (code == NarrativeStatus.GENERATED) return "generated"; if (code == NarrativeStatus.EXTENSIONS) return "extensions"; @@ -198,7 +200,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/NutritionOrder.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/NutritionOrder.java index 29767f906..412be34c9 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/NutritionOrder.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/NutritionOrder.java @@ -283,7 +283,9 @@ public class NutritionOrder extends DomainResource { } 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"; @@ -302,7 +304,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Observation.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Observation.java index f36361f7a..5881b4848 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Observation.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Observation.java @@ -251,7 +251,9 @@ public class Observation extends DomainResource { } public String toCode(ObservationStatus code) { - if (code == ObservationStatus.REGISTERED) + if (code == ObservationStatus.NULL) + return null; + if (code == ObservationStatus.REGISTERED) return "registered"; if (code == ObservationStatus.PRELIMINARY) return "preliminary"; @@ -266,7 +268,7 @@ public class Observation extends DomainResource { if (code == ObservationStatus.UNKNOWN) return "unknown"; return "?"; - } + } public String toSystem(ObservationStatus code) { return code.getSystem(); @@ -458,7 +460,9 @@ public class Observation extends DomainResource { } 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"; @@ -471,7 +475,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/OperationDefinition.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/OperationDefinition.java index b90650aa0..b4c60b2d9 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/OperationDefinition.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/OperationDefinition.java @@ -160,12 +160,14 @@ public class OperationDefinition extends DomainResource { } 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(); @@ -275,12 +277,14 @@ public class OperationDefinition extends DomainResource { } 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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/OperationOutcome.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/OperationOutcome.java index 4d5b93abb..feefcf37a 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/OperationOutcome.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/OperationOutcome.java @@ -191,7 +191,9 @@ public class OperationOutcome extends DomainResource implements IBaseOperationOu } public String toCode(IssueSeverity code) { - if (code == IssueSeverity.FATAL) + if (code == IssueSeverity.NULL) + return null; + if (code == IssueSeverity.FATAL) return "fatal"; if (code == IssueSeverity.ERROR) return "error"; @@ -200,7 +202,7 @@ public class OperationOutcome extends DomainResource implements IBaseOperationOu if (code == IssueSeverity.INFORMATION) return "information"; return "?"; - } + } public String toSystem(IssueSeverity code) { return code.getSystem(); @@ -816,7 +818,9 @@ public class OperationOutcome extends DomainResource implements IBaseOperationOu } public String toCode(IssueType code) { - if (code == IssueType.INVALID) + if (code == IssueType.NULL) + return null; + if (code == IssueType.INVALID) return "invalid"; if (code == IssueType.STRUCTURE) return "structure"; @@ -875,7 +879,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/OrderResponse.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/OrderResponse.java index b5ddf4434..24d9d8381 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/OrderResponse.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/OrderResponse.java @@ -280,7 +280,9 @@ public class OrderResponse extends DomainResource { } public String toCode(OrderStatus code) { - if (code == OrderStatus.PENDING) + if (code == OrderStatus.NULL) + return null; + if (code == OrderStatus.PENDING) return "pending"; if (code == OrderStatus.REVIEW) return "review"; @@ -299,7 +301,7 @@ public class OrderResponse extends DomainResource { if (code == OrderStatus.COMPLETED) return "completed"; return "?"; - } + } public String toSystem(OrderStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Patient.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Patient.java index 2169cf3e5..cbdd25183 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Patient.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Patient.java @@ -182,14 +182,16 @@ public class Patient extends DomainResource { } public String toCode(LinkType code) { - if (code == LinkType.REPLACE) + if (code == LinkType.NULL) + return null; + if (code == LinkType.REPLACE) return "replace"; if (code == LinkType.REFER) return "refer"; if (code == LinkType.SEEALSO) return "seealso"; return "?"; - } + } public String toSystem(LinkType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Person.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Person.java index 38a6acf7d..1850b69a8 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Person.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Person.java @@ -191,7 +191,9 @@ public class Person extends DomainResource { } public String toCode(IdentityAssuranceLevel code) { - if (code == IdentityAssuranceLevel.LEVEL1) + if (code == IdentityAssuranceLevel.NULL) + return null; + if (code == IdentityAssuranceLevel.LEVEL1) return "level1"; if (code == IdentityAssuranceLevel.LEVEL2) return "level2"; @@ -200,7 +202,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Procedure.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Procedure.java index ddbfc23cb..d4f71f60c 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Procedure.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Procedure.java @@ -189,7 +189,9 @@ public class Procedure extends DomainResource { } public String toCode(ProcedureStatus code) { - if (code == ProcedureStatus.INPROGRESS) + if (code == ProcedureStatus.NULL) + return null; + if (code == ProcedureStatus.INPROGRESS) return "in-progress"; if (code == ProcedureStatus.ABORTED) return "aborted"; @@ -198,7 +200,7 @@ public class Procedure extends DomainResource { if (code == ProcedureStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(ProcedureStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ProcedureRequest.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ProcedureRequest.java index 07f223a75..dea9ec59b 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ProcedureRequest.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ProcedureRequest.java @@ -298,7 +298,9 @@ public class ProcedureRequest extends DomainResource { } public String toCode(ProcedureRequestStatus code) { - if (code == ProcedureRequestStatus.PROPOSED) + if (code == ProcedureRequestStatus.NULL) + return null; + if (code == ProcedureRequestStatus.PROPOSED) return "proposed"; if (code == ProcedureRequestStatus.DRAFT) return "draft"; @@ -319,7 +321,7 @@ public class ProcedureRequest extends DomainResource { if (code == ProcedureRequestStatus.ABORTED) return "aborted"; return "?"; - } + } public String toSystem(ProcedureRequestStatus code) { return code.getSystem(); @@ -465,7 +467,9 @@ public class ProcedureRequest extends DomainResource { } 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"; @@ -474,7 +478,7 @@ public class ProcedureRequest extends DomainResource { if (code == ProcedureRequestPriority.ASAP) return "asap"; return "?"; - } + } public String toSystem(ProcedureRequestPriority code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ProcessRequest.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ProcessRequest.java index eb47c9567..21683b1ec 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ProcessRequest.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ProcessRequest.java @@ -190,7 +190,9 @@ public class ProcessRequest extends DomainResource { } 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"; @@ -199,7 +201,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Protocol.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Protocol.java index 161962ceb..48d48d2ea 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Protocol.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Protocol.java @@ -228,7 +228,9 @@ public class Protocol extends DomainResource { } public String toCode(ProtocolStatus code) { - if (code == ProtocolStatus.DRAFT) + if (code == ProtocolStatus.NULL) + return null; + if (code == ProtocolStatus.DRAFT) return "draft"; if (code == ProtocolStatus.TESTING) return "testing"; @@ -241,7 +243,7 @@ public class Protocol extends DomainResource { if (code == ProtocolStatus.SUPERSEDED) return "superseded"; return "?"; - } + } public String toSystem(ProtocolStatus code) { return code.getSystem(); @@ -391,7 +393,9 @@ public class Protocol extends DomainResource { } public String toCode(ProtocolType code) { - if (code == ProtocolType.CONDITION) + if (code == ProtocolType.NULL) + return null; + if (code == ProtocolType.CONDITION) return "condition"; if (code == ProtocolType.DEVICE) return "device"; @@ -400,7 +404,7 @@ public class Protocol extends DomainResource { if (code == ProtocolType.STUDY) return "study"; return "?"; - } + } public String toSystem(ProtocolType code) { return code.getSystem(); @@ -603,7 +607,9 @@ public class Protocol extends DomainResource { } public String toCode(ActivityDefinitionCategory code) { - if (code == ActivityDefinitionCategory.DIET) + if (code == ActivityDefinitionCategory.NULL) + return null; + if (code == ActivityDefinitionCategory.DIET) return "diet"; if (code == ActivityDefinitionCategory.DRUG) return "drug"; @@ -618,7 +624,7 @@ public class Protocol extends DomainResource { if (code == ActivityDefinitionCategory.OTHER) return "other"; return "?"; - } + } public String toSystem(ActivityDefinitionCategory code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Provenance.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Provenance.java index 1091787e2..f5aaaf571 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Provenance.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Provenance.java @@ -223,7 +223,9 @@ public class Provenance extends DomainResource { } public String toCode(ProvenanceEntityRole code) { - if (code == ProvenanceEntityRole.DERIVATION) + if (code == ProvenanceEntityRole.NULL) + return null; + if (code == ProvenanceEntityRole.DERIVATION) return "derivation"; if (code == ProvenanceEntityRole.REVISION) return "revision"; @@ -234,7 +236,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Quantity.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Quantity.java index 1e03bcb31..d8665276a 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Quantity.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Quantity.java @@ -189,7 +189,9 @@ public class Quantity extends Type implements ICompositeType { } 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 "<="; @@ -198,7 +200,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Questionnaire.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Questionnaire.java index 103e36a85..f245d6a1e 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Questionnaire.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Questionnaire.java @@ -173,14 +173,16 @@ public class Questionnaire extends DomainResource { } public String toCode(QuestionnaireStatus code) { - if (code == QuestionnaireStatus.DRAFT) + if (code == QuestionnaireStatus.NULL) + return null; + if (code == QuestionnaireStatus.DRAFT) return "draft"; if (code == QuestionnaireStatus.PUBLISHED) return "published"; if (code == QuestionnaireStatus.RETIRED) return "retired"; return "?"; - } + } public String toSystem(QuestionnaireStatus code) { return code.getSystem(); @@ -584,7 +586,9 @@ public class Questionnaire extends DomainResource { } 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"; @@ -621,7 +625,7 @@ public class Questionnaire extends DomainResource { if (code == QuestionnaireItemType.QUANTITY) return "quantity"; return "?"; - } + } public String toSystem(QuestionnaireItemType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/QuestionnaireResponse.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/QuestionnaireResponse.java index 6c49ea024..12126dbeb 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/QuestionnaireResponse.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/QuestionnaireResponse.java @@ -176,14 +176,16 @@ public class QuestionnaireResponse extends DomainResource { } public String toCode(QuestionnaireResponseStatus code) { - if (code == QuestionnaireResponseStatus.INPROGRESS) + if (code == QuestionnaireResponseStatus.NULL) + return null; + if (code == QuestionnaireResponseStatus.INPROGRESS) return "in-progress"; if (code == QuestionnaireResponseStatus.COMPLETED) return "completed"; if (code == QuestionnaireResponseStatus.AMENDED) return "amended"; return "?"; - } + } public String toSystem(QuestionnaireResponseStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ReferralRequest.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ReferralRequest.java index 2fe1de6a8..e8a7b76ba 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ReferralRequest.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ReferralRequest.java @@ -210,7 +210,9 @@ public class ReferralRequest extends DomainResource { } 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"; @@ -221,7 +223,7 @@ public class ReferralRequest extends DomainResource { if (code == ReferralStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(ReferralStatus code) { return code.getSystem(); @@ -352,14 +354,16 @@ public class ReferralRequest extends DomainResource { } 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"; if (code == ReferralCategory.REQUEST) return "request"; return "?"; - } + } public String toSystem(ReferralCategory code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/SearchParameter.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/SearchParameter.java index f1059134e..3071aa372 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/SearchParameter.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/SearchParameter.java @@ -216,7 +216,9 @@ public class SearchParameter extends DomainResource { } 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"; @@ -227,7 +229,7 @@ public class SearchParameter extends DomainResource { if (code == XPathUsageType.OTHER) return "other"; return "?"; - } + } public String toSystem(XPathUsageType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Sequence.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Sequence.java index 61365e107..9b00857f2 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Sequence.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Sequence.java @@ -172,14 +172,16 @@ public class Sequence extends DomainResource { } public String toCode(SequenceType code) { - if (code == SequenceType.AA) + if (code == SequenceType.NULL) + return null; + if (code == SequenceType.AA) return "AA"; if (code == SequenceType.DNA) return "DNA"; if (code == SequenceType.RNA) return "RNA"; return "?"; - } + } public String toSystem(SequenceType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Slot.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Slot.java index a2513a13c..5fe641a8b 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Slot.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Slot.java @@ -190,7 +190,9 @@ public class Slot extends DomainResource { } public String toCode(SlotStatus code) { - if (code == SlotStatus.BUSY) + if (code == SlotStatus.NULL) + return null; + if (code == SlotStatus.BUSY) return "busy"; if (code == SlotStatus.FREE) return "free"; @@ -199,7 +201,7 @@ public class Slot extends DomainResource { if (code == SlotStatus.BUSYTENTATIVE) return "busy-tentative"; return "?"; - } + } public String toSystem(SlotStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Specimen.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Specimen.java index 831de516f..c34b59d8d 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Specimen.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Specimen.java @@ -191,7 +191,9 @@ public class Specimen extends DomainResource { } public String toCode(SpecimenStatus code) { - if (code == SpecimenStatus.AVAILABLE) + if (code == SpecimenStatus.NULL) + return null; + if (code == SpecimenStatus.AVAILABLE) return "available"; if (code == SpecimenStatus.UNAVAILABLE) return "unavailable"; @@ -200,7 +202,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/StructureDefinition.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/StructureDefinition.java index 7ec1f0388..f889d7801 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/StructureDefinition.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/StructureDefinition.java @@ -178,14 +178,16 @@ public class StructureDefinition extends DomainResource { } public String toCode(StructureDefinitionKind code) { - if (code == StructureDefinitionKind.DATATYPE) + if (code == StructureDefinitionKind.NULL) + return null; + if (code == StructureDefinitionKind.DATATYPE) return "datatype"; if (code == StructureDefinitionKind.RESOURCE) return "resource"; if (code == StructureDefinitionKind.LOGICAL) return "logical"; return "?"; - } + } public String toSystem(StructureDefinitionKind code) { return code.getSystem(); @@ -316,14 +318,16 @@ public class StructureDefinition extends DomainResource { } 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(); @@ -434,12 +438,14 @@ public class StructureDefinition extends DomainResource { } 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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/StructureMap.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/StructureMap.java index ba7e49197..137a8405d 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/StructureMap.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/StructureMap.java @@ -196,7 +196,9 @@ public class StructureMap extends DomainResource { } 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"; @@ -205,7 +207,7 @@ public class StructureMap extends DomainResource { if (code == StructureMapModelMode.PRODUCED) return "produced"; return "?"; - } + } public String toSystem(StructureMapModelMode code) { return code.getSystem(); @@ -315,12 +317,14 @@ public class StructureMap extends DomainResource { } 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(); @@ -430,12 +434,14 @@ public class StructureMap extends DomainResource { } 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(); @@ -568,14 +574,16 @@ public class StructureMap extends DomainResource { } public String toCode(StructureMapListMode code) { - if (code == StructureMapListMode.FIRST) + if (code == StructureMapListMode.NULL) + return null; + if (code == StructureMapListMode.FIRST) return "first"; if (code == StructureMapListMode.SHARE) return "share"; if (code == StructureMapListMode.LAST) return "last"; return "?"; - } + } public String toSystem(StructureMapListMode code) { return code.getSystem(); @@ -870,7 +878,9 @@ public class StructureMap extends DomainResource { } 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"; @@ -895,7 +905,7 @@ public class StructureMap extends DomainResource { if (code == StructureMapTransform.EVALUATE) return "evaluate"; return "?"; - } + } public String toSystem(StructureMapTransform code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Subscription.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Subscription.java index a3bbf866e..3acce4133 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Subscription.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Subscription.java @@ -194,7 +194,9 @@ public class Subscription extends DomainResource { } public String toCode(SubscriptionStatus code) { - if (code == SubscriptionStatus.REQUESTED) + if (code == SubscriptionStatus.NULL) + return null; + if (code == SubscriptionStatus.REQUESTED) return "requested"; if (code == SubscriptionStatus.ACTIVE) return "active"; @@ -203,7 +205,7 @@ public class Subscription extends DomainResource { if (code == SubscriptionStatus.OFF) return "off"; return "?"; - } + } public String toSystem(SubscriptionStatus code) { return code.getSystem(); @@ -374,7 +376,9 @@ public class Subscription extends DomainResource { } public String toCode(SubscriptionChannelType code) { - if (code == SubscriptionChannelType.RESTHOOK) + if (code == SubscriptionChannelType.NULL) + return null; + if (code == SubscriptionChannelType.RESTHOOK) return "rest-hook"; if (code == SubscriptionChannelType.WEBSOCKET) return "websocket"; @@ -385,7 +389,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/SupplyDelivery.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/SupplyDelivery.java index 3e4c0f8ed..fc755e601 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/SupplyDelivery.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/SupplyDelivery.java @@ -168,14 +168,16 @@ public class SupplyDelivery extends DomainResource { } public String toCode(SupplyDeliveryStatus code) { - if (code == SupplyDeliveryStatus.INPROGRESS) + if (code == SupplyDeliveryStatus.NULL) + return null; + if (code == SupplyDeliveryStatus.INPROGRESS) return "in-progress"; if (code == SupplyDeliveryStatus.COMPLETED) return "completed"; if (code == SupplyDeliveryStatus.ABANDONED) return "abandoned"; return "?"; - } + } public String toSystem(SupplyDeliveryStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/SupplyRequest.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/SupplyRequest.java index 7e2b0295a..136382f51 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/SupplyRequest.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/SupplyRequest.java @@ -190,7 +190,9 @@ public class SupplyRequest extends DomainResource { } public String toCode(SupplyRequestStatus code) { - if (code == SupplyRequestStatus.REQUESTED) + if (code == SupplyRequestStatus.NULL) + return null; + if (code == SupplyRequestStatus.REQUESTED) return "requested"; if (code == SupplyRequestStatus.COMPLETED) return "completed"; @@ -199,7 +201,7 @@ public class SupplyRequest extends DomainResource { if (code == SupplyRequestStatus.CANCELLED) return "cancelled"; return "?"; - } + } public String toSystem(SupplyRequestStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Task.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Task.java index 1b2911719..aebd31fe4 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Task.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Task.java @@ -171,14 +171,16 @@ public class Task extends DomainResource { } 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(); @@ -437,7 +439,9 @@ public class Task extends DomainResource { } public String toCode(TaskStatus code) { - if (code == TaskStatus.DRAFT) + if (code == TaskStatus.NULL) + return null; + if (code == TaskStatus.DRAFT) return "draft"; if (code == TaskStatus.REQUESTED) return "requested"; @@ -458,7 +462,7 @@ public class Task extends DomainResource { if (code == TaskStatus.COMPLETED) return "completed"; return "?"; - } + } public String toSystem(TaskStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/TestScript.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/TestScript.java index e96020bab..3e12fe3ee 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/TestScript.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/TestScript.java @@ -156,12 +156,14 @@ public class TestScript extends DomainResource { } 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"; return "?"; - } + } public String toSystem(ContentType code) { return code.getSystem(); @@ -271,12 +273,14 @@ public class TestScript extends DomainResource { } 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(); @@ -530,7 +534,9 @@ public class TestScript extends DomainResource { } 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"; @@ -551,7 +557,7 @@ public class TestScript extends DomainResource { if (code == AssertionOperatorType.NOTCONTAINS) return "notContains"; return "?"; - } + } public String toSystem(AssertionOperatorType code) { return code.getSystem(); @@ -841,7 +847,9 @@ public class TestScript extends DomainResource { } 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"; @@ -866,7 +874,7 @@ public class TestScript extends DomainResource { if (code == AssertionResponseTypes.UNPROCESSABLE) return "unprocessable"; return "?"; - } + } public String toSystem(AssertionResponseTypes code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Timing.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Timing.java index 104e977e7..a109aabcf 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Timing.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/Timing.java @@ -247,7 +247,9 @@ public class Timing extends Type implements ICompositeType { } public String toCode(UnitsOfTime code) { - if (code == UnitsOfTime.S) + if (code == UnitsOfTime.NULL) + return null; + if (code == UnitsOfTime.S) return "s"; if (code == UnitsOfTime.MIN) return "min"; @@ -262,7 +264,7 @@ public class Timing extends Type implements ICompositeType { if (code == UnitsOfTime.A) return "a"; return "?"; - } + } public String toSystem(UnitsOfTime code) { return code.getSystem(); @@ -588,7 +590,9 @@ public class Timing extends Type implements ICompositeType { } public String toCode(EventTiming code) { - if (code == EventTiming.HS) + if (code == EventTiming.NULL) + return null; + if (code == EventTiming.HS) return "HS"; if (code == EventTiming.WAKE) return "WAKE"; @@ -617,7 +621,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/TriggerDefinition.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/TriggerDefinition.java index 974ebda08..95453bcaf 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/TriggerDefinition.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/TriggerDefinition.java @@ -240,7 +240,9 @@ public class TriggerDefinition extends Type implements ICompositeType { } public String toCode(TriggerType code) { - if (code == TriggerType.NAMEDEVENT) + if (code == TriggerType.NULL) + return null; + if (code == TriggerType.NAMEDEVENT) return "named-event"; if (code == TriggerType.PERIODIC) return "periodic"; @@ -255,7 +257,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ValueSet.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ValueSet.java index d839b2dd1..6143f8ee4 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ValueSet.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/ValueSet.java @@ -232,7 +232,9 @@ public class ValueSet extends DomainResource { } 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"; @@ -245,7 +247,7 @@ public class ValueSet extends DomainResource { if (code == FilterOperator.NOTIN) return "not-in"; return "?"; - } + } public String toSystem(FilterOperator code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/VisionPrescription.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/VisionPrescription.java index db527aa33..4c05a2e9b 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/VisionPrescription.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/VisionPrescription.java @@ -156,12 +156,14 @@ public class VisionPrescription extends DomainResource { } public String toCode(VisionEyes code) { - if (code == VisionEyes.RIGHT) + if (code == VisionEyes.NULL) + return null; + if (code == VisionEyes.RIGHT) return "right"; if (code == VisionEyes.LEFT) return "left"; return "?"; - } + } public String toSystem(VisionEyes code) { return code.getSystem(); @@ -307,7 +309,9 @@ public class VisionPrescription extends DomainResource { } public String toCode(VisionBase code) { - if (code == VisionBase.UP) + if (code == VisionBase.NULL) + return null; + if (code == VisionBase.UP) return "up"; if (code == VisionBase.DOWN) return "down"; @@ -316,7 +320,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/AbstractTypesEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/AbstractTypesEnumFactory.java index 7226998a6..60e36924f 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/AbstractTypesEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/AbstractTypesEnumFactory.java @@ -46,12 +46,14 @@ public class AbstractTypesEnumFactory implements EnumFactory { } public String toCode(AbstractTypes code) { - if (code == AbstractTypes.TYPE) + if (code == AbstractTypes.NULL) + return null; + if (code == AbstractTypes.TYPE) return "Type"; if (code == AbstractTypes.ANY) return "Any"; return "?"; - } + } public String toSystem(AbstractTypes code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/AccountStatusEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/AccountStatusEnumFactory.java index 9af6cf36e..9490cf2b5 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/AccountStatusEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/AccountStatusEnumFactory.java @@ -46,12 +46,14 @@ 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"; return "?"; - } + } public String toSystem(AccountStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ActionBehaviorTypeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ActionBehaviorTypeEnumFactory.java index 998ff29f4..8a89b665d 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ActionBehaviorTypeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ActionBehaviorTypeEnumFactory.java @@ -52,7 +52,9 @@ public class ActionBehaviorTypeEnumFactory implements EnumFactory { } public String toCode(ActionType code) { - if (code == ActionType.CREATE) + if (code == ActionType.NULL) + return null; + if (code == ActionType.CREATE) return "create"; if (code == ActionType.UPDATE) return "update"; @@ -59,7 +61,7 @@ public class ActionTypeEnumFactory implements EnumFactory { if (code == ActionType.FIREEVENT) return "fire-event"; return "?"; - } + } public String toSystem(ActionType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ActionlistEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ActionlistEnumFactory.java index b7fffd5bc..8132fbd4a 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ActionlistEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ActionlistEnumFactory.java @@ -50,7 +50,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"; @@ -59,7 +61,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ActivityDefinitionCategoryEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ActivityDefinitionCategoryEnumFactory.java index 113a573a4..0b28c0ad8 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ActivityDefinitionCategoryEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ActivityDefinitionCategoryEnumFactory.java @@ -56,7 +56,9 @@ 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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/AddressUseEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/AddressUseEnumFactory.java index d65b45a31..8c1502b20 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/AddressUseEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/AddressUseEnumFactory.java @@ -50,7 +50,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"; @@ -59,7 +61,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/AdjudicationEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/AdjudicationEnumFactory.java index 39068b266..a34c1323d 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/AdjudicationEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/AdjudicationEnumFactory.java @@ -56,7 +56,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"; @@ -71,7 +73,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/AdjudicationErrorEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/AdjudicationErrorEnumFactory.java index 36695f629..1640f2d59 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/AdjudicationErrorEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/AdjudicationErrorEnumFactory.java @@ -46,12 +46,14 @@ public class AdjudicationErrorEnumFactory implements EnumFactory { } public String toCode(AnimalBreeds code) { - if (code == AnimalBreeds.GSD) + if (code == AnimalBreeds.NULL) + return null; + if (code == AnimalBreeds.GSD) return "gsd"; if (code == AnimalBreeds.IRT) return "irt"; @@ -59,7 +61,7 @@ public class AnimalBreedsEnumFactory implements EnumFactory { if (code == AnimalBreeds.GRET) return "gret"; return "?"; - } + } public String toSystem(AnimalBreeds code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/AnimalGenderstatusEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/AnimalGenderstatusEnumFactory.java index eb0a5e2c1..7050e4720 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/AnimalGenderstatusEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/AnimalGenderstatusEnumFactory.java @@ -48,14 +48,16 @@ public class AnimalGenderstatusEnumFactory 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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/AnzscoOccupationsEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/AnzscoOccupationsEnumFactory.java index 79ed8e672..e022a2442 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/AnzscoOccupationsEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/AnzscoOccupationsEnumFactory.java @@ -2694,7 +2694,9 @@ public class AnzscoOccupationsEnumFactory 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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/AuditSourceTypeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/AuditSourceTypeEnumFactory.java index 744f558ac..e6c8f33f3 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/AuditSourceTypeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/AuditSourceTypeEnumFactory.java @@ -60,7 +60,9 @@ public class AuditSourceTypeEnumFactory implements EnumFactory } public String toCode(AuditSourceType code) { - if (code == AuditSourceType._1) + if (code == AuditSourceType.NULL) + return null; + if (code == AuditSourceType._1) return "1"; if (code == AuditSourceType._2) return "2"; @@ -79,7 +81,7 @@ public class AuditSourceTypeEnumFactory implements EnumFactory if (code == AuditSourceType._9) return "9"; return "?"; - } + } public String toSystem(AuditSourceType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/BasicResourceTypeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/BasicResourceTypeEnumFactory.java index c6bb18c85..d866fb643 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/BasicResourceTypeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/BasicResourceTypeEnumFactory.java @@ -74,7 +74,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"; @@ -59,7 +61,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/BenefitNetworkEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/BenefitNetworkEnumFactory.java index 749e483e5..1f4cb78f1 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/BenefitNetworkEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/BenefitNetworkEnumFactory.java @@ -46,12 +46,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/BenefitSubcategoryEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/BenefitSubcategoryEnumFactory.java index e441bbcce..c04bac7ce 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/BenefitSubcategoryEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/BenefitSubcategoryEnumFactory.java @@ -58,7 +58,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.LIFETIME) return "lifetime"; return "?"; - } + } public String toSystem(BenefitTerm code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/BenefitTypeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/BenefitTypeEnumFactory.java index e7848980e..0d318c3c5 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/BenefitTypeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/BenefitTypeEnumFactory.java @@ -58,7 +58,9 @@ public class BenefitTypeEnumFactory implements EnumFactory { } public String toCode(BenefitType code) { - if (code == BenefitType.DEDUCTABLE) + if (code == BenefitType.NULL) + return null; + if (code == BenefitType.DEDUCTABLE) return "deductable"; if (code == BenefitType.VISIT) return "visit"; @@ -75,7 +77,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/BenefitUnitEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/BenefitUnitEnumFactory.java index 6662a5db8..685c4f321 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/BenefitUnitEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/BenefitUnitEnumFactory.java @@ -46,12 +46,14 @@ public class BenefitUnitEnumFactory implements EnumFactory { } public String toCode(BenefitUnit code) { - if (code == BenefitUnit.INDIVIDUAL) + if (code == BenefitUnit.NULL) + return null; + if (code == BenefitUnit.INDIVIDUAL) return "individual"; if (code == BenefitUnit.FAMILY) return "family"; return "?"; - } + } public String toSystem(BenefitUnit code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/BindingStrengthEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/BindingStrengthEnumFactory.java index 6d4ebd205..527650baf 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/BindingStrengthEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/BindingStrengthEnumFactory.java @@ -50,7 +50,9 @@ public class BindingStrengthEnumFactory implements EnumFactory } public String toCode(BindingStrength code) { - if (code == BindingStrength.REQUIRED) + if (code == BindingStrength.NULL) + return null; + if (code == BindingStrength.REQUIRED) return "required"; if (code == BindingStrength.EXTENSIBLE) return "extensible"; @@ -59,7 +61,7 @@ public class BindingStrengthEnumFactory implements EnumFactory if (code == BindingStrength.EXAMPLE) return "example"; return "?"; - } + } public String toSystem(BindingStrength code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/BundleTypeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/BundleTypeEnumFactory.java index 77add6c7a..3b4079143 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/BundleTypeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/BundleTypeEnumFactory.java @@ -60,7 +60,9 @@ public class BundleTypeEnumFactory implements EnumFactory { } public String toCode(BundleType code) { - if (code == BundleType.DOCUMENT) + if (code == BundleType.NULL) + return null; + if (code == BundleType.DOCUMENT) return "document"; if (code == BundleType.MESSAGE) return "message"; @@ -79,7 +81,7 @@ public class BundleTypeEnumFactory implements EnumFactory { if (code == BundleType.COLLECTION) return "collection"; return "?"; - } + } public String toSystem(BundleType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/CardinalityBehaviorEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/CardinalityBehaviorEnumFactory.java index 7ce042847..7feb54750 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/CardinalityBehaviorEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/CardinalityBehaviorEnumFactory.java @@ -46,12 +46,14 @@ public class CardinalityBehaviorEnumFactory implements EnumFactory { } public String toCode(CarePlanStatus code) { - if (code == CarePlanStatus.PROPOSED) + if (code == CarePlanStatus.NULL) + return null; + if (code == CarePlanStatus.PROPOSED) return "proposed"; if (code == CarePlanStatus.DRAFT) return "draft"; @@ -63,7 +65,7 @@ public class CarePlanStatusEnumFactory implements EnumFactory { if (code == CarePlanStatus.CANCELLED) return "cancelled"; return "?"; - } + } public String toSystem(CarePlanStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/CdsRuleActionTypeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/CdsRuleActionTypeEnumFactory.java index 0c08eed3d..d42f7060e 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/CdsRuleActionTypeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/CdsRuleActionTypeEnumFactory.java @@ -50,7 +50,9 @@ public class CdsRuleActionTypeEnumFactory implements EnumFactory } public String toCode(ChromosomeHuman code) { - if (code == ChromosomeHuman._1) + if (code == ChromosomeHuman.NULL) + return null; + if (code == ChromosomeHuman._1) return "1"; if (code == ChromosomeHuman._2) return "2"; @@ -139,7 +141,7 @@ public class ChromosomeHumanEnumFactory implements EnumFactory if (code == ChromosomeHuman.Y) return "Y"; return "?"; - } + } public String toSystem(ChromosomeHuman code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ClaimExceptionEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ClaimExceptionEnumFactory.java index 95a46e228..4162e1675 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ClaimExceptionEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ClaimExceptionEnumFactory.java @@ -46,12 +46,14 @@ public class ClaimExceptionEnumFactory 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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ClaimModifiersEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ClaimModifiersEnumFactory.java index 8991f48b2..37f9adc39 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ClaimModifiersEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ClaimModifiersEnumFactory.java @@ -52,7 +52,9 @@ public class ClaimModifiersEnumFactory 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"; @@ -63,7 +65,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ClaimSubtypeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ClaimSubtypeEnumFactory.java index 034696581..2f6420efd 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ClaimSubtypeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ClaimSubtypeEnumFactory.java @@ -46,12 +46,14 @@ public class ClaimSubtypeEnumFactory implements EnumFactory { } public String toCode(ClaimSubtype code) { - if (code == ClaimSubtype.ORTHO) + if (code == ClaimSubtype.NULL) + return null; + if (code == ClaimSubtype.ORTHO) return "ortho"; if (code == ClaimSubtype.EMERGENCY) return "emergency"; return "?"; - } + } public String toSystem(ClaimSubtype code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ClaimTypeLinkEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ClaimTypeLinkEnumFactory.java index 8f0ecb819..68f989eb5 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ClaimTypeLinkEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ClaimTypeLinkEnumFactory.java @@ -52,7 +52,9 @@ public class ClaimTypeLinkEnumFactory implements EnumFactory { } public String toCode(ClaimTypeLink code) { - if (code == ClaimTypeLink.INSTITUTIONAL) + if (code == ClaimTypeLink.NULL) + return null; + if (code == ClaimTypeLink.INSTITUTIONAL) return "institutional"; if (code == ClaimTypeLink.ORAL) return "oral"; @@ -63,7 +65,7 @@ public class ClaimTypeLinkEnumFactory implements EnumFactory { if (code == ClaimTypeLink.VISION) return "vision"; return "?"; - } + } public String toSystem(ClaimTypeLink code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ClaimUseLinkEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ClaimUseLinkEnumFactory.java index bd92ab994..97309f6db 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ClaimUseLinkEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ClaimUseLinkEnumFactory.java @@ -50,7 +50,9 @@ public class ClaimUseLinkEnumFactory implements EnumFactory { } public String toCode(ClaimUseLink code) { - if (code == ClaimUseLink.COMPLETE) + if (code == ClaimUseLink.NULL) + return null; + if (code == ClaimUseLink.COMPLETE) return "complete"; if (code == ClaimUseLink.PROPOSED) return "proposed"; @@ -59,7 +61,7 @@ public class ClaimUseLinkEnumFactory implements EnumFactory { if (code == ClaimUseLink.OTHER) return "other"; return "?"; - } + } public String toSystem(ClaimUseLink code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ClassificationOrContextEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ClassificationOrContextEnumFactory.java index 0d1f99fb3..64cd13cc8 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ClassificationOrContextEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ClassificationOrContextEnumFactory.java @@ -46,12 +46,14 @@ public class ClassificationOrContextEnumFactory implements EnumFactory } public String toCode(CompartmentType code) { - if (code == CompartmentType.PATIENT) + if (code == CompartmentType.NULL) + return null; + if (code == CompartmentType.PATIENT) return "Patient"; if (code == CompartmentType.ENCOUNTER) return "Encounter"; @@ -63,7 +65,7 @@ public class CompartmentTypeEnumFactory implements EnumFactory if (code == CompartmentType.DEVICE) return "Device"; return "?"; - } + } public String toSystem(CompartmentType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/CompositionAttestationModeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/CompositionAttestationModeEnumFactory.java index e333a3c26..2a08c6445 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/CompositionAttestationModeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/CompositionAttestationModeEnumFactory.java @@ -50,7 +50,9 @@ public class CompositionAttestationModeEnumFactory 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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ConditionVerStatusEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ConditionVerStatusEnumFactory.java index d40f683ef..eccd5a652 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ConditionVerStatusEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ConditionVerStatusEnumFactory.java @@ -54,7 +54,9 @@ public class ConditionVerStatusEnumFactory implements EnumFactory } public String toCode(ContactPointUse code) { - if (code == ContactPointUse.HOME) + if (code == ContactPointUse.NULL) + return null; + if (code == ContactPointUse.HOME) return "home"; if (code == ContactPointUse.WORK) return "work"; @@ -63,7 +65,7 @@ public class ContactPointUseEnumFactory implements EnumFactory if (code == ContactPointUse.MOBILE) return "mobile"; return "?"; - } + } public String toSystem(ContactPointUse code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ContactentityTypeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ContactentityTypeEnumFactory.java index 7876d955f..638a4eac5 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ContactentityTypeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ContactentityTypeEnumFactory.java @@ -54,7 +54,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"; return "?"; - } + } public String toSystem(ContentType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ContractActionEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ContractActionEnumFactory.java index fee0c29ae..14cfd0613 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ContractActionEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ContractActionEnumFactory.java @@ -46,12 +46,14 @@ public class ContractActionEnumFactory implements EnumFactory { } public String toCode(ContractAction code) { - if (code == ContractAction.ACTIONA) + if (code == ContractAction.NULL) + return null; + if (code == ContractAction.ACTIONA) return "action-a"; if (code == ContractAction.ACTIONB) return "action-b"; return "?"; - } + } public String toSystem(ContractAction code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ContractActorroleEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ContractActorroleEnumFactory.java index 55b3ffb44..5652ed843 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ContractActorroleEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ContractActorroleEnumFactory.java @@ -46,12 +46,14 @@ public class ContractActorroleEnumFactory 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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ContractTermSubtypeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ContractTermSubtypeEnumFactory.java index 4f71566b4..4eac72fc8 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ContractTermSubtypeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ContractTermSubtypeEnumFactory.java @@ -48,14 +48,16 @@ public class ContractTermSubtypeEnumFactory implements EnumFactory { } public String toCode(ContractType code) { - if (code == ContractType.PRIVACY) + if (code == ContractType.NULL) + return null; + if (code == ContractType.PRIVACY) return "privacy"; if (code == ContractType.DISCLOSURE) return "disclosure"; return "?"; - } + } public String toSystem(ContractType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/CopyNumberEventEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/CopyNumberEventEnumFactory.java index 048398400..532ee3924 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/CopyNumberEventEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/CopyNumberEventEnumFactory.java @@ -48,14 +48,16 @@ public class CopyNumberEventEnumFactory implements EnumFactory } public String toCode(CopyNumberEvent code) { - if (code == CopyNumberEvent.AMP) + if (code == CopyNumberEvent.NULL) + return null; + if (code == CopyNumberEvent.AMP) return "amp"; if (code == CopyNumberEvent.DEL) return "del"; if (code == CopyNumberEvent.LOF) return "lof"; return "?"; - } + } public String toSystem(CopyNumberEvent code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/CoverageExceptionEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/CoverageExceptionEnumFactory.java index 04de406da..21d849840 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/CoverageExceptionEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/CoverageExceptionEnumFactory.java @@ -46,12 +46,14 @@ public class CoverageExceptionEnumFactory 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"; @@ -59,7 +61,7 @@ public class DWebTypeEnumFactory implements EnumFactory { if (code == DWebType.WADOWS) return "WADO-WS"; return "?"; - } + } public String toSystem(DWebType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/DataAbsentReasonEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/DataAbsentReasonEnumFactory.java index 8f0fe10fa..2c72974ea 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/DataAbsentReasonEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/DataAbsentReasonEnumFactory.java @@ -60,7 +60,9 @@ public class DataAbsentReasonEnumFactory implements EnumFactory { } public String toCode(DataTypes code) { - if (code == DataTypes.ACTIONDEFINITION) + if (code == DataTypes.NULL) + return null; + if (code == DataTypes.ACTIONDEFINITION) return "ActionDefinition"; if (code == DataTypes.ADDRESS) return "Address"; @@ -247,7 +249,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/DataelementStringencyEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/DataelementStringencyEnumFactory.java index 621cea19e..9a561a6ec 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/DataelementStringencyEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/DataelementStringencyEnumFactory.java @@ -54,7 +54,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"; @@ -71,7 +73,7 @@ public class DaysOfWeekEnumFactory implements EnumFactory { if (code == DaysOfWeek.SUN) return "sun"; return "?"; - } + } public String toSystem(DaysOfWeek code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/DetectedissueSeverityEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/DetectedissueSeverityEnumFactory.java index 0040a3b47..63881b3ce 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/DetectedissueSeverityEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/DetectedissueSeverityEnumFactory.java @@ -48,14 +48,16 @@ public class DetectedissueSeverityEnumFactory implements EnumFactory { } public String toCode(DeviceAction code) { - if (code == DeviceAction.IMPLANTED) + if (code == DeviceAction.NULL) + return null; + if (code == DeviceAction.IMPLANTED) return "implanted"; if (code == DeviceAction.EXPLANTED) return "explanted"; if (code == DeviceAction.MANIPULATED) return "manipulated"; return "?"; - } + } public String toSystem(DeviceAction code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/DeviceUseRequestPriorityEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/DeviceUseRequestPriorityEnumFactory.java index f818949c6..b2a6a44ab 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/DeviceUseRequestPriorityEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/DeviceUseRequestPriorityEnumFactory.java @@ -50,7 +50,9 @@ public class DeviceUseRequestPriorityEnumFactory implements EnumFactory { } public String toCode(Devicestatus code) { - if (code == Devicestatus.AVAILABLE) + if (code == Devicestatus.NULL) + return null; + if (code == Devicestatus.AVAILABLE) return "available"; if (code == Devicestatus.NOTAVAILABLE) return "not-available"; if (code == Devicestatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(Devicestatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/DiagnosticOrderPriorityEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/DiagnosticOrderPriorityEnumFactory.java index 243a821d5..c25b94c8a 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/DiagnosticOrderPriorityEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/DiagnosticOrderPriorityEnumFactory.java @@ -50,7 +50,9 @@ public class DiagnosticOrderPriorityEnumFactory 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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/DocumentReferenceStatusEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/DocumentReferenceStatusEnumFactory.java index d344c759c..5bd5ffa1c 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/DocumentReferenceStatusEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/DocumentReferenceStatusEnumFactory.java @@ -48,14 +48,16 @@ public class DocumentReferenceStatusEnumFactory implements EnumFactory { } public String toCode(EncounterClass code) { - if (code == EncounterClass.INPATIENT) + if (code == EncounterClass.NULL) + return null; + if (code == EncounterClass.INPATIENT) return "inpatient"; if (code == EncounterClass.OUTPATIENT) return "outpatient"; @@ -79,7 +81,7 @@ public class EncounterClassEnumFactory implements EnumFactory { if (code == EncounterClass.OTHER) return "other"; return "?"; - } + } public String toSystem(EncounterClass code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/EncounterDietEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/EncounterDietEnumFactory.java index d44553a4b..9ce1fedee 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/EncounterDietEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/EncounterDietEnumFactory.java @@ -56,7 +56,9 @@ public class EncounterDietEnumFactory implements EnumFactory { } public String toCode(EncounterDiet code) { - if (code == EncounterDiet.VEGETARIAN) + if (code == EncounterDiet.NULL) + return null; + if (code == EncounterDiet.VEGETARIAN) return "vegetarian"; if (code == EncounterDiet.DAIRYFREE) return "dairy-free"; @@ -71,7 +73,7 @@ public class EncounterDietEnumFactory implements EnumFactory { if (code == EncounterDiet.KOSHER) return "kosher"; return "?"; - } + } public String toSystem(EncounterDiet code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/EncounterDischargeDispositionEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/EncounterDischargeDispositionEnumFactory.java index 80208ffb2..235105f3a 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/EncounterDischargeDispositionEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/EncounterDischargeDispositionEnumFactory.java @@ -60,7 +60,9 @@ public class EncounterDischargeDispositionEnumFactory implements EnumFactory { } public String toCode(EncounterState code) { - if (code == EncounterState.PLANNED) + if (code == EncounterState.NULL) + return null; + if (code == EncounterState.PLANNED) return "planned"; if (code == EncounterState.ARRIVED) return "arrived"; @@ -67,7 +69,7 @@ public class EncounterStateEnumFactory implements EnumFactory { if (code == EncounterState.CANCELLED) return "cancelled"; return "?"; - } + } public String toSystem(EncounterState code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/EncounterTypeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/EncounterTypeEnumFactory.java index d7750ca3f..16c20ef69 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/EncounterTypeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/EncounterTypeEnumFactory.java @@ -50,7 +50,9 @@ public class EncounterTypeEnumFactory implements EnumFactory { } public String toCode(EncounterType code) { - if (code == EncounterType.ADMS) + if (code == EncounterType.NULL) + return null; + if (code == EncounterType.ADMS) return "ADMS"; if (code == EncounterType.BD_BMCLIN) return "BD/BM-clin"; @@ -59,7 +61,7 @@ public class EncounterTypeEnumFactory implements EnumFactory { if (code == EncounterType.OKI) return "OKI"; return "?"; - } + } public String toSystem(EncounterType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/EndpointStatusEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/EndpointStatusEnumFactory.java index 71599e166..6da07b7ce 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/EndpointStatusEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/EndpointStatusEnumFactory.java @@ -50,7 +50,9 @@ public class EndpointStatusEnumFactory 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"; @@ -59,7 +61,7 @@ public class EndpointStatusEnumFactory implements EnumFactory { if (code == EndpointStatus.OFF) return "off"; return "?"; - } + } public String toSystem(EndpointStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/EntformulaAdditiveEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/EntformulaAdditiveEnumFactory.java index ceafd7b0c..2700e5ec5 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/EntformulaAdditiveEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/EntformulaAdditiveEnumFactory.java @@ -52,7 +52,9 @@ public class EntformulaAdditiveEnumFactory 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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ExProgramCodeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ExProgramCodeEnumFactory.java index bacae4659..a94b7f819 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ExProgramCodeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ExProgramCodeEnumFactory.java @@ -48,14 +48,16 @@ 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"; if (code == ExProgramCode.AUSCR) return "AUSCR"; return "?"; - } + } public String toSystem(ExProgramCode code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ExtensionContextEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ExtensionContextEnumFactory.java index 18264d4c0..8858858ff 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ExtensionContextEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ExtensionContextEnumFactory.java @@ -48,14 +48,16 @@ public class ExtensionContextEnumFactory 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"; @@ -67,7 +69,7 @@ public class FilterOperatorEnumFactory implements EnumFactory { if (code == FilterOperator.NOTIN) return "not-in"; return "?"; - } + } public String toSystem(FilterOperator code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/FlagCategoryEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/FlagCategoryEnumFactory.java index db20e16b9..dc9083e35 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/FlagCategoryEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/FlagCategoryEnumFactory.java @@ -52,7 +52,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"; @@ -63,7 +65,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/FlagPriorityEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/FlagPriorityEnumFactory.java index f4c1f64a7..36c33bafc 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/FlagPriorityEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/FlagPriorityEnumFactory.java @@ -50,7 +50,9 @@ public class FlagPriorityEnumFactory implements EnumFactory { } public String toCode(FlagPriority code) { - if (code == FlagPriority.PN) + if (code == FlagPriority.NULL) + return null; + if (code == FlagPriority.PN) return "PN"; if (code == FlagPriority.PL) return "PL"; @@ -59,7 +61,7 @@ public class FlagPriorityEnumFactory implements EnumFactory { if (code == FlagPriority.PH) return "PH"; return "?"; - } + } public String toSystem(FlagPriority code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/FlagStatusEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/FlagStatusEnumFactory.java index a426de344..126ca610a 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/FlagStatusEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/FlagStatusEnumFactory.java @@ -48,14 +48,16 @@ public class FlagStatusEnumFactory implements EnumFactory { } public String toCode(FlagStatus code) { - if (code == FlagStatus.ACTIVE) + if (code == FlagStatus.NULL) + return null; + if (code == FlagStatus.ACTIVE) return "active"; if (code == FlagStatus.INACTIVE) return "inactive"; if (code == FlagStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(FlagStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/FmConditionsEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/FmConditionsEnumFactory.java index bff7ecb36..2d8337ca3 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/FmConditionsEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/FmConditionsEnumFactory.java @@ -44,10 +44,12 @@ public class FmConditionsEnumFactory implements EnumFactory { } public String toCode(FmConditions code) { - if (code == FmConditions._123987) + if (code == FmConditions.NULL) + return null; + if (code == FmConditions._123987) return "123987"; return "?"; - } + } public String toSystem(FmConditions code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/FormsEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/FormsEnumFactory.java index dc447a98d..b63c1758c 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/FormsEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/FormsEnumFactory.java @@ -46,12 +46,14 @@ public class FormsEnumFactory implements EnumFactory { } public String toCode(Forms code) { - if (code == Forms._1) + if (code == Forms.NULL) + return null; + if (code == Forms._1) return "1"; if (code == Forms._2) return "2"; return "?"; - } + } public String toSystem(Forms code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/FundsreserveEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/FundsreserveEnumFactory.java index ed744b76c..e6021aac4 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/FundsreserveEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/FundsreserveEnumFactory.java @@ -48,14 +48,16 @@ public class FundsreserveEnumFactory implements EnumFactory { } public String toCode(Fundsreserve code) { - if (code == Fundsreserve.PATIENT) + if (code == Fundsreserve.NULL) + return null; + if (code == Fundsreserve.PATIENT) return "patient"; if (code == Fundsreserve.PROVIDER) return "provider"; if (code == Fundsreserve.NONE) return "none"; return "?"; - } + } public String toSystem(Fundsreserve code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/GaoEvaluationResultCodeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/GaoEvaluationResultCodeEnumFactory.java index dd8f60662..8d096e819 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/GaoEvaluationResultCodeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/GaoEvaluationResultCodeEnumFactory.java @@ -54,7 +54,9 @@ public class GaoEvaluationResultCodeEnumFactory implements EnumFactory { } public String toCode(GoalCategory code) { - if (code == GoalCategory.DIETARY) + if (code == GoalCategory.NULL) + return null; + if (code == GoalCategory.DIETARY) return "dietary"; if (code == GoalCategory.SAFETY) return "safety"; @@ -63,7 +65,7 @@ public class GoalCategoryEnumFactory implements EnumFactory { if (code == GoalCategory.PHYSIOTHERAPY) return "physiotherapy"; return "?"; - } + } public String toSystem(GoalCategory code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/GoalPriorityEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/GoalPriorityEnumFactory.java index 867f98d37..9c7ff404f 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/GoalPriorityEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/GoalPriorityEnumFactory.java @@ -48,14 +48,16 @@ public class GoalPriorityEnumFactory implements EnumFactory { } public String toCode(GoalPriority code) { - if (code == GoalPriority.HIGH) + if (code == GoalPriority.NULL) + return null; + if (code == GoalPriority.HIGH) return "high"; if (code == GoalPriority.MEDIUM) return "medium"; if (code == GoalPriority.LOW) return "low"; return "?"; - } + } public String toSystem(GoalPriority code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/GoalRelationshipTypeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/GoalRelationshipTypeEnumFactory.java index ca21f3bf1..efc6413bd 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/GoalRelationshipTypeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/GoalRelationshipTypeEnumFactory.java @@ -52,7 +52,9 @@ public class GoalRelationshipTypeEnumFactory implements EnumFactory { } public String toCode(GoalStatus code) { - if (code == GoalStatus.PROPOSED) + if (code == GoalStatus.NULL) + return null; + if (code == GoalStatus.PROPOSED) return "proposed"; if (code == GoalStatus.PLANNED) return "planned"; @@ -79,7 +81,7 @@ public class GoalStatusEnumFactory implements EnumFactory { if (code == GoalStatus.CANCELLED) return "cancelled"; return "?"; - } + } public String toSystem(GoalStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/GoalStatusReasonEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/GoalStatusReasonEnumFactory.java index 5b0ed33bd..1b03f4e8c 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/GoalStatusReasonEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/GoalStatusReasonEnumFactory.java @@ -50,7 +50,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"; @@ -67,7 +69,7 @@ public class GroupTypeEnumFactory implements EnumFactory { if (code == GroupType.SUBSTANCE) return "substance"; return "?"; - } + } public String toSystem(GroupType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/GroupingBehaviorEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/GroupingBehaviorEnumFactory.java index bc8f73b68..ad2c2743d 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/GroupingBehaviorEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/GroupingBehaviorEnumFactory.java @@ -48,14 +48,16 @@ public class GroupingBehaviorEnumFactory 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"; @@ -75,7 +77,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/GuideResourcePurposeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/GuideResourcePurposeEnumFactory.java index 8f8663942..2545611cc 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/GuideResourcePurposeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/GuideResourcePurposeEnumFactory.java @@ -54,7 +54,9 @@ public class GuideResourcePurposeEnumFactory implements EnumFactory { } public String toCode(HistoryStatus code) { - if (code == HistoryStatus.PARTIAL) + if (code == HistoryStatus.NULL) + return null; + if (code == HistoryStatus.PARTIAL) return "partial"; if (code == HistoryStatus.COMPLETED) return "completed"; @@ -59,7 +61,7 @@ public class HistoryStatusEnumFactory implements EnumFactory { if (code == HistoryStatus.HEALTHUNKNOWN) return "health-unknown"; return "?"; - } + } public String toSystem(HistoryStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/HspcAbnIntNumericNomEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/HspcAbnIntNumericNomEnumFactory.java index 4c198ab46..8da233c25 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/HspcAbnIntNumericNomEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/HspcAbnIntNumericNomEnumFactory.java @@ -46,12 +46,14 @@ public class HspcAbnIntNumericNomEnumFactory implements EnumFactory { } public String toCode(HspcAddressUse code) { - if (code == HspcAddressUse.BAD) + if (code == HspcAddressUse.NULL) + return null; + if (code == HspcAddressUse.BAD) return "BAD"; if (code == HspcAddressUse.PHYS) return "PHYS"; @@ -87,7 +89,7 @@ public class HspcAddressUseEnumFactory implements EnumFactory { if (code == HspcAddressUse.CONF) return "CONF"; return "?"; - } + } public String toSystem(HspcAddressUse code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/HspcAdmissionSourceEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/HspcAdmissionSourceEnumFactory.java index 271ce6e34..deef765f4 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/HspcAdmissionSourceEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/HspcAdmissionSourceEnumFactory.java @@ -84,7 +84,9 @@ public class HspcAdmissionSourceEnumFactory implements EnumFactory { } public String toCode(HspcTelecomUse code) { - if (code == HspcTelecomUse.NS) + if (code == HspcTelecomUse.NULL) + return null; + if (code == HspcTelecomUse.NS) return "NS"; return "?"; - } + } public String toSystem(HspcTelecomUse code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/HspcVitalsignassociatedprecondEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/HspcVitalsignassociatedprecondEnumFactory.java index cdc303dd4..8d6d665bb 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/HspcVitalsignassociatedprecondEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/HspcVitalsignassociatedprecondEnumFactory.java @@ -50,7 +50,9 @@ public class HspcVitalsignassociatedprecondEnumFactory 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"; @@ -59,7 +61,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/Icd10ProceduresEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/Icd10ProceduresEnumFactory.java index e27914cfa..eea518168 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/Icd10ProceduresEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/Icd10ProceduresEnumFactory.java @@ -48,14 +48,16 @@ public class Icd10ProceduresEnumFactory implements EnumFactory } public String toCode(Icd10Procedures code) { - if (code == Icd10Procedures._123001) + if (code == Icd10Procedures.NULL) + return null; + if (code == Icd10Procedures._123001) return "123001"; if (code == Icd10Procedures._123002) return "123002"; if (code == Icd10Procedures._123003) return "123003"; return "?"; - } + } public String toSystem(Icd10Procedures code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/IdentifierTypeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/IdentifierTypeEnumFactory.java index 985d022d5..104ef9e03 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/IdentifierTypeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/IdentifierTypeEnumFactory.java @@ -52,7 +52,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"; @@ -63,7 +65,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/IdentifierUseEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/IdentifierUseEnumFactory.java index 133b27599..0c447b958 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/IdentifierUseEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/IdentifierUseEnumFactory.java @@ -50,7 +50,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"; @@ -59,7 +61,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/IdentityAssuranceLevelEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/IdentityAssuranceLevelEnumFactory.java index b733ea282..05a243f52 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/IdentityAssuranceLevelEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/IdentityAssuranceLevelEnumFactory.java @@ -50,7 +50,9 @@ public class IdentityAssuranceLevelEnumFactory 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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/IssueSeverityEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/IssueSeverityEnumFactory.java index a6915753a..2b1f602a0 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/IssueSeverityEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/IssueSeverityEnumFactory.java @@ -50,7 +50,9 @@ public class IssueSeverityEnumFactory implements EnumFactory { } public String toCode(IssueSeverity code) { - if (code == IssueSeverity.FATAL) + if (code == IssueSeverity.NULL) + return null; + if (code == IssueSeverity.FATAL) return "fatal"; if (code == IssueSeverity.ERROR) return "error"; @@ -59,7 +61,7 @@ public class IssueSeverityEnumFactory implements EnumFactory { if (code == IssueSeverity.INFORMATION) return "information"; return "?"; - } + } public String toSystem(IssueSeverity code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/IssueTypeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/IssueTypeEnumFactory.java index 7bd063f18..2e6e6f8b8 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/IssueTypeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/IssueTypeEnumFactory.java @@ -100,7 +100,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"; @@ -159,7 +161,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ItemTypeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ItemTypeEnumFactory.java index 11c52ecff..bef0af3b4 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ItemTypeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ItemTypeEnumFactory.java @@ -78,7 +78,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/LOINC480020AnswerlistEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/LOINC480020AnswerlistEnumFactory.java index 93c89b168..03cac6a8a 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/LOINC480020AnswerlistEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/LOINC480020AnswerlistEnumFactory.java @@ -56,7 +56,9 @@ public class LOINC480020AnswerlistEnumFactory implements EnumFactory { } public String toCode(LinkType code) { - if (code == LinkType.REPLACE) + if (code == LinkType.NULL) + return null; + if (code == LinkType.REPLACE) return "replace"; if (code == LinkType.REFER) return "refer"; if (code == LinkType.SEEALSO) return "seealso"; return "?"; - } + } public String toSystem(LinkType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/LinkageTypeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/LinkageTypeEnumFactory.java index 99b90c659..e5ea5ede1 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/LinkageTypeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/LinkageTypeEnumFactory.java @@ -48,14 +48,16 @@ public class LinkageTypeEnumFactory implements EnumFactory { } public String toCode(LinkageType code) { - if (code == LinkageType.SOURCE) + if (code == LinkageType.NULL) + return null; + if (code == LinkageType.SOURCE) return "source"; if (code == LinkageType.ALTERNATE) return "alternate"; if (code == LinkageType.HISTORICAL) return "historical"; return "?"; - } + } public String toSystem(LinkageType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ListEmptyReasonEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ListEmptyReasonEnumFactory.java index e16f69aa5..9ba434f87 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ListEmptyReasonEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ListEmptyReasonEnumFactory.java @@ -54,7 +54,9 @@ public class ListEmptyReasonEnumFactory implements EnumFactory } public String toCode(ListEmptyReason code) { - if (code == ListEmptyReason.NILKNOWN) + if (code == ListEmptyReason.NULL) + return null; + if (code == ListEmptyReason.NILKNOWN) return "nilknown"; if (code == ListEmptyReason.NOTASKED) return "notasked"; @@ -67,7 +69,7 @@ public class ListEmptyReasonEnumFactory implements EnumFactory if (code == ListEmptyReason.CLOSED) return "closed"; return "?"; - } + } public String toSystem(ListEmptyReason code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ListExampleCodesEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ListExampleCodesEnumFactory.java index 51699e378..a158656dc 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ListExampleCodesEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ListExampleCodesEnumFactory.java @@ -60,7 +60,9 @@ public class ListExampleCodesEnumFactory implements EnumFactory { } public String toCode(ListItemFlag code) { - if (code == ListItemFlag._01) + if (code == ListItemFlag.NULL) + return null; + if (code == ListItemFlag._01) return "01"; if (code == ListItemFlag._02) return "02"; @@ -67,7 +69,7 @@ public class ListItemFlagEnumFactory implements EnumFactory { if (code == ListItemFlag._06) return "06"; return "?"; - } + } public String toSystem(ListItemFlag code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ListModeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ListModeEnumFactory.java index af14b9422..0518326df 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ListModeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ListModeEnumFactory.java @@ -48,14 +48,16 @@ public class ListModeEnumFactory implements EnumFactory { } public String toCode(ListMode code) { - if (code == ListMode.WORKING) + if (code == ListMode.NULL) + return null; + if (code == ListMode.WORKING) return "working"; if (code == ListMode.SNAPSHOT) return "snapshot"; if (code == ListMode.CHANGES) return "changes"; return "?"; - } + } public String toSystem(ListMode code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ListOrderEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ListOrderEnumFactory.java index a07e806d1..ef9ad882f 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ListOrderEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ListOrderEnumFactory.java @@ -58,7 +58,9 @@ public class ListOrderEnumFactory implements EnumFactory { } public String toCode(ListOrder code) { - if (code == ListOrder.USER) + if (code == ListOrder.NULL) + return null; + if (code == ListOrder.USER) return "user"; if (code == ListOrder.SYSTEM) return "system"; @@ -75,7 +77,7 @@ public class ListOrderEnumFactory implements EnumFactory { if (code == ListOrder.PATIENT) return "patient"; return "?"; - } + } public String toSystem(ListOrder code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ListStatusEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ListStatusEnumFactory.java index 9548b51ed..8257b84f9 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ListStatusEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ListStatusEnumFactory.java @@ -48,14 +48,16 @@ public class ListStatusEnumFactory implements EnumFactory { } public String toCode(ListStatus code) { - if (code == ListStatus.CURRENT) + if (code == ListStatus.NULL) + return null; + if (code == ListStatus.CURRENT) return "current"; if (code == ListStatus.RETIRED) return "retired"; if (code == ListStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(ListStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/LocationModeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/LocationModeEnumFactory.java index 875fb9c4d..9a3c6a95e 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/LocationModeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/LocationModeEnumFactory.java @@ -46,12 +46,14 @@ public class LocationModeEnumFactory implements EnumFactory { } public String toCode(LocationMode code) { - if (code == LocationMode.INSTANCE) + if (code == LocationMode.NULL) + return null; + if (code == LocationMode.INSTANCE) return "instance"; if (code == LocationMode.KIND) return "kind"; return "?"; - } + } public String toSystem(LocationMode code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/LocationPhysicalTypeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/LocationPhysicalTypeEnumFactory.java index 07d2c0f50..08517ccc6 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/LocationPhysicalTypeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/LocationPhysicalTypeEnumFactory.java @@ -66,7 +66,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MapContextTypeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MapContextTypeEnumFactory.java index 932633d64..76f8c7f88 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MapContextTypeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MapContextTypeEnumFactory.java @@ -46,12 +46,14 @@ public class MapContextTypeEnumFactory implements EnumFactory { } public String toCode(MapContextType code) { - if (code == MapContextType.TYPE) + if (code == MapContextType.NULL) + return null; + if (code == MapContextType.TYPE) return "type"; if (code == MapContextType.VARIABLE) return "variable"; return "?"; - } + } public String toSystem(MapContextType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MapInputModeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MapInputModeEnumFactory.java index bf5bd391e..102e938c6 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MapInputModeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MapInputModeEnumFactory.java @@ -46,12 +46,14 @@ public class MapInputModeEnumFactory 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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MapListModeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MapListModeEnumFactory.java index 75881af66..86663f8c1 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MapListModeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MapListModeEnumFactory.java @@ -48,14 +48,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MapModelModeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MapModelModeEnumFactory.java index f4e911008..d3df7af02 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MapModelModeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MapModelModeEnumFactory.java @@ -50,7 +50,9 @@ public class MapModelModeEnumFactory implements EnumFactory { } public String toCode(MapModelMode code) { - if (code == MapModelMode.SOURCE) + if (code == MapModelMode.NULL) + return null; + if (code == MapModelMode.SOURCE) return "source"; if (code == MapModelMode.QUERIED) return "queried"; @@ -59,7 +61,7 @@ public class MapModelModeEnumFactory implements EnumFactory { if (code == MapModelMode.PRODUCED) return "produced"; return "?"; - } + } public String toSystem(MapModelMode code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MapTransformEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MapTransformEnumFactory.java index de3a38072..5d6d7b3d9 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MapTransformEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MapTransformEnumFactory.java @@ -66,7 +66,9 @@ public class MapTransformEnumFactory 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"; @@ -91,7 +93,7 @@ public class MapTransformEnumFactory implements EnumFactory { if (code == MapTransform.EVALUATE) return "evaluate"; return "?"; - } + } public String toSystem(MapTransform code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MaritalStatusEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MaritalStatusEnumFactory.java index 5de6b8e6b..001c09adb 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MaritalStatusEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MaritalStatusEnumFactory.java @@ -44,10 +44,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MatchGradeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MatchGradeEnumFactory.java index eab999d36..2faaa748f 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MatchGradeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MatchGradeEnumFactory.java @@ -50,7 +50,9 @@ public class MatchGradeEnumFactory implements EnumFactory { } public String toCode(MatchGrade code) { - if (code == MatchGrade.CERTAIN) + if (code == MatchGrade.NULL) + return null; + if (code == MatchGrade.CERTAIN) return "certain"; if (code == MatchGrade.PROBABLE) return "probable"; @@ -59,7 +61,7 @@ public class MatchGradeEnumFactory implements EnumFactory { if (code == MatchGrade.CERTAINLYNOT) return "certainly-not"; return "?"; - } + } public String toSystem(MatchGrade code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MeasureDataUsageEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MeasureDataUsageEnumFactory.java index 9d09c2c05..91e58925f 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MeasureDataUsageEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MeasureDataUsageEnumFactory.java @@ -46,12 +46,14 @@ public class MeasureDataUsageEnumFactory implements EnumFactory { } public String toCode(MeasureScoring code) { - if (code == MeasureScoring.PROPORTION) + if (code == MeasureScoring.NULL) + return null; + if (code == MeasureScoring.PROPORTION) return "proportion"; if (code == MeasureScoring.RATIO) return "ratio"; @@ -59,7 +61,7 @@ public class MeasureScoringEnumFactory implements EnumFactory { if (code == MeasureScoring.COHORT) return "cohort"; return "?"; - } + } public String toSystem(MeasureScoring code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MeasureTypeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MeasureTypeEnumFactory.java index f234aa910..6d413ec7d 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MeasureTypeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MeasureTypeEnumFactory.java @@ -46,12 +46,14 @@ 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"; return "?"; - } + } public String toSystem(MeasureType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MeasurementPrincipleEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MeasurementPrincipleEnumFactory.java index f73b9bf39..63dd0ea97 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MeasurementPrincipleEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MeasurementPrincipleEnumFactory.java @@ -64,7 +64,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"; @@ -87,7 +89,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MessageReasonEncounterEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MessageReasonEncounterEnumFactory.java index 7f4eaf056..886dc66f1 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MessageReasonEncounterEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MessageReasonEncounterEnumFactory.java @@ -54,7 +54,9 @@ public class MessageReasonEncounterEnumFactory implements EnumFactory { } public String toCode(MetricCategory code) { - if (code == MetricCategory.MEASUREMENT) + if (code == MetricCategory.NULL) + return null; + if (code == MetricCategory.MEASUREMENT) return "measurement"; if (code == MetricCategory.SETTING) return "setting"; @@ -59,7 +61,7 @@ public class MetricCategoryEnumFactory implements EnumFactory { if (code == MetricCategory.UNSPECIFIED) return "unspecified"; return "?"; - } + } public String toSystem(MetricCategory code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MetricColorEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MetricColorEnumFactory.java index a53face66..5d48a0c0a 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MetricColorEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MetricColorEnumFactory.java @@ -58,7 +58,9 @@ public class MetricColorEnumFactory implements EnumFactory { } public String toCode(MetricColor code) { - if (code == MetricColor.BLACK) + if (code == MetricColor.NULL) + return null; + if (code == MetricColor.BLACK) return "black"; if (code == MetricColor.RED) return "red"; @@ -75,7 +77,7 @@ public class MetricColorEnumFactory implements EnumFactory { if (code == MetricColor.WHITE) return "white"; return "?"; - } + } public String toSystem(MetricColor code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MetricOperationalStatusEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MetricOperationalStatusEnumFactory.java index 197c2cfc7..36f23c740 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MetricOperationalStatusEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/MetricOperationalStatusEnumFactory.java @@ -48,14 +48,16 @@ public class MetricOperationalStatusEnumFactory implements EnumFactory { } public String toCode(NameUse code) { - if (code == NameUse.USUAL) + if (code == NameUse.NULL) + return null; + if (code == NameUse.USUAL) return "usual"; if (code == NameUse.OFFICIAL) return "official"; @@ -71,7 +73,7 @@ public class NameUseEnumFactory implements EnumFactory { if (code == NameUse.MAIDEN) return "maiden"; return "?"; - } + } public String toSystem(NameUse code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/NamingsystemIdentifierTypeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/NamingsystemIdentifierTypeEnumFactory.java index 8c442e90f..b2b385eac 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/NamingsystemIdentifierTypeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/NamingsystemIdentifierTypeEnumFactory.java @@ -50,7 +50,9 @@ public class NamingsystemIdentifierTypeEnumFactory implements EnumFactory } public String toCode(NarrativeStatus code) { - if (code == NarrativeStatus.GENERATED) + if (code == NarrativeStatus.NULL) + return null; + if (code == NarrativeStatus.GENERATED) return "generated"; if (code == NarrativeStatus.EXTENSIONS) return "extensions"; @@ -59,7 +61,7 @@ public class NarrativeStatusEnumFactory implements EnumFactory if (code == NarrativeStatus.EMPTY) return "empty"; return "?"; - } + } public String toSystem(NarrativeStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/NehtaGlobalStatementValuesEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/NehtaGlobalStatementValuesEnumFactory.java index b035cc953..2437e55bc 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/NehtaGlobalStatementValuesEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/NehtaGlobalStatementValuesEnumFactory.java @@ -48,14 +48,16 @@ public class NehtaGlobalStatementValuesEnumFactory implements EnumFactory } public String toCode(NehtaTumourType code) { - if (code == NehtaTumourType.EPITHELIALTUMOURS) + if (code == NehtaTumourType.NULL) + return null; + if (code == NehtaTumourType.EPITHELIALTUMOURS) return "epithelial-tumours"; if (code == NehtaTumourType.MESENCHYMALTUMOURS) return "mesenchymal-tumours"; return "?"; - } + } public String toSystem(NehtaTumourType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/NetworkTypeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/NetworkTypeEnumFactory.java index 378dcb85e..f91a864c1 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/NetworkTypeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/NetworkTypeEnumFactory.java @@ -52,7 +52,9 @@ public class NetworkTypeEnumFactory implements EnumFactory { } public String toCode(NetworkType code) { - if (code == NetworkType._1) + if (code == NetworkType.NULL) + return null; + if (code == NetworkType._1) return "1"; if (code == NetworkType._2) return "2"; @@ -63,7 +65,7 @@ public class NetworkTypeEnumFactory implements EnumFactory { if (code == NetworkType._5) return "5"; return "?"; - } + } public String toSystem(NetworkType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/NoteTypeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/NoteTypeEnumFactory.java index 2458db1d1..c1a22621a 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/NoteTypeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/NoteTypeEnumFactory.java @@ -48,14 +48,16 @@ public class NoteTypeEnumFactory implements EnumFactory { } public String toCode(NoteType code) { - if (code == NoteType.DISPLAY) + if (code == NoteType.NULL) + return null; + if (code == NoteType.DISPLAY) return "display"; if (code == NoteType.PRINT) return "print"; if (code == NoteType.PRINTOPER) return "printoper"; return "?"; - } + } public String toSystem(NoteType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/NutritionOrderStatusEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/NutritionOrderStatusEnumFactory.java index 2e96484f0..22ef0dd2e 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/NutritionOrderStatusEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/NutritionOrderStatusEnumFactory.java @@ -60,7 +60,9 @@ public class NutritionOrderStatusEnumFactory 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"; @@ -103,7 +105,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ObjectRoleEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ObjectRoleEnumFactory.java index 6fa9288b3..06e05642f 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ObjectRoleEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ObjectRoleEnumFactory.java @@ -90,7 +90,9 @@ public class ObjectRoleEnumFactory implements EnumFactory { } public String toCode(ObjectRole code) { - if (code == ObjectRole._1) + if (code == ObjectRole.NULL) + return null; + if (code == ObjectRole._1) return "1"; if (code == ObjectRole._2) return "2"; @@ -139,7 +141,7 @@ public class ObjectRoleEnumFactory implements EnumFactory { if (code == ObjectRole._24) return "24"; return "?"; - } + } public String toSystem(ObjectRole code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ObjectTypeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ObjectTypeEnumFactory.java index 4d285f4c6..1c2560c80 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ObjectTypeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ObjectTypeEnumFactory.java @@ -50,7 +50,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"; @@ -59,7 +61,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ObservationCategoryEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ObservationCategoryEnumFactory.java index 56bc2d2ac..6a0adfa18 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ObservationCategoryEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ObservationCategoryEnumFactory.java @@ -58,7 +58,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/OccurrenceSpanCodesEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/OccurrenceSpanCodesEnumFactory.java index c17cf20de..a4e9434d3 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/OccurrenceSpanCodesEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/OccurrenceSpanCodesEnumFactory.java @@ -46,12 +46,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/OperationOutcomeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/OperationOutcomeEnumFactory.java index 52e87c7f8..aff4362c6 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/OperationOutcomeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/OperationOutcomeEnumFactory.java @@ -140,7 +140,9 @@ public class OperationOutcomeEnumFactory implements EnumFactory { } public String toCode(OrderStatus code) { - if (code == OrderStatus.PENDING) + if (code == OrderStatus.NULL) + return null; + if (code == OrderStatus.PENDING) return "pending"; if (code == OrderStatus.REVIEW) return "review"; @@ -79,7 +81,7 @@ public class OrderStatusEnumFactory implements EnumFactory { if (code == OrderStatus.COMPLETED) return "completed"; return "?"; - } + } public String toSystem(OrderStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/OrganizationTypeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/OrganizationTypeEnumFactory.java index e6b739cec..ce4fcbb7c 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/OrganizationTypeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/OrganizationTypeEnumFactory.java @@ -64,7 +64,9 @@ public class OrganizationTypeEnumFactory 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"; @@ -59,7 +61,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/PayeetypeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/PayeetypeEnumFactory.java index 52e564dbe..518154d16 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/PayeetypeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/PayeetypeEnumFactory.java @@ -48,14 +48,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/PaymentAdjustmentReasonEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/PaymentAdjustmentReasonEnumFactory.java index 3df7ccdc9..5e0cbe99c 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/PaymentAdjustmentReasonEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/PaymentAdjustmentReasonEnumFactory.java @@ -46,12 +46,14 @@ public class PaymentAdjustmentReasonEnumFactory implements EnumFactory { } public String toCode(PaymentStatus code) { - if (code == PaymentStatus.PAID) + if (code == PaymentStatus.NULL) + return null; + if (code == PaymentStatus.PAID) return "paid"; if (code == PaymentStatus.CLEARED) return "cleared"; return "?"; - } + } public String toSystem(PaymentStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/PaymentTypeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/PaymentTypeEnumFactory.java index 3acce705b..0507d370f 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/PaymentTypeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/PaymentTypeEnumFactory.java @@ -48,14 +48,16 @@ public class PaymentTypeEnumFactory implements EnumFactory { } public String toCode(PaymentType code) { - if (code == PaymentType.PAYMENT) + if (code == PaymentType.NULL) + return null; + if (code == PaymentType.PAYMENT) return "payment"; if (code == PaymentType.ADJUSTMENT) return "adjustment"; if (code == PaymentType.ADVANCE) return "advance"; return "?"; - } + } public String toSystem(PaymentType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/PractitionerRoleEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/PractitionerRoleEnumFactory.java index c8b4f8765..316e8605c 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/PractitionerRoleEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/PractitionerRoleEnumFactory.java @@ -54,7 +54,9 @@ public class PractitionerRoleEnumFactory implements EnumFactory } public String toCode(ProcedureStatus code) { - if (code == ProcedureStatus.INPROGRESS) + if (code == ProcedureStatus.NULL) + return null; + if (code == ProcedureStatus.INPROGRESS) return "in-progress"; if (code == ProcedureStatus.ABORTED) return "aborted"; @@ -59,7 +61,7 @@ public class ProcedureStatusEnumFactory implements EnumFactory if (code == ProcedureStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(ProcedureStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ProcessOutcomeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ProcessOutcomeEnumFactory.java index ad3d3f612..b05f987d4 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ProcessOutcomeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ProcessOutcomeEnumFactory.java @@ -48,14 +48,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ProcessPriorityEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ProcessPriorityEnumFactory.java index 08789399e..dabc2b42f 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ProcessPriorityEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ProcessPriorityEnumFactory.java @@ -48,14 +48,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ProfileDestinationTypesEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ProfileDestinationTypesEnumFactory.java index 3b4c471f9..5c85ed20a 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ProfileDestinationTypesEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ProfileDestinationTypesEnumFactory.java @@ -50,7 +50,9 @@ public class ProfileDestinationTypesEnumFactory implements EnumFactory { } public String toCode(ProtocolStatus code) { - if (code == ProtocolStatus.DRAFT) + if (code == ProtocolStatus.NULL) + return null; + if (code == ProtocolStatus.DRAFT) return "draft"; if (code == ProtocolStatus.TESTING) return "testing"; @@ -67,7 +69,7 @@ public class ProtocolStatusEnumFactory implements EnumFactory { if (code == ProtocolStatus.SUPERSEDED) return "superseded"; return "?"; - } + } public String toSystem(ProtocolStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ProtocolTypeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ProtocolTypeEnumFactory.java index 2b97f0b9b..1f9d3be88 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ProtocolTypeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ProtocolTypeEnumFactory.java @@ -50,7 +50,9 @@ public class ProtocolTypeEnumFactory implements EnumFactory { } public String toCode(ProtocolType code) { - if (code == ProtocolType.CONDITION) + if (code == ProtocolType.NULL) + return null; + if (code == ProtocolType.CONDITION) return "condition"; if (code == ProtocolType.DEVICE) return "device"; @@ -59,7 +61,7 @@ public class ProtocolTypeEnumFactory implements EnumFactory { if (code == ProtocolType.STUDY) return "study"; return "?"; - } + } public String toSystem(ProtocolType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ProvenanceAgentRoleEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ProvenanceAgentRoleEnumFactory.java index 686b7a45a..b86f8f54a 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ProvenanceAgentRoleEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ProvenanceAgentRoleEnumFactory.java @@ -62,7 +62,9 @@ public class ProvenanceAgentRoleEnumFactory implements EnumFactory"; return "?"; - } + } public String toSystem(QuantityComparator code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/QuestionMaxOccursEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/QuestionMaxOccursEnumFactory.java index e762da695..a87018aa5 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/QuestionMaxOccursEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/QuestionMaxOccursEnumFactory.java @@ -44,10 +44,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"; @@ -63,7 +65,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/RelatedClaimRelationshipEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/RelatedClaimRelationshipEnumFactory.java index f6f36d355..43afaf554 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/RelatedClaimRelationshipEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/RelatedClaimRelationshipEnumFactory.java @@ -46,12 +46,14 @@ public class RelatedClaimRelationshipEnumFactory implements EnumFactory { } public String toCode(Relationship code) { - if (code == Relationship._1) + if (code == Relationship.NULL) + return null; + if (code == Relationship._1) return "1"; if (code == Relationship._2) return "2"; @@ -63,7 +65,7 @@ public class RelationshipEnumFactory implements EnumFactory { if (code == Relationship._5) return "5"; return "?"; - } + } public String toSystem(Relationship code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/RemittanceOutcomeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/RemittanceOutcomeEnumFactory.java index 84a027c77..27e87e785 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/RemittanceOutcomeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/RemittanceOutcomeEnumFactory.java @@ -46,12 +46,14 @@ public class RemittanceOutcomeEnumFactory 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.ALLERGYINTOLERANCE) return "AllergyIntolerance"; @@ -503,7 +505,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ResourceValidationModeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ResourceValidationModeEnumFactory.java index ca1dda069..d758f73c3 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ResourceValidationModeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ResourceValidationModeEnumFactory.java @@ -48,14 +48,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/RestfulConformanceModeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/RestfulConformanceModeEnumFactory.java index 7e5d9dfc8..7d4437704 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/RestfulConformanceModeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/RestfulConformanceModeEnumFactory.java @@ -46,12 +46,14 @@ public class RestfulConformanceModeEnumFactory implements EnumFactory } public String toCode(RiskProbability code) { - if (code == RiskProbability.NEGLIGIBLE) + if (code == RiskProbability.NULL) + return null; + if (code == RiskProbability.NEGLIGIBLE) return "negligible"; if (code == RiskProbability.LOW) return "low"; @@ -63,7 +65,7 @@ public class RiskProbabilityEnumFactory implements EnumFactory if (code == RiskProbability.CERTAIN) return "certain"; return "?"; - } + } public String toSystem(RiskProbability code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/RulesetEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/RulesetEnumFactory.java index ab2d16cbd..3a2660fb2 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/RulesetEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/RulesetEnumFactory.java @@ -54,7 +54,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"; @@ -67,7 +69,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/SearchEntryModeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/SearchEntryModeEnumFactory.java index dd06eb61d..da8726f2e 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/SearchEntryModeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/SearchEntryModeEnumFactory.java @@ -48,14 +48,16 @@ public class SearchEntryModeEnumFactory 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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/SearchModifierCodeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/SearchModifierCodeEnumFactory.java index 832953b32..349c501c2 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/SearchModifierCodeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/SearchModifierCodeEnumFactory.java @@ -62,7 +62,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"; @@ -75,7 +77,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/SearchXpathUsageEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/SearchXpathUsageEnumFactory.java index a1676cf0e..17fba3f98 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/SearchXpathUsageEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/SearchXpathUsageEnumFactory.java @@ -52,7 +52,9 @@ public class SearchXpathUsageEnumFactory implements EnumFactory { } public String toCode(SequenceType code) { - if (code == SequenceType.AA) + if (code == SequenceType.NULL) + return null; + if (code == SequenceType.AA) return "AA"; if (code == SequenceType.DNA) return "DNA"; if (code == SequenceType.RNA) return "RNA"; return "?"; - } + } public String toSystem(SequenceType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ServiceCategoryEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ServiceCategoryEnumFactory.java index 38ea8f700..1ab6d0465 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ServiceCategoryEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ServiceCategoryEnumFactory.java @@ -118,7 +118,9 @@ public class ServiceCategoryEnumFactory implements EnumFactory } public String toCode(ServiceCategory code) { - if (code == ServiceCategory._1) + if (code == ServiceCategory.NULL) + return null; + if (code == ServiceCategory._1) return "1"; if (code == ServiceCategory._2) return "2"; @@ -195,7 +197,7 @@ public class ServiceCategoryEnumFactory implements EnumFactory if (code == ServiceCategory._33) return "33"; return "?"; - } + } public String toSystem(ServiceCategory code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ServiceModifiersEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ServiceModifiersEnumFactory.java index 5aa26f7c8..512eb8ac1 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ServiceModifiersEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ServiceModifiersEnumFactory.java @@ -46,12 +46,14 @@ public class ServiceModifiersEnumFactory implements EnumFactory } public String toCode(ServicePharmacy code) { - if (code == ServicePharmacy.SMOKECESS) + if (code == ServicePharmacy.NULL) + return null; + if (code == ServicePharmacy.SMOKECESS) return "smokecess"; if (code == ServicePharmacy.FLUSHOT) return "flushot"; return "?"; - } + } public String toSystem(ServicePharmacy code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ServicePlaceEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ServicePlaceEnumFactory.java index bf699f125..0729e7384 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ServicePlaceEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ServicePlaceEnumFactory.java @@ -46,12 +46,14 @@ public class ServicePlaceEnumFactory implements EnumFactory { } public String toCode(ServicePlace code) { - if (code == ServicePlace.EMERGENCY) + if (code == ServicePlace.NULL) + return null; + if (code == ServicePlace.EMERGENCY) return "emergency"; if (code == ServicePlace.CLINIC) return "clinic"; return "?"; - } + } public String toSystem(ServicePlace code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ServiceProductEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ServiceProductEnumFactory.java index c1671187e..ddcaa0f3f 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ServiceProductEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ServiceProductEnumFactory.java @@ -46,12 +46,14 @@ public class ServiceProductEnumFactory implements EnumFactory { } public String toCode(ServiceProduct code) { - if (code == ServiceProduct.EXAM) + if (code == ServiceProduct.NULL) + return null; + if (code == ServiceProduct.EXAM) return "exam"; if (code == ServiceProduct.FLUSHOT) return "flushot"; return "?"; - } + } public String toSystem(ServiceProduct code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ServiceProvisionConditionsEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ServiceProvisionConditionsEnumFactory.java index 5f41ff6bc..a22715ea9 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ServiceProvisionConditionsEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ServiceProvisionConditionsEnumFactory.java @@ -48,14 +48,16 @@ public class ServiceProvisionConditionsEnumFactory implements EnumFactory { } public String toCode(ServiceType code) { - if (code == ServiceType._1) + if (code == ServiceType.NULL) + return null; + if (code == ServiceType._1) return "1"; if (code == ServiceType._2) return "2"; @@ -2427,7 +2429,7 @@ public class ServiceTypeEnumFactory implements EnumFactory { if (code == ServiceType._629) return "629"; return "?"; - } + } public String toSystem(ServiceType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ServiceUsclsEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ServiceUsclsEnumFactory.java index 280515cf8..832c6f697 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ServiceUsclsEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/ServiceUsclsEnumFactory.java @@ -80,7 +80,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"; @@ -119,7 +121,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/SignatureTypeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/SignatureTypeEnumFactory.java index 9ff45b56a..525bea384 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/SignatureTypeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/SignatureTypeEnumFactory.java @@ -78,7 +78,9 @@ public class SignatureTypeEnumFactory implements EnumFactory { } public String toCode(SignatureType code) { - if (code == SignatureType.OID_1_2_840_10065_1_12_1_1) + if (code == SignatureType.NULL) + return null; + if (code == SignatureType.OID_1_2_840_10065_1_12_1_1) return "1.2.840.10065.1.12.1.1"; if (code == SignatureType.OID_1_2_840_10065_1_12_1_2) return "1.2.840.10065.1.12.1.2"; @@ -115,7 +117,7 @@ public class SignatureTypeEnumFactory implements EnumFactory { if (code == SignatureType.OID_1_2_840_10065_1_12_1_18) return "1.2.840.10065.1.12.1.18"; return "?"; - } + } public String toSystem(SignatureType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/SlotstatusEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/SlotstatusEnumFactory.java index 6ffac1f24..b0c154a49 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/SlotstatusEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/SlotstatusEnumFactory.java @@ -50,7 +50,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"; @@ -59,7 +61,7 @@ public class SlotstatusEnumFactory implements EnumFactory { if (code == Slotstatus.BUSYTENTATIVE) return "busy-tentative"; return "?"; - } + } public String toSystem(Slotstatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/SpecialValuesEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/SpecialValuesEnumFactory.java index e4eb32c41..b44acde4b 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/SpecialValuesEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/SpecialValuesEnumFactory.java @@ -54,7 +54,9 @@ public class SpecialValuesEnumFactory implements EnumFactory { } public String toCode(SpecialValues code) { - if (code == SpecialValues.TRUE) + if (code == SpecialValues.NULL) + return null; + if (code == SpecialValues.TRUE) return "true"; if (code == SpecialValues.FALSE) return "false"; @@ -67,7 +69,7 @@ public class SpecialValuesEnumFactory implements EnumFactory { if (code == SpecialValues.NILKNOWN) return "nil-known"; return "?"; - } + } public String toSystem(SpecialValues code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/SpecimenStatusEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/SpecimenStatusEnumFactory.java index 2a10eb0f0..fe405200a 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/SpecimenStatusEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/SpecimenStatusEnumFactory.java @@ -50,7 +50,9 @@ public class SpecimenStatusEnumFactory implements EnumFactory { } public String toCode(SpecimenStatus code) { - if (code == SpecimenStatus.AVAILABLE) + if (code == SpecimenStatus.NULL) + return null; + if (code == SpecimenStatus.AVAILABLE) return "available"; if (code == SpecimenStatus.UNAVAILABLE) return "unavailable"; @@ -59,7 +61,7 @@ public class SpecimenStatusEnumFactory implements EnumFactory { if (code == SpecimenStatus.ENTEREDINERROR) return "entered-in-error"; return "?"; - } + } public String toSystem(SpecimenStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/StructureDefinitionKindEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/StructureDefinitionKindEnumFactory.java index dc297d77d..496f60f43 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/StructureDefinitionKindEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/StructureDefinitionKindEnumFactory.java @@ -48,14 +48,16 @@ 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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/SubstanceCategoryEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/SubstanceCategoryEnumFactory.java index d56c71192..7f8f9a22d 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/SubstanceCategoryEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/SubstanceCategoryEnumFactory.java @@ -56,7 +56,9 @@ public class SubstanceCategoryEnumFactory implements EnumFactory { } public String toCode(Surface code) { - if (code == Surface.M) + if (code == Surface.NULL) + return null; + if (code == Surface.M) return "M"; if (code == Surface.O) return "O"; @@ -87,7 +89,7 @@ public class SurfaceEnumFactory implements EnumFactory { if (code == Surface.MOD) return "MOD"; return "?"; - } + } public String toSystem(Surface code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/TaskPerformerTypeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/TaskPerformerTypeEnumFactory.java index dc1e27999..49cb622cb 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/TaskPerformerTypeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/TaskPerformerTypeEnumFactory.java @@ -58,7 +58,9 @@ public class TaskPerformerTypeEnumFactory 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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/TaskStatusEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/TaskStatusEnumFactory.java index f6cbf0783..c588e7874 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/TaskStatusEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/TaskStatusEnumFactory.java @@ -62,7 +62,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"; @@ -83,7 +85,7 @@ public class TaskStatusEnumFactory implements EnumFactory { if (code == TaskStatus.COMPLETED) return "completed"; return "?"; - } + } public String toSystem(TaskStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/TeethEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/TeethEnumFactory.java index e40022e43..00f01af96 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/TeethEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/TeethEnumFactory.java @@ -106,7 +106,9 @@ public class TeethEnumFactory implements EnumFactory { } public String toCode(Teeth code) { - if (code == Teeth._11) + if (code == Teeth.NULL) + return null; + if (code == Teeth._11) return "11"; if (code == Teeth._12) return "12"; @@ -171,7 +173,7 @@ public class TeethEnumFactory implements EnumFactory { if (code == Teeth._48) return "48"; return "?"; - } + } public String toSystem(Teeth code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/TestscriptOperationCodesEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/TestscriptOperationCodesEnumFactory.java index 314118c44..7e3707503 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/TestscriptOperationCodesEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/TestscriptOperationCodesEnumFactory.java @@ -124,7 +124,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"; @@ -207,7 +209,7 @@ public class ToothEnumFactory implements EnumFactory { if (code == Tooth._48) return "48"; return "?"; - } + } public String toSystem(Tooth code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/TransactionModeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/TransactionModeEnumFactory.java index 217f53f83..662390d5a 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/TransactionModeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/TransactionModeEnumFactory.java @@ -50,7 +50,9 @@ public class TransactionModeEnumFactory implements EnumFactory } public String toCode(TransactionMode code) { - if (code == TransactionMode.NOTSUPPORTED) + if (code == TransactionMode.NULL) + return null; + if (code == TransactionMode.NOTSUPPORTED) return "not-supported"; if (code == TransactionMode.BATCH) return "batch"; @@ -59,7 +61,7 @@ public class TransactionModeEnumFactory implements EnumFactory if (code == TransactionMode.BOTH) return "both"; return "?"; - } + } public String toSystem(TransactionMode code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/TriggerTypeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/TriggerTypeEnumFactory.java index 641d32dcb..2a4b04327 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/TriggerTypeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/TriggerTypeEnumFactory.java @@ -56,7 +56,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"; @@ -71,7 +73,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/TypeDerivationRuleEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/TypeDerivationRuleEnumFactory.java index 05a89a3f3..c33a1e483 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/TypeDerivationRuleEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/TypeDerivationRuleEnumFactory.java @@ -46,12 +46,14 @@ public class TypeDerivationRuleEnumFactory 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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/UnknownContentCodeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/UnknownContentCodeEnumFactory.java index 16b69c583..53d050b4e 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/UnknownContentCodeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/UnknownContentCodeEnumFactory.java @@ -50,7 +50,9 @@ public class UnknownContentCodeEnumFactory implements EnumFactory { } public String toCode(UslabDoEvent code) { - if (code == UslabDoEvent.NEWREQUEST) + if (code == UslabDoEvent.NULL) + return null; + if (code == UslabDoEvent.NEWREQUEST) return "new-request"; if (code == UslabDoEvent.ADDONREQUEST) return "add-on-request"; @@ -59,7 +61,7 @@ public class UslabDoEventEnumFactory implements EnumFactory { if (code == UslabDoEvent.LABCANCEL) return "lab-cancel"; return "?"; - } + } public String toSystem(UslabDoEvent code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/UslabObsKindEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/UslabObsKindEnumFactory.java index 986d1e27d..e1f47efe6 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/UslabObsKindEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/UslabObsKindEnumFactory.java @@ -48,14 +48,16 @@ public class UslabObsKindEnumFactory implements EnumFactory { } public String toCode(UslabObsKind code) { - if (code == UslabObsKind.RESULT) + if (code == UslabObsKind.NULL) + return null; + if (code == UslabObsKind.RESULT) return "result"; if (code == UslabObsKind.RESPONSE) return "response"; if (code == UslabObsKind.INFORMATION) return "information"; return "?"; - } + } public String toSystem(UslabObsKind code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3AcknowledgementConditionEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3AcknowledgementConditionEnumFactory.java index 7c109856b..3d41d0059 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3AcknowledgementConditionEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3AcknowledgementConditionEnumFactory.java @@ -50,7 +50,9 @@ public class V3AcknowledgementConditionEnumFactory implements EnumFactory { } public String toCode(V3ActClass code) { - if (code == V3ActClass.ACT) + if (code == V3ActClass.NULL) + return null; + if (code == V3ActClass.ACT) return "ACT"; if (code == V3ActClass._ACTCLASSRECORDORGANIZER) return "_ActClassRecordOrganizer"; @@ -539,7 +541,7 @@ public class V3ActClassEnumFactory implements EnumFactory { if (code == V3ActClass.UNORDERED) return "unordered"; return "?"; - } + } public String toSystem(V3ActClass code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ActCodeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ActCodeEnumFactory.java index dd782023f..16a3b49e6 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ActCodeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ActCodeEnumFactory.java @@ -2224,7 +2224,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"; @@ -4407,7 +4409,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ActExposureLevelCodeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ActExposureLevelCodeEnumFactory.java index 4a4eec6d8..d3d23073c 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ActExposureLevelCodeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ActExposureLevelCodeEnumFactory.java @@ -50,7 +50,9 @@ public class V3ActExposureLevelCodeEnumFactory implements EnumFactory { } public String toCode(V3ActMood code) { - if (code == V3ActMood._ACTMOODCOMPLETIONTRACK) + if (code == V3ActMood.NULL) + return null; + if (code == V3ActMood._ACTMOODCOMPLETIONTRACK) return "_ActMoodCompletionTrack"; if (code == V3ActMood._ACTMOODPOTENTIAL) return "_ActMoodPotential"; @@ -155,7 +157,7 @@ public class V3ActMoodEnumFactory implements EnumFactory { if (code == V3ActMood.OPT) return "OPT"; return "?"; - } + } public String toSystem(V3ActMood code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ActPriorityEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ActPriorityEnumFactory.java index 4ebbf4ecf..da3edad10 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ActPriorityEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ActPriorityEnumFactory.java @@ -72,7 +72,9 @@ public class V3ActPriorityEnumFactory implements EnumFactory { } public String toCode(V3ActPriority code) { - if (code == V3ActPriority.A) + if (code == V3ActPriority.NULL) + return null; + if (code == V3ActPriority.A) return "A"; if (code == V3ActPriority.CR) return "CR"; @@ -103,7 +105,7 @@ public class V3ActPriorityEnumFactory implements EnumFactory { if (code == V3ActPriority.UR) return "UR"; return "?"; - } + } public String toSystem(V3ActPriority code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ActReasonEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ActReasonEnumFactory.java index 57392e704..27f1f15ff 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ActReasonEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ActReasonEnumFactory.java @@ -566,7 +566,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"; @@ -1091,7 +1093,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ActRelationshipCheckpointEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ActRelationshipCheckpointEnumFactory.java index 67e0a0b7d..5b818cf97 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ActRelationshipCheckpointEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ActRelationshipCheckpointEnumFactory.java @@ -52,7 +52,9 @@ public class V3ActRelationshipCheckpointEnumFactory implements EnumFactory { } public String toCode(V3ActSite code) { - if (code == V3ActSite._HUMANACTSITE) + if (code == V3ActSite.NULL) + return null; + if (code == V3ActSite._HUMANACTSITE) return "_HumanActSite"; if (code == V3ActSite._HUMANSUBSTANCEADMINISTRATIONSITE) return "_HumanSubstanceAdministrationSite"; @@ -259,7 +261,7 @@ public class V3ActSiteEnumFactory implements EnumFactory { if (code == V3ActSite.RVL) return "RVL"; return "?"; - } + } public String toSystem(V3ActSite code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ActStatusEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ActStatusEnumFactory.java index 8452ffc38..342790d4e 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ActStatusEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ActStatusEnumFactory.java @@ -62,7 +62,9 @@ public class V3ActStatusEnumFactory implements EnumFactory { } public String toCode(V3ActStatus code) { - if (code == V3ActStatus.NORMAL) + if (code == V3ActStatus.NULL) + return null; + if (code == V3ActStatus.NORMAL) return "normal"; if (code == V3ActStatus.ABORTED) return "aborted"; @@ -83,7 +85,7 @@ public class V3ActStatusEnumFactory implements EnumFactory { if (code == V3ActStatus.OBSOLETE) return "obsolete"; return "?"; - } + } public String toSystem(V3ActStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ActUSPrivacyLawEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ActUSPrivacyLawEnumFactory.java index 626ee1296..d5702b360 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ActUSPrivacyLawEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ActUSPrivacyLawEnumFactory.java @@ -56,7 +56,9 @@ public class V3ActUSPrivacyLawEnumFactory implements EnumFactory { } public String toCode(V3AddressUse code) { - if (code == V3AddressUse._GENERALADDRESSUSE) + if (code == V3AddressUse.NULL) + return null; + if (code == V3AddressUse._GENERALADDRESSUSE) return "_GeneralAddressUse"; if (code == V3AddressUse.BAD) return "BAD"; @@ -119,7 +121,7 @@ public class V3AddressUseEnumFactory implements EnumFactory { if (code == V3AddressUse.PG) return "PG"; return "?"; - } + } public String toSystem(V3AddressUse code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3AdministrativeGenderEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3AdministrativeGenderEnumFactory.java index 80ec23fe7..86707d07a 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3AdministrativeGenderEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3AdministrativeGenderEnumFactory.java @@ -48,14 +48,16 @@ public class V3AdministrativeGenderEnumFactory implements EnumFactory } public String toCode(V3CalendarCycle code) { - if (code == V3CalendarCycle._CALENDARCYCLEONELETTER) + if (code == V3CalendarCycle.NULL) + return null; + if (code == V3CalendarCycle._CALENDARCYCLEONELETTER) return "_CalendarCycleOneLetter"; if (code == V3CalendarCycle.CW) return "CW"; @@ -115,7 +117,7 @@ public class V3CalendarCycleEnumFactory implements EnumFactory if (code == V3CalendarCycle.WM) return "WM"; return "?"; - } + } public String toSystem(V3CalendarCycle code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3CalendarEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3CalendarEnumFactory.java index 1a9b24857..0e8e12f2c 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3CalendarEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3CalendarEnumFactory.java @@ -44,10 +44,12 @@ public class V3CalendarEnumFactory implements EnumFactory { } public String toCode(V3Calendar code) { - if (code == V3Calendar.GREG) + if (code == V3Calendar.NULL) + return null; + if (code == V3Calendar.GREG) return "GREG"; return "?"; - } + } public String toSystem(V3Calendar code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3CalendarTypeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3CalendarTypeEnumFactory.java index 78d3d2722..25995dd3f 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3CalendarTypeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3CalendarTypeEnumFactory.java @@ -44,10 +44,12 @@ public class V3CalendarTypeEnumFactory implements EnumFactory { } public String toCode(V3CalendarType code) { - if (code == V3CalendarType.GREG) + if (code == V3CalendarType.NULL) + return null; + if (code == V3CalendarType.GREG) return "GREG"; return "?"; - } + } public String toSystem(V3CalendarType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3CharsetEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3CharsetEnumFactory.java index 63a5e7233..3a239c9e8 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3CharsetEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3CharsetEnumFactory.java @@ -62,7 +62,9 @@ public class V3CharsetEnumFactory implements EnumFactory { } public String toCode(V3Charset code) { - if (code == V3Charset.EBCDIC) + if (code == V3Charset.NULL) + return null; + if (code == V3Charset.EBCDIC) return "EBCDIC"; if (code == V3Charset.ISO10646UCS2) return "ISO-10646-UCS-2"; @@ -83,7 +85,7 @@ public class V3CharsetEnumFactory implements EnumFactory { if (code == V3Charset.UTF8) return "UTF-8"; return "?"; - } + } public String toSystem(V3Charset code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3CodingRationaleEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3CodingRationaleEnumFactory.java index 6599100f4..9e606c674 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3CodingRationaleEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3CodingRationaleEnumFactory.java @@ -58,7 +58,9 @@ public class V3CodingRationaleEnumFactory implements EnumFactory { } public String toCode(V3ContainerCap code) { - if (code == V3ContainerCap._MEDICATIONCAP) + if (code == V3ContainerCap.NULL) + return null; + if (code == V3ContainerCap._MEDICATIONCAP) return "_MedicationCap"; if (code == V3ContainerCap.CHILD) return "CHILD"; @@ -71,7 +73,7 @@ public class V3ContainerCapEnumFactory implements EnumFactory { if (code == V3ContainerCap.SCR) return "SCR"; return "?"; - } + } public String toSystem(V3ContainerCap code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ContainerSeparatorEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ContainerSeparatorEnumFactory.java index 48f94b044..6a0438143 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ContainerSeparatorEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ContainerSeparatorEnumFactory.java @@ -46,12 +46,14 @@ public class V3ContainerSeparatorEnumFactory implements EnumFactory } public String toCode(V3DataOperation code) { - if (code == V3DataOperation.OPERATE) + if (code == V3DataOperation.NULL) + return null; + if (code == V3DataOperation.OPERATE) return "OPERATE"; if (code == V3DataOperation.CREATE) return "CREATE"; @@ -123,7 +125,7 @@ public class V3DataOperationEnumFactory implements EnumFactory if (code == V3DataOperation.SUSPEND) return "SUSPEND"; return "?"; - } + } public String toSystem(V3DataOperation code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3DeviceAlertLevelEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3DeviceAlertLevelEnumFactory.java index ac1f08bb3..b87f068f1 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3DeviceAlertLevelEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3DeviceAlertLevelEnumFactory.java @@ -50,7 +50,9 @@ public class V3DeviceAlertLevelEnumFactory implements EnumFactory { } public String toCode(V3EntityClass code) { - if (code == V3EntityClass.ENT) + if (code == V3EntityClass.NULL) + return null; + if (code == V3EntityClass.ENT) return "ENT"; if (code == V3EntityClass.HCE) return "HCE"; @@ -151,7 +153,7 @@ public class V3EntityClassEnumFactory implements EnumFactory { if (code == V3EntityClass.RGRP) return "RGRP"; return "?"; - } + } public String toSystem(V3EntityClass code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3EntityCodeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3EntityCodeEnumFactory.java index 336dc09fd..9cd3ff214 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3EntityCodeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3EntityCodeEnumFactory.java @@ -332,7 +332,9 @@ public class V3EntityCodeEnumFactory implements EnumFactory { } public String toCode(V3EntityCode code) { - if (code == V3EntityCode._MATERIALENTITYCLASSTYPE) + if (code == V3EntityCode.NULL) + return null; + if (code == V3EntityCode._MATERIALENTITYCLASSTYPE) return "_MaterialEntityClassType"; if (code == V3EntityCode._CONTAINERENTITYTYPE) return "_ContainerEntityType"; @@ -623,7 +625,7 @@ public class V3EntityCodeEnumFactory implements EnumFactory { if (code == V3EntityCode.PRAC) return "PRAC"; return "?"; - } + } public String toSystem(V3EntityCode code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3EntityDeterminerEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3EntityDeterminerEnumFactory.java index 1daf56d4f..32a290688 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3EntityDeterminerEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3EntityDeterminerEnumFactory.java @@ -52,7 +52,9 @@ public class V3EntityDeterminerEnumFactory implements EnumFactory } public String toCode(V3EntityNameUse code) { - if (code == V3EntityNameUse._NAMEREPRESENTATIONUSE) + if (code == V3EntityNameUse.NULL) + return null; + if (code == V3EntityNameUse._NAMEREPRESENTATIONUSE) return "_NameRepresentationUse"; if (code == V3EntityNameUse.ABC) return "ABC"; @@ -103,7 +105,7 @@ public class V3EntityNameUseEnumFactory implements EnumFactory if (code == V3EntityNameUse.SNDX) return "SNDX"; return "?"; - } + } public String toSystem(V3EntityNameUse code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3EntityNameUseR2EnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3EntityNameUseR2EnumFactory.java index 5f131dd42..db1f2893d 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3EntityNameUseR2EnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3EntityNameUseR2EnumFactory.java @@ -78,7 +78,9 @@ public class V3EntityNameUseR2EnumFactory implements EnumFactory { } public String toCode(V3EntityRisk code) { - if (code == V3EntityRisk.AGG) + if (code == V3EntityRisk.NULL) + return null; + if (code == V3EntityRisk.AGG) return "AGG"; if (code == V3EntityRisk.BIO) return "BIO"; @@ -87,7 +89,7 @@ public class V3EntityRiskEnumFactory implements EnumFactory { if (code == V3EntityRisk.RAD) return "RAD"; return "?"; - } + } public String toSystem(V3EntityRisk code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3EntityStatusEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3EntityStatusEnumFactory.java index 4c441e97f..a3b10cea6 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3EntityStatusEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3EntityStatusEnumFactory.java @@ -52,7 +52,9 @@ public class V3EntityStatusEnumFactory implements EnumFactory { } public String toCode(V3EntityStatus code) { - if (code == V3EntityStatus.NORMAL) + if (code == V3EntityStatus.NULL) + return null; + if (code == V3EntityStatus.NORMAL) return "normal"; if (code == V3EntityStatus.ACTIVE) return "active"; @@ -63,7 +65,7 @@ public class V3EntityStatusEnumFactory implements EnumFactory { if (code == V3EntityStatus.NULLIFIED) return "nullified"; return "?"; - } + } public String toSystem(V3EntityStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3EquipmentAlertLevelEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3EquipmentAlertLevelEnumFactory.java index 751b270fe..44914a527 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3EquipmentAlertLevelEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3EquipmentAlertLevelEnumFactory.java @@ -50,7 +50,9 @@ public class V3EquipmentAlertLevelEnumFactory implements EnumFactory { } public String toCode(V3Ethnicity code) { - if (code == V3Ethnicity._21352) + if (code == V3Ethnicity.NULL) + return null; + if (code == V3Ethnicity._21352) return "2135-2"; if (code == V3Ethnicity._21378) return "2137-8"; @@ -215,7 +217,7 @@ public class V3EthnicityEnumFactory implements EnumFactory { if (code == V3Ethnicity._21865) return "2186-5"; return "?"; - } + } public String toSystem(V3Ethnicity code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ExposureModeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ExposureModeEnumFactory.java index 8019aa8fc..fe0e93d35 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ExposureModeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ExposureModeEnumFactory.java @@ -52,7 +52,9 @@ public class V3ExposureModeEnumFactory implements EnumFactory { } public String toCode(V3ExposureMode code) { - if (code == V3ExposureMode._EXPOSUREMODE) + if (code == V3ExposureMode.NULL) + return null; + if (code == V3ExposureMode._EXPOSUREMODE) return "_ExposureMode"; if (code == V3ExposureMode.AIRBORNE) return "AIRBORNE"; @@ -63,7 +65,7 @@ public class V3ExposureModeEnumFactory implements EnumFactory { if (code == V3ExposureMode.WATERBORNE) return "WATERBORNE"; return "?"; - } + } public String toSystem(V3ExposureMode code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3GTSAbbreviationEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3GTSAbbreviationEnumFactory.java index b2650e692..a5cc52adf 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3GTSAbbreviationEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3GTSAbbreviationEnumFactory.java @@ -116,7 +116,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3HL7UpdateModeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3HL7UpdateModeEnumFactory.java index 742587a24..7b37a23b4 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3HL7UpdateModeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3HL7UpdateModeEnumFactory.java @@ -74,7 +74,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"; @@ -107,7 +109,7 @@ public class V3HL7UpdateModeEnumFactory implements EnumFactory if (code == V3HL7UpdateMode.V) return "V"; return "?"; - } + } public String toSystem(V3HL7UpdateMode code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3Hl7RealmEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3Hl7RealmEnumFactory.java index 77ac0f8e1..4613104cf 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3Hl7RealmEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3Hl7RealmEnumFactory.java @@ -132,7 +132,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"; @@ -223,7 +225,7 @@ public class V3Hl7RealmEnumFactory implements EnumFactory { if (code == V3Hl7Realm.ZZ) return "ZZ"; return "?"; - } + } public String toSystem(V3Hl7Realm code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3Hl7V3ConformanceEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3Hl7V3ConformanceEnumFactory.java index d14707408..d41d61d5b 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3Hl7V3ConformanceEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3Hl7V3ConformanceEnumFactory.java @@ -54,7 +54,9 @@ public class V3Hl7V3ConformanceEnumFactory implements EnumFactory { } public String toCode(V3HtmlLinkType code) { - if (code == V3HtmlLinkType.ALTERNATE) + if (code == V3HtmlLinkType.NULL) + return null; + if (code == V3HtmlLinkType.ALTERNATE) return "alternate"; if (code == V3HtmlLinkType.APPENDIX) return "appendix"; @@ -103,7 +105,7 @@ public class V3HtmlLinkTypeEnumFactory implements EnumFactory { if (code == V3HtmlLinkType.SUBSECTION) return "subsection"; return "?"; - } + } public String toSystem(V3HtmlLinkType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3IdentifierReliabilityEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3IdentifierReliabilityEnumFactory.java index c6198ebdb..22a4c94ed 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3IdentifierReliabilityEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3IdentifierReliabilityEnumFactory.java @@ -48,14 +48,16 @@ public class V3IdentifierReliabilityEnumFactory implements EnumFactory } public String toCode(V3MaritalStatus code) { - if (code == V3MaritalStatus.A) + if (code == V3MaritalStatus.NULL) + return null; + if (code == V3MaritalStatus.A) return "A"; if (code == V3MaritalStatus.D) return "D"; @@ -83,7 +85,7 @@ public class V3MaritalStatusEnumFactory implements EnumFactory if (code == V3MaritalStatus.W) return "W"; return "?"; - } + } public String toSystem(V3MaritalStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3MessageWaitingPriorityEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3MessageWaitingPriorityEnumFactory.java index f12ed8229..be02da6e0 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3MessageWaitingPriorityEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3MessageWaitingPriorityEnumFactory.java @@ -48,14 +48,16 @@ public class V3MessageWaitingPriorityEnumFactory implements EnumFactory { } public String toCode(V3NullFlavor code) { - if (code == V3NullFlavor.NI) + if (code == V3NullFlavor.NULL) + return null; + if (code == V3NullFlavor.NI) return "NI"; if (code == V3NullFlavor.INV) return "INV"; @@ -111,7 +113,7 @@ public class V3NullFlavorEnumFactory implements EnumFactory { if (code == V3NullFlavor.NP) return "NP"; return "?"; - } + } public String toSystem(V3NullFlavor code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ObservationInterpretationEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ObservationInterpretationEnumFactory.java index 0e26cfbc6..d2c3188fb 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ObservationInterpretationEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ObservationInterpretationEnumFactory.java @@ -150,7 +150,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"; @@ -59,7 +61,7 @@ public class V3PaymentTermsEnumFactory implements EnumFactory { if (code == V3PaymentTerms.N90) return "N90"; return "?"; - } + } public String toSystem(V3PaymentTerms code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3PersonDisabilityTypeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3PersonDisabilityTypeEnumFactory.java index fcf9be171..a565b4a8f 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3PersonDisabilityTypeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3PersonDisabilityTypeEnumFactory.java @@ -62,7 +62,9 @@ public class V3PersonDisabilityTypeEnumFactory implements EnumFactory { } public String toCode(V3ProcessingID code) { - if (code == V3ProcessingID.D) + if (code == V3ProcessingID.NULL) + return null; + if (code == V3ProcessingID.D) return "D"; if (code == V3ProcessingID.P) return "P"; if (code == V3ProcessingID.T) return "T"; return "?"; - } + } public String toSystem(V3ProcessingID code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ProcessingModeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ProcessingModeEnumFactory.java index 47788f943..607472d7f 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ProcessingModeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ProcessingModeEnumFactory.java @@ -50,7 +50,9 @@ public class V3ProcessingModeEnumFactory implements EnumFactory } public String toCode(V3QueryPriority code) { - if (code == V3QueryPriority.D) + if (code == V3QueryPriority.NULL) + return null; + if (code == V3QueryPriority.D) return "D"; if (code == V3QueryPriority.I) return "I"; return "?"; - } + } public String toSystem(V3QueryPriority code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3QueryRequestLimitEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3QueryRequestLimitEnumFactory.java index b091bd709..1e56f84c9 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3QueryRequestLimitEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3QueryRequestLimitEnumFactory.java @@ -46,12 +46,14 @@ public class V3QueryRequestLimitEnumFactory implements EnumFactory } public String toCode(V3QueryResponse code) { - if (code == V3QueryResponse.AE) + if (code == V3QueryResponse.NULL) + return null; + if (code == V3QueryResponse.AE) return "AE"; if (code == V3QueryResponse.NF) return "NF"; @@ -59,7 +61,7 @@ public class V3QueryResponseEnumFactory implements EnumFactory if (code == V3QueryResponse.QE) return "QE"; return "?"; - } + } public String toSystem(V3QueryResponse code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3QueryStatusCodeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3QueryStatusCodeEnumFactory.java index 04ef621c8..c147a614f 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3QueryStatusCodeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3QueryStatusCodeEnumFactory.java @@ -52,7 +52,9 @@ public class V3QueryStatusCodeEnumFactory implements EnumFactory { } public String toCode(V3Race code) { - if (code == V3Race._10025) + if (code == V3Race.NULL) + return null; + if (code == V3Race._10025) return "1002-5"; if (code == V3Race._10041) return "1004-1"; @@ -3727,7 +3729,7 @@ public class V3RaceEnumFactory implements EnumFactory { if (code == V3Race._21311) return "2131-1"; return "?"; - } + } public String toSystem(V3Race code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3RelationalOperatorEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3RelationalOperatorEnumFactory.java index 959ace26c..eefe9e640 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3RelationalOperatorEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3RelationalOperatorEnumFactory.java @@ -58,7 +58,9 @@ public class V3RelationalOperatorEnumFactory implements EnumFactory } public String toCode(V3ResponseLevel code) { - if (code == V3ResponseLevel.C) + if (code == V3ResponseLevel.NULL) + return null; + if (code == V3ResponseLevel.C) return "C"; if (code == V3ResponseLevel.D) return "D"; @@ -71,7 +73,7 @@ public class V3ResponseLevelEnumFactory implements EnumFactory if (code == V3ResponseLevel.X) return "X"; return "?"; - } + } public String toSystem(V3ResponseLevel code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ResponseModalityEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ResponseModalityEnumFactory.java index 0bdb74534..a4a367261 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ResponseModalityEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3ResponseModalityEnumFactory.java @@ -48,14 +48,16 @@ public class V3ResponseModalityEnumFactory implements EnumFactory { } public String toCode(V3ResponseMode code) { - if (code == V3ResponseMode.D) + if (code == V3ResponseMode.NULL) + return null; + if (code == V3ResponseMode.D) return "D"; if (code == V3ResponseMode.I) return "I"; if (code == V3ResponseMode.Q) return "Q"; return "?"; - } + } public String toSystem(V3ResponseMode code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3RoleClassEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3RoleClassEnumFactory.java index 5a8c93311..747d5ae6f 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3RoleClassEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3RoleClassEnumFactory.java @@ -266,7 +266,9 @@ public class V3RoleClassEnumFactory implements EnumFactory { } public String toCode(V3RoleClass code) { - if (code == V3RoleClass.ROL) + if (code == V3RoleClass.NULL) + return null; + if (code == V3RoleClass.ROL) return "ROL"; if (code == V3RoleClass._ROLECLASSASSOCIATIVE) return "_RoleClassAssociative"; @@ -491,7 +493,7 @@ public class V3RoleClassEnumFactory implements EnumFactory { if (code == V3RoleClass.PHYS) return "PHYS"; return "?"; - } + } public String toSystem(V3RoleClass code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3RoleCodeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3RoleCodeEnumFactory.java index a898b950a..32f1f4b00 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3RoleCodeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3RoleCodeEnumFactory.java @@ -836,7 +836,9 @@ public class V3RoleCodeEnumFactory implements EnumFactory { } public String toCode(V3RoleCode code) { - if (code == V3RoleCode._AFFILIATIONROLETYPE) + if (code == V3RoleCode.NULL) + return null; + if (code == V3RoleCode._AFFILIATIONROLETYPE) return "_AffiliationRoleType"; if (code == V3RoleCode._AGENTROLETYPE) return "_AgentRoleType"; @@ -1631,7 +1633,7 @@ public class V3RoleCodeEnumFactory implements EnumFactory { if (code == V3RoleCode.SUBSCR) return "SUBSCR"; return "?"; - } + } public String toSystem(V3RoleCode code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3RoleLinkStatusEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3RoleLinkStatusEnumFactory.java index 163cecae7..63997b59f 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3RoleLinkStatusEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3RoleLinkStatusEnumFactory.java @@ -54,7 +54,9 @@ public class V3RoleLinkStatusEnumFactory implements EnumFactory { } public String toCode(V3RoleLinkType code) { - if (code == V3RoleLinkType.REL) + if (code == V3RoleLinkType.NULL) + return null; + if (code == V3RoleLinkType.REL) return "REL"; if (code == V3RoleLinkType.BACKUP) return "BACKUP"; @@ -75,7 +77,7 @@ public class V3RoleLinkTypeEnumFactory implements EnumFactory { if (code == V3RoleLinkType.REPL) return "REPL"; return "?"; - } + } public String toSystem(V3RoleLinkType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3RoleStatusEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3RoleStatusEnumFactory.java index 06d7ec349..a24dd5e8e 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3RoleStatusEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3RoleStatusEnumFactory.java @@ -56,7 +56,9 @@ public class V3RoleStatusEnumFactory implements EnumFactory { } public String toCode(V3RoleStatus code) { - if (code == V3RoleStatus.NORMAL) + if (code == V3RoleStatus.NULL) + return null; + if (code == V3RoleStatus.NORMAL) return "normal"; if (code == V3RoleStatus.ACTIVE) return "active"; @@ -71,7 +73,7 @@ public class V3RoleStatusEnumFactory implements EnumFactory { if (code == V3RoleStatus.NULLIFIED) return "nullified"; return "?"; - } + } public String toSystem(V3RoleStatus code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3RouteOfAdministrationEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3RouteOfAdministrationEnumFactory.java index eadd1f633..aefe57ccf 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3RouteOfAdministrationEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3RouteOfAdministrationEnumFactory.java @@ -814,7 +814,9 @@ public class V3RouteOfAdministrationEnumFactory implements EnumFactory { } public String toCode(V3Sequencing code) { - if (code == V3Sequencing.A) + if (code == V3Sequencing.NULL) + return null; + if (code == V3Sequencing.A) return "A"; if (code == V3Sequencing.D) return "D"; if (code == V3Sequencing.N) return "N"; return "?"; - } + } public String toSystem(V3Sequencing code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3SetOperatorEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3SetOperatorEnumFactory.java index fbf50b76a..b36cc1924 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3SetOperatorEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3SetOperatorEnumFactory.java @@ -54,7 +54,9 @@ public class V3SetOperatorEnumFactory implements EnumFactory { } public String toCode(V3SetOperator code) { - if (code == V3SetOperator._VALUESETOPERATOR) + if (code == V3SetOperator.NULL) + return null; + if (code == V3SetOperator._VALUESETOPERATOR) return "_ValueSetOperator"; if (code == V3SetOperator.E) return "E"; @@ -67,7 +69,7 @@ public class V3SetOperatorEnumFactory implements EnumFactory { if (code == V3SetOperator.P) return "P"; return "?"; - } + } public String toSystem(V3SetOperator code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3SpecimenTypeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3SpecimenTypeEnumFactory.java index bdc56a392..845dee68e 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3SpecimenTypeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3SpecimenTypeEnumFactory.java @@ -290,7 +290,9 @@ public class V3SpecimenTypeEnumFactory implements EnumFactory { } public String toCode(V3SpecimenType code) { - if (code == V3SpecimenType._SPECIMENENTITYTYPE) + if (code == V3SpecimenType.NULL) + return null; + if (code == V3SpecimenType._SPECIMENENTITYTYPE) return "_SpecimenEntityType"; if (code == V3SpecimenType.ABS) return "ABS"; @@ -539,7 +541,7 @@ public class V3SpecimenTypeEnumFactory implements EnumFactory { if (code == V3SpecimenType.WNDE) return "WNDE"; return "?"; - } + } public String toSystem(V3SpecimenType code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3SubstanceAdminSubstitutionEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3SubstanceAdminSubstitutionEnumFactory.java index 582fa31cf..d9913784a 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3SubstanceAdminSubstitutionEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3SubstanceAdminSubstitutionEnumFactory.java @@ -62,7 +62,9 @@ public class V3SubstanceAdminSubstitutionEnumFactory implements EnumFactory { } public String toCode(V3TableFrame code) { - if (code == V3TableFrame.ABOVE) + if (code == V3TableFrame.NULL) + return null; + if (code == V3TableFrame.ABOVE) return "above"; if (code == V3TableFrame.BELOW) return "below"; @@ -79,7 +81,7 @@ public class V3TableFrameEnumFactory implements EnumFactory { if (code == V3TableFrame.VSIDES) return "vsides"; return "?"; - } + } public String toSystem(V3TableFrame code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3TableRulesEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3TableRulesEnumFactory.java index 6c2db98dd..81614adeb 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3TableRulesEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3TableRulesEnumFactory.java @@ -52,7 +52,9 @@ public class V3TableRulesEnumFactory implements EnumFactory { } public String toCode(V3TableRules code) { - if (code == V3TableRules.ALL) + if (code == V3TableRules.NULL) + return null; + if (code == V3TableRules.ALL) return "all"; if (code == V3TableRules.COLS) return "cols"; @@ -63,7 +65,7 @@ public class V3TableRulesEnumFactory implements EnumFactory { if (code == V3TableRules.ROWS) return "rows"; return "?"; - } + } public String toSystem(V3TableRules code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3TargetAwarenessEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3TargetAwarenessEnumFactory.java index 12cc00240..a24ab8c10 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3TargetAwarenessEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3TargetAwarenessEnumFactory.java @@ -54,7 +54,9 @@ public class V3TargetAwarenessEnumFactory implements EnumFactory { } public String toCode(V3TimingEvent code) { - if (code == V3TimingEvent.AC) + if (code == V3TimingEvent.NULL) + return null; + if (code == V3TimingEvent.AC) return "AC"; if (code == V3TimingEvent.ACD) return "ACD"; @@ -115,7 +117,7 @@ public class V3TimingEventEnumFactory implements EnumFactory { if (code == V3TimingEvent.WAKE) return "WAKE"; return "?"; - } + } public String toSystem(V3TimingEvent code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3TransmissionRelationshipTypeCodeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3TransmissionRelationshipTypeCodeEnumFactory.java index 4ffb84aeb..628bf6d21 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3TransmissionRelationshipTypeCodeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3TransmissionRelationshipTypeCodeEnumFactory.java @@ -44,10 +44,12 @@ public class V3TransmissionRelationshipTypeCodeEnumFactory implements EnumFactor } public String toCode(V3TransmissionRelationshipTypeCode code) { - if (code == V3TransmissionRelationshipTypeCode.SEQL) + if (code == V3TransmissionRelationshipTypeCode.NULL) + return null; + if (code == V3TransmissionRelationshipTypeCode.SEQL) return "SEQL"; return "?"; - } + } public String toSystem(V3TransmissionRelationshipTypeCode code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3TribalEntityUSEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3TribalEntityUSEnumFactory.java index 09a63a86d..e82724116 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3TribalEntityUSEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/V3TribalEntityUSEnumFactory.java @@ -1178,7 +1178,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.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/VariantStateEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/VariantStateEnumFactory.java index 064fa7e05..d626b02b8 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/VariantStateEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/VariantStateEnumFactory.java @@ -48,14 +48,16 @@ public class VariantStateEnumFactory implements EnumFactory { } public String toCode(VariantState code) { - if (code == VariantState.POSITIVE) + if (code == VariantState.NULL) + return null; + if (code == VariantState.POSITIVE) return "positive"; if (code == VariantState.NEGATIVE) return "negative"; if (code == VariantState.ABSENT) return "absent"; return "?"; - } + } public String toSystem(VariantState code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/VersioningPolicyEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/VersioningPolicyEnumFactory.java index 51aa10668..6cfa146eb 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/VersioningPolicyEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/VersioningPolicyEnumFactory.java @@ -48,14 +48,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"; @@ -59,7 +61,7 @@ public class VisionBaseCodesEnumFactory implements EnumFactory if (code == VisionBaseCodes.OUT) return "out"; return "?"; - } + } public String toSystem(VisionBaseCodes code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/VisionEyeCodesEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/VisionEyeCodesEnumFactory.java index 11b9d3108..6929acbf5 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/VisionEyeCodesEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/VisionEyeCodesEnumFactory.java @@ -46,12 +46,14 @@ public class VisionEyeCodesEnumFactory implements EnumFactory { } public String toCode(VisionEyeCodes code) { - if (code == VisionEyeCodes.RIGHT) + if (code == VisionEyeCodes.NULL) + return null; + if (code == VisionEyeCodes.RIGHT) return "right"; if (code == VisionEyeCodes.LEFT) return "left"; return "?"; - } + } public String toSystem(VisionEyeCodes code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/VisionProductEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/VisionProductEnumFactory.java index 6e13b9fbb..324c6e4fe 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/VisionProductEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/VisionProductEnumFactory.java @@ -46,12 +46,14 @@ public class VisionProductEnumFactory implements EnumFactory { } public String toCode(VisionProduct code) { - if (code == VisionProduct.LENS) + if (code == VisionProduct.NULL) + return null; + if (code == VisionProduct.LENS) return "lens"; if (code == VisionProduct.CONTACT) return "contact"; return "?"; - } + } public String toSystem(VisionProduct code) { return code.getSystem(); diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/XdsRelationshipTypeEnumFactory.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/XdsRelationshipTypeEnumFactory.java index 2c5bde208..1795afc10 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/XdsRelationshipTypeEnumFactory.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/codesystems/XdsRelationshipTypeEnumFactory.java @@ -52,7 +52,9 @@ public class XdsRelationshipTypeEnumFactory implements EnumFactory