From 5fc297b3b54eae1a1337af21b287d87943eba2c2 Mon Sep 17 00:00:00 2001
From: Grahame Grieve
Date: Thu, 20 Aug 2020 20:37:10 +1000
Subject: [PATCH] Upgrade R5 to latest version
---
.../convertors/VersionConvertor_10_50.java | 12 +
.../convertors/VersionConvertor_40_50.java | 14 +-
.../conv10_50/Composition10_50.java | 4 +-
.../conv10_50/DocumentReference10_50.java | 39 +-
.../conv14_50/StructureMap14_50.java | 3 +-
.../conv30_50/Composition30_50.java | 44 +-
.../conv30_50/DocumentReference30_50.java | 37 +-
.../conv30_50/StructureMap30_50.java | 12 +-
.../conv40_50/Composition40_50.java | 42 +-
.../convertors/conv40_50/Consent40_50.java | 5 +-
.../conv40_50/DocumentReference40_50.java | 38 +-
.../conv40_50/MedicationKnowledge40_50.java | 11 +-
.../MedicinalProductDefinition40_50.java | 26 +-
.../conv40_50/StructureMap40_50.java | 14 +-
.../conv40_50/SubstancePolymer40_50.java | 48 +-
.../SubstanceReferenceInformation40_50.java | 60 +-
.../fhir/convertors/misc/ICD11Generator.java | 16 +-
.../misc/NpmPackageVersionConverter.java | 3 -
.../configuration/BackboneElement.java | 67 +-
.../configuration/CanonicalResource.java | 8 +-
.../configuration/CodeableConcept.java | 66 +-
.../configuration/Coding.java | 54 +-
.../configuration/Element.java | 41 +-
.../configuration/ElementDefinition.java | 6 +-
.../configuration/configuration.ini | 2 +-
.../configuration/license.txt | 20 -
.../fhir/r5/conformance/ProfileUtilities.java | 50 +-
.../org/hl7/fhir/r5/formats/JsonParser.java | 2760 ++++---
.../org/hl7/fhir/r5/formats/RdfParser.java | 1170 ++-
.../org/hl7/fhir/r5/formats/XmlParser.java | 2367 ++++--
.../java/org/hl7/fhir/r5/model/Account.java | 22 +-
.../hl7/fhir/r5/model/ActivityDefinition.java | 43 +-
.../java/org/hl7/fhir/r5/model/Address.java | 16 +-
.../model/AdministrableProductDefinition.java | 107 +-
.../org/hl7/fhir/r5/model/AdverseEvent.java | 22 +-
.../main/java/org/hl7/fhir/r5/model/Age.java | 42 +-
.../hl7/fhir/r5/model/AllergyIntolerance.java | 33 +-
.../org/hl7/fhir/r5/model/Annotation.java | 38 +-
.../org/hl7/fhir/r5/model/Appointment.java | 27 +-
.../fhir/r5/model/AppointmentResponse.java | 23 +-
.../org/hl7/fhir/r5/model/Attachment.java | 42 +-
.../org/hl7/fhir/r5/model/AuditEvent.java | 109 +-
.../hl7/fhir/r5/model/BackboneElement.java | 16 +-
.../org/hl7/fhir/r5/model/BackboneType.java | 19 +-
.../hl7/fhir/r5/model/Base64BinaryType.java | 17 +-
.../hl7/fhir/r5/model/BaseDateTimeType.java | 25 +-
.../java/org/hl7/fhir/r5/model/Basic.java | 21 +-
.../java/org/hl7/fhir/r5/model/Binary.java | 56 +-
.../r5/model/BiologicallyDerivedProduct.java | 36 +-
.../org/hl7/fhir/r5/model/BodyStructure.java | 22 +-
.../java/org/hl7/fhir/r5/model/Bundle.java | 41 +-
.../hl7/fhir/r5/model/CanonicalResource.java | 56 +-
.../fhir/r5/model/CapabilityStatement.java | 36 +-
.../fhir/r5/model/CapabilityStatement2.java | 33 +-
.../java/org/hl7/fhir/r5/model/CarePlan.java | 35 +-
.../java/org/hl7/fhir/r5/model/CareTeam.java | 34 +-
.../org/hl7/fhir/r5/model/CatalogEntry.java | 24 +-
.../org/hl7/fhir/r5/model/ChargeItem.java | 26 +-
.../fhir/r5/model/ChargeItemDefinition.java | 30 +-
.../java/org/hl7/fhir/r5/model/Citation.java | 7128 +++++++++++------
.../java/org/hl7/fhir/r5/model/Claim.java | 30 +-
.../org/hl7/fhir/r5/model/ClaimResponse.java | 34 +-
.../hl7/fhir/r5/model/ClinicalImpression.java | 27 +-
.../hl7/fhir/r5/model/ClinicalUseIssue.java | 63 +-
.../org/hl7/fhir/r5/model/CodeSystem.java | 38 +-
.../hl7/fhir/r5/model/CodeableConcept.java | 26 +-
.../hl7/fhir/r5/model/CodeableReference.java | 39 +-
.../java/org/hl7/fhir/r5/model/Coding.java | 51 +-
.../org/hl7/fhir/r5/model/Communication.java | 30 +-
.../fhir/r5/model/CommunicationRequest.java | 28 +-
.../fhir/r5/model/CompartmentDefinition.java | 27 +-
.../org/hl7/fhir/r5/model/Composition.java | 233 +-
.../org/hl7/fhir/r5/model/ConceptMap.java | 27 +-
.../java/org/hl7/fhir/r5/model/Condition.java | 33 +-
.../fhir/r5/model/ConditionDefinition.java | 25 +-
.../java/org/hl7/fhir/r5/model/Consent.java | 285 +-
.../java/org/hl7/fhir/r5/model/Constants.java | 14 +-
.../org/hl7/fhir/r5/model/ContactDetail.java | 16 +-
.../org/hl7/fhir/r5/model/ContactPoint.java | 41 +-
.../java/org/hl7/fhir/r5/model/Contract.java | 32 +-
.../org/hl7/fhir/r5/model/Contributor.java | 15 +-
.../java/org/hl7/fhir/r5/model/Count.java | 42 +-
.../java/org/hl7/fhir/r5/model/Coverage.java | 50 +-
.../r5/model/CoverageEligibilityRequest.java | 25 +-
.../r5/model/CoverageEligibilityResponse.java | 27 +-
.../hl7/fhir/r5/model/DataRequirement.java | 22 +-
.../java/org/hl7/fhir/r5/model/DataType.java | 46 +-
.../org/hl7/fhir/r5/model/DateTimeType.java | 13 +-
.../java/org/hl7/fhir/r5/model/DateType.java | 13 +-
.../org/hl7/fhir/r5/model/DetectedIssue.java | 37 +-
.../java/org/hl7/fhir/r5/model/Device.java | 63 +-
.../hl7/fhir/r5/model/DeviceDefinition.java | 26 +-
.../org/hl7/fhir/r5/model/DeviceMetric.java | 22 +-
.../org/hl7/fhir/r5/model/DeviceRequest.java | 48 +-
.../hl7/fhir/r5/model/DeviceUseStatement.java | 20 +-
.../hl7/fhir/r5/model/DiagnosticReport.java | 63 +-
.../java/org/hl7/fhir/r5/model/Distance.java | 42 +-
.../hl7/fhir/r5/model/DocumentManifest.java | 39 +-
.../hl7/fhir/r5/model/DocumentReference.java | 1915 +++--
.../org/hl7/fhir/r5/model/DomainResource.java | 45 +-
.../java/org/hl7/fhir/r5/model/Dosage.java | 20 +-
.../java/org/hl7/fhir/r5/model/Duration.java | 42 +-
.../java/org/hl7/fhir/r5/model/Element.java | 25 +-
.../hl7/fhir/r5/model/ElementDefinition.java | 235 +-
.../java/org/hl7/fhir/r5/model/Encounter.java | 33 +-
.../java/org/hl7/fhir/r5/model/Endpoint.java | 22 +-
.../hl7/fhir/r5/model/EnrollmentRequest.java | 22 +-
.../hl7/fhir/r5/model/EnrollmentResponse.java | 25 +-
.../org/hl7/fhir/r5/model/Enumerations.java | 308 +-
.../org/hl7/fhir/r5/model/EpisodeOfCare.java | 33 +-
.../hl7/fhir/r5/model/EventDefinition.java | 33 +-
.../java/org/hl7/fhir/r5/model/Evidence.java | 858 +-
.../org/hl7/fhir/r5/model/EvidenceFocus.java | 2029 -----
.../org/hl7/fhir/r5/model/EvidenceReport.java | 3954 +++++++++
.../hl7/fhir/r5/model/EvidenceVariable.java | 1541 ++--
.../hl7/fhir/r5/model/ExampleScenario.java | 25 +-
.../fhir/r5/model/ExplanationOfBenefit.java | 32 +-
.../org/hl7/fhir/r5/model/Expression.java | 41 +-
.../java/org/hl7/fhir/r5/model/Extension.java | 48 +-
.../fhir/r5/model/FamilyMemberHistory.java | 33 +-
.../main/java/org/hl7/fhir/r5/model/Flag.java | 27 +-
.../main/java/org/hl7/fhir/r5/model/Goal.java | 33 +-
.../hl7/fhir/r5/model/GraphDefinition.java | 27 +-
.../java/org/hl7/fhir/r5/model/Group.java | 24 +-
.../hl7/fhir/r5/model/GuidanceResponse.java | 20 +-
.../hl7/fhir/r5/model/HealthcareService.java | 26 +-
.../java/org/hl7/fhir/r5/model/HumanName.java | 25 +-
.../org/hl7/fhir/r5/model/Identifier.java | 41 +-
.../org/hl7/fhir/r5/model/ImagingStudy.java | 35 +-
.../org/hl7/fhir/r5/model/Immunization.java | 731 +-
.../fhir/r5/model/ImmunizationEvaluation.java | 21 +-
.../r5/model/ImmunizationRecommendation.java | 219 +-
.../fhir/r5/model/ImplementationGuide.java | 48 +-
.../org/hl7/fhir/r5/model/Ingredient.java | 838 +-
.../org/hl7/fhir/r5/model/InstantType.java | 10 +-
.../org/hl7/fhir/r5/model/InsurancePlan.java | 26 +-
.../org/hl7/fhir/r5/model/Integer64Type.java | 12 +-
.../org/hl7/fhir/r5/model/IntegerType.java | 10 +-
.../java/org/hl7/fhir/r5/model/Invoice.java | 28 +-
.../java/org/hl7/fhir/r5/model/Library.java | 33 +-
.../java/org/hl7/fhir/r5/model/Linkage.java | 27 +-
.../org/hl7/fhir/r5/model/ListResource.java | 43 +-
.../java/org/hl7/fhir/r5/model/Location.java | 29 +-
.../r5/model/ManufacturedItemDefinition.java | 48 +-
.../hl7/fhir/r5/model/MarketingStatus.java | 46 +-
.../java/org/hl7/fhir/r5/model/Measure.java | 35 +-
.../org/hl7/fhir/r5/model/MeasureReport.java | 24 +-
.../org/hl7/fhir/r5/model/Medication.java | 25 +-
.../r5/model/MedicationAdministration.java | 51 +-
.../hl7/fhir/r5/model/MedicationDispense.java | 50 +-
.../fhir/r5/model/MedicationKnowledge.java | 617 +-
.../hl7/fhir/r5/model/MedicationRequest.java | 103 +-
.../hl7/fhir/r5/model/MedicationUsage.java | 31 +-
.../r5/model/MedicinalProductDefinition.java | 330 +-
.../hl7/fhir/r5/model/MessageDefinition.java | 25 +-
.../org/hl7/fhir/r5/model/MessageHeader.java | 26 +-
.../main/java/org/hl7/fhir/r5/model/Meta.java | 22 +-
.../hl7/fhir/r5/model/MetadataResource.java | 43 +-
.../hl7/fhir/r5/model/MolecularSequence.java | 27 +-
.../java/org/hl7/fhir/r5/model/Money.java | 43 +-
.../org/hl7/fhir/r5/model/MoneyQuantity.java | 2 +
.../org/hl7/fhir/r5/model/NamingSystem.java | 25 +-
.../java/org/hl7/fhir/r5/model/Narrative.java | 46 +-
.../hl7/fhir/r5/model/NutritionIntake.java | 24 +-
.../org/hl7/fhir/r5/model/NutritionOrder.java | 43 +-
.../hl7/fhir/r5/model/NutritionProduct.java | 38 +-
.../org/hl7/fhir/r5/model/Observation.java | 141 +-
.../fhir/r5/model/ObservationDefinition.java | 30 +-
.../fhir/r5/model/OperationDefinition.java | 33 +-
.../hl7/fhir/r5/model/OperationOutcome.java | 28 +-
.../fhir/r5/model/OrderedDistribution.java | 20 +-
.../org/hl7/fhir/r5/model/Organization.java | 24 +-
.../r5/model/OrganizationAffiliation.java | 20 +-
.../r5/model/PackagedProductDefinition.java | 395 +-
.../fhir/r5/model/ParameterDefinition.java | 45 +-
.../org/hl7/fhir/r5/model/Parameters.java | 266 +-
.../java/org/hl7/fhir/r5/model/Patient.java | 24 +-
.../org/hl7/fhir/r5/model/PaymentNotice.java | 26 +-
.../fhir/r5/model/PaymentReconciliation.java | 29 +-
.../java/org/hl7/fhir/r5/model/Period.java | 47 +-
.../org/hl7/fhir/r5/model/Permission.java | 22 +-
.../java/org/hl7/fhir/r5/model/Person.java | 24 +-
.../org/hl7/fhir/r5/model/PlanDefinition.java | 55 +-
.../org/hl7/fhir/r5/model/Population.java | 39 +-
.../org/hl7/fhir/r5/model/Practitioner.java | 26 +-
.../hl7/fhir/r5/model/PractitionerRole.java | 58 +-
.../java/org/hl7/fhir/r5/model/Procedure.java | 40 +-
.../hl7/fhir/r5/model/ProdCharacteristic.java | 16 +-
.../hl7/fhir/r5/model/ProductShelfLife.java | 156 +-
.../org/hl7/fhir/r5/model/Provenance.java | 28 +-
.../java/org/hl7/fhir/r5/model/Quantity.java | 51 +-
.../org/hl7/fhir/r5/model/Questionnaire.java | 35 +-
.../fhir/r5/model/QuestionnaireResponse.java | 25 +-
.../java/org/hl7/fhir/r5/model/Range.java | 39 +-
.../java/org/hl7/fhir/r5/model/Ratio.java | 39 +-
.../java/org/hl7/fhir/r5/model/Reference.java | 57 +-
.../fhir/r5/model/RegulatedAuthorization.java | 47 +-
.../hl7/fhir/r5/model/RelatedArtifact.java | 41 +-
.../org/hl7/fhir/r5/model/RelatedPerson.java | 24 +-
.../org/hl7/fhir/r5/model/RequestGroup.java | 43 +-
.../org/hl7/fhir/r5/model/ResearchStudy.java | 24 +-
.../hl7/fhir/r5/model/ResearchSubject.java | 23 +-
.../java/org/hl7/fhir/r5/model/Resource.java | 53 +-
.../hl7/fhir/r5/model/ResourceFactory.java | 13 +-
.../org/hl7/fhir/r5/model/ResourceType.java | 14 +-
.../org/hl7/fhir/r5/model/RiskAssessment.java | 45 +-
.../org/hl7/fhir/r5/model/SampledData.java | 43 +-
.../java/org/hl7/fhir/r5/model/Schedule.java | 22 +-
.../hl7/fhir/r5/model/SearchParameter.java | 27 +-
.../org/hl7/fhir/r5/model/ServiceRequest.java | 43 +-
.../java/org/hl7/fhir/r5/model/Signature.java | 15 +-
.../org/hl7/fhir/r5/model/SimpleQuantity.java | 2 +
.../main/java/org/hl7/fhir/r5/model/Slot.java | 21 +-
.../java/org/hl7/fhir/r5/model/Specimen.java | 23 +-
.../hl7/fhir/r5/model/SpecimenDefinition.java | 25 +-
.../java/org/hl7/fhir/r5/model/Statistic.java | 1289 ++-
.../fhir/r5/model/StructureDefinition.java | 48 +-
.../org/hl7/fhir/r5/model/StructureMap.java | 98 +-
.../org/hl7/fhir/r5/model/Subscription.java | 134 +-
.../hl7/fhir/r5/model/SubscriptionStatus.java | 295 +-
.../hl7/fhir/r5/model/SubscriptionTopic.java | 278 +-
.../java/org/hl7/fhir/r5/model/Substance.java | 23 +-
.../hl7/fhir/r5/model/SubstanceAmount.java | 44 +-
.../fhir/r5/model/SubstanceDefinition.java | 346 +-
.../fhir/r5/model/SubstanceNucleicAcid.java | 25 +-
.../hl7/fhir/r5/model/SubstancePolymer.java | 758 +-
.../hl7/fhir/r5/model/SubstanceProtein.java | 25 +-
.../model/SubstanceReferenceInformation.java | 470 +-
.../r5/model/SubstanceSourceMaterial.java | 25 +-
.../org/hl7/fhir/r5/model/SupplyDelivery.java | 33 +-
.../org/hl7/fhir/r5/model/SupplyRequest.java | 34 +-
.../main/java/org/hl7/fhir/r5/model/Task.java | 41 +-
.../r5/model/TerminologyCapabilities.java | 75 +-
.../org/hl7/fhir/r5/model/TestReport.java | 26 +-
.../org/hl7/fhir/r5/model/TestScript.java | 81 +-
.../java/org/hl7/fhir/r5/model/Timing.java | 77 +-
.../hl7/fhir/r5/model/TriggerDefinition.java | 16 +-
.../org/hl7/fhir/r5/model/UsageContext.java | 39 +-
.../java/org/hl7/fhir/r5/model/UuidType.java | 4 +-
.../java/org/hl7/fhir/r5/model/ValueSet.java | 27 +-
.../hl7/fhir/r5/model/VerificationResult.java | 25 +-
.../hl7/fhir/r5/model/VisionPrescription.java | 44 +-
.../org/hl7/fhir/r5/utils/LiquidEngine.java | 8 +-
.../hl7/fhir/r5/utils/MappingSheetParser.java | 1 -
.../fhir/r5/utils/StructureMapUtilities.java | 6 +-
.../hl7/fhir/r5/test/LiquidEngineTests.java | 4 +-
.../hl7/fhir/utilities/VersionUtilities.java | 7 +-
.../hl7/fhir/validation/BaseValidator.java | 4 +-
248 files changed, 24362 insertions(+), 14740 deletions(-)
delete mode 100644 org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EvidenceFocus.java
create mode 100644 org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EvidenceReport.java
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_50.java
index 1bd647afd..3903d68bf 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_50.java
@@ -347,12 +347,24 @@ public class VersionConvertor_10_50 {
return tgt;
}
+ public static org.hl7.fhir.r5.model.MarkdownType convertStringToMarkdown(org.hl7.fhir.dstu2.model.StringType src) throws FHIRException {
+ org.hl7.fhir.r5.model.MarkdownType tgt = src.hasValue() ? new org.hl7.fhir.r5.model.MarkdownType(src.getValue()) : new org.hl7.fhir.r5.model.MarkdownType();
+ copyElement(src, tgt);
+ return tgt;
+ }
+
public static org.hl7.fhir.dstu2.model.StringType convertString(org.hl7.fhir.r5.model.StringType src) throws FHIRException {
org.hl7.fhir.dstu2.model.StringType tgt = src.hasValue() ? new org.hl7.fhir.dstu2.model.StringType(src.getValue()) : new org.hl7.fhir.dstu2.model.StringType();
copyElement(src, tgt);
return tgt;
}
+ public static org.hl7.fhir.dstu2.model.StringType convertMarkdownToString(org.hl7.fhir.r5.model.MarkdownType src) throws FHIRException {
+ org.hl7.fhir.dstu2.model.StringType tgt = src.hasValue() ? new org.hl7.fhir.dstu2.model.StringType(src.getValue()) : new org.hl7.fhir.dstu2.model.StringType();
+ copyElement(src, tgt);
+ return tgt;
+ }
+
public static org.hl7.fhir.r5.model.TimeType convertTime(org.hl7.fhir.dstu2.model.TimeType src) throws FHIRException {
org.hl7.fhir.r5.model.TimeType tgt = src.hasValue() ? new org.hl7.fhir.r5.model.TimeType(src.getValue()) : new org.hl7.fhir.r5.model.TimeType();
copyElement(src, tgt);
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_40_50.java
index b3d30b8b1..2121ad12e 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_40_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_40_50.java
@@ -289,6 +289,12 @@ public class VersionConvertor_40_50 {
return tgt;
}
+ public static org.hl7.fhir.r5.model.MarkdownType convertStringToMarkdown(org.hl7.fhir.r4.model.StringType src) throws FHIRException {
+ org.hl7.fhir.r5.model.MarkdownType tgt = src.hasValue() ? new org.hl7.fhir.r5.model.MarkdownType(src.getValue()) : new org.hl7.fhir.r5.model.MarkdownType();
+ copyElement(src, tgt);
+ return tgt;
+ }
+
public static org.hl7.fhir.r4.model.StringType convertString(org.hl7.fhir.r5.model.StringType src) throws FHIRException {
org.hl7.fhir.r4.model.StringType tgt = src.hasValue() ? new org.hl7.fhir.r4.model.StringType(src.getValue()) : new org.hl7.fhir.r4.model.StringType();
copyElement(src, tgt);
@@ -1842,8 +1848,6 @@ public class VersionConvertor_40_50 {
return null;
org.hl7.fhir.r5.model.ProductShelfLife tgt = new org.hl7.fhir.r5.model.ProductShelfLife();
copyBackboneElement(src, tgt);
- if (src.hasIdentifier())
- tgt.setIdentifier(convertIdentifier(src.getIdentifier()));
if (src.hasType())
tgt.setType(convertCodeableConcept(src.getType()));
if (src.hasPeriod())
@@ -1857,12 +1861,10 @@ public class VersionConvertor_40_50 {
return null;
org.hl7.fhir.r4.model.ProductShelfLife tgt = new org.hl7.fhir.r4.model.ProductShelfLife();
copyBackboneElement(src, tgt);
- if (src.hasIdentifier())
- tgt.setIdentifier(convertIdentifier(src.getIdentifier()));
if (src.hasType())
tgt.setType(convertCodeableConcept(src.getType()));
- if (src.hasPeriod())
- tgt.setPeriod(convertQuantity(src.getPeriod()));
+ if (src.hasPeriodQuantity())
+ tgt.setPeriod(convertQuantity(src.getPeriodQuantity()));
for (org.hl7.fhir.r5.model.CodeableConcept t : src.getSpecialPrecautionsForStorage()) tgt.addSpecialPrecautionsForStorage(convertCodeableConcept(t));
return tgt;
}
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/Composition10_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/Composition10_50.java
index 60da77317..688c84079 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/Composition10_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/Composition10_50.java
@@ -26,7 +26,7 @@ public class Composition10_50 {
tgt.setStatusElement(convertCompositionStatus(src.getStatusElement()));
try {
if (src.hasConfidentiality())
- tgt.setConfidentiality(org.hl7.fhir.r5.model.Composition.V3ConfidentialityClassification.fromCode(src.getConfidentiality()));
+ tgt.setConfidentiality(src.getConfidentiality());
} catch (org.hl7.fhir.exceptions.FHIRException e) {
throw new FHIRException(e);
}
@@ -60,7 +60,7 @@ public class Composition10_50 {
tgt.setTitleElement(VersionConvertor_10_50.convertString(src.getTitleElement()));
if (src.hasStatus())
tgt.setStatusElement(convertCompositionStatus(src.getStatusElement()));
- tgt.setConfidentiality(src.getConfidentiality().toCode());
+ tgt.setConfidentiality(src.getConfidentiality());
if (src.hasSubject())
tgt.setSubject(VersionConvertor_10_50.convertReference(src.getSubject()));
for (org.hl7.fhir.r5.model.Reference t : src.getAuthor()) tgt.addAuthor(VersionConvertor_10_50.convertReference(t));
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/DocumentReference10_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/DocumentReference10_50.java
index dc1cdaa60..b50fb514f 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/DocumentReference10_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/DocumentReference10_50.java
@@ -1,8 +1,11 @@
package org.hl7.fhir.convertors.conv10_50;
import org.hl7.fhir.convertors.VersionConvertor_10_50;
+import org.hl7.fhir.convertors.VersionConvertor_30_50;
import org.hl7.fhir.dstu2.model.CodeableConcept;
import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.r5.model.DocumentReference.DocumentAttestationMode;
+import org.hl7.fhir.r5.model.DocumentReference.DocumentReferenceAttesterComponent;
public class DocumentReference10_50 {
@@ -44,8 +47,8 @@ public class DocumentReference10_50 {
return null;
org.hl7.fhir.dstu2.model.DocumentReference tgt = new org.hl7.fhir.dstu2.model.DocumentReference();
VersionConvertor_10_50.copyDomainResource(src, tgt);
- if (src.hasMasterIdentifier())
- tgt.setMasterIdentifier(VersionConvertor_10_50.convertIdentifier(src.getMasterIdentifier()));
+// if (src.hasMasterIdentifier())
+// tgt.setMasterIdentifier(VersionConvertor_10_50.convertIdentifier(src.getMasterIdentifier()));
for (org.hl7.fhir.r5.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_10_50.convertIdentifier(t));
if (src.hasSubject())
tgt.setSubject(VersionConvertor_10_50.convertReference(src.getSubject()));
@@ -55,8 +58,10 @@ public class DocumentReference10_50 {
tgt.setClass_(VersionConvertor_10_50.convertCodeableConcept(src.getCategoryFirstRep()));
if (src.hasCustodian())
tgt.setCustodian(VersionConvertor_10_50.convertReference(src.getCustodian()));
- if (src.hasAuthenticator())
- tgt.setAuthenticator(VersionConvertor_10_50.convertReference(src.getAuthenticator()));
+ for (DocumentReferenceAttesterComponent t : src.getAttester()) {
+ if (t.getMode() == DocumentAttestationMode.OFFICIAL)
+ tgt.setAuthenticator(VersionConvertor_10_50.convertReference(t.getParty()));
+ }
if (src.hasDate())
tgt.setCreated(src.getDate());
if (src.hasStatus())
@@ -68,8 +73,7 @@ public class DocumentReference10_50 {
tgt.setDescriptionElement(VersionConvertor_10_50.convertString(src.getDescriptionElement()));
for (org.hl7.fhir.r5.model.CodeableConcept t : src.getSecurityLabel()) tgt.addSecurityLabel(VersionConvertor_10_50.convertCodeableConcept(t));
for (org.hl7.fhir.r5.model.DocumentReference.DocumentReferenceContentComponent t : src.getContent()) tgt.addContent(convertDocumentReferenceContentComponent(t));
- if (src.hasContext())
- tgt.setContext(convertDocumentReferenceContextComponent(src.getContext()));
+ convertDocumentReferenceContextComponent(tgt.getContext(), src);
return tgt;
}
@@ -79,7 +83,7 @@ public class DocumentReference10_50 {
org.hl7.fhir.r5.model.DocumentReference tgt = new org.hl7.fhir.r5.model.DocumentReference();
VersionConvertor_10_50.copyDomainResource(src, tgt);
if (src.hasMasterIdentifier())
- tgt.setMasterIdentifier(VersionConvertor_10_50.convertIdentifier(src.getMasterIdentifier()));
+ tgt.addIdentifier(VersionConvertor_10_50.convertIdentifier(src.getMasterIdentifier()));
for (org.hl7.fhir.dstu2.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_10_50.convertIdentifier(t));
if (src.hasSubject())
tgt.setSubject(VersionConvertor_10_50.convertReference(src.getSubject()));
@@ -90,7 +94,7 @@ public class DocumentReference10_50 {
if (src.hasCustodian())
tgt.setCustodian(VersionConvertor_10_50.convertReference(src.getCustodian()));
if (src.hasAuthenticator())
- tgt.setAuthenticator(VersionConvertor_10_50.convertReference(src.getAuthenticator()));
+ tgt.addAttester().setMode(DocumentAttestationMode.OFFICIAL).setParty(VersionConvertor_10_50.convertReference(src.getAuthenticator()));
if (src.hasCreated())
tgt.setDate(src.getCreated());
if (src.hasStatus())
@@ -99,11 +103,10 @@ public class DocumentReference10_50 {
tgt.setDocStatus(convertDocStatus(src.getDocStatus()));
for (org.hl7.fhir.dstu2.model.DocumentReference.DocumentReferenceRelatesToComponent t : src.getRelatesTo()) tgt.addRelatesTo(convertDocumentReferenceRelatesToComponent(t));
if (src.hasDescriptionElement())
- tgt.setDescriptionElement(VersionConvertor_10_50.convertString(src.getDescriptionElement()));
+ tgt.setDescriptionElement(VersionConvertor_10_50.convertStringToMarkdown(src.getDescriptionElement()));
for (org.hl7.fhir.dstu2.model.CodeableConcept t : src.getSecurityLabel()) tgt.addSecurityLabel(VersionConvertor_10_50.convertCodeableConcept(t));
for (org.hl7.fhir.dstu2.model.DocumentReference.DocumentReferenceContentComponent t : src.getContent()) tgt.addContent(convertDocumentReferenceContentComponent(t));
- if (src.hasContext())
- tgt.setContext(convertDocumentReferenceContextComponent(src.getContext()));
+ convertDocumentReferenceContextComponent(src.getContext(), tgt);
return tgt;
}
@@ -130,11 +133,7 @@ public class DocumentReference10_50 {
return tgt;
}
- public static org.hl7.fhir.dstu2.model.DocumentReference.DocumentReferenceContextComponent convertDocumentReferenceContextComponent(org.hl7.fhir.r5.model.DocumentReference.DocumentReferenceContextComponent src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.dstu2.model.DocumentReference.DocumentReferenceContextComponent tgt = new org.hl7.fhir.dstu2.model.DocumentReference.DocumentReferenceContextComponent();
- VersionConvertor_10_50.copyElement(src, tgt);
+ public static void convertDocumentReferenceContextComponent(org.hl7.fhir.r5.model.DocumentReference src, org.hl7.fhir.dstu2.model.DocumentReference.DocumentReferenceContextComponent tgt) throws FHIRException {
if (src.hasEncounter())
tgt.setEncounter(VersionConvertor_10_50.convertReference(src.getEncounterFirstRep()));
for (org.hl7.fhir.r5.model.CodeableConcept t : src.getEvent()) tgt.addEvent(VersionConvertor_10_50.convertCodeableConcept(t));
@@ -147,14 +146,9 @@ public class DocumentReference10_50 {
if (src.hasSourcePatientInfo())
tgt.setSourcePatientInfo(VersionConvertor_10_50.convertReference(src.getSourcePatientInfo()));
for (org.hl7.fhir.r5.model.Reference t : src.getRelated()) tgt.addRelated(convertDocumentReferenceContextRelatedComponent(t));
- return tgt;
}
- public static org.hl7.fhir.r5.model.DocumentReference.DocumentReferenceContextComponent convertDocumentReferenceContextComponent(org.hl7.fhir.dstu2.model.DocumentReference.DocumentReferenceContextComponent src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r5.model.DocumentReference.DocumentReferenceContextComponent tgt = new org.hl7.fhir.r5.model.DocumentReference.DocumentReferenceContextComponent();
- VersionConvertor_10_50.copyElement(src, tgt);
+ public static void convertDocumentReferenceContextComponent(org.hl7.fhir.dstu2.model.DocumentReference.DocumentReferenceContextComponent src, org.hl7.fhir.r5.model.DocumentReference tgt) throws FHIRException {
if (src.hasEncounter())
tgt.addEncounter(VersionConvertor_10_50.convertReference(src.getEncounter()));
for (org.hl7.fhir.dstu2.model.CodeableConcept t : src.getEvent()) tgt.addEvent(VersionConvertor_10_50.convertCodeableConcept(t));
@@ -167,7 +161,6 @@ public class DocumentReference10_50 {
if (src.hasSourcePatientInfo())
tgt.setSourcePatientInfo(VersionConvertor_10_50.convertReference(src.getSourcePatientInfo()));
for (org.hl7.fhir.dstu2.model.DocumentReference.DocumentReferenceContextRelatedComponent t : src.getRelated()) tgt.addRelated(convertDocumentReferenceContextRelatedComponent(t));
- return tgt;
}
public static org.hl7.fhir.r5.model.Reference convertDocumentReferenceContextRelatedComponent(org.hl7.fhir.dstu2.model.DocumentReference.DocumentReferenceContextRelatedComponent src) throws FHIRException {
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/StructureMap14_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/StructureMap14_50.java
index f13d7c71d..f2dee9f21 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/StructureMap14_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/StructureMap14_50.java
@@ -153,7 +153,6 @@ public class StructureMap14_50 {
tgt.setNameElement(VersionConvertor_14_50.convertId(src.getNameElement()));
if (src.hasExtends())
tgt.setExtendsElement(VersionConvertor_14_50.convertId(src.getExtendsElement()));
- tgt.setTypeMode(org.hl7.fhir.r5.model.StructureMap.StructureMapGroupTypeMode.NONE);
if (src.hasDocumentation())
tgt.setDocumentationElement(VersionConvertor_14_50.convertString(src.getDocumentationElement()));
for (org.hl7.fhir.dstu2016may.model.StructureMap.StructureMapGroupInputComponent t : src.getInput()) tgt.addInput(convertStructureMapGroupInputComponent(t));
@@ -170,7 +169,7 @@ public class StructureMap14_50 {
tgt.setNameElement(VersionConvertor_14_50.convertId(src.getNameElement()));
if (src.hasExtends())
tgt.setExtendsElement(VersionConvertor_14_50.convertId(src.getExtendsElement()));
- if (!src.getTypeMode().equals(org.hl7.fhir.r5.model.StructureMap.StructureMapGroupTypeMode.NONE))
+ if (src.hasTypeMode())
throw new FHIRException("Unable to downgrade structure map with group.typeMode other than 'None': " + src.getTypeMode().getDisplay());
if (src.hasDocumentation())
tgt.setDocumentationElement(VersionConvertor_14_50.convertString(src.getDocumentationElement()));
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Composition30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Composition30_50.java
index 9bcbec24f..2a18de6f5 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Composition30_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Composition30_50.java
@@ -299,59 +299,37 @@ public class Composition30_50 {
return tgt;
}
- static public org.hl7.fhir.r5.model.Enumeration convertDocumentConfidentiality(org.hl7.fhir.dstu3.model.Enumeration src) throws FHIRException {
+ static public org.hl7.fhir.r5.model.CodeType convertDocumentConfidentiality(org.hl7.fhir.dstu3.model.Enumeration src) throws FHIRException {
if (src == null || src.isEmpty())
return null;
- org.hl7.fhir.r5.model.Enumeration tgt = new org.hl7.fhir.r5.model.Enumeration<>(new org.hl7.fhir.r5.model.Composition.V3ConfidentialityClassificationEnumFactory());
+ org.hl7.fhir.r5.model.CodeType tgt = new org.hl7.fhir.r5.model.CodeType();
VersionConvertor_30_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case U:
- tgt.setValue(org.hl7.fhir.r5.model.Composition.V3ConfidentialityClassification.U);
- break;
- case L:
- tgt.setValue(org.hl7.fhir.r5.model.Composition.V3ConfidentialityClassification.L);
- break;
- case M:
- tgt.setValue(org.hl7.fhir.r5.model.Composition.V3ConfidentialityClassification.M);
- break;
- case N:
- tgt.setValue(org.hl7.fhir.r5.model.Composition.V3ConfidentialityClassification.N);
- break;
- case R:
- tgt.setValue(org.hl7.fhir.r5.model.Composition.V3ConfidentialityClassification.R);
- break;
- case V:
- tgt.setValue(org.hl7.fhir.r5.model.Composition.V3ConfidentialityClassification.V);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r5.model.Composition.V3ConfidentialityClassification.NULL);
- break;
- }
+ tgt.setValue(src.getValue().toCode());
return tgt;
}
- static public org.hl7.fhir.dstu3.model.Enumeration convertDocumentConfidentiality(org.hl7.fhir.r5.model.Enumeration src) throws FHIRException {
+ static public org.hl7.fhir.dstu3.model.Enumeration convertDocumentConfidentiality(org.hl7.fhir.r5.model.CodeType src) throws FHIRException {
if (src == null || src.isEmpty())
return null;
org.hl7.fhir.dstu3.model.Enumeration tgt = new org.hl7.fhir.dstu3.model.Enumeration<>(new org.hl7.fhir.dstu3.model.Composition.DocumentConfidentialityEnumFactory());
VersionConvertor_30_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case U:
+ switch (src.getValue()) {
+ case "U":
tgt.setValue(org.hl7.fhir.dstu3.model.Composition.DocumentConfidentiality.U);
break;
- case L:
+ case "L":
tgt.setValue(org.hl7.fhir.dstu3.model.Composition.DocumentConfidentiality.L);
break;
- case M:
+ case "M":
tgt.setValue(org.hl7.fhir.dstu3.model.Composition.DocumentConfidentiality.M);
break;
- case N:
+ case "N":
tgt.setValue(org.hl7.fhir.dstu3.model.Composition.DocumentConfidentiality.N);
break;
- case R:
+ case "R":
tgt.setValue(org.hl7.fhir.dstu3.model.Composition.DocumentConfidentiality.R);
break;
- case V:
+ case "V":
tgt.setValue(org.hl7.fhir.dstu3.model.Composition.DocumentConfidentiality.V);
break;
default:
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/DocumentReference30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/DocumentReference30_50.java
index 10218c576..f36363f5c 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/DocumentReference30_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/DocumentReference30_50.java
@@ -2,6 +2,8 @@ package org.hl7.fhir.convertors.conv30_50;
import org.hl7.fhir.convertors.VersionConvertor_30_50;
import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.r5.model.DocumentReference.DocumentAttestationMode;
+import org.hl7.fhir.r5.model.DocumentReference.DocumentReferenceAttesterComponent;
public class DocumentReference30_50 {
@@ -11,7 +13,7 @@ public class DocumentReference30_50 {
org.hl7.fhir.r5.model.DocumentReference tgt = new org.hl7.fhir.r5.model.DocumentReference();
VersionConvertor_30_50.copyDomainResource(src, tgt);
if (src.hasMasterIdentifier())
- tgt.setMasterIdentifier(VersionConvertor_30_50.convertIdentifier(src.getMasterIdentifier()));
+ tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(src.getMasterIdentifier()));
for (org.hl7.fhir.dstu3.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t));
if (src.hasStatus())
tgt.setStatusElement(convertDocumentReferenceStatus(src.getStatusElement()));
@@ -26,16 +28,16 @@ public class DocumentReference30_50 {
if (src.hasCreated())
tgt.setDate(src.getCreated());
if (src.hasAuthenticator())
- tgt.setAuthenticator(VersionConvertor_30_50.convertReference(src.getAuthenticator()));
+ tgt.addAttester().setMode(DocumentAttestationMode.OFFICIAL).setParty(VersionConvertor_30_50.convertReference(src.getAuthenticator()));
if (src.hasCustodian())
tgt.setCustodian(VersionConvertor_30_50.convertReference(src.getCustodian()));
for (org.hl7.fhir.dstu3.model.DocumentReference.DocumentReferenceRelatesToComponent t : src.getRelatesTo()) tgt.addRelatesTo(convertDocumentReferenceRelatesToComponent(t));
if (src.hasDescription())
- tgt.setDescriptionElement(VersionConvertor_30_50.convertString(src.getDescriptionElement()));
+ tgt.setDescriptionElement(VersionConvertor_30_50.convertStringToMarkdown(src.getDescriptionElement()));
for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getSecurityLabel()) tgt.addSecurityLabel(VersionConvertor_30_50.convertCodeableConcept(t));
for (org.hl7.fhir.dstu3.model.DocumentReference.DocumentReferenceContentComponent t : src.getContent()) tgt.addContent(convertDocumentReferenceContentComponent(t));
if (src.hasContext())
- tgt.setContext(convertDocumentReferenceContextComponent(src.getContext()));
+ convertDocumentReferenceContextComponent(src.getContext(), tgt);
return tgt;
}
@@ -44,8 +46,8 @@ public class DocumentReference30_50 {
return null;
org.hl7.fhir.dstu3.model.DocumentReference tgt = new org.hl7.fhir.dstu3.model.DocumentReference();
VersionConvertor_30_50.copyDomainResource(src, tgt);
- if (src.hasMasterIdentifier())
- tgt.setMasterIdentifier(VersionConvertor_30_50.convertIdentifier(src.getMasterIdentifier()));
+// if (src.hasMasterIdentifier())
+// tgt.setMasterIdentifier(VersionConvertor_30_50.convertIdentifier(src.getMasterIdentifier()));
for (org.hl7.fhir.r5.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t));
if (src.hasStatus())
tgt.setStatusElement(convertDocumentReferenceStatus(src.getStatusElement()));
@@ -59,8 +61,10 @@ public class DocumentReference30_50 {
tgt.setSubject(VersionConvertor_30_50.convertReference(src.getSubject()));
if (src.hasDate())
tgt.setCreated(src.getDate());
- if (src.hasAuthenticator())
- tgt.setAuthenticator(VersionConvertor_30_50.convertReference(src.getAuthenticator()));
+ for (DocumentReferenceAttesterComponent t : src.getAttester()) {
+ if (t.getMode() == DocumentAttestationMode.OFFICIAL)
+ tgt.setAuthenticator(VersionConvertor_30_50.convertReference(t.getParty()));
+ }
if (src.hasCustodian())
tgt.setCustodian(VersionConvertor_30_50.convertReference(src.getCustodian()));
for (org.hl7.fhir.r5.model.DocumentReference.DocumentReferenceRelatesToComponent t : src.getRelatesTo()) tgt.addRelatesTo(convertDocumentReferenceRelatesToComponent(t));
@@ -68,8 +72,7 @@ public class DocumentReference30_50 {
tgt.setDescriptionElement(VersionConvertor_30_50.convertString(src.getDescriptionElement()));
for (org.hl7.fhir.r5.model.CodeableConcept t : src.getSecurityLabel()) tgt.addSecurityLabel(VersionConvertor_30_50.convertCodeableConcept(t));
for (org.hl7.fhir.r5.model.DocumentReference.DocumentReferenceContentComponent t : src.getContent()) tgt.addContent(convertDocumentReferenceContentComponent(t));
- if (src.hasContext())
- tgt.setContext(convertDocumentReferenceContextComponent(src.getContext()));
+ convertDocumentReferenceContextComponent(src, tgt.getContext());
return tgt;
}
@@ -97,11 +100,7 @@ public class DocumentReference30_50 {
return tgt;
}
- public static org.hl7.fhir.dstu3.model.DocumentReference.DocumentReferenceContextComponent convertDocumentReferenceContextComponent(org.hl7.fhir.r5.model.DocumentReference.DocumentReferenceContextComponent src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.dstu3.model.DocumentReference.DocumentReferenceContextComponent tgt = new org.hl7.fhir.dstu3.model.DocumentReference.DocumentReferenceContextComponent();
- VersionConvertor_30_50.copyElement(src, tgt);
+ public static void convertDocumentReferenceContextComponent(org.hl7.fhir.r5.model.DocumentReference src, org.hl7.fhir.dstu3.model.DocumentReference.DocumentReferenceContextComponent tgt) throws FHIRException {
if (src.hasEncounter())
tgt.setEncounter(VersionConvertor_30_50.convertReference(src.getEncounterFirstRep()));
for (org.hl7.fhir.r5.model.CodeableConcept t : src.getEvent()) tgt.addEvent(VersionConvertor_30_50.convertCodeableConcept(t));
@@ -114,14 +113,9 @@ public class DocumentReference30_50 {
if (src.hasSourcePatientInfo())
tgt.setSourcePatientInfo(VersionConvertor_30_50.convertReference(src.getSourcePatientInfo()));
for (org.hl7.fhir.r5.model.Reference t : src.getRelated()) tgt.addRelated(convertDocumentReferenceContextRelatedComponent(t));
- return tgt;
}
- public static org.hl7.fhir.r5.model.DocumentReference.DocumentReferenceContextComponent convertDocumentReferenceContextComponent(org.hl7.fhir.dstu3.model.DocumentReference.DocumentReferenceContextComponent src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r5.model.DocumentReference.DocumentReferenceContextComponent tgt = new org.hl7.fhir.r5.model.DocumentReference.DocumentReferenceContextComponent();
- VersionConvertor_30_50.copyElement(src, tgt);
+ public static void convertDocumentReferenceContextComponent(org.hl7.fhir.dstu3.model.DocumentReference.DocumentReferenceContextComponent src, org.hl7.fhir.r5.model.DocumentReference tgt) throws FHIRException {
if (src.hasEncounter())
tgt.addEncounter(VersionConvertor_30_50.convertReference(src.getEncounter()));
for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getEvent()) tgt.addEvent(VersionConvertor_30_50.convertCodeableConcept(t));
@@ -134,7 +128,6 @@ public class DocumentReference30_50 {
if (src.hasSourcePatientInfo())
tgt.setSourcePatientInfo(VersionConvertor_30_50.convertReference(src.getSourcePatientInfo()));
for (org.hl7.fhir.dstu3.model.DocumentReference.DocumentReferenceContextRelatedComponent t : src.getRelated()) tgt.addRelated(convertDocumentReferenceContextRelatedComponent(t));
- return tgt;
}
public static org.hl7.fhir.r5.model.Reference convertDocumentReferenceContextRelatedComponent(org.hl7.fhir.dstu3.model.DocumentReference.DocumentReferenceContextRelatedComponent src) throws FHIRException {
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/StructureMap30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/StructureMap30_50.java
index 4c59a65e6..f8f49b95d 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/StructureMap30_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/StructureMap30_50.java
@@ -372,8 +372,7 @@ public class StructureMap30_50 {
VersionConvertor_30_50.copyElement(src, tgt);
switch(src.getValue()) {
case NONE:
- tgt.setValue(org.hl7.fhir.r5.model.StructureMap.StructureMapGroupTypeMode.NONE);
- break;
+ return null;
case TYPES:
tgt.setValue(org.hl7.fhir.r5.model.StructureMap.StructureMapGroupTypeMode.TYPES);
break;
@@ -388,14 +387,13 @@ public class StructureMap30_50 {
}
static public org.hl7.fhir.dstu3.model.Enumeration convertStructureMapGroupTypeMode(org.hl7.fhir.r5.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
org.hl7.fhir.dstu3.model.Enumeration tgt = new org.hl7.fhir.dstu3.model.Enumeration<>(new org.hl7.fhir.dstu3.model.StructureMap.StructureMapGroupTypeModeEnumFactory());
+ if (src == null || src.isEmpty()) {
+ tgt.setValue(org.hl7.fhir.dstu3.model.StructureMap.StructureMapGroupTypeMode.NONE);
+ return tgt;
+ }
VersionConvertor_30_50.copyElement(src, tgt);
switch(src.getValue()) {
- case NONE:
- tgt.setValue(org.hl7.fhir.dstu3.model.StructureMap.StructureMapGroupTypeMode.NONE);
- break;
case TYPES:
tgt.setValue(org.hl7.fhir.dstu3.model.StructureMap.StructureMapGroupTypeMode.TYPES);
break;
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Composition40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Composition40_50.java
index c8c3465b3..b322b62c8 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Composition40_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Composition40_50.java
@@ -149,59 +149,37 @@ public class Composition40_50 extends VersionConvertor_40_50 {
return tgt;
}
- static public org.hl7.fhir.r5.model.Enumeration convertDocumentConfidentiality(org.hl7.fhir.r4.model.Enumeration src) throws FHIRException {
+ static public org.hl7.fhir.r5.model.CodeType convertDocumentConfidentiality(org.hl7.fhir.r4.model.Enumeration src) throws FHIRException {
if (src == null || src.isEmpty())
return null;
- org.hl7.fhir.r5.model.Enumeration tgt = new org.hl7.fhir.r5.model.Enumeration<>(new org.hl7.fhir.r5.model.Composition.V3ConfidentialityClassificationEnumFactory());
+ org.hl7.fhir.r5.model.CodeType tgt = new org.hl7.fhir.r5.model.CodeType();
VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case U:
- tgt.setValue(org.hl7.fhir.r5.model.Composition.V3ConfidentialityClassification.U);
- break;
- case L:
- tgt.setValue(org.hl7.fhir.r5.model.Composition.V3ConfidentialityClassification.L);
- break;
- case M:
- tgt.setValue(org.hl7.fhir.r5.model.Composition.V3ConfidentialityClassification.M);
- break;
- case N:
- tgt.setValue(org.hl7.fhir.r5.model.Composition.V3ConfidentialityClassification.N);
- break;
- case R:
- tgt.setValue(org.hl7.fhir.r5.model.Composition.V3ConfidentialityClassification.R);
- break;
- case V:
- tgt.setValue(org.hl7.fhir.r5.model.Composition.V3ConfidentialityClassification.V);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r5.model.Composition.V3ConfidentialityClassification.NULL);
- break;
- }
+ tgt.setValue(src.getValue().toCode());
return tgt;
}
- static public org.hl7.fhir.r4.model.Enumeration convertDocumentConfidentiality(org.hl7.fhir.r5.model.Enumeration src) throws FHIRException {
+ static public org.hl7.fhir.r4.model.Enumeration convertDocumentConfidentiality(org.hl7.fhir.r5.model.CodeType src) throws FHIRException {
if (src == null || src.isEmpty())
return null;
org.hl7.fhir.r4.model.Enumeration tgt = new org.hl7.fhir.r4.model.Enumeration<>(new org.hl7.fhir.r4.model.Composition.DocumentConfidentialityEnumFactory());
VersionConvertor_40_50.copyElement(src, tgt);
switch(src.getValue()) {
- case U:
+ case "U":
tgt.setValue(org.hl7.fhir.r4.model.Composition.DocumentConfidentiality.U);
break;
- case L:
+ case "L":
tgt.setValue(org.hl7.fhir.r4.model.Composition.DocumentConfidentiality.L);
break;
- case M:
+ case "M":
tgt.setValue(org.hl7.fhir.r4.model.Composition.DocumentConfidentiality.M);
break;
- case N:
+ case "N":
tgt.setValue(org.hl7.fhir.r4.model.Composition.DocumentConfidentiality.N);
break;
- case R:
+ case "R":
tgt.setValue(org.hl7.fhir.r4.model.Composition.DocumentConfidentiality.R);
break;
- case V:
+ case "V":
tgt.setValue(org.hl7.fhir.r4.model.Composition.DocumentConfidentiality.V);
break;
default:
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Consent40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Consent40_50.java
index 551012553..d745ce082 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Consent40_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Consent40_50.java
@@ -51,7 +51,7 @@ public class Consent40_50 extends VersionConvertor_40_50 {
if (src.hasDateTime())
tgt.setDateTimeElement(convertDateTime(src.getDateTimeElement()));
for (org.hl7.fhir.r4.model.Reference t : src.getPerformer()) tgt.addPerformer(convertReference(t));
- for (org.hl7.fhir.r4.model.Reference t : src.getOrganization()) tgt.addOrganization(convertReference(t));
+ for (org.hl7.fhir.r4.model.Reference t : src.getOrganization()) tgt.addManager(convertReference(t));
if (src.hasSourceAttachment())
tgt.addSourceAttachment(convertAttachment(src.getSourceAttachment()));
if (src.hasSourceReference())
@@ -81,7 +81,8 @@ public class Consent40_50 extends VersionConvertor_40_50 {
if (src.hasDateTime())
tgt.setDateTimeElement(convertDateTime(src.getDateTimeElement()));
for (org.hl7.fhir.r5.model.Reference t : src.getPerformer()) tgt.addPerformer(convertReference(t));
- for (org.hl7.fhir.r5.model.Reference t : src.getOrganization()) tgt.addOrganization(convertReference(t));
+ for (org.hl7.fhir.r5.model.Reference t : src.getManager()) tgt.addOrganization(convertReference(t));
+ for (org.hl7.fhir.r5.model.Reference t : src.getController()) tgt.addOrganization(convertReference(t));
if (src.hasSourceAttachment())
tgt.setSource(convertType(src.getSourceAttachmentFirstRep()));
if (src.hasSourceReference())
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DocumentReference40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DocumentReference40_50.java
index ca42c58be..0051fb1d0 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DocumentReference40_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DocumentReference40_50.java
@@ -1,8 +1,11 @@
package org.hl7.fhir.convertors.conv40_50;
+import org.hl7.fhir.convertors.VersionConvertor_30_50;
import org.hl7.fhir.convertors.VersionConvertor_40_50;
import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.r5.model.DocumentReference.DocumentAttestationMode;
+import org.hl7.fhir.r5.model.DocumentReference.DocumentReferenceAttesterComponent;
/*
Copyright (c) 2011+, HL7, Inc.
@@ -41,7 +44,7 @@ public class DocumentReference40_50 extends VersionConvertor_40_50 {
org.hl7.fhir.r5.model.DocumentReference tgt = new org.hl7.fhir.r5.model.DocumentReference();
copyDomainResource(src, tgt);
if (src.hasMasterIdentifier())
- tgt.setMasterIdentifier(convertIdentifier(src.getMasterIdentifier()));
+ tgt.addIdentifier(convertIdentifier(src.getMasterIdentifier()));
for (org.hl7.fhir.r4.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(convertIdentifier(t));
if (src.hasStatus())
tgt.setStatusElement(Enumerations40_50.convertDocumentReferenceStatus(src.getStatusElement()));
@@ -56,16 +59,16 @@ public class DocumentReference40_50 extends VersionConvertor_40_50 {
tgt.setDateElement(convertInstant(src.getDateElement()));
for (org.hl7.fhir.r4.model.Reference t : src.getAuthor()) tgt.addAuthor(convertReference(t));
if (src.hasAuthenticator())
- tgt.setAuthenticator(convertReference(src.getAuthenticator()));
+ tgt.addAttester().setMode(DocumentAttestationMode.OFFICIAL).setParty(VersionConvertor_40_50.convertReference(src.getAuthenticator()));
if (src.hasCustodian())
tgt.setCustodian(convertReference(src.getCustodian()));
for (org.hl7.fhir.r4.model.DocumentReference.DocumentReferenceRelatesToComponent t : src.getRelatesTo()) tgt.addRelatesTo(convertDocumentReferenceRelatesToComponent(t));
if (src.hasDescription())
- tgt.setDescriptionElement(convertString(src.getDescriptionElement()));
+ tgt.setDescriptionElement(convertStringToMarkdown(src.getDescriptionElement()));
for (org.hl7.fhir.r4.model.CodeableConcept t : src.getSecurityLabel()) tgt.addSecurityLabel(convertCodeableConcept(t));
for (org.hl7.fhir.r4.model.DocumentReference.DocumentReferenceContentComponent t : src.getContent()) tgt.addContent(convertDocumentReferenceContentComponent(t));
if (src.hasContext())
- tgt.setContext(convertDocumentReferenceContextComponent(src.getContext()));
+ convertDocumentReferenceContextComponent(src.getContext(), tgt);
return tgt;
}
@@ -74,8 +77,8 @@ public class DocumentReference40_50 extends VersionConvertor_40_50 {
return null;
org.hl7.fhir.r4.model.DocumentReference tgt = new org.hl7.fhir.r4.model.DocumentReference();
copyDomainResource(src, tgt);
- if (src.hasMasterIdentifier())
- tgt.setMasterIdentifier(convertIdentifier(src.getMasterIdentifier()));
+// if (src.hasMasterIdentifier())
+// tgt.setMasterIdentifier(convertIdentifier(src.getMasterIdentifier()));
for (org.hl7.fhir.r5.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(convertIdentifier(t));
if (src.hasStatus())
tgt.setStatusElement(Enumerations40_50.convertDocumentReferenceStatus(src.getStatusElement()));
@@ -89,8 +92,10 @@ public class DocumentReference40_50 extends VersionConvertor_40_50 {
if (src.hasDate())
tgt.setDateElement(convertInstant(src.getDateElement()));
for (org.hl7.fhir.r5.model.Reference t : src.getAuthor()) tgt.addAuthor(convertReference(t));
- if (src.hasAuthenticator())
- tgt.setAuthenticator(convertReference(src.getAuthenticator()));
+ for (DocumentReferenceAttesterComponent t : src.getAttester()) {
+ if (t.getMode() == DocumentAttestationMode.OFFICIAL)
+ tgt.setAuthenticator(VersionConvertor_40_50.convertReference(t.getParty()));
+ }
if (src.hasCustodian())
tgt.setCustodian(convertReference(src.getCustodian()));
for (org.hl7.fhir.r5.model.DocumentReference.DocumentReferenceRelatesToComponent t : src.getRelatesTo()) tgt.addRelatesTo(convertDocumentReferenceRelatesToComponent(t));
@@ -98,8 +103,7 @@ public class DocumentReference40_50 extends VersionConvertor_40_50 {
tgt.setDescriptionElement(convertString(src.getDescriptionElement()));
for (org.hl7.fhir.r5.model.CodeableConcept t : src.getSecurityLabel()) tgt.addSecurityLabel(convertCodeableConcept(t));
for (org.hl7.fhir.r5.model.DocumentReference.DocumentReferenceContentComponent t : src.getContent()) tgt.addContent(convertDocumentReferenceContentComponent(t));
- if (src.hasContext())
- tgt.setContext(convertDocumentReferenceContextComponent(src.getContext()));
+ convertDocumentReferenceContextComponent(src, tgt.getContext());
return tgt;
}
@@ -251,11 +255,7 @@ public class DocumentReference40_50 extends VersionConvertor_40_50 {
return tgt;
}
- public static org.hl7.fhir.r5.model.DocumentReference.DocumentReferenceContextComponent convertDocumentReferenceContextComponent(org.hl7.fhir.r4.model.DocumentReference.DocumentReferenceContextComponent src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r5.model.DocumentReference.DocumentReferenceContextComponent tgt = new org.hl7.fhir.r5.model.DocumentReference.DocumentReferenceContextComponent();
- copyElement(src, tgt);
+ public static void convertDocumentReferenceContextComponent(org.hl7.fhir.r4.model.DocumentReference.DocumentReferenceContextComponent src, org.hl7.fhir.r5.model.DocumentReference tgt) throws FHIRException {
for (org.hl7.fhir.r4.model.Reference t : src.getEncounter()) tgt.addEncounter(convertReference(t));
for (org.hl7.fhir.r4.model.CodeableConcept t : src.getEvent()) tgt.addEvent(convertCodeableConcept(t));
if (src.hasPeriod())
@@ -267,14 +267,9 @@ public class DocumentReference40_50 extends VersionConvertor_40_50 {
if (src.hasSourcePatientInfo())
tgt.setSourcePatientInfo(convertReference(src.getSourcePatientInfo()));
for (org.hl7.fhir.r4.model.Reference t : src.getRelated()) tgt.addRelated(convertReference(t));
- return tgt;
}
- public static org.hl7.fhir.r4.model.DocumentReference.DocumentReferenceContextComponent convertDocumentReferenceContextComponent(org.hl7.fhir.r5.model.DocumentReference.DocumentReferenceContextComponent src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r4.model.DocumentReference.DocumentReferenceContextComponent tgt = new org.hl7.fhir.r4.model.DocumentReference.DocumentReferenceContextComponent();
- copyElement(src, tgt);
+ public static void convertDocumentReferenceContextComponent(org.hl7.fhir.r5.model.DocumentReference src, org.hl7.fhir.r4.model.DocumentReference.DocumentReferenceContextComponent tgt) throws FHIRException {
for (org.hl7.fhir.r5.model.Reference t : src.getEncounter()) tgt.addEncounter(convertReference(t));
for (org.hl7.fhir.r5.model.CodeableConcept t : src.getEvent()) tgt.addEvent(convertCodeableConcept(t));
if (src.hasPeriod())
@@ -286,6 +281,5 @@ public class DocumentReference40_50 extends VersionConvertor_40_50 {
if (src.hasSourcePatientInfo())
tgt.setSourcePatientInfo(convertReference(src.getSourcePatientInfo()));
for (org.hl7.fhir.r5.model.Reference t : src.getRelated()) tgt.addRelated(convertReference(t));
- return tgt;
}
}
\ No newline at end of file
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationKnowledge40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationKnowledge40_50.java
index 015b84fef..4134b86d1 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationKnowledge40_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationKnowledge40_50.java
@@ -6,6 +6,7 @@ import org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.r4.model.CodeType;
import org.hl7.fhir.r5.model.Enumeration;
import org.hl7.fhir.r5.model.MedicationKnowledge.MedicationKnowledgeStatusCodesEnumFactory;
+import org.hl7.fhir.r5.model.MedicationKnowledge.MedicationKnowledgePackagingComponent;
import org.hl7.fhir.r5.model.MedicationKnowledge.MedicationKnowledgeStatusCodes;
import org.hl7.fhir.r5.model.MedicationKnowledge.MedicationKnowledgeStatusCodesEnumFactory;
@@ -70,7 +71,7 @@ public class MedicationKnowledge40_50 extends VersionConvertor_40_50 {
// tgt.addAdministrationGuidelines(convertMedicationKnowledgeAdministrationGuidelinesComponent(t));
for (org.hl7.fhir.r4.model.MedicationKnowledge.MedicationKnowledgeMedicineClassificationComponent t : src.getMedicineClassification()) tgt.addMedicineClassification(convertMedicationKnowledgeMedicineClassificationComponent(t));
if (src.hasPackaging())
- tgt.setPackaging(convertMedicationKnowledgePackagingComponent(src.getPackaging()));
+ tgt.addPackaging(convertMedicationKnowledgePackagingComponent(src.getPackaging()));
for (org.hl7.fhir.r4.model.MedicationKnowledge.MedicationKnowledgeDrugCharacteristicComponent t : src.getDrugCharacteristic()) tgt.addDrugCharacteristic(convertMedicationKnowledgeDrugCharacteristicComponent(t));
// for (org.hl7.fhir.r4.model.Reference t : src.getContraindication())
// tgt.addContraindication(convertReference(t));
@@ -109,8 +110,8 @@ public class MedicationKnowledge40_50 extends VersionConvertor_40_50 {
// for (org.hl7.fhir.r5.model.MedicationKnowledge.MedicationKnowledgeAdministrationGuidelinesComponent t : src.getAdministrationGuidelines())
// tgt.addAdministrationGuidelines(convertMedicationKnowledgeAdministrationGuidelinesComponent(t));
for (org.hl7.fhir.r5.model.MedicationKnowledge.MedicationKnowledgeMedicineClassificationComponent t : src.getMedicineClassification()) tgt.addMedicineClassification(convertMedicationKnowledgeMedicineClassificationComponent(t));
- if (src.hasPackaging())
- tgt.setPackaging(convertMedicationKnowledgePackagingComponent(src.getPackaging()));
+ for (MedicationKnowledgePackagingComponent t : src.getPackaging())
+ tgt.setPackaging(convertMedicationKnowledgePackagingComponent(t));
for (org.hl7.fhir.r5.model.MedicationKnowledge.MedicationKnowledgeDrugCharacteristicComponent t : src.getDrugCharacteristic()) tgt.addDrugCharacteristic(convertMedicationKnowledgeDrugCharacteristicComponent(t));
// for (org.hl7.fhir.r5.model.Reference t : src.getContraindication())
// tgt.addContraindication(convertReference(t));
@@ -266,8 +267,8 @@ public class MedicationKnowledge40_50 extends VersionConvertor_40_50 {
tgt.setType(convertCodeableConcept(src.getType()));
if (src.hasSource())
tgt.setSourceElement(convertString(src.getSourceElement()));
- if (src.hasCost())
- tgt.setCost(convertMoney(src.getCost()));
+ if (src.hasCostMoney())
+ tgt.setCost(convertMoney(src.getCostMoney()));
return tgt;
}
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicinalProductDefinition40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicinalProductDefinition40_50.java
index 1df6f9cac..70f84c3f0 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicinalProductDefinition40_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicinalProductDefinition40_50.java
@@ -65,7 +65,7 @@ public class MedicinalProductDefinition40_50 extends VersionConvertor_40_50 {
}
if (src.hasPaediatricUseIndicator())
tgt.setPaediatricUseIndicator(convertCodeableConcept(src.getPaediatricUseIndicator()));
- for (org.hl7.fhir.r4.model.CodeableConcept t : src.getProductClassification()) tgt.addProductClassification(convertCodeableConcept(t));
+ for (org.hl7.fhir.r4.model.CodeableConcept t : src.getProductClassification()) tgt.addClassification(convertCodeableConcept(t));
for (org.hl7.fhir.r4.model.MarketingStatus t : src.getMarketingStatus()) tgt.addMarketingStatus(convertMarketingStatus(t));
for (org.hl7.fhir.r4.model.Reference t : src.getPharmaceuticalProduct()) tgt.addPharmaceuticalProduct(convertReference(t));
for (org.hl7.fhir.r4.model.Reference t : src.getPackagedMedicinalProduct()) tgt.addPackagedMedicinalProduct(convertReference(t));
@@ -101,10 +101,10 @@ public class MedicinalProductDefinition40_50 extends VersionConvertor_40_50 {
}
}
for (org.hl7.fhir.r4.model.Identifier t : src.getCrossReference()) {
- // cross-reference Identifier -> complex
- org.hl7.fhir.r5.model.MedicinalProductDefinition.MedicinalProductDefinitionCrossReferenceComponent c = new org.hl7.fhir.r5.model.MedicinalProductDefinition.MedicinalProductDefinitionCrossReferenceComponent();
- tgt.addCrossReference(c);
- c.setProduct(convertIdentifier(t));
+ // cross-reference Identifier -> complex - todo
+// org.hl7.fhir.r5.model.MedicinalProductDefinition.MedicinalProductDefinitionCrossReferenceComponent c = new org.hl7.fhir.r5.model.MedicinalProductDefinition.MedicinalProductDefinitionCrossReferenceComponent();
+// tgt.addCrossReference(c);
+// c.setProduct(convertIdentifier(t));
}
for (org.hl7.fhir.r4.model.MedicinalProduct.MedicinalProductManufacturingBusinessOperationComponent srcMBO : src.getManufacturingBusinessOperation()) {
org.hl7.fhir.r5.model.MedicinalProductDefinition.MedicinalProductDefinitionManufacturingBusinessOperationComponent tgtMBO = new org.hl7.fhir.r5.model.MedicinalProductDefinition.MedicinalProductDefinitionManufacturingBusinessOperationComponent();
@@ -174,7 +174,7 @@ public class MedicinalProductDefinition40_50 extends VersionConvertor_40_50 {
}
if (src.hasPaediatricUseIndicator())
tgt.setPaediatricUseIndicator(convertCodeableConcept(src.getPaediatricUseIndicator()));
- for (org.hl7.fhir.r5.model.CodeableConcept t : src.getProductClassification()) tgt.addProductClassification(convertCodeableConcept(t));
+ for (org.hl7.fhir.r5.model.CodeableConcept t : src.getClassification()) tgt.addProductClassification(convertCodeableConcept(t));
for (org.hl7.fhir.r5.model.MarketingStatus t : src.getMarketingStatus()) tgt.addMarketingStatus(convertMarketingStatus(t));
for (org.hl7.fhir.r5.model.Reference t : src.getPharmaceuticalProduct()) tgt.addPharmaceuticalProduct(convertReference(t));
for (org.hl7.fhir.r5.model.Reference t : src.getPackagedMedicinalProduct()) tgt.addPackagedMedicinalProduct(convertReference(t));
@@ -215,13 +215,13 @@ public class MedicinalProductDefinition40_50 extends VersionConvertor_40_50 {
}
}
for (org.hl7.fhir.r5.model.MedicinalProductDefinition.MedicinalProductDefinitionCrossReferenceComponent t : src.getCrossReference()) {
- // cross-reference complex -> Identifier
- if (t.hasProduct()) {
- if (t.getProduct() instanceof org.hl7.fhir.r5.model.Identifier)
- tgt.addCrossReference(convertIdentifier((org.hl7.fhir.r5.model.Identifier)t.getProduct()));
- else
- throw new FHIRException("Converting MedicinalProductDefinition.crossReference.productReference is not supported");
- }
+ // cross-reference complex -> Identifier - todo
+// if (t.hasProduct()) {
+// if (t.getProduct() instanceof org.hl7.fhir.r5.model.Identifier)
+// tgt.addCrossReference(convertIdentifier((org.hl7.fhir.r5.model.Identifier)t.getProduct()));
+// else
+// throw new FHIRException("Converting MedicinalProductDefinition.crossReference.productReference is not supported");
+// }
checkBase(t, "MedicinalProductDefinition.crossReference");
if (t.hasType())
throw new FHIRException("Converting MedicinalProductDefinition.crossReference.type is not supported");
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/StructureMap40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/StructureMap40_50.java
index edf463d3e..ee3be5756 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/StructureMap40_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/StructureMap40_50.java
@@ -236,8 +236,7 @@ public class StructureMap40_50 extends VersionConvertor_40_50 {
VersionConvertor_40_50.copyElement(src, tgt);
switch(src.getValue()) {
case NONE:
- tgt.setValue(org.hl7.fhir.r5.model.StructureMap.StructureMapGroupTypeMode.NONE);
- break;
+ return null;
case TYPES:
tgt.setValue(org.hl7.fhir.r5.model.StructureMap.StructureMapGroupTypeMode.TYPES);
break;
@@ -252,14 +251,13 @@ public class StructureMap40_50 extends VersionConvertor_40_50 {
}
static public org.hl7.fhir.r4.model.Enumeration convertStructureMapGroupTypeMode(org.hl7.fhir.r5.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r4.model.Enumeration tgt = new org.hl7.fhir.r4.model.Enumeration<>(new org.hl7.fhir.r4.model.StructureMap.StructureMapGroupTypeModeEnumFactory());
+ org.hl7.fhir.r4.model.Enumeration tgt = new org.hl7.fhir.r4.model.Enumeration<>(new org.hl7.fhir.r4.model.StructureMap.StructureMapGroupTypeModeEnumFactory());
+ if (src == null || src.isEmpty()) {
+ tgt.setValue(org.hl7.fhir.r4.model.StructureMap.StructureMapGroupTypeMode.NONE);
+ return tgt;
+ }
VersionConvertor_40_50.copyElement(src, tgt);
switch(src.getValue()) {
- case NONE:
- tgt.setValue(org.hl7.fhir.r4.model.StructureMap.StructureMapGroupTypeMode.NONE);
- break;
case TYPES:
tgt.setValue(org.hl7.fhir.r4.model.StructureMap.StructureMapGroupTypeMode.TYPES);
break;
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SubstancePolymer40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SubstancePolymer40_50.java
index 65cdaf8df..f9c21f111 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SubstancePolymer40_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SubstancePolymer40_50.java
@@ -100,8 +100,9 @@ public class SubstancePolymer40_50 extends VersionConvertor_40_50 {
tgt.setCategory(convertCodeableConcept(src.getType()));
if (src.hasIsDefining())
tgt.setIsDefiningElement(convertBoolean(src.getIsDefiningElement()));
- if (src.hasAmount())
- tgt.setAmount(convertSubstanceAmount(src.getAmount()));
+// todo
+// if (src.hasAmount())
+// tgt.setAmount(convertSubstanceAmount(src.getAmount()));
return tgt;
}
@@ -116,8 +117,9 @@ public class SubstancePolymer40_50 extends VersionConvertor_40_50 {
tgt.setType(convertCodeableConcept(src.getCategory()));
if (src.hasIsDefining())
tgt.setIsDefiningElement(convertBoolean(src.getIsDefiningElement()));
- if (src.hasAmount())
- tgt.setAmount(convertSubstanceAmount(src.getAmount()));
+ // todo
+// if (src.hasAmount())
+// tgt.setAmount(convertSubstanceAmount(src.getAmount()));
return tgt;
}
@@ -126,8 +128,9 @@ public class SubstancePolymer40_50 extends VersionConvertor_40_50 {
return null;
org.hl7.fhir.r5.model.SubstancePolymer.SubstancePolymerRepeatComponent tgt = new org.hl7.fhir.r5.model.SubstancePolymer.SubstancePolymerRepeatComponent();
copyElement(src, tgt);
- if (src.hasNumberOfUnits())
- tgt.setNumberOfUnitsElement(convertInteger(src.getNumberOfUnitsElement()));
+ // todo
+// if (src.hasNumberOfUnits())
+// tgt.setNumberOfUnitsElement(convertInteger(src.getNumberOfUnitsElement()));
if (src.hasAverageMolecularFormula())
tgt.setAverageMolecularFormulaElement(convertString(src.getAverageMolecularFormulaElement()));
if (src.hasRepeatUnitAmountType())
@@ -141,8 +144,9 @@ public class SubstancePolymer40_50 extends VersionConvertor_40_50 {
return null;
org.hl7.fhir.r4.model.SubstancePolymer.SubstancePolymerRepeatComponent tgt = new org.hl7.fhir.r4.model.SubstancePolymer.SubstancePolymerRepeatComponent();
copyElement(src, tgt);
- if (src.hasNumberOfUnits())
- tgt.setNumberOfUnitsElement(convertInteger(src.getNumberOfUnitsElement()));
+ // todo
+// if (src.hasNumberOfUnits())
+// tgt.setNumberOfUnitsElement(convertInteger(src.getNumberOfUnitsElement()));
if (src.hasAverageMolecularFormula())
tgt.setAverageMolecularFormulaElement(convertString(src.getAverageMolecularFormulaElement()));
if (src.hasRepeatUnitAmountType())
@@ -160,8 +164,9 @@ public class SubstancePolymer40_50 extends VersionConvertor_40_50 {
tgt.setOrientation(convertCodeableConcept(src.getOrientationOfPolymerisation()));
if (src.hasRepeatUnit())
tgt.setUnitElement(convertString(src.getRepeatUnitElement()));
- if (src.hasAmount())
- tgt.setAmount(convertSubstanceAmount(src.getAmount()));
+ // todo
+// if (src.hasAmount())
+// tgt.setAmount(convertSubstanceAmount(src.getAmount()));
for (org.hl7.fhir.r4.model.SubstancePolymer.SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent t : src.getDegreeOfPolymerisation()) tgt.addDegreeOfPolymerisation(convertSubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent(t));
for (org.hl7.fhir.r4.model.SubstancePolymer.SubstancePolymerRepeatRepeatUnitStructuralRepresentationComponent t : src.getStructuralRepresentation()) tgt.addStructuralRepresentation(convertSubstancePolymerRepeatRepeatUnitStructuralRepresentationComponent(t));
return tgt;
@@ -176,8 +181,9 @@ public class SubstancePolymer40_50 extends VersionConvertor_40_50 {
tgt.setOrientationOfPolymerisation(convertCodeableConcept(src.getOrientation()));
if (src.hasUnit())
tgt.setRepeatUnitElement(convertString(src.getUnitElement()));
- if (src.hasAmount())
- tgt.setAmount(convertSubstanceAmount(src.getAmount()));
+ // todo
+// if (src.hasAmount())
+// tgt.setAmount(convertSubstanceAmount(src.getAmount()));
for (org.hl7.fhir.r5.model.SubstancePolymer.SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent t : src.getDegreeOfPolymerisation()) tgt.addDegreeOfPolymerisation(convertSubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent(t));
for (org.hl7.fhir.r5.model.SubstancePolymer.SubstancePolymerRepeatRepeatUnitStructuralRepresentationComponent t : src.getStructuralRepresentation()) tgt.addStructuralRepresentation(convertSubstancePolymerRepeatRepeatUnitStructuralRepresentationComponent(t));
return tgt;
@@ -188,10 +194,11 @@ public class SubstancePolymer40_50 extends VersionConvertor_40_50 {
return null;
org.hl7.fhir.r5.model.SubstancePolymer.SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent tgt = new org.hl7.fhir.r5.model.SubstancePolymer.SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent();
copyElement(src, tgt);
- if (src.hasDegree())
- tgt.setDegree(convertCodeableConcept(src.getDegree()));
- if (src.hasAmount())
- tgt.setAmount(convertSubstanceAmount(src.getAmount()));
+ // todo
+// if (src.hasDegree())
+// tgt.setDegree(convertCodeableConcept(src.getDegree()));
+// if (src.hasAmount())
+// tgt.setAmount(convertSubstanceAmount(src.getAmount()));
return tgt;
}
@@ -200,10 +207,11 @@ public class SubstancePolymer40_50 extends VersionConvertor_40_50 {
return null;
org.hl7.fhir.r4.model.SubstancePolymer.SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent tgt = new org.hl7.fhir.r4.model.SubstancePolymer.SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent();
copyElement(src, tgt);
- if (src.hasDegree())
- tgt.setDegree(convertCodeableConcept(src.getDegree()));
- if (src.hasAmount())
- tgt.setAmount(convertSubstanceAmount(src.getAmount()));
+ // todo
+// if (src.hasDegree())
+// tgt.setDegree(convertCodeableConcept(src.getDegree()));
+// if (src.hasAmount())
+// tgt.setAmount(convertSubstanceAmount(src.getAmount()));
return tgt;
}
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SubstanceReferenceInformation40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SubstanceReferenceInformation40_50.java
index 1332335f6..a1ec744c9 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SubstanceReferenceInformation40_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SubstanceReferenceInformation40_50.java
@@ -44,7 +44,7 @@ public class SubstanceReferenceInformation40_50 extends VersionConvertor_40_50 {
tgt.setCommentElement(convertString(src.getCommentElement()));
for (org.hl7.fhir.r4.model.SubstanceReferenceInformation.SubstanceReferenceInformationGeneComponent t : src.getGene()) tgt.addGene(convertSubstanceReferenceInformationGeneComponent(t));
for (org.hl7.fhir.r4.model.SubstanceReferenceInformation.SubstanceReferenceInformationGeneElementComponent t : src.getGeneElement()) tgt.addGeneElement(convertSubstanceReferenceInformationGeneElementComponent(t));
- for (org.hl7.fhir.r4.model.SubstanceReferenceInformation.SubstanceReferenceInformationClassificationComponent t : src.getClassification()) tgt.addClassification(convertSubstanceReferenceInformationClassificationComponent(t));
+// for (org.hl7.fhir.r4.model.SubstanceReferenceInformation.SubstanceReferenceInformationClassificationComponent t : src.getClassification()) tgt.addClassification(convertSubstanceReferenceInformationClassificationComponent(t));
for (org.hl7.fhir.r4.model.SubstanceReferenceInformation.SubstanceReferenceInformationTargetComponent t : src.getTarget()) tgt.addTarget(convertSubstanceReferenceInformationTargetComponent(t));
return tgt;
}
@@ -58,7 +58,7 @@ public class SubstanceReferenceInformation40_50 extends VersionConvertor_40_50 {
tgt.setCommentElement(convertString(src.getCommentElement()));
for (org.hl7.fhir.r5.model.SubstanceReferenceInformation.SubstanceReferenceInformationGeneComponent t : src.getGene()) tgt.addGene(convertSubstanceReferenceInformationGeneComponent(t));
for (org.hl7.fhir.r5.model.SubstanceReferenceInformation.SubstanceReferenceInformationGeneElementComponent t : src.getGeneElement()) tgt.addGeneElement(convertSubstanceReferenceInformationGeneElementComponent(t));
- for (org.hl7.fhir.r5.model.SubstanceReferenceInformation.SubstanceReferenceInformationClassificationComponent t : src.getClassification()) tgt.addClassification(convertSubstanceReferenceInformationClassificationComponent(t));
+// for (org.hl7.fhir.r5.model.SubstanceReferenceInformation.SubstanceReferenceInformationClassificationComponent t : src.getClassification()) tgt.addClassification(convertSubstanceReferenceInformationClassificationComponent(t));
for (org.hl7.fhir.r5.model.SubstanceReferenceInformation.SubstanceReferenceInformationTargetComponent t : src.getTarget()) tgt.addTarget(convertSubstanceReferenceInformationTargetComponent(t));
return tgt;
}
@@ -115,34 +115,34 @@ public class SubstanceReferenceInformation40_50 extends VersionConvertor_40_50 {
return tgt;
}
- public static org.hl7.fhir.r5.model.SubstanceReferenceInformation.SubstanceReferenceInformationClassificationComponent convertSubstanceReferenceInformationClassificationComponent(org.hl7.fhir.r4.model.SubstanceReferenceInformation.SubstanceReferenceInformationClassificationComponent src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r5.model.SubstanceReferenceInformation.SubstanceReferenceInformationClassificationComponent tgt = new org.hl7.fhir.r5.model.SubstanceReferenceInformation.SubstanceReferenceInformationClassificationComponent();
- copyElement(src, tgt);
- if (src.hasDomain())
- tgt.setDomain(convertCodeableConcept(src.getDomain()));
- if (src.hasClassification())
- tgt.setClassification(convertCodeableConcept(src.getClassification()));
- for (org.hl7.fhir.r4.model.CodeableConcept t : src.getSubtype()) tgt.addSubtype(convertCodeableConcept(t));
- for (org.hl7.fhir.r4.model.Reference t : src.getSource()) tgt.addSource(convertReference(t));
- return tgt;
- }
-
- public static org.hl7.fhir.r4.model.SubstanceReferenceInformation.SubstanceReferenceInformationClassificationComponent convertSubstanceReferenceInformationClassificationComponent(org.hl7.fhir.r5.model.SubstanceReferenceInformation.SubstanceReferenceInformationClassificationComponent src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r4.model.SubstanceReferenceInformation.SubstanceReferenceInformationClassificationComponent tgt = new org.hl7.fhir.r4.model.SubstanceReferenceInformation.SubstanceReferenceInformationClassificationComponent();
- copyElement(src, tgt);
- if (src.hasDomain())
- tgt.setDomain(convertCodeableConcept(src.getDomain()));
- if (src.hasClassification())
- tgt.setClassification(convertCodeableConcept(src.getClassification()));
- for (org.hl7.fhir.r5.model.CodeableConcept t : src.getSubtype()) tgt.addSubtype(convertCodeableConcept(t));
- for (org.hl7.fhir.r5.model.Reference t : src.getSource()) tgt.addSource(convertReference(t));
- return tgt;
- }
-
+// public static org.hl7.fhir.r5.model.SubstanceReferenceInformation.SubstanceReferenceInformationClassificationComponent convertSubstanceReferenceInformationClassificationComponent(org.hl7.fhir.r4.model.SubstanceReferenceInformation.SubstanceReferenceInformationClassificationComponent src) throws FHIRException {
+// if (src == null)
+// return null;
+// org.hl7.fhir.r5.model.SubstanceReferenceInformation.SubstanceReferenceInformationClassificationComponent tgt = new org.hl7.fhir.r5.model.SubstanceReferenceInformation.SubstanceReferenceInformationClassificationComponent();
+// copyElement(src, tgt);
+// if (src.hasDomain())
+// tgt.setDomain(convertCodeableConcept(src.getDomain()));
+// if (src.hasClassification())
+// tgt.setClassification(convertCodeableConcept(src.getClassification()));
+// for (org.hl7.fhir.r4.model.CodeableConcept t : src.getSubtype()) tgt.addSubtype(convertCodeableConcept(t));
+// for (org.hl7.fhir.r4.model.Reference t : src.getSource()) tgt.addSource(convertReference(t));
+// return tgt;
+// }
+//
+// public static org.hl7.fhir.r4.model.SubstanceReferenceInformation.SubstanceReferenceInformationClassificationComponent convertSubstanceReferenceInformationClassificationComponent(org.hl7.fhir.r5.model.SubstanceReferenceInformation.SubstanceReferenceInformationClassificationComponent src) throws FHIRException {
+// if (src == null)
+// return null;
+// org.hl7.fhir.r4.model.SubstanceReferenceInformation.SubstanceReferenceInformationClassificationComponent tgt = new org.hl7.fhir.r4.model.SubstanceReferenceInformation.SubstanceReferenceInformationClassificationComponent();
+// copyElement(src, tgt);
+// if (src.hasDomain())
+// tgt.setDomain(convertCodeableConcept(src.getDomain()));
+// if (src.hasClassification())
+// tgt.setClassification(convertCodeableConcept(src.getClassification()));
+// for (org.hl7.fhir.r5.model.CodeableConcept t : src.getSubtype()) tgt.addSubtype(convertCodeableConcept(t));
+// for (org.hl7.fhir.r5.model.Reference t : src.getSource()) tgt.addSource(convertReference(t));
+// return tgt;
+// }
+//
public static org.hl7.fhir.r5.model.SubstanceReferenceInformation.SubstanceReferenceInformationTargetComponent convertSubstanceReferenceInformationTargetComponent(org.hl7.fhir.r4.model.SubstanceReferenceInformation.SubstanceReferenceInformationTargetComponent src) throws FHIRException {
if (src == null)
return null;
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/ICD11Generator.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/ICD11Generator.java
index 04642e0f8..a8b9cac80 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/ICD11Generator.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/ICD11Generator.java
@@ -5,19 +5,11 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.net.URL;
import java.net.URLConnection;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashSet;
import java.util.Set;
-import org.hl7.fhir.r4.model.CodeType;
-import org.hl7.fhir.r4.model.Coding;
import org.hl7.fhir.r4.formats.IParser.OutputStyle;
-import org.hl7.fhir.r4.model.ValueSet;
-import org.hl7.fhir.r4.model.ValueSet.ConceptSetComponent;
-import org.hl7.fhir.r4.model.ValueSet.FilterOperator;
import org.hl7.fhir.r4.formats.XmlParser;
import org.hl7.fhir.r4.formats.XmlParserBase.XmlVersion;
import org.hl7.fhir.r4.model.BooleanType;
@@ -26,16 +18,18 @@ import org.hl7.fhir.r4.model.CodeSystem.CodeSystemContentMode;
import org.hl7.fhir.r4.model.CodeSystem.CodeSystemHierarchyMeaning;
import org.hl7.fhir.r4.model.CodeSystem.ConceptPropertyComponent;
import org.hl7.fhir.r4.model.CodeSystem.PropertyType;
+import org.hl7.fhir.r4.model.CodeType;
+import org.hl7.fhir.r4.model.Coding;
import org.hl7.fhir.r4.model.DateTimeType;
import org.hl7.fhir.r4.model.Enumerations.PublicationStatus;
import org.hl7.fhir.r4.model.StringType;
+import org.hl7.fhir.r4.model.ValueSet;
+import org.hl7.fhir.r4.model.ValueSet.ConceptSetComponent;
+import org.hl7.fhir.r4.model.ValueSet.FilterOperator;
import org.hl7.fhir.r4.terminologies.CodeSystemUtilities;
import org.hl7.fhir.r4.utils.ToolingExtensions;
-import org.hl7.fhir.r5.model.CodeSystem.ConceptDefinitionComponent;
-import org.hl7.fhir.utilities.CommaSeparatedStringBuilder;
import org.hl7.fhir.utilities.TextFile;
import org.hl7.fhir.utilities.Utilities;
-import org.hl7.fhir.utilities.json.JSONUtil;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/NpmPackageVersionConverter.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/NpmPackageVersionConverter.java
index 103d8b680..f5da11936 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/NpmPackageVersionConverter.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/NpmPackageVersionConverter.java
@@ -16,7 +16,6 @@ import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream;
-import org.hl7.fhir.dstu2.model.ClaimResponse.ErrorsComponent;
import org.hl7.fhir.convertors.VersionConvertorAdvisor40;
import org.hl7.fhir.convertors.VersionConvertor_10_30;
import org.hl7.fhir.convertors.VersionConvertor_10_40;
@@ -35,12 +34,10 @@ import org.hl7.fhir.r4.model.ValueSet;
import org.hl7.fhir.utilities.TextFile;
import org.hl7.fhir.utilities.VersionUtilities;
import org.hl7.fhir.utilities.cache.NpmPackageIndexBuilder;
-import org.hl7.fhir.utilities.cache.NpmPackage.NpmPackageFolder;
import org.hl7.fhir.utilities.json.JSONUtil;
import org.hl7.fhir.utilities.json.JsonTrackingParser;
import com.google.common.base.Charsets;
-import com.google.gson.GsonBuilder;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
diff --git a/org.hl7.fhir.core.generator/configuration/BackboneElement.java b/org.hl7.fhir.core.generator/configuration/BackboneElement.java
index eaf86be13..0f162c401 100644
--- a/org.hl7.fhir.core.generator/configuration/BackboneElement.java
+++ b/org.hl7.fhir.core.generator/configuration/BackboneElement.java
@@ -1,6 +1,69 @@
-public void checkNoModifiers(String noun, String verb) throws FHIRException {
+ public void checkNoModifiers(String noun, String verb) throws FHIRException {
if (hasModifierExtension()) {
throw new FHIRException("Found unknown Modifier Exceptions on "+noun+" doing "+verb);
}
- }
\ No newline at end of file
+ }
+
+ public void addModifierExtension(String url, DataType value) {
+ if (isDisallowExtensions())
+ throw new Error("Extensions are not allowed in this context");
+ Extension ex = new Extension();
+ ex.setUrl(url);
+ ex.setValue(value);
+ getModifierExtension().add(ex);
+ }
+
+
+ @Override
+ public Extension getExtensionByUrl(String theUrl) {
+ org.apache.commons.lang3.Validate.notBlank(theUrl, "theUrl must not be blank or null");
+ ArrayList retVal = new ArrayList();
+ Extension res = super.getExtensionByUrl(theUrl);
+ if (res != null) {
+ retVal.add(res);
+ }
+ for (Extension next : getModifierExtension()) {
+ if (theUrl.equals(next.getUrl())) {
+ retVal.add(next);
+ }
+ }
+ if (retVal.size() == 0)
+ return null;
+ else {
+ org.apache.commons.lang3.Validate.isTrue(retVal.size() == 1, "Url "+theUrl+" must have only one match");
+ return retVal.get(0);
+ }
+ }
+
+ @Override
+ public void removeExtension(String theUrl) {
+ for (int i = getModifierExtension().size()-1; i >= 0; i--) {
+ if (theUrl.equals(getExtension().get(i).getUrl()))
+ getExtension().remove(i);
+ }
+ super.removeExtension(theUrl);
+ }
+
+
+ /**
+ * Returns an unmodifiable list containing all extensions on this element which
+ * match the given URL.
+ *
+ * @param theUrl The URL. Must not be blank or null.
+ * @return an unmodifiable list containing all extensions on this element which
+ * match the given URL
+ */
+ @Override
+ public List getExtensionsByUrl(String theUrl) {
+ org.apache.commons.lang3.Validate.notBlank(theUrl, "theUrl must not be blank or null");
+ ArrayList retVal = new ArrayList();
+ retVal.addAll(super.getExtensionsByUrl(theUrl));
+ for (Extension next : getModifierExtension()) {
+ if (theUrl.equals(next.getUrl())) {
+ retVal.add(next);
+ }
+ }
+ return java.util.Collections.unmodifiableList(retVal);
+ }
+
\ No newline at end of file
diff --git a/org.hl7.fhir.core.generator/configuration/CanonicalResource.java b/org.hl7.fhir.core.generator/configuration/CanonicalResource.java
index 25c649986..354661f7e 100644
--- a/org.hl7.fhir.core.generator/configuration/CanonicalResource.java
+++ b/org.hl7.fhir.core.generator/configuration/CanonicalResource.java
@@ -1,4 +1,4 @@
-@Override
+ @Override
public String toString() {
return fhirType()+"["+getUrl()+"]";
}
@@ -9,4 +9,8 @@
if (hasName())
return getName();
return toString();
- }
\ No newline at end of file
+ }
+
+ public String getVUrl() {
+ return getUrl() + (hasVersion() ? "|"+getVersion() : "");
+ }
\ No newline at end of file
diff --git a/org.hl7.fhir.core.generator/configuration/CodeableConcept.java b/org.hl7.fhir.core.generator/configuration/CodeableConcept.java
index 03a9b8ca9..3668a4bc8 100644
--- a/org.hl7.fhir.core.generator/configuration/CodeableConcept.java
+++ b/org.hl7.fhir.core.generator/configuration/CodeableConcept.java
@@ -23,4 +23,68 @@ public boolean hasCoding(String system, String code) {
public boolean hasCoding(Coding coding) {
return hasCoding(coding.getSystem(), coding.getCode());
- }
\ No newline at end of file
+ }
+
+ public boolean hasCoding(String system) {
+ for (Coding c : getCoding()) {
+ if (system.equals(c.getSystem())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public String getCode(String system) {
+ for (Coding c : getCoding()) {
+ if (system.equals(c.getSystem())) {
+ return c.getCode();
+ }
+ }
+ return null;
+ }
+
+ public static CodeableConcept merge(CodeableConcept l, CodeableConcept r) {
+ CodeableConcept res = new CodeableConcept();
+ List handled = new ArrayList<>();
+ for (Coding c : l.getCoding()) {
+ boolean done = false;
+ for (Coding t : r.getCoding()) {
+ if (t.matches(c)) {
+ handled.add(t);
+ res.getCoding().add(Coding.merge(c, t));
+ done = true;
+ break;
+ }
+ }
+ if (!done) {
+ res.getCoding().add(c.copy());
+ }
+ }
+ for (Coding c : r.getCoding()) {
+ if (!handled.contains(c)) {
+ res.getCoding().add(c);
+ }
+ }
+ if (l.hasText()) {
+ res.setText(l.getText());
+ } else {
+ res.setText(r.getText());
+ }
+ return res;
+ }
+
+ public static CodeableConcept intersect(CodeableConcept l, CodeableConcept r) {
+ CodeableConcept res = new CodeableConcept();
+ for (Coding c : l.getCoding()) {
+ for (Coding t : r.getCoding()) {
+ if (t.matches(c)) {
+ res.getCoding().add(Coding.intersect(c, t));
+ break;
+ }
+ }
+ }
+ if (l.hasText() && r.hasText() && l.getText().equals(r.getText())) {
+ res.setText(l.getText());
+ }
+ return res;
+ }
\ No newline at end of file
diff --git a/org.hl7.fhir.core.generator/configuration/Coding.java b/org.hl7.fhir.core.generator/configuration/Coding.java
index 90748e5ab..1ce5f39d7 100644
--- a/org.hl7.fhir.core.generator/configuration/Coding.java
+++ b/org.hl7.fhir.core.generator/configuration/Coding.java
@@ -27,4 +27,56 @@
public boolean matches(Coding other) {
return other.hasCode() && this.hasCode() && other.hasSystem() && this.hasSystem() && this.getCode().equals(other.getCode()) && this.getSystem().equals(other.getSystem()) ;
- }
\ No newline at end of file
+ }
+
+
+ public static Coding merge(Coding l, Coding r) {
+ Coding res = new Coding();
+ if (l.hasSystem()) {
+ res.setSystem(l.getSystem());
+ } else {
+ res.setSystem(r.getSystem());
+ }
+ if (l.hasVersion()) {
+ res.setVersion(l.getVersion());
+ } else {
+ res.setVersion(r.getVersion());
+ }
+ if (l.hasCode()) {
+ res.setCode(l.getCode());
+ } else {
+ res.setCode(r.getCode());
+ }
+ if (l.hasDisplay()) {
+ res.setDisplay(l.getDisplay());
+ } else {
+ res.setDisplay(r.getDisplay());
+ }
+ if (l.hasUserSelected()) {
+ res.setUserSelected(l.getUserSelected());
+ } else {
+ res.setUserSelected(r.getUserSelected());
+ }
+ return res;
+ }
+
+ public static Coding intersect(Coding l, Coding r) {
+ Coding res = new Coding();
+ if (l.hasSystem() && l.getSystem().equals(r.getSystem())) {
+ res.setSystem(l.getSystem());
+ }
+ if (l.hasVersion() && l.getVersion().equals(r.getVersion())) {
+ res.setVersion(l.getVersion());
+ }
+ if (l.hasCode() && l.getCode().equals(r.getCode())) {
+ res.setCode(l.getCode());
+ }
+ if (l.hasDisplay() && l.getDisplay().equals(r.getDisplay())) {
+ res.setDisplay(l.getDisplay());
+ }
+ if (l.hasUserSelected() && l.getUserSelected() == r.getUserSelected()) {
+ res.setUserSelected(l.getUserSelected());
+ }
+ return res;
+ }
+
\ No newline at end of file
diff --git a/org.hl7.fhir.core.generator/configuration/Element.java b/org.hl7.fhir.core.generator/configuration/Element.java
index 597cd9bd6..08f5ca7cc 100644
--- a/org.hl7.fhir.core.generator/configuration/Element.java
+++ b/org.hl7.fhir.core.generator/configuration/Element.java
@@ -1,4 +1,4 @@
-@Override
+ @Override
public String getIdBase() {
return getId();
}
@@ -17,7 +17,15 @@
getExtension().add(ex);
}
-
+
+ /**
+ * Returns an extension if one (and only one) matches the given URL.
+ *
+ * Note: BackbdoneElements override this to look in matching Modifier Extensions too
+ *
+ * @param theUrl The URL. Must not be blank or null.
+ * @return the matching extension, or null
+ */
public Extension getExtensionByUrl(String theUrl) {
org.apache.commons.lang3.Validate.notBlank(theUrl, "theUrl must not be blank or null");
ArrayList retVal = new ArrayList();
@@ -34,6 +42,13 @@
}
}
+ /**
+ * Remove any extensions that match (by given URL).
+ *
+ * Note: BackbdoneElements override this to remove from Modifier Extensions too
+ *
+ * @param theUrl The URL. Must not be blank or null.
+ */
public void removeExtension(String theUrl) {
for (int i = getExtension().size()-1; i >= 0; i--) {
if (theUrl.equals(getExtension().get(i).getUrl()))
@@ -65,9 +80,10 @@
* Returns an unmodifiable list containing all extensions on this element which
* match the given URL.
*
+ * Note: BackbdoneElements override this to add matching Modifier Extensions too
+ *
* @param theUrl The URL. Must not be blank or null.
- * @return an unmodifiable list containing all extensions on this element which
- * match the given URL
+ * @return an unmodifiable list containing all extensions on this element which match the given URL
*/
public List getExtensionsByUrl(String theUrl) {
org.apache.commons.lang3.Validate.notBlank(theUrl, "theUrl must not be blank or null");
@@ -80,11 +96,24 @@
return java.util.Collections.unmodifiableList(retVal);
}
+ /**
+ * Returns an true if this element has an extension that matchs the given URL.
+ *
+ * Note: BackbdoneElements override this to check Modifier Extensions too
+ *
+ * @param theUrl The URL. Must not be blank or null.
+ */
public boolean hasExtension(String theUrl) {
return !getExtensionsByUrl(theUrl).isEmpty();
}
-
+ /**
+ * Returns the value as a string if this element has only one extension that matches the given URL, and that can be converted to a string.
+ *
+ * Note: BackbdoneElements override this to check Modifier Extensions too
+ *
+ * @param theUrl The URL. Must not be blank or null.
+ */
public String getExtensionString(String theUrl) throws FHIRException {
List ext = getExtensionsByUrl(theUrl);
if (ext.isEmpty())
@@ -94,4 +123,4 @@
if (!ext.get(0).getValue().isPrimitive())
throw new FHIRException("Extension could not be converted to a string");
return ext.get(0).getValue().primitiveValue();
- }
\ No newline at end of file
+ }
diff --git a/org.hl7.fhir.core.generator/configuration/ElementDefinition.java b/org.hl7.fhir.core.generator/configuration/ElementDefinition.java
index b32a7128a..c3faf3de3 100644
--- a/org.hl7.fhir.core.generator/configuration/ElementDefinition.java
+++ b/org.hl7.fhir.core.generator/configuration/ElementDefinition.java
@@ -1,4 +1,5 @@
-public String toString() {
+
+ public String toString() {
if (hasId())
return getId();
if (hasSliceName())
@@ -108,4 +109,5 @@ public String toString() {
public boolean isInlineType() {
return getType().size() == 1 && Utilities.existsInList(getType().get(0).getCode(), "Element", "BackboneElement");
- }
\ No newline at end of file
+ }
+
diff --git a/org.hl7.fhir.core.generator/configuration/configuration.ini b/org.hl7.fhir.core.generator/configuration/configuration.ini
index ee162154e..8872b770b 100644
--- a/org.hl7.fhir.core.generator/configuration/configuration.ini
+++ b/org.hl7.fhir.core.generator/configuration/configuration.ini
@@ -22,7 +22,7 @@ Binary = extends BaseBinary implements IBaseBinary
[imports]
Meta = org.hl7.fhir.instance.model.api.IBaseMetaType
DomainResource = java.util.Collections, org.hl7.fhir.instance.model.api.IDomainResource, org.hl7.fhir.instance.model.api.IBaseDatatypeElement, org.hl7.fhir.instance.model.api.IBaseHasExtensions, org.hl7.fhir.instance.model.api.IBaseHasModifierExtensions, org.hl7.fhir.instance.model.api.IBaseBackboneElement
-Parameters = org.hl7.fhir.instance.model.api.IBaseParameters
+Parameters = org.hl7.fhir.instance.model.api.IBaseParameters, org.hl7.fhir.utilities.CommaSeparatedStringBuilder
Bundle = org.hl7.fhir.instance.model.api.IBaseBundle
Reference = org.hl7.fhir.instance.model.api.IAnyResource, org.hl7.fhir.instance.model.api.IBaseReference, org.hl7.fhir.instance.model.api.ICompositeType, org.hl7.fhir.instance.model.api.IIdType
Element = org.hl7.fhir.instance.model.api.IBaseElement, org.hl7.fhir.instance.model.api.IBaseHasExtensions
diff --git a/org.hl7.fhir.core.generator/configuration/license.txt b/org.hl7.fhir.core.generator/configuration/license.txt
index 110f0b2e5..2120b0862 100644
--- a/org.hl7.fhir.core.generator/configuration/license.txt
+++ b/org.hl7.fhir.core.generator/configuration/license.txt
@@ -1,23 +1,3 @@
-/*
- * #%L
- * org.hl7.fhir.r5
- * %%
- * Copyright (C) 2014 - 2019 Health Level 7
- * %%
- * Licensed under the Apache License, Version 2.0 (the \"License\");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an \"AS IS\" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java
index f4ce4522b..eada2d252 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java
@@ -2165,9 +2165,25 @@ public class ProfileUtilities extends TranslatingUtilities {
if (j < markdown.length()) {
String url = markdown.substring(i+2, j);
if (!Utilities.isAbsoluteUrl(url) && !url.startsWith("..")) {
- b.append("](");
- b.append(webUrl);
- i = i + 1;
+ //
+ // In principle, relative URLs are supposed to be converted to absolute URLs in snapshots.
+ // that's what this code is doing.
+ //
+ // But that hasn't always happened and there's packages out there where the snapshots
+ // contain relative references that actually are references to the main specification
+ //
+ // This code is trying to guess which relative references are actually to the
+ // base specification.
+ //
+ if (isLikelySourceURLReference(url)) {
+ b.append("](");
+ b.append(baseSpecUrl());
+ i = i + 1;
+ } else {
+ b.append("](");
+ b.append(webUrl);
+ i = i + 1;
+ }
} else
b.append(markdown.charAt(i));
} else
@@ -2181,6 +2197,34 @@ public class ProfileUtilities extends TranslatingUtilities {
}
+ private boolean isLikelySourceURLReference(String url) {
+ return
+ url.startsWith("extensibility.html") ||
+ url.startsWith("observation.html") ||
+ url.startsWith("datatypes.html") ||
+ (url.startsWith("extension-") || url.contains(".html")) ||
+ url.startsWith("resource-definitions.html");
+ }
+
+ private String baseSpecUrl() {
+ if (VersionUtilities.isR5Ver(context.getVersion())) {
+ return "http://build.fhir.org/";
+ }
+ if (VersionUtilities.isR4Ver(context.getVersion())) {
+ return "http://hl7.org/fhir/R4/";
+ }
+ if (VersionUtilities.isR3Ver(context.getVersion())) {
+ return "http://hl7.org/fhir/STU3/";
+ }
+ if (VersionUtilities.isR2BVer(context.getVersion())) {
+ return "http://hl7.org/fhir/2016May/";
+ }
+ if (VersionUtilities.isR2Ver(context.getVersion())) {
+ return "http://hl7.org/fhir/DSTU2/";
+ }
+ return "";
+ }
+
private List getSiblings(List list, ElementDefinition current) {
List result = new ArrayList();
String path = current.getPath();
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/JsonParser.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/JsonParser.java
index 44ee8c330..2027be53e 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/JsonParser.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/JsonParser.java
@@ -1,9 +1,5 @@
package org.hl7.fhir.r5.formats;
-import java.io.IOException;
-
-import org.hl7.fhir.exceptions.FHIRFormatError;
-
// generated
@@ -36,17 +32,20 @@ import org.hl7.fhir.exceptions.FHIRFormatError;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import org.hl7.fhir.r5.model.*;
import org.hl7.fhir.utilities.Utilities;
-import org.hl7.fhir.utilities.json.JsonTrackingParser.PresentedBigDecimal;
import org.hl7.fhir.utilities.xhtml.XhtmlNode;
-
-import com.google.gson.JsonArray;
+import org.hl7.fhir.exceptions.FHIRFormatError;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.utilities.json.JsonTrackingParser.PresentedBigDecimal;
import com.google.gson.JsonObject;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import java.io.IOException;
public class JsonParser extends JsonParserBase {
@@ -1664,12 +1663,11 @@ public class JsonParser extends JsonParserBase {
protected void parseProductShelfLifeProperties(JsonObject json, ProductShelfLife res) throws IOException, FHIRFormatError {
parseBackboneTypeProperties(json, res);
- if (json.has("identifier"))
- res.setIdentifier(parseIdentifier(getJObject(json, "identifier")));
if (json.has("type"))
res.setType(parseCodeableConcept(getJObject(json, "type")));
- if (json.has("period"))
- res.setPeriod(parseQuantity(getJObject(json, "period")));
+ DataType period = parseType("period", json);
+ if (period != null)
+ res.setPeriod(period);
if (json.has("specialPrecautionsForStorage")) {
JsonArray array = json.getAsJsonArray("specialPrecautionsForStorage");
for (int i = 0; i < array.size(); i++) {
@@ -1890,6 +1888,10 @@ public class JsonParser extends JsonParserBase {
res.setStatisticType(parseCodeableConcept(getJObject(json, "statisticType")));
if (json.has("quantity"))
res.setQuantity(parseQuantity(getJObject(json, "quantity")));
+ if (json.has("numberOfEvents"))
+ res.setNumberOfEventsElement(parseInteger(json.get("numberOfEvents").getAsLong()));
+ if (json.has("_numberOfEvents"))
+ parseElementProperties(getJObject(json, "_numberOfEvents"), res.getNumberOfEventsElement());
if (json.has("sampleSize"))
res.setSampleSize(parseStatisticSampleSizeComponent(getJObject(json, "sampleSize")));
if (json.has("attributeEstimate")) {
@@ -1898,6 +1900,12 @@ public class JsonParser extends JsonParserBase {
res.getAttributeEstimate().add(parseStatisticAttributeEstimateComponent(array.get(i).getAsJsonObject()));
}
};
+ if (json.has("modelCharacteristic")) {
+ JsonArray array = json.getAsJsonArray("modelCharacteristic");
+ for (int i = 0; i < array.size(); i++) {
+ res.getModelCharacteristic().add(parseStatisticModelCharacteristicComponent(array.get(i).getAsJsonObject()));
+ }
+ };
}
protected Statistic.StatisticSampleSizeComponent parseStatisticSampleSizeComponent(JsonObject json) throws IOException, FHIRFormatError {
@@ -1930,10 +1938,6 @@ public class JsonParser extends JsonParserBase {
res.setKnownDataCountElement(parseInteger(json.get("knownDataCount").getAsLong()));
if (json.has("_knownDataCount"))
parseElementProperties(getJObject(json, "_knownDataCount"), res.getKnownDataCountElement());
- if (json.has("numeratorCount"))
- res.setNumeratorCountElement(parseInteger(json.get("numeratorCount").getAsLong()));
- if (json.has("_numeratorCount"))
- parseElementProperties(getJObject(json, "_numeratorCount"), res.getNumeratorCountElement());
}
protected Statistic.StatisticAttributeEstimateComponent parseStatisticAttributeEstimateComponent(JsonObject json) throws IOException, FHIRFormatError {
@@ -1964,21 +1968,21 @@ public class JsonParser extends JsonParserBase {
parseElementProperties(getJObject(json, "_level"), res.getLevelElement());
if (json.has("range"))
res.setRange(parseRange(getJObject(json, "range")));
- if (json.has("estimateQualifier")) {
- JsonArray array = json.getAsJsonArray("estimateQualifier");
+ if (json.has("attributeEstimate")) {
+ JsonArray array = json.getAsJsonArray("attributeEstimate");
for (int i = 0; i < array.size(); i++) {
- res.getEstimateQualifier().add(parseStatisticAttributeEstimateEstimateQualifierComponent(array.get(i).getAsJsonObject()));
+ res.getAttributeEstimate().add(parseStatisticAttributeEstimateAttributeEstimateComponent(array.get(i).getAsJsonObject()));
}
};
}
- protected Statistic.StatisticAttributeEstimateEstimateQualifierComponent parseStatisticAttributeEstimateEstimateQualifierComponent(JsonObject json) throws IOException, FHIRFormatError {
- Statistic.StatisticAttributeEstimateEstimateQualifierComponent res = new Statistic.StatisticAttributeEstimateEstimateQualifierComponent();
- parseStatisticAttributeEstimateEstimateQualifierComponentProperties(json, res);
+ protected Statistic.StatisticAttributeEstimateAttributeEstimateComponent parseStatisticAttributeEstimateAttributeEstimateComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Statistic.StatisticAttributeEstimateAttributeEstimateComponent res = new Statistic.StatisticAttributeEstimateAttributeEstimateComponent();
+ parseStatisticAttributeEstimateAttributeEstimateComponentProperties(json, res);
return res;
}
- protected void parseStatisticAttributeEstimateEstimateQualifierComponentProperties(JsonObject json, Statistic.StatisticAttributeEstimateEstimateQualifierComponent res) throws IOException, FHIRFormatError {
+ protected void parseStatisticAttributeEstimateAttributeEstimateComponentProperties(JsonObject json, Statistic.StatisticAttributeEstimateAttributeEstimateComponent res) throws IOException, FHIRFormatError {
parseElementProperties(json, res);
if (json.has("description"))
res.setDescriptionElement(parseString(json.get("description").getAsString()));
@@ -2002,39 +2006,59 @@ public class JsonParser extends JsonParserBase {
res.setRange(parseRange(getJObject(json, "range")));
}
- protected SubstanceAmount parseSubstanceAmount(JsonObject json) throws IOException, FHIRFormatError {
- SubstanceAmount res = new SubstanceAmount();
- parseSubstanceAmountProperties(json, res);
+ protected Statistic.StatisticModelCharacteristicComponent parseStatisticModelCharacteristicComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Statistic.StatisticModelCharacteristicComponent res = new Statistic.StatisticModelCharacteristicComponent();
+ parseStatisticModelCharacteristicComponentProperties(json, res);
return res;
}
- protected void parseSubstanceAmountProperties(JsonObject json, SubstanceAmount res) throws IOException, FHIRFormatError {
- parseBackboneTypeProperties(json, res);
- DataType amount = parseType("amount", json);
- if (amount != null)
- res.setAmount(amount);
- if (json.has("amountType"))
- res.setAmountType(parseCodeableConcept(getJObject(json, "amountType")));
- if (json.has("amountText"))
- res.setAmountTextElement(parseString(json.get("amountText").getAsString()));
- if (json.has("_amountText"))
- parseElementProperties(getJObject(json, "_amountText"), res.getAmountTextElement());
- if (json.has("referenceRange"))
- res.setReferenceRange(parseSubstanceAmountReferenceRangeComponent(getJObject(json, "referenceRange")));
- }
-
- protected SubstanceAmount.SubstanceAmountReferenceRangeComponent parseSubstanceAmountReferenceRangeComponent(JsonObject json) throws IOException, FHIRFormatError {
- SubstanceAmount.SubstanceAmountReferenceRangeComponent res = new SubstanceAmount.SubstanceAmountReferenceRangeComponent();
- parseSubstanceAmountReferenceRangeComponentProperties(json, res);
- return res;
- }
-
- protected void parseSubstanceAmountReferenceRangeComponentProperties(JsonObject json, SubstanceAmount.SubstanceAmountReferenceRangeComponent res) throws IOException, FHIRFormatError {
+ protected void parseStatisticModelCharacteristicComponentProperties(JsonObject json, Statistic.StatisticModelCharacteristicComponent res) throws IOException, FHIRFormatError {
parseElementProperties(json, res);
- if (json.has("lowLimit"))
- res.setLowLimit(parseQuantity(getJObject(json, "lowLimit")));
- if (json.has("highLimit"))
- res.setHighLimit(parseQuantity(getJObject(json, "highLimit")));
+ if (json.has("code"))
+ res.setCode(parseCodeableConcept(getJObject(json, "code")));
+ DataType value = parseType("value", json);
+ if (value != null)
+ res.setValue(value);
+ if (json.has("variable")) {
+ JsonArray array = json.getAsJsonArray("variable");
+ for (int i = 0; i < array.size(); i++) {
+ res.getVariable().add(parseStatisticModelCharacteristicVariableComponent(array.get(i).getAsJsonObject()));
+ }
+ };
+ }
+
+ protected Statistic.StatisticModelCharacteristicVariableComponent parseStatisticModelCharacteristicVariableComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Statistic.StatisticModelCharacteristicVariableComponent res = new Statistic.StatisticModelCharacteristicVariableComponent();
+ parseStatisticModelCharacteristicVariableComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseStatisticModelCharacteristicVariableComponentProperties(JsonObject json, Statistic.StatisticModelCharacteristicVariableComponent res) throws IOException, FHIRFormatError {
+ parseElementProperties(json, res);
+ if (json.has("variableDefinition"))
+ res.setVariableDefinition(parseReference(getJObject(json, "variableDefinition")));
+ if (json.has("handling"))
+ res.setHandlingElement(parseEnumeration(json.get("handling").getAsString(), Enumerations.EvidenceVariableHandling.NULL, new Enumerations.EvidenceVariableHandlingEnumFactory()));
+ if (json.has("_handling"))
+ parseElementProperties(getJObject(json, "_handling"), res.getHandlingElement());
+ if (json.has("valueCategory")) {
+ JsonArray array = json.getAsJsonArray("valueCategory");
+ for (int i = 0; i < array.size(); i++) {
+ res.getValueCategory().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("valueQuantity")) {
+ JsonArray array = json.getAsJsonArray("valueQuantity");
+ for (int i = 0; i < array.size(); i++) {
+ res.getValueQuantity().add(parseQuantity(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("valueRange")) {
+ JsonArray array = json.getAsJsonArray("valueRange");
+ for (int i = 0; i < array.size(); i++) {
+ res.getValueRange().add(parseRange(array.get(i).getAsJsonObject()));
+ }
+ };
}
protected Timing parseTiming(JsonObject json) throws IOException, FHIRFormatError {
@@ -5776,10 +5800,6 @@ public class JsonParser extends JsonParserBase {
res.setUrlElement(parseUri(json.get("url").getAsString()));
if (json.has("_url"))
parseElementProperties(getJObject(json, "_url"), res.getUrlElement());
- if (json.has("version"))
- res.setVersionElement(parseString(json.get("version").getAsString()));
- if (json.has("_version"))
- parseElementProperties(getJObject(json, "_version"), res.getVersionElement());
if (json.has("status"))
res.setStatusElement(parseEnumeration(json.get("status").getAsString(), Enumerations.PublicationStatus.NULL, new Enumerations.PublicationStatusEnumFactory()));
if (json.has("_status"))
@@ -5802,6 +5822,12 @@ public class JsonParser extends JsonParserBase {
res.getRelatedIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
+ if (json.has("summary")) {
+ JsonArray array = json.getAsJsonArray("summary");
+ for (int i = 0; i < array.size(); i++) {
+ res.getSummary().add(parseCitationSummaryComponent(array.get(i).getAsJsonObject()));
+ }
+ };
if (json.has("dateCited"))
res.setDateCitedElement(parseDateTime(json.get("dateCited").getAsString()));
if (json.has("_dateCited"))
@@ -5812,6 +5838,8 @@ public class JsonParser extends JsonParserBase {
res.setPublishingModel(parseCodeableConcept(getJObject(json, "publishingModel")));
if (json.has("journal"))
res.setJournal(parseCitationJournalComponent(getJObject(json, "journal")));
+ if (json.has("publicationInfo"))
+ res.setPublicationInfo(parseCitationPublicationInfoComponent(getJObject(json, "publicationInfo")));
if (json.has("articleTitle"))
res.setArticleTitleElement(parseMarkdown(json.get("articleTitle").getAsString()));
if (json.has("_articleTitle"))
@@ -5844,16 +5872,8 @@ public class JsonParser extends JsonParserBase {
res.getAlternativeAbstract().add(parseCitationAlternativeAbstractComponent(array.get(i).getAsJsonObject()));
}
};
- if (json.has("authorList"))
- res.setAuthorList(parseCitationAuthorListComponent(getJObject(json, "authorList")));
- if (json.has("authorString")) {
- JsonArray array = json.getAsJsonArray("authorString");
- for (int i = 0; i < array.size(); i++) {
- res.getAuthorString().add(parseCitationAuthorStringComponent(array.get(i).getAsJsonObject()));
- }
- };
- if (json.has("contributorList"))
- res.setContributorList(parseCitationContributorListComponent(getJObject(json, "contributorList")));
+ if (json.has("contributorship"))
+ res.setContributorship(parseCitationContributorshipComponent(getJObject(json, "contributorship")));
if (json.has("articleLanguage"))
res.setArticleLanguage(parseCodeableConcept(getJObject(json, "articleLanguage")));
if (json.has("alternativeForm")) {
@@ -5868,6 +5888,12 @@ public class JsonParser extends JsonParserBase {
res.getClassifier().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
+ if (json.has("keywordList")) {
+ JsonArray array = json.getAsJsonArray("keywordList");
+ for (int i = 0; i < array.size(); i++) {
+ res.getKeywordList().add(parseCitationKeywordListComponent(array.get(i).getAsJsonObject()));
+ }
+ };
if (json.has("relatedArtifact")) {
JsonArray array = json.getAsJsonArray("relatedArtifact");
for (int i = 0; i < array.size(); i++) {
@@ -5884,6 +5910,22 @@ public class JsonParser extends JsonParserBase {
res.setMedlinePubMed(parseCitationMedlinePubMedComponent(getJObject(json, "medlinePubMed")));
}
+ protected Citation.CitationSummaryComponent parseCitationSummaryComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Citation.CitationSummaryComponent res = new Citation.CitationSummaryComponent();
+ parseCitationSummaryComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseCitationSummaryComponentProperties(JsonObject json, Citation.CitationSummaryComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("style"))
+ res.setStyle(parseCodeableConcept(getJObject(json, "style")));
+ if (json.has("text"))
+ res.setTextElement(parseMarkdown(json.get("text").getAsString()));
+ if (json.has("_text"))
+ parseElementProperties(getJObject(json, "_text"), res.getTextElement());
+ }
+
protected Citation.CitationVariantCitationComponent parseCitationVariantCitationComponent(JsonObject json) throws IOException, FHIRFormatError {
Citation.CitationVariantCitationComponent res = new Citation.CitationVariantCitationComponent();
parseCitationVariantCitationComponentProperties(json, res);
@@ -5947,9 +5989,97 @@ public class JsonParser extends JsonParserBase {
if (json.has("_issue"))
parseElementProperties(getJObject(json, "_issue"), res.getIssueElement());
if (json.has("publicationDate"))
- res.setPublicationDateElement(parseString(json.get("publicationDate").getAsString()));
- if (json.has("_publicationDate"))
- parseElementProperties(getJObject(json, "_publicationDate"), res.getPublicationDateElement());
+ res.setPublicationDate(parseCitationJournalJournalIssuePublicationDateComponent(getJObject(json, "publicationDate")));
+ }
+
+ protected Citation.CitationJournalJournalIssuePublicationDateComponent parseCitationJournalJournalIssuePublicationDateComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Citation.CitationJournalJournalIssuePublicationDateComponent res = new Citation.CitationJournalJournalIssuePublicationDateComponent();
+ parseCitationJournalJournalIssuePublicationDateComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseCitationJournalJournalIssuePublicationDateComponentProperties(JsonObject json, Citation.CitationJournalJournalIssuePublicationDateComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("date"))
+ res.setDateElement(parseDate(json.get("date").getAsString()));
+ if (json.has("_date"))
+ parseElementProperties(getJObject(json, "_date"), res.getDateElement());
+ if (json.has("year"))
+ res.setYearElement(parseString(json.get("year").getAsString()));
+ if (json.has("_year"))
+ parseElementProperties(getJObject(json, "_year"), res.getYearElement());
+ if (json.has("month"))
+ res.setMonthElement(parseString(json.get("month").getAsString()));
+ if (json.has("_month"))
+ parseElementProperties(getJObject(json, "_month"), res.getMonthElement());
+ if (json.has("day"))
+ res.setDayElement(parseString(json.get("day").getAsString()));
+ if (json.has("_day"))
+ parseElementProperties(getJObject(json, "_day"), res.getDayElement());
+ if (json.has("season"))
+ res.setSeasonElement(parseString(json.get("season").getAsString()));
+ if (json.has("_season"))
+ parseElementProperties(getJObject(json, "_season"), res.getSeasonElement());
+ if (json.has("text"))
+ res.setTextElement(parseString(json.get("text").getAsString()));
+ if (json.has("_text"))
+ parseElementProperties(getJObject(json, "_text"), res.getTextElement());
+ }
+
+ protected Citation.CitationPublicationInfoComponent parseCitationPublicationInfoComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Citation.CitationPublicationInfoComponent res = new Citation.CitationPublicationInfoComponent();
+ parseCitationPublicationInfoComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseCitationPublicationInfoComponentProperties(JsonObject json, Citation.CitationPublicationInfoComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("publishedIn"))
+ res.setPublishedIn(parseCitationPublicationInfoPublishedInComponent(getJObject(json, "publishedIn")));
+ if (json.has("entryDate"))
+ res.setEntryDateElement(parseDateTime(json.get("entryDate").getAsString()));
+ if (json.has("_entryDate"))
+ parseElementProperties(getJObject(json, "_entryDate"), res.getEntryDateElement());
+ if (json.has("revisionDate"))
+ res.setRevisionDateElement(parseDateTime(json.get("revisionDate").getAsString()));
+ if (json.has("_revisionDate"))
+ parseElementProperties(getJObject(json, "_revisionDate"), res.getRevisionDateElement());
+ if (json.has("pageCount"))
+ res.setPageCountElement(parseString(json.get("pageCount").getAsString()));
+ if (json.has("_pageCount"))
+ parseElementProperties(getJObject(json, "_pageCount"), res.getPageCountElement());
+ }
+
+ protected Citation.CitationPublicationInfoPublishedInComponent parseCitationPublicationInfoPublishedInComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Citation.CitationPublicationInfoPublishedInComponent res = new Citation.CitationPublicationInfoPublishedInComponent();
+ parseCitationPublicationInfoPublishedInComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseCitationPublicationInfoPublishedInComponentProperties(JsonObject json, Citation.CitationPublicationInfoPublishedInComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("type"))
+ res.setType(parseCodeableConcept(getJObject(json, "type")));
+ if (json.has("identifier")) {
+ JsonArray array = json.getAsJsonArray("identifier");
+ for (int i = 0; i < array.size(); i++) {
+ res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("name"))
+ res.setNameElement(parseString(json.get("name").getAsString()));
+ if (json.has("_name"))
+ parseElementProperties(getJObject(json, "_name"), res.getNameElement());
+ if (json.has("publisher"))
+ res.setPublisher(parseReference(getJObject(json, "publisher")));
+ if (json.has("publisherLocation"))
+ res.setPublisherLocationElement(parseString(json.get("publisherLocation").getAsString()));
+ if (json.has("_publisherLocation"))
+ parseElementProperties(getJObject(json, "_publisherLocation"), res.getPublisherLocationElement());
+ if (json.has("startDate"))
+ res.setStartDateElement(parseDate(json.get("startDate").getAsString()));
+ if (json.has("_startDate"))
+ parseElementProperties(getJObject(json, "_startDate"), res.getStartDateElement());
}
protected Citation.CitationAlternativeTitleComponent parseCitationAlternativeTitleComponent(JsonObject json) throws IOException, FHIRFormatError {
@@ -6030,46 +6160,42 @@ public class JsonParser extends JsonParserBase {
parseElementProperties(getJObject(json, "_abstractCopyright"), res.getAbstractCopyrightElement());
}
- protected Citation.CitationAuthorListComponent parseCitationAuthorListComponent(JsonObject json) throws IOException, FHIRFormatError {
- Citation.CitationAuthorListComponent res = new Citation.CitationAuthorListComponent();
- parseCitationAuthorListComponentProperties(json, res);
+ protected Citation.CitationContributorshipComponent parseCitationContributorshipComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Citation.CitationContributorshipComponent res = new Citation.CitationContributorshipComponent();
+ parseCitationContributorshipComponentProperties(json, res);
return res;
}
- protected void parseCitationAuthorListComponentProperties(JsonObject json, Citation.CitationAuthorListComponent res) throws IOException, FHIRFormatError {
+ protected void parseCitationContributorshipComponentProperties(JsonObject json, Citation.CitationContributorshipComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("complete"))
res.setCompleteElement(parseBoolean(json.get("complete").getAsBoolean()));
if (json.has("_complete"))
parseElementProperties(getJObject(json, "_complete"), res.getCompleteElement());
- if (json.has("author")) {
- JsonArray array = json.getAsJsonArray("author");
+ if (json.has("entry")) {
+ JsonArray array = json.getAsJsonArray("entry");
for (int i = 0; i < array.size(); i++) {
- res.getAuthor().add(parseCitationAuthorListAuthorComponent(array.get(i).getAsJsonObject()));
+ res.getEntry().add(parseCitationContributorshipEntryComponent(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("summary")) {
+ JsonArray array = json.getAsJsonArray("summary");
+ for (int i = 0; i < array.size(); i++) {
+ res.getSummary().add(parseCitationContributorshipSummaryComponent(array.get(i).getAsJsonObject()));
}
};
}
- protected Citation.CitationAuthorListAuthorComponent parseCitationAuthorListAuthorComponent(JsonObject json) throws IOException, FHIRFormatError {
- Citation.CitationAuthorListAuthorComponent res = new Citation.CitationAuthorListAuthorComponent();
- parseCitationAuthorListAuthorComponentProperties(json, res);
+ protected Citation.CitationContributorshipEntryComponent parseCitationContributorshipEntryComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Citation.CitationContributorshipEntryComponent res = new Citation.CitationContributorshipEntryComponent();
+ parseCitationContributorshipEntryComponentProperties(json, res);
return res;
}
- protected void parseCitationAuthorListAuthorComponentProperties(JsonObject json, Citation.CitationAuthorListAuthorComponent res) throws IOException, FHIRFormatError {
+ protected void parseCitationContributorshipEntryComponentProperties(JsonObject json, Citation.CitationContributorshipEntryComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
- if (json.has("lastName"))
- res.setLastNameElement(parseString(json.get("lastName").getAsString()));
- if (json.has("_lastName"))
- parseElementProperties(getJObject(json, "_lastName"), res.getLastNameElement());
- if (json.has("foreName"))
- res.setForeNameElement(parseString(json.get("foreName").getAsString()));
- if (json.has("_foreName"))
- parseElementProperties(getJObject(json, "_foreName"), res.getForeNameElement());
- if (json.has("suffix"))
- res.setSuffixElement(parseString(json.get("suffix").getAsString()));
- if (json.has("_suffix"))
- parseElementProperties(getJObject(json, "_suffix"), res.getSuffixElement());
+ if (json.has("name"))
+ res.setName(parseHumanName(getJObject(json, "name")));
if (json.has("initials"))
res.setInitialsElement(parseString(json.get("initials").getAsString()));
if (json.has("_initials"))
@@ -6087,26 +6213,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("affiliationInfo")) {
JsonArray array = json.getAsJsonArray("affiliationInfo");
for (int i = 0; i < array.size(); i++) {
- res.getAffiliationInfo().add(parseCitationAuthorListAuthorAffiliationInfoComponent(array.get(i).getAsJsonObject()));
+ res.getAffiliationInfo().add(parseCitationContributorshipEntryAffiliationInfoComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("address")) {
JsonArray array = json.getAsJsonArray("address");
for (int i = 0; i < array.size(); i++) {
- if (array.get(i).isJsonNull()) {
- res.getAddress().add(new StringType());
- } else {;
- res.getAddress().add(parseString(array.get(i).getAsString()));
- }
- }
- };
- if (json.has("_address")) {
- JsonArray array = json.getAsJsonArray("_address");
- for (int i = 0; i < array.size(); i++) {
- if (i == res.getAddress().size())
- res.getAddress().add(parseString(null));
- if (array.get(i) instanceof JsonObject)
- parseElementProperties(array.get(i).getAsJsonObject(), res.getAddress().get(i));
+ res.getAddress().add(parseAddress(array.get(i).getAsJsonObject()));
}
};
if (json.has("telecom")) {
@@ -6115,6 +6228,16 @@ public class JsonParser extends JsonParserBase {
res.getTelecom().add(parseContactPoint(array.get(i).getAsJsonObject()));
}
};
+ if (json.has("contribution")) {
+ JsonArray array = json.getAsJsonArray("contribution");
+ for (int i = 0; i < array.size(); i++) {
+ res.getContribution().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("notAnAuthor"))
+ res.setNotAnAuthorElement(parseBoolean(json.get("notAnAuthor").getAsBoolean()));
+ if (json.has("_notAnAuthor"))
+ parseElementProperties(getJObject(json, "_notAnAuthor"), res.getNotAnAuthorElement());
if (json.has("correspondingAuthor"))
res.setCorrespondingAuthorElement(parseBoolean(json.get("correspondingAuthor").getAsBoolean()));
if (json.has("_correspondingAuthor"))
@@ -6125,13 +6248,13 @@ public class JsonParser extends JsonParserBase {
parseElementProperties(getJObject(json, "_listOrder"), res.getListOrderElement());
}
- protected Citation.CitationAuthorListAuthorAffiliationInfoComponent parseCitationAuthorListAuthorAffiliationInfoComponent(JsonObject json) throws IOException, FHIRFormatError {
- Citation.CitationAuthorListAuthorAffiliationInfoComponent res = new Citation.CitationAuthorListAuthorAffiliationInfoComponent();
- parseCitationAuthorListAuthorAffiliationInfoComponentProperties(json, res);
+ protected Citation.CitationContributorshipEntryAffiliationInfoComponent parseCitationContributorshipEntryAffiliationInfoComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Citation.CitationContributorshipEntryAffiliationInfoComponent res = new Citation.CitationContributorshipEntryAffiliationInfoComponent();
+ parseCitationContributorshipEntryAffiliationInfoComponentProperties(json, res);
return res;
}
- protected void parseCitationAuthorListAuthorAffiliationInfoComponentProperties(JsonObject json, Citation.CitationAuthorListAuthorAffiliationInfoComponent res) throws IOException, FHIRFormatError {
+ protected void parseCitationContributorshipEntryAffiliationInfoComponentProperties(JsonObject json, Citation.CitationContributorshipEntryAffiliationInfoComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("affiliation"))
res.setAffiliationElement(parseString(json.get("affiliation").getAsString()));
@@ -6149,118 +6272,26 @@ public class JsonParser extends JsonParserBase {
};
}
- protected Citation.CitationAuthorStringComponent parseCitationAuthorStringComponent(JsonObject json) throws IOException, FHIRFormatError {
- Citation.CitationAuthorStringComponent res = new Citation.CitationAuthorStringComponent();
- parseCitationAuthorStringComponentProperties(json, res);
+ protected Citation.CitationContributorshipSummaryComponent parseCitationContributorshipSummaryComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Citation.CitationContributorshipSummaryComponent res = new Citation.CitationContributorshipSummaryComponent();
+ parseCitationContributorshipSummaryComponentProperties(json, res);
return res;
}
- protected void parseCitationAuthorStringComponentProperties(JsonObject json, Citation.CitationAuthorStringComponent res) throws IOException, FHIRFormatError {
+ protected void parseCitationContributorshipSummaryComponentProperties(JsonObject json, Citation.CitationContributorshipSummaryComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
+ if (json.has("type"))
+ res.setType(parseCodeableConcept(getJObject(json, "type")));
+ if (json.has("style"))
+ res.setStyle(parseCodeableConcept(getJObject(json, "style")));
if (json.has("source"))
res.setSource(parseCodeableConcept(getJObject(json, "source")));
if (json.has("value"))
- res.setValueElement(parseString(json.get("value").getAsString()));
+ res.setValueElement(parseMarkdown(json.get("value").getAsString()));
if (json.has("_value"))
parseElementProperties(getJObject(json, "_value"), res.getValueElement());
}
- protected Citation.CitationContributorListComponent parseCitationContributorListComponent(JsonObject json) throws IOException, FHIRFormatError {
- Citation.CitationContributorListComponent res = new Citation.CitationContributorListComponent();
- parseCitationContributorListComponentProperties(json, res);
- return res;
- }
-
- protected void parseCitationContributorListComponentProperties(JsonObject json, Citation.CitationContributorListComponent res) throws IOException, FHIRFormatError {
- parseBackboneElementProperties(json, res);
- if (json.has("complete"))
- res.setCompleteElement(parseBoolean(json.get("complete").getAsBoolean()));
- if (json.has("_complete"))
- parseElementProperties(getJObject(json, "_complete"), res.getCompleteElement());
- if (json.has("contributor")) {
- JsonArray array = json.getAsJsonArray("contributor");
- for (int i = 0; i < array.size(); i++) {
- res.getContributor().add(parseCitationContributorListContributorComponent(array.get(i).getAsJsonObject()));
- }
- };
- }
-
- protected Citation.CitationContributorListContributorComponent parseCitationContributorListContributorComponent(JsonObject json) throws IOException, FHIRFormatError {
- Citation.CitationContributorListContributorComponent res = new Citation.CitationContributorListContributorComponent();
- parseCitationContributorListContributorComponentProperties(json, res);
- return res;
- }
-
- protected void parseCitationContributorListContributorComponentProperties(JsonObject json, Citation.CitationContributorListContributorComponent res) throws IOException, FHIRFormatError {
- parseBackboneElementProperties(json, res);
- if (json.has("lastName"))
- res.setLastNameElement(parseString(json.get("lastName").getAsString()));
- if (json.has("_lastName"))
- parseElementProperties(getJObject(json, "_lastName"), res.getLastNameElement());
- if (json.has("foreName"))
- res.setForeNameElement(parseString(json.get("foreName").getAsString()));
- if (json.has("_foreName"))
- parseElementProperties(getJObject(json, "_foreName"), res.getForeNameElement());
- if (json.has("suffix"))
- res.setSuffixElement(parseString(json.get("suffix").getAsString()));
- if (json.has("_suffix"))
- parseElementProperties(getJObject(json, "_suffix"), res.getSuffixElement());
- if (json.has("initials"))
- res.setInitialsElement(parseString(json.get("initials").getAsString()));
- if (json.has("_initials"))
- parseElementProperties(getJObject(json, "_initials"), res.getInitialsElement());
- if (json.has("collectiveName"))
- res.setCollectiveNameElement(parseString(json.get("collectiveName").getAsString()));
- if (json.has("_collectiveName"))
- parseElementProperties(getJObject(json, "_collectiveName"), res.getCollectiveNameElement());
- if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
- for (int i = 0; i < array.size(); i++) {
- res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
- }
- };
- if (json.has("contribution")) {
- JsonArray array = json.getAsJsonArray("contribution");
- for (int i = 0; i < array.size(); i++) {
- res.getContribution().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
- }
- };
- if (json.has("affiliationInfo")) {
- JsonArray array = json.getAsJsonArray("affiliationInfo");
- for (int i = 0; i < array.size(); i++) {
- res.getAffiliationInfo().add(parseCitationContributorListContributorAffiliationInfoComponent(array.get(i).getAsJsonObject()));
- }
- };
- if (json.has("listOrder"))
- res.setListOrderElement(parsePositiveInt(json.get("listOrder").getAsString()));
- if (json.has("_listOrder"))
- parseElementProperties(getJObject(json, "_listOrder"), res.getListOrderElement());
- }
-
- protected Citation.CitationContributorListContributorAffiliationInfoComponent parseCitationContributorListContributorAffiliationInfoComponent(JsonObject json) throws IOException, FHIRFormatError {
- Citation.CitationContributorListContributorAffiliationInfoComponent res = new Citation.CitationContributorListContributorAffiliationInfoComponent();
- parseCitationContributorListContributorAffiliationInfoComponentProperties(json, res);
- return res;
- }
-
- protected void parseCitationContributorListContributorAffiliationInfoComponentProperties(JsonObject json, Citation.CitationContributorListContributorAffiliationInfoComponent res) throws IOException, FHIRFormatError {
- parseBackboneElementProperties(json, res);
- if (json.has("affiliation"))
- res.setAffiliationElement(parseString(json.get("affiliation").getAsString()));
- if (json.has("_affiliation"))
- parseElementProperties(getJObject(json, "_affiliation"), res.getAffiliationElement());
- if (json.has("role"))
- res.setRoleElement(parseString(json.get("role").getAsString()));
- if (json.has("_role"))
- parseElementProperties(getJObject(json, "_role"), res.getRoleElement());
- if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
- for (int i = 0; i < array.size(); i++) {
- res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
- }
- };
- }
-
protected Citation.CitationAlternativeFormComponent parseCitationAlternativeFormComponent(JsonObject json) throws IOException, FHIRFormatError {
Citation.CitationAlternativeFormComponent res = new Citation.CitationAlternativeFormComponent();
parseCitationAlternativeFormComponentProperties(json, res);
@@ -6277,6 +6308,8 @@ public class JsonParser extends JsonParserBase {
res.setJournalIssue(parseCitationAlternativeFormJournalIssueComponent(getJObject(json, "journalIssue")));
if (json.has("pagination"))
res.setPagination(parseCitationAlternativeFormPaginationComponent(getJObject(json, "pagination")));
+ if (json.has("publicationInfo"))
+ res.setPublicationInfo(parseCitationAlternativeFormPublicationInfoComponent(getJObject(json, "publicationInfo")));
}
protected Citation.CitationAlternativeFormJournalIssueComponent parseCitationAlternativeFormJournalIssueComponent(JsonObject json) throws IOException, FHIRFormatError {
@@ -6298,9 +6331,41 @@ public class JsonParser extends JsonParserBase {
if (json.has("_issue"))
parseElementProperties(getJObject(json, "_issue"), res.getIssueElement());
if (json.has("publicationDate"))
- res.setPublicationDateElement(parseString(json.get("publicationDate").getAsString()));
- if (json.has("_publicationDate"))
- parseElementProperties(getJObject(json, "_publicationDate"), res.getPublicationDateElement());
+ res.setPublicationDate(parseCitationAlternativeFormJournalIssuePublicationDateComponent(getJObject(json, "publicationDate")));
+ }
+
+ protected Citation.CitationAlternativeFormJournalIssuePublicationDateComponent parseCitationAlternativeFormJournalIssuePublicationDateComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Citation.CitationAlternativeFormJournalIssuePublicationDateComponent res = new Citation.CitationAlternativeFormJournalIssuePublicationDateComponent();
+ parseCitationAlternativeFormJournalIssuePublicationDateComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseCitationAlternativeFormJournalIssuePublicationDateComponentProperties(JsonObject json, Citation.CitationAlternativeFormJournalIssuePublicationDateComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("date"))
+ res.setDateElement(parseDate(json.get("date").getAsString()));
+ if (json.has("_date"))
+ parseElementProperties(getJObject(json, "_date"), res.getDateElement());
+ if (json.has("year"))
+ res.setYearElement(parseString(json.get("year").getAsString()));
+ if (json.has("_year"))
+ parseElementProperties(getJObject(json, "_year"), res.getYearElement());
+ if (json.has("month"))
+ res.setMonthElement(parseString(json.get("month").getAsString()));
+ if (json.has("_month"))
+ parseElementProperties(getJObject(json, "_month"), res.getMonthElement());
+ if (json.has("day"))
+ res.setDayElement(parseString(json.get("day").getAsString()));
+ if (json.has("_day"))
+ parseElementProperties(getJObject(json, "_day"), res.getDayElement());
+ if (json.has("season"))
+ res.setSeasonElement(parseString(json.get("season").getAsString()));
+ if (json.has("_season"))
+ parseElementProperties(getJObject(json, "_season"), res.getSeasonElement());
+ if (json.has("text"))
+ res.setTextElement(parseString(json.get("text").getAsString()));
+ if (json.has("_text"))
+ parseElementProperties(getJObject(json, "_text"), res.getTextElement());
}
protected Citation.CitationAlternativeFormPaginationComponent parseCitationAlternativeFormPaginationComponent(JsonObject json) throws IOException, FHIRFormatError {
@@ -6325,6 +6390,94 @@ public class JsonParser extends JsonParserBase {
parseElementProperties(getJObject(json, "_lastPage"), res.getLastPageElement());
}
+ protected Citation.CitationAlternativeFormPublicationInfoComponent parseCitationAlternativeFormPublicationInfoComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Citation.CitationAlternativeFormPublicationInfoComponent res = new Citation.CitationAlternativeFormPublicationInfoComponent();
+ parseCitationAlternativeFormPublicationInfoComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseCitationAlternativeFormPublicationInfoComponentProperties(JsonObject json, Citation.CitationAlternativeFormPublicationInfoComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("publishedIn"))
+ res.setPublishedIn(parseCitationAlternativeFormPublicationInfoPublishedInComponent(getJObject(json, "publishedIn")));
+ if (json.has("entryDate"))
+ res.setEntryDateElement(parseDateTime(json.get("entryDate").getAsString()));
+ if (json.has("_entryDate"))
+ parseElementProperties(getJObject(json, "_entryDate"), res.getEntryDateElement());
+ if (json.has("revisionDate"))
+ res.setRevisionDateElement(parseDateTime(json.get("revisionDate").getAsString()));
+ if (json.has("_revisionDate"))
+ parseElementProperties(getJObject(json, "_revisionDate"), res.getRevisionDateElement());
+ if (json.has("pageCount"))
+ res.setPageCountElement(parseString(json.get("pageCount").getAsString()));
+ if (json.has("_pageCount"))
+ parseElementProperties(getJObject(json, "_pageCount"), res.getPageCountElement());
+ }
+
+ protected Citation.CitationAlternativeFormPublicationInfoPublishedInComponent parseCitationAlternativeFormPublicationInfoPublishedInComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Citation.CitationAlternativeFormPublicationInfoPublishedInComponent res = new Citation.CitationAlternativeFormPublicationInfoPublishedInComponent();
+ parseCitationAlternativeFormPublicationInfoPublishedInComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseCitationAlternativeFormPublicationInfoPublishedInComponentProperties(JsonObject json, Citation.CitationAlternativeFormPublicationInfoPublishedInComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("type"))
+ res.setType(parseCodeableConcept(getJObject(json, "type")));
+ if (json.has("name"))
+ res.setNameElement(parseString(json.get("name").getAsString()));
+ if (json.has("_name"))
+ parseElementProperties(getJObject(json, "_name"), res.getNameElement());
+ if (json.has("publisher"))
+ res.setPublisher(parseReference(getJObject(json, "publisher")));
+ if (json.has("publisherLocation"))
+ res.setPublisherLocationElement(parseString(json.get("publisherLocation").getAsString()));
+ if (json.has("_publisherLocation"))
+ parseElementProperties(getJObject(json, "_publisherLocation"), res.getPublisherLocationElement());
+ if (json.has("startDate"))
+ res.setStartDateElement(parseDate(json.get("startDate").getAsString()));
+ if (json.has("_startDate"))
+ parseElementProperties(getJObject(json, "_startDate"), res.getStartDateElement());
+ }
+
+ protected Citation.CitationKeywordListComponent parseCitationKeywordListComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Citation.CitationKeywordListComponent res = new Citation.CitationKeywordListComponent();
+ parseCitationKeywordListComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseCitationKeywordListComponentProperties(JsonObject json, Citation.CitationKeywordListComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("owner"))
+ res.setOwnerElement(parseString(json.get("owner").getAsString()));
+ if (json.has("_owner"))
+ parseElementProperties(getJObject(json, "_owner"), res.getOwnerElement());
+ if (json.has("keyword")) {
+ JsonArray array = json.getAsJsonArray("keyword");
+ for (int i = 0; i < array.size(); i++) {
+ res.getKeyword().add(parseCitationKeywordListKeywordComponent(array.get(i).getAsJsonObject()));
+ }
+ };
+ }
+
+ protected Citation.CitationKeywordListKeywordComponent parseCitationKeywordListKeywordComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Citation.CitationKeywordListKeywordComponent res = new Citation.CitationKeywordListKeywordComponent();
+ parseCitationKeywordListKeywordComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseCitationKeywordListKeywordComponentProperties(JsonObject json, Citation.CitationKeywordListKeywordComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("majorTopic"))
+ res.setMajorTopicElement(parseBoolean(json.get("majorTopic").getAsBoolean()));
+ if (json.has("_majorTopic"))
+ parseElementProperties(getJObject(json, "_majorTopic"), res.getMajorTopicElement());
+ if (json.has("value"))
+ res.setValueElement(parseString(json.get("value").getAsString()));
+ if (json.has("_value"))
+ parseElementProperties(getJObject(json, "_value"), res.getValueElement());
+ }
+
protected Citation.CitationMedlinePubMedComponent parseCitationMedlinePubMedComponent(JsonObject json) throws IOException, FHIRFormatError {
Citation.CitationMedlinePubMedComponent res = new Citation.CitationMedlinePubMedComponent();
parseCitationMedlinePubMedComponentProperties(json, res);
@@ -8591,7 +8744,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_title"))
parseElementProperties(getJObject(json, "_title"), res.getTitleElement());
if (json.has("confidentiality"))
- res.setConfidentialityElement(parseEnumeration(json.get("confidentiality").getAsString(), Composition.V3ConfidentialityClassification.NULL, new Composition.V3ConfidentialityClassificationEnumFactory()));
+ res.setConfidentialityElement(parseCode(json.get("confidentiality").getAsString()));
if (json.has("_confidentiality"))
parseElementProperties(getJObject(json, "_confidentiality"), res.getConfidentialityElement());
if (json.has("attester")) {
@@ -9345,10 +9498,16 @@ public class JsonParser extends JsonParserBase {
res.getPerformer().add(parseReference(array.get(i).getAsJsonObject()));
}
};
- if (json.has("organization")) {
- JsonArray array = json.getAsJsonArray("organization");
+ if (json.has("manager")) {
+ JsonArray array = json.getAsJsonArray("manager");
for (int i = 0; i < array.size(); i++) {
- res.getOrganization().add(parseReference(array.get(i).getAsJsonObject()));
+ res.getManager().add(parseReference(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("controller")) {
+ JsonArray array = json.getAsJsonArray("controller");
+ for (int i = 0; i < array.size(); i++) {
+ res.getController().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("sourceAttachment")) {
@@ -12025,14 +12184,18 @@ public class JsonParser extends JsonParserBase {
protected void parseDocumentReferenceProperties(JsonObject json, DocumentReference res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
- if (json.has("masterIdentifier"))
- res.setMasterIdentifier(parseIdentifier(getJObject(json, "masterIdentifier")));
if (json.has("identifier")) {
JsonArray array = json.getAsJsonArray("identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
+ if (json.has("basedOn")) {
+ JsonArray array = json.getAsJsonArray("basedOn");
+ for (int i = 0; i < array.size(); i++) {
+ res.getBasedOn().add(parseReference(array.get(i).getAsJsonObject()));
+ }
+ };
if (json.has("status"))
res.setStatusElement(parseEnumeration(json.get("status").getAsString(), Enumerations.DocumentReferenceStatus.NULL, new Enumerations.DocumentReferenceStatusEnumFactory()));
if (json.has("_status"))
@@ -12051,6 +12214,24 @@ public class JsonParser extends JsonParserBase {
};
if (json.has("subject"))
res.setSubject(parseReference(getJObject(json, "subject")));
+ if (json.has("encounter")) {
+ JsonArray array = json.getAsJsonArray("encounter");
+ for (int i = 0; i < array.size(); i++) {
+ res.getEncounter().add(parseReference(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("event")) {
+ JsonArray array = json.getAsJsonArray("event");
+ for (int i = 0; i < array.size(); i++) {
+ res.getEvent().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("facilityType"))
+ res.setFacilityType(parseCodeableConcept(getJObject(json, "facilityType")));
+ if (json.has("practiceSetting"))
+ res.setPracticeSetting(parseCodeableConcept(getJObject(json, "practiceSetting")));
+ if (json.has("period"))
+ res.setPeriod(parsePeriod(getJObject(json, "period")));
if (json.has("date"))
res.setDateElement(parseInstant(json.get("date").getAsString()));
if (json.has("_date"))
@@ -12061,8 +12242,12 @@ public class JsonParser extends JsonParserBase {
res.getAuthor().add(parseReference(array.get(i).getAsJsonObject()));
}
};
- if (json.has("authenticator"))
- res.setAuthenticator(parseReference(getJObject(json, "authenticator")));
+ if (json.has("attester")) {
+ JsonArray array = json.getAsJsonArray("attester");
+ for (int i = 0; i < array.size(); i++) {
+ res.getAttester().add(parseDocumentReferenceAttesterComponent(array.get(i).getAsJsonObject()));
+ }
+ };
if (json.has("custodian"))
res.setCustodian(parseReference(getJObject(json, "custodian")));
if (json.has("relatesTo")) {
@@ -12072,7 +12257,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("description"))
- res.setDescriptionElement(parseString(json.get("description").getAsString()));
+ res.setDescriptionElement(parseMarkdown(json.get("description").getAsString()));
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("securityLabel")) {
@@ -12087,8 +12272,34 @@ public class JsonParser extends JsonParserBase {
res.getContent().add(parseDocumentReferenceContentComponent(array.get(i).getAsJsonObject()));
}
};
- if (json.has("context"))
- res.setContext(parseDocumentReferenceContextComponent(getJObject(json, "context")));
+ if (json.has("sourcePatientInfo"))
+ res.setSourcePatientInfo(parseReference(getJObject(json, "sourcePatientInfo")));
+ if (json.has("related")) {
+ JsonArray array = json.getAsJsonArray("related");
+ for (int i = 0; i < array.size(); i++) {
+ res.getRelated().add(parseReference(array.get(i).getAsJsonObject()));
+ }
+ };
+ }
+
+ protected DocumentReference.DocumentReferenceAttesterComponent parseDocumentReferenceAttesterComponent(JsonObject json) throws IOException, FHIRFormatError {
+ DocumentReference.DocumentReferenceAttesterComponent res = new DocumentReference.DocumentReferenceAttesterComponent();
+ parseDocumentReferenceAttesterComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseDocumentReferenceAttesterComponentProperties(JsonObject json, DocumentReference.DocumentReferenceAttesterComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("mode"))
+ res.setModeElement(parseEnumeration(json.get("mode").getAsString(), DocumentReference.DocumentAttestationMode.NULL, new DocumentReference.DocumentAttestationModeEnumFactory()));
+ if (json.has("_mode"))
+ parseElementProperties(getJObject(json, "_mode"), res.getModeElement());
+ if (json.has("time"))
+ res.setTimeElement(parseDateTime(json.get("time").getAsString()));
+ if (json.has("_time"))
+ parseElementProperties(getJObject(json, "_time"), res.getTimeElement());
+ if (json.has("party"))
+ res.setParty(parseReference(getJObject(json, "party")));
}
protected DocumentReference.DocumentReferenceRelatesToComponent parseDocumentReferenceRelatesToComponent(JsonObject json) throws IOException, FHIRFormatError {
@@ -12119,48 +12330,8 @@ public class JsonParser extends JsonParserBase {
res.setAttachment(parseAttachment(getJObject(json, "attachment")));
if (json.has("format"))
res.setFormat(parseCoding(getJObject(json, "format")));
- }
-
- protected DocumentReference.DocumentReferenceContextComponent parseDocumentReferenceContextComponent(JsonObject json) throws IOException, FHIRFormatError {
- DocumentReference.DocumentReferenceContextComponent res = new DocumentReference.DocumentReferenceContextComponent();
- parseDocumentReferenceContextComponentProperties(json, res);
- return res;
- }
-
- protected void parseDocumentReferenceContextComponentProperties(JsonObject json, DocumentReference.DocumentReferenceContextComponent res) throws IOException, FHIRFormatError {
- parseBackboneElementProperties(json, res);
- if (json.has("encounter")) {
- JsonArray array = json.getAsJsonArray("encounter");
- for (int i = 0; i < array.size(); i++) {
- res.getEncounter().add(parseReference(array.get(i).getAsJsonObject()));
- }
- };
- if (json.has("event")) {
- JsonArray array = json.getAsJsonArray("event");
- for (int i = 0; i < array.size(); i++) {
- res.getEvent().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
- }
- };
- if (json.has("period"))
- res.setPeriod(parsePeriod(getJObject(json, "period")));
- if (json.has("facilityType"))
- res.setFacilityType(parseCodeableConcept(getJObject(json, "facilityType")));
- if (json.has("practiceSetting"))
- res.setPracticeSetting(parseCodeableConcept(getJObject(json, "practiceSetting")));
- if (json.has("sourcePatientInfo"))
- res.setSourcePatientInfo(parseReference(getJObject(json, "sourcePatientInfo")));
- if (json.has("related")) {
- JsonArray array = json.getAsJsonArray("related");
- for (int i = 0; i < array.size(); i++) {
- res.getRelated().add(parseReference(array.get(i).getAsJsonObject()));
- }
- };
- if (json.has("basedOn")) {
- JsonArray array = json.getAsJsonArray("basedOn");
- for (int i = 0; i < array.size(); i++) {
- res.getBasedOn().add(parseReference(array.get(i).getAsJsonObject()));
- }
- };
+ if (json.has("identifier"))
+ res.setIdentifier(parseIdentifier(getJObject(json, "identifier")));
}
protected Encounter parseEncounter(JsonObject json) throws IOException, FHIRFormatError {
@@ -12838,10 +13009,38 @@ public class JsonParser extends JsonParserBase {
res.setLastReviewDateElement(parseDate(json.get("lastReviewDate").getAsString()));
if (json.has("_lastReviewDate"))
parseElementProperties(getJObject(json, "_lastReviewDate"), res.getLastReviewDateElement());
- if (json.has("contributor")) {
- JsonArray array = json.getAsJsonArray("contributor");
+ if (json.has("publisher"))
+ res.setPublisherElement(parseString(json.get("publisher").getAsString()));
+ if (json.has("_publisher"))
+ parseElementProperties(getJObject(json, "_publisher"), res.getPublisherElement());
+ if (json.has("contact")) {
+ JsonArray array = json.getAsJsonArray("contact");
for (int i = 0; i < array.size(); i++) {
- res.getContributor().add(parseContributor(array.get(i).getAsJsonObject()));
+ res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("author")) {
+ JsonArray array = json.getAsJsonArray("author");
+ for (int i = 0; i < array.size(); i++) {
+ res.getAuthor().add(parseContactDetail(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("editor")) {
+ JsonArray array = json.getAsJsonArray("editor");
+ for (int i = 0; i < array.size(); i++) {
+ res.getEditor().add(parseContactDetail(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("reviewer")) {
+ JsonArray array = json.getAsJsonArray("reviewer");
+ for (int i = 0; i < array.size(); i++) {
+ res.getReviewer().add(parseContactDetail(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("endorser")) {
+ JsonArray array = json.getAsJsonArray("endorser");
+ for (int i = 0; i < array.size(); i++) {
+ res.getEndorser().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
};
if (json.has("relatedArtifact")) {
@@ -12934,8 +13133,12 @@ public class JsonParser extends JsonParserBase {
res.setDescriptionElement(parseString(json.get("description").getAsString()));
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
- if (json.has("note"))
- res.setNote(parseAnnotation(getJObject(json, "note")));
+ if (json.has("note")) {
+ JsonArray array = json.getAsJsonArray("note");
+ for (int i = 0; i < array.size(); i++) {
+ res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
+ }
+ };
if (json.has("rating")) {
JsonArray array = json.getAsJsonArray("rating");
for (int i = 0; i < array.size(); i++) {
@@ -12962,8 +13165,12 @@ public class JsonParser extends JsonParserBase {
res.setDescriptionElement(parseString(json.get("description").getAsString()));
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
- if (json.has("note"))
- res.setNote(parseAnnotation(getJObject(json, "note")));
+ if (json.has("note")) {
+ JsonArray array = json.getAsJsonArray("note");
+ for (int i = 0; i < array.size(); i++) {
+ res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
+ }
+ };
if (json.has("type")) {
JsonArray array = json.getAsJsonArray("type");
for (int i = 0; i < array.size(); i++) {
@@ -12978,32 +13185,18 @@ public class JsonParser extends JsonParserBase {
};
}
- protected EvidenceFocus parseEvidenceFocus(JsonObject json) throws IOException, FHIRFormatError {
- EvidenceFocus res = new EvidenceFocus();
- parseEvidenceFocusProperties(json, res);
+ protected EvidenceReport parseEvidenceReport(JsonObject json) throws IOException, FHIRFormatError {
+ EvidenceReport res = new EvidenceReport();
+ parseEvidenceReportProperties(json, res);
return res;
}
- protected void parseEvidenceFocusProperties(JsonObject json, EvidenceFocus res) throws IOException, FHIRFormatError {
+ protected void parseEvidenceReportProperties(JsonObject json, EvidenceReport res) throws IOException, FHIRFormatError {
parseMetadataResourceProperties(json, res);
if (json.has("url"))
res.setUrlElement(parseUri(json.get("url").getAsString()));
if (json.has("_url"))
parseElementProperties(getJObject(json, "_url"), res.getUrlElement());
- if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
- for (int i = 0; i < array.size(); i++) {
- res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
- }
- };
- if (json.has("version"))
- res.setVersionElement(parseString(json.get("version").getAsString()));
- if (json.has("_version"))
- parseElementProperties(getJObject(json, "_version"), res.getVersionElement());
- if (json.has("name"))
- res.setNameElement(parseString(json.get("name").getAsString()));
- if (json.has("_name"))
- parseElementProperties(getJObject(json, "_name"), res.getNameElement());
if (json.has("status"))
res.setStatusElement(parseEnumeration(json.get("status").getAsString(), Enumerations.PublicationStatus.NULL, new Enumerations.PublicationStatusEnumFactory()));
if (json.has("_status"))
@@ -13014,43 +13207,113 @@ public class JsonParser extends JsonParserBase {
res.getUseContext().add(parseUsageContext(array.get(i).getAsJsonObject()));
}
};
- if (json.has("date"))
- res.setDateElement(parseDateTime(json.get("date").getAsString()));
- if (json.has("_date"))
- parseElementProperties(getJObject(json, "_date"), res.getDateElement());
+ if (json.has("identifier")) {
+ JsonArray array = json.getAsJsonArray("identifier");
+ for (int i = 0; i < array.size(); i++) {
+ res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("relatedIdentifier")) {
+ JsonArray array = json.getAsJsonArray("relatedIdentifier");
+ for (int i = 0; i < array.size(); i++) {
+ res.getRelatedIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("citeAs"))
+ res.setCiteAs(parseReference(getJObject(json, "citeAs")));
+ if (json.has("type"))
+ res.setType(parseCodeableConcept(getJObject(json, "type")));
if (json.has("note")) {
JsonArray array = json.getAsJsonArray("note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
};
- if (json.has("copyright"))
- res.setCopyrightElement(parseMarkdown(json.get("copyright").getAsString()));
- if (json.has("_copyright"))
- parseElementProperties(getJObject(json, "_copyright"), res.getCopyrightElement());
- if (json.has("citeAs"))
- res.setCiteAs(parseReference(getJObject(json, "citeAs")));
- if (json.has("characteristic")) {
- JsonArray array = json.getAsJsonArray("characteristic");
- for (int i = 0; i < array.size(); i++) {
- res.getCharacteristic().add(parseEvidenceFocusCharacteristicComponent(array.get(i).getAsJsonObject()));
- }
- };
if (json.has("relatedArtifact")) {
JsonArray array = json.getAsJsonArray("relatedArtifact");
for (int i = 0; i < array.size(); i++) {
res.getRelatedArtifact().add(parseRelatedArtifact(array.get(i).getAsJsonObject()));
}
};
+ if (json.has("subject"))
+ res.setSubject(parseEvidenceReportSubjectComponent(getJObject(json, "subject")));
+ if (json.has("publisher"))
+ res.setPublisherElement(parseString(json.get("publisher").getAsString()));
+ if (json.has("_publisher"))
+ parseElementProperties(getJObject(json, "_publisher"), res.getPublisherElement());
+ if (json.has("contact")) {
+ JsonArray array = json.getAsJsonArray("contact");
+ for (int i = 0; i < array.size(); i++) {
+ res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("author")) {
+ JsonArray array = json.getAsJsonArray("author");
+ for (int i = 0; i < array.size(); i++) {
+ res.getAuthor().add(parseContactDetail(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("editor")) {
+ JsonArray array = json.getAsJsonArray("editor");
+ for (int i = 0; i < array.size(); i++) {
+ res.getEditor().add(parseContactDetail(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("reviewer")) {
+ JsonArray array = json.getAsJsonArray("reviewer");
+ for (int i = 0; i < array.size(); i++) {
+ res.getReviewer().add(parseContactDetail(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("endorser")) {
+ JsonArray array = json.getAsJsonArray("endorser");
+ for (int i = 0; i < array.size(); i++) {
+ res.getEndorser().add(parseContactDetail(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("relatesTo")) {
+ JsonArray array = json.getAsJsonArray("relatesTo");
+ for (int i = 0; i < array.size(); i++) {
+ res.getRelatesTo().add(parseEvidenceReportRelatesToComponent(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("section")) {
+ JsonArray array = json.getAsJsonArray("section");
+ for (int i = 0; i < array.size(); i++) {
+ res.getSection().add(parseEvidenceReportSectionComponent(array.get(i).getAsJsonObject()));
+ }
+ };
}
- protected EvidenceFocus.EvidenceFocusCharacteristicComponent parseEvidenceFocusCharacteristicComponent(JsonObject json) throws IOException, FHIRFormatError {
- EvidenceFocus.EvidenceFocusCharacteristicComponent res = new EvidenceFocus.EvidenceFocusCharacteristicComponent();
- parseEvidenceFocusCharacteristicComponentProperties(json, res);
+ protected EvidenceReport.EvidenceReportSubjectComponent parseEvidenceReportSubjectComponent(JsonObject json) throws IOException, FHIRFormatError {
+ EvidenceReport.EvidenceReportSubjectComponent res = new EvidenceReport.EvidenceReportSubjectComponent();
+ parseEvidenceReportSubjectComponentProperties(json, res);
return res;
}
- protected void parseEvidenceFocusCharacteristicComponentProperties(JsonObject json, EvidenceFocus.EvidenceFocusCharacteristicComponent res) throws IOException, FHIRFormatError {
+ protected void parseEvidenceReportSubjectComponentProperties(JsonObject json, EvidenceReport.EvidenceReportSubjectComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("characteristic")) {
+ JsonArray array = json.getAsJsonArray("characteristic");
+ for (int i = 0; i < array.size(); i++) {
+ res.getCharacteristic().add(parseEvidenceReportSubjectCharacteristicComponent(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("note")) {
+ JsonArray array = json.getAsJsonArray("note");
+ for (int i = 0; i < array.size(); i++) {
+ res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
+ }
+ };
+ }
+
+ protected EvidenceReport.EvidenceReportSubjectCharacteristicComponent parseEvidenceReportSubjectCharacteristicComponent(JsonObject json) throws IOException, FHIRFormatError {
+ EvidenceReport.EvidenceReportSubjectCharacteristicComponent res = new EvidenceReport.EvidenceReportSubjectCharacteristicComponent();
+ parseEvidenceReportSubjectCharacteristicComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseEvidenceReportSubjectCharacteristicComponentProperties(JsonObject json, EvidenceReport.EvidenceReportSubjectCharacteristicComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("code"))
res.setCode(parseCodeableConcept(getJObject(json, "code")));
@@ -13065,6 +13328,75 @@ public class JsonParser extends JsonParserBase {
res.setPeriod(parsePeriod(getJObject(json, "period")));
}
+ protected EvidenceReport.EvidenceReportRelatesToComponent parseEvidenceReportRelatesToComponent(JsonObject json) throws IOException, FHIRFormatError {
+ EvidenceReport.EvidenceReportRelatesToComponent res = new EvidenceReport.EvidenceReportRelatesToComponent();
+ parseEvidenceReportRelatesToComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseEvidenceReportRelatesToComponentProperties(JsonObject json, EvidenceReport.EvidenceReportRelatesToComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("code"))
+ res.setCodeElement(parseEnumeration(json.get("code").getAsString(), EvidenceReport.ReportRelationshipType.NULL, new EvidenceReport.ReportRelationshipTypeEnumFactory()));
+ if (json.has("_code"))
+ parseElementProperties(getJObject(json, "_code"), res.getCodeElement());
+ DataType target = parseType("target", json);
+ if (target != null)
+ res.setTarget(target);
+ }
+
+ protected EvidenceReport.SectionComponent parseEvidenceReportSectionComponent(JsonObject json) throws IOException, FHIRFormatError {
+ EvidenceReport.SectionComponent res = new EvidenceReport.SectionComponent();
+ parseEvidenceReportSectionComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseEvidenceReportSectionComponentProperties(JsonObject json, EvidenceReport.SectionComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("title"))
+ res.setTitleElement(parseString(json.get("title").getAsString()));
+ if (json.has("_title"))
+ parseElementProperties(getJObject(json, "_title"), res.getTitleElement());
+ if (json.has("focus"))
+ res.setFocus(parseCodeableConcept(getJObject(json, "focus")));
+ if (json.has("focusReference"))
+ res.setFocusReference(parseReference(getJObject(json, "focusReference")));
+ if (json.has("author")) {
+ JsonArray array = json.getAsJsonArray("author");
+ for (int i = 0; i < array.size(); i++) {
+ res.getAuthor().add(parseReference(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("text"))
+ res.setText(parseNarrative(getJObject(json, "text")));
+ if (json.has("mode"))
+ res.setModeElement(parseEnumeration(json.get("mode").getAsString(), Enumerations.ListMode.NULL, new Enumerations.ListModeEnumFactory()));
+ if (json.has("_mode"))
+ parseElementProperties(getJObject(json, "_mode"), res.getModeElement());
+ if (json.has("orderedBy"))
+ res.setOrderedBy(parseCodeableConcept(getJObject(json, "orderedBy")));
+ if (json.has("entryClassifier")) {
+ JsonArray array = json.getAsJsonArray("entryClassifier");
+ for (int i = 0; i < array.size(); i++) {
+ res.getEntryClassifier().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("entryReference")) {
+ JsonArray array = json.getAsJsonArray("entryReference");
+ for (int i = 0; i < array.size(); i++) {
+ res.getEntryReference().add(parseReference(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("emptyReason"))
+ res.setEmptyReason(parseCodeableConcept(getJObject(json, "emptyReason")));
+ if (json.has("section")) {
+ JsonArray array = json.getAsJsonArray("section");
+ for (int i = 0; i < array.size(); i++) {
+ res.getSection().add(parseEvidenceReportSectionComponent(array.get(i).getAsJsonObject()));
+ }
+ };
+ }
+
protected EvidenceVariable parseEvidenceVariable(JsonObject json) throws IOException, FHIRFormatError {
EvidenceVariable res = new EvidenceVariable();
parseEvidenceVariableProperties(json, res);
@@ -13111,16 +13443,6 @@ public class JsonParser extends JsonParserBase {
res.setDateElement(parseDateTime(json.get("date").getAsString()));
if (json.has("_date"))
parseElementProperties(getJObject(json, "_date"), res.getDateElement());
- if (json.has("publisher"))
- res.setPublisherElement(parseString(json.get("publisher").getAsString()));
- if (json.has("_publisher"))
- parseElementProperties(getJObject(json, "_publisher"), res.getPublisherElement());
- if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
- for (int i = 0; i < array.size(); i++) {
- res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
- }
- };
if (json.has("description"))
res.setDescriptionElement(parseMarkdown(json.get("description").getAsString()));
if (json.has("_description"))
@@ -13137,30 +13459,14 @@ public class JsonParser extends JsonParserBase {
res.getUseContext().add(parseUsageContext(array.get(i).getAsJsonObject()));
}
};
- if (json.has("jurisdiction")) {
- JsonArray array = json.getAsJsonArray("jurisdiction");
+ if (json.has("publisher"))
+ res.setPublisherElement(parseString(json.get("publisher").getAsString()));
+ if (json.has("_publisher"))
+ parseElementProperties(getJObject(json, "_publisher"), res.getPublisherElement());
+ if (json.has("contact")) {
+ JsonArray array = json.getAsJsonArray("contact");
for (int i = 0; i < array.size(); i++) {
- res.getJurisdiction().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
- }
- };
- if (json.has("copyright"))
- res.setCopyrightElement(parseMarkdown(json.get("copyright").getAsString()));
- if (json.has("_copyright"))
- parseElementProperties(getJObject(json, "_copyright"), res.getCopyrightElement());
- if (json.has("approvalDate"))
- res.setApprovalDateElement(parseDate(json.get("approvalDate").getAsString()));
- if (json.has("_approvalDate"))
- parseElementProperties(getJObject(json, "_approvalDate"), res.getApprovalDateElement());
- if (json.has("lastReviewDate"))
- res.setLastReviewDateElement(parseDate(json.get("lastReviewDate").getAsString()));
- if (json.has("_lastReviewDate"))
- parseElementProperties(getJObject(json, "_lastReviewDate"), res.getLastReviewDateElement());
- if (json.has("effectivePeriod"))
- res.setEffectivePeriod(parsePeriod(getJObject(json, "effectivePeriod")));
- if (json.has("topic")) {
- JsonArray array = json.getAsJsonArray("topic");
- for (int i = 0; i < array.size(); i++) {
- res.getTopic().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
+ res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
};
if (json.has("author")) {
@@ -13193,10 +13499,6 @@ public class JsonParser extends JsonParserBase {
res.getRelatedArtifact().add(parseRelatedArtifact(array.get(i).getAsJsonObject()));
}
};
- if (json.has("type"))
- res.setTypeElement(parseEnumeration(json.get("type").getAsString(), EvidenceVariable.EvidenceVariableType.NULL, new EvidenceVariable.EvidenceVariableTypeEnumFactory()));
- if (json.has("_type"))
- parseElementProperties(getJObject(json, "_type"), res.getTypeElement());
if (json.has("actual"))
res.setActualElement(parseBoolean(json.get("actual").getAsBoolean()));
if (json.has("_actual"))
@@ -13211,6 +13513,16 @@ public class JsonParser extends JsonParserBase {
res.getCharacteristic().add(parseEvidenceVariableCharacteristicComponent(array.get(i).getAsJsonObject()));
}
};
+ if (json.has("handling"))
+ res.setHandlingElement(parseEnumeration(json.get("handling").getAsString(), Enumerations.EvidenceVariableHandling.NULL, new Enumerations.EvidenceVariableHandlingEnumFactory()));
+ if (json.has("_handling"))
+ parseElementProperties(getJObject(json, "_handling"), res.getHandlingElement());
+ if (json.has("category")) {
+ JsonArray array = json.getAsJsonArray("category");
+ for (int i = 0; i < array.size(); i++) {
+ res.getCategory().add(parseEvidenceVariableCategoryComponent(array.get(i).getAsJsonObject()));
+ }
+ };
}
protected EvidenceVariable.EvidenceVariableCharacteristicComponent parseEvidenceVariableCharacteristicComponent(JsonObject json) throws IOException, FHIRFormatError {
@@ -13268,6 +13580,23 @@ public class JsonParser extends JsonParserBase {
};
}
+ protected EvidenceVariable.EvidenceVariableCategoryComponent parseEvidenceVariableCategoryComponent(JsonObject json) throws IOException, FHIRFormatError {
+ EvidenceVariable.EvidenceVariableCategoryComponent res = new EvidenceVariable.EvidenceVariableCategoryComponent();
+ parseEvidenceVariableCategoryComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseEvidenceVariableCategoryComponentProperties(JsonObject json, EvidenceVariable.EvidenceVariableCategoryComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("name"))
+ res.setNameElement(parseString(json.get("name").getAsString()));
+ if (json.has("_name"))
+ parseElementProperties(getJObject(json, "_name"), res.getNameElement());
+ DataType value = parseType("value", json);
+ if (value != null)
+ res.setValue(value);
+ }
+
protected ExampleScenario parseExampleScenario(JsonObject json) throws IOException, FHIRFormatError {
ExampleScenario res = new ExampleScenario();
parseExampleScenarioProperties(json, res);
@@ -15747,6 +16076,50 @@ public class JsonParser extends JsonParserBase {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
+ if (json.has("instantiatesCanonical")) {
+ JsonArray array = json.getAsJsonArray("instantiatesCanonical");
+ for (int i = 0; i < array.size(); i++) {
+ if (array.get(i).isJsonNull()) {
+ res.getInstantiatesCanonical().add(new CanonicalType());
+ } else {;
+ res.getInstantiatesCanonical().add(parseCanonical(array.get(i).getAsString()));
+ }
+ }
+ };
+ if (json.has("_instantiatesCanonical")) {
+ JsonArray array = json.getAsJsonArray("_instantiatesCanonical");
+ for (int i = 0; i < array.size(); i++) {
+ if (i == res.getInstantiatesCanonical().size())
+ res.getInstantiatesCanonical().add(parseCanonical(null));
+ if (array.get(i) instanceof JsonObject)
+ parseElementProperties(array.get(i).getAsJsonObject(), res.getInstantiatesCanonical().get(i));
+ }
+ };
+ if (json.has("instantiatesUri")) {
+ JsonArray array = json.getAsJsonArray("instantiatesUri");
+ for (int i = 0; i < array.size(); i++) {
+ if (array.get(i).isJsonNull()) {
+ res.getInstantiatesUri().add(new UriType());
+ } else {;
+ res.getInstantiatesUri().add(parseUri(array.get(i).getAsString()));
+ }
+ }
+ };
+ if (json.has("_instantiatesUri")) {
+ JsonArray array = json.getAsJsonArray("_instantiatesUri");
+ for (int i = 0; i < array.size(); i++) {
+ if (i == res.getInstantiatesUri().size())
+ res.getInstantiatesUri().add(parseUri(null));
+ if (array.get(i) instanceof JsonObject)
+ parseElementProperties(array.get(i).getAsJsonObject(), res.getInstantiatesUri().get(i));
+ }
+ };
+ if (json.has("basedOn")) {
+ JsonArray array = json.getAsJsonArray("basedOn");
+ for (int i = 0; i < array.size(); i++) {
+ res.getBasedOn().add(parseReference(array.get(i).getAsJsonObject()));
+ }
+ };
if (json.has("status"))
res.setStatusElement(parseEnumeration(json.get("status").getAsString(), Immunization.ImmunizationStatusCodes.NULL, new Immunization.ImmunizationStatusCodesEnumFactory()));
if (json.has("_status"))
@@ -15755,6 +16128,16 @@ public class JsonParser extends JsonParserBase {
res.setStatusReason(parseCodeableConcept(getJObject(json, "statusReason")));
if (json.has("vaccineCode"))
res.setVaccineCode(parseCodeableConcept(getJObject(json, "vaccineCode")));
+ if (json.has("manufacturer"))
+ res.setManufacturer(parseReference(getJObject(json, "manufacturer")));
+ if (json.has("lotNumber"))
+ res.setLotNumberElement(parseString(json.get("lotNumber").getAsString()));
+ if (json.has("_lotNumber"))
+ parseElementProperties(getJObject(json, "_lotNumber"), res.getLotNumberElement());
+ if (json.has("expirationDate"))
+ res.setExpirationDateElement(parseDate(json.get("expirationDate").getAsString()));
+ if (json.has("_expirationDate"))
+ parseElementProperties(getJObject(json, "_expirationDate"), res.getExpirationDateElement());
if (json.has("patient"))
res.setPatient(parseReference(getJObject(json, "patient")));
if (json.has("encounter"))
@@ -15775,16 +16158,6 @@ public class JsonParser extends JsonParserBase {
res.setInformationSource(informationSource);
if (json.has("location"))
res.setLocation(parseReference(getJObject(json, "location")));
- if (json.has("manufacturer"))
- res.setManufacturer(parseReference(getJObject(json, "manufacturer")));
- if (json.has("lotNumber"))
- res.setLotNumberElement(parseString(json.get("lotNumber").getAsString()));
- if (json.has("_lotNumber"))
- parseElementProperties(getJObject(json, "_lotNumber"), res.getLotNumberElement());
- if (json.has("expirationDate"))
- res.setExpirationDateElement(parseDate(json.get("expirationDate").getAsString()));
- if (json.has("_expirationDate"))
- parseElementProperties(getJObject(json, "_expirationDate"), res.getExpirationDateElement());
if (json.has("site"))
res.setSite(parseCodeableConcept(getJObject(json, "site")));
if (json.has("route"))
@@ -16007,6 +16380,44 @@ public class JsonParser extends JsonParserBase {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
+ if (json.has("instantiatesCanonical")) {
+ JsonArray array = json.getAsJsonArray("instantiatesCanonical");
+ for (int i = 0; i < array.size(); i++) {
+ if (array.get(i).isJsonNull()) {
+ res.getInstantiatesCanonical().add(new CanonicalType());
+ } else {;
+ res.getInstantiatesCanonical().add(parseCanonical(array.get(i).getAsString()));
+ }
+ }
+ };
+ if (json.has("_instantiatesCanonical")) {
+ JsonArray array = json.getAsJsonArray("_instantiatesCanonical");
+ for (int i = 0; i < array.size(); i++) {
+ if (i == res.getInstantiatesCanonical().size())
+ res.getInstantiatesCanonical().add(parseCanonical(null));
+ if (array.get(i) instanceof JsonObject)
+ parseElementProperties(array.get(i).getAsJsonObject(), res.getInstantiatesCanonical().get(i));
+ }
+ };
+ if (json.has("instantiatesUri")) {
+ JsonArray array = json.getAsJsonArray("instantiatesUri");
+ for (int i = 0; i < array.size(); i++) {
+ if (array.get(i).isJsonNull()) {
+ res.getInstantiatesUri().add(new UriType());
+ } else {;
+ res.getInstantiatesUri().add(parseUri(array.get(i).getAsString()));
+ }
+ }
+ };
+ if (json.has("_instantiatesUri")) {
+ JsonArray array = json.getAsJsonArray("_instantiatesUri");
+ for (int i = 0; i < array.size(); i++) {
+ if (i == res.getInstantiatesUri().size())
+ res.getInstantiatesUri().add(parseUri(null));
+ if (array.get(i) instanceof JsonObject)
+ parseElementProperties(array.get(i).getAsJsonObject(), res.getInstantiatesUri().get(i));
+ }
+ };
if (json.has("patient"))
res.setPatient(parseReference(getJObject(json, "patient")));
if (json.has("date"))
@@ -16579,46 +16990,42 @@ public class JsonParser extends JsonParserBase {
res.getManufacturer().add(parseReference(array.get(i).getAsJsonObject()));
}
};
+ if (json.has("substance"))
+ res.setSubstance(parseIngredientSubstanceComponent(getJObject(json, "substance")));
if (json.has("specifiedSubstance")) {
JsonArray array = json.getAsJsonArray("specifiedSubstance");
for (int i = 0; i < array.size(); i++) {
res.getSpecifiedSubstance().add(parseIngredientSpecifiedSubstanceComponent(array.get(i).getAsJsonObject()));
}
};
- if (json.has("substance"))
- res.setSubstance(parseIngredientSubstanceComponent(getJObject(json, "substance")));
}
- protected Ingredient.IngredientSpecifiedSubstanceComponent parseIngredientSpecifiedSubstanceComponent(JsonObject json) throws IOException, FHIRFormatError {
- Ingredient.IngredientSpecifiedSubstanceComponent res = new Ingredient.IngredientSpecifiedSubstanceComponent();
- parseIngredientSpecifiedSubstanceComponentProperties(json, res);
+ protected Ingredient.IngredientSubstanceComponent parseIngredientSubstanceComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Ingredient.IngredientSubstanceComponent res = new Ingredient.IngredientSubstanceComponent();
+ parseIngredientSubstanceComponentProperties(json, res);
return res;
}
- protected void parseIngredientSpecifiedSubstanceComponentProperties(JsonObject json, Ingredient.IngredientSpecifiedSubstanceComponent res) throws IOException, FHIRFormatError {
+ protected void parseIngredientSubstanceComponentProperties(JsonObject json, Ingredient.IngredientSubstanceComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
DataType code = parseType("code", json);
if (code != null)
res.setCode(code);
- if (json.has("group"))
- res.setGroup(parseCodeableConcept(getJObject(json, "group")));
- if (json.has("confidentiality"))
- res.setConfidentiality(parseCodeableConcept(getJObject(json, "confidentiality")));
if (json.has("strength")) {
JsonArray array = json.getAsJsonArray("strength");
for (int i = 0; i < array.size(); i++) {
- res.getStrength().add(parseIngredientSpecifiedSubstanceStrengthComponent(array.get(i).getAsJsonObject()));
+ res.getStrength().add(parseIngredientSubstanceStrengthComponent(array.get(i).getAsJsonObject()));
}
};
}
- protected Ingredient.IngredientSpecifiedSubstanceStrengthComponent parseIngredientSpecifiedSubstanceStrengthComponent(JsonObject json) throws IOException, FHIRFormatError {
- Ingredient.IngredientSpecifiedSubstanceStrengthComponent res = new Ingredient.IngredientSpecifiedSubstanceStrengthComponent();
- parseIngredientSpecifiedSubstanceStrengthComponentProperties(json, res);
+ protected Ingredient.IngredientSubstanceStrengthComponent parseIngredientSubstanceStrengthComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Ingredient.IngredientSubstanceStrengthComponent res = new Ingredient.IngredientSubstanceStrengthComponent();
+ parseIngredientSubstanceStrengthComponentProperties(json, res);
return res;
}
- protected void parseIngredientSpecifiedSubstanceStrengthComponentProperties(JsonObject json, Ingredient.IngredientSpecifiedSubstanceStrengthComponent res) throws IOException, FHIRFormatError {
+ protected void parseIngredientSubstanceStrengthComponentProperties(JsonObject json, Ingredient.IngredientSubstanceStrengthComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("presentation"))
res.setPresentation(parseRatio(getJObject(json, "presentation")));
@@ -16649,18 +17056,18 @@ public class JsonParser extends JsonParserBase {
if (json.has("referenceStrength")) {
JsonArray array = json.getAsJsonArray("referenceStrength");
for (int i = 0; i < array.size(); i++) {
- res.getReferenceStrength().add(parseIngredientSpecifiedSubstanceStrengthReferenceStrengthComponent(array.get(i).getAsJsonObject()));
+ res.getReferenceStrength().add(parseIngredientSubstanceStrengthReferenceStrengthComponent(array.get(i).getAsJsonObject()));
}
};
}
- protected Ingredient.IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent parseIngredientSpecifiedSubstanceStrengthReferenceStrengthComponent(JsonObject json) throws IOException, FHIRFormatError {
- Ingredient.IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent res = new Ingredient.IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent();
- parseIngredientSpecifiedSubstanceStrengthReferenceStrengthComponentProperties(json, res);
+ protected Ingredient.IngredientSubstanceStrengthReferenceStrengthComponent parseIngredientSubstanceStrengthReferenceStrengthComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Ingredient.IngredientSubstanceStrengthReferenceStrengthComponent res = new Ingredient.IngredientSubstanceStrengthReferenceStrengthComponent();
+ parseIngredientSubstanceStrengthReferenceStrengthComponentProperties(json, res);
return res;
}
- protected void parseIngredientSpecifiedSubstanceStrengthReferenceStrengthComponentProperties(JsonObject json, Ingredient.IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent res) throws IOException, FHIRFormatError {
+ protected void parseIngredientSubstanceStrengthReferenceStrengthComponentProperties(JsonObject json, Ingredient.IngredientSubstanceStrengthReferenceStrengthComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
DataType substance = parseType("substance", json);
if (substance != null)
@@ -16681,21 +17088,25 @@ public class JsonParser extends JsonParserBase {
};
}
- protected Ingredient.IngredientSubstanceComponent parseIngredientSubstanceComponent(JsonObject json) throws IOException, FHIRFormatError {
- Ingredient.IngredientSubstanceComponent res = new Ingredient.IngredientSubstanceComponent();
- parseIngredientSubstanceComponentProperties(json, res);
+ protected Ingredient.IngredientSpecifiedSubstanceComponent parseIngredientSpecifiedSubstanceComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Ingredient.IngredientSpecifiedSubstanceComponent res = new Ingredient.IngredientSpecifiedSubstanceComponent();
+ parseIngredientSpecifiedSubstanceComponentProperties(json, res);
return res;
}
- protected void parseIngredientSubstanceComponentProperties(JsonObject json, Ingredient.IngredientSubstanceComponent res) throws IOException, FHIRFormatError {
+ protected void parseIngredientSpecifiedSubstanceComponentProperties(JsonObject json, Ingredient.IngredientSpecifiedSubstanceComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
DataType code = parseType("code", json);
if (code != null)
res.setCode(code);
+ if (json.has("group"))
+ res.setGroup(parseCodeableConcept(getJObject(json, "group")));
+ if (json.has("confidentiality"))
+ res.setConfidentiality(parseCodeableConcept(getJObject(json, "confidentiality")));
if (json.has("strength")) {
JsonArray array = json.getAsJsonArray("strength");
for (int i = 0; i < array.size(); i++) {
- res.getStrength().add(parseIngredientSpecifiedSubstanceStrengthComponent(array.get(i).getAsJsonObject()));
+ res.getStrength().add(parseIngredientSubstanceStrengthComponent(array.get(i).getAsJsonObject()));
}
};
}
@@ -18534,6 +18945,8 @@ public class JsonParser extends JsonParserBase {
res.setStatusElement(parseEnumeration(json.get("status").getAsString(), MedicationKnowledge.MedicationKnowledgeStatusCodes.NULL, new MedicationKnowledge.MedicationKnowledgeStatusCodesEnumFactory()));
if (json.has("_status"))
parseElementProperties(getJObject(json, "_status"), res.getStatusElement());
+ if (json.has("author"))
+ res.setAuthor(parseReference(getJObject(json, "author")));
if (json.has("manufacturer"))
res.setManufacturer(parseReference(getJObject(json, "manufacturer")));
if (json.has("doseForm"))
@@ -18571,6 +18984,8 @@ public class JsonParser extends JsonParserBase {
res.getAssociatedMedication().add(parseReference(array.get(i).getAsJsonObject()));
}
};
+ if (json.has("associatedDefinition"))
+ res.setAssociatedDefinition(parseReference(getJObject(json, "associatedDefinition")));
if (json.has("productType")) {
JsonArray array = json.getAsJsonArray("productType");
for (int i = 0; i < array.size(); i++) {
@@ -18629,8 +19044,12 @@ public class JsonParser extends JsonParserBase {
res.getMedicineClassification().add(parseMedicationKnowledgeMedicineClassificationComponent(array.get(i).getAsJsonObject()));
}
};
- if (json.has("packaging"))
- res.setPackaging(parseMedicationKnowledgePackagingComponent(getJObject(json, "packaging")));
+ if (json.has("packaging")) {
+ JsonArray array = json.getAsJsonArray("packaging");
+ for (int i = 0; i < array.size(); i++) {
+ res.getPackaging().add(parseMedicationKnowledgePackagingComponent(array.get(i).getAsJsonObject()));
+ }
+ };
if (json.has("drugCharacteristic")) {
JsonArray array = json.getAsJsonArray("drugCharacteristic");
for (int i = 0; i < array.size(); i++) {
@@ -18716,14 +19135,21 @@ public class JsonParser extends JsonParserBase {
protected void parseMedicationKnowledgeCostComponentProperties(JsonObject json, MedicationKnowledge.MedicationKnowledgeCostComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
+ if (json.has("effectiveDate")) {
+ JsonArray array = json.getAsJsonArray("effectiveDate");
+ for (int i = 0; i < array.size(); i++) {
+ res.getEffectiveDate().add(parsePeriod(array.get(i).getAsJsonObject()));
+ }
+ };
if (json.has("type"))
res.setType(parseCodeableConcept(getJObject(json, "type")));
if (json.has("source"))
res.setSourceElement(parseString(json.get("source").getAsString()));
if (json.has("_source"))
parseElementProperties(getJObject(json, "_source"), res.getSourceElement());
- if (json.has("cost"))
- res.setCost(parseMoney(getJObject(json, "cost")));
+ DataType cost = parseType("cost", json);
+ if (cost != null)
+ res.setCost(cost);
}
protected MedicationKnowledge.MedicationKnowledgeMonitoringProgramComponent parseMedicationKnowledgeMonitoringProgramComponent(JsonObject json) throws IOException, FHIRFormatError {
@@ -18825,6 +19251,10 @@ public class JsonParser extends JsonParserBase {
protected void parseMedicationKnowledgePackagingComponentProperties(JsonObject json, MedicationKnowledge.MedicationKnowledgePackagingComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
+ if (json.has("identifier"))
+ res.setIdentifier(parseIdentifier(getJObject(json, "identifier")));
+ if (json.has("cost"))
+ res.setCost(parseMedicationKnowledgeCostComponent(getJObject(json, "cost")));
if (json.has("type"))
res.setType(parseCodeableConcept(getJObject(json, "type")));
if (json.has("quantity"))
@@ -19287,10 +19717,10 @@ public class JsonParser extends JsonParserBase {
};
if (json.has("paediatricUseIndicator"))
res.setPaediatricUseIndicator(parseCodeableConcept(getJObject(json, "paediatricUseIndicator")));
- if (json.has("productClassification")) {
- JsonArray array = json.getAsJsonArray("productClassification");
+ if (json.has("classification")) {
+ JsonArray array = json.getAsJsonArray("classification");
for (int i = 0; i < array.size(); i++) {
- res.getProductClassification().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
+ res.getClassification().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("characteristic")) {
@@ -19323,6 +19753,12 @@ public class JsonParser extends JsonParserBase {
res.getIngredient().add(parseReference(array.get(i).getAsJsonObject()));
}
};
+ if (json.has("impurity")) {
+ JsonArray array = json.getAsJsonArray("impurity");
+ for (int i = 0; i < array.size(); i++) {
+ res.getImpurity().add(parseReference(array.get(i).getAsJsonObject()));
+ }
+ };
if (json.has("attachedDocument")) {
JsonArray array = json.getAsJsonArray("attachedDocument");
for (int i = 0; i < array.size(); i++) {
@@ -19449,9 +19885,8 @@ public class JsonParser extends JsonParserBase {
protected void parseMedicinalProductDefinitionCrossReferenceComponentProperties(JsonObject json, MedicinalProductDefinition.MedicinalProductDefinitionCrossReferenceComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
- DataType product = parseType("product", json);
- if (product != null)
- res.setProduct(product);
+ if (json.has("product"))
+ res.setProduct(parseCodeableReference(getJObject(json, "product")));
if (json.has("type"))
res.setType(parseCodeableConcept(getJObject(json, "type")));
}
@@ -21951,6 +22386,8 @@ public class JsonParser extends JsonParserBase {
res.setNameElement(parseString(json.get("name").getAsString()));
if (json.has("_name"))
parseElementProperties(getJObject(json, "_name"), res.getNameElement());
+ if (json.has("type"))
+ res.setType(parseCodeableConcept(getJObject(json, "type")));
if (json.has("subject")) {
JsonArray array = json.getAsJsonArray("subject");
for (int i = 0; i < array.size(); i++) {
@@ -26317,12 +26754,6 @@ public class JsonParser extends JsonParserBase {
res.getFilterBy().add(parseSubscriptionFilterByComponent(array.get(i).getAsJsonObject()));
}
};
- if (json.has("error")) {
- JsonArray array = json.getAsJsonArray("error");
- for (int i = 0; i < array.size(); i++) {
- res.getError().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
- }
- };
if (json.has("channelType"))
res.setChannelType(parseCoding(getJObject(json, "channelType")));
if (json.has("endpoint"))
@@ -26396,10 +26827,10 @@ public class JsonParser extends JsonParserBase {
protected void parseSubscriptionStatusProperties(JsonObject json, SubscriptionStatus res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
- if (json.has("notificationType"))
- res.setNotificationTypeElement(parseEnumeration(json.get("notificationType").getAsString(), SubscriptionStatus.SubscriptionNotificationType.NULL, new SubscriptionStatus.SubscriptionNotificationTypeEnumFactory()));
- if (json.has("_notificationType"))
- parseElementProperties(getJObject(json, "_notificationType"), res.getNotificationTypeElement());
+ if (json.has("type"))
+ res.setTypeElement(parseEnumeration(json.get("type").getAsString(), SubscriptionStatus.SubscriptionNotificationType.NULL, new SubscriptionStatus.SubscriptionNotificationTypeEnumFactory()));
+ if (json.has("_type"))
+ parseElementProperties(getJObject(json, "_type"), res.getTypeElement());
if (json.has("eventsSinceSubscriptionStart"))
res.setEventsSinceSubscriptionStartElement(parseInteger64(json.get("eventsSinceSubscriptionStart").getAsLong()));
if (json.has("_eventsSinceSubscriptionStart"))
@@ -26415,7 +26846,15 @@ public class JsonParser extends JsonParserBase {
if (json.has("_status"))
parseElementProperties(getJObject(json, "_status"), res.getStatusElement());
if (json.has("topic"))
- res.setTopic(parseReference(getJObject(json, "topic")));
+ res.setTopicElement(parseCanonical(json.get("topic").getAsString()));
+ if (json.has("_topic"))
+ parseElementProperties(getJObject(json, "_topic"), res.getTopicElement());
+ if (json.has("error")) {
+ JsonArray array = json.getAsJsonArray("error");
+ for (int i = 0; i < array.size(); i++) {
+ res.getError().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
+ }
+ };
}
protected SubscriptionTopic parseSubscriptionTopic(JsonObject json) throws IOException, FHIRFormatError {
@@ -26444,42 +26883,23 @@ public class JsonParser extends JsonParserBase {
res.setTitleElement(parseString(json.get("title").getAsString()));
if (json.has("_title"))
parseElementProperties(getJObject(json, "_title"), res.getTitleElement());
- if (json.has("derivedFromCanonical")) {
- JsonArray array = json.getAsJsonArray("derivedFromCanonical");
+ if (json.has("derivedFrom")) {
+ JsonArray array = json.getAsJsonArray("derivedFrom");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
- res.getDerivedFromCanonical().add(new CanonicalType());
+ res.getDerivedFrom().add(new CanonicalType());
} else {;
- res.getDerivedFromCanonical().add(parseCanonical(array.get(i).getAsString()));
+ res.getDerivedFrom().add(parseCanonical(array.get(i).getAsString()));
}
}
};
- if (json.has("_derivedFromCanonical")) {
- JsonArray array = json.getAsJsonArray("_derivedFromCanonical");
+ if (json.has("_derivedFrom")) {
+ JsonArray array = json.getAsJsonArray("_derivedFrom");
for (int i = 0; i < array.size(); i++) {
- if (i == res.getDerivedFromCanonical().size())
- res.getDerivedFromCanonical().add(parseCanonical(null));
+ if (i == res.getDerivedFrom().size())
+ res.getDerivedFrom().add(parseCanonical(null));
if (array.get(i) instanceof JsonObject)
- parseElementProperties(array.get(i).getAsJsonObject(), res.getDerivedFromCanonical().get(i));
- }
- };
- if (json.has("derivedFromUri")) {
- JsonArray array = json.getAsJsonArray("derivedFromUri");
- for (int i = 0; i < array.size(); i++) {
- if (array.get(i).isJsonNull()) {
- res.getDerivedFromUri().add(new UriType());
- } else {;
- res.getDerivedFromUri().add(parseUri(array.get(i).getAsString()));
- }
- }
- };
- if (json.has("_derivedFromUri")) {
- JsonArray array = json.getAsJsonArray("_derivedFromUri");
- for (int i = 0; i < array.size(); i++) {
- if (i == res.getDerivedFromUri().size())
- res.getDerivedFromUri().add(parseUri(null));
- if (array.get(i) instanceof JsonObject)
- parseElementProperties(array.get(i).getAsJsonObject(), res.getDerivedFromUri().get(i));
+ parseElementProperties(array.get(i).getAsJsonObject(), res.getDerivedFrom().get(i));
}
};
if (json.has("status"))
@@ -26773,6 +27193,12 @@ public class JsonParser extends JsonParserBase {
res.setStatus(parseCodeableConcept(getJObject(json, "status")));
if (json.has("category"))
res.setCategory(parseCodeableConcept(getJObject(json, "category")));
+ if (json.has("classification")) {
+ JsonArray array = json.getAsJsonArray("classification");
+ for (int i = 0; i < array.size(); i++) {
+ res.getClassification().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
+ }
+ };
if (json.has("domain"))
res.setDomain(parseCodeableConcept(getJObject(json, "domain")));
if (json.has("description"))
@@ -26900,9 +27326,8 @@ public class JsonParser extends JsonParserBase {
res.setParametersElement(parseString(json.get("parameters").getAsString()));
if (json.has("_parameters"))
parseElementProperties(getJObject(json, "_parameters"), res.getParametersElement());
- DataType definingSubstance = parseType("definingSubstance", json);
- if (definingSubstance != null)
- res.setDefiningSubstance(definingSubstance);
+ if (json.has("definingSubstance"))
+ res.setDefiningSubstance(parseCodeableReference(getJObject(json, "definingSubstance")));
DataType amount = parseType("amount", json);
if (amount != null)
res.setAmount(amount);
@@ -27016,8 +27441,8 @@ public class JsonParser extends JsonParserBase {
parseElementProperties(getJObject(json, "_representation"), res.getRepresentationElement());
if (json.has("format"))
res.setFormat(parseCodeableConcept(getJObject(json, "format")));
- if (json.has("attachment"))
- res.setAttachment(parseAttachment(getJObject(json, "attachment")));
+ if (json.has("document"))
+ res.setDocument(parseReference(getJObject(json, "document")));
}
protected SubstanceDefinition.SubstanceDefinitionCodeComponent parseSubstanceDefinitionCodeComponent(JsonObject json) throws IOException, FHIRFormatError {
@@ -27349,7 +27774,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_isDefining"))
parseElementProperties(getJObject(json, "_isDefining"), res.getIsDefiningElement());
if (json.has("amount"))
- res.setAmount(parseSubstanceAmount(getJObject(json, "amount")));
+ res.setAmount(parseQuantity(getJObject(json, "amount")));
}
protected SubstancePolymer.SubstancePolymerRepeatComponent parseSubstancePolymerRepeatComponent(JsonObject json) throws IOException, FHIRFormatError {
@@ -27360,10 +27785,6 @@ public class JsonParser extends JsonParserBase {
protected void parseSubstancePolymerRepeatComponentProperties(JsonObject json, SubstancePolymer.SubstancePolymerRepeatComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
- if (json.has("numberOfUnits"))
- res.setNumberOfUnitsElement(parseInteger(json.get("numberOfUnits").getAsLong()));
- if (json.has("_numberOfUnits"))
- parseElementProperties(getJObject(json, "_numberOfUnits"), res.getNumberOfUnitsElement());
if (json.has("averageMolecularFormula"))
res.setAverageMolecularFormulaElement(parseString(json.get("averageMolecularFormula").getAsString()));
if (json.has("_averageMolecularFormula"))
@@ -27393,7 +27814,9 @@ public class JsonParser extends JsonParserBase {
if (json.has("orientation"))
res.setOrientation(parseCodeableConcept(getJObject(json, "orientation")));
if (json.has("amount"))
- res.setAmount(parseSubstanceAmount(getJObject(json, "amount")));
+ res.setAmountElement(parseInteger(json.get("amount").getAsLong()));
+ if (json.has("_amount"))
+ parseElementProperties(getJObject(json, "_amount"), res.getAmountElement());
if (json.has("degreeOfPolymerisation")) {
JsonArray array = json.getAsJsonArray("degreeOfPolymerisation");
for (int i = 0; i < array.size(); i++) {
@@ -27416,10 +27839,20 @@ public class JsonParser extends JsonParserBase {
protected void parseSubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponentProperties(JsonObject json, SubstancePolymer.SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
- if (json.has("degree"))
- res.setDegree(parseCodeableConcept(getJObject(json, "degree")));
- if (json.has("amount"))
- res.setAmount(parseSubstanceAmount(getJObject(json, "amount")));
+ if (json.has("type"))
+ res.setType(parseCodeableConcept(getJObject(json, "type")));
+ if (json.has("average"))
+ res.setAverageElement(parseInteger(json.get("average").getAsLong()));
+ if (json.has("_average"))
+ parseElementProperties(getJObject(json, "_average"), res.getAverageElement());
+ if (json.has("low"))
+ res.setLowElement(parseInteger(json.get("low").getAsLong()));
+ if (json.has("_low"))
+ parseElementProperties(getJObject(json, "_low"), res.getLowElement());
+ if (json.has("high"))
+ res.setHighElement(parseInteger(json.get("high").getAsLong()));
+ if (json.has("_high"))
+ parseElementProperties(getJObject(json, "_high"), res.getHighElement());
}
protected SubstancePolymer.SubstancePolymerRepeatRepeatUnitStructuralRepresentationComponent parseSubstancePolymerRepeatRepeatUnitStructuralRepresentationComponent(JsonObject json) throws IOException, FHIRFormatError {
@@ -27543,12 +27976,6 @@ public class JsonParser extends JsonParserBase {
res.getGeneElement().add(parseSubstanceReferenceInformationGeneElementComponent(array.get(i).getAsJsonObject()));
}
};
- if (json.has("classification")) {
- JsonArray array = json.getAsJsonArray("classification");
- for (int i = 0; i < array.size(); i++) {
- res.getClassification().add(parseSubstanceReferenceInformationClassificationComponent(array.get(i).getAsJsonObject()));
- }
- };
if (json.has("target")) {
JsonArray array = json.getAsJsonArray("target");
for (int i = 0; i < array.size(); i++) {
@@ -27597,32 +28024,6 @@ public class JsonParser extends JsonParserBase {
};
}
- protected SubstanceReferenceInformation.SubstanceReferenceInformationClassificationComponent parseSubstanceReferenceInformationClassificationComponent(JsonObject json) throws IOException, FHIRFormatError {
- SubstanceReferenceInformation.SubstanceReferenceInformationClassificationComponent res = new SubstanceReferenceInformation.SubstanceReferenceInformationClassificationComponent();
- parseSubstanceReferenceInformationClassificationComponentProperties(json, res);
- return res;
- }
-
- protected void parseSubstanceReferenceInformationClassificationComponentProperties(JsonObject json, SubstanceReferenceInformation.SubstanceReferenceInformationClassificationComponent res) throws IOException, FHIRFormatError {
- parseBackboneElementProperties(json, res);
- if (json.has("domain"))
- res.setDomain(parseCodeableConcept(getJObject(json, "domain")));
- if (json.has("classification"))
- res.setClassification(parseCodeableConcept(getJObject(json, "classification")));
- if (json.has("subtype")) {
- JsonArray array = json.getAsJsonArray("subtype");
- for (int i = 0; i < array.size(); i++) {
- res.getSubtype().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
- }
- };
- if (json.has("source")) {
- JsonArray array = json.getAsJsonArray("source");
- for (int i = 0; i < array.size(); i++) {
- res.getSource().add(parseReference(array.get(i).getAsJsonObject()));
- }
- };
- }
-
protected SubstanceReferenceInformation.SubstanceReferenceInformationTargetComponent parseSubstanceReferenceInformationTargetComponent(JsonObject json) throws IOException, FHIRFormatError {
SubstanceReferenceInformation.SubstanceReferenceInformationTargetComponent res = new SubstanceReferenceInformation.SubstanceReferenceInformationTargetComponent();
parseSubstanceReferenceInformationTargetComponentProperties(json, res);
@@ -30174,8 +30575,8 @@ public class JsonParser extends JsonParserBase {
return parseEventDefinition(json);
} else if (t.equals("Evidence")) {
return parseEvidence(json);
- } else if (t.equals("EvidenceFocus")) {
- return parseEvidenceFocus(json);
+ } else if (t.equals("EvidenceReport")) {
+ return parseEvidenceReport(json);
} else if (t.equals("EvidenceVariable")) {
return parseEvidenceVariable(json);
} else if (t.equals("ExampleScenario")) {
@@ -30562,8 +30963,6 @@ public class JsonParser extends JsonParserBase {
return parseSignature(getJObject(json, prefix+"Signature"));
} else if (json.has(prefix+"Statistic")) {
return parseStatistic(getJObject(json, prefix+"Statistic"));
- } else if (json.has(prefix+"SubstanceAmount")) {
- return parseSubstanceAmount(getJObject(json, prefix+"SubstanceAmount"));
} else if (json.has(prefix+"Timing")) {
return parseTiming(getJObject(json, prefix+"Timing"));
} else if (json.has(prefix+"TriggerDefinition")) {
@@ -30659,8 +31058,6 @@ public class JsonParser extends JsonParserBase {
return parseSignature(json);
} else if (type.equals("Statistic")) {
return parseStatistic(json);
- } else if (type.equals("SubstanceAmount")) {
- return parseSubstanceAmount(json);
} else if (type.equals("Timing")) {
return parseTiming(json);
} else if (type.equals("TriggerDefinition")) {
@@ -30788,9 +31185,6 @@ public class JsonParser extends JsonParserBase {
if (json.has(prefix+"Statistic")) {
return true;
};
- if (json.has(prefix+"SubstanceAmount")) {
- return true;
- };
if (json.has(prefix+"Timing")) {
return true;
};
@@ -30962,7 +31356,7 @@ public class JsonParser extends JsonParserBase {
if (json.has(prefix+"Evidence")) {
return true;
};
- if (json.has(prefix+"EvidenceFocus")) {
+ if (json.has(prefix+"EvidenceReport")) {
return true;
};
if (json.has(prefix+"EvidenceVariable")) {
@@ -33171,14 +33565,11 @@ public class JsonParser extends JsonParserBase {
protected void composeProductShelfLifeProperties(ProductShelfLife element) throws IOException {
composeBackboneTypeProperties(element);
- if (element.hasIdentifier()) {
- composeIdentifier("identifier", element.getIdentifier());
- }
if (element.hasType()) {
composeCodeableConcept("type", element.getType());
}
if (element.hasPeriod()) {
- composeQuantity("period", element.getPeriod());
+ composeType("period", element.getPeriod());
}
if (element.hasSpecialPrecautionsForStorage()) {
openArray("specialPrecautionsForStorage");
@@ -33427,6 +33818,10 @@ public class JsonParser extends JsonParserBase {
if (element.hasQuantity()) {
composeQuantity("quantity", element.getQuantity());
}
+ if (element.hasNumberOfEventsElement()) {
+ composeIntegerCore("numberOfEvents", element.getNumberOfEventsElement(), false);
+ composeIntegerExtras("numberOfEvents", element.getNumberOfEventsElement(), false);
+ }
if (element.hasSampleSize()) {
composeStatisticSampleSizeComponent("sampleSize", element.getSampleSize());
}
@@ -33436,6 +33831,12 @@ public class JsonParser extends JsonParserBase {
composeStatisticAttributeEstimateComponent(null, e);
closeArray();
};
+ if (element.hasModelCharacteristic()) {
+ openArray("modelCharacteristic");
+ for (Statistic.StatisticModelCharacteristicComponent e : element.getModelCharacteristic())
+ composeStatisticModelCharacteristicComponent(null, e);
+ closeArray();
+ };
}
protected void composeStatisticSampleSizeComponent(String name, Statistic.StatisticSampleSizeComponent element) throws IOException {
@@ -33470,10 +33871,6 @@ public class JsonParser extends JsonParserBase {
composeIntegerCore("knownDataCount", element.getKnownDataCountElement(), false);
composeIntegerExtras("knownDataCount", element.getKnownDataCountElement(), false);
}
- if (element.hasNumeratorCountElement()) {
- composeIntegerCore("numeratorCount", element.getNumeratorCountElement(), false);
- composeIntegerExtras("numeratorCount", element.getNumeratorCountElement(), false);
- }
}
protected void composeStatisticAttributeEstimateComponent(String name, Statistic.StatisticAttributeEstimateComponent element) throws IOException {
@@ -33509,23 +33906,23 @@ public class JsonParser extends JsonParserBase {
if (element.hasRange()) {
composeRange("range", element.getRange());
}
- if (element.hasEstimateQualifier()) {
- openArray("estimateQualifier");
- for (Statistic.StatisticAttributeEstimateEstimateQualifierComponent e : element.getEstimateQualifier())
- composeStatisticAttributeEstimateEstimateQualifierComponent(null, e);
+ if (element.hasAttributeEstimate()) {
+ openArray("attributeEstimate");
+ for (Statistic.StatisticAttributeEstimateAttributeEstimateComponent e : element.getAttributeEstimate())
+ composeStatisticAttributeEstimateAttributeEstimateComponent(null, e);
closeArray();
};
}
- protected void composeStatisticAttributeEstimateEstimateQualifierComponent(String name, Statistic.StatisticAttributeEstimateEstimateQualifierComponent element) throws IOException {
+ protected void composeStatisticAttributeEstimateAttributeEstimateComponent(String name, Statistic.StatisticAttributeEstimateAttributeEstimateComponent element) throws IOException {
if (element != null) {
open(name);
- composeStatisticAttributeEstimateEstimateQualifierComponentProperties(element);
+ composeStatisticAttributeEstimateAttributeEstimateComponentProperties(element);
close();
}
}
- protected void composeStatisticAttributeEstimateEstimateQualifierComponentProperties(Statistic.StatisticAttributeEstimateEstimateQualifierComponent element) throws IOException {
+ protected void composeStatisticAttributeEstimateAttributeEstimateComponentProperties(Statistic.StatisticAttributeEstimateAttributeEstimateComponent element) throws IOException {
composeElementProperties(element);
if (element.hasDescriptionElement()) {
composeStringCore("description", element.getDescriptionElement(), false);
@@ -33552,47 +33949,65 @@ public class JsonParser extends JsonParserBase {
}
}
- protected void composeSubstanceAmount(String name, SubstanceAmount element) throws IOException {
+ protected void composeStatisticModelCharacteristicComponent(String name, Statistic.StatisticModelCharacteristicComponent element) throws IOException {
if (element != null) {
open(name);
- composeSubstanceAmountProperties(element);
+ composeStatisticModelCharacteristicComponentProperties(element);
close();
}
}
- protected void composeSubstanceAmountProperties(SubstanceAmount element) throws IOException {
- composeBackboneTypeProperties(element);
- if (element.hasAmount()) {
- composeType("amount", element.getAmount());
- }
- if (element.hasAmountType()) {
- composeCodeableConcept("amountType", element.getAmountType());
- }
- if (element.hasAmountTextElement()) {
- composeStringCore("amountText", element.getAmountTextElement(), false);
- composeStringExtras("amountText", element.getAmountTextElement(), false);
- }
- if (element.hasReferenceRange()) {
- composeSubstanceAmountReferenceRangeComponent("referenceRange", element.getReferenceRange());
- }
- }
-
- protected void composeSubstanceAmountReferenceRangeComponent(String name, SubstanceAmount.SubstanceAmountReferenceRangeComponent element) throws IOException {
- if (element != null) {
- open(name);
- composeSubstanceAmountReferenceRangeComponentProperties(element);
- close();
- }
- }
-
- protected void composeSubstanceAmountReferenceRangeComponentProperties(SubstanceAmount.SubstanceAmountReferenceRangeComponent element) throws IOException {
+ protected void composeStatisticModelCharacteristicComponentProperties(Statistic.StatisticModelCharacteristicComponent element) throws IOException {
composeElementProperties(element);
- if (element.hasLowLimit()) {
- composeQuantity("lowLimit", element.getLowLimit());
+ if (element.hasCode()) {
+ composeCodeableConcept("code", element.getCode());
}
- if (element.hasHighLimit()) {
- composeQuantity("highLimit", element.getHighLimit());
+ if (element.hasValue()) {
+ composeType("value", element.getValue());
}
+ if (element.hasVariable()) {
+ openArray("variable");
+ for (Statistic.StatisticModelCharacteristicVariableComponent e : element.getVariable())
+ composeStatisticModelCharacteristicVariableComponent(null, e);
+ closeArray();
+ };
+ }
+
+ protected void composeStatisticModelCharacteristicVariableComponent(String name, Statistic.StatisticModelCharacteristicVariableComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeStatisticModelCharacteristicVariableComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeStatisticModelCharacteristicVariableComponentProperties(Statistic.StatisticModelCharacteristicVariableComponent element) throws IOException {
+ composeElementProperties(element);
+ if (element.hasVariableDefinition()) {
+ composeReference("variableDefinition", element.getVariableDefinition());
+ }
+ if (element.hasHandlingElement()) {
+ composeEnumerationCore("handling", element.getHandlingElement(), new Enumerations.EvidenceVariableHandlingEnumFactory(), false);
+ composeEnumerationExtras("handling", element.getHandlingElement(), new Enumerations.EvidenceVariableHandlingEnumFactory(), false);
+ }
+ if (element.hasValueCategory()) {
+ openArray("valueCategory");
+ for (CodeableConcept e : element.getValueCategory())
+ composeCodeableConcept(null, e);
+ closeArray();
+ };
+ if (element.hasValueQuantity()) {
+ openArray("valueQuantity");
+ for (Quantity e : element.getValueQuantity())
+ composeQuantity(null, e);
+ closeArray();
+ };
+ if (element.hasValueRange()) {
+ openArray("valueRange");
+ for (Range e : element.getValueRange())
+ composeRange(null, e);
+ closeArray();
+ };
}
protected void composeTiming(String name, Timing element) throws IOException {
@@ -37399,10 +37814,6 @@ public class JsonParser extends JsonParserBase {
composeUriCore("url", element.getUrlElement(), false);
composeUriExtras("url", element.getUrlElement(), false);
}
- if (element.hasVersionElement()) {
- composeStringCore("version", element.getVersionElement(), false);
- composeStringExtras("version", element.getVersionElement(), false);
- }
if (element.hasStatusElement()) {
composeEnumerationCore("status", element.getStatusElement(), new Enumerations.PublicationStatusEnumFactory(), false);
composeEnumerationExtras("status", element.getStatusElement(), new Enumerations.PublicationStatusEnumFactory(), false);
@@ -37425,6 +37836,12 @@ public class JsonParser extends JsonParserBase {
composeIdentifier(null, e);
closeArray();
};
+ if (element.hasSummary()) {
+ openArray("summary");
+ for (Citation.CitationSummaryComponent e : element.getSummary())
+ composeCitationSummaryComponent(null, e);
+ closeArray();
+ };
if (element.hasDateCitedElement()) {
composeDateTimeCore("dateCited", element.getDateCitedElement(), false);
composeDateTimeExtras("dateCited", element.getDateCitedElement(), false);
@@ -37438,6 +37855,9 @@ public class JsonParser extends JsonParserBase {
if (element.hasJournal()) {
composeCitationJournalComponent("journal", element.getJournal());
}
+ if (element.hasPublicationInfo()) {
+ composeCitationPublicationInfoComponent("publicationInfo", element.getPublicationInfo());
+ }
if (element.hasArticleTitleElement()) {
composeMarkdownCore("articleTitle", element.getArticleTitleElement(), false);
composeMarkdownExtras("articleTitle", element.getArticleTitleElement(), false);
@@ -37471,17 +37891,8 @@ public class JsonParser extends JsonParserBase {
composeCitationAlternativeAbstractComponent(null, e);
closeArray();
};
- if (element.hasAuthorList()) {
- composeCitationAuthorListComponent("authorList", element.getAuthorList());
- }
- if (element.hasAuthorString()) {
- openArray("authorString");
- for (Citation.CitationAuthorStringComponent e : element.getAuthorString())
- composeCitationAuthorStringComponent(null, e);
- closeArray();
- };
- if (element.hasContributorList()) {
- composeCitationContributorListComponent("contributorList", element.getContributorList());
+ if (element.hasContributorship()) {
+ composeCitationContributorshipComponent("contributorship", element.getContributorship());
}
if (element.hasArticleLanguage()) {
composeCodeableConcept("articleLanguage", element.getArticleLanguage());
@@ -37498,6 +37909,12 @@ public class JsonParser extends JsonParserBase {
composeCodeableConcept(null, e);
closeArray();
};
+ if (element.hasKeywordList()) {
+ openArray("keywordList");
+ for (Citation.CitationKeywordListComponent e : element.getKeywordList())
+ composeCitationKeywordListComponent(null, e);
+ closeArray();
+ };
if (element.hasRelatedArtifact()) {
openArray("relatedArtifact");
for (RelatedArtifact e : element.getRelatedArtifact())
@@ -37515,6 +37932,25 @@ public class JsonParser extends JsonParserBase {
}
}
+ protected void composeCitationSummaryComponent(String name, Citation.CitationSummaryComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeCitationSummaryComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeCitationSummaryComponentProperties(Citation.CitationSummaryComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasStyle()) {
+ composeCodeableConcept("style", element.getStyle());
+ }
+ if (element.hasTextElement()) {
+ composeMarkdownCore("text", element.getTextElement(), false);
+ composeMarkdownExtras("text", element.getTextElement(), false);
+ }
+ }
+
protected void composeCitationVariantCitationComponent(String name, Citation.CitationVariantCitationComponent element) throws IOException {
if (element != null) {
open(name);
@@ -37587,9 +38023,107 @@ public class JsonParser extends JsonParserBase {
composeStringCore("issue", element.getIssueElement(), false);
composeStringExtras("issue", element.getIssueElement(), false);
}
- if (element.hasPublicationDateElement()) {
- composeStringCore("publicationDate", element.getPublicationDateElement(), false);
- composeStringExtras("publicationDate", element.getPublicationDateElement(), false);
+ if (element.hasPublicationDate()) {
+ composeCitationJournalJournalIssuePublicationDateComponent("publicationDate", element.getPublicationDate());
+ }
+ }
+
+ protected void composeCitationJournalJournalIssuePublicationDateComponent(String name, Citation.CitationJournalJournalIssuePublicationDateComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeCitationJournalJournalIssuePublicationDateComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeCitationJournalJournalIssuePublicationDateComponentProperties(Citation.CitationJournalJournalIssuePublicationDateComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasDateElement()) {
+ composeDateCore("date", element.getDateElement(), false);
+ composeDateExtras("date", element.getDateElement(), false);
+ }
+ if (element.hasYearElement()) {
+ composeStringCore("year", element.getYearElement(), false);
+ composeStringExtras("year", element.getYearElement(), false);
+ }
+ if (element.hasMonthElement()) {
+ composeStringCore("month", element.getMonthElement(), false);
+ composeStringExtras("month", element.getMonthElement(), false);
+ }
+ if (element.hasDayElement()) {
+ composeStringCore("day", element.getDayElement(), false);
+ composeStringExtras("day", element.getDayElement(), false);
+ }
+ if (element.hasSeasonElement()) {
+ composeStringCore("season", element.getSeasonElement(), false);
+ composeStringExtras("season", element.getSeasonElement(), false);
+ }
+ if (element.hasTextElement()) {
+ composeStringCore("text", element.getTextElement(), false);
+ composeStringExtras("text", element.getTextElement(), false);
+ }
+ }
+
+ protected void composeCitationPublicationInfoComponent(String name, Citation.CitationPublicationInfoComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeCitationPublicationInfoComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeCitationPublicationInfoComponentProperties(Citation.CitationPublicationInfoComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasPublishedIn()) {
+ composeCitationPublicationInfoPublishedInComponent("publishedIn", element.getPublishedIn());
+ }
+ if (element.hasEntryDateElement()) {
+ composeDateTimeCore("entryDate", element.getEntryDateElement(), false);
+ composeDateTimeExtras("entryDate", element.getEntryDateElement(), false);
+ }
+ if (element.hasRevisionDateElement()) {
+ composeDateTimeCore("revisionDate", element.getRevisionDateElement(), false);
+ composeDateTimeExtras("revisionDate", element.getRevisionDateElement(), false);
+ }
+ if (element.hasPageCountElement()) {
+ composeStringCore("pageCount", element.getPageCountElement(), false);
+ composeStringExtras("pageCount", element.getPageCountElement(), false);
+ }
+ }
+
+ protected void composeCitationPublicationInfoPublishedInComponent(String name, Citation.CitationPublicationInfoPublishedInComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeCitationPublicationInfoPublishedInComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeCitationPublicationInfoPublishedInComponentProperties(Citation.CitationPublicationInfoPublishedInComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasType()) {
+ composeCodeableConcept("type", element.getType());
+ }
+ if (element.hasIdentifier()) {
+ openArray("identifier");
+ for (Identifier e : element.getIdentifier())
+ composeIdentifier(null, e);
+ closeArray();
+ };
+ if (element.hasNameElement()) {
+ composeStringCore("name", element.getNameElement(), false);
+ composeStringExtras("name", element.getNameElement(), false);
+ }
+ if (element.hasPublisher()) {
+ composeReference("publisher", element.getPublisher());
+ }
+ if (element.hasPublisherLocationElement()) {
+ composeStringCore("publisherLocation", element.getPublisherLocationElement(), false);
+ composeStringExtras("publisherLocation", element.getPublisherLocationElement(), false);
+ }
+ if (element.hasStartDateElement()) {
+ composeDateCore("startDate", element.getStartDateElement(), false);
+ composeDateExtras("startDate", element.getStartDateElement(), false);
}
}
@@ -37684,49 +38218,46 @@ public class JsonParser extends JsonParserBase {
}
}
- protected void composeCitationAuthorListComponent(String name, Citation.CitationAuthorListComponent element) throws IOException {
+ protected void composeCitationContributorshipComponent(String name, Citation.CitationContributorshipComponent element) throws IOException {
if (element != null) {
open(name);
- composeCitationAuthorListComponentProperties(element);
+ composeCitationContributorshipComponentProperties(element);
close();
}
}
- protected void composeCitationAuthorListComponentProperties(Citation.CitationAuthorListComponent element) throws IOException {
+ protected void composeCitationContributorshipComponentProperties(Citation.CitationContributorshipComponent element) throws IOException {
composeBackboneElementProperties(element);
if (element.hasCompleteElement()) {
composeBooleanCore("complete", element.getCompleteElement(), false);
composeBooleanExtras("complete", element.getCompleteElement(), false);
}
- if (element.hasAuthor()) {
- openArray("author");
- for (Citation.CitationAuthorListAuthorComponent e : element.getAuthor())
- composeCitationAuthorListAuthorComponent(null, e);
+ if (element.hasEntry()) {
+ openArray("entry");
+ for (Citation.CitationContributorshipEntryComponent e : element.getEntry())
+ composeCitationContributorshipEntryComponent(null, e);
+ closeArray();
+ };
+ if (element.hasSummary()) {
+ openArray("summary");
+ for (Citation.CitationContributorshipSummaryComponent e : element.getSummary())
+ composeCitationContributorshipSummaryComponent(null, e);
closeArray();
};
}
- protected void composeCitationAuthorListAuthorComponent(String name, Citation.CitationAuthorListAuthorComponent element) throws IOException {
+ protected void composeCitationContributorshipEntryComponent(String name, Citation.CitationContributorshipEntryComponent element) throws IOException {
if (element != null) {
open(name);
- composeCitationAuthorListAuthorComponentProperties(element);
+ composeCitationContributorshipEntryComponentProperties(element);
close();
}
}
- protected void composeCitationAuthorListAuthorComponentProperties(Citation.CitationAuthorListAuthorComponent element) throws IOException {
+ protected void composeCitationContributorshipEntryComponentProperties(Citation.CitationContributorshipEntryComponent element) throws IOException {
composeBackboneElementProperties(element);
- if (element.hasLastNameElement()) {
- composeStringCore("lastName", element.getLastNameElement(), false);
- composeStringExtras("lastName", element.getLastNameElement(), false);
- }
- if (element.hasForeNameElement()) {
- composeStringCore("foreName", element.getForeNameElement(), false);
- composeStringExtras("foreName", element.getForeNameElement(), false);
- }
- if (element.hasSuffixElement()) {
- composeStringCore("suffix", element.getSuffixElement(), false);
- composeStringExtras("suffix", element.getSuffixElement(), false);
+ if (element.hasName()) {
+ composeHumanName("name", element.getName());
}
if (element.hasInitialsElement()) {
composeStringCore("initials", element.getInitialsElement(), false);
@@ -37744,21 +38275,15 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasAffiliationInfo()) {
openArray("affiliationInfo");
- for (Citation.CitationAuthorListAuthorAffiliationInfoComponent e : element.getAffiliationInfo())
- composeCitationAuthorListAuthorAffiliationInfoComponent(null, e);
+ for (Citation.CitationContributorshipEntryAffiliationInfoComponent e : element.getAffiliationInfo())
+ composeCitationContributorshipEntryAffiliationInfoComponent(null, e);
closeArray();
};
if (element.hasAddress()) {
openArray("address");
- for (StringType e : element.getAddress())
- composeStringCore(null, e, true);
- closeArray();
- if (anyHasExtras(element.getAddress())) {
- openArray("_address");
- for (StringType e : element.getAddress())
- composeStringExtras(null, e, true);
+ for (Address e : element.getAddress())
+ composeAddress(null, e);
closeArray();
- }
};
if (element.hasTelecom()) {
openArray("telecom");
@@ -37766,6 +38291,16 @@ public class JsonParser extends JsonParserBase {
composeContactPoint(null, e);
closeArray();
};
+ if (element.hasContribution()) {
+ openArray("contribution");
+ for (CodeableConcept e : element.getContribution())
+ composeCodeableConcept(null, e);
+ closeArray();
+ };
+ if (element.hasNotAnAuthorElement()) {
+ composeBooleanCore("notAnAuthor", element.getNotAnAuthorElement(), false);
+ composeBooleanExtras("notAnAuthor", element.getNotAnAuthorElement(), false);
+ }
if (element.hasCorrespondingAuthorElement()) {
composeBooleanCore("correspondingAuthor", element.getCorrespondingAuthorElement(), false);
composeBooleanExtras("correspondingAuthor", element.getCorrespondingAuthorElement(), false);
@@ -37776,15 +38311,15 @@ public class JsonParser extends JsonParserBase {
}
}
- protected void composeCitationAuthorListAuthorAffiliationInfoComponent(String name, Citation.CitationAuthorListAuthorAffiliationInfoComponent element) throws IOException {
+ protected void composeCitationContributorshipEntryAffiliationInfoComponent(String name, Citation.CitationContributorshipEntryAffiliationInfoComponent element) throws IOException {
if (element != null) {
open(name);
- composeCitationAuthorListAuthorAffiliationInfoComponentProperties(element);
+ composeCitationContributorshipEntryAffiliationInfoComponentProperties(element);
close();
}
}
- protected void composeCitationAuthorListAuthorAffiliationInfoComponentProperties(Citation.CitationAuthorListAuthorAffiliationInfoComponent element) throws IOException {
+ protected void composeCitationContributorshipEntryAffiliationInfoComponentProperties(Citation.CitationContributorshipEntryAffiliationInfoComponent element) throws IOException {
composeBackboneElementProperties(element);
if (element.hasAffiliationElement()) {
composeStringCore("affiliation", element.getAffiliationElement(), false);
@@ -37802,127 +38337,31 @@ public class JsonParser extends JsonParserBase {
};
}
- protected void composeCitationAuthorStringComponent(String name, Citation.CitationAuthorStringComponent element) throws IOException {
+ protected void composeCitationContributorshipSummaryComponent(String name, Citation.CitationContributorshipSummaryComponent element) throws IOException {
if (element != null) {
open(name);
- composeCitationAuthorStringComponentProperties(element);
+ composeCitationContributorshipSummaryComponentProperties(element);
close();
}
}
- protected void composeCitationAuthorStringComponentProperties(Citation.CitationAuthorStringComponent element) throws IOException {
+ protected void composeCitationContributorshipSummaryComponentProperties(Citation.CitationContributorshipSummaryComponent element) throws IOException {
composeBackboneElementProperties(element);
+ if (element.hasType()) {
+ composeCodeableConcept("type", element.getType());
+ }
+ if (element.hasStyle()) {
+ composeCodeableConcept("style", element.getStyle());
+ }
if (element.hasSource()) {
composeCodeableConcept("source", element.getSource());
}
if (element.hasValueElement()) {
- composeStringCore("value", element.getValueElement(), false);
- composeStringExtras("value", element.getValueElement(), false);
+ composeMarkdownCore("value", element.getValueElement(), false);
+ composeMarkdownExtras("value", element.getValueElement(), false);
}
}
- protected void composeCitationContributorListComponent(String name, Citation.CitationContributorListComponent element) throws IOException {
- if (element != null) {
- open(name);
- composeCitationContributorListComponentProperties(element);
- close();
- }
- }
-
- protected void composeCitationContributorListComponentProperties(Citation.CitationContributorListComponent element) throws IOException {
- composeBackboneElementProperties(element);
- if (element.hasCompleteElement()) {
- composeBooleanCore("complete", element.getCompleteElement(), false);
- composeBooleanExtras("complete", element.getCompleteElement(), false);
- }
- if (element.hasContributor()) {
- openArray("contributor");
- for (Citation.CitationContributorListContributorComponent e : element.getContributor())
- composeCitationContributorListContributorComponent(null, e);
- closeArray();
- };
- }
-
- protected void composeCitationContributorListContributorComponent(String name, Citation.CitationContributorListContributorComponent element) throws IOException {
- if (element != null) {
- open(name);
- composeCitationContributorListContributorComponentProperties(element);
- close();
- }
- }
-
- protected void composeCitationContributorListContributorComponentProperties(Citation.CitationContributorListContributorComponent element) throws IOException {
- composeBackboneElementProperties(element);
- if (element.hasLastNameElement()) {
- composeStringCore("lastName", element.getLastNameElement(), false);
- composeStringExtras("lastName", element.getLastNameElement(), false);
- }
- if (element.hasForeNameElement()) {
- composeStringCore("foreName", element.getForeNameElement(), false);
- composeStringExtras("foreName", element.getForeNameElement(), false);
- }
- if (element.hasSuffixElement()) {
- composeStringCore("suffix", element.getSuffixElement(), false);
- composeStringExtras("suffix", element.getSuffixElement(), false);
- }
- if (element.hasInitialsElement()) {
- composeStringCore("initials", element.getInitialsElement(), false);
- composeStringExtras("initials", element.getInitialsElement(), false);
- }
- if (element.hasCollectiveNameElement()) {
- composeStringCore("collectiveName", element.getCollectiveNameElement(), false);
- composeStringExtras("collectiveName", element.getCollectiveNameElement(), false);
- }
- if (element.hasIdentifier()) {
- openArray("identifier");
- for (Identifier e : element.getIdentifier())
- composeIdentifier(null, e);
- closeArray();
- };
- if (element.hasContribution()) {
- openArray("contribution");
- for (CodeableConcept e : element.getContribution())
- composeCodeableConcept(null, e);
- closeArray();
- };
- if (element.hasAffiliationInfo()) {
- openArray("affiliationInfo");
- for (Citation.CitationContributorListContributorAffiliationInfoComponent e : element.getAffiliationInfo())
- composeCitationContributorListContributorAffiliationInfoComponent(null, e);
- closeArray();
- };
- if (element.hasListOrderElement()) {
- composePositiveIntCore("listOrder", element.getListOrderElement(), false);
- composePositiveIntExtras("listOrder", element.getListOrderElement(), false);
- }
- }
-
- protected void composeCitationContributorListContributorAffiliationInfoComponent(String name, Citation.CitationContributorListContributorAffiliationInfoComponent element) throws IOException {
- if (element != null) {
- open(name);
- composeCitationContributorListContributorAffiliationInfoComponentProperties(element);
- close();
- }
- }
-
- protected void composeCitationContributorListContributorAffiliationInfoComponentProperties(Citation.CitationContributorListContributorAffiliationInfoComponent element) throws IOException {
- composeBackboneElementProperties(element);
- if (element.hasAffiliationElement()) {
- composeStringCore("affiliation", element.getAffiliationElement(), false);
- composeStringExtras("affiliation", element.getAffiliationElement(), false);
- }
- if (element.hasRoleElement()) {
- composeStringCore("role", element.getRoleElement(), false);
- composeStringExtras("role", element.getRoleElement(), false);
- }
- if (element.hasIdentifier()) {
- openArray("identifier");
- for (Identifier e : element.getIdentifier())
- composeIdentifier(null, e);
- closeArray();
- };
- }
-
protected void composeCitationAlternativeFormComponent(String name, Citation.CitationAlternativeFormComponent element) throws IOException {
if (element != null) {
open(name);
@@ -37945,6 +38384,9 @@ public class JsonParser extends JsonParserBase {
if (element.hasPagination()) {
composeCitationAlternativeFormPaginationComponent("pagination", element.getPagination());
}
+ if (element.hasPublicationInfo()) {
+ composeCitationAlternativeFormPublicationInfoComponent("publicationInfo", element.getPublicationInfo());
+ }
}
protected void composeCitationAlternativeFormJournalIssueComponent(String name, Citation.CitationAlternativeFormJournalIssueComponent element) throws IOException {
@@ -37968,9 +38410,44 @@ public class JsonParser extends JsonParserBase {
composeStringCore("issue", element.getIssueElement(), false);
composeStringExtras("issue", element.getIssueElement(), false);
}
- if (element.hasPublicationDateElement()) {
- composeStringCore("publicationDate", element.getPublicationDateElement(), false);
- composeStringExtras("publicationDate", element.getPublicationDateElement(), false);
+ if (element.hasPublicationDate()) {
+ composeCitationAlternativeFormJournalIssuePublicationDateComponent("publicationDate", element.getPublicationDate());
+ }
+ }
+
+ protected void composeCitationAlternativeFormJournalIssuePublicationDateComponent(String name, Citation.CitationAlternativeFormJournalIssuePublicationDateComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeCitationAlternativeFormJournalIssuePublicationDateComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeCitationAlternativeFormJournalIssuePublicationDateComponentProperties(Citation.CitationAlternativeFormJournalIssuePublicationDateComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasDateElement()) {
+ composeDateCore("date", element.getDateElement(), false);
+ composeDateExtras("date", element.getDateElement(), false);
+ }
+ if (element.hasYearElement()) {
+ composeStringCore("year", element.getYearElement(), false);
+ composeStringExtras("year", element.getYearElement(), false);
+ }
+ if (element.hasMonthElement()) {
+ composeStringCore("month", element.getMonthElement(), false);
+ composeStringExtras("month", element.getMonthElement(), false);
+ }
+ if (element.hasDayElement()) {
+ composeStringCore("day", element.getDayElement(), false);
+ composeStringExtras("day", element.getDayElement(), false);
+ }
+ if (element.hasSeasonElement()) {
+ composeStringCore("season", element.getSeasonElement(), false);
+ composeStringExtras("season", element.getSeasonElement(), false);
+ }
+ if (element.hasTextElement()) {
+ composeStringCore("text", element.getTextElement(), false);
+ composeStringExtras("text", element.getTextElement(), false);
}
}
@@ -37998,6 +38475,105 @@ public class JsonParser extends JsonParserBase {
}
}
+ protected void composeCitationAlternativeFormPublicationInfoComponent(String name, Citation.CitationAlternativeFormPublicationInfoComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeCitationAlternativeFormPublicationInfoComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeCitationAlternativeFormPublicationInfoComponentProperties(Citation.CitationAlternativeFormPublicationInfoComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasPublishedIn()) {
+ composeCitationAlternativeFormPublicationInfoPublishedInComponent("publishedIn", element.getPublishedIn());
+ }
+ if (element.hasEntryDateElement()) {
+ composeDateTimeCore("entryDate", element.getEntryDateElement(), false);
+ composeDateTimeExtras("entryDate", element.getEntryDateElement(), false);
+ }
+ if (element.hasRevisionDateElement()) {
+ composeDateTimeCore("revisionDate", element.getRevisionDateElement(), false);
+ composeDateTimeExtras("revisionDate", element.getRevisionDateElement(), false);
+ }
+ if (element.hasPageCountElement()) {
+ composeStringCore("pageCount", element.getPageCountElement(), false);
+ composeStringExtras("pageCount", element.getPageCountElement(), false);
+ }
+ }
+
+ protected void composeCitationAlternativeFormPublicationInfoPublishedInComponent(String name, Citation.CitationAlternativeFormPublicationInfoPublishedInComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeCitationAlternativeFormPublicationInfoPublishedInComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeCitationAlternativeFormPublicationInfoPublishedInComponentProperties(Citation.CitationAlternativeFormPublicationInfoPublishedInComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasType()) {
+ composeCodeableConcept("type", element.getType());
+ }
+ if (element.hasNameElement()) {
+ composeStringCore("name", element.getNameElement(), false);
+ composeStringExtras("name", element.getNameElement(), false);
+ }
+ if (element.hasPublisher()) {
+ composeReference("publisher", element.getPublisher());
+ }
+ if (element.hasPublisherLocationElement()) {
+ composeStringCore("publisherLocation", element.getPublisherLocationElement(), false);
+ composeStringExtras("publisherLocation", element.getPublisherLocationElement(), false);
+ }
+ if (element.hasStartDateElement()) {
+ composeDateCore("startDate", element.getStartDateElement(), false);
+ composeDateExtras("startDate", element.getStartDateElement(), false);
+ }
+ }
+
+ protected void composeCitationKeywordListComponent(String name, Citation.CitationKeywordListComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeCitationKeywordListComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeCitationKeywordListComponentProperties(Citation.CitationKeywordListComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasOwnerElement()) {
+ composeStringCore("owner", element.getOwnerElement(), false);
+ composeStringExtras("owner", element.getOwnerElement(), false);
+ }
+ if (element.hasKeyword()) {
+ openArray("keyword");
+ for (Citation.CitationKeywordListKeywordComponent e : element.getKeyword())
+ composeCitationKeywordListKeywordComponent(null, e);
+ closeArray();
+ };
+ }
+
+ protected void composeCitationKeywordListKeywordComponent(String name, Citation.CitationKeywordListKeywordComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeCitationKeywordListKeywordComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeCitationKeywordListKeywordComponentProperties(Citation.CitationKeywordListKeywordComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasMajorTopicElement()) {
+ composeBooleanCore("majorTopic", element.getMajorTopicElement(), false);
+ composeBooleanExtras("majorTopic", element.getMajorTopicElement(), false);
+ }
+ if (element.hasValueElement()) {
+ composeStringCore("value", element.getValueElement(), false);
+ composeStringExtras("value", element.getValueElement(), false);
+ }
+ }
+
protected void composeCitationMedlinePubMedComponent(String name, Citation.CitationMedlinePubMedComponent element) throws IOException {
if (element != null) {
open(name);
@@ -40359,8 +40935,8 @@ public class JsonParser extends JsonParserBase {
composeStringExtras("title", element.getTitleElement(), false);
}
if (element.hasConfidentialityElement()) {
- composeEnumerationCore("confidentiality", element.getConfidentialityElement(), new Composition.V3ConfidentialityClassificationEnumFactory(), false);
- composeEnumerationExtras("confidentiality", element.getConfidentialityElement(), new Composition.V3ConfidentialityClassificationEnumFactory(), false);
+ composeCodeCore("confidentiality", element.getConfidentialityElement(), false);
+ composeCodeExtras("confidentiality", element.getConfidentialityElement(), false);
}
if (element.hasAttester()) {
openArray("attester");
@@ -41176,9 +41752,15 @@ public class JsonParser extends JsonParserBase {
composeReference(null, e);
closeArray();
};
- if (element.hasOrganization()) {
- openArray("organization");
- for (Reference e : element.getOrganization())
+ if (element.hasManager()) {
+ openArray("manager");
+ for (Reference e : element.getManager())
+ composeReference(null, e);
+ closeArray();
+ };
+ if (element.hasController()) {
+ openArray("controller");
+ for (Reference e : element.getController())
composeReference(null, e);
closeArray();
};
@@ -43966,15 +44548,18 @@ public class JsonParser extends JsonParserBase {
protected void composeDocumentReferenceProperties(DocumentReference element) throws IOException {
composeDomainResourceProperties(element);
- if (element.hasMasterIdentifier()) {
- composeIdentifier("masterIdentifier", element.getMasterIdentifier());
- }
if (element.hasIdentifier()) {
openArray("identifier");
for (Identifier e : element.getIdentifier())
composeIdentifier(null, e);
closeArray();
};
+ if (element.hasBasedOn()) {
+ openArray("basedOn");
+ for (Reference e : element.getBasedOn())
+ composeReference(null, e);
+ closeArray();
+ };
if (element.hasStatusElement()) {
composeEnumerationCore("status", element.getStatusElement(), new Enumerations.DocumentReferenceStatusEnumFactory(), false);
composeEnumerationExtras("status", element.getStatusElement(), new Enumerations.DocumentReferenceStatusEnumFactory(), false);
@@ -43995,6 +44580,27 @@ public class JsonParser extends JsonParserBase {
if (element.hasSubject()) {
composeReference("subject", element.getSubject());
}
+ if (element.hasEncounter()) {
+ openArray("encounter");
+ for (Reference e : element.getEncounter())
+ composeReference(null, e);
+ closeArray();
+ };
+ if (element.hasEvent()) {
+ openArray("event");
+ for (CodeableConcept e : element.getEvent())
+ composeCodeableConcept(null, e);
+ closeArray();
+ };
+ if (element.hasFacilityType()) {
+ composeCodeableConcept("facilityType", element.getFacilityType());
+ }
+ if (element.hasPracticeSetting()) {
+ composeCodeableConcept("practiceSetting", element.getPracticeSetting());
+ }
+ if (element.hasPeriod()) {
+ composePeriod("period", element.getPeriod());
+ }
if (element.hasDateElement()) {
composeInstantCore("date", element.getDateElement(), false);
composeInstantExtras("date", element.getDateElement(), false);
@@ -44005,9 +44611,12 @@ public class JsonParser extends JsonParserBase {
composeReference(null, e);
closeArray();
};
- if (element.hasAuthenticator()) {
- composeReference("authenticator", element.getAuthenticator());
- }
+ if (element.hasAttester()) {
+ openArray("attester");
+ for (DocumentReference.DocumentReferenceAttesterComponent e : element.getAttester())
+ composeDocumentReferenceAttesterComponent(null, e);
+ closeArray();
+ };
if (element.hasCustodian()) {
composeReference("custodian", element.getCustodian());
}
@@ -44018,8 +44627,8 @@ public class JsonParser extends JsonParserBase {
closeArray();
};
if (element.hasDescriptionElement()) {
- composeStringCore("description", element.getDescriptionElement(), false);
- composeStringExtras("description", element.getDescriptionElement(), false);
+ composeMarkdownCore("description", element.getDescriptionElement(), false);
+ composeMarkdownExtras("description", element.getDescriptionElement(), false);
}
if (element.hasSecurityLabel()) {
openArray("securityLabel");
@@ -44033,8 +44642,37 @@ public class JsonParser extends JsonParserBase {
composeDocumentReferenceContentComponent(null, e);
closeArray();
};
- if (element.hasContext()) {
- composeDocumentReferenceContextComponent("context", element.getContext());
+ if (element.hasSourcePatientInfo()) {
+ composeReference("sourcePatientInfo", element.getSourcePatientInfo());
+ }
+ if (element.hasRelated()) {
+ openArray("related");
+ for (Reference e : element.getRelated())
+ composeReference(null, e);
+ closeArray();
+ };
+ }
+
+ protected void composeDocumentReferenceAttesterComponent(String name, DocumentReference.DocumentReferenceAttesterComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeDocumentReferenceAttesterComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeDocumentReferenceAttesterComponentProperties(DocumentReference.DocumentReferenceAttesterComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasModeElement()) {
+ composeEnumerationCore("mode", element.getModeElement(), new DocumentReference.DocumentAttestationModeEnumFactory(), false);
+ composeEnumerationExtras("mode", element.getModeElement(), new DocumentReference.DocumentAttestationModeEnumFactory(), false);
+ }
+ if (element.hasTimeElement()) {
+ composeDateTimeCore("time", element.getTimeElement(), false);
+ composeDateTimeExtras("time", element.getTimeElement(), false);
+ }
+ if (element.hasParty()) {
+ composeReference("party", element.getParty());
}
}
@@ -44073,54 +44711,9 @@ public class JsonParser extends JsonParserBase {
if (element.hasFormat()) {
composeCoding("format", element.getFormat());
}
+ if (element.hasIdentifier()) {
+ composeIdentifier("identifier", element.getIdentifier());
}
-
- protected void composeDocumentReferenceContextComponent(String name, DocumentReference.DocumentReferenceContextComponent element) throws IOException {
- if (element != null) {
- open(name);
- composeDocumentReferenceContextComponentProperties(element);
- close();
- }
- }
-
- protected void composeDocumentReferenceContextComponentProperties(DocumentReference.DocumentReferenceContextComponent element) throws IOException {
- composeBackboneElementProperties(element);
- if (element.hasEncounter()) {
- openArray("encounter");
- for (Reference e : element.getEncounter())
- composeReference(null, e);
- closeArray();
- };
- if (element.hasEvent()) {
- openArray("event");
- for (CodeableConcept e : element.getEvent())
- composeCodeableConcept(null, e);
- closeArray();
- };
- if (element.hasPeriod()) {
- composePeriod("period", element.getPeriod());
- }
- if (element.hasFacilityType()) {
- composeCodeableConcept("facilityType", element.getFacilityType());
- }
- if (element.hasPracticeSetting()) {
- composeCodeableConcept("practiceSetting", element.getPracticeSetting());
- }
- if (element.hasSourcePatientInfo()) {
- composeReference("sourcePatientInfo", element.getSourcePatientInfo());
- }
- if (element.hasRelated()) {
- openArray("related");
- for (Reference e : element.getRelated())
- composeReference(null, e);
- closeArray();
- };
- if (element.hasBasedOn()) {
- openArray("basedOn");
- for (Reference e : element.getBasedOn())
- composeReference(null, e);
- closeArray();
- };
}
protected void composeEncounter(String name, Encounter element) throws IOException {
@@ -44851,10 +45444,38 @@ public class JsonParser extends JsonParserBase {
composeDateCore("lastReviewDate", element.getLastReviewDateElement(), false);
composeDateExtras("lastReviewDate", element.getLastReviewDateElement(), false);
}
- if (element.hasContributor()) {
- openArray("contributor");
- for (Contributor e : element.getContributor())
- composeContributor(null, e);
+ if (element.hasPublisherElement()) {
+ composeStringCore("publisher", element.getPublisherElement(), false);
+ composeStringExtras("publisher", element.getPublisherElement(), false);
+ }
+ if (element.hasContact()) {
+ openArray("contact");
+ for (ContactDetail e : element.getContact())
+ composeContactDetail(null, e);
+ closeArray();
+ };
+ if (element.hasAuthor()) {
+ openArray("author");
+ for (ContactDetail e : element.getAuthor())
+ composeContactDetail(null, e);
+ closeArray();
+ };
+ if (element.hasEditor()) {
+ openArray("editor");
+ for (ContactDetail e : element.getEditor())
+ composeContactDetail(null, e);
+ closeArray();
+ };
+ if (element.hasReviewer()) {
+ openArray("reviewer");
+ for (ContactDetail e : element.getReviewer())
+ composeContactDetail(null, e);
+ closeArray();
+ };
+ if (element.hasEndorser()) {
+ openArray("endorser");
+ for (ContactDetail e : element.getEndorser())
+ composeContactDetail(null, e);
closeArray();
};
if (element.hasRelatedArtifact()) {
@@ -44958,8 +45579,11 @@ public class JsonParser extends JsonParserBase {
composeStringExtras("description", element.getDescriptionElement(), false);
}
if (element.hasNote()) {
- composeAnnotation("note", element.getNote());
- }
+ openArray("note");
+ for (Annotation e : element.getNote())
+ composeAnnotation(null, e);
+ closeArray();
+ };
if (element.hasRating()) {
openArray("rating");
for (CodeableConcept e : element.getRating())
@@ -44989,8 +45613,11 @@ public class JsonParser extends JsonParserBase {
composeStringExtras("description", element.getDescriptionElement(), false);
}
if (element.hasNote()) {
- composeAnnotation("note", element.getNote());
- }
+ openArray("note");
+ for (Annotation e : element.getNote())
+ composeAnnotation(null, e);
+ closeArray();
+ };
if (element.hasType()) {
openArray("type");
for (CodeableConcept e : element.getType())
@@ -45005,33 +45632,19 @@ public class JsonParser extends JsonParserBase {
};
}
- protected void composeEvidenceFocus(String name, EvidenceFocus element) throws IOException {
+ protected void composeEvidenceReport(String name, EvidenceReport element) throws IOException {
if (element != null) {
prop("resourceType", name);
- composeEvidenceFocusProperties(element);
+ composeEvidenceReportProperties(element);
}
}
- protected void composeEvidenceFocusProperties(EvidenceFocus element) throws IOException {
+ protected void composeEvidenceReportProperties(EvidenceReport element) throws IOException {
composeMetadataResourceProperties(element);
if (element.hasUrlElement()) {
composeUriCore("url", element.getUrlElement(), false);
composeUriExtras("url", element.getUrlElement(), false);
}
- if (element.hasIdentifier()) {
- openArray("identifier");
- for (Identifier e : element.getIdentifier())
- composeIdentifier(null, e);
- closeArray();
- };
- if (element.hasVersionElement()) {
- composeStringCore("version", element.getVersionElement(), false);
- composeStringExtras("version", element.getVersionElement(), false);
- }
- if (element.hasNameElement()) {
- composeStringCore("name", element.getNameElement(), false);
- composeStringExtras("name", element.getNameElement(), false);
- }
if (element.hasStatusElement()) {
composeEnumerationCore("status", element.getStatusElement(), new Enumerations.PublicationStatusEnumFactory(), false);
composeEnumerationExtras("status", element.getStatusElement(), new Enumerations.PublicationStatusEnumFactory(), false);
@@ -45042,9 +45655,23 @@ public class JsonParser extends JsonParserBase {
composeUsageContext(null, e);
closeArray();
};
- if (element.hasDateElement()) {
- composeDateTimeCore("date", element.getDateElement(), false);
- composeDateTimeExtras("date", element.getDateElement(), false);
+ if (element.hasIdentifier()) {
+ openArray("identifier");
+ for (Identifier e : element.getIdentifier())
+ composeIdentifier(null, e);
+ closeArray();
+ };
+ if (element.hasRelatedIdentifier()) {
+ openArray("relatedIdentifier");
+ for (Identifier e : element.getRelatedIdentifier())
+ composeIdentifier(null, e);
+ closeArray();
+ };
+ if (element.hasCiteAs()) {
+ composeReference("citeAs", element.getCiteAs());
+ }
+ if (element.hasType()) {
+ composeCodeableConcept("type", element.getType());
}
if (element.hasNote()) {
openArray("note");
@@ -45052,36 +45679,96 @@ public class JsonParser extends JsonParserBase {
composeAnnotation(null, e);
closeArray();
};
- if (element.hasCopyrightElement()) {
- composeMarkdownCore("copyright", element.getCopyrightElement(), false);
- composeMarkdownExtras("copyright", element.getCopyrightElement(), false);
- }
- if (element.hasCiteAs()) {
- composeReference("citeAs", element.getCiteAs());
- }
- if (element.hasCharacteristic()) {
- openArray("characteristic");
- for (EvidenceFocus.EvidenceFocusCharacteristicComponent e : element.getCharacteristic())
- composeEvidenceFocusCharacteristicComponent(null, e);
- closeArray();
- };
if (element.hasRelatedArtifact()) {
openArray("relatedArtifact");
for (RelatedArtifact e : element.getRelatedArtifact())
composeRelatedArtifact(null, e);
closeArray();
};
+ if (element.hasSubject()) {
+ composeEvidenceReportSubjectComponent("subject", element.getSubject());
+ }
+ if (element.hasPublisherElement()) {
+ composeStringCore("publisher", element.getPublisherElement(), false);
+ composeStringExtras("publisher", element.getPublisherElement(), false);
+ }
+ if (element.hasContact()) {
+ openArray("contact");
+ for (ContactDetail e : element.getContact())
+ composeContactDetail(null, e);
+ closeArray();
+ };
+ if (element.hasAuthor()) {
+ openArray("author");
+ for (ContactDetail e : element.getAuthor())
+ composeContactDetail(null, e);
+ closeArray();
+ };
+ if (element.hasEditor()) {
+ openArray("editor");
+ for (ContactDetail e : element.getEditor())
+ composeContactDetail(null, e);
+ closeArray();
+ };
+ if (element.hasReviewer()) {
+ openArray("reviewer");
+ for (ContactDetail e : element.getReviewer())
+ composeContactDetail(null, e);
+ closeArray();
+ };
+ if (element.hasEndorser()) {
+ openArray("endorser");
+ for (ContactDetail e : element.getEndorser())
+ composeContactDetail(null, e);
+ closeArray();
+ };
+ if (element.hasRelatesTo()) {
+ openArray("relatesTo");
+ for (EvidenceReport.EvidenceReportRelatesToComponent e : element.getRelatesTo())
+ composeEvidenceReportRelatesToComponent(null, e);
+ closeArray();
+ };
+ if (element.hasSection()) {
+ openArray("section");
+ for (EvidenceReport.SectionComponent e : element.getSection())
+ composeSectionComponent(null, e);
+ closeArray();
+ };
}
- protected void composeEvidenceFocusCharacteristicComponent(String name, EvidenceFocus.EvidenceFocusCharacteristicComponent element) throws IOException {
+ protected void composeEvidenceReportSubjectComponent(String name, EvidenceReport.EvidenceReportSubjectComponent element) throws IOException {
if (element != null) {
open(name);
- composeEvidenceFocusCharacteristicComponentProperties(element);
+ composeEvidenceReportSubjectComponentProperties(element);
close();
}
}
- protected void composeEvidenceFocusCharacteristicComponentProperties(EvidenceFocus.EvidenceFocusCharacteristicComponent element) throws IOException {
+ protected void composeEvidenceReportSubjectComponentProperties(EvidenceReport.EvidenceReportSubjectComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasCharacteristic()) {
+ openArray("characteristic");
+ for (EvidenceReport.EvidenceReportSubjectCharacteristicComponent e : element.getCharacteristic())
+ composeEvidenceReportSubjectCharacteristicComponent(null, e);
+ closeArray();
+ };
+ if (element.hasNote()) {
+ openArray("note");
+ for (Annotation e : element.getNote())
+ composeAnnotation(null, e);
+ closeArray();
+ };
+ }
+
+ protected void composeEvidenceReportSubjectCharacteristicComponent(String name, EvidenceReport.EvidenceReportSubjectCharacteristicComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeEvidenceReportSubjectCharacteristicComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeEvidenceReportSubjectCharacteristicComponentProperties(EvidenceReport.EvidenceReportSubjectCharacteristicComponent element) throws IOException {
composeBackboneElementProperties(element);
if (element.hasCode()) {
composeCodeableConcept("code", element.getCode());
@@ -45098,6 +45785,84 @@ public class JsonParser extends JsonParserBase {
}
}
+ protected void composeEvidenceReportRelatesToComponent(String name, EvidenceReport.EvidenceReportRelatesToComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeEvidenceReportRelatesToComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeEvidenceReportRelatesToComponentProperties(EvidenceReport.EvidenceReportRelatesToComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasCodeElement()) {
+ composeEnumerationCore("code", element.getCodeElement(), new EvidenceReport.ReportRelationshipTypeEnumFactory(), false);
+ composeEnumerationExtras("code", element.getCodeElement(), new EvidenceReport.ReportRelationshipTypeEnumFactory(), false);
+ }
+ if (element.hasTarget()) {
+ composeType("target", element.getTarget());
+ }
+ }
+
+ protected void composeSectionComponent(String name, EvidenceReport.SectionComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeSectionComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeSectionComponentProperties(EvidenceReport.SectionComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasTitleElement()) {
+ composeStringCore("title", element.getTitleElement(), false);
+ composeStringExtras("title", element.getTitleElement(), false);
+ }
+ if (element.hasFocus()) {
+ composeCodeableConcept("focus", element.getFocus());
+ }
+ if (element.hasFocusReference()) {
+ composeReference("focusReference", element.getFocusReference());
+ }
+ if (element.hasAuthor()) {
+ openArray("author");
+ for (Reference e : element.getAuthor())
+ composeReference(null, e);
+ closeArray();
+ };
+ if (element.hasText()) {
+ composeNarrative("text", element.getText());
+ }
+ if (element.hasModeElement()) {
+ composeEnumerationCore("mode", element.getModeElement(), new Enumerations.ListModeEnumFactory(), false);
+ composeEnumerationExtras("mode", element.getModeElement(), new Enumerations.ListModeEnumFactory(), false);
+ }
+ if (element.hasOrderedBy()) {
+ composeCodeableConcept("orderedBy", element.getOrderedBy());
+ }
+ if (element.hasEntryClassifier()) {
+ openArray("entryClassifier");
+ for (CodeableConcept e : element.getEntryClassifier())
+ composeCodeableConcept(null, e);
+ closeArray();
+ };
+ if (element.hasEntryReference()) {
+ openArray("entryReference");
+ for (Reference e : element.getEntryReference())
+ composeReference(null, e);
+ closeArray();
+ };
+ if (element.hasEmptyReason()) {
+ composeCodeableConcept("emptyReason", element.getEmptyReason());
+ }
+ if (element.hasSection()) {
+ openArray("section");
+ for (EvidenceReport.SectionComponent e : element.getSection())
+ composeSectionComponent(null, e);
+ closeArray();
+ };
+ }
+
protected void composeEvidenceVariable(String name, EvidenceVariable element) throws IOException {
if (element != null) {
prop("resourceType", name);
@@ -45145,16 +45910,6 @@ public class JsonParser extends JsonParserBase {
composeDateTimeCore("date", element.getDateElement(), false);
composeDateTimeExtras("date", element.getDateElement(), false);
}
- if (element.hasPublisherElement()) {
- composeStringCore("publisher", element.getPublisherElement(), false);
- composeStringExtras("publisher", element.getPublisherElement(), false);
- }
- if (element.hasContact()) {
- openArray("contact");
- for (ContactDetail e : element.getContact())
- composeContactDetail(null, e);
- closeArray();
- };
if (element.hasDescriptionElement()) {
composeMarkdownCore("description", element.getDescriptionElement(), false);
composeMarkdownExtras("description", element.getDescriptionElement(), false);
@@ -45171,31 +45926,14 @@ public class JsonParser extends JsonParserBase {
composeUsageContext(null, e);
closeArray();
};
- if (element.hasJurisdiction()) {
- openArray("jurisdiction");
- for (CodeableConcept e : element.getJurisdiction())
- composeCodeableConcept(null, e);
- closeArray();
- };
- if (element.hasCopyrightElement()) {
- composeMarkdownCore("copyright", element.getCopyrightElement(), false);
- composeMarkdownExtras("copyright", element.getCopyrightElement(), false);
+ if (element.hasPublisherElement()) {
+ composeStringCore("publisher", element.getPublisherElement(), false);
+ composeStringExtras("publisher", element.getPublisherElement(), false);
}
- if (element.hasApprovalDateElement()) {
- composeDateCore("approvalDate", element.getApprovalDateElement(), false);
- composeDateExtras("approvalDate", element.getApprovalDateElement(), false);
- }
- if (element.hasLastReviewDateElement()) {
- composeDateCore("lastReviewDate", element.getLastReviewDateElement(), false);
- composeDateExtras("lastReviewDate", element.getLastReviewDateElement(), false);
- }
- if (element.hasEffectivePeriod()) {
- composePeriod("effectivePeriod", element.getEffectivePeriod());
- }
- if (element.hasTopic()) {
- openArray("topic");
- for (CodeableConcept e : element.getTopic())
- composeCodeableConcept(null, e);
+ if (element.hasContact()) {
+ openArray("contact");
+ for (ContactDetail e : element.getContact())
+ composeContactDetail(null, e);
closeArray();
};
if (element.hasAuthor()) {
@@ -45228,10 +45966,6 @@ public class JsonParser extends JsonParserBase {
composeRelatedArtifact(null, e);
closeArray();
};
- if (element.hasTypeElement()) {
- composeEnumerationCore("type", element.getTypeElement(), new EvidenceVariable.EvidenceVariableTypeEnumFactory(), false);
- composeEnumerationExtras("type", element.getTypeElement(), new EvidenceVariable.EvidenceVariableTypeEnumFactory(), false);
- }
if (element.hasActualElement()) {
composeBooleanCore("actual", element.getActualElement(), false);
composeBooleanExtras("actual", element.getActualElement(), false);
@@ -45246,6 +45980,16 @@ public class JsonParser extends JsonParserBase {
composeEvidenceVariableCharacteristicComponent(null, e);
closeArray();
};
+ if (element.hasHandlingElement()) {
+ composeEnumerationCore("handling", element.getHandlingElement(), new Enumerations.EvidenceVariableHandlingEnumFactory(), false);
+ composeEnumerationExtras("handling", element.getHandlingElement(), new Enumerations.EvidenceVariableHandlingEnumFactory(), false);
+ }
+ if (element.hasCategory()) {
+ openArray("category");
+ for (EvidenceVariable.EvidenceVariableCategoryComponent e : element.getCategory())
+ composeEvidenceVariableCategoryComponent(null, e);
+ closeArray();
+ };
}
protected void composeEvidenceVariableCharacteristicComponent(String name, EvidenceVariable.EvidenceVariableCharacteristicComponent element) throws IOException {
@@ -45312,6 +46056,25 @@ public class JsonParser extends JsonParserBase {
};
}
+ protected void composeEvidenceVariableCategoryComponent(String name, EvidenceVariable.EvidenceVariableCategoryComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeEvidenceVariableCategoryComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeEvidenceVariableCategoryComponentProperties(EvidenceVariable.EvidenceVariableCategoryComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasNameElement()) {
+ composeStringCore("name", element.getNameElement(), false);
+ composeStringExtras("name", element.getNameElement(), false);
+ }
+ if (element.hasValue()) {
+ composeType("value", element.getValue());
+ }
+ }
+
protected void composeExampleScenario(String name, ExampleScenario element) throws IOException {
if (element != null) {
prop("resourceType", name);
@@ -47888,6 +48651,36 @@ public class JsonParser extends JsonParserBase {
composeIdentifier(null, e);
closeArray();
};
+ if (element.hasInstantiatesCanonical()) {
+ openArray("instantiatesCanonical");
+ for (CanonicalType e : element.getInstantiatesCanonical())
+ composeCanonicalCore(null, e, true);
+ closeArray();
+ if (anyHasExtras(element.getInstantiatesCanonical())) {
+ openArray("_instantiatesCanonical");
+ for (CanonicalType e : element.getInstantiatesCanonical())
+ composeCanonicalExtras(null, e, true);
+ closeArray();
+ }
+ };
+ if (element.hasInstantiatesUri()) {
+ openArray("instantiatesUri");
+ for (UriType e : element.getInstantiatesUri())
+ composeUriCore(null, e, true);
+ closeArray();
+ if (anyHasExtras(element.getInstantiatesUri())) {
+ openArray("_instantiatesUri");
+ for (UriType e : element.getInstantiatesUri())
+ composeUriExtras(null, e, true);
+ closeArray();
+ }
+ };
+ if (element.hasBasedOn()) {
+ openArray("basedOn");
+ for (Reference e : element.getBasedOn())
+ composeReference(null, e);
+ closeArray();
+ };
if (element.hasStatusElement()) {
composeEnumerationCore("status", element.getStatusElement(), new Immunization.ImmunizationStatusCodesEnumFactory(), false);
composeEnumerationExtras("status", element.getStatusElement(), new Immunization.ImmunizationStatusCodesEnumFactory(), false);
@@ -47898,6 +48691,17 @@ public class JsonParser extends JsonParserBase {
if (element.hasVaccineCode()) {
composeCodeableConcept("vaccineCode", element.getVaccineCode());
}
+ if (element.hasManufacturer()) {
+ composeReference("manufacturer", element.getManufacturer());
+ }
+ if (element.hasLotNumberElement()) {
+ composeStringCore("lotNumber", element.getLotNumberElement(), false);
+ composeStringExtras("lotNumber", element.getLotNumberElement(), false);
+ }
+ if (element.hasExpirationDateElement()) {
+ composeDateCore("expirationDate", element.getExpirationDateElement(), false);
+ composeDateExtras("expirationDate", element.getExpirationDateElement(), false);
+ }
if (element.hasPatient()) {
composeReference("patient", element.getPatient());
}
@@ -47921,17 +48725,6 @@ public class JsonParser extends JsonParserBase {
if (element.hasLocation()) {
composeReference("location", element.getLocation());
}
- if (element.hasManufacturer()) {
- composeReference("manufacturer", element.getManufacturer());
- }
- if (element.hasLotNumberElement()) {
- composeStringCore("lotNumber", element.getLotNumberElement(), false);
- composeStringExtras("lotNumber", element.getLotNumberElement(), false);
- }
- if (element.hasExpirationDateElement()) {
- composeDateCore("expirationDate", element.getExpirationDateElement(), false);
- composeDateExtras("expirationDate", element.getExpirationDateElement(), false);
- }
if (element.hasSite()) {
composeCodeableConcept("site", element.getSite());
}
@@ -48177,6 +48970,30 @@ public class JsonParser extends JsonParserBase {
composeIdentifier(null, e);
closeArray();
};
+ if (element.hasInstantiatesCanonical()) {
+ openArray("instantiatesCanonical");
+ for (CanonicalType e : element.getInstantiatesCanonical())
+ composeCanonicalCore(null, e, true);
+ closeArray();
+ if (anyHasExtras(element.getInstantiatesCanonical())) {
+ openArray("_instantiatesCanonical");
+ for (CanonicalType e : element.getInstantiatesCanonical())
+ composeCanonicalExtras(null, e, true);
+ closeArray();
+ }
+ };
+ if (element.hasInstantiatesUri()) {
+ openArray("instantiatesUri");
+ for (UriType e : element.getInstantiatesUri())
+ composeUriCore(null, e, true);
+ closeArray();
+ if (anyHasExtras(element.getInstantiatesUri())) {
+ openArray("_instantiatesUri");
+ for (UriType e : element.getInstantiatesUri())
+ composeUriExtras(null, e, true);
+ closeArray();
+ }
+ };
if (element.hasPatient()) {
composeReference("patient", element.getPatient());
}
@@ -48753,53 +49570,47 @@ public class JsonParser extends JsonParserBase {
composeReference(null, e);
closeArray();
};
+ if (element.hasSubstance()) {
+ composeIngredientSubstanceComponent("substance", element.getSubstance());
+ }
if (element.hasSpecifiedSubstance()) {
openArray("specifiedSubstance");
for (Ingredient.IngredientSpecifiedSubstanceComponent e : element.getSpecifiedSubstance())
composeIngredientSpecifiedSubstanceComponent(null, e);
closeArray();
};
- if (element.hasSubstance()) {
- composeIngredientSubstanceComponent("substance", element.getSubstance());
- }
}
- protected void composeIngredientSpecifiedSubstanceComponent(String name, Ingredient.IngredientSpecifiedSubstanceComponent element) throws IOException {
+ protected void composeIngredientSubstanceComponent(String name, Ingredient.IngredientSubstanceComponent element) throws IOException {
if (element != null) {
open(name);
- composeIngredientSpecifiedSubstanceComponentProperties(element);
+ composeIngredientSubstanceComponentProperties(element);
close();
}
}
- protected void composeIngredientSpecifiedSubstanceComponentProperties(Ingredient.IngredientSpecifiedSubstanceComponent element) throws IOException {
+ protected void composeIngredientSubstanceComponentProperties(Ingredient.IngredientSubstanceComponent element) throws IOException {
composeBackboneElementProperties(element);
if (element.hasCode()) {
composeType("code", element.getCode());
}
- if (element.hasGroup()) {
- composeCodeableConcept("group", element.getGroup());
- }
- if (element.hasConfidentiality()) {
- composeCodeableConcept("confidentiality", element.getConfidentiality());
- }
if (element.hasStrength()) {
openArray("strength");
- for (Ingredient.IngredientSpecifiedSubstanceStrengthComponent e : element.getStrength())
- composeIngredientSpecifiedSubstanceStrengthComponent(null, e);
+ for (Ingredient.IngredientSubstanceStrengthComponent e : element.getStrength())
+ composeIngredientSubstanceStrengthComponent(null, e);
closeArray();
};
}
- protected void composeIngredientSpecifiedSubstanceStrengthComponent(String name, Ingredient.IngredientSpecifiedSubstanceStrengthComponent element) throws IOException {
+ protected void composeIngredientSubstanceStrengthComponent(String name, Ingredient.IngredientSubstanceStrengthComponent element) throws IOException {
if (element != null) {
open(name);
- composeIngredientSpecifiedSubstanceStrengthComponentProperties(element);
+ composeIngredientSubstanceStrengthComponentProperties(element);
close();
}
}
- protected void composeIngredientSpecifiedSubstanceStrengthComponentProperties(Ingredient.IngredientSpecifiedSubstanceStrengthComponent element) throws IOException {
+ protected void composeIngredientSubstanceStrengthComponentProperties(Ingredient.IngredientSubstanceStrengthComponent element) throws IOException {
composeBackboneElementProperties(element);
if (element.hasPresentation()) {
composeRatio("presentation", element.getPresentation());
@@ -48833,21 +49644,21 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasReferenceStrength()) {
openArray("referenceStrength");
- for (Ingredient.IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent e : element.getReferenceStrength())
- composeIngredientSpecifiedSubstanceStrengthReferenceStrengthComponent(null, e);
+ for (Ingredient.IngredientSubstanceStrengthReferenceStrengthComponent e : element.getReferenceStrength())
+ composeIngredientSubstanceStrengthReferenceStrengthComponent(null, e);
closeArray();
};
}
- protected void composeIngredientSpecifiedSubstanceStrengthReferenceStrengthComponent(String name, Ingredient.IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent element) throws IOException {
+ protected void composeIngredientSubstanceStrengthReferenceStrengthComponent(String name, Ingredient.IngredientSubstanceStrengthReferenceStrengthComponent element) throws IOException {
if (element != null) {
open(name);
- composeIngredientSpecifiedSubstanceStrengthReferenceStrengthComponentProperties(element);
+ composeIngredientSubstanceStrengthReferenceStrengthComponentProperties(element);
close();
}
}
- protected void composeIngredientSpecifiedSubstanceStrengthReferenceStrengthComponentProperties(Ingredient.IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent element) throws IOException {
+ protected void composeIngredientSubstanceStrengthReferenceStrengthComponentProperties(Ingredient.IngredientSubstanceStrengthReferenceStrengthComponent element) throws IOException {
composeBackboneElementProperties(element);
if (element.hasSubstance()) {
composeType("substance", element.getSubstance());
@@ -48870,23 +49681,29 @@ public class JsonParser extends JsonParserBase {
};
}
- protected void composeIngredientSubstanceComponent(String name, Ingredient.IngredientSubstanceComponent element) throws IOException {
+ protected void composeIngredientSpecifiedSubstanceComponent(String name, Ingredient.IngredientSpecifiedSubstanceComponent element) throws IOException {
if (element != null) {
open(name);
- composeIngredientSubstanceComponentProperties(element);
+ composeIngredientSpecifiedSubstanceComponentProperties(element);
close();
}
}
- protected void composeIngredientSubstanceComponentProperties(Ingredient.IngredientSubstanceComponent element) throws IOException {
+ protected void composeIngredientSpecifiedSubstanceComponentProperties(Ingredient.IngredientSpecifiedSubstanceComponent element) throws IOException {
composeBackboneElementProperties(element);
if (element.hasCode()) {
composeType("code", element.getCode());
}
+ if (element.hasGroup()) {
+ composeCodeableConcept("group", element.getGroup());
+ }
+ if (element.hasConfidentiality()) {
+ composeCodeableConcept("confidentiality", element.getConfidentiality());
+ }
if (element.hasStrength()) {
openArray("strength");
- for (Ingredient.IngredientSpecifiedSubstanceStrengthComponent e : element.getStrength())
- composeIngredientSpecifiedSubstanceStrengthComponent(null, e);
+ for (Ingredient.IngredientSubstanceStrengthComponent e : element.getStrength())
+ composeIngredientSubstanceStrengthComponent(null, e);
closeArray();
};
}
@@ -50866,6 +51683,9 @@ public class JsonParser extends JsonParserBase {
composeEnumerationCore("status", element.getStatusElement(), new MedicationKnowledge.MedicationKnowledgeStatusCodesEnumFactory(), false);
composeEnumerationExtras("status", element.getStatusElement(), new MedicationKnowledge.MedicationKnowledgeStatusCodesEnumFactory(), false);
}
+ if (element.hasAuthor()) {
+ composeReference("author", element.getAuthor());
+ }
if (element.hasManufacturer()) {
composeReference("manufacturer", element.getManufacturer());
}
@@ -50899,6 +51719,9 @@ public class JsonParser extends JsonParserBase {
composeReference(null, e);
closeArray();
};
+ if (element.hasAssociatedDefinition()) {
+ composeReference("associatedDefinition", element.getAssociatedDefinition());
+ }
if (element.hasProductType()) {
openArray("productType");
for (CodeableConcept e : element.getProductType())
@@ -50958,8 +51781,11 @@ public class JsonParser extends JsonParserBase {
closeArray();
};
if (element.hasPackaging()) {
- composeMedicationKnowledgePackagingComponent("packaging", element.getPackaging());
- }
+ openArray("packaging");
+ for (MedicationKnowledge.MedicationKnowledgePackagingComponent e : element.getPackaging())
+ composeMedicationKnowledgePackagingComponent(null, e);
+ closeArray();
+ };
if (element.hasDrugCharacteristic()) {
openArray("drugCharacteristic");
for (MedicationKnowledge.MedicationKnowledgeDrugCharacteristicComponent e : element.getDrugCharacteristic())
@@ -51057,6 +51883,12 @@ public class JsonParser extends JsonParserBase {
protected void composeMedicationKnowledgeCostComponentProperties(MedicationKnowledge.MedicationKnowledgeCostComponent element) throws IOException {
composeBackboneElementProperties(element);
+ if (element.hasEffectiveDate()) {
+ openArray("effectiveDate");
+ for (Period e : element.getEffectiveDate())
+ composePeriod(null, e);
+ closeArray();
+ };
if (element.hasType()) {
composeCodeableConcept("type", element.getType());
}
@@ -51065,7 +51897,7 @@ public class JsonParser extends JsonParserBase {
composeStringExtras("source", element.getSourceElement(), false);
}
if (element.hasCost()) {
- composeMoney("cost", element.getCost());
+ composeType("cost", element.getCost());
}
}
@@ -51185,6 +52017,12 @@ public class JsonParser extends JsonParserBase {
protected void composeMedicationKnowledgePackagingComponentProperties(MedicationKnowledge.MedicationKnowledgePackagingComponent element) throws IOException {
composeBackboneElementProperties(element);
+ if (element.hasIdentifier()) {
+ composeIdentifier("identifier", element.getIdentifier());
+ }
+ if (element.hasCost()) {
+ composeMedicationKnowledgeCostComponent("cost", element.getCost());
+ }
if (element.hasType()) {
composeCodeableConcept("type", element.getType());
}
@@ -51697,9 +52535,9 @@ public class JsonParser extends JsonParserBase {
if (element.hasPaediatricUseIndicator()) {
composeCodeableConcept("paediatricUseIndicator", element.getPaediatricUseIndicator());
}
- if (element.hasProductClassification()) {
- openArray("productClassification");
- for (CodeableConcept e : element.getProductClassification())
+ if (element.hasClassification()) {
+ openArray("classification");
+ for (CodeableConcept e : element.getClassification())
composeCodeableConcept(null, e);
closeArray();
};
@@ -51733,6 +52571,12 @@ public class JsonParser extends JsonParserBase {
composeReference(null, e);
closeArray();
};
+ if (element.hasImpurity()) {
+ openArray("impurity");
+ for (Reference e : element.getImpurity())
+ composeReference(null, e);
+ closeArray();
+ };
if (element.hasAttachedDocument()) {
openArray("attachedDocument");
for (Reference e : element.getAttachedDocument())
@@ -51877,7 +52721,7 @@ public class JsonParser extends JsonParserBase {
protected void composeMedicinalProductDefinitionCrossReferenceComponentProperties(MedicinalProductDefinition.MedicinalProductDefinitionCrossReferenceComponent element) throws IOException {
composeBackboneElementProperties(element);
if (element.hasProduct()) {
- composeType("product", element.getProduct());
+ composeCodeableReference("product", element.getProduct());
}
if (element.hasType()) {
composeCodeableConcept("type", element.getType());
@@ -54413,6 +55257,9 @@ public class JsonParser extends JsonParserBase {
composeStringCore("name", element.getNameElement(), false);
composeStringExtras("name", element.getNameElement(), false);
}
+ if (element.hasType()) {
+ composeCodeableConcept("type", element.getType());
+ }
if (element.hasSubject()) {
openArray("subject");
for (Reference e : element.getSubject())
@@ -58945,12 +59792,6 @@ public class JsonParser extends JsonParserBase {
composeSubscriptionFilterByComponent(null, e);
closeArray();
};
- if (element.hasError()) {
- openArray("error");
- for (CodeableConcept e : element.getError())
- composeCodeableConcept(null, e);
- closeArray();
- };
if (element.hasChannelType()) {
composeCoding("channelType", element.getChannelType());
}
@@ -59021,9 +59862,9 @@ public class JsonParser extends JsonParserBase {
protected void composeSubscriptionStatusProperties(SubscriptionStatus element) throws IOException {
composeDomainResourceProperties(element);
- if (element.hasNotificationTypeElement()) {
- composeEnumerationCore("notificationType", element.getNotificationTypeElement(), new SubscriptionStatus.SubscriptionNotificationTypeEnumFactory(), false);
- composeEnumerationExtras("notificationType", element.getNotificationTypeElement(), new SubscriptionStatus.SubscriptionNotificationTypeEnumFactory(), false);
+ if (element.hasTypeElement()) {
+ composeEnumerationCore("type", element.getTypeElement(), new SubscriptionStatus.SubscriptionNotificationTypeEnumFactory(), false);
+ composeEnumerationExtras("type", element.getTypeElement(), new SubscriptionStatus.SubscriptionNotificationTypeEnumFactory(), false);
}
if (element.hasEventsSinceSubscriptionStartElement()) {
composeInteger64Core("eventsSinceSubscriptionStart", element.getEventsSinceSubscriptionStartElement(), false);
@@ -59040,9 +59881,16 @@ public class JsonParser extends JsonParserBase {
composeEnumerationCore("status", element.getStatusElement(), new Enumerations.SubscriptionStateEnumFactory(), false);
composeEnumerationExtras("status", element.getStatusElement(), new Enumerations.SubscriptionStateEnumFactory(), false);
}
- if (element.hasTopic()) {
- composeReference("topic", element.getTopic());
+ if (element.hasTopicElement()) {
+ composeCanonicalCore("topic", element.getTopicElement(), false);
+ composeCanonicalExtras("topic", element.getTopicElement(), false);
}
+ if (element.hasError()) {
+ openArray("error");
+ for (CodeableConcept e : element.getError())
+ composeCodeableConcept(null, e);
+ closeArray();
+ };
}
protected void composeSubscriptionTopic(String name, SubscriptionTopic element) throws IOException {
@@ -59072,30 +59920,18 @@ public class JsonParser extends JsonParserBase {
composeStringCore("title", element.getTitleElement(), false);
composeStringExtras("title", element.getTitleElement(), false);
}
- if (element.hasDerivedFromCanonical()) {
- openArray("derivedFromCanonical");
- for (CanonicalType e : element.getDerivedFromCanonical())
+ if (element.hasDerivedFrom()) {
+ openArray("derivedFrom");
+ for (CanonicalType e : element.getDerivedFrom())
composeCanonicalCore(null, e, true);
closeArray();
- if (anyHasExtras(element.getDerivedFromCanonical())) {
- openArray("_derivedFromCanonical");
- for (CanonicalType e : element.getDerivedFromCanonical())
+ if (anyHasExtras(element.getDerivedFrom())) {
+ openArray("_derivedFrom");
+ for (CanonicalType e : element.getDerivedFrom())
composeCanonicalExtras(null, e, true);
closeArray();
}
};
- if (element.hasDerivedFromUri()) {
- openArray("derivedFromUri");
- for (UriType e : element.getDerivedFromUri())
- composeUriCore(null, e, true);
- closeArray();
- if (anyHasExtras(element.getDerivedFromUri())) {
- openArray("_derivedFromUri");
- for (UriType e : element.getDerivedFromUri())
- composeUriExtras(null, e, true);
- closeArray();
- }
- };
if (element.hasStatusElement()) {
composeEnumerationCore("status", element.getStatusElement(), new Enumerations.PublicationStatusEnumFactory(), false);
composeEnumerationExtras("status", element.getStatusElement(), new Enumerations.PublicationStatusEnumFactory(), false);
@@ -59382,6 +60218,12 @@ public class JsonParser extends JsonParserBase {
if (element.hasCategory()) {
composeCodeableConcept("category", element.getCategory());
}
+ if (element.hasClassification()) {
+ openArray("classification");
+ for (CodeableConcept e : element.getClassification())
+ composeCodeableConcept(null, e);
+ closeArray();
+ };
if (element.hasDomain()) {
composeCodeableConcept("domain", element.getDomain());
}
@@ -59528,7 +60370,7 @@ public class JsonParser extends JsonParserBase {
composeStringExtras("parameters", element.getParametersElement(), false);
}
if (element.hasDefiningSubstance()) {
- composeType("definingSubstance", element.getDefiningSubstance());
+ composeCodeableReference("definingSubstance", element.getDefiningSubstance());
}
if (element.hasAmount()) {
composeType("amount", element.getAmount());
@@ -59665,8 +60507,8 @@ public class JsonParser extends JsonParserBase {
if (element.hasFormat()) {
composeCodeableConcept("format", element.getFormat());
}
- if (element.hasAttachment()) {
- composeAttachment("attachment", element.getAttachment());
+ if (element.hasDocument()) {
+ composeReference("document", element.getDocument());
}
}
@@ -60041,7 +60883,7 @@ public class JsonParser extends JsonParserBase {
composeBooleanExtras("isDefining", element.getIsDefiningElement(), false);
}
if (element.hasAmount()) {
- composeSubstanceAmount("amount", element.getAmount());
+ composeQuantity("amount", element.getAmount());
}
}
@@ -60055,10 +60897,6 @@ public class JsonParser extends JsonParserBase {
protected void composeSubstancePolymerRepeatComponentProperties(SubstancePolymer.SubstancePolymerRepeatComponent element) throws IOException {
composeBackboneElementProperties(element);
- if (element.hasNumberOfUnitsElement()) {
- composeIntegerCore("numberOfUnits", element.getNumberOfUnitsElement(), false);
- composeIntegerExtras("numberOfUnits", element.getNumberOfUnitsElement(), false);
- }
if (element.hasAverageMolecularFormulaElement()) {
composeStringCore("averageMolecularFormula", element.getAverageMolecularFormulaElement(), false);
composeStringExtras("averageMolecularFormula", element.getAverageMolecularFormulaElement(), false);
@@ -60091,8 +60929,9 @@ public class JsonParser extends JsonParserBase {
if (element.hasOrientation()) {
composeCodeableConcept("orientation", element.getOrientation());
}
- if (element.hasAmount()) {
- composeSubstanceAmount("amount", element.getAmount());
+ if (element.hasAmountElement()) {
+ composeIntegerCore("amount", element.getAmountElement(), false);
+ composeIntegerExtras("amount", element.getAmountElement(), false);
}
if (element.hasDegreeOfPolymerisation()) {
openArray("degreeOfPolymerisation");
@@ -60118,11 +60957,20 @@ public class JsonParser extends JsonParserBase {
protected void composeSubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponentProperties(SubstancePolymer.SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent element) throws IOException {
composeBackboneElementProperties(element);
- if (element.hasDegree()) {
- composeCodeableConcept("degree", element.getDegree());
+ if (element.hasType()) {
+ composeCodeableConcept("type", element.getType());
}
- if (element.hasAmount()) {
- composeSubstanceAmount("amount", element.getAmount());
+ if (element.hasAverageElement()) {
+ composeIntegerCore("average", element.getAverageElement(), false);
+ composeIntegerExtras("average", element.getAverageElement(), false);
+ }
+ if (element.hasLowElement()) {
+ composeIntegerCore("low", element.getLowElement(), false);
+ composeIntegerExtras("low", element.getLowElement(), false);
+ }
+ if (element.hasHighElement()) {
+ composeIntegerCore("high", element.getHighElement(), false);
+ composeIntegerExtras("high", element.getHighElement(), false);
}
}
@@ -60253,12 +61101,6 @@ public class JsonParser extends JsonParserBase {
composeSubstanceReferenceInformationGeneElementComponent(null, e);
closeArray();
};
- if (element.hasClassification()) {
- openArray("classification");
- for (SubstanceReferenceInformation.SubstanceReferenceInformationClassificationComponent e : element.getClassification())
- composeSubstanceReferenceInformationClassificationComponent(null, e);
- closeArray();
- };
if (element.hasTarget()) {
openArray("target");
for (SubstanceReferenceInformation.SubstanceReferenceInformationTargetComponent e : element.getTarget())
@@ -60315,36 +61157,6 @@ public class JsonParser extends JsonParserBase {
};
}
- protected void composeSubstanceReferenceInformationClassificationComponent(String name, SubstanceReferenceInformation.SubstanceReferenceInformationClassificationComponent element) throws IOException {
- if (element != null) {
- open(name);
- composeSubstanceReferenceInformationClassificationComponentProperties(element);
- close();
- }
- }
-
- protected void composeSubstanceReferenceInformationClassificationComponentProperties(SubstanceReferenceInformation.SubstanceReferenceInformationClassificationComponent element) throws IOException {
- composeBackboneElementProperties(element);
- if (element.hasDomain()) {
- composeCodeableConcept("domain", element.getDomain());
- }
- if (element.hasClassification()) {
- composeCodeableConcept("classification", element.getClassification());
- }
- if (element.hasSubtype()) {
- openArray("subtype");
- for (CodeableConcept e : element.getSubtype())
- composeCodeableConcept(null, e);
- closeArray();
- };
- if (element.hasSource()) {
- openArray("source");
- for (Reference e : element.getSource())
- composeReference(null, e);
- closeArray();
- };
- }
-
protected void composeSubstanceReferenceInformationTargetComponent(String name, SubstanceReferenceInformation.SubstanceReferenceInformationTargetComponent element) throws IOException {
if (element != null) {
open(name);
@@ -63064,8 +63876,8 @@ public class JsonParser extends JsonParserBase {
composeEventDefinition("EventDefinition", (EventDefinition)resource);
} else if (resource instanceof Evidence) {
composeEvidence("Evidence", (Evidence)resource);
- } else if (resource instanceof EvidenceFocus) {
- composeEvidenceFocus("EvidenceFocus", (EvidenceFocus)resource);
+ } else if (resource instanceof EvidenceReport) {
+ composeEvidenceReport("EvidenceReport", (EvidenceReport)resource);
} else if (resource instanceof EvidenceVariable) {
composeEvidenceVariable("EvidenceVariable", (EvidenceVariable)resource);
} else if (resource instanceof ExampleScenario) {
@@ -63366,8 +64178,8 @@ public class JsonParser extends JsonParserBase {
composeEventDefinition(name, (EventDefinition)resource);
} else if (resource instanceof Evidence) {
composeEvidence(name, (Evidence)resource);
- } else if (resource instanceof EvidenceFocus) {
- composeEvidenceFocus(name, (EvidenceFocus)resource);
+ } else if (resource instanceof EvidenceReport) {
+ composeEvidenceReport(name, (EvidenceReport)resource);
} else if (resource instanceof EvidenceVariable) {
composeEvidenceVariable(name, (EvidenceVariable)resource);
} else if (resource instanceof ExampleScenario) {
@@ -63636,8 +64448,6 @@ public class JsonParser extends JsonParserBase {
composeSignature(prefix+"Signature", (Signature) type);
} else if (type instanceof Statistic) {
composeStatistic(prefix+"Statistic", (Statistic) type);
- } else if (type instanceof SubstanceAmount) {
- composeSubstanceAmount(prefix+"SubstanceAmount", (SubstanceAmount) type);
} else if (type instanceof Timing) {
composeTiming(prefix+"Timing", (Timing) type);
} else if (type instanceof TriggerDefinition) {
@@ -63807,8 +64617,6 @@ public class JsonParser extends JsonParserBase {
composeSignatureProperties((Signature) type);
} else if (type instanceof Statistic) {
composeStatisticProperties((Statistic) type);
- } else if (type instanceof SubstanceAmount) {
- composeSubstanceAmountProperties((SubstanceAmount) type);
} else if (type instanceof Timing) {
composeTimingProperties((Timing) type);
} else if (type instanceof TriggerDefinition) {
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/RdfParser.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/RdfParser.java
index 22d953157..9ebbb3a7d 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/RdfParser.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/RdfParser.java
@@ -33,13 +33,16 @@ package org.hl7.fhir.r5.formats;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import org.hl7.fhir.r5.model.*;
import org.hl7.fhir.utilities.Utilities;
+import org.hl7.fhir.exceptions.FHIRFormatError;
+import org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.utilities.turtle.Turtle.Complex;
+import java.io.IOException;
public class RdfParser extends RdfParserBase {
@@ -1394,14 +1397,11 @@ public class RdfParser extends RdfParserBase {
t = parent.predicate("fhir:"+parentType+'.'+name);
}
composeBackboneType(t, "ProductShelfLife", name, element, index);
- if (element.hasIdentifier()) {
- composeIdentifier(t, "ProductShelfLife", "identifier", element.getIdentifier(), -1);
- }
if (element.hasType()) {
composeCodeableConcept(t, "ProductShelfLife", "type", element.getType(), -1);
}
if (element.hasPeriod()) {
- composeQuantity(t, "ProductShelfLife", "period", element.getPeriod(), -1);
+ composeType(t, "ProductShelfLife", "period", element.getPeriod(), -1);
}
for (int i = 0; i < element.getSpecialPrecautionsForStorage().size(); i++) {
composeCodeableConcept(t, "ProductShelfLife", "specialPrecautionsForStorage", element.getSpecialPrecautionsForStorage().get(i), i);
@@ -1616,12 +1616,18 @@ public class RdfParser extends RdfParserBase {
if (element.hasQuantity()) {
composeQuantity(t, "Statistic", "quantity", element.getQuantity(), -1);
}
+ if (element.hasNumberOfEventsElement()) {
+ composeInteger(t, "Statistic", "numberOfEvents", element.getNumberOfEventsElement(), -1);
+ }
if (element.hasSampleSize()) {
composeStatisticSampleSizeComponent(t, "Statistic", "sampleSize", element.getSampleSize(), -1);
}
for (int i = 0; i < element.getAttributeEstimate().size(); i++) {
composeStatisticAttributeEstimateComponent(t, "Statistic", "attributeEstimate", element.getAttributeEstimate().get(i), i);
}
+ for (int i = 0; i < element.getModelCharacteristic().size(); i++) {
+ composeStatisticModelCharacteristicComponent(t, "Statistic", "modelCharacteristic", element.getModelCharacteristic().get(i), i);
+ }
}
protected void composeStatisticSampleSizeComponent(Complex parent, String parentType, String name, Statistic.StatisticSampleSizeComponent element, int index) {
@@ -1649,9 +1655,6 @@ public class RdfParser extends RdfParserBase {
if (element.hasKnownDataCountElement()) {
composeInteger(t, "StatisticSampleSizeComponent", "knownDataCount", element.getKnownDataCountElement(), -1);
}
- if (element.hasNumeratorCountElement()) {
- composeInteger(t, "StatisticSampleSizeComponent", "numeratorCount", element.getNumeratorCountElement(), -1);
- }
}
protected void composeStatisticAttributeEstimateComponent(Complex parent, String parentType, String name, Statistic.StatisticAttributeEstimateComponent element, int index) {
@@ -1682,12 +1685,12 @@ public class RdfParser extends RdfParserBase {
if (element.hasRange()) {
composeRange(t, "StatisticAttributeEstimateComponent", "range", element.getRange(), -1);
}
- for (int i = 0; i < element.getEstimateQualifier().size(); i++) {
- composeStatisticAttributeEstimateEstimateQualifierComponent(t, "StatisticAttributeEstimateComponent", "estimateQualifier", element.getEstimateQualifier().get(i), i);
+ for (int i = 0; i < element.getAttributeEstimate().size(); i++) {
+ composeStatisticAttributeEstimateAttributeEstimateComponent(t, "StatisticAttributeEstimateComponent", "attributeEstimate", element.getAttributeEstimate().get(i), i);
}
}
- protected void composeStatisticAttributeEstimateEstimateQualifierComponent(Complex parent, String parentType, String name, Statistic.StatisticAttributeEstimateEstimateQualifierComponent element, int index) {
+ protected void composeStatisticAttributeEstimateAttributeEstimateComponent(Complex parent, String parentType, String name, Statistic.StatisticAttributeEstimateAttributeEstimateComponent element, int index) {
if (element == null)
return;
Complex t;
@@ -1696,28 +1699,28 @@ public class RdfParser extends RdfParserBase {
else {
t = parent.predicate("fhir:"+parentType+'.'+name);
}
- composeElement(t, "estimateQualifier", name, element, index);
+ composeElement(t, "attributeEstimate", name, element, index);
if (element.hasDescriptionElement()) {
- composeString(t, "StatisticAttributeEstimateEstimateQualifierComponent", "description", element.getDescriptionElement(), -1);
+ composeString(t, "StatisticAttributeEstimateAttributeEstimateComponent", "description", element.getDescriptionElement(), -1);
}
for (int i = 0; i < element.getNote().size(); i++) {
- composeAnnotation(t, "StatisticAttributeEstimateEstimateQualifierComponent", "note", element.getNote().get(i), i);
+ composeAnnotation(t, "StatisticAttributeEstimateAttributeEstimateComponent", "note", element.getNote().get(i), i);
}
if (element.hasType()) {
- composeCodeableConcept(t, "StatisticAttributeEstimateEstimateQualifierComponent", "type", element.getType(), -1);
+ composeCodeableConcept(t, "StatisticAttributeEstimateAttributeEstimateComponent", "type", element.getType(), -1);
}
if (element.hasQuantity()) {
- composeQuantity(t, "StatisticAttributeEstimateEstimateQualifierComponent", "quantity", element.getQuantity(), -1);
+ composeQuantity(t, "StatisticAttributeEstimateAttributeEstimateComponent", "quantity", element.getQuantity(), -1);
}
if (element.hasLevelElement()) {
- composeDecimal(t, "StatisticAttributeEstimateEstimateQualifierComponent", "level", element.getLevelElement(), -1);
+ composeDecimal(t, "StatisticAttributeEstimateAttributeEstimateComponent", "level", element.getLevelElement(), -1);
}
if (element.hasRange()) {
- composeRange(t, "StatisticAttributeEstimateEstimateQualifierComponent", "range", element.getRange(), -1);
+ composeRange(t, "StatisticAttributeEstimateAttributeEstimateComponent", "range", element.getRange(), -1);
}
}
- protected void composeSubstanceAmount(Complex parent, String parentType, String name, SubstanceAmount element, int index) {
+ protected void composeStatisticModelCharacteristicComponent(Complex parent, String parentType, String name, Statistic.StatisticModelCharacteristicComponent element, int index) {
if (element == null)
return;
Complex t;
@@ -1726,22 +1729,19 @@ public class RdfParser extends RdfParserBase {
else {
t = parent.predicate("fhir:"+parentType+'.'+name);
}
- composeBackboneType(t, "SubstanceAmount", name, element, index);
- if (element.hasAmount()) {
- composeType(t, "SubstanceAmount", "amount", element.getAmount(), -1);
+ composeElement(t, "modelCharacteristic", name, element, index);
+ if (element.hasCode()) {
+ composeCodeableConcept(t, "StatisticModelCharacteristicComponent", "code", element.getCode(), -1);
}
- if (element.hasAmountType()) {
- composeCodeableConcept(t, "SubstanceAmount", "amountType", element.getAmountType(), -1);
+ if (element.hasValue()) {
+ composeType(t, "StatisticModelCharacteristicComponent", "value", element.getValue(), -1);
}
- if (element.hasAmountTextElement()) {
- composeString(t, "SubstanceAmount", "amountText", element.getAmountTextElement(), -1);
- }
- if (element.hasReferenceRange()) {
- composeSubstanceAmountReferenceRangeComponent(t, "SubstanceAmount", "referenceRange", element.getReferenceRange(), -1);
+ for (int i = 0; i < element.getVariable().size(); i++) {
+ composeStatisticModelCharacteristicVariableComponent(t, "StatisticModelCharacteristicComponent", "variable", element.getVariable().get(i), i);
}
}
- protected void composeSubstanceAmountReferenceRangeComponent(Complex parent, String parentType, String name, SubstanceAmount.SubstanceAmountReferenceRangeComponent element, int index) {
+ protected void composeStatisticModelCharacteristicVariableComponent(Complex parent, String parentType, String name, Statistic.StatisticModelCharacteristicVariableComponent element, int index) {
if (element == null)
return;
Complex t;
@@ -1750,12 +1750,21 @@ public class RdfParser extends RdfParserBase {
else {
t = parent.predicate("fhir:"+parentType+'.'+name);
}
- composeElement(t, "referenceRange", name, element, index);
- if (element.hasLowLimit()) {
- composeQuantity(t, "SubstanceAmountReferenceRangeComponent", "lowLimit", element.getLowLimit(), -1);
+ composeElement(t, "variable", name, element, index);
+ if (element.hasVariableDefinition()) {
+ composeReference(t, "StatisticModelCharacteristicVariableComponent", "variableDefinition", element.getVariableDefinition(), -1);
}
- if (element.hasHighLimit()) {
- composeQuantity(t, "SubstanceAmountReferenceRangeComponent", "highLimit", element.getHighLimit(), -1);
+ if (element.hasHandlingElement()) {
+ composeEnum(t, "StatisticModelCharacteristicVariableComponent", "handling", element.getHandlingElement(), -1);
+ }
+ for (int i = 0; i < element.getValueCategory().size(); i++) {
+ composeCodeableConcept(t, "StatisticModelCharacteristicVariableComponent", "valueCategory", element.getValueCategory().get(i), i);
+ }
+ for (int i = 0; i < element.getValueQuantity().size(); i++) {
+ composeQuantity(t, "StatisticModelCharacteristicVariableComponent", "valueQuantity", element.getValueQuantity().get(i), i);
+ }
+ for (int i = 0; i < element.getValueRange().size(); i++) {
+ composeRange(t, "StatisticModelCharacteristicVariableComponent", "valueRange", element.getValueRange().get(i), i);
}
}
@@ -4626,9 +4635,6 @@ public class RdfParser extends RdfParserBase {
if (element.hasUrlElement()) {
composeUri(t, "Citation", "url", element.getUrlElement(), -1);
}
- if (element.hasVersionElement()) {
- composeString(t, "Citation", "version", element.getVersionElement(), -1);
- }
if (element.hasStatusElement()) {
composeEnum(t, "Citation", "status", element.getStatusElement(), -1);
}
@@ -4641,6 +4647,9 @@ public class RdfParser extends RdfParserBase {
for (int i = 0; i < element.getRelatedIdentifier().size(); i++) {
composeIdentifier(t, "Citation", "relatedIdentifier", element.getRelatedIdentifier().get(i), i);
}
+ for (int i = 0; i < element.getSummary().size(); i++) {
+ composeCitationSummaryComponent(t, "Citation", "summary", element.getSummary().get(i), i);
+ }
if (element.hasDateCitedElement()) {
composeDateTime(t, "Citation", "dateCited", element.getDateCitedElement(), -1);
}
@@ -4653,6 +4662,9 @@ public class RdfParser extends RdfParserBase {
if (element.hasJournal()) {
composeCitationJournalComponent(t, "Citation", "journal", element.getJournal(), -1);
}
+ if (element.hasPublicationInfo()) {
+ composeCitationPublicationInfoComponent(t, "Citation", "publicationInfo", element.getPublicationInfo(), -1);
+ }
if (element.hasArticleTitleElement()) {
composeMarkdown(t, "Citation", "articleTitle", element.getArticleTitleElement(), -1);
}
@@ -4674,14 +4686,8 @@ public class RdfParser extends RdfParserBase {
for (int i = 0; i < element.getAlternativeAbstract().size(); i++) {
composeCitationAlternativeAbstractComponent(t, "Citation", "alternativeAbstract", element.getAlternativeAbstract().get(i), i);
}
- if (element.hasAuthorList()) {
- composeCitationAuthorListComponent(t, "Citation", "authorList", element.getAuthorList(), -1);
- }
- for (int i = 0; i < element.getAuthorString().size(); i++) {
- composeCitationAuthorStringComponent(t, "Citation", "authorString", element.getAuthorString().get(i), i);
- }
- if (element.hasContributorList()) {
- composeCitationContributorListComponent(t, "Citation", "contributorList", element.getContributorList(), -1);
+ if (element.hasContributorship()) {
+ composeCitationContributorshipComponent(t, "Citation", "contributorship", element.getContributorship(), -1);
}
if (element.hasArticleLanguage()) {
composeCodeableConcept(t, "Citation", "articleLanguage", element.getArticleLanguage(), -1);
@@ -4692,6 +4698,9 @@ public class RdfParser extends RdfParserBase {
for (int i = 0; i < element.getClassifier().size(); i++) {
composeCodeableConcept(t, "Citation", "classifier", element.getClassifier().get(i), i);
}
+ for (int i = 0; i < element.getKeywordList().size(); i++) {
+ composeCitationKeywordListComponent(t, "Citation", "keywordList", element.getKeywordList().get(i), i);
+ }
for (int i = 0; i < element.getRelatedArtifact().size(); i++) {
composeRelatedArtifact(t, "Citation", "relatedArtifact", element.getRelatedArtifact().get(i), i);
}
@@ -4703,6 +4712,24 @@ public class RdfParser extends RdfParserBase {
}
}
+ protected void composeCitationSummaryComponent(Complex parent, String parentType, String name, Citation.CitationSummaryComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "summary", name, element, index);
+ if (element.hasStyle()) {
+ composeCodeableConcept(t, "CitationSummaryComponent", "style", element.getStyle(), -1);
+ }
+ if (element.hasTextElement()) {
+ composeMarkdown(t, "CitationSummaryComponent", "text", element.getTextElement(), -1);
+ }
+ }
+
protected void composeCitationVariantCitationComponent(Complex parent, String parentType, String name, Citation.CitationVariantCitationComponent element, int index) {
if (element == null)
return;
@@ -4767,8 +4794,92 @@ public class RdfParser extends RdfParserBase {
if (element.hasIssueElement()) {
composeString(t, "CitationJournalJournalIssueComponent", "issue", element.getIssueElement(), -1);
}
- if (element.hasPublicationDateElement()) {
- composeString(t, "CitationJournalJournalIssueComponent", "publicationDate", element.getPublicationDateElement(), -1);
+ if (element.hasPublicationDate()) {
+ composeCitationJournalJournalIssuePublicationDateComponent(t, "CitationJournalJournalIssueComponent", "publicationDate", element.getPublicationDate(), -1);
+ }
+ }
+
+ protected void composeCitationJournalJournalIssuePublicationDateComponent(Complex parent, String parentType, String name, Citation.CitationJournalJournalIssuePublicationDateComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "publicationDate", name, element, index);
+ if (element.hasDateElement()) {
+ composeDate(t, "CitationJournalJournalIssuePublicationDateComponent", "date", element.getDateElement(), -1);
+ }
+ if (element.hasYearElement()) {
+ composeString(t, "CitationJournalJournalIssuePublicationDateComponent", "year", element.getYearElement(), -1);
+ }
+ if (element.hasMonthElement()) {
+ composeString(t, "CitationJournalJournalIssuePublicationDateComponent", "month", element.getMonthElement(), -1);
+ }
+ if (element.hasDayElement()) {
+ composeString(t, "CitationJournalJournalIssuePublicationDateComponent", "day", element.getDayElement(), -1);
+ }
+ if (element.hasSeasonElement()) {
+ composeString(t, "CitationJournalJournalIssuePublicationDateComponent", "season", element.getSeasonElement(), -1);
+ }
+ if (element.hasTextElement()) {
+ composeString(t, "CitationJournalJournalIssuePublicationDateComponent", "text", element.getTextElement(), -1);
+ }
+ }
+
+ protected void composeCitationPublicationInfoComponent(Complex parent, String parentType, String name, Citation.CitationPublicationInfoComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "publicationInfo", name, element, index);
+ if (element.hasPublishedIn()) {
+ composeCitationPublicationInfoPublishedInComponent(t, "CitationPublicationInfoComponent", "publishedIn", element.getPublishedIn(), -1);
+ }
+ if (element.hasEntryDateElement()) {
+ composeDateTime(t, "CitationPublicationInfoComponent", "entryDate", element.getEntryDateElement(), -1);
+ }
+ if (element.hasRevisionDateElement()) {
+ composeDateTime(t, "CitationPublicationInfoComponent", "revisionDate", element.getRevisionDateElement(), -1);
+ }
+ if (element.hasPageCountElement()) {
+ composeString(t, "CitationPublicationInfoComponent", "pageCount", element.getPageCountElement(), -1);
+ }
+ }
+
+ protected void composeCitationPublicationInfoPublishedInComponent(Complex parent, String parentType, String name, Citation.CitationPublicationInfoPublishedInComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "publishedIn", name, element, index);
+ if (element.hasType()) {
+ composeCodeableConcept(t, "CitationPublicationInfoPublishedInComponent", "type", element.getType(), -1);
+ }
+ for (int i = 0; i < element.getIdentifier().size(); i++) {
+ composeIdentifier(t, "CitationPublicationInfoPublishedInComponent", "identifier", element.getIdentifier().get(i), i);
+ }
+ if (element.hasNameElement()) {
+ composeString(t, "CitationPublicationInfoPublishedInComponent", "name", element.getNameElement(), -1);
+ }
+ if (element.hasPublisher()) {
+ composeReference(t, "CitationPublicationInfoPublishedInComponent", "publisher", element.getPublisher(), -1);
+ }
+ if (element.hasPublisherLocationElement()) {
+ composeString(t, "CitationPublicationInfoPublishedInComponent", "publisherLocation", element.getPublisherLocationElement(), -1);
+ }
+ if (element.hasStartDateElement()) {
+ composeDate(t, "CitationPublicationInfoPublishedInComponent", "startDate", element.getStartDateElement(), -1);
}
}
@@ -4856,7 +4967,7 @@ public class RdfParser extends RdfParserBase {
}
}
- protected void composeCitationAuthorListComponent(Complex parent, String parentType, String name, Citation.CitationAuthorListComponent element, int index) {
+ protected void composeCitationContributorshipComponent(Complex parent, String parentType, String name, Citation.CitationContributorshipComponent element, int index) {
if (element == null)
return;
Complex t;
@@ -4865,16 +4976,19 @@ public class RdfParser extends RdfParserBase {
else {
t = parent.predicate("fhir:"+parentType+'.'+name);
}
- composeBackboneElement(t, "authorList", name, element, index);
+ composeBackboneElement(t, "contributorship", name, element, index);
if (element.hasCompleteElement()) {
- composeBoolean(t, "CitationAuthorListComponent", "complete", element.getCompleteElement(), -1);
+ composeBoolean(t, "CitationContributorshipComponent", "complete", element.getCompleteElement(), -1);
}
- for (int i = 0; i < element.getAuthor().size(); i++) {
- composeCitationAuthorListAuthorComponent(t, "CitationAuthorListComponent", "author", element.getAuthor().get(i), i);
+ for (int i = 0; i < element.getEntry().size(); i++) {
+ composeCitationContributorshipEntryComponent(t, "CitationContributorshipComponent", "entry", element.getEntry().get(i), i);
+ }
+ for (int i = 0; i < element.getSummary().size(); i++) {
+ composeCitationContributorshipSummaryComponent(t, "CitationContributorshipComponent", "summary", element.getSummary().get(i), i);
}
}
- protected void composeCitationAuthorListAuthorComponent(Complex parent, String parentType, String name, Citation.CitationAuthorListAuthorComponent element, int index) {
+ protected void composeCitationContributorshipEntryComponent(Complex parent, String parentType, String name, Citation.CitationContributorshipEntryComponent element, int index) {
if (element == null)
return;
Complex t;
@@ -4883,139 +4997,43 @@ public class RdfParser extends RdfParserBase {
else {
t = parent.predicate("fhir:"+parentType+'.'+name);
}
- composeBackboneElement(t, "author", name, element, index);
- if (element.hasLastNameElement()) {
- composeString(t, "CitationAuthorListAuthorComponent", "lastName", element.getLastNameElement(), -1);
- }
- if (element.hasForeNameElement()) {
- composeString(t, "CitationAuthorListAuthorComponent", "foreName", element.getForeNameElement(), -1);
- }
- if (element.hasSuffixElement()) {
- composeString(t, "CitationAuthorListAuthorComponent", "suffix", element.getSuffixElement(), -1);
+ composeBackboneElement(t, "entry", name, element, index);
+ if (element.hasName()) {
+ composeHumanName(t, "CitationContributorshipEntryComponent", "name", element.getName(), -1);
}
if (element.hasInitialsElement()) {
- composeString(t, "CitationAuthorListAuthorComponent", "initials", element.getInitialsElement(), -1);
+ composeString(t, "CitationContributorshipEntryComponent", "initials", element.getInitialsElement(), -1);
}
if (element.hasCollectiveNameElement()) {
- composeString(t, "CitationAuthorListAuthorComponent", "collectiveName", element.getCollectiveNameElement(), -1);
+ composeString(t, "CitationContributorshipEntryComponent", "collectiveName", element.getCollectiveNameElement(), -1);
}
for (int i = 0; i < element.getIdentifier().size(); i++) {
- composeIdentifier(t, "CitationAuthorListAuthorComponent", "identifier", element.getIdentifier().get(i), i);
+ composeIdentifier(t, "CitationContributorshipEntryComponent", "identifier", element.getIdentifier().get(i), i);
}
for (int i = 0; i < element.getAffiliationInfo().size(); i++) {
- composeCitationAuthorListAuthorAffiliationInfoComponent(t, "CitationAuthorListAuthorComponent", "affiliationInfo", element.getAffiliationInfo().get(i), i);
+ composeCitationContributorshipEntryAffiliationInfoComponent(t, "CitationContributorshipEntryComponent", "affiliationInfo", element.getAffiliationInfo().get(i), i);
}
for (int i = 0; i < element.getAddress().size(); i++) {
- composeString(t, "CitationAuthorListAuthorComponent", "address", element.getAddress().get(i), i);
+ composeAddress(t, "CitationContributorshipEntryComponent", "address", element.getAddress().get(i), i);
}
for (int i = 0; i < element.getTelecom().size(); i++) {
- composeContactPoint(t, "CitationAuthorListAuthorComponent", "telecom", element.getTelecom().get(i), i);
- }
- if (element.hasCorrespondingAuthorElement()) {
- composeBoolean(t, "CitationAuthorListAuthorComponent", "correspondingAuthor", element.getCorrespondingAuthorElement(), -1);
- }
- if (element.hasListOrderElement()) {
- composePositiveInt(t, "CitationAuthorListAuthorComponent", "listOrder", element.getListOrderElement(), -1);
- }
- }
-
- protected void composeCitationAuthorListAuthorAffiliationInfoComponent(Complex parent, String parentType, String name, Citation.CitationAuthorListAuthorAffiliationInfoComponent element, int index) {
- if (element == null)
- return;
- Complex t;
- if (Utilities.noString(parentType))
- t = parent;
- else {
- t = parent.predicate("fhir:"+parentType+'.'+name);
- }
- composeBackboneElement(t, "affiliationInfo", name, element, index);
- if (element.hasAffiliationElement()) {
- composeString(t, "CitationAuthorListAuthorAffiliationInfoComponent", "affiliation", element.getAffiliationElement(), -1);
- }
- if (element.hasRoleElement()) {
- composeString(t, "CitationAuthorListAuthorAffiliationInfoComponent", "role", element.getRoleElement(), -1);
- }
- for (int i = 0; i < element.getIdentifier().size(); i++) {
- composeIdentifier(t, "CitationAuthorListAuthorAffiliationInfoComponent", "identifier", element.getIdentifier().get(i), i);
- }
- }
-
- protected void composeCitationAuthorStringComponent(Complex parent, String parentType, String name, Citation.CitationAuthorStringComponent element, int index) {
- if (element == null)
- return;
- Complex t;
- if (Utilities.noString(parentType))
- t = parent;
- else {
- t = parent.predicate("fhir:"+parentType+'.'+name);
- }
- composeBackboneElement(t, "authorString", name, element, index);
- if (element.hasSource()) {
- composeCodeableConcept(t, "CitationAuthorStringComponent", "source", element.getSource(), -1);
- }
- if (element.hasValueElement()) {
- composeString(t, "CitationAuthorStringComponent", "value", element.getValueElement(), -1);
- }
- }
-
- protected void composeCitationContributorListComponent(Complex parent, String parentType, String name, Citation.CitationContributorListComponent element, int index) {
- if (element == null)
- return;
- Complex t;
- if (Utilities.noString(parentType))
- t = parent;
- else {
- t = parent.predicate("fhir:"+parentType+'.'+name);
- }
- composeBackboneElement(t, "contributorList", name, element, index);
- if (element.hasCompleteElement()) {
- composeBoolean(t, "CitationContributorListComponent", "complete", element.getCompleteElement(), -1);
- }
- for (int i = 0; i < element.getContributor().size(); i++) {
- composeCitationContributorListContributorComponent(t, "CitationContributorListComponent", "contributor", element.getContributor().get(i), i);
- }
- }
-
- protected void composeCitationContributorListContributorComponent(Complex parent, String parentType, String name, Citation.CitationContributorListContributorComponent element, int index) {
- if (element == null)
- return;
- Complex t;
- if (Utilities.noString(parentType))
- t = parent;
- else {
- t = parent.predicate("fhir:"+parentType+'.'+name);
- }
- composeBackboneElement(t, "contributor", name, element, index);
- if (element.hasLastNameElement()) {
- composeString(t, "CitationContributorListContributorComponent", "lastName", element.getLastNameElement(), -1);
- }
- if (element.hasForeNameElement()) {
- composeString(t, "CitationContributorListContributorComponent", "foreName", element.getForeNameElement(), -1);
- }
- if (element.hasSuffixElement()) {
- composeString(t, "CitationContributorListContributorComponent", "suffix", element.getSuffixElement(), -1);
- }
- if (element.hasInitialsElement()) {
- composeString(t, "CitationContributorListContributorComponent", "initials", element.getInitialsElement(), -1);
- }
- if (element.hasCollectiveNameElement()) {
- composeString(t, "CitationContributorListContributorComponent", "collectiveName", element.getCollectiveNameElement(), -1);
- }
- for (int i = 0; i < element.getIdentifier().size(); i++) {
- composeIdentifier(t, "CitationContributorListContributorComponent", "identifier", element.getIdentifier().get(i), i);
+ composeContactPoint(t, "CitationContributorshipEntryComponent", "telecom", element.getTelecom().get(i), i);
}
for (int i = 0; i < element.getContribution().size(); i++) {
- composeCodeableConcept(t, "CitationContributorListContributorComponent", "contribution", element.getContribution().get(i), i);
+ composeCodeableConcept(t, "CitationContributorshipEntryComponent", "contribution", element.getContribution().get(i), i);
}
- for (int i = 0; i < element.getAffiliationInfo().size(); i++) {
- composeCitationContributorListContributorAffiliationInfoComponent(t, "CitationContributorListContributorComponent", "affiliationInfo", element.getAffiliationInfo().get(i), i);
+ if (element.hasNotAnAuthorElement()) {
+ composeBoolean(t, "CitationContributorshipEntryComponent", "notAnAuthor", element.getNotAnAuthorElement(), -1);
+ }
+ if (element.hasCorrespondingAuthorElement()) {
+ composeBoolean(t, "CitationContributorshipEntryComponent", "correspondingAuthor", element.getCorrespondingAuthorElement(), -1);
}
if (element.hasListOrderElement()) {
- composePositiveInt(t, "CitationContributorListContributorComponent", "listOrder", element.getListOrderElement(), -1);
+ composePositiveInt(t, "CitationContributorshipEntryComponent", "listOrder", element.getListOrderElement(), -1);
}
}
- protected void composeCitationContributorListContributorAffiliationInfoComponent(Complex parent, String parentType, String name, Citation.CitationContributorListContributorAffiliationInfoComponent element, int index) {
+ protected void composeCitationContributorshipEntryAffiliationInfoComponent(Complex parent, String parentType, String name, Citation.CitationContributorshipEntryAffiliationInfoComponent element, int index) {
if (element == null)
return;
Complex t;
@@ -5026,13 +5044,37 @@ public class RdfParser extends RdfParserBase {
}
composeBackboneElement(t, "affiliationInfo", name, element, index);
if (element.hasAffiliationElement()) {
- composeString(t, "CitationContributorListContributorAffiliationInfoComponent", "affiliation", element.getAffiliationElement(), -1);
+ composeString(t, "CitationContributorshipEntryAffiliationInfoComponent", "affiliation", element.getAffiliationElement(), -1);
}
if (element.hasRoleElement()) {
- composeString(t, "CitationContributorListContributorAffiliationInfoComponent", "role", element.getRoleElement(), -1);
+ composeString(t, "CitationContributorshipEntryAffiliationInfoComponent", "role", element.getRoleElement(), -1);
}
for (int i = 0; i < element.getIdentifier().size(); i++) {
- composeIdentifier(t, "CitationContributorListContributorAffiliationInfoComponent", "identifier", element.getIdentifier().get(i), i);
+ composeIdentifier(t, "CitationContributorshipEntryAffiliationInfoComponent", "identifier", element.getIdentifier().get(i), i);
+ }
+ }
+
+ protected void composeCitationContributorshipSummaryComponent(Complex parent, String parentType, String name, Citation.CitationContributorshipSummaryComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "summary", name, element, index);
+ if (element.hasType()) {
+ composeCodeableConcept(t, "CitationContributorshipSummaryComponent", "type", element.getType(), -1);
+ }
+ if (element.hasStyle()) {
+ composeCodeableConcept(t, "CitationContributorshipSummaryComponent", "style", element.getStyle(), -1);
+ }
+ if (element.hasSource()) {
+ composeCodeableConcept(t, "CitationContributorshipSummaryComponent", "source", element.getSource(), -1);
+ }
+ if (element.hasValueElement()) {
+ composeMarkdown(t, "CitationContributorshipSummaryComponent", "value", element.getValueElement(), -1);
}
}
@@ -5058,6 +5100,9 @@ public class RdfParser extends RdfParserBase {
if (element.hasPagination()) {
composeCitationAlternativeFormPaginationComponent(t, "CitationAlternativeFormComponent", "pagination", element.getPagination(), -1);
}
+ if (element.hasPublicationInfo()) {
+ composeCitationAlternativeFormPublicationInfoComponent(t, "CitationAlternativeFormComponent", "publicationInfo", element.getPublicationInfo(), -1);
+ }
}
protected void composeCitationAlternativeFormJournalIssueComponent(Complex parent, String parentType, String name, Citation.CitationAlternativeFormJournalIssueComponent element, int index) {
@@ -5079,8 +5124,38 @@ public class RdfParser extends RdfParserBase {
if (element.hasIssueElement()) {
composeString(t, "CitationAlternativeFormJournalIssueComponent", "issue", element.getIssueElement(), -1);
}
- if (element.hasPublicationDateElement()) {
- composeString(t, "CitationAlternativeFormJournalIssueComponent", "publicationDate", element.getPublicationDateElement(), -1);
+ if (element.hasPublicationDate()) {
+ composeCitationAlternativeFormJournalIssuePublicationDateComponent(t, "CitationAlternativeFormJournalIssueComponent", "publicationDate", element.getPublicationDate(), -1);
+ }
+ }
+
+ protected void composeCitationAlternativeFormJournalIssuePublicationDateComponent(Complex parent, String parentType, String name, Citation.CitationAlternativeFormJournalIssuePublicationDateComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "publicationDate", name, element, index);
+ if (element.hasDateElement()) {
+ composeDate(t, "CitationAlternativeFormJournalIssuePublicationDateComponent", "date", element.getDateElement(), -1);
+ }
+ if (element.hasYearElement()) {
+ composeString(t, "CitationAlternativeFormJournalIssuePublicationDateComponent", "year", element.getYearElement(), -1);
+ }
+ if (element.hasMonthElement()) {
+ composeString(t, "CitationAlternativeFormJournalIssuePublicationDateComponent", "month", element.getMonthElement(), -1);
+ }
+ if (element.hasDayElement()) {
+ composeString(t, "CitationAlternativeFormJournalIssuePublicationDateComponent", "day", element.getDayElement(), -1);
+ }
+ if (element.hasSeasonElement()) {
+ composeString(t, "CitationAlternativeFormJournalIssuePublicationDateComponent", "season", element.getSeasonElement(), -1);
+ }
+ if (element.hasTextElement()) {
+ composeString(t, "CitationAlternativeFormJournalIssuePublicationDateComponent", "text", element.getTextElement(), -1);
}
}
@@ -5105,6 +5180,93 @@ public class RdfParser extends RdfParserBase {
}
}
+ protected void composeCitationAlternativeFormPublicationInfoComponent(Complex parent, String parentType, String name, Citation.CitationAlternativeFormPublicationInfoComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "publicationInfo", name, element, index);
+ if (element.hasPublishedIn()) {
+ composeCitationAlternativeFormPublicationInfoPublishedInComponent(t, "CitationAlternativeFormPublicationInfoComponent", "publishedIn", element.getPublishedIn(), -1);
+ }
+ if (element.hasEntryDateElement()) {
+ composeDateTime(t, "CitationAlternativeFormPublicationInfoComponent", "entryDate", element.getEntryDateElement(), -1);
+ }
+ if (element.hasRevisionDateElement()) {
+ composeDateTime(t, "CitationAlternativeFormPublicationInfoComponent", "revisionDate", element.getRevisionDateElement(), -1);
+ }
+ if (element.hasPageCountElement()) {
+ composeString(t, "CitationAlternativeFormPublicationInfoComponent", "pageCount", element.getPageCountElement(), -1);
+ }
+ }
+
+ protected void composeCitationAlternativeFormPublicationInfoPublishedInComponent(Complex parent, String parentType, String name, Citation.CitationAlternativeFormPublicationInfoPublishedInComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "publishedIn", name, element, index);
+ if (element.hasType()) {
+ composeCodeableConcept(t, "CitationAlternativeFormPublicationInfoPublishedInComponent", "type", element.getType(), -1);
+ }
+ if (element.hasNameElement()) {
+ composeString(t, "CitationAlternativeFormPublicationInfoPublishedInComponent", "name", element.getNameElement(), -1);
+ }
+ if (element.hasPublisher()) {
+ composeReference(t, "CitationAlternativeFormPublicationInfoPublishedInComponent", "publisher", element.getPublisher(), -1);
+ }
+ if (element.hasPublisherLocationElement()) {
+ composeString(t, "CitationAlternativeFormPublicationInfoPublishedInComponent", "publisherLocation", element.getPublisherLocationElement(), -1);
+ }
+ if (element.hasStartDateElement()) {
+ composeDate(t, "CitationAlternativeFormPublicationInfoPublishedInComponent", "startDate", element.getStartDateElement(), -1);
+ }
+ }
+
+ protected void composeCitationKeywordListComponent(Complex parent, String parentType, String name, Citation.CitationKeywordListComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "keywordList", name, element, index);
+ if (element.hasOwnerElement()) {
+ composeString(t, "CitationKeywordListComponent", "owner", element.getOwnerElement(), -1);
+ }
+ for (int i = 0; i < element.getKeyword().size(); i++) {
+ composeCitationKeywordListKeywordComponent(t, "CitationKeywordListComponent", "keyword", element.getKeyword().get(i), i);
+ }
+ }
+
+ protected void composeCitationKeywordListKeywordComponent(Complex parent, String parentType, String name, Citation.CitationKeywordListKeywordComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "keyword", name, element, index);
+ if (element.hasMajorTopicElement()) {
+ composeBoolean(t, "CitationKeywordListKeywordComponent", "majorTopic", element.getMajorTopicElement(), -1);
+ }
+ if (element.hasValueElement()) {
+ composeString(t, "CitationKeywordListKeywordComponent", "value", element.getValueElement(), -1);
+ }
+ }
+
protected void composeCitationMedlinePubMedComponent(Complex parent, String parentType, String name, Citation.CitationMedlinePubMedComponent element, int index) {
if (element == null)
return;
@@ -6874,7 +7036,7 @@ public class RdfParser extends RdfParserBase {
composeString(t, "Composition", "title", element.getTitleElement(), -1);
}
if (element.hasConfidentialityElement()) {
- composeEnum(t, "Composition", "confidentiality", element.getConfidentialityElement(), -1);
+ composeCode(t, "Composition", "confidentiality", element.getConfidentialityElement(), -1);
}
for (int i = 0; i < element.getAttester().size(); i++) {
composeCompositionAttesterComponent(t, "Composition", "attester", element.getAttester().get(i), i);
@@ -7515,8 +7677,11 @@ public class RdfParser extends RdfParserBase {
for (int i = 0; i < element.getPerformer().size(); i++) {
composeReference(t, "Consent", "performer", element.getPerformer().get(i), i);
}
- for (int i = 0; i < element.getOrganization().size(); i++) {
- composeReference(t, "Consent", "organization", element.getOrganization().get(i), i);
+ for (int i = 0; i < element.getManager().size(); i++) {
+ composeReference(t, "Consent", "manager", element.getManager().get(i), i);
+ }
+ for (int i = 0; i < element.getController().size(); i++) {
+ composeReference(t, "Consent", "controller", element.getController().get(i), i);
}
for (int i = 0; i < element.getSourceAttachment().size(); i++) {
composeAttachment(t, "Consent", "sourceAttachment", element.getSourceAttachment().get(i), i);
@@ -9588,12 +9753,12 @@ public class RdfParser extends RdfParserBase {
t = parent.predicate("fhir:"+parentType+'.'+name);
}
composeDomainResource(t, "DocumentReference", name, element, index);
- if (element.hasMasterIdentifier()) {
- composeIdentifier(t, "DocumentReference", "masterIdentifier", element.getMasterIdentifier(), -1);
- }
for (int i = 0; i < element.getIdentifier().size(); i++) {
composeIdentifier(t, "DocumentReference", "identifier", element.getIdentifier().get(i), i);
}
+ for (int i = 0; i < element.getBasedOn().size(); i++) {
+ composeReference(t, "DocumentReference", "basedOn", element.getBasedOn().get(i), i);
+ }
if (element.hasStatusElement()) {
composeEnum(t, "DocumentReference", "status", element.getStatusElement(), -1);
}
@@ -9609,14 +9774,29 @@ public class RdfParser extends RdfParserBase {
if (element.hasSubject()) {
composeReference(t, "DocumentReference", "subject", element.getSubject(), -1);
}
+ for (int i = 0; i < element.getEncounter().size(); i++) {
+ composeReference(t, "DocumentReference", "encounter", element.getEncounter().get(i), i);
+ }
+ for (int i = 0; i < element.getEvent().size(); i++) {
+ composeCodeableConcept(t, "DocumentReference", "event", element.getEvent().get(i), i);
+ }
+ if (element.hasFacilityType()) {
+ composeCodeableConcept(t, "DocumentReference", "facilityType", element.getFacilityType(), -1);
+ }
+ if (element.hasPracticeSetting()) {
+ composeCodeableConcept(t, "DocumentReference", "practiceSetting", element.getPracticeSetting(), -1);
+ }
+ if (element.hasPeriod()) {
+ composePeriod(t, "DocumentReference", "period", element.getPeriod(), -1);
+ }
if (element.hasDateElement()) {
composeInstant(t, "DocumentReference", "date", element.getDateElement(), -1);
}
for (int i = 0; i < element.getAuthor().size(); i++) {
composeReference(t, "DocumentReference", "author", element.getAuthor().get(i), i);
}
- if (element.hasAuthenticator()) {
- composeReference(t, "DocumentReference", "authenticator", element.getAuthenticator(), -1);
+ for (int i = 0; i < element.getAttester().size(); i++) {
+ composeDocumentReferenceAttesterComponent(t, "DocumentReference", "attester", element.getAttester().get(i), i);
}
if (element.hasCustodian()) {
composeReference(t, "DocumentReference", "custodian", element.getCustodian(), -1);
@@ -9625,7 +9805,7 @@ public class RdfParser extends RdfParserBase {
composeDocumentReferenceRelatesToComponent(t, "DocumentReference", "relatesTo", element.getRelatesTo().get(i), i);
}
if (element.hasDescriptionElement()) {
- composeString(t, "DocumentReference", "description", element.getDescriptionElement(), -1);
+ composeMarkdown(t, "DocumentReference", "description", element.getDescriptionElement(), -1);
}
for (int i = 0; i < element.getSecurityLabel().size(); i++) {
composeCodeableConcept(t, "DocumentReference", "securityLabel", element.getSecurityLabel().get(i), i);
@@ -9633,8 +9813,32 @@ public class RdfParser extends RdfParserBase {
for (int i = 0; i < element.getContent().size(); i++) {
composeDocumentReferenceContentComponent(t, "DocumentReference", "content", element.getContent().get(i), i);
}
- if (element.hasContext()) {
- composeDocumentReferenceContextComponent(t, "DocumentReference", "context", element.getContext(), -1);
+ if (element.hasSourcePatientInfo()) {
+ composeReference(t, "DocumentReference", "sourcePatientInfo", element.getSourcePatientInfo(), -1);
+ }
+ for (int i = 0; i < element.getRelated().size(); i++) {
+ composeReference(t, "DocumentReference", "related", element.getRelated().get(i), i);
+ }
+ }
+
+ protected void composeDocumentReferenceAttesterComponent(Complex parent, String parentType, String name, DocumentReference.DocumentReferenceAttesterComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "attester", name, element, index);
+ if (element.hasModeElement()) {
+ composeEnum(t, "DocumentReferenceAttesterComponent", "mode", element.getModeElement(), -1);
+ }
+ if (element.hasTimeElement()) {
+ composeDateTime(t, "DocumentReferenceAttesterComponent", "time", element.getTimeElement(), -1);
+ }
+ if (element.hasParty()) {
+ composeReference(t, "DocumentReferenceAttesterComponent", "party", element.getParty(), -1);
}
}
@@ -9672,41 +9876,8 @@ public class RdfParser extends RdfParserBase {
if (element.hasFormat()) {
composeCoding(t, "DocumentReferenceContentComponent", "format", element.getFormat(), -1);
}
- }
-
- protected void composeDocumentReferenceContextComponent(Complex parent, String parentType, String name, DocumentReference.DocumentReferenceContextComponent element, int index) {
- if (element == null)
- return;
- Complex t;
- if (Utilities.noString(parentType))
- t = parent;
- else {
- t = parent.predicate("fhir:"+parentType+'.'+name);
- }
- composeBackboneElement(t, "context", name, element, index);
- for (int i = 0; i < element.getEncounter().size(); i++) {
- composeReference(t, "DocumentReferenceContextComponent", "encounter", element.getEncounter().get(i), i);
- }
- for (int i = 0; i < element.getEvent().size(); i++) {
- composeCodeableConcept(t, "DocumentReferenceContextComponent", "event", element.getEvent().get(i), i);
- }
- if (element.hasPeriod()) {
- composePeriod(t, "DocumentReferenceContextComponent", "period", element.getPeriod(), -1);
- }
- if (element.hasFacilityType()) {
- composeCodeableConcept(t, "DocumentReferenceContextComponent", "facilityType", element.getFacilityType(), -1);
- }
- if (element.hasPracticeSetting()) {
- composeCodeableConcept(t, "DocumentReferenceContextComponent", "practiceSetting", element.getPracticeSetting(), -1);
- }
- if (element.hasSourcePatientInfo()) {
- composeReference(t, "DocumentReferenceContextComponent", "sourcePatientInfo", element.getSourcePatientInfo(), -1);
- }
- for (int i = 0; i < element.getRelated().size(); i++) {
- composeReference(t, "DocumentReferenceContextComponent", "related", element.getRelated().get(i), i);
- }
- for (int i = 0; i < element.getBasedOn().size(); i++) {
- composeReference(t, "DocumentReferenceContextComponent", "basedOn", element.getBasedOn().get(i), i);
+ if (element.hasIdentifier()) {
+ composeIdentifier(t, "DocumentReferenceContentComponent", "identifier", element.getIdentifier(), -1);
}
}
@@ -10266,8 +10437,23 @@ public class RdfParser extends RdfParserBase {
if (element.hasLastReviewDateElement()) {
composeDate(t, "Evidence", "lastReviewDate", element.getLastReviewDateElement(), -1);
}
- for (int i = 0; i < element.getContributor().size(); i++) {
- composeContributor(t, "Evidence", "contributor", element.getContributor().get(i), i);
+ if (element.hasPublisherElement()) {
+ composeString(t, "Evidence", "publisher", element.getPublisherElement(), -1);
+ }
+ for (int i = 0; i < element.getContact().size(); i++) {
+ composeContactDetail(t, "Evidence", "contact", element.getContact().get(i), i);
+ }
+ for (int i = 0; i < element.getAuthor().size(); i++) {
+ composeContactDetail(t, "Evidence", "author", element.getAuthor().get(i), i);
+ }
+ for (int i = 0; i < element.getEditor().size(); i++) {
+ composeContactDetail(t, "Evidence", "editor", element.getEditor().get(i), i);
+ }
+ for (int i = 0; i < element.getReviewer().size(); i++) {
+ composeContactDetail(t, "Evidence", "reviewer", element.getReviewer().get(i), i);
+ }
+ for (int i = 0; i < element.getEndorser().size(); i++) {
+ composeContactDetail(t, "Evidence", "endorser", element.getEndorser().get(i), i);
}
for (int i = 0; i < element.getRelatedArtifact().size(); i++) {
composeRelatedArtifact(t, "Evidence", "relatedArtifact", element.getRelatedArtifact().get(i), i);
@@ -10344,8 +10530,8 @@ public class RdfParser extends RdfParserBase {
if (element.hasDescriptionElement()) {
composeString(t, "EvidenceCertaintyComponent", "description", element.getDescriptionElement(), -1);
}
- if (element.hasNote()) {
- composeAnnotation(t, "EvidenceCertaintyComponent", "note", element.getNote(), -1);
+ for (int i = 0; i < element.getNote().size(); i++) {
+ composeAnnotation(t, "EvidenceCertaintyComponent", "note", element.getNote().get(i), i);
}
for (int i = 0; i < element.getRating().size(); i++) {
composeCodeableConcept(t, "EvidenceCertaintyComponent", "rating", element.getRating().get(i), i);
@@ -10368,8 +10554,8 @@ public class RdfParser extends RdfParserBase {
if (element.hasDescriptionElement()) {
composeString(t, "EvidenceCertaintyCertaintySubcomponentComponent", "description", element.getDescriptionElement(), -1);
}
- if (element.hasNote()) {
- composeAnnotation(t, "EvidenceCertaintyCertaintySubcomponentComponent", "note", element.getNote(), -1);
+ for (int i = 0; i < element.getNote().size(); i++) {
+ composeAnnotation(t, "EvidenceCertaintyCertaintySubcomponentComponent", "note", element.getNote().get(i), i);
}
for (int i = 0; i < element.getType().size(); i++) {
composeCodeableConcept(t, "EvidenceCertaintyCertaintySubcomponentComponent", "type", element.getType().get(i), i);
@@ -10379,7 +10565,7 @@ public class RdfParser extends RdfParserBase {
}
}
- protected void composeEvidenceFocus(Complex parent, String parentType, String name, EvidenceFocus element, int index) {
+ protected void composeEvidenceReport(Complex parent, String parentType, String name, EvidenceReport element, int index) {
if (element == null)
return;
Complex t;
@@ -10388,46 +10574,82 @@ public class RdfParser extends RdfParserBase {
else {
t = parent.predicate("fhir:"+parentType+'.'+name);
}
- composeMetadataResource(t, "EvidenceFocus", name, element, index);
+ composeMetadataResource(t, "EvidenceReport", name, element, index);
if (element.hasUrlElement()) {
- composeUri(t, "EvidenceFocus", "url", element.getUrlElement(), -1);
- }
- for (int i = 0; i < element.getIdentifier().size(); i++) {
- composeIdentifier(t, "EvidenceFocus", "identifier", element.getIdentifier().get(i), i);
- }
- if (element.hasVersionElement()) {
- composeString(t, "EvidenceFocus", "version", element.getVersionElement(), -1);
- }
- if (element.hasNameElement()) {
- composeString(t, "EvidenceFocus", "name", element.getNameElement(), -1);
+ composeUri(t, "EvidenceReport", "url", element.getUrlElement(), -1);
}
if (element.hasStatusElement()) {
- composeEnum(t, "EvidenceFocus", "status", element.getStatusElement(), -1);
+ composeEnum(t, "EvidenceReport", "status", element.getStatusElement(), -1);
}
for (int i = 0; i < element.getUseContext().size(); i++) {
- composeUsageContext(t, "EvidenceFocus", "useContext", element.getUseContext().get(i), i);
+ composeUsageContext(t, "EvidenceReport", "useContext", element.getUseContext().get(i), i);
}
- if (element.hasDateElement()) {
- composeDateTime(t, "EvidenceFocus", "date", element.getDateElement(), -1);
+ for (int i = 0; i < element.getIdentifier().size(); i++) {
+ composeIdentifier(t, "EvidenceReport", "identifier", element.getIdentifier().get(i), i);
}
- for (int i = 0; i < element.getNote().size(); i++) {
- composeAnnotation(t, "EvidenceFocus", "note", element.getNote().get(i), i);
- }
- if (element.hasCopyrightElement()) {
- composeMarkdown(t, "EvidenceFocus", "copyright", element.getCopyrightElement(), -1);
+ for (int i = 0; i < element.getRelatedIdentifier().size(); i++) {
+ composeIdentifier(t, "EvidenceReport", "relatedIdentifier", element.getRelatedIdentifier().get(i), i);
}
if (element.hasCiteAs()) {
- composeReference(t, "EvidenceFocus", "citeAs", element.getCiteAs(), -1);
+ composeReference(t, "EvidenceReport", "citeAs", element.getCiteAs(), -1);
}
- for (int i = 0; i < element.getCharacteristic().size(); i++) {
- composeEvidenceFocusCharacteristicComponent(t, "EvidenceFocus", "characteristic", element.getCharacteristic().get(i), i);
+ if (element.hasType()) {
+ composeCodeableConcept(t, "EvidenceReport", "type", element.getType(), -1);
+ }
+ for (int i = 0; i < element.getNote().size(); i++) {
+ composeAnnotation(t, "EvidenceReport", "note", element.getNote().get(i), i);
}
for (int i = 0; i < element.getRelatedArtifact().size(); i++) {
- composeRelatedArtifact(t, "EvidenceFocus", "relatedArtifact", element.getRelatedArtifact().get(i), i);
+ composeRelatedArtifact(t, "EvidenceReport", "relatedArtifact", element.getRelatedArtifact().get(i), i);
+ }
+ if (element.hasSubject()) {
+ composeEvidenceReportSubjectComponent(t, "EvidenceReport", "subject", element.getSubject(), -1);
+ }
+ if (element.hasPublisherElement()) {
+ composeString(t, "EvidenceReport", "publisher", element.getPublisherElement(), -1);
+ }
+ for (int i = 0; i < element.getContact().size(); i++) {
+ composeContactDetail(t, "EvidenceReport", "contact", element.getContact().get(i), i);
+ }
+ for (int i = 0; i < element.getAuthor().size(); i++) {
+ composeContactDetail(t, "EvidenceReport", "author", element.getAuthor().get(i), i);
+ }
+ for (int i = 0; i < element.getEditor().size(); i++) {
+ composeContactDetail(t, "EvidenceReport", "editor", element.getEditor().get(i), i);
+ }
+ for (int i = 0; i < element.getReviewer().size(); i++) {
+ composeContactDetail(t, "EvidenceReport", "reviewer", element.getReviewer().get(i), i);
+ }
+ for (int i = 0; i < element.getEndorser().size(); i++) {
+ composeContactDetail(t, "EvidenceReport", "endorser", element.getEndorser().get(i), i);
+ }
+ for (int i = 0; i < element.getRelatesTo().size(); i++) {
+ composeEvidenceReportRelatesToComponent(t, "EvidenceReport", "relatesTo", element.getRelatesTo().get(i), i);
+ }
+ for (int i = 0; i < element.getSection().size(); i++) {
+ composeEvidenceReportSectionComponent(t, "EvidenceReport", "section", element.getSection().get(i), i);
}
}
- protected void composeEvidenceFocusCharacteristicComponent(Complex parent, String parentType, String name, EvidenceFocus.EvidenceFocusCharacteristicComponent element, int index) {
+ protected void composeEvidenceReportSubjectComponent(Complex parent, String parentType, String name, EvidenceReport.EvidenceReportSubjectComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "subject", name, element, index);
+ for (int i = 0; i < element.getCharacteristic().size(); i++) {
+ composeEvidenceReportSubjectCharacteristicComponent(t, "EvidenceReportSubjectComponent", "characteristic", element.getCharacteristic().get(i), i);
+ }
+ for (int i = 0; i < element.getNote().size(); i++) {
+ composeAnnotation(t, "EvidenceReportSubjectComponent", "note", element.getNote().get(i), i);
+ }
+ }
+
+ protected void composeEvidenceReportSubjectCharacteristicComponent(Complex parent, String parentType, String name, EvidenceReport.EvidenceReportSubjectCharacteristicComponent element, int index) {
if (element == null)
return;
Complex t;
@@ -10438,16 +10660,79 @@ public class RdfParser extends RdfParserBase {
}
composeBackboneElement(t, "characteristic", name, element, index);
if (element.hasCode()) {
- composeCodeableConcept(t, "EvidenceFocusCharacteristicComponent", "code", element.getCode(), -1);
+ composeCodeableConcept(t, "EvidenceReportSubjectCharacteristicComponent", "code", element.getCode(), -1);
}
if (element.hasValue()) {
- composeType(t, "EvidenceFocusCharacteristicComponent", "value", element.getValue(), -1);
+ composeType(t, "EvidenceReportSubjectCharacteristicComponent", "value", element.getValue(), -1);
}
if (element.hasExcludeElement()) {
- composeBoolean(t, "EvidenceFocusCharacteristicComponent", "exclude", element.getExcludeElement(), -1);
+ composeBoolean(t, "EvidenceReportSubjectCharacteristicComponent", "exclude", element.getExcludeElement(), -1);
}
if (element.hasPeriod()) {
- composePeriod(t, "EvidenceFocusCharacteristicComponent", "period", element.getPeriod(), -1);
+ composePeriod(t, "EvidenceReportSubjectCharacteristicComponent", "period", element.getPeriod(), -1);
+ }
+ }
+
+ protected void composeEvidenceReportRelatesToComponent(Complex parent, String parentType, String name, EvidenceReport.EvidenceReportRelatesToComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "relatesTo", name, element, index);
+ if (element.hasCodeElement()) {
+ composeEnum(t, "EvidenceReportRelatesToComponent", "code", element.getCodeElement(), -1);
+ }
+ if (element.hasTarget()) {
+ composeType(t, "EvidenceReportRelatesToComponent", "target", element.getTarget(), -1);
+ }
+ }
+
+ protected void composeEvidenceReportSectionComponent(Complex parent, String parentType, String name, EvidenceReport.SectionComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "section", name, element, index);
+ if (element.hasTitleElement()) {
+ composeString(t, "SectionComponent", "title", element.getTitleElement(), -1);
+ }
+ if (element.hasFocus()) {
+ composeCodeableConcept(t, "SectionComponent", "focus", element.getFocus(), -1);
+ }
+ if (element.hasFocusReference()) {
+ composeReference(t, "SectionComponent", "focusReference", element.getFocusReference(), -1);
+ }
+ for (int i = 0; i < element.getAuthor().size(); i++) {
+ composeReference(t, "SectionComponent", "author", element.getAuthor().get(i), i);
+ }
+ if (element.hasText()) {
+ composeNarrative(t, "SectionComponent", "text", element.getText(), -1);
+ }
+ if (element.hasModeElement()) {
+ composeEnum(t, "SectionComponent", "mode", element.getModeElement(), -1);
+ }
+ if (element.hasOrderedBy()) {
+ composeCodeableConcept(t, "SectionComponent", "orderedBy", element.getOrderedBy(), -1);
+ }
+ for (int i = 0; i < element.getEntryClassifier().size(); i++) {
+ composeCodeableConcept(t, "SectionComponent", "entryClassifier", element.getEntryClassifier().get(i), i);
+ }
+ for (int i = 0; i < element.getEntryReference().size(); i++) {
+ composeReference(t, "SectionComponent", "entryReference", element.getEntryReference().get(i), i);
+ }
+ if (element.hasEmptyReason()) {
+ composeCodeableConcept(t, "SectionComponent", "emptyReason", element.getEmptyReason(), -1);
+ }
+ for (int i = 0; i < element.getSection().size(); i++) {
+ composeEvidenceReportSectionComponent(t, "SectionComponent", "section", element.getSection().get(i), i);
}
}
@@ -10488,12 +10773,6 @@ public class RdfParser extends RdfParserBase {
if (element.hasDateElement()) {
composeDateTime(t, "EvidenceVariable", "date", element.getDateElement(), -1);
}
- if (element.hasPublisherElement()) {
- composeString(t, "EvidenceVariable", "publisher", element.getPublisherElement(), -1);
- }
- for (int i = 0; i < element.getContact().size(); i++) {
- composeContactDetail(t, "EvidenceVariable", "contact", element.getContact().get(i), i);
- }
if (element.hasDescriptionElement()) {
composeMarkdown(t, "EvidenceVariable", "description", element.getDescriptionElement(), -1);
}
@@ -10503,23 +10782,11 @@ public class RdfParser extends RdfParserBase {
for (int i = 0; i < element.getUseContext().size(); i++) {
composeUsageContext(t, "EvidenceVariable", "useContext", element.getUseContext().get(i), i);
}
- for (int i = 0; i < element.getJurisdiction().size(); i++) {
- composeCodeableConcept(t, "EvidenceVariable", "jurisdiction", element.getJurisdiction().get(i), i);
+ if (element.hasPublisherElement()) {
+ composeString(t, "EvidenceVariable", "publisher", element.getPublisherElement(), -1);
}
- if (element.hasCopyrightElement()) {
- composeMarkdown(t, "EvidenceVariable", "copyright", element.getCopyrightElement(), -1);
- }
- if (element.hasApprovalDateElement()) {
- composeDate(t, "EvidenceVariable", "approvalDate", element.getApprovalDateElement(), -1);
- }
- if (element.hasLastReviewDateElement()) {
- composeDate(t, "EvidenceVariable", "lastReviewDate", element.getLastReviewDateElement(), -1);
- }
- if (element.hasEffectivePeriod()) {
- composePeriod(t, "EvidenceVariable", "effectivePeriod", element.getEffectivePeriod(), -1);
- }
- for (int i = 0; i < element.getTopic().size(); i++) {
- composeCodeableConcept(t, "EvidenceVariable", "topic", element.getTopic().get(i), i);
+ for (int i = 0; i < element.getContact().size(); i++) {
+ composeContactDetail(t, "EvidenceVariable", "contact", element.getContact().get(i), i);
}
for (int i = 0; i < element.getAuthor().size(); i++) {
composeContactDetail(t, "EvidenceVariable", "author", element.getAuthor().get(i), i);
@@ -10536,9 +10803,6 @@ public class RdfParser extends RdfParserBase {
for (int i = 0; i < element.getRelatedArtifact().size(); i++) {
composeRelatedArtifact(t, "EvidenceVariable", "relatedArtifact", element.getRelatedArtifact().get(i), i);
}
- if (element.hasTypeElement()) {
- composeEnum(t, "EvidenceVariable", "type", element.getTypeElement(), -1);
- }
if (element.hasActualElement()) {
composeBoolean(t, "EvidenceVariable", "actual", element.getActualElement(), -1);
}
@@ -10548,6 +10812,12 @@ public class RdfParser extends RdfParserBase {
for (int i = 0; i < element.getCharacteristic().size(); i++) {
composeEvidenceVariableCharacteristicComponent(t, "EvidenceVariable", "characteristic", element.getCharacteristic().get(i), i);
}
+ if (element.hasHandlingElement()) {
+ composeEnum(t, "EvidenceVariable", "handling", element.getHandlingElement(), -1);
+ }
+ for (int i = 0; i < element.getCategory().size(); i++) {
+ composeEvidenceVariableCategoryComponent(t, "EvidenceVariable", "category", element.getCategory().get(i), i);
+ }
}
protected void composeEvidenceVariableCharacteristicComponent(Complex parent, String parentType, String name, EvidenceVariable.EvidenceVariableCharacteristicComponent element, int index) {
@@ -10607,6 +10877,24 @@ public class RdfParser extends RdfParserBase {
}
}
+ protected void composeEvidenceVariableCategoryComponent(Complex parent, String parentType, String name, EvidenceVariable.EvidenceVariableCategoryComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "category", name, element, index);
+ if (element.hasNameElement()) {
+ composeString(t, "EvidenceVariableCategoryComponent", "name", element.getNameElement(), -1);
+ }
+ if (element.hasValue()) {
+ composeType(t, "EvidenceVariableCategoryComponent", "value", element.getValue(), -1);
+ }
+ }
+
protected void composeExampleScenario(Complex parent, String parentType, String name, ExampleScenario element, int index) {
if (element == null)
return;
@@ -12534,6 +12822,15 @@ public class RdfParser extends RdfParserBase {
for (int i = 0; i < element.getIdentifier().size(); i++) {
composeIdentifier(t, "Immunization", "identifier", element.getIdentifier().get(i), i);
}
+ for (int i = 0; i < element.getInstantiatesCanonical().size(); i++) {
+ composeCanonical(t, "Immunization", "instantiatesCanonical", element.getInstantiatesCanonical().get(i), i);
+ }
+ for (int i = 0; i < element.getInstantiatesUri().size(); i++) {
+ composeUri(t, "Immunization", "instantiatesUri", element.getInstantiatesUri().get(i), i);
+ }
+ for (int i = 0; i < element.getBasedOn().size(); i++) {
+ composeReference(t, "Immunization", "basedOn", element.getBasedOn().get(i), i);
+ }
if (element.hasStatusElement()) {
composeEnum(t, "Immunization", "status", element.getStatusElement(), -1);
}
@@ -12543,6 +12840,15 @@ public class RdfParser extends RdfParserBase {
if (element.hasVaccineCode()) {
composeCodeableConcept(t, "Immunization", "vaccineCode", element.getVaccineCode(), -1);
}
+ if (element.hasManufacturer()) {
+ composeReference(t, "Immunization", "manufacturer", element.getManufacturer(), -1);
+ }
+ if (element.hasLotNumberElement()) {
+ composeString(t, "Immunization", "lotNumber", element.getLotNumberElement(), -1);
+ }
+ if (element.hasExpirationDateElement()) {
+ composeDate(t, "Immunization", "expirationDate", element.getExpirationDateElement(), -1);
+ }
if (element.hasPatient()) {
composeReference(t, "Immunization", "patient", element.getPatient(), -1);
}
@@ -12564,15 +12870,6 @@ public class RdfParser extends RdfParserBase {
if (element.hasLocation()) {
composeReference(t, "Immunization", "location", element.getLocation(), -1);
}
- if (element.hasManufacturer()) {
- composeReference(t, "Immunization", "manufacturer", element.getManufacturer(), -1);
- }
- if (element.hasLotNumberElement()) {
- composeString(t, "Immunization", "lotNumber", element.getLotNumberElement(), -1);
- }
- if (element.hasExpirationDateElement()) {
- composeDate(t, "Immunization", "expirationDate", element.getExpirationDateElement(), -1);
- }
if (element.hasSite()) {
composeCodeableConcept(t, "Immunization", "site", element.getSite(), -1);
}
@@ -12768,6 +13065,12 @@ public class RdfParser extends RdfParserBase {
for (int i = 0; i < element.getIdentifier().size(); i++) {
composeIdentifier(t, "ImmunizationRecommendation", "identifier", element.getIdentifier().get(i), i);
}
+ for (int i = 0; i < element.getInstantiatesCanonical().size(); i++) {
+ composeCanonical(t, "ImmunizationRecommendation", "instantiatesCanonical", element.getInstantiatesCanonical().get(i), i);
+ }
+ for (int i = 0; i < element.getInstantiatesUri().size(); i++) {
+ composeUri(t, "ImmunizationRecommendation", "instantiatesUri", element.getInstantiatesUri().get(i), i);
+ }
if (element.hasPatient()) {
composeReference(t, "ImmunizationRecommendation", "patient", element.getPatient(), -1);
}
@@ -13194,11 +13497,95 @@ public class RdfParser extends RdfParserBase {
for (int i = 0; i < element.getManufacturer().size(); i++) {
composeReference(t, "Ingredient", "manufacturer", element.getManufacturer().get(i), i);
}
+ if (element.hasSubstance()) {
+ composeIngredientSubstanceComponent(t, "Ingredient", "substance", element.getSubstance(), -1);
+ }
for (int i = 0; i < element.getSpecifiedSubstance().size(); i++) {
composeIngredientSpecifiedSubstanceComponent(t, "Ingredient", "specifiedSubstance", element.getSpecifiedSubstance().get(i), i);
}
+ }
+
+ protected void composeIngredientSubstanceComponent(Complex parent, String parentType, String name, Ingredient.IngredientSubstanceComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "substance", name, element, index);
+ if (element.hasCode()) {
+ composeType(t, "IngredientSubstanceComponent", "code", element.getCode(), -1);
+ }
+ for (int i = 0; i < element.getStrength().size(); i++) {
+ composeIngredientSubstanceStrengthComponent(t, "IngredientSubstanceComponent", "strength", element.getStrength().get(i), i);
+ }
+ }
+
+ protected void composeIngredientSubstanceStrengthComponent(Complex parent, String parentType, String name, Ingredient.IngredientSubstanceStrengthComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "strength", name, element, index);
+ if (element.hasPresentation()) {
+ composeRatio(t, "IngredientSubstanceStrengthComponent", "presentation", element.getPresentation(), -1);
+ }
+ if (element.hasPresentationHighLimit()) {
+ composeRatio(t, "IngredientSubstanceStrengthComponent", "presentationHighLimit", element.getPresentationHighLimit(), -1);
+ }
+ if (element.hasPresentationTextElement()) {
+ composeString(t, "IngredientSubstanceStrengthComponent", "presentationText", element.getPresentationTextElement(), -1);
+ }
+ if (element.hasConcentration()) {
+ composeRatio(t, "IngredientSubstanceStrengthComponent", "concentration", element.getConcentration(), -1);
+ }
+ if (element.hasConcentrationHighLimit()) {
+ composeRatio(t, "IngredientSubstanceStrengthComponent", "concentrationHighLimit", element.getConcentrationHighLimit(), -1);
+ }
+ if (element.hasConcentrationTextElement()) {
+ composeString(t, "IngredientSubstanceStrengthComponent", "concentrationText", element.getConcentrationTextElement(), -1);
+ }
+ if (element.hasMeasurementPointElement()) {
+ composeString(t, "IngredientSubstanceStrengthComponent", "measurementPoint", element.getMeasurementPointElement(), -1);
+ }
+ for (int i = 0; i < element.getCountry().size(); i++) {
+ composeCodeableConcept(t, "IngredientSubstanceStrengthComponent", "country", element.getCountry().get(i), i);
+ }
+ for (int i = 0; i < element.getReferenceStrength().size(); i++) {
+ composeIngredientSubstanceStrengthReferenceStrengthComponent(t, "IngredientSubstanceStrengthComponent", "referenceStrength", element.getReferenceStrength().get(i), i);
+ }
+ }
+
+ protected void composeIngredientSubstanceStrengthReferenceStrengthComponent(Complex parent, String parentType, String name, Ingredient.IngredientSubstanceStrengthReferenceStrengthComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "referenceStrength", name, element, index);
if (element.hasSubstance()) {
- composeIngredientSubstanceComponent(t, "Ingredient", "substance", element.getSubstance(), -1);
+ composeType(t, "IngredientSubstanceStrengthReferenceStrengthComponent", "substance", element.getSubstance(), -1);
+ }
+ if (element.hasStrength()) {
+ composeRatio(t, "IngredientSubstanceStrengthReferenceStrengthComponent", "strength", element.getStrength(), -1);
+ }
+ if (element.hasStrengthHighLimit()) {
+ composeRatio(t, "IngredientSubstanceStrengthReferenceStrengthComponent", "strengthHighLimit", element.getStrengthHighLimit(), -1);
+ }
+ if (element.hasMeasurementPointElement()) {
+ composeString(t, "IngredientSubstanceStrengthReferenceStrengthComponent", "measurementPoint", element.getMeasurementPointElement(), -1);
+ }
+ for (int i = 0; i < element.getCountry().size(); i++) {
+ composeCodeableConcept(t, "IngredientSubstanceStrengthReferenceStrengthComponent", "country", element.getCountry().get(i), i);
}
}
@@ -13222,91 +13609,7 @@ public class RdfParser extends RdfParserBase {
composeCodeableConcept(t, "IngredientSpecifiedSubstanceComponent", "confidentiality", element.getConfidentiality(), -1);
}
for (int i = 0; i < element.getStrength().size(); i++) {
- composeIngredientSpecifiedSubstanceStrengthComponent(t, "IngredientSpecifiedSubstanceComponent", "strength", element.getStrength().get(i), i);
- }
- }
-
- protected void composeIngredientSpecifiedSubstanceStrengthComponent(Complex parent, String parentType, String name, Ingredient.IngredientSpecifiedSubstanceStrengthComponent element, int index) {
- if (element == null)
- return;
- Complex t;
- if (Utilities.noString(parentType))
- t = parent;
- else {
- t = parent.predicate("fhir:"+parentType+'.'+name);
- }
- composeBackboneElement(t, "strength", name, element, index);
- if (element.hasPresentation()) {
- composeRatio(t, "IngredientSpecifiedSubstanceStrengthComponent", "presentation", element.getPresentation(), -1);
- }
- if (element.hasPresentationHighLimit()) {
- composeRatio(t, "IngredientSpecifiedSubstanceStrengthComponent", "presentationHighLimit", element.getPresentationHighLimit(), -1);
- }
- if (element.hasPresentationTextElement()) {
- composeString(t, "IngredientSpecifiedSubstanceStrengthComponent", "presentationText", element.getPresentationTextElement(), -1);
- }
- if (element.hasConcentration()) {
- composeRatio(t, "IngredientSpecifiedSubstanceStrengthComponent", "concentration", element.getConcentration(), -1);
- }
- if (element.hasConcentrationHighLimit()) {
- composeRatio(t, "IngredientSpecifiedSubstanceStrengthComponent", "concentrationHighLimit", element.getConcentrationHighLimit(), -1);
- }
- if (element.hasConcentrationTextElement()) {
- composeString(t, "IngredientSpecifiedSubstanceStrengthComponent", "concentrationText", element.getConcentrationTextElement(), -1);
- }
- if (element.hasMeasurementPointElement()) {
- composeString(t, "IngredientSpecifiedSubstanceStrengthComponent", "measurementPoint", element.getMeasurementPointElement(), -1);
- }
- for (int i = 0; i < element.getCountry().size(); i++) {
- composeCodeableConcept(t, "IngredientSpecifiedSubstanceStrengthComponent", "country", element.getCountry().get(i), i);
- }
- for (int i = 0; i < element.getReferenceStrength().size(); i++) {
- composeIngredientSpecifiedSubstanceStrengthReferenceStrengthComponent(t, "IngredientSpecifiedSubstanceStrengthComponent", "referenceStrength", element.getReferenceStrength().get(i), i);
- }
- }
-
- protected void composeIngredientSpecifiedSubstanceStrengthReferenceStrengthComponent(Complex parent, String parentType, String name, Ingredient.IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent element, int index) {
- if (element == null)
- return;
- Complex t;
- if (Utilities.noString(parentType))
- t = parent;
- else {
- t = parent.predicate("fhir:"+parentType+'.'+name);
- }
- composeBackboneElement(t, "referenceStrength", name, element, index);
- if (element.hasSubstance()) {
- composeType(t, "IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent", "substance", element.getSubstance(), -1);
- }
- if (element.hasStrength()) {
- composeRatio(t, "IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent", "strength", element.getStrength(), -1);
- }
- if (element.hasStrengthHighLimit()) {
- composeRatio(t, "IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent", "strengthHighLimit", element.getStrengthHighLimit(), -1);
- }
- if (element.hasMeasurementPointElement()) {
- composeString(t, "IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent", "measurementPoint", element.getMeasurementPointElement(), -1);
- }
- for (int i = 0; i < element.getCountry().size(); i++) {
- composeCodeableConcept(t, "IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent", "country", element.getCountry().get(i), i);
- }
- }
-
- protected void composeIngredientSubstanceComponent(Complex parent, String parentType, String name, Ingredient.IngredientSubstanceComponent element, int index) {
- if (element == null)
- return;
- Complex t;
- if (Utilities.noString(parentType))
- t = parent;
- else {
- t = parent.predicate("fhir:"+parentType+'.'+name);
- }
- composeBackboneElement(t, "substance", name, element, index);
- if (element.hasCode()) {
- composeType(t, "IngredientSubstanceComponent", "code", element.getCode(), -1);
- }
- for (int i = 0; i < element.getStrength().size(); i++) {
- composeIngredientSpecifiedSubstanceStrengthComponent(t, "IngredientSubstanceComponent", "strength", element.getStrength().get(i), i);
+ composeIngredientSubstanceStrengthComponent(t, "IngredientSpecifiedSubstanceComponent", "strength", element.getStrength().get(i), i);
}
}
@@ -14829,6 +15132,9 @@ public class RdfParser extends RdfParserBase {
if (element.hasStatusElement()) {
composeEnum(t, "MedicationKnowledge", "status", element.getStatusElement(), -1);
}
+ if (element.hasAuthor()) {
+ composeReference(t, "MedicationKnowledge", "author", element.getAuthor(), -1);
+ }
if (element.hasManufacturer()) {
composeReference(t, "MedicationKnowledge", "manufacturer", element.getManufacturer(), -1);
}
@@ -14847,6 +15153,9 @@ public class RdfParser extends RdfParserBase {
for (int i = 0; i < element.getAssociatedMedication().size(); i++) {
composeReference(t, "MedicationKnowledge", "associatedMedication", element.getAssociatedMedication().get(i), i);
}
+ if (element.hasAssociatedDefinition()) {
+ composeReference(t, "MedicationKnowledge", "associatedDefinition", element.getAssociatedDefinition(), -1);
+ }
for (int i = 0; i < element.getProductType().size(); i++) {
composeCodeableConcept(t, "MedicationKnowledge", "productType", element.getProductType().get(i), i);
}
@@ -14877,8 +15186,8 @@ public class RdfParser extends RdfParserBase {
for (int i = 0; i < element.getMedicineClassification().size(); i++) {
composeMedicationKnowledgeMedicineClassificationComponent(t, "MedicationKnowledge", "medicineClassification", element.getMedicineClassification().get(i), i);
}
- if (element.hasPackaging()) {
- composeMedicationKnowledgePackagingComponent(t, "MedicationKnowledge", "packaging", element.getPackaging(), -1);
+ for (int i = 0; i < element.getPackaging().size(); i++) {
+ composeMedicationKnowledgePackagingComponent(t, "MedicationKnowledge", "packaging", element.getPackaging().get(i), i);
}
for (int i = 0; i < element.getDrugCharacteristic().size(); i++) {
composeMedicationKnowledgeDrugCharacteristicComponent(t, "MedicationKnowledge", "drugCharacteristic", element.getDrugCharacteristic().get(i), i);
@@ -14961,6 +15270,9 @@ public class RdfParser extends RdfParserBase {
t = parent.predicate("fhir:"+parentType+'.'+name);
}
composeBackboneElement(t, "cost", name, element, index);
+ for (int i = 0; i < element.getEffectiveDate().size(); i++) {
+ composePeriod(t, "MedicationKnowledgeCostComponent", "effectiveDate", element.getEffectiveDate().get(i), i);
+ }
if (element.hasType()) {
composeCodeableConcept(t, "MedicationKnowledgeCostComponent", "type", element.getType(), -1);
}
@@ -14968,7 +15280,7 @@ public class RdfParser extends RdfParserBase {
composeString(t, "MedicationKnowledgeCostComponent", "source", element.getSourceElement(), -1);
}
if (element.hasCost()) {
- composeMoney(t, "MedicationKnowledgeCostComponent", "cost", element.getCost(), -1);
+ composeType(t, "MedicationKnowledgeCostComponent", "cost", element.getCost(), -1);
}
}
@@ -15075,6 +15387,12 @@ public class RdfParser extends RdfParserBase {
t = parent.predicate("fhir:"+parentType+'.'+name);
}
composeBackboneElement(t, "packaging", name, element, index);
+ if (element.hasIdentifier()) {
+ composeIdentifier(t, "MedicationKnowledgePackagingComponent", "identifier", element.getIdentifier(), -1);
+ }
+ if (element.hasCost()) {
+ composeMedicationKnowledgeCostComponent(t, "MedicationKnowledgePackagingComponent", "cost", element.getCost(), -1);
+ }
if (element.hasType()) {
composeCodeableConcept(t, "MedicationKnowledgePackagingComponent", "type", element.getType(), -1);
}
@@ -15483,8 +15801,8 @@ public class RdfParser extends RdfParserBase {
if (element.hasPaediatricUseIndicator()) {
composeCodeableConcept(t, "MedicinalProductDefinition", "paediatricUseIndicator", element.getPaediatricUseIndicator(), -1);
}
- for (int i = 0; i < element.getProductClassification().size(); i++) {
- composeCodeableConcept(t, "MedicinalProductDefinition", "productClassification", element.getProductClassification().get(i), i);
+ for (int i = 0; i < element.getClassification().size(); i++) {
+ composeCodeableConcept(t, "MedicinalProductDefinition", "classification", element.getClassification().get(i), i);
}
for (int i = 0; i < element.getCharacteristic().size(); i++) {
composeCodeableConcept(t, "MedicinalProductDefinition", "characteristic", element.getCharacteristic().get(i), i);
@@ -15501,6 +15819,9 @@ public class RdfParser extends RdfParserBase {
for (int i = 0; i < element.getIngredient().size(); i++) {
composeReference(t, "MedicinalProductDefinition", "ingredient", element.getIngredient().get(i), i);
}
+ for (int i = 0; i < element.getImpurity().size(); i++) {
+ composeReference(t, "MedicinalProductDefinition", "impurity", element.getImpurity().get(i), i);
+ }
for (int i = 0; i < element.getAttachedDocument().size(); i++) {
composeReference(t, "MedicinalProductDefinition", "attachedDocument", element.getAttachedDocument().get(i), i);
}
@@ -15616,7 +15937,7 @@ public class RdfParser extends RdfParserBase {
}
composeBackboneElement(t, "crossReference", name, element, index);
if (element.hasProduct()) {
- composeType(t, "MedicinalProductDefinitionCrossReferenceComponent", "product", element.getProduct(), -1);
+ composeCodeableReference(t, "MedicinalProductDefinitionCrossReferenceComponent", "product", element.getProduct(), -1);
}
if (element.hasType()) {
composeCodeableConcept(t, "MedicinalProductDefinitionCrossReferenceComponent", "type", element.getType(), -1);
@@ -17484,6 +17805,9 @@ public class RdfParser extends RdfParserBase {
if (element.hasNameElement()) {
composeString(t, "PackagedProductDefinition", "name", element.getNameElement(), -1);
}
+ if (element.hasType()) {
+ composeCodeableConcept(t, "PackagedProductDefinition", "type", element.getType(), -1);
+ }
for (int i = 0; i < element.getSubject().size(); i++) {
composeReference(t, "PackagedProductDefinition", "subject", element.getSubject().get(i), i);
}
@@ -20826,9 +21150,6 @@ public class RdfParser extends RdfParserBase {
for (int i = 0; i < element.getFilterBy().size(); i++) {
composeSubscriptionFilterByComponent(t, "Subscription", "filterBy", element.getFilterBy().get(i), i);
}
- for (int i = 0; i < element.getError().size(); i++) {
- composeCodeableConcept(t, "Subscription", "error", element.getError().get(i), i);
- }
if (element.hasChannelType()) {
composeCoding(t, "Subscription", "channelType", element.getChannelType(), -1);
}
@@ -20883,8 +21204,8 @@ public class RdfParser extends RdfParserBase {
t = parent.predicate("fhir:"+parentType+'.'+name);
}
composeDomainResource(t, "SubscriptionStatus", name, element, index);
- if (element.hasNotificationTypeElement()) {
- composeEnum(t, "SubscriptionStatus", "notificationType", element.getNotificationTypeElement(), -1);
+ if (element.hasTypeElement()) {
+ composeEnum(t, "SubscriptionStatus", "type", element.getTypeElement(), -1);
}
if (element.hasEventsSinceSubscriptionStartElement()) {
composeInteger64(t, "SubscriptionStatus", "eventsSinceSubscriptionStart", element.getEventsSinceSubscriptionStartElement(), -1);
@@ -20898,8 +21219,11 @@ public class RdfParser extends RdfParserBase {
if (element.hasStatusElement()) {
composeEnum(t, "SubscriptionStatus", "status", element.getStatusElement(), -1);
}
- if (element.hasTopic()) {
- composeReference(t, "SubscriptionStatus", "topic", element.getTopic(), -1);
+ if (element.hasTopicElement()) {
+ composeCanonical(t, "SubscriptionStatus", "topic", element.getTopicElement(), -1);
+ }
+ for (int i = 0; i < element.getError().size(); i++) {
+ composeCodeableConcept(t, "SubscriptionStatus", "error", element.getError().get(i), i);
}
}
@@ -20925,11 +21249,8 @@ public class RdfParser extends RdfParserBase {
if (element.hasTitleElement()) {
composeString(t, "SubscriptionTopic", "title", element.getTitleElement(), -1);
}
- for (int i = 0; i < element.getDerivedFromCanonical().size(); i++) {
- composeCanonical(t, "SubscriptionTopic", "derivedFromCanonical", element.getDerivedFromCanonical().get(i), i);
- }
- for (int i = 0; i < element.getDerivedFromUri().size(); i++) {
- composeUri(t, "SubscriptionTopic", "derivedFromUri", element.getDerivedFromUri().get(i), i);
+ for (int i = 0; i < element.getDerivedFrom().size(); i++) {
+ composeCanonical(t, "SubscriptionTopic", "derivedFrom", element.getDerivedFrom().get(i), i);
}
if (element.hasStatusElement()) {
composeEnum(t, "SubscriptionTopic", "status", element.getStatusElement(), -1);
@@ -21141,6 +21462,9 @@ public class RdfParser extends RdfParserBase {
if (element.hasCategory()) {
composeCodeableConcept(t, "SubstanceDefinition", "category", element.getCategory(), -1);
}
+ for (int i = 0; i < element.getClassification().size(); i++) {
+ composeCodeableConcept(t, "SubstanceDefinition", "classification", element.getClassification().get(i), i);
+ }
if (element.hasDomain()) {
composeCodeableConcept(t, "SubstanceDefinition", "domain", element.getDomain(), -1);
}
@@ -21253,7 +21577,7 @@ public class RdfParser extends RdfParserBase {
composeString(t, "SubstanceDefinitionPropertyComponent", "parameters", element.getParametersElement(), -1);
}
if (element.hasDefiningSubstance()) {
- composeType(t, "SubstanceDefinitionPropertyComponent", "definingSubstance", element.getDefiningSubstance(), -1);
+ composeCodeableReference(t, "SubstanceDefinitionPropertyComponent", "definingSubstance", element.getDefiningSubstance(), -1);
}
if (element.hasAmount()) {
composeType(t, "SubstanceDefinitionPropertyComponent", "amount", element.getAmount(), -1);
@@ -21372,8 +21696,8 @@ public class RdfParser extends RdfParserBase {
if (element.hasFormat()) {
composeCodeableConcept(t, "SubstanceDefinitionStructureRepresentationComponent", "format", element.getFormat(), -1);
}
- if (element.hasAttachment()) {
- composeAttachment(t, "SubstanceDefinitionStructureRepresentationComponent", "attachment", element.getAttachment(), -1);
+ if (element.hasDocument()) {
+ composeReference(t, "SubstanceDefinitionStructureRepresentationComponent", "document", element.getDocument(), -1);
}
}
@@ -21682,7 +22006,7 @@ public class RdfParser extends RdfParserBase {
composeBoolean(t, "SubstancePolymerMonomerSetStartingMaterialComponent", "isDefining", element.getIsDefiningElement(), -1);
}
if (element.hasAmount()) {
- composeSubstanceAmount(t, "SubstancePolymerMonomerSetStartingMaterialComponent", "amount", element.getAmount(), -1);
+ composeQuantity(t, "SubstancePolymerMonomerSetStartingMaterialComponent", "amount", element.getAmount(), -1);
}
}
@@ -21696,9 +22020,6 @@ public class RdfParser extends RdfParserBase {
t = parent.predicate("fhir:"+parentType+'.'+name);
}
composeBackboneElement(t, "repeat", name, element, index);
- if (element.hasNumberOfUnitsElement()) {
- composeInteger(t, "SubstancePolymerRepeatComponent", "numberOfUnits", element.getNumberOfUnitsElement(), -1);
- }
if (element.hasAverageMolecularFormulaElement()) {
composeString(t, "SubstancePolymerRepeatComponent", "averageMolecularFormula", element.getAverageMolecularFormulaElement(), -1);
}
@@ -21726,8 +22047,8 @@ public class RdfParser extends RdfParserBase {
if (element.hasOrientation()) {
composeCodeableConcept(t, "SubstancePolymerRepeatRepeatUnitComponent", "orientation", element.getOrientation(), -1);
}
- if (element.hasAmount()) {
- composeSubstanceAmount(t, "SubstancePolymerRepeatRepeatUnitComponent", "amount", element.getAmount(), -1);
+ if (element.hasAmountElement()) {
+ composeInteger(t, "SubstancePolymerRepeatRepeatUnitComponent", "amount", element.getAmountElement(), -1);
}
for (int i = 0; i < element.getDegreeOfPolymerisation().size(); i++) {
composeSubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent(t, "SubstancePolymerRepeatRepeatUnitComponent", "degreeOfPolymerisation", element.getDegreeOfPolymerisation().get(i), i);
@@ -21747,11 +22068,17 @@ public class RdfParser extends RdfParserBase {
t = parent.predicate("fhir:"+parentType+'.'+name);
}
composeBackboneElement(t, "degreeOfPolymerisation", name, element, index);
- if (element.hasDegree()) {
- composeCodeableConcept(t, "SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent", "degree", element.getDegree(), -1);
+ if (element.hasType()) {
+ composeCodeableConcept(t, "SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent", "type", element.getType(), -1);
}
- if (element.hasAmount()) {
- composeSubstanceAmount(t, "SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent", "amount", element.getAmount(), -1);
+ if (element.hasAverageElement()) {
+ composeInteger(t, "SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent", "average", element.getAverageElement(), -1);
+ }
+ if (element.hasLowElement()) {
+ composeInteger(t, "SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent", "low", element.getLowElement(), -1);
+ }
+ if (element.hasHighElement()) {
+ composeInteger(t, "SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent", "high", element.getHighElement(), -1);
}
}
@@ -21858,9 +22185,6 @@ public class RdfParser extends RdfParserBase {
for (int i = 0; i < element.getGeneElement().size(); i++) {
composeSubstanceReferenceInformationGeneElementComponent(t, "SubstanceReferenceInformation", "geneElement", element.getGeneElement().get(i), i);
}
- for (int i = 0; i < element.getClassification().size(); i++) {
- composeSubstanceReferenceInformationClassificationComponent(t, "SubstanceReferenceInformation", "classification", element.getClassification().get(i), i);
- }
for (int i = 0; i < element.getTarget().size(); i++) {
composeSubstanceReferenceInformationTargetComponent(t, "SubstanceReferenceInformation", "target", element.getTarget().get(i), i);
}
@@ -21908,30 +22232,6 @@ public class RdfParser extends RdfParserBase {
}
}
- protected void composeSubstanceReferenceInformationClassificationComponent(Complex parent, String parentType, String name, SubstanceReferenceInformation.SubstanceReferenceInformationClassificationComponent element, int index) {
- if (element == null)
- return;
- Complex t;
- if (Utilities.noString(parentType))
- t = parent;
- else {
- t = parent.predicate("fhir:"+parentType+'.'+name);
- }
- composeBackboneElement(t, "classification", name, element, index);
- if (element.hasDomain()) {
- composeCodeableConcept(t, "SubstanceReferenceInformationClassificationComponent", "domain", element.getDomain(), -1);
- }
- if (element.hasClassification()) {
- composeCodeableConcept(t, "SubstanceReferenceInformationClassificationComponent", "classification", element.getClassification(), -1);
- }
- for (int i = 0; i < element.getSubtype().size(); i++) {
- composeCodeableConcept(t, "SubstanceReferenceInformationClassificationComponent", "subtype", element.getSubtype().get(i), i);
- }
- for (int i = 0; i < element.getSource().size(); i++) {
- composeReference(t, "SubstanceReferenceInformationClassificationComponent", "source", element.getSource().get(i), i);
- }
- }
-
protected void composeSubstanceReferenceInformationTargetComponent(Complex parent, String parentType, String name, SubstanceReferenceInformation.SubstanceReferenceInformationTargetComponent element, int index) {
if (element == null)
return;
@@ -24137,8 +24437,8 @@ public class RdfParser extends RdfParserBase {
composeEventDefinition(parent, null, "EventDefinition", (EventDefinition)resource, -1);
} else if (resource instanceof Evidence) {
composeEvidence(parent, null, "Evidence", (Evidence)resource, -1);
- } else if (resource instanceof EvidenceFocus) {
- composeEvidenceFocus(parent, null, "EvidenceFocus", (EvidenceFocus)resource, -1);
+ } else if (resource instanceof EvidenceReport) {
+ composeEvidenceReport(parent, null, "EvidenceReport", (EvidenceReport)resource, -1);
} else if (resource instanceof EvidenceVariable) {
composeEvidenceVariable(parent, null, "EvidenceVariable", (EvidenceVariable)resource, -1);
} else if (resource instanceof ExampleScenario) {
@@ -24454,8 +24754,6 @@ public class RdfParser extends RdfParserBase {
composeSignature(parent, parentType, name, (Signature)value, index);
} else if (value instanceof Statistic) {
composeStatistic(parent, parentType, name, (Statistic)value, index);
- } else if (value instanceof SubstanceAmount) {
- composeSubstanceAmount(parent, parentType, name, (SubstanceAmount)value, index);
} else if (value instanceof Timing) {
composeTiming(parent, parentType, name, (Timing)value, index);
} else if (value instanceof TriggerDefinition) {
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/XmlParser.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/XmlParser.java
index 1111e619d..3fcd374bc 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/XmlParser.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/XmlParser.java
@@ -1,9 +1,5 @@
package org.hl7.fhir.r5.formats;
-import java.io.IOException;
-
-import org.hl7.fhir.exceptions.FHIRFormatError;
-
// generated
@@ -36,14 +32,17 @@ import org.hl7.fhir.exceptions.FHIRFormatError;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import org.hl7.fhir.r5.model.*;
+import org.hl7.fhir.r5.model.Enumerations.FHIRVersion;
+import org.xmlpull.v1.*;
import org.hl7.fhir.utilities.Utilities;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.hl7.fhir.exceptions.FHIRFormatError;
+import org.hl7.fhir.exceptions.FHIRException;
+import java.io.IOException;
public class XmlParser extends XmlParserBase {
@@ -1769,12 +1768,10 @@ public class XmlParser extends XmlParserBase {
}
protected boolean parseProductShelfLifeContent(int eventType, XmlPullParser xpp, ProductShelfLife res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("identifier")) {
- res.setIdentifier(parseIdentifier(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
res.setType(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("period")) {
- res.setPeriod(parseQuantity(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "period")) {
+ res.setPeriod(parseType("period", xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("specialPrecautionsForStorage")) {
res.getSpecialPrecautionsForStorage().add(parseCodeableConcept(xpp));
} else if (!parseBackboneTypeContent(eventType, xpp, res)){
@@ -2029,10 +2026,14 @@ public class XmlParser extends XmlParserBase {
res.setStatisticType(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("quantity")) {
res.setQuantity(parseQuantity(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("numberOfEvents")) {
+ res.setNumberOfEventsElement(parseInteger(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("sampleSize")) {
res.setSampleSize(parseStatisticSampleSizeComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("attributeEstimate")) {
res.getAttributeEstimate().add(parseStatisticAttributeEstimateComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("modelCharacteristic")) {
+ res.getModelCharacteristic().add(parseStatisticModelCharacteristicComponent(xpp));
} else if (!parseBackboneTypeContent(eventType, xpp, res)){
return false;
}
@@ -2065,8 +2066,6 @@ public class XmlParser extends XmlParserBase {
res.setNumberOfParticipantsElement(parseInteger(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("knownDataCount")) {
res.setKnownDataCountElement(parseInteger(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("numeratorCount")) {
- res.setNumeratorCountElement(parseInteger(xpp));
} else if (!parseElementContent(eventType, xpp, res)){
return false;
}
@@ -2101,21 +2100,21 @@ public class XmlParser extends XmlParserBase {
res.setLevelElement(parseDecimal(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("range")) {
res.setRange(parseRange(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("estimateQualifier")) {
- res.getEstimateQualifier().add(parseStatisticAttributeEstimateEstimateQualifierComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("attributeEstimate")) {
+ res.getAttributeEstimate().add(parseStatisticAttributeEstimateAttributeEstimateComponent(xpp));
} else if (!parseElementContent(eventType, xpp, res)){
return false;
}
return true;
}
- protected Statistic.StatisticAttributeEstimateEstimateQualifierComponent parseStatisticAttributeEstimateEstimateQualifierComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Statistic.StatisticAttributeEstimateEstimateQualifierComponent res = new Statistic.StatisticAttributeEstimateEstimateQualifierComponent();
+ protected Statistic.StatisticAttributeEstimateAttributeEstimateComponent parseStatisticAttributeEstimateAttributeEstimateComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Statistic.StatisticAttributeEstimateAttributeEstimateComponent res = new Statistic.StatisticAttributeEstimateAttributeEstimateComponent();
parseElementAttributes(xpp, res);
next(xpp);
int eventType = nextNoWhitespace(xpp);
while (eventType != XmlPullParser.END_TAG) {
- if (!parseStatisticAttributeEstimateEstimateQualifierComponentContent(eventType, xpp, res))
+ if (!parseStatisticAttributeEstimateAttributeEstimateComponentContent(eventType, xpp, res))
unknownContent(xpp);
eventType = nextNoWhitespace(xpp);
}
@@ -2124,7 +2123,7 @@ public class XmlParser extends XmlParserBase {
return res;
}
- protected boolean parseStatisticAttributeEstimateEstimateQualifierComponentContent(int eventType, XmlPullParser xpp, Statistic.StatisticAttributeEstimateEstimateQualifierComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ protected boolean parseStatisticAttributeEstimateAttributeEstimateComponentContent(int eventType, XmlPullParser xpp, Statistic.StatisticAttributeEstimateAttributeEstimateComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("description")) {
res.setDescriptionElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("note")) {
@@ -2143,13 +2142,13 @@ public class XmlParser extends XmlParserBase {
return true;
}
- protected SubstanceAmount parseSubstanceAmount(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- SubstanceAmount res = new SubstanceAmount();
+ protected Statistic.StatisticModelCharacteristicComponent parseStatisticModelCharacteristicComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Statistic.StatisticModelCharacteristicComponent res = new Statistic.StatisticModelCharacteristicComponent();
parseElementAttributes(xpp, res);
next(xpp);
int eventType = nextNoWhitespace(xpp);
while (eventType != XmlPullParser.END_TAG) {
- if (!parseSubstanceAmountContent(eventType, xpp, res))
+ if (!parseStatisticModelCharacteristicComponentContent(eventType, xpp, res))
unknownContent(xpp);
eventType = nextNoWhitespace(xpp);
}
@@ -2158,28 +2157,26 @@ public class XmlParser extends XmlParserBase {
return res;
}
- protected boolean parseSubstanceAmountContent(int eventType, XmlPullParser xpp, SubstanceAmount res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "amount")) {
- res.setAmount(parseType("amount", xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("amountType")) {
- res.setAmountType(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("amountText")) {
- res.setAmountTextElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("referenceRange")) {
- res.setReferenceRange(parseSubstanceAmountReferenceRangeComponent(xpp));
- } else if (!parseBackboneTypeContent(eventType, xpp, res)){
+ protected boolean parseStatisticModelCharacteristicComponentContent(int eventType, XmlPullParser xpp, Statistic.StatisticModelCharacteristicComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("code")) {
+ res.setCode(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "value")) {
+ res.setValue(parseType("value", xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("variable")) {
+ res.getVariable().add(parseStatisticModelCharacteristicVariableComponent(xpp));
+ } else if (!parseElementContent(eventType, xpp, res)){
return false;
}
return true;
}
- protected SubstanceAmount.SubstanceAmountReferenceRangeComponent parseSubstanceAmountReferenceRangeComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- SubstanceAmount.SubstanceAmountReferenceRangeComponent res = new SubstanceAmount.SubstanceAmountReferenceRangeComponent();
+ protected Statistic.StatisticModelCharacteristicVariableComponent parseStatisticModelCharacteristicVariableComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Statistic.StatisticModelCharacteristicVariableComponent res = new Statistic.StatisticModelCharacteristicVariableComponent();
parseElementAttributes(xpp, res);
next(xpp);
int eventType = nextNoWhitespace(xpp);
while (eventType != XmlPullParser.END_TAG) {
- if (!parseSubstanceAmountReferenceRangeComponentContent(eventType, xpp, res))
+ if (!parseStatisticModelCharacteristicVariableComponentContent(eventType, xpp, res))
unknownContent(xpp);
eventType = nextNoWhitespace(xpp);
}
@@ -2188,11 +2185,17 @@ public class XmlParser extends XmlParserBase {
return res;
}
- protected boolean parseSubstanceAmountReferenceRangeComponentContent(int eventType, XmlPullParser xpp, SubstanceAmount.SubstanceAmountReferenceRangeComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("lowLimit")) {
- res.setLowLimit(parseQuantity(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("highLimit")) {
- res.setHighLimit(parseQuantity(xpp));
+ protected boolean parseStatisticModelCharacteristicVariableComponentContent(int eventType, XmlPullParser xpp, Statistic.StatisticModelCharacteristicVariableComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("variableDefinition")) {
+ res.setVariableDefinition(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("handling")) {
+ res.setHandlingElement(parseEnumeration(xpp, Enumerations.EvidenceVariableHandling.NULL, new Enumerations.EvidenceVariableHandlingEnumFactory()));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("valueCategory")) {
+ res.getValueCategory().add(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("valueQuantity")) {
+ res.getValueQuantity().add(parseQuantity(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("valueRange")) {
+ res.getValueRange().add(parseRange(xpp));
} else if (!parseElementContent(eventType, xpp, res)){
return false;
}
@@ -5277,8 +5280,6 @@ public class XmlParser extends XmlParserBase {
protected boolean parseCitationContent(int eventType, XmlPullParser xpp, Citation res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("url")) {
res.setUrlElement(parseUri(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("version")) {
- res.setVersionElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("status")) {
res.setStatusElement(parseEnumeration(xpp, Enumerations.PublicationStatus.NULL, new Enumerations.PublicationStatusEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("useContext")) {
@@ -5287,6 +5288,8 @@ public class XmlParser extends XmlParserBase {
res.getIdentifier().add(parseIdentifier(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("relatedIdentifier")) {
res.getRelatedIdentifier().add(parseIdentifier(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("summary")) {
+ res.getSummary().add(parseCitationSummaryComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("dateCited")) {
res.setDateCitedElement(parseDateTime(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("variantCitation")) {
@@ -5295,6 +5298,8 @@ public class XmlParser extends XmlParserBase {
res.setPublishingModel(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("journal")) {
res.setJournal(parseCitationJournalComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("publicationInfo")) {
+ res.setPublicationInfo(parseCitationPublicationInfoComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("articleTitle")) {
res.setArticleTitleElement(parseMarkdown(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("alternativeTitle")) {
@@ -5309,18 +5314,16 @@ public class XmlParser extends XmlParserBase {
res.setAbstractCopyrightElement(parseMarkdown(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("alternativeAbstract")) {
res.getAlternativeAbstract().add(parseCitationAlternativeAbstractComponent(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("authorList")) {
- res.setAuthorList(parseCitationAuthorListComponent(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("authorString")) {
- res.getAuthorString().add(parseCitationAuthorStringComponent(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("contributorList")) {
- res.setContributorList(parseCitationContributorListComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("contributorship")) {
+ res.setContributorship(parseCitationContributorshipComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("articleLanguage")) {
res.setArticleLanguage(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("alternativeForm")) {
res.getAlternativeForm().add(parseCitationAlternativeFormComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("classifier")) {
res.getClassifier().add(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("keywordList")) {
+ res.getKeywordList().add(parseCitationKeywordListComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("relatedArtifact")) {
res.getRelatedArtifact().add(parseRelatedArtifact(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("note")) {
@@ -5333,6 +5336,32 @@ public class XmlParser extends XmlParserBase {
return true;
}
+ protected Citation.CitationSummaryComponent parseCitationSummaryComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Citation.CitationSummaryComponent res = new Citation.CitationSummaryComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseCitationSummaryComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseCitationSummaryComponentContent(int eventType, XmlPullParser xpp, Citation.CitationSummaryComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("style")) {
+ res.setStyle(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("text")) {
+ res.setTextElement(parseMarkdown(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
protected Citation.CitationVariantCitationComponent parseCitationVariantCitationComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
Citation.CitationVariantCitationComponent res = new Citation.CitationVariantCitationComponent();
parseElementAttributes(xpp, res);
@@ -5414,7 +5443,105 @@ public class XmlParser extends XmlParserBase {
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("issue")) {
res.setIssueElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("publicationDate")) {
- res.setPublicationDateElement(parseString(xpp));
+ res.setPublicationDate(parseCitationJournalJournalIssuePublicationDateComponent(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected Citation.CitationJournalJournalIssuePublicationDateComponent parseCitationJournalJournalIssuePublicationDateComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Citation.CitationJournalJournalIssuePublicationDateComponent res = new Citation.CitationJournalJournalIssuePublicationDateComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseCitationJournalJournalIssuePublicationDateComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseCitationJournalJournalIssuePublicationDateComponentContent(int eventType, XmlPullParser xpp, Citation.CitationJournalJournalIssuePublicationDateComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("date")) {
+ res.setDateElement(parseDate(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("year")) {
+ res.setYearElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("month")) {
+ res.setMonthElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("day")) {
+ res.setDayElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("season")) {
+ res.setSeasonElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("text")) {
+ res.setTextElement(parseString(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected Citation.CitationPublicationInfoComponent parseCitationPublicationInfoComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Citation.CitationPublicationInfoComponent res = new Citation.CitationPublicationInfoComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseCitationPublicationInfoComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseCitationPublicationInfoComponentContent(int eventType, XmlPullParser xpp, Citation.CitationPublicationInfoComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("publishedIn")) {
+ res.setPublishedIn(parseCitationPublicationInfoPublishedInComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("entryDate")) {
+ res.setEntryDateElement(parseDateTime(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("revisionDate")) {
+ res.setRevisionDateElement(parseDateTime(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("pageCount")) {
+ res.setPageCountElement(parseString(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected Citation.CitationPublicationInfoPublishedInComponent parseCitationPublicationInfoPublishedInComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Citation.CitationPublicationInfoPublishedInComponent res = new Citation.CitationPublicationInfoPublishedInComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseCitationPublicationInfoPublishedInComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseCitationPublicationInfoPublishedInComponentContent(int eventType, XmlPullParser xpp, Citation.CitationPublicationInfoPublishedInComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
+ res.setType(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("identifier")) {
+ res.getIdentifier().add(parseIdentifier(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("name")) {
+ res.setNameElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("publisher")) {
+ res.setPublisher(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("publisherLocation")) {
+ res.setPublisherLocationElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("startDate")) {
+ res.setStartDateElement(parseDate(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
return false;
}
@@ -5533,13 +5660,13 @@ public class XmlParser extends XmlParserBase {
return true;
}
- protected Citation.CitationAuthorListComponent parseCitationAuthorListComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Citation.CitationAuthorListComponent res = new Citation.CitationAuthorListComponent();
+ protected Citation.CitationContributorshipComponent parseCitationContributorshipComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Citation.CitationContributorshipComponent res = new Citation.CitationContributorshipComponent();
parseElementAttributes(xpp, res);
next(xpp);
int eventType = nextNoWhitespace(xpp);
while (eventType != XmlPullParser.END_TAG) {
- if (!parseCitationAuthorListComponentContent(eventType, xpp, res))
+ if (!parseCitationContributorshipComponentContent(eventType, xpp, res))
unknownContent(xpp);
eventType = nextNoWhitespace(xpp);
}
@@ -5548,24 +5675,26 @@ public class XmlParser extends XmlParserBase {
return res;
}
- protected boolean parseCitationAuthorListComponentContent(int eventType, XmlPullParser xpp, Citation.CitationAuthorListComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ protected boolean parseCitationContributorshipComponentContent(int eventType, XmlPullParser xpp, Citation.CitationContributorshipComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("complete")) {
res.setCompleteElement(parseBoolean(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("author")) {
- res.getAuthor().add(parseCitationAuthorListAuthorComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("entry")) {
+ res.getEntry().add(parseCitationContributorshipEntryComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("summary")) {
+ res.getSummary().add(parseCitationContributorshipSummaryComponent(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
return false;
}
return true;
}
- protected Citation.CitationAuthorListAuthorComponent parseCitationAuthorListAuthorComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Citation.CitationAuthorListAuthorComponent res = new Citation.CitationAuthorListAuthorComponent();
+ protected Citation.CitationContributorshipEntryComponent parseCitationContributorshipEntryComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Citation.CitationContributorshipEntryComponent res = new Citation.CitationContributorshipEntryComponent();
parseElementAttributes(xpp, res);
next(xpp);
int eventType = nextNoWhitespace(xpp);
while (eventType != XmlPullParser.END_TAG) {
- if (!parseCitationAuthorListAuthorComponentContent(eventType, xpp, res))
+ if (!parseCitationContributorshipEntryComponentContent(eventType, xpp, res))
unknownContent(xpp);
eventType = nextNoWhitespace(xpp);
}
@@ -5574,13 +5703,9 @@ public class XmlParser extends XmlParserBase {
return res;
}
- protected boolean parseCitationAuthorListAuthorComponentContent(int eventType, XmlPullParser xpp, Citation.CitationAuthorListAuthorComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("lastName")) {
- res.setLastNameElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("foreName")) {
- res.setForeNameElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("suffix")) {
- res.setSuffixElement(parseString(xpp));
+ protected boolean parseCitationContributorshipEntryComponentContent(int eventType, XmlPullParser xpp, Citation.CitationContributorshipEntryComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("name")) {
+ res.setName(parseHumanName(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("initials")) {
res.setInitialsElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("collectiveName")) {
@@ -5588,11 +5713,15 @@ public class XmlParser extends XmlParserBase {
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("identifier")) {
res.getIdentifier().add(parseIdentifier(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("affiliationInfo")) {
- res.getAffiliationInfo().add(parseCitationAuthorListAuthorAffiliationInfoComponent(xpp));
+ res.getAffiliationInfo().add(parseCitationContributorshipEntryAffiliationInfoComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("address")) {
- res.getAddress().add(parseString(xpp));
+ res.getAddress().add(parseAddress(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("telecom")) {
res.getTelecom().add(parseContactPoint(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("contribution")) {
+ res.getContribution().add(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("notAnAuthor")) {
+ res.setNotAnAuthorElement(parseBoolean(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("correspondingAuthor")) {
res.setCorrespondingAuthorElement(parseBoolean(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("listOrder")) {
@@ -5603,13 +5732,13 @@ public class XmlParser extends XmlParserBase {
return true;
}
- protected Citation.CitationAuthorListAuthorAffiliationInfoComponent parseCitationAuthorListAuthorAffiliationInfoComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Citation.CitationAuthorListAuthorAffiliationInfoComponent res = new Citation.CitationAuthorListAuthorAffiliationInfoComponent();
+ protected Citation.CitationContributorshipEntryAffiliationInfoComponent parseCitationContributorshipEntryAffiliationInfoComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Citation.CitationContributorshipEntryAffiliationInfoComponent res = new Citation.CitationContributorshipEntryAffiliationInfoComponent();
parseElementAttributes(xpp, res);
next(xpp);
int eventType = nextNoWhitespace(xpp);
while (eventType != XmlPullParser.END_TAG) {
- if (!parseCitationAuthorListAuthorAffiliationInfoComponentContent(eventType, xpp, res))
+ if (!parseCitationContributorshipEntryAffiliationInfoComponentContent(eventType, xpp, res))
unknownContent(xpp);
eventType = nextNoWhitespace(xpp);
}
@@ -5618,7 +5747,7 @@ public class XmlParser extends XmlParserBase {
return res;
}
- protected boolean parseCitationAuthorListAuthorAffiliationInfoComponentContent(int eventType, XmlPullParser xpp, Citation.CitationAuthorListAuthorAffiliationInfoComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ protected boolean parseCitationContributorshipEntryAffiliationInfoComponentContent(int eventType, XmlPullParser xpp, Citation.CitationContributorshipEntryAffiliationInfoComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("affiliation")) {
res.setAffiliationElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("role")) {
@@ -5631,13 +5760,13 @@ public class XmlParser extends XmlParserBase {
return true;
}
- protected Citation.CitationAuthorStringComponent parseCitationAuthorStringComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Citation.CitationAuthorStringComponent res = new Citation.CitationAuthorStringComponent();
+ protected Citation.CitationContributorshipSummaryComponent parseCitationContributorshipSummaryComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Citation.CitationContributorshipSummaryComponent res = new Citation.CitationContributorshipSummaryComponent();
parseElementAttributes(xpp, res);
next(xpp);
int eventType = nextNoWhitespace(xpp);
while (eventType != XmlPullParser.END_TAG) {
- if (!parseCitationAuthorStringComponentContent(eventType, xpp, res))
+ if (!parseCitationContributorshipSummaryComponentContent(eventType, xpp, res))
unknownContent(xpp);
eventType = nextNoWhitespace(xpp);
}
@@ -5646,105 +5775,15 @@ public class XmlParser extends XmlParserBase {
return res;
}
- protected boolean parseCitationAuthorStringComponentContent(int eventType, XmlPullParser xpp, Citation.CitationAuthorStringComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("source")) {
+ protected boolean parseCitationContributorshipSummaryComponentContent(int eventType, XmlPullParser xpp, Citation.CitationContributorshipSummaryComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
+ res.setType(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("style")) {
+ res.setStyle(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("source")) {
res.setSource(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("value")) {
- res.setValueElement(parseString(xpp));
- } else if (!parseBackboneElementContent(eventType, xpp, res)){
- return false;
- }
- return true;
- }
-
- protected Citation.CitationContributorListComponent parseCitationContributorListComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Citation.CitationContributorListComponent res = new Citation.CitationContributorListComponent();
- parseElementAttributes(xpp, res);
- next(xpp);
- int eventType = nextNoWhitespace(xpp);
- while (eventType != XmlPullParser.END_TAG) {
- if (!parseCitationContributorListComponentContent(eventType, xpp, res))
- unknownContent(xpp);
- eventType = nextNoWhitespace(xpp);
- }
- next(xpp);
- parseElementClose(res);
- return res;
- }
-
- protected boolean parseCitationContributorListComponentContent(int eventType, XmlPullParser xpp, Citation.CitationContributorListComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("complete")) {
- res.setCompleteElement(parseBoolean(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("contributor")) {
- res.getContributor().add(parseCitationContributorListContributorComponent(xpp));
- } else if (!parseBackboneElementContent(eventType, xpp, res)){
- return false;
- }
- return true;
- }
-
- protected Citation.CitationContributorListContributorComponent parseCitationContributorListContributorComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Citation.CitationContributorListContributorComponent res = new Citation.CitationContributorListContributorComponent();
- parseElementAttributes(xpp, res);
- next(xpp);
- int eventType = nextNoWhitespace(xpp);
- while (eventType != XmlPullParser.END_TAG) {
- if (!parseCitationContributorListContributorComponentContent(eventType, xpp, res))
- unknownContent(xpp);
- eventType = nextNoWhitespace(xpp);
- }
- next(xpp);
- parseElementClose(res);
- return res;
- }
-
- protected boolean parseCitationContributorListContributorComponentContent(int eventType, XmlPullParser xpp, Citation.CitationContributorListContributorComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("lastName")) {
- res.setLastNameElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("foreName")) {
- res.setForeNameElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("suffix")) {
- res.setSuffixElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("initials")) {
- res.setInitialsElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("collectiveName")) {
- res.setCollectiveNameElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("identifier")) {
- res.getIdentifier().add(parseIdentifier(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("contribution")) {
- res.getContribution().add(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("affiliationInfo")) {
- res.getAffiliationInfo().add(parseCitationContributorListContributorAffiliationInfoComponent(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("listOrder")) {
- res.setListOrderElement(parsePositiveInt(xpp));
- } else if (!parseBackboneElementContent(eventType, xpp, res)){
- return false;
- }
- return true;
- }
-
- protected Citation.CitationContributorListContributorAffiliationInfoComponent parseCitationContributorListContributorAffiliationInfoComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Citation.CitationContributorListContributorAffiliationInfoComponent res = new Citation.CitationContributorListContributorAffiliationInfoComponent();
- parseElementAttributes(xpp, res);
- next(xpp);
- int eventType = nextNoWhitespace(xpp);
- while (eventType != XmlPullParser.END_TAG) {
- if (!parseCitationContributorListContributorAffiliationInfoComponentContent(eventType, xpp, res))
- unknownContent(xpp);
- eventType = nextNoWhitespace(xpp);
- }
- next(xpp);
- parseElementClose(res);
- return res;
- }
-
- protected boolean parseCitationContributorListContributorAffiliationInfoComponentContent(int eventType, XmlPullParser xpp, Citation.CitationContributorListContributorAffiliationInfoComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("affiliation")) {
- res.setAffiliationElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("role")) {
- res.setRoleElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("identifier")) {
- res.getIdentifier().add(parseIdentifier(xpp));
+ res.setValueElement(parseMarkdown(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
return false;
}
@@ -5775,6 +5814,8 @@ public class XmlParser extends XmlParserBase {
res.setJournalIssue(parseCitationAlternativeFormJournalIssueComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("pagination")) {
res.setPagination(parseCitationAlternativeFormPaginationComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("publicationInfo")) {
+ res.setPublicationInfo(parseCitationAlternativeFormPublicationInfoComponent(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
return false;
}
@@ -5804,7 +5845,41 @@ public class XmlParser extends XmlParserBase {
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("issue")) {
res.setIssueElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("publicationDate")) {
- res.setPublicationDateElement(parseString(xpp));
+ res.setPublicationDate(parseCitationAlternativeFormJournalIssuePublicationDateComponent(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected Citation.CitationAlternativeFormJournalIssuePublicationDateComponent parseCitationAlternativeFormJournalIssuePublicationDateComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Citation.CitationAlternativeFormJournalIssuePublicationDateComponent res = new Citation.CitationAlternativeFormJournalIssuePublicationDateComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseCitationAlternativeFormJournalIssuePublicationDateComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseCitationAlternativeFormJournalIssuePublicationDateComponentContent(int eventType, XmlPullParser xpp, Citation.CitationAlternativeFormJournalIssuePublicationDateComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("date")) {
+ res.setDateElement(parseDate(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("year")) {
+ res.setYearElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("month")) {
+ res.setMonthElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("day")) {
+ res.setDayElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("season")) {
+ res.setSeasonElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("text")) {
+ res.setTextElement(parseString(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
return false;
}
@@ -5839,6 +5914,120 @@ public class XmlParser extends XmlParserBase {
return true;
}
+ protected Citation.CitationAlternativeFormPublicationInfoComponent parseCitationAlternativeFormPublicationInfoComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Citation.CitationAlternativeFormPublicationInfoComponent res = new Citation.CitationAlternativeFormPublicationInfoComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseCitationAlternativeFormPublicationInfoComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseCitationAlternativeFormPublicationInfoComponentContent(int eventType, XmlPullParser xpp, Citation.CitationAlternativeFormPublicationInfoComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("publishedIn")) {
+ res.setPublishedIn(parseCitationAlternativeFormPublicationInfoPublishedInComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("entryDate")) {
+ res.setEntryDateElement(parseDateTime(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("revisionDate")) {
+ res.setRevisionDateElement(parseDateTime(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("pageCount")) {
+ res.setPageCountElement(parseString(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected Citation.CitationAlternativeFormPublicationInfoPublishedInComponent parseCitationAlternativeFormPublicationInfoPublishedInComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Citation.CitationAlternativeFormPublicationInfoPublishedInComponent res = new Citation.CitationAlternativeFormPublicationInfoPublishedInComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseCitationAlternativeFormPublicationInfoPublishedInComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseCitationAlternativeFormPublicationInfoPublishedInComponentContent(int eventType, XmlPullParser xpp, Citation.CitationAlternativeFormPublicationInfoPublishedInComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
+ res.setType(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("name")) {
+ res.setNameElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("publisher")) {
+ res.setPublisher(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("publisherLocation")) {
+ res.setPublisherLocationElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("startDate")) {
+ res.setStartDateElement(parseDate(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected Citation.CitationKeywordListComponent parseCitationKeywordListComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Citation.CitationKeywordListComponent res = new Citation.CitationKeywordListComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseCitationKeywordListComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseCitationKeywordListComponentContent(int eventType, XmlPullParser xpp, Citation.CitationKeywordListComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("owner")) {
+ res.setOwnerElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("keyword")) {
+ res.getKeyword().add(parseCitationKeywordListKeywordComponent(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected Citation.CitationKeywordListKeywordComponent parseCitationKeywordListKeywordComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Citation.CitationKeywordListKeywordComponent res = new Citation.CitationKeywordListKeywordComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseCitationKeywordListKeywordComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseCitationKeywordListKeywordComponentContent(int eventType, XmlPullParser xpp, Citation.CitationKeywordListKeywordComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("majorTopic")) {
+ res.setMajorTopicElement(parseBoolean(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("value")) {
+ res.setValueElement(parseString(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
protected Citation.CitationMedlinePubMedComponent parseCitationMedlinePubMedComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
Citation.CitationMedlinePubMedComponent res = new Citation.CitationMedlinePubMedComponent();
parseElementAttributes(xpp, res);
@@ -7714,7 +7903,7 @@ public class XmlParser extends XmlParserBase {
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("title")) {
res.setTitleElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("confidentiality")) {
- res.setConfidentialityElement(parseEnumeration(xpp, Composition.V3ConfidentialityClassification.NULL, new Composition.V3ConfidentialityClassificationEnumFactory()));
+ res.setConfidentialityElement(parseCode(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("attester")) {
res.getAttester().add(parseCompositionAttesterComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("custodian")) {
@@ -8421,8 +8610,10 @@ public class XmlParser extends XmlParserBase {
res.setDateTimeElement(parseDateTime(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("performer")) {
res.getPerformer().add(parseReference(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("organization")) {
- res.getOrganization().add(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("manager")) {
+ res.getManager().add(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("controller")) {
+ res.getController().add(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("sourceAttachment")) {
res.getSourceAttachment().add(parseAttachment(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("sourceReference")) {
@@ -10685,10 +10876,10 @@ public class XmlParser extends XmlParserBase {
}
protected boolean parseDocumentReferenceContent(int eventType, XmlPullParser xpp, DocumentReference res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("masterIdentifier")) {
- res.setMasterIdentifier(parseIdentifier(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("identifier")) {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("identifier")) {
res.getIdentifier().add(parseIdentifier(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("basedOn")) {
+ res.getBasedOn().add(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("status")) {
res.setStatusElement(parseEnumeration(xpp, Enumerations.DocumentReferenceStatus.NULL, new Enumerations.DocumentReferenceStatusEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("docStatus")) {
@@ -10699,30 +10890,70 @@ public class XmlParser extends XmlParserBase {
res.getCategory().add(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("subject")) {
res.setSubject(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("encounter")) {
+ res.getEncounter().add(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("event")) {
+ res.getEvent().add(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("facilityType")) {
+ res.setFacilityType(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("practiceSetting")) {
+ res.setPracticeSetting(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("period")) {
+ res.setPeriod(parsePeriod(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("date")) {
res.setDateElement(parseInstant(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("author")) {
res.getAuthor().add(parseReference(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("authenticator")) {
- res.setAuthenticator(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("attester")) {
+ res.getAttester().add(parseDocumentReferenceAttesterComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("custodian")) {
res.setCustodian(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("relatesTo")) {
res.getRelatesTo().add(parseDocumentReferenceRelatesToComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("description")) {
- res.setDescriptionElement(parseString(xpp));
+ res.setDescriptionElement(parseMarkdown(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("securityLabel")) {
res.getSecurityLabel().add(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("content")) {
res.getContent().add(parseDocumentReferenceContentComponent(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("context")) {
- res.setContext(parseDocumentReferenceContextComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("sourcePatientInfo")) {
+ res.setSourcePatientInfo(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("related")) {
+ res.getRelated().add(parseReference(xpp));
} else if (!parseDomainResourceContent(eventType, xpp, res)){
return false;
}
return true;
}
+ protected DocumentReference.DocumentReferenceAttesterComponent parseDocumentReferenceAttesterComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ DocumentReference.DocumentReferenceAttesterComponent res = new DocumentReference.DocumentReferenceAttesterComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseDocumentReferenceAttesterComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseDocumentReferenceAttesterComponentContent(int eventType, XmlPullParser xpp, DocumentReference.DocumentReferenceAttesterComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("mode")) {
+ res.setModeElement(parseEnumeration(xpp, DocumentReference.DocumentAttestationMode.NULL, new DocumentReference.DocumentAttestationModeEnumFactory()));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("time")) {
+ res.setTimeElement(parseDateTime(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("party")) {
+ res.setParty(parseReference(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
protected DocumentReference.DocumentReferenceRelatesToComponent parseDocumentReferenceRelatesToComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
DocumentReference.DocumentReferenceRelatesToComponent res = new DocumentReference.DocumentReferenceRelatesToComponent();
parseElementAttributes(xpp, res);
@@ -10769,44 +11000,8 @@ public class XmlParser extends XmlParserBase {
res.setAttachment(parseAttachment(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("format")) {
res.setFormat(parseCoding(xpp));
- } else if (!parseBackboneElementContent(eventType, xpp, res)){
- return false;
- }
- return true;
- }
-
- protected DocumentReference.DocumentReferenceContextComponent parseDocumentReferenceContextComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- DocumentReference.DocumentReferenceContextComponent res = new DocumentReference.DocumentReferenceContextComponent();
- parseElementAttributes(xpp, res);
- next(xpp);
- int eventType = nextNoWhitespace(xpp);
- while (eventType != XmlPullParser.END_TAG) {
- if (!parseDocumentReferenceContextComponentContent(eventType, xpp, res))
- unknownContent(xpp);
- eventType = nextNoWhitespace(xpp);
- }
- next(xpp);
- parseElementClose(res);
- return res;
- }
-
- protected boolean parseDocumentReferenceContextComponentContent(int eventType, XmlPullParser xpp, DocumentReference.DocumentReferenceContextComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("encounter")) {
- res.getEncounter().add(parseReference(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("event")) {
- res.getEvent().add(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("period")) {
- res.setPeriod(parsePeriod(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("facilityType")) {
- res.setFacilityType(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("practiceSetting")) {
- res.setPracticeSetting(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("sourcePatientInfo")) {
- res.setSourcePatientInfo(parseReference(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("related")) {
- res.getRelated().add(parseReference(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("basedOn")) {
- res.getBasedOn().add(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("identifier")) {
+ res.setIdentifier(parseIdentifier(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
return false;
}
@@ -11389,8 +11584,18 @@ public class XmlParser extends XmlParserBase {
res.setApprovalDateElement(parseDate(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("lastReviewDate")) {
res.setLastReviewDateElement(parseDate(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("contributor")) {
- res.getContributor().add(parseContributor(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("publisher")) {
+ res.setPublisherElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("contact")) {
+ res.getContact().add(parseContactDetail(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("author")) {
+ res.getAuthor().add(parseContactDetail(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("editor")) {
+ res.getEditor().add(parseContactDetail(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reviewer")) {
+ res.getReviewer().add(parseContactDetail(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("endorser")) {
+ res.getEndorser().add(parseContactDetail(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("relatedArtifact")) {
res.getRelatedArtifact().add(parseRelatedArtifact(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("description")) {
@@ -11470,7 +11675,7 @@ public class XmlParser extends XmlParserBase {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("description")) {
res.setDescriptionElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("note")) {
- res.setNote(parseAnnotation(xpp));
+ res.getNote().add(parseAnnotation(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("rating")) {
res.getRating().add(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("certaintySubcomponent")) {
@@ -11500,7 +11705,7 @@ public class XmlParser extends XmlParserBase {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("description")) {
res.setDescriptionElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("note")) {
- res.setNote(parseAnnotation(xpp));
+ res.getNote().add(parseAnnotation(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
res.getType().add(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("rating")) {
@@ -11511,13 +11716,13 @@ public class XmlParser extends XmlParserBase {
return true;
}
- protected EvidenceFocus parseEvidenceFocus(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- EvidenceFocus res = new EvidenceFocus();
+ protected EvidenceReport parseEvidenceReport(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ EvidenceReport res = new EvidenceReport();
parseResourceAttributes(xpp, res);
next(xpp);
int eventType = nextNoWhitespace(xpp);
while (eventType != XmlPullParser.END_TAG) {
- if (!parseEvidenceFocusContent(eventType, xpp, res))
+ if (!parseEvidenceReportContent(eventType, xpp, res))
unknownContent(xpp);
eventType = nextNoWhitespace(xpp);
}
@@ -11526,44 +11731,56 @@ public class XmlParser extends XmlParserBase {
return res;
}
- protected boolean parseEvidenceFocusContent(int eventType, XmlPullParser xpp, EvidenceFocus res) throws XmlPullParserException, IOException, FHIRFormatError {
+ protected boolean parseEvidenceReportContent(int eventType, XmlPullParser xpp, EvidenceReport res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("url")) {
res.setUrlElement(parseUri(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("identifier")) {
- res.getIdentifier().add(parseIdentifier(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("version")) {
- res.setVersionElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("name")) {
- res.setNameElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("status")) {
res.setStatusElement(parseEnumeration(xpp, Enumerations.PublicationStatus.NULL, new Enumerations.PublicationStatusEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("useContext")) {
res.getUseContext().add(parseUsageContext(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("date")) {
- res.setDateElement(parseDateTime(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("note")) {
- res.getNote().add(parseAnnotation(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("copyright")) {
- res.setCopyrightElement(parseMarkdown(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("identifier")) {
+ res.getIdentifier().add(parseIdentifier(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("relatedIdentifier")) {
+ res.getRelatedIdentifier().add(parseIdentifier(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("citeAs")) {
res.setCiteAs(parseReference(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("characteristic")) {
- res.getCharacteristic().add(parseEvidenceFocusCharacteristicComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
+ res.setType(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("note")) {
+ res.getNote().add(parseAnnotation(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("relatedArtifact")) {
res.getRelatedArtifact().add(parseRelatedArtifact(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("subject")) {
+ res.setSubject(parseEvidenceReportSubjectComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("publisher")) {
+ res.setPublisherElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("contact")) {
+ res.getContact().add(parseContactDetail(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("author")) {
+ res.getAuthor().add(parseContactDetail(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("editor")) {
+ res.getEditor().add(parseContactDetail(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reviewer")) {
+ res.getReviewer().add(parseContactDetail(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("endorser")) {
+ res.getEndorser().add(parseContactDetail(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("relatesTo")) {
+ res.getRelatesTo().add(parseEvidenceReportRelatesToComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("section")) {
+ res.getSection().add(parseEvidenceReportSectionComponent(xpp));
} else if (!parseMetadataResourceContent(eventType, xpp, res)){
return false;
}
return true;
}
- protected EvidenceFocus.EvidenceFocusCharacteristicComponent parseEvidenceFocusCharacteristicComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- EvidenceFocus.EvidenceFocusCharacteristicComponent res = new EvidenceFocus.EvidenceFocusCharacteristicComponent();
+ protected EvidenceReport.EvidenceReportSubjectComponent parseEvidenceReportSubjectComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ EvidenceReport.EvidenceReportSubjectComponent res = new EvidenceReport.EvidenceReportSubjectComponent();
parseElementAttributes(xpp, res);
next(xpp);
int eventType = nextNoWhitespace(xpp);
while (eventType != XmlPullParser.END_TAG) {
- if (!parseEvidenceFocusCharacteristicComponentContent(eventType, xpp, res))
+ if (!parseEvidenceReportSubjectComponentContent(eventType, xpp, res))
unknownContent(xpp);
eventType = nextNoWhitespace(xpp);
}
@@ -11572,7 +11789,33 @@ public class XmlParser extends XmlParserBase {
return res;
}
- protected boolean parseEvidenceFocusCharacteristicComponentContent(int eventType, XmlPullParser xpp, EvidenceFocus.EvidenceFocusCharacteristicComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ protected boolean parseEvidenceReportSubjectComponentContent(int eventType, XmlPullParser xpp, EvidenceReport.EvidenceReportSubjectComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("characteristic")) {
+ res.getCharacteristic().add(parseEvidenceReportSubjectCharacteristicComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("note")) {
+ res.getNote().add(parseAnnotation(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected EvidenceReport.EvidenceReportSubjectCharacteristicComponent parseEvidenceReportSubjectCharacteristicComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ EvidenceReport.EvidenceReportSubjectCharacteristicComponent res = new EvidenceReport.EvidenceReportSubjectCharacteristicComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseEvidenceReportSubjectCharacteristicComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseEvidenceReportSubjectCharacteristicComponentContent(int eventType, XmlPullParser xpp, EvidenceReport.EvidenceReportSubjectCharacteristicComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("code")) {
res.setCode(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "value")) {
@@ -11587,6 +11830,76 @@ public class XmlParser extends XmlParserBase {
return true;
}
+ protected EvidenceReport.EvidenceReportRelatesToComponent parseEvidenceReportRelatesToComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ EvidenceReport.EvidenceReportRelatesToComponent res = new EvidenceReport.EvidenceReportRelatesToComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseEvidenceReportRelatesToComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseEvidenceReportRelatesToComponentContent(int eventType, XmlPullParser xpp, EvidenceReport.EvidenceReportRelatesToComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("code")) {
+ res.setCodeElement(parseEnumeration(xpp, EvidenceReport.ReportRelationshipType.NULL, new EvidenceReport.ReportRelationshipTypeEnumFactory()));
+ } else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "target")) {
+ res.setTarget(parseType("target", xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected EvidenceReport.SectionComponent parseEvidenceReportSectionComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ EvidenceReport.SectionComponent res = new EvidenceReport.SectionComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseEvidenceReportSectionComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseEvidenceReportSectionComponentContent(int eventType, XmlPullParser xpp, EvidenceReport.SectionComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("title")) {
+ res.setTitleElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("focus")) {
+ res.setFocus(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("focusReference")) {
+ res.setFocusReference(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("author")) {
+ res.getAuthor().add(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("text")) {
+ res.setText(parseNarrative(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("mode")) {
+ res.setModeElement(parseEnumeration(xpp, Enumerations.ListMode.NULL, new Enumerations.ListModeEnumFactory()));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("orderedBy")) {
+ res.setOrderedBy(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("entryClassifier")) {
+ res.getEntryClassifier().add(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("entryReference")) {
+ res.getEntryReference().add(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("emptyReason")) {
+ res.setEmptyReason(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("section")) {
+ res.getSection().add(parseEvidenceReportSectionComponent(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
protected EvidenceVariable parseEvidenceVariable(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
EvidenceVariable res = new EvidenceVariable();
parseResourceAttributes(xpp, res);
@@ -11621,28 +11934,16 @@ public class XmlParser extends XmlParserBase {
res.setStatusElement(parseEnumeration(xpp, Enumerations.PublicationStatus.NULL, new Enumerations.PublicationStatusEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("date")) {
res.setDateElement(parseDateTime(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("publisher")) {
- res.setPublisherElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("contact")) {
- res.getContact().add(parseContactDetail(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("description")) {
res.setDescriptionElement(parseMarkdown(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("note")) {
res.getNote().add(parseAnnotation(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("useContext")) {
res.getUseContext().add(parseUsageContext(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("jurisdiction")) {
- res.getJurisdiction().add(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("copyright")) {
- res.setCopyrightElement(parseMarkdown(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("approvalDate")) {
- res.setApprovalDateElement(parseDate(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("lastReviewDate")) {
- res.setLastReviewDateElement(parseDate(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("effectivePeriod")) {
- res.setEffectivePeriod(parsePeriod(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("topic")) {
- res.getTopic().add(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("publisher")) {
+ res.setPublisherElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("contact")) {
+ res.getContact().add(parseContactDetail(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("author")) {
res.getAuthor().add(parseContactDetail(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("editor")) {
@@ -11653,14 +11954,16 @@ public class XmlParser extends XmlParserBase {
res.getEndorser().add(parseContactDetail(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("relatedArtifact")) {
res.getRelatedArtifact().add(parseRelatedArtifact(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
- res.setTypeElement(parseEnumeration(xpp, EvidenceVariable.EvidenceVariableType.NULL, new EvidenceVariable.EvidenceVariableTypeEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("actual")) {
res.setActualElement(parseBoolean(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("characteristicCombination")) {
res.setCharacteristicCombinationElement(parseEnumeration(xpp, EvidenceVariable.CharacteristicCombination.NULL, new EvidenceVariable.CharacteristicCombinationEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("characteristic")) {
res.getCharacteristic().add(parseEvidenceVariableCharacteristicComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("handling")) {
+ res.setHandlingElement(parseEnumeration(xpp, Enumerations.EvidenceVariableHandling.NULL, new Enumerations.EvidenceVariableHandlingEnumFactory()));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("category")) {
+ res.getCategory().add(parseEvidenceVariableCategoryComponent(xpp));
} else if (!parseMetadataResourceContent(eventType, xpp, res)){
return false;
}
@@ -11733,6 +12036,32 @@ public class XmlParser extends XmlParserBase {
return true;
}
+ protected EvidenceVariable.EvidenceVariableCategoryComponent parseEvidenceVariableCategoryComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ EvidenceVariable.EvidenceVariableCategoryComponent res = new EvidenceVariable.EvidenceVariableCategoryComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseEvidenceVariableCategoryComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseEvidenceVariableCategoryComponentContent(int eventType, XmlPullParser xpp, EvidenceVariable.EvidenceVariableCategoryComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("name")) {
+ res.setNameElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "value")) {
+ res.setValue(parseType("value", xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
protected ExampleScenario parseExampleScenario(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
ExampleScenario res = new ExampleScenario();
parseResourceAttributes(xpp, res);
@@ -13769,12 +14098,24 @@ public class XmlParser extends XmlParserBase {
protected boolean parseImmunizationContent(int eventType, XmlPullParser xpp, Immunization res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("identifier")) {
res.getIdentifier().add(parseIdentifier(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("instantiatesCanonical")) {
+ res.getInstantiatesCanonical().add(parseCanonical(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("instantiatesUri")) {
+ res.getInstantiatesUri().add(parseUri(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("basedOn")) {
+ res.getBasedOn().add(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("status")) {
res.setStatusElement(parseEnumeration(xpp, Immunization.ImmunizationStatusCodes.NULL, new Immunization.ImmunizationStatusCodesEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("statusReason")) {
res.setStatusReason(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("vaccineCode")) {
res.setVaccineCode(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("manufacturer")) {
+ res.setManufacturer(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("lotNumber")) {
+ res.setLotNumberElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("expirationDate")) {
+ res.setExpirationDateElement(parseDate(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("patient")) {
res.setPatient(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("encounter")) {
@@ -13789,12 +14130,6 @@ public class XmlParser extends XmlParserBase {
res.setInformationSource(parseType("informationSource", xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("location")) {
res.setLocation(parseReference(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("manufacturer")) {
- res.setManufacturer(parseReference(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("lotNumber")) {
- res.setLotNumberElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("expirationDate")) {
- res.setExpirationDateElement(parseDate(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("site")) {
res.setSite(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("route")) {
@@ -14009,6 +14344,10 @@ public class XmlParser extends XmlParserBase {
protected boolean parseImmunizationRecommendationContent(int eventType, XmlPullParser xpp, ImmunizationRecommendation res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("identifier")) {
res.getIdentifier().add(parseIdentifier(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("instantiatesCanonical")) {
+ res.getInstantiatesCanonical().add(parseCanonical(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("instantiatesUri")) {
+ res.getInstantiatesUri().add(parseUri(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("patient")) {
res.setPatient(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("date")) {
@@ -14503,16 +14842,114 @@ public class XmlParser extends XmlParserBase {
res.setAllergenicIndicatorElement(parseBoolean(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("manufacturer")) {
res.getManufacturer().add(parseReference(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("specifiedSubstance")) {
- res.getSpecifiedSubstance().add(parseIngredientSpecifiedSubstanceComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("substance")) {
res.setSubstance(parseIngredientSubstanceComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("specifiedSubstance")) {
+ res.getSpecifiedSubstance().add(parseIngredientSpecifiedSubstanceComponent(xpp));
} else if (!parseDomainResourceContent(eventType, xpp, res)){
return false;
}
return true;
}
+ protected Ingredient.IngredientSubstanceComponent parseIngredientSubstanceComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Ingredient.IngredientSubstanceComponent res = new Ingredient.IngredientSubstanceComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseIngredientSubstanceComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseIngredientSubstanceComponentContent(int eventType, XmlPullParser xpp, Ingredient.IngredientSubstanceComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "code")) {
+ res.setCode(parseType("code", xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("strength")) {
+ res.getStrength().add(parseIngredientSubstanceStrengthComponent(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected Ingredient.IngredientSubstanceStrengthComponent parseIngredientSubstanceStrengthComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Ingredient.IngredientSubstanceStrengthComponent res = new Ingredient.IngredientSubstanceStrengthComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseIngredientSubstanceStrengthComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseIngredientSubstanceStrengthComponentContent(int eventType, XmlPullParser xpp, Ingredient.IngredientSubstanceStrengthComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("presentation")) {
+ res.setPresentation(parseRatio(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("presentationHighLimit")) {
+ res.setPresentationHighLimit(parseRatio(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("presentationText")) {
+ res.setPresentationTextElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("concentration")) {
+ res.setConcentration(parseRatio(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("concentrationHighLimit")) {
+ res.setConcentrationHighLimit(parseRatio(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("concentrationText")) {
+ res.setConcentrationTextElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("measurementPoint")) {
+ res.setMeasurementPointElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("country")) {
+ res.getCountry().add(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("referenceStrength")) {
+ res.getReferenceStrength().add(parseIngredientSubstanceStrengthReferenceStrengthComponent(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected Ingredient.IngredientSubstanceStrengthReferenceStrengthComponent parseIngredientSubstanceStrengthReferenceStrengthComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Ingredient.IngredientSubstanceStrengthReferenceStrengthComponent res = new Ingredient.IngredientSubstanceStrengthReferenceStrengthComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseIngredientSubstanceStrengthReferenceStrengthComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseIngredientSubstanceStrengthReferenceStrengthComponentContent(int eventType, XmlPullParser xpp, Ingredient.IngredientSubstanceStrengthReferenceStrengthComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "substance")) {
+ res.setSubstance(parseType("substance", xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("strength")) {
+ res.setStrength(parseRatio(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("strengthHighLimit")) {
+ res.setStrengthHighLimit(parseRatio(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("measurementPoint")) {
+ res.setMeasurementPointElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("country")) {
+ res.getCountry().add(parseCodeableConcept(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
protected Ingredient.IngredientSpecifiedSubstanceComponent parseIngredientSpecifiedSubstanceComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
Ingredient.IngredientSpecifiedSubstanceComponent res = new Ingredient.IngredientSpecifiedSubstanceComponent();
parseElementAttributes(xpp, res);
@@ -14536,105 +14973,7 @@ public class XmlParser extends XmlParserBase {
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("confidentiality")) {
res.setConfidentiality(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("strength")) {
- res.getStrength().add(parseIngredientSpecifiedSubstanceStrengthComponent(xpp));
- } else if (!parseBackboneElementContent(eventType, xpp, res)){
- return false;
- }
- return true;
- }
-
- protected Ingredient.IngredientSpecifiedSubstanceStrengthComponent parseIngredientSpecifiedSubstanceStrengthComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Ingredient.IngredientSpecifiedSubstanceStrengthComponent res = new Ingredient.IngredientSpecifiedSubstanceStrengthComponent();
- parseElementAttributes(xpp, res);
- next(xpp);
- int eventType = nextNoWhitespace(xpp);
- while (eventType != XmlPullParser.END_TAG) {
- if (!parseIngredientSpecifiedSubstanceStrengthComponentContent(eventType, xpp, res))
- unknownContent(xpp);
- eventType = nextNoWhitespace(xpp);
- }
- next(xpp);
- parseElementClose(res);
- return res;
- }
-
- protected boolean parseIngredientSpecifiedSubstanceStrengthComponentContent(int eventType, XmlPullParser xpp, Ingredient.IngredientSpecifiedSubstanceStrengthComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("presentation")) {
- res.setPresentation(parseRatio(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("presentationHighLimit")) {
- res.setPresentationHighLimit(parseRatio(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("presentationText")) {
- res.setPresentationTextElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("concentration")) {
- res.setConcentration(parseRatio(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("concentrationHighLimit")) {
- res.setConcentrationHighLimit(parseRatio(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("concentrationText")) {
- res.setConcentrationTextElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("measurementPoint")) {
- res.setMeasurementPointElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("country")) {
- res.getCountry().add(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("referenceStrength")) {
- res.getReferenceStrength().add(parseIngredientSpecifiedSubstanceStrengthReferenceStrengthComponent(xpp));
- } else if (!parseBackboneElementContent(eventType, xpp, res)){
- return false;
- }
- return true;
- }
-
- protected Ingredient.IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent parseIngredientSpecifiedSubstanceStrengthReferenceStrengthComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Ingredient.IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent res = new Ingredient.IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent();
- parseElementAttributes(xpp, res);
- next(xpp);
- int eventType = nextNoWhitespace(xpp);
- while (eventType != XmlPullParser.END_TAG) {
- if (!parseIngredientSpecifiedSubstanceStrengthReferenceStrengthComponentContent(eventType, xpp, res))
- unknownContent(xpp);
- eventType = nextNoWhitespace(xpp);
- }
- next(xpp);
- parseElementClose(res);
- return res;
- }
-
- protected boolean parseIngredientSpecifiedSubstanceStrengthReferenceStrengthComponentContent(int eventType, XmlPullParser xpp, Ingredient.IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "substance")) {
- res.setSubstance(parseType("substance", xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("strength")) {
- res.setStrength(parseRatio(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("strengthHighLimit")) {
- res.setStrengthHighLimit(parseRatio(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("measurementPoint")) {
- res.setMeasurementPointElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("country")) {
- res.getCountry().add(parseCodeableConcept(xpp));
- } else if (!parseBackboneElementContent(eventType, xpp, res)){
- return false;
- }
- return true;
- }
-
- protected Ingredient.IngredientSubstanceComponent parseIngredientSubstanceComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Ingredient.IngredientSubstanceComponent res = new Ingredient.IngredientSubstanceComponent();
- parseElementAttributes(xpp, res);
- next(xpp);
- int eventType = nextNoWhitespace(xpp);
- while (eventType != XmlPullParser.END_TAG) {
- if (!parseIngredientSubstanceComponentContent(eventType, xpp, res))
- unknownContent(xpp);
- eventType = nextNoWhitespace(xpp);
- }
- next(xpp);
- parseElementClose(res);
- return res;
- }
-
- protected boolean parseIngredientSubstanceComponentContent(int eventType, XmlPullParser xpp, Ingredient.IngredientSubstanceComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "code")) {
- res.setCode(parseType("code", xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("strength")) {
- res.getStrength().add(parseIngredientSpecifiedSubstanceStrengthComponent(xpp));
+ res.getStrength().add(parseIngredientSubstanceStrengthComponent(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
return false;
}
@@ -16307,6 +16646,8 @@ public class XmlParser extends XmlParserBase {
res.setCode(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("status")) {
res.setStatusElement(parseEnumeration(xpp, MedicationKnowledge.MedicationKnowledgeStatusCodes.NULL, new MedicationKnowledge.MedicationKnowledgeStatusCodesEnumFactory()));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("author")) {
+ res.setAuthor(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("manufacturer")) {
res.setManufacturer(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("doseForm")) {
@@ -16319,6 +16660,8 @@ public class XmlParser extends XmlParserBase {
res.getRelatedMedicationKnowledge().add(parseMedicationKnowledgeRelatedMedicationKnowledgeComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("associatedMedication")) {
res.getAssociatedMedication().add(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("associatedDefinition")) {
+ res.setAssociatedDefinition(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("productType")) {
res.getProductType().add(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("monograph")) {
@@ -16340,7 +16683,7 @@ public class XmlParser extends XmlParserBase {
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("medicineClassification")) {
res.getMedicineClassification().add(parseMedicationKnowledgeMedicineClassificationComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("packaging")) {
- res.setPackaging(parseMedicationKnowledgePackagingComponent(xpp));
+ res.getPackaging().add(parseMedicationKnowledgePackagingComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("drugCharacteristic")) {
res.getDrugCharacteristic().add(parseMedicationKnowledgeDrugCharacteristicComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("clinicalUseIssue")) {
@@ -16451,12 +16794,14 @@ public class XmlParser extends XmlParserBase {
}
protected boolean parseMedicationKnowledgeCostComponentContent(int eventType, XmlPullParser xpp, MedicationKnowledge.MedicationKnowledgeCostComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("effectiveDate")) {
+ res.getEffectiveDate().add(parsePeriod(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
res.setType(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("source")) {
res.setSourceElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("cost")) {
- res.setCost(parseMoney(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "cost")) {
+ res.setCost(parseType("cost", xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
return false;
}
@@ -16611,7 +16956,11 @@ public class XmlParser extends XmlParserBase {
}
protected boolean parseMedicationKnowledgePackagingComponentContent(int eventType, XmlPullParser xpp, MedicationKnowledge.MedicationKnowledgePackagingComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("identifier")) {
+ res.setIdentifier(parseIdentifier(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("cost")) {
+ res.setCost(parseMedicationKnowledgeCostComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
res.setType(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("quantity")) {
res.setQuantity(parseQuantity(xpp));
@@ -17037,8 +17386,8 @@ public class XmlParser extends XmlParserBase {
res.getSpecialMeasures().add(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("paediatricUseIndicator")) {
res.setPaediatricUseIndicator(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("productClassification")) {
- res.getProductClassification().add(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("classification")) {
+ res.getClassification().add(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("characteristic")) {
res.getCharacteristic().add(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("marketingStatus")) {
@@ -17049,6 +17398,8 @@ public class XmlParser extends XmlParserBase {
res.getPackagedMedicinalProduct().add(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("ingredient")) {
res.getIngredient().add(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("impurity")) {
+ res.getImpurity().add(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("attachedDocument")) {
res.getAttachedDocument().add(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("masterFile")) {
@@ -17195,8 +17546,8 @@ public class XmlParser extends XmlParserBase {
}
protected boolean parseMedicinalProductDefinitionCrossReferenceComponentContent(int eventType, XmlPullParser xpp, MedicinalProductDefinition.MedicinalProductDefinitionCrossReferenceComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "product")) {
- res.setProduct(parseType("product", xpp));
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("product")) {
+ res.setProduct(parseCodeableReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
res.setType(parseCodeableConcept(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
@@ -19183,6 +19534,8 @@ public class XmlParser extends XmlParserBase {
res.getIdentifier().add(parseIdentifier(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("name")) {
res.setNameElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
+ res.setType(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("subject")) {
res.getSubject().add(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("status")) {
@@ -22685,8 +23038,6 @@ public class XmlParser extends XmlParserBase {
res.setReasonElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("filterBy")) {
res.getFilterBy().add(parseSubscriptionFilterByComponent(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("error")) {
- res.getError().add(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("channelType")) {
res.setChannelType(parseCoding(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("endpoint")) {
@@ -22751,8 +23102,8 @@ public class XmlParser extends XmlParserBase {
}
protected boolean parseSubscriptionStatusContent(int eventType, XmlPullParser xpp, SubscriptionStatus res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("notificationType")) {
- res.setNotificationTypeElement(parseEnumeration(xpp, SubscriptionStatus.SubscriptionNotificationType.NULL, new SubscriptionStatus.SubscriptionNotificationTypeEnumFactory()));
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
+ res.setTypeElement(parseEnumeration(xpp, SubscriptionStatus.SubscriptionNotificationType.NULL, new SubscriptionStatus.SubscriptionNotificationTypeEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("eventsSinceSubscriptionStart")) {
res.setEventsSinceSubscriptionStartElement(parseInteger64(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("eventsInNotification")) {
@@ -22762,7 +23113,9 @@ public class XmlParser extends XmlParserBase {
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("status")) {
res.setStatusElement(parseEnumeration(xpp, Enumerations.SubscriptionState.NULL, new Enumerations.SubscriptionStateEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("topic")) {
- res.setTopic(parseReference(xpp));
+ res.setTopicElement(parseCanonical(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("error")) {
+ res.getError().add(parseCodeableConcept(xpp));
} else if (!parseDomainResourceContent(eventType, xpp, res)){
return false;
}
@@ -22793,10 +23146,8 @@ public class XmlParser extends XmlParserBase {
res.setVersionElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("title")) {
res.setTitleElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("derivedFromCanonical")) {
- res.getDerivedFromCanonical().add(parseCanonical(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("derivedFromUri")) {
- res.getDerivedFromUri().add(parseUri(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("derivedFrom")) {
+ res.getDerivedFrom().add(parseCanonical(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("status")) {
res.setStatusElement(parseEnumeration(xpp, Enumerations.PublicationStatus.NULL, new Enumerations.PublicationStatusEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("experimental")) {
@@ -23035,6 +23386,8 @@ public class XmlParser extends XmlParserBase {
res.setStatus(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("category")) {
res.setCategory(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("classification")) {
+ res.getClassification().add(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("domain")) {
res.setDomain(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("description")) {
@@ -23137,8 +23490,8 @@ public class XmlParser extends XmlParserBase {
res.setCode(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("parameters")) {
res.setParametersElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "definingSubstance")) {
- res.setDefiningSubstance(parseType("definingSubstance", xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("definingSubstance")) {
+ res.setDefiningSubstance(parseCodeableReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "amount")) {
res.setAmount(parseType("amount", xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("referenceRange")) {
@@ -23273,8 +23626,8 @@ public class XmlParser extends XmlParserBase {
res.setRepresentationElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("format")) {
res.setFormat(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("attachment")) {
- res.setAttachment(parseAttachment(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("document")) {
+ res.setDocument(parseReference(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
return false;
}
@@ -23634,7 +23987,7 @@ public class XmlParser extends XmlParserBase {
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("isDefining")) {
res.setIsDefiningElement(parseBoolean(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("amount")) {
- res.setAmount(parseSubstanceAmount(xpp));
+ res.setAmount(parseQuantity(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
return false;
}
@@ -23657,9 +24010,7 @@ public class XmlParser extends XmlParserBase {
}
protected boolean parseSubstancePolymerRepeatComponentContent(int eventType, XmlPullParser xpp, SubstancePolymer.SubstancePolymerRepeatComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("numberOfUnits")) {
- res.setNumberOfUnitsElement(parseInteger(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("averageMolecularFormula")) {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("averageMolecularFormula")) {
res.setAverageMolecularFormulaElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("repeatUnitAmountType")) {
res.setRepeatUnitAmountType(parseCodeableConcept(xpp));
@@ -23692,7 +24043,7 @@ public class XmlParser extends XmlParserBase {
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("orientation")) {
res.setOrientation(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("amount")) {
- res.setAmount(parseSubstanceAmount(xpp));
+ res.setAmountElement(parseInteger(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("degreeOfPolymerisation")) {
res.getDegreeOfPolymerisation().add(parseSubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("structuralRepresentation")) {
@@ -23719,10 +24070,14 @@ public class XmlParser extends XmlParserBase {
}
protected boolean parseSubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponentContent(int eventType, XmlPullParser xpp, SubstancePolymer.SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("degree")) {
- res.setDegree(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("amount")) {
- res.setAmount(parseSubstanceAmount(xpp));
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
+ res.setType(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("average")) {
+ res.setAverageElement(parseInteger(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("low")) {
+ res.setLowElement(parseInteger(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("high")) {
+ res.setHighElement(parseInteger(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
return false;
}
@@ -23849,8 +24204,6 @@ public class XmlParser extends XmlParserBase {
res.getGene().add(parseSubstanceReferenceInformationGeneComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("geneElement")) {
res.getGeneElement().add(parseSubstanceReferenceInformationGeneElementComponent(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("classification")) {
- res.getClassification().add(parseSubstanceReferenceInformationClassificationComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("target")) {
res.getTarget().add(parseSubstanceReferenceInformationTargetComponent(xpp));
} else if (!parseDomainResourceContent(eventType, xpp, res)){
@@ -23915,36 +24268,6 @@ public class XmlParser extends XmlParserBase {
return true;
}
- protected SubstanceReferenceInformation.SubstanceReferenceInformationClassificationComponent parseSubstanceReferenceInformationClassificationComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- SubstanceReferenceInformation.SubstanceReferenceInformationClassificationComponent res = new SubstanceReferenceInformation.SubstanceReferenceInformationClassificationComponent();
- parseElementAttributes(xpp, res);
- next(xpp);
- int eventType = nextNoWhitespace(xpp);
- while (eventType != XmlPullParser.END_TAG) {
- if (!parseSubstanceReferenceInformationClassificationComponentContent(eventType, xpp, res))
- unknownContent(xpp);
- eventType = nextNoWhitespace(xpp);
- }
- next(xpp);
- parseElementClose(res);
- return res;
- }
-
- protected boolean parseSubstanceReferenceInformationClassificationComponentContent(int eventType, XmlPullParser xpp, SubstanceReferenceInformation.SubstanceReferenceInformationClassificationComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("domain")) {
- res.setDomain(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("classification")) {
- res.setClassification(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("subtype")) {
- res.getSubtype().add(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("source")) {
- res.getSource().add(parseReference(xpp));
- } else if (!parseBackboneElementContent(eventType, xpp, res)){
- return false;
- }
- return true;
- }
-
protected SubstanceReferenceInformation.SubstanceReferenceInformationTargetComponent parseSubstanceReferenceInformationTargetComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
SubstanceReferenceInformation.SubstanceReferenceInformationTargetComponent res = new SubstanceReferenceInformation.SubstanceReferenceInformationTargetComponent();
parseElementAttributes(xpp, res);
@@ -26459,8 +26782,8 @@ public class XmlParser extends XmlParserBase {
return parseEventDefinition(xpp);
} else if (xpp.getName().equals("Evidence")) {
return parseEvidence(xpp);
- } else if (xpp.getName().equals("EvidenceFocus")) {
- return parseEvidenceFocus(xpp);
+ } else if (xpp.getName().equals("EvidenceReport")) {
+ return parseEvidenceReport(xpp);
} else if (xpp.getName().equals("EvidenceVariable")) {
return parseEvidenceVariable(xpp);
} else if (xpp.getName().equals("ExampleScenario")) {
@@ -26772,8 +27095,6 @@ public class XmlParser extends XmlParserBase {
return parseSignature(xpp);
} else if (xpp.getName().equals(prefix+"Statistic")) {
return parseStatistic(xpp);
- } else if (xpp.getName().equals(prefix+"SubstanceAmount")) {
- return parseSubstanceAmount(xpp);
} else if (xpp.getName().equals(prefix+"Timing")) {
return parseTiming(xpp);
} else if (xpp.getName().equals(prefix+"TriggerDefinition")) {
@@ -26907,8 +27228,6 @@ public class XmlParser extends XmlParserBase {
return parseSignature(xpp);
} else if (type.equals("Statistic")) {
return parseStatistic(xpp);
- } else if (type.equals("SubstanceAmount")) {
- return parseSubstanceAmount(xpp);
} else if (type.equals("Timing")) {
return parseTiming(xpp);
} else if (type.equals("TriggerDefinition")) {
@@ -27002,8 +27321,6 @@ public class XmlParser extends XmlParserBase {
return parseSignature(xpp);
} else if (type.equals("Statistic")) {
return parseStatistic(xpp);
- } else if (type.equals("SubstanceAmount")) {
- return parseSubstanceAmount(xpp);
} else if (type.equals("Timing")) {
return parseTiming(xpp);
} else if (type.equals("TriggerDefinition")) {
@@ -27118,8 +27435,8 @@ public class XmlParser extends XmlParserBase {
return parseEventDefinition(xpp);
} else if (type.equals("Evidence")) {
return parseEvidence(xpp);
- } else if (type.equals("EvidenceFocus")) {
- return parseEvidenceFocus(xpp);
+ } else if (type.equals("EvidenceReport")) {
+ return parseEvidenceReport(xpp);
} else if (type.equals("EvidenceVariable")) {
return parseEvidenceVariable(xpp);
} else if (type.equals("ExampleScenario")) {
@@ -27431,8 +27748,6 @@ public class XmlParser extends XmlParserBase {
return true;
} else if (xpp.getName().equals(prefix+"Statistic")) {
return true;
- } else if (xpp.getName().equals(prefix+"SubstanceAmount")) {
- return true;
} else if (xpp.getName().equals(prefix+"Timing")) {
return true;
} else if (xpp.getName().equals(prefix+"TriggerDefinition")) {
@@ -27547,7 +27862,7 @@ public class XmlParser extends XmlParserBase {
return true;
} else if (xpp.getName().equals(prefix+"Evidence")) {
return true;
- } else if (xpp.getName().equals(prefix+"EvidenceFocus")) {
+ } else if (xpp.getName().equals(prefix+"EvidenceReport")) {
return true;
} else if (xpp.getName().equals(prefix+"EvidenceVariable")) {
return true;
@@ -29317,16 +29632,12 @@ public class XmlParser extends XmlParserBase {
protected void composeProductShelfLifeElements(ProductShelfLife element) throws IOException {
composeBackboneTypeElements(element);
- if (element.hasIdentifier()) {
- composeIdentifier("identifier", element.getIdentifier());
- }
if (element.hasType()) {
composeCodeableConcept("type", element.getType());
}
if (element.hasPeriod()) {
- composeQuantity("period", element.getPeriod());
- }
- if (element.hasSpecialPrecautionsForStorage()) {
+ composeType("period", element.getPeriod());
+ } if (element.hasSpecialPrecautionsForStorage()) {
for (CodeableConcept e : element.getSpecialPrecautionsForStorage())
composeCodeableConcept("specialPrecautionsForStorage", e);
}
@@ -29556,6 +29867,9 @@ public class XmlParser extends XmlParserBase {
if (element.hasQuantity()) {
composeQuantity("quantity", element.getQuantity());
}
+ if (element.hasNumberOfEventsElement()) {
+ composeInteger("numberOfEvents", element.getNumberOfEventsElement());
+ }
if (element.hasSampleSize()) {
composeStatisticSampleSizeComponent("sampleSize", element.getSampleSize());
}
@@ -29563,6 +29877,10 @@ public class XmlParser extends XmlParserBase {
for (Statistic.StatisticAttributeEstimateComponent e : element.getAttributeEstimate())
composeStatisticAttributeEstimateComponent("attributeEstimate", e);
}
+ if (element.hasModelCharacteristic()) {
+ for (Statistic.StatisticModelCharacteristicComponent e : element.getModelCharacteristic())
+ composeStatisticModelCharacteristicComponent("modelCharacteristic", e);
+ }
}
protected void composeStatisticSampleSizeComponent(String name, Statistic.StatisticSampleSizeComponent element) throws IOException {
@@ -29593,9 +29911,6 @@ public class XmlParser extends XmlParserBase {
if (element.hasKnownDataCountElement()) {
composeInteger("knownDataCount", element.getKnownDataCountElement());
}
- if (element.hasNumeratorCountElement()) {
- composeInteger("numeratorCount", element.getNumeratorCountElement());
- }
}
protected void composeStatisticAttributeEstimateComponent(String name, Statistic.StatisticAttributeEstimateComponent element) throws IOException {
@@ -29629,23 +29944,23 @@ public class XmlParser extends XmlParserBase {
if (element.hasRange()) {
composeRange("range", element.getRange());
}
- if (element.hasEstimateQualifier()) {
- for (Statistic.StatisticAttributeEstimateEstimateQualifierComponent e : element.getEstimateQualifier())
- composeStatisticAttributeEstimateEstimateQualifierComponent("estimateQualifier", e);
+ if (element.hasAttributeEstimate()) {
+ for (Statistic.StatisticAttributeEstimateAttributeEstimateComponent e : element.getAttributeEstimate())
+ composeStatisticAttributeEstimateAttributeEstimateComponent("attributeEstimate", e);
}
}
- protected void composeStatisticAttributeEstimateEstimateQualifierComponent(String name, Statistic.StatisticAttributeEstimateEstimateQualifierComponent element) throws IOException {
+ protected void composeStatisticAttributeEstimateAttributeEstimateComponent(String name, Statistic.StatisticAttributeEstimateAttributeEstimateComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
xml.enter(FHIR_NS, name);
- composeStatisticAttributeEstimateEstimateQualifierComponentElements(element);
+ composeStatisticAttributeEstimateAttributeEstimateComponentElements(element);
composeElementClose(element);
xml.exit(FHIR_NS, name);
}
}
- protected void composeStatisticAttributeEstimateEstimateQualifierComponentElements(Statistic.StatisticAttributeEstimateEstimateQualifierComponent element) throws IOException {
+ protected void composeStatisticAttributeEstimateAttributeEstimateComponentElements(Statistic.StatisticAttributeEstimateAttributeEstimateComponent element) throws IOException {
composeElementElements(element);
if (element.hasDescriptionElement()) {
composeString("description", element.getDescriptionElement());
@@ -29668,48 +29983,57 @@ public class XmlParser extends XmlParserBase {
}
}
- protected void composeSubstanceAmount(String name, SubstanceAmount element) throws IOException {
+ protected void composeStatisticModelCharacteristicComponent(String name, Statistic.StatisticModelCharacteristicComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
xml.enter(FHIR_NS, name);
- composeSubstanceAmountElements(element);
+ composeStatisticModelCharacteristicComponentElements(element);
composeElementClose(element);
xml.exit(FHIR_NS, name);
}
}
- protected void composeSubstanceAmountElements(SubstanceAmount element) throws IOException {
- composeBackboneTypeElements(element);
- if (element.hasAmount()) {
- composeType("amount", element.getAmount());
- } if (element.hasAmountType()) {
- composeCodeableConcept("amountType", element.getAmountType());
- }
- if (element.hasAmountTextElement()) {
- composeString("amountText", element.getAmountTextElement());
- }
- if (element.hasReferenceRange()) {
- composeSubstanceAmountReferenceRangeComponent("referenceRange", element.getReferenceRange());
- }
- }
-
- protected void composeSubstanceAmountReferenceRangeComponent(String name, SubstanceAmount.SubstanceAmountReferenceRangeComponent element) throws IOException {
- if (element != null) {
- composeElementAttributes(element);
- xml.enter(FHIR_NS, name);
- composeSubstanceAmountReferenceRangeComponentElements(element);
- composeElementClose(element);
- xml.exit(FHIR_NS, name);
- }
- }
-
- protected void composeSubstanceAmountReferenceRangeComponentElements(SubstanceAmount.SubstanceAmountReferenceRangeComponent element) throws IOException {
+ protected void composeStatisticModelCharacteristicComponentElements(Statistic.StatisticModelCharacteristicComponent element) throws IOException {
composeElementElements(element);
- if (element.hasLowLimit()) {
- composeQuantity("lowLimit", element.getLowLimit());
+ if (element.hasCode()) {
+ composeCodeableConcept("code", element.getCode());
}
- if (element.hasHighLimit()) {
- composeQuantity("highLimit", element.getHighLimit());
+ if (element.hasValue()) {
+ composeType("value", element.getValue());
+ } if (element.hasVariable()) {
+ for (Statistic.StatisticModelCharacteristicVariableComponent e : element.getVariable())
+ composeStatisticModelCharacteristicVariableComponent("variable", e);
+ }
+ }
+
+ protected void composeStatisticModelCharacteristicVariableComponent(String name, Statistic.StatisticModelCharacteristicVariableComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeStatisticModelCharacteristicVariableComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeStatisticModelCharacteristicVariableComponentElements(Statistic.StatisticModelCharacteristicVariableComponent element) throws IOException {
+ composeElementElements(element);
+ if (element.hasVariableDefinition()) {
+ composeReference("variableDefinition", element.getVariableDefinition());
+ }
+ if (element.hasHandlingElement())
+ composeEnumeration("handling", element.getHandlingElement(), new Enumerations.EvidenceVariableHandlingEnumFactory());
+ if (element.hasValueCategory()) {
+ for (CodeableConcept e : element.getValueCategory())
+ composeCodeableConcept("valueCategory", e);
+ }
+ if (element.hasValueQuantity()) {
+ for (Quantity e : element.getValueQuantity())
+ composeQuantity("valueQuantity", e);
+ }
+ if (element.hasValueRange()) {
+ for (Range e : element.getValueRange())
+ composeRange("valueRange", e);
}
}
@@ -32808,9 +33132,6 @@ public class XmlParser extends XmlParserBase {
if (element.hasUrlElement()) {
composeUri("url", element.getUrlElement());
}
- if (element.hasVersionElement()) {
- composeString("version", element.getVersionElement());
- }
if (element.hasStatusElement())
composeEnumeration("status", element.getStatusElement(), new Enumerations.PublicationStatusEnumFactory());
if (element.hasUseContext()) {
@@ -32825,6 +33146,10 @@ public class XmlParser extends XmlParserBase {
for (Identifier e : element.getRelatedIdentifier())
composeIdentifier("relatedIdentifier", e);
}
+ if (element.hasSummary()) {
+ for (Citation.CitationSummaryComponent e : element.getSummary())
+ composeCitationSummaryComponent("summary", e);
+ }
if (element.hasDateCitedElement()) {
composeDateTime("dateCited", element.getDateCitedElement());
}
@@ -32837,6 +33162,9 @@ public class XmlParser extends XmlParserBase {
if (element.hasJournal()) {
composeCitationJournalComponent("journal", element.getJournal());
}
+ if (element.hasPublicationInfo()) {
+ composeCitationPublicationInfoComponent("publicationInfo", element.getPublicationInfo());
+ }
if (element.hasArticleTitleElement()) {
composeMarkdown("articleTitle", element.getArticleTitleElement());
}
@@ -32861,15 +33189,8 @@ public class XmlParser extends XmlParserBase {
for (Citation.CitationAlternativeAbstractComponent e : element.getAlternativeAbstract())
composeCitationAlternativeAbstractComponent("alternativeAbstract", e);
}
- if (element.hasAuthorList()) {
- composeCitationAuthorListComponent("authorList", element.getAuthorList());
- }
- if (element.hasAuthorString()) {
- for (Citation.CitationAuthorStringComponent e : element.getAuthorString())
- composeCitationAuthorStringComponent("authorString", e);
- }
- if (element.hasContributorList()) {
- composeCitationContributorListComponent("contributorList", element.getContributorList());
+ if (element.hasContributorship()) {
+ composeCitationContributorshipComponent("contributorship", element.getContributorship());
}
if (element.hasArticleLanguage()) {
composeCodeableConcept("articleLanguage", element.getArticleLanguage());
@@ -32882,6 +33203,10 @@ public class XmlParser extends XmlParserBase {
for (CodeableConcept e : element.getClassifier())
composeCodeableConcept("classifier", e);
}
+ if (element.hasKeywordList()) {
+ for (Citation.CitationKeywordListComponent e : element.getKeywordList())
+ composeCitationKeywordListComponent("keywordList", e);
+ }
if (element.hasRelatedArtifact()) {
for (RelatedArtifact e : element.getRelatedArtifact())
composeRelatedArtifact("relatedArtifact", e);
@@ -32895,6 +33220,26 @@ public class XmlParser extends XmlParserBase {
}
}
+ protected void composeCitationSummaryComponent(String name, Citation.CitationSummaryComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeCitationSummaryComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeCitationSummaryComponentElements(Citation.CitationSummaryComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasStyle()) {
+ composeCodeableConcept("style", element.getStyle());
+ }
+ if (element.hasTextElement()) {
+ composeMarkdown("text", element.getTextElement());
+ }
+ }
+
protected void composeCitationVariantCitationComponent(String name, Citation.CitationVariantCitationComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
@@ -32966,8 +33311,99 @@ public class XmlParser extends XmlParserBase {
if (element.hasIssueElement()) {
composeString("issue", element.getIssueElement());
}
- if (element.hasPublicationDateElement()) {
- composeString("publicationDate", element.getPublicationDateElement());
+ if (element.hasPublicationDate()) {
+ composeCitationJournalJournalIssuePublicationDateComponent("publicationDate", element.getPublicationDate());
+ }
+ }
+
+ protected void composeCitationJournalJournalIssuePublicationDateComponent(String name, Citation.CitationJournalJournalIssuePublicationDateComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeCitationJournalJournalIssuePublicationDateComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeCitationJournalJournalIssuePublicationDateComponentElements(Citation.CitationJournalJournalIssuePublicationDateComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasDateElement()) {
+ composeDate("date", element.getDateElement());
+ }
+ if (element.hasYearElement()) {
+ composeString("year", element.getYearElement());
+ }
+ if (element.hasMonthElement()) {
+ composeString("month", element.getMonthElement());
+ }
+ if (element.hasDayElement()) {
+ composeString("day", element.getDayElement());
+ }
+ if (element.hasSeasonElement()) {
+ composeString("season", element.getSeasonElement());
+ }
+ if (element.hasTextElement()) {
+ composeString("text", element.getTextElement());
+ }
+ }
+
+ protected void composeCitationPublicationInfoComponent(String name, Citation.CitationPublicationInfoComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeCitationPublicationInfoComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeCitationPublicationInfoComponentElements(Citation.CitationPublicationInfoComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasPublishedIn()) {
+ composeCitationPublicationInfoPublishedInComponent("publishedIn", element.getPublishedIn());
+ }
+ if (element.hasEntryDateElement()) {
+ composeDateTime("entryDate", element.getEntryDateElement());
+ }
+ if (element.hasRevisionDateElement()) {
+ composeDateTime("revisionDate", element.getRevisionDateElement());
+ }
+ if (element.hasPageCountElement()) {
+ composeString("pageCount", element.getPageCountElement());
+ }
+ }
+
+ protected void composeCitationPublicationInfoPublishedInComponent(String name, Citation.CitationPublicationInfoPublishedInComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeCitationPublicationInfoPublishedInComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeCitationPublicationInfoPublishedInComponentElements(Citation.CitationPublicationInfoPublishedInComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasType()) {
+ composeCodeableConcept("type", element.getType());
+ }
+ if (element.hasIdentifier()) {
+ for (Identifier e : element.getIdentifier())
+ composeIdentifier("identifier", e);
+ }
+ if (element.hasNameElement()) {
+ composeString("name", element.getNameElement());
+ }
+ if (element.hasPublisher()) {
+ composeReference("publisher", element.getPublisher());
+ }
+ if (element.hasPublisherLocationElement()) {
+ composeString("publisherLocation", element.getPublisherLocationElement());
+ }
+ if (element.hasStartDateElement()) {
+ composeDate("startDate", element.getStartDateElement());
}
}
@@ -33063,47 +33499,45 @@ public class XmlParser extends XmlParserBase {
}
}
- protected void composeCitationAuthorListComponent(String name, Citation.CitationAuthorListComponent element) throws IOException {
+ protected void composeCitationContributorshipComponent(String name, Citation.CitationContributorshipComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
xml.enter(FHIR_NS, name);
- composeCitationAuthorListComponentElements(element);
+ composeCitationContributorshipComponentElements(element);
composeElementClose(element);
xml.exit(FHIR_NS, name);
}
}
- protected void composeCitationAuthorListComponentElements(Citation.CitationAuthorListComponent element) throws IOException {
+ protected void composeCitationContributorshipComponentElements(Citation.CitationContributorshipComponent element) throws IOException {
composeBackboneElementElements(element);
if (element.hasCompleteElement()) {
composeBoolean("complete", element.getCompleteElement());
}
- if (element.hasAuthor()) {
- for (Citation.CitationAuthorListAuthorComponent e : element.getAuthor())
- composeCitationAuthorListAuthorComponent("author", e);
+ if (element.hasEntry()) {
+ for (Citation.CitationContributorshipEntryComponent e : element.getEntry())
+ composeCitationContributorshipEntryComponent("entry", e);
+ }
+ if (element.hasSummary()) {
+ for (Citation.CitationContributorshipSummaryComponent e : element.getSummary())
+ composeCitationContributorshipSummaryComponent("summary", e);
}
}
- protected void composeCitationAuthorListAuthorComponent(String name, Citation.CitationAuthorListAuthorComponent element) throws IOException {
+ protected void composeCitationContributorshipEntryComponent(String name, Citation.CitationContributorshipEntryComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
xml.enter(FHIR_NS, name);
- composeCitationAuthorListAuthorComponentElements(element);
+ composeCitationContributorshipEntryComponentElements(element);
composeElementClose(element);
xml.exit(FHIR_NS, name);
}
}
- protected void composeCitationAuthorListAuthorComponentElements(Citation.CitationAuthorListAuthorComponent element) throws IOException {
+ protected void composeCitationContributorshipEntryComponentElements(Citation.CitationContributorshipEntryComponent element) throws IOException {
composeBackboneElementElements(element);
- if (element.hasLastNameElement()) {
- composeString("lastName", element.getLastNameElement());
- }
- if (element.hasForeNameElement()) {
- composeString("foreName", element.getForeNameElement());
- }
- if (element.hasSuffixElement()) {
- composeString("suffix", element.getSuffixElement());
+ if (element.hasName()) {
+ composeHumanName("name", element.getName());
}
if (element.hasInitialsElement()) {
composeString("initials", element.getInitialsElement());
@@ -33116,17 +33550,24 @@ public class XmlParser extends XmlParserBase {
composeIdentifier("identifier", e);
}
if (element.hasAffiliationInfo()) {
- for (Citation.CitationAuthorListAuthorAffiliationInfoComponent e : element.getAffiliationInfo())
- composeCitationAuthorListAuthorAffiliationInfoComponent("affiliationInfo", e);
+ for (Citation.CitationContributorshipEntryAffiliationInfoComponent e : element.getAffiliationInfo())
+ composeCitationContributorshipEntryAffiliationInfoComponent("affiliationInfo", e);
}
if (element.hasAddress()) {
- for (StringType e : element.getAddress())
- composeString("address", e);
+ for (Address e : element.getAddress())
+ composeAddress("address", e);
}
if (element.hasTelecom()) {
for (ContactPoint e : element.getTelecom())
composeContactPoint("telecom", e);
}
+ if (element.hasContribution()) {
+ for (CodeableConcept e : element.getContribution())
+ composeCodeableConcept("contribution", e);
+ }
+ if (element.hasNotAnAuthorElement()) {
+ composeBoolean("notAnAuthor", element.getNotAnAuthorElement());
+ }
if (element.hasCorrespondingAuthorElement()) {
composeBoolean("correspondingAuthor", element.getCorrespondingAuthorElement());
}
@@ -33135,17 +33576,17 @@ public class XmlParser extends XmlParserBase {
}
}
- protected void composeCitationAuthorListAuthorAffiliationInfoComponent(String name, Citation.CitationAuthorListAuthorAffiliationInfoComponent element) throws IOException {
+ protected void composeCitationContributorshipEntryAffiliationInfoComponent(String name, Citation.CitationContributorshipEntryAffiliationInfoComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
xml.enter(FHIR_NS, name);
- composeCitationAuthorListAuthorAffiliationInfoComponentElements(element);
+ composeCitationContributorshipEntryAffiliationInfoComponentElements(element);
composeElementClose(element);
xml.exit(FHIR_NS, name);
}
}
- protected void composeCitationAuthorListAuthorAffiliationInfoComponentElements(Citation.CitationAuthorListAuthorAffiliationInfoComponent element) throws IOException {
+ protected void composeCitationContributorshipEntryAffiliationInfoComponentElements(Citation.CitationContributorshipEntryAffiliationInfoComponent element) throws IOException {
composeBackboneElementElements(element);
if (element.hasAffiliationElement()) {
composeString("affiliation", element.getAffiliationElement());
@@ -33159,112 +33600,29 @@ public class XmlParser extends XmlParserBase {
}
}
- protected void composeCitationAuthorStringComponent(String name, Citation.CitationAuthorStringComponent element) throws IOException {
+ protected void composeCitationContributorshipSummaryComponent(String name, Citation.CitationContributorshipSummaryComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
xml.enter(FHIR_NS, name);
- composeCitationAuthorStringComponentElements(element);
+ composeCitationContributorshipSummaryComponentElements(element);
composeElementClose(element);
xml.exit(FHIR_NS, name);
}
}
- protected void composeCitationAuthorStringComponentElements(Citation.CitationAuthorStringComponent element) throws IOException {
+ protected void composeCitationContributorshipSummaryComponentElements(Citation.CitationContributorshipSummaryComponent element) throws IOException {
composeBackboneElementElements(element);
+ if (element.hasType()) {
+ composeCodeableConcept("type", element.getType());
+ }
+ if (element.hasStyle()) {
+ composeCodeableConcept("style", element.getStyle());
+ }
if (element.hasSource()) {
composeCodeableConcept("source", element.getSource());
}
if (element.hasValueElement()) {
- composeString("value", element.getValueElement());
- }
- }
-
- protected void composeCitationContributorListComponent(String name, Citation.CitationContributorListComponent element) throws IOException {
- if (element != null) {
- composeElementAttributes(element);
- xml.enter(FHIR_NS, name);
- composeCitationContributorListComponentElements(element);
- composeElementClose(element);
- xml.exit(FHIR_NS, name);
- }
- }
-
- protected void composeCitationContributorListComponentElements(Citation.CitationContributorListComponent element) throws IOException {
- composeBackboneElementElements(element);
- if (element.hasCompleteElement()) {
- composeBoolean("complete", element.getCompleteElement());
- }
- if (element.hasContributor()) {
- for (Citation.CitationContributorListContributorComponent e : element.getContributor())
- composeCitationContributorListContributorComponent("contributor", e);
- }
- }
-
- protected void composeCitationContributorListContributorComponent(String name, Citation.CitationContributorListContributorComponent element) throws IOException {
- if (element != null) {
- composeElementAttributes(element);
- xml.enter(FHIR_NS, name);
- composeCitationContributorListContributorComponentElements(element);
- composeElementClose(element);
- xml.exit(FHIR_NS, name);
- }
- }
-
- protected void composeCitationContributorListContributorComponentElements(Citation.CitationContributorListContributorComponent element) throws IOException {
- composeBackboneElementElements(element);
- if (element.hasLastNameElement()) {
- composeString("lastName", element.getLastNameElement());
- }
- if (element.hasForeNameElement()) {
- composeString("foreName", element.getForeNameElement());
- }
- if (element.hasSuffixElement()) {
- composeString("suffix", element.getSuffixElement());
- }
- if (element.hasInitialsElement()) {
- composeString("initials", element.getInitialsElement());
- }
- if (element.hasCollectiveNameElement()) {
- composeString("collectiveName", element.getCollectiveNameElement());
- }
- if (element.hasIdentifier()) {
- for (Identifier e : element.getIdentifier())
- composeIdentifier("identifier", e);
- }
- if (element.hasContribution()) {
- for (CodeableConcept e : element.getContribution())
- composeCodeableConcept("contribution", e);
- }
- if (element.hasAffiliationInfo()) {
- for (Citation.CitationContributorListContributorAffiliationInfoComponent e : element.getAffiliationInfo())
- composeCitationContributorListContributorAffiliationInfoComponent("affiliationInfo", e);
- }
- if (element.hasListOrderElement()) {
- composePositiveInt("listOrder", element.getListOrderElement());
- }
- }
-
- protected void composeCitationContributorListContributorAffiliationInfoComponent(String name, Citation.CitationContributorListContributorAffiliationInfoComponent element) throws IOException {
- if (element != null) {
- composeElementAttributes(element);
- xml.enter(FHIR_NS, name);
- composeCitationContributorListContributorAffiliationInfoComponentElements(element);
- composeElementClose(element);
- xml.exit(FHIR_NS, name);
- }
- }
-
- protected void composeCitationContributorListContributorAffiliationInfoComponentElements(Citation.CitationContributorListContributorAffiliationInfoComponent element) throws IOException {
- composeBackboneElementElements(element);
- if (element.hasAffiliationElement()) {
- composeString("affiliation", element.getAffiliationElement());
- }
- if (element.hasRoleElement()) {
- composeString("role", element.getRoleElement());
- }
- if (element.hasIdentifier()) {
- for (Identifier e : element.getIdentifier())
- composeIdentifier("identifier", e);
+ composeMarkdown("value", element.getValueElement());
}
}
@@ -33292,6 +33650,9 @@ public class XmlParser extends XmlParserBase {
if (element.hasPagination()) {
composeCitationAlternativeFormPaginationComponent("pagination", element.getPagination());
}
+ if (element.hasPublicationInfo()) {
+ composeCitationAlternativeFormPublicationInfoComponent("publicationInfo", element.getPublicationInfo());
+ }
}
protected void composeCitationAlternativeFormJournalIssueComponent(String name, Citation.CitationAlternativeFormJournalIssueComponent element) throws IOException {
@@ -33315,8 +33676,40 @@ public class XmlParser extends XmlParserBase {
if (element.hasIssueElement()) {
composeString("issue", element.getIssueElement());
}
- if (element.hasPublicationDateElement()) {
- composeString("publicationDate", element.getPublicationDateElement());
+ if (element.hasPublicationDate()) {
+ composeCitationAlternativeFormJournalIssuePublicationDateComponent("publicationDate", element.getPublicationDate());
+ }
+ }
+
+ protected void composeCitationAlternativeFormJournalIssuePublicationDateComponent(String name, Citation.CitationAlternativeFormJournalIssuePublicationDateComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeCitationAlternativeFormJournalIssuePublicationDateComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeCitationAlternativeFormJournalIssuePublicationDateComponentElements(Citation.CitationAlternativeFormJournalIssuePublicationDateComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasDateElement()) {
+ composeDate("date", element.getDateElement());
+ }
+ if (element.hasYearElement()) {
+ composeString("year", element.getYearElement());
+ }
+ if (element.hasMonthElement()) {
+ composeString("month", element.getMonthElement());
+ }
+ if (element.hasDayElement()) {
+ composeString("day", element.getDayElement());
+ }
+ if (element.hasSeasonElement()) {
+ composeString("season", element.getSeasonElement());
+ }
+ if (element.hasTextElement()) {
+ composeString("text", element.getTextElement());
}
}
@@ -33343,6 +33736,102 @@ public class XmlParser extends XmlParserBase {
}
}
+ protected void composeCitationAlternativeFormPublicationInfoComponent(String name, Citation.CitationAlternativeFormPublicationInfoComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeCitationAlternativeFormPublicationInfoComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeCitationAlternativeFormPublicationInfoComponentElements(Citation.CitationAlternativeFormPublicationInfoComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasPublishedIn()) {
+ composeCitationAlternativeFormPublicationInfoPublishedInComponent("publishedIn", element.getPublishedIn());
+ }
+ if (element.hasEntryDateElement()) {
+ composeDateTime("entryDate", element.getEntryDateElement());
+ }
+ if (element.hasRevisionDateElement()) {
+ composeDateTime("revisionDate", element.getRevisionDateElement());
+ }
+ if (element.hasPageCountElement()) {
+ composeString("pageCount", element.getPageCountElement());
+ }
+ }
+
+ protected void composeCitationAlternativeFormPublicationInfoPublishedInComponent(String name, Citation.CitationAlternativeFormPublicationInfoPublishedInComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeCitationAlternativeFormPublicationInfoPublishedInComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeCitationAlternativeFormPublicationInfoPublishedInComponentElements(Citation.CitationAlternativeFormPublicationInfoPublishedInComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasType()) {
+ composeCodeableConcept("type", element.getType());
+ }
+ if (element.hasNameElement()) {
+ composeString("name", element.getNameElement());
+ }
+ if (element.hasPublisher()) {
+ composeReference("publisher", element.getPublisher());
+ }
+ if (element.hasPublisherLocationElement()) {
+ composeString("publisherLocation", element.getPublisherLocationElement());
+ }
+ if (element.hasStartDateElement()) {
+ composeDate("startDate", element.getStartDateElement());
+ }
+ }
+
+ protected void composeCitationKeywordListComponent(String name, Citation.CitationKeywordListComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeCitationKeywordListComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeCitationKeywordListComponentElements(Citation.CitationKeywordListComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasOwnerElement()) {
+ composeString("owner", element.getOwnerElement());
+ }
+ if (element.hasKeyword()) {
+ for (Citation.CitationKeywordListKeywordComponent e : element.getKeyword())
+ composeCitationKeywordListKeywordComponent("keyword", e);
+ }
+ }
+
+ protected void composeCitationKeywordListKeywordComponent(String name, Citation.CitationKeywordListKeywordComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeCitationKeywordListKeywordComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeCitationKeywordListKeywordComponentElements(Citation.CitationKeywordListKeywordComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasMajorTopicElement()) {
+ composeBoolean("majorTopic", element.getMajorTopicElement());
+ }
+ if (element.hasValueElement()) {
+ composeString("value", element.getValueElement());
+ }
+ }
+
protected void composeCitationMedlinePubMedComponent(String name, Citation.CitationMedlinePubMedComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
@@ -35300,8 +35789,9 @@ public class XmlParser extends XmlParserBase {
if (element.hasTitleElement()) {
composeString("title", element.getTitleElement());
}
- if (element.hasConfidentialityElement())
- composeEnumeration("confidentiality", element.getConfidentialityElement(), new Composition.V3ConfidentialityClassificationEnumFactory());
+ if (element.hasConfidentialityElement()) {
+ composeCode("confidentiality", element.getConfidentialityElement());
+ }
if (element.hasAttester()) {
for (Composition.CompositionAttesterComponent e : element.getAttester())
composeCompositionAttesterComponent("attester", e);
@@ -36005,9 +36495,13 @@ public class XmlParser extends XmlParserBase {
for (Reference e : element.getPerformer())
composeReference("performer", e);
}
- if (element.hasOrganization()) {
- for (Reference e : element.getOrganization())
- composeReference("organization", e);
+ if (element.hasManager()) {
+ for (Reference e : element.getManager())
+ composeReference("manager", e);
+ }
+ if (element.hasController()) {
+ for (Reference e : element.getController())
+ composeReference("controller", e);
}
if (element.hasSourceAttachment()) {
for (Attachment e : element.getSourceAttachment())
@@ -38321,13 +38815,14 @@ public class XmlParser extends XmlParserBase {
protected void composeDocumentReferenceElements(DocumentReference element) throws IOException {
composeDomainResourceElements(element);
- if (element.hasMasterIdentifier()) {
- composeIdentifier("masterIdentifier", element.getMasterIdentifier());
- }
if (element.hasIdentifier()) {
for (Identifier e : element.getIdentifier())
composeIdentifier("identifier", e);
}
+ if (element.hasBasedOn()) {
+ for (Reference e : element.getBasedOn())
+ composeReference("basedOn", e);
+ }
if (element.hasStatusElement())
composeEnumeration("status", element.getStatusElement(), new Enumerations.DocumentReferenceStatusEnumFactory());
if (element.hasDocStatusElement())
@@ -38342,6 +38837,23 @@ public class XmlParser extends XmlParserBase {
if (element.hasSubject()) {
composeReference("subject", element.getSubject());
}
+ if (element.hasEncounter()) {
+ for (Reference e : element.getEncounter())
+ composeReference("encounter", e);
+ }
+ if (element.hasEvent()) {
+ for (CodeableConcept e : element.getEvent())
+ composeCodeableConcept("event", e);
+ }
+ if (element.hasFacilityType()) {
+ composeCodeableConcept("facilityType", element.getFacilityType());
+ }
+ if (element.hasPracticeSetting()) {
+ composeCodeableConcept("practiceSetting", element.getPracticeSetting());
+ }
+ if (element.hasPeriod()) {
+ composePeriod("period", element.getPeriod());
+ }
if (element.hasDateElement()) {
composeInstant("date", element.getDateElement());
}
@@ -38349,8 +38861,9 @@ public class XmlParser extends XmlParserBase {
for (Reference e : element.getAuthor())
composeReference("author", e);
}
- if (element.hasAuthenticator()) {
- composeReference("authenticator", element.getAuthenticator());
+ if (element.hasAttester()) {
+ for (DocumentReference.DocumentReferenceAttesterComponent e : element.getAttester())
+ composeDocumentReferenceAttesterComponent("attester", e);
}
if (element.hasCustodian()) {
composeReference("custodian", element.getCustodian());
@@ -38360,7 +38873,7 @@ public class XmlParser extends XmlParserBase {
composeDocumentReferenceRelatesToComponent("relatesTo", e);
}
if (element.hasDescriptionElement()) {
- composeString("description", element.getDescriptionElement());
+ composeMarkdown("description", element.getDescriptionElement());
}
if (element.hasSecurityLabel()) {
for (CodeableConcept e : element.getSecurityLabel())
@@ -38370,8 +38883,34 @@ public class XmlParser extends XmlParserBase {
for (DocumentReference.DocumentReferenceContentComponent e : element.getContent())
composeDocumentReferenceContentComponent("content", e);
}
- if (element.hasContext()) {
- composeDocumentReferenceContextComponent("context", element.getContext());
+ if (element.hasSourcePatientInfo()) {
+ composeReference("sourcePatientInfo", element.getSourcePatientInfo());
+ }
+ if (element.hasRelated()) {
+ for (Reference e : element.getRelated())
+ composeReference("related", e);
+ }
+ }
+
+ protected void composeDocumentReferenceAttesterComponent(String name, DocumentReference.DocumentReferenceAttesterComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeDocumentReferenceAttesterComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeDocumentReferenceAttesterComponentElements(DocumentReference.DocumentReferenceAttesterComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasModeElement())
+ composeEnumeration("mode", element.getModeElement(), new DocumentReference.DocumentAttestationModeEnumFactory());
+ if (element.hasTimeElement()) {
+ composeDateTime("time", element.getTimeElement());
+ }
+ if (element.hasParty()) {
+ composeReference("party", element.getParty());
}
}
@@ -38412,47 +38951,8 @@ public class XmlParser extends XmlParserBase {
if (element.hasFormat()) {
composeCoding("format", element.getFormat());
}
- }
-
- protected void composeDocumentReferenceContextComponent(String name, DocumentReference.DocumentReferenceContextComponent element) throws IOException {
- if (element != null) {
- composeElementAttributes(element);
- xml.enter(FHIR_NS, name);
- composeDocumentReferenceContextComponentElements(element);
- composeElementClose(element);
- xml.exit(FHIR_NS, name);
- }
- }
-
- protected void composeDocumentReferenceContextComponentElements(DocumentReference.DocumentReferenceContextComponent element) throws IOException {
- composeBackboneElementElements(element);
- if (element.hasEncounter()) {
- for (Reference e : element.getEncounter())
- composeReference("encounter", e);
- }
- if (element.hasEvent()) {
- for (CodeableConcept e : element.getEvent())
- composeCodeableConcept("event", e);
- }
- if (element.hasPeriod()) {
- composePeriod("period", element.getPeriod());
- }
- if (element.hasFacilityType()) {
- composeCodeableConcept("facilityType", element.getFacilityType());
- }
- if (element.hasPracticeSetting()) {
- composeCodeableConcept("practiceSetting", element.getPracticeSetting());
- }
- if (element.hasSourcePatientInfo()) {
- composeReference("sourcePatientInfo", element.getSourcePatientInfo());
- }
- if (element.hasRelated()) {
- for (Reference e : element.getRelated())
- composeReference("related", e);
- }
- if (element.hasBasedOn()) {
- for (Reference e : element.getBasedOn())
- composeReference("basedOn", e);
+ if (element.hasIdentifier()) {
+ composeIdentifier("identifier", element.getIdentifier());
}
}
@@ -39073,9 +39573,28 @@ public class XmlParser extends XmlParserBase {
if (element.hasLastReviewDateElement()) {
composeDate("lastReviewDate", element.getLastReviewDateElement());
}
- if (element.hasContributor()) {
- for (Contributor e : element.getContributor())
- composeContributor("contributor", e);
+ if (element.hasPublisherElement()) {
+ composeString("publisher", element.getPublisherElement());
+ }
+ if (element.hasContact()) {
+ for (ContactDetail e : element.getContact())
+ composeContactDetail("contact", e);
+ }
+ if (element.hasAuthor()) {
+ for (ContactDetail e : element.getAuthor())
+ composeContactDetail("author", e);
+ }
+ if (element.hasEditor()) {
+ for (ContactDetail e : element.getEditor())
+ composeContactDetail("editor", e);
+ }
+ if (element.hasReviewer()) {
+ for (ContactDetail e : element.getReviewer())
+ composeContactDetail("reviewer", e);
+ }
+ if (element.hasEndorser()) {
+ for (ContactDetail e : element.getEndorser())
+ composeContactDetail("endorser", e);
}
if (element.hasRelatedArtifact()) {
for (RelatedArtifact e : element.getRelatedArtifact())
@@ -39164,7 +39683,8 @@ public class XmlParser extends XmlParserBase {
composeString("description", element.getDescriptionElement());
}
if (element.hasNote()) {
- composeAnnotation("note", element.getNote());
+ for (Annotation e : element.getNote())
+ composeAnnotation("note", e);
}
if (element.hasRating()) {
for (CodeableConcept e : element.getRating())
@@ -39192,7 +39712,8 @@ public class XmlParser extends XmlParserBase {
composeString("description", element.getDescriptionElement());
}
if (element.hasNote()) {
- composeAnnotation("note", element.getNote());
+ for (Annotation e : element.getNote())
+ composeAnnotation("note", e);
}
if (element.hasType()) {
for (CodeableConcept e : element.getType())
@@ -39204,71 +39725,118 @@ public class XmlParser extends XmlParserBase {
}
}
- protected void composeEvidenceFocus(String name, EvidenceFocus element) throws IOException {
+ protected void composeEvidenceReport(String name, EvidenceReport element) throws IOException {
if (element != null) {
composeResourceAttributes(element);
xml.enter(FHIR_NS, name);
- composeEvidenceFocusElements(element);
+ composeEvidenceReportElements(element);
composeElementClose(element);
xml.exit(FHIR_NS, name);
}
}
- protected void composeEvidenceFocusElements(EvidenceFocus element) throws IOException {
+ protected void composeEvidenceReportElements(EvidenceReport element) throws IOException {
composeMetadataResourceElements(element);
if (element.hasUrlElement()) {
composeUri("url", element.getUrlElement());
}
- if (element.hasIdentifier()) {
- for (Identifier e : element.getIdentifier())
- composeIdentifier("identifier", e);
- }
- if (element.hasVersionElement()) {
- composeString("version", element.getVersionElement());
- }
- if (element.hasNameElement()) {
- composeString("name", element.getNameElement());
- }
if (element.hasStatusElement())
composeEnumeration("status", element.getStatusElement(), new Enumerations.PublicationStatusEnumFactory());
if (element.hasUseContext()) {
for (UsageContext e : element.getUseContext())
composeUsageContext("useContext", e);
}
- if (element.hasDateElement()) {
- composeDateTime("date", element.getDateElement());
+ if (element.hasIdentifier()) {
+ for (Identifier e : element.getIdentifier())
+ composeIdentifier("identifier", e);
+ }
+ if (element.hasRelatedIdentifier()) {
+ for (Identifier e : element.getRelatedIdentifier())
+ composeIdentifier("relatedIdentifier", e);
+ }
+ if (element.hasCiteAs()) {
+ composeReference("citeAs", element.getCiteAs());
+ }
+ if (element.hasType()) {
+ composeCodeableConcept("type", element.getType());
}
if (element.hasNote()) {
for (Annotation e : element.getNote())
composeAnnotation("note", e);
}
- if (element.hasCopyrightElement()) {
- composeMarkdown("copyright", element.getCopyrightElement());
- }
- if (element.hasCiteAs()) {
- composeReference("citeAs", element.getCiteAs());
- }
- if (element.hasCharacteristic()) {
- for (EvidenceFocus.EvidenceFocusCharacteristicComponent e : element.getCharacteristic())
- composeEvidenceFocusCharacteristicComponent("characteristic", e);
- }
if (element.hasRelatedArtifact()) {
for (RelatedArtifact e : element.getRelatedArtifact())
composeRelatedArtifact("relatedArtifact", e);
}
+ if (element.hasSubject()) {
+ composeEvidenceReportSubjectComponent("subject", element.getSubject());
+ }
+ if (element.hasPublisherElement()) {
+ composeString("publisher", element.getPublisherElement());
+ }
+ if (element.hasContact()) {
+ for (ContactDetail e : element.getContact())
+ composeContactDetail("contact", e);
+ }
+ if (element.hasAuthor()) {
+ for (ContactDetail e : element.getAuthor())
+ composeContactDetail("author", e);
+ }
+ if (element.hasEditor()) {
+ for (ContactDetail e : element.getEditor())
+ composeContactDetail("editor", e);
+ }
+ if (element.hasReviewer()) {
+ for (ContactDetail e : element.getReviewer())
+ composeContactDetail("reviewer", e);
+ }
+ if (element.hasEndorser()) {
+ for (ContactDetail e : element.getEndorser())
+ composeContactDetail("endorser", e);
+ }
+ if (element.hasRelatesTo()) {
+ for (EvidenceReport.EvidenceReportRelatesToComponent e : element.getRelatesTo())
+ composeEvidenceReportRelatesToComponent("relatesTo", e);
+ }
+ if (element.hasSection()) {
+ for (EvidenceReport.SectionComponent e : element.getSection())
+ composeEvidenceReportSectionComponent("section", e);
+ }
}
- protected void composeEvidenceFocusCharacteristicComponent(String name, EvidenceFocus.EvidenceFocusCharacteristicComponent element) throws IOException {
+ protected void composeEvidenceReportSubjectComponent(String name, EvidenceReport.EvidenceReportSubjectComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
xml.enter(FHIR_NS, name);
- composeEvidenceFocusCharacteristicComponentElements(element);
+ composeEvidenceReportSubjectComponentElements(element);
composeElementClose(element);
xml.exit(FHIR_NS, name);
}
}
- protected void composeEvidenceFocusCharacteristicComponentElements(EvidenceFocus.EvidenceFocusCharacteristicComponent element) throws IOException {
+ protected void composeEvidenceReportSubjectComponentElements(EvidenceReport.EvidenceReportSubjectComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasCharacteristic()) {
+ for (EvidenceReport.EvidenceReportSubjectCharacteristicComponent e : element.getCharacteristic())
+ composeEvidenceReportSubjectCharacteristicComponent("characteristic", e);
+ }
+ if (element.hasNote()) {
+ for (Annotation e : element.getNote())
+ composeAnnotation("note", e);
+ }
+ }
+
+ protected void composeEvidenceReportSubjectCharacteristicComponent(String name, EvidenceReport.EvidenceReportSubjectCharacteristicComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeEvidenceReportSubjectCharacteristicComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeEvidenceReportSubjectCharacteristicComponentElements(EvidenceReport.EvidenceReportSubjectCharacteristicComponent element) throws IOException {
composeBackboneElementElements(element);
if (element.hasCode()) {
composeCodeableConcept("code", element.getCode());
@@ -39283,6 +39851,74 @@ public class XmlParser extends XmlParserBase {
}
}
+ protected void composeEvidenceReportRelatesToComponent(String name, EvidenceReport.EvidenceReportRelatesToComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeEvidenceReportRelatesToComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeEvidenceReportRelatesToComponentElements(EvidenceReport.EvidenceReportRelatesToComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasCodeElement())
+ composeEnumeration("code", element.getCodeElement(), new EvidenceReport.ReportRelationshipTypeEnumFactory());
+ if (element.hasTarget()) {
+ composeType("target", element.getTarget());
+ } }
+
+ protected void composeEvidenceReportSectionComponent(String name, EvidenceReport.SectionComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeEvidenceReportSectionComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeEvidenceReportSectionComponentElements(EvidenceReport.SectionComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasTitleElement()) {
+ composeString("title", element.getTitleElement());
+ }
+ if (element.hasFocus()) {
+ composeCodeableConcept("focus", element.getFocus());
+ }
+ if (element.hasFocusReference()) {
+ composeReference("focusReference", element.getFocusReference());
+ }
+ if (element.hasAuthor()) {
+ for (Reference e : element.getAuthor())
+ composeReference("author", e);
+ }
+ if (element.hasText()) {
+ composeNarrative("text", element.getText());
+ }
+ if (element.hasModeElement())
+ composeEnumeration("mode", element.getModeElement(), new Enumerations.ListModeEnumFactory());
+ if (element.hasOrderedBy()) {
+ composeCodeableConcept("orderedBy", element.getOrderedBy());
+ }
+ if (element.hasEntryClassifier()) {
+ for (CodeableConcept e : element.getEntryClassifier())
+ composeCodeableConcept("entryClassifier", e);
+ }
+ if (element.hasEntryReference()) {
+ for (Reference e : element.getEntryReference())
+ composeReference("entryReference", e);
+ }
+ if (element.hasEmptyReason()) {
+ composeCodeableConcept("emptyReason", element.getEmptyReason());
+ }
+ if (element.hasSection()) {
+ for (EvidenceReport.SectionComponent e : element.getSection())
+ composeEvidenceReportSectionComponent("section", e);
+ }
+ }
+
protected void composeEvidenceVariable(String name, EvidenceVariable element) throws IOException {
if (element != null) {
composeResourceAttributes(element);
@@ -39322,13 +39958,6 @@ public class XmlParser extends XmlParserBase {
if (element.hasDateElement()) {
composeDateTime("date", element.getDateElement());
}
- if (element.hasPublisherElement()) {
- composeString("publisher", element.getPublisherElement());
- }
- if (element.hasContact()) {
- for (ContactDetail e : element.getContact())
- composeContactDetail("contact", e);
- }
if (element.hasDescriptionElement()) {
composeMarkdown("description", element.getDescriptionElement());
}
@@ -39340,25 +39969,12 @@ public class XmlParser extends XmlParserBase {
for (UsageContext e : element.getUseContext())
composeUsageContext("useContext", e);
}
- if (element.hasJurisdiction()) {
- for (CodeableConcept e : element.getJurisdiction())
- composeCodeableConcept("jurisdiction", e);
+ if (element.hasPublisherElement()) {
+ composeString("publisher", element.getPublisherElement());
}
- if (element.hasCopyrightElement()) {
- composeMarkdown("copyright", element.getCopyrightElement());
- }
- if (element.hasApprovalDateElement()) {
- composeDate("approvalDate", element.getApprovalDateElement());
- }
- if (element.hasLastReviewDateElement()) {
- composeDate("lastReviewDate", element.getLastReviewDateElement());
- }
- if (element.hasEffectivePeriod()) {
- composePeriod("effectivePeriod", element.getEffectivePeriod());
- }
- if (element.hasTopic()) {
- for (CodeableConcept e : element.getTopic())
- composeCodeableConcept("topic", e);
+ if (element.hasContact()) {
+ for (ContactDetail e : element.getContact())
+ composeContactDetail("contact", e);
}
if (element.hasAuthor()) {
for (ContactDetail e : element.getAuthor())
@@ -39380,8 +39996,6 @@ public class XmlParser extends XmlParserBase {
for (RelatedArtifact e : element.getRelatedArtifact())
composeRelatedArtifact("relatedArtifact", e);
}
- if (element.hasTypeElement())
- composeEnumeration("type", element.getTypeElement(), new EvidenceVariable.EvidenceVariableTypeEnumFactory());
if (element.hasActualElement()) {
composeBoolean("actual", element.getActualElement());
}
@@ -39391,6 +40005,12 @@ public class XmlParser extends XmlParserBase {
for (EvidenceVariable.EvidenceVariableCharacteristicComponent e : element.getCharacteristic())
composeEvidenceVariableCharacteristicComponent("characteristic", e);
}
+ if (element.hasHandlingElement())
+ composeEnumeration("handling", element.getHandlingElement(), new Enumerations.EvidenceVariableHandlingEnumFactory());
+ if (element.hasCategory()) {
+ for (EvidenceVariable.EvidenceVariableCategoryComponent e : element.getCategory())
+ composeEvidenceVariableCategoryComponent("category", e);
+ }
}
protected void composeEvidenceVariableCharacteristicComponent(String name, EvidenceVariable.EvidenceVariableCharacteristicComponent element) throws IOException {
@@ -39453,6 +40073,25 @@ public class XmlParser extends XmlParserBase {
}
}
+ protected void composeEvidenceVariableCategoryComponent(String name, EvidenceVariable.EvidenceVariableCategoryComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeEvidenceVariableCategoryComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeEvidenceVariableCategoryComponentElements(EvidenceVariable.EvidenceVariableCategoryComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasNameElement()) {
+ composeString("name", element.getNameElement());
+ }
+ if (element.hasValue()) {
+ composeType("value", element.getValue());
+ } }
+
protected void composeExampleScenario(String name, ExampleScenario element) throws IOException {
if (element != null) {
composeResourceAttributes(element);
@@ -41586,6 +42225,18 @@ public class XmlParser extends XmlParserBase {
for (Identifier e : element.getIdentifier())
composeIdentifier("identifier", e);
}
+ if (element.hasInstantiatesCanonical()) {
+ for (CanonicalType e : element.getInstantiatesCanonical())
+ composeCanonical("instantiatesCanonical", e);
+ }
+ if (element.hasInstantiatesUri()) {
+ for (UriType e : element.getInstantiatesUri())
+ composeUri("instantiatesUri", e);
+ }
+ if (element.hasBasedOn()) {
+ for (Reference e : element.getBasedOn())
+ composeReference("basedOn", e);
+ }
if (element.hasStatusElement())
composeEnumeration("status", element.getStatusElement(), new Immunization.ImmunizationStatusCodesEnumFactory());
if (element.hasStatusReason()) {
@@ -41594,6 +42245,15 @@ public class XmlParser extends XmlParserBase {
if (element.hasVaccineCode()) {
composeCodeableConcept("vaccineCode", element.getVaccineCode());
}
+ if (element.hasManufacturer()) {
+ composeReference("manufacturer", element.getManufacturer());
+ }
+ if (element.hasLotNumberElement()) {
+ composeString("lotNumber", element.getLotNumberElement());
+ }
+ if (element.hasExpirationDateElement()) {
+ composeDate("expirationDate", element.getExpirationDateElement());
+ }
if (element.hasPatient()) {
composeReference("patient", element.getPatient());
}
@@ -41613,15 +42273,6 @@ public class XmlParser extends XmlParserBase {
} if (element.hasLocation()) {
composeReference("location", element.getLocation());
}
- if (element.hasManufacturer()) {
- composeReference("manufacturer", element.getManufacturer());
- }
- if (element.hasLotNumberElement()) {
- composeString("lotNumber", element.getLotNumberElement());
- }
- if (element.hasExpirationDateElement()) {
- composeDate("expirationDate", element.getExpirationDateElement());
- }
if (element.hasSite()) {
composeCodeableConcept("site", element.getSite());
}
@@ -41840,6 +42491,14 @@ public class XmlParser extends XmlParserBase {
for (Identifier e : element.getIdentifier())
composeIdentifier("identifier", e);
}
+ if (element.hasInstantiatesCanonical()) {
+ for (CanonicalType e : element.getInstantiatesCanonical())
+ composeCanonical("instantiatesCanonical", e);
+ }
+ if (element.hasInstantiatesUri()) {
+ for (UriType e : element.getInstantiatesUri())
+ composeUri("instantiatesUri", e);
+ }
if (element.hasPatient()) {
composeReference("patient", element.getPatient());
}
@@ -42315,52 +42974,46 @@ public class XmlParser extends XmlParserBase {
for (Reference e : element.getManufacturer())
composeReference("manufacturer", e);
}
+ if (element.hasSubstance()) {
+ composeIngredientSubstanceComponent("substance", element.getSubstance());
+ }
if (element.hasSpecifiedSubstance()) {
for (Ingredient.IngredientSpecifiedSubstanceComponent e : element.getSpecifiedSubstance())
composeIngredientSpecifiedSubstanceComponent("specifiedSubstance", e);
}
- if (element.hasSubstance()) {
- composeIngredientSubstanceComponent("substance", element.getSubstance());
- }
}
- protected void composeIngredientSpecifiedSubstanceComponent(String name, Ingredient.IngredientSpecifiedSubstanceComponent element) throws IOException {
+ protected void composeIngredientSubstanceComponent(String name, Ingredient.IngredientSubstanceComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
xml.enter(FHIR_NS, name);
- composeIngredientSpecifiedSubstanceComponentElements(element);
+ composeIngredientSubstanceComponentElements(element);
composeElementClose(element);
xml.exit(FHIR_NS, name);
}
}
- protected void composeIngredientSpecifiedSubstanceComponentElements(Ingredient.IngredientSpecifiedSubstanceComponent element) throws IOException {
+ protected void composeIngredientSubstanceComponentElements(Ingredient.IngredientSubstanceComponent element) throws IOException {
composeBackboneElementElements(element);
if (element.hasCode()) {
composeType("code", element.getCode());
- } if (element.hasGroup()) {
- composeCodeableConcept("group", element.getGroup());
- }
- if (element.hasConfidentiality()) {
- composeCodeableConcept("confidentiality", element.getConfidentiality());
- }
- if (element.hasStrength()) {
- for (Ingredient.IngredientSpecifiedSubstanceStrengthComponent e : element.getStrength())
- composeIngredientSpecifiedSubstanceStrengthComponent("strength", e);
+ } if (element.hasStrength()) {
+ for (Ingredient.IngredientSubstanceStrengthComponent e : element.getStrength())
+ composeIngredientSubstanceStrengthComponent("strength", e);
}
}
- protected void composeIngredientSpecifiedSubstanceStrengthComponent(String name, Ingredient.IngredientSpecifiedSubstanceStrengthComponent element) throws IOException {
+ protected void composeIngredientSubstanceStrengthComponent(String name, Ingredient.IngredientSubstanceStrengthComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
xml.enter(FHIR_NS, name);
- composeIngredientSpecifiedSubstanceStrengthComponentElements(element);
+ composeIngredientSubstanceStrengthComponentElements(element);
composeElementClose(element);
xml.exit(FHIR_NS, name);
}
}
- protected void composeIngredientSpecifiedSubstanceStrengthComponentElements(Ingredient.IngredientSpecifiedSubstanceStrengthComponent element) throws IOException {
+ protected void composeIngredientSubstanceStrengthComponentElements(Ingredient.IngredientSubstanceStrengthComponent element) throws IOException {
composeBackboneElementElements(element);
if (element.hasPresentation()) {
composeRatio("presentation", element.getPresentation());
@@ -42388,22 +43041,22 @@ public class XmlParser extends XmlParserBase {
composeCodeableConcept("country", e);
}
if (element.hasReferenceStrength()) {
- for (Ingredient.IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent e : element.getReferenceStrength())
- composeIngredientSpecifiedSubstanceStrengthReferenceStrengthComponent("referenceStrength", e);
+ for (Ingredient.IngredientSubstanceStrengthReferenceStrengthComponent e : element.getReferenceStrength())
+ composeIngredientSubstanceStrengthReferenceStrengthComponent("referenceStrength", e);
}
}
- protected void composeIngredientSpecifiedSubstanceStrengthReferenceStrengthComponent(String name, Ingredient.IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent element) throws IOException {
+ protected void composeIngredientSubstanceStrengthReferenceStrengthComponent(String name, Ingredient.IngredientSubstanceStrengthReferenceStrengthComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
xml.enter(FHIR_NS, name);
- composeIngredientSpecifiedSubstanceStrengthReferenceStrengthComponentElements(element);
+ composeIngredientSubstanceStrengthReferenceStrengthComponentElements(element);
composeElementClose(element);
xml.exit(FHIR_NS, name);
}
}
- protected void composeIngredientSpecifiedSubstanceStrengthReferenceStrengthComponentElements(Ingredient.IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent element) throws IOException {
+ protected void composeIngredientSubstanceStrengthReferenceStrengthComponentElements(Ingredient.IngredientSubstanceStrengthReferenceStrengthComponent element) throws IOException {
composeBackboneElementElements(element);
if (element.hasSubstance()) {
composeType("substance", element.getSubstance());
@@ -42422,23 +43075,29 @@ public class XmlParser extends XmlParserBase {
}
}
- protected void composeIngredientSubstanceComponent(String name, Ingredient.IngredientSubstanceComponent element) throws IOException {
+ protected void composeIngredientSpecifiedSubstanceComponent(String name, Ingredient.IngredientSpecifiedSubstanceComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
xml.enter(FHIR_NS, name);
- composeIngredientSubstanceComponentElements(element);
+ composeIngredientSpecifiedSubstanceComponentElements(element);
composeElementClose(element);
xml.exit(FHIR_NS, name);
}
}
- protected void composeIngredientSubstanceComponentElements(Ingredient.IngredientSubstanceComponent element) throws IOException {
+ protected void composeIngredientSpecifiedSubstanceComponentElements(Ingredient.IngredientSpecifiedSubstanceComponent element) throws IOException {
composeBackboneElementElements(element);
if (element.hasCode()) {
composeType("code", element.getCode());
- } if (element.hasStrength()) {
- for (Ingredient.IngredientSpecifiedSubstanceStrengthComponent e : element.getStrength())
- composeIngredientSpecifiedSubstanceStrengthComponent("strength", e);
+ } if (element.hasGroup()) {
+ composeCodeableConcept("group", element.getGroup());
+ }
+ if (element.hasConfidentiality()) {
+ composeCodeableConcept("confidentiality", element.getConfidentiality());
+ }
+ if (element.hasStrength()) {
+ for (Ingredient.IngredientSubstanceStrengthComponent e : element.getStrength())
+ composeIngredientSubstanceStrengthComponent("strength", e);
}
}
@@ -44143,6 +44802,9 @@ public class XmlParser extends XmlParserBase {
}
if (element.hasStatusElement())
composeEnumeration("status", element.getStatusElement(), new MedicationKnowledge.MedicationKnowledgeStatusCodesEnumFactory());
+ if (element.hasAuthor()) {
+ composeReference("author", element.getAuthor());
+ }
if (element.hasManufacturer()) {
composeReference("manufacturer", element.getManufacturer());
}
@@ -44164,6 +44826,9 @@ public class XmlParser extends XmlParserBase {
for (Reference e : element.getAssociatedMedication())
composeReference("associatedMedication", e);
}
+ if (element.hasAssociatedDefinition()) {
+ composeReference("associatedDefinition", element.getAssociatedDefinition());
+ }
if (element.hasProductType()) {
for (CodeableConcept e : element.getProductType())
composeCodeableConcept("productType", e);
@@ -44204,7 +44869,8 @@ public class XmlParser extends XmlParserBase {
composeMedicationKnowledgeMedicineClassificationComponent("medicineClassification", e);
}
if (element.hasPackaging()) {
- composeMedicationKnowledgePackagingComponent("packaging", element.getPackaging());
+ for (MedicationKnowledge.MedicationKnowledgePackagingComponent e : element.getPackaging())
+ composeMedicationKnowledgePackagingComponent("packaging", e);
}
if (element.hasDrugCharacteristic()) {
for (MedicationKnowledge.MedicationKnowledgeDrugCharacteristicComponent e : element.getDrugCharacteristic())
@@ -44299,6 +44965,10 @@ public class XmlParser extends XmlParserBase {
protected void composeMedicationKnowledgeCostComponentElements(MedicationKnowledge.MedicationKnowledgeCostComponent element) throws IOException {
composeBackboneElementElements(element);
+ if (element.hasEffectiveDate()) {
+ for (Period e : element.getEffectiveDate())
+ composePeriod("effectiveDate", e);
+ }
if (element.hasType()) {
composeCodeableConcept("type", element.getType());
}
@@ -44306,9 +44976,8 @@ public class XmlParser extends XmlParserBase {
composeString("source", element.getSourceElement());
}
if (element.hasCost()) {
- composeMoney("cost", element.getCost());
- }
- }
+ composeType("cost", element.getCost());
+ } }
protected void composeMedicationKnowledgeMonitoringProgramComponent(String name, MedicationKnowledge.MedicationKnowledgeMonitoringProgramComponent element) throws IOException {
if (element != null) {
@@ -44428,6 +45097,12 @@ public class XmlParser extends XmlParserBase {
protected void composeMedicationKnowledgePackagingComponentElements(MedicationKnowledge.MedicationKnowledgePackagingComponent element) throws IOException {
composeBackboneElementElements(element);
+ if (element.hasIdentifier()) {
+ composeIdentifier("identifier", element.getIdentifier());
+ }
+ if (element.hasCost()) {
+ composeMedicationKnowledgeCostComponent("cost", element.getCost());
+ }
if (element.hasType()) {
composeCodeableConcept("type", element.getType());
}
@@ -44876,9 +45551,9 @@ public class XmlParser extends XmlParserBase {
if (element.hasPaediatricUseIndicator()) {
composeCodeableConcept("paediatricUseIndicator", element.getPaediatricUseIndicator());
}
- if (element.hasProductClassification()) {
- for (CodeableConcept e : element.getProductClassification())
- composeCodeableConcept("productClassification", e);
+ if (element.hasClassification()) {
+ for (CodeableConcept e : element.getClassification())
+ composeCodeableConcept("classification", e);
}
if (element.hasCharacteristic()) {
for (CodeableConcept e : element.getCharacteristic())
@@ -44900,6 +45575,10 @@ public class XmlParser extends XmlParserBase {
for (Reference e : element.getIngredient())
composeReference("ingredient", e);
}
+ if (element.hasImpurity()) {
+ for (Reference e : element.getImpurity())
+ composeReference("impurity", e);
+ }
if (element.hasAttachedDocument()) {
for (Reference e : element.getAttachedDocument())
composeReference("attachedDocument", e);
@@ -45034,8 +45713,9 @@ public class XmlParser extends XmlParserBase {
protected void composeMedicinalProductDefinitionCrossReferenceComponentElements(MedicinalProductDefinition.MedicinalProductDefinitionCrossReferenceComponent element) throws IOException {
composeBackboneElementElements(element);
if (element.hasProduct()) {
- composeType("product", element.getProduct());
- } if (element.hasType()) {
+ composeCodeableReference("product", element.getProduct());
+ }
+ if (element.hasType()) {
composeCodeableConcept("type", element.getType());
}
}
@@ -47092,6 +47772,9 @@ public class XmlParser extends XmlParserBase {
if (element.hasNameElement()) {
composeString("name", element.getNameElement());
}
+ if (element.hasType()) {
+ composeCodeableConcept("type", element.getType());
+ }
if (element.hasSubject()) {
for (Reference e : element.getSubject())
composeReference("subject", e);
@@ -50779,10 +51462,6 @@ public class XmlParser extends XmlParserBase {
for (Subscription.SubscriptionFilterByComponent e : element.getFilterBy())
composeSubscriptionFilterByComponent("filterBy", e);
}
- if (element.hasError()) {
- for (CodeableConcept e : element.getError())
- composeCodeableConcept("error", e);
- }
if (element.hasChannelType()) {
composeCoding("channelType", element.getChannelType());
}
@@ -50840,8 +51519,8 @@ public class XmlParser extends XmlParserBase {
protected void composeSubscriptionStatusElements(SubscriptionStatus element) throws IOException {
composeDomainResourceElements(element);
- if (element.hasNotificationTypeElement())
- composeEnumeration("notificationType", element.getNotificationTypeElement(), new SubscriptionStatus.SubscriptionNotificationTypeEnumFactory());
+ if (element.hasTypeElement())
+ composeEnumeration("type", element.getTypeElement(), new SubscriptionStatus.SubscriptionNotificationTypeEnumFactory());
if (element.hasEventsSinceSubscriptionStartElement()) {
composeInteger64("eventsSinceSubscriptionStart", element.getEventsSinceSubscriptionStartElement());
}
@@ -50853,8 +51532,12 @@ public class XmlParser extends XmlParserBase {
}
if (element.hasStatusElement())
composeEnumeration("status", element.getStatusElement(), new Enumerations.SubscriptionStateEnumFactory());
- if (element.hasTopic()) {
- composeReference("topic", element.getTopic());
+ if (element.hasTopicElement()) {
+ composeCanonical("topic", element.getTopicElement());
+ }
+ if (element.hasError()) {
+ for (CodeableConcept e : element.getError())
+ composeCodeableConcept("error", e);
}
}
@@ -50883,13 +51566,9 @@ public class XmlParser extends XmlParserBase {
if (element.hasTitleElement()) {
composeString("title", element.getTitleElement());
}
- if (element.hasDerivedFromCanonical()) {
- for (CanonicalType e : element.getDerivedFromCanonical())
- composeCanonical("derivedFromCanonical", e);
- }
- if (element.hasDerivedFromUri()) {
- for (UriType e : element.getDerivedFromUri())
- composeUri("derivedFromUri", e);
+ if (element.hasDerivedFrom()) {
+ for (CanonicalType e : element.getDerivedFrom())
+ composeCanonical("derivedFrom", e);
}
if (element.hasStatusElement())
composeEnumeration("status", element.getStatusElement(), new Enumerations.PublicationStatusEnumFactory());
@@ -51122,6 +51801,10 @@ public class XmlParser extends XmlParserBase {
if (element.hasCategory()) {
composeCodeableConcept("category", element.getCategory());
}
+ if (element.hasClassification()) {
+ for (CodeableConcept e : element.getClassification())
+ composeCodeableConcept("classification", e);
+ }
if (element.hasDomain()) {
composeCodeableConcept("domain", element.getDomain());
}
@@ -51247,8 +51930,9 @@ public class XmlParser extends XmlParserBase {
composeString("parameters", element.getParametersElement());
}
if (element.hasDefiningSubstance()) {
- composeType("definingSubstance", element.getDefiningSubstance());
- } if (element.hasAmount()) {
+ composeCodeableReference("definingSubstance", element.getDefiningSubstance());
+ }
+ if (element.hasAmount()) {
composeType("amount", element.getAmount());
} if (element.hasReferenceRange()) {
composeRange("referenceRange", element.getReferenceRange());
@@ -51377,8 +52061,8 @@ public class XmlParser extends XmlParserBase {
if (element.hasFormat()) {
composeCodeableConcept("format", element.getFormat());
}
- if (element.hasAttachment()) {
- composeAttachment("attachment", element.getAttachment());
+ if (element.hasDocument()) {
+ composeReference("document", element.getDocument());
}
}
@@ -51724,7 +52408,7 @@ public class XmlParser extends XmlParserBase {
composeBoolean("isDefining", element.getIsDefiningElement());
}
if (element.hasAmount()) {
- composeSubstanceAmount("amount", element.getAmount());
+ composeQuantity("amount", element.getAmount());
}
}
@@ -51740,9 +52424,6 @@ public class XmlParser extends XmlParserBase {
protected void composeSubstancePolymerRepeatComponentElements(SubstancePolymer.SubstancePolymerRepeatComponent element) throws IOException {
composeBackboneElementElements(element);
- if (element.hasNumberOfUnitsElement()) {
- composeInteger("numberOfUnits", element.getNumberOfUnitsElement());
- }
if (element.hasAverageMolecularFormulaElement()) {
composeString("averageMolecularFormula", element.getAverageMolecularFormulaElement());
}
@@ -51773,8 +52454,8 @@ public class XmlParser extends XmlParserBase {
if (element.hasOrientation()) {
composeCodeableConcept("orientation", element.getOrientation());
}
- if (element.hasAmount()) {
- composeSubstanceAmount("amount", element.getAmount());
+ if (element.hasAmountElement()) {
+ composeInteger("amount", element.getAmountElement());
}
if (element.hasDegreeOfPolymerisation()) {
for (SubstancePolymer.SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent e : element.getDegreeOfPolymerisation())
@@ -51798,11 +52479,17 @@ public class XmlParser extends XmlParserBase {
protected void composeSubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponentElements(SubstancePolymer.SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent element) throws IOException {
composeBackboneElementElements(element);
- if (element.hasDegree()) {
- composeCodeableConcept("degree", element.getDegree());
+ if (element.hasType()) {
+ composeCodeableConcept("type", element.getType());
}
- if (element.hasAmount()) {
- composeSubstanceAmount("amount", element.getAmount());
+ if (element.hasAverageElement()) {
+ composeInteger("average", element.getAverageElement());
+ }
+ if (element.hasLowElement()) {
+ composeInteger("low", element.getLowElement());
+ }
+ if (element.hasHighElement()) {
+ composeInteger("high", element.getHighElement());
}
}
@@ -51921,10 +52608,6 @@ public class XmlParser extends XmlParserBase {
for (SubstanceReferenceInformation.SubstanceReferenceInformationGeneElementComponent e : element.getGeneElement())
composeSubstanceReferenceInformationGeneElementComponent("geneElement", e);
}
- if (element.hasClassification()) {
- for (SubstanceReferenceInformation.SubstanceReferenceInformationClassificationComponent e : element.getClassification())
- composeSubstanceReferenceInformationClassificationComponent("classification", e);
- }
if (element.hasTarget()) {
for (SubstanceReferenceInformation.SubstanceReferenceInformationTargetComponent e : element.getTarget())
composeSubstanceReferenceInformationTargetComponent("target", e);
@@ -51979,34 +52662,6 @@ public class XmlParser extends XmlParserBase {
}
}
- protected void composeSubstanceReferenceInformationClassificationComponent(String name, SubstanceReferenceInformation.SubstanceReferenceInformationClassificationComponent element) throws IOException {
- if (element != null) {
- composeElementAttributes(element);
- xml.enter(FHIR_NS, name);
- composeSubstanceReferenceInformationClassificationComponentElements(element);
- composeElementClose(element);
- xml.exit(FHIR_NS, name);
- }
- }
-
- protected void composeSubstanceReferenceInformationClassificationComponentElements(SubstanceReferenceInformation.SubstanceReferenceInformationClassificationComponent element) throws IOException {
- composeBackboneElementElements(element);
- if (element.hasDomain()) {
- composeCodeableConcept("domain", element.getDomain());
- }
- if (element.hasClassification()) {
- composeCodeableConcept("classification", element.getClassification());
- }
- if (element.hasSubtype()) {
- for (CodeableConcept e : element.getSubtype())
- composeCodeableConcept("subtype", e);
- }
- if (element.hasSource()) {
- for (Reference e : element.getSource())
- composeReference("source", e);
- }
- }
-
protected void composeSubstanceReferenceInformationTargetComponent(String name, SubstanceReferenceInformation.SubstanceReferenceInformationTargetComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
@@ -54404,8 +55059,8 @@ public class XmlParser extends XmlParserBase {
composeEventDefinition("EventDefinition", (EventDefinition)resource);
} else if (resource instanceof Evidence) {
composeEvidence("Evidence", (Evidence)resource);
- } else if (resource instanceof EvidenceFocus) {
- composeEvidenceFocus("EvidenceFocus", (EvidenceFocus)resource);
+ } else if (resource instanceof EvidenceReport) {
+ composeEvidenceReport("EvidenceReport", (EvidenceReport)resource);
} else if (resource instanceof EvidenceVariable) {
composeEvidenceVariable("EvidenceVariable", (EvidenceVariable)resource);
} else if (resource instanceof ExampleScenario) {
@@ -54709,8 +55364,8 @@ public class XmlParser extends XmlParserBase {
composeEventDefinition(name, (EventDefinition)resource);
} else if (resource instanceof Evidence) {
composeEvidence(name, (Evidence)resource);
- } else if (resource instanceof EvidenceFocus) {
- composeEvidenceFocus(name, (EvidenceFocus)resource);
+ } else if (resource instanceof EvidenceReport) {
+ composeEvidenceReport(name, (EvidenceReport)resource);
} else if (resource instanceof EvidenceVariable) {
composeEvidenceVariable(name, (EvidenceVariable)resource);
} else if (resource instanceof ExampleScenario) {
@@ -54982,8 +55637,6 @@ public class XmlParser extends XmlParserBase {
composeSignature(prefix+"Signature", (Signature) type);
} else if (type instanceof Statistic) {
composeStatistic(prefix+"Statistic", (Statistic) type);
- } else if (type instanceof SubstanceAmount) {
- composeSubstanceAmount(prefix+"SubstanceAmount", (SubstanceAmount) type);
} else if (type instanceof Timing) {
composeTiming(prefix+"Timing", (Timing) type);
} else if (type instanceof TriggerDefinition) {
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Account.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Account.java
index f89e47577..af334dc08 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Account.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Account.java
@@ -31,20 +31,23 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* A financial tool for tracking value accrued for a particular purpose. In the healthcare field, used to track charges for a patient, cost centers, etc.
@@ -1716,4 +1719,5 @@ A coverage may only be responsible for specific types of charges, and the sequen
public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE);
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ActivityDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ActivityDefinition.java
index 2f54e17a7..3584b2270 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ActivityDefinition.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ActivityDefinition.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,29 +29,23 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
-import org.hl7.fhir.r5.model.Enumerations.ActionParticipantType;
-import org.hl7.fhir.r5.model.Enumerations.ActionParticipantTypeEnumFactory;
-import org.hl7.fhir.r5.model.Enumerations.PublicationStatus;
-import org.hl7.fhir.r5.model.Enumerations.PublicationStatusEnumFactory;
-import org.hl7.fhir.r5.model.Enumerations.RequestIntent;
-import org.hl7.fhir.r5.model.Enumerations.RequestIntentEnumFactory;
-import org.hl7.fhir.r5.model.Enumerations.RequestPriority;
-import org.hl7.fhir.r5.model.Enumerations.RequestPriorityEnumFactory;
import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* This resource allows for the definition of some activity to be performed, independent of a particular patient, practitioner, or other performance context.
@@ -376,7 +368,7 @@ public class ActivityDefinition extends MetadataResource {
*/
@Child(name = "role", type = {CodeableConcept.class}, order=2, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="E.g. Nurse, Surgeon, Parent, etc.", formalDefinition="The role the participant should play in performing the described action." )
- @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/action-participant-role")
+ @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://terminology.hl7.org/ValueSet/action-participant-role")
protected CodeableConcept role;
private static final long serialVersionUID = -1152013659L;
@@ -4380,7 +4372,7 @@ public class ActivityDefinition extends MetadataResource {
* Path: ActivityDefinition.relatedArtifact.where(type='composed-of').resource
*
*/
- @SearchParamDefinition(name="composed-of", path="ActivityDefinition.relatedArtifact.where(type='composed-of').resource", description="What resource is being referenced", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceFocus.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
+ @SearchParamDefinition(name="composed-of", path="ActivityDefinition.relatedArtifact.where(type='composed-of').resource", description="What resource is being referenced", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
public static final String SP_COMPOSED_OF = "composed-of";
/**
* Fluent Client search parameter constant for composed-of
@@ -4526,7 +4518,7 @@ public class ActivityDefinition extends MetadataResource {
* Path: ActivityDefinition.relatedArtifact.where(type='depends-on').resource | ActivityDefinition.library
*
*/
- @SearchParamDefinition(name="depends-on", path="ActivityDefinition.relatedArtifact.where(type='depends-on').resource | ActivityDefinition.library", description="What resource is being referenced", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceFocus.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
+ @SearchParamDefinition(name="depends-on", path="ActivityDefinition.relatedArtifact.where(type='depends-on').resource | ActivityDefinition.library", description="What resource is being referenced", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
public static final String SP_DEPENDS_ON = "depends-on";
/**
* Fluent Client search parameter constant for depends-on
@@ -4552,7 +4544,7 @@ public class ActivityDefinition extends MetadataResource {
* Path: ActivityDefinition.relatedArtifact.where(type='derived-from').resource
*
*/
- @SearchParamDefinition(name="derived-from", path="ActivityDefinition.relatedArtifact.where(type='derived-from').resource", description="What resource is being referenced", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceFocus.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
+ @SearchParamDefinition(name="derived-from", path="ActivityDefinition.relatedArtifact.where(type='derived-from').resource", description="What resource is being referenced", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
public static final String SP_DERIVED_FROM = "derived-from";
/**
* Fluent Client search parameter constant for derived-from
@@ -4678,7 +4670,7 @@ public class ActivityDefinition extends MetadataResource {
* Path: ActivityDefinition.relatedArtifact.where(type='predecessor').resource
*
*/
- @SearchParamDefinition(name="predecessor", path="ActivityDefinition.relatedArtifact.where(type='predecessor').resource", description="What resource is being referenced", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceFocus.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
+ @SearchParamDefinition(name="predecessor", path="ActivityDefinition.relatedArtifact.where(type='predecessor').resource", description="What resource is being referenced", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
public static final String SP_PREDECESSOR = "predecessor";
/**
* Fluent Client search parameter constant for predecessor
@@ -4744,7 +4736,7 @@ public class ActivityDefinition extends MetadataResource {
* Path: ActivityDefinition.relatedArtifact.where(type='successor').resource
*
*/
- @SearchParamDefinition(name="successor", path="ActivityDefinition.relatedArtifact.where(type='successor').resource", description="What resource is being referenced", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceFocus.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
+ @SearchParamDefinition(name="successor", path="ActivityDefinition.relatedArtifact.where(type='successor').resource", description="What resource is being referenced", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
public static final String SP_SUCCESSOR = "successor";
/**
* Fluent Client search parameter constant for successor
@@ -4843,4 +4835,5 @@ public class ActivityDefinition extends MetadataResource {
public static final ca.uhn.fhir.rest.gclient.TokenClientParam VERSION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_VERSION);
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Address.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Address.java
index deb14b5ce..674d76df1 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Address.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Address.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,18 +29,21 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
-
+import org.hl7.fhir.utilities.Utilities;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseDatatypeElement;
import org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.instance.model.api.ICompositeType;
-import org.hl7.fhir.utilities.Utilities;
-
import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* Base StructureDefinition for Address Type: An address expressed using postal conventions (as opposed to GPS or other location definition formats). This data type may be used to convey addresses for use in delivering mail as well as for visiting locations which might not be valid for mail delivery. There are a variety of postal address formats defined around the world.
@@ -1113,4 +1114,5 @@ public class Address extends DataType implements ICompositeType {
}
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AdministrableProductDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AdministrableProductDefinition.java
index 9f41ebed0..77bce65af 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AdministrableProductDefinition.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AdministrableProductDefinition.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,20 +29,23 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* A pharmaceutical product described in terms of its composition and dose form.
@@ -1419,7 +1420,7 @@ public class AdministrableProductDefinition extends DomainResource {
/**
* The administrable dose form, after necessary reconstitution.
*/
- @Child(name = "administrableDoseForm", type = {CodeableConcept.class}, order=2, min=1, max=1, modifier=false, summary=true)
+ @Child(name = "administrableDoseForm", type = {CodeableConcept.class}, order=2, min=0, max=1, modifier=false, summary=true)
@Description(shortDefinition="The administrable dose form, after necessary reconstitution", formalDefinition="The administrable dose form, after necessary reconstitution." )
protected CodeableConcept administrableDoseForm;
@@ -1477,9 +1478,8 @@ public class AdministrableProductDefinition extends DomainResource {
/**
* Constructor
*/
- public AdministrableProductDefinition(CodeableConcept administrableDoseForm, AdministrableProductDefinitionRouteOfAdministrationComponent routeOfAdministration) {
+ public AdministrableProductDefinition(AdministrableProductDefinitionRouteOfAdministrationComponent routeOfAdministration) {
super();
- this.setAdministrableDoseForm(administrableDoseForm);
this.addRouteOfAdministration(routeOfAdministration);
}
@@ -2168,6 +2168,32 @@ public class AdministrableProductDefinition extends DomainResource {
return ResourceType.AdministrableProductDefinition;
}
+ /**
+ * Search parameter: device
+ *
+ * Description: Accompanying device
+ * Type: reference
+ * Path: AdministrableProductDefinition.device
+ *
+ */
+ @SearchParamDefinition(name="device", path="AdministrableProductDefinition.device", description="Accompanying device", type="reference", target={DeviceDefinition.class } )
+ public static final String SP_DEVICE = "device";
+ /**
+ * Fluent Client search parameter constant for device
+ *
+ * Description: Accompanying device
+ * Type: reference
+ * Path: AdministrableProductDefinition.device
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam DEVICE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_DEVICE);
+
+/**
+ * Constant for fluent queries to be used to add include statements. Specifies
+ * the path value of "AdministrableProductDefinition:device".
+ */
+ public static final ca.uhn.fhir.model.api.Include INCLUDE_DEVICE = new ca.uhn.fhir.model.api.Include("AdministrableProductDefinition:device").toLocked();
+
/**
* Search parameter: dose-form
*
@@ -2208,6 +2234,58 @@ public class AdministrableProductDefinition extends DomainResource {
*/
public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
+ /**
+ * Search parameter: ingredient
+ *
+ * Description: The ingredients of this administrable pharmaceutical product
+ * Type: reference
+ * Path: AdministrableProductDefinition.ingredient
+ *
+ */
+ @SearchParamDefinition(name="ingredient", path="AdministrableProductDefinition.ingredient", description="The ingredients of this administrable pharmaceutical product", type="reference", target={Ingredient.class } )
+ public static final String SP_INGREDIENT = "ingredient";
+ /**
+ * Fluent Client search parameter constant for ingredient
+ *
+ * Description: The ingredients of this administrable pharmaceutical product
+ * Type: reference
+ * Path: AdministrableProductDefinition.ingredient
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam INGREDIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_INGREDIENT);
+
+/**
+ * Constant for fluent queries to be used to add include statements. Specifies
+ * the path value of "AdministrableProductDefinition:ingredient".
+ */
+ public static final ca.uhn.fhir.model.api.Include INCLUDE_INGREDIENT = new ca.uhn.fhir.model.api.Include("AdministrableProductDefinition:ingredient").toLocked();
+
+ /**
+ * Search parameter: manufactured-item
+ *
+ * Description: The manufactured item(s) that this administrable product is produced from. Either a single item, or several that are mixed before administration (e.g. a power item and a solution item). Note that these are not raw ingredients
+ * Type: reference
+ * Path: AdministrableProductDefinition.producedFrom
+ *
+ */
+ @SearchParamDefinition(name="manufactured-item", path="AdministrableProductDefinition.producedFrom", description="The manufactured item(s) that this administrable product is produced from. Either a single item, or several that are mixed before administration (e.g. a power item and a solution item). Note that these are not raw ingredients", type="reference", target={ManufacturedItemDefinition.class } )
+ public static final String SP_MANUFACTURED_ITEM = "manufactured-item";
+ /**
+ * Fluent Client search parameter constant for manufactured-item
+ *
+ * Description: The manufactured item(s) that this administrable product is produced from. Either a single item, or several that are mixed before administration (e.g. a power item and a solution item). Note that these are not raw ingredients
+ * Type: reference
+ * Path: AdministrableProductDefinition.producedFrom
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam MANUFACTURED_ITEM = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_MANUFACTURED_ITEM);
+
+/**
+ * Constant for fluent queries to be used to add include statements. Specifies
+ * the path value of "AdministrableProductDefinition:manufactured-item".
+ */
+ public static final ca.uhn.fhir.model.api.Include INCLUDE_MANUFACTURED_ITEM = new ca.uhn.fhir.model.api.Include("AdministrableProductDefinition:manufactured-item").toLocked();
+
/**
* Search parameter: route
*
@@ -2275,4 +2353,5 @@ public class AdministrableProductDefinition extends DomainResource {
public static final ca.uhn.fhir.rest.gclient.TokenClientParam TARGET_SPECIES = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TARGET_SPECIES);
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AdverseEvent.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AdverseEvent.java
index 6dce51142..6da0ea84d 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AdverseEvent.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AdverseEvent.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,20 +29,23 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.utilities.Utilities;
+import org.hl7.fhir.r5.model.Enumerations.*;
import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* An event (i.e. any change to current patient status) that may be related to unintended effects on a patient or research subject. The unintended effects may require additional monitoring, treatment or hospitalization or may result in death. The AdverseEvent resource also extends to potential or avoided events that could have had such effects.
@@ -3713,4 +3714,5 @@ public class AdverseEvent extends DomainResource {
public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBSTANCE = new ca.uhn.fhir.model.api.Include("AdverseEvent:substance").toLocked();
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Age.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Age.java
index 2075a6673..5538edbb2 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Age.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Age.java
@@ -1,11 +1,48 @@
package org.hl7.fhir.r5.model;
+/*
+ Copyright (c) 2011+, HL7, Inc.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modification, \
+ are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this \
+ list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, \
+ this list of conditions and the following disclaimer in the documentation \
+ and/or other materials provided with the distribution.
+ * Neither the name of HL7 nor the names of its contributors may be used to
+ endorse or promote products derived from this software without specific
+ prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND \
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED \
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. \
+ IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, \
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT \
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR \
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, \
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) \
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE \
+ POSSIBILITY OF SUCH DAMAGE.
+ */
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseDatatypeElement;
+import org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.instance.model.api.ICompositeType;
-
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* Base StructureDefinition for Age Type: A duration of time during which an organism (or a process) has existed.
@@ -42,4 +79,5 @@ public class Age extends Quantity implements ICompositeType {
}
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AllergyIntolerance.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AllergyIntolerance.java
index 2a305dd6d..411c16f99 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AllergyIntolerance.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AllergyIntolerance.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,21 +29,23 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* Risk of harmful or undesirable, physiological response which is unique to an individual and associated with exposure to a substance.
@@ -2614,7 +2614,7 @@ public class AllergyIntolerance extends DomainResource {
* [DeviceRequest](devicerequest.html): Business identifier for request/order
* [DiagnosticReport](diagnosticreport.html): An identifier for the report
* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents
-* [DocumentReference](documentreference.html): Master Version Specific Identifier
+* [DocumentReference](documentreference.html): Identifier of the attachment binary
* [Encounter](encounter.html): Identifier(s) by which this encounter is known
* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare
* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier
@@ -2636,10 +2636,10 @@ public class AllergyIntolerance extends DomainResource {
* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier
* Type: token
- * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.masterIdentifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
+ * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
*
*/
- @SearchParamDefinition(name="identifier", path="AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.masterIdentifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier", description="Multiple Resources: \r\n\r\n* [AllergyIntolerance](allergyintolerance.html): External ids for this item\r\n* [CarePlan](careplan.html): External Ids for this plan\r\n* [CareTeam](careteam.html): External Ids for this team\r\n* [Composition](composition.html): Version-independent identifier for the Composition\r\n* [Condition](condition.html): A unique identifier of the condition record\r\n* [Consent](consent.html): Identifier for this record (external references)\r\n* [DetectedIssue](detectedissue.html): Unique id for the detected issue\r\n* [DeviceRequest](devicerequest.html): Business identifier for request/order\r\n* [DiagnosticReport](diagnosticreport.html): An identifier for the report\r\n* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents\r\n* [DocumentReference](documentreference.html): Master Version Specific Identifier\r\n* [Encounter](encounter.html): Identifier(s) by which this encounter is known\r\n* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare\r\n* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier\r\n* [Goal](goal.html): External Ids for this goal\r\n* [ImagingStudy](imagingstudy.html): Identifiers for the Study, such as DICOM Study Instance UID and Accession number\r\n* [Immunization](immunization.html): Business identifier\r\n* [List](list.html): Business identifier\r\n* [MedicationAdministration](medicationadministration.html): Return administrations with this external identifier\r\n* [MedicationDispense](medicationdispense.html): Returns dispenses with this external identifier\r\n* [MedicationRequest](medicationrequest.html): Return prescriptions with this external identifier\r\n* [MedicationUsage](medicationusage.html): Return statements with this external identifier\r\n* [NutritionOrder](nutritionorder.html): Return nutrition orders with this external identifier\r\n* [Observation](observation.html): The unique id for a particular observation\r\n* [Procedure](procedure.html): A unique identifier for a procedure\r\n* [RiskAssessment](riskassessment.html): Unique identifier for the assessment\r\n* [ServiceRequest](servicerequest.html): Identifiers assigned to this order\r\n* [SupplyDelivery](supplydelivery.html): External identifier\r\n* [SupplyRequest](supplyrequest.html): Business Identifier for SupplyRequest\r\n* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier\r\n", type="token" )
+ @SearchParamDefinition(name="identifier", path="AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier", description="Multiple Resources: \r\n\r\n* [AllergyIntolerance](allergyintolerance.html): External ids for this item\r\n* [CarePlan](careplan.html): External Ids for this plan\r\n* [CareTeam](careteam.html): External Ids for this team\r\n* [Composition](composition.html): Version-independent identifier for the Composition\r\n* [Condition](condition.html): A unique identifier of the condition record\r\n* [Consent](consent.html): Identifier for this record (external references)\r\n* [DetectedIssue](detectedissue.html): Unique id for the detected issue\r\n* [DeviceRequest](devicerequest.html): Business identifier for request/order\r\n* [DiagnosticReport](diagnosticreport.html): An identifier for the report\r\n* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents\r\n* [DocumentReference](documentreference.html): Identifier of the attachment binary\r\n* [Encounter](encounter.html): Identifier(s) by which this encounter is known\r\n* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare\r\n* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier\r\n* [Goal](goal.html): External Ids for this goal\r\n* [ImagingStudy](imagingstudy.html): Identifiers for the Study, such as DICOM Study Instance UID and Accession number\r\n* [Immunization](immunization.html): Business identifier\r\n* [List](list.html): Business identifier\r\n* [MedicationAdministration](medicationadministration.html): Return administrations with this external identifier\r\n* [MedicationDispense](medicationdispense.html): Returns dispenses with this external identifier\r\n* [MedicationRequest](medicationrequest.html): Return prescriptions with this external identifier\r\n* [MedicationUsage](medicationusage.html): Return statements with this external identifier\r\n* [NutritionOrder](nutritionorder.html): Return nutrition orders with this external identifier\r\n* [Observation](observation.html): The unique id for a particular observation\r\n* [Procedure](procedure.html): A unique identifier for a procedure\r\n* [RiskAssessment](riskassessment.html): Unique identifier for the assessment\r\n* [ServiceRequest](servicerequest.html): Identifiers assigned to this order\r\n* [SupplyDelivery](supplydelivery.html): External identifier\r\n* [SupplyRequest](supplyrequest.html): Business Identifier for SupplyRequest\r\n* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier\r\n", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
* Fluent Client search parameter constant for identifier
@@ -2656,7 +2656,7 @@ public class AllergyIntolerance extends DomainResource {
* [DeviceRequest](devicerequest.html): Business identifier for request/order
* [DiagnosticReport](diagnosticreport.html): An identifier for the report
* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents
-* [DocumentReference](documentreference.html): Master Version Specific Identifier
+* [DocumentReference](documentreference.html): Identifier of the attachment binary
* [Encounter](encounter.html): Identifier(s) by which this encounter is known
* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare
* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier
@@ -2678,7 +2678,7 @@ public class AllergyIntolerance extends DomainResource {
* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier
* Type: token
- * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.masterIdentifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
+ * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
*
*/
public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
@@ -2814,4 +2814,5 @@ public class AllergyIntolerance extends DomainResource {
public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE);
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Annotation.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Annotation.java
index 6f13f1446..8ca5873ba 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Annotation.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Annotation.java
@@ -1,17 +1,48 @@
package org.hl7.fhir.r5.model;
+/*
+ Copyright (c) 2011+, HL7, Inc.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modification, \
+ are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this \
+ list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, \
+ this list of conditions and the following disclaimer in the documentation \
+ and/or other materials provided with the distribution.
+ * Neither the name of HL7 nor the names of its contributors may be used to
+ endorse or promote products derived from this software without specific
+ prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND \
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED \
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. \
+ IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, \
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT \
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR \
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, \
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) \
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE \
+ POSSIBILITY OF SUCH DAMAGE.
+ */
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseDatatypeElement;
import org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.instance.model.api.ICompositeType;
-
import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* Base StructureDefinition for Annotation Type: A text note which also contains information about who made the statement and when.
@@ -355,4 +386,5 @@ public class Annotation extends DataType implements ICompositeType {
}
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Appointment.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Appointment.java
index 1afd5f400..e2f3252eb 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Appointment.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Appointment.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,23 +29,23 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
-import org.hl7.fhir.r5.model.Enumerations.ParticipationStatus;
-import org.hl7.fhir.r5.model.Enumerations.ParticipationStatusEnumFactory;
import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* A booking of a healthcare event among patient(s), practitioner(s), related person(s) and/or device(s) for a specific date/time. This may result in one or more Encounter(s).
@@ -2825,7 +2823,7 @@ The duration (usually in minutes) could also be provided to indicate the length
* Path: Appointment.supportingInformation
*
*/
- @SearchParamDefinition(name="supporting-info", path="Appointment.supportingInformation", description="Additional information to support the appointment", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceFocus.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
+ @SearchParamDefinition(name="supporting-info", path="Appointment.supportingInformation", description="Additional information to support the appointment", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
public static final String SP_SUPPORTING_INFO = "supporting-info";
/**
* Fluent Client search parameter constant for supporting-info
@@ -2844,4 +2842,5 @@ The duration (usually in minutes) could also be provided to indicate the length
public static final ca.uhn.fhir.model.api.Include INCLUDE_SUPPORTING_INFO = new ca.uhn.fhir.model.api.Include("Appointment:supporting-info").toLocked();
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AppointmentResponse.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AppointmentResponse.java
index 3f85178c1..066931b47 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AppointmentResponse.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AppointmentResponse.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,21 +29,23 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.r5.model.Enumerations.ParticipationStatus;
-import org.hl7.fhir.r5.model.Enumerations.ParticipationStatusEnumFactory;
import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* A reply to an appointment request for a patient and/or practitioner(s), such as a confirmation or rejection.
@@ -880,4 +880,5 @@ public class AppointmentResponse extends DomainResource {
public static final ca.uhn.fhir.model.api.Include INCLUDE_PRACTITIONER = new ca.uhn.fhir.model.api.Include("AppointmentResponse:practitioner").toLocked();
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Attachment.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Attachment.java
index 2d995fc57..0d871780c 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Attachment.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Attachment.java
@@ -1,19 +1,50 @@
package org.hl7.fhir.r5.model;
+/*
+ Copyright (c) 2011+, HL7, Inc.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modification, \
+ are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this \
+ list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, \
+ this list of conditions and the following disclaimer in the documentation \
+ and/or other materials provided with the distribution.
+ * Neither the name of HL7 nor the names of its contributors may be used to
+ endorse or promote products derived from this software without specific
+ prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND \
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED \
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. \
+ IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, \
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT \
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR \
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, \
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) \
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE \
+ POSSIBILITY OF SUCH DAMAGE.
+ */
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
-import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
+import java.math.*;
+import org.hl7.fhir.utilities.Utilities;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseDatatypeElement;
import org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.instance.model.api.ICompositeType;
-import org.hl7.fhir.utilities.Utilities;
-
import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* Base StructureDefinition for Attachment Type: For referring to data content defined in other formats.
@@ -1050,4 +1081,5 @@ public class Attachment extends DataType implements ICompositeType {
}
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AuditEvent.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AuditEvent.java
index 04ab65382..74bb589b0 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AuditEvent.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AuditEvent.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,21 +29,23 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* A record of an event relevant for purposes such as operations, privacy, security, maintenance, and performance analysis.
@@ -373,21 +373,21 @@ public class AuditEvent extends DomainResource {
public static AuditEventSeverity fromCode(String codeString) throws FHIRException {
if (codeString == null || "".equals(codeString))
return null;
- if ("Emergency".equals(codeString))
+ if ("emergency".equals(codeString))
return EMERGENCY;
- if ("Alert".equals(codeString))
+ if ("alert".equals(codeString))
return ALERT;
- if ("Critical".equals(codeString))
+ if ("critical".equals(codeString))
return CRITICAL;
- if ("Error".equals(codeString))
+ if ("error".equals(codeString))
return ERROR;
- if ("Warning".equals(codeString))
+ if ("warning".equals(codeString))
return WARNING;
- if ("Notice".equals(codeString))
+ if ("notice".equals(codeString))
return NOTICE;
- if ("Informational".equals(codeString))
+ if ("informational".equals(codeString))
return INFORMATIONAL;
- if ("Debug".equals(codeString))
+ if ("debug".equals(codeString))
return DEBUG;
if (Configuration.isAcceptInvalidEnums())
return null;
@@ -396,14 +396,14 @@ public class AuditEvent extends DomainResource {
}
public String toCode() {
switch (this) {
- case EMERGENCY: return "Emergency";
- case ALERT: return "Alert";
- case CRITICAL: return "Critical";
- case ERROR: return "Error";
- case WARNING: return "Warning";
- case NOTICE: return "Notice";
- case INFORMATIONAL: return "Informational";
- case DEBUG: return "Debug";
+ case EMERGENCY: return "emergency";
+ case ALERT: return "alert";
+ case CRITICAL: return "critical";
+ case ERROR: return "error";
+ case WARNING: return "warning";
+ case NOTICE: return "notice";
+ case INFORMATIONAL: return "informational";
+ case DEBUG: return "debug";
default: return "?";
}
}
@@ -453,21 +453,21 @@ public class AuditEvent extends DomainResource {
if (codeString == null || "".equals(codeString))
if (codeString == null || "".equals(codeString))
return null;
- if ("Emergency".equals(codeString))
+ if ("emergency".equals(codeString))
return AuditEventSeverity.EMERGENCY;
- if ("Alert".equals(codeString))
+ if ("alert".equals(codeString))
return AuditEventSeverity.ALERT;
- if ("Critical".equals(codeString))
+ if ("critical".equals(codeString))
return AuditEventSeverity.CRITICAL;
- if ("Error".equals(codeString))
+ if ("error".equals(codeString))
return AuditEventSeverity.ERROR;
- if ("Warning".equals(codeString))
+ if ("warning".equals(codeString))
return AuditEventSeverity.WARNING;
- if ("Notice".equals(codeString))
+ if ("notice".equals(codeString))
return AuditEventSeverity.NOTICE;
- if ("Informational".equals(codeString))
+ if ("informational".equals(codeString))
return AuditEventSeverity.INFORMATIONAL;
- if ("Debug".equals(codeString))
+ if ("debug".equals(codeString))
return AuditEventSeverity.DEBUG;
throw new IllegalArgumentException("Unknown AuditEventSeverity code '"+codeString+"'");
}
@@ -479,41 +479,41 @@ public class AuditEvent extends DomainResource {
String codeString = ((PrimitiveType) code).asStringValue();
if (codeString == null || "".equals(codeString))
return null;
- if ("Emergency".equals(codeString))
+ if ("emergency".equals(codeString))
return new Enumeration(this, AuditEventSeverity.EMERGENCY);
- if ("Alert".equals(codeString))
+ if ("alert".equals(codeString))
return new Enumeration(this, AuditEventSeverity.ALERT);
- if ("Critical".equals(codeString))
+ if ("critical".equals(codeString))
return new Enumeration(this, AuditEventSeverity.CRITICAL);
- if ("Error".equals(codeString))
+ if ("error".equals(codeString))
return new Enumeration(this, AuditEventSeverity.ERROR);
- if ("Warning".equals(codeString))
+ if ("warning".equals(codeString))
return new Enumeration(this, AuditEventSeverity.WARNING);
- if ("Notice".equals(codeString))
+ if ("notice".equals(codeString))
return new Enumeration(this, AuditEventSeverity.NOTICE);
- if ("Informational".equals(codeString))
+ if ("informational".equals(codeString))
return new Enumeration(this, AuditEventSeverity.INFORMATIONAL);
- if ("Debug".equals(codeString))
+ if ("debug".equals(codeString))
return new Enumeration(this, AuditEventSeverity.DEBUG);
throw new FHIRException("Unknown AuditEventSeverity code '"+codeString+"'");
}
public String toCode(AuditEventSeverity code) {
if (code == AuditEventSeverity.EMERGENCY)
- return "Emergency";
+ return "emergency";
if (code == AuditEventSeverity.ALERT)
- return "Alert";
+ return "alert";
if (code == AuditEventSeverity.CRITICAL)
- return "Critical";
+ return "critical";
if (code == AuditEventSeverity.ERROR)
- return "Error";
+ return "error";
if (code == AuditEventSeverity.WARNING)
- return "Warning";
+ return "warning";
if (code == AuditEventSeverity.NOTICE)
- return "Notice";
+ return "notice";
if (code == AuditEventSeverity.INFORMATIONAL)
- return "Informational";
+ return "informational";
if (code == AuditEventSeverity.DEBUG)
- return "Debug";
+ return "debug";
return "?";
}
public String toSystem(AuditEventSeverity code) {
@@ -586,7 +586,7 @@ public class AuditEvent extends DomainResource {
*/
@Child(name = "media", type = {Coding.class}, order=9, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="Type of media", formalDefinition="Type of media involved. Used when the event is about exporting/importing onto media." )
- @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/dicm-405-mediatype")
+ @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/audit-media-type")
protected Coding media;
/**
@@ -2780,7 +2780,7 @@ public class AuditEvent extends DomainResource {
* Indicates and enables segmentation of various severity including debugging from critical.
*/
@Child(name = "severity", type = {CodeType.class}, order=3, min=0, max=1, modifier=false, summary=true)
- @Description(shortDefinition="Emergency | Alert | Critical | Error | Warning | Notice | Informational | Debug", formalDefinition="Indicates and enables segmentation of various severity including debugging from critical." )
+ @Description(shortDefinition="emergency | alert | critical | error | warning | notice | informational | debug", formalDefinition="Indicates and enables segmentation of various severity including debugging from critical." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/audit-event-severity")
protected Enumeration severity;
@@ -3809,7 +3809,7 @@ public class AuditEvent extends DomainResource {
* Path: AuditEvent.entity.what
*
*/
- @SearchParamDefinition(name="entity", path="AuditEvent.entity.what", description="Specific instance of resource", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceFocus.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
+ @SearchParamDefinition(name="entity", path="AuditEvent.entity.what", description="Specific instance of resource", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
public static final String SP_ENTITY = "entity";
/**
* Fluent Client search parameter constant for entity
@@ -4000,4 +4000,5 @@ public class AuditEvent extends DomainResource {
public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE);
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BackboneElement.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BackboneElement.java
index 7dd11ef42..ce595f524 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BackboneElement.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BackboneElement.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,17 +29,21 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
-
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseDatatypeElement;
import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
-
import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* Base StructureDefinition for BackboneElement Type: Base definition for all elements that are defined inside a resource - but not those in a data type.
@@ -233,7 +235,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or
}
// Manual code (from Configuration.txt)t:
-
public void checkNoModifiers(String noun, String verb) throws FHIRException {
if (hasModifierExtension()) {
throw new FHIRException("Found unknown Modifier Exceptions on "+noun+" doing "+verb);
@@ -305,4 +306,5 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or
// end addition
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BackboneType.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BackboneType.java
index 121bc8e8b..3eaecbd25 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BackboneType.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BackboneType.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,17 +29,21 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
-
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseDatatypeElement;
import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
-
import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* Base StructureDefinition for BackboneType Type: Base definition for the few data types that are allowed to carry modifier extensions.
@@ -233,14 +235,13 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or
}
// Manual code (from Configuration.txt)t:
-
- public void checkNoModifiers(String noun, String verb) throws FHIRException {
+public void checkNoModifiers(String noun, String verb) throws FHIRException {
if (hasModifierExtension()) {
throw new FHIRException("Found unknown Modifier Exceptions on "+noun+" doing "+verb);
}
}
-
// end addition
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Base64BinaryType.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Base64BinaryType.java
index 9b9c45a73..2cb1437f4 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Base64BinaryType.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Base64BinaryType.java
@@ -1,14 +1,5 @@
package org.hl7.fhir.r5.model;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import org.apache.commons.codec.binary.Base64;
-import org.hl7.fhir.instance.model.api.IBaseHasExtensions;
-import org.hl7.fhir.instance.model.api.IPrimitiveType;
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -43,6 +34,14 @@ import org.hl7.fhir.instance.model.api.IPrimitiveType;
import ca.uhn.fhir.model.api.IElement;
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
import ca.uhn.fhir.parser.DataFormatException;
+import org.apache.commons.codec.binary.Base64;
+import org.hl7.fhir.instance.model.api.IBaseHasExtensions;
+import org.hl7.fhir.instance.model.api.IPrimitiveType;
+
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
/**
* Primitive type "base64Binary" in FHIR: a sequence of bytes represented in base64
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BaseDateTimeType.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BaseDateTimeType.java
index 394566708..b31dd14f3 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BaseDateTimeType.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BaseDateTimeType.java
@@ -1,18 +1,5 @@
package org.hl7.fhir.r5.model;
-import static org.apache.commons.lang3.StringUtils.isBlank;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.TimeZone;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.Validate;
-import org.apache.commons.lang3.time.DateUtils;
-import org.apache.commons.lang3.time.FastDateFormat;
-import org.hl7.fhir.utilities.DateTimeUtil;
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -45,6 +32,18 @@ import org.hl7.fhir.utilities.DateTimeUtil;
import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
import ca.uhn.fhir.parser.DataFormatException;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Validate;
+import org.apache.commons.lang3.time.DateUtils;
+import org.apache.commons.lang3.time.FastDateFormat;
+import org.hl7.fhir.utilities.DateTimeUtil;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.TimeZone;
+
+import static org.apache.commons.lang3.StringUtils.isBlank;
public abstract class BaseDateTimeType extends PrimitiveType {
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Basic.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Basic.java
index ca42754f5..5a16fbb5c 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Basic.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Basic.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,18 +29,22 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
import org.hl7.fhir.exceptions.FHIRException;
-
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* Basic is used for handling concepts not yet defined in FHIR, narrative-only resources that don't map to an existing resource, and custom resources not appropriate for inclusion in the FHIR specification.
@@ -581,7 +583,7 @@ public class Basic extends DomainResource {
* Path: Basic.subject
*
*/
- @SearchParamDefinition(name="subject", path="Basic.subject", description="Identifies the focus of this resource", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceFocus.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
+ @SearchParamDefinition(name="subject", path="Basic.subject", description="Identifies the focus of this resource", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
public static final String SP_SUBJECT = "subject";
/**
* Fluent Client search parameter constant for subject
@@ -600,4 +602,5 @@ public class Basic extends DomainResource {
public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("Basic:subject").toLocked();
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Binary.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Binary.java
index 4db50142f..fc1cf5de3 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Binary.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Binary.java
@@ -1,16 +1,53 @@
package org.hl7.fhir.r5.model;
+/*
+ Copyright (c) 2011+, HL7, Inc.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modification, \
+ are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this \
+ list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, \
+ this list of conditions and the following disclaimer in the documentation \
+ and/or other materials provided with the distribution.
+ * Neither the name of HL7 nor the names of its contributors may be used to
+ endorse or promote products derived from this software without specific
+ prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND \
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED \
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. \
+ IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, \
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT \
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR \
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, \
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) \
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE \
+ POSSIBILITY OF SUCH DAMAGE.
+ */
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
-
+import org.hl7.fhir.utilities.Utilities;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBinary;
-
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+
+import org.hl7.fhir.instance.model.api.IBaseBinary;
/**
* A resource that represents the data of a single raw artifact as digital content accessible in its native format. A Binary resource can contain any content, whether text, image, pdf, zip archive, etc.
*/
@@ -325,8 +362,7 @@ public class Binary extends BaseBinary implements IBaseBinary {
}
// Manual code (from Configuration.txt)t:
-
- @Override
+@Override
public byte[] getContent() {
return getData();
}
@@ -340,9 +376,7 @@ public class Binary extends BaseBinary implements IBaseBinary {
public Base64BinaryType getContentElement() {
return getDataElement();
}
-
-
-
// end addition
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BiologicallyDerivedProduct.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BiologicallyDerivedProduct.java
index 60ce396d1..a82ba3aef 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BiologicallyDerivedProduct.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BiologicallyDerivedProduct.java
@@ -1,10 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
-import java.math.BigDecimal;
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -33,19 +29,24 @@ import java.math.BigDecimal;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import java.math.*;
import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* A material substance originating from a biological entity intended to be transplanted or infused
@@ -196,11 +197,11 @@ public class BiologicallyDerivedProduct extends DomainResource {
public enum BiologicallyDerivedProductStatus {
/**
- *
+ * Product is currently available for use.
*/
AVAILABLE,
/**
- *
+ * Product is not currently available for use.
*/
UNAVAILABLE,
/**
@@ -235,8 +236,8 @@ public class BiologicallyDerivedProduct extends DomainResource {
}
public String getDefinition() {
switch (this) {
- case AVAILABLE: return "";
- case UNAVAILABLE: return "";
+ case AVAILABLE: return "Product is currently available for use.";
+ case UNAVAILABLE: return "Product is not currently available for use.";
default: return "?";
}
}
@@ -2544,4 +2545,5 @@ public class BiologicallyDerivedProduct extends DomainResource {
}
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BodyStructure.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BodyStructure.java
index a02ed9541..c502111c1 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BodyStructure.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BodyStructure.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,18 +29,23 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* Record details about an anatomical structure. This resource may be used when a coded concept does not provide the necessary detail needed for the use case.
@@ -774,4 +777,5 @@ public class BodyStructure extends DomainResource {
public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("BodyStructure:patient").toLocked();
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Bundle.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Bundle.java
index 7c62b8b84..368f8fd08 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Bundle.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Bundle.java
@@ -1,10 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
-import java.math.BigDecimal;
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -33,22 +29,26 @@ import java.math.BigDecimal;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
-import org.hl7.fhir.instance.model.api.IBaseBundle;
+import java.math.*;
import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+
+import org.hl7.fhir.instance.model.api.IBaseBundle;
/**
* A container for a collection of resources.
*/
@@ -1236,7 +1236,7 @@ public class Bundle extends Resource implements IBaseBundle {
}
// added from java-adornments.txt:
- /**
+/**
* Returns the {@link #getLink() link} which matches a given {@link BundleLinkComponent#getRelation() relation}.
* If no link is found which matches the given relation, returns null
. If more than one
* link is found which matches the given relation, returns the first matching BundleLinkComponent.
@@ -1282,9 +1282,7 @@ public class Bundle extends Resource implements IBaseBundle {
retVal.setRelation(theRelation);
getLink().add(retVal);
return retVal;
- }
-
-
+ }
// end addition
}
@@ -3224,7 +3222,7 @@ public class Bundle extends Resource implements IBaseBundle {
public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE);
// Manual code (from Configuration.txt)t:
- /**
+/**
* Returns the {@link #getLink() link} which matches a given {@link BundleLinkComponent#getRelation() relation}.
* If no link is found which matches the given relation, returns null
. If more than one
* link is found which matches the given relation, returns the first matching BundleLinkComponent.
@@ -3270,9 +3268,8 @@ public class Bundle extends Resource implements IBaseBundle {
retVal.setRelation(theRelation);
getLink().add(retVal);
return retVal;
- }
-
-
+ }
// end addition
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CanonicalResource.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CanonicalResource.java
index 8e6389908..f01f05a4e 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CanonicalResource.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CanonicalResource.java
@@ -1,13 +1,51 @@
package org.hl7.fhir.r5.model;
+/*
+ Copyright (c) 2011+, HL7, Inc.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modification, \
+ are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this \
+ list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, \
+ this list of conditions and the following disclaimer in the documentation \
+ and/or other materials provided with the distribution.
+ * Neither the name of HL7 nor the names of its contributors may be used to
+ endorse or promote products derived from this software without specific
+ prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND \
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED \
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. \
+ IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, \
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT \
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR \
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, \
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) \
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE \
+ POSSIBILITY OF SUCH DAMAGE.
+ */
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
+import org.hl7.fhir.utilities.Utilities;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.r5.model.Enumerations.PublicationStatus;
+import org.hl7.fhir.instance.model.api.ICompositeType;
+import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* Common Ancestor declaration for conformance and knowledge artifact resources.
@@ -495,7 +533,7 @@ public abstract class CanonicalResource extends DomainResource {
}
// Manual code (from Configuration.txt)t:
- @Override
+ @Override
public String toString() {
return fhirType()+"["+getUrl()+"]";
}
@@ -506,12 +544,12 @@ public abstract class CanonicalResource extends DomainResource {
if (hasName())
return getName();
return toString();
- }
-
- public String getVUrl() {
- return getUrl() + (hasVersion() ? "|"+getVersion() : "");
}
-
+
+ public String getVUrl() {
+ return getUrl() + (hasVersion() ? "|"+getVersion() : "");
+ }
// end addition
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CapabilityStatement.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CapabilityStatement.java
index 43a77fded..e482dcc42 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CapabilityStatement.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CapabilityStatement.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,32 +29,25 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
-import org.hl7.fhir.instance.model.api.IBaseConformance;
-import org.hl7.fhir.r5.model.Enumerations.CapabilityStatementKind;
-import org.hl7.fhir.r5.model.Enumerations.CapabilityStatementKindEnumFactory;
-import org.hl7.fhir.r5.model.Enumerations.FHIRVersion;
-import org.hl7.fhir.r5.model.Enumerations.FHIRVersionEnumFactory;
-import org.hl7.fhir.r5.model.Enumerations.PublicationStatus;
-import org.hl7.fhir.r5.model.Enumerations.PublicationStatusEnumFactory;
-import org.hl7.fhir.r5.model.Enumerations.RestfulCapabilityMode;
-import org.hl7.fhir.r5.model.Enumerations.RestfulCapabilityModeEnumFactory;
-import org.hl7.fhir.r5.model.Enumerations.SearchParamType;
-import org.hl7.fhir.r5.model.Enumerations.SearchParamTypeEnumFactory;
import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+
+import org.hl7.fhir.instance.model.api.IBaseConformance;
/**
* A Capability Statement documents a set of capabilities (behaviors) of a FHIR Server for a particular version of FHIR that may be used as a statement of actual server functionality or a statement of required or desired server implementation.
*/
@@ -9553,4 +9544,5 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
// end addition
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CapabilityStatement2.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CapabilityStatement2.java
index ac3279694..1428d698d 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CapabilityStatement2.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CapabilityStatement2.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,31 +29,23 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
-import org.hl7.fhir.r5.model.Enumerations.CapabilityStatementKind;
-import org.hl7.fhir.r5.model.Enumerations.CapabilityStatementKindEnumFactory;
-import org.hl7.fhir.r5.model.Enumerations.FHIRVersion;
-import org.hl7.fhir.r5.model.Enumerations.FHIRVersionEnumFactory;
-import org.hl7.fhir.r5.model.Enumerations.PublicationStatus;
-import org.hl7.fhir.r5.model.Enumerations.PublicationStatusEnumFactory;
-import org.hl7.fhir.r5.model.Enumerations.RestfulCapabilityMode;
-import org.hl7.fhir.r5.model.Enumerations.RestfulCapabilityModeEnumFactory;
-import org.hl7.fhir.r5.model.Enumerations.SearchParamType;
-import org.hl7.fhir.r5.model.Enumerations.SearchParamTypeEnumFactory;
import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* A Capability Statement documents a set of capabilities (behaviors) of a FHIR Server for a particular version of FHIR that may be used as a statement of actual server functionality or a statement of required or desired server implementation.
@@ -5929,4 +5919,5 @@ public class CapabilityStatement2 extends CanonicalResource {
public static final ca.uhn.fhir.rest.gclient.TokenClientParam VERSION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_VERSION);
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CarePlan.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CarePlan.java
index fa263e71c..bae17f04c 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CarePlan.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CarePlan.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,23 +29,23 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
-import org.hl7.fhir.r5.model.Enumerations.RequestStatus;
-import org.hl7.fhir.r5.model.Enumerations.RequestStatusEnumFactory;
import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* Describes the intention of how one or more practitioners intend to deliver care for a particular patient, group or community for a period of time, possibly limited to care for a specific condition or set of conditions.
@@ -4535,7 +4533,7 @@ public class CarePlan extends DomainResource {
* [DeviceRequest](devicerequest.html): Business identifier for request/order
* [DiagnosticReport](diagnosticreport.html): An identifier for the report
* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents
-* [DocumentReference](documentreference.html): Master Version Specific Identifier
+* [DocumentReference](documentreference.html): Identifier of the attachment binary
* [Encounter](encounter.html): Identifier(s) by which this encounter is known
* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare
* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier
@@ -4557,10 +4555,10 @@ public class CarePlan extends DomainResource {
* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier
* Type: token
- * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.masterIdentifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
+ * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
*
*/
- @SearchParamDefinition(name="identifier", path="AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.masterIdentifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier", description="Multiple Resources: \r\n\r\n* [AllergyIntolerance](allergyintolerance.html): External ids for this item\r\n* [CarePlan](careplan.html): External Ids for this plan\r\n* [CareTeam](careteam.html): External Ids for this team\r\n* [Composition](composition.html): Version-independent identifier for the Composition\r\n* [Condition](condition.html): A unique identifier of the condition record\r\n* [Consent](consent.html): Identifier for this record (external references)\r\n* [DetectedIssue](detectedissue.html): Unique id for the detected issue\r\n* [DeviceRequest](devicerequest.html): Business identifier for request/order\r\n* [DiagnosticReport](diagnosticreport.html): An identifier for the report\r\n* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents\r\n* [DocumentReference](documentreference.html): Master Version Specific Identifier\r\n* [Encounter](encounter.html): Identifier(s) by which this encounter is known\r\n* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare\r\n* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier\r\n* [Goal](goal.html): External Ids for this goal\r\n* [ImagingStudy](imagingstudy.html): Identifiers for the Study, such as DICOM Study Instance UID and Accession number\r\n* [Immunization](immunization.html): Business identifier\r\n* [List](list.html): Business identifier\r\n* [MedicationAdministration](medicationadministration.html): Return administrations with this external identifier\r\n* [MedicationDispense](medicationdispense.html): Returns dispenses with this external identifier\r\n* [MedicationRequest](medicationrequest.html): Return prescriptions with this external identifier\r\n* [MedicationUsage](medicationusage.html): Return statements with this external identifier\r\n* [NutritionOrder](nutritionorder.html): Return nutrition orders with this external identifier\r\n* [Observation](observation.html): The unique id for a particular observation\r\n* [Procedure](procedure.html): A unique identifier for a procedure\r\n* [RiskAssessment](riskassessment.html): Unique identifier for the assessment\r\n* [ServiceRequest](servicerequest.html): Identifiers assigned to this order\r\n* [SupplyDelivery](supplydelivery.html): External identifier\r\n* [SupplyRequest](supplyrequest.html): Business Identifier for SupplyRequest\r\n* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier\r\n", type="token" )
+ @SearchParamDefinition(name="identifier", path="AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier", description="Multiple Resources: \r\n\r\n* [AllergyIntolerance](allergyintolerance.html): External ids for this item\r\n* [CarePlan](careplan.html): External Ids for this plan\r\n* [CareTeam](careteam.html): External Ids for this team\r\n* [Composition](composition.html): Version-independent identifier for the Composition\r\n* [Condition](condition.html): A unique identifier of the condition record\r\n* [Consent](consent.html): Identifier for this record (external references)\r\n* [DetectedIssue](detectedissue.html): Unique id for the detected issue\r\n* [DeviceRequest](devicerequest.html): Business identifier for request/order\r\n* [DiagnosticReport](diagnosticreport.html): An identifier for the report\r\n* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents\r\n* [DocumentReference](documentreference.html): Identifier of the attachment binary\r\n* [Encounter](encounter.html): Identifier(s) by which this encounter is known\r\n* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare\r\n* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier\r\n* [Goal](goal.html): External Ids for this goal\r\n* [ImagingStudy](imagingstudy.html): Identifiers for the Study, such as DICOM Study Instance UID and Accession number\r\n* [Immunization](immunization.html): Business identifier\r\n* [List](list.html): Business identifier\r\n* [MedicationAdministration](medicationadministration.html): Return administrations with this external identifier\r\n* [MedicationDispense](medicationdispense.html): Returns dispenses with this external identifier\r\n* [MedicationRequest](medicationrequest.html): Return prescriptions with this external identifier\r\n* [MedicationUsage](medicationusage.html): Return statements with this external identifier\r\n* [NutritionOrder](nutritionorder.html): Return nutrition orders with this external identifier\r\n* [Observation](observation.html): The unique id for a particular observation\r\n* [Procedure](procedure.html): A unique identifier for a procedure\r\n* [RiskAssessment](riskassessment.html): Unique identifier for the assessment\r\n* [ServiceRequest](servicerequest.html): Identifiers assigned to this order\r\n* [SupplyDelivery](supplydelivery.html): External identifier\r\n* [SupplyRequest](supplyrequest.html): Business Identifier for SupplyRequest\r\n* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier\r\n", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
* Fluent Client search parameter constant for identifier
@@ -4577,7 +4575,7 @@ public class CarePlan extends DomainResource {
* [DeviceRequest](devicerequest.html): Business identifier for request/order
* [DiagnosticReport](diagnosticreport.html): An identifier for the report
* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents
-* [DocumentReference](documentreference.html): Master Version Specific Identifier
+* [DocumentReference](documentreference.html): Identifier of the attachment binary
* [Encounter](encounter.html): Identifier(s) by which this encounter is known
* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare
* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier
@@ -4599,7 +4597,7 @@ public class CarePlan extends DomainResource {
* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier
* Type: token
- * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.masterIdentifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
+ * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
*
*/
public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
@@ -4699,4 +4697,5 @@ public class CarePlan extends DomainResource {
public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("CarePlan:patient").toLocked();
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CareTeam.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CareTeam.java
index 5362cf16f..f7c356633 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CareTeam.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CareTeam.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,20 +29,23 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* The Care Team includes all the people and organizations who plan to participate in the coordination and delivery of care.
@@ -1610,7 +1611,7 @@ public class CareTeam extends DomainResource {
* [DeviceRequest](devicerequest.html): Business identifier for request/order
* [DiagnosticReport](diagnosticreport.html): An identifier for the report
* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents
-* [DocumentReference](documentreference.html): Master Version Specific Identifier
+* [DocumentReference](documentreference.html): Identifier of the attachment binary
* [Encounter](encounter.html): Identifier(s) by which this encounter is known
* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare
* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier
@@ -1632,10 +1633,10 @@ public class CareTeam extends DomainResource {
* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier
* Type: token
- * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.masterIdentifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
+ * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
*
*/
- @SearchParamDefinition(name="identifier", path="AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.masterIdentifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier", description="Multiple Resources: \r\n\r\n* [AllergyIntolerance](allergyintolerance.html): External ids for this item\r\n* [CarePlan](careplan.html): External Ids for this plan\r\n* [CareTeam](careteam.html): External Ids for this team\r\n* [Composition](composition.html): Version-independent identifier for the Composition\r\n* [Condition](condition.html): A unique identifier of the condition record\r\n* [Consent](consent.html): Identifier for this record (external references)\r\n* [DetectedIssue](detectedissue.html): Unique id for the detected issue\r\n* [DeviceRequest](devicerequest.html): Business identifier for request/order\r\n* [DiagnosticReport](diagnosticreport.html): An identifier for the report\r\n* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents\r\n* [DocumentReference](documentreference.html): Master Version Specific Identifier\r\n* [Encounter](encounter.html): Identifier(s) by which this encounter is known\r\n* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare\r\n* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier\r\n* [Goal](goal.html): External Ids for this goal\r\n* [ImagingStudy](imagingstudy.html): Identifiers for the Study, such as DICOM Study Instance UID and Accession number\r\n* [Immunization](immunization.html): Business identifier\r\n* [List](list.html): Business identifier\r\n* [MedicationAdministration](medicationadministration.html): Return administrations with this external identifier\r\n* [MedicationDispense](medicationdispense.html): Returns dispenses with this external identifier\r\n* [MedicationRequest](medicationrequest.html): Return prescriptions with this external identifier\r\n* [MedicationUsage](medicationusage.html): Return statements with this external identifier\r\n* [NutritionOrder](nutritionorder.html): Return nutrition orders with this external identifier\r\n* [Observation](observation.html): The unique id for a particular observation\r\n* [Procedure](procedure.html): A unique identifier for a procedure\r\n* [RiskAssessment](riskassessment.html): Unique identifier for the assessment\r\n* [ServiceRequest](servicerequest.html): Identifiers assigned to this order\r\n* [SupplyDelivery](supplydelivery.html): External identifier\r\n* [SupplyRequest](supplyrequest.html): Business Identifier for SupplyRequest\r\n* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier\r\n", type="token" )
+ @SearchParamDefinition(name="identifier", path="AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier", description="Multiple Resources: \r\n\r\n* [AllergyIntolerance](allergyintolerance.html): External ids for this item\r\n* [CarePlan](careplan.html): External Ids for this plan\r\n* [CareTeam](careteam.html): External Ids for this team\r\n* [Composition](composition.html): Version-independent identifier for the Composition\r\n* [Condition](condition.html): A unique identifier of the condition record\r\n* [Consent](consent.html): Identifier for this record (external references)\r\n* [DetectedIssue](detectedissue.html): Unique id for the detected issue\r\n* [DeviceRequest](devicerequest.html): Business identifier for request/order\r\n* [DiagnosticReport](diagnosticreport.html): An identifier for the report\r\n* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents\r\n* [DocumentReference](documentreference.html): Identifier of the attachment binary\r\n* [Encounter](encounter.html): Identifier(s) by which this encounter is known\r\n* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare\r\n* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier\r\n* [Goal](goal.html): External Ids for this goal\r\n* [ImagingStudy](imagingstudy.html): Identifiers for the Study, such as DICOM Study Instance UID and Accession number\r\n* [Immunization](immunization.html): Business identifier\r\n* [List](list.html): Business identifier\r\n* [MedicationAdministration](medicationadministration.html): Return administrations with this external identifier\r\n* [MedicationDispense](medicationdispense.html): Returns dispenses with this external identifier\r\n* [MedicationRequest](medicationrequest.html): Return prescriptions with this external identifier\r\n* [MedicationUsage](medicationusage.html): Return statements with this external identifier\r\n* [NutritionOrder](nutritionorder.html): Return nutrition orders with this external identifier\r\n* [Observation](observation.html): The unique id for a particular observation\r\n* [Procedure](procedure.html): A unique identifier for a procedure\r\n* [RiskAssessment](riskassessment.html): Unique identifier for the assessment\r\n* [ServiceRequest](servicerequest.html): Identifiers assigned to this order\r\n* [SupplyDelivery](supplydelivery.html): External identifier\r\n* [SupplyRequest](supplyrequest.html): Business Identifier for SupplyRequest\r\n* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier\r\n", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
* Fluent Client search parameter constant for identifier
@@ -1652,7 +1653,7 @@ public class CareTeam extends DomainResource {
* [DeviceRequest](devicerequest.html): Business identifier for request/order
* [DiagnosticReport](diagnosticreport.html): An identifier for the report
* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents
-* [DocumentReference](documentreference.html): Master Version Specific Identifier
+* [DocumentReference](documentreference.html): Identifier of the attachment binary
* [Encounter](encounter.html): Identifier(s) by which this encounter is known
* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare
* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier
@@ -1674,7 +1675,7 @@ public class CareTeam extends DomainResource {
* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier
* Type: token
- * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.masterIdentifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
+ * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
*
*/
public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
@@ -1774,4 +1775,5 @@ public class CareTeam extends DomainResource {
public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("CareTeam:patient").toLocked();
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CatalogEntry.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CatalogEntry.java
index 2a1a09aaf..1b82a4ed0 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CatalogEntry.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CatalogEntry.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,20 +29,23 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* Catalog entries are wrappers that contextualize items included in a catalog.
@@ -2133,4 +2134,5 @@ public class CatalogEntry extends DomainResource {
public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE);
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ChargeItem.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ChargeItem.java
index 1b993130f..a79586842 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ChargeItem.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ChargeItem.java
@@ -1,10 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
-import java.math.BigDecimal;
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -33,21 +29,24 @@ import java.math.BigDecimal;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import java.math.*;
import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* The resource ChargeItem describes the provision of healthcare provider products for a certain patient, therefore referring not only to the product, but containing in addition details of the provision, like date, time, amounts and participating organizations and persons. Main Usage of the ChargeItem is to enable the billing process and internal cost allocation.
@@ -2743,4 +2742,5 @@ public class ChargeItem extends DomainResource {
public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("ChargeItem:subject").toLocked();
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ChargeItemDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ChargeItemDefinition.java
index 15a154d0d..de2917ce9 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ChargeItemDefinition.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ChargeItemDefinition.java
@@ -1,10 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
-import java.math.BigDecimal;
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -33,25 +29,24 @@ import java.math.BigDecimal;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
-import org.hl7.fhir.r5.model.Enumerations.InvoicePriceComponentType;
-import org.hl7.fhir.r5.model.Enumerations.InvoicePriceComponentTypeEnumFactory;
-import org.hl7.fhir.r5.model.Enumerations.PublicationStatus;
-import org.hl7.fhir.r5.model.Enumerations.PublicationStatusEnumFactory;
+import java.math.*;
import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* The ChargeItemDefinition resource provides the properties that apply to the (billing) codes necessary to calculate costs and prices. The properties may differ largely depending on type and realm, therefore this resource gives only a rough structure and requires profiling for each type of billing code system.
@@ -3188,4 +3183,5 @@ public class ChargeItemDefinition extends MetadataResource {
public static final ca.uhn.fhir.rest.gclient.TokenClientParam VERSION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_VERSION);
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Citation.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Citation.java
index fa222c953..54ca2a99f 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Citation.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Citation.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,23 +29,23 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
-import org.hl7.fhir.r5.model.Enumerations.PublicationStatus;
-import org.hl7.fhir.r5.model.Enumerations.PublicationStatusEnumFactory;
import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* The Citation.
@@ -55,6 +53,236 @@ import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
@ResourceDef(name="Citation", profile="http://hl7.org/fhir/StructureDefinition/Citation")
public class Citation extends MetadataResource {
+ @Block()
+ public static class CitationSummaryComponent extends BackboneElement implements IBaseBackboneElement {
+ /**
+ * Format for display of the citation.
+ */
+ @Child(name = "style", type = {CodeableConcept.class}, order=1, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Format for display of the citation", formalDefinition="Format for display of the citation." )
+ @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/citation-summary-style")
+ protected CodeableConcept style;
+
+ /**
+ * The human-readable display of the citation.
+ */
+ @Child(name = "text", type = {MarkdownType.class}, order=2, min=1, max=1, modifier=false, summary=true)
+ @Description(shortDefinition="The human-readable display of the citation", formalDefinition="The human-readable display of the citation." )
+ protected MarkdownType text;
+
+ private static final long serialVersionUID = 123416446L;
+
+ /**
+ * Constructor
+ */
+ public CitationSummaryComponent() {
+ super();
+ }
+
+ /**
+ * Constructor
+ */
+ public CitationSummaryComponent(String text) {
+ super();
+ this.setText(text);
+ }
+
+ /**
+ * @return {@link #style} (Format for display of the citation.)
+ */
+ public CodeableConcept getStyle() {
+ if (this.style == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationSummaryComponent.style");
+ else if (Configuration.doAutoCreate())
+ this.style = new CodeableConcept(); // cc
+ return this.style;
+ }
+
+ public boolean hasStyle() {
+ return this.style != null && !this.style.isEmpty();
+ }
+
+ /**
+ * @param value {@link #style} (Format for display of the citation.)
+ */
+ public CitationSummaryComponent setStyle(CodeableConcept value) {
+ this.style = value;
+ return this;
+ }
+
+ /**
+ * @return {@link #text} (The human-readable display of the citation.). This is the underlying object with id, value and extensions. The accessor "getText" gives direct access to the value
+ */
+ public MarkdownType getTextElement() {
+ if (this.text == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationSummaryComponent.text");
+ else if (Configuration.doAutoCreate())
+ this.text = new MarkdownType(); // bb
+ return this.text;
+ }
+
+ public boolean hasTextElement() {
+ return this.text != null && !this.text.isEmpty();
+ }
+
+ public boolean hasText() {
+ return this.text != null && !this.text.isEmpty();
+ }
+
+ /**
+ * @param value {@link #text} (The human-readable display of the citation.). This is the underlying object with id, value and extensions. The accessor "getText" gives direct access to the value
+ */
+ public CitationSummaryComponent setTextElement(MarkdownType value) {
+ this.text = value;
+ return this;
+ }
+
+ /**
+ * @return The human-readable display of the citation.
+ */
+ public String getText() {
+ return this.text == null ? null : this.text.getValue();
+ }
+
+ /**
+ * @param value The human-readable display of the citation.
+ */
+ public CitationSummaryComponent setText(String value) {
+ if (this.text == null)
+ this.text = new MarkdownType();
+ this.text.setValue(value);
+ return this;
+ }
+
+ protected void listChildren(List children) {
+ super.listChildren(children);
+ children.add(new Property("style", "CodeableConcept", "Format for display of the citation.", 0, 1, style));
+ children.add(new Property("text", "markdown", "The human-readable display of the citation.", 0, 1, text));
+ }
+
+ @Override
+ public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException {
+ switch (_hash) {
+ case 109780401: /*style*/ return new Property("style", "CodeableConcept", "Format for display of the citation.", 0, 1, style);
+ case 3556653: /*text*/ return new Property("text", "markdown", "The human-readable display of the citation.", 0, 1, text);
+ default: return super.getNamedProperty(_hash, _name, _checkValid);
+ }
+
+ }
+
+ @Override
+ public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException {
+ switch (hash) {
+ case 109780401: /*style*/ return this.style == null ? new Base[0] : new Base[] {this.style}; // CodeableConcept
+ case 3556653: /*text*/ return this.text == null ? new Base[0] : new Base[] {this.text}; // MarkdownType
+ default: return super.getProperty(hash, name, checkValid);
+ }
+
+ }
+
+ @Override
+ public Base setProperty(int hash, String name, Base value) throws FHIRException {
+ switch (hash) {
+ case 109780401: // style
+ this.style = TypeConvertor.castToCodeableConcept(value); // CodeableConcept
+ return value;
+ case 3556653: // text
+ this.text = TypeConvertor.castToMarkdown(value); // MarkdownType
+ return value;
+ default: return super.setProperty(hash, name, value);
+ }
+
+ }
+
+ @Override
+ public Base setProperty(String name, Base value) throws FHIRException {
+ if (name.equals("style")) {
+ this.style = TypeConvertor.castToCodeableConcept(value); // CodeableConcept
+ } else if (name.equals("text")) {
+ this.text = TypeConvertor.castToMarkdown(value); // MarkdownType
+ } else
+ return super.setProperty(name, value);
+ return value;
+ }
+
+ @Override
+ public Base makeProperty(int hash, String name) throws FHIRException {
+ switch (hash) {
+ case 109780401: return getStyle();
+ case 3556653: return getTextElement();
+ default: return super.makeProperty(hash, name);
+ }
+
+ }
+
+ @Override
+ public String[] getTypesForProperty(int hash, String name) throws FHIRException {
+ switch (hash) {
+ case 109780401: /*style*/ return new String[] {"CodeableConcept"};
+ case 3556653: /*text*/ return new String[] {"markdown"};
+ default: return super.getTypesForProperty(hash, name);
+ }
+
+ }
+
+ @Override
+ public Base addChild(String name) throws FHIRException {
+ if (name.equals("style")) {
+ this.style = new CodeableConcept();
+ return this.style;
+ }
+ else if (name.equals("text")) {
+ throw new FHIRException("Cannot call addChild on a primitive type Citation.summary.text");
+ }
+ else
+ return super.addChild(name);
+ }
+
+ public CitationSummaryComponent copy() {
+ CitationSummaryComponent dst = new CitationSummaryComponent();
+ copyValues(dst);
+ return dst;
+ }
+
+ public void copyValues(CitationSummaryComponent dst) {
+ super.copyValues(dst);
+ dst.style = style == null ? null : style.copy();
+ dst.text = text == null ? null : text.copy();
+ }
+
+ @Override
+ public boolean equalsDeep(Base other_) {
+ if (!super.equalsDeep(other_))
+ return false;
+ if (!(other_ instanceof CitationSummaryComponent))
+ return false;
+ CitationSummaryComponent o = (CitationSummaryComponent) other_;
+ return compareDeep(style, o.style, true) && compareDeep(text, o.text, true);
+ }
+
+ @Override
+ public boolean equalsShallow(Base other_) {
+ if (!super.equalsShallow(other_))
+ return false;
+ if (!(other_ instanceof CitationSummaryComponent))
+ return false;
+ CitationSummaryComponent o = (CitationSummaryComponent) other_;
+ return compareValues(text, o.text, true);
+ }
+
+ public boolean isEmpty() {
+ return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(style, text);
+ }
+
+ public String fhirType() {
+ return "Citation.summary";
+
+ }
+
+ }
+
@Block()
public static class CitationVariantCitationComponent extends BackboneElement implements IBaseBackboneElement {
/**
@@ -731,11 +959,11 @@ public class Citation extends MetadataResource {
/**
* Date on which the issue of the journal was published.
*/
- @Child(name = "publicationDate", type = {StringType.class}, order=4, min=0, max=1, modifier=false, summary=false)
+ @Child(name = "publicationDate", type = {}, order=4, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="Date on which the issue of the journal was published", formalDefinition="Date on which the issue of the journal was published." )
- protected StringType publicationDate;
+ protected CitationJournalJournalIssuePublicationDateComponent publicationDate;
- private static final long serialVersionUID = -1343937439L;
+ private static final long serialVersionUID = 933986267L;
/**
* Constructor
@@ -867,60 +1095,35 @@ public class Citation extends MetadataResource {
}
/**
- * @return {@link #publicationDate} (Date on which the issue of the journal was published.). This is the underlying object with id, value and extensions. The accessor "getPublicationDate" gives direct access to the value
+ * @return {@link #publicationDate} (Date on which the issue of the journal was published.)
*/
- public StringType getPublicationDateElement() {
+ public CitationJournalJournalIssuePublicationDateComponent getPublicationDate() {
if (this.publicationDate == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create CitationJournalJournalIssueComponent.publicationDate");
else if (Configuration.doAutoCreate())
- this.publicationDate = new StringType(); // bb
+ this.publicationDate = new CitationJournalJournalIssuePublicationDateComponent(); // cc
return this.publicationDate;
}
- public boolean hasPublicationDateElement() {
- return this.publicationDate != null && !this.publicationDate.isEmpty();
- }
-
public boolean hasPublicationDate() {
return this.publicationDate != null && !this.publicationDate.isEmpty();
}
/**
- * @param value {@link #publicationDate} (Date on which the issue of the journal was published.). This is the underlying object with id, value and extensions. The accessor "getPublicationDate" gives direct access to the value
+ * @param value {@link #publicationDate} (Date on which the issue of the journal was published.)
*/
- public CitationJournalJournalIssueComponent setPublicationDateElement(StringType value) {
+ public CitationJournalJournalIssueComponent setPublicationDate(CitationJournalJournalIssuePublicationDateComponent value) {
this.publicationDate = value;
return this;
}
- /**
- * @return Date on which the issue of the journal was published.
- */
- public String getPublicationDate() {
- return this.publicationDate == null ? null : this.publicationDate.getValue();
- }
-
- /**
- * @param value Date on which the issue of the journal was published.
- */
- public CitationJournalJournalIssueComponent setPublicationDate(String value) {
- if (Utilities.noString(value))
- this.publicationDate = null;
- else {
- if (this.publicationDate == null)
- this.publicationDate = new StringType();
- this.publicationDate.setValue(value);
- }
- return this;
- }
-
protected void listChildren(List children) {
super.listChildren(children);
children.add(new Property("citedMedium", "CodeableConcept", "NLM codes Internet or Print.", 0, 1, citedMedium));
children.add(new Property("volume", "string", "Volume number of journal in which the article is published.", 0, 1, volume));
children.add(new Property("issue", "string", "Issue, part or supplement of journal in which the article is published.", 0, 1, issue));
- children.add(new Property("publicationDate", "string", "Date on which the issue of the journal was published.", 0, 1, publicationDate));
+ children.add(new Property("publicationDate", "", "Date on which the issue of the journal was published.", 0, 1, publicationDate));
}
@Override
@@ -929,7 +1132,7 @@ public class Citation extends MetadataResource {
case 612116418: /*citedMedium*/ return new Property("citedMedium", "CodeableConcept", "NLM codes Internet or Print.", 0, 1, citedMedium);
case -810883302: /*volume*/ return new Property("volume", "string", "Volume number of journal in which the article is published.", 0, 1, volume);
case 100509913: /*issue*/ return new Property("issue", "string", "Issue, part or supplement of journal in which the article is published.", 0, 1, issue);
- case 1470566394: /*publicationDate*/ return new Property("publicationDate", "string", "Date on which the issue of the journal was published.", 0, 1, publicationDate);
+ case 1470566394: /*publicationDate*/ return new Property("publicationDate", "", "Date on which the issue of the journal was published.", 0, 1, publicationDate);
default: return super.getNamedProperty(_hash, _name, _checkValid);
}
@@ -941,7 +1144,7 @@ public class Citation extends MetadataResource {
case 612116418: /*citedMedium*/ return this.citedMedium == null ? new Base[0] : new Base[] {this.citedMedium}; // CodeableConcept
case -810883302: /*volume*/ return this.volume == null ? new Base[0] : new Base[] {this.volume}; // StringType
case 100509913: /*issue*/ return this.issue == null ? new Base[0] : new Base[] {this.issue}; // StringType
- case 1470566394: /*publicationDate*/ return this.publicationDate == null ? new Base[0] : new Base[] {this.publicationDate}; // StringType
+ case 1470566394: /*publicationDate*/ return this.publicationDate == null ? new Base[0] : new Base[] {this.publicationDate}; // CitationJournalJournalIssuePublicationDateComponent
default: return super.getProperty(hash, name, checkValid);
}
@@ -960,7 +1163,7 @@ public class Citation extends MetadataResource {
this.issue = TypeConvertor.castToString(value); // StringType
return value;
case 1470566394: // publicationDate
- this.publicationDate = TypeConvertor.castToString(value); // StringType
+ this.publicationDate = (CitationJournalJournalIssuePublicationDateComponent) value; // CitationJournalJournalIssuePublicationDateComponent
return value;
default: return super.setProperty(hash, name, value);
}
@@ -976,7 +1179,7 @@ public class Citation extends MetadataResource {
} else if (name.equals("issue")) {
this.issue = TypeConvertor.castToString(value); // StringType
} else if (name.equals("publicationDate")) {
- this.publicationDate = TypeConvertor.castToString(value); // StringType
+ this.publicationDate = (CitationJournalJournalIssuePublicationDateComponent) value; // CitationJournalJournalIssuePublicationDateComponent
} else
return super.setProperty(name, value);
return value;
@@ -988,7 +1191,7 @@ public class Citation extends MetadataResource {
case 612116418: return getCitedMedium();
case -810883302: return getVolumeElement();
case 100509913: return getIssueElement();
- case 1470566394: return getPublicationDateElement();
+ case 1470566394: return getPublicationDate();
default: return super.makeProperty(hash, name);
}
@@ -1000,7 +1203,7 @@ public class Citation extends MetadataResource {
case 612116418: /*citedMedium*/ return new String[] {"CodeableConcept"};
case -810883302: /*volume*/ return new String[] {"string"};
case 100509913: /*issue*/ return new String[] {"string"};
- case 1470566394: /*publicationDate*/ return new String[] {"string"};
+ case 1470566394: /*publicationDate*/ return new String[] {};
default: return super.getTypesForProperty(hash, name);
}
@@ -1019,7 +1222,8 @@ public class Citation extends MetadataResource {
throw new FHIRException("Cannot call addChild on a primitive type Citation.journal.journalIssue.issue");
}
else if (name.equals("publicationDate")) {
- throw new FHIRException("Cannot call addChild on a primitive type Citation.journal.journalIssue.publicationDate");
+ this.publicationDate = new CitationJournalJournalIssuePublicationDateComponent();
+ return this.publicationDate;
}
else
return super.addChild(name);
@@ -1057,8 +1261,7 @@ public class Citation extends MetadataResource {
if (!(other_ instanceof CitationJournalJournalIssueComponent))
return false;
CitationJournalJournalIssueComponent o = (CitationJournalJournalIssueComponent) other_;
- return compareValues(volume, o.volume, true) && compareValues(issue, o.issue, true) && compareValues(publicationDate, o.publicationDate, true)
- ;
+ return compareValues(volume, o.volume, true) && compareValues(issue, o.issue, true);
}
public boolean isEmpty() {
@@ -1071,6 +1274,1403 @@ public class Citation extends MetadataResource {
}
+ }
+
+ @Block()
+ public static class CitationJournalJournalIssuePublicationDateComponent extends BackboneElement implements IBaseBackboneElement {
+ /**
+ * Defining the date on which the issue of the joutnal was published.
+ */
+ @Child(name = "date", type = {DateType.class}, order=1, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Defining the date on which the issue of the joutnal was published", formalDefinition="Defining the date on which the issue of the joutnal was published." )
+ protected DateType date;
+
+ /**
+ * Year on which the issue of the journal was published.
+ */
+ @Child(name = "year", type = {StringType.class}, order=2, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Year on which the issue of the journal was published", formalDefinition="Year on which the issue of the journal was published." )
+ protected StringType year;
+
+ /**
+ * Month on which the issue of the journal was published.
+ */
+ @Child(name = "month", type = {StringType.class}, order=3, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Month on which the issue of the journal was published", formalDefinition="Month on which the issue of the journal was published." )
+ protected StringType month;
+
+ /**
+ * Day on which the issue of the journal was published.
+ */
+ @Child(name = "day", type = {StringType.class}, order=4, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Day on which the issue of the journal was published", formalDefinition="Day on which the issue of the journal was published." )
+ protected StringType day;
+
+ /**
+ * Spring, Summer, Fall/Autumn, Winter.
+ */
+ @Child(name = "season", type = {StringType.class}, order=5, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Season on which the issue of the jornal was published", formalDefinition="Spring, Summer, Fall/Autumn, Winter." )
+ protected StringType season;
+
+ /**
+ * Text representation of the date of which the issue of the journal was published.
+ */
+ @Child(name = "text", type = {StringType.class}, order=6, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Text representation of the date of which the issue of the journal was published", formalDefinition="Text representation of the date of which the issue of the journal was published." )
+ protected StringType text;
+
+ private static final long serialVersionUID = 1585589146L;
+
+ /**
+ * Constructor
+ */
+ public CitationJournalJournalIssuePublicationDateComponent() {
+ super();
+ }
+
+ /**
+ * @return {@link #date} (Defining the date on which the issue of the joutnal was published.). This is the underlying object with id, value and extensions. The accessor "getDate" gives direct access to the value
+ */
+ public DateType getDateElement() {
+ if (this.date == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationJournalJournalIssuePublicationDateComponent.date");
+ else if (Configuration.doAutoCreate())
+ this.date = new DateType(); // bb
+ return this.date;
+ }
+
+ public boolean hasDateElement() {
+ return this.date != null && !this.date.isEmpty();
+ }
+
+ public boolean hasDate() {
+ return this.date != null && !this.date.isEmpty();
+ }
+
+ /**
+ * @param value {@link #date} (Defining the date on which the issue of the joutnal was published.). This is the underlying object with id, value and extensions. The accessor "getDate" gives direct access to the value
+ */
+ public CitationJournalJournalIssuePublicationDateComponent setDateElement(DateType value) {
+ this.date = value;
+ return this;
+ }
+
+ /**
+ * @return Defining the date on which the issue of the joutnal was published.
+ */
+ public Date getDate() {
+ return this.date == null ? null : this.date.getValue();
+ }
+
+ /**
+ * @param value Defining the date on which the issue of the joutnal was published.
+ */
+ public CitationJournalJournalIssuePublicationDateComponent setDate(Date value) {
+ if (value == null)
+ this.date = null;
+ else {
+ if (this.date == null)
+ this.date = new DateType();
+ this.date.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #year} (Year on which the issue of the journal was published.). This is the underlying object with id, value and extensions. The accessor "getYear" gives direct access to the value
+ */
+ public StringType getYearElement() {
+ if (this.year == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationJournalJournalIssuePublicationDateComponent.year");
+ else if (Configuration.doAutoCreate())
+ this.year = new StringType(); // bb
+ return this.year;
+ }
+
+ public boolean hasYearElement() {
+ return this.year != null && !this.year.isEmpty();
+ }
+
+ public boolean hasYear() {
+ return this.year != null && !this.year.isEmpty();
+ }
+
+ /**
+ * @param value {@link #year} (Year on which the issue of the journal was published.). This is the underlying object with id, value and extensions. The accessor "getYear" gives direct access to the value
+ */
+ public CitationJournalJournalIssuePublicationDateComponent setYearElement(StringType value) {
+ this.year = value;
+ return this;
+ }
+
+ /**
+ * @return Year on which the issue of the journal was published.
+ */
+ public String getYear() {
+ return this.year == null ? null : this.year.getValue();
+ }
+
+ /**
+ * @param value Year on which the issue of the journal was published.
+ */
+ public CitationJournalJournalIssuePublicationDateComponent setYear(String value) {
+ if (Utilities.noString(value))
+ this.year = null;
+ else {
+ if (this.year == null)
+ this.year = new StringType();
+ this.year.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #month} (Month on which the issue of the journal was published.). This is the underlying object with id, value and extensions. The accessor "getMonth" gives direct access to the value
+ */
+ public StringType getMonthElement() {
+ if (this.month == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationJournalJournalIssuePublicationDateComponent.month");
+ else if (Configuration.doAutoCreate())
+ this.month = new StringType(); // bb
+ return this.month;
+ }
+
+ public boolean hasMonthElement() {
+ return this.month != null && !this.month.isEmpty();
+ }
+
+ public boolean hasMonth() {
+ return this.month != null && !this.month.isEmpty();
+ }
+
+ /**
+ * @param value {@link #month} (Month on which the issue of the journal was published.). This is the underlying object with id, value and extensions. The accessor "getMonth" gives direct access to the value
+ */
+ public CitationJournalJournalIssuePublicationDateComponent setMonthElement(StringType value) {
+ this.month = value;
+ return this;
+ }
+
+ /**
+ * @return Month on which the issue of the journal was published.
+ */
+ public String getMonth() {
+ return this.month == null ? null : this.month.getValue();
+ }
+
+ /**
+ * @param value Month on which the issue of the journal was published.
+ */
+ public CitationJournalJournalIssuePublicationDateComponent setMonth(String value) {
+ if (Utilities.noString(value))
+ this.month = null;
+ else {
+ if (this.month == null)
+ this.month = new StringType();
+ this.month.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #day} (Day on which the issue of the journal was published.). This is the underlying object with id, value and extensions. The accessor "getDay" gives direct access to the value
+ */
+ public StringType getDayElement() {
+ if (this.day == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationJournalJournalIssuePublicationDateComponent.day");
+ else if (Configuration.doAutoCreate())
+ this.day = new StringType(); // bb
+ return this.day;
+ }
+
+ public boolean hasDayElement() {
+ return this.day != null && !this.day.isEmpty();
+ }
+
+ public boolean hasDay() {
+ return this.day != null && !this.day.isEmpty();
+ }
+
+ /**
+ * @param value {@link #day} (Day on which the issue of the journal was published.). This is the underlying object with id, value and extensions. The accessor "getDay" gives direct access to the value
+ */
+ public CitationJournalJournalIssuePublicationDateComponent setDayElement(StringType value) {
+ this.day = value;
+ return this;
+ }
+
+ /**
+ * @return Day on which the issue of the journal was published.
+ */
+ public String getDay() {
+ return this.day == null ? null : this.day.getValue();
+ }
+
+ /**
+ * @param value Day on which the issue of the journal was published.
+ */
+ public CitationJournalJournalIssuePublicationDateComponent setDay(String value) {
+ if (Utilities.noString(value))
+ this.day = null;
+ else {
+ if (this.day == null)
+ this.day = new StringType();
+ this.day.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #season} (Spring, Summer, Fall/Autumn, Winter.). This is the underlying object with id, value and extensions. The accessor "getSeason" gives direct access to the value
+ */
+ public StringType getSeasonElement() {
+ if (this.season == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationJournalJournalIssuePublicationDateComponent.season");
+ else if (Configuration.doAutoCreate())
+ this.season = new StringType(); // bb
+ return this.season;
+ }
+
+ public boolean hasSeasonElement() {
+ return this.season != null && !this.season.isEmpty();
+ }
+
+ public boolean hasSeason() {
+ return this.season != null && !this.season.isEmpty();
+ }
+
+ /**
+ * @param value {@link #season} (Spring, Summer, Fall/Autumn, Winter.). This is the underlying object with id, value and extensions. The accessor "getSeason" gives direct access to the value
+ */
+ public CitationJournalJournalIssuePublicationDateComponent setSeasonElement(StringType value) {
+ this.season = value;
+ return this;
+ }
+
+ /**
+ * @return Spring, Summer, Fall/Autumn, Winter.
+ */
+ public String getSeason() {
+ return this.season == null ? null : this.season.getValue();
+ }
+
+ /**
+ * @param value Spring, Summer, Fall/Autumn, Winter.
+ */
+ public CitationJournalJournalIssuePublicationDateComponent setSeason(String value) {
+ if (Utilities.noString(value))
+ this.season = null;
+ else {
+ if (this.season == null)
+ this.season = new StringType();
+ this.season.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #text} (Text representation of the date of which the issue of the journal was published.). This is the underlying object with id, value and extensions. The accessor "getText" gives direct access to the value
+ */
+ public StringType getTextElement() {
+ if (this.text == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationJournalJournalIssuePublicationDateComponent.text");
+ else if (Configuration.doAutoCreate())
+ this.text = new StringType(); // bb
+ return this.text;
+ }
+
+ public boolean hasTextElement() {
+ return this.text != null && !this.text.isEmpty();
+ }
+
+ public boolean hasText() {
+ return this.text != null && !this.text.isEmpty();
+ }
+
+ /**
+ * @param value {@link #text} (Text representation of the date of which the issue of the journal was published.). This is the underlying object with id, value and extensions. The accessor "getText" gives direct access to the value
+ */
+ public CitationJournalJournalIssuePublicationDateComponent setTextElement(StringType value) {
+ this.text = value;
+ return this;
+ }
+
+ /**
+ * @return Text representation of the date of which the issue of the journal was published.
+ */
+ public String getText() {
+ return this.text == null ? null : this.text.getValue();
+ }
+
+ /**
+ * @param value Text representation of the date of which the issue of the journal was published.
+ */
+ public CitationJournalJournalIssuePublicationDateComponent setText(String value) {
+ if (Utilities.noString(value))
+ this.text = null;
+ else {
+ if (this.text == null)
+ this.text = new StringType();
+ this.text.setValue(value);
+ }
+ return this;
+ }
+
+ protected void listChildren(List children) {
+ super.listChildren(children);
+ children.add(new Property("date", "date", "Defining the date on which the issue of the joutnal was published.", 0, 1, date));
+ children.add(new Property("year", "string", "Year on which the issue of the journal was published.", 0, 1, year));
+ children.add(new Property("month", "string", "Month on which the issue of the journal was published.", 0, 1, month));
+ children.add(new Property("day", "string", "Day on which the issue of the journal was published.", 0, 1, day));
+ children.add(new Property("season", "string", "Spring, Summer, Fall/Autumn, Winter.", 0, 1, season));
+ children.add(new Property("text", "string", "Text representation of the date of which the issue of the journal was published.", 0, 1, text));
+ }
+
+ @Override
+ public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException {
+ switch (_hash) {
+ case 3076014: /*date*/ return new Property("date", "date", "Defining the date on which the issue of the joutnal was published.", 0, 1, date);
+ case 3704893: /*year*/ return new Property("year", "string", "Year on which the issue of the journal was published.", 0, 1, year);
+ case 104080000: /*month*/ return new Property("month", "string", "Month on which the issue of the journal was published.", 0, 1, month);
+ case 99228: /*day*/ return new Property("day", "string", "Day on which the issue of the journal was published.", 0, 1, day);
+ case -906335517: /*season*/ return new Property("season", "string", "Spring, Summer, Fall/Autumn, Winter.", 0, 1, season);
+ case 3556653: /*text*/ return new Property("text", "string", "Text representation of the date of which the issue of the journal was published.", 0, 1, text);
+ default: return super.getNamedProperty(_hash, _name, _checkValid);
+ }
+
+ }
+
+ @Override
+ public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException {
+ switch (hash) {
+ case 3076014: /*date*/ return this.date == null ? new Base[0] : new Base[] {this.date}; // DateType
+ case 3704893: /*year*/ return this.year == null ? new Base[0] : new Base[] {this.year}; // StringType
+ case 104080000: /*month*/ return this.month == null ? new Base[0] : new Base[] {this.month}; // StringType
+ case 99228: /*day*/ return this.day == null ? new Base[0] : new Base[] {this.day}; // StringType
+ case -906335517: /*season*/ return this.season == null ? new Base[0] : new Base[] {this.season}; // StringType
+ case 3556653: /*text*/ return this.text == null ? new Base[0] : new Base[] {this.text}; // StringType
+ default: return super.getProperty(hash, name, checkValid);
+ }
+
+ }
+
+ @Override
+ public Base setProperty(int hash, String name, Base value) throws FHIRException {
+ switch (hash) {
+ case 3076014: // date
+ this.date = TypeConvertor.castToDate(value); // DateType
+ return value;
+ case 3704893: // year
+ this.year = TypeConvertor.castToString(value); // StringType
+ return value;
+ case 104080000: // month
+ this.month = TypeConvertor.castToString(value); // StringType
+ return value;
+ case 99228: // day
+ this.day = TypeConvertor.castToString(value); // StringType
+ return value;
+ case -906335517: // season
+ this.season = TypeConvertor.castToString(value); // StringType
+ return value;
+ case 3556653: // text
+ this.text = TypeConvertor.castToString(value); // StringType
+ return value;
+ default: return super.setProperty(hash, name, value);
+ }
+
+ }
+
+ @Override
+ public Base setProperty(String name, Base value) throws FHIRException {
+ if (name.equals("date")) {
+ this.date = TypeConvertor.castToDate(value); // DateType
+ } else if (name.equals("year")) {
+ this.year = TypeConvertor.castToString(value); // StringType
+ } else if (name.equals("month")) {
+ this.month = TypeConvertor.castToString(value); // StringType
+ } else if (name.equals("day")) {
+ this.day = TypeConvertor.castToString(value); // StringType
+ } else if (name.equals("season")) {
+ this.season = TypeConvertor.castToString(value); // StringType
+ } else if (name.equals("text")) {
+ this.text = TypeConvertor.castToString(value); // StringType
+ } else
+ return super.setProperty(name, value);
+ return value;
+ }
+
+ @Override
+ public Base makeProperty(int hash, String name) throws FHIRException {
+ switch (hash) {
+ case 3076014: return getDateElement();
+ case 3704893: return getYearElement();
+ case 104080000: return getMonthElement();
+ case 99228: return getDayElement();
+ case -906335517: return getSeasonElement();
+ case 3556653: return getTextElement();
+ default: return super.makeProperty(hash, name);
+ }
+
+ }
+
+ @Override
+ public String[] getTypesForProperty(int hash, String name) throws FHIRException {
+ switch (hash) {
+ case 3076014: /*date*/ return new String[] {"date"};
+ case 3704893: /*year*/ return new String[] {"string"};
+ case 104080000: /*month*/ return new String[] {"string"};
+ case 99228: /*day*/ return new String[] {"string"};
+ case -906335517: /*season*/ return new String[] {"string"};
+ case 3556653: /*text*/ return new String[] {"string"};
+ default: return super.getTypesForProperty(hash, name);
+ }
+
+ }
+
+ @Override
+ public Base addChild(String name) throws FHIRException {
+ if (name.equals("date")) {
+ throw new FHIRException("Cannot call addChild on a primitive type Citation.journal.journalIssue.publicationDate.date");
+ }
+ else if (name.equals("year")) {
+ throw new FHIRException("Cannot call addChild on a primitive type Citation.journal.journalIssue.publicationDate.year");
+ }
+ else if (name.equals("month")) {
+ throw new FHIRException("Cannot call addChild on a primitive type Citation.journal.journalIssue.publicationDate.month");
+ }
+ else if (name.equals("day")) {
+ throw new FHIRException("Cannot call addChild on a primitive type Citation.journal.journalIssue.publicationDate.day");
+ }
+ else if (name.equals("season")) {
+ throw new FHIRException("Cannot call addChild on a primitive type Citation.journal.journalIssue.publicationDate.season");
+ }
+ else if (name.equals("text")) {
+ throw new FHIRException("Cannot call addChild on a primitive type Citation.journal.journalIssue.publicationDate.text");
+ }
+ else
+ return super.addChild(name);
+ }
+
+ public CitationJournalJournalIssuePublicationDateComponent copy() {
+ CitationJournalJournalIssuePublicationDateComponent dst = new CitationJournalJournalIssuePublicationDateComponent();
+ copyValues(dst);
+ return dst;
+ }
+
+ public void copyValues(CitationJournalJournalIssuePublicationDateComponent dst) {
+ super.copyValues(dst);
+ dst.date = date == null ? null : date.copy();
+ dst.year = year == null ? null : year.copy();
+ dst.month = month == null ? null : month.copy();
+ dst.day = day == null ? null : day.copy();
+ dst.season = season == null ? null : season.copy();
+ dst.text = text == null ? null : text.copy();
+ }
+
+ @Override
+ public boolean equalsDeep(Base other_) {
+ if (!super.equalsDeep(other_))
+ return false;
+ if (!(other_ instanceof CitationJournalJournalIssuePublicationDateComponent))
+ return false;
+ CitationJournalJournalIssuePublicationDateComponent o = (CitationJournalJournalIssuePublicationDateComponent) other_;
+ return compareDeep(date, o.date, true) && compareDeep(year, o.year, true) && compareDeep(month, o.month, true)
+ && compareDeep(day, o.day, true) && compareDeep(season, o.season, true) && compareDeep(text, o.text, true)
+ ;
+ }
+
+ @Override
+ public boolean equalsShallow(Base other_) {
+ if (!super.equalsShallow(other_))
+ return false;
+ if (!(other_ instanceof CitationJournalJournalIssuePublicationDateComponent))
+ return false;
+ CitationJournalJournalIssuePublicationDateComponent o = (CitationJournalJournalIssuePublicationDateComponent) other_;
+ return compareValues(date, o.date, true) && compareValues(year, o.year, true) && compareValues(month, o.month, true)
+ && compareValues(day, o.day, true) && compareValues(season, o.season, true) && compareValues(text, o.text, true)
+ ;
+ }
+
+ public boolean isEmpty() {
+ return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(date, year, month, day
+ , season, text);
+ }
+
+ public String fhirType() {
+ return "Citation.journal.journalIssue.publicationDate";
+
+ }
+
+ }
+
+ @Block()
+ public static class CitationPublicationInfoComponent extends BackboneElement implements IBaseBackboneElement {
+ /**
+ * The collection the cited article is published in.
+ */
+ @Child(name = "publishedIn", type = {}, order=1, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="The collection the cited article is published in", formalDefinition="The collection the cited article is published in." )
+ protected CitationPublicationInfoPublishedInComponent publishedIn;
+
+ /**
+ * The date the article was added to the database.
+ */
+ @Child(name = "entryDate", type = {DateTimeType.class}, order=2, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="The date the article was added to the database", formalDefinition="The date the article was added to the database." )
+ protected DateTimeType entryDate;
+
+ /**
+ * The date the article was last revised or updated in the database.
+ */
+ @Child(name = "revisionDate", type = {DateTimeType.class}, order=3, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="The date the article was last revised or updated in the database", formalDefinition="The date the article was last revised or updated in the database." )
+ protected DateTimeType revisionDate;
+
+ /**
+ * Actual or Approximate number of pages or screens.
+ */
+ @Child(name = "pageCount", type = {StringType.class}, order=4, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Number of pages or screens", formalDefinition="Actual or Approximate number of pages or screens." )
+ protected StringType pageCount;
+
+ private static final long serialVersionUID = -223356914L;
+
+ /**
+ * Constructor
+ */
+ public CitationPublicationInfoComponent() {
+ super();
+ }
+
+ /**
+ * @return {@link #publishedIn} (The collection the cited article is published in.)
+ */
+ public CitationPublicationInfoPublishedInComponent getPublishedIn() {
+ if (this.publishedIn == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationPublicationInfoComponent.publishedIn");
+ else if (Configuration.doAutoCreate())
+ this.publishedIn = new CitationPublicationInfoPublishedInComponent(); // cc
+ return this.publishedIn;
+ }
+
+ public boolean hasPublishedIn() {
+ return this.publishedIn != null && !this.publishedIn.isEmpty();
+ }
+
+ /**
+ * @param value {@link #publishedIn} (The collection the cited article is published in.)
+ */
+ public CitationPublicationInfoComponent setPublishedIn(CitationPublicationInfoPublishedInComponent value) {
+ this.publishedIn = value;
+ return this;
+ }
+
+ /**
+ * @return {@link #entryDate} (The date the article was added to the database.). This is the underlying object with id, value and extensions. The accessor "getEntryDate" gives direct access to the value
+ */
+ public DateTimeType getEntryDateElement() {
+ if (this.entryDate == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationPublicationInfoComponent.entryDate");
+ else if (Configuration.doAutoCreate())
+ this.entryDate = new DateTimeType(); // bb
+ return this.entryDate;
+ }
+
+ public boolean hasEntryDateElement() {
+ return this.entryDate != null && !this.entryDate.isEmpty();
+ }
+
+ public boolean hasEntryDate() {
+ return this.entryDate != null && !this.entryDate.isEmpty();
+ }
+
+ /**
+ * @param value {@link #entryDate} (The date the article was added to the database.). This is the underlying object with id, value and extensions. The accessor "getEntryDate" gives direct access to the value
+ */
+ public CitationPublicationInfoComponent setEntryDateElement(DateTimeType value) {
+ this.entryDate = value;
+ return this;
+ }
+
+ /**
+ * @return The date the article was added to the database.
+ */
+ public Date getEntryDate() {
+ return this.entryDate == null ? null : this.entryDate.getValue();
+ }
+
+ /**
+ * @param value The date the article was added to the database.
+ */
+ public CitationPublicationInfoComponent setEntryDate(Date value) {
+ if (value == null)
+ this.entryDate = null;
+ else {
+ if (this.entryDate == null)
+ this.entryDate = new DateTimeType();
+ this.entryDate.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #revisionDate} (The date the article was last revised or updated in the database.). This is the underlying object with id, value and extensions. The accessor "getRevisionDate" gives direct access to the value
+ */
+ public DateTimeType getRevisionDateElement() {
+ if (this.revisionDate == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationPublicationInfoComponent.revisionDate");
+ else if (Configuration.doAutoCreate())
+ this.revisionDate = new DateTimeType(); // bb
+ return this.revisionDate;
+ }
+
+ public boolean hasRevisionDateElement() {
+ return this.revisionDate != null && !this.revisionDate.isEmpty();
+ }
+
+ public boolean hasRevisionDate() {
+ return this.revisionDate != null && !this.revisionDate.isEmpty();
+ }
+
+ /**
+ * @param value {@link #revisionDate} (The date the article was last revised or updated in the database.). This is the underlying object with id, value and extensions. The accessor "getRevisionDate" gives direct access to the value
+ */
+ public CitationPublicationInfoComponent setRevisionDateElement(DateTimeType value) {
+ this.revisionDate = value;
+ return this;
+ }
+
+ /**
+ * @return The date the article was last revised or updated in the database.
+ */
+ public Date getRevisionDate() {
+ return this.revisionDate == null ? null : this.revisionDate.getValue();
+ }
+
+ /**
+ * @param value The date the article was last revised or updated in the database.
+ */
+ public CitationPublicationInfoComponent setRevisionDate(Date value) {
+ if (value == null)
+ this.revisionDate = null;
+ else {
+ if (this.revisionDate == null)
+ this.revisionDate = new DateTimeType();
+ this.revisionDate.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #pageCount} (Actual or Approximate number of pages or screens.). This is the underlying object with id, value and extensions. The accessor "getPageCount" gives direct access to the value
+ */
+ public StringType getPageCountElement() {
+ if (this.pageCount == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationPublicationInfoComponent.pageCount");
+ else if (Configuration.doAutoCreate())
+ this.pageCount = new StringType(); // bb
+ return this.pageCount;
+ }
+
+ public boolean hasPageCountElement() {
+ return this.pageCount != null && !this.pageCount.isEmpty();
+ }
+
+ public boolean hasPageCount() {
+ return this.pageCount != null && !this.pageCount.isEmpty();
+ }
+
+ /**
+ * @param value {@link #pageCount} (Actual or Approximate number of pages or screens.). This is the underlying object with id, value and extensions. The accessor "getPageCount" gives direct access to the value
+ */
+ public CitationPublicationInfoComponent setPageCountElement(StringType value) {
+ this.pageCount = value;
+ return this;
+ }
+
+ /**
+ * @return Actual or Approximate number of pages or screens.
+ */
+ public String getPageCount() {
+ return this.pageCount == null ? null : this.pageCount.getValue();
+ }
+
+ /**
+ * @param value Actual or Approximate number of pages or screens.
+ */
+ public CitationPublicationInfoComponent setPageCount(String value) {
+ if (Utilities.noString(value))
+ this.pageCount = null;
+ else {
+ if (this.pageCount == null)
+ this.pageCount = new StringType();
+ this.pageCount.setValue(value);
+ }
+ return this;
+ }
+
+ protected void listChildren(List children) {
+ super.listChildren(children);
+ children.add(new Property("publishedIn", "", "The collection the cited article is published in.", 0, 1, publishedIn));
+ children.add(new Property("entryDate", "dateTime", "The date the article was added to the database.", 0, 1, entryDate));
+ children.add(new Property("revisionDate", "dateTime", "The date the article was last revised or updated in the database.", 0, 1, revisionDate));
+ children.add(new Property("pageCount", "string", "Actual or Approximate number of pages or screens.", 0, 1, pageCount));
+ }
+
+ @Override
+ public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException {
+ switch (_hash) {
+ case -614144077: /*publishedIn*/ return new Property("publishedIn", "", "The collection the cited article is published in.", 0, 1, publishedIn);
+ case -479861952: /*entryDate*/ return new Property("entryDate", "dateTime", "The date the article was added to the database.", 0, 1, entryDate);
+ case -1250970071: /*revisionDate*/ return new Property("revisionDate", "dateTime", "The date the article was last revised or updated in the database.", 0, 1, revisionDate);
+ case 857882560: /*pageCount*/ return new Property("pageCount", "string", "Actual or Approximate number of pages or screens.", 0, 1, pageCount);
+ default: return super.getNamedProperty(_hash, _name, _checkValid);
+ }
+
+ }
+
+ @Override
+ public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException {
+ switch (hash) {
+ case -614144077: /*publishedIn*/ return this.publishedIn == null ? new Base[0] : new Base[] {this.publishedIn}; // CitationPublicationInfoPublishedInComponent
+ case -479861952: /*entryDate*/ return this.entryDate == null ? new Base[0] : new Base[] {this.entryDate}; // DateTimeType
+ case -1250970071: /*revisionDate*/ return this.revisionDate == null ? new Base[0] : new Base[] {this.revisionDate}; // DateTimeType
+ case 857882560: /*pageCount*/ return this.pageCount == null ? new Base[0] : new Base[] {this.pageCount}; // StringType
+ default: return super.getProperty(hash, name, checkValid);
+ }
+
+ }
+
+ @Override
+ public Base setProperty(int hash, String name, Base value) throws FHIRException {
+ switch (hash) {
+ case -614144077: // publishedIn
+ this.publishedIn = (CitationPublicationInfoPublishedInComponent) value; // CitationPublicationInfoPublishedInComponent
+ return value;
+ case -479861952: // entryDate
+ this.entryDate = TypeConvertor.castToDateTime(value); // DateTimeType
+ return value;
+ case -1250970071: // revisionDate
+ this.revisionDate = TypeConvertor.castToDateTime(value); // DateTimeType
+ return value;
+ case 857882560: // pageCount
+ this.pageCount = TypeConvertor.castToString(value); // StringType
+ return value;
+ default: return super.setProperty(hash, name, value);
+ }
+
+ }
+
+ @Override
+ public Base setProperty(String name, Base value) throws FHIRException {
+ if (name.equals("publishedIn")) {
+ this.publishedIn = (CitationPublicationInfoPublishedInComponent) value; // CitationPublicationInfoPublishedInComponent
+ } else if (name.equals("entryDate")) {
+ this.entryDate = TypeConvertor.castToDateTime(value); // DateTimeType
+ } else if (name.equals("revisionDate")) {
+ this.revisionDate = TypeConvertor.castToDateTime(value); // DateTimeType
+ } else if (name.equals("pageCount")) {
+ this.pageCount = TypeConvertor.castToString(value); // StringType
+ } else
+ return super.setProperty(name, value);
+ return value;
+ }
+
+ @Override
+ public Base makeProperty(int hash, String name) throws FHIRException {
+ switch (hash) {
+ case -614144077: return getPublishedIn();
+ case -479861952: return getEntryDateElement();
+ case -1250970071: return getRevisionDateElement();
+ case 857882560: return getPageCountElement();
+ default: return super.makeProperty(hash, name);
+ }
+
+ }
+
+ @Override
+ public String[] getTypesForProperty(int hash, String name) throws FHIRException {
+ switch (hash) {
+ case -614144077: /*publishedIn*/ return new String[] {};
+ case -479861952: /*entryDate*/ return new String[] {"dateTime"};
+ case -1250970071: /*revisionDate*/ return new String[] {"dateTime"};
+ case 857882560: /*pageCount*/ return new String[] {"string"};
+ default: return super.getTypesForProperty(hash, name);
+ }
+
+ }
+
+ @Override
+ public Base addChild(String name) throws FHIRException {
+ if (name.equals("publishedIn")) {
+ this.publishedIn = new CitationPublicationInfoPublishedInComponent();
+ return this.publishedIn;
+ }
+ else if (name.equals("entryDate")) {
+ throw new FHIRException("Cannot call addChild on a primitive type Citation.publicationInfo.entryDate");
+ }
+ else if (name.equals("revisionDate")) {
+ throw new FHIRException("Cannot call addChild on a primitive type Citation.publicationInfo.revisionDate");
+ }
+ else if (name.equals("pageCount")) {
+ throw new FHIRException("Cannot call addChild on a primitive type Citation.publicationInfo.pageCount");
+ }
+ else
+ return super.addChild(name);
+ }
+
+ public CitationPublicationInfoComponent copy() {
+ CitationPublicationInfoComponent dst = new CitationPublicationInfoComponent();
+ copyValues(dst);
+ return dst;
+ }
+
+ public void copyValues(CitationPublicationInfoComponent dst) {
+ super.copyValues(dst);
+ dst.publishedIn = publishedIn == null ? null : publishedIn.copy();
+ dst.entryDate = entryDate == null ? null : entryDate.copy();
+ dst.revisionDate = revisionDate == null ? null : revisionDate.copy();
+ dst.pageCount = pageCount == null ? null : pageCount.copy();
+ }
+
+ @Override
+ public boolean equalsDeep(Base other_) {
+ if (!super.equalsDeep(other_))
+ return false;
+ if (!(other_ instanceof CitationPublicationInfoComponent))
+ return false;
+ CitationPublicationInfoComponent o = (CitationPublicationInfoComponent) other_;
+ return compareDeep(publishedIn, o.publishedIn, true) && compareDeep(entryDate, o.entryDate, true)
+ && compareDeep(revisionDate, o.revisionDate, true) && compareDeep(pageCount, o.pageCount, true)
+ ;
+ }
+
+ @Override
+ public boolean equalsShallow(Base other_) {
+ if (!super.equalsShallow(other_))
+ return false;
+ if (!(other_ instanceof CitationPublicationInfoComponent))
+ return false;
+ CitationPublicationInfoComponent o = (CitationPublicationInfoComponent) other_;
+ return compareValues(entryDate, o.entryDate, true) && compareValues(revisionDate, o.revisionDate, true)
+ && compareValues(pageCount, o.pageCount, true);
+ }
+
+ public boolean isEmpty() {
+ return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(publishedIn, entryDate, revisionDate
+ , pageCount);
+ }
+
+ public String fhirType() {
+ return "Citation.publicationInfo";
+
+ }
+
+ }
+
+ @Block()
+ public static class CitationPublicationInfoPublishedInComponent extends BackboneElement implements IBaseBackboneElement {
+ /**
+ * Database or book.
+ */
+ @Child(name = "type", type = {CodeableConcept.class}, order=1, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Database or book", formalDefinition="Database or book." )
+ @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/published-in-type")
+ protected CodeableConcept type;
+
+ /**
+ * Identifiers may include ISBN (International Standard Book Number) for books.
+ */
+ @Child(name = "identifier", type = {Identifier.class}, order=2, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+ @Description(shortDefinition="Identifiers may include ISBN for books", formalDefinition="Identifiers may include ISBN (International Standard Book Number) for books." )
+ protected List identifier;
+
+ /**
+ * Name of the database or title of the book.
+ */
+ @Child(name = "name", type = {StringType.class}, order=3, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Name of the database or title of the book", formalDefinition="Name of the database or title of the book." )
+ protected StringType name;
+
+ /**
+ * Name of the publisher.
+ */
+ @Child(name = "publisher", type = {Organization.class}, order=4, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Name of the publisher", formalDefinition="Name of the publisher." )
+ protected Reference publisher;
+
+ /**
+ * Geographic location of the publisher.
+ */
+ @Child(name = "publisherLocation", type = {StringType.class}, order=5, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Geographic location of the publisher", formalDefinition="Geographic location of the publisher." )
+ protected StringType publisherLocation;
+
+ /**
+ * When the database was first available or when the book was published.
+ */
+ @Child(name = "startDate", type = {DateType.class}, order=6, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="When the database was first available or when the book was published", formalDefinition="When the database was first available or when the book was published." )
+ protected DateType startDate;
+
+ private static final long serialVersionUID = -618673226L;
+
+ /**
+ * Constructor
+ */
+ public CitationPublicationInfoPublishedInComponent() {
+ super();
+ }
+
+ /**
+ * @return {@link #type} (Database or book.)
+ */
+ public CodeableConcept getType() {
+ if (this.type == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationPublicationInfoPublishedInComponent.type");
+ else if (Configuration.doAutoCreate())
+ this.type = new CodeableConcept(); // cc
+ return this.type;
+ }
+
+ public boolean hasType() {
+ return this.type != null && !this.type.isEmpty();
+ }
+
+ /**
+ * @param value {@link #type} (Database or book.)
+ */
+ public CitationPublicationInfoPublishedInComponent setType(CodeableConcept value) {
+ this.type = value;
+ return this;
+ }
+
+ /**
+ * @return {@link #identifier} (Identifiers may include ISBN (International Standard Book Number) for books.)
+ */
+ public List getIdentifier() {
+ if (this.identifier == null)
+ this.identifier = new ArrayList();
+ return this.identifier;
+ }
+
+ /**
+ * @return Returns a reference to this
for easy method chaining
+ */
+ public CitationPublicationInfoPublishedInComponent setIdentifier(List theIdentifier) {
+ this.identifier = theIdentifier;
+ return this;
+ }
+
+ public boolean hasIdentifier() {
+ if (this.identifier == null)
+ return false;
+ for (Identifier item : this.identifier)
+ if (!item.isEmpty())
+ return true;
+ return false;
+ }
+
+ public Identifier addIdentifier() { //3
+ Identifier t = new Identifier();
+ if (this.identifier == null)
+ this.identifier = new ArrayList();
+ this.identifier.add(t);
+ return t;
+ }
+
+ public CitationPublicationInfoPublishedInComponent addIdentifier(Identifier t) { //3
+ if (t == null)
+ return this;
+ if (this.identifier == null)
+ this.identifier = new ArrayList();
+ this.identifier.add(t);
+ return this;
+ }
+
+ /**
+ * @return The first repetition of repeating field {@link #identifier}, creating it if it does not already exist {3}
+ */
+ public Identifier getIdentifierFirstRep() {
+ if (getIdentifier().isEmpty()) {
+ addIdentifier();
+ }
+ return getIdentifier().get(0);
+ }
+
+ /**
+ * @return {@link #name} (Name of the database or title of the book.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value
+ */
+ public StringType getNameElement() {
+ if (this.name == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationPublicationInfoPublishedInComponent.name");
+ else if (Configuration.doAutoCreate())
+ this.name = new StringType(); // bb
+ return this.name;
+ }
+
+ public boolean hasNameElement() {
+ return this.name != null && !this.name.isEmpty();
+ }
+
+ public boolean hasName() {
+ return this.name != null && !this.name.isEmpty();
+ }
+
+ /**
+ * @param value {@link #name} (Name of the database or title of the book.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value
+ */
+ public CitationPublicationInfoPublishedInComponent setNameElement(StringType value) {
+ this.name = value;
+ return this;
+ }
+
+ /**
+ * @return Name of the database or title of the book.
+ */
+ public String getName() {
+ return this.name == null ? null : this.name.getValue();
+ }
+
+ /**
+ * @param value Name of the database or title of the book.
+ */
+ public CitationPublicationInfoPublishedInComponent setName(String value) {
+ if (Utilities.noString(value))
+ this.name = null;
+ else {
+ if (this.name == null)
+ this.name = new StringType();
+ this.name.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #publisher} (Name of the publisher.)
+ */
+ public Reference getPublisher() {
+ if (this.publisher == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationPublicationInfoPublishedInComponent.publisher");
+ else if (Configuration.doAutoCreate())
+ this.publisher = new Reference(); // cc
+ return this.publisher;
+ }
+
+ public boolean hasPublisher() {
+ return this.publisher != null && !this.publisher.isEmpty();
+ }
+
+ /**
+ * @param value {@link #publisher} (Name of the publisher.)
+ */
+ public CitationPublicationInfoPublishedInComponent setPublisher(Reference value) {
+ this.publisher = value;
+ return this;
+ }
+
+ /**
+ * @return {@link #publisherLocation} (Geographic location of the publisher.). This is the underlying object with id, value and extensions. The accessor "getPublisherLocation" gives direct access to the value
+ */
+ public StringType getPublisherLocationElement() {
+ if (this.publisherLocation == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationPublicationInfoPublishedInComponent.publisherLocation");
+ else if (Configuration.doAutoCreate())
+ this.publisherLocation = new StringType(); // bb
+ return this.publisherLocation;
+ }
+
+ public boolean hasPublisherLocationElement() {
+ return this.publisherLocation != null && !this.publisherLocation.isEmpty();
+ }
+
+ public boolean hasPublisherLocation() {
+ return this.publisherLocation != null && !this.publisherLocation.isEmpty();
+ }
+
+ /**
+ * @param value {@link #publisherLocation} (Geographic location of the publisher.). This is the underlying object with id, value and extensions. The accessor "getPublisherLocation" gives direct access to the value
+ */
+ public CitationPublicationInfoPublishedInComponent setPublisherLocationElement(StringType value) {
+ this.publisherLocation = value;
+ return this;
+ }
+
+ /**
+ * @return Geographic location of the publisher.
+ */
+ public String getPublisherLocation() {
+ return this.publisherLocation == null ? null : this.publisherLocation.getValue();
+ }
+
+ /**
+ * @param value Geographic location of the publisher.
+ */
+ public CitationPublicationInfoPublishedInComponent setPublisherLocation(String value) {
+ if (Utilities.noString(value))
+ this.publisherLocation = null;
+ else {
+ if (this.publisherLocation == null)
+ this.publisherLocation = new StringType();
+ this.publisherLocation.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #startDate} (When the database was first available or when the book was published.). This is the underlying object with id, value and extensions. The accessor "getStartDate" gives direct access to the value
+ */
+ public DateType getStartDateElement() {
+ if (this.startDate == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationPublicationInfoPublishedInComponent.startDate");
+ else if (Configuration.doAutoCreate())
+ this.startDate = new DateType(); // bb
+ return this.startDate;
+ }
+
+ public boolean hasStartDateElement() {
+ return this.startDate != null && !this.startDate.isEmpty();
+ }
+
+ public boolean hasStartDate() {
+ return this.startDate != null && !this.startDate.isEmpty();
+ }
+
+ /**
+ * @param value {@link #startDate} (When the database was first available or when the book was published.). This is the underlying object with id, value and extensions. The accessor "getStartDate" gives direct access to the value
+ */
+ public CitationPublicationInfoPublishedInComponent setStartDateElement(DateType value) {
+ this.startDate = value;
+ return this;
+ }
+
+ /**
+ * @return When the database was first available or when the book was published.
+ */
+ public Date getStartDate() {
+ return this.startDate == null ? null : this.startDate.getValue();
+ }
+
+ /**
+ * @param value When the database was first available or when the book was published.
+ */
+ public CitationPublicationInfoPublishedInComponent setStartDate(Date value) {
+ if (value == null)
+ this.startDate = null;
+ else {
+ if (this.startDate == null)
+ this.startDate = new DateType();
+ this.startDate.setValue(value);
+ }
+ return this;
+ }
+
+ protected void listChildren(List children) {
+ super.listChildren(children);
+ children.add(new Property("type", "CodeableConcept", "Database or book.", 0, 1, type));
+ children.add(new Property("identifier", "Identifier", "Identifiers may include ISBN (International Standard Book Number) for books.", 0, java.lang.Integer.MAX_VALUE, identifier));
+ children.add(new Property("name", "string", "Name of the database or title of the book.", 0, 1, name));
+ children.add(new Property("publisher", "Reference(Organization)", "Name of the publisher.", 0, 1, publisher));
+ children.add(new Property("publisherLocation", "string", "Geographic location of the publisher.", 0, 1, publisherLocation));
+ children.add(new Property("startDate", "date", "When the database was first available or when the book was published.", 0, 1, startDate));
+ }
+
+ @Override
+ public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException {
+ switch (_hash) {
+ case 3575610: /*type*/ return new Property("type", "CodeableConcept", "Database or book.", 0, 1, type);
+ case -1618432855: /*identifier*/ return new Property("identifier", "Identifier", "Identifiers may include ISBN (International Standard Book Number) for books.", 0, java.lang.Integer.MAX_VALUE, identifier);
+ case 3373707: /*name*/ return new Property("name", "string", "Name of the database or title of the book.", 0, 1, name);
+ case 1447404028: /*publisher*/ return new Property("publisher", "Reference(Organization)", "Name of the publisher.", 0, 1, publisher);
+ case -1281627695: /*publisherLocation*/ return new Property("publisherLocation", "string", "Geographic location of the publisher.", 0, 1, publisherLocation);
+ case -2129778896: /*startDate*/ return new Property("startDate", "date", "When the database was first available or when the book was published.", 0, 1, startDate);
+ default: return super.getNamedProperty(_hash, _name, _checkValid);
+ }
+
+ }
+
+ @Override
+ public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException {
+ switch (hash) {
+ case 3575610: /*type*/ return this.type == null ? new Base[0] : new Base[] {this.type}; // CodeableConcept
+ case -1618432855: /*identifier*/ return this.identifier == null ? new Base[0] : this.identifier.toArray(new Base[this.identifier.size()]); // Identifier
+ case 3373707: /*name*/ return this.name == null ? new Base[0] : new Base[] {this.name}; // StringType
+ case 1447404028: /*publisher*/ return this.publisher == null ? new Base[0] : new Base[] {this.publisher}; // Reference
+ case -1281627695: /*publisherLocation*/ return this.publisherLocation == null ? new Base[0] : new Base[] {this.publisherLocation}; // StringType
+ case -2129778896: /*startDate*/ return this.startDate == null ? new Base[0] : new Base[] {this.startDate}; // DateType
+ default: return super.getProperty(hash, name, checkValid);
+ }
+
+ }
+
+ @Override
+ public Base setProperty(int hash, String name, Base value) throws FHIRException {
+ switch (hash) {
+ case 3575610: // type
+ this.type = TypeConvertor.castToCodeableConcept(value); // CodeableConcept
+ return value;
+ case -1618432855: // identifier
+ this.getIdentifier().add(TypeConvertor.castToIdentifier(value)); // Identifier
+ return value;
+ case 3373707: // name
+ this.name = TypeConvertor.castToString(value); // StringType
+ return value;
+ case 1447404028: // publisher
+ this.publisher = TypeConvertor.castToReference(value); // Reference
+ return value;
+ case -1281627695: // publisherLocation
+ this.publisherLocation = TypeConvertor.castToString(value); // StringType
+ return value;
+ case -2129778896: // startDate
+ this.startDate = TypeConvertor.castToDate(value); // DateType
+ return value;
+ default: return super.setProperty(hash, name, value);
+ }
+
+ }
+
+ @Override
+ public Base setProperty(String name, Base value) throws FHIRException {
+ if (name.equals("type")) {
+ this.type = TypeConvertor.castToCodeableConcept(value); // CodeableConcept
+ } else if (name.equals("identifier")) {
+ this.getIdentifier().add(TypeConvertor.castToIdentifier(value));
+ } else if (name.equals("name")) {
+ this.name = TypeConvertor.castToString(value); // StringType
+ } else if (name.equals("publisher")) {
+ this.publisher = TypeConvertor.castToReference(value); // Reference
+ } else if (name.equals("publisherLocation")) {
+ this.publisherLocation = TypeConvertor.castToString(value); // StringType
+ } else if (name.equals("startDate")) {
+ this.startDate = TypeConvertor.castToDate(value); // DateType
+ } else
+ return super.setProperty(name, value);
+ return value;
+ }
+
+ @Override
+ public Base makeProperty(int hash, String name) throws FHIRException {
+ switch (hash) {
+ case 3575610: return getType();
+ case -1618432855: return addIdentifier();
+ case 3373707: return getNameElement();
+ case 1447404028: return getPublisher();
+ case -1281627695: return getPublisherLocationElement();
+ case -2129778896: return getStartDateElement();
+ default: return super.makeProperty(hash, name);
+ }
+
+ }
+
+ @Override
+ public String[] getTypesForProperty(int hash, String name) throws FHIRException {
+ switch (hash) {
+ case 3575610: /*type*/ return new String[] {"CodeableConcept"};
+ case -1618432855: /*identifier*/ return new String[] {"Identifier"};
+ case 3373707: /*name*/ return new String[] {"string"};
+ case 1447404028: /*publisher*/ return new String[] {"Reference"};
+ case -1281627695: /*publisherLocation*/ return new String[] {"string"};
+ case -2129778896: /*startDate*/ return new String[] {"date"};
+ default: return super.getTypesForProperty(hash, name);
+ }
+
+ }
+
+ @Override
+ public Base addChild(String name) throws FHIRException {
+ if (name.equals("type")) {
+ this.type = new CodeableConcept();
+ return this.type;
+ }
+ else if (name.equals("identifier")) {
+ return addIdentifier();
+ }
+ else if (name.equals("name")) {
+ throw new FHIRException("Cannot call addChild on a primitive type Citation.publicationInfo.publishedIn.name");
+ }
+ else if (name.equals("publisher")) {
+ this.publisher = new Reference();
+ return this.publisher;
+ }
+ else if (name.equals("publisherLocation")) {
+ throw new FHIRException("Cannot call addChild on a primitive type Citation.publicationInfo.publishedIn.publisherLocation");
+ }
+ else if (name.equals("startDate")) {
+ throw new FHIRException("Cannot call addChild on a primitive type Citation.publicationInfo.publishedIn.startDate");
+ }
+ else
+ return super.addChild(name);
+ }
+
+ public CitationPublicationInfoPublishedInComponent copy() {
+ CitationPublicationInfoPublishedInComponent dst = new CitationPublicationInfoPublishedInComponent();
+ copyValues(dst);
+ return dst;
+ }
+
+ public void copyValues(CitationPublicationInfoPublishedInComponent dst) {
+ super.copyValues(dst);
+ dst.type = type == null ? null : type.copy();
+ if (identifier != null) {
+ dst.identifier = new ArrayList();
+ for (Identifier i : identifier)
+ dst.identifier.add(i.copy());
+ };
+ dst.name = name == null ? null : name.copy();
+ dst.publisher = publisher == null ? null : publisher.copy();
+ dst.publisherLocation = publisherLocation == null ? null : publisherLocation.copy();
+ dst.startDate = startDate == null ? null : startDate.copy();
+ }
+
+ @Override
+ public boolean equalsDeep(Base other_) {
+ if (!super.equalsDeep(other_))
+ return false;
+ if (!(other_ instanceof CitationPublicationInfoPublishedInComponent))
+ return false;
+ CitationPublicationInfoPublishedInComponent o = (CitationPublicationInfoPublishedInComponent) other_;
+ return compareDeep(type, o.type, true) && compareDeep(identifier, o.identifier, true) && compareDeep(name, o.name, true)
+ && compareDeep(publisher, o.publisher, true) && compareDeep(publisherLocation, o.publisherLocation, true)
+ && compareDeep(startDate, o.startDate, true);
+ }
+
+ @Override
+ public boolean equalsShallow(Base other_) {
+ if (!super.equalsShallow(other_))
+ return false;
+ if (!(other_ instanceof CitationPublicationInfoPublishedInComponent))
+ return false;
+ CitationPublicationInfoPublishedInComponent o = (CitationPublicationInfoPublishedInComponent) other_;
+ return compareValues(name, o.name, true) && compareValues(publisherLocation, o.publisherLocation, true)
+ && compareValues(startDate, o.startDate, true);
+ }
+
+ public boolean isEmpty() {
+ return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(type, identifier, name, publisher
+ , publisherLocation, startDate);
+ }
+
+ public String fhirType() {
+ return "Citation.publicationInfo.publishedIn";
+
+ }
+
}
@Block()
@@ -2250,45 +3850,44 @@ public class Citation extends MetadataResource {
}
@Block()
- public static class CitationAuthorListComponent extends BackboneElement implements IBaseBackboneElement {
+ public static class CitationContributorshipComponent extends BackboneElement implements IBaseBackboneElement {
/**
- * Indicates if the list includes all authors, else “et al” should be appended for display.
+ * Indicates if the list includes all authors and/or contributors.
*/
@Child(name = "complete", type = {BooleanType.class}, order=1, min=0, max=1, modifier=false, summary=false)
- @Description(shortDefinition="Indicates if the list includes all authors, else “et al” should be appended for display", formalDefinition="Indicates if the list includes all authors, else “et al” should be appended for display." )
+ @Description(shortDefinition="Indicates if the list includes all authors and/or contributors", formalDefinition="Indicates if the list includes all authors and/or contributors." )
protected BooleanType complete;
/**
- * An individual entity named in the author list.
+ * An individual entity named in the author list or contributor list.
*/
- @Child(name = "author", type = {}, order=2, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
- @Description(shortDefinition="An individual entity named in the author list", formalDefinition="An individual entity named in the author list." )
- protected List author;
+ @Child(name = "entry", type = {}, order=2, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+ @Description(shortDefinition="An individual entity named in the list", formalDefinition="An individual entity named in the author list or contributor list." )
+ protected List entry;
- private static final long serialVersionUID = -204175482L;
+ /**
+ * Used to record a display of the author/contributor list without separate coding for each list member.
+ */
+ @Child(name = "summary", type = {}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+ @Description(shortDefinition="Used to record a display of the author/contributor list without separate coding for each list member", formalDefinition="Used to record a display of the author/contributor list without separate coding for each list member." )
+ protected List summary;
+
+ private static final long serialVersionUID = -1399349675L;
/**
* Constructor
*/
- public CitationAuthorListComponent() {
+ public CitationContributorshipComponent() {
super();
}
- /**
- * Constructor
- */
- public CitationAuthorListComponent(CitationAuthorListAuthorComponent author) {
- super();
- this.addAuthor(author);
- }
-
/**
- * @return {@link #complete} (Indicates if the list includes all authors, else “et al” should be appended for display.). This is the underlying object with id, value and extensions. The accessor "getComplete" gives direct access to the value
+ * @return {@link #complete} (Indicates if the list includes all authors and/or contributors.). This is the underlying object with id, value and extensions. The accessor "getComplete" gives direct access to the value
*/
public BooleanType getCompleteElement() {
if (this.complete == null)
if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create CitationAuthorListComponent.complete");
+ throw new Error("Attempt to auto-create CitationContributorshipComponent.complete");
else if (Configuration.doAutoCreate())
this.complete = new BooleanType(); // bb
return this.complete;
@@ -2303,24 +3902,24 @@ public class Citation extends MetadataResource {
}
/**
- * @param value {@link #complete} (Indicates if the list includes all authors, else “et al” should be appended for display.). This is the underlying object with id, value and extensions. The accessor "getComplete" gives direct access to the value
+ * @param value {@link #complete} (Indicates if the list includes all authors and/or contributors.). This is the underlying object with id, value and extensions. The accessor "getComplete" gives direct access to the value
*/
- public CitationAuthorListComponent setCompleteElement(BooleanType value) {
+ public CitationContributorshipComponent setCompleteElement(BooleanType value) {
this.complete = value;
return this;
}
/**
- * @return Indicates if the list includes all authors, else “et al” should be appended for display.
+ * @return Indicates if the list includes all authors and/or contributors.
*/
public boolean getComplete() {
return this.complete == null || this.complete.isEmpty() ? false : this.complete.getValue();
}
/**
- * @param value Indicates if the list includes all authors, else “et al” should be appended for display.
+ * @param value Indicates if the list includes all authors and/or contributors.
*/
- public CitationAuthorListComponent setComplete(boolean value) {
+ public CitationContributorshipComponent setComplete(boolean value) {
if (this.complete == null)
this.complete = new BooleanType();
this.complete.setValue(value);
@@ -2328,69 +3927,124 @@ public class Citation extends MetadataResource {
}
/**
- * @return {@link #author} (An individual entity named in the author list.)
+ * @return {@link #entry} (An individual entity named in the author list or contributor list.)
*/
- public List getAuthor() {
- if (this.author == null)
- this.author = new ArrayList();
- return this.author;
+ public List getEntry() {
+ if (this.entry == null)
+ this.entry = new ArrayList();
+ return this.entry;
}
/**
* @return Returns a reference to this
for easy method chaining
*/
- public CitationAuthorListComponent setAuthor(List theAuthor) {
- this.author = theAuthor;
+ public CitationContributorshipComponent setEntry(List theEntry) {
+ this.entry = theEntry;
return this;
}
- public boolean hasAuthor() {
- if (this.author == null)
+ public boolean hasEntry() {
+ if (this.entry == null)
return false;
- for (CitationAuthorListAuthorComponent item : this.author)
+ for (CitationContributorshipEntryComponent item : this.entry)
if (!item.isEmpty())
return true;
return false;
}
- public CitationAuthorListAuthorComponent addAuthor() { //3
- CitationAuthorListAuthorComponent t = new CitationAuthorListAuthorComponent();
- if (this.author == null)
- this.author = new ArrayList();
- this.author.add(t);
+ public CitationContributorshipEntryComponent addEntry() { //3
+ CitationContributorshipEntryComponent t = new CitationContributorshipEntryComponent();
+ if (this.entry == null)
+ this.entry = new ArrayList();
+ this.entry.add(t);
return t;
}
- public CitationAuthorListComponent addAuthor(CitationAuthorListAuthorComponent t) { //3
+ public CitationContributorshipComponent addEntry(CitationContributorshipEntryComponent t) { //3
if (t == null)
return this;
- if (this.author == null)
- this.author = new ArrayList();
- this.author.add(t);
+ if (this.entry == null)
+ this.entry = new ArrayList();
+ this.entry.add(t);
return this;
}
/**
- * @return The first repetition of repeating field {@link #author}, creating it if it does not already exist {3}
+ * @return The first repetition of repeating field {@link #entry}, creating it if it does not already exist {3}
*/
- public CitationAuthorListAuthorComponent getAuthorFirstRep() {
- if (getAuthor().isEmpty()) {
- addAuthor();
+ public CitationContributorshipEntryComponent getEntryFirstRep() {
+ if (getEntry().isEmpty()) {
+ addEntry();
}
- return getAuthor().get(0);
+ return getEntry().get(0);
+ }
+
+ /**
+ * @return {@link #summary} (Used to record a display of the author/contributor list without separate coding for each list member.)
+ */
+ public List getSummary() {
+ if (this.summary == null)
+ this.summary = new ArrayList();
+ return this.summary;
+ }
+
+ /**
+ * @return Returns a reference to this
for easy method chaining
+ */
+ public CitationContributorshipComponent setSummary(List theSummary) {
+ this.summary = theSummary;
+ return this;
+ }
+
+ public boolean hasSummary() {
+ if (this.summary == null)
+ return false;
+ for (CitationContributorshipSummaryComponent item : this.summary)
+ if (!item.isEmpty())
+ return true;
+ return false;
+ }
+
+ public CitationContributorshipSummaryComponent addSummary() { //3
+ CitationContributorshipSummaryComponent t = new CitationContributorshipSummaryComponent();
+ if (this.summary == null)
+ this.summary = new ArrayList();
+ this.summary.add(t);
+ return t;
+ }
+
+ public CitationContributorshipComponent addSummary(CitationContributorshipSummaryComponent t) { //3
+ if (t == null)
+ return this;
+ if (this.summary == null)
+ this.summary = new ArrayList();
+ this.summary.add(t);
+ return this;
+ }
+
+ /**
+ * @return The first repetition of repeating field {@link #summary}, creating it if it does not already exist {3}
+ */
+ public CitationContributorshipSummaryComponent getSummaryFirstRep() {
+ if (getSummary().isEmpty()) {
+ addSummary();
+ }
+ return getSummary().get(0);
}
protected void listChildren(List children) {
super.listChildren(children);
- children.add(new Property("complete", "boolean", "Indicates if the list includes all authors, else “et al” should be appended for display.", 0, 1, complete));
- children.add(new Property("author", "", "An individual entity named in the author list.", 0, java.lang.Integer.MAX_VALUE, author));
+ children.add(new Property("complete", "boolean", "Indicates if the list includes all authors and/or contributors.", 0, 1, complete));
+ children.add(new Property("entry", "", "An individual entity named in the author list or contributor list.", 0, java.lang.Integer.MAX_VALUE, entry));
+ children.add(new Property("summary", "", "Used to record a display of the author/contributor list without separate coding for each list member.", 0, java.lang.Integer.MAX_VALUE, summary));
}
@Override
public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException {
switch (_hash) {
- case -599445191: /*complete*/ return new Property("complete", "boolean", "Indicates if the list includes all authors, else “et al” should be appended for display.", 0, 1, complete);
- case -1406328437: /*author*/ return new Property("author", "", "An individual entity named in the author list.", 0, java.lang.Integer.MAX_VALUE, author);
+ case -599445191: /*complete*/ return new Property("complete", "boolean", "Indicates if the list includes all authors and/or contributors.", 0, 1, complete);
+ case 96667762: /*entry*/ return new Property("entry", "", "An individual entity named in the author list or contributor list.", 0, java.lang.Integer.MAX_VALUE, entry);
+ case -1857640538: /*summary*/ return new Property("summary", "", "Used to record a display of the author/contributor list without separate coding for each list member.", 0, java.lang.Integer.MAX_VALUE, summary);
default: return super.getNamedProperty(_hash, _name, _checkValid);
}
@@ -2400,7 +4054,8 @@ public class Citation extends MetadataResource {
public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException {
switch (hash) {
case -599445191: /*complete*/ return this.complete == null ? new Base[0] : new Base[] {this.complete}; // BooleanType
- case -1406328437: /*author*/ return this.author == null ? new Base[0] : this.author.toArray(new Base[this.author.size()]); // CitationAuthorListAuthorComponent
+ case 96667762: /*entry*/ return this.entry == null ? new Base[0] : this.entry.toArray(new Base[this.entry.size()]); // CitationContributorshipEntryComponent
+ case -1857640538: /*summary*/ return this.summary == null ? new Base[0] : this.summary.toArray(new Base[this.summary.size()]); // CitationContributorshipSummaryComponent
default: return super.getProperty(hash, name, checkValid);
}
@@ -2412,8 +4067,11 @@ public class Citation extends MetadataResource {
case -599445191: // complete
this.complete = TypeConvertor.castToBoolean(value); // BooleanType
return value;
- case -1406328437: // author
- this.getAuthor().add((CitationAuthorListAuthorComponent) value); // CitationAuthorListAuthorComponent
+ case 96667762: // entry
+ this.getEntry().add((CitationContributorshipEntryComponent) value); // CitationContributorshipEntryComponent
+ return value;
+ case -1857640538: // summary
+ this.getSummary().add((CitationContributorshipSummaryComponent) value); // CitationContributorshipSummaryComponent
return value;
default: return super.setProperty(hash, name, value);
}
@@ -2424,8 +4082,10 @@ public class Citation extends MetadataResource {
public Base setProperty(String name, Base value) throws FHIRException {
if (name.equals("complete")) {
this.complete = TypeConvertor.castToBoolean(value); // BooleanType
- } else if (name.equals("author")) {
- this.getAuthor().add((CitationAuthorListAuthorComponent) value);
+ } else if (name.equals("entry")) {
+ this.getEntry().add((CitationContributorshipEntryComponent) value);
+ } else if (name.equals("summary")) {
+ this.getSummary().add((CitationContributorshipSummaryComponent) value);
} else
return super.setProperty(name, value);
return value;
@@ -2435,7 +4095,8 @@ public class Citation extends MetadataResource {
public Base makeProperty(int hash, String name) throws FHIRException {
switch (hash) {
case -599445191: return getCompleteElement();
- case -1406328437: return addAuthor();
+ case 96667762: return addEntry();
+ case -1857640538: return addSummary();
default: return super.makeProperty(hash, name);
}
@@ -2445,7 +4106,8 @@ public class Citation extends MetadataResource {
public String[] getTypesForProperty(int hash, String name) throws FHIRException {
switch (hash) {
case -599445191: /*complete*/ return new String[] {"boolean"};
- case -1406328437: /*author*/ return new String[] {};
+ case 96667762: /*entry*/ return new String[] {};
+ case -1857640538: /*summary*/ return new String[] {};
default: return super.getTypesForProperty(hash, name);
}
@@ -2454,28 +4116,36 @@ public class Citation extends MetadataResource {
@Override
public Base addChild(String name) throws FHIRException {
if (name.equals("complete")) {
- throw new FHIRException("Cannot call addChild on a primitive type Citation.authorList.complete");
+ throw new FHIRException("Cannot call addChild on a primitive type Citation.contributorship.complete");
}
- else if (name.equals("author")) {
- return addAuthor();
+ else if (name.equals("entry")) {
+ return addEntry();
+ }
+ else if (name.equals("summary")) {
+ return addSummary();
}
else
return super.addChild(name);
}
- public CitationAuthorListComponent copy() {
- CitationAuthorListComponent dst = new CitationAuthorListComponent();
+ public CitationContributorshipComponent copy() {
+ CitationContributorshipComponent dst = new CitationContributorshipComponent();
copyValues(dst);
return dst;
}
- public void copyValues(CitationAuthorListComponent dst) {
+ public void copyValues(CitationContributorshipComponent dst) {
super.copyValues(dst);
dst.complete = complete == null ? null : complete.copy();
- if (author != null) {
- dst.author = new ArrayList();
- for (CitationAuthorListAuthorComponent i : author)
- dst.author.add(i.copy());
+ if (entry != null) {
+ dst.entry = new ArrayList();
+ for (CitationContributorshipEntryComponent i : entry)
+ dst.entry.add(i.copy());
+ };
+ if (summary != null) {
+ dst.summary = new ArrayList();
+ for (CitationContributorshipSummaryComponent i : summary)
+ dst.summary.add(i.copy());
};
}
@@ -2483,98 +4153,101 @@ public class Citation extends MetadataResource {
public boolean equalsDeep(Base other_) {
if (!super.equalsDeep(other_))
return false;
- if (!(other_ instanceof CitationAuthorListComponent))
+ if (!(other_ instanceof CitationContributorshipComponent))
return false;
- CitationAuthorListComponent o = (CitationAuthorListComponent) other_;
- return compareDeep(complete, o.complete, true) && compareDeep(author, o.author, true);
+ CitationContributorshipComponent o = (CitationContributorshipComponent) other_;
+ return compareDeep(complete, o.complete, true) && compareDeep(entry, o.entry, true) && compareDeep(summary, o.summary, true)
+ ;
}
@Override
public boolean equalsShallow(Base other_) {
if (!super.equalsShallow(other_))
return false;
- if (!(other_ instanceof CitationAuthorListComponent))
+ if (!(other_ instanceof CitationContributorshipComponent))
return false;
- CitationAuthorListComponent o = (CitationAuthorListComponent) other_;
+ CitationContributorshipComponent o = (CitationContributorshipComponent) other_;
return compareValues(complete, o.complete, true);
}
public boolean isEmpty() {
- return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(complete, author);
+ return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(complete, entry, summary
+ );
}
public String fhirType() {
- return "Citation.authorList";
+ return "Citation.contributorship";
}
}
@Block()
- public static class CitationAuthorListAuthorComponent extends BackboneElement implements IBaseBackboneElement {
+ public static class CitationContributorshipEntryComponent extends BackboneElement implements IBaseBackboneElement {
/**
- * Surname or single name.
+ * A name associated with the individual.
*/
- @Child(name = "lastName", type = {StringType.class}, order=1, min=0, max=1, modifier=false, summary=false)
- @Description(shortDefinition="Surname or single name", formalDefinition="Surname or single name." )
- protected StringType lastName;
-
- /**
- * Remainder of name except for suffix.
- */
- @Child(name = "foreName", type = {StringType.class}, order=2, min=0, max=1, modifier=false, summary=false)
- @Description(shortDefinition="Remainder of name except for suffix", formalDefinition="Remainder of name except for suffix." )
- protected StringType foreName;
-
- /**
- * Eg 2nd, 3rd, Jr, Sr.
- */
- @Child(name = "suffix", type = {StringType.class}, order=3, min=0, max=1, modifier=false, summary=false)
- @Description(shortDefinition="Eg 2nd, 3rd, Jr, Sr", formalDefinition="Eg 2nd, 3rd, Jr, Sr." )
- protected StringType suffix;
+ @Child(name = "name", type = {HumanName.class}, order=1, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="A name associated with the person", formalDefinition="A name associated with the individual." )
+ protected HumanName name;
/**
* Initials for forename.
*/
- @Child(name = "initials", type = {StringType.class}, order=4, min=0, max=1, modifier=false, summary=false)
+ @Child(name = "initials", type = {StringType.class}, order=2, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="Initials for forename", formalDefinition="Initials for forename." )
protected StringType initials;
/**
* Used for collective or corporate name as an author.
*/
- @Child(name = "collectiveName", type = {StringType.class}, order=5, min=0, max=1, modifier=false, summary=false)
+ @Child(name = "collectiveName", type = {StringType.class}, order=3, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="Used for collective or corporate name as an author", formalDefinition="Used for collective or corporate name as an author." )
protected StringType collectiveName;
/**
- * Author identifier, eg ORCID.
+ * Unique person identifier.
*/
- @Child(name = "identifier", type = {Identifier.class}, order=6, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
- @Description(shortDefinition="Author identifier, eg ORCID", formalDefinition="Author identifier, eg ORCID." )
+ @Child(name = "identifier", type = {Identifier.class}, order=4, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+ @Description(shortDefinition="Author identifier, eg ORCID", formalDefinition="Unique person identifier." )
protected List identifier;
/**
- * Organizational affiliation.
+ * Organization affiliated with the entity.
*/
- @Child(name = "affiliationInfo", type = {}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
- @Description(shortDefinition="Organizational affiliation", formalDefinition="Organizational affiliation." )
- protected List affiliationInfo;
+ @Child(name = "affiliationInfo", type = {}, order=5, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+ @Description(shortDefinition="Organizational affiliation", formalDefinition="Organization affiliated with the entity." )
+ protected List affiliationInfo;
/**
- * Physical mailing address for the author.
+ * Physical mailing address for the author or contributor.
*/
- @Child(name = "address", type = {StringType.class}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
- @Description(shortDefinition="Physical mailing address for the author", formalDefinition="Physical mailing address for the author." )
- protected List address;
+ @Child(name = "address", type = {Address.class}, order=6, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+ @Description(shortDefinition="Physical mailing address", formalDefinition="Physical mailing address for the author or contributor." )
+ protected List address;
/**
- * Email or telephone contact methods for the author.
+ * Email or telephone contact methods for the author or contributor.
*/
- @Child(name = "telecom", type = {ContactPoint.class}, order=9, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
- @Description(shortDefinition="Email or telephone contact methods for the author", formalDefinition="Email or telephone contact methods for the author." )
+ @Child(name = "telecom", type = {ContactPoint.class}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+ @Description(shortDefinition="Email or telephone contact methods for", formalDefinition="Email or telephone contact methods for the author or contributor." )
protected List telecom;
+ /**
+ * This element identifies the specific nature of an individual’s contribution with respect to the cited work.
+ */
+ @Child(name = "contribution", type = {CodeableConcept.class}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+ @Description(shortDefinition="The specific contributions", formalDefinition="This element identifies the specific nature of an individual’s contribution with respect to the cited work." )
+ @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/citation-contribution")
+ protected List contribution;
+
+ /**
+ * False, missing, or empty elements implies authorship.
+ */
+ @Child(name = "notAnAuthor", type = {BooleanType.class}, order=9, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Used to identify non-author contributors", formalDefinition="False, missing, or empty elements implies authorship." )
+ protected BooleanType notAnAuthor;
+
/**
* Indication of which author is the corresponding author for the article cited.
*/
@@ -2589,159 +4262,36 @@ public class Citation extends MetadataResource {
@Description(shortDefinition="Used to code order of authors", formalDefinition="Used to code order of authors." )
protected PositiveIntType listOrder;
- private static final long serialVersionUID = 1461164632L;
+ private static final long serialVersionUID = -298558035L;
/**
* Constructor
*/
- public CitationAuthorListAuthorComponent() {
+ public CitationContributorshipEntryComponent() {
super();
}
/**
- * @return {@link #lastName} (Surname or single name.). This is the underlying object with id, value and extensions. The accessor "getLastName" gives direct access to the value
+ * @return {@link #name} (A name associated with the individual.)
*/
- public StringType getLastNameElement() {
- if (this.lastName == null)
+ public HumanName getName() {
+ if (this.name == null)
if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create CitationAuthorListAuthorComponent.lastName");
+ throw new Error("Attempt to auto-create CitationContributorshipEntryComponent.name");
else if (Configuration.doAutoCreate())
- this.lastName = new StringType(); // bb
- return this.lastName;
+ this.name = new HumanName(); // cc
+ return this.name;
}
- public boolean hasLastNameElement() {
- return this.lastName != null && !this.lastName.isEmpty();
- }
-
- public boolean hasLastName() {
- return this.lastName != null && !this.lastName.isEmpty();
+ public boolean hasName() {
+ return this.name != null && !this.name.isEmpty();
}
/**
- * @param value {@link #lastName} (Surname or single name.). This is the underlying object with id, value and extensions. The accessor "getLastName" gives direct access to the value
+ * @param value {@link #name} (A name associated with the individual.)
*/
- public CitationAuthorListAuthorComponent setLastNameElement(StringType value) {
- this.lastName = value;
- return this;
- }
-
- /**
- * @return Surname or single name.
- */
- public String getLastName() {
- return this.lastName == null ? null : this.lastName.getValue();
- }
-
- /**
- * @param value Surname or single name.
- */
- public CitationAuthorListAuthorComponent setLastName(String value) {
- if (Utilities.noString(value))
- this.lastName = null;
- else {
- if (this.lastName == null)
- this.lastName = new StringType();
- this.lastName.setValue(value);
- }
- return this;
- }
-
- /**
- * @return {@link #foreName} (Remainder of name except for suffix.). This is the underlying object with id, value and extensions. The accessor "getForeName" gives direct access to the value
- */
- public StringType getForeNameElement() {
- if (this.foreName == null)
- if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create CitationAuthorListAuthorComponent.foreName");
- else if (Configuration.doAutoCreate())
- this.foreName = new StringType(); // bb
- return this.foreName;
- }
-
- public boolean hasForeNameElement() {
- return this.foreName != null && !this.foreName.isEmpty();
- }
-
- public boolean hasForeName() {
- return this.foreName != null && !this.foreName.isEmpty();
- }
-
- /**
- * @param value {@link #foreName} (Remainder of name except for suffix.). This is the underlying object with id, value and extensions. The accessor "getForeName" gives direct access to the value
- */
- public CitationAuthorListAuthorComponent setForeNameElement(StringType value) {
- this.foreName = value;
- return this;
- }
-
- /**
- * @return Remainder of name except for suffix.
- */
- public String getForeName() {
- return this.foreName == null ? null : this.foreName.getValue();
- }
-
- /**
- * @param value Remainder of name except for suffix.
- */
- public CitationAuthorListAuthorComponent setForeName(String value) {
- if (Utilities.noString(value))
- this.foreName = null;
- else {
- if (this.foreName == null)
- this.foreName = new StringType();
- this.foreName.setValue(value);
- }
- return this;
- }
-
- /**
- * @return {@link #suffix} (Eg 2nd, 3rd, Jr, Sr.). This is the underlying object with id, value and extensions. The accessor "getSuffix" gives direct access to the value
- */
- public StringType getSuffixElement() {
- if (this.suffix == null)
- if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create CitationAuthorListAuthorComponent.suffix");
- else if (Configuration.doAutoCreate())
- this.suffix = new StringType(); // bb
- return this.suffix;
- }
-
- public boolean hasSuffixElement() {
- return this.suffix != null && !this.suffix.isEmpty();
- }
-
- public boolean hasSuffix() {
- return this.suffix != null && !this.suffix.isEmpty();
- }
-
- /**
- * @param value {@link #suffix} (Eg 2nd, 3rd, Jr, Sr.). This is the underlying object with id, value and extensions. The accessor "getSuffix" gives direct access to the value
- */
- public CitationAuthorListAuthorComponent setSuffixElement(StringType value) {
- this.suffix = value;
- return this;
- }
-
- /**
- * @return Eg 2nd, 3rd, Jr, Sr.
- */
- public String getSuffix() {
- return this.suffix == null ? null : this.suffix.getValue();
- }
-
- /**
- * @param value Eg 2nd, 3rd, Jr, Sr.
- */
- public CitationAuthorListAuthorComponent setSuffix(String value) {
- if (Utilities.noString(value))
- this.suffix = null;
- else {
- if (this.suffix == null)
- this.suffix = new StringType();
- this.suffix.setValue(value);
- }
+ public CitationContributorshipEntryComponent setName(HumanName value) {
+ this.name = value;
return this;
}
@@ -2751,7 +4301,7 @@ public class Citation extends MetadataResource {
public StringType getInitialsElement() {
if (this.initials == null)
if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create CitationAuthorListAuthorComponent.initials");
+ throw new Error("Attempt to auto-create CitationContributorshipEntryComponent.initials");
else if (Configuration.doAutoCreate())
this.initials = new StringType(); // bb
return this.initials;
@@ -2768,7 +4318,7 @@ public class Citation extends MetadataResource {
/**
* @param value {@link #initials} (Initials for forename.). This is the underlying object with id, value and extensions. The accessor "getInitials" gives direct access to the value
*/
- public CitationAuthorListAuthorComponent setInitialsElement(StringType value) {
+ public CitationContributorshipEntryComponent setInitialsElement(StringType value) {
this.initials = value;
return this;
}
@@ -2783,7 +4333,7 @@ public class Citation extends MetadataResource {
/**
* @param value Initials for forename.
*/
- public CitationAuthorListAuthorComponent setInitials(String value) {
+ public CitationContributorshipEntryComponent setInitials(String value) {
if (Utilities.noString(value))
this.initials = null;
else {
@@ -2800,7 +4350,7 @@ public class Citation extends MetadataResource {
public StringType getCollectiveNameElement() {
if (this.collectiveName == null)
if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create CitationAuthorListAuthorComponent.collectiveName");
+ throw new Error("Attempt to auto-create CitationContributorshipEntryComponent.collectiveName");
else if (Configuration.doAutoCreate())
this.collectiveName = new StringType(); // bb
return this.collectiveName;
@@ -2817,7 +4367,7 @@ public class Citation extends MetadataResource {
/**
* @param value {@link #collectiveName} (Used for collective or corporate name as an author.). This is the underlying object with id, value and extensions. The accessor "getCollectiveName" gives direct access to the value
*/
- public CitationAuthorListAuthorComponent setCollectiveNameElement(StringType value) {
+ public CitationContributorshipEntryComponent setCollectiveNameElement(StringType value) {
this.collectiveName = value;
return this;
}
@@ -2832,7 +4382,7 @@ public class Citation extends MetadataResource {
/**
* @param value Used for collective or corporate name as an author.
*/
- public CitationAuthorListAuthorComponent setCollectiveName(String value) {
+ public CitationContributorshipEntryComponent setCollectiveName(String value) {
if (Utilities.noString(value))
this.collectiveName = null;
else {
@@ -2844,7 +4394,7 @@ public class Citation extends MetadataResource {
}
/**
- * @return {@link #identifier} (Author identifier, eg ORCID.)
+ * @return {@link #identifier} (Unique person identifier.)
*/
public List getIdentifier() {
if (this.identifier == null)
@@ -2855,7 +4405,7 @@ public class Citation extends MetadataResource {
/**
* @return Returns a reference to this
for easy method chaining
*/
- public CitationAuthorListAuthorComponent setIdentifier(List theIdentifier) {
+ public CitationContributorshipEntryComponent setIdentifier(List theIdentifier) {
this.identifier = theIdentifier;
return this;
}
@@ -2877,7 +4427,7 @@ public class Citation extends MetadataResource {
return t;
}
- public CitationAuthorListAuthorComponent addIdentifier(Identifier t) { //3
+ public CitationContributorshipEntryComponent addIdentifier(Identifier t) { //3
if (t == null)
return this;
if (this.identifier == null)
@@ -2897,18 +4447,18 @@ public class Citation extends MetadataResource {
}
/**
- * @return {@link #affiliationInfo} (Organizational affiliation.)
+ * @return {@link #affiliationInfo} (Organization affiliated with the entity.)
*/
- public List getAffiliationInfo() {
+ public List getAffiliationInfo() {
if (this.affiliationInfo == null)
- this.affiliationInfo = new ArrayList();
+ this.affiliationInfo = new ArrayList();
return this.affiliationInfo;
}
/**
* @return Returns a reference to this
for easy method chaining
*/
- public CitationAuthorListAuthorComponent setAffiliationInfo(List theAffiliationInfo) {
+ public CitationContributorshipEntryComponent setAffiliationInfo(List theAffiliationInfo) {
this.affiliationInfo = theAffiliationInfo;
return this;
}
@@ -2916,25 +4466,25 @@ public class Citation extends MetadataResource {
public boolean hasAffiliationInfo() {
if (this.affiliationInfo == null)
return false;
- for (CitationAuthorListAuthorAffiliationInfoComponent item : this.affiliationInfo)
+ for (CitationContributorshipEntryAffiliationInfoComponent item : this.affiliationInfo)
if (!item.isEmpty())
return true;
return false;
}
- public CitationAuthorListAuthorAffiliationInfoComponent addAffiliationInfo() { //3
- CitationAuthorListAuthorAffiliationInfoComponent t = new CitationAuthorListAuthorAffiliationInfoComponent();
+ public CitationContributorshipEntryAffiliationInfoComponent addAffiliationInfo() { //3
+ CitationContributorshipEntryAffiliationInfoComponent t = new CitationContributorshipEntryAffiliationInfoComponent();
if (this.affiliationInfo == null)
- this.affiliationInfo = new ArrayList();
+ this.affiliationInfo = new ArrayList();
this.affiliationInfo.add(t);
return t;
}
- public CitationAuthorListAuthorComponent addAffiliationInfo(CitationAuthorListAuthorAffiliationInfoComponent t) { //3
+ public CitationContributorshipEntryComponent addAffiliationInfo(CitationContributorshipEntryAffiliationInfoComponent t) { //3
if (t == null)
return this;
if (this.affiliationInfo == null)
- this.affiliationInfo = new ArrayList();
+ this.affiliationInfo = new ArrayList();
this.affiliationInfo.add(t);
return this;
}
@@ -2942,7 +4492,7 @@ public class Citation extends MetadataResource {
/**
* @return The first repetition of repeating field {@link #affiliationInfo}, creating it if it does not already exist {3}
*/
- public CitationAuthorListAuthorAffiliationInfoComponent getAffiliationInfoFirstRep() {
+ public CitationContributorshipEntryAffiliationInfoComponent getAffiliationInfoFirstRep() {
if (getAffiliationInfo().isEmpty()) {
addAffiliationInfo();
}
@@ -2950,18 +4500,18 @@ public class Citation extends MetadataResource {
}
/**
- * @return {@link #address} (Physical mailing address for the author.)
+ * @return {@link #address} (Physical mailing address for the author or contributor.)
*/
- public List getAddress() {
+ public List getAddress() {
if (this.address == null)
- this.address = new ArrayList();
+ this.address = new ArrayList();
return this.address;
}
/**
* @return Returns a reference to this
for easy method chaining
*/
- public CitationAuthorListAuthorComponent setAddress(List theAddress) {
+ public CitationContributorshipEntryComponent setAddress(List theAddress) {
this.address = theAddress;
return this;
}
@@ -2969,49 +4519,41 @@ public class Citation extends MetadataResource {
public boolean hasAddress() {
if (this.address == null)
return false;
- for (StringType item : this.address)
+ for (Address item : this.address)
if (!item.isEmpty())
return true;
return false;
}
- /**
- * @return {@link #address} (Physical mailing address for the author.)
- */
- public StringType addAddressElement() {//2
- StringType t = new StringType();
+ public Address addAddress() { //3
+ Address t = new Address();
if (this.address == null)
- this.address = new ArrayList();
+ this.address = new ArrayList();
this.address.add(t);
return t;
}
- /**
- * @param value {@link #address} (Physical mailing address for the author.)
- */
- public CitationAuthorListAuthorComponent addAddress(String value) { //1
- StringType t = new StringType();
- t.setValue(value);
+ public CitationContributorshipEntryComponent addAddress(Address t) { //3
+ if (t == null)
+ return this;
if (this.address == null)
- this.address = new ArrayList();
+ this.address = new ArrayList();
this.address.add(t);
return this;
}
/**
- * @param value {@link #address} (Physical mailing address for the author.)
+ * @return The first repetition of repeating field {@link #address}, creating it if it does not already exist {3}
*/
- public boolean hasAddress(String value) {
- if (this.address == null)
- return false;
- for (StringType v : this.address)
- if (v.getValue().equals(value)) // string
- return true;
- return false;
+ public Address getAddressFirstRep() {
+ if (getAddress().isEmpty()) {
+ addAddress();
+ }
+ return getAddress().get(0);
}
/**
- * @return {@link #telecom} (Email or telephone contact methods for the author.)
+ * @return {@link #telecom} (Email or telephone contact methods for the author or contributor.)
*/
public List getTelecom() {
if (this.telecom == null)
@@ -3022,7 +4564,7 @@ public class Citation extends MetadataResource {
/**
* @return Returns a reference to this
for easy method chaining
*/
- public CitationAuthorListAuthorComponent setTelecom(List theTelecom) {
+ public CitationContributorshipEntryComponent setTelecom(List theTelecom) {
this.telecom = theTelecom;
return this;
}
@@ -3044,7 +4586,7 @@ public class Citation extends MetadataResource {
return t;
}
- public CitationAuthorListAuthorComponent addTelecom(ContactPoint t) { //3
+ public CitationContributorshipEntryComponent addTelecom(ContactPoint t) { //3
if (t == null)
return this;
if (this.telecom == null)
@@ -3064,1568 +4606,7 @@ public class Citation extends MetadataResource {
}
/**
- * @return {@link #correspondingAuthor} (Indication of which author is the corresponding author for the article cited.). This is the underlying object with id, value and extensions. The accessor "getCorrespondingAuthor" gives direct access to the value
- */
- public BooleanType getCorrespondingAuthorElement() {
- if (this.correspondingAuthor == null)
- if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create CitationAuthorListAuthorComponent.correspondingAuthor");
- else if (Configuration.doAutoCreate())
- this.correspondingAuthor = new BooleanType(); // bb
- return this.correspondingAuthor;
- }
-
- public boolean hasCorrespondingAuthorElement() {
- return this.correspondingAuthor != null && !this.correspondingAuthor.isEmpty();
- }
-
- public boolean hasCorrespondingAuthor() {
- return this.correspondingAuthor != null && !this.correspondingAuthor.isEmpty();
- }
-
- /**
- * @param value {@link #correspondingAuthor} (Indication of which author is the corresponding author for the article cited.). This is the underlying object with id, value and extensions. The accessor "getCorrespondingAuthor" gives direct access to the value
- */
- public CitationAuthorListAuthorComponent setCorrespondingAuthorElement(BooleanType value) {
- this.correspondingAuthor = value;
- return this;
- }
-
- /**
- * @return Indication of which author is the corresponding author for the article cited.
- */
- public boolean getCorrespondingAuthor() {
- return this.correspondingAuthor == null || this.correspondingAuthor.isEmpty() ? false : this.correspondingAuthor.getValue();
- }
-
- /**
- * @param value Indication of which author is the corresponding author for the article cited.
- */
- public CitationAuthorListAuthorComponent setCorrespondingAuthor(boolean value) {
- if (this.correspondingAuthor == null)
- this.correspondingAuthor = new BooleanType();
- this.correspondingAuthor.setValue(value);
- return this;
- }
-
- /**
- * @return {@link #listOrder} (Used to code order of authors.). This is the underlying object with id, value and extensions. The accessor "getListOrder" gives direct access to the value
- */
- public PositiveIntType getListOrderElement() {
- if (this.listOrder == null)
- if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create CitationAuthorListAuthorComponent.listOrder");
- else if (Configuration.doAutoCreate())
- this.listOrder = new PositiveIntType(); // bb
- return this.listOrder;
- }
-
- public boolean hasListOrderElement() {
- return this.listOrder != null && !this.listOrder.isEmpty();
- }
-
- public boolean hasListOrder() {
- return this.listOrder != null && !this.listOrder.isEmpty();
- }
-
- /**
- * @param value {@link #listOrder} (Used to code order of authors.). This is the underlying object with id, value and extensions. The accessor "getListOrder" gives direct access to the value
- */
- public CitationAuthorListAuthorComponent setListOrderElement(PositiveIntType value) {
- this.listOrder = value;
- return this;
- }
-
- /**
- * @return Used to code order of authors.
- */
- public int getListOrder() {
- return this.listOrder == null || this.listOrder.isEmpty() ? 0 : this.listOrder.getValue();
- }
-
- /**
- * @param value Used to code order of authors.
- */
- public CitationAuthorListAuthorComponent setListOrder(int value) {
- if (this.listOrder == null)
- this.listOrder = new PositiveIntType();
- this.listOrder.setValue(value);
- return this;
- }
-
- protected void listChildren(List children) {
- super.listChildren(children);
- children.add(new Property("lastName", "string", "Surname or single name.", 0, 1, lastName));
- children.add(new Property("foreName", "string", "Remainder of name except for suffix.", 0, 1, foreName));
- children.add(new Property("suffix", "string", "Eg 2nd, 3rd, Jr, Sr.", 0, 1, suffix));
- children.add(new Property("initials", "string", "Initials for forename.", 0, 1, initials));
- children.add(new Property("collectiveName", "string", "Used for collective or corporate name as an author.", 0, 1, collectiveName));
- children.add(new Property("identifier", "Identifier", "Author identifier, eg ORCID.", 0, java.lang.Integer.MAX_VALUE, identifier));
- children.add(new Property("affiliationInfo", "", "Organizational affiliation.", 0, java.lang.Integer.MAX_VALUE, affiliationInfo));
- children.add(new Property("address", "string", "Physical mailing address for the author.", 0, java.lang.Integer.MAX_VALUE, address));
- children.add(new Property("telecom", "ContactPoint", "Email or telephone contact methods for the author.", 0, java.lang.Integer.MAX_VALUE, telecom));
- children.add(new Property("correspondingAuthor", "boolean", "Indication of which author is the corresponding author for the article cited.", 0, 1, correspondingAuthor));
- children.add(new Property("listOrder", "positiveInt", "Used to code order of authors.", 0, 1, listOrder));
- }
-
- @Override
- public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException {
- switch (_hash) {
- case -1459599807: /*lastName*/ return new Property("lastName", "string", "Surname or single name.", 0, 1, lastName);
- case 466107751: /*foreName*/ return new Property("foreName", "string", "Remainder of name except for suffix.", 0, 1, foreName);
- case -891422895: /*suffix*/ return new Property("suffix", "string", "Eg 2nd, 3rd, Jr, Sr.", 0, 1, suffix);
- case 269062575: /*initials*/ return new Property("initials", "string", "Initials for forename.", 0, 1, initials);
- case 502871833: /*collectiveName*/ return new Property("collectiveName", "string", "Used for collective or corporate name as an author.", 0, 1, collectiveName);
- case -1618432855: /*identifier*/ return new Property("identifier", "Identifier", "Author identifier, eg ORCID.", 0, java.lang.Integer.MAX_VALUE, identifier);
- case -215129154: /*affiliationInfo*/ return new Property("affiliationInfo", "", "Organizational affiliation.", 0, java.lang.Integer.MAX_VALUE, affiliationInfo);
- case -1147692044: /*address*/ return new Property("address", "string", "Physical mailing address for the author.", 0, java.lang.Integer.MAX_VALUE, address);
- case -1429363305: /*telecom*/ return new Property("telecom", "ContactPoint", "Email or telephone contact methods for the author.", 0, java.lang.Integer.MAX_VALUE, telecom);
- case 1413890206: /*correspondingAuthor*/ return new Property("correspondingAuthor", "boolean", "Indication of which author is the corresponding author for the article cited.", 0, 1, correspondingAuthor);
- case -1238918832: /*listOrder*/ return new Property("listOrder", "positiveInt", "Used to code order of authors.", 0, 1, listOrder);
- default: return super.getNamedProperty(_hash, _name, _checkValid);
- }
-
- }
-
- @Override
- public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException {
- switch (hash) {
- case -1459599807: /*lastName*/ return this.lastName == null ? new Base[0] : new Base[] {this.lastName}; // StringType
- case 466107751: /*foreName*/ return this.foreName == null ? new Base[0] : new Base[] {this.foreName}; // StringType
- case -891422895: /*suffix*/ return this.suffix == null ? new Base[0] : new Base[] {this.suffix}; // StringType
- case 269062575: /*initials*/ return this.initials == null ? new Base[0] : new Base[] {this.initials}; // StringType
- case 502871833: /*collectiveName*/ return this.collectiveName == null ? new Base[0] : new Base[] {this.collectiveName}; // StringType
- case -1618432855: /*identifier*/ return this.identifier == null ? new Base[0] : this.identifier.toArray(new Base[this.identifier.size()]); // Identifier
- case -215129154: /*affiliationInfo*/ return this.affiliationInfo == null ? new Base[0] : this.affiliationInfo.toArray(new Base[this.affiliationInfo.size()]); // CitationAuthorListAuthorAffiliationInfoComponent
- case -1147692044: /*address*/ return this.address == null ? new Base[0] : this.address.toArray(new Base[this.address.size()]); // StringType
- case -1429363305: /*telecom*/ return this.telecom == null ? new Base[0] : this.telecom.toArray(new Base[this.telecom.size()]); // ContactPoint
- case 1413890206: /*correspondingAuthor*/ return this.correspondingAuthor == null ? new Base[0] : new Base[] {this.correspondingAuthor}; // BooleanType
- case -1238918832: /*listOrder*/ return this.listOrder == null ? new Base[0] : new Base[] {this.listOrder}; // PositiveIntType
- default: return super.getProperty(hash, name, checkValid);
- }
-
- }
-
- @Override
- public Base setProperty(int hash, String name, Base value) throws FHIRException {
- switch (hash) {
- case -1459599807: // lastName
- this.lastName = TypeConvertor.castToString(value); // StringType
- return value;
- case 466107751: // foreName
- this.foreName = TypeConvertor.castToString(value); // StringType
- return value;
- case -891422895: // suffix
- this.suffix = TypeConvertor.castToString(value); // StringType
- return value;
- case 269062575: // initials
- this.initials = TypeConvertor.castToString(value); // StringType
- return value;
- case 502871833: // collectiveName
- this.collectiveName = TypeConvertor.castToString(value); // StringType
- return value;
- case -1618432855: // identifier
- this.getIdentifier().add(TypeConvertor.castToIdentifier(value)); // Identifier
- return value;
- case -215129154: // affiliationInfo
- this.getAffiliationInfo().add((CitationAuthorListAuthorAffiliationInfoComponent) value); // CitationAuthorListAuthorAffiliationInfoComponent
- return value;
- case -1147692044: // address
- this.getAddress().add(TypeConvertor.castToString(value)); // StringType
- return value;
- case -1429363305: // telecom
- this.getTelecom().add(TypeConvertor.castToContactPoint(value)); // ContactPoint
- return value;
- case 1413890206: // correspondingAuthor
- this.correspondingAuthor = TypeConvertor.castToBoolean(value); // BooleanType
- return value;
- case -1238918832: // listOrder
- this.listOrder = TypeConvertor.castToPositiveInt(value); // PositiveIntType
- return value;
- default: return super.setProperty(hash, name, value);
- }
-
- }
-
- @Override
- public Base setProperty(String name, Base value) throws FHIRException {
- if (name.equals("lastName")) {
- this.lastName = TypeConvertor.castToString(value); // StringType
- } else if (name.equals("foreName")) {
- this.foreName = TypeConvertor.castToString(value); // StringType
- } else if (name.equals("suffix")) {
- this.suffix = TypeConvertor.castToString(value); // StringType
- } else if (name.equals("initials")) {
- this.initials = TypeConvertor.castToString(value); // StringType
- } else if (name.equals("collectiveName")) {
- this.collectiveName = TypeConvertor.castToString(value); // StringType
- } else if (name.equals("identifier")) {
- this.getIdentifier().add(TypeConvertor.castToIdentifier(value));
- } else if (name.equals("affiliationInfo")) {
- this.getAffiliationInfo().add((CitationAuthorListAuthorAffiliationInfoComponent) value);
- } else if (name.equals("address")) {
- this.getAddress().add(TypeConvertor.castToString(value));
- } else if (name.equals("telecom")) {
- this.getTelecom().add(TypeConvertor.castToContactPoint(value));
- } else if (name.equals("correspondingAuthor")) {
- this.correspondingAuthor = TypeConvertor.castToBoolean(value); // BooleanType
- } else if (name.equals("listOrder")) {
- this.listOrder = TypeConvertor.castToPositiveInt(value); // PositiveIntType
- } else
- return super.setProperty(name, value);
- return value;
- }
-
- @Override
- public Base makeProperty(int hash, String name) throws FHIRException {
- switch (hash) {
- case -1459599807: return getLastNameElement();
- case 466107751: return getForeNameElement();
- case -891422895: return getSuffixElement();
- case 269062575: return getInitialsElement();
- case 502871833: return getCollectiveNameElement();
- case -1618432855: return addIdentifier();
- case -215129154: return addAffiliationInfo();
- case -1147692044: return addAddressElement();
- case -1429363305: return addTelecom();
- case 1413890206: return getCorrespondingAuthorElement();
- case -1238918832: return getListOrderElement();
- default: return super.makeProperty(hash, name);
- }
-
- }
-
- @Override
- public String[] getTypesForProperty(int hash, String name) throws FHIRException {
- switch (hash) {
- case -1459599807: /*lastName*/ return new String[] {"string"};
- case 466107751: /*foreName*/ return new String[] {"string"};
- case -891422895: /*suffix*/ return new String[] {"string"};
- case 269062575: /*initials*/ return new String[] {"string"};
- case 502871833: /*collectiveName*/ return new String[] {"string"};
- case -1618432855: /*identifier*/ return new String[] {"Identifier"};
- case -215129154: /*affiliationInfo*/ return new String[] {};
- case -1147692044: /*address*/ return new String[] {"string"};
- case -1429363305: /*telecom*/ return new String[] {"ContactPoint"};
- case 1413890206: /*correspondingAuthor*/ return new String[] {"boolean"};
- case -1238918832: /*listOrder*/ return new String[] {"positiveInt"};
- default: return super.getTypesForProperty(hash, name);
- }
-
- }
-
- @Override
- public Base addChild(String name) throws FHIRException {
- if (name.equals("lastName")) {
- throw new FHIRException("Cannot call addChild on a primitive type Citation.authorList.author.lastName");
- }
- else if (name.equals("foreName")) {
- throw new FHIRException("Cannot call addChild on a primitive type Citation.authorList.author.foreName");
- }
- else if (name.equals("suffix")) {
- throw new FHIRException("Cannot call addChild on a primitive type Citation.authorList.author.suffix");
- }
- else if (name.equals("initials")) {
- throw new FHIRException("Cannot call addChild on a primitive type Citation.authorList.author.initials");
- }
- else if (name.equals("collectiveName")) {
- throw new FHIRException("Cannot call addChild on a primitive type Citation.authorList.author.collectiveName");
- }
- else if (name.equals("identifier")) {
- return addIdentifier();
- }
- else if (name.equals("affiliationInfo")) {
- return addAffiliationInfo();
- }
- else if (name.equals("address")) {
- throw new FHIRException("Cannot call addChild on a primitive type Citation.authorList.author.address");
- }
- else if (name.equals("telecom")) {
- return addTelecom();
- }
- else if (name.equals("correspondingAuthor")) {
- throw new FHIRException("Cannot call addChild on a primitive type Citation.authorList.author.correspondingAuthor");
- }
- else if (name.equals("listOrder")) {
- throw new FHIRException("Cannot call addChild on a primitive type Citation.authorList.author.listOrder");
- }
- else
- return super.addChild(name);
- }
-
- public CitationAuthorListAuthorComponent copy() {
- CitationAuthorListAuthorComponent dst = new CitationAuthorListAuthorComponent();
- copyValues(dst);
- return dst;
- }
-
- public void copyValues(CitationAuthorListAuthorComponent dst) {
- super.copyValues(dst);
- dst.lastName = lastName == null ? null : lastName.copy();
- dst.foreName = foreName == null ? null : foreName.copy();
- dst.suffix = suffix == null ? null : suffix.copy();
- dst.initials = initials == null ? null : initials.copy();
- dst.collectiveName = collectiveName == null ? null : collectiveName.copy();
- if (identifier != null) {
- dst.identifier = new ArrayList();
- for (Identifier i : identifier)
- dst.identifier.add(i.copy());
- };
- if (affiliationInfo != null) {
- dst.affiliationInfo = new ArrayList();
- for (CitationAuthorListAuthorAffiliationInfoComponent i : affiliationInfo)
- dst.affiliationInfo.add(i.copy());
- };
- if (address != null) {
- dst.address = new ArrayList();
- for (StringType i : address)
- dst.address.add(i.copy());
- };
- if (telecom != null) {
- dst.telecom = new ArrayList();
- for (ContactPoint i : telecom)
- dst.telecom.add(i.copy());
- };
- dst.correspondingAuthor = correspondingAuthor == null ? null : correspondingAuthor.copy();
- dst.listOrder = listOrder == null ? null : listOrder.copy();
- }
-
- @Override
- public boolean equalsDeep(Base other_) {
- if (!super.equalsDeep(other_))
- return false;
- if (!(other_ instanceof CitationAuthorListAuthorComponent))
- return false;
- CitationAuthorListAuthorComponent o = (CitationAuthorListAuthorComponent) other_;
- return compareDeep(lastName, o.lastName, true) && compareDeep(foreName, o.foreName, true) && compareDeep(suffix, o.suffix, true)
- && compareDeep(initials, o.initials, true) && compareDeep(collectiveName, o.collectiveName, true)
- && compareDeep(identifier, o.identifier, true) && compareDeep(affiliationInfo, o.affiliationInfo, true)
- && compareDeep(address, o.address, true) && compareDeep(telecom, o.telecom, true) && compareDeep(correspondingAuthor, o.correspondingAuthor, true)
- && compareDeep(listOrder, o.listOrder, true);
- }
-
- @Override
- public boolean equalsShallow(Base other_) {
- if (!super.equalsShallow(other_))
- return false;
- if (!(other_ instanceof CitationAuthorListAuthorComponent))
- return false;
- CitationAuthorListAuthorComponent o = (CitationAuthorListAuthorComponent) other_;
- return compareValues(lastName, o.lastName, true) && compareValues(foreName, o.foreName, true) && compareValues(suffix, o.suffix, true)
- && compareValues(initials, o.initials, true) && compareValues(collectiveName, o.collectiveName, true)
- && compareValues(address, o.address, true) && compareValues(correspondingAuthor, o.correspondingAuthor, true)
- && compareValues(listOrder, o.listOrder, true);
- }
-
- public boolean isEmpty() {
- return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(lastName, foreName, suffix
- , initials, collectiveName, identifier, affiliationInfo, address, telecom, correspondingAuthor
- , listOrder);
- }
-
- public String fhirType() {
- return "Citation.authorList.author";
-
- }
-
- }
-
- @Block()
- public static class CitationAuthorListAuthorAffiliationInfoComponent extends BackboneElement implements IBaseBackboneElement {
- /**
- * Display for the organization.
- */
- @Child(name = "affiliation", type = {StringType.class}, order=1, min=0, max=1, modifier=false, summary=false)
- @Description(shortDefinition="Display for the organization", formalDefinition="Display for the organization." )
- protected StringType affiliation;
-
- /**
- * Role.
- */
- @Child(name = "role", type = {StringType.class}, order=2, min=0, max=1, modifier=false, summary=false)
- @Description(shortDefinition="Role", formalDefinition="Role." )
- protected StringType role;
-
- /**
- * Identifier for the organization.
- */
- @Child(name = "identifier", type = {Identifier.class}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
- @Description(shortDefinition="Identifier for the organization", formalDefinition="Identifier for the organization." )
- protected List identifier;
-
- private static final long serialVersionUID = 548335522L;
-
- /**
- * Constructor
- */
- public CitationAuthorListAuthorAffiliationInfoComponent() {
- super();
- }
-
- /**
- * @return {@link #affiliation} (Display for the organization.). This is the underlying object with id, value and extensions. The accessor "getAffiliation" gives direct access to the value
- */
- public StringType getAffiliationElement() {
- if (this.affiliation == null)
- if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create CitationAuthorListAuthorAffiliationInfoComponent.affiliation");
- else if (Configuration.doAutoCreate())
- this.affiliation = new StringType(); // bb
- return this.affiliation;
- }
-
- public boolean hasAffiliationElement() {
- return this.affiliation != null && !this.affiliation.isEmpty();
- }
-
- public boolean hasAffiliation() {
- return this.affiliation != null && !this.affiliation.isEmpty();
- }
-
- /**
- * @param value {@link #affiliation} (Display for the organization.). This is the underlying object with id, value and extensions. The accessor "getAffiliation" gives direct access to the value
- */
- public CitationAuthorListAuthorAffiliationInfoComponent setAffiliationElement(StringType value) {
- this.affiliation = value;
- return this;
- }
-
- /**
- * @return Display for the organization.
- */
- public String getAffiliation() {
- return this.affiliation == null ? null : this.affiliation.getValue();
- }
-
- /**
- * @param value Display for the organization.
- */
- public CitationAuthorListAuthorAffiliationInfoComponent setAffiliation(String value) {
- if (Utilities.noString(value))
- this.affiliation = null;
- else {
- if (this.affiliation == null)
- this.affiliation = new StringType();
- this.affiliation.setValue(value);
- }
- return this;
- }
-
- /**
- * @return {@link #role} (Role.). This is the underlying object with id, value and extensions. The accessor "getRole" gives direct access to the value
- */
- public StringType getRoleElement() {
- if (this.role == null)
- if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create CitationAuthorListAuthorAffiliationInfoComponent.role");
- else if (Configuration.doAutoCreate())
- this.role = new StringType(); // bb
- return this.role;
- }
-
- public boolean hasRoleElement() {
- return this.role != null && !this.role.isEmpty();
- }
-
- public boolean hasRole() {
- return this.role != null && !this.role.isEmpty();
- }
-
- /**
- * @param value {@link #role} (Role.). This is the underlying object with id, value and extensions. The accessor "getRole" gives direct access to the value
- */
- public CitationAuthorListAuthorAffiliationInfoComponent setRoleElement(StringType value) {
- this.role = value;
- return this;
- }
-
- /**
- * @return Role.
- */
- public String getRole() {
- return this.role == null ? null : this.role.getValue();
- }
-
- /**
- * @param value Role.
- */
- public CitationAuthorListAuthorAffiliationInfoComponent setRole(String value) {
- if (Utilities.noString(value))
- this.role = null;
- else {
- if (this.role == null)
- this.role = new StringType();
- this.role.setValue(value);
- }
- return this;
- }
-
- /**
- * @return {@link #identifier} (Identifier for the organization.)
- */
- public List getIdentifier() {
- if (this.identifier == null)
- this.identifier = new ArrayList();
- return this.identifier;
- }
-
- /**
- * @return Returns a reference to this
for easy method chaining
- */
- public CitationAuthorListAuthorAffiliationInfoComponent setIdentifier(List theIdentifier) {
- this.identifier = theIdentifier;
- return this;
- }
-
- public boolean hasIdentifier() {
- if (this.identifier == null)
- return false;
- for (Identifier item : this.identifier)
- if (!item.isEmpty())
- return true;
- return false;
- }
-
- public Identifier addIdentifier() { //3
- Identifier t = new Identifier();
- if (this.identifier == null)
- this.identifier = new ArrayList();
- this.identifier.add(t);
- return t;
- }
-
- public CitationAuthorListAuthorAffiliationInfoComponent addIdentifier(Identifier t) { //3
- if (t == null)
- return this;
- if (this.identifier == null)
- this.identifier = new ArrayList();
- this.identifier.add(t);
- return this;
- }
-
- /**
- * @return The first repetition of repeating field {@link #identifier}, creating it if it does not already exist {3}
- */
- public Identifier getIdentifierFirstRep() {
- if (getIdentifier().isEmpty()) {
- addIdentifier();
- }
- return getIdentifier().get(0);
- }
-
- protected void listChildren(List children) {
- super.listChildren(children);
- children.add(new Property("affiliation", "string", "Display for the organization.", 0, 1, affiliation));
- children.add(new Property("role", "string", "Role.", 0, 1, role));
- children.add(new Property("identifier", "Identifier", "Identifier for the organization.", 0, java.lang.Integer.MAX_VALUE, identifier));
- }
-
- @Override
- public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException {
- switch (_hash) {
- case 2019918576: /*affiliation*/ return new Property("affiliation", "string", "Display for the organization.", 0, 1, affiliation);
- case 3506294: /*role*/ return new Property("role", "string", "Role.", 0, 1, role);
- case -1618432855: /*identifier*/ return new Property("identifier", "Identifier", "Identifier for the organization.", 0, java.lang.Integer.MAX_VALUE, identifier);
- default: return super.getNamedProperty(_hash, _name, _checkValid);
- }
-
- }
-
- @Override
- public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException {
- switch (hash) {
- case 2019918576: /*affiliation*/ return this.affiliation == null ? new Base[0] : new Base[] {this.affiliation}; // StringType
- case 3506294: /*role*/ return this.role == null ? new Base[0] : new Base[] {this.role}; // StringType
- case -1618432855: /*identifier*/ return this.identifier == null ? new Base[0] : this.identifier.toArray(new Base[this.identifier.size()]); // Identifier
- default: return super.getProperty(hash, name, checkValid);
- }
-
- }
-
- @Override
- public Base setProperty(int hash, String name, Base value) throws FHIRException {
- switch (hash) {
- case 2019918576: // affiliation
- this.affiliation = TypeConvertor.castToString(value); // StringType
- return value;
- case 3506294: // role
- this.role = TypeConvertor.castToString(value); // StringType
- return value;
- case -1618432855: // identifier
- this.getIdentifier().add(TypeConvertor.castToIdentifier(value)); // Identifier
- return value;
- default: return super.setProperty(hash, name, value);
- }
-
- }
-
- @Override
- public Base setProperty(String name, Base value) throws FHIRException {
- if (name.equals("affiliation")) {
- this.affiliation = TypeConvertor.castToString(value); // StringType
- } else if (name.equals("role")) {
- this.role = TypeConvertor.castToString(value); // StringType
- } else if (name.equals("identifier")) {
- this.getIdentifier().add(TypeConvertor.castToIdentifier(value));
- } else
- return super.setProperty(name, value);
- return value;
- }
-
- @Override
- public Base makeProperty(int hash, String name) throws FHIRException {
- switch (hash) {
- case 2019918576: return getAffiliationElement();
- case 3506294: return getRoleElement();
- case -1618432855: return addIdentifier();
- default: return super.makeProperty(hash, name);
- }
-
- }
-
- @Override
- public String[] getTypesForProperty(int hash, String name) throws FHIRException {
- switch (hash) {
- case 2019918576: /*affiliation*/ return new String[] {"string"};
- case 3506294: /*role*/ return new String[] {"string"};
- case -1618432855: /*identifier*/ return new String[] {"Identifier"};
- default: return super.getTypesForProperty(hash, name);
- }
-
- }
-
- @Override
- public Base addChild(String name) throws FHIRException {
- if (name.equals("affiliation")) {
- throw new FHIRException("Cannot call addChild on a primitive type Citation.authorList.author.affiliationInfo.affiliation");
- }
- else if (name.equals("role")) {
- throw new FHIRException("Cannot call addChild on a primitive type Citation.authorList.author.affiliationInfo.role");
- }
- else if (name.equals("identifier")) {
- return addIdentifier();
- }
- else
- return super.addChild(name);
- }
-
- public CitationAuthorListAuthorAffiliationInfoComponent copy() {
- CitationAuthorListAuthorAffiliationInfoComponent dst = new CitationAuthorListAuthorAffiliationInfoComponent();
- copyValues(dst);
- return dst;
- }
-
- public void copyValues(CitationAuthorListAuthorAffiliationInfoComponent dst) {
- super.copyValues(dst);
- dst.affiliation = affiliation == null ? null : affiliation.copy();
- dst.role = role == null ? null : role.copy();
- if (identifier != null) {
- dst.identifier = new ArrayList();
- for (Identifier i : identifier)
- dst.identifier.add(i.copy());
- };
- }
-
- @Override
- public boolean equalsDeep(Base other_) {
- if (!super.equalsDeep(other_))
- return false;
- if (!(other_ instanceof CitationAuthorListAuthorAffiliationInfoComponent))
- return false;
- CitationAuthorListAuthorAffiliationInfoComponent o = (CitationAuthorListAuthorAffiliationInfoComponent) other_;
- return compareDeep(affiliation, o.affiliation, true) && compareDeep(role, o.role, true) && compareDeep(identifier, o.identifier, true)
- ;
- }
-
- @Override
- public boolean equalsShallow(Base other_) {
- if (!super.equalsShallow(other_))
- return false;
- if (!(other_ instanceof CitationAuthorListAuthorAffiliationInfoComponent))
- return false;
- CitationAuthorListAuthorAffiliationInfoComponent o = (CitationAuthorListAuthorAffiliationInfoComponent) other_;
- return compareValues(affiliation, o.affiliation, true) && compareValues(role, o.role, true);
- }
-
- public boolean isEmpty() {
- return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(affiliation, role, identifier
- );
- }
-
- public String fhirType() {
- return "Citation.authorList.author.affiliationInfo";
-
- }
-
- }
-
- @Block()
- public static class CitationAuthorStringComponent extends BackboneElement implements IBaseBackboneElement {
- /**
- * Used to code the producer or rule for creating the display string.
- */
- @Child(name = "source", type = {CodeableConcept.class}, order=1, min=0, max=1, modifier=false, summary=false)
- @Description(shortDefinition="Used to code the producer or rule for creating the display string", formalDefinition="Used to code the producer or rule for creating the display string." )
- @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/author-string-source")
- protected CodeableConcept source;
-
- /**
- * The display string for the author list.
- */
- @Child(name = "value", type = {StringType.class}, order=2, min=1, max=1, modifier=false, summary=false)
- @Description(shortDefinition="The display string for the author list", formalDefinition="The display string for the author list." )
- protected StringType value;
-
- private static final long serialVersionUID = -1218527170L;
-
- /**
- * Constructor
- */
- public CitationAuthorStringComponent() {
- super();
- }
-
- /**
- * Constructor
- */
- public CitationAuthorStringComponent(String value) {
- super();
- this.setValue(value);
- }
-
- /**
- * @return {@link #source} (Used to code the producer or rule for creating the display string.)
- */
- public CodeableConcept getSource() {
- if (this.source == null)
- if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create CitationAuthorStringComponent.source");
- else if (Configuration.doAutoCreate())
- this.source = new CodeableConcept(); // cc
- return this.source;
- }
-
- public boolean hasSource() {
- return this.source != null && !this.source.isEmpty();
- }
-
- /**
- * @param value {@link #source} (Used to code the producer or rule for creating the display string.)
- */
- public CitationAuthorStringComponent setSource(CodeableConcept value) {
- this.source = value;
- return this;
- }
-
- /**
- * @return {@link #value} (The display string for the author list.). This is the underlying object with id, value and extensions. The accessor "getValue" gives direct access to the value
- */
- public StringType getValueElement() {
- if (this.value == null)
- if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create CitationAuthorStringComponent.value");
- else if (Configuration.doAutoCreate())
- this.value = new StringType(); // bb
- return this.value;
- }
-
- public boolean hasValueElement() {
- return this.value != null && !this.value.isEmpty();
- }
-
- public boolean hasValue() {
- return this.value != null && !this.value.isEmpty();
- }
-
- /**
- * @param value {@link #value} (The display string for the author list.). This is the underlying object with id, value and extensions. The accessor "getValue" gives direct access to the value
- */
- public CitationAuthorStringComponent setValueElement(StringType value) {
- this.value = value;
- return this;
- }
-
- /**
- * @return The display string for the author list.
- */
- public String getValue() {
- return this.value == null ? null : this.value.getValue();
- }
-
- /**
- * @param value The display string for the author list.
- */
- public CitationAuthorStringComponent setValue(String value) {
- if (this.value == null)
- this.value = new StringType();
- this.value.setValue(value);
- return this;
- }
-
- protected void listChildren(List children) {
- super.listChildren(children);
- children.add(new Property("source", "CodeableConcept", "Used to code the producer or rule for creating the display string.", 0, 1, source));
- children.add(new Property("value", "string", "The display string for the author list.", 0, 1, value));
- }
-
- @Override
- public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException {
- switch (_hash) {
- case -896505829: /*source*/ return new Property("source", "CodeableConcept", "Used to code the producer or rule for creating the display string.", 0, 1, source);
- case 111972721: /*value*/ return new Property("value", "string", "The display string for the author list.", 0, 1, value);
- default: return super.getNamedProperty(_hash, _name, _checkValid);
- }
-
- }
-
- @Override
- public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException {
- switch (hash) {
- case -896505829: /*source*/ return this.source == null ? new Base[0] : new Base[] {this.source}; // CodeableConcept
- case 111972721: /*value*/ return this.value == null ? new Base[0] : new Base[] {this.value}; // StringType
- default: return super.getProperty(hash, name, checkValid);
- }
-
- }
-
- @Override
- public Base setProperty(int hash, String name, Base value) throws FHIRException {
- switch (hash) {
- case -896505829: // source
- this.source = TypeConvertor.castToCodeableConcept(value); // CodeableConcept
- return value;
- case 111972721: // value
- this.value = TypeConvertor.castToString(value); // StringType
- return value;
- default: return super.setProperty(hash, name, value);
- }
-
- }
-
- @Override
- public Base setProperty(String name, Base value) throws FHIRException {
- if (name.equals("source")) {
- this.source = TypeConvertor.castToCodeableConcept(value); // CodeableConcept
- } else if (name.equals("value")) {
- this.value = TypeConvertor.castToString(value); // StringType
- } else
- return super.setProperty(name, value);
- return value;
- }
-
- @Override
- public Base makeProperty(int hash, String name) throws FHIRException {
- switch (hash) {
- case -896505829: return getSource();
- case 111972721: return getValueElement();
- default: return super.makeProperty(hash, name);
- }
-
- }
-
- @Override
- public String[] getTypesForProperty(int hash, String name) throws FHIRException {
- switch (hash) {
- case -896505829: /*source*/ return new String[] {"CodeableConcept"};
- case 111972721: /*value*/ return new String[] {"string"};
- default: return super.getTypesForProperty(hash, name);
- }
-
- }
-
- @Override
- public Base addChild(String name) throws FHIRException {
- if (name.equals("source")) {
- this.source = new CodeableConcept();
- return this.source;
- }
- else if (name.equals("value")) {
- throw new FHIRException("Cannot call addChild on a primitive type Citation.authorString.value");
- }
- else
- return super.addChild(name);
- }
-
- public CitationAuthorStringComponent copy() {
- CitationAuthorStringComponent dst = new CitationAuthorStringComponent();
- copyValues(dst);
- return dst;
- }
-
- public void copyValues(CitationAuthorStringComponent dst) {
- super.copyValues(dst);
- dst.source = source == null ? null : source.copy();
- dst.value = value == null ? null : value.copy();
- }
-
- @Override
- public boolean equalsDeep(Base other_) {
- if (!super.equalsDeep(other_))
- return false;
- if (!(other_ instanceof CitationAuthorStringComponent))
- return false;
- CitationAuthorStringComponent o = (CitationAuthorStringComponent) other_;
- return compareDeep(source, o.source, true) && compareDeep(value, o.value, true);
- }
-
- @Override
- public boolean equalsShallow(Base other_) {
- if (!super.equalsShallow(other_))
- return false;
- if (!(other_ instanceof CitationAuthorStringComponent))
- return false;
- CitationAuthorStringComponent o = (CitationAuthorStringComponent) other_;
- return compareValues(value, o.value, true);
- }
-
- public boolean isEmpty() {
- return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(source, value);
- }
-
- public String fhirType() {
- return "Citation.authorString";
-
- }
-
- }
-
- @Block()
- public static class CitationContributorListComponent extends BackboneElement implements IBaseBackboneElement {
- /**
- * Indicates if the list includes all contributors.
- */
- @Child(name = "complete", type = {BooleanType.class}, order=1, min=0, max=1, modifier=false, summary=false)
- @Description(shortDefinition="Indicates if the list includes all contributors", formalDefinition="Indicates if the list includes all contributors." )
- protected BooleanType complete;
-
- /**
- * An individual entity named in the contributor list.
- */
- @Child(name = "contributor", type = {}, order=2, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
- @Description(shortDefinition="An individual entity named in the contributor list", formalDefinition="An individual entity named in the contributor list." )
- protected List contributor;
-
- private static final long serialVersionUID = 1922271126L;
-
- /**
- * Constructor
- */
- public CitationContributorListComponent() {
- super();
- }
-
- /**
- * Constructor
- */
- public CitationContributorListComponent(CitationContributorListContributorComponent contributor) {
- super();
- this.addContributor(contributor);
- }
-
- /**
- * @return {@link #complete} (Indicates if the list includes all contributors.). This is the underlying object with id, value and extensions. The accessor "getComplete" gives direct access to the value
- */
- public BooleanType getCompleteElement() {
- if (this.complete == null)
- if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create CitationContributorListComponent.complete");
- else if (Configuration.doAutoCreate())
- this.complete = new BooleanType(); // bb
- return this.complete;
- }
-
- public boolean hasCompleteElement() {
- return this.complete != null && !this.complete.isEmpty();
- }
-
- public boolean hasComplete() {
- return this.complete != null && !this.complete.isEmpty();
- }
-
- /**
- * @param value {@link #complete} (Indicates if the list includes all contributors.). This is the underlying object with id, value and extensions. The accessor "getComplete" gives direct access to the value
- */
- public CitationContributorListComponent setCompleteElement(BooleanType value) {
- this.complete = value;
- return this;
- }
-
- /**
- * @return Indicates if the list includes all contributors.
- */
- public boolean getComplete() {
- return this.complete == null || this.complete.isEmpty() ? false : this.complete.getValue();
- }
-
- /**
- * @param value Indicates if the list includes all contributors.
- */
- public CitationContributorListComponent setComplete(boolean value) {
- if (this.complete == null)
- this.complete = new BooleanType();
- this.complete.setValue(value);
- return this;
- }
-
- /**
- * @return {@link #contributor} (An individual entity named in the contributor list.)
- */
- public List getContributor() {
- if (this.contributor == null)
- this.contributor = new ArrayList();
- return this.contributor;
- }
-
- /**
- * @return Returns a reference to this
for easy method chaining
- */
- public CitationContributorListComponent setContributor(List theContributor) {
- this.contributor = theContributor;
- return this;
- }
-
- public boolean hasContributor() {
- if (this.contributor == null)
- return false;
- for (CitationContributorListContributorComponent item : this.contributor)
- if (!item.isEmpty())
- return true;
- return false;
- }
-
- public CitationContributorListContributorComponent addContributor() { //3
- CitationContributorListContributorComponent t = new CitationContributorListContributorComponent();
- if (this.contributor == null)
- this.contributor = new ArrayList();
- this.contributor.add(t);
- return t;
- }
-
- public CitationContributorListComponent addContributor(CitationContributorListContributorComponent t) { //3
- if (t == null)
- return this;
- if (this.contributor == null)
- this.contributor = new ArrayList();
- this.contributor.add(t);
- return this;
- }
-
- /**
- * @return The first repetition of repeating field {@link #contributor}, creating it if it does not already exist {3}
- */
- public CitationContributorListContributorComponent getContributorFirstRep() {
- if (getContributor().isEmpty()) {
- addContributor();
- }
- return getContributor().get(0);
- }
-
- protected void listChildren(List children) {
- super.listChildren(children);
- children.add(new Property("complete", "boolean", "Indicates if the list includes all contributors.", 0, 1, complete));
- children.add(new Property("contributor", "", "An individual entity named in the contributor list.", 0, java.lang.Integer.MAX_VALUE, contributor));
- }
-
- @Override
- public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException {
- switch (_hash) {
- case -599445191: /*complete*/ return new Property("complete", "boolean", "Indicates if the list includes all contributors.", 0, 1, complete);
- case -1895276325: /*contributor*/ return new Property("contributor", "", "An individual entity named in the contributor list.", 0, java.lang.Integer.MAX_VALUE, contributor);
- default: return super.getNamedProperty(_hash, _name, _checkValid);
- }
-
- }
-
- @Override
- public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException {
- switch (hash) {
- case -599445191: /*complete*/ return this.complete == null ? new Base[0] : new Base[] {this.complete}; // BooleanType
- case -1895276325: /*contributor*/ return this.contributor == null ? new Base[0] : this.contributor.toArray(new Base[this.contributor.size()]); // CitationContributorListContributorComponent
- default: return super.getProperty(hash, name, checkValid);
- }
-
- }
-
- @Override
- public Base setProperty(int hash, String name, Base value) throws FHIRException {
- switch (hash) {
- case -599445191: // complete
- this.complete = TypeConvertor.castToBoolean(value); // BooleanType
- return value;
- case -1895276325: // contributor
- this.getContributor().add((CitationContributorListContributorComponent) value); // CitationContributorListContributorComponent
- return value;
- default: return super.setProperty(hash, name, value);
- }
-
- }
-
- @Override
- public Base setProperty(String name, Base value) throws FHIRException {
- if (name.equals("complete")) {
- this.complete = TypeConvertor.castToBoolean(value); // BooleanType
- } else if (name.equals("contributor")) {
- this.getContributor().add((CitationContributorListContributorComponent) value);
- } else
- return super.setProperty(name, value);
- return value;
- }
-
- @Override
- public Base makeProperty(int hash, String name) throws FHIRException {
- switch (hash) {
- case -599445191: return getCompleteElement();
- case -1895276325: return addContributor();
- default: return super.makeProperty(hash, name);
- }
-
- }
-
- @Override
- public String[] getTypesForProperty(int hash, String name) throws FHIRException {
- switch (hash) {
- case -599445191: /*complete*/ return new String[] {"boolean"};
- case -1895276325: /*contributor*/ return new String[] {};
- default: return super.getTypesForProperty(hash, name);
- }
-
- }
-
- @Override
- public Base addChild(String name) throws FHIRException {
- if (name.equals("complete")) {
- throw new FHIRException("Cannot call addChild on a primitive type Citation.contributorList.complete");
- }
- else if (name.equals("contributor")) {
- return addContributor();
- }
- else
- return super.addChild(name);
- }
-
- public CitationContributorListComponent copy() {
- CitationContributorListComponent dst = new CitationContributorListComponent();
- copyValues(dst);
- return dst;
- }
-
- public void copyValues(CitationContributorListComponent dst) {
- super.copyValues(dst);
- dst.complete = complete == null ? null : complete.copy();
- if (contributor != null) {
- dst.contributor = new ArrayList();
- for (CitationContributorListContributorComponent i : contributor)
- dst.contributor.add(i.copy());
- };
- }
-
- @Override
- public boolean equalsDeep(Base other_) {
- if (!super.equalsDeep(other_))
- return false;
- if (!(other_ instanceof CitationContributorListComponent))
- return false;
- CitationContributorListComponent o = (CitationContributorListComponent) other_;
- return compareDeep(complete, o.complete, true) && compareDeep(contributor, o.contributor, true)
- ;
- }
-
- @Override
- public boolean equalsShallow(Base other_) {
- if (!super.equalsShallow(other_))
- return false;
- if (!(other_ instanceof CitationContributorListComponent))
- return false;
- CitationContributorListComponent o = (CitationContributorListComponent) other_;
- return compareValues(complete, o.complete, true);
- }
-
- public boolean isEmpty() {
- return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(complete, contributor);
- }
-
- public String fhirType() {
- return "Citation.contributorList";
-
- }
-
- }
-
- @Block()
- public static class CitationContributorListContributorComponent extends BackboneElement implements IBaseBackboneElement {
- /**
- * Surname or single name.
- */
- @Child(name = "lastName", type = {StringType.class}, order=1, min=0, max=1, modifier=false, summary=false)
- @Description(shortDefinition="Surname or single name", formalDefinition="Surname or single name." )
- protected StringType lastName;
-
- /**
- * Remainder of name except for suffix.
- */
- @Child(name = "foreName", type = {StringType.class}, order=2, min=0, max=1, modifier=false, summary=false)
- @Description(shortDefinition="Remainder of name except for suffix", formalDefinition="Remainder of name except for suffix." )
- protected StringType foreName;
-
- /**
- * Eg 2nd, 3rd, Jr, Sr.
- */
- @Child(name = "suffix", type = {StringType.class}, order=3, min=0, max=1, modifier=false, summary=false)
- @Description(shortDefinition="Eg 2nd, 3rd, Jr, Sr", formalDefinition="Eg 2nd, 3rd, Jr, Sr." )
- protected StringType suffix;
-
- /**
- * Initials for forename.
- */
- @Child(name = "initials", type = {StringType.class}, order=4, min=0, max=1, modifier=false, summary=false)
- @Description(shortDefinition="Initials for forename", formalDefinition="Initials for forename." )
- protected StringType initials;
-
- /**
- * Used for collective or corporate name as a contributor.
- */
- @Child(name = "collectiveName", type = {StringType.class}, order=5, min=0, max=1, modifier=false, summary=false)
- @Description(shortDefinition="Used for collective or corporate name as a contributor", formalDefinition="Used for collective or corporate name as a contributor." )
- protected StringType collectiveName;
-
- /**
- * Contributor identifier, eg ORCID.
- */
- @Child(name = "identifier", type = {Identifier.class}, order=6, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
- @Description(shortDefinition="Contributor identifier, eg ORCID", formalDefinition="Contributor identifier, eg ORCID." )
- protected List identifier;
-
- /**
- * The specific contributions.
- */
- @Child(name = "contribution", type = {CodeableConcept.class}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
- @Description(shortDefinition="The specific contributions", formalDefinition="The specific contributions." )
- @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/citation-contribution")
- protected List contribution;
-
- /**
- * Organizational affiliation.
- */
- @Child(name = "affiliationInfo", type = {}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
- @Description(shortDefinition="Organizational affiliation", formalDefinition="Organizational affiliation." )
- protected List affiliationInfo;
-
- /**
- * Used to code order of contributors.
- */
- @Child(name = "listOrder", type = {PositiveIntType.class}, order=9, min=0, max=1, modifier=false, summary=false)
- @Description(shortDefinition="Used to code order of contributors", formalDefinition="Used to code order of contributors." )
- protected PositiveIntType listOrder;
-
- private static final long serialVersionUID = 160410057L;
-
- /**
- * Constructor
- */
- public CitationContributorListContributorComponent() {
- super();
- }
-
- /**
- * @return {@link #lastName} (Surname or single name.). This is the underlying object with id, value and extensions. The accessor "getLastName" gives direct access to the value
- */
- public StringType getLastNameElement() {
- if (this.lastName == null)
- if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create CitationContributorListContributorComponent.lastName");
- else if (Configuration.doAutoCreate())
- this.lastName = new StringType(); // bb
- return this.lastName;
- }
-
- public boolean hasLastNameElement() {
- return this.lastName != null && !this.lastName.isEmpty();
- }
-
- public boolean hasLastName() {
- return this.lastName != null && !this.lastName.isEmpty();
- }
-
- /**
- * @param value {@link #lastName} (Surname or single name.). This is the underlying object with id, value and extensions. The accessor "getLastName" gives direct access to the value
- */
- public CitationContributorListContributorComponent setLastNameElement(StringType value) {
- this.lastName = value;
- return this;
- }
-
- /**
- * @return Surname or single name.
- */
- public String getLastName() {
- return this.lastName == null ? null : this.lastName.getValue();
- }
-
- /**
- * @param value Surname or single name.
- */
- public CitationContributorListContributorComponent setLastName(String value) {
- if (Utilities.noString(value))
- this.lastName = null;
- else {
- if (this.lastName == null)
- this.lastName = new StringType();
- this.lastName.setValue(value);
- }
- return this;
- }
-
- /**
- * @return {@link #foreName} (Remainder of name except for suffix.). This is the underlying object with id, value and extensions. The accessor "getForeName" gives direct access to the value
- */
- public StringType getForeNameElement() {
- if (this.foreName == null)
- if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create CitationContributorListContributorComponent.foreName");
- else if (Configuration.doAutoCreate())
- this.foreName = new StringType(); // bb
- return this.foreName;
- }
-
- public boolean hasForeNameElement() {
- return this.foreName != null && !this.foreName.isEmpty();
- }
-
- public boolean hasForeName() {
- return this.foreName != null && !this.foreName.isEmpty();
- }
-
- /**
- * @param value {@link #foreName} (Remainder of name except for suffix.). This is the underlying object with id, value and extensions. The accessor "getForeName" gives direct access to the value
- */
- public CitationContributorListContributorComponent setForeNameElement(StringType value) {
- this.foreName = value;
- return this;
- }
-
- /**
- * @return Remainder of name except for suffix.
- */
- public String getForeName() {
- return this.foreName == null ? null : this.foreName.getValue();
- }
-
- /**
- * @param value Remainder of name except for suffix.
- */
- public CitationContributorListContributorComponent setForeName(String value) {
- if (Utilities.noString(value))
- this.foreName = null;
- else {
- if (this.foreName == null)
- this.foreName = new StringType();
- this.foreName.setValue(value);
- }
- return this;
- }
-
- /**
- * @return {@link #suffix} (Eg 2nd, 3rd, Jr, Sr.). This is the underlying object with id, value and extensions. The accessor "getSuffix" gives direct access to the value
- */
- public StringType getSuffixElement() {
- if (this.suffix == null)
- if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create CitationContributorListContributorComponent.suffix");
- else if (Configuration.doAutoCreate())
- this.suffix = new StringType(); // bb
- return this.suffix;
- }
-
- public boolean hasSuffixElement() {
- return this.suffix != null && !this.suffix.isEmpty();
- }
-
- public boolean hasSuffix() {
- return this.suffix != null && !this.suffix.isEmpty();
- }
-
- /**
- * @param value {@link #suffix} (Eg 2nd, 3rd, Jr, Sr.). This is the underlying object with id, value and extensions. The accessor "getSuffix" gives direct access to the value
- */
- public CitationContributorListContributorComponent setSuffixElement(StringType value) {
- this.suffix = value;
- return this;
- }
-
- /**
- * @return Eg 2nd, 3rd, Jr, Sr.
- */
- public String getSuffix() {
- return this.suffix == null ? null : this.suffix.getValue();
- }
-
- /**
- * @param value Eg 2nd, 3rd, Jr, Sr.
- */
- public CitationContributorListContributorComponent setSuffix(String value) {
- if (Utilities.noString(value))
- this.suffix = null;
- else {
- if (this.suffix == null)
- this.suffix = new StringType();
- this.suffix.setValue(value);
- }
- return this;
- }
-
- /**
- * @return {@link #initials} (Initials for forename.). This is the underlying object with id, value and extensions. The accessor "getInitials" gives direct access to the value
- */
- public StringType getInitialsElement() {
- if (this.initials == null)
- if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create CitationContributorListContributorComponent.initials");
- else if (Configuration.doAutoCreate())
- this.initials = new StringType(); // bb
- return this.initials;
- }
-
- public boolean hasInitialsElement() {
- return this.initials != null && !this.initials.isEmpty();
- }
-
- public boolean hasInitials() {
- return this.initials != null && !this.initials.isEmpty();
- }
-
- /**
- * @param value {@link #initials} (Initials for forename.). This is the underlying object with id, value and extensions. The accessor "getInitials" gives direct access to the value
- */
- public CitationContributorListContributorComponent setInitialsElement(StringType value) {
- this.initials = value;
- return this;
- }
-
- /**
- * @return Initials for forename.
- */
- public String getInitials() {
- return this.initials == null ? null : this.initials.getValue();
- }
-
- /**
- * @param value Initials for forename.
- */
- public CitationContributorListContributorComponent setInitials(String value) {
- if (Utilities.noString(value))
- this.initials = null;
- else {
- if (this.initials == null)
- this.initials = new StringType();
- this.initials.setValue(value);
- }
- return this;
- }
-
- /**
- * @return {@link #collectiveName} (Used for collective or corporate name as a contributor.). This is the underlying object with id, value and extensions. The accessor "getCollectiveName" gives direct access to the value
- */
- public StringType getCollectiveNameElement() {
- if (this.collectiveName == null)
- if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create CitationContributorListContributorComponent.collectiveName");
- else if (Configuration.doAutoCreate())
- this.collectiveName = new StringType(); // bb
- return this.collectiveName;
- }
-
- public boolean hasCollectiveNameElement() {
- return this.collectiveName != null && !this.collectiveName.isEmpty();
- }
-
- public boolean hasCollectiveName() {
- return this.collectiveName != null && !this.collectiveName.isEmpty();
- }
-
- /**
- * @param value {@link #collectiveName} (Used for collective or corporate name as a contributor.). This is the underlying object with id, value and extensions. The accessor "getCollectiveName" gives direct access to the value
- */
- public CitationContributorListContributorComponent setCollectiveNameElement(StringType value) {
- this.collectiveName = value;
- return this;
- }
-
- /**
- * @return Used for collective or corporate name as a contributor.
- */
- public String getCollectiveName() {
- return this.collectiveName == null ? null : this.collectiveName.getValue();
- }
-
- /**
- * @param value Used for collective or corporate name as a contributor.
- */
- public CitationContributorListContributorComponent setCollectiveName(String value) {
- if (Utilities.noString(value))
- this.collectiveName = null;
- else {
- if (this.collectiveName == null)
- this.collectiveName = new StringType();
- this.collectiveName.setValue(value);
- }
- return this;
- }
-
- /**
- * @return {@link #identifier} (Contributor identifier, eg ORCID.)
- */
- public List getIdentifier() {
- if (this.identifier == null)
- this.identifier = new ArrayList();
- return this.identifier;
- }
-
- /**
- * @return Returns a reference to this
for easy method chaining
- */
- public CitationContributorListContributorComponent setIdentifier(List theIdentifier) {
- this.identifier = theIdentifier;
- return this;
- }
-
- public boolean hasIdentifier() {
- if (this.identifier == null)
- return false;
- for (Identifier item : this.identifier)
- if (!item.isEmpty())
- return true;
- return false;
- }
-
- public Identifier addIdentifier() { //3
- Identifier t = new Identifier();
- if (this.identifier == null)
- this.identifier = new ArrayList();
- this.identifier.add(t);
- return t;
- }
-
- public CitationContributorListContributorComponent addIdentifier(Identifier t) { //3
- if (t == null)
- return this;
- if (this.identifier == null)
- this.identifier = new ArrayList();
- this.identifier.add(t);
- return this;
- }
-
- /**
- * @return The first repetition of repeating field {@link #identifier}, creating it if it does not already exist {3}
- */
- public Identifier getIdentifierFirstRep() {
- if (getIdentifier().isEmpty()) {
- addIdentifier();
- }
- return getIdentifier().get(0);
- }
-
- /**
- * @return {@link #contribution} (The specific contributions.)
+ * @return {@link #contribution} (This element identifies the specific nature of an individual’s contribution with respect to the cited work.)
*/
public List getContribution() {
if (this.contribution == null)
@@ -4636,7 +4617,7 @@ public class Citation extends MetadataResource {
/**
* @return Returns a reference to this
for easy method chaining
*/
- public CitationContributorListContributorComponent setContribution(List theContribution) {
+ public CitationContributorshipEntryComponent setContribution(List theContribution) {
this.contribution = theContribution;
return this;
}
@@ -4658,7 +4639,7 @@ public class Citation extends MetadataResource {
return t;
}
- public CitationContributorListContributorComponent addContribution(CodeableConcept t) { //3
+ public CitationContributorshipEntryComponent addContribution(CodeableConcept t) { //3
if (t == null)
return this;
if (this.contribution == null)
@@ -4678,65 +4659,102 @@ public class Citation extends MetadataResource {
}
/**
- * @return {@link #affiliationInfo} (Organizational affiliation.)
+ * @return {@link #notAnAuthor} (False, missing, or empty elements implies authorship.). This is the underlying object with id, value and extensions. The accessor "getNotAnAuthor" gives direct access to the value
*/
- public List getAffiliationInfo() {
- if (this.affiliationInfo == null)
- this.affiliationInfo = new ArrayList();
- return this.affiliationInfo;
+ public BooleanType getNotAnAuthorElement() {
+ if (this.notAnAuthor == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationContributorshipEntryComponent.notAnAuthor");
+ else if (Configuration.doAutoCreate())
+ this.notAnAuthor = new BooleanType(); // bb
+ return this.notAnAuthor;
+ }
+
+ public boolean hasNotAnAuthorElement() {
+ return this.notAnAuthor != null && !this.notAnAuthor.isEmpty();
+ }
+
+ public boolean hasNotAnAuthor() {
+ return this.notAnAuthor != null && !this.notAnAuthor.isEmpty();
}
/**
- * @return Returns a reference to this
for easy method chaining
+ * @param value {@link #notAnAuthor} (False, missing, or empty elements implies authorship.). This is the underlying object with id, value and extensions. The accessor "getNotAnAuthor" gives direct access to the value
*/
- public CitationContributorListContributorComponent setAffiliationInfo(List theAffiliationInfo) {
- this.affiliationInfo = theAffiliationInfo;
- return this;
- }
-
- public boolean hasAffiliationInfo() {
- if (this.affiliationInfo == null)
- return false;
- for (CitationContributorListContributorAffiliationInfoComponent item : this.affiliationInfo)
- if (!item.isEmpty())
- return true;
- return false;
- }
-
- public CitationContributorListContributorAffiliationInfoComponent addAffiliationInfo() { //3
- CitationContributorListContributorAffiliationInfoComponent t = new CitationContributorListContributorAffiliationInfoComponent();
- if (this.affiliationInfo == null)
- this.affiliationInfo = new ArrayList();
- this.affiliationInfo.add(t);
- return t;
- }
-
- public CitationContributorListContributorComponent addAffiliationInfo(CitationContributorListContributorAffiliationInfoComponent t) { //3
- if (t == null)
- return this;
- if (this.affiliationInfo == null)
- this.affiliationInfo = new ArrayList();
- this.affiliationInfo.add(t);
+ public CitationContributorshipEntryComponent setNotAnAuthorElement(BooleanType value) {
+ this.notAnAuthor = value;
return this;
}
/**
- * @return The first repetition of repeating field {@link #affiliationInfo}, creating it if it does not already exist {3}
+ * @return False, missing, or empty elements implies authorship.
*/
- public CitationContributorListContributorAffiliationInfoComponent getAffiliationInfoFirstRep() {
- if (getAffiliationInfo().isEmpty()) {
- addAffiliationInfo();
- }
- return getAffiliationInfo().get(0);
+ public boolean getNotAnAuthor() {
+ return this.notAnAuthor == null || this.notAnAuthor.isEmpty() ? false : this.notAnAuthor.getValue();
}
/**
- * @return {@link #listOrder} (Used to code order of contributors.). This is the underlying object with id, value and extensions. The accessor "getListOrder" gives direct access to the value
+ * @param value False, missing, or empty elements implies authorship.
+ */
+ public CitationContributorshipEntryComponent setNotAnAuthor(boolean value) {
+ if (this.notAnAuthor == null)
+ this.notAnAuthor = new BooleanType();
+ this.notAnAuthor.setValue(value);
+ return this;
+ }
+
+ /**
+ * @return {@link #correspondingAuthor} (Indication of which author is the corresponding author for the article cited.). This is the underlying object with id, value and extensions. The accessor "getCorrespondingAuthor" gives direct access to the value
+ */
+ public BooleanType getCorrespondingAuthorElement() {
+ if (this.correspondingAuthor == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationContributorshipEntryComponent.correspondingAuthor");
+ else if (Configuration.doAutoCreate())
+ this.correspondingAuthor = new BooleanType(); // bb
+ return this.correspondingAuthor;
+ }
+
+ public boolean hasCorrespondingAuthorElement() {
+ return this.correspondingAuthor != null && !this.correspondingAuthor.isEmpty();
+ }
+
+ public boolean hasCorrespondingAuthor() {
+ return this.correspondingAuthor != null && !this.correspondingAuthor.isEmpty();
+ }
+
+ /**
+ * @param value {@link #correspondingAuthor} (Indication of which author is the corresponding author for the article cited.). This is the underlying object with id, value and extensions. The accessor "getCorrespondingAuthor" gives direct access to the value
+ */
+ public CitationContributorshipEntryComponent setCorrespondingAuthorElement(BooleanType value) {
+ this.correspondingAuthor = value;
+ return this;
+ }
+
+ /**
+ * @return Indication of which author is the corresponding author for the article cited.
+ */
+ public boolean getCorrespondingAuthor() {
+ return this.correspondingAuthor == null || this.correspondingAuthor.isEmpty() ? false : this.correspondingAuthor.getValue();
+ }
+
+ /**
+ * @param value Indication of which author is the corresponding author for the article cited.
+ */
+ public CitationContributorshipEntryComponent setCorrespondingAuthor(boolean value) {
+ if (this.correspondingAuthor == null)
+ this.correspondingAuthor = new BooleanType();
+ this.correspondingAuthor.setValue(value);
+ return this;
+ }
+
+ /**
+ * @return {@link #listOrder} (Used to code order of authors.). This is the underlying object with id, value and extensions. The accessor "getListOrder" gives direct access to the value
*/
public PositiveIntType getListOrderElement() {
if (this.listOrder == null)
if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create CitationContributorListContributorComponent.listOrder");
+ throw new Error("Attempt to auto-create CitationContributorshipEntryComponent.listOrder");
else if (Configuration.doAutoCreate())
this.listOrder = new PositiveIntType(); // bb
return this.listOrder;
@@ -4751,24 +4769,24 @@ public class Citation extends MetadataResource {
}
/**
- * @param value {@link #listOrder} (Used to code order of contributors.). This is the underlying object with id, value and extensions. The accessor "getListOrder" gives direct access to the value
+ * @param value {@link #listOrder} (Used to code order of authors.). This is the underlying object with id, value and extensions. The accessor "getListOrder" gives direct access to the value
*/
- public CitationContributorListContributorComponent setListOrderElement(PositiveIntType value) {
+ public CitationContributorshipEntryComponent setListOrderElement(PositiveIntType value) {
this.listOrder = value;
return this;
}
/**
- * @return Used to code order of contributors.
+ * @return Used to code order of authors.
*/
public int getListOrder() {
return this.listOrder == null || this.listOrder.isEmpty() ? 0 : this.listOrder.getValue();
}
/**
- * @param value Used to code order of contributors.
+ * @param value Used to code order of authors.
*/
- public CitationContributorListContributorComponent setListOrder(int value) {
+ public CitationContributorshipEntryComponent setListOrder(int value) {
if (this.listOrder == null)
this.listOrder = new PositiveIntType();
this.listOrder.setValue(value);
@@ -4777,29 +4795,33 @@ public class Citation extends MetadataResource {
protected void listChildren(List children) {
super.listChildren(children);
- children.add(new Property("lastName", "string", "Surname or single name.", 0, 1, lastName));
- children.add(new Property("foreName", "string", "Remainder of name except for suffix.", 0, 1, foreName));
- children.add(new Property("suffix", "string", "Eg 2nd, 3rd, Jr, Sr.", 0, 1, suffix));
+ children.add(new Property("name", "HumanName", "A name associated with the individual.", 0, 1, name));
children.add(new Property("initials", "string", "Initials for forename.", 0, 1, initials));
- children.add(new Property("collectiveName", "string", "Used for collective or corporate name as a contributor.", 0, 1, collectiveName));
- children.add(new Property("identifier", "Identifier", "Contributor identifier, eg ORCID.", 0, java.lang.Integer.MAX_VALUE, identifier));
- children.add(new Property("contribution", "CodeableConcept", "The specific contributions.", 0, java.lang.Integer.MAX_VALUE, contribution));
- children.add(new Property("affiliationInfo", "", "Organizational affiliation.", 0, java.lang.Integer.MAX_VALUE, affiliationInfo));
- children.add(new Property("listOrder", "positiveInt", "Used to code order of contributors.", 0, 1, listOrder));
+ children.add(new Property("collectiveName", "string", "Used for collective or corporate name as an author.", 0, 1, collectiveName));
+ children.add(new Property("identifier", "Identifier", "Unique person identifier.", 0, java.lang.Integer.MAX_VALUE, identifier));
+ children.add(new Property("affiliationInfo", "", "Organization affiliated with the entity.", 0, java.lang.Integer.MAX_VALUE, affiliationInfo));
+ children.add(new Property("address", "Address", "Physical mailing address for the author or contributor.", 0, java.lang.Integer.MAX_VALUE, address));
+ children.add(new Property("telecom", "ContactPoint", "Email or telephone contact methods for the author or contributor.", 0, java.lang.Integer.MAX_VALUE, telecom));
+ children.add(new Property("contribution", "CodeableConcept", "This element identifies the specific nature of an individual’s contribution with respect to the cited work.", 0, java.lang.Integer.MAX_VALUE, contribution));
+ children.add(new Property("notAnAuthor", "boolean", "False, missing, or empty elements implies authorship.", 0, 1, notAnAuthor));
+ children.add(new Property("correspondingAuthor", "boolean", "Indication of which author is the corresponding author for the article cited.", 0, 1, correspondingAuthor));
+ children.add(new Property("listOrder", "positiveInt", "Used to code order of authors.", 0, 1, listOrder));
}
@Override
public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException {
switch (_hash) {
- case -1459599807: /*lastName*/ return new Property("lastName", "string", "Surname or single name.", 0, 1, lastName);
- case 466107751: /*foreName*/ return new Property("foreName", "string", "Remainder of name except for suffix.", 0, 1, foreName);
- case -891422895: /*suffix*/ return new Property("suffix", "string", "Eg 2nd, 3rd, Jr, Sr.", 0, 1, suffix);
+ case 3373707: /*name*/ return new Property("name", "HumanName", "A name associated with the individual.", 0, 1, name);
case 269062575: /*initials*/ return new Property("initials", "string", "Initials for forename.", 0, 1, initials);
- case 502871833: /*collectiveName*/ return new Property("collectiveName", "string", "Used for collective or corporate name as a contributor.", 0, 1, collectiveName);
- case -1618432855: /*identifier*/ return new Property("identifier", "Identifier", "Contributor identifier, eg ORCID.", 0, java.lang.Integer.MAX_VALUE, identifier);
- case 1375970320: /*contribution*/ return new Property("contribution", "CodeableConcept", "The specific contributions.", 0, java.lang.Integer.MAX_VALUE, contribution);
- case -215129154: /*affiliationInfo*/ return new Property("affiliationInfo", "", "Organizational affiliation.", 0, java.lang.Integer.MAX_VALUE, affiliationInfo);
- case -1238918832: /*listOrder*/ return new Property("listOrder", "positiveInt", "Used to code order of contributors.", 0, 1, listOrder);
+ case 502871833: /*collectiveName*/ return new Property("collectiveName", "string", "Used for collective or corporate name as an author.", 0, 1, collectiveName);
+ case -1618432855: /*identifier*/ return new Property("identifier", "Identifier", "Unique person identifier.", 0, java.lang.Integer.MAX_VALUE, identifier);
+ case -215129154: /*affiliationInfo*/ return new Property("affiliationInfo", "", "Organization affiliated with the entity.", 0, java.lang.Integer.MAX_VALUE, affiliationInfo);
+ case -1147692044: /*address*/ return new Property("address", "Address", "Physical mailing address for the author or contributor.", 0, java.lang.Integer.MAX_VALUE, address);
+ case -1429363305: /*telecom*/ return new Property("telecom", "ContactPoint", "Email or telephone contact methods for the author or contributor.", 0, java.lang.Integer.MAX_VALUE, telecom);
+ case 1375970320: /*contribution*/ return new Property("contribution", "CodeableConcept", "This element identifies the specific nature of an individual’s contribution with respect to the cited work.", 0, java.lang.Integer.MAX_VALUE, contribution);
+ case -1513418741: /*notAnAuthor*/ return new Property("notAnAuthor", "boolean", "False, missing, or empty elements implies authorship.", 0, 1, notAnAuthor);
+ case 1413890206: /*correspondingAuthor*/ return new Property("correspondingAuthor", "boolean", "Indication of which author is the corresponding author for the article cited.", 0, 1, correspondingAuthor);
+ case -1238918832: /*listOrder*/ return new Property("listOrder", "positiveInt", "Used to code order of authors.", 0, 1, listOrder);
default: return super.getNamedProperty(_hash, _name, _checkValid);
}
@@ -4808,14 +4830,16 @@ public class Citation extends MetadataResource {
@Override
public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException {
switch (hash) {
- case -1459599807: /*lastName*/ return this.lastName == null ? new Base[0] : new Base[] {this.lastName}; // StringType
- case 466107751: /*foreName*/ return this.foreName == null ? new Base[0] : new Base[] {this.foreName}; // StringType
- case -891422895: /*suffix*/ return this.suffix == null ? new Base[0] : new Base[] {this.suffix}; // StringType
+ case 3373707: /*name*/ return this.name == null ? new Base[0] : new Base[] {this.name}; // HumanName
case 269062575: /*initials*/ return this.initials == null ? new Base[0] : new Base[] {this.initials}; // StringType
case 502871833: /*collectiveName*/ return this.collectiveName == null ? new Base[0] : new Base[] {this.collectiveName}; // StringType
case -1618432855: /*identifier*/ return this.identifier == null ? new Base[0] : this.identifier.toArray(new Base[this.identifier.size()]); // Identifier
+ case -215129154: /*affiliationInfo*/ return this.affiliationInfo == null ? new Base[0] : this.affiliationInfo.toArray(new Base[this.affiliationInfo.size()]); // CitationContributorshipEntryAffiliationInfoComponent
+ case -1147692044: /*address*/ return this.address == null ? new Base[0] : this.address.toArray(new Base[this.address.size()]); // Address
+ case -1429363305: /*telecom*/ return this.telecom == null ? new Base[0] : this.telecom.toArray(new Base[this.telecom.size()]); // ContactPoint
case 1375970320: /*contribution*/ return this.contribution == null ? new Base[0] : this.contribution.toArray(new Base[this.contribution.size()]); // CodeableConcept
- case -215129154: /*affiliationInfo*/ return this.affiliationInfo == null ? new Base[0] : this.affiliationInfo.toArray(new Base[this.affiliationInfo.size()]); // CitationContributorListContributorAffiliationInfoComponent
+ case -1513418741: /*notAnAuthor*/ return this.notAnAuthor == null ? new Base[0] : new Base[] {this.notAnAuthor}; // BooleanType
+ case 1413890206: /*correspondingAuthor*/ return this.correspondingAuthor == null ? new Base[0] : new Base[] {this.correspondingAuthor}; // BooleanType
case -1238918832: /*listOrder*/ return this.listOrder == null ? new Base[0] : new Base[] {this.listOrder}; // PositiveIntType
default: return super.getProperty(hash, name, checkValid);
}
@@ -4825,14 +4849,8 @@ public class Citation extends MetadataResource {
@Override
public Base setProperty(int hash, String name, Base value) throws FHIRException {
switch (hash) {
- case -1459599807: // lastName
- this.lastName = TypeConvertor.castToString(value); // StringType
- return value;
- case 466107751: // foreName
- this.foreName = TypeConvertor.castToString(value); // StringType
- return value;
- case -891422895: // suffix
- this.suffix = TypeConvertor.castToString(value); // StringType
+ case 3373707: // name
+ this.name = TypeConvertor.castToHumanName(value); // HumanName
return value;
case 269062575: // initials
this.initials = TypeConvertor.castToString(value); // StringType
@@ -4843,11 +4861,23 @@ public class Citation extends MetadataResource {
case -1618432855: // identifier
this.getIdentifier().add(TypeConvertor.castToIdentifier(value)); // Identifier
return value;
+ case -215129154: // affiliationInfo
+ this.getAffiliationInfo().add((CitationContributorshipEntryAffiliationInfoComponent) value); // CitationContributorshipEntryAffiliationInfoComponent
+ return value;
+ case -1147692044: // address
+ this.getAddress().add(TypeConvertor.castToAddress(value)); // Address
+ return value;
+ case -1429363305: // telecom
+ this.getTelecom().add(TypeConvertor.castToContactPoint(value)); // ContactPoint
+ return value;
case 1375970320: // contribution
this.getContribution().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept
return value;
- case -215129154: // affiliationInfo
- this.getAffiliationInfo().add((CitationContributorListContributorAffiliationInfoComponent) value); // CitationContributorListContributorAffiliationInfoComponent
+ case -1513418741: // notAnAuthor
+ this.notAnAuthor = TypeConvertor.castToBoolean(value); // BooleanType
+ return value;
+ case 1413890206: // correspondingAuthor
+ this.correspondingAuthor = TypeConvertor.castToBoolean(value); // BooleanType
return value;
case -1238918832: // listOrder
this.listOrder = TypeConvertor.castToPositiveInt(value); // PositiveIntType
@@ -4859,22 +4889,26 @@ public class Citation extends MetadataResource {
@Override
public Base setProperty(String name, Base value) throws FHIRException {
- if (name.equals("lastName")) {
- this.lastName = TypeConvertor.castToString(value); // StringType
- } else if (name.equals("foreName")) {
- this.foreName = TypeConvertor.castToString(value); // StringType
- } else if (name.equals("suffix")) {
- this.suffix = TypeConvertor.castToString(value); // StringType
+ if (name.equals("name")) {
+ this.name = TypeConvertor.castToHumanName(value); // HumanName
} else if (name.equals("initials")) {
this.initials = TypeConvertor.castToString(value); // StringType
} else if (name.equals("collectiveName")) {
this.collectiveName = TypeConvertor.castToString(value); // StringType
} else if (name.equals("identifier")) {
this.getIdentifier().add(TypeConvertor.castToIdentifier(value));
+ } else if (name.equals("affiliationInfo")) {
+ this.getAffiliationInfo().add((CitationContributorshipEntryAffiliationInfoComponent) value);
+ } else if (name.equals("address")) {
+ this.getAddress().add(TypeConvertor.castToAddress(value));
+ } else if (name.equals("telecom")) {
+ this.getTelecom().add(TypeConvertor.castToContactPoint(value));
} else if (name.equals("contribution")) {
this.getContribution().add(TypeConvertor.castToCodeableConcept(value));
- } else if (name.equals("affiliationInfo")) {
- this.getAffiliationInfo().add((CitationContributorListContributorAffiliationInfoComponent) value);
+ } else if (name.equals("notAnAuthor")) {
+ this.notAnAuthor = TypeConvertor.castToBoolean(value); // BooleanType
+ } else if (name.equals("correspondingAuthor")) {
+ this.correspondingAuthor = TypeConvertor.castToBoolean(value); // BooleanType
} else if (name.equals("listOrder")) {
this.listOrder = TypeConvertor.castToPositiveInt(value); // PositiveIntType
} else
@@ -4885,14 +4919,16 @@ public class Citation extends MetadataResource {
@Override
public Base makeProperty(int hash, String name) throws FHIRException {
switch (hash) {
- case -1459599807: return getLastNameElement();
- case 466107751: return getForeNameElement();
- case -891422895: return getSuffixElement();
+ case 3373707: return getName();
case 269062575: return getInitialsElement();
case 502871833: return getCollectiveNameElement();
case -1618432855: return addIdentifier();
- case 1375970320: return addContribution();
case -215129154: return addAffiliationInfo();
+ case -1147692044: return addAddress();
+ case -1429363305: return addTelecom();
+ case 1375970320: return addContribution();
+ case -1513418741: return getNotAnAuthorElement();
+ case 1413890206: return getCorrespondingAuthorElement();
case -1238918832: return getListOrderElement();
default: return super.makeProperty(hash, name);
}
@@ -4902,14 +4938,16 @@ public class Citation extends MetadataResource {
@Override
public String[] getTypesForProperty(int hash, String name) throws FHIRException {
switch (hash) {
- case -1459599807: /*lastName*/ return new String[] {"string"};
- case 466107751: /*foreName*/ return new String[] {"string"};
- case -891422895: /*suffix*/ return new String[] {"string"};
+ case 3373707: /*name*/ return new String[] {"HumanName"};
case 269062575: /*initials*/ return new String[] {"string"};
case 502871833: /*collectiveName*/ return new String[] {"string"};
case -1618432855: /*identifier*/ return new String[] {"Identifier"};
- case 1375970320: /*contribution*/ return new String[] {"CodeableConcept"};
case -215129154: /*affiliationInfo*/ return new String[] {};
+ case -1147692044: /*address*/ return new String[] {"Address"};
+ case -1429363305: /*telecom*/ return new String[] {"ContactPoint"};
+ case 1375970320: /*contribution*/ return new String[] {"CodeableConcept"};
+ case -1513418741: /*notAnAuthor*/ return new String[] {"boolean"};
+ case 1413890206: /*correspondingAuthor*/ return new String[] {"boolean"};
case -1238918832: /*listOrder*/ return new String[] {"positiveInt"};
default: return super.getTypesForProperty(hash, name);
}
@@ -4918,48 +4956,53 @@ public class Citation extends MetadataResource {
@Override
public Base addChild(String name) throws FHIRException {
- if (name.equals("lastName")) {
- throw new FHIRException("Cannot call addChild on a primitive type Citation.contributorList.contributor.lastName");
- }
- else if (name.equals("foreName")) {
- throw new FHIRException("Cannot call addChild on a primitive type Citation.contributorList.contributor.foreName");
- }
- else if (name.equals("suffix")) {
- throw new FHIRException("Cannot call addChild on a primitive type Citation.contributorList.contributor.suffix");
+ if (name.equals("name")) {
+ this.name = new HumanName();
+ return this.name;
}
else if (name.equals("initials")) {
- throw new FHIRException("Cannot call addChild on a primitive type Citation.contributorList.contributor.initials");
+ throw new FHIRException("Cannot call addChild on a primitive type Citation.contributorship.entry.initials");
}
else if (name.equals("collectiveName")) {
- throw new FHIRException("Cannot call addChild on a primitive type Citation.contributorList.contributor.collectiveName");
+ throw new FHIRException("Cannot call addChild on a primitive type Citation.contributorship.entry.collectiveName");
}
else if (name.equals("identifier")) {
return addIdentifier();
}
- else if (name.equals("contribution")) {
- return addContribution();
- }
else if (name.equals("affiliationInfo")) {
return addAffiliationInfo();
}
+ else if (name.equals("address")) {
+ return addAddress();
+ }
+ else if (name.equals("telecom")) {
+ return addTelecom();
+ }
+ else if (name.equals("contribution")) {
+ return addContribution();
+ }
+ else if (name.equals("notAnAuthor")) {
+ throw new FHIRException("Cannot call addChild on a primitive type Citation.contributorship.entry.notAnAuthor");
+ }
+ else if (name.equals("correspondingAuthor")) {
+ throw new FHIRException("Cannot call addChild on a primitive type Citation.contributorship.entry.correspondingAuthor");
+ }
else if (name.equals("listOrder")) {
- throw new FHIRException("Cannot call addChild on a primitive type Citation.contributorList.contributor.listOrder");
+ throw new FHIRException("Cannot call addChild on a primitive type Citation.contributorship.entry.listOrder");
}
else
return super.addChild(name);
}
- public CitationContributorListContributorComponent copy() {
- CitationContributorListContributorComponent dst = new CitationContributorListContributorComponent();
+ public CitationContributorshipEntryComponent copy() {
+ CitationContributorshipEntryComponent dst = new CitationContributorshipEntryComponent();
copyValues(dst);
return dst;
}
- public void copyValues(CitationContributorListContributorComponent dst) {
+ public void copyValues(CitationContributorshipEntryComponent dst) {
super.copyValues(dst);
- dst.lastName = lastName == null ? null : lastName.copy();
- dst.foreName = foreName == null ? null : foreName.copy();
- dst.suffix = suffix == null ? null : suffix.copy();
+ dst.name = name == null ? null : name.copy();
dst.initials = initials == null ? null : initials.copy();
dst.collectiveName = collectiveName == null ? null : collectiveName.copy();
if (identifier != null) {
@@ -4967,16 +5010,28 @@ public class Citation extends MetadataResource {
for (Identifier i : identifier)
dst.identifier.add(i.copy());
};
+ if (affiliationInfo != null) {
+ dst.affiliationInfo = new ArrayList();
+ for (CitationContributorshipEntryAffiliationInfoComponent i : affiliationInfo)
+ dst.affiliationInfo.add(i.copy());
+ };
+ if (address != null) {
+ dst.address = new ArrayList();
+ for (Address i : address)
+ dst.address.add(i.copy());
+ };
+ if (telecom != null) {
+ dst.telecom = new ArrayList();
+ for (ContactPoint i : telecom)
+ dst.telecom.add(i.copy());
+ };
if (contribution != null) {
dst.contribution = new ArrayList();
for (CodeableConcept i : contribution)
dst.contribution.add(i.copy());
};
- if (affiliationInfo != null) {
- dst.affiliationInfo = new ArrayList();
- for (CitationContributorListContributorAffiliationInfoComponent i : affiliationInfo)
- dst.affiliationInfo.add(i.copy());
- };
+ dst.notAnAuthor = notAnAuthor == null ? null : notAnAuthor.copy();
+ dst.correspondingAuthor = correspondingAuthor == null ? null : correspondingAuthor.copy();
dst.listOrder = listOrder == null ? null : listOrder.copy();
}
@@ -4984,43 +5039,43 @@ public class Citation extends MetadataResource {
public boolean equalsDeep(Base other_) {
if (!super.equalsDeep(other_))
return false;
- if (!(other_ instanceof CitationContributorListContributorComponent))
+ if (!(other_ instanceof CitationContributorshipEntryComponent))
return false;
- CitationContributorListContributorComponent o = (CitationContributorListContributorComponent) other_;
- return compareDeep(lastName, o.lastName, true) && compareDeep(foreName, o.foreName, true) && compareDeep(suffix, o.suffix, true)
- && compareDeep(initials, o.initials, true) && compareDeep(collectiveName, o.collectiveName, true)
- && compareDeep(identifier, o.identifier, true) && compareDeep(contribution, o.contribution, true)
- && compareDeep(affiliationInfo, o.affiliationInfo, true) && compareDeep(listOrder, o.listOrder, true)
- ;
+ CitationContributorshipEntryComponent o = (CitationContributorshipEntryComponent) other_;
+ return compareDeep(name, o.name, true) && compareDeep(initials, o.initials, true) && compareDeep(collectiveName, o.collectiveName, true)
+ && compareDeep(identifier, o.identifier, true) && compareDeep(affiliationInfo, o.affiliationInfo, true)
+ && compareDeep(address, o.address, true) && compareDeep(telecom, o.telecom, true) && compareDeep(contribution, o.contribution, true)
+ && compareDeep(notAnAuthor, o.notAnAuthor, true) && compareDeep(correspondingAuthor, o.correspondingAuthor, true)
+ && compareDeep(listOrder, o.listOrder, true);
}
@Override
public boolean equalsShallow(Base other_) {
if (!super.equalsShallow(other_))
return false;
- if (!(other_ instanceof CitationContributorListContributorComponent))
+ if (!(other_ instanceof CitationContributorshipEntryComponent))
return false;
- CitationContributorListContributorComponent o = (CitationContributorListContributorComponent) other_;
- return compareValues(lastName, o.lastName, true) && compareValues(foreName, o.foreName, true) && compareValues(suffix, o.suffix, true)
- && compareValues(initials, o.initials, true) && compareValues(collectiveName, o.collectiveName, true)
+ CitationContributorshipEntryComponent o = (CitationContributorshipEntryComponent) other_;
+ return compareValues(initials, o.initials, true) && compareValues(collectiveName, o.collectiveName, true)
+ && compareValues(notAnAuthor, o.notAnAuthor, true) && compareValues(correspondingAuthor, o.correspondingAuthor, true)
&& compareValues(listOrder, o.listOrder, true);
}
public boolean isEmpty() {
- return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(lastName, foreName, suffix
- , initials, collectiveName, identifier, contribution, affiliationInfo, listOrder
- );
+ return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(name, initials, collectiveName
+ , identifier, affiliationInfo, address, telecom, contribution, notAnAuthor, correspondingAuthor
+ , listOrder);
}
public String fhirType() {
- return "Citation.contributorList.contributor";
+ return "Citation.contributorship.entry";
}
}
@Block()
- public static class CitationContributorListContributorAffiliationInfoComponent extends BackboneElement implements IBaseBackboneElement {
+ public static class CitationContributorshipEntryAffiliationInfoComponent extends BackboneElement implements IBaseBackboneElement {
/**
* Display for the organization.
*/
@@ -5029,10 +5084,10 @@ public class Citation extends MetadataResource {
protected StringType affiliation;
/**
- * Role.
+ * Role within the organization, such as professional title.
*/
@Child(name = "role", type = {StringType.class}, order=2, min=0, max=1, modifier=false, summary=false)
- @Description(shortDefinition="Role", formalDefinition="Role." )
+ @Description(shortDefinition="Role within the organization, such as professional title", formalDefinition="Role within the organization, such as professional title." )
protected StringType role;
/**
@@ -5047,7 +5102,7 @@ public class Citation extends MetadataResource {
/**
* Constructor
*/
- public CitationContributorListContributorAffiliationInfoComponent() {
+ public CitationContributorshipEntryAffiliationInfoComponent() {
super();
}
@@ -5057,7 +5112,7 @@ public class Citation extends MetadataResource {
public StringType getAffiliationElement() {
if (this.affiliation == null)
if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create CitationContributorListContributorAffiliationInfoComponent.affiliation");
+ throw new Error("Attempt to auto-create CitationContributorshipEntryAffiliationInfoComponent.affiliation");
else if (Configuration.doAutoCreate())
this.affiliation = new StringType(); // bb
return this.affiliation;
@@ -5074,7 +5129,7 @@ public class Citation extends MetadataResource {
/**
* @param value {@link #affiliation} (Display for the organization.). This is the underlying object with id, value and extensions. The accessor "getAffiliation" gives direct access to the value
*/
- public CitationContributorListContributorAffiliationInfoComponent setAffiliationElement(StringType value) {
+ public CitationContributorshipEntryAffiliationInfoComponent setAffiliationElement(StringType value) {
this.affiliation = value;
return this;
}
@@ -5089,7 +5144,7 @@ public class Citation extends MetadataResource {
/**
* @param value Display for the organization.
*/
- public CitationContributorListContributorAffiliationInfoComponent setAffiliation(String value) {
+ public CitationContributorshipEntryAffiliationInfoComponent setAffiliation(String value) {
if (Utilities.noString(value))
this.affiliation = null;
else {
@@ -5101,12 +5156,12 @@ public class Citation extends MetadataResource {
}
/**
- * @return {@link #role} (Role.). This is the underlying object with id, value and extensions. The accessor "getRole" gives direct access to the value
+ * @return {@link #role} (Role within the organization, such as professional title.). This is the underlying object with id, value and extensions. The accessor "getRole" gives direct access to the value
*/
public StringType getRoleElement() {
if (this.role == null)
if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create CitationContributorListContributorAffiliationInfoComponent.role");
+ throw new Error("Attempt to auto-create CitationContributorshipEntryAffiliationInfoComponent.role");
else if (Configuration.doAutoCreate())
this.role = new StringType(); // bb
return this.role;
@@ -5121,24 +5176,24 @@ public class Citation extends MetadataResource {
}
/**
- * @param value {@link #role} (Role.). This is the underlying object with id, value and extensions. The accessor "getRole" gives direct access to the value
+ * @param value {@link #role} (Role within the organization, such as professional title.). This is the underlying object with id, value and extensions. The accessor "getRole" gives direct access to the value
*/
- public CitationContributorListContributorAffiliationInfoComponent setRoleElement(StringType value) {
+ public CitationContributorshipEntryAffiliationInfoComponent setRoleElement(StringType value) {
this.role = value;
return this;
}
/**
- * @return Role.
+ * @return Role within the organization, such as professional title.
*/
public String getRole() {
return this.role == null ? null : this.role.getValue();
}
/**
- * @param value Role.
+ * @param value Role within the organization, such as professional title.
*/
- public CitationContributorListContributorAffiliationInfoComponent setRole(String value) {
+ public CitationContributorshipEntryAffiliationInfoComponent setRole(String value) {
if (Utilities.noString(value))
this.role = null;
else {
@@ -5161,7 +5216,7 @@ public class Citation extends MetadataResource {
/**
* @return Returns a reference to this
for easy method chaining
*/
- public CitationContributorListContributorAffiliationInfoComponent setIdentifier(List theIdentifier) {
+ public CitationContributorshipEntryAffiliationInfoComponent setIdentifier(List theIdentifier) {
this.identifier = theIdentifier;
return this;
}
@@ -5183,7 +5238,7 @@ public class Citation extends MetadataResource {
return t;
}
- public CitationContributorListContributorAffiliationInfoComponent addIdentifier(Identifier t) { //3
+ public CitationContributorshipEntryAffiliationInfoComponent addIdentifier(Identifier t) { //3
if (t == null)
return this;
if (this.identifier == null)
@@ -5205,7 +5260,7 @@ public class Citation extends MetadataResource {
protected void listChildren(List children) {
super.listChildren(children);
children.add(new Property("affiliation", "string", "Display for the organization.", 0, 1, affiliation));
- children.add(new Property("role", "string", "Role.", 0, 1, role));
+ children.add(new Property("role", "string", "Role within the organization, such as professional title.", 0, 1, role));
children.add(new Property("identifier", "Identifier", "Identifier for the organization.", 0, java.lang.Integer.MAX_VALUE, identifier));
}
@@ -5213,7 +5268,7 @@ public class Citation extends MetadataResource {
public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException {
switch (_hash) {
case 2019918576: /*affiliation*/ return new Property("affiliation", "string", "Display for the organization.", 0, 1, affiliation);
- case 3506294: /*role*/ return new Property("role", "string", "Role.", 0, 1, role);
+ case 3506294: /*role*/ return new Property("role", "string", "Role within the organization, such as professional title.", 0, 1, role);
case -1618432855: /*identifier*/ return new Property("identifier", "Identifier", "Identifier for the organization.", 0, java.lang.Integer.MAX_VALUE, identifier);
default: return super.getNamedProperty(_hash, _name, _checkValid);
}
@@ -5286,10 +5341,10 @@ public class Citation extends MetadataResource {
@Override
public Base addChild(String name) throws FHIRException {
if (name.equals("affiliation")) {
- throw new FHIRException("Cannot call addChild on a primitive type Citation.contributorList.contributor.affiliationInfo.affiliation");
+ throw new FHIRException("Cannot call addChild on a primitive type Citation.contributorship.entry.affiliationInfo.affiliation");
}
else if (name.equals("role")) {
- throw new FHIRException("Cannot call addChild on a primitive type Citation.contributorList.contributor.affiliationInfo.role");
+ throw new FHIRException("Cannot call addChild on a primitive type Citation.contributorship.entry.affiliationInfo.role");
}
else if (name.equals("identifier")) {
return addIdentifier();
@@ -5298,13 +5353,13 @@ public class Citation extends MetadataResource {
return super.addChild(name);
}
- public CitationContributorListContributorAffiliationInfoComponent copy() {
- CitationContributorListContributorAffiliationInfoComponent dst = new CitationContributorListContributorAffiliationInfoComponent();
+ public CitationContributorshipEntryAffiliationInfoComponent copy() {
+ CitationContributorshipEntryAffiliationInfoComponent dst = new CitationContributorshipEntryAffiliationInfoComponent();
copyValues(dst);
return dst;
}
- public void copyValues(CitationContributorListContributorAffiliationInfoComponent dst) {
+ public void copyValues(CitationContributorshipEntryAffiliationInfoComponent dst) {
super.copyValues(dst);
dst.affiliation = affiliation == null ? null : affiliation.copy();
dst.role = role == null ? null : role.copy();
@@ -5319,9 +5374,9 @@ public class Citation extends MetadataResource {
public boolean equalsDeep(Base other_) {
if (!super.equalsDeep(other_))
return false;
- if (!(other_ instanceof CitationContributorListContributorAffiliationInfoComponent))
+ if (!(other_ instanceof CitationContributorshipEntryAffiliationInfoComponent))
return false;
- CitationContributorListContributorAffiliationInfoComponent o = (CitationContributorListContributorAffiliationInfoComponent) other_;
+ CitationContributorshipEntryAffiliationInfoComponent o = (CitationContributorshipEntryAffiliationInfoComponent) other_;
return compareDeep(affiliation, o.affiliation, true) && compareDeep(role, o.role, true) && compareDeep(identifier, o.identifier, true)
;
}
@@ -5330,9 +5385,9 @@ public class Citation extends MetadataResource {
public boolean equalsShallow(Base other_) {
if (!super.equalsShallow(other_))
return false;
- if (!(other_ instanceof CitationContributorListContributorAffiliationInfoComponent))
+ if (!(other_ instanceof CitationContributorshipEntryAffiliationInfoComponent))
return false;
- CitationContributorListContributorAffiliationInfoComponent o = (CitationContributorListContributorAffiliationInfoComponent) other_;
+ CitationContributorshipEntryAffiliationInfoComponent o = (CitationContributorshipEntryAffiliationInfoComponent) other_;
return compareValues(affiliation, o.affiliation, true) && compareValues(role, o.role, true);
}
@@ -5342,7 +5397,333 @@ public class Citation extends MetadataResource {
}
public String fhirType() {
- return "Citation.contributorList.contributor.affiliationInfo";
+ return "Citation.contributorship.entry.affiliationInfo";
+
+ }
+
+ }
+
+ @Block()
+ public static class CitationContributorshipSummaryComponent extends BackboneElement implements IBaseBackboneElement {
+ /**
+ * Used most commonly to express an author list or a contributorship statement.
+ */
+ @Child(name = "type", type = {CodeableConcept.class}, order=1, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Either authorList or contributorshipStatement", formalDefinition="Used most commonly to express an author list or a contributorship statement." )
+ @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/contributor-summary-type")
+ protected CodeableConcept type;
+
+ /**
+ * The format for the display string.
+ */
+ @Child(name = "style", type = {CodeableConcept.class}, order=2, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="The format for the display string", formalDefinition="The format for the display string." )
+ @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/contributor-summary-style")
+ protected CodeableConcept style;
+
+ /**
+ * Used to code the producer or rule for creating the display string.
+ */
+ @Child(name = "source", type = {CodeableConcept.class}, order=3, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Used to code the producer or rule for creating the display string", formalDefinition="Used to code the producer or rule for creating the display string." )
+ @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/contributor-summary-source")
+ protected CodeableConcept source;
+
+ /**
+ * The display string for the author list, contributor list, or contributorship statement.
+ */
+ @Child(name = "value", type = {MarkdownType.class}, order=4, min=1, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="The display string for the author list, contributor list, or contributorship statement", formalDefinition="The display string for the author list, contributor list, or contributorship statement." )
+ protected MarkdownType value;
+
+ private static final long serialVersionUID = 1353383781L;
+
+ /**
+ * Constructor
+ */
+ public CitationContributorshipSummaryComponent() {
+ super();
+ }
+
+ /**
+ * Constructor
+ */
+ public CitationContributorshipSummaryComponent(String value) {
+ super();
+ this.setValue(value);
+ }
+
+ /**
+ * @return {@link #type} (Used most commonly to express an author list or a contributorship statement.)
+ */
+ public CodeableConcept getType() {
+ if (this.type == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationContributorshipSummaryComponent.type");
+ else if (Configuration.doAutoCreate())
+ this.type = new CodeableConcept(); // cc
+ return this.type;
+ }
+
+ public boolean hasType() {
+ return this.type != null && !this.type.isEmpty();
+ }
+
+ /**
+ * @param value {@link #type} (Used most commonly to express an author list or a contributorship statement.)
+ */
+ public CitationContributorshipSummaryComponent setType(CodeableConcept value) {
+ this.type = value;
+ return this;
+ }
+
+ /**
+ * @return {@link #style} (The format for the display string.)
+ */
+ public CodeableConcept getStyle() {
+ if (this.style == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationContributorshipSummaryComponent.style");
+ else if (Configuration.doAutoCreate())
+ this.style = new CodeableConcept(); // cc
+ return this.style;
+ }
+
+ public boolean hasStyle() {
+ return this.style != null && !this.style.isEmpty();
+ }
+
+ /**
+ * @param value {@link #style} (The format for the display string.)
+ */
+ public CitationContributorshipSummaryComponent setStyle(CodeableConcept value) {
+ this.style = value;
+ return this;
+ }
+
+ /**
+ * @return {@link #source} (Used to code the producer or rule for creating the display string.)
+ */
+ public CodeableConcept getSource() {
+ if (this.source == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationContributorshipSummaryComponent.source");
+ else if (Configuration.doAutoCreate())
+ this.source = new CodeableConcept(); // cc
+ return this.source;
+ }
+
+ public boolean hasSource() {
+ return this.source != null && !this.source.isEmpty();
+ }
+
+ /**
+ * @param value {@link #source} (Used to code the producer or rule for creating the display string.)
+ */
+ public CitationContributorshipSummaryComponent setSource(CodeableConcept value) {
+ this.source = value;
+ return this;
+ }
+
+ /**
+ * @return {@link #value} (The display string for the author list, contributor list, or contributorship statement.). This is the underlying object with id, value and extensions. The accessor "getValue" gives direct access to the value
+ */
+ public MarkdownType getValueElement() {
+ if (this.value == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationContributorshipSummaryComponent.value");
+ else if (Configuration.doAutoCreate())
+ this.value = new MarkdownType(); // bb
+ return this.value;
+ }
+
+ public boolean hasValueElement() {
+ return this.value != null && !this.value.isEmpty();
+ }
+
+ public boolean hasValue() {
+ return this.value != null && !this.value.isEmpty();
+ }
+
+ /**
+ * @param value {@link #value} (The display string for the author list, contributor list, or contributorship statement.). This is the underlying object with id, value and extensions. The accessor "getValue" gives direct access to the value
+ */
+ public CitationContributorshipSummaryComponent setValueElement(MarkdownType value) {
+ this.value = value;
+ return this;
+ }
+
+ /**
+ * @return The display string for the author list, contributor list, or contributorship statement.
+ */
+ public String getValue() {
+ return this.value == null ? null : this.value.getValue();
+ }
+
+ /**
+ * @param value The display string for the author list, contributor list, or contributorship statement.
+ */
+ public CitationContributorshipSummaryComponent setValue(String value) {
+ if (this.value == null)
+ this.value = new MarkdownType();
+ this.value.setValue(value);
+ return this;
+ }
+
+ protected void listChildren(List children) {
+ super.listChildren(children);
+ children.add(new Property("type", "CodeableConcept", "Used most commonly to express an author list or a contributorship statement.", 0, 1, type));
+ children.add(new Property("style", "CodeableConcept", "The format for the display string.", 0, 1, style));
+ children.add(new Property("source", "CodeableConcept", "Used to code the producer or rule for creating the display string.", 0, 1, source));
+ children.add(new Property("value", "markdown", "The display string for the author list, contributor list, or contributorship statement.", 0, 1, value));
+ }
+
+ @Override
+ public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException {
+ switch (_hash) {
+ case 3575610: /*type*/ return new Property("type", "CodeableConcept", "Used most commonly to express an author list or a contributorship statement.", 0, 1, type);
+ case 109780401: /*style*/ return new Property("style", "CodeableConcept", "The format for the display string.", 0, 1, style);
+ case -896505829: /*source*/ return new Property("source", "CodeableConcept", "Used to code the producer or rule for creating the display string.", 0, 1, source);
+ case 111972721: /*value*/ return new Property("value", "markdown", "The display string for the author list, contributor list, or contributorship statement.", 0, 1, value);
+ default: return super.getNamedProperty(_hash, _name, _checkValid);
+ }
+
+ }
+
+ @Override
+ public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException {
+ switch (hash) {
+ case 3575610: /*type*/ return this.type == null ? new Base[0] : new Base[] {this.type}; // CodeableConcept
+ case 109780401: /*style*/ return this.style == null ? new Base[0] : new Base[] {this.style}; // CodeableConcept
+ case -896505829: /*source*/ return this.source == null ? new Base[0] : new Base[] {this.source}; // CodeableConcept
+ case 111972721: /*value*/ return this.value == null ? new Base[0] : new Base[] {this.value}; // MarkdownType
+ default: return super.getProperty(hash, name, checkValid);
+ }
+
+ }
+
+ @Override
+ public Base setProperty(int hash, String name, Base value) throws FHIRException {
+ switch (hash) {
+ case 3575610: // type
+ this.type = TypeConvertor.castToCodeableConcept(value); // CodeableConcept
+ return value;
+ case 109780401: // style
+ this.style = TypeConvertor.castToCodeableConcept(value); // CodeableConcept
+ return value;
+ case -896505829: // source
+ this.source = TypeConvertor.castToCodeableConcept(value); // CodeableConcept
+ return value;
+ case 111972721: // value
+ this.value = TypeConvertor.castToMarkdown(value); // MarkdownType
+ return value;
+ default: return super.setProperty(hash, name, value);
+ }
+
+ }
+
+ @Override
+ public Base setProperty(String name, Base value) throws FHIRException {
+ if (name.equals("type")) {
+ this.type = TypeConvertor.castToCodeableConcept(value); // CodeableConcept
+ } else if (name.equals("style")) {
+ this.style = TypeConvertor.castToCodeableConcept(value); // CodeableConcept
+ } else if (name.equals("source")) {
+ this.source = TypeConvertor.castToCodeableConcept(value); // CodeableConcept
+ } else if (name.equals("value")) {
+ this.value = TypeConvertor.castToMarkdown(value); // MarkdownType
+ } else
+ return super.setProperty(name, value);
+ return value;
+ }
+
+ @Override
+ public Base makeProperty(int hash, String name) throws FHIRException {
+ switch (hash) {
+ case 3575610: return getType();
+ case 109780401: return getStyle();
+ case -896505829: return getSource();
+ case 111972721: return getValueElement();
+ default: return super.makeProperty(hash, name);
+ }
+
+ }
+
+ @Override
+ public String[] getTypesForProperty(int hash, String name) throws FHIRException {
+ switch (hash) {
+ case 3575610: /*type*/ return new String[] {"CodeableConcept"};
+ case 109780401: /*style*/ return new String[] {"CodeableConcept"};
+ case -896505829: /*source*/ return new String[] {"CodeableConcept"};
+ case 111972721: /*value*/ return new String[] {"markdown"};
+ default: return super.getTypesForProperty(hash, name);
+ }
+
+ }
+
+ @Override
+ public Base addChild(String name) throws FHIRException {
+ if (name.equals("type")) {
+ this.type = new CodeableConcept();
+ return this.type;
+ }
+ else if (name.equals("style")) {
+ this.style = new CodeableConcept();
+ return this.style;
+ }
+ else if (name.equals("source")) {
+ this.source = new CodeableConcept();
+ return this.source;
+ }
+ else if (name.equals("value")) {
+ throw new FHIRException("Cannot call addChild on a primitive type Citation.contributorship.summary.value");
+ }
+ else
+ return super.addChild(name);
+ }
+
+ public CitationContributorshipSummaryComponent copy() {
+ CitationContributorshipSummaryComponent dst = new CitationContributorshipSummaryComponent();
+ copyValues(dst);
+ return dst;
+ }
+
+ public void copyValues(CitationContributorshipSummaryComponent dst) {
+ super.copyValues(dst);
+ dst.type = type == null ? null : type.copy();
+ dst.style = style == null ? null : style.copy();
+ dst.source = source == null ? null : source.copy();
+ dst.value = value == null ? null : value.copy();
+ }
+
+ @Override
+ public boolean equalsDeep(Base other_) {
+ if (!super.equalsDeep(other_))
+ return false;
+ if (!(other_ instanceof CitationContributorshipSummaryComponent))
+ return false;
+ CitationContributorshipSummaryComponent o = (CitationContributorshipSummaryComponent) other_;
+ return compareDeep(type, o.type, true) && compareDeep(style, o.style, true) && compareDeep(source, o.source, true)
+ && compareDeep(value, o.value, true);
+ }
+
+ @Override
+ public boolean equalsShallow(Base other_) {
+ if (!super.equalsShallow(other_))
+ return false;
+ if (!(other_ instanceof CitationContributorshipSummaryComponent))
+ return false;
+ CitationContributorshipSummaryComponent o = (CitationContributorshipSummaryComponent) other_;
+ return compareValues(value, o.value, true);
+ }
+
+ public boolean isEmpty() {
+ return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(type, style, source, value
+ );
+ }
+
+ public String fhirType() {
+ return "Citation.contributorship.summary";
}
@@ -5359,10 +5740,10 @@ public class Citation extends MetadataResource {
protected CodeableConcept publishingModel;
/**
- * Language in which the article is published.
+ * Language in which this form of the article is published.
*/
@Child(name = "language", type = {CodeableConcept.class}, order=2, min=0, max=1, modifier=false, summary=false)
- @Description(shortDefinition="Language in which the article is published", formalDefinition="Language in which the article is published." )
+ @Description(shortDefinition="Language in which this form of the article is published", formalDefinition="Language in which this form of the article is published." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/languages")
protected CodeableConcept language;
@@ -5380,7 +5761,14 @@ public class Citation extends MetadataResource {
@Description(shortDefinition="Indicates the inclusive pages for the article cited", formalDefinition="Indicates the inclusive pages for the article cited." )
protected CitationAlternativeFormPaginationComponent pagination;
- private static final long serialVersionUID = -991805122L;
+ /**
+ * Citation detail for sources other than journals such as books and databases.
+ */
+ @Child(name = "publicationInfo", type = {}, order=5, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Citation detail for sources other than journals", formalDefinition="Citation detail for sources other than journals such as books and databases." )
+ protected CitationAlternativeFormPublicationInfoComponent publicationInfo;
+
+ private static final long serialVersionUID = 1567425409L;
/**
* Constructor
@@ -5414,7 +5802,7 @@ public class Citation extends MetadataResource {
}
/**
- * @return {@link #language} (Language in which the article is published.)
+ * @return {@link #language} (Language in which this form of the article is published.)
*/
public CodeableConcept getLanguage() {
if (this.language == null)
@@ -5430,7 +5818,7 @@ public class Citation extends MetadataResource {
}
/**
- * @param value {@link #language} (Language in which the article is published.)
+ * @param value {@link #language} (Language in which this form of the article is published.)
*/
public CitationAlternativeFormComponent setLanguage(CodeableConcept value) {
this.language = value;
@@ -5485,21 +5873,47 @@ public class Citation extends MetadataResource {
return this;
}
+ /**
+ * @return {@link #publicationInfo} (Citation detail for sources other than journals such as books and databases.)
+ */
+ public CitationAlternativeFormPublicationInfoComponent getPublicationInfo() {
+ if (this.publicationInfo == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationAlternativeFormComponent.publicationInfo");
+ else if (Configuration.doAutoCreate())
+ this.publicationInfo = new CitationAlternativeFormPublicationInfoComponent(); // cc
+ return this.publicationInfo;
+ }
+
+ public boolean hasPublicationInfo() {
+ return this.publicationInfo != null && !this.publicationInfo.isEmpty();
+ }
+
+ /**
+ * @param value {@link #publicationInfo} (Citation detail for sources other than journals such as books and databases.)
+ */
+ public CitationAlternativeFormComponent setPublicationInfo(CitationAlternativeFormPublicationInfoComponent value) {
+ this.publicationInfo = value;
+ return this;
+ }
+
protected void listChildren(List children) {
super.listChildren(children);
children.add(new Property("publishingModel", "CodeableConcept", "Identify the medium/media in which the cited article is published, eg print, electronic or print-electronic.", 0, 1, publishingModel));
- children.add(new Property("language", "CodeableConcept", "Language in which the article is published.", 0, 1, language));
+ children.add(new Property("language", "CodeableConcept", "Language in which this form of the article is published.", 0, 1, language));
children.add(new Property("journalIssue", "", "The specific issue in which the cited article resides.", 0, 1, journalIssue));
children.add(new Property("pagination", "", "Indicates the inclusive pages for the article cited.", 0, 1, pagination));
+ children.add(new Property("publicationInfo", "", "Citation detail for sources other than journals such as books and databases.", 0, 1, publicationInfo));
}
@Override
public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException {
switch (_hash) {
case 747318902: /*publishingModel*/ return new Property("publishingModel", "CodeableConcept", "Identify the medium/media in which the cited article is published, eg print, electronic or print-electronic.", 0, 1, publishingModel);
- case -1613589672: /*language*/ return new Property("language", "CodeableConcept", "Language in which the article is published.", 0, 1, language);
+ case -1613589672: /*language*/ return new Property("language", "CodeableConcept", "Language in which this form of the article is published.", 0, 1, language);
case -716835870: /*journalIssue*/ return new Property("journalIssue", "", "The specific issue in which the cited article resides.", 0, 1, journalIssue);
case 1297692570: /*pagination*/ return new Property("pagination", "", "Indicates the inclusive pages for the article cited.", 0, 1, pagination);
+ case 1470727418: /*publicationInfo*/ return new Property("publicationInfo", "", "Citation detail for sources other than journals such as books and databases.", 0, 1, publicationInfo);
default: return super.getNamedProperty(_hash, _name, _checkValid);
}
@@ -5512,6 +5926,7 @@ public class Citation extends MetadataResource {
case -1613589672: /*language*/ return this.language == null ? new Base[0] : new Base[] {this.language}; // CodeableConcept
case -716835870: /*journalIssue*/ return this.journalIssue == null ? new Base[0] : new Base[] {this.journalIssue}; // CitationAlternativeFormJournalIssueComponent
case 1297692570: /*pagination*/ return this.pagination == null ? new Base[0] : new Base[] {this.pagination}; // CitationAlternativeFormPaginationComponent
+ case 1470727418: /*publicationInfo*/ return this.publicationInfo == null ? new Base[0] : new Base[] {this.publicationInfo}; // CitationAlternativeFormPublicationInfoComponent
default: return super.getProperty(hash, name, checkValid);
}
@@ -5532,6 +5947,9 @@ public class Citation extends MetadataResource {
case 1297692570: // pagination
this.pagination = (CitationAlternativeFormPaginationComponent) value; // CitationAlternativeFormPaginationComponent
return value;
+ case 1470727418: // publicationInfo
+ this.publicationInfo = (CitationAlternativeFormPublicationInfoComponent) value; // CitationAlternativeFormPublicationInfoComponent
+ return value;
default: return super.setProperty(hash, name, value);
}
@@ -5547,6 +5965,8 @@ public class Citation extends MetadataResource {
this.journalIssue = (CitationAlternativeFormJournalIssueComponent) value; // CitationAlternativeFormJournalIssueComponent
} else if (name.equals("pagination")) {
this.pagination = (CitationAlternativeFormPaginationComponent) value; // CitationAlternativeFormPaginationComponent
+ } else if (name.equals("publicationInfo")) {
+ this.publicationInfo = (CitationAlternativeFormPublicationInfoComponent) value; // CitationAlternativeFormPublicationInfoComponent
} else
return super.setProperty(name, value);
return value;
@@ -5559,6 +5979,7 @@ public class Citation extends MetadataResource {
case -1613589672: return getLanguage();
case -716835870: return getJournalIssue();
case 1297692570: return getPagination();
+ case 1470727418: return getPublicationInfo();
default: return super.makeProperty(hash, name);
}
@@ -5571,6 +5992,7 @@ public class Citation extends MetadataResource {
case -1613589672: /*language*/ return new String[] {"CodeableConcept"};
case -716835870: /*journalIssue*/ return new String[] {};
case 1297692570: /*pagination*/ return new String[] {};
+ case 1470727418: /*publicationInfo*/ return new String[] {};
default: return super.getTypesForProperty(hash, name);
}
@@ -5594,6 +6016,10 @@ public class Citation extends MetadataResource {
this.pagination = new CitationAlternativeFormPaginationComponent();
return this.pagination;
}
+ else if (name.equals("publicationInfo")) {
+ this.publicationInfo = new CitationAlternativeFormPublicationInfoComponent();
+ return this.publicationInfo;
+ }
else
return super.addChild(name);
}
@@ -5610,6 +6036,7 @@ public class Citation extends MetadataResource {
dst.language = language == null ? null : language.copy();
dst.journalIssue = journalIssue == null ? null : journalIssue.copy();
dst.pagination = pagination == null ? null : pagination.copy();
+ dst.publicationInfo = publicationInfo == null ? null : publicationInfo.copy();
}
@Override
@@ -5621,7 +6048,7 @@ public class Citation extends MetadataResource {
CitationAlternativeFormComponent o = (CitationAlternativeFormComponent) other_;
return compareDeep(publishingModel, o.publishingModel, true) && compareDeep(language, o.language, true)
&& compareDeep(journalIssue, o.journalIssue, true) && compareDeep(pagination, o.pagination, true)
- ;
+ && compareDeep(publicationInfo, o.publicationInfo, true);
}
@Override
@@ -5636,7 +6063,7 @@ public class Citation extends MetadataResource {
public boolean isEmpty() {
return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(publishingModel, language
- , journalIssue, pagination);
+ , journalIssue, pagination, publicationInfo);
}
public String fhirType() {
@@ -5649,10 +6076,10 @@ public class Citation extends MetadataResource {
@Block()
public static class CitationAlternativeFormJournalIssueComponent extends BackboneElement implements IBaseBackboneElement {
/**
- * NLM codes Internet or Print.
+ * Describes the form of the medium cited. Common codes are "Internet" or "Print.".
*/
@Child(name = "citedMedium", type = {CodeableConcept.class}, order=1, min=0, max=1, modifier=false, summary=false)
- @Description(shortDefinition="NLM codes Internet or Print", formalDefinition="NLM codes Internet or Print." )
+ @Description(shortDefinition="Internet or Print", formalDefinition="Describes the form of the medium cited. Common codes are \"Internet\" or \"Print.\"." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/journal-issue-medium")
protected CodeableConcept citedMedium;
@@ -5671,13 +6098,13 @@ public class Citation extends MetadataResource {
protected StringType issue;
/**
- * Date on which the issue of the journal was published.
+ * Defining the date on which the issue of the joutnal was published.
*/
- @Child(name = "publicationDate", type = {StringType.class}, order=4, min=0, max=1, modifier=false, summary=false)
- @Description(shortDefinition="Date on which the issue of the journal was published", formalDefinition="Date on which the issue of the journal was published." )
- protected StringType publicationDate;
+ @Child(name = "publicationDate", type = {}, order=4, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Defining the date on which the issue of the joutnal was published", formalDefinition="Defining the date on which the issue of the joutnal was published." )
+ protected CitationAlternativeFormJournalIssuePublicationDateComponent publicationDate;
- private static final long serialVersionUID = -1343937439L;
+ private static final long serialVersionUID = 2080837313L;
/**
* Constructor
@@ -5687,7 +6114,7 @@ public class Citation extends MetadataResource {
}
/**
- * @return {@link #citedMedium} (NLM codes Internet or Print.)
+ * @return {@link #citedMedium} (Describes the form of the medium cited. Common codes are "Internet" or "Print.".)
*/
public CodeableConcept getCitedMedium() {
if (this.citedMedium == null)
@@ -5703,7 +6130,7 @@ public class Citation extends MetadataResource {
}
/**
- * @param value {@link #citedMedium} (NLM codes Internet or Print.)
+ * @param value {@link #citedMedium} (Describes the form of the medium cited. Common codes are "Internet" or "Print.".)
*/
public CitationAlternativeFormJournalIssueComponent setCitedMedium(CodeableConcept value) {
this.citedMedium = value;
@@ -5809,69 +6236,44 @@ public class Citation extends MetadataResource {
}
/**
- * @return {@link #publicationDate} (Date on which the issue of the journal was published.). This is the underlying object with id, value and extensions. The accessor "getPublicationDate" gives direct access to the value
+ * @return {@link #publicationDate} (Defining the date on which the issue of the joutnal was published.)
*/
- public StringType getPublicationDateElement() {
+ public CitationAlternativeFormJournalIssuePublicationDateComponent getPublicationDate() {
if (this.publicationDate == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create CitationAlternativeFormJournalIssueComponent.publicationDate");
else if (Configuration.doAutoCreate())
- this.publicationDate = new StringType(); // bb
+ this.publicationDate = new CitationAlternativeFormJournalIssuePublicationDateComponent(); // cc
return this.publicationDate;
}
- public boolean hasPublicationDateElement() {
- return this.publicationDate != null && !this.publicationDate.isEmpty();
- }
-
public boolean hasPublicationDate() {
return this.publicationDate != null && !this.publicationDate.isEmpty();
}
/**
- * @param value {@link #publicationDate} (Date on which the issue of the journal was published.). This is the underlying object with id, value and extensions. The accessor "getPublicationDate" gives direct access to the value
+ * @param value {@link #publicationDate} (Defining the date on which the issue of the joutnal was published.)
*/
- public CitationAlternativeFormJournalIssueComponent setPublicationDateElement(StringType value) {
+ public CitationAlternativeFormJournalIssueComponent setPublicationDate(CitationAlternativeFormJournalIssuePublicationDateComponent value) {
this.publicationDate = value;
return this;
}
- /**
- * @return Date on which the issue of the journal was published.
- */
- public String getPublicationDate() {
- return this.publicationDate == null ? null : this.publicationDate.getValue();
- }
-
- /**
- * @param value Date on which the issue of the journal was published.
- */
- public CitationAlternativeFormJournalIssueComponent setPublicationDate(String value) {
- if (Utilities.noString(value))
- this.publicationDate = null;
- else {
- if (this.publicationDate == null)
- this.publicationDate = new StringType();
- this.publicationDate.setValue(value);
- }
- return this;
- }
-
protected void listChildren(List children) {
super.listChildren(children);
- children.add(new Property("citedMedium", "CodeableConcept", "NLM codes Internet or Print.", 0, 1, citedMedium));
+ children.add(new Property("citedMedium", "CodeableConcept", "Describes the form of the medium cited. Common codes are \"Internet\" or \"Print.\".", 0, 1, citedMedium));
children.add(new Property("volume", "string", "Volume number of journal in which the article is published.", 0, 1, volume));
children.add(new Property("issue", "string", "Issue, part or supplement of journal in which the article is published.", 0, 1, issue));
- children.add(new Property("publicationDate", "string", "Date on which the issue of the journal was published.", 0, 1, publicationDate));
+ children.add(new Property("publicationDate", "", "Defining the date on which the issue of the joutnal was published.", 0, 1, publicationDate));
}
@Override
public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException {
switch (_hash) {
- case 612116418: /*citedMedium*/ return new Property("citedMedium", "CodeableConcept", "NLM codes Internet or Print.", 0, 1, citedMedium);
+ case 612116418: /*citedMedium*/ return new Property("citedMedium", "CodeableConcept", "Describes the form of the medium cited. Common codes are \"Internet\" or \"Print.\".", 0, 1, citedMedium);
case -810883302: /*volume*/ return new Property("volume", "string", "Volume number of journal in which the article is published.", 0, 1, volume);
case 100509913: /*issue*/ return new Property("issue", "string", "Issue, part or supplement of journal in which the article is published.", 0, 1, issue);
- case 1470566394: /*publicationDate*/ return new Property("publicationDate", "string", "Date on which the issue of the journal was published.", 0, 1, publicationDate);
+ case 1470566394: /*publicationDate*/ return new Property("publicationDate", "", "Defining the date on which the issue of the joutnal was published.", 0, 1, publicationDate);
default: return super.getNamedProperty(_hash, _name, _checkValid);
}
@@ -5883,7 +6285,7 @@ public class Citation extends MetadataResource {
case 612116418: /*citedMedium*/ return this.citedMedium == null ? new Base[0] : new Base[] {this.citedMedium}; // CodeableConcept
case -810883302: /*volume*/ return this.volume == null ? new Base[0] : new Base[] {this.volume}; // StringType
case 100509913: /*issue*/ return this.issue == null ? new Base[0] : new Base[] {this.issue}; // StringType
- case 1470566394: /*publicationDate*/ return this.publicationDate == null ? new Base[0] : new Base[] {this.publicationDate}; // StringType
+ case 1470566394: /*publicationDate*/ return this.publicationDate == null ? new Base[0] : new Base[] {this.publicationDate}; // CitationAlternativeFormJournalIssuePublicationDateComponent
default: return super.getProperty(hash, name, checkValid);
}
@@ -5902,7 +6304,7 @@ public class Citation extends MetadataResource {
this.issue = TypeConvertor.castToString(value); // StringType
return value;
case 1470566394: // publicationDate
- this.publicationDate = TypeConvertor.castToString(value); // StringType
+ this.publicationDate = (CitationAlternativeFormJournalIssuePublicationDateComponent) value; // CitationAlternativeFormJournalIssuePublicationDateComponent
return value;
default: return super.setProperty(hash, name, value);
}
@@ -5918,7 +6320,7 @@ public class Citation extends MetadataResource {
} else if (name.equals("issue")) {
this.issue = TypeConvertor.castToString(value); // StringType
} else if (name.equals("publicationDate")) {
- this.publicationDate = TypeConvertor.castToString(value); // StringType
+ this.publicationDate = (CitationAlternativeFormJournalIssuePublicationDateComponent) value; // CitationAlternativeFormJournalIssuePublicationDateComponent
} else
return super.setProperty(name, value);
return value;
@@ -5930,7 +6332,7 @@ public class Citation extends MetadataResource {
case 612116418: return getCitedMedium();
case -810883302: return getVolumeElement();
case 100509913: return getIssueElement();
- case 1470566394: return getPublicationDateElement();
+ case 1470566394: return getPublicationDate();
default: return super.makeProperty(hash, name);
}
@@ -5942,7 +6344,7 @@ public class Citation extends MetadataResource {
case 612116418: /*citedMedium*/ return new String[] {"CodeableConcept"};
case -810883302: /*volume*/ return new String[] {"string"};
case 100509913: /*issue*/ return new String[] {"string"};
- case 1470566394: /*publicationDate*/ return new String[] {"string"};
+ case 1470566394: /*publicationDate*/ return new String[] {};
default: return super.getTypesForProperty(hash, name);
}
@@ -5961,7 +6363,8 @@ public class Citation extends MetadataResource {
throw new FHIRException("Cannot call addChild on a primitive type Citation.alternativeForm.journalIssue.issue");
}
else if (name.equals("publicationDate")) {
- throw new FHIRException("Cannot call addChild on a primitive type Citation.alternativeForm.journalIssue.publicationDate");
+ this.publicationDate = new CitationAlternativeFormJournalIssuePublicationDateComponent();
+ return this.publicationDate;
}
else
return super.addChild(name);
@@ -5999,8 +6402,7 @@ public class Citation extends MetadataResource {
if (!(other_ instanceof CitationAlternativeFormJournalIssueComponent))
return false;
CitationAlternativeFormJournalIssueComponent o = (CitationAlternativeFormJournalIssueComponent) other_;
- return compareValues(volume, o.volume, true) && compareValues(issue, o.issue, true) && compareValues(publicationDate, o.publicationDate, true)
- ;
+ return compareValues(volume, o.volume, true) && compareValues(issue, o.issue, true);
}
public boolean isEmpty() {
@@ -6013,6 +6415,540 @@ public class Citation extends MetadataResource {
}
+ }
+
+ @Block()
+ public static class CitationAlternativeFormJournalIssuePublicationDateComponent extends BackboneElement implements IBaseBackboneElement {
+ /**
+ * Date on which the issue of the journal was published.
+ */
+ @Child(name = "date", type = {DateType.class}, order=1, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Date on which the issue of the journal was published", formalDefinition="Date on which the issue of the journal was published." )
+ protected DateType date;
+
+ /**
+ * Year on which the issue of the journal was published.
+ */
+ @Child(name = "year", type = {StringType.class}, order=2, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Year on which the issue of the journal was published", formalDefinition="Year on which the issue of the journal was published." )
+ protected StringType year;
+
+ /**
+ * Month on which the issue of the journal was published.
+ */
+ @Child(name = "month", type = {StringType.class}, order=3, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Month on which the issue of the journal was published", formalDefinition="Month on which the issue of the journal was published." )
+ protected StringType month;
+
+ /**
+ * Day on which the issue of the journal was published.
+ */
+ @Child(name = "day", type = {StringType.class}, order=4, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Day on which the issue of the journal was published", formalDefinition="Day on which the issue of the journal was published." )
+ protected StringType day;
+
+ /**
+ * Spring, Summer, Fall/Autumn, Winter.
+ */
+ @Child(name = "season", type = {StringType.class}, order=5, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Season on which the issue of the jornal was published", formalDefinition="Spring, Summer, Fall/Autumn, Winter." )
+ protected StringType season;
+
+ /**
+ * Text representation of the date of which the issue of the journal was published.
+ */
+ @Child(name = "text", type = {StringType.class}, order=6, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Text representation of the date of which the issue of the journal was published", formalDefinition="Text representation of the date of which the issue of the journal was published." )
+ protected StringType text;
+
+ private static final long serialVersionUID = 1585589146L;
+
+ /**
+ * Constructor
+ */
+ public CitationAlternativeFormJournalIssuePublicationDateComponent() {
+ super();
+ }
+
+ /**
+ * @return {@link #date} (Date on which the issue of the journal was published.). This is the underlying object with id, value and extensions. The accessor "getDate" gives direct access to the value
+ */
+ public DateType getDateElement() {
+ if (this.date == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationAlternativeFormJournalIssuePublicationDateComponent.date");
+ else if (Configuration.doAutoCreate())
+ this.date = new DateType(); // bb
+ return this.date;
+ }
+
+ public boolean hasDateElement() {
+ return this.date != null && !this.date.isEmpty();
+ }
+
+ public boolean hasDate() {
+ return this.date != null && !this.date.isEmpty();
+ }
+
+ /**
+ * @param value {@link #date} (Date on which the issue of the journal was published.). This is the underlying object with id, value and extensions. The accessor "getDate" gives direct access to the value
+ */
+ public CitationAlternativeFormJournalIssuePublicationDateComponent setDateElement(DateType value) {
+ this.date = value;
+ return this;
+ }
+
+ /**
+ * @return Date on which the issue of the journal was published.
+ */
+ public Date getDate() {
+ return this.date == null ? null : this.date.getValue();
+ }
+
+ /**
+ * @param value Date on which the issue of the journal was published.
+ */
+ public CitationAlternativeFormJournalIssuePublicationDateComponent setDate(Date value) {
+ if (value == null)
+ this.date = null;
+ else {
+ if (this.date == null)
+ this.date = new DateType();
+ this.date.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #year} (Year on which the issue of the journal was published.). This is the underlying object with id, value and extensions. The accessor "getYear" gives direct access to the value
+ */
+ public StringType getYearElement() {
+ if (this.year == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationAlternativeFormJournalIssuePublicationDateComponent.year");
+ else if (Configuration.doAutoCreate())
+ this.year = new StringType(); // bb
+ return this.year;
+ }
+
+ public boolean hasYearElement() {
+ return this.year != null && !this.year.isEmpty();
+ }
+
+ public boolean hasYear() {
+ return this.year != null && !this.year.isEmpty();
+ }
+
+ /**
+ * @param value {@link #year} (Year on which the issue of the journal was published.). This is the underlying object with id, value and extensions. The accessor "getYear" gives direct access to the value
+ */
+ public CitationAlternativeFormJournalIssuePublicationDateComponent setYearElement(StringType value) {
+ this.year = value;
+ return this;
+ }
+
+ /**
+ * @return Year on which the issue of the journal was published.
+ */
+ public String getYear() {
+ return this.year == null ? null : this.year.getValue();
+ }
+
+ /**
+ * @param value Year on which the issue of the journal was published.
+ */
+ public CitationAlternativeFormJournalIssuePublicationDateComponent setYear(String value) {
+ if (Utilities.noString(value))
+ this.year = null;
+ else {
+ if (this.year == null)
+ this.year = new StringType();
+ this.year.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #month} (Month on which the issue of the journal was published.). This is the underlying object with id, value and extensions. The accessor "getMonth" gives direct access to the value
+ */
+ public StringType getMonthElement() {
+ if (this.month == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationAlternativeFormJournalIssuePublicationDateComponent.month");
+ else if (Configuration.doAutoCreate())
+ this.month = new StringType(); // bb
+ return this.month;
+ }
+
+ public boolean hasMonthElement() {
+ return this.month != null && !this.month.isEmpty();
+ }
+
+ public boolean hasMonth() {
+ return this.month != null && !this.month.isEmpty();
+ }
+
+ /**
+ * @param value {@link #month} (Month on which the issue of the journal was published.). This is the underlying object with id, value and extensions. The accessor "getMonth" gives direct access to the value
+ */
+ public CitationAlternativeFormJournalIssuePublicationDateComponent setMonthElement(StringType value) {
+ this.month = value;
+ return this;
+ }
+
+ /**
+ * @return Month on which the issue of the journal was published.
+ */
+ public String getMonth() {
+ return this.month == null ? null : this.month.getValue();
+ }
+
+ /**
+ * @param value Month on which the issue of the journal was published.
+ */
+ public CitationAlternativeFormJournalIssuePublicationDateComponent setMonth(String value) {
+ if (Utilities.noString(value))
+ this.month = null;
+ else {
+ if (this.month == null)
+ this.month = new StringType();
+ this.month.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #day} (Day on which the issue of the journal was published.). This is the underlying object with id, value and extensions. The accessor "getDay" gives direct access to the value
+ */
+ public StringType getDayElement() {
+ if (this.day == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationAlternativeFormJournalIssuePublicationDateComponent.day");
+ else if (Configuration.doAutoCreate())
+ this.day = new StringType(); // bb
+ return this.day;
+ }
+
+ public boolean hasDayElement() {
+ return this.day != null && !this.day.isEmpty();
+ }
+
+ public boolean hasDay() {
+ return this.day != null && !this.day.isEmpty();
+ }
+
+ /**
+ * @param value {@link #day} (Day on which the issue of the journal was published.). This is the underlying object with id, value and extensions. The accessor "getDay" gives direct access to the value
+ */
+ public CitationAlternativeFormJournalIssuePublicationDateComponent setDayElement(StringType value) {
+ this.day = value;
+ return this;
+ }
+
+ /**
+ * @return Day on which the issue of the journal was published.
+ */
+ public String getDay() {
+ return this.day == null ? null : this.day.getValue();
+ }
+
+ /**
+ * @param value Day on which the issue of the journal was published.
+ */
+ public CitationAlternativeFormJournalIssuePublicationDateComponent setDay(String value) {
+ if (Utilities.noString(value))
+ this.day = null;
+ else {
+ if (this.day == null)
+ this.day = new StringType();
+ this.day.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #season} (Spring, Summer, Fall/Autumn, Winter.). This is the underlying object with id, value and extensions. The accessor "getSeason" gives direct access to the value
+ */
+ public StringType getSeasonElement() {
+ if (this.season == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationAlternativeFormJournalIssuePublicationDateComponent.season");
+ else if (Configuration.doAutoCreate())
+ this.season = new StringType(); // bb
+ return this.season;
+ }
+
+ public boolean hasSeasonElement() {
+ return this.season != null && !this.season.isEmpty();
+ }
+
+ public boolean hasSeason() {
+ return this.season != null && !this.season.isEmpty();
+ }
+
+ /**
+ * @param value {@link #season} (Spring, Summer, Fall/Autumn, Winter.). This is the underlying object with id, value and extensions. The accessor "getSeason" gives direct access to the value
+ */
+ public CitationAlternativeFormJournalIssuePublicationDateComponent setSeasonElement(StringType value) {
+ this.season = value;
+ return this;
+ }
+
+ /**
+ * @return Spring, Summer, Fall/Autumn, Winter.
+ */
+ public String getSeason() {
+ return this.season == null ? null : this.season.getValue();
+ }
+
+ /**
+ * @param value Spring, Summer, Fall/Autumn, Winter.
+ */
+ public CitationAlternativeFormJournalIssuePublicationDateComponent setSeason(String value) {
+ if (Utilities.noString(value))
+ this.season = null;
+ else {
+ if (this.season == null)
+ this.season = new StringType();
+ this.season.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #text} (Text representation of the date of which the issue of the journal was published.). This is the underlying object with id, value and extensions. The accessor "getText" gives direct access to the value
+ */
+ public StringType getTextElement() {
+ if (this.text == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationAlternativeFormJournalIssuePublicationDateComponent.text");
+ else if (Configuration.doAutoCreate())
+ this.text = new StringType(); // bb
+ return this.text;
+ }
+
+ public boolean hasTextElement() {
+ return this.text != null && !this.text.isEmpty();
+ }
+
+ public boolean hasText() {
+ return this.text != null && !this.text.isEmpty();
+ }
+
+ /**
+ * @param value {@link #text} (Text representation of the date of which the issue of the journal was published.). This is the underlying object with id, value and extensions. The accessor "getText" gives direct access to the value
+ */
+ public CitationAlternativeFormJournalIssuePublicationDateComponent setTextElement(StringType value) {
+ this.text = value;
+ return this;
+ }
+
+ /**
+ * @return Text representation of the date of which the issue of the journal was published.
+ */
+ public String getText() {
+ return this.text == null ? null : this.text.getValue();
+ }
+
+ /**
+ * @param value Text representation of the date of which the issue of the journal was published.
+ */
+ public CitationAlternativeFormJournalIssuePublicationDateComponent setText(String value) {
+ if (Utilities.noString(value))
+ this.text = null;
+ else {
+ if (this.text == null)
+ this.text = new StringType();
+ this.text.setValue(value);
+ }
+ return this;
+ }
+
+ protected void listChildren(List children) {
+ super.listChildren(children);
+ children.add(new Property("date", "date", "Date on which the issue of the journal was published.", 0, 1, date));
+ children.add(new Property("year", "string", "Year on which the issue of the journal was published.", 0, 1, year));
+ children.add(new Property("month", "string", "Month on which the issue of the journal was published.", 0, 1, month));
+ children.add(new Property("day", "string", "Day on which the issue of the journal was published.", 0, 1, day));
+ children.add(new Property("season", "string", "Spring, Summer, Fall/Autumn, Winter.", 0, 1, season));
+ children.add(new Property("text", "string", "Text representation of the date of which the issue of the journal was published.", 0, 1, text));
+ }
+
+ @Override
+ public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException {
+ switch (_hash) {
+ case 3076014: /*date*/ return new Property("date", "date", "Date on which the issue of the journal was published.", 0, 1, date);
+ case 3704893: /*year*/ return new Property("year", "string", "Year on which the issue of the journal was published.", 0, 1, year);
+ case 104080000: /*month*/ return new Property("month", "string", "Month on which the issue of the journal was published.", 0, 1, month);
+ case 99228: /*day*/ return new Property("day", "string", "Day on which the issue of the journal was published.", 0, 1, day);
+ case -906335517: /*season*/ return new Property("season", "string", "Spring, Summer, Fall/Autumn, Winter.", 0, 1, season);
+ case 3556653: /*text*/ return new Property("text", "string", "Text representation of the date of which the issue of the journal was published.", 0, 1, text);
+ default: return super.getNamedProperty(_hash, _name, _checkValid);
+ }
+
+ }
+
+ @Override
+ public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException {
+ switch (hash) {
+ case 3076014: /*date*/ return this.date == null ? new Base[0] : new Base[] {this.date}; // DateType
+ case 3704893: /*year*/ return this.year == null ? new Base[0] : new Base[] {this.year}; // StringType
+ case 104080000: /*month*/ return this.month == null ? new Base[0] : new Base[] {this.month}; // StringType
+ case 99228: /*day*/ return this.day == null ? new Base[0] : new Base[] {this.day}; // StringType
+ case -906335517: /*season*/ return this.season == null ? new Base[0] : new Base[] {this.season}; // StringType
+ case 3556653: /*text*/ return this.text == null ? new Base[0] : new Base[] {this.text}; // StringType
+ default: return super.getProperty(hash, name, checkValid);
+ }
+
+ }
+
+ @Override
+ public Base setProperty(int hash, String name, Base value) throws FHIRException {
+ switch (hash) {
+ case 3076014: // date
+ this.date = TypeConvertor.castToDate(value); // DateType
+ return value;
+ case 3704893: // year
+ this.year = TypeConvertor.castToString(value); // StringType
+ return value;
+ case 104080000: // month
+ this.month = TypeConvertor.castToString(value); // StringType
+ return value;
+ case 99228: // day
+ this.day = TypeConvertor.castToString(value); // StringType
+ return value;
+ case -906335517: // season
+ this.season = TypeConvertor.castToString(value); // StringType
+ return value;
+ case 3556653: // text
+ this.text = TypeConvertor.castToString(value); // StringType
+ return value;
+ default: return super.setProperty(hash, name, value);
+ }
+
+ }
+
+ @Override
+ public Base setProperty(String name, Base value) throws FHIRException {
+ if (name.equals("date")) {
+ this.date = TypeConvertor.castToDate(value); // DateType
+ } else if (name.equals("year")) {
+ this.year = TypeConvertor.castToString(value); // StringType
+ } else if (name.equals("month")) {
+ this.month = TypeConvertor.castToString(value); // StringType
+ } else if (name.equals("day")) {
+ this.day = TypeConvertor.castToString(value); // StringType
+ } else if (name.equals("season")) {
+ this.season = TypeConvertor.castToString(value); // StringType
+ } else if (name.equals("text")) {
+ this.text = TypeConvertor.castToString(value); // StringType
+ } else
+ return super.setProperty(name, value);
+ return value;
+ }
+
+ @Override
+ public Base makeProperty(int hash, String name) throws FHIRException {
+ switch (hash) {
+ case 3076014: return getDateElement();
+ case 3704893: return getYearElement();
+ case 104080000: return getMonthElement();
+ case 99228: return getDayElement();
+ case -906335517: return getSeasonElement();
+ case 3556653: return getTextElement();
+ default: return super.makeProperty(hash, name);
+ }
+
+ }
+
+ @Override
+ public String[] getTypesForProperty(int hash, String name) throws FHIRException {
+ switch (hash) {
+ case 3076014: /*date*/ return new String[] {"date"};
+ case 3704893: /*year*/ return new String[] {"string"};
+ case 104080000: /*month*/ return new String[] {"string"};
+ case 99228: /*day*/ return new String[] {"string"};
+ case -906335517: /*season*/ return new String[] {"string"};
+ case 3556653: /*text*/ return new String[] {"string"};
+ default: return super.getTypesForProperty(hash, name);
+ }
+
+ }
+
+ @Override
+ public Base addChild(String name) throws FHIRException {
+ if (name.equals("date")) {
+ throw new FHIRException("Cannot call addChild on a primitive type Citation.alternativeForm.journalIssue.publicationDate.date");
+ }
+ else if (name.equals("year")) {
+ throw new FHIRException("Cannot call addChild on a primitive type Citation.alternativeForm.journalIssue.publicationDate.year");
+ }
+ else if (name.equals("month")) {
+ throw new FHIRException("Cannot call addChild on a primitive type Citation.alternativeForm.journalIssue.publicationDate.month");
+ }
+ else if (name.equals("day")) {
+ throw new FHIRException("Cannot call addChild on a primitive type Citation.alternativeForm.journalIssue.publicationDate.day");
+ }
+ else if (name.equals("season")) {
+ throw new FHIRException("Cannot call addChild on a primitive type Citation.alternativeForm.journalIssue.publicationDate.season");
+ }
+ else if (name.equals("text")) {
+ throw new FHIRException("Cannot call addChild on a primitive type Citation.alternativeForm.journalIssue.publicationDate.text");
+ }
+ else
+ return super.addChild(name);
+ }
+
+ public CitationAlternativeFormJournalIssuePublicationDateComponent copy() {
+ CitationAlternativeFormJournalIssuePublicationDateComponent dst = new CitationAlternativeFormJournalIssuePublicationDateComponent();
+ copyValues(dst);
+ return dst;
+ }
+
+ public void copyValues(CitationAlternativeFormJournalIssuePublicationDateComponent dst) {
+ super.copyValues(dst);
+ dst.date = date == null ? null : date.copy();
+ dst.year = year == null ? null : year.copy();
+ dst.month = month == null ? null : month.copy();
+ dst.day = day == null ? null : day.copy();
+ dst.season = season == null ? null : season.copy();
+ dst.text = text == null ? null : text.copy();
+ }
+
+ @Override
+ public boolean equalsDeep(Base other_) {
+ if (!super.equalsDeep(other_))
+ return false;
+ if (!(other_ instanceof CitationAlternativeFormJournalIssuePublicationDateComponent))
+ return false;
+ CitationAlternativeFormJournalIssuePublicationDateComponent o = (CitationAlternativeFormJournalIssuePublicationDateComponent) other_;
+ return compareDeep(date, o.date, true) && compareDeep(year, o.year, true) && compareDeep(month, o.month, true)
+ && compareDeep(day, o.day, true) && compareDeep(season, o.season, true) && compareDeep(text, o.text, true)
+ ;
+ }
+
+ @Override
+ public boolean equalsShallow(Base other_) {
+ if (!super.equalsShallow(other_))
+ return false;
+ if (!(other_ instanceof CitationAlternativeFormJournalIssuePublicationDateComponent))
+ return false;
+ CitationAlternativeFormJournalIssuePublicationDateComponent o = (CitationAlternativeFormJournalIssuePublicationDateComponent) other_;
+ return compareValues(date, o.date, true) && compareValues(year, o.year, true) && compareValues(month, o.month, true)
+ && compareValues(day, o.day, true) && compareValues(season, o.season, true) && compareValues(text, o.text, true)
+ ;
+ }
+
+ public boolean isEmpty() {
+ return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(date, year, month, day
+ , season, text);
+ }
+
+ public String fhirType() {
+ return "Citation.alternativeForm.journalIssue.publicationDate";
+
+ }
+
}
@Block()
@@ -6335,6 +7271,1305 @@ public class Citation extends MetadataResource {
}
+ }
+
+ @Block()
+ public static class CitationAlternativeFormPublicationInfoComponent extends BackboneElement implements IBaseBackboneElement {
+ /**
+ * The collection the cited article is published in.
+ */
+ @Child(name = "publishedIn", type = {}, order=1, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="The collection the cited article is published in", formalDefinition="The collection the cited article is published in." )
+ protected CitationAlternativeFormPublicationInfoPublishedInComponent publishedIn;
+
+ /**
+ * The date the article was added to the database.
+ */
+ @Child(name = "entryDate", type = {DateTimeType.class}, order=2, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="The date the article was added to the database", formalDefinition="The date the article was added to the database." )
+ protected DateTimeType entryDate;
+
+ /**
+ * The date the article was last revised or updated in the database.
+ */
+ @Child(name = "revisionDate", type = {DateTimeType.class}, order=3, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="The date the article was last revised or updated in the database", formalDefinition="The date the article was last revised or updated in the database." )
+ protected DateTimeType revisionDate;
+
+ /**
+ * Actual or Approximate number of pages or screens.
+ */
+ @Child(name = "pageCount", type = {StringType.class}, order=4, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Number of pages or screens", formalDefinition="Actual or Approximate number of pages or screens." )
+ protected StringType pageCount;
+
+ private static final long serialVersionUID = -1109876499L;
+
+ /**
+ * Constructor
+ */
+ public CitationAlternativeFormPublicationInfoComponent() {
+ super();
+ }
+
+ /**
+ * @return {@link #publishedIn} (The collection the cited article is published in.)
+ */
+ public CitationAlternativeFormPublicationInfoPublishedInComponent getPublishedIn() {
+ if (this.publishedIn == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationAlternativeFormPublicationInfoComponent.publishedIn");
+ else if (Configuration.doAutoCreate())
+ this.publishedIn = new CitationAlternativeFormPublicationInfoPublishedInComponent(); // cc
+ return this.publishedIn;
+ }
+
+ public boolean hasPublishedIn() {
+ return this.publishedIn != null && !this.publishedIn.isEmpty();
+ }
+
+ /**
+ * @param value {@link #publishedIn} (The collection the cited article is published in.)
+ */
+ public CitationAlternativeFormPublicationInfoComponent setPublishedIn(CitationAlternativeFormPublicationInfoPublishedInComponent value) {
+ this.publishedIn = value;
+ return this;
+ }
+
+ /**
+ * @return {@link #entryDate} (The date the article was added to the database.). This is the underlying object with id, value and extensions. The accessor "getEntryDate" gives direct access to the value
+ */
+ public DateTimeType getEntryDateElement() {
+ if (this.entryDate == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationAlternativeFormPublicationInfoComponent.entryDate");
+ else if (Configuration.doAutoCreate())
+ this.entryDate = new DateTimeType(); // bb
+ return this.entryDate;
+ }
+
+ public boolean hasEntryDateElement() {
+ return this.entryDate != null && !this.entryDate.isEmpty();
+ }
+
+ public boolean hasEntryDate() {
+ return this.entryDate != null && !this.entryDate.isEmpty();
+ }
+
+ /**
+ * @param value {@link #entryDate} (The date the article was added to the database.). This is the underlying object with id, value and extensions. The accessor "getEntryDate" gives direct access to the value
+ */
+ public CitationAlternativeFormPublicationInfoComponent setEntryDateElement(DateTimeType value) {
+ this.entryDate = value;
+ return this;
+ }
+
+ /**
+ * @return The date the article was added to the database.
+ */
+ public Date getEntryDate() {
+ return this.entryDate == null ? null : this.entryDate.getValue();
+ }
+
+ /**
+ * @param value The date the article was added to the database.
+ */
+ public CitationAlternativeFormPublicationInfoComponent setEntryDate(Date value) {
+ if (value == null)
+ this.entryDate = null;
+ else {
+ if (this.entryDate == null)
+ this.entryDate = new DateTimeType();
+ this.entryDate.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #revisionDate} (The date the article was last revised or updated in the database.). This is the underlying object with id, value and extensions. The accessor "getRevisionDate" gives direct access to the value
+ */
+ public DateTimeType getRevisionDateElement() {
+ if (this.revisionDate == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationAlternativeFormPublicationInfoComponent.revisionDate");
+ else if (Configuration.doAutoCreate())
+ this.revisionDate = new DateTimeType(); // bb
+ return this.revisionDate;
+ }
+
+ public boolean hasRevisionDateElement() {
+ return this.revisionDate != null && !this.revisionDate.isEmpty();
+ }
+
+ public boolean hasRevisionDate() {
+ return this.revisionDate != null && !this.revisionDate.isEmpty();
+ }
+
+ /**
+ * @param value {@link #revisionDate} (The date the article was last revised or updated in the database.). This is the underlying object with id, value and extensions. The accessor "getRevisionDate" gives direct access to the value
+ */
+ public CitationAlternativeFormPublicationInfoComponent setRevisionDateElement(DateTimeType value) {
+ this.revisionDate = value;
+ return this;
+ }
+
+ /**
+ * @return The date the article was last revised or updated in the database.
+ */
+ public Date getRevisionDate() {
+ return this.revisionDate == null ? null : this.revisionDate.getValue();
+ }
+
+ /**
+ * @param value The date the article was last revised or updated in the database.
+ */
+ public CitationAlternativeFormPublicationInfoComponent setRevisionDate(Date value) {
+ if (value == null)
+ this.revisionDate = null;
+ else {
+ if (this.revisionDate == null)
+ this.revisionDate = new DateTimeType();
+ this.revisionDate.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #pageCount} (Actual or Approximate number of pages or screens.). This is the underlying object with id, value and extensions. The accessor "getPageCount" gives direct access to the value
+ */
+ public StringType getPageCountElement() {
+ if (this.pageCount == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationAlternativeFormPublicationInfoComponent.pageCount");
+ else if (Configuration.doAutoCreate())
+ this.pageCount = new StringType(); // bb
+ return this.pageCount;
+ }
+
+ public boolean hasPageCountElement() {
+ return this.pageCount != null && !this.pageCount.isEmpty();
+ }
+
+ public boolean hasPageCount() {
+ return this.pageCount != null && !this.pageCount.isEmpty();
+ }
+
+ /**
+ * @param value {@link #pageCount} (Actual or Approximate number of pages or screens.). This is the underlying object with id, value and extensions. The accessor "getPageCount" gives direct access to the value
+ */
+ public CitationAlternativeFormPublicationInfoComponent setPageCountElement(StringType value) {
+ this.pageCount = value;
+ return this;
+ }
+
+ /**
+ * @return Actual or Approximate number of pages or screens.
+ */
+ public String getPageCount() {
+ return this.pageCount == null ? null : this.pageCount.getValue();
+ }
+
+ /**
+ * @param value Actual or Approximate number of pages or screens.
+ */
+ public CitationAlternativeFormPublicationInfoComponent setPageCount(String value) {
+ if (Utilities.noString(value))
+ this.pageCount = null;
+ else {
+ if (this.pageCount == null)
+ this.pageCount = new StringType();
+ this.pageCount.setValue(value);
+ }
+ return this;
+ }
+
+ protected void listChildren(List children) {
+ super.listChildren(children);
+ children.add(new Property("publishedIn", "", "The collection the cited article is published in.", 0, 1, publishedIn));
+ children.add(new Property("entryDate", "dateTime", "The date the article was added to the database.", 0, 1, entryDate));
+ children.add(new Property("revisionDate", "dateTime", "The date the article was last revised or updated in the database.", 0, 1, revisionDate));
+ children.add(new Property("pageCount", "string", "Actual or Approximate number of pages or screens.", 0, 1, pageCount));
+ }
+
+ @Override
+ public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException {
+ switch (_hash) {
+ case -614144077: /*publishedIn*/ return new Property("publishedIn", "", "The collection the cited article is published in.", 0, 1, publishedIn);
+ case -479861952: /*entryDate*/ return new Property("entryDate", "dateTime", "The date the article was added to the database.", 0, 1, entryDate);
+ case -1250970071: /*revisionDate*/ return new Property("revisionDate", "dateTime", "The date the article was last revised or updated in the database.", 0, 1, revisionDate);
+ case 857882560: /*pageCount*/ return new Property("pageCount", "string", "Actual or Approximate number of pages or screens.", 0, 1, pageCount);
+ default: return super.getNamedProperty(_hash, _name, _checkValid);
+ }
+
+ }
+
+ @Override
+ public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException {
+ switch (hash) {
+ case -614144077: /*publishedIn*/ return this.publishedIn == null ? new Base[0] : new Base[] {this.publishedIn}; // CitationAlternativeFormPublicationInfoPublishedInComponent
+ case -479861952: /*entryDate*/ return this.entryDate == null ? new Base[0] : new Base[] {this.entryDate}; // DateTimeType
+ case -1250970071: /*revisionDate*/ return this.revisionDate == null ? new Base[0] : new Base[] {this.revisionDate}; // DateTimeType
+ case 857882560: /*pageCount*/ return this.pageCount == null ? new Base[0] : new Base[] {this.pageCount}; // StringType
+ default: return super.getProperty(hash, name, checkValid);
+ }
+
+ }
+
+ @Override
+ public Base setProperty(int hash, String name, Base value) throws FHIRException {
+ switch (hash) {
+ case -614144077: // publishedIn
+ this.publishedIn = (CitationAlternativeFormPublicationInfoPublishedInComponent) value; // CitationAlternativeFormPublicationInfoPublishedInComponent
+ return value;
+ case -479861952: // entryDate
+ this.entryDate = TypeConvertor.castToDateTime(value); // DateTimeType
+ return value;
+ case -1250970071: // revisionDate
+ this.revisionDate = TypeConvertor.castToDateTime(value); // DateTimeType
+ return value;
+ case 857882560: // pageCount
+ this.pageCount = TypeConvertor.castToString(value); // StringType
+ return value;
+ default: return super.setProperty(hash, name, value);
+ }
+
+ }
+
+ @Override
+ public Base setProperty(String name, Base value) throws FHIRException {
+ if (name.equals("publishedIn")) {
+ this.publishedIn = (CitationAlternativeFormPublicationInfoPublishedInComponent) value; // CitationAlternativeFormPublicationInfoPublishedInComponent
+ } else if (name.equals("entryDate")) {
+ this.entryDate = TypeConvertor.castToDateTime(value); // DateTimeType
+ } else if (name.equals("revisionDate")) {
+ this.revisionDate = TypeConvertor.castToDateTime(value); // DateTimeType
+ } else if (name.equals("pageCount")) {
+ this.pageCount = TypeConvertor.castToString(value); // StringType
+ } else
+ return super.setProperty(name, value);
+ return value;
+ }
+
+ @Override
+ public Base makeProperty(int hash, String name) throws FHIRException {
+ switch (hash) {
+ case -614144077: return getPublishedIn();
+ case -479861952: return getEntryDateElement();
+ case -1250970071: return getRevisionDateElement();
+ case 857882560: return getPageCountElement();
+ default: return super.makeProperty(hash, name);
+ }
+
+ }
+
+ @Override
+ public String[] getTypesForProperty(int hash, String name) throws FHIRException {
+ switch (hash) {
+ case -614144077: /*publishedIn*/ return new String[] {};
+ case -479861952: /*entryDate*/ return new String[] {"dateTime"};
+ case -1250970071: /*revisionDate*/ return new String[] {"dateTime"};
+ case 857882560: /*pageCount*/ return new String[] {"string"};
+ default: return super.getTypesForProperty(hash, name);
+ }
+
+ }
+
+ @Override
+ public Base addChild(String name) throws FHIRException {
+ if (name.equals("publishedIn")) {
+ this.publishedIn = new CitationAlternativeFormPublicationInfoPublishedInComponent();
+ return this.publishedIn;
+ }
+ else if (name.equals("entryDate")) {
+ throw new FHIRException("Cannot call addChild on a primitive type Citation.alternativeForm.publicationInfo.entryDate");
+ }
+ else if (name.equals("revisionDate")) {
+ throw new FHIRException("Cannot call addChild on a primitive type Citation.alternativeForm.publicationInfo.revisionDate");
+ }
+ else if (name.equals("pageCount")) {
+ throw new FHIRException("Cannot call addChild on a primitive type Citation.alternativeForm.publicationInfo.pageCount");
+ }
+ else
+ return super.addChild(name);
+ }
+
+ public CitationAlternativeFormPublicationInfoComponent copy() {
+ CitationAlternativeFormPublicationInfoComponent dst = new CitationAlternativeFormPublicationInfoComponent();
+ copyValues(dst);
+ return dst;
+ }
+
+ public void copyValues(CitationAlternativeFormPublicationInfoComponent dst) {
+ super.copyValues(dst);
+ dst.publishedIn = publishedIn == null ? null : publishedIn.copy();
+ dst.entryDate = entryDate == null ? null : entryDate.copy();
+ dst.revisionDate = revisionDate == null ? null : revisionDate.copy();
+ dst.pageCount = pageCount == null ? null : pageCount.copy();
+ }
+
+ @Override
+ public boolean equalsDeep(Base other_) {
+ if (!super.equalsDeep(other_))
+ return false;
+ if (!(other_ instanceof CitationAlternativeFormPublicationInfoComponent))
+ return false;
+ CitationAlternativeFormPublicationInfoComponent o = (CitationAlternativeFormPublicationInfoComponent) other_;
+ return compareDeep(publishedIn, o.publishedIn, true) && compareDeep(entryDate, o.entryDate, true)
+ && compareDeep(revisionDate, o.revisionDate, true) && compareDeep(pageCount, o.pageCount, true)
+ ;
+ }
+
+ @Override
+ public boolean equalsShallow(Base other_) {
+ if (!super.equalsShallow(other_))
+ return false;
+ if (!(other_ instanceof CitationAlternativeFormPublicationInfoComponent))
+ return false;
+ CitationAlternativeFormPublicationInfoComponent o = (CitationAlternativeFormPublicationInfoComponent) other_;
+ return compareValues(entryDate, o.entryDate, true) && compareValues(revisionDate, o.revisionDate, true)
+ && compareValues(pageCount, o.pageCount, true);
+ }
+
+ public boolean isEmpty() {
+ return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(publishedIn, entryDate, revisionDate
+ , pageCount);
+ }
+
+ public String fhirType() {
+ return "Citation.alternativeForm.publicationInfo";
+
+ }
+
+ }
+
+ @Block()
+ public static class CitationAlternativeFormPublicationInfoPublishedInComponent extends BackboneElement implements IBaseBackboneElement {
+ /**
+ * Database or book.
+ */
+ @Child(name = "type", type = {CodeableConcept.class}, order=1, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Database or book", formalDefinition="Database or book." )
+ @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/published-in-type")
+ protected CodeableConcept type;
+
+ /**
+ * Name of the database or title of the book.
+ */
+ @Child(name = "name", type = {StringType.class}, order=2, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Name of the database or title of the book", formalDefinition="Name of the database or title of the book." )
+ protected StringType name;
+
+ /**
+ * Name of the publisher.
+ */
+ @Child(name = "publisher", type = {Organization.class}, order=3, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Name of the publisher", formalDefinition="Name of the publisher." )
+ protected Reference publisher;
+
+ /**
+ * Geographic location of the publisher.
+ */
+ @Child(name = "publisherLocation", type = {StringType.class}, order=4, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Geographic location of the publisher", formalDefinition="Geographic location of the publisher." )
+ protected StringType publisherLocation;
+
+ /**
+ * When the database was first available or when the book was published.
+ */
+ @Child(name = "startDate", type = {DateType.class}, order=5, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="When the database was first available or when the book was published", formalDefinition="When the database was first available or when the book was published." )
+ protected DateType startDate;
+
+ private static final long serialVersionUID = 17141502L;
+
+ /**
+ * Constructor
+ */
+ public CitationAlternativeFormPublicationInfoPublishedInComponent() {
+ super();
+ }
+
+ /**
+ * @return {@link #type} (Database or book.)
+ */
+ public CodeableConcept getType() {
+ if (this.type == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationAlternativeFormPublicationInfoPublishedInComponent.type");
+ else if (Configuration.doAutoCreate())
+ this.type = new CodeableConcept(); // cc
+ return this.type;
+ }
+
+ public boolean hasType() {
+ return this.type != null && !this.type.isEmpty();
+ }
+
+ /**
+ * @param value {@link #type} (Database or book.)
+ */
+ public CitationAlternativeFormPublicationInfoPublishedInComponent setType(CodeableConcept value) {
+ this.type = value;
+ return this;
+ }
+
+ /**
+ * @return {@link #name} (Name of the database or title of the book.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value
+ */
+ public StringType getNameElement() {
+ if (this.name == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationAlternativeFormPublicationInfoPublishedInComponent.name");
+ else if (Configuration.doAutoCreate())
+ this.name = new StringType(); // bb
+ return this.name;
+ }
+
+ public boolean hasNameElement() {
+ return this.name != null && !this.name.isEmpty();
+ }
+
+ public boolean hasName() {
+ return this.name != null && !this.name.isEmpty();
+ }
+
+ /**
+ * @param value {@link #name} (Name of the database or title of the book.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value
+ */
+ public CitationAlternativeFormPublicationInfoPublishedInComponent setNameElement(StringType value) {
+ this.name = value;
+ return this;
+ }
+
+ /**
+ * @return Name of the database or title of the book.
+ */
+ public String getName() {
+ return this.name == null ? null : this.name.getValue();
+ }
+
+ /**
+ * @param value Name of the database or title of the book.
+ */
+ public CitationAlternativeFormPublicationInfoPublishedInComponent setName(String value) {
+ if (Utilities.noString(value))
+ this.name = null;
+ else {
+ if (this.name == null)
+ this.name = new StringType();
+ this.name.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #publisher} (Name of the publisher.)
+ */
+ public Reference getPublisher() {
+ if (this.publisher == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationAlternativeFormPublicationInfoPublishedInComponent.publisher");
+ else if (Configuration.doAutoCreate())
+ this.publisher = new Reference(); // cc
+ return this.publisher;
+ }
+
+ public boolean hasPublisher() {
+ return this.publisher != null && !this.publisher.isEmpty();
+ }
+
+ /**
+ * @param value {@link #publisher} (Name of the publisher.)
+ */
+ public CitationAlternativeFormPublicationInfoPublishedInComponent setPublisher(Reference value) {
+ this.publisher = value;
+ return this;
+ }
+
+ /**
+ * @return {@link #publisherLocation} (Geographic location of the publisher.). This is the underlying object with id, value and extensions. The accessor "getPublisherLocation" gives direct access to the value
+ */
+ public StringType getPublisherLocationElement() {
+ if (this.publisherLocation == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationAlternativeFormPublicationInfoPublishedInComponent.publisherLocation");
+ else if (Configuration.doAutoCreate())
+ this.publisherLocation = new StringType(); // bb
+ return this.publisherLocation;
+ }
+
+ public boolean hasPublisherLocationElement() {
+ return this.publisherLocation != null && !this.publisherLocation.isEmpty();
+ }
+
+ public boolean hasPublisherLocation() {
+ return this.publisherLocation != null && !this.publisherLocation.isEmpty();
+ }
+
+ /**
+ * @param value {@link #publisherLocation} (Geographic location of the publisher.). This is the underlying object with id, value and extensions. The accessor "getPublisherLocation" gives direct access to the value
+ */
+ public CitationAlternativeFormPublicationInfoPublishedInComponent setPublisherLocationElement(StringType value) {
+ this.publisherLocation = value;
+ return this;
+ }
+
+ /**
+ * @return Geographic location of the publisher.
+ */
+ public String getPublisherLocation() {
+ return this.publisherLocation == null ? null : this.publisherLocation.getValue();
+ }
+
+ /**
+ * @param value Geographic location of the publisher.
+ */
+ public CitationAlternativeFormPublicationInfoPublishedInComponent setPublisherLocation(String value) {
+ if (Utilities.noString(value))
+ this.publisherLocation = null;
+ else {
+ if (this.publisherLocation == null)
+ this.publisherLocation = new StringType();
+ this.publisherLocation.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #startDate} (When the database was first available or when the book was published.). This is the underlying object with id, value and extensions. The accessor "getStartDate" gives direct access to the value
+ */
+ public DateType getStartDateElement() {
+ if (this.startDate == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationAlternativeFormPublicationInfoPublishedInComponent.startDate");
+ else if (Configuration.doAutoCreate())
+ this.startDate = new DateType(); // bb
+ return this.startDate;
+ }
+
+ public boolean hasStartDateElement() {
+ return this.startDate != null && !this.startDate.isEmpty();
+ }
+
+ public boolean hasStartDate() {
+ return this.startDate != null && !this.startDate.isEmpty();
+ }
+
+ /**
+ * @param value {@link #startDate} (When the database was first available or when the book was published.). This is the underlying object with id, value and extensions. The accessor "getStartDate" gives direct access to the value
+ */
+ public CitationAlternativeFormPublicationInfoPublishedInComponent setStartDateElement(DateType value) {
+ this.startDate = value;
+ return this;
+ }
+
+ /**
+ * @return When the database was first available or when the book was published.
+ */
+ public Date getStartDate() {
+ return this.startDate == null ? null : this.startDate.getValue();
+ }
+
+ /**
+ * @param value When the database was first available or when the book was published.
+ */
+ public CitationAlternativeFormPublicationInfoPublishedInComponent setStartDate(Date value) {
+ if (value == null)
+ this.startDate = null;
+ else {
+ if (this.startDate == null)
+ this.startDate = new DateType();
+ this.startDate.setValue(value);
+ }
+ return this;
+ }
+
+ protected void listChildren(List children) {
+ super.listChildren(children);
+ children.add(new Property("type", "CodeableConcept", "Database or book.", 0, 1, type));
+ children.add(new Property("name", "string", "Name of the database or title of the book.", 0, 1, name));
+ children.add(new Property("publisher", "Reference(Organization)", "Name of the publisher.", 0, 1, publisher));
+ children.add(new Property("publisherLocation", "string", "Geographic location of the publisher.", 0, 1, publisherLocation));
+ children.add(new Property("startDate", "date", "When the database was first available or when the book was published.", 0, 1, startDate));
+ }
+
+ @Override
+ public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException {
+ switch (_hash) {
+ case 3575610: /*type*/ return new Property("type", "CodeableConcept", "Database or book.", 0, 1, type);
+ case 3373707: /*name*/ return new Property("name", "string", "Name of the database or title of the book.", 0, 1, name);
+ case 1447404028: /*publisher*/ return new Property("publisher", "Reference(Organization)", "Name of the publisher.", 0, 1, publisher);
+ case -1281627695: /*publisherLocation*/ return new Property("publisherLocation", "string", "Geographic location of the publisher.", 0, 1, publisherLocation);
+ case -2129778896: /*startDate*/ return new Property("startDate", "date", "When the database was first available or when the book was published.", 0, 1, startDate);
+ default: return super.getNamedProperty(_hash, _name, _checkValid);
+ }
+
+ }
+
+ @Override
+ public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException {
+ switch (hash) {
+ case 3575610: /*type*/ return this.type == null ? new Base[0] : new Base[] {this.type}; // CodeableConcept
+ case 3373707: /*name*/ return this.name == null ? new Base[0] : new Base[] {this.name}; // StringType
+ case 1447404028: /*publisher*/ return this.publisher == null ? new Base[0] : new Base[] {this.publisher}; // Reference
+ case -1281627695: /*publisherLocation*/ return this.publisherLocation == null ? new Base[0] : new Base[] {this.publisherLocation}; // StringType
+ case -2129778896: /*startDate*/ return this.startDate == null ? new Base[0] : new Base[] {this.startDate}; // DateType
+ default: return super.getProperty(hash, name, checkValid);
+ }
+
+ }
+
+ @Override
+ public Base setProperty(int hash, String name, Base value) throws FHIRException {
+ switch (hash) {
+ case 3575610: // type
+ this.type = TypeConvertor.castToCodeableConcept(value); // CodeableConcept
+ return value;
+ case 3373707: // name
+ this.name = TypeConvertor.castToString(value); // StringType
+ return value;
+ case 1447404028: // publisher
+ this.publisher = TypeConvertor.castToReference(value); // Reference
+ return value;
+ case -1281627695: // publisherLocation
+ this.publisherLocation = TypeConvertor.castToString(value); // StringType
+ return value;
+ case -2129778896: // startDate
+ this.startDate = TypeConvertor.castToDate(value); // DateType
+ return value;
+ default: return super.setProperty(hash, name, value);
+ }
+
+ }
+
+ @Override
+ public Base setProperty(String name, Base value) throws FHIRException {
+ if (name.equals("type")) {
+ this.type = TypeConvertor.castToCodeableConcept(value); // CodeableConcept
+ } else if (name.equals("name")) {
+ this.name = TypeConvertor.castToString(value); // StringType
+ } else if (name.equals("publisher")) {
+ this.publisher = TypeConvertor.castToReference(value); // Reference
+ } else if (name.equals("publisherLocation")) {
+ this.publisherLocation = TypeConvertor.castToString(value); // StringType
+ } else if (name.equals("startDate")) {
+ this.startDate = TypeConvertor.castToDate(value); // DateType
+ } else
+ return super.setProperty(name, value);
+ return value;
+ }
+
+ @Override
+ public Base makeProperty(int hash, String name) throws FHIRException {
+ switch (hash) {
+ case 3575610: return getType();
+ case 3373707: return getNameElement();
+ case 1447404028: return getPublisher();
+ case -1281627695: return getPublisherLocationElement();
+ case -2129778896: return getStartDateElement();
+ default: return super.makeProperty(hash, name);
+ }
+
+ }
+
+ @Override
+ public String[] getTypesForProperty(int hash, String name) throws FHIRException {
+ switch (hash) {
+ case 3575610: /*type*/ return new String[] {"CodeableConcept"};
+ case 3373707: /*name*/ return new String[] {"string"};
+ case 1447404028: /*publisher*/ return new String[] {"Reference"};
+ case -1281627695: /*publisherLocation*/ return new String[] {"string"};
+ case -2129778896: /*startDate*/ return new String[] {"date"};
+ default: return super.getTypesForProperty(hash, name);
+ }
+
+ }
+
+ @Override
+ public Base addChild(String name) throws FHIRException {
+ if (name.equals("type")) {
+ this.type = new CodeableConcept();
+ return this.type;
+ }
+ else if (name.equals("name")) {
+ throw new FHIRException("Cannot call addChild on a primitive type Citation.alternativeForm.publicationInfo.publishedIn.name");
+ }
+ else if (name.equals("publisher")) {
+ this.publisher = new Reference();
+ return this.publisher;
+ }
+ else if (name.equals("publisherLocation")) {
+ throw new FHIRException("Cannot call addChild on a primitive type Citation.alternativeForm.publicationInfo.publishedIn.publisherLocation");
+ }
+ else if (name.equals("startDate")) {
+ throw new FHIRException("Cannot call addChild on a primitive type Citation.alternativeForm.publicationInfo.publishedIn.startDate");
+ }
+ else
+ return super.addChild(name);
+ }
+
+ public CitationAlternativeFormPublicationInfoPublishedInComponent copy() {
+ CitationAlternativeFormPublicationInfoPublishedInComponent dst = new CitationAlternativeFormPublicationInfoPublishedInComponent();
+ copyValues(dst);
+ return dst;
+ }
+
+ public void copyValues(CitationAlternativeFormPublicationInfoPublishedInComponent dst) {
+ super.copyValues(dst);
+ dst.type = type == null ? null : type.copy();
+ dst.name = name == null ? null : name.copy();
+ dst.publisher = publisher == null ? null : publisher.copy();
+ dst.publisherLocation = publisherLocation == null ? null : publisherLocation.copy();
+ dst.startDate = startDate == null ? null : startDate.copy();
+ }
+
+ @Override
+ public boolean equalsDeep(Base other_) {
+ if (!super.equalsDeep(other_))
+ return false;
+ if (!(other_ instanceof CitationAlternativeFormPublicationInfoPublishedInComponent))
+ return false;
+ CitationAlternativeFormPublicationInfoPublishedInComponent o = (CitationAlternativeFormPublicationInfoPublishedInComponent) other_;
+ return compareDeep(type, o.type, true) && compareDeep(name, o.name, true) && compareDeep(publisher, o.publisher, true)
+ && compareDeep(publisherLocation, o.publisherLocation, true) && compareDeep(startDate, o.startDate, true)
+ ;
+ }
+
+ @Override
+ public boolean equalsShallow(Base other_) {
+ if (!super.equalsShallow(other_))
+ return false;
+ if (!(other_ instanceof CitationAlternativeFormPublicationInfoPublishedInComponent))
+ return false;
+ CitationAlternativeFormPublicationInfoPublishedInComponent o = (CitationAlternativeFormPublicationInfoPublishedInComponent) other_;
+ return compareValues(name, o.name, true) && compareValues(publisherLocation, o.publisherLocation, true)
+ && compareValues(startDate, o.startDate, true);
+ }
+
+ public boolean isEmpty() {
+ return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(type, name, publisher, publisherLocation
+ , startDate);
+ }
+
+ public String fhirType() {
+ return "Citation.alternativeForm.publicationInfo.publishedIn";
+
+ }
+
+ }
+
+ @Block()
+ public static class CitationKeywordListComponent extends BackboneElement implements IBaseBackboneElement {
+ /**
+ * The entity responsible for the creation or maintenance of this keyword list.
+ */
+ @Child(name = "owner", type = {StringType.class}, order=1, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Author, publisher, or custodian of the keyword list", formalDefinition="The entity responsible for the creation or maintenance of this keyword list." )
+ protected StringType owner;
+
+ /**
+ * For each keyword in the keyword list.
+ */
+ @Child(name = "keyword", type = {}, order=2, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+ @Description(shortDefinition="For each keyword in the keyword list", formalDefinition="For each keyword in the keyword list." )
+ protected List keyword;
+
+ private static final long serialVersionUID = -1638002879L;
+
+ /**
+ * Constructor
+ */
+ public CitationKeywordListComponent() {
+ super();
+ }
+
+ /**
+ * Constructor
+ */
+ public CitationKeywordListComponent(CitationKeywordListKeywordComponent keyword) {
+ super();
+ this.addKeyword(keyword);
+ }
+
+ /**
+ * @return {@link #owner} (The entity responsible for the creation or maintenance of this keyword list.). This is the underlying object with id, value and extensions. The accessor "getOwner" gives direct access to the value
+ */
+ public StringType getOwnerElement() {
+ if (this.owner == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationKeywordListComponent.owner");
+ else if (Configuration.doAutoCreate())
+ this.owner = new StringType(); // bb
+ return this.owner;
+ }
+
+ public boolean hasOwnerElement() {
+ return this.owner != null && !this.owner.isEmpty();
+ }
+
+ public boolean hasOwner() {
+ return this.owner != null && !this.owner.isEmpty();
+ }
+
+ /**
+ * @param value {@link #owner} (The entity responsible for the creation or maintenance of this keyword list.). This is the underlying object with id, value and extensions. The accessor "getOwner" gives direct access to the value
+ */
+ public CitationKeywordListComponent setOwnerElement(StringType value) {
+ this.owner = value;
+ return this;
+ }
+
+ /**
+ * @return The entity responsible for the creation or maintenance of this keyword list.
+ */
+ public String getOwner() {
+ return this.owner == null ? null : this.owner.getValue();
+ }
+
+ /**
+ * @param value The entity responsible for the creation or maintenance of this keyword list.
+ */
+ public CitationKeywordListComponent setOwner(String value) {
+ if (Utilities.noString(value))
+ this.owner = null;
+ else {
+ if (this.owner == null)
+ this.owner = new StringType();
+ this.owner.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #keyword} (For each keyword in the keyword list.)
+ */
+ public List getKeyword() {
+ if (this.keyword == null)
+ this.keyword = new ArrayList();
+ return this.keyword;
+ }
+
+ /**
+ * @return Returns a reference to this
for easy method chaining
+ */
+ public CitationKeywordListComponent setKeyword(List theKeyword) {
+ this.keyword = theKeyword;
+ return this;
+ }
+
+ public boolean hasKeyword() {
+ if (this.keyword == null)
+ return false;
+ for (CitationKeywordListKeywordComponent item : this.keyword)
+ if (!item.isEmpty())
+ return true;
+ return false;
+ }
+
+ public CitationKeywordListKeywordComponent addKeyword() { //3
+ CitationKeywordListKeywordComponent t = new CitationKeywordListKeywordComponent();
+ if (this.keyword == null)
+ this.keyword = new ArrayList();
+ this.keyword.add(t);
+ return t;
+ }
+
+ public CitationKeywordListComponent addKeyword(CitationKeywordListKeywordComponent t) { //3
+ if (t == null)
+ return this;
+ if (this.keyword == null)
+ this.keyword = new ArrayList();
+ this.keyword.add(t);
+ return this;
+ }
+
+ /**
+ * @return The first repetition of repeating field {@link #keyword}, creating it if it does not already exist {3}
+ */
+ public CitationKeywordListKeywordComponent getKeywordFirstRep() {
+ if (getKeyword().isEmpty()) {
+ addKeyword();
+ }
+ return getKeyword().get(0);
+ }
+
+ protected void listChildren(List children) {
+ super.listChildren(children);
+ children.add(new Property("owner", "string", "The entity responsible for the creation or maintenance of this keyword list.", 0, 1, owner));
+ children.add(new Property("keyword", "", "For each keyword in the keyword list.", 0, java.lang.Integer.MAX_VALUE, keyword));
+ }
+
+ @Override
+ public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException {
+ switch (_hash) {
+ case 106164915: /*owner*/ return new Property("owner", "string", "The entity responsible for the creation or maintenance of this keyword list.", 0, 1, owner);
+ case -814408215: /*keyword*/ return new Property("keyword", "", "For each keyword in the keyword list.", 0, java.lang.Integer.MAX_VALUE, keyword);
+ default: return super.getNamedProperty(_hash, _name, _checkValid);
+ }
+
+ }
+
+ @Override
+ public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException {
+ switch (hash) {
+ case 106164915: /*owner*/ return this.owner == null ? new Base[0] : new Base[] {this.owner}; // StringType
+ case -814408215: /*keyword*/ return this.keyword == null ? new Base[0] : this.keyword.toArray(new Base[this.keyword.size()]); // CitationKeywordListKeywordComponent
+ default: return super.getProperty(hash, name, checkValid);
+ }
+
+ }
+
+ @Override
+ public Base setProperty(int hash, String name, Base value) throws FHIRException {
+ switch (hash) {
+ case 106164915: // owner
+ this.owner = TypeConvertor.castToString(value); // StringType
+ return value;
+ case -814408215: // keyword
+ this.getKeyword().add((CitationKeywordListKeywordComponent) value); // CitationKeywordListKeywordComponent
+ return value;
+ default: return super.setProperty(hash, name, value);
+ }
+
+ }
+
+ @Override
+ public Base setProperty(String name, Base value) throws FHIRException {
+ if (name.equals("owner")) {
+ this.owner = TypeConvertor.castToString(value); // StringType
+ } else if (name.equals("keyword")) {
+ this.getKeyword().add((CitationKeywordListKeywordComponent) value);
+ } else
+ return super.setProperty(name, value);
+ return value;
+ }
+
+ @Override
+ public Base makeProperty(int hash, String name) throws FHIRException {
+ switch (hash) {
+ case 106164915: return getOwnerElement();
+ case -814408215: return addKeyword();
+ default: return super.makeProperty(hash, name);
+ }
+
+ }
+
+ @Override
+ public String[] getTypesForProperty(int hash, String name) throws FHIRException {
+ switch (hash) {
+ case 106164915: /*owner*/ return new String[] {"string"};
+ case -814408215: /*keyword*/ return new String[] {};
+ default: return super.getTypesForProperty(hash, name);
+ }
+
+ }
+
+ @Override
+ public Base addChild(String name) throws FHIRException {
+ if (name.equals("owner")) {
+ throw new FHIRException("Cannot call addChild on a primitive type Citation.keywordList.owner");
+ }
+ else if (name.equals("keyword")) {
+ return addKeyword();
+ }
+ else
+ return super.addChild(name);
+ }
+
+ public CitationKeywordListComponent copy() {
+ CitationKeywordListComponent dst = new CitationKeywordListComponent();
+ copyValues(dst);
+ return dst;
+ }
+
+ public void copyValues(CitationKeywordListComponent dst) {
+ super.copyValues(dst);
+ dst.owner = owner == null ? null : owner.copy();
+ if (keyword != null) {
+ dst.keyword = new ArrayList();
+ for (CitationKeywordListKeywordComponent i : keyword)
+ dst.keyword.add(i.copy());
+ };
+ }
+
+ @Override
+ public boolean equalsDeep(Base other_) {
+ if (!super.equalsDeep(other_))
+ return false;
+ if (!(other_ instanceof CitationKeywordListComponent))
+ return false;
+ CitationKeywordListComponent o = (CitationKeywordListComponent) other_;
+ return compareDeep(owner, o.owner, true) && compareDeep(keyword, o.keyword, true);
+ }
+
+ @Override
+ public boolean equalsShallow(Base other_) {
+ if (!super.equalsShallow(other_))
+ return false;
+ if (!(other_ instanceof CitationKeywordListComponent))
+ return false;
+ CitationKeywordListComponent o = (CitationKeywordListComponent) other_;
+ return compareValues(owner, o.owner, true);
+ }
+
+ public boolean isEmpty() {
+ return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(owner, keyword);
+ }
+
+ public String fhirType() {
+ return "Citation.keywordList";
+
+ }
+
+ }
+
+ @Block()
+ public static class CitationKeywordListKeywordComponent extends BackboneElement implements IBaseBackboneElement {
+ /**
+ * Whether or not it is a major topic.
+ */
+ @Child(name = "majorTopic", type = {BooleanType.class}, order=1, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Whether or not it is a major topic", formalDefinition="Whether or not it is a major topic." )
+ protected BooleanType majorTopic;
+
+ /**
+ * The actual keyword.
+ */
+ @Child(name = "value", type = {StringType.class}, order=2, min=1, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="The actual keyword", formalDefinition="The actual keyword." )
+ protected StringType value;
+
+ private static final long serialVersionUID = 853626648L;
+
+ /**
+ * Constructor
+ */
+ public CitationKeywordListKeywordComponent() {
+ super();
+ }
+
+ /**
+ * Constructor
+ */
+ public CitationKeywordListKeywordComponent(String value) {
+ super();
+ this.setValue(value);
+ }
+
+ /**
+ * @return {@link #majorTopic} (Whether or not it is a major topic.). This is the underlying object with id, value and extensions. The accessor "getMajorTopic" gives direct access to the value
+ */
+ public BooleanType getMajorTopicElement() {
+ if (this.majorTopic == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationKeywordListKeywordComponent.majorTopic");
+ else if (Configuration.doAutoCreate())
+ this.majorTopic = new BooleanType(); // bb
+ return this.majorTopic;
+ }
+
+ public boolean hasMajorTopicElement() {
+ return this.majorTopic != null && !this.majorTopic.isEmpty();
+ }
+
+ public boolean hasMajorTopic() {
+ return this.majorTopic != null && !this.majorTopic.isEmpty();
+ }
+
+ /**
+ * @param value {@link #majorTopic} (Whether or not it is a major topic.). This is the underlying object with id, value and extensions. The accessor "getMajorTopic" gives direct access to the value
+ */
+ public CitationKeywordListKeywordComponent setMajorTopicElement(BooleanType value) {
+ this.majorTopic = value;
+ return this;
+ }
+
+ /**
+ * @return Whether or not it is a major topic.
+ */
+ public boolean getMajorTopic() {
+ return this.majorTopic == null || this.majorTopic.isEmpty() ? false : this.majorTopic.getValue();
+ }
+
+ /**
+ * @param value Whether or not it is a major topic.
+ */
+ public CitationKeywordListKeywordComponent setMajorTopic(boolean value) {
+ if (this.majorTopic == null)
+ this.majorTopic = new BooleanType();
+ this.majorTopic.setValue(value);
+ return this;
+ }
+
+ /**
+ * @return {@link #value} (The actual keyword.). This is the underlying object with id, value and extensions. The accessor "getValue" gives direct access to the value
+ */
+ public StringType getValueElement() {
+ if (this.value == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CitationKeywordListKeywordComponent.value");
+ else if (Configuration.doAutoCreate())
+ this.value = new StringType(); // bb
+ return this.value;
+ }
+
+ public boolean hasValueElement() {
+ return this.value != null && !this.value.isEmpty();
+ }
+
+ public boolean hasValue() {
+ return this.value != null && !this.value.isEmpty();
+ }
+
+ /**
+ * @param value {@link #value} (The actual keyword.). This is the underlying object with id, value and extensions. The accessor "getValue" gives direct access to the value
+ */
+ public CitationKeywordListKeywordComponent setValueElement(StringType value) {
+ this.value = value;
+ return this;
+ }
+
+ /**
+ * @return The actual keyword.
+ */
+ public String getValue() {
+ return this.value == null ? null : this.value.getValue();
+ }
+
+ /**
+ * @param value The actual keyword.
+ */
+ public CitationKeywordListKeywordComponent setValue(String value) {
+ if (this.value == null)
+ this.value = new StringType();
+ this.value.setValue(value);
+ return this;
+ }
+
+ protected void listChildren(List children) {
+ super.listChildren(children);
+ children.add(new Property("majorTopic", "boolean", "Whether or not it is a major topic.", 0, 1, majorTopic));
+ children.add(new Property("value", "string", "The actual keyword.", 0, 1, value));
+ }
+
+ @Override
+ public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException {
+ switch (_hash) {
+ case -341847306: /*majorTopic*/ return new Property("majorTopic", "boolean", "Whether or not it is a major topic.", 0, 1, majorTopic);
+ case 111972721: /*value*/ return new Property("value", "string", "The actual keyword.", 0, 1, value);
+ default: return super.getNamedProperty(_hash, _name, _checkValid);
+ }
+
+ }
+
+ @Override
+ public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException {
+ switch (hash) {
+ case -341847306: /*majorTopic*/ return this.majorTopic == null ? new Base[0] : new Base[] {this.majorTopic}; // BooleanType
+ case 111972721: /*value*/ return this.value == null ? new Base[0] : new Base[] {this.value}; // StringType
+ default: return super.getProperty(hash, name, checkValid);
+ }
+
+ }
+
+ @Override
+ public Base setProperty(int hash, String name, Base value) throws FHIRException {
+ switch (hash) {
+ case -341847306: // majorTopic
+ this.majorTopic = TypeConvertor.castToBoolean(value); // BooleanType
+ return value;
+ case 111972721: // value
+ this.value = TypeConvertor.castToString(value); // StringType
+ return value;
+ default: return super.setProperty(hash, name, value);
+ }
+
+ }
+
+ @Override
+ public Base setProperty(String name, Base value) throws FHIRException {
+ if (name.equals("majorTopic")) {
+ this.majorTopic = TypeConvertor.castToBoolean(value); // BooleanType
+ } else if (name.equals("value")) {
+ this.value = TypeConvertor.castToString(value); // StringType
+ } else
+ return super.setProperty(name, value);
+ return value;
+ }
+
+ @Override
+ public Base makeProperty(int hash, String name) throws FHIRException {
+ switch (hash) {
+ case -341847306: return getMajorTopicElement();
+ case 111972721: return getValueElement();
+ default: return super.makeProperty(hash, name);
+ }
+
+ }
+
+ @Override
+ public String[] getTypesForProperty(int hash, String name) throws FHIRException {
+ switch (hash) {
+ case -341847306: /*majorTopic*/ return new String[] {"boolean"};
+ case 111972721: /*value*/ return new String[] {"string"};
+ default: return super.getTypesForProperty(hash, name);
+ }
+
+ }
+
+ @Override
+ public Base addChild(String name) throws FHIRException {
+ if (name.equals("majorTopic")) {
+ throw new FHIRException("Cannot call addChild on a primitive type Citation.keywordList.keyword.majorTopic");
+ }
+ else if (name.equals("value")) {
+ throw new FHIRException("Cannot call addChild on a primitive type Citation.keywordList.keyword.value");
+ }
+ else
+ return super.addChild(name);
+ }
+
+ public CitationKeywordListKeywordComponent copy() {
+ CitationKeywordListKeywordComponent dst = new CitationKeywordListKeywordComponent();
+ copyValues(dst);
+ return dst;
+ }
+
+ public void copyValues(CitationKeywordListKeywordComponent dst) {
+ super.copyValues(dst);
+ dst.majorTopic = majorTopic == null ? null : majorTopic.copy();
+ dst.value = value == null ? null : value.copy();
+ }
+
+ @Override
+ public boolean equalsDeep(Base other_) {
+ if (!super.equalsDeep(other_))
+ return false;
+ if (!(other_ instanceof CitationKeywordListKeywordComponent))
+ return false;
+ CitationKeywordListKeywordComponent o = (CitationKeywordListKeywordComponent) other_;
+ return compareDeep(majorTopic, o.majorTopic, true) && compareDeep(value, o.value, true);
+ }
+
+ @Override
+ public boolean equalsShallow(Base other_) {
+ if (!super.equalsShallow(other_))
+ return false;
+ if (!(other_ instanceof CitationKeywordListKeywordComponent))
+ return false;
+ CitationKeywordListKeywordComponent o = (CitationKeywordListKeywordComponent) other_;
+ return compareValues(majorTopic, o.majorTopic, true) && compareValues(value, o.value, true);
+ }
+
+ public boolean isEmpty() {
+ return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(majorTopic, value);
+ }
+
+ public String fhirType() {
+ return "Citation.keywordList.keyword";
+
+ }
+
}
@Block()
@@ -7632,17 +9867,10 @@ public class Citation extends MetadataResource {
@Description(shortDefinition="Canonical identifier for this citation, represented as a globally unique URI", formalDefinition="An absolute URI that is used to identify this citation when it is referenced in a specification, model, design or an instance; also called its canonical identifier. This SHOULD be globally unique and SHOULD be a literal address at which at which an authoritative instance of this summary is (or will be) published. This URL can be the target of a canonical reference. It SHALL remain the same when the summary is stored on different servers." )
protected UriType url;
- /**
- * The identifier that is used to identify this version of the summary when it is referenced in a specification, model, design or instance. This is an arbitrary value managed by the summary author and is not expected to be globally unique. For example, it might be a timestamp (e.g. yyyymmdd) if a managed version is not available. There is also no expectation that versions can be placed in a lexicographical sequence.
- */
- @Child(name = "version", type = {StringType.class}, order=1, min=0, max=1, modifier=false, summary=true)
- @Description(shortDefinition="Business version of this summary", formalDefinition="The identifier that is used to identify this version of the summary when it is referenced in a specification, model, design or instance. This is an arbitrary value managed by the summary author and is not expected to be globally unique. For example, it might be a timestamp (e.g. yyyymmdd) if a managed version is not available. There is also no expectation that versions can be placed in a lexicographical sequence." )
- protected StringType version;
-
/**
* The status of this summary. Enables tracking the life-cycle of the content.
*/
- @Child(name = "status", type = {CodeType.class}, order=2, min=1, max=1, modifier=true, summary=true)
+ @Child(name = "status", type = {CodeType.class}, order=1, min=1, max=1, modifier=true, summary=true)
@Description(shortDefinition="draft | active | retired | unknown", formalDefinition="The status of this summary. Enables tracking the life-cycle of the content." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/publication-status")
protected Enumeration status;
@@ -7650,24 +9878,31 @@ public class Citation extends MetadataResource {
/**
* The content was developed with a focus and intent of supporting the contexts that are listed. These contexts may be general categories (gender, age, ...) or may be references to specific programs (insurance plans, studies, ...) and may be used to assist with indexing and searching for appropriate citation instances.
*/
- @Child(name = "useContext", type = {UsageContext.class}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
+ @Child(name = "useContext", type = {UsageContext.class}, order=2, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Description(shortDefinition="Use context", formalDefinition="The content was developed with a focus and intent of supporting the contexts that are listed. These contexts may be general categories (gender, age, ...) or may be references to specific programs (insurance plans, studies, ...) and may be used to assist with indexing and searching for appropriate citation instances." )
protected List useContext;
/**
- * A formal identifier that is used to identify this summary when it is represented in other formats, or referenced in a specification, model, design or an instance. May include DOI, PMID, PMCID, etc.
+ * A formal identifier that is used to identify this citation when it is represented in other formats, or referenced in a specification, model, design or an instance.
*/
- @Child(name = "identifier", type = {Identifier.class}, order=4, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
- @Description(shortDefinition="May include DOI, PMID, PMCID, etc.", formalDefinition="A formal identifier that is used to identify this summary when it is represented in other formats, or referenced in a specification, model, design or an instance. May include DOI, PMID, PMCID, etc." )
+ @Child(name = "identifier", type = {Identifier.class}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
+ @Description(shortDefinition="May include DOI, PMID, PMCID, etc.", formalDefinition="A formal identifier that is used to identify this citation when it is represented in other formats, or referenced in a specification, model, design or an instance." )
protected List identifier;
/**
- * May include trial registry identifiers.
+ * A formal identifier that is used to identify things closely related to this citation.
*/
- @Child(name = "relatedIdentifier", type = {Identifier.class}, order=5, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
- @Description(shortDefinition="May include trial registry identifiers", formalDefinition="May include trial registry identifiers." )
+ @Child(name = "relatedIdentifier", type = {Identifier.class}, order=4, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
+ @Description(shortDefinition="May include trial registry identifiers", formalDefinition="A formal identifier that is used to identify things closely related to this citation." )
protected List relatedIdentifier;
+ /**
+ * A human-readable display of the citation.
+ */
+ @Child(name = "summary", type = {}, order=5, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+ @Description(shortDefinition="A human-readable display of the citation", formalDefinition="A human-readable display of the citation." )
+ protected List summary;
+
/**
* Date Cited.
*/
@@ -7697,80 +9932,73 @@ public class Citation extends MetadataResource {
@Description(shortDefinition="Contains identifiers and classifiers for the journal cited", formalDefinition="Contains identifiers and classifiers for the journal cited." )
protected CitationJournalComponent journal;
+ /**
+ * Citation detail for sources other than journals such as books and databases.
+ */
+ @Child(name = "publicationInfo", type = {}, order=10, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Citation detail for sources other than journals", formalDefinition="Citation detail for sources other than journals such as books and databases." )
+ protected CitationPublicationInfoComponent publicationInfo;
+
/**
* Full title of the article.
*/
- @Child(name = "articleTitle", type = {MarkdownType.class}, order=10, min=0, max=1, modifier=false, summary=true)
+ @Child(name = "articleTitle", type = {MarkdownType.class}, order=11, min=0, max=1, modifier=false, summary=true)
@Description(shortDefinition="Full title of the article", formalDefinition="Full title of the article." )
protected MarkdownType articleTitle;
/**
* Used for variant titles, such as translations.
*/
- @Child(name = "alternativeTitle", type = {}, order=11, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+ @Child(name = "alternativeTitle", type = {}, order=12, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Description(shortDefinition="Used for variant titles, such as translations", formalDefinition="Used for variant titles, such as translations." )
protected List alternativeTitle;
/**
* Indicates the inclusive pages for the article cited.
*/
- @Child(name = "pagination", type = {}, order=12, min=0, max=1, modifier=false, summary=false)
+ @Child(name = "pagination", type = {}, order=13, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="Indicates the inclusive pages for the article cited", formalDefinition="Indicates the inclusive pages for the article cited." )
protected CitationPaginationComponent pagination;
/**
* Used for any URL for the article cited.
*/
- @Child(name = "articleUrl", type = {}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+ @Child(name = "articleUrl", type = {}, order=14, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Description(shortDefinition="Used for any URL for the article cited", formalDefinition="Used for any URL for the article cited." )
protected List articleUrl;
/**
- * Abstract text, may include structured labels.
+ * Abstract text, as published; may include structured labels.
*/
- @Child(name = "abstract", type = {MarkdownType.class}, order=14, min=0, max=1, modifier=false, summary=false)
- @Description(shortDefinition="Abstract text", formalDefinition="Abstract text, may include structured labels." )
+ @Child(name = "abstract", type = {MarkdownType.class}, order=15, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Abstract text", formalDefinition="Abstract text, as published; may include structured labels." )
protected MarkdownType abstract_;
/**
* Copyright information for the abstract text.
*/
- @Child(name = "abstractCopyright", type = {MarkdownType.class}, order=15, min=0, max=1, modifier=false, summary=false)
+ @Child(name = "abstractCopyright", type = {MarkdownType.class}, order=16, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="Abstract copyright", formalDefinition="Copyright information for the abstract text." )
protected MarkdownType abstractCopyright;
/**
* Used for variant abstracts, such as translations.
*/
- @Child(name = "alternativeAbstract", type = {}, order=16, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+ @Child(name = "alternativeAbstract", type = {}, order=17, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Description(shortDefinition="Used for variant abstracts, such as translations", formalDefinition="Used for variant abstracts, such as translations." )
protected List alternativeAbstract;
/**
- * Personal and collective author names.
+ * This element is used to list authors and other contributors, their contact information, specific contributions, and summary statements.
*/
- @Child(name = "authorList", type = {}, order=17, min=0, max=1, modifier=false, summary=false)
- @Description(shortDefinition="Personal and collective author names", formalDefinition="Personal and collective author names." )
- protected CitationAuthorListComponent authorList;
-
- /**
- * Used to record a display of the author list without separate coding for each author.
- */
- @Child(name = "authorString", type = {}, order=18, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
- @Description(shortDefinition="Used to record a display of the author list without separate coding for each author", formalDefinition="Used to record a display of the author list without separate coding for each author." )
- protected List authorString;
-
- /**
- * Personal and collective contributor names.
- */
- @Child(name = "contributorList", type = {}, order=19, min=0, max=1, modifier=false, summary=false)
- @Description(shortDefinition="Personal and collective contributor names", formalDefinition="Personal and collective contributor names." )
- protected CitationContributorListComponent contributorList;
+ @Child(name = "contributorship", type = {}, order=18, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Attribution of authors and other contributors", formalDefinition="This element is used to list authors and other contributors, their contact information, specific contributions, and summary statements." )
+ protected CitationContributorshipComponent contributorship;
/**
* The language in which the article is published.
*/
- @Child(name = "articleLanguage", type = {CodeableConcept.class}, order=20, min=0, max=1, modifier=false, summary=false)
+ @Child(name = "articleLanguage", type = {CodeableConcept.class}, order=19, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="The language in which the article is published", formalDefinition="The language in which the article is published." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/languages")
protected CodeableConcept articleLanguage;
@@ -7778,23 +10006,30 @@ public class Citation extends MetadataResource {
/**
* Used to represent alternative forms of the article that are not separate citations.
*/
- @Child(name = "alternativeForm", type = {}, order=21, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+ @Child(name = "alternativeForm", type = {}, order=20, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Description(shortDefinition="Used to represent alternative forms of the article that are not separate citations", formalDefinition="Used to represent alternative forms of the article that are not separate citations." )
protected List alternativeForm;
/**
* Used for many classifiers including PublicationType, CitationSubset, MeshHeading, Chemical.
*/
- @Child(name = "classifier", type = {CodeableConcept.class}, order=22, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+ @Child(name = "classifier", type = {CodeableConcept.class}, order=21, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Description(shortDefinition="Used for many classifiers including PublicationType, CitationSubset, MeshHeading, Chemical", formalDefinition="Used for many classifiers including PublicationType, CitationSubset, MeshHeading, Chemical." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/citation-classifier")
protected List classifier;
/**
- * Used for referencing EvidenceReport resource.
+ * A list of words classified as keywords for specific use in search functions.
+ */
+ @Child(name = "keywordList", type = {}, order=22, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+ @Description(shortDefinition="Used to support keyword searches", formalDefinition="A list of words classified as keywords for specific use in search functions." )
+ protected List keywordList;
+
+ /**
+ * Link or citation to artifact associated with the referenced material.
*/
@Child(name = "relatedArtifact", type = {RelatedArtifact.class}, order=23, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
- @Description(shortDefinition="Link or citation to artifact associated with the summary", formalDefinition="Used for referencing EvidenceReport resource." )
+ @Description(shortDefinition="Link or citation to artifact associated with the referenced material", formalDefinition="Link or citation to artifact associated with the referenced material." )
protected List relatedArtifact;
/**
@@ -7811,7 +10046,7 @@ public class Citation extends MetadataResource {
@Description(shortDefinition="These elements are items with values assigned by MEDLINE or PubMed management", formalDefinition="These elements are items with values assigned by MEDLINE or PubMed management." )
protected CitationMedlinePubMedComponent medlinePubMed;
- private static final long serialVersionUID = 1796797816L;
+ private static final long serialVersionUID = -3279077L;
/**
* Constructor
@@ -7877,55 +10112,6 @@ public class Citation extends MetadataResource {
return this;
}
- /**
- * @return {@link #version} (The identifier that is used to identify this version of the summary when it is referenced in a specification, model, design or instance. This is an arbitrary value managed by the summary author and is not expected to be globally unique. For example, it might be a timestamp (e.g. yyyymmdd) if a managed version is not available. There is also no expectation that versions can be placed in a lexicographical sequence.). This is the underlying object with id, value and extensions. The accessor "getVersion" gives direct access to the value
- */
- public StringType getVersionElement() {
- if (this.version == null)
- if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create Citation.version");
- else if (Configuration.doAutoCreate())
- this.version = new StringType(); // bb
- return this.version;
- }
-
- public boolean hasVersionElement() {
- return this.version != null && !this.version.isEmpty();
- }
-
- public boolean hasVersion() {
- return this.version != null && !this.version.isEmpty();
- }
-
- /**
- * @param value {@link #version} (The identifier that is used to identify this version of the summary when it is referenced in a specification, model, design or instance. This is an arbitrary value managed by the summary author and is not expected to be globally unique. For example, it might be a timestamp (e.g. yyyymmdd) if a managed version is not available. There is also no expectation that versions can be placed in a lexicographical sequence.). This is the underlying object with id, value and extensions. The accessor "getVersion" gives direct access to the value
- */
- public Citation setVersionElement(StringType value) {
- this.version = value;
- return this;
- }
-
- /**
- * @return The identifier that is used to identify this version of the summary when it is referenced in a specification, model, design or instance. This is an arbitrary value managed by the summary author and is not expected to be globally unique. For example, it might be a timestamp (e.g. yyyymmdd) if a managed version is not available. There is also no expectation that versions can be placed in a lexicographical sequence.
- */
- public String getVersion() {
- return this.version == null ? null : this.version.getValue();
- }
-
- /**
- * @param value The identifier that is used to identify this version of the summary when it is referenced in a specification, model, design or instance. This is an arbitrary value managed by the summary author and is not expected to be globally unique. For example, it might be a timestamp (e.g. yyyymmdd) if a managed version is not available. There is also no expectation that versions can be placed in a lexicographical sequence.
- */
- public Citation setVersion(String value) {
- if (Utilities.noString(value))
- this.version = null;
- else {
- if (this.version == null)
- this.version = new StringType();
- this.version.setValue(value);
- }
- return this;
- }
-
/**
* @return {@link #status} (The status of this summary. Enables tracking the life-cycle of the content.). This is the underlying object with id, value and extensions. The accessor "getStatus" gives direct access to the value
*/
@@ -8025,7 +10211,7 @@ public class Citation extends MetadataResource {
}
/**
- * @return {@link #identifier} (A formal identifier that is used to identify this summary when it is represented in other formats, or referenced in a specification, model, design or an instance. May include DOI, PMID, PMCID, etc.)
+ * @return {@link #identifier} (A formal identifier that is used to identify this citation when it is represented in other formats, or referenced in a specification, model, design or an instance.)
*/
public List getIdentifier() {
if (this.identifier == null)
@@ -8078,7 +10264,7 @@ public class Citation extends MetadataResource {
}
/**
- * @return {@link #relatedIdentifier} (May include trial registry identifiers.)
+ * @return {@link #relatedIdentifier} (A formal identifier that is used to identify things closely related to this citation.)
*/
public List getRelatedIdentifier() {
if (this.relatedIdentifier == null)
@@ -8130,6 +10316,59 @@ public class Citation extends MetadataResource {
return getRelatedIdentifier().get(0);
}
+ /**
+ * @return {@link #summary} (A human-readable display of the citation.)
+ */
+ public List getSummary() {
+ if (this.summary == null)
+ this.summary = new ArrayList();
+ return this.summary;
+ }
+
+ /**
+ * @return Returns a reference to this
for easy method chaining
+ */
+ public Citation setSummary(List theSummary) {
+ this.summary = theSummary;
+ return this;
+ }
+
+ public boolean hasSummary() {
+ if (this.summary == null)
+ return false;
+ for (CitationSummaryComponent item : this.summary)
+ if (!item.isEmpty())
+ return true;
+ return false;
+ }
+
+ public CitationSummaryComponent addSummary() { //3
+ CitationSummaryComponent t = new CitationSummaryComponent();
+ if (this.summary == null)
+ this.summary = new ArrayList();
+ this.summary.add(t);
+ return t;
+ }
+
+ public Citation addSummary(CitationSummaryComponent t) { //3
+ if (t == null)
+ return this;
+ if (this.summary == null)
+ this.summary = new ArrayList();
+ this.summary.add(t);
+ return this;
+ }
+
+ /**
+ * @return The first repetition of repeating field {@link #summary}, creating it if it does not already exist {3}
+ */
+ public CitationSummaryComponent getSummaryFirstRep() {
+ if (getSummary().isEmpty()) {
+ addSummary();
+ }
+ return getSummary().get(0);
+ }
+
/**
* @return {@link #dateCited} (Date Cited.). This is the underlying object with id, value and extensions. The accessor "getDateCited" gives direct access to the value
*/
@@ -8251,6 +10490,30 @@ public class Citation extends MetadataResource {
return this;
}
+ /**
+ * @return {@link #publicationInfo} (Citation detail for sources other than journals such as books and databases.)
+ */
+ public CitationPublicationInfoComponent getPublicationInfo() {
+ if (this.publicationInfo == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create Citation.publicationInfo");
+ else if (Configuration.doAutoCreate())
+ this.publicationInfo = new CitationPublicationInfoComponent(); // cc
+ return this.publicationInfo;
+ }
+
+ public boolean hasPublicationInfo() {
+ return this.publicationInfo != null && !this.publicationInfo.isEmpty();
+ }
+
+ /**
+ * @param value {@link #publicationInfo} (Citation detail for sources other than journals such as books and databases.)
+ */
+ public Citation setPublicationInfo(CitationPublicationInfoComponent value) {
+ this.publicationInfo = value;
+ return this;
+ }
+
/**
* @return {@link #articleTitle} (Full title of the article.). This is the underlying object with id, value and extensions. The accessor "getArticleTitle" gives direct access to the value
*/
@@ -8431,7 +10694,7 @@ public class Citation extends MetadataResource {
}
/**
- * @return {@link #abstract_} (Abstract text, may include structured labels.). This is the underlying object with id, value and extensions. The accessor "getAbstract" gives direct access to the value
+ * @return {@link #abstract_} (Abstract text, as published; may include structured labels.). This is the underlying object with id, value and extensions. The accessor "getAbstract" gives direct access to the value
*/
public MarkdownType getAbstractElement() {
if (this.abstract_ == null)
@@ -8451,7 +10714,7 @@ public class Citation extends MetadataResource {
}
/**
- * @param value {@link #abstract_} (Abstract text, may include structured labels.). This is the underlying object with id, value and extensions. The accessor "getAbstract" gives direct access to the value
+ * @param value {@link #abstract_} (Abstract text, as published; may include structured labels.). This is the underlying object with id, value and extensions. The accessor "getAbstract" gives direct access to the value
*/
public Citation setAbstractElement(MarkdownType value) {
this.abstract_ = value;
@@ -8459,14 +10722,14 @@ public class Citation extends MetadataResource {
}
/**
- * @return Abstract text, may include structured labels.
+ * @return Abstract text, as published; may include structured labels.
*/
public String getAbstract() {
return this.abstract_ == null ? null : this.abstract_.getValue();
}
/**
- * @param value Abstract text, may include structured labels.
+ * @param value Abstract text, as published; may include structured labels.
*/
public Citation setAbstract(String value) {
if (value == null)
@@ -8582,103 +10845,26 @@ public class Citation extends MetadataResource {
}
/**
- * @return {@link #authorList} (Personal and collective author names.)
+ * @return {@link #contributorship} (This element is used to list authors and other contributors, their contact information, specific contributions, and summary statements.)
*/
- public CitationAuthorListComponent getAuthorList() {
- if (this.authorList == null)
+ public CitationContributorshipComponent getContributorship() {
+ if (this.contributorship == null)
if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create Citation.authorList");
+ throw new Error("Attempt to auto-create Citation.contributorship");
else if (Configuration.doAutoCreate())
- this.authorList = new CitationAuthorListComponent(); // cc
- return this.authorList;
+ this.contributorship = new CitationContributorshipComponent(); // cc
+ return this.contributorship;
}
- public boolean hasAuthorList() {
- return this.authorList != null && !this.authorList.isEmpty();
+ public boolean hasContributorship() {
+ return this.contributorship != null && !this.contributorship.isEmpty();
}
/**
- * @param value {@link #authorList} (Personal and collective author names.)
+ * @param value {@link #contributorship} (This element is used to list authors and other contributors, their contact information, specific contributions, and summary statements.)
*/
- public Citation setAuthorList(CitationAuthorListComponent value) {
- this.authorList = value;
- return this;
- }
-
- /**
- * @return {@link #authorString} (Used to record a display of the author list without separate coding for each author.)
- */
- public List getAuthorString() {
- if (this.authorString == null)
- this.authorString = new ArrayList();
- return this.authorString;
- }
-
- /**
- * @return Returns a reference to this
for easy method chaining
- */
- public Citation setAuthorString(List theAuthorString) {
- this.authorString = theAuthorString;
- return this;
- }
-
- public boolean hasAuthorString() {
- if (this.authorString == null)
- return false;
- for (CitationAuthorStringComponent item : this.authorString)
- if (!item.isEmpty())
- return true;
- return false;
- }
-
- public CitationAuthorStringComponent addAuthorString() { //3
- CitationAuthorStringComponent t = new CitationAuthorStringComponent();
- if (this.authorString == null)
- this.authorString = new ArrayList();
- this.authorString.add(t);
- return t;
- }
-
- public Citation addAuthorString(CitationAuthorStringComponent t) { //3
- if (t == null)
- return this;
- if (this.authorString == null)
- this.authorString = new ArrayList();
- this.authorString.add(t);
- return this;
- }
-
- /**
- * @return The first repetition of repeating field {@link #authorString}, creating it if it does not already exist {3}
- */
- public CitationAuthorStringComponent getAuthorStringFirstRep() {
- if (getAuthorString().isEmpty()) {
- addAuthorString();
- }
- return getAuthorString().get(0);
- }
-
- /**
- * @return {@link #contributorList} (Personal and collective contributor names.)
- */
- public CitationContributorListComponent getContributorList() {
- if (this.contributorList == null)
- if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create Citation.contributorList");
- else if (Configuration.doAutoCreate())
- this.contributorList = new CitationContributorListComponent(); // cc
- return this.contributorList;
- }
-
- public boolean hasContributorList() {
- return this.contributorList != null && !this.contributorList.isEmpty();
- }
-
- /**
- * @param value {@link #contributorList} (Personal and collective contributor names.)
- */
- public Citation setContributorList(CitationContributorListComponent value) {
- this.contributorList = value;
+ public Citation setContributorship(CitationContributorshipComponent value) {
+ this.contributorship = value;
return this;
}
@@ -8813,7 +10999,60 @@ public class Citation extends MetadataResource {
}
/**
- * @return {@link #relatedArtifact} (Used for referencing EvidenceReport resource.)
+ * @return {@link #keywordList} (A list of words classified as keywords for specific use in search functions.)
+ */
+ public List getKeywordList() {
+ if (this.keywordList == null)
+ this.keywordList = new ArrayList();
+ return this.keywordList;
+ }
+
+ /**
+ * @return Returns a reference to this
for easy method chaining
+ */
+ public Citation setKeywordList(List theKeywordList) {
+ this.keywordList = theKeywordList;
+ return this;
+ }
+
+ public boolean hasKeywordList() {
+ if (this.keywordList == null)
+ return false;
+ for (CitationKeywordListComponent item : this.keywordList)
+ if (!item.isEmpty())
+ return true;
+ return false;
+ }
+
+ public CitationKeywordListComponent addKeywordList() { //3
+ CitationKeywordListComponent t = new CitationKeywordListComponent();
+ if (this.keywordList == null)
+ this.keywordList = new ArrayList();
+ this.keywordList.add(t);
+ return t;
+ }
+
+ public Citation addKeywordList(CitationKeywordListComponent t) { //3
+ if (t == null)
+ return this;
+ if (this.keywordList == null)
+ this.keywordList = new ArrayList();
+ this.keywordList.add(t);
+ return this;
+ }
+
+ /**
+ * @return The first repetition of repeating field {@link #keywordList}, creating it if it does not already exist {3}
+ */
+ public CitationKeywordListComponent getKeywordListFirstRep() {
+ if (getKeywordList().isEmpty()) {
+ addKeywordList();
+ }
+ return getKeywordList().get(0);
+ }
+
+ /**
+ * @return {@link #relatedArtifact} (Link or citation to artifact associated with the referenced material.)
*/
public List getRelatedArtifact() {
if (this.relatedArtifact == null)
@@ -8942,6 +11181,42 @@ public class Citation extends MetadataResource {
return this;
}
+ /**
+ * not supported on this implementation
+ */
+ @Override
+ public int getVersionMax() {
+ return 0;
+ }
+ /**
+ * @return {@link #version} (The identifier that is used to identify this version of the citation when it is referenced in a specification, model, design or instance. This is an arbitrary value managed by the citation author and is not expected to be globally unique. For example, it might be a timestamp (e.g. yyyymmdd) if a managed version is not available. There is also no expectation that versions can be placed in a lexicographical sequence.). This is the underlying object with id, value and extensions. The accessor "getVersion" gives direct access to the value
+ */
+ public StringType getVersionElement() {
+ throw new Error("The resource type \"Citation\" does not implement the property \"version\"");
+ }
+
+ public boolean hasVersionElement() {
+ return false;
+ }
+ public boolean hasVersion() {
+ return false;
+ }
+
+ /**
+ * @param value {@link #version} (The identifier that is used to identify this version of the citation when it is referenced in a specification, model, design or instance. This is an arbitrary value managed by the citation author and is not expected to be globally unique. For example, it might be a timestamp (e.g. yyyymmdd) if a managed version is not available. There is also no expectation that versions can be placed in a lexicographical sequence.). This is the underlying object with id, value and extensions. The accessor "getVersion" gives direct access to the value
+ */
+ public Citation setVersionElement(StringType value) {
+ throw new Error("The resource type \"Citation\" does not implement the property \"version\"");
+ }
+ public String getVersion() {
+ throw new Error("The resource type \"Citation\" does not implement the property \"version\"");
+ }
+ /**
+ * @param value The identifier that is used to identify this version of the citation when it is referenced in a specification, model, design or instance. This is an arbitrary value managed by the citation author and is not expected to be globally unique. For example, it might be a timestamp (e.g. yyyymmdd) if a managed version is not available. There is also no expectation that versions can be placed in a lexicographical sequence.
+ */
+ public Citation setVersion(String value) {
+ throw new Error("The resource type \"Citation\" does not implement the property \"version\"");
+ }
/**
* not supported on this implementation
*/
@@ -9398,29 +11673,29 @@ public class Citation extends MetadataResource {
protected void listChildren(List children) {
super.listChildren(children);
children.add(new Property("url", "uri", "An absolute URI that is used to identify this citation when it is referenced in a specification, model, design or an instance; also called its canonical identifier. This SHOULD be globally unique and SHOULD be a literal address at which at which an authoritative instance of this summary is (or will be) published. This URL can be the target of a canonical reference. It SHALL remain the same when the summary is stored on different servers.", 0, 1, url));
- children.add(new Property("version", "string", "The identifier that is used to identify this version of the summary when it is referenced in a specification, model, design or instance. This is an arbitrary value managed by the summary author and is not expected to be globally unique. For example, it might be a timestamp (e.g. yyyymmdd) if a managed version is not available. There is also no expectation that versions can be placed in a lexicographical sequence.", 0, 1, version));
children.add(new Property("status", "code", "The status of this summary. Enables tracking the life-cycle of the content.", 0, 1, status));
children.add(new Property("useContext", "UsageContext", "The content was developed with a focus and intent of supporting the contexts that are listed. These contexts may be general categories (gender, age, ...) or may be references to specific programs (insurance plans, studies, ...) and may be used to assist with indexing and searching for appropriate citation instances.", 0, java.lang.Integer.MAX_VALUE, useContext));
- children.add(new Property("identifier", "Identifier", "A formal identifier that is used to identify this summary when it is represented in other formats, or referenced in a specification, model, design or an instance. May include DOI, PMID, PMCID, etc.", 0, java.lang.Integer.MAX_VALUE, identifier));
- children.add(new Property("relatedIdentifier", "Identifier", "May include trial registry identifiers.", 0, java.lang.Integer.MAX_VALUE, relatedIdentifier));
+ children.add(new Property("identifier", "Identifier", "A formal identifier that is used to identify this citation when it is represented in other formats, or referenced in a specification, model, design or an instance.", 0, java.lang.Integer.MAX_VALUE, identifier));
+ children.add(new Property("relatedIdentifier", "Identifier", "A formal identifier that is used to identify things closely related to this citation.", 0, java.lang.Integer.MAX_VALUE, relatedIdentifier));
+ children.add(new Property("summary", "", "A human-readable display of the citation.", 0, java.lang.Integer.MAX_VALUE, summary));
children.add(new Property("dateCited", "dateTime", "Date Cited.", 0, 1, dateCited));
children.add(new Property("variantCitation", "", "Variant citation.", 0, 1, variantCitation));
children.add(new Property("publishingModel", "CodeableConcept", "Identify the medium/media in which the cited article is published, eg print, electronic or print-electronic.", 0, 1, publishingModel));
children.add(new Property("journal", "", "Contains identifiers and classifiers for the journal cited.", 0, 1, journal));
+ children.add(new Property("publicationInfo", "", "Citation detail for sources other than journals such as books and databases.", 0, 1, publicationInfo));
children.add(new Property("articleTitle", "markdown", "Full title of the article.", 0, 1, articleTitle));
children.add(new Property("alternativeTitle", "", "Used for variant titles, such as translations.", 0, java.lang.Integer.MAX_VALUE, alternativeTitle));
children.add(new Property("pagination", "", "Indicates the inclusive pages for the article cited.", 0, 1, pagination));
children.add(new Property("articleUrl", "", "Used for any URL for the article cited.", 0, java.lang.Integer.MAX_VALUE, articleUrl));
- children.add(new Property("abstract", "markdown", "Abstract text, may include structured labels.", 0, 1, abstract_));
+ children.add(new Property("abstract", "markdown", "Abstract text, as published; may include structured labels.", 0, 1, abstract_));
children.add(new Property("abstractCopyright", "markdown", "Copyright information for the abstract text.", 0, 1, abstractCopyright));
children.add(new Property("alternativeAbstract", "", "Used for variant abstracts, such as translations.", 0, java.lang.Integer.MAX_VALUE, alternativeAbstract));
- children.add(new Property("authorList", "", "Personal and collective author names.", 0, 1, authorList));
- children.add(new Property("authorString", "", "Used to record a display of the author list without separate coding for each author.", 0, java.lang.Integer.MAX_VALUE, authorString));
- children.add(new Property("contributorList", "", "Personal and collective contributor names.", 0, 1, contributorList));
+ children.add(new Property("contributorship", "", "This element is used to list authors and other contributors, their contact information, specific contributions, and summary statements.", 0, 1, contributorship));
children.add(new Property("articleLanguage", "CodeableConcept", "The language in which the article is published.", 0, 1, articleLanguage));
children.add(new Property("alternativeForm", "", "Used to represent alternative forms of the article that are not separate citations.", 0, java.lang.Integer.MAX_VALUE, alternativeForm));
children.add(new Property("classifier", "CodeableConcept", "Used for many classifiers including PublicationType, CitationSubset, MeshHeading, Chemical.", 0, java.lang.Integer.MAX_VALUE, classifier));
- children.add(new Property("relatedArtifact", "RelatedArtifact", "Used for referencing EvidenceReport resource.", 0, java.lang.Integer.MAX_VALUE, relatedArtifact));
+ children.add(new Property("keywordList", "", "A list of words classified as keywords for specific use in search functions.", 0, java.lang.Integer.MAX_VALUE, keywordList));
+ children.add(new Property("relatedArtifact", "RelatedArtifact", "Link or citation to artifact associated with the referenced material.", 0, java.lang.Integer.MAX_VALUE, relatedArtifact));
children.add(new Property("note", "Annotation", "Used for general notes and annotations not coded elsewhere.", 0, java.lang.Integer.MAX_VALUE, note));
children.add(new Property("medlinePubMed", "", "These elements are items with values assigned by MEDLINE or PubMed management.", 0, 1, medlinePubMed));
}
@@ -9429,29 +11704,29 @@ public class Citation extends MetadataResource {
public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException {
switch (_hash) {
case 116079: /*url*/ return new Property("url", "uri", "An absolute URI that is used to identify this citation when it is referenced in a specification, model, design or an instance; also called its canonical identifier. This SHOULD be globally unique and SHOULD be a literal address at which at which an authoritative instance of this summary is (or will be) published. This URL can be the target of a canonical reference. It SHALL remain the same when the summary is stored on different servers.", 0, 1, url);
- case 351608024: /*version*/ return new Property("version", "string", "The identifier that is used to identify this version of the summary when it is referenced in a specification, model, design or instance. This is an arbitrary value managed by the summary author and is not expected to be globally unique. For example, it might be a timestamp (e.g. yyyymmdd) if a managed version is not available. There is also no expectation that versions can be placed in a lexicographical sequence.", 0, 1, version);
case -892481550: /*status*/ return new Property("status", "code", "The status of this summary. Enables tracking the life-cycle of the content.", 0, 1, status);
case -669707736: /*useContext*/ return new Property("useContext", "UsageContext", "The content was developed with a focus and intent of supporting the contexts that are listed. These contexts may be general categories (gender, age, ...) or may be references to specific programs (insurance plans, studies, ...) and may be used to assist with indexing and searching for appropriate citation instances.", 0, java.lang.Integer.MAX_VALUE, useContext);
- case -1618432855: /*identifier*/ return new Property("identifier", "Identifier", "A formal identifier that is used to identify this summary when it is represented in other formats, or referenced in a specification, model, design or an instance. May include DOI, PMID, PMCID, etc.", 0, java.lang.Integer.MAX_VALUE, identifier);
- case -1007604940: /*relatedIdentifier*/ return new Property("relatedIdentifier", "Identifier", "May include trial registry identifiers.", 0, java.lang.Integer.MAX_VALUE, relatedIdentifier);
+ case -1618432855: /*identifier*/ return new Property("identifier", "Identifier", "A formal identifier that is used to identify this citation when it is represented in other formats, or referenced in a specification, model, design or an instance.", 0, java.lang.Integer.MAX_VALUE, identifier);
+ case -1007604940: /*relatedIdentifier*/ return new Property("relatedIdentifier", "Identifier", "A formal identifier that is used to identify things closely related to this citation.", 0, java.lang.Integer.MAX_VALUE, relatedIdentifier);
+ case -1857640538: /*summary*/ return new Property("summary", "", "A human-readable display of the citation.", 0, java.lang.Integer.MAX_VALUE, summary);
case -275034401: /*dateCited*/ return new Property("dateCited", "dateTime", "Date Cited.", 0, 1, dateCited);
case -1653134708: /*variantCitation*/ return new Property("variantCitation", "", "Variant citation.", 0, 1, variantCitation);
case 747318902: /*publishingModel*/ return new Property("publishingModel", "CodeableConcept", "Identify the medium/media in which the cited article is published, eg print, electronic or print-electronic.", 0, 1, publishingModel);
case -1419464905: /*journal*/ return new Property("journal", "", "Contains identifiers and classifiers for the journal cited.", 0, 1, journal);
+ case 1470727418: /*publicationInfo*/ return new Property("publicationInfo", "", "Citation detail for sources other than journals such as books and databases.", 0, 1, publicationInfo);
case -404746494: /*articleTitle*/ return new Property("articleTitle", "markdown", "Full title of the article.", 0, 1, articleTitle);
case -1478308181: /*alternativeTitle*/ return new Property("alternativeTitle", "", "Used for variant titles, such as translations.", 0, java.lang.Integer.MAX_VALUE, alternativeTitle);
case 1297692570: /*pagination*/ return new Property("pagination", "", "Indicates the inclusive pages for the article cited.", 0, 1, pagination);
case 164943001: /*articleUrl*/ return new Property("articleUrl", "", "Used for any URL for the article cited.", 0, java.lang.Integer.MAX_VALUE, articleUrl);
- case 1732898850: /*abstract*/ return new Property("abstract", "markdown", "Abstract text, may include structured labels.", 0, 1, abstract_);
+ case 1732898850: /*abstract*/ return new Property("abstract", "markdown", "Abstract text, as published; may include structured labels.", 0, 1, abstract_);
case -656627259: /*abstractCopyright*/ return new Property("abstractCopyright", "markdown", "Copyright information for the abstract text.", 0, 1, abstractCopyright);
case -376340753: /*alternativeAbstract*/ return new Property("alternativeAbstract", "", "Used for variant abstracts, such as translations.", 0, java.lang.Integer.MAX_VALUE, alternativeAbstract);
- case -1501591351: /*authorList*/ return new Property("authorList", "", "Personal and collective author names.", 0, 1, authorList);
- case 290249084: /*authorString*/ return new Property("authorString", "", "Used to record a display of the author list without separate coding for each author.", 0, java.lang.Integer.MAX_VALUE, authorString);
- case 537567257: /*contributorList*/ return new Property("contributorList", "", "Personal and collective contributor names.", 0, 1, contributorList);
+ case 538727831: /*contributorship*/ return new Property("contributorship", "", "This element is used to list authors and other contributors, their contact information, specific contributions, and summary statements.", 0, 1, contributorship);
case -1573097874: /*articleLanguage*/ return new Property("articleLanguage", "CodeableConcept", "The language in which the article is published.", 0, 1, articleLanguage);
case 2030111249: /*alternativeForm*/ return new Property("alternativeForm", "", "Used to represent alternative forms of the article that are not separate citations.", 0, java.lang.Integer.MAX_VALUE, alternativeForm);
case -281470431: /*classifier*/ return new Property("classifier", "CodeableConcept", "Used for many classifiers including PublicationType, CitationSubset, MeshHeading, Chemical.", 0, java.lang.Integer.MAX_VALUE, classifier);
- case 666807069: /*relatedArtifact*/ return new Property("relatedArtifact", "RelatedArtifact", "Used for referencing EvidenceReport resource.", 0, java.lang.Integer.MAX_VALUE, relatedArtifact);
+ case -1298782681: /*keywordList*/ return new Property("keywordList", "", "A list of words classified as keywords for specific use in search functions.", 0, java.lang.Integer.MAX_VALUE, keywordList);
+ case 666807069: /*relatedArtifact*/ return new Property("relatedArtifact", "RelatedArtifact", "Link or citation to artifact associated with the referenced material.", 0, java.lang.Integer.MAX_VALUE, relatedArtifact);
case 3387378: /*note*/ return new Property("note", "Annotation", "Used for general notes and annotations not coded elsewhere.", 0, java.lang.Integer.MAX_VALUE, note);
case -1342445201: /*medlinePubMed*/ return new Property("medlinePubMed", "", "These elements are items with values assigned by MEDLINE or PubMed management.", 0, 1, medlinePubMed);
default: return super.getNamedProperty(_hash, _name, _checkValid);
@@ -9463,15 +11738,16 @@ public class Citation extends MetadataResource {
public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException {
switch (hash) {
case 116079: /*url*/ return this.url == null ? new Base[0] : new Base[] {this.url}; // UriType
- case 351608024: /*version*/ return this.version == null ? new Base[0] : new Base[] {this.version}; // StringType
case -892481550: /*status*/ return this.status == null ? new Base[0] : new Base[] {this.status}; // Enumeration
case -669707736: /*useContext*/ return this.useContext == null ? new Base[0] : this.useContext.toArray(new Base[this.useContext.size()]); // UsageContext
case -1618432855: /*identifier*/ return this.identifier == null ? new Base[0] : this.identifier.toArray(new Base[this.identifier.size()]); // Identifier
case -1007604940: /*relatedIdentifier*/ return this.relatedIdentifier == null ? new Base[0] : this.relatedIdentifier.toArray(new Base[this.relatedIdentifier.size()]); // Identifier
+ case -1857640538: /*summary*/ return this.summary == null ? new Base[0] : this.summary.toArray(new Base[this.summary.size()]); // CitationSummaryComponent
case -275034401: /*dateCited*/ return this.dateCited == null ? new Base[0] : new Base[] {this.dateCited}; // DateTimeType
case -1653134708: /*variantCitation*/ return this.variantCitation == null ? new Base[0] : new Base[] {this.variantCitation}; // CitationVariantCitationComponent
case 747318902: /*publishingModel*/ return this.publishingModel == null ? new Base[0] : new Base[] {this.publishingModel}; // CodeableConcept
case -1419464905: /*journal*/ return this.journal == null ? new Base[0] : new Base[] {this.journal}; // CitationJournalComponent
+ case 1470727418: /*publicationInfo*/ return this.publicationInfo == null ? new Base[0] : new Base[] {this.publicationInfo}; // CitationPublicationInfoComponent
case -404746494: /*articleTitle*/ return this.articleTitle == null ? new Base[0] : new Base[] {this.articleTitle}; // MarkdownType
case -1478308181: /*alternativeTitle*/ return this.alternativeTitle == null ? new Base[0] : this.alternativeTitle.toArray(new Base[this.alternativeTitle.size()]); // CitationAlternativeTitleComponent
case 1297692570: /*pagination*/ return this.pagination == null ? new Base[0] : new Base[] {this.pagination}; // CitationPaginationComponent
@@ -9479,12 +11755,11 @@ public class Citation extends MetadataResource {
case 1732898850: /*abstract*/ return this.abstract_ == null ? new Base[0] : new Base[] {this.abstract_}; // MarkdownType
case -656627259: /*abstractCopyright*/ return this.abstractCopyright == null ? new Base[0] : new Base[] {this.abstractCopyright}; // MarkdownType
case -376340753: /*alternativeAbstract*/ return this.alternativeAbstract == null ? new Base[0] : this.alternativeAbstract.toArray(new Base[this.alternativeAbstract.size()]); // CitationAlternativeAbstractComponent
- case -1501591351: /*authorList*/ return this.authorList == null ? new Base[0] : new Base[] {this.authorList}; // CitationAuthorListComponent
- case 290249084: /*authorString*/ return this.authorString == null ? new Base[0] : this.authorString.toArray(new Base[this.authorString.size()]); // CitationAuthorStringComponent
- case 537567257: /*contributorList*/ return this.contributorList == null ? new Base[0] : new Base[] {this.contributorList}; // CitationContributorListComponent
+ case 538727831: /*contributorship*/ return this.contributorship == null ? new Base[0] : new Base[] {this.contributorship}; // CitationContributorshipComponent
case -1573097874: /*articleLanguage*/ return this.articleLanguage == null ? new Base[0] : new Base[] {this.articleLanguage}; // CodeableConcept
case 2030111249: /*alternativeForm*/ return this.alternativeForm == null ? new Base[0] : this.alternativeForm.toArray(new Base[this.alternativeForm.size()]); // CitationAlternativeFormComponent
case -281470431: /*classifier*/ return this.classifier == null ? new Base[0] : this.classifier.toArray(new Base[this.classifier.size()]); // CodeableConcept
+ case -1298782681: /*keywordList*/ return this.keywordList == null ? new Base[0] : this.keywordList.toArray(new Base[this.keywordList.size()]); // CitationKeywordListComponent
case 666807069: /*relatedArtifact*/ return this.relatedArtifact == null ? new Base[0] : this.relatedArtifact.toArray(new Base[this.relatedArtifact.size()]); // RelatedArtifact
case 3387378: /*note*/ return this.note == null ? new Base[0] : this.note.toArray(new Base[this.note.size()]); // Annotation
case -1342445201: /*medlinePubMed*/ return this.medlinePubMed == null ? new Base[0] : new Base[] {this.medlinePubMed}; // CitationMedlinePubMedComponent
@@ -9499,9 +11774,6 @@ public class Citation extends MetadataResource {
case 116079: // url
this.url = TypeConvertor.castToUri(value); // UriType
return value;
- case 351608024: // version
- this.version = TypeConvertor.castToString(value); // StringType
- return value;
case -892481550: // status
value = new PublicationStatusEnumFactory().fromType(TypeConvertor.castToCode(value));
this.status = (Enumeration) value; // Enumeration
@@ -9515,6 +11787,9 @@ public class Citation extends MetadataResource {
case -1007604940: // relatedIdentifier
this.getRelatedIdentifier().add(TypeConvertor.castToIdentifier(value)); // Identifier
return value;
+ case -1857640538: // summary
+ this.getSummary().add((CitationSummaryComponent) value); // CitationSummaryComponent
+ return value;
case -275034401: // dateCited
this.dateCited = TypeConvertor.castToDateTime(value); // DateTimeType
return value;
@@ -9527,6 +11802,9 @@ public class Citation extends MetadataResource {
case -1419464905: // journal
this.journal = (CitationJournalComponent) value; // CitationJournalComponent
return value;
+ case 1470727418: // publicationInfo
+ this.publicationInfo = (CitationPublicationInfoComponent) value; // CitationPublicationInfoComponent
+ return value;
case -404746494: // articleTitle
this.articleTitle = TypeConvertor.castToMarkdown(value); // MarkdownType
return value;
@@ -9548,14 +11826,8 @@ public class Citation extends MetadataResource {
case -376340753: // alternativeAbstract
this.getAlternativeAbstract().add((CitationAlternativeAbstractComponent) value); // CitationAlternativeAbstractComponent
return value;
- case -1501591351: // authorList
- this.authorList = (CitationAuthorListComponent) value; // CitationAuthorListComponent
- return value;
- case 290249084: // authorString
- this.getAuthorString().add((CitationAuthorStringComponent) value); // CitationAuthorStringComponent
- return value;
- case 537567257: // contributorList
- this.contributorList = (CitationContributorListComponent) value; // CitationContributorListComponent
+ case 538727831: // contributorship
+ this.contributorship = (CitationContributorshipComponent) value; // CitationContributorshipComponent
return value;
case -1573097874: // articleLanguage
this.articleLanguage = TypeConvertor.castToCodeableConcept(value); // CodeableConcept
@@ -9566,6 +11838,9 @@ public class Citation extends MetadataResource {
case -281470431: // classifier
this.getClassifier().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept
return value;
+ case -1298782681: // keywordList
+ this.getKeywordList().add((CitationKeywordListComponent) value); // CitationKeywordListComponent
+ return value;
case 666807069: // relatedArtifact
this.getRelatedArtifact().add(TypeConvertor.castToRelatedArtifact(value)); // RelatedArtifact
return value;
@@ -9584,8 +11859,6 @@ public class Citation extends MetadataResource {
public Base setProperty(String name, Base value) throws FHIRException {
if (name.equals("url")) {
this.url = TypeConvertor.castToUri(value); // UriType
- } else if (name.equals("version")) {
- this.version = TypeConvertor.castToString(value); // StringType
} else if (name.equals("status")) {
value = new PublicationStatusEnumFactory().fromType(TypeConvertor.castToCode(value));
this.status = (Enumeration) value; // Enumeration
@@ -9595,6 +11868,8 @@ public class Citation extends MetadataResource {
this.getIdentifier().add(TypeConvertor.castToIdentifier(value));
} else if (name.equals("relatedIdentifier")) {
this.getRelatedIdentifier().add(TypeConvertor.castToIdentifier(value));
+ } else if (name.equals("summary")) {
+ this.getSummary().add((CitationSummaryComponent) value);
} else if (name.equals("dateCited")) {
this.dateCited = TypeConvertor.castToDateTime(value); // DateTimeType
} else if (name.equals("variantCitation")) {
@@ -9603,6 +11878,8 @@ public class Citation extends MetadataResource {
this.publishingModel = TypeConvertor.castToCodeableConcept(value); // CodeableConcept
} else if (name.equals("journal")) {
this.journal = (CitationJournalComponent) value; // CitationJournalComponent
+ } else if (name.equals("publicationInfo")) {
+ this.publicationInfo = (CitationPublicationInfoComponent) value; // CitationPublicationInfoComponent
} else if (name.equals("articleTitle")) {
this.articleTitle = TypeConvertor.castToMarkdown(value); // MarkdownType
} else if (name.equals("alternativeTitle")) {
@@ -9617,18 +11894,16 @@ public class Citation extends MetadataResource {
this.abstractCopyright = TypeConvertor.castToMarkdown(value); // MarkdownType
} else if (name.equals("alternativeAbstract")) {
this.getAlternativeAbstract().add((CitationAlternativeAbstractComponent) value);
- } else if (name.equals("authorList")) {
- this.authorList = (CitationAuthorListComponent) value; // CitationAuthorListComponent
- } else if (name.equals("authorString")) {
- this.getAuthorString().add((CitationAuthorStringComponent) value);
- } else if (name.equals("contributorList")) {
- this.contributorList = (CitationContributorListComponent) value; // CitationContributorListComponent
+ } else if (name.equals("contributorship")) {
+ this.contributorship = (CitationContributorshipComponent) value; // CitationContributorshipComponent
} else if (name.equals("articleLanguage")) {
this.articleLanguage = TypeConvertor.castToCodeableConcept(value); // CodeableConcept
} else if (name.equals("alternativeForm")) {
this.getAlternativeForm().add((CitationAlternativeFormComponent) value);
} else if (name.equals("classifier")) {
this.getClassifier().add(TypeConvertor.castToCodeableConcept(value));
+ } else if (name.equals("keywordList")) {
+ this.getKeywordList().add((CitationKeywordListComponent) value);
} else if (name.equals("relatedArtifact")) {
this.getRelatedArtifact().add(TypeConvertor.castToRelatedArtifact(value));
} else if (name.equals("note")) {
@@ -9644,15 +11919,16 @@ public class Citation extends MetadataResource {
public Base makeProperty(int hash, String name) throws FHIRException {
switch (hash) {
case 116079: return getUrlElement();
- case 351608024: return getVersionElement();
case -892481550: return getStatusElement();
case -669707736: return addUseContext();
case -1618432855: return addIdentifier();
case -1007604940: return addRelatedIdentifier();
+ case -1857640538: return addSummary();
case -275034401: return getDateCitedElement();
case -1653134708: return getVariantCitation();
case 747318902: return getPublishingModel();
case -1419464905: return getJournal();
+ case 1470727418: return getPublicationInfo();
case -404746494: return getArticleTitleElement();
case -1478308181: return addAlternativeTitle();
case 1297692570: return getPagination();
@@ -9660,12 +11936,11 @@ public class Citation extends MetadataResource {
case 1732898850: return getAbstractElement();
case -656627259: return getAbstractCopyrightElement();
case -376340753: return addAlternativeAbstract();
- case -1501591351: return getAuthorList();
- case 290249084: return addAuthorString();
- case 537567257: return getContributorList();
+ case 538727831: return getContributorship();
case -1573097874: return getArticleLanguage();
case 2030111249: return addAlternativeForm();
case -281470431: return addClassifier();
+ case -1298782681: return addKeywordList();
case 666807069: return addRelatedArtifact();
case 3387378: return addNote();
case -1342445201: return getMedlinePubMed();
@@ -9678,15 +11953,16 @@ public class Citation extends MetadataResource {
public String[] getTypesForProperty(int hash, String name) throws FHIRException {
switch (hash) {
case 116079: /*url*/ return new String[] {"uri"};
- case 351608024: /*version*/ return new String[] {"string"};
case -892481550: /*status*/ return new String[] {"code"};
case -669707736: /*useContext*/ return new String[] {"UsageContext"};
case -1618432855: /*identifier*/ return new String[] {"Identifier"};
case -1007604940: /*relatedIdentifier*/ return new String[] {"Identifier"};
+ case -1857640538: /*summary*/ return new String[] {};
case -275034401: /*dateCited*/ return new String[] {"dateTime"};
case -1653134708: /*variantCitation*/ return new String[] {};
case 747318902: /*publishingModel*/ return new String[] {"CodeableConcept"};
case -1419464905: /*journal*/ return new String[] {};
+ case 1470727418: /*publicationInfo*/ return new String[] {};
case -404746494: /*articleTitle*/ return new String[] {"markdown"};
case -1478308181: /*alternativeTitle*/ return new String[] {};
case 1297692570: /*pagination*/ return new String[] {};
@@ -9694,12 +11970,11 @@ public class Citation extends MetadataResource {
case 1732898850: /*abstract*/ return new String[] {"markdown"};
case -656627259: /*abstractCopyright*/ return new String[] {"markdown"};
case -376340753: /*alternativeAbstract*/ return new String[] {};
- case -1501591351: /*authorList*/ return new String[] {};
- case 290249084: /*authorString*/ return new String[] {};
- case 537567257: /*contributorList*/ return new String[] {};
+ case 538727831: /*contributorship*/ return new String[] {};
case -1573097874: /*articleLanguage*/ return new String[] {"CodeableConcept"};
case 2030111249: /*alternativeForm*/ return new String[] {};
case -281470431: /*classifier*/ return new String[] {"CodeableConcept"};
+ case -1298782681: /*keywordList*/ return new String[] {};
case 666807069: /*relatedArtifact*/ return new String[] {"RelatedArtifact"};
case 3387378: /*note*/ return new String[] {"Annotation"};
case -1342445201: /*medlinePubMed*/ return new String[] {};
@@ -9713,9 +11988,6 @@ public class Citation extends MetadataResource {
if (name.equals("url")) {
throw new FHIRException("Cannot call addChild on a primitive type Citation.url");
}
- else if (name.equals("version")) {
- throw new FHIRException("Cannot call addChild on a primitive type Citation.version");
- }
else if (name.equals("status")) {
throw new FHIRException("Cannot call addChild on a primitive type Citation.status");
}
@@ -9728,6 +12000,9 @@ public class Citation extends MetadataResource {
else if (name.equals("relatedIdentifier")) {
return addRelatedIdentifier();
}
+ else if (name.equals("summary")) {
+ return addSummary();
+ }
else if (name.equals("dateCited")) {
throw new FHIRException("Cannot call addChild on a primitive type Citation.dateCited");
}
@@ -9743,6 +12018,10 @@ public class Citation extends MetadataResource {
this.journal = new CitationJournalComponent();
return this.journal;
}
+ else if (name.equals("publicationInfo")) {
+ this.publicationInfo = new CitationPublicationInfoComponent();
+ return this.publicationInfo;
+ }
else if (name.equals("articleTitle")) {
throw new FHIRException("Cannot call addChild on a primitive type Citation.articleTitle");
}
@@ -9765,16 +12044,9 @@ public class Citation extends MetadataResource {
else if (name.equals("alternativeAbstract")) {
return addAlternativeAbstract();
}
- else if (name.equals("authorList")) {
- this.authorList = new CitationAuthorListComponent();
- return this.authorList;
- }
- else if (name.equals("authorString")) {
- return addAuthorString();
- }
- else if (name.equals("contributorList")) {
- this.contributorList = new CitationContributorListComponent();
- return this.contributorList;
+ else if (name.equals("contributorship")) {
+ this.contributorship = new CitationContributorshipComponent();
+ return this.contributorship;
}
else if (name.equals("articleLanguage")) {
this.articleLanguage = new CodeableConcept();
@@ -9786,6 +12058,9 @@ public class Citation extends MetadataResource {
else if (name.equals("classifier")) {
return addClassifier();
}
+ else if (name.equals("keywordList")) {
+ return addKeywordList();
+ }
else if (name.equals("relatedArtifact")) {
return addRelatedArtifact();
}
@@ -9814,7 +12089,6 @@ public class Citation extends MetadataResource {
public void copyValues(Citation dst) {
super.copyValues(dst);
dst.url = url == null ? null : url.copy();
- dst.version = version == null ? null : version.copy();
dst.status = status == null ? null : status.copy();
if (useContext != null) {
dst.useContext = new ArrayList();
@@ -9831,10 +12105,16 @@ public class Citation extends MetadataResource {
for (Identifier i : relatedIdentifier)
dst.relatedIdentifier.add(i.copy());
};
+ if (summary != null) {
+ dst.summary = new ArrayList();
+ for (CitationSummaryComponent i : summary)
+ dst.summary.add(i.copy());
+ };
dst.dateCited = dateCited == null ? null : dateCited.copy();
dst.variantCitation = variantCitation == null ? null : variantCitation.copy();
dst.publishingModel = publishingModel == null ? null : publishingModel.copy();
dst.journal = journal == null ? null : journal.copy();
+ dst.publicationInfo = publicationInfo == null ? null : publicationInfo.copy();
dst.articleTitle = articleTitle == null ? null : articleTitle.copy();
if (alternativeTitle != null) {
dst.alternativeTitle = new ArrayList();
@@ -9854,13 +12134,7 @@ public class Citation extends MetadataResource {
for (CitationAlternativeAbstractComponent i : alternativeAbstract)
dst.alternativeAbstract.add(i.copy());
};
- dst.authorList = authorList == null ? null : authorList.copy();
- if (authorString != null) {
- dst.authorString = new ArrayList();
- for (CitationAuthorStringComponent i : authorString)
- dst.authorString.add(i.copy());
- };
- dst.contributorList = contributorList == null ? null : contributorList.copy();
+ dst.contributorship = contributorship == null ? null : contributorship.copy();
dst.articleLanguage = articleLanguage == null ? null : articleLanguage.copy();
if (alternativeForm != null) {
dst.alternativeForm = new ArrayList();
@@ -9872,6 +12146,11 @@ public class Citation extends MetadataResource {
for (CodeableConcept i : classifier)
dst.classifier.add(i.copy());
};
+ if (keywordList != null) {
+ dst.keywordList = new ArrayList();
+ for (CitationKeywordListComponent i : keywordList)
+ dst.keywordList.add(i.copy());
+ };
if (relatedArtifact != null) {
dst.relatedArtifact = new ArrayList();
for (RelatedArtifact i : relatedArtifact)
@@ -9896,16 +12175,16 @@ public class Citation extends MetadataResource {
if (!(other_ instanceof Citation))
return false;
Citation o = (Citation) other_;
- return compareDeep(url, o.url, true) && compareDeep(version, o.version, true) && compareDeep(status, o.status, true)
- && compareDeep(useContext, o.useContext, true) && compareDeep(identifier, o.identifier, true) && compareDeep(relatedIdentifier, o.relatedIdentifier, true)
- && compareDeep(dateCited, o.dateCited, true) && compareDeep(variantCitation, o.variantCitation, true)
+ return compareDeep(url, o.url, true) && compareDeep(status, o.status, true) && compareDeep(useContext, o.useContext, true)
+ && compareDeep(identifier, o.identifier, true) && compareDeep(relatedIdentifier, o.relatedIdentifier, true)
+ && compareDeep(summary, o.summary, true) && compareDeep(dateCited, o.dateCited, true) && compareDeep(variantCitation, o.variantCitation, true)
&& compareDeep(publishingModel, o.publishingModel, true) && compareDeep(journal, o.journal, true)
- && compareDeep(articleTitle, o.articleTitle, true) && compareDeep(alternativeTitle, o.alternativeTitle, true)
- && compareDeep(pagination, o.pagination, true) && compareDeep(articleUrl, o.articleUrl, true) && compareDeep(abstract_, o.abstract_, true)
- && compareDeep(abstractCopyright, o.abstractCopyright, true) && compareDeep(alternativeAbstract, o.alternativeAbstract, true)
- && compareDeep(authorList, o.authorList, true) && compareDeep(authorString, o.authorString, true)
- && compareDeep(contributorList, o.contributorList, true) && compareDeep(articleLanguage, o.articleLanguage, true)
- && compareDeep(alternativeForm, o.alternativeForm, true) && compareDeep(classifier, o.classifier, true)
+ && compareDeep(publicationInfo, o.publicationInfo, true) && compareDeep(articleTitle, o.articleTitle, true)
+ && compareDeep(alternativeTitle, o.alternativeTitle, true) && compareDeep(pagination, o.pagination, true)
+ && compareDeep(articleUrl, o.articleUrl, true) && compareDeep(abstract_, o.abstract_, true) && compareDeep(abstractCopyright, o.abstractCopyright, true)
+ && compareDeep(alternativeAbstract, o.alternativeAbstract, true) && compareDeep(contributorship, o.contributorship, true)
+ && compareDeep(articleLanguage, o.articleLanguage, true) && compareDeep(alternativeForm, o.alternativeForm, true)
+ && compareDeep(classifier, o.classifier, true) && compareDeep(keywordList, o.keywordList, true)
&& compareDeep(relatedArtifact, o.relatedArtifact, true) && compareDeep(note, o.note, true) && compareDeep(medlinePubMed, o.medlinePubMed, true)
;
}
@@ -9917,18 +12196,18 @@ public class Citation extends MetadataResource {
if (!(other_ instanceof Citation))
return false;
Citation o = (Citation) other_;
- return compareValues(url, o.url, true) && compareValues(version, o.version, true) && compareValues(status, o.status, true)
- && compareValues(dateCited, o.dateCited, true) && compareValues(articleTitle, o.articleTitle, true)
- && compareValues(abstract_, o.abstract_, true) && compareValues(abstractCopyright, o.abstractCopyright, true)
- ;
+ return compareValues(url, o.url, true) && compareValues(status, o.status, true) && compareValues(dateCited, o.dateCited, true)
+ && compareValues(articleTitle, o.articleTitle, true) && compareValues(abstract_, o.abstract_, true)
+ && compareValues(abstractCopyright, o.abstractCopyright, true);
}
public boolean isEmpty() {
- return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(url, version, status, useContext
- , identifier, relatedIdentifier, dateCited, variantCitation, publishingModel, journal
- , articleTitle, alternativeTitle, pagination, articleUrl, abstract_, abstractCopyright
- , alternativeAbstract, authorList, authorString, contributorList, articleLanguage
- , alternativeForm, classifier, relatedArtifact, note, medlinePubMed);
+ return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(url, status, useContext
+ , identifier, relatedIdentifier, summary, dateCited, variantCitation, publishingModel
+ , journal, publicationInfo, articleTitle, alternativeTitle, pagination, articleUrl
+ , abstract_, abstractCopyright, alternativeAbstract, contributorship, articleLanguage
+ , alternativeForm, classifier, keywordList, relatedArtifact, note, medlinePubMed
+ );
}
@Override
@@ -10096,25 +12375,6 @@ public class Citation extends MetadataResource {
*/
public static final ca.uhn.fhir.rest.gclient.UriClientParam URL = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_URL);
- /**
- * Search parameter: version
- *
- * Description: The business version of the citation
- * Type: token
- * Path: Citation.version
- *
- */
- @SearchParamDefinition(name="version", path="Citation.version", description="The business version of the citation", type="token" )
- public static final String SP_VERSION = "version";
- /**
- * Fluent Client search parameter constant for version
- *
- * Description: The business version of the citation
- * Type: token
- * Path: Citation.version
- *
- */
- public static final ca.uhn.fhir.rest.gclient.TokenClientParam VERSION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_VERSION);
+}
-}
\ No newline at end of file
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Claim.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Claim.java
index 9a1212bbc..f259e92e4 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Claim.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Claim.java
@@ -1,10 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
-import java.math.BigDecimal;
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -33,25 +29,24 @@ import java.math.BigDecimal;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
-import org.hl7.fhir.r5.model.Enumerations.FinancialResourceStatusCodes;
-import org.hl7.fhir.r5.model.Enumerations.FinancialResourceStatusCodesEnumFactory;
-import org.hl7.fhir.r5.model.Enumerations.Use;
-import org.hl7.fhir.r5.model.Enumerations.UseEnumFactory;
+import java.math.*;
import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* A provider issued list of professional services and products which have been provided, or are to be provided, to a patient which is sent to an insurer for reimbursement.
@@ -8660,4 +8655,5 @@ public class Claim extends DomainResource {
public static final ca.uhn.fhir.rest.gclient.TokenClientParam USE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_USE);
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ClaimResponse.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ClaimResponse.java
index 75fe0db2a..b8c8327cd 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ClaimResponse.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ClaimResponse.java
@@ -1,10 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
-import java.math.BigDecimal;
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -33,29 +29,24 @@ import java.math.BigDecimal;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
-import org.hl7.fhir.r5.model.Enumerations.ClaimProcessingCodes;
-import org.hl7.fhir.r5.model.Enumerations.ClaimProcessingCodesEnumFactory;
-import org.hl7.fhir.r5.model.Enumerations.FinancialResourceStatusCodes;
-import org.hl7.fhir.r5.model.Enumerations.FinancialResourceStatusCodesEnumFactory;
-import org.hl7.fhir.r5.model.Enumerations.NoteType;
-import org.hl7.fhir.r5.model.Enumerations.NoteTypeEnumFactory;
-import org.hl7.fhir.r5.model.Enumerations.Use;
-import org.hl7.fhir.r5.model.Enumerations.UseEnumFactory;
+import java.math.*;
import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* This resource provides the adjudication details from the processing of a Claim resource.
@@ -8270,4 +8261,5 @@ public class ClaimResponse extends DomainResource {
public static final ca.uhn.fhir.rest.gclient.TokenClientParam USE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_USE);
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ClinicalImpression.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ClinicalImpression.java
index 3608ca6d6..5b2c75f1d 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ClinicalImpression.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ClinicalImpression.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,23 +29,23 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
-import org.hl7.fhir.r5.model.Enumerations.EventStatus;
-import org.hl7.fhir.r5.model.Enumerations.EventStatusEnumFactory;
import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* A record of a clinical assessment performed to determine what problem(s) may affect the patient and before planning the treatments or management strategies that are best to manage a patient's condition. Assessments are often 1:1 with a clinical consultation / encounter, but this varies greatly depending on the clinical workflow. This resource is called "ClinicalImpression" rather than "ClinicalAssessment" to avoid confusion with the recording of assessment tools such as Apgar score.
@@ -1862,7 +1860,7 @@ public class ClinicalImpression extends DomainResource {
* Path: ClinicalImpression.supportingInfo
*
*/
- @SearchParamDefinition(name="supporting-info", path="ClinicalImpression.supportingInfo", description="Information supporting the clinical impression", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceFocus.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
+ @SearchParamDefinition(name="supporting-info", path="ClinicalImpression.supportingInfo", description="Information supporting the clinical impression", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
public static final String SP_SUPPORTING_INFO = "supporting-info";
/**
* Fluent Client search parameter constant for supporting-info
@@ -2033,4 +2031,5 @@ public class ClinicalImpression extends DomainResource {
public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("ClinicalImpression:patient").toLocked();
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ClinicalUseIssue.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ClinicalUseIssue.java
index e6a6adb8a..3565ee14c 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ClinicalUseIssue.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ClinicalUseIssue.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,19 +29,23 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.utilities.Utilities;
+import org.hl7.fhir.r5.model.Enumerations.*;
import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* A single usage issue - either an indication, contraindication, interaction or an undesirable effect for a medicinal product, medication, device or procedure.
@@ -2243,10 +2245,10 @@ public class ClinicalUseIssue extends DomainResource {
protected Enumeration type;
/**
- * A categorisation of the issue, primarily for dividing warnings into subject heading areas such as "Pregnancy and Lactation", "Overdose", "Effects Ability to Drive and Use Machines".
+ * A categorisation of the issue, primarily for dividing warnings into subject heading areas such as "Pregnancy and Lactation", "Overdose", "Effects on Ability to Drive and Use Machines".
*/
@Child(name = "category", type = {CodeableConcept.class}, order=2, min=0, max=1, modifier=false, summary=true)
- @Description(shortDefinition="A categorisation of the issue, primarily for dividing warnings into subject heading areas such as \"Pregnancy and Lactation\", \"Overdose\", \"Effects Ability to Drive and Use Machines\"", formalDefinition="A categorisation of the issue, primarily for dividing warnings into subject heading areas such as \"Pregnancy and Lactation\", \"Overdose\", \"Effects Ability to Drive and Use Machines\"." )
+ @Description(shortDefinition="A categorisation of the issue, primarily for dividing warnings into subject heading areas such as \"Pregnancy and Lactation\", \"Overdose\", \"Effects on Ability to Drive and Use Machines\"", formalDefinition="A categorisation of the issue, primarily for dividing warnings into subject heading areas such as \"Pregnancy and Lactation\", \"Overdose\", \"Effects on Ability to Drive and Use Machines\"." )
protected CodeableConcept category;
/**
@@ -2257,17 +2259,17 @@ public class ClinicalUseIssue extends DomainResource {
protected List subject;
/**
- * General description.
+ * Whether this is a current issue or one that has been retired etc.
*/
@Child(name = "status", type = {CodeableConcept.class}, order=4, min=0, max=1, modifier=false, summary=true)
- @Description(shortDefinition="General description", formalDefinition="General description." )
+ @Description(shortDefinition="Whether this is a current issue or one that has been retired etc", formalDefinition="Whether this is a current issue or one that has been retired etc." )
protected CodeableConcept status;
/**
- * General description.
+ * General description of an effect (particularly for a general warning, rather than any of the more specific types such as indication) for when a distinct coded or textual description is not appropriate using Indication.diseaseSymptomProcedure.text, Contraindication.diseaseSymptomProcedure.text etc. For example "May affect ability to drive".
*/
@Child(name = "description", type = {MarkdownType.class}, order=5, min=0, max=1, modifier=false, summary=true)
- @Description(shortDefinition="General description", formalDefinition="General description." )
+ @Description(shortDefinition="General description of an effect (particularly for a general warning, rather than any of the more specific types such as indication) for when a distinct coded or textual description is not appropriate using Indication.diseaseSymptomProcedure.text, Contraindication.diseaseSymptomProcedure.text etc. For example \"May affect ability to drive\"", formalDefinition="General description of an effect (particularly for a general warning, rather than any of the more specific types such as indication) for when a distinct coded or textual description is not appropriate using Indication.diseaseSymptomProcedure.text, Contraindication.diseaseSymptomProcedure.text etc. For example \"May affect ability to drive\"." )
protected MarkdownType description;
/**
@@ -2421,7 +2423,7 @@ public class ClinicalUseIssue extends DomainResource {
}
/**
- * @return {@link #category} (A categorisation of the issue, primarily for dividing warnings into subject heading areas such as "Pregnancy and Lactation", "Overdose", "Effects Ability to Drive and Use Machines".)
+ * @return {@link #category} (A categorisation of the issue, primarily for dividing warnings into subject heading areas such as "Pregnancy and Lactation", "Overdose", "Effects on Ability to Drive and Use Machines".)
*/
public CodeableConcept getCategory() {
if (this.category == null)
@@ -2437,7 +2439,7 @@ public class ClinicalUseIssue extends DomainResource {
}
/**
- * @param value {@link #category} (A categorisation of the issue, primarily for dividing warnings into subject heading areas such as "Pregnancy and Lactation", "Overdose", "Effects Ability to Drive and Use Machines".)
+ * @param value {@link #category} (A categorisation of the issue, primarily for dividing warnings into subject heading areas such as "Pregnancy and Lactation", "Overdose", "Effects on Ability to Drive and Use Machines".)
*/
public ClinicalUseIssue setCategory(CodeableConcept value) {
this.category = value;
@@ -2498,7 +2500,7 @@ public class ClinicalUseIssue extends DomainResource {
}
/**
- * @return {@link #status} (General description.)
+ * @return {@link #status} (Whether this is a current issue or one that has been retired etc.)
*/
public CodeableConcept getStatus() {
if (this.status == null)
@@ -2514,7 +2516,7 @@ public class ClinicalUseIssue extends DomainResource {
}
/**
- * @param value {@link #status} (General description.)
+ * @param value {@link #status} (Whether this is a current issue or one that has been retired etc.)
*/
public ClinicalUseIssue setStatus(CodeableConcept value) {
this.status = value;
@@ -2522,7 +2524,7 @@ public class ClinicalUseIssue extends DomainResource {
}
/**
- * @return {@link #description} (General description.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value
+ * @return {@link #description} (General description of an effect (particularly for a general warning, rather than any of the more specific types such as indication) for when a distinct coded or textual description is not appropriate using Indication.diseaseSymptomProcedure.text, Contraindication.diseaseSymptomProcedure.text etc. For example "May affect ability to drive".). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value
*/
public MarkdownType getDescriptionElement() {
if (this.description == null)
@@ -2542,7 +2544,7 @@ public class ClinicalUseIssue extends DomainResource {
}
/**
- * @param value {@link #description} (General description.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value
+ * @param value {@link #description} (General description of an effect (particularly for a general warning, rather than any of the more specific types such as indication) for when a distinct coded or textual description is not appropriate using Indication.diseaseSymptomProcedure.text, Contraindication.diseaseSymptomProcedure.text etc. For example "May affect ability to drive".). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value
*/
public ClinicalUseIssue setDescriptionElement(MarkdownType value) {
this.description = value;
@@ -2550,14 +2552,14 @@ public class ClinicalUseIssue extends DomainResource {
}
/**
- * @return General description.
+ * @return General description of an effect (particularly for a general warning, rather than any of the more specific types such as indication) for when a distinct coded or textual description is not appropriate using Indication.diseaseSymptomProcedure.text, Contraindication.diseaseSymptomProcedure.text etc. For example "May affect ability to drive".
*/
public String getDescription() {
return this.description == null ? null : this.description.getValue();
}
/**
- * @param value General description.
+ * @param value General description of an effect (particularly for a general warning, rather than any of the more specific types such as indication) for when a distinct coded or textual description is not appropriate using Indication.diseaseSymptomProcedure.text, Contraindication.diseaseSymptomProcedure.text etc. For example "May affect ability to drive".
*/
public ClinicalUseIssue setDescription(String value) {
if (value == null)
@@ -2723,10 +2725,10 @@ public class ClinicalUseIssue extends DomainResource {
super.listChildren(children);
children.add(new Property("identifier", "Identifier", "Business identifier for this issue.", 0, java.lang.Integer.MAX_VALUE, identifier));
children.add(new Property("type", "code", "indication | contraindication | interaction | undesirable-effect | warning.", 0, 1, type));
- children.add(new Property("category", "CodeableConcept", "A categorisation of the issue, primarily for dividing warnings into subject heading areas such as \"Pregnancy and Lactation\", \"Overdose\", \"Effects Ability to Drive and Use Machines\".", 0, 1, category));
+ children.add(new Property("category", "CodeableConcept", "A categorisation of the issue, primarily for dividing warnings into subject heading areas such as \"Pregnancy and Lactation\", \"Overdose\", \"Effects on Ability to Drive and Use Machines\".", 0, 1, category));
children.add(new Property("subject", "Reference(MedicinalProductDefinition|Medication|ActivityDefinition|PlanDefinition|Device|DeviceDefinition|Substance)", "The medication or procedure for which this is an indication.", 0, java.lang.Integer.MAX_VALUE, subject));
- children.add(new Property("status", "CodeableConcept", "General description.", 0, 1, status));
- children.add(new Property("description", "markdown", "General description.", 0, 1, description));
+ children.add(new Property("status", "CodeableConcept", "Whether this is a current issue or one that has been retired etc.", 0, 1, status));
+ children.add(new Property("description", "markdown", "General description of an effect (particularly for a general warning, rather than any of the more specific types such as indication) for when a distinct coded or textual description is not appropriate using Indication.diseaseSymptomProcedure.text, Contraindication.diseaseSymptomProcedure.text etc. For example \"May affect ability to drive\".", 0, 1, description));
children.add(new Property("contraindication", "", "Specifics for when this is a contraindication.", 0, 1, contraindication));
children.add(new Property("indication", "", "Specifics for when this is an indication.", 0, 1, indication));
children.add(new Property("interaction", "", "Specifics for when this is an interaction.", 0, 1, interaction));
@@ -2739,10 +2741,10 @@ public class ClinicalUseIssue extends DomainResource {
switch (_hash) {
case -1618432855: /*identifier*/ return new Property("identifier", "Identifier", "Business identifier for this issue.", 0, java.lang.Integer.MAX_VALUE, identifier);
case 3575610: /*type*/ return new Property("type", "code", "indication | contraindication | interaction | undesirable-effect | warning.", 0, 1, type);
- case 50511102: /*category*/ return new Property("category", "CodeableConcept", "A categorisation of the issue, primarily for dividing warnings into subject heading areas such as \"Pregnancy and Lactation\", \"Overdose\", \"Effects Ability to Drive and Use Machines\".", 0, 1, category);
+ case 50511102: /*category*/ return new Property("category", "CodeableConcept", "A categorisation of the issue, primarily for dividing warnings into subject heading areas such as \"Pregnancy and Lactation\", \"Overdose\", \"Effects on Ability to Drive and Use Machines\".", 0, 1, category);
case -1867885268: /*subject*/ return new Property("subject", "Reference(MedicinalProductDefinition|Medication|ActivityDefinition|PlanDefinition|Device|DeviceDefinition|Substance)", "The medication or procedure for which this is an indication.", 0, java.lang.Integer.MAX_VALUE, subject);
- case -892481550: /*status*/ return new Property("status", "CodeableConcept", "General description.", 0, 1, status);
- case -1724546052: /*description*/ return new Property("description", "markdown", "General description.", 0, 1, description);
+ case -892481550: /*status*/ return new Property("status", "CodeableConcept", "Whether this is a current issue or one that has been retired etc.", 0, 1, status);
+ case -1724546052: /*description*/ return new Property("description", "markdown", "General description of an effect (particularly for a general warning, rather than any of the more specific types such as indication) for when a distinct coded or textual description is not appropriate using Indication.diseaseSymptomProcedure.text, Contraindication.diseaseSymptomProcedure.text etc. For example \"May affect ability to drive\".", 0, 1, description);
case 107135229: /*contraindication*/ return new Property("contraindication", "", "Specifics for when this is a contraindication.", 0, 1, contraindication);
case -597168804: /*indication*/ return new Property("indication", "", "Specifics for when this is an indication.", 0, 1, indication);
case 1844104722: /*interaction*/ return new Property("interaction", "", "Specifics for when this is an interaction.", 0, 1, interaction);
@@ -3177,4 +3179,5 @@ public class ClinicalUseIssue extends DomainResource {
public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE);
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CodeSystem.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CodeSystem.java
index 5c051a578..f22f3120f 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CodeSystem.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CodeSystem.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,25 +29,23 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
-import org.hl7.fhir.r5.model.Enumerations.FilterOperator;
-import org.hl7.fhir.r5.model.Enumerations.FilterOperatorEnumFactory;
-import org.hl7.fhir.r5.model.Enumerations.PublicationStatus;
-import org.hl7.fhir.r5.model.Enumerations.PublicationStatusEnumFactory;
import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* The CodeSystem resource is used to declare the existence of and describe a code system or code system supplement and its key properties, and optionally define a part or all of its content.
@@ -1862,13 +1858,10 @@ public class CodeSystem extends CanonicalResource {
}
// added from java-adornments.txt:
-
- @Override
+@Override
public String toString() {
return getCode()+": "+getDisplay();
- }
-
-
+ }
// end addition
}
@@ -5402,7 +5395,7 @@ public class CodeSystem extends CanonicalResource {
public static final ca.uhn.fhir.rest.gclient.TokenClientParam VERSION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_VERSION);
// Manual code (from Configuration.txt)t:
- public PropertyComponent getProperty(String code) {
+public PropertyComponent getProperty(String code) {
for (PropertyComponent pd : getProperty()) {
if (pd.getCode().equalsIgnoreCase(code))
return pd;
@@ -5426,8 +5419,7 @@ public class CodeSystem extends CanonicalResource {
}
return null;
}
-
-
// end addition
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CodeableConcept.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CodeableConcept.java
index a2bf74035..429c97223 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CodeableConcept.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CodeableConcept.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,18 +29,21 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
-
+import org.hl7.fhir.utilities.Utilities;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseDatatypeElement;
import org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.instance.model.api.ICompositeType;
-import org.hl7.fhir.utilities.Utilities;
-
import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* Base StructureDefinition for CodeableConcept Type: A concept that may be defined by a formal reference to a terminology or ontology or may be provided by text.
@@ -308,8 +309,7 @@ public class CodeableConcept extends DataType implements ICompositeType {
}
// Manual code (from Configuration.txt)t:
-
- public boolean hasCoding(String system, String code) {
+public boolean hasCoding(String system, String code) {
for (Coding c : getCoding()) {
if (system.equals(c.getSystem()) && code.equals(c.getCode()))
return true;
@@ -335,8 +335,8 @@ public class CodeableConcept extends DataType implements ICompositeType {
public boolean hasCoding(Coding coding) {
return hasCoding(coding.getSystem(), coding.getCode());
}
-
- public boolean hasCoding(String system) {
+
+ public boolean hasCoding(String system) {
for (Coding c : getCoding()) {
if (system.equals(c.getSystem())) {
return true;
@@ -398,8 +398,8 @@ public class CodeableConcept extends DataType implements ICompositeType {
res.setText(l.getText());
}
return res;
- }
-
+ }
// end addition
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CodeableReference.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CodeableReference.java
index 8e0c59eb4..08badaaf7 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CodeableReference.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CodeableReference.java
@@ -1,16 +1,48 @@
package org.hl7.fhir.r5.model;
+/*
+ Copyright (c) 2011+, HL7, Inc.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modification, \
+ are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this \
+ list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, \
+ this list of conditions and the following disclaimer in the documentation \
+ and/or other materials provided with the distribution.
+ * Neither the name of HL7 nor the names of its contributors may be used to
+ endorse or promote products derived from this software without specific
+ prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND \
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED \
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. \
+ IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, \
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT \
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR \
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, \
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) \
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE \
+ POSSIBILITY OF SUCH DAMAGE.
+ */
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
-
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseDatatypeElement;
import org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.instance.model.api.ICompositeType;
-
import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* Base StructureDefinition for CodeableReference Type: A reference to a resource (by instance), or instead, a reference to a cencept defined in a terminology or ontology (by class).
@@ -220,4 +252,5 @@ public class CodeableReference extends DataType implements ICompositeType {
}
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Coding.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Coding.java
index eb3ca2efa..9ed4710f6 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Coding.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Coding.java
@@ -1,18 +1,51 @@
package org.hl7.fhir.r5.model;
+/*
+ Copyright (c) 2011+, HL7, Inc.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modification, \
+ are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this \
+ list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, \
+ this list of conditions and the following disclaimer in the documentation \
+ and/or other materials provided with the distribution.
+ * Neither the name of HL7 nor the names of its contributors may be used to
+ endorse or promote products derived from this software without specific
+ prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND \
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED \
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. \
+ IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, \
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT \
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR \
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, \
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) \
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE \
+ POSSIBILITY OF SUCH DAMAGE.
+ */
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseCoding;
-import org.hl7.fhir.instance.model.api.ICompositeType;
import org.hl7.fhir.utilities.Utilities;
-
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseDatatypeElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
+
+import org.hl7.fhir.instance.model.api.IBaseCoding;
/**
* Base StructureDefinition for Coding Type: A reference to a code defined by a terminology system.
*/
@@ -490,7 +523,7 @@ public class Coding extends DataType implements IBaseCoding, ICompositeType, ICo
}
// Manual code (from Configuration.txt)t:
- @Override
+@Override
public boolean supportsVersion() {
return true;
}
@@ -520,6 +553,7 @@ public class Coding extends DataType implements IBaseCoding, ICompositeType, ICo
public boolean matches(Coding other) {
return other.hasCode() && this.hasCode() && other.hasSystem() && this.hasSystem() && this.getCode().equals(other.getCode()) && this.getSystem().equals(other.getSystem()) ;
}
+
public static Coding merge(Coding l, Coding r) {
Coding res = new Coding();
@@ -570,7 +604,8 @@ public class Coding extends DataType implements IBaseCoding, ICompositeType, ICo
}
return res;
}
-
+
// end addition
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Communication.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Communication.java
index ffe3cb3b8..25b4c1e71 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Communication.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Communication.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,24 +29,23 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.utilities.Utilities;
+import org.hl7.fhir.r5.model.Enumerations.*;
import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
-import org.hl7.fhir.r5.model.Enumerations.EventStatus;
-import org.hl7.fhir.r5.model.Enumerations.EventStatusEnumFactory;
-import org.hl7.fhir.r5.model.Enumerations.RequestPriority;
-import org.hl7.fhir.r5.model.Enumerations.RequestPriorityEnumFactory;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* A clinical or business level record of information being transmitted or shared; e.g. an alert that was sent to a responsible provider, a public health agency communication to a provider/reporter in response to a case report for a reportable condition.
@@ -1964,7 +1961,7 @@ public class Communication extends DomainResource {
* Path: Communication.basedOn
*
*/
- @SearchParamDefinition(name="based-on", path="Communication.basedOn", description="Request fulfilled by this communication", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceFocus.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
+ @SearchParamDefinition(name="based-on", path="Communication.basedOn", description="Request fulfilled by this communication", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
public static final String SP_BASED_ON = "based-on";
/**
* Fluent Client search parameter constant for based-on
@@ -2122,7 +2119,7 @@ public class Communication extends DomainResource {
* Path: Communication.partOf
*
*/
- @SearchParamDefinition(name="part-of", path="Communication.partOf", description="Part of referenced event (e.g. Communication, Procedure)", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceFocus.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
+ @SearchParamDefinition(name="part-of", path="Communication.partOf", description="Part of referenced event (e.g. Communication, Procedure)", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
public static final String SP_PART_OF = "part-of";
/**
* Fluent Client search parameter constant for part-of
@@ -2325,4 +2322,5 @@ public class Communication extends DomainResource {
public static final ca.uhn.fhir.rest.gclient.TokenClientParam TOPIC = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TOPIC);
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CommunicationRequest.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CommunicationRequest.java
index 1c94ad772..d607bd697 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CommunicationRequest.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CommunicationRequest.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,24 +29,23 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.utilities.Utilities;
+import org.hl7.fhir.r5.model.Enumerations.*;
import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
-import org.hl7.fhir.r5.model.Enumerations.RequestPriority;
-import org.hl7.fhir.r5.model.Enumerations.RequestPriorityEnumFactory;
-import org.hl7.fhir.r5.model.Enumerations.RequestStatus;
-import org.hl7.fhir.r5.model.Enumerations.RequestStatusEnumFactory;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* A request to convey information; e.g. the CDS system proposes that an alert be sent to a responsible provider, the CDS system proposes that the public health agency be notified about a reportable condition.
@@ -1886,7 +1883,7 @@ public class CommunicationRequest extends DomainResource {
* Path: CommunicationRequest.basedOn
*
*/
- @SearchParamDefinition(name="based-on", path="CommunicationRequest.basedOn", description="Fulfills plan or proposal", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceFocus.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
+ @SearchParamDefinition(name="based-on", path="CommunicationRequest.basedOn", description="Fulfills plan or proposal", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
public static final String SP_BASED_ON = "based-on";
/**
* Fluent Client search parameter constant for based-on
@@ -2227,4 +2224,5 @@ public class CommunicationRequest extends DomainResource {
public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("CommunicationRequest:subject").toLocked();
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CompartmentDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CompartmentDefinition.java
index db475538b..9e301f1a9 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CompartmentDefinition.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CompartmentDefinition.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,25 +29,23 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
-import org.hl7.fhir.r5.model.Enumerations.CompartmentType;
-import org.hl7.fhir.r5.model.Enumerations.CompartmentTypeEnumFactory;
-import org.hl7.fhir.r5.model.Enumerations.PublicationStatus;
-import org.hl7.fhir.r5.model.Enumerations.PublicationStatusEnumFactory;
import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* A compartment definition that defines how resources are accessed on a server.
@@ -2328,4 +2324,5 @@ public class CompartmentDefinition extends CanonicalResource {
public static final ca.uhn.fhir.rest.gclient.TokenClientParam VERSION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_VERSION);
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Composition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Composition.java
index 6a7160c1b..5f54177d8 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Composition.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Composition.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,27 +29,23 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
-import org.hl7.fhir.r5.model.Enumerations.CompositionStatus;
-import org.hl7.fhir.r5.model.Enumerations.CompositionStatusEnumFactory;
-import org.hl7.fhir.r5.model.Enumerations.DocumentRelationshipType;
-import org.hl7.fhir.r5.model.Enumerations.DocumentRelationshipTypeEnumFactory;
-import org.hl7.fhir.r5.model.Enumerations.ListMode;
-import org.hl7.fhir.r5.model.Enumerations.ListModeEnumFactory;
import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* A set of healthcare-related information that is assembled together into a single logical package that provides a single coherent statement of meaning, establishes its own context and that has clinical attestation with regard to who is making the statement. A Composition defines the structure and narrative content necessary for a document. However, a Composition alone does not constitute a document. Rather, the Composition must be the first entry in a Bundle where Bundle.type=document, and any other resources referenced from Composition must be included as subsequent entries in the Bundle (for example Patient, Practitioner, Encounter, etc.).
@@ -183,162 +177,6 @@ public class Composition extends DomainResource {
}
}
- public enum V3ConfidentialityClassification {
- /**
- * Privacy metadata indicating that no level of protection is required to safeguard personal and healthcare information that has been disclosed by an authorized individual without restrictions on its use.\r\n\n \n Examples: Includes publicly available information e.g., business name, phone, email and physical address.\r\n\n \n Usage Note: The authorization to collect, access, use, and disclose this information may be stipulated in a contract of adhesion by a data user (e.g., via terms of service or data user privacy policies) in exchange for the data subject's use of a service.\r\n\n This metadata indicates that the receiver has no obligation to consider privacy policies other than its own when making access control decisions.\r\n\n This metadata indicates that the receiver has no obligation to consider privacy policies other than its own when making access control decisions.\r\n\n Confidentiality code total order hierarchy: Unrestricted (U) is less protective than V, R, N, M, and L, and is the lowest protection levels.
- */
- U,
- /**
- * Privacy metadata indicating that a low level of protection is required to safeguard personal and healthcare information, which has been altered in such a way as to minimize the need for confidentiality protections with some residual risks associated with re-linking. The risk of harm to an individual's reputation and sense of privacy if disclosed without authorization is considered negligible, and mitigations are in place to address reidentification risk.\r\n\n \n Usage Note: \n \r\nThe level of protection afforded anonymized and pseudonymized, and non-personally identifiable information (e.g., a limited data set) is dictated by privacy policies and data use agreements intended to engender trust that health information can be used and disclosed with little or no risk of re-identification.\n Example: Personal and healthcare information, which excludes 16 designated categories of direct identifiers in a HIPAA Limited Data Set. This information may be disclosed by HIPAA Covered Entities without patient authorization for a research, public health, and operations purposes if conditions are met, which includes obtaining a signed data use agreement from the recipient. See 45 CFR Section 164.514.\r\n\n This metadata indicates that the receiver may have an obligation to comply with a data use agreement with the discloser. The discloser may have obligations to comply with policies dictating the methods for de-identification.\r\n\n Confidentiality code total order hierarchy: Low (L) is less protective than V, R, N, and M, and subsumes U.
- */
- L,
- /**
- * Privacy metadata indicating the level of protection required to safeguard personal and healthcare information, which if disclosed without authorization, would present a moderate risk of harm to an individual's reputation and sense of privacy.\r\n\n \n Usage Note: The level of protection afforded moderately confidential information is dictated by privacy policies intended to engender trust in a service provider. May include publicly available information in jurisdictions that restrict uses of that information without the consent of the data subject.\r\n\n Privacy policies mandating moderate levels of protection, which preempt less protective privacy policies. \"Moderate\" confidentiality policies differ from and would be preempted by the prevailing privacy policies mandating the normative level of protection for information used in the delivery and management of healthcare.\r\n\n Confidentiality code total order hierarchy: Moderate (M) is less protective than V, R, and N, and subsumes all other protection levels (i.e., L and U).\r\n\n \n Examples: Includes personal and health information that an individual authorizes to be collected, accessed, used or disclosed to a bank for a health credit card or savings account; to health oversight authorities; to a hospital patient directory; to worker compensation, disability, property and casualty or life insurers; and to personal health record systems, consumer-controlled devices, social media accounts and online Apps; or for marketing purposes
- */
- M,
- /**
- * Privacy metadata indicating the level of protection required to safeguard personal and healthcare information, which if disclosed without authorization, would present a considerable risk of harm to an individual's reputation and sense of privacy.\r\n\n \n Usage Note: The level of protection afforded normatively confidential information is dictated by the prevailing normative privacy policies, which are intended to engender patient trust in their healthcare providers.\r\n\n Privacy policies mandating normative levels of protection, which preempt less protective privacy policies when the information is used in the delivery and management of healthcare. May be pre-empted by jurisdictional law (e.g., for public health reporting or emergency treatment).\r\n\n Confidentiality code total order hierarchy: Normal (N) is less protective than V and R, and subsumes all other protection levels (i.e., M, L, and U).\r\n\n \n Map:Partial Map to ISO 13606-4 Sensitivity Level (3) Clinical Care when purpose of use is treatment: Default for normal clinical care access (i.e., most clinical staff directly caring for the patient should be able to access nearly all of the EHR). Maps to normal confidentiality for treatment information but not to ancillary care, payment and operations. \r\n\n \n Examples: \n \r\nn the US, this includes what HIPAA identifies as protected health information (PHI) under 45 CFR Section 160.103.
- */
- N,
- /**
- * Privacy metadata indicating the level of protection required to safeguard potentially stigmatizing information, which if disclosed without authorization, would present a high risk of harm to an individual's reputation and sense of privacy.\r\n\n \n Usage Note: The level of protection afforded restricted confidential information is dictated by specially protective organizational or jurisdictional privacy policies, including at an authorized individual’s request, intended to engender patient trust in providers of sensitive services.\r\n\n Privacy policies mandating additional levels of protection by restricting information access preempt less protective privacy policies when the information is used in the delivery and management of healthcare. May be pre-empted by jurisdictional law (e.g., for public health reporting or emergency treatment).\r\n\n Confidentiality code total order hierarchy: Restricted (R) is less protective than V, and subsumes all other protection levels (i.e., N, M, L, and U).\r\n\n \n Examples: \n \r\nIncludes information that is additionally protected such as sensitive conditions mental health, HIV, substance abuse, domestic violence, child abuse, genetic disease, and reproductive health; or sensitive demographic information such as a patient’s standing as an employee or a celebrity. May be used to indicate proprietary or classified information that is not related to an individual (e.g., secret ingredients in a therapeutic substance; or the name of a manufacturer).
- */
- R,
- /**
- * Privacy metadata indicating the level of protection required under atypical cicumstances to safeguard potentially damaging or harmful information, which if disclosed without authorization, would (1) present an extremely high risk of harm to an individual's reputation, sense of privacy, and possibly safety; or (2) impact an individual's or organization's legal matters.\r\n\n \n Usage Note: The level of protection afforded very restricted confidential information is dictated by specially protective privacy or legal policies intended to ensure that under atypical circumstances additional protections limit access to only those with a high 'need to know' and the information is kept in highest confidence..\r\n\n Privacy and legal policies mandating the highest level of protection by stringently restricting information access, preempt less protective privacy policies when the information is used in the delivery and management of healthcare including legal proceedings related to healthcare. May be pre-empted by jurisdictional law (e.g., for public health reporting or emergency treatment but only under limited circumstances).\r\n\n Confidentiality code total order hierarchy: Very Restricted (V) is the highest protection level and subsumes all other protection levels s (i.e., R, N, M, L, and UI).\r\n\n \n Examples: \n \r\nIncludes information about a victim of abuse, patient requested information sensitivity, and taboo subjects relating to health status that must be discussed with the patient by an attending provider before sharing with the patient. May also include information held under a legal hold or attorney-client privilege.
- */
- V,
- /**
- * added to help the parsers with the generic types
- */
- NULL;
- public static V3ConfidentialityClassification fromCode(String codeString) throws FHIRException {
- if (codeString == null || "".equals(codeString))
- return null;
- if ("U".equals(codeString))
- return U;
- if ("L".equals(codeString))
- return L;
- if ("M".equals(codeString))
- return M;
- if ("N".equals(codeString))
- return N;
- if ("R".equals(codeString))
- return R;
- if ("V".equals(codeString))
- return V;
- if (Configuration.isAcceptInvalidEnums())
- return null;
- else
- throw new FHIRException("Unknown V3ConfidentialityClassification code '"+codeString+"'");
- }
- public String toCode() {
- switch (this) {
- case U: return "U";
- case L: return "L";
- case M: return "M";
- case N: return "N";
- case R: return "R";
- case V: return "V";
- default: return "?";
- }
- }
- public String getSystem() {
- switch (this) {
- case U: return "http://terminology.hl7.org/CodeSystem/v3-Confidentiality";
- case L: return "http://terminology.hl7.org/CodeSystem/v3-Confidentiality";
- case M: return "http://terminology.hl7.org/CodeSystem/v3-Confidentiality";
- case N: return "http://terminology.hl7.org/CodeSystem/v3-Confidentiality";
- case R: return "http://terminology.hl7.org/CodeSystem/v3-Confidentiality";
- case V: return "http://terminology.hl7.org/CodeSystem/v3-Confidentiality";
- default: return "?";
- }
- }
- public String getDefinition() {
- switch (this) {
- case U: return "Privacy metadata indicating that no level of protection is required to safeguard personal and healthcare information that has been disclosed by an authorized individual without restrictions on its use.\r\n\n \n Examples: Includes publicly available information e.g., business name, phone, email and physical address.\r\n\n \n Usage Note: The authorization to collect, access, use, and disclose this information may be stipulated in a contract of adhesion by a data user (e.g., via terms of service or data user privacy policies) in exchange for the data subject's use of a service.\r\n\n This metadata indicates that the receiver has no obligation to consider privacy policies other than its own when making access control decisions.\r\n\n This metadata indicates that the receiver has no obligation to consider privacy policies other than its own when making access control decisions.\r\n\n Confidentiality code total order hierarchy: Unrestricted (U) is less protective than V, R, N, M, and L, and is the lowest protection levels.";
- case L: return "Privacy metadata indicating that a low level of protection is required to safeguard personal and healthcare information, which has been altered in such a way as to minimize the need for confidentiality protections with some residual risks associated with re-linking. The risk of harm to an individual's reputation and sense of privacy if disclosed without authorization is considered negligible, and mitigations are in place to address reidentification risk.\r\n\n \n Usage Note: \n \r\nThe level of protection afforded anonymized and pseudonymized, and non-personally identifiable information (e.g., a limited data set) is dictated by privacy policies and data use agreements intended to engender trust that health information can be used and disclosed with little or no risk of re-identification.\n Example: Personal and healthcare information, which excludes 16 designated categories of direct identifiers in a HIPAA Limited Data Set. This information may be disclosed by HIPAA Covered Entities without patient authorization for a research, public health, and operations purposes if conditions are met, which includes obtaining a signed data use agreement from the recipient. See 45 CFR Section 164.514.\r\n\n This metadata indicates that the receiver may have an obligation to comply with a data use agreement with the discloser. The discloser may have obligations to comply with policies dictating the methods for de-identification.\r\n\n Confidentiality code total order hierarchy: Low (L) is less protective than V, R, N, and M, and subsumes U.";
- case M: return "Privacy metadata indicating the level of protection required to safeguard personal and healthcare information, which if disclosed without authorization, would present a moderate risk of harm to an individual's reputation and sense of privacy.\r\n\n \n Usage Note: The level of protection afforded moderately confidential information is dictated by privacy policies intended to engender trust in a service provider. May include publicly available information in jurisdictions that restrict uses of that information without the consent of the data subject.\r\n\n Privacy policies mandating moderate levels of protection, which preempt less protective privacy policies. \"Moderate\" confidentiality policies differ from and would be preempted by the prevailing privacy policies mandating the normative level of protection for information used in the delivery and management of healthcare.\r\n\n Confidentiality code total order hierarchy: Moderate (M) is less protective than V, R, and N, and subsumes all other protection levels (i.e., L and U).\r\n\n \n Examples: Includes personal and health information that an individual authorizes to be collected, accessed, used or disclosed to a bank for a health credit card or savings account; to health oversight authorities; to a hospital patient directory; to worker compensation, disability, property and casualty or life insurers; and to personal health record systems, consumer-controlled devices, social media accounts and online Apps; or for marketing purposes";
- case N: return "Privacy metadata indicating the level of protection required to safeguard personal and healthcare information, which if disclosed without authorization, would present a considerable risk of harm to an individual's reputation and sense of privacy.\r\n\n \n Usage Note: The level of protection afforded normatively confidential information is dictated by the prevailing normative privacy policies, which are intended to engender patient trust in their healthcare providers.\r\n\n Privacy policies mandating normative levels of protection, which preempt less protective privacy policies when the information is used in the delivery and management of healthcare. May be pre-empted by jurisdictional law (e.g., for public health reporting or emergency treatment).\r\n\n Confidentiality code total order hierarchy: Normal (N) is less protective than V and R, and subsumes all other protection levels (i.e., M, L, and U).\r\n\n \n Map:Partial Map to ISO 13606-4 Sensitivity Level (3) Clinical Care when purpose of use is treatment: Default for normal clinical care access (i.e., most clinical staff directly caring for the patient should be able to access nearly all of the EHR). Maps to normal confidentiality for treatment information but not to ancillary care, payment and operations. \r\n\n \n Examples: \n \r\nn the US, this includes what HIPAA identifies as protected health information (PHI) under 45 CFR Section 160.103.";
- case R: return "Privacy metadata indicating the level of protection required to safeguard potentially stigmatizing information, which if disclosed without authorization, would present a high risk of harm to an individual's reputation and sense of privacy.\r\n\n \n Usage Note: The level of protection afforded restricted confidential information is dictated by specially protective organizational or jurisdictional privacy policies, including at an authorized individual’s request, intended to engender patient trust in providers of sensitive services.\r\n\n Privacy policies mandating additional levels of protection by restricting information access preempt less protective privacy policies when the information is used in the delivery and management of healthcare. May be pre-empted by jurisdictional law (e.g., for public health reporting or emergency treatment).\r\n\n Confidentiality code total order hierarchy: Restricted (R) is less protective than V, and subsumes all other protection levels (i.e., N, M, L, and U).\r\n\n \n Examples: \n \r\nIncludes information that is additionally protected such as sensitive conditions mental health, HIV, substance abuse, domestic violence, child abuse, genetic disease, and reproductive health; or sensitive demographic information such as a patient’s standing as an employee or a celebrity. May be used to indicate proprietary or classified information that is not related to an individual (e.g., secret ingredients in a therapeutic substance; or the name of a manufacturer).";
- case V: return "Privacy metadata indicating the level of protection required under atypical cicumstances to safeguard potentially damaging or harmful information, which if disclosed without authorization, would (1) present an extremely high risk of harm to an individual's reputation, sense of privacy, and possibly safety; or (2) impact an individual's or organization's legal matters.\r\n\n \n Usage Note: The level of protection afforded very restricted confidential information is dictated by specially protective privacy or legal policies intended to ensure that under atypical circumstances additional protections limit access to only those with a high 'need to know' and the information is kept in highest confidence..\r\n\n Privacy and legal policies mandating the highest level of protection by stringently restricting information access, preempt less protective privacy policies when the information is used in the delivery and management of healthcare including legal proceedings related to healthcare. May be pre-empted by jurisdictional law (e.g., for public health reporting or emergency treatment but only under limited circumstances).\r\n\n Confidentiality code total order hierarchy: Very Restricted (V) is the highest protection level and subsumes all other protection levels s (i.e., R, N, M, L, and UI).\r\n\n \n Examples: \n \r\nIncludes information about a victim of abuse, patient requested information sensitivity, and taboo subjects relating to health status that must be discussed with the patient by an attending provider before sharing with the patient. May also include information held under a legal hold or attorney-client privilege.";
- default: return "?";
- }
- }
- public String getDisplay() {
- switch (this) {
- case U: return "unrestricted";
- case L: return "low";
- case M: return "moderate";
- case N: return "normal";
- case R: return "restricted";
- case V: return "very restricted";
- default: return "?";
- }
- }
- }
-
- public static class V3ConfidentialityClassificationEnumFactory implements EnumFactory {
- public V3ConfidentialityClassification fromCode(String codeString) throws IllegalArgumentException {
- if (codeString == null || "".equals(codeString))
- if (codeString == null || "".equals(codeString))
- return null;
- if ("U".equals(codeString))
- return V3ConfidentialityClassification.U;
- if ("L".equals(codeString))
- return V3ConfidentialityClassification.L;
- if ("M".equals(codeString))
- return V3ConfidentialityClassification.M;
- if ("N".equals(codeString))
- return V3ConfidentialityClassification.N;
- if ("R".equals(codeString))
- return V3ConfidentialityClassification.R;
- if ("V".equals(codeString))
- return V3ConfidentialityClassification.V;
- throw new IllegalArgumentException("Unknown V3ConfidentialityClassification code '"+codeString+"'");
- }
- public Enumeration fromType(Base code) throws FHIRException {
- if (code == null)
- return null;
- if (code.isEmpty())
- return new Enumeration(this);
- String codeString = ((PrimitiveType) code).asStringValue();
- if (codeString == null || "".equals(codeString))
- return null;
- if ("U".equals(codeString))
- return new Enumeration(this, V3ConfidentialityClassification.U);
- if ("L".equals(codeString))
- return new Enumeration(this, V3ConfidentialityClassification.L);
- if ("M".equals(codeString))
- return new Enumeration(this, V3ConfidentialityClassification.M);
- if ("N".equals(codeString))
- return new Enumeration(this, V3ConfidentialityClassification.N);
- if ("R".equals(codeString))
- return new Enumeration(this, V3ConfidentialityClassification.R);
- if ("V".equals(codeString))
- return new Enumeration(this, V3ConfidentialityClassification.V);
- throw new FHIRException("Unknown V3ConfidentialityClassification code '"+codeString+"'");
- }
- public String toCode(V3ConfidentialityClassification code) {
- if (code == V3ConfidentialityClassification.U)
- return "U";
- if (code == V3ConfidentialityClassification.L)
- return "L";
- if (code == V3ConfidentialityClassification.M)
- return "M";
- if (code == V3ConfidentialityClassification.N)
- return "N";
- if (code == V3ConfidentialityClassification.R)
- return "R";
- if (code == V3ConfidentialityClassification.V)
- return "V";
- return "?";
- }
- public String toSystem(V3ConfidentialityClassification code) {
- return code.getSystem();
- }
- }
-
@Block()
public static class CompositionAttesterComponent extends BackboneElement implements IBaseBackboneElement {
/**
@@ -2017,8 +1855,8 @@ public class Composition extends DomainResource {
*/
@Child(name = "confidentiality", type = {CodeType.class}, order=9, min=0, max=1, modifier=false, summary=true)
@Description(shortDefinition="As defined by affinity domain", formalDefinition="The code specifying the level of confidentiality of the Composition." )
- @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://terminology.hl7.org/ValueSet/v3-ConfidentialityClassification")
- protected Enumeration confidentiality;
+ @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://terminology.hl7.org/ValueSet/v3-Confidentiality")
+ protected CodeType confidentiality;
/**
* A participant who has attested to the accuracy of the composition/document.
@@ -2055,7 +1893,7 @@ public class Composition extends DomainResource {
@Description(shortDefinition="Composition is broken into sections", formalDefinition="The root of the sections that make up the composition." )
protected List section;
- private static final long serialVersionUID = 432957183L;
+ private static final long serialVersionUID = 1733513890L;
/**
* Constructor
@@ -2416,12 +2254,12 @@ public class Composition extends DomainResource {
/**
* @return {@link #confidentiality} (The code specifying the level of confidentiality of the Composition.). This is the underlying object with id, value and extensions. The accessor "getConfidentiality" gives direct access to the value
*/
- public Enumeration getConfidentialityElement() {
+ public CodeType getConfidentialityElement() {
if (this.confidentiality == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create Composition.confidentiality");
else if (Configuration.doAutoCreate())
- this.confidentiality = new Enumeration(new V3ConfidentialityClassificationEnumFactory()); // bb
+ this.confidentiality = new CodeType(); // bb
return this.confidentiality;
}
@@ -2436,7 +2274,7 @@ public class Composition extends DomainResource {
/**
* @param value {@link #confidentiality} (The code specifying the level of confidentiality of the Composition.). This is the underlying object with id, value and extensions. The accessor "getConfidentiality" gives direct access to the value
*/
- public Composition setConfidentialityElement(Enumeration value) {
+ public Composition setConfidentialityElement(CodeType value) {
this.confidentiality = value;
return this;
}
@@ -2444,19 +2282,19 @@ public class Composition extends DomainResource {
/**
* @return The code specifying the level of confidentiality of the Composition.
*/
- public V3ConfidentialityClassification getConfidentiality() {
+ public String getConfidentiality() {
return this.confidentiality == null ? null : this.confidentiality.getValue();
}
/**
* @param value The code specifying the level of confidentiality of the Composition.
*/
- public Composition setConfidentiality(V3ConfidentialityClassification value) {
- if (value == null)
+ public Composition setConfidentiality(String value) {
+ if (Utilities.noString(value))
this.confidentiality = null;
else {
if (this.confidentiality == null)
- this.confidentiality = new Enumeration(new V3ConfidentialityClassificationEnumFactory());
+ this.confidentiality = new CodeType();
this.confidentiality.setValue(value);
}
return this;
@@ -2752,7 +2590,7 @@ public class Composition extends DomainResource {
case 3076014: /*date*/ return this.date == null ? new Base[0] : new Base[] {this.date}; // DateTimeType
case -1406328437: /*author*/ return this.author == null ? new Base[0] : this.author.toArray(new Base[this.author.size()]); // Reference
case 110371416: /*title*/ return this.title == null ? new Base[0] : new Base[] {this.title}; // StringType
- case -1923018202: /*confidentiality*/ return this.confidentiality == null ? new Base[0] : new Base[] {this.confidentiality}; // Enumeration
+ case -1923018202: /*confidentiality*/ return this.confidentiality == null ? new Base[0] : new Base[] {this.confidentiality}; // CodeType
case 542920370: /*attester*/ return this.attester == null ? new Base[0] : this.attester.toArray(new Base[this.attester.size()]); // CompositionAttesterComponent
case 1611297262: /*custodian*/ return this.custodian == null ? new Base[0] : new Base[] {this.custodian}; // Reference
case -7765931: /*relatesTo*/ return this.relatesTo == null ? new Base[0] : this.relatesTo.toArray(new Base[this.relatesTo.size()]); // CompositionRelatesToComponent
@@ -2795,8 +2633,7 @@ public class Composition extends DomainResource {
this.title = TypeConvertor.castToString(value); // StringType
return value;
case -1923018202: // confidentiality
- value = new V3ConfidentialityClassificationEnumFactory().fromType(TypeConvertor.castToCode(value));
- this.confidentiality = (Enumeration) value; // Enumeration
+ this.confidentiality = TypeConvertor.castToCode(value); // CodeType
return value;
case 542920370: // attester
this.getAttester().add((CompositionAttesterComponent) value); // CompositionAttesterComponent
@@ -2840,8 +2677,7 @@ public class Composition extends DomainResource {
} else if (name.equals("title")) {
this.title = TypeConvertor.castToString(value); // StringType
} else if (name.equals("confidentiality")) {
- value = new V3ConfidentialityClassificationEnumFactory().fromType(TypeConvertor.castToCode(value));
- this.confidentiality = (Enumeration) value; // Enumeration
+ this.confidentiality = TypeConvertor.castToCode(value); // CodeType
} else if (name.equals("attester")) {
this.getAttester().add((CompositionAttesterComponent) value);
} else if (name.equals("custodian")) {
@@ -3174,7 +3010,7 @@ public class Composition extends DomainResource {
* Path: Composition.section.entry
*
*/
- @SearchParamDefinition(name="entry", path="Composition.section.entry", description="A reference to data that supports this section", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceFocus.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
+ @SearchParamDefinition(name="entry", path="Composition.section.entry", description="A reference to data that supports this section", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
public static final String SP_ENTRY = "entry";
/**
* Fluent Client search parameter constant for entry
@@ -3306,7 +3142,7 @@ public class Composition extends DomainResource {
* Path: Composition.subject
*
*/
- @SearchParamDefinition(name="subject", path="Composition.subject", description="Who and/or what the composition is about", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Patient"), @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Practitioner") }, target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceFocus.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
+ @SearchParamDefinition(name="subject", path="Composition.subject", description="Who and/or what the composition is about", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Patient"), @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Practitioner") }, target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
public static final String SP_SUBJECT = "subject";
/**
* Fluent Client search parameter constant for subject
@@ -3421,10 +3257,10 @@ public class Composition extends DomainResource {
* [VisionPrescription](visionprescription.html): Return prescriptions with this encounter identifier
* Type: reference
- * Path: Composition.encounter | DeviceRequest.encounter | DiagnosticReport.encounter | DocumentReference.context.encounter | Flag.encounter | List.encounter | NutritionOrder.encounter | Observation.encounter | Procedure.encounter | RiskAssessment.encounter | ServiceRequest.encounter | VisionPrescription.encounter
+ * Path: Composition.encounter | DeviceRequest.encounter | DiagnosticReport.encounter | DocumentReference.encounter | Flag.encounter | List.encounter | NutritionOrder.encounter | Observation.encounter | Procedure.encounter | RiskAssessment.encounter | ServiceRequest.encounter | VisionPrescription.encounter
*
*/
- @SearchParamDefinition(name="encounter", path="Composition.encounter | DeviceRequest.encounter | DiagnosticReport.encounter | DocumentReference.context.encounter | Flag.encounter | List.encounter | NutritionOrder.encounter | Observation.encounter | Procedure.encounter | RiskAssessment.encounter | ServiceRequest.encounter | VisionPrescription.encounter", description="Multiple Resources: \r\n\r\n* [Composition](composition.html): Context of the Composition\r\n* [DeviceRequest](devicerequest.html): Encounter during which request was created\r\n* [DiagnosticReport](diagnosticreport.html): The Encounter when the order was made\r\n* [DocumentReference](documentreference.html): Context of the document content\r\n* [Flag](flag.html): Alert relevant during encounter\r\n* [List](list.html): Context in which list created\r\n* [NutritionOrder](nutritionorder.html): Return nutrition orders with this encounter identifier\r\n* [Observation](observation.html): Encounter related to the observation\r\n* [Procedure](procedure.html): The Encounter during which this Procedure was created\r\n* [RiskAssessment](riskassessment.html): Where was assessment performed?\r\n* [ServiceRequest](servicerequest.html): An encounter in which this request is made\r\n* [VisionPrescription](visionprescription.html): Return prescriptions with this encounter identifier\r\n", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Encounter") }, target={Encounter.class } )
+ @SearchParamDefinition(name="encounter", path="Composition.encounter | DeviceRequest.encounter | DiagnosticReport.encounter | DocumentReference.encounter | Flag.encounter | List.encounter | NutritionOrder.encounter | Observation.encounter | Procedure.encounter | RiskAssessment.encounter | ServiceRequest.encounter | VisionPrescription.encounter", description="Multiple Resources: \r\n\r\n* [Composition](composition.html): Context of the Composition\r\n* [DeviceRequest](devicerequest.html): Encounter during which request was created\r\n* [DiagnosticReport](diagnosticreport.html): The Encounter when the order was made\r\n* [DocumentReference](documentreference.html): Context of the document content\r\n* [Flag](flag.html): Alert relevant during encounter\r\n* [List](list.html): Context in which list created\r\n* [NutritionOrder](nutritionorder.html): Return nutrition orders with this encounter identifier\r\n* [Observation](observation.html): Encounter related to the observation\r\n* [Procedure](procedure.html): The Encounter during which this Procedure was created\r\n* [RiskAssessment](riskassessment.html): Where was assessment performed?\r\n* [ServiceRequest](servicerequest.html): An encounter in which this request is made\r\n* [VisionPrescription](visionprescription.html): Return prescriptions with this encounter identifier\r\n", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Encounter") }, target={Encounter.class } )
public static final String SP_ENCOUNTER = "encounter";
/**
* Fluent Client search parameter constant for encounter
@@ -3445,7 +3281,7 @@ public class Composition extends DomainResource {
* [VisionPrescription](visionprescription.html): Return prescriptions with this encounter identifier
* Type: reference
- * Path: Composition.encounter | DeviceRequest.encounter | DiagnosticReport.encounter | DocumentReference.context.encounter | Flag.encounter | List.encounter | NutritionOrder.encounter | Observation.encounter | Procedure.encounter | RiskAssessment.encounter | ServiceRequest.encounter | VisionPrescription.encounter
+ * Path: Composition.encounter | DeviceRequest.encounter | DiagnosticReport.encounter | DocumentReference.encounter | Flag.encounter | List.encounter | NutritionOrder.encounter | Observation.encounter | Procedure.encounter | RiskAssessment.encounter | ServiceRequest.encounter | VisionPrescription.encounter
*
*/
public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ENCOUNTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ENCOUNTER);
@@ -3471,7 +3307,7 @@ public class Composition extends DomainResource {
* [DeviceRequest](devicerequest.html): Business identifier for request/order
* [DiagnosticReport](diagnosticreport.html): An identifier for the report
* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents
-* [DocumentReference](documentreference.html): Master Version Specific Identifier
+* [DocumentReference](documentreference.html): Identifier of the attachment binary
* [Encounter](encounter.html): Identifier(s) by which this encounter is known
* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare
* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier
@@ -3493,10 +3329,10 @@ public class Composition extends DomainResource {
* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier
* Type: token
- * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.masterIdentifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
+ * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
*
*/
- @SearchParamDefinition(name="identifier", path="AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.masterIdentifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier", description="Multiple Resources: \r\n\r\n* [AllergyIntolerance](allergyintolerance.html): External ids for this item\r\n* [CarePlan](careplan.html): External Ids for this plan\r\n* [CareTeam](careteam.html): External Ids for this team\r\n* [Composition](composition.html): Version-independent identifier for the Composition\r\n* [Condition](condition.html): A unique identifier of the condition record\r\n* [Consent](consent.html): Identifier for this record (external references)\r\n* [DetectedIssue](detectedissue.html): Unique id for the detected issue\r\n* [DeviceRequest](devicerequest.html): Business identifier for request/order\r\n* [DiagnosticReport](diagnosticreport.html): An identifier for the report\r\n* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents\r\n* [DocumentReference](documentreference.html): Master Version Specific Identifier\r\n* [Encounter](encounter.html): Identifier(s) by which this encounter is known\r\n* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare\r\n* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier\r\n* [Goal](goal.html): External Ids for this goal\r\n* [ImagingStudy](imagingstudy.html): Identifiers for the Study, such as DICOM Study Instance UID and Accession number\r\n* [Immunization](immunization.html): Business identifier\r\n* [List](list.html): Business identifier\r\n* [MedicationAdministration](medicationadministration.html): Return administrations with this external identifier\r\n* [MedicationDispense](medicationdispense.html): Returns dispenses with this external identifier\r\n* [MedicationRequest](medicationrequest.html): Return prescriptions with this external identifier\r\n* [MedicationUsage](medicationusage.html): Return statements with this external identifier\r\n* [NutritionOrder](nutritionorder.html): Return nutrition orders with this external identifier\r\n* [Observation](observation.html): The unique id for a particular observation\r\n* [Procedure](procedure.html): A unique identifier for a procedure\r\n* [RiskAssessment](riskassessment.html): Unique identifier for the assessment\r\n* [ServiceRequest](servicerequest.html): Identifiers assigned to this order\r\n* [SupplyDelivery](supplydelivery.html): External identifier\r\n* [SupplyRequest](supplyrequest.html): Business Identifier for SupplyRequest\r\n* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier\r\n", type="token" )
+ @SearchParamDefinition(name="identifier", path="AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier", description="Multiple Resources: \r\n\r\n* [AllergyIntolerance](allergyintolerance.html): External ids for this item\r\n* [CarePlan](careplan.html): External Ids for this plan\r\n* [CareTeam](careteam.html): External Ids for this team\r\n* [Composition](composition.html): Version-independent identifier for the Composition\r\n* [Condition](condition.html): A unique identifier of the condition record\r\n* [Consent](consent.html): Identifier for this record (external references)\r\n* [DetectedIssue](detectedissue.html): Unique id for the detected issue\r\n* [DeviceRequest](devicerequest.html): Business identifier for request/order\r\n* [DiagnosticReport](diagnosticreport.html): An identifier for the report\r\n* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents\r\n* [DocumentReference](documentreference.html): Identifier of the attachment binary\r\n* [Encounter](encounter.html): Identifier(s) by which this encounter is known\r\n* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare\r\n* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier\r\n* [Goal](goal.html): External Ids for this goal\r\n* [ImagingStudy](imagingstudy.html): Identifiers for the Study, such as DICOM Study Instance UID and Accession number\r\n* [Immunization](immunization.html): Business identifier\r\n* [List](list.html): Business identifier\r\n* [MedicationAdministration](medicationadministration.html): Return administrations with this external identifier\r\n* [MedicationDispense](medicationdispense.html): Returns dispenses with this external identifier\r\n* [MedicationRequest](medicationrequest.html): Return prescriptions with this external identifier\r\n* [MedicationUsage](medicationusage.html): Return statements with this external identifier\r\n* [NutritionOrder](nutritionorder.html): Return nutrition orders with this external identifier\r\n* [Observation](observation.html): The unique id for a particular observation\r\n* [Procedure](procedure.html): A unique identifier for a procedure\r\n* [RiskAssessment](riskassessment.html): Unique identifier for the assessment\r\n* [ServiceRequest](servicerequest.html): Identifiers assigned to this order\r\n* [SupplyDelivery](supplydelivery.html): External identifier\r\n* [SupplyRequest](supplyrequest.html): Business Identifier for SupplyRequest\r\n* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier\r\n", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
* Fluent Client search parameter constant for identifier
@@ -3513,7 +3349,7 @@ public class Composition extends DomainResource {
* [DeviceRequest](devicerequest.html): Business identifier for request/order
* [DiagnosticReport](diagnosticreport.html): An identifier for the report
* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents
-* [DocumentReference](documentreference.html): Master Version Specific Identifier
+* [DocumentReference](documentreference.html): Identifier of the attachment binary
* [Encounter](encounter.html): Identifier(s) by which this encounter is known
* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare
* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier
@@ -3535,7 +3371,7 @@ public class Composition extends DomainResource {
* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier
* Type: token
- * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.masterIdentifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
+ * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
*
*/
public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
@@ -3671,4 +3507,5 @@ public class Composition extends DomainResource {
public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE);
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ConceptMap.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ConceptMap.java
index bbc22700f..b7791157d 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ConceptMap.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ConceptMap.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,25 +29,23 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
-import org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship;
-import org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationshipEnumFactory;
-import org.hl7.fhir.r5.model.Enumerations.PublicationStatus;
-import org.hl7.fhir.r5.model.Enumerations.PublicationStatusEnumFactory;
import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* A statement of relationships from one set of concepts to one or more other concepts - either concepts in code systems, or data element/data element concepts, or classes in class models.
@@ -4900,4 +4896,5 @@ public class ConceptMap extends CanonicalResource {
public static final ca.uhn.fhir.rest.gclient.TokenClientParam VERSION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_VERSION);
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Condition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Condition.java
index 919219c57..933dc1e0b 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Condition.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Condition.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,20 +29,22 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.r5.model.Enumerations.*;
import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* A clinical condition, problem, diagnosis, or other event, situation, issue, or clinical concept that has risen to a level of concern.
@@ -2105,7 +2105,7 @@ public class Condition extends DomainResource {
* Path: Condition.evidence.detail
*
*/
- @SearchParamDefinition(name="evidence-detail", path="Condition.evidence.detail", description="Supporting information found elsewhere", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceFocus.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
+ @SearchParamDefinition(name="evidence-detail", path="Condition.evidence.detail", description="Supporting information found elsewhere", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
public static final String SP_EVIDENCE_DETAIL = "evidence-detail";
/**
* Fluent Client search parameter constant for evidence-detail
@@ -2376,7 +2376,7 @@ public class Condition extends DomainResource {
* [DeviceRequest](devicerequest.html): Business identifier for request/order
* [DiagnosticReport](diagnosticreport.html): An identifier for the report
* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents
-* [DocumentReference](documentreference.html): Master Version Specific Identifier
+* [DocumentReference](documentreference.html): Identifier of the attachment binary
* [Encounter](encounter.html): Identifier(s) by which this encounter is known
* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare
* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier
@@ -2398,10 +2398,10 @@ public class Condition extends DomainResource {
* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier
* Type: token
- * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.masterIdentifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
+ * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
*
*/
- @SearchParamDefinition(name="identifier", path="AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.masterIdentifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier", description="Multiple Resources: \r\n\r\n* [AllergyIntolerance](allergyintolerance.html): External ids for this item\r\n* [CarePlan](careplan.html): External Ids for this plan\r\n* [CareTeam](careteam.html): External Ids for this team\r\n* [Composition](composition.html): Version-independent identifier for the Composition\r\n* [Condition](condition.html): A unique identifier of the condition record\r\n* [Consent](consent.html): Identifier for this record (external references)\r\n* [DetectedIssue](detectedissue.html): Unique id for the detected issue\r\n* [DeviceRequest](devicerequest.html): Business identifier for request/order\r\n* [DiagnosticReport](diagnosticreport.html): An identifier for the report\r\n* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents\r\n* [DocumentReference](documentreference.html): Master Version Specific Identifier\r\n* [Encounter](encounter.html): Identifier(s) by which this encounter is known\r\n* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare\r\n* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier\r\n* [Goal](goal.html): External Ids for this goal\r\n* [ImagingStudy](imagingstudy.html): Identifiers for the Study, such as DICOM Study Instance UID and Accession number\r\n* [Immunization](immunization.html): Business identifier\r\n* [List](list.html): Business identifier\r\n* [MedicationAdministration](medicationadministration.html): Return administrations with this external identifier\r\n* [MedicationDispense](medicationdispense.html): Returns dispenses with this external identifier\r\n* [MedicationRequest](medicationrequest.html): Return prescriptions with this external identifier\r\n* [MedicationUsage](medicationusage.html): Return statements with this external identifier\r\n* [NutritionOrder](nutritionorder.html): Return nutrition orders with this external identifier\r\n* [Observation](observation.html): The unique id for a particular observation\r\n* [Procedure](procedure.html): A unique identifier for a procedure\r\n* [RiskAssessment](riskassessment.html): Unique identifier for the assessment\r\n* [ServiceRequest](servicerequest.html): Identifiers assigned to this order\r\n* [SupplyDelivery](supplydelivery.html): External identifier\r\n* [SupplyRequest](supplyrequest.html): Business Identifier for SupplyRequest\r\n* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier\r\n", type="token" )
+ @SearchParamDefinition(name="identifier", path="AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier", description="Multiple Resources: \r\n\r\n* [AllergyIntolerance](allergyintolerance.html): External ids for this item\r\n* [CarePlan](careplan.html): External Ids for this plan\r\n* [CareTeam](careteam.html): External Ids for this team\r\n* [Composition](composition.html): Version-independent identifier for the Composition\r\n* [Condition](condition.html): A unique identifier of the condition record\r\n* [Consent](consent.html): Identifier for this record (external references)\r\n* [DetectedIssue](detectedissue.html): Unique id for the detected issue\r\n* [DeviceRequest](devicerequest.html): Business identifier for request/order\r\n* [DiagnosticReport](diagnosticreport.html): An identifier for the report\r\n* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents\r\n* [DocumentReference](documentreference.html): Identifier of the attachment binary\r\n* [Encounter](encounter.html): Identifier(s) by which this encounter is known\r\n* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare\r\n* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier\r\n* [Goal](goal.html): External Ids for this goal\r\n* [ImagingStudy](imagingstudy.html): Identifiers for the Study, such as DICOM Study Instance UID and Accession number\r\n* [Immunization](immunization.html): Business identifier\r\n* [List](list.html): Business identifier\r\n* [MedicationAdministration](medicationadministration.html): Return administrations with this external identifier\r\n* [MedicationDispense](medicationdispense.html): Returns dispenses with this external identifier\r\n* [MedicationRequest](medicationrequest.html): Return prescriptions with this external identifier\r\n* [MedicationUsage](medicationusage.html): Return statements with this external identifier\r\n* [NutritionOrder](nutritionorder.html): Return nutrition orders with this external identifier\r\n* [Observation](observation.html): The unique id for a particular observation\r\n* [Procedure](procedure.html): A unique identifier for a procedure\r\n* [RiskAssessment](riskassessment.html): Unique identifier for the assessment\r\n* [ServiceRequest](servicerequest.html): Identifiers assigned to this order\r\n* [SupplyDelivery](supplydelivery.html): External identifier\r\n* [SupplyRequest](supplyrequest.html): Business Identifier for SupplyRequest\r\n* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier\r\n", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
* Fluent Client search parameter constant for identifier
@@ -2418,7 +2418,7 @@ public class Condition extends DomainResource {
* [DeviceRequest](devicerequest.html): Business identifier for request/order
* [DiagnosticReport](diagnosticreport.html): An identifier for the report
* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents
-* [DocumentReference](documentreference.html): Master Version Specific Identifier
+* [DocumentReference](documentreference.html): Identifier of the attachment binary
* [Encounter](encounter.html): Identifier(s) by which this encounter is known
* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare
* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier
@@ -2440,7 +2440,7 @@ public class Condition extends DomainResource {
* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier
* Type: token
- * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.masterIdentifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
+ * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
*
*/
public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
@@ -2540,4 +2540,5 @@ public class Condition extends DomainResource {
public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("Condition:patient").toLocked();
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ConditionDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ConditionDefinition.java
index f8a46fcfd..58afdf067 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ConditionDefinition.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ConditionDefinition.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,23 +29,23 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
-import org.hl7.fhir.r5.model.Enumerations.PublicationStatus;
-import org.hl7.fhir.r5.model.Enumerations.PublicationStatusEnumFactory;
import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* A definition of a condition and information relevant to managing it.
@@ -3977,4 +3975,5 @@ public class ConditionDefinition extends MetadataResource {
public static final ca.uhn.fhir.rest.gclient.TokenClientParam VERSION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_VERSION);
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Consent.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Consent.java
index 8055be4d8..ae07380d4 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Consent.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Consent.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,21 +29,23 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* A record of a healthcare consumer’s choices or choices made on their behalf by a third party, which permits or denies identified recipient(s) or recipient role(s) to perform one or more actions within a given policy context, for specific purposes and periods of time.
@@ -2437,10 +2437,10 @@ public class Consent extends DomainResource {
protected Enumeration status;
/**
- * A selector of the type of consent being presented: Privacy, Treatment, or Research. This list is now extensible.
+ * A selector of the type of consent being presented with the base being Privacy, Treatment, or Research.
*/
@Child(name = "scope", type = {CodeableConcept.class}, order=2, min=1, max=1, modifier=true, summary=true)
- @Description(shortDefinition="Which of the four areas this resource covers (extensible)", formalDefinition="A selector of the type of consent being presented: Privacy, Treatment, or Research. This list is now extensible." )
+ @Description(shortDefinition="Which of the three areas this resource covers (extensible)", formalDefinition="A selector of the type of consent being presented with the base being Privacy, Treatment, or Research." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/consent-scope")
protected CodeableConcept scope;
@@ -2474,37 +2474,44 @@ public class Consent extends DomainResource {
protected List performer;
/**
- * The organization that manages the consent, and the framework within which it is executed.
+ * The actor that manages the consent through its lifecycle.
*/
- @Child(name = "organization", type = {Organization.class}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
- @Description(shortDefinition="Custodian of the consent", formalDefinition="The organization that manages the consent, and the framework within which it is executed." )
- protected List organization;
+ @Child(name = "manager", type = {HealthcareService.class, Organization.class, Patient.class, Practitioner.class}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+ @Description(shortDefinition="Consent workflow management", formalDefinition="The actor that manages the consent through its lifecycle." )
+ protected List manager;
+
+ /**
+ * The actor that controls/enforces the access according to the consent.
+ */
+ @Child(name = "controller", type = {HealthcareService.class, Organization.class, Patient.class, Practitioner.class}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+ @Description(shortDefinition="Consent Enforcer", formalDefinition="The actor that controls/enforces the access according to the consent." )
+ protected List controller;
/**
* The source on which this consent statement is based. The source might be a scanned original paper form.
*/
- @Child(name = "sourceAttachment", type = {Attachment.class}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+ @Child(name = "sourceAttachment", type = {Attachment.class}, order=9, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Description(shortDefinition="Source from which this consent is taken", formalDefinition="The source on which this consent statement is based. The source might be a scanned original paper form." )
protected List sourceAttachment;
/**
* A reference to a consent that links back to such a source, a reference to a document repository (e.g. XDS) that stores the original consent document.
*/
- @Child(name = "sourceReference", type = {Consent.class, DocumentReference.class, Contract.class, QuestionnaireResponse.class}, order=9, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+ @Child(name = "sourceReference", type = {Consent.class, DocumentReference.class, Contract.class, QuestionnaireResponse.class}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Description(shortDefinition="Source from which this consent is taken", formalDefinition="A reference to a consent that links back to such a source, a reference to a document repository (e.g. XDS) that stores the original consent document." )
protected List sourceReference;
/**
* The references to the policies that are included in this consent scope. Policies may be organizational, but are often defined jurisdictionally, or in law.
*/
- @Child(name = "policy", type = {}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+ @Child(name = "policy", type = {}, order=11, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Description(shortDefinition="Policies covered by this consent", formalDefinition="The references to the policies that are included in this consent scope. Policies may be organizational, but are often defined jurisdictionally, or in law." )
protected List policy;
/**
* A reference to the specific base computable regulation or policy.
*/
- @Child(name = "policyRule", type = {CodeableConcept.class}, order=11, min=0, max=1, modifier=false, summary=true)
+ @Child(name = "policyRule", type = {CodeableConcept.class}, order=12, min=0, max=1, modifier=false, summary=true)
@Description(shortDefinition="Regulation that this consents to", formalDefinition="A reference to the specific base computable regulation or policy." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/consent-policy")
protected CodeableConcept policyRule;
@@ -2512,18 +2519,18 @@ public class Consent extends DomainResource {
/**
* Whether a treatment instruction (e.g. artificial respiration yes or no) was verified with the patient, his/her family or another authorized person.
*/
- @Child(name = "verification", type = {}, order=12, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
+ @Child(name = "verification", type = {}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Description(shortDefinition="Consent Verified by patient or family", formalDefinition="Whether a treatment instruction (e.g. artificial respiration yes or no) was verified with the patient, his/her family or another authorized person." )
protected List verification;
/**
* An exception to the base policy of this consent. An exception can be an addition or removal of access permissions.
*/
- @Child(name = "provision", type = {}, order=13, min=0, max=1, modifier=false, summary=true)
+ @Child(name = "provision", type = {}, order=14, min=0, max=1, modifier=false, summary=true)
@Description(shortDefinition="Constraints to the base Consent.policyRule/Consent.policy", formalDefinition="An exception to the base policy of this consent. An exception can be an addition or removal of access permissions." )
protected ProvisionComponent provision;
- private static final long serialVersionUID = -1510572988L;
+ private static final long serialVersionUID = -528055185L;
/**
* Constructor
@@ -2641,7 +2648,7 @@ public class Consent extends DomainResource {
}
/**
- * @return {@link #scope} (A selector of the type of consent being presented: Privacy, Treatment, or Research. This list is now extensible.)
+ * @return {@link #scope} (A selector of the type of consent being presented with the base being Privacy, Treatment, or Research.)
*/
public CodeableConcept getScope() {
if (this.scope == null)
@@ -2657,7 +2664,7 @@ public class Consent extends DomainResource {
}
/**
- * @param value {@link #scope} (A selector of the type of consent being presented: Privacy, Treatment, or Research. This list is now extensible.)
+ * @param value {@link #scope} (A selector of the type of consent being presented with the base being Privacy, Treatment, or Research.)
*/
public Consent setScope(CodeableConcept value) {
this.scope = value;
@@ -2844,56 +2851,109 @@ public class Consent extends DomainResource {
}
/**
- * @return {@link #organization} (The organization that manages the consent, and the framework within which it is executed.)
+ * @return {@link #manager} (The actor that manages the consent through its lifecycle.)
*/
- public List getOrganization() {
- if (this.organization == null)
- this.organization = new ArrayList();
- return this.organization;
+ public List getManager() {
+ if (this.manager == null)
+ this.manager = new ArrayList();
+ return this.manager;
}
/**
* @return Returns a reference to this
for easy method chaining
*/
- public Consent setOrganization(List theOrganization) {
- this.organization = theOrganization;
+ public Consent setManager(List theManager) {
+ this.manager = theManager;
return this;
}
- public boolean hasOrganization() {
- if (this.organization == null)
+ public boolean hasManager() {
+ if (this.manager == null)
return false;
- for (Reference item : this.organization)
+ for (Reference item : this.manager)
if (!item.isEmpty())
return true;
return false;
}
- public Reference addOrganization() { //3
+ public Reference addManager() { //3
Reference t = new Reference();
- if (this.organization == null)
- this.organization = new ArrayList();
- this.organization.add(t);
+ if (this.manager == null)
+ this.manager = new ArrayList();
+ this.manager.add(t);
return t;
}
- public Consent addOrganization(Reference t) { //3
+ public Consent addManager(Reference t) { //3
if (t == null)
return this;
- if (this.organization == null)
- this.organization = new ArrayList();
- this.organization.add(t);
+ if (this.manager == null)
+ this.manager = new ArrayList();
+ this.manager.add(t);
return this;
}
/**
- * @return The first repetition of repeating field {@link #organization}, creating it if it does not already exist {3}
+ * @return The first repetition of repeating field {@link #manager}, creating it if it does not already exist {3}
*/
- public Reference getOrganizationFirstRep() {
- if (getOrganization().isEmpty()) {
- addOrganization();
+ public Reference getManagerFirstRep() {
+ if (getManager().isEmpty()) {
+ addManager();
}
- return getOrganization().get(0);
+ return getManager().get(0);
+ }
+
+ /**
+ * @return {@link #controller} (The actor that controls/enforces the access according to the consent.)
+ */
+ public List getController() {
+ if (this.controller == null)
+ this.controller = new ArrayList();
+ return this.controller;
+ }
+
+ /**
+ * @return Returns a reference to this
for easy method chaining
+ */
+ public Consent setController(List theController) {
+ this.controller = theController;
+ return this;
+ }
+
+ public boolean hasController() {
+ if (this.controller == null)
+ return false;
+ for (Reference item : this.controller)
+ if (!item.isEmpty())
+ return true;
+ return false;
+ }
+
+ public Reference addController() { //3
+ Reference t = new Reference();
+ if (this.controller == null)
+ this.controller = new ArrayList();
+ this.controller.add(t);
+ return t;
+ }
+
+ public Consent addController(Reference t) { //3
+ if (t == null)
+ return this;
+ if (this.controller == null)
+ this.controller = new ArrayList();
+ this.controller.add(t);
+ return this;
+ }
+
+ /**
+ * @return The first repetition of repeating field {@link #controller}, creating it if it does not already exist {3}
+ */
+ public Reference getControllerFirstRep() {
+ if (getController().isEmpty()) {
+ addController();
+ }
+ return getController().get(0);
}
/**
@@ -3160,12 +3220,13 @@ public class Consent extends DomainResource {
super.listChildren(children);
children.add(new Property("identifier", "Identifier", "Unique identifier for this copy of the Consent Statement.", 0, java.lang.Integer.MAX_VALUE, identifier));
children.add(new Property("status", "code", "Indicates the current state of this Consent resource.", 0, 1, status));
- children.add(new Property("scope", "CodeableConcept", "A selector of the type of consent being presented: Privacy, Treatment, or Research. This list is now extensible.", 0, 1, scope));
+ children.add(new Property("scope", "CodeableConcept", "A selector of the type of consent being presented with the base being Privacy, Treatment, or Research.", 0, 1, scope));
children.add(new Property("category", "CodeableConcept", "A classification of the type of consents found in the statement. This element supports indexing and retrieval of consent statements.", 0, java.lang.Integer.MAX_VALUE, category));
children.add(new Property("subject", "Reference(Patient|Practitioner)", "The patient/healthcare practitioner to whom this consent applies.", 0, 1, subject));
children.add(new Property("dateTime", "dateTime", "Date and time the consent instance was agreed to.", 0, 1, dateTime));
children.add(new Property("performer", "Reference(CareTeam|HealthcareService|Organization|Patient|Practitioner|RelatedPerson|PractitionerRole)", "Either the Grantor, which is the entity responsible for granting the rights listed in a Consent Directive or the Grantee, which is the entity responsible for complying with the Consent Directive, including any obligations or limitations on authorizations and enforcement of prohibitions.", 0, java.lang.Integer.MAX_VALUE, performer));
- children.add(new Property("organization", "Reference(Organization)", "The organization that manages the consent, and the framework within which it is executed.", 0, java.lang.Integer.MAX_VALUE, organization));
+ children.add(new Property("manager", "Reference(HealthcareService|Organization|Patient|Practitioner)", "The actor that manages the consent through its lifecycle.", 0, java.lang.Integer.MAX_VALUE, manager));
+ children.add(new Property("controller", "Reference(HealthcareService|Organization|Patient|Practitioner)", "The actor that controls/enforces the access according to the consent.", 0, java.lang.Integer.MAX_VALUE, controller));
children.add(new Property("sourceAttachment", "Attachment", "The source on which this consent statement is based. The source might be a scanned original paper form.", 0, java.lang.Integer.MAX_VALUE, sourceAttachment));
children.add(new Property("sourceReference", "Reference(Consent|DocumentReference|Contract|QuestionnaireResponse)", "A reference to a consent that links back to such a source, a reference to a document repository (e.g. XDS) that stores the original consent document.", 0, java.lang.Integer.MAX_VALUE, sourceReference));
children.add(new Property("policy", "", "The references to the policies that are included in this consent scope. Policies may be organizational, but are often defined jurisdictionally, or in law.", 0, java.lang.Integer.MAX_VALUE, policy));
@@ -3179,12 +3240,13 @@ public class Consent extends DomainResource {
switch (_hash) {
case -1618432855: /*identifier*/ return new Property("identifier", "Identifier", "Unique identifier for this copy of the Consent Statement.", 0, java.lang.Integer.MAX_VALUE, identifier);
case -892481550: /*status*/ return new Property("status", "code", "Indicates the current state of this Consent resource.", 0, 1, status);
- case 109264468: /*scope*/ return new Property("scope", "CodeableConcept", "A selector of the type of consent being presented: Privacy, Treatment, or Research. This list is now extensible.", 0, 1, scope);
+ case 109264468: /*scope*/ return new Property("scope", "CodeableConcept", "A selector of the type of consent being presented with the base being Privacy, Treatment, or Research.", 0, 1, scope);
case 50511102: /*category*/ return new Property("category", "CodeableConcept", "A classification of the type of consents found in the statement. This element supports indexing and retrieval of consent statements.", 0, java.lang.Integer.MAX_VALUE, category);
case -1867885268: /*subject*/ return new Property("subject", "Reference(Patient|Practitioner)", "The patient/healthcare practitioner to whom this consent applies.", 0, 1, subject);
case 1792749467: /*dateTime*/ return new Property("dateTime", "dateTime", "Date and time the consent instance was agreed to.", 0, 1, dateTime);
case 481140686: /*performer*/ return new Property("performer", "Reference(CareTeam|HealthcareService|Organization|Patient|Practitioner|RelatedPerson|PractitionerRole)", "Either the Grantor, which is the entity responsible for granting the rights listed in a Consent Directive or the Grantee, which is the entity responsible for complying with the Consent Directive, including any obligations or limitations on authorizations and enforcement of prohibitions.", 0, java.lang.Integer.MAX_VALUE, performer);
- case 1178922291: /*organization*/ return new Property("organization", "Reference(Organization)", "The organization that manages the consent, and the framework within which it is executed.", 0, java.lang.Integer.MAX_VALUE, organization);
+ case 835260333: /*manager*/ return new Property("manager", "Reference(HealthcareService|Organization|Patient|Practitioner)", "The actor that manages the consent through its lifecycle.", 0, java.lang.Integer.MAX_VALUE, manager);
+ case 637428636: /*controller*/ return new Property("controller", "Reference(HealthcareService|Organization|Patient|Practitioner)", "The actor that controls/enforces the access according to the consent.", 0, java.lang.Integer.MAX_VALUE, controller);
case 1964406686: /*sourceAttachment*/ return new Property("sourceAttachment", "Attachment", "The source on which this consent statement is based. The source might be a scanned original paper form.", 0, java.lang.Integer.MAX_VALUE, sourceAttachment);
case -244259472: /*sourceReference*/ return new Property("sourceReference", "Reference(Consent|DocumentReference|Contract|QuestionnaireResponse)", "A reference to a consent that links back to such a source, a reference to a document repository (e.g. XDS) that stores the original consent document.", 0, java.lang.Integer.MAX_VALUE, sourceReference);
case -982670030: /*policy*/ return new Property("policy", "", "The references to the policies that are included in this consent scope. Policies may be organizational, but are often defined jurisdictionally, or in law.", 0, java.lang.Integer.MAX_VALUE, policy);
@@ -3206,7 +3268,8 @@ public class Consent extends DomainResource {
case -1867885268: /*subject*/ return this.subject == null ? new Base[0] : new Base[] {this.subject}; // Reference
case 1792749467: /*dateTime*/ return this.dateTime == null ? new Base[0] : new Base[] {this.dateTime}; // DateTimeType
case 481140686: /*performer*/ return this.performer == null ? new Base[0] : this.performer.toArray(new Base[this.performer.size()]); // Reference
- case 1178922291: /*organization*/ return this.organization == null ? new Base[0] : this.organization.toArray(new Base[this.organization.size()]); // Reference
+ case 835260333: /*manager*/ return this.manager == null ? new Base[0] : this.manager.toArray(new Base[this.manager.size()]); // Reference
+ case 637428636: /*controller*/ return this.controller == null ? new Base[0] : this.controller.toArray(new Base[this.controller.size()]); // Reference
case 1964406686: /*sourceAttachment*/ return this.sourceAttachment == null ? new Base[0] : this.sourceAttachment.toArray(new Base[this.sourceAttachment.size()]); // Attachment
case -244259472: /*sourceReference*/ return this.sourceReference == null ? new Base[0] : this.sourceReference.toArray(new Base[this.sourceReference.size()]); // Reference
case -982670030: /*policy*/ return this.policy == null ? new Base[0] : this.policy.toArray(new Base[this.policy.size()]); // ConsentPolicyComponent
@@ -3243,8 +3306,11 @@ public class Consent extends DomainResource {
case 481140686: // performer
this.getPerformer().add(TypeConvertor.castToReference(value)); // Reference
return value;
- case 1178922291: // organization
- this.getOrganization().add(TypeConvertor.castToReference(value)); // Reference
+ case 835260333: // manager
+ this.getManager().add(TypeConvertor.castToReference(value)); // Reference
+ return value;
+ case 637428636: // controller
+ this.getController().add(TypeConvertor.castToReference(value)); // Reference
return value;
case 1964406686: // sourceAttachment
this.getSourceAttachment().add(TypeConvertor.castToAttachment(value)); // Attachment
@@ -3286,8 +3352,10 @@ public class Consent extends DomainResource {
this.dateTime = TypeConvertor.castToDateTime(value); // DateTimeType
} else if (name.equals("performer")) {
this.getPerformer().add(TypeConvertor.castToReference(value));
- } else if (name.equals("organization")) {
- this.getOrganization().add(TypeConvertor.castToReference(value));
+ } else if (name.equals("manager")) {
+ this.getManager().add(TypeConvertor.castToReference(value));
+ } else if (name.equals("controller")) {
+ this.getController().add(TypeConvertor.castToReference(value));
} else if (name.equals("sourceAttachment")) {
this.getSourceAttachment().add(TypeConvertor.castToAttachment(value));
} else if (name.equals("sourceReference")) {
@@ -3315,7 +3383,8 @@ public class Consent extends DomainResource {
case -1867885268: return getSubject();
case 1792749467: return getDateTimeElement();
case 481140686: return addPerformer();
- case 1178922291: return addOrganization();
+ case 835260333: return addManager();
+ case 637428636: return addController();
case 1964406686: return addSourceAttachment();
case -244259472: return addSourceReference();
case -982670030: return addPolicy();
@@ -3337,7 +3406,8 @@ public class Consent extends DomainResource {
case -1867885268: /*subject*/ return new String[] {"Reference"};
case 1792749467: /*dateTime*/ return new String[] {"dateTime"};
case 481140686: /*performer*/ return new String[] {"Reference"};
- case 1178922291: /*organization*/ return new String[] {"Reference"};
+ case 835260333: /*manager*/ return new String[] {"Reference"};
+ case 637428636: /*controller*/ return new String[] {"Reference"};
case 1964406686: /*sourceAttachment*/ return new String[] {"Attachment"};
case -244259472: /*sourceReference*/ return new String[] {"Reference"};
case -982670030: /*policy*/ return new String[] {};
@@ -3374,8 +3444,11 @@ public class Consent extends DomainResource {
else if (name.equals("performer")) {
return addPerformer();
}
- else if (name.equals("organization")) {
- return addOrganization();
+ else if (name.equals("manager")) {
+ return addManager();
+ }
+ else if (name.equals("controller")) {
+ return addController();
}
else if (name.equals("sourceAttachment")) {
return addSourceAttachment();
@@ -3433,10 +3506,15 @@ public class Consent extends DomainResource {
for (Reference i : performer)
dst.performer.add(i.copy());
};
- if (organization != null) {
- dst.organization = new ArrayList();
- for (Reference i : organization)
- dst.organization.add(i.copy());
+ if (manager != null) {
+ dst.manager = new ArrayList();
+ for (Reference i : manager)
+ dst.manager.add(i.copy());
+ };
+ if (controller != null) {
+ dst.controller = new ArrayList();
+ for (Reference i : controller)
+ dst.controller.add(i.copy());
};
if (sourceAttachment != null) {
dst.sourceAttachment = new ArrayList();
@@ -3475,7 +3553,7 @@ public class Consent extends DomainResource {
Consent o = (Consent) other_;
return compareDeep(identifier, o.identifier, true) && compareDeep(status, o.status, true) && compareDeep(scope, o.scope, true)
&& compareDeep(category, o.category, true) && compareDeep(subject, o.subject, true) && compareDeep(dateTime, o.dateTime, true)
- && compareDeep(performer, o.performer, true) && compareDeep(organization, o.organization, true)
+ && compareDeep(performer, o.performer, true) && compareDeep(manager, o.manager, true) && compareDeep(controller, o.controller, true)
&& compareDeep(sourceAttachment, o.sourceAttachment, true) && compareDeep(sourceReference, o.sourceReference, true)
&& compareDeep(policy, o.policy, true) && compareDeep(policyRule, o.policyRule, true) && compareDeep(verification, o.verification, true)
&& compareDeep(provision, o.provision, true);
@@ -3493,8 +3571,8 @@ public class Consent extends DomainResource {
public boolean isEmpty() {
return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, status, scope
- , category, subject, dateTime, performer, organization, sourceAttachment, sourceReference
- , policy, policyRule, verification, provision);
+ , category, subject, dateTime, performer, manager, controller, sourceAttachment
+ , sourceReference, policy, policyRule, verification, provision);
}
@Override
@@ -3594,6 +3672,32 @@ public class Consent extends DomainResource {
*/
public static final ca.uhn.fhir.model.api.Include INCLUDE_CONSENTOR = new ca.uhn.fhir.model.api.Include("Consent:consentor").toLocked();
+ /**
+ * Search parameter: controller
+ *
+ * Description: Consent Enforcer
+ * Type: reference
+ * Path: Consent.controller
+ *
+ */
+ @SearchParamDefinition(name="controller", path="Consent.controller", description="Consent Enforcer", type="reference", target={HealthcareService.class, Organization.class, Patient.class, Practitioner.class } )
+ public static final String SP_CONTROLLER = "controller";
+ /**
+ * Fluent Client search parameter constant for controller
+ *
+ * Description: Consent Enforcer
+ * Type: reference
+ * Path: Consent.controller
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam CONTROLLER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_CONTROLLER);
+
+/**
+ * Constant for fluent queries to be used to add include statements. Specifies
+ * the path value of "Consent:controller".
+ */
+ public static final ca.uhn.fhir.model.api.Include INCLUDE_CONTROLLER = new ca.uhn.fhir.model.api.Include("Consent:controller").toLocked();
+
/**
* Search parameter: data
*
@@ -3602,7 +3706,7 @@ public class Consent extends DomainResource {
* Path: Consent.provision.data.reference
*
*/
- @SearchParamDefinition(name="data", path="Consent.provision.data.reference", description="The actual data reference", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceFocus.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
+ @SearchParamDefinition(name="data", path="Consent.provision.data.reference", description="The actual data reference", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
public static final String SP_DATA = "data";
/**
* Fluent Client search parameter constant for data
@@ -3621,30 +3725,30 @@ public class Consent extends DomainResource {
public static final ca.uhn.fhir.model.api.Include INCLUDE_DATA = new ca.uhn.fhir.model.api.Include("Consent:data").toLocked();
/**
- * Search parameter: organization
+ * Search parameter: manager
*
- * Description: Custodian of the consent
+ * Description: Consent workflow management
* Type: reference
- * Path: Consent.organization
+ * Path: Consent.manager
*
*/
- @SearchParamDefinition(name="organization", path="Consent.organization", description="Custodian of the consent", type="reference", target={Organization.class } )
- public static final String SP_ORGANIZATION = "organization";
+ @SearchParamDefinition(name="manager", path="Consent.manager", description="Consent workflow management", type="reference", target={HealthcareService.class, Organization.class, Patient.class, Practitioner.class } )
+ public static final String SP_MANAGER = "manager";
/**
- * Fluent Client search parameter constant for organization
+ * Fluent Client search parameter constant for manager
*
- * Description: Custodian of the consent
+ * Description: Consent workflow management
* Type: reference
- * Path: Consent.organization
+ * Path: Consent.manager
*
*/
- public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ORGANIZATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ORGANIZATION);
+ public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam MANAGER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_MANAGER);
/**
* Constant for fluent queries to be used to add include statements. Specifies
- * the path value of "Consent:organization".
+ * the path value of "Consent:manager".
*/
- public static final ca.uhn.fhir.model.api.Include INCLUDE_ORGANIZATION = new ca.uhn.fhir.model.api.Include("Consent:organization").toLocked();
+ public static final ca.uhn.fhir.model.api.Include INCLUDE_MANAGER = new ca.uhn.fhir.model.api.Include("Consent:manager").toLocked();
/**
* Search parameter: period
@@ -3709,17 +3813,17 @@ public class Consent extends DomainResource {
/**
* Search parameter: scope
*
- * Description: Which of the four areas this resource covers (extensible)
+ * Description: Which of the three areas this resource covers (extensible)
* Type: token
* Path: Consent.scope
*
*/
- @SearchParamDefinition(name="scope", path="Consent.scope", description="Which of the four areas this resource covers (extensible)", type="token" )
+ @SearchParamDefinition(name="scope", path="Consent.scope", description="Which of the three areas this resource covers (extensible)", type="token" )
public static final String SP_SCOPE = "scope";
/**
* Fluent Client search parameter constant for scope
*
- * Description: Which of the four areas this resource covers (extensible)
+ * Description: Which of the three areas this resource covers (extensible)
* Type: token
* Path: Consent.scope
*
@@ -3800,7 +3904,7 @@ public class Consent extends DomainResource {
* Path: Consent.subject
*
*/
- @SearchParamDefinition(name="subject", path="Consent.subject", description="Who the consent applies to", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Patient") }, target={Patient.class, Practitioner.class } )
+ @SearchParamDefinition(name="subject", path="Consent.subject", description="Who the consent applies to", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Patient") }, target={Patient.class, Practitioner.class, ResearchSubject.class } )
public static final String SP_SUBJECT = "subject";
/**
* Fluent Client search parameter constant for subject
@@ -3931,7 +4035,7 @@ public class Consent extends DomainResource {
* [DeviceRequest](devicerequest.html): Business identifier for request/order
* [DiagnosticReport](diagnosticreport.html): An identifier for the report
* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents
-* [DocumentReference](documentreference.html): Master Version Specific Identifier
+* [DocumentReference](documentreference.html): Identifier of the attachment binary
* [Encounter](encounter.html): Identifier(s) by which this encounter is known
* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare
* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier
@@ -3953,10 +4057,10 @@ public class Consent extends DomainResource {
* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier
* Type: token
- * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.masterIdentifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
+ * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
*
*/
- @SearchParamDefinition(name="identifier", path="AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.masterIdentifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier", description="Multiple Resources: \r\n\r\n* [AllergyIntolerance](allergyintolerance.html): External ids for this item\r\n* [CarePlan](careplan.html): External Ids for this plan\r\n* [CareTeam](careteam.html): External Ids for this team\r\n* [Composition](composition.html): Version-independent identifier for the Composition\r\n* [Condition](condition.html): A unique identifier of the condition record\r\n* [Consent](consent.html): Identifier for this record (external references)\r\n* [DetectedIssue](detectedissue.html): Unique id for the detected issue\r\n* [DeviceRequest](devicerequest.html): Business identifier for request/order\r\n* [DiagnosticReport](diagnosticreport.html): An identifier for the report\r\n* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents\r\n* [DocumentReference](documentreference.html): Master Version Specific Identifier\r\n* [Encounter](encounter.html): Identifier(s) by which this encounter is known\r\n* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare\r\n* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier\r\n* [Goal](goal.html): External Ids for this goal\r\n* [ImagingStudy](imagingstudy.html): Identifiers for the Study, such as DICOM Study Instance UID and Accession number\r\n* [Immunization](immunization.html): Business identifier\r\n* [List](list.html): Business identifier\r\n* [MedicationAdministration](medicationadministration.html): Return administrations with this external identifier\r\n* [MedicationDispense](medicationdispense.html): Returns dispenses with this external identifier\r\n* [MedicationRequest](medicationrequest.html): Return prescriptions with this external identifier\r\n* [MedicationUsage](medicationusage.html): Return statements with this external identifier\r\n* [NutritionOrder](nutritionorder.html): Return nutrition orders with this external identifier\r\n* [Observation](observation.html): The unique id for a particular observation\r\n* [Procedure](procedure.html): A unique identifier for a procedure\r\n* [RiskAssessment](riskassessment.html): Unique identifier for the assessment\r\n* [ServiceRequest](servicerequest.html): Identifiers assigned to this order\r\n* [SupplyDelivery](supplydelivery.html): External identifier\r\n* [SupplyRequest](supplyrequest.html): Business Identifier for SupplyRequest\r\n* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier\r\n", type="token" )
+ @SearchParamDefinition(name="identifier", path="AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier", description="Multiple Resources: \r\n\r\n* [AllergyIntolerance](allergyintolerance.html): External ids for this item\r\n* [CarePlan](careplan.html): External Ids for this plan\r\n* [CareTeam](careteam.html): External Ids for this team\r\n* [Composition](composition.html): Version-independent identifier for the Composition\r\n* [Condition](condition.html): A unique identifier of the condition record\r\n* [Consent](consent.html): Identifier for this record (external references)\r\n* [DetectedIssue](detectedissue.html): Unique id for the detected issue\r\n* [DeviceRequest](devicerequest.html): Business identifier for request/order\r\n* [DiagnosticReport](diagnosticreport.html): An identifier for the report\r\n* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents\r\n* [DocumentReference](documentreference.html): Identifier of the attachment binary\r\n* [Encounter](encounter.html): Identifier(s) by which this encounter is known\r\n* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare\r\n* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier\r\n* [Goal](goal.html): External Ids for this goal\r\n* [ImagingStudy](imagingstudy.html): Identifiers for the Study, such as DICOM Study Instance UID and Accession number\r\n* [Immunization](immunization.html): Business identifier\r\n* [List](list.html): Business identifier\r\n* [MedicationAdministration](medicationadministration.html): Return administrations with this external identifier\r\n* [MedicationDispense](medicationdispense.html): Returns dispenses with this external identifier\r\n* [MedicationRequest](medicationrequest.html): Return prescriptions with this external identifier\r\n* [MedicationUsage](medicationusage.html): Return statements with this external identifier\r\n* [NutritionOrder](nutritionorder.html): Return nutrition orders with this external identifier\r\n* [Observation](observation.html): The unique id for a particular observation\r\n* [Procedure](procedure.html): A unique identifier for a procedure\r\n* [RiskAssessment](riskassessment.html): Unique identifier for the assessment\r\n* [ServiceRequest](servicerequest.html): Identifiers assigned to this order\r\n* [SupplyDelivery](supplydelivery.html): External identifier\r\n* [SupplyRequest](supplyrequest.html): Business Identifier for SupplyRequest\r\n* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier\r\n", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
* Fluent Client search parameter constant for identifier
@@ -3973,7 +4077,7 @@ public class Consent extends DomainResource {
* [DeviceRequest](devicerequest.html): Business identifier for request/order
* [DiagnosticReport](diagnosticreport.html): An identifier for the report
* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents
-* [DocumentReference](documentreference.html): Master Version Specific Identifier
+* [DocumentReference](documentreference.html): Identifier of the attachment binary
* [Encounter](encounter.html): Identifier(s) by which this encounter is known
* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare
* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier
@@ -3995,7 +4099,7 @@ public class Consent extends DomainResource {
* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier
* Type: token
- * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.masterIdentifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
+ * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
*
*/
public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
@@ -4095,4 +4199,5 @@ public class Consent extends DomainResource {
public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("Consent:patient").toLocked();
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Constants.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Constants.java
index db1372113..2d7244827 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Constants.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Constants.java
@@ -2,8 +2,6 @@ package org.hl7.fhir.r5.model;
// generated
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -32,17 +30,17 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR v4.4.0
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR v4.5.0
public class Constants {
- public final static String LOCAL_REF_REGEX = "(Account|ActivityDefinition|AdministrableProductDefinition|AdverseEvent|AllergyIntolerance|Appointment|AppointmentResponse|AuditEvent|Basic|Binary|BiologicallyDerivedProduct|BodyStructure|Bundle|CapabilityStatement|CapabilityStatement2|CarePlan|CareTeam|CatalogEntry|ChargeItem|ChargeItemDefinition|Citation|Claim|ClaimResponse|ClinicalImpression|ClinicalUseIssue|CodeSystem|Communication|CommunicationRequest|CompartmentDefinition|Composition|ConceptMap|Condition|ConditionDefinition|Consent|Contract|Coverage|CoverageEligibilityRequest|CoverageEligibilityResponse|DetectedIssue|Device|DeviceDefinition|DeviceMetric|DeviceRequest|DeviceUseStatement|DiagnosticReport|DocumentManifest|DocumentReference|Encounter|Endpoint|EnrollmentRequest|EnrollmentResponse|EpisodeOfCare|EventDefinition|Evidence|EvidenceFocus|EvidenceVariable|ExampleScenario|ExplanationOfBenefit|FamilyMemberHistory|Flag|Goal|GraphDefinition|Group|GuidanceResponse|HealthcareService|ImagingStudy|Immunization|ImmunizationEvaluation|ImmunizationRecommendation|ImplementationGuide|Ingredient|InsurancePlan|Invoice|Library|Linkage|List|Location|ManufacturedItemDefinition|Measure|MeasureReport|Medication|MedicationAdministration|MedicationDispense|MedicationKnowledge|MedicationRequest|MedicationUsage|MedicinalProductDefinition|MessageDefinition|MessageHeader|MolecularSequence|NamingSystem|NutritionIntake|NutritionOrder|NutritionProduct|Observation|ObservationDefinition|OperationDefinition|OperationOutcome|Organization|OrganizationAffiliation|PackagedProductDefinition|Parameters|Patient|PaymentNotice|PaymentReconciliation|Permission|Person|PlanDefinition|Practitioner|PractitionerRole|Procedure|Provenance|Questionnaire|QuestionnaireResponse|RegulatedAuthorization|RelatedPerson|RequestGroup|ResearchStudy|ResearchSubject|RiskAssessment|Schedule|SearchParameter|ServiceRequest|Slot|Specimen|SpecimenDefinition|StructureDefinition|StructureMap|Subscription|SubscriptionStatus|SubscriptionTopic|Substance|SubstanceDefinition|SubstanceNucleicAcid|SubstancePolymer|SubstanceProtein|SubstanceReferenceInformation|SubstanceSourceMaterial|SupplyDelivery|SupplyRequest|Task|TerminologyCapabilities|TestReport|TestScript|ValueSet|VerificationResult|VisionPrescription)\\\\/[A-Za-z0-9\\\\-\\\\.]{1,64}";
+ public final static String LOCAL_REF_REGEX = "(Account|ActivityDefinition|AdministrableProductDefinition|AdverseEvent|AllergyIntolerance|Appointment|AppointmentResponse|AuditEvent|Basic|Binary|BiologicallyDerivedProduct|BodyStructure|Bundle|CapabilityStatement|CapabilityStatement2|CarePlan|CareTeam|CatalogEntry|ChargeItem|ChargeItemDefinition|Citation|Claim|ClaimResponse|ClinicalImpression|ClinicalUseIssue|CodeSystem|Communication|CommunicationRequest|CompartmentDefinition|Composition|ConceptMap|Condition|ConditionDefinition|Consent|Contract|Coverage|CoverageEligibilityRequest|CoverageEligibilityResponse|DetectedIssue|Device|DeviceDefinition|DeviceMetric|DeviceRequest|DeviceUseStatement|DiagnosticReport|DocumentManifest|DocumentReference|Encounter|Endpoint|EnrollmentRequest|EnrollmentResponse|EpisodeOfCare|EventDefinition|Evidence|EvidenceReport|EvidenceVariable|ExampleScenario|ExplanationOfBenefit|FamilyMemberHistory|Flag|Goal|GraphDefinition|Group|GuidanceResponse|HealthcareService|ImagingStudy|Immunization|ImmunizationEvaluation|ImmunizationRecommendation|ImplementationGuide|Ingredient|InsurancePlan|Invoice|Library|Linkage|List|Location|ManufacturedItemDefinition|Measure|MeasureReport|Medication|MedicationAdministration|MedicationDispense|MedicationKnowledge|MedicationRequest|MedicationUsage|MedicinalProductDefinition|MessageDefinition|MessageHeader|MolecularSequence|NamingSystem|NutritionIntake|NutritionOrder|NutritionProduct|Observation|ObservationDefinition|OperationDefinition|OperationOutcome|Organization|OrganizationAffiliation|PackagedProductDefinition|Parameters|Patient|PaymentNotice|PaymentReconciliation|Permission|Person|PlanDefinition|Practitioner|PractitionerRole|Procedure|Provenance|Questionnaire|QuestionnaireResponse|RegulatedAuthorization|RelatedPerson|RequestGroup|ResearchStudy|ResearchSubject|RiskAssessment|Schedule|SearchParameter|ServiceRequest|Slot|Specimen|SpecimenDefinition|StructureDefinition|StructureMap|Subscription|SubscriptionStatus|SubscriptionTopic|Substance|SubstanceDefinition|SubstanceNucleicAcid|SubstancePolymer|SubstanceProtein|SubstanceReferenceInformation|SubstanceSourceMaterial|SupplyDelivery|SupplyRequest|Task|TerminologyCapabilities|TestReport|TestScript|ValueSet|VerificationResult|VisionPrescription)\\\\/[A-Za-z0-9\\\\-\\\\.]{1,64}";
public final static String NS_SYSTEM_TYPE = "http://hl7.org/fhirpath/System.";
- public final static String VERSION = "4.4.0";
- public final static String VERSION_MM = "4.4";
- public final static String DATE = "Mon, May 11, 2020 09:58+1000";
- public final static String URI_REGEX = "((http|https)://([A-Za-z0-9\\\\\\.\\:\\%\\$]*\\/)*)?(Account|ActivityDefinition|AdministrableProductDefinition|AdverseEvent|AllergyIntolerance|Appointment|AppointmentResponse|AuditEvent|Basic|Binary|BiologicallyDerivedProduct|BodyStructure|Bundle|CapabilityStatement|CapabilityStatement2|CarePlan|CareTeam|CatalogEntry|ChargeItem|ChargeItemDefinition|Citation|Claim|ClaimResponse|ClinicalImpression|ClinicalUseIssue|CodeSystem|Communication|CommunicationRequest|CompartmentDefinition|Composition|ConceptMap|Condition|ConditionDefinition|Consent|Contract|Coverage|CoverageEligibilityRequest|CoverageEligibilityResponse|DetectedIssue|Device|DeviceDefinition|DeviceMetric|DeviceRequest|DeviceUseStatement|DiagnosticReport|DocumentManifest|DocumentReference|Encounter|Endpoint|EnrollmentRequest|EnrollmentResponse|EpisodeOfCare|EventDefinition|Evidence|EvidenceFocus|EvidenceVariable|ExampleScenario|ExplanationOfBenefit|FamilyMemberHistory|Flag|Goal|GraphDefinition|Group|GuidanceResponse|HealthcareService|ImagingStudy|Immunization|ImmunizationEvaluation|ImmunizationRecommendation|ImplementationGuide|Ingredient|InsurancePlan|Invoice|Library|Linkage|List|Location|ManufacturedItemDefinition|Measure|MeasureReport|Medication|MedicationAdministration|MedicationDispense|MedicationKnowledge|MedicationRequest|MedicationUsage|MedicinalProductDefinition|MessageDefinition|MessageHeader|MolecularSequence|NamingSystem|NutritionIntake|NutritionOrder|NutritionProduct|Observation|ObservationDefinition|OperationDefinition|OperationOutcome|Organization|OrganizationAffiliation|PackagedProductDefinition|Parameters|Patient|PaymentNotice|PaymentReconciliation|Permission|Person|PlanDefinition|Practitioner|PractitionerRole|Procedure|Provenance|Questionnaire|QuestionnaireResponse|RegulatedAuthorization|RelatedPerson|RequestGroup|ResearchStudy|ResearchSubject|RiskAssessment|Schedule|SearchParameter|ServiceRequest|Slot|Specimen|SpecimenDefinition|StructureDefinition|StructureMap|Subscription|SubscriptionStatus|SubscriptionTopic|Substance|SubstanceDefinition|SubstanceNucleicAcid|SubstancePolymer|SubstanceProtein|SubstanceReferenceInformation|SubstanceSourceMaterial|SupplyDelivery|SupplyRequest|Task|TerminologyCapabilities|TestReport|TestScript|ValueSet|VerificationResult|VisionPrescription)\\/[A-Za-z0-9\\-\\.]{1,64}(\\/_history\\/[A-Za-z0-9\\-\\.]{1,64})?";
+ public final static String VERSION = "4.5.0";
+ public final static String VERSION_MM = "4.5";
+ public final static String DATE = "Thu, Aug 20, 2020 19:42+1000";
+ public final static String URI_REGEX = "((http|https)://([A-Za-z0-9\\\\\\.\\:\\%\\$]*\\/)*)?(Account|ActivityDefinition|AdministrableProductDefinition|AdverseEvent|AllergyIntolerance|Appointment|AppointmentResponse|AuditEvent|Basic|Binary|BiologicallyDerivedProduct|BodyStructure|Bundle|CapabilityStatement|CapabilityStatement2|CarePlan|CareTeam|CatalogEntry|ChargeItem|ChargeItemDefinition|Citation|Claim|ClaimResponse|ClinicalImpression|ClinicalUseIssue|CodeSystem|Communication|CommunicationRequest|CompartmentDefinition|Composition|ConceptMap|Condition|ConditionDefinition|Consent|Contract|Coverage|CoverageEligibilityRequest|CoverageEligibilityResponse|DetectedIssue|Device|DeviceDefinition|DeviceMetric|DeviceRequest|DeviceUseStatement|DiagnosticReport|DocumentManifest|DocumentReference|Encounter|Endpoint|EnrollmentRequest|EnrollmentResponse|EpisodeOfCare|EventDefinition|Evidence|EvidenceReport|EvidenceVariable|ExampleScenario|ExplanationOfBenefit|FamilyMemberHistory|Flag|Goal|GraphDefinition|Group|GuidanceResponse|HealthcareService|ImagingStudy|Immunization|ImmunizationEvaluation|ImmunizationRecommendation|ImplementationGuide|Ingredient|InsurancePlan|Invoice|Library|Linkage|List|Location|ManufacturedItemDefinition|Measure|MeasureReport|Medication|MedicationAdministration|MedicationDispense|MedicationKnowledge|MedicationRequest|MedicationUsage|MedicinalProductDefinition|MessageDefinition|MessageHeader|MolecularSequence|NamingSystem|NutritionIntake|NutritionOrder|NutritionProduct|Observation|ObservationDefinition|OperationDefinition|OperationOutcome|Organization|OrganizationAffiliation|PackagedProductDefinition|Parameters|Patient|PaymentNotice|PaymentReconciliation|Permission|Person|PlanDefinition|Practitioner|PractitionerRole|Procedure|Provenance|Questionnaire|QuestionnaireResponse|RegulatedAuthorization|RelatedPerson|RequestGroup|ResearchStudy|ResearchSubject|RiskAssessment|Schedule|SearchParameter|ServiceRequest|Slot|Specimen|SpecimenDefinition|StructureDefinition|StructureMap|Subscription|SubscriptionStatus|SubscriptionTopic|Substance|SubstanceDefinition|SubstanceNucleicAcid|SubstancePolymer|SubstanceProtein|SubstanceReferenceInformation|SubstanceSourceMaterial|SupplyDelivery|SupplyRequest|Task|TerminologyCapabilities|TestReport|TestScript|ValueSet|VerificationResult|VisionPrescription)\\/[A-Za-z0-9\\-\\.]{1,64}(\\/_history\\/[A-Za-z0-9\\-\\.]{1,64})?";
}
\ No newline at end of file
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ContactDetail.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ContactDetail.java
index b5e6993bc..59e3195d8 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ContactDetail.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ContactDetail.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,18 +29,21 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
-
+import org.hl7.fhir.utilities.Utilities;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseDatatypeElement;
import org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.instance.model.api.ICompositeType;
-import org.hl7.fhir.utilities.Utilities;
-
import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* Base StructureDefinition for ContactDetail Type: Specifies contact information for a person or organization.
@@ -308,4 +309,5 @@ public class ContactDetail extends DataType implements ICompositeType {
}
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ContactPoint.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ContactPoint.java
index 29c1a83c6..20b476c4b 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ContactPoint.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ContactPoint.java
@@ -1,17 +1,49 @@
package org.hl7.fhir.r5.model;
+/*
+ Copyright (c) 2011+, HL7, Inc.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modification, \
+ are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this \
+ list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, \
+ this list of conditions and the following disclaimer in the documentation \
+ and/or other materials provided with the distribution.
+ * Neither the name of HL7 nor the names of its contributors may be used to
+ endorse or promote products derived from this software without specific
+ prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND \
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED \
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. \
+ IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, \
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT \
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR \
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, \
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) \
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE \
+ POSSIBILITY OF SUCH DAMAGE.
+ */
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
-
+import org.hl7.fhir.utilities.Utilities;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseDatatypeElement;
import org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.instance.model.api.ICompositeType;
-import org.hl7.fhir.utilities.Utilities;
-
import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* Base StructureDefinition for ContactPoint Type: Details for all kinds of technology mediated contact points for a person or organization, including telephone, email, etc.
@@ -772,4 +804,5 @@ public class ContactPoint extends DataType implements ICompositeType {
}
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Contract.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Contract.java
index fe6ce1b02..07197bfef 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Contract.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Contract.java
@@ -1,10 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
-import java.math.BigDecimal;
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -33,21 +29,24 @@ import java.math.BigDecimal;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import java.math.*;
import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* Legally enforceable, formally recorded unilateral or bilateral directive i.e., a policy or agreement.
@@ -6527,7 +6526,7 @@ public class Contract extends DomainResource {
*/
@Child(name = "performerType", type = {CodeableConcept.class}, order=12, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Description(shortDefinition="Kind of service performer", formalDefinition="The type of individual that is desired or required to perform or not perform the action." )
- @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/provenance-agent-type")
+ @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/participation-role-type")
protected List performerType;
/**
@@ -6535,7 +6534,7 @@ public class Contract extends DomainResource {
*/
@Child(name = "performerRole", type = {CodeableConcept.class}, order=13, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="Competency of the performer", formalDefinition="The type of role or competency of an individual desired or required to perform or not perform the action." )
- @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/provenance-agent-role")
+ @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/security-role-type")
protected CodeableConcept performerRole;
/**
@@ -11623,7 +11622,7 @@ public class Contract extends DomainResource {
* Path: Contract.subject
*
*/
- @SearchParamDefinition(name="subject", path="Contract.subject", description="The identity of the subject of the contract", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceFocus.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
+ @SearchParamDefinition(name="subject", path="Contract.subject", description="The identity of the subject of the contract", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
public static final String SP_SUBJECT = "subject";
/**
* Fluent Client search parameter constant for subject
@@ -11662,4 +11661,5 @@ public class Contract extends DomainResource {
public static final ca.uhn.fhir.rest.gclient.UriClientParam URL = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_URL);
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Contributor.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Contributor.java
index 71dd8a6f7..2bd2068c7 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Contributor.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Contributor.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,17 +29,21 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
-
+import org.hl7.fhir.utilities.Utilities;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseDatatypeElement;
import org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.instance.model.api.ICompositeType;
-
import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* Base StructureDefinition for Contributor Type: A contributor to the content of a knowledge asset, including authors, editors, reviewers, and endorsers.
@@ -506,4 +508,5 @@ public class Contributor extends DataType implements ICompositeType {
}
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Count.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Count.java
index ca3b6b377..c23848a07 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Count.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Count.java
@@ -1,11 +1,48 @@
package org.hl7.fhir.r5.model;
+/*
+ Copyright (c) 2011+, HL7, Inc.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modification, \
+ are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this \
+ list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, \
+ this list of conditions and the following disclaimer in the documentation \
+ and/or other materials provided with the distribution.
+ * Neither the name of HL7 nor the names of its contributors may be used to
+ endorse or promote products derived from this software without specific
+ prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND \
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED \
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. \
+ IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, \
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT \
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR \
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, \
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) \
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE \
+ POSSIBILITY OF SUCH DAMAGE.
+ */
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseDatatypeElement;
+import org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.instance.model.api.ICompositeType;
-
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* Base StructureDefinition for Count Type: A measured amount (or an amount that can potentially be measured). Note that measured amounts include amounts that are not precisely quantified, including amounts involving arbitrary units and floating currencies.
@@ -42,4 +79,5 @@ public class Count extends Quantity implements ICompositeType {
}
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Coverage.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Coverage.java
index b42aceb77..78cd476e8 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Coverage.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Coverage.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,22 +29,23 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
-import org.hl7.fhir.r5.model.Enumerations.FinancialResourceStatusCodes;
-import org.hl7.fhir.r5.model.Enumerations.FinancialResourceStatusCodesEnumFactory;
import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* Financial instrument which may be used to reimburse or pay for health care products and services. Includes both insurance and self-payment.
@@ -57,10 +56,10 @@ public class Coverage extends DomainResource {
@Block()
public static class ClassComponent extends BackboneElement implements IBaseBackboneElement {
/**
- * The type of classification for which an insurer-specific class label or number and optional name is provided, for example may be used to identify a class of coverage or employer group, Policy, Plan.
+ * The type of classification for which an insurer-specific class label or number and optional name is provided. For example, type may be used to identify a class of coverage or employer group, policy, or plan.
*/
@Child(name = "type", type = {CodeableConcept.class}, order=1, min=1, max=1, modifier=false, summary=true)
- @Description(shortDefinition="Type of class such as 'group' or 'plan'", formalDefinition="The type of classification for which an insurer-specific class label or number and optional name is provided, for example may be used to identify a class of coverage or employer group, Policy, Plan." )
+ @Description(shortDefinition="Type of class such as 'group' or 'plan'", formalDefinition="The type of classification for which an insurer-specific class label or number and optional name is provided. For example, type may be used to identify a class of coverage or employer group, policy, or plan." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/coverage-class")
protected CodeableConcept type;
@@ -97,7 +96,7 @@ public class Coverage extends DomainResource {
}
/**
- * @return {@link #type} (The type of classification for which an insurer-specific class label or number and optional name is provided, for example may be used to identify a class of coverage or employer group, Policy, Plan.)
+ * @return {@link #type} (The type of classification for which an insurer-specific class label or number and optional name is provided. For example, type may be used to identify a class of coverage or employer group, policy, or plan.)
*/
public CodeableConcept getType() {
if (this.type == null)
@@ -113,7 +112,7 @@ public class Coverage extends DomainResource {
}
/**
- * @param value {@link #type} (The type of classification for which an insurer-specific class label or number and optional name is provided, for example may be used to identify a class of coverage or employer group, Policy, Plan.)
+ * @param value {@link #type} (The type of classification for which an insurer-specific class label or number and optional name is provided. For example, type may be used to identify a class of coverage or employer group, policy, or plan.)
*/
public ClassComponent setType(CodeableConcept value) {
this.type = value;
@@ -216,7 +215,7 @@ public class Coverage extends DomainResource {
protected void listChildren(List children) {
super.listChildren(children);
- children.add(new Property("type", "CodeableConcept", "The type of classification for which an insurer-specific class label or number and optional name is provided, for example may be used to identify a class of coverage or employer group, Policy, Plan.", 0, 1, type));
+ children.add(new Property("type", "CodeableConcept", "The type of classification for which an insurer-specific class label or number and optional name is provided. For example, type may be used to identify a class of coverage or employer group, policy, or plan.", 0, 1, type));
children.add(new Property("value", "string", "The alphanumeric string value associated with the insurer issued label.", 0, 1, value));
children.add(new Property("name", "string", "A short description for the class.", 0, 1, name));
}
@@ -224,7 +223,7 @@ public class Coverage extends DomainResource {
@Override
public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException {
switch (_hash) {
- case 3575610: /*type*/ return new Property("type", "CodeableConcept", "The type of classification for which an insurer-specific class label or number and optional name is provided, for example may be used to identify a class of coverage or employer group, Policy, Plan.", 0, 1, type);
+ case 3575610: /*type*/ return new Property("type", "CodeableConcept", "The type of classification for which an insurer-specific class label or number and optional name is provided. For example, type may be used to identify a class of coverage or employer group, policy, or plan.", 0, 1, type);
case 111972721: /*value*/ return new Property("value", "string", "The alphanumeric string value associated with the insurer issued label.", 0, 1, value);
case 3373707: /*name*/ return new Property("name", "string", "A short description for the class.", 0, 1, name);
default: return super.getNamedProperty(_hash, _name, _checkValid);
@@ -691,10 +690,10 @@ public class Coverage extends DomainResource {
protected CodeableConcept type;
/**
- * The timeframe during when the exception is in force.
+ * The timeframe the exception is in force.
*/
@Child(name = "period", type = {Period.class}, order=2, min=0, max=1, modifier=false, summary=true)
- @Description(shortDefinition="The effective period of the exception", formalDefinition="The timeframe during when the exception is in force." )
+ @Description(shortDefinition="The effective period of the exception", formalDefinition="The timeframe the exception is in force." )
protected Period period;
private static final long serialVersionUID = 523191991L;
@@ -739,7 +738,7 @@ public class Coverage extends DomainResource {
}
/**
- * @return {@link #period} (The timeframe during when the exception is in force.)
+ * @return {@link #period} (The timeframe the exception is in force.)
*/
public Period getPeriod() {
if (this.period == null)
@@ -755,7 +754,7 @@ public class Coverage extends DomainResource {
}
/**
- * @param value {@link #period} (The timeframe during when the exception is in force.)
+ * @param value {@link #period} (The timeframe the exception is in force.)
*/
public ExemptionComponent setPeriod(Period value) {
this.period = value;
@@ -765,14 +764,14 @@ public class Coverage extends DomainResource {
protected void listChildren(List children) {
super.listChildren(children);
children.add(new Property("type", "CodeableConcept", "The code for the specific exception.", 0, 1, type));
- children.add(new Property("period", "Period", "The timeframe during when the exception is in force.", 0, 1, period));
+ children.add(new Property("period", "Period", "The timeframe the exception is in force.", 0, 1, period));
}
@Override
public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException {
switch (_hash) {
case 3575610: /*type*/ return new Property("type", "CodeableConcept", "The code for the specific exception.", 0, 1, type);
- case -991726143: /*period*/ return new Property("period", "Period", "The timeframe during when the exception is in force.", 0, 1, period);
+ case -991726143: /*period*/ return new Property("period", "Period", "The timeframe the exception is in force.", 0, 1, period);
default: return super.getNamedProperty(_hash, _name, _checkValid);
}
@@ -2329,4 +2328,5 @@ public class Coverage extends DomainResource {
public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE);
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CoverageEligibilityRequest.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CoverageEligibilityRequest.java
index a823a77f6..b411c77d1 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CoverageEligibilityRequest.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CoverageEligibilityRequest.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,23 +29,23 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
-import org.hl7.fhir.r5.model.Enumerations.FinancialResourceStatusCodes;
-import org.hl7.fhir.r5.model.Enumerations.FinancialResourceStatusCodesEnumFactory;
import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* The CoverageEligibilityRequest provides patient and insurance coverage information to an insurer for them to respond, in the form of an CoverageEligibilityResponse, with information regarding whether the stated coverage is valid and in-force and optionally to provide the insurance details of the policy.
@@ -2877,4 +2875,5 @@ public class CoverageEligibilityRequest extends DomainResource {
public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS);
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CoverageEligibilityResponse.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CoverageEligibilityResponse.java
index 3a55d40f4..5e0e4caa3 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CoverageEligibilityResponse.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CoverageEligibilityResponse.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,25 +29,23 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
-import org.hl7.fhir.r5.model.Enumerations.ClaimProcessingCodes;
-import org.hl7.fhir.r5.model.Enumerations.ClaimProcessingCodesEnumFactory;
-import org.hl7.fhir.r5.model.Enumerations.FinancialResourceStatusCodes;
-import org.hl7.fhir.r5.model.Enumerations.FinancialResourceStatusCodesEnumFactory;
import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* This resource provides eligibility and plan details from the processing of an CoverageEligibilityRequest resource.
@@ -3365,4 +3361,5 @@ public class CoverageEligibilityResponse extends DomainResource {
public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS);
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DataRequirement.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DataRequirement.java
index 51841edc4..12c69e8b9 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DataRequirement.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DataRequirement.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,22 +29,21 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseDatatypeElement;
-import org.hl7.fhir.instance.model.api.ICompositeType;
-import org.hl7.fhir.r5.model.Enumerations.FHIRAllTypes;
-import org.hl7.fhir.r5.model.Enumerations.FHIRAllTypesEnumFactory;
import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseDatatypeElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* Base StructureDefinition for DataRequirement Type: Describes a required data item for evaluation in terms of the type of data, and optional code or date-based filters of the data.
@@ -1907,4 +1904,5 @@ The value of mustSupport SHALL be a FHIRPath resolveable on the type of the Data
}
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DataType.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DataType.java
index 22511388e..8833576c7 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DataType.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DataType.java
@@ -1,12 +1,51 @@
package org.hl7.fhir.r5.model;
+/*
+ Copyright (c) 2011+, HL7, Inc.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modification, \
+ are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this \
+ list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, \
+ this list of conditions and the following disclaimer in the documentation \
+ and/or other materials provided with the distribution.
+ * Neither the name of HL7 nor the names of its contributors may be used to
+ endorse or promote products derived from this software without specific
+ prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND \
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED \
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. \
+ IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, \
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT \
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR \
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, \
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) \
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE \
+ POSSIBILITY OF SUCH DAMAGE.
+ */
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseDatatypeElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.DatatypeDef;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
import org.hl7.fhir.instance.model.api.IBaseDatatype;
-
import ca.uhn.fhir.model.api.IElement;
-import ca.uhn.fhir.model.api.annotation.DatatypeDef;
/**
* Base StructureDefinition for DataType Type: The base class for all re-useable types defined as part of the FHIR Specification.
*/
@@ -34,4 +73,5 @@ public abstract class DataType extends Element implements IBaseDatatype, IElemen
}
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DateTimeType.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DateTimeType.java
index 6d04f1e7e..1583bb1e3 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DateTimeType.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DateTimeType.java
@@ -1,12 +1,5 @@
package org.hl7.fhir.r5.model;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.TimeZone;
-import java.util.zip.DataFormatException;
-
-import org.apache.commons.lang3.time.DateUtils;
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -40,6 +33,12 @@ import org.apache.commons.lang3.time.DateUtils;
import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
+import org.apache.commons.lang3.time.DateUtils;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.TimeZone;
+import java.util.zip.DataFormatException;
/**
* Represents a FHIR dateTime datatype. Valid precisions values for this type are:
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DateType.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DateType.java
index 7a4ba8c36..2810a5bda 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DateType.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DateType.java
@@ -1,12 +1,5 @@
package org.hl7.fhir.r5.model;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.TimeZone;
-
-import org.apache.commons.lang3.Validate;
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -40,6 +33,12 @@ import org.apache.commons.lang3.Validate;
import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
+import org.apache.commons.lang3.Validate;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.TimeZone;
/**
* Primitive type "date" in FHIR: any day in a gregorian calendar
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DetectedIssue.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DetectedIssue.java
index 4a8536d8d..b90927e0b 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DetectedIssue.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DetectedIssue.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,23 +29,23 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
-import org.hl7.fhir.r5.model.Enumerations.ObservationStatus;
-import org.hl7.fhir.r5.model.Enumerations.ObservationStatusEnumFactory;
import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* Indicates an actual or potential clinical issue with or between one or more active or proposed clinical actions for a patient; e.g. Drug-drug interaction, Ineffective treatment frequency, Procedure-condition conflict, etc.
@@ -1727,7 +1725,7 @@ public class DetectedIssue extends DomainResource {
* Path: DetectedIssue.implicated
*
*/
- @SearchParamDefinition(name="implicated", path="DetectedIssue.implicated", description="Problem resource", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceFocus.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
+ @SearchParamDefinition(name="implicated", path="DetectedIssue.implicated", description="Problem resource", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
public static final String SP_IMPLICATED = "implicated";
/**
* Fluent Client search parameter constant for implicated
@@ -1760,7 +1758,7 @@ public class DetectedIssue extends DomainResource {
* [DeviceRequest](devicerequest.html): Business identifier for request/order
* [DiagnosticReport](diagnosticreport.html): An identifier for the report
* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents
-* [DocumentReference](documentreference.html): Master Version Specific Identifier
+* [DocumentReference](documentreference.html): Identifier of the attachment binary
* [Encounter](encounter.html): Identifier(s) by which this encounter is known
* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare
* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier
@@ -1782,10 +1780,10 @@ public class DetectedIssue extends DomainResource {
* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier
* Type: token
- * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.masterIdentifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
+ * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
*
*/
- @SearchParamDefinition(name="identifier", path="AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.masterIdentifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier", description="Multiple Resources: \r\n\r\n* [AllergyIntolerance](allergyintolerance.html): External ids for this item\r\n* [CarePlan](careplan.html): External Ids for this plan\r\n* [CareTeam](careteam.html): External Ids for this team\r\n* [Composition](composition.html): Version-independent identifier for the Composition\r\n* [Condition](condition.html): A unique identifier of the condition record\r\n* [Consent](consent.html): Identifier for this record (external references)\r\n* [DetectedIssue](detectedissue.html): Unique id for the detected issue\r\n* [DeviceRequest](devicerequest.html): Business identifier for request/order\r\n* [DiagnosticReport](diagnosticreport.html): An identifier for the report\r\n* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents\r\n* [DocumentReference](documentreference.html): Master Version Specific Identifier\r\n* [Encounter](encounter.html): Identifier(s) by which this encounter is known\r\n* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare\r\n* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier\r\n* [Goal](goal.html): External Ids for this goal\r\n* [ImagingStudy](imagingstudy.html): Identifiers for the Study, such as DICOM Study Instance UID and Accession number\r\n* [Immunization](immunization.html): Business identifier\r\n* [List](list.html): Business identifier\r\n* [MedicationAdministration](medicationadministration.html): Return administrations with this external identifier\r\n* [MedicationDispense](medicationdispense.html): Returns dispenses with this external identifier\r\n* [MedicationRequest](medicationrequest.html): Return prescriptions with this external identifier\r\n* [MedicationUsage](medicationusage.html): Return statements with this external identifier\r\n* [NutritionOrder](nutritionorder.html): Return nutrition orders with this external identifier\r\n* [Observation](observation.html): The unique id for a particular observation\r\n* [Procedure](procedure.html): A unique identifier for a procedure\r\n* [RiskAssessment](riskassessment.html): Unique identifier for the assessment\r\n* [ServiceRequest](servicerequest.html): Identifiers assigned to this order\r\n* [SupplyDelivery](supplydelivery.html): External identifier\r\n* [SupplyRequest](supplyrequest.html): Business Identifier for SupplyRequest\r\n* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier\r\n", type="token" )
+ @SearchParamDefinition(name="identifier", path="AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier", description="Multiple Resources: \r\n\r\n* [AllergyIntolerance](allergyintolerance.html): External ids for this item\r\n* [CarePlan](careplan.html): External Ids for this plan\r\n* [CareTeam](careteam.html): External Ids for this team\r\n* [Composition](composition.html): Version-independent identifier for the Composition\r\n* [Condition](condition.html): A unique identifier of the condition record\r\n* [Consent](consent.html): Identifier for this record (external references)\r\n* [DetectedIssue](detectedissue.html): Unique id for the detected issue\r\n* [DeviceRequest](devicerequest.html): Business identifier for request/order\r\n* [DiagnosticReport](diagnosticreport.html): An identifier for the report\r\n* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents\r\n* [DocumentReference](documentreference.html): Identifier of the attachment binary\r\n* [Encounter](encounter.html): Identifier(s) by which this encounter is known\r\n* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare\r\n* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier\r\n* [Goal](goal.html): External Ids for this goal\r\n* [ImagingStudy](imagingstudy.html): Identifiers for the Study, such as DICOM Study Instance UID and Accession number\r\n* [Immunization](immunization.html): Business identifier\r\n* [List](list.html): Business identifier\r\n* [MedicationAdministration](medicationadministration.html): Return administrations with this external identifier\r\n* [MedicationDispense](medicationdispense.html): Returns dispenses with this external identifier\r\n* [MedicationRequest](medicationrequest.html): Return prescriptions with this external identifier\r\n* [MedicationUsage](medicationusage.html): Return statements with this external identifier\r\n* [NutritionOrder](nutritionorder.html): Return nutrition orders with this external identifier\r\n* [Observation](observation.html): The unique id for a particular observation\r\n* [Procedure](procedure.html): A unique identifier for a procedure\r\n* [RiskAssessment](riskassessment.html): Unique identifier for the assessment\r\n* [ServiceRequest](servicerequest.html): Identifiers assigned to this order\r\n* [SupplyDelivery](supplydelivery.html): External identifier\r\n* [SupplyRequest](supplyrequest.html): Business Identifier for SupplyRequest\r\n* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier\r\n", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
* Fluent Client search parameter constant for identifier
@@ -1802,7 +1800,7 @@ public class DetectedIssue extends DomainResource {
* [DeviceRequest](devicerequest.html): Business identifier for request/order
* [DiagnosticReport](diagnosticreport.html): An identifier for the report
* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents
-* [DocumentReference](documentreference.html): Master Version Specific Identifier
+* [DocumentReference](documentreference.html): Identifier of the attachment binary
* [Encounter](encounter.html): Identifier(s) by which this encounter is known
* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare
* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier
@@ -1824,7 +1822,7 @@ public class DetectedIssue extends DomainResource {
* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier
* Type: token
- * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.masterIdentifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
+ * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
*
*/
public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
@@ -1924,4 +1922,5 @@ public class DetectedIssue extends DomainResource {
public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("DetectedIssue:patient").toLocked();
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Device.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Device.java
index dcc8b7557..07b530600 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Device.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Device.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,23 +29,23 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
-import org.hl7.fhir.r5.model.Enumerations.DeviceNameType;
-import org.hl7.fhir.r5.model.Enumerations.DeviceNameTypeEnumFactory;
import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* A type of a manufactured item that is used in the provision of healthcare without being substantially changed through that activity. The device may be a medical or non-medical device.
@@ -2511,18 +2509,18 @@ UDILabelName | UserFriendlyName | PatientReportedName | ManufactureDeviceName |
protected List udiCarrier;
/**
- * Status of the Device availability.
+ * Status of the Device record. This is not the status of the device like availability.
*/
@Child(name = "status", type = {CodeType.class}, order=4, min=0, max=1, modifier=true, summary=true)
- @Description(shortDefinition="active | inactive | entered-in-error | unknown", formalDefinition="Status of the Device availability." )
+ @Description(shortDefinition="active | inactive | entered-in-error | unknown", formalDefinition="Status of the Device record. This is not the status of the device like availability." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/device-status")
protected Enumeration status;
/**
- * Reason for the dtatus of the Device availability.
+ * Reason for the status of the Device record. For example, why is the record not active.
*/
@Child(name = "statusReason", type = {CodeableConcept.class}, order=5, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
- @Description(shortDefinition="online | paused | standby | offline | not-ready | transduc-discon | hw-discon | off", formalDefinition="Reason for the dtatus of the Device availability." )
+ @Description(shortDefinition="discarded | obsolete | removed", formalDefinition="Reason for the status of the Device record. For example, why is the record not active." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/device-status-reason")
protected List statusReason;
@@ -2598,10 +2596,11 @@ UDILabelName | UserFriendlyName | PatientReportedName | ManufactureDeviceName |
protected List type;
/**
- * The capabilities supported on a device, the standards to which the device conforms for a particular purpose, and used for the communication.
+ * The device function, including in some cases whether or not the functionality conforms to some standard. For example, a PHD blood pressure specialization indicates that the device conforms to the IEEE 11073-10407 Blood Pressure Specialization. This is NOT an alternate name or an additional descriptive name given by the manufacturer. That would be found in the deviceName element.
+In the PHD case, there are 11073 10101 nomenclature codes that define the specialization standards and that will be used, for example, in the PHD case for the specialization.systemType element. The specialization.version would be the version of the standard if the systemType referred to a standard.
*/
@Child(name = "specialization", type = {}, order=16, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
- @Description(shortDefinition="The capabilities supported on a device, the standards to which the device conforms for a particular purpose, and used for the communication", formalDefinition="The capabilities supported on a device, the standards to which the device conforms for a particular purpose, and used for the communication." )
+ @Description(shortDefinition="The capabilities supported on a device, the standards to which the device conforms for a particular purpose, and used for the communication", formalDefinition="The device function, including in some cases whether or not the functionality conforms to some standard. For example, a PHD blood pressure specialization indicates that the device conforms to the IEEE 11073-10407 Blood Pressure Specialization. This is NOT an alternate name or an additional descriptive name given by the manufacturer. That would be found in the deviceName element.\nIn the PHD case, there are 11073 10101 nomenclature codes that define the specialization standards and that will be used, for example, in the PHD case for the specialization.systemType element. The specialization.version would be the version of the standard if the systemType referred to a standard." )
protected List specialization;
/**
@@ -2877,7 +2876,7 @@ UDILabelName | UserFriendlyName | PatientReportedName | ManufactureDeviceName |
}
/**
- * @return {@link #status} (Status of the Device availability.). This is the underlying object with id, value and extensions. The accessor "getStatus" gives direct access to the value
+ * @return {@link #status} (Status of the Device record. This is not the status of the device like availability.). This is the underlying object with id, value and extensions. The accessor "getStatus" gives direct access to the value
*/
public Enumeration getStatusElement() {
if (this.status == null)
@@ -2897,7 +2896,7 @@ UDILabelName | UserFriendlyName | PatientReportedName | ManufactureDeviceName |
}
/**
- * @param value {@link #status} (Status of the Device availability.). This is the underlying object with id, value and extensions. The accessor "getStatus" gives direct access to the value
+ * @param value {@link #status} (Status of the Device record. This is not the status of the device like availability.). This is the underlying object with id, value and extensions. The accessor "getStatus" gives direct access to the value
*/
public Device setStatusElement(Enumeration value) {
this.status = value;
@@ -2905,14 +2904,14 @@ UDILabelName | UserFriendlyName | PatientReportedName | ManufactureDeviceName |
}
/**
- * @return Status of the Device availability.
+ * @return Status of the Device record. This is not the status of the device like availability.
*/
public FHIRDeviceStatus getStatus() {
return this.status == null ? null : this.status.getValue();
}
/**
- * @param value Status of the Device availability.
+ * @param value Status of the Device record. This is not the status of the device like availability.
*/
public Device setStatus(FHIRDeviceStatus value) {
if (value == null)
@@ -2926,7 +2925,7 @@ UDILabelName | UserFriendlyName | PatientReportedName | ManufactureDeviceName |
}
/**
- * @return {@link #statusReason} (Reason for the dtatus of the Device availability.)
+ * @return {@link #statusReason} (Reason for the status of the Device record. For example, why is the record not active.)
*/
public List getStatusReason() {
if (this.statusReason == null)
@@ -3477,7 +3476,8 @@ UDILabelName | UserFriendlyName | PatientReportedName | ManufactureDeviceName |
}
/**
- * @return {@link #specialization} (The capabilities supported on a device, the standards to which the device conforms for a particular purpose, and used for the communication.)
+ * @return {@link #specialization} (The device function, including in some cases whether or not the functionality conforms to some standard. For example, a PHD blood pressure specialization indicates that the device conforms to the IEEE 11073-10407 Blood Pressure Specialization. This is NOT an alternate name or an additional descriptive name given by the manufacturer. That would be found in the deviceName element.
+In the PHD case, there are 11073 10101 nomenclature codes that define the specialization standards and that will be used, for example, in the PHD case for the specialization.systemType element. The specialization.version would be the version of the standard if the systemType referred to a standard.)
*/
public List getSpecialization() {
if (this.specialization == null)
@@ -3993,8 +3993,8 @@ UDILabelName | UserFriendlyName | PatientReportedName | ManufactureDeviceName |
children.add(new Property("displayName", "string", "The name used to display by default when the device is referenced. Based on intent of use by the resource creator, this may reflect one of the names in Device.deviceName, or may be another simple name.", 0, 1, displayName));
children.add(new Property("definition", "Reference(DeviceDefinition)", "The reference to the definition for the device.", 0, 1, definition));
children.add(new Property("udiCarrier", "", "Unique device identifier (UDI) assigned to device label or package. Note that the Device may include multiple udiCarriers as it either may include just the udiCarrier for the jurisdiction it is sold, or for multiple jurisdictions it could have been sold.", 0, java.lang.Integer.MAX_VALUE, udiCarrier));
- children.add(new Property("status", "code", "Status of the Device availability.", 0, 1, status));
- children.add(new Property("statusReason", "CodeableConcept", "Reason for the dtatus of the Device availability.", 0, java.lang.Integer.MAX_VALUE, statusReason));
+ children.add(new Property("status", "code", "Status of the Device record. This is not the status of the device like availability.", 0, 1, status));
+ children.add(new Property("statusReason", "CodeableConcept", "Reason for the status of the Device record. For example, why is the record not active.", 0, java.lang.Integer.MAX_VALUE, statusReason));
children.add(new Property("distinctIdentifier", "string", "The distinct identification string as required by regulation for a human cell, tissue, or cellular and tissue-based product.", 0, 1, distinctIdentifier));
children.add(new Property("manufacturer", "string", "A name of the manufacturer or entity legally responsible for the device.", 0, 1, manufacturer));
children.add(new Property("manufactureDate", "dateTime", "The date and time when the device was manufactured.", 0, 1, manufactureDate));
@@ -4005,7 +4005,7 @@ UDILabelName | UserFriendlyName | PatientReportedName | ManufactureDeviceName |
children.add(new Property("modelNumber", "string", "The manufacturer's model number for the device.", 0, 1, modelNumber));
children.add(new Property("partNumber", "string", "The part number or catalog number of the device.", 0, 1, partNumber));
children.add(new Property("type", "CodeableConcept", "The kind or type of device. A device instance may have more than one type - in which case those are the types that apply to the specific instance of the device.", 0, java.lang.Integer.MAX_VALUE, type));
- children.add(new Property("specialization", "", "The capabilities supported on a device, the standards to which the device conforms for a particular purpose, and used for the communication.", 0, java.lang.Integer.MAX_VALUE, specialization));
+ children.add(new Property("specialization", "", "The device function, including in some cases whether or not the functionality conforms to some standard. For example, a PHD blood pressure specialization indicates that the device conforms to the IEEE 11073-10407 Blood Pressure Specialization. This is NOT an alternate name or an additional descriptive name given by the manufacturer. That would be found in the deviceName element.\nIn the PHD case, there are 11073 10101 nomenclature codes that define the specialization standards and that will be used, for example, in the PHD case for the specialization.systemType element. The specialization.version would be the version of the standard if the systemType referred to a standard.", 0, java.lang.Integer.MAX_VALUE, specialization));
children.add(new Property("version", "", "The actual design of the device or software version running on the device.", 0, java.lang.Integer.MAX_VALUE, version));
children.add(new Property("property", "", "The actual configuration settings of a device as it actually operates, e.g., regulation status, time properties.", 0, java.lang.Integer.MAX_VALUE, property));
children.add(new Property("patient", "Reference(Patient)", "Patient information, if the device is affixed to, or associated to a patient for their specific use, irrespective of the procedure, use, observation, or other activity that the device is involved in.", 0, 1, patient));
@@ -4027,8 +4027,8 @@ UDILabelName | UserFriendlyName | PatientReportedName | ManufactureDeviceName |
case 1714148973: /*displayName*/ return new Property("displayName", "string", "The name used to display by default when the device is referenced. Based on intent of use by the resource creator, this may reflect one of the names in Device.deviceName, or may be another simple name.", 0, 1, displayName);
case -1014418093: /*definition*/ return new Property("definition", "Reference(DeviceDefinition)", "The reference to the definition for the device.", 0, 1, definition);
case -1343558178: /*udiCarrier*/ return new Property("udiCarrier", "", "Unique device identifier (UDI) assigned to device label or package. Note that the Device may include multiple udiCarriers as it either may include just the udiCarrier for the jurisdiction it is sold, or for multiple jurisdictions it could have been sold.", 0, java.lang.Integer.MAX_VALUE, udiCarrier);
- case -892481550: /*status*/ return new Property("status", "code", "Status of the Device availability.", 0, 1, status);
- case 2051346646: /*statusReason*/ return new Property("statusReason", "CodeableConcept", "Reason for the dtatus of the Device availability.", 0, java.lang.Integer.MAX_VALUE, statusReason);
+ case -892481550: /*status*/ return new Property("status", "code", "Status of the Device record. This is not the status of the device like availability.", 0, 1, status);
+ case 2051346646: /*statusReason*/ return new Property("statusReason", "CodeableConcept", "Reason for the status of the Device record. For example, why is the record not active.", 0, java.lang.Integer.MAX_VALUE, statusReason);
case -1836176187: /*distinctIdentifier*/ return new Property("distinctIdentifier", "string", "The distinct identification string as required by regulation for a human cell, tissue, or cellular and tissue-based product.", 0, 1, distinctIdentifier);
case -1969347631: /*manufacturer*/ return new Property("manufacturer", "string", "A name of the manufacturer or entity legally responsible for the device.", 0, 1, manufacturer);
case 416714767: /*manufactureDate*/ return new Property("manufactureDate", "dateTime", "The date and time when the device was manufactured.", 0, 1, manufactureDate);
@@ -4039,7 +4039,7 @@ UDILabelName | UserFriendlyName | PatientReportedName | ManufactureDeviceName |
case 346619858: /*modelNumber*/ return new Property("modelNumber", "string", "The manufacturer's model number for the device.", 0, 1, modelNumber);
case -731502308: /*partNumber*/ return new Property("partNumber", "string", "The part number or catalog number of the device.", 0, 1, partNumber);
case 3575610: /*type*/ return new Property("type", "CodeableConcept", "The kind or type of device. A device instance may have more than one type - in which case those are the types that apply to the specific instance of the device.", 0, java.lang.Integer.MAX_VALUE, type);
- case 682815883: /*specialization*/ return new Property("specialization", "", "The capabilities supported on a device, the standards to which the device conforms for a particular purpose, and used for the communication.", 0, java.lang.Integer.MAX_VALUE, specialization);
+ case 682815883: /*specialization*/ return new Property("specialization", "", "The device function, including in some cases whether or not the functionality conforms to some standard. For example, a PHD blood pressure specialization indicates that the device conforms to the IEEE 11073-10407 Blood Pressure Specialization. This is NOT an alternate name or an additional descriptive name given by the manufacturer. That would be found in the deviceName element.\nIn the PHD case, there are 11073 10101 nomenclature codes that define the specialization standards and that will be used, for example, in the PHD case for the specialization.systemType element. The specialization.version would be the version of the standard if the systemType referred to a standard.", 0, java.lang.Integer.MAX_VALUE, specialization);
case 351608024: /*version*/ return new Property("version", "", "The actual design of the device or software version running on the device.", 0, java.lang.Integer.MAX_VALUE, version);
case -993141291: /*property*/ return new Property("property", "", "The actual configuration settings of a device as it actually operates, e.g., regulation status, time properties.", 0, java.lang.Integer.MAX_VALUE, property);
case -791418107: /*patient*/ return new Property("patient", "Reference(Patient)", "Patient information, if the device is affixed to, or associated to a patient for their specific use, irrespective of the procedure, use, observation, or other activity that the device is involved in.", 0, 1, patient);
@@ -5002,4 +5002,5 @@ UDILabelName | UserFriendlyName | PatientReportedName | ManufactureDeviceName |
public static final ca.uhn.fhir.rest.gclient.TokenClientParam DIN = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_DIN);
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DeviceDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DeviceDefinition.java
index 6c7e4bbeb..897f9bd87 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DeviceDefinition.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DeviceDefinition.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,22 +29,23 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
-import org.hl7.fhir.r5.model.Enumerations.DeviceNameType;
-import org.hl7.fhir.r5.model.Enumerations.DeviceNameTypeEnumFactory;
import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* The characteristics, operational status and capabilities of a medical-related component of a medical device.
@@ -3413,4 +3412,5 @@ UDILabelName | UserFriendlyName | PatientReportedName | ManufactureDeviceName |
public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE);
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DeviceMetric.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DeviceMetric.java
index e47844fd0..30ecdc3d5 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DeviceMetric.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DeviceMetric.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,20 +29,23 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.utilities.Utilities;
+import org.hl7.fhir.r5.model.Enumerations.*;
import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* Describes a measurement, calculation or setting capability of a medical device.
@@ -1907,4 +1908,5 @@ public class DeviceMetric extends DomainResource {
public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE);
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DeviceRequest.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DeviceRequest.java
index f5e5ee468..60e8ae71c 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DeviceRequest.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DeviceRequest.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,26 +29,23 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.utilities.Utilities;
+import org.hl7.fhir.r5.model.Enumerations.*;
import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
-import org.hl7.fhir.r5.model.Enumerations.RequestIntent;
-import org.hl7.fhir.r5.model.Enumerations.RequestIntentEnumFactory;
-import org.hl7.fhir.r5.model.Enumerations.RequestPriority;
-import org.hl7.fhir.r5.model.Enumerations.RequestPriorityEnumFactory;
-import org.hl7.fhir.r5.model.Enumerations.RequestStatus;
-import org.hl7.fhir.r5.model.Enumerations.RequestStatusEnumFactory;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* Represents a request for a patient to employ a medical device. The device may be an implantable device, or an external assistive device, such as a walker.
@@ -2085,7 +2080,7 @@ public class DeviceRequest extends DomainResource {
* Path: DeviceRequest.basedOn
*
*/
- @SearchParamDefinition(name="based-on", path="DeviceRequest.basedOn", description="Plan/proposal/order fulfilled by this request", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceFocus.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
+ @SearchParamDefinition(name="based-on", path="DeviceRequest.basedOn", description="Plan/proposal/order fulfilled by this request", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
public static final String SP_BASED_ON = "based-on";
/**
* Fluent Client search parameter constant for based-on
@@ -2295,7 +2290,7 @@ public class DeviceRequest extends DomainResource {
* Path: DeviceRequest.priorRequest
*
*/
- @SearchParamDefinition(name="prior-request", path="DeviceRequest.priorRequest", description="Request takes the place of referenced completed or terminated requests", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceFocus.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
+ @SearchParamDefinition(name="prior-request", path="DeviceRequest.priorRequest", description="Request takes the place of referenced completed or terminated requests", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
public static final String SP_PRIOR_REQUEST = "prior-request";
/**
* Fluent Client search parameter constant for prior-request
@@ -2456,10 +2451,10 @@ public class DeviceRequest extends DomainResource {
* [VisionPrescription](visionprescription.html): Return prescriptions with this encounter identifier
* Type: reference
- * Path: Composition.encounter | DeviceRequest.encounter | DiagnosticReport.encounter | DocumentReference.context.encounter | Flag.encounter | List.encounter | NutritionOrder.encounter | Observation.encounter | Procedure.encounter | RiskAssessment.encounter | ServiceRequest.encounter | VisionPrescription.encounter
+ * Path: Composition.encounter | DeviceRequest.encounter | DiagnosticReport.encounter | DocumentReference.encounter | Flag.encounter | List.encounter | NutritionOrder.encounter | Observation.encounter | Procedure.encounter | RiskAssessment.encounter | ServiceRequest.encounter | VisionPrescription.encounter
*
*/
- @SearchParamDefinition(name="encounter", path="Composition.encounter | DeviceRequest.encounter | DiagnosticReport.encounter | DocumentReference.context.encounter | Flag.encounter | List.encounter | NutritionOrder.encounter | Observation.encounter | Procedure.encounter | RiskAssessment.encounter | ServiceRequest.encounter | VisionPrescription.encounter", description="Multiple Resources: \r\n\r\n* [Composition](composition.html): Context of the Composition\r\n* [DeviceRequest](devicerequest.html): Encounter during which request was created\r\n* [DiagnosticReport](diagnosticreport.html): The Encounter when the order was made\r\n* [DocumentReference](documentreference.html): Context of the document content\r\n* [Flag](flag.html): Alert relevant during encounter\r\n* [List](list.html): Context in which list created\r\n* [NutritionOrder](nutritionorder.html): Return nutrition orders with this encounter identifier\r\n* [Observation](observation.html): Encounter related to the observation\r\n* [Procedure](procedure.html): The Encounter during which this Procedure was created\r\n* [RiskAssessment](riskassessment.html): Where was assessment performed?\r\n* [ServiceRequest](servicerequest.html): An encounter in which this request is made\r\n* [VisionPrescription](visionprescription.html): Return prescriptions with this encounter identifier\r\n", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Encounter") }, target={Encounter.class } )
+ @SearchParamDefinition(name="encounter", path="Composition.encounter | DeviceRequest.encounter | DiagnosticReport.encounter | DocumentReference.encounter | Flag.encounter | List.encounter | NutritionOrder.encounter | Observation.encounter | Procedure.encounter | RiskAssessment.encounter | ServiceRequest.encounter | VisionPrescription.encounter", description="Multiple Resources: \r\n\r\n* [Composition](composition.html): Context of the Composition\r\n* [DeviceRequest](devicerequest.html): Encounter during which request was created\r\n* [DiagnosticReport](diagnosticreport.html): The Encounter when the order was made\r\n* [DocumentReference](documentreference.html): Context of the document content\r\n* [Flag](flag.html): Alert relevant during encounter\r\n* [List](list.html): Context in which list created\r\n* [NutritionOrder](nutritionorder.html): Return nutrition orders with this encounter identifier\r\n* [Observation](observation.html): Encounter related to the observation\r\n* [Procedure](procedure.html): The Encounter during which this Procedure was created\r\n* [RiskAssessment](riskassessment.html): Where was assessment performed?\r\n* [ServiceRequest](servicerequest.html): An encounter in which this request is made\r\n* [VisionPrescription](visionprescription.html): Return prescriptions with this encounter identifier\r\n", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Encounter") }, target={Encounter.class } )
public static final String SP_ENCOUNTER = "encounter";
/**
* Fluent Client search parameter constant for encounter
@@ -2480,7 +2475,7 @@ public class DeviceRequest extends DomainResource {
* [VisionPrescription](visionprescription.html): Return prescriptions with this encounter identifier
* Type: reference
- * Path: Composition.encounter | DeviceRequest.encounter | DiagnosticReport.encounter | DocumentReference.context.encounter | Flag.encounter | List.encounter | NutritionOrder.encounter | Observation.encounter | Procedure.encounter | RiskAssessment.encounter | ServiceRequest.encounter | VisionPrescription.encounter
+ * Path: Composition.encounter | DeviceRequest.encounter | DiagnosticReport.encounter | DocumentReference.encounter | Flag.encounter | List.encounter | NutritionOrder.encounter | Observation.encounter | Procedure.encounter | RiskAssessment.encounter | ServiceRequest.encounter | VisionPrescription.encounter
*
*/
public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ENCOUNTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ENCOUNTER);
@@ -2506,7 +2501,7 @@ public class DeviceRequest extends DomainResource {
* [DeviceRequest](devicerequest.html): Business identifier for request/order
* [DiagnosticReport](diagnosticreport.html): An identifier for the report
* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents
-* [DocumentReference](documentreference.html): Master Version Specific Identifier
+* [DocumentReference](documentreference.html): Identifier of the attachment binary
* [Encounter](encounter.html): Identifier(s) by which this encounter is known
* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare
* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier
@@ -2528,10 +2523,10 @@ public class DeviceRequest extends DomainResource {
* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier
* Type: token
- * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.masterIdentifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
+ * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
*
*/
- @SearchParamDefinition(name="identifier", path="AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.masterIdentifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier", description="Multiple Resources: \r\n\r\n* [AllergyIntolerance](allergyintolerance.html): External ids for this item\r\n* [CarePlan](careplan.html): External Ids for this plan\r\n* [CareTeam](careteam.html): External Ids for this team\r\n* [Composition](composition.html): Version-independent identifier for the Composition\r\n* [Condition](condition.html): A unique identifier of the condition record\r\n* [Consent](consent.html): Identifier for this record (external references)\r\n* [DetectedIssue](detectedissue.html): Unique id for the detected issue\r\n* [DeviceRequest](devicerequest.html): Business identifier for request/order\r\n* [DiagnosticReport](diagnosticreport.html): An identifier for the report\r\n* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents\r\n* [DocumentReference](documentreference.html): Master Version Specific Identifier\r\n* [Encounter](encounter.html): Identifier(s) by which this encounter is known\r\n* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare\r\n* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier\r\n* [Goal](goal.html): External Ids for this goal\r\n* [ImagingStudy](imagingstudy.html): Identifiers for the Study, such as DICOM Study Instance UID and Accession number\r\n* [Immunization](immunization.html): Business identifier\r\n* [List](list.html): Business identifier\r\n* [MedicationAdministration](medicationadministration.html): Return administrations with this external identifier\r\n* [MedicationDispense](medicationdispense.html): Returns dispenses with this external identifier\r\n* [MedicationRequest](medicationrequest.html): Return prescriptions with this external identifier\r\n* [MedicationUsage](medicationusage.html): Return statements with this external identifier\r\n* [NutritionOrder](nutritionorder.html): Return nutrition orders with this external identifier\r\n* [Observation](observation.html): The unique id for a particular observation\r\n* [Procedure](procedure.html): A unique identifier for a procedure\r\n* [RiskAssessment](riskassessment.html): Unique identifier for the assessment\r\n* [ServiceRequest](servicerequest.html): Identifiers assigned to this order\r\n* [SupplyDelivery](supplydelivery.html): External identifier\r\n* [SupplyRequest](supplyrequest.html): Business Identifier for SupplyRequest\r\n* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier\r\n", type="token" )
+ @SearchParamDefinition(name="identifier", path="AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier", description="Multiple Resources: \r\n\r\n* [AllergyIntolerance](allergyintolerance.html): External ids for this item\r\n* [CarePlan](careplan.html): External Ids for this plan\r\n* [CareTeam](careteam.html): External Ids for this team\r\n* [Composition](composition.html): Version-independent identifier for the Composition\r\n* [Condition](condition.html): A unique identifier of the condition record\r\n* [Consent](consent.html): Identifier for this record (external references)\r\n* [DetectedIssue](detectedissue.html): Unique id for the detected issue\r\n* [DeviceRequest](devicerequest.html): Business identifier for request/order\r\n* [DiagnosticReport](diagnosticreport.html): An identifier for the report\r\n* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents\r\n* [DocumentReference](documentreference.html): Identifier of the attachment binary\r\n* [Encounter](encounter.html): Identifier(s) by which this encounter is known\r\n* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare\r\n* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier\r\n* [Goal](goal.html): External Ids for this goal\r\n* [ImagingStudy](imagingstudy.html): Identifiers for the Study, such as DICOM Study Instance UID and Accession number\r\n* [Immunization](immunization.html): Business identifier\r\n* [List](list.html): Business identifier\r\n* [MedicationAdministration](medicationadministration.html): Return administrations with this external identifier\r\n* [MedicationDispense](medicationdispense.html): Returns dispenses with this external identifier\r\n* [MedicationRequest](medicationrequest.html): Return prescriptions with this external identifier\r\n* [MedicationUsage](medicationusage.html): Return statements with this external identifier\r\n* [NutritionOrder](nutritionorder.html): Return nutrition orders with this external identifier\r\n* [Observation](observation.html): The unique id for a particular observation\r\n* [Procedure](procedure.html): A unique identifier for a procedure\r\n* [RiskAssessment](riskassessment.html): Unique identifier for the assessment\r\n* [ServiceRequest](servicerequest.html): Identifiers assigned to this order\r\n* [SupplyDelivery](supplydelivery.html): External identifier\r\n* [SupplyRequest](supplyrequest.html): Business Identifier for SupplyRequest\r\n* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier\r\n", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
* Fluent Client search parameter constant for identifier
@@ -2548,7 +2543,7 @@ public class DeviceRequest extends DomainResource {
* [DeviceRequest](devicerequest.html): Business identifier for request/order
* [DiagnosticReport](diagnosticreport.html): An identifier for the report
* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents
-* [DocumentReference](documentreference.html): Master Version Specific Identifier
+* [DocumentReference](documentreference.html): Identifier of the attachment binary
* [Encounter](encounter.html): Identifier(s) by which this encounter is known
* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare
* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier
@@ -2570,7 +2565,7 @@ public class DeviceRequest extends DomainResource {
* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier
* Type: token
- * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.masterIdentifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
+ * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
*
*/
public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
@@ -2670,4 +2665,5 @@ public class DeviceRequest extends DomainResource {
public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("DeviceRequest:patient").toLocked();
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DeviceUseStatement.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DeviceUseStatement.java
index a5d9a8a22..92c6e88cb 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DeviceUseStatement.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DeviceUseStatement.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,18 +29,23 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
+import org.hl7.fhir.utilities.Utilities;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
import org.hl7.fhir.exceptions.FHIRException;
-
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* A record of a device being used by a patient where the record is the result of a report from the patient or a clinician.
@@ -1562,4 +1565,5 @@ public class DeviceUseStatement extends DomainResource {
public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("DeviceUseStatement:patient").toLocked();
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DiagnosticReport.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DiagnosticReport.java
index b531cb49b..5eb1b8eb2 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DiagnosticReport.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DiagnosticReport.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,21 +29,23 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* The findings and interpretation of diagnostic tests performed on patients, groups of patients, devices, and locations, and/or specimens derived from these. The report includes clinical context such as requesting and provider information, and some mix of atomic results, images, textual and coded interpretations, and formatted representation of diagnostic reports.
@@ -2319,10 +2319,10 @@ public class DiagnosticReport extends DomainResource {
* [VisionPrescription](visionprescription.html): Return prescriptions with this encounter identifier
* Type: reference
- * Path: Composition.encounter | DeviceRequest.encounter | DiagnosticReport.encounter | DocumentReference.context.encounter | Flag.encounter | List.encounter | NutritionOrder.encounter | Observation.encounter | Procedure.encounter | RiskAssessment.encounter | ServiceRequest.encounter | VisionPrescription.encounter
+ * Path: Composition.encounter | DeviceRequest.encounter | DiagnosticReport.encounter | DocumentReference.encounter | Flag.encounter | List.encounter | NutritionOrder.encounter | Observation.encounter | Procedure.encounter | RiskAssessment.encounter | ServiceRequest.encounter | VisionPrescription.encounter
*
*/
- @SearchParamDefinition(name="encounter", path="Composition.encounter | DeviceRequest.encounter | DiagnosticReport.encounter | DocumentReference.context.encounter | Flag.encounter | List.encounter | NutritionOrder.encounter | Observation.encounter | Procedure.encounter | RiskAssessment.encounter | ServiceRequest.encounter | VisionPrescription.encounter", description="Multiple Resources: \r\n\r\n* [Composition](composition.html): Context of the Composition\r\n* [DeviceRequest](devicerequest.html): Encounter during which request was created\r\n* [DiagnosticReport](diagnosticreport.html): The Encounter when the order was made\r\n* [DocumentReference](documentreference.html): Context of the document content\r\n* [Flag](flag.html): Alert relevant during encounter\r\n* [List](list.html): Context in which list created\r\n* [NutritionOrder](nutritionorder.html): Return nutrition orders with this encounter identifier\r\n* [Observation](observation.html): Encounter related to the observation\r\n* [Procedure](procedure.html): The Encounter during which this Procedure was created\r\n* [RiskAssessment](riskassessment.html): Where was assessment performed?\r\n* [ServiceRequest](servicerequest.html): An encounter in which this request is made\r\n* [VisionPrescription](visionprescription.html): Return prescriptions with this encounter identifier\r\n", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Encounter") }, target={Encounter.class } )
+ @SearchParamDefinition(name="encounter", path="Composition.encounter | DeviceRequest.encounter | DiagnosticReport.encounter | DocumentReference.encounter | Flag.encounter | List.encounter | NutritionOrder.encounter | Observation.encounter | Procedure.encounter | RiskAssessment.encounter | ServiceRequest.encounter | VisionPrescription.encounter", description="Multiple Resources: \r\n\r\n* [Composition](composition.html): Context of the Composition\r\n* [DeviceRequest](devicerequest.html): Encounter during which request was created\r\n* [DiagnosticReport](diagnosticreport.html): The Encounter when the order was made\r\n* [DocumentReference](documentreference.html): Context of the document content\r\n* [Flag](flag.html): Alert relevant during encounter\r\n* [List](list.html): Context in which list created\r\n* [NutritionOrder](nutritionorder.html): Return nutrition orders with this encounter identifier\r\n* [Observation](observation.html): Encounter related to the observation\r\n* [Procedure](procedure.html): The Encounter during which this Procedure was created\r\n* [RiskAssessment](riskassessment.html): Where was assessment performed?\r\n* [ServiceRequest](servicerequest.html): An encounter in which this request is made\r\n* [VisionPrescription](visionprescription.html): Return prescriptions with this encounter identifier\r\n", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Encounter") }, target={Encounter.class } )
public static final String SP_ENCOUNTER = "encounter";
/**
* Fluent Client search parameter constant for encounter
@@ -2343,7 +2343,7 @@ public class DiagnosticReport extends DomainResource {
* [VisionPrescription](visionprescription.html): Return prescriptions with this encounter identifier
* Type: reference
- * Path: Composition.encounter | DeviceRequest.encounter | DiagnosticReport.encounter | DocumentReference.context.encounter | Flag.encounter | List.encounter | NutritionOrder.encounter | Observation.encounter | Procedure.encounter | RiskAssessment.encounter | ServiceRequest.encounter | VisionPrescription.encounter
+ * Path: Composition.encounter | DeviceRequest.encounter | DiagnosticReport.encounter | DocumentReference.encounter | Flag.encounter | List.encounter | NutritionOrder.encounter | Observation.encounter | Procedure.encounter | RiskAssessment.encounter | ServiceRequest.encounter | VisionPrescription.encounter
*
*/
public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ENCOUNTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ENCOUNTER);
@@ -2369,7 +2369,7 @@ public class DiagnosticReport extends DomainResource {
* [DeviceRequest](devicerequest.html): Business identifier for request/order
* [DiagnosticReport](diagnosticreport.html): An identifier for the report
* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents
-* [DocumentReference](documentreference.html): Master Version Specific Identifier
+* [DocumentReference](documentreference.html): Identifier of the attachment binary
* [Encounter](encounter.html): Identifier(s) by which this encounter is known
* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare
* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier
@@ -2391,10 +2391,10 @@ public class DiagnosticReport extends DomainResource {
* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier
* Type: token
- * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.masterIdentifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
+ * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
*
*/
- @SearchParamDefinition(name="identifier", path="AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.masterIdentifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier", description="Multiple Resources: \r\n\r\n* [AllergyIntolerance](allergyintolerance.html): External ids for this item\r\n* [CarePlan](careplan.html): External Ids for this plan\r\n* [CareTeam](careteam.html): External Ids for this team\r\n* [Composition](composition.html): Version-independent identifier for the Composition\r\n* [Condition](condition.html): A unique identifier of the condition record\r\n* [Consent](consent.html): Identifier for this record (external references)\r\n* [DetectedIssue](detectedissue.html): Unique id for the detected issue\r\n* [DeviceRequest](devicerequest.html): Business identifier for request/order\r\n* [DiagnosticReport](diagnosticreport.html): An identifier for the report\r\n* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents\r\n* [DocumentReference](documentreference.html): Master Version Specific Identifier\r\n* [Encounter](encounter.html): Identifier(s) by which this encounter is known\r\n* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare\r\n* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier\r\n* [Goal](goal.html): External Ids for this goal\r\n* [ImagingStudy](imagingstudy.html): Identifiers for the Study, such as DICOM Study Instance UID and Accession number\r\n* [Immunization](immunization.html): Business identifier\r\n* [List](list.html): Business identifier\r\n* [MedicationAdministration](medicationadministration.html): Return administrations with this external identifier\r\n* [MedicationDispense](medicationdispense.html): Returns dispenses with this external identifier\r\n* [MedicationRequest](medicationrequest.html): Return prescriptions with this external identifier\r\n* [MedicationUsage](medicationusage.html): Return statements with this external identifier\r\n* [NutritionOrder](nutritionorder.html): Return nutrition orders with this external identifier\r\n* [Observation](observation.html): The unique id for a particular observation\r\n* [Procedure](procedure.html): A unique identifier for a procedure\r\n* [RiskAssessment](riskassessment.html): Unique identifier for the assessment\r\n* [ServiceRequest](servicerequest.html): Identifiers assigned to this order\r\n* [SupplyDelivery](supplydelivery.html): External identifier\r\n* [SupplyRequest](supplyrequest.html): Business Identifier for SupplyRequest\r\n* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier\r\n", type="token" )
+ @SearchParamDefinition(name="identifier", path="AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier", description="Multiple Resources: \r\n\r\n* [AllergyIntolerance](allergyintolerance.html): External ids for this item\r\n* [CarePlan](careplan.html): External Ids for this plan\r\n* [CareTeam](careteam.html): External Ids for this team\r\n* [Composition](composition.html): Version-independent identifier for the Composition\r\n* [Condition](condition.html): A unique identifier of the condition record\r\n* [Consent](consent.html): Identifier for this record (external references)\r\n* [DetectedIssue](detectedissue.html): Unique id for the detected issue\r\n* [DeviceRequest](devicerequest.html): Business identifier for request/order\r\n* [DiagnosticReport](diagnosticreport.html): An identifier for the report\r\n* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents\r\n* [DocumentReference](documentreference.html): Identifier of the attachment binary\r\n* [Encounter](encounter.html): Identifier(s) by which this encounter is known\r\n* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare\r\n* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier\r\n* [Goal](goal.html): External Ids for this goal\r\n* [ImagingStudy](imagingstudy.html): Identifiers for the Study, such as DICOM Study Instance UID and Accession number\r\n* [Immunization](immunization.html): Business identifier\r\n* [List](list.html): Business identifier\r\n* [MedicationAdministration](medicationadministration.html): Return administrations with this external identifier\r\n* [MedicationDispense](medicationdispense.html): Returns dispenses with this external identifier\r\n* [MedicationRequest](medicationrequest.html): Return prescriptions with this external identifier\r\n* [MedicationUsage](medicationusage.html): Return statements with this external identifier\r\n* [NutritionOrder](nutritionorder.html): Return nutrition orders with this external identifier\r\n* [Observation](observation.html): The unique id for a particular observation\r\n* [Procedure](procedure.html): A unique identifier for a procedure\r\n* [RiskAssessment](riskassessment.html): Unique identifier for the assessment\r\n* [ServiceRequest](servicerequest.html): Identifiers assigned to this order\r\n* [SupplyDelivery](supplydelivery.html): External identifier\r\n* [SupplyRequest](supplyrequest.html): Business Identifier for SupplyRequest\r\n* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier\r\n", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
* Fluent Client search parameter constant for identifier
@@ -2411,7 +2411,7 @@ public class DiagnosticReport extends DomainResource {
* [DeviceRequest](devicerequest.html): Business identifier for request/order
* [DiagnosticReport](diagnosticreport.html): An identifier for the report
* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents
-* [DocumentReference](documentreference.html): Master Version Specific Identifier
+* [DocumentReference](documentreference.html): Identifier of the attachment binary
* [Encounter](encounter.html): Identifier(s) by which this encounter is known
* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare
* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier
@@ -2433,7 +2433,7 @@ public class DiagnosticReport extends DomainResource {
* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier
* Type: token
- * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.masterIdentifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
+ * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
*
*/
public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
@@ -2532,31 +2532,6 @@ public class DiagnosticReport extends DomainResource {
*/
public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("DiagnosticReport:patient").toLocked();
- /**
- * Search parameter: assessed-condition
- *
- * Description: Condition assessed by genetic test
- * Type: reference
- * Path: DiagnosticReport.extension('http://hl7.org/fhir/StructureDefinition/DiagnosticReport-geneticsAssessedCondition')
- *
- */
- @SearchParamDefinition(name="assessed-condition", path="DiagnosticReport.extension('http://hl7.org/fhir/StructureDefinition/DiagnosticReport-geneticsAssessedCondition')", description="Condition assessed by genetic test", type="reference" )
- public static final String SP_ASSESSED_CONDITION = "assessed-condition";
- /**
- * Fluent Client search parameter constant for assessed-condition
- *
- * Description: Condition assessed by genetic test
- * Type: reference
- * Path: DiagnosticReport.extension('http://hl7.org/fhir/StructureDefinition/DiagnosticReport-geneticsAssessedCondition')
- *
- */
- public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ASSESSED_CONDITION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ASSESSED_CONDITION);
-/**
- * Constant for fluent queries to be used to add include statements. Specifies
- * the path value of "DiagnosticReport:assessed-condition".
- */
- public static final ca.uhn.fhir.model.api.Include INCLUDE_ASSESSED_CONDITION = new ca.uhn.fhir.model.api.Include("DiagnosticReport:assessed-condition").toLocked();
+}
-
-}
\ No newline at end of file
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Distance.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Distance.java
index d5dd71aec..13e07d6a8 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Distance.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Distance.java
@@ -1,11 +1,48 @@
package org.hl7.fhir.r5.model;
+/*
+ Copyright (c) 2011+, HL7, Inc.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modification, \
+ are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this \
+ list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, \
+ this list of conditions and the following disclaimer in the documentation \
+ and/or other materials provided with the distribution.
+ * Neither the name of HL7 nor the names of its contributors may be used to
+ endorse or promote products derived from this software without specific
+ prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND \
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED \
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. \
+ IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, \
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT \
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR \
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, \
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) \
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE \
+ POSSIBILITY OF SUCH DAMAGE.
+ */
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseDatatypeElement;
+import org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.instance.model.api.ICompositeType;
-
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* Base StructureDefinition for Distance Type: A length - a value with a unit that is a physical distance.
@@ -42,4 +79,5 @@ public class Distance extends Quantity implements ICompositeType {
}
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DocumentManifest.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DocumentManifest.java
index 696661d88..58813a852 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DocumentManifest.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DocumentManifest.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,23 +29,23 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
-import org.hl7.fhir.r5.model.Enumerations.DocumentReferenceStatus;
-import org.hl7.fhir.r5.model.Enumerations.DocumentReferenceStatusEnumFactory;
import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* A collection of documents compiled for a purpose together with metadata that applies to the collection.
@@ -1268,7 +1266,7 @@ public class DocumentManifest extends DomainResource {
* Path: DocumentManifest.content
*
*/
- @SearchParamDefinition(name="item", path="DocumentManifest.content", description="Items in manifest", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceFocus.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
+ @SearchParamDefinition(name="item", path="DocumentManifest.content", description="Items in manifest", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
public static final String SP_ITEM = "item";
/**
* Fluent Client search parameter constant for item
@@ -1340,7 +1338,7 @@ public class DocumentManifest extends DomainResource {
* Path: DocumentManifest.related.ref
*
*/
- @SearchParamDefinition(name="related-ref", path="DocumentManifest.related.ref", description="Related Resource", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Encounter") }, target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceFocus.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
+ @SearchParamDefinition(name="related-ref", path="DocumentManifest.related.ref", description="Related Resource", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Encounter") }, target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
public static final String SP_RELATED_REF = "related-ref";
/**
* Fluent Client search parameter constant for related-ref
@@ -1439,7 +1437,7 @@ public class DocumentManifest extends DomainResource {
* [DeviceRequest](devicerequest.html): Business identifier for request/order
* [DiagnosticReport](diagnosticreport.html): An identifier for the report
* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents
-* [DocumentReference](documentreference.html): Master Version Specific Identifier
+* [DocumentReference](documentreference.html): Identifier of the attachment binary
* [Encounter](encounter.html): Identifier(s) by which this encounter is known
* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare
* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier
@@ -1461,10 +1459,10 @@ public class DocumentManifest extends DomainResource {
* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier
* Type: token
- * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.masterIdentifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
+ * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
*
*/
- @SearchParamDefinition(name="identifier", path="AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.masterIdentifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier", description="Multiple Resources: \r\n\r\n* [AllergyIntolerance](allergyintolerance.html): External ids for this item\r\n* [CarePlan](careplan.html): External Ids for this plan\r\n* [CareTeam](careteam.html): External Ids for this team\r\n* [Composition](composition.html): Version-independent identifier for the Composition\r\n* [Condition](condition.html): A unique identifier of the condition record\r\n* [Consent](consent.html): Identifier for this record (external references)\r\n* [DetectedIssue](detectedissue.html): Unique id for the detected issue\r\n* [DeviceRequest](devicerequest.html): Business identifier for request/order\r\n* [DiagnosticReport](diagnosticreport.html): An identifier for the report\r\n* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents\r\n* [DocumentReference](documentreference.html): Master Version Specific Identifier\r\n* [Encounter](encounter.html): Identifier(s) by which this encounter is known\r\n* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare\r\n* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier\r\n* [Goal](goal.html): External Ids for this goal\r\n* [ImagingStudy](imagingstudy.html): Identifiers for the Study, such as DICOM Study Instance UID and Accession number\r\n* [Immunization](immunization.html): Business identifier\r\n* [List](list.html): Business identifier\r\n* [MedicationAdministration](medicationadministration.html): Return administrations with this external identifier\r\n* [MedicationDispense](medicationdispense.html): Returns dispenses with this external identifier\r\n* [MedicationRequest](medicationrequest.html): Return prescriptions with this external identifier\r\n* [MedicationUsage](medicationusage.html): Return statements with this external identifier\r\n* [NutritionOrder](nutritionorder.html): Return nutrition orders with this external identifier\r\n* [Observation](observation.html): The unique id for a particular observation\r\n* [Procedure](procedure.html): A unique identifier for a procedure\r\n* [RiskAssessment](riskassessment.html): Unique identifier for the assessment\r\n* [ServiceRequest](servicerequest.html): Identifiers assigned to this order\r\n* [SupplyDelivery](supplydelivery.html): External identifier\r\n* [SupplyRequest](supplyrequest.html): Business Identifier for SupplyRequest\r\n* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier\r\n", type="token" )
+ @SearchParamDefinition(name="identifier", path="AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier", description="Multiple Resources: \r\n\r\n* [AllergyIntolerance](allergyintolerance.html): External ids for this item\r\n* [CarePlan](careplan.html): External Ids for this plan\r\n* [CareTeam](careteam.html): External Ids for this team\r\n* [Composition](composition.html): Version-independent identifier for the Composition\r\n* [Condition](condition.html): A unique identifier of the condition record\r\n* [Consent](consent.html): Identifier for this record (external references)\r\n* [DetectedIssue](detectedissue.html): Unique id for the detected issue\r\n* [DeviceRequest](devicerequest.html): Business identifier for request/order\r\n* [DiagnosticReport](diagnosticreport.html): An identifier for the report\r\n* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents\r\n* [DocumentReference](documentreference.html): Identifier of the attachment binary\r\n* [Encounter](encounter.html): Identifier(s) by which this encounter is known\r\n* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare\r\n* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier\r\n* [Goal](goal.html): External Ids for this goal\r\n* [ImagingStudy](imagingstudy.html): Identifiers for the Study, such as DICOM Study Instance UID and Accession number\r\n* [Immunization](immunization.html): Business identifier\r\n* [List](list.html): Business identifier\r\n* [MedicationAdministration](medicationadministration.html): Return administrations with this external identifier\r\n* [MedicationDispense](medicationdispense.html): Returns dispenses with this external identifier\r\n* [MedicationRequest](medicationrequest.html): Return prescriptions with this external identifier\r\n* [MedicationUsage](medicationusage.html): Return statements with this external identifier\r\n* [NutritionOrder](nutritionorder.html): Return nutrition orders with this external identifier\r\n* [Observation](observation.html): The unique id for a particular observation\r\n* [Procedure](procedure.html): A unique identifier for a procedure\r\n* [RiskAssessment](riskassessment.html): Unique identifier for the assessment\r\n* [ServiceRequest](servicerequest.html): Identifiers assigned to this order\r\n* [SupplyDelivery](supplydelivery.html): External identifier\r\n* [SupplyRequest](supplyrequest.html): Business Identifier for SupplyRequest\r\n* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier\r\n", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
* Fluent Client search parameter constant for identifier
@@ -1481,7 +1479,7 @@ public class DocumentManifest extends DomainResource {
* [DeviceRequest](devicerequest.html): Business identifier for request/order
* [DiagnosticReport](diagnosticreport.html): An identifier for the report
* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents
-* [DocumentReference](documentreference.html): Master Version Specific Identifier
+* [DocumentReference](documentreference.html): Identifier of the attachment binary
* [Encounter](encounter.html): Identifier(s) by which this encounter is known
* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare
* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier
@@ -1503,7 +1501,7 @@ public class DocumentManifest extends DomainResource {
* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier
* Type: token
- * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.masterIdentifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
+ * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
*
*/
public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
@@ -1639,4 +1637,5 @@ public class DocumentManifest extends DomainResource {
public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE);
-}
\ No newline at end of file
+}
+
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DocumentReference.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DocumentReference.java
index 35cb7b09c..8a3d9e733 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DocumentReference.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DocumentReference.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,27 +29,23 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent
+// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
-import org.hl7.fhir.r5.model.Enumerations.CompositionStatus;
-import org.hl7.fhir.r5.model.Enumerations.CompositionStatusEnumFactory;
-import org.hl7.fhir.r5.model.Enumerations.DocumentReferenceStatus;
-import org.hl7.fhir.r5.model.Enumerations.DocumentReferenceStatusEnumFactory;
-import org.hl7.fhir.r5.model.Enumerations.DocumentRelationshipType;
-import org.hl7.fhir.r5.model.Enumerations.DocumentRelationshipTypeEnumFactory;
import org.hl7.fhir.utilities.Utilities;
-
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Description;
+import org.hl7.fhir.r5.model.Enumerations.*;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.instance.model.api.ICompositeType;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
+import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.ChildOrder;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.Block;
/**
* A reference to a document of any kind for any purpose. While the term “document” implies a more narrow focus, for this resource this "document" encompasses *any* serialized object with a mime-type, it includes formal patient-centric documents (CDA), clinical notes, scanned paper, non-patient specific documents like policy text, as well as a photo, video, or audio recording acquired or used in healthcare. The DocumentReference resource provides metadata about the document so that the document can be discovered and managed. The actual content may be inline base64 encoded data or provided by direct reference.
@@ -59,6 +53,433 @@ import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
@ResourceDef(name="DocumentReference", profile="http://hl7.org/fhir/StructureDefinition/DocumentReference")
public class DocumentReference extends DomainResource {
+ public enum DocumentAttestationMode {
+ /**
+ * The person authenticated the content in their personal capacity.
+ */
+ PERSONAL,
+ /**
+ * The person authenticated the content in their professional capacity.
+ */
+ PROFESSIONAL,
+ /**
+ * The person authenticated the content and accepted legal responsibility for its content.
+ */
+ LEGAL,
+ /**
+ * The organization authenticated the content as consistent with their policies and procedures.
+ */
+ OFFICIAL,
+ /**
+ * added to help the parsers with the generic types
+ */
+ NULL;
+ public static DocumentAttestationMode fromCode(String codeString) throws FHIRException {
+ if (codeString == null || "".equals(codeString))
+ return null;
+ if ("personal".equals(codeString))
+ return PERSONAL;
+ if ("professional".equals(codeString))
+ return PROFESSIONAL;
+ if ("legal".equals(codeString))
+ return LEGAL;
+ if ("official".equals(codeString))
+ return OFFICIAL;
+ if (Configuration.isAcceptInvalidEnums())
+ return null;
+ else
+ throw new FHIRException("Unknown DocumentAttestationMode code '"+codeString+"'");
+ }
+ public String toCode() {
+ switch (this) {
+ case PERSONAL: return "personal";
+ case PROFESSIONAL: return "professional";
+ case LEGAL: return "legal";
+ case OFFICIAL: return "official";
+ default: return "?";
+ }
+ }
+ public String getSystem() {
+ switch (this) {
+ case PERSONAL: return "http://hl7.org/fhir/document-attestation-mode";
+ case PROFESSIONAL: return "http://hl7.org/fhir/document-attestation-mode";
+ case LEGAL: return "http://hl7.org/fhir/document-attestation-mode";
+ case OFFICIAL: return "http://hl7.org/fhir/document-attestation-mode";
+ default: return "?";
+ }
+ }
+ public String getDefinition() {
+ switch (this) {
+ case PERSONAL: return "The person authenticated the content in their personal capacity.";
+ case PROFESSIONAL: return "The person authenticated the content in their professional capacity.";
+ case LEGAL: return "The person authenticated the content and accepted legal responsibility for its content.";
+ case OFFICIAL: return "The organization authenticated the content as consistent with their policies and procedures.";
+ default: return "?";
+ }
+ }
+ public String getDisplay() {
+ switch (this) {
+ case PERSONAL: return "Personal";
+ case PROFESSIONAL: return "Professional";
+ case LEGAL: return "Legal";
+ case OFFICIAL: return "Official";
+ default: return "?";
+ }
+ }
+ }
+
+ public static class DocumentAttestationModeEnumFactory implements EnumFactory {
+ public DocumentAttestationMode fromCode(String codeString) throws IllegalArgumentException {
+ if (codeString == null || "".equals(codeString))
+ if (codeString == null || "".equals(codeString))
+ return null;
+ if ("personal".equals(codeString))
+ return DocumentAttestationMode.PERSONAL;
+ if ("professional".equals(codeString))
+ return DocumentAttestationMode.PROFESSIONAL;
+ if ("legal".equals(codeString))
+ return DocumentAttestationMode.LEGAL;
+ if ("official".equals(codeString))
+ return DocumentAttestationMode.OFFICIAL;
+ throw new IllegalArgumentException("Unknown DocumentAttestationMode code '"+codeString+"'");
+ }
+ public Enumeration fromType(Base code) throws FHIRException {
+ if (code == null)
+ return null;
+ if (code.isEmpty())
+ return new Enumeration(this);
+ String codeString = ((PrimitiveType) code).asStringValue();
+ if (codeString == null || "".equals(codeString))
+ return null;
+ if ("personal".equals(codeString))
+ return new Enumeration(this, DocumentAttestationMode.PERSONAL);
+ if ("professional".equals(codeString))
+ return new Enumeration(this, DocumentAttestationMode.PROFESSIONAL);
+ if ("legal".equals(codeString))
+ return new Enumeration(this, DocumentAttestationMode.LEGAL);
+ if ("official".equals(codeString))
+ return new Enumeration(this, DocumentAttestationMode.OFFICIAL);
+ throw new FHIRException("Unknown DocumentAttestationMode code '"+codeString+"'");
+ }
+ public String toCode(DocumentAttestationMode code) {
+ if (code == DocumentAttestationMode.PERSONAL)
+ return "personal";
+ if (code == DocumentAttestationMode.PROFESSIONAL)
+ return "professional";
+ if (code == DocumentAttestationMode.LEGAL)
+ return "legal";
+ if (code == DocumentAttestationMode.OFFICIAL)
+ return "official";
+ return "?";
+ }
+ public String toSystem(DocumentAttestationMode code) {
+ return code.getSystem();
+ }
+ }
+
+ @Block()
+ public static class DocumentReferenceAttesterComponent extends BackboneElement implements IBaseBackboneElement {
+ /**
+ * The type of attestation the authenticator offers.
+ */
+ @Child(name = "mode", type = {CodeType.class}, order=1, min=1, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="personal | professional | legal | official", formalDefinition="The type of attestation the authenticator offers." )
+ @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/document-attestation-mode")
+ protected Enumeration mode;
+
+ /**
+ * When the composition was attested by the party.
+ */
+ @Child(name = "time", type = {DateTimeType.class}, order=2, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="When the composition was attested", formalDefinition="When the composition was attested by the party." )
+ protected DateTimeType time;
+
+ /**
+ * Who attested the composition in the specified way.
+ */
+ @Child(name = "party", type = {Patient.class, RelatedPerson.class, Practitioner.class, PractitionerRole.class, Organization.class}, order=3, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Who attested the composition", formalDefinition="Who attested the composition in the specified way." )
+ protected Reference party;
+
+ private static final long serialVersionUID = -437585715L;
+
+ /**
+ * Constructor
+ */
+ public DocumentReferenceAttesterComponent() {
+ super();
+ }
+
+ /**
+ * Constructor
+ */
+ public DocumentReferenceAttesterComponent(DocumentAttestationMode mode) {
+ super();
+ this.setMode(mode);
+ }
+
+ /**
+ * @return {@link #mode} (The type of attestation the authenticator offers.). This is the underlying object with id, value and extensions. The accessor "getMode" gives direct access to the value
+ */
+ public Enumeration getModeElement() {
+ if (this.mode == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create DocumentReferenceAttesterComponent.mode");
+ else if (Configuration.doAutoCreate())
+ this.mode = new Enumeration(new DocumentAttestationModeEnumFactory()); // bb
+ return this.mode;
+ }
+
+ public boolean hasModeElement() {
+ return this.mode != null && !this.mode.isEmpty();
+ }
+
+ public boolean hasMode() {
+ return this.mode != null && !this.mode.isEmpty();
+ }
+
+ /**
+ * @param value {@link #mode} (The type of attestation the authenticator offers.). This is the underlying object with id, value and extensions. The accessor "getMode" gives direct access to the value
+ */
+ public DocumentReferenceAttesterComponent setModeElement(Enumeration value) {
+ this.mode = value;
+ return this;
+ }
+
+ /**
+ * @return The type of attestation the authenticator offers.
+ */
+ public DocumentAttestationMode getMode() {
+ return this.mode == null ? null : this.mode.getValue();
+ }
+
+ /**
+ * @param value The type of attestation the authenticator offers.
+ */
+ public DocumentReferenceAttesterComponent setMode(DocumentAttestationMode value) {
+ if (this.mode == null)
+ this.mode = new Enumeration(new DocumentAttestationModeEnumFactory());
+ this.mode.setValue(value);
+ return this;
+ }
+
+ /**
+ * @return {@link #time} (When the composition was attested by the party.). This is the underlying object with id, value and extensions. The accessor "getTime" gives direct access to the value
+ */
+ public DateTimeType getTimeElement() {
+ if (this.time == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create DocumentReferenceAttesterComponent.time");
+ else if (Configuration.doAutoCreate())
+ this.time = new DateTimeType(); // bb
+ return this.time;
+ }
+
+ public boolean hasTimeElement() {
+ return this.time != null && !this.time.isEmpty();
+ }
+
+ public boolean hasTime() {
+ return this.time != null && !this.time.isEmpty();
+ }
+
+ /**
+ * @param value {@link #time} (When the composition was attested by the party.). This is the underlying object with id, value and extensions. The accessor "getTime" gives direct access to the value
+ */
+ public DocumentReferenceAttesterComponent setTimeElement(DateTimeType value) {
+ this.time = value;
+ return this;
+ }
+
+ /**
+ * @return When the composition was attested by the party.
+ */
+ public Date getTime() {
+ return this.time == null ? null : this.time.getValue();
+ }
+
+ /**
+ * @param value When the composition was attested by the party.
+ */
+ public DocumentReferenceAttesterComponent setTime(Date value) {
+ if (value == null)
+ this.time = null;
+ else {
+ if (this.time == null)
+ this.time = new DateTimeType();
+ this.time.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #party} (Who attested the composition in the specified way.)
+ */
+ public Reference getParty() {
+ if (this.party == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create DocumentReferenceAttesterComponent.party");
+ else if (Configuration.doAutoCreate())
+ this.party = new Reference(); // cc
+ return this.party;
+ }
+
+ public boolean hasParty() {
+ return this.party != null && !this.party.isEmpty();
+ }
+
+ /**
+ * @param value {@link #party} (Who attested the composition in the specified way.)
+ */
+ public DocumentReferenceAttesterComponent setParty(Reference value) {
+ this.party = value;
+ return this;
+ }
+
+ protected void listChildren(List