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 children) { + super.listChildren(children); + children.add(new Property("mode", "code", "The type of attestation the authenticator offers.", 0, 1, mode)); + children.add(new Property("time", "dateTime", "When the composition was attested by the party.", 0, 1, time)); + children.add(new Property("party", "Reference(Patient|RelatedPerson|Practitioner|PractitionerRole|Organization)", "Who attested the composition in the specified way.", 0, 1, party)); + } + + @Override + public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { + switch (_hash) { + case 3357091: /*mode*/ return new Property("mode", "code", "The type of attestation the authenticator offers.", 0, 1, mode); + case 3560141: /*time*/ return new Property("time", "dateTime", "When the composition was attested by the party.", 0, 1, time); + case 106437350: /*party*/ return new Property("party", "Reference(Patient|RelatedPerson|Practitioner|PractitionerRole|Organization)", "Who attested the composition in the specified way.", 0, 1, party); + default: return super.getNamedProperty(_hash, _name, _checkValid); + } + + } + + @Override + public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException { + switch (hash) { + case 3357091: /*mode*/ return this.mode == null ? new Base[0] : new Base[] {this.mode}; // Enumeration + case 3560141: /*time*/ return this.time == null ? new Base[0] : new Base[] {this.time}; // DateTimeType + case 106437350: /*party*/ return this.party == null ? new Base[0] : new Base[] {this.party}; // Reference + default: return super.getProperty(hash, name, checkValid); + } + + } + + @Override + public Base setProperty(int hash, String name, Base value) throws FHIRException { + switch (hash) { + case 3357091: // mode + value = new DocumentAttestationModeEnumFactory().fromType(TypeConvertor.castToCode(value)); + this.mode = (Enumeration) value; // Enumeration + return value; + case 3560141: // time + this.time = TypeConvertor.castToDateTime(value); // DateTimeType + return value; + case 106437350: // party + this.party = TypeConvertor.castToReference(value); // Reference + return value; + default: return super.setProperty(hash, name, value); + } + + } + + @Override + public Base setProperty(String name, Base value) throws FHIRException { + if (name.equals("mode")) { + value = new DocumentAttestationModeEnumFactory().fromType(TypeConvertor.castToCode(value)); + this.mode = (Enumeration) value; // Enumeration + } else if (name.equals("time")) { + this.time = TypeConvertor.castToDateTime(value); // DateTimeType + } else if (name.equals("party")) { + this.party = TypeConvertor.castToReference(value); // Reference + } else + return super.setProperty(name, value); + return value; + } + + @Override + public Base makeProperty(int hash, String name) throws FHIRException { + switch (hash) { + case 3357091: return getModeElement(); + case 3560141: return getTimeElement(); + case 106437350: return getParty(); + default: return super.makeProperty(hash, name); + } + + } + + @Override + public String[] getTypesForProperty(int hash, String name) throws FHIRException { + switch (hash) { + case 3357091: /*mode*/ return new String[] {"code"}; + case 3560141: /*time*/ return new String[] {"dateTime"}; + case 106437350: /*party*/ return new String[] {"Reference"}; + default: return super.getTypesForProperty(hash, name); + } + + } + + @Override + public Base addChild(String name) throws FHIRException { + if (name.equals("mode")) { + throw new FHIRException("Cannot call addChild on a primitive type DocumentReference.attester.mode"); + } + else if (name.equals("time")) { + throw new FHIRException("Cannot call addChild on a primitive type DocumentReference.attester.time"); + } + else if (name.equals("party")) { + this.party = new Reference(); + return this.party; + } + else + return super.addChild(name); + } + + public DocumentReferenceAttesterComponent copy() { + DocumentReferenceAttesterComponent dst = new DocumentReferenceAttesterComponent(); + copyValues(dst); + return dst; + } + + public void copyValues(DocumentReferenceAttesterComponent dst) { + super.copyValues(dst); + dst.mode = mode == null ? null : mode.copy(); + dst.time = time == null ? null : time.copy(); + dst.party = party == null ? null : party.copy(); + } + + @Override + public boolean equalsDeep(Base other_) { + if (!super.equalsDeep(other_)) + return false; + if (!(other_ instanceof DocumentReferenceAttesterComponent)) + return false; + DocumentReferenceAttesterComponent o = (DocumentReferenceAttesterComponent) other_; + return compareDeep(mode, o.mode, true) && compareDeep(time, o.time, true) && compareDeep(party, o.party, true) + ; + } + + @Override + public boolean equalsShallow(Base other_) { + if (!super.equalsShallow(other_)) + return false; + if (!(other_ instanceof DocumentReferenceAttesterComponent)) + return false; + DocumentReferenceAttesterComponent o = (DocumentReferenceAttesterComponent) other_; + return compareValues(mode, o.mode, true) && compareValues(time, o.time, true); + } + + public boolean isEmpty() { + return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(mode, time, party); + } + + public String fhirType() { + return "DocumentReference.attester"; + + } + + } + @Block() public static class DocumentReferenceRelatesToComponent extends BackboneElement implements IBaseBackboneElement { /** @@ -309,7 +730,14 @@ public class DocumentReference extends DomainResource { @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/formatcodes") protected Coding format; - private static final long serialVersionUID = -1313860217L; + /** + * Document identifier as assigned by the source of the document. This identifier is specific to this version of the document. This unique identifier may be used elsewhere to identify this version of the document. + */ + @Child(name = "identifier", type = {Identifier.class}, order=3, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="Identifier of the attachment binary", formalDefinition="Document identifier as assigned by the source of the document. This identifier is specific to this version of the document. This unique identifier may be used elsewhere to identify this version of the document." ) + protected Identifier identifier; + + private static final long serialVersionUID = 1399001009L; /** * Constructor @@ -374,10 +802,35 @@ public class DocumentReference extends DomainResource { return this; } + /** + * @return {@link #identifier} (Document identifier as assigned by the source of the document. This identifier is specific to this version of the document. This unique identifier may be used elsewhere to identify this version of the document.) + */ + public Identifier getIdentifier() { + if (this.identifier == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create DocumentReferenceContentComponent.identifier"); + else if (Configuration.doAutoCreate()) + this.identifier = new Identifier(); // cc + return this.identifier; + } + + public boolean hasIdentifier() { + return this.identifier != null && !this.identifier.isEmpty(); + } + + /** + * @param value {@link #identifier} (Document identifier as assigned by the source of the document. This identifier is specific to this version of the document. This unique identifier may be used elsewhere to identify this version of the document.) + */ + public DocumentReferenceContentComponent setIdentifier(Identifier value) { + this.identifier = value; + return this; + } + protected void listChildren(List children) { super.listChildren(children); children.add(new Property("attachment", "Attachment", "The document or URL of the document along with critical metadata to prove content has integrity.", 0, 1, attachment)); children.add(new Property("format", "Coding", "An identifier of the document encoding, structure, and template that the document conforms to beyond the base format indicated in the mimeType.", 0, 1, format)); + children.add(new Property("identifier", "Identifier", "Document identifier as assigned by the source of the document. This identifier is specific to this version of the document. This unique identifier may be used elsewhere to identify this version of the document.", 0, 1, identifier)); } @Override @@ -385,6 +838,7 @@ public class DocumentReference extends DomainResource { switch (_hash) { case -1963501277: /*attachment*/ return new Property("attachment", "Attachment", "The document or URL of the document along with critical metadata to prove content has integrity.", 0, 1, attachment); case -1268779017: /*format*/ return new Property("format", "Coding", "An identifier of the document encoding, structure, and template that the document conforms to beyond the base format indicated in the mimeType.", 0, 1, format); + case -1618432855: /*identifier*/ return new Property("identifier", "Identifier", "Document identifier as assigned by the source of the document. This identifier is specific to this version of the document. This unique identifier may be used elsewhere to identify this version of the document.", 0, 1, identifier); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -395,6 +849,7 @@ public class DocumentReference extends DomainResource { switch (hash) { case -1963501277: /*attachment*/ return this.attachment == null ? new Base[0] : new Base[] {this.attachment}; // Attachment case -1268779017: /*format*/ return this.format == null ? new Base[0] : new Base[] {this.format}; // Coding + case -1618432855: /*identifier*/ return this.identifier == null ? new Base[0] : new Base[] {this.identifier}; // Identifier default: return super.getProperty(hash, name, checkValid); } @@ -409,6 +864,9 @@ public class DocumentReference extends DomainResource { case -1268779017: // format this.format = TypeConvertor.castToCoding(value); // Coding return value; + case -1618432855: // identifier + this.identifier = TypeConvertor.castToIdentifier(value); // Identifier + return value; default: return super.setProperty(hash, name, value); } @@ -420,6 +878,8 @@ public class DocumentReference extends DomainResource { this.attachment = TypeConvertor.castToAttachment(value); // Attachment } else if (name.equals("format")) { this.format = TypeConvertor.castToCoding(value); // Coding + } else if (name.equals("identifier")) { + this.identifier = TypeConvertor.castToIdentifier(value); // Identifier } else return super.setProperty(name, value); return value; @@ -430,6 +890,7 @@ public class DocumentReference extends DomainResource { switch (hash) { case -1963501277: return getAttachment(); case -1268779017: return getFormat(); + case -1618432855: return getIdentifier(); default: return super.makeProperty(hash, name); } @@ -440,6 +901,7 @@ public class DocumentReference extends DomainResource { switch (hash) { case -1963501277: /*attachment*/ return new String[] {"Attachment"}; case -1268779017: /*format*/ return new String[] {"Coding"}; + case -1618432855: /*identifier*/ return new String[] {"Identifier"}; default: return super.getTypesForProperty(hash, name); } @@ -455,6 +917,10 @@ public class DocumentReference extends DomainResource { this.format = new Coding(); return this.format; } + else if (name.equals("identifier")) { + this.identifier = new Identifier(); + return this.identifier; + } else return super.addChild(name); } @@ -469,6 +935,7 @@ public class DocumentReference extends DomainResource { super.copyValues(dst); dst.attachment = attachment == null ? null : attachment.copy(); dst.format = format == null ? null : format.copy(); + dst.identifier = identifier == null ? null : identifier.copy(); } @Override @@ -478,7 +945,8 @@ public class DocumentReference extends DomainResource { if (!(other_ instanceof DocumentReferenceContentComponent)) return false; DocumentReferenceContentComponent o = (DocumentReferenceContentComponent) other_; - return compareDeep(attachment, o.attachment, true) && compareDeep(format, o.format, true); + return compareDeep(attachment, o.attachment, true) && compareDeep(format, o.format, true) && compareDeep(identifier, o.identifier, true) + ; } @Override @@ -492,7 +960,8 @@ public class DocumentReference extends DomainResource { } public boolean isEmpty() { - return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(attachment, format); + return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(attachment, format, identifier + ); } public String fhirType() { @@ -502,632 +971,20 @@ public class DocumentReference extends DomainResource { } - @Block() - public static class DocumentReferenceContextComponent extends BackboneElement implements IBaseBackboneElement { - /** - * Describes the clinical encounter or type of care that the document content is associated with. - */ - @Child(name = "encounter", type = {Encounter.class}, order=1, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Context of the document content", formalDefinition="Describes the clinical encounter or type of care that the document content is associated with." ) - protected List encounter; - - /** - * This list of codes represents the main clinical acts, such as a colonoscopy or an appendectomy, being documented. In some cases, the event is inherent in the type Code, such as a "History and Physical Report" in which the procedure being documented is necessarily a "History and Physical" act. - */ - @Child(name = "event", type = {CodeableConcept.class}, order=2, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Main clinical acts documented", formalDefinition="This list of codes represents the main clinical acts, such as a colonoscopy or an appendectomy, being documented. In some cases, the event is inherent in the type Code, such as a \"History and Physical Report\" in which the procedure being documented is necessarily a \"History and Physical\" act." ) - @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://terminology.hl7.org/ValueSet/v3-ActCode") - protected List event; - - /** - * The time period over which the service that is described by the document was provided. - */ - @Child(name = "period", type = {Period.class}, order=3, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Time of service that is being documented", formalDefinition="The time period over which the service that is described by the document was provided." ) - protected Period period; - - /** - * The kind of facility where the patient was seen. - */ - @Child(name = "facilityType", type = {CodeableConcept.class}, order=4, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Kind of facility where patient was seen", formalDefinition="The kind of facility where the patient was seen." ) - @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/c80-facilitycodes") - protected CodeableConcept facilityType; - - /** - * This property may convey specifics about the practice setting where the content was created, often reflecting the clinical specialty. - */ - @Child(name = "practiceSetting", type = {CodeableConcept.class}, order=5, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Additional details about where the content was created (e.g. clinical specialty)", formalDefinition="This property may convey specifics about the practice setting where the content was created, often reflecting the clinical specialty." ) - @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/c80-practice-codes") - protected CodeableConcept practiceSetting; - - /** - * The Patient Information as known when the document was published. May be a reference to a version specific, or contained. - */ - @Child(name = "sourcePatientInfo", type = {Patient.class}, order=6, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Patient demographics from source", formalDefinition="The Patient Information as known when the document was published. May be a reference to a version specific, or contained." ) - protected Reference sourcePatientInfo; - - /** - * Related identifiers or resources associated with the DocumentReference. - */ - @Child(name = "related", type = {Reference.class}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Related identifiers or resources", formalDefinition="Related identifiers or resources associated with the DocumentReference." ) - protected List related; - - /** - * A procedure that is fulfilled in whole or in part by the creation of this media. - */ - @Child(name = "basedOn", type = {ServiceRequest.class, CarePlan.class}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Procedure that caused this media to be created", formalDefinition="A procedure that is fulfilled in whole or in part by the creation of this media." ) - protected List basedOn; - - private static final long serialVersionUID = 1499534389L; - - /** - * Constructor - */ - public DocumentReferenceContextComponent() { - super(); - } - - /** - * @return {@link #encounter} (Describes the clinical encounter or type of care that the document content is associated with.) - */ - public List getEncounter() { - if (this.encounter == null) - this.encounter = new ArrayList(); - return this.encounter; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public DocumentReferenceContextComponent setEncounter(List theEncounter) { - this.encounter = theEncounter; - return this; - } - - public boolean hasEncounter() { - if (this.encounter == null) - return false; - for (Reference item : this.encounter) - if (!item.isEmpty()) - return true; - return false; - } - - public Reference addEncounter() { //3 - Reference t = new Reference(); - if (this.encounter == null) - this.encounter = new ArrayList(); - this.encounter.add(t); - return t; - } - - public DocumentReferenceContextComponent addEncounter(Reference t) { //3 - if (t == null) - return this; - if (this.encounter == null) - this.encounter = new ArrayList(); - this.encounter.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #encounter}, creating it if it does not already exist {3} - */ - public Reference getEncounterFirstRep() { - if (getEncounter().isEmpty()) { - addEncounter(); - } - return getEncounter().get(0); - } - - /** - * @return {@link #event} (This list of codes represents the main clinical acts, such as a colonoscopy or an appendectomy, being documented. In some cases, the event is inherent in the type Code, such as a "History and Physical Report" in which the procedure being documented is necessarily a "History and Physical" act.) - */ - public List getEvent() { - if (this.event == null) - this.event = new ArrayList(); - return this.event; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public DocumentReferenceContextComponent setEvent(List theEvent) { - this.event = theEvent; - return this; - } - - public boolean hasEvent() { - if (this.event == null) - return false; - for (CodeableConcept item : this.event) - if (!item.isEmpty()) - return true; - return false; - } - - public CodeableConcept addEvent() { //3 - CodeableConcept t = new CodeableConcept(); - if (this.event == null) - this.event = new ArrayList(); - this.event.add(t); - return t; - } - - public DocumentReferenceContextComponent addEvent(CodeableConcept t) { //3 - if (t == null) - return this; - if (this.event == null) - this.event = new ArrayList(); - this.event.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #event}, creating it if it does not already exist {3} - */ - public CodeableConcept getEventFirstRep() { - if (getEvent().isEmpty()) { - addEvent(); - } - return getEvent().get(0); - } - - /** - * @return {@link #period} (The time period over which the service that is described by the document was provided.) - */ - public Period getPeriod() { - if (this.period == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create DocumentReferenceContextComponent.period"); - else if (Configuration.doAutoCreate()) - this.period = new Period(); // cc - return this.period; - } - - public boolean hasPeriod() { - return this.period != null && !this.period.isEmpty(); - } - - /** - * @param value {@link #period} (The time period over which the service that is described by the document was provided.) - */ - public DocumentReferenceContextComponent setPeriod(Period value) { - this.period = value; - return this; - } - - /** - * @return {@link #facilityType} (The kind of facility where the patient was seen.) - */ - public CodeableConcept getFacilityType() { - if (this.facilityType == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create DocumentReferenceContextComponent.facilityType"); - else if (Configuration.doAutoCreate()) - this.facilityType = new CodeableConcept(); // cc - return this.facilityType; - } - - public boolean hasFacilityType() { - return this.facilityType != null && !this.facilityType.isEmpty(); - } - - /** - * @param value {@link #facilityType} (The kind of facility where the patient was seen.) - */ - public DocumentReferenceContextComponent setFacilityType(CodeableConcept value) { - this.facilityType = value; - return this; - } - - /** - * @return {@link #practiceSetting} (This property may convey specifics about the practice setting where the content was created, often reflecting the clinical specialty.) - */ - public CodeableConcept getPracticeSetting() { - if (this.practiceSetting == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create DocumentReferenceContextComponent.practiceSetting"); - else if (Configuration.doAutoCreate()) - this.practiceSetting = new CodeableConcept(); // cc - return this.practiceSetting; - } - - public boolean hasPracticeSetting() { - return this.practiceSetting != null && !this.practiceSetting.isEmpty(); - } - - /** - * @param value {@link #practiceSetting} (This property may convey specifics about the practice setting where the content was created, often reflecting the clinical specialty.) - */ - public DocumentReferenceContextComponent setPracticeSetting(CodeableConcept value) { - this.practiceSetting = value; - return this; - } - - /** - * @return {@link #sourcePatientInfo} (The Patient Information as known when the document was published. May be a reference to a version specific, or contained.) - */ - public Reference getSourcePatientInfo() { - if (this.sourcePatientInfo == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create DocumentReferenceContextComponent.sourcePatientInfo"); - else if (Configuration.doAutoCreate()) - this.sourcePatientInfo = new Reference(); // cc - return this.sourcePatientInfo; - } - - public boolean hasSourcePatientInfo() { - return this.sourcePatientInfo != null && !this.sourcePatientInfo.isEmpty(); - } - - /** - * @param value {@link #sourcePatientInfo} (The Patient Information as known when the document was published. May be a reference to a version specific, or contained.) - */ - public DocumentReferenceContextComponent setSourcePatientInfo(Reference value) { - this.sourcePatientInfo = value; - return this; - } - - /** - * @return {@link #related} (Related identifiers or resources associated with the DocumentReference.) - */ - public List getRelated() { - if (this.related == null) - this.related = new ArrayList(); - return this.related; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public DocumentReferenceContextComponent setRelated(List theRelated) { - this.related = theRelated; - return this; - } - - public boolean hasRelated() { - if (this.related == null) - return false; - for (Reference item : this.related) - if (!item.isEmpty()) - return true; - return false; - } - - public Reference addRelated() { //3 - Reference t = new Reference(); - if (this.related == null) - this.related = new ArrayList(); - this.related.add(t); - return t; - } - - public DocumentReferenceContextComponent addRelated(Reference t) { //3 - if (t == null) - return this; - if (this.related == null) - this.related = new ArrayList(); - this.related.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #related}, creating it if it does not already exist {3} - */ - public Reference getRelatedFirstRep() { - if (getRelated().isEmpty()) { - addRelated(); - } - return getRelated().get(0); - } - - /** - * @return {@link #basedOn} (A procedure that is fulfilled in whole or in part by the creation of this media.) - */ - public List getBasedOn() { - if (this.basedOn == null) - this.basedOn = new ArrayList(); - return this.basedOn; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public DocumentReferenceContextComponent setBasedOn(List theBasedOn) { - this.basedOn = theBasedOn; - return this; - } - - public boolean hasBasedOn() { - if (this.basedOn == null) - return false; - for (Reference item : this.basedOn) - if (!item.isEmpty()) - return true; - return false; - } - - public Reference addBasedOn() { //3 - Reference t = new Reference(); - if (this.basedOn == null) - this.basedOn = new ArrayList(); - this.basedOn.add(t); - return t; - } - - public DocumentReferenceContextComponent addBasedOn(Reference t) { //3 - if (t == null) - return this; - if (this.basedOn == null) - this.basedOn = new ArrayList(); - this.basedOn.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #basedOn}, creating it if it does not already exist {3} - */ - public Reference getBasedOnFirstRep() { - if (getBasedOn().isEmpty()) { - addBasedOn(); - } - return getBasedOn().get(0); - } - - protected void listChildren(List children) { - super.listChildren(children); - children.add(new Property("encounter", "Reference(Encounter)", "Describes the clinical encounter or type of care that the document content is associated with.", 0, java.lang.Integer.MAX_VALUE, encounter)); - children.add(new Property("event", "CodeableConcept", "This list of codes represents the main clinical acts, such as a colonoscopy or an appendectomy, being documented. In some cases, the event is inherent in the type Code, such as a \"History and Physical Report\" in which the procedure being documented is necessarily a \"History and Physical\" act.", 0, java.lang.Integer.MAX_VALUE, event)); - children.add(new Property("period", "Period", "The time period over which the service that is described by the document was provided.", 0, 1, period)); - children.add(new Property("facilityType", "CodeableConcept", "The kind of facility where the patient was seen.", 0, 1, facilityType)); - children.add(new Property("practiceSetting", "CodeableConcept", "This property may convey specifics about the practice setting where the content was created, often reflecting the clinical specialty.", 0, 1, practiceSetting)); - children.add(new Property("sourcePatientInfo", "Reference(Patient)", "The Patient Information as known when the document was published. May be a reference to a version specific, or contained.", 0, 1, sourcePatientInfo)); - children.add(new Property("related", "Reference(Any)", "Related identifiers or resources associated with the DocumentReference.", 0, java.lang.Integer.MAX_VALUE, related)); - children.add(new Property("basedOn", "Reference(ServiceRequest|CarePlan)", "A procedure that is fulfilled in whole or in part by the creation of this media.", 0, java.lang.Integer.MAX_VALUE, basedOn)); - } - - @Override - public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { - switch (_hash) { - case 1524132147: /*encounter*/ return new Property("encounter", "Reference(Encounter)", "Describes the clinical encounter or type of care that the document content is associated with.", 0, java.lang.Integer.MAX_VALUE, encounter); - case 96891546: /*event*/ return new Property("event", "CodeableConcept", "This list of codes represents the main clinical acts, such as a colonoscopy or an appendectomy, being documented. In some cases, the event is inherent in the type Code, such as a \"History and Physical Report\" in which the procedure being documented is necessarily a \"History and Physical\" act.", 0, java.lang.Integer.MAX_VALUE, event); - case -991726143: /*period*/ return new Property("period", "Period", "The time period over which the service that is described by the document was provided.", 0, 1, period); - case 370698365: /*facilityType*/ return new Property("facilityType", "CodeableConcept", "The kind of facility where the patient was seen.", 0, 1, facilityType); - case 331373717: /*practiceSetting*/ return new Property("practiceSetting", "CodeableConcept", "This property may convey specifics about the practice setting where the content was created, often reflecting the clinical specialty.", 0, 1, practiceSetting); - case 2031381048: /*sourcePatientInfo*/ return new Property("sourcePatientInfo", "Reference(Patient)", "The Patient Information as known when the document was published. May be a reference to a version specific, or contained.", 0, 1, sourcePatientInfo); - case 1090493483: /*related*/ return new Property("related", "Reference(Any)", "Related identifiers or resources associated with the DocumentReference.", 0, java.lang.Integer.MAX_VALUE, related); - case -332612366: /*basedOn*/ return new Property("basedOn", "Reference(ServiceRequest|CarePlan)", "A procedure that is fulfilled in whole or in part by the creation of this media.", 0, java.lang.Integer.MAX_VALUE, basedOn); - default: return super.getNamedProperty(_hash, _name, _checkValid); - } - - } - - @Override - public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException { - switch (hash) { - case 1524132147: /*encounter*/ return this.encounter == null ? new Base[0] : this.encounter.toArray(new Base[this.encounter.size()]); // Reference - case 96891546: /*event*/ return this.event == null ? new Base[0] : this.event.toArray(new Base[this.event.size()]); // CodeableConcept - case -991726143: /*period*/ return this.period == null ? new Base[0] : new Base[] {this.period}; // Period - case 370698365: /*facilityType*/ return this.facilityType == null ? new Base[0] : new Base[] {this.facilityType}; // CodeableConcept - case 331373717: /*practiceSetting*/ return this.practiceSetting == null ? new Base[0] : new Base[] {this.practiceSetting}; // CodeableConcept - case 2031381048: /*sourcePatientInfo*/ return this.sourcePatientInfo == null ? new Base[0] : new Base[] {this.sourcePatientInfo}; // Reference - case 1090493483: /*related*/ return this.related == null ? new Base[0] : this.related.toArray(new Base[this.related.size()]); // Reference - case -332612366: /*basedOn*/ return this.basedOn == null ? new Base[0] : this.basedOn.toArray(new Base[this.basedOn.size()]); // Reference - default: return super.getProperty(hash, name, checkValid); - } - - } - - @Override - public Base setProperty(int hash, String name, Base value) throws FHIRException { - switch (hash) { - case 1524132147: // encounter - this.getEncounter().add(TypeConvertor.castToReference(value)); // Reference - return value; - case 96891546: // event - this.getEvent().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept - return value; - case -991726143: // period - this.period = TypeConvertor.castToPeriod(value); // Period - return value; - case 370698365: // facilityType - this.facilityType = TypeConvertor.castToCodeableConcept(value); // CodeableConcept - return value; - case 331373717: // practiceSetting - this.practiceSetting = TypeConvertor.castToCodeableConcept(value); // CodeableConcept - return value; - case 2031381048: // sourcePatientInfo - this.sourcePatientInfo = TypeConvertor.castToReference(value); // Reference - return value; - case 1090493483: // related - this.getRelated().add(TypeConvertor.castToReference(value)); // Reference - return value; - case -332612366: // basedOn - this.getBasedOn().add(TypeConvertor.castToReference(value)); // Reference - return value; - default: return super.setProperty(hash, name, value); - } - - } - - @Override - public Base setProperty(String name, Base value) throws FHIRException { - if (name.equals("encounter")) { - this.getEncounter().add(TypeConvertor.castToReference(value)); - } else if (name.equals("event")) { - this.getEvent().add(TypeConvertor.castToCodeableConcept(value)); - } else if (name.equals("period")) { - this.period = TypeConvertor.castToPeriod(value); // Period - } else if (name.equals("facilityType")) { - this.facilityType = TypeConvertor.castToCodeableConcept(value); // CodeableConcept - } else if (name.equals("practiceSetting")) { - this.practiceSetting = TypeConvertor.castToCodeableConcept(value); // CodeableConcept - } else if (name.equals("sourcePatientInfo")) { - this.sourcePatientInfo = TypeConvertor.castToReference(value); // Reference - } else if (name.equals("related")) { - this.getRelated().add(TypeConvertor.castToReference(value)); - } else if (name.equals("basedOn")) { - this.getBasedOn().add(TypeConvertor.castToReference(value)); - } else - return super.setProperty(name, value); - return value; - } - - @Override - public Base makeProperty(int hash, String name) throws FHIRException { - switch (hash) { - case 1524132147: return addEncounter(); - case 96891546: return addEvent(); - case -991726143: return getPeriod(); - case 370698365: return getFacilityType(); - case 331373717: return getPracticeSetting(); - case 2031381048: return getSourcePatientInfo(); - case 1090493483: return addRelated(); - case -332612366: return addBasedOn(); - default: return super.makeProperty(hash, name); - } - - } - - @Override - public String[] getTypesForProperty(int hash, String name) throws FHIRException { - switch (hash) { - case 1524132147: /*encounter*/ return new String[] {"Reference"}; - case 96891546: /*event*/ return new String[] {"CodeableConcept"}; - case -991726143: /*period*/ return new String[] {"Period"}; - case 370698365: /*facilityType*/ return new String[] {"CodeableConcept"}; - case 331373717: /*practiceSetting*/ return new String[] {"CodeableConcept"}; - case 2031381048: /*sourcePatientInfo*/ return new String[] {"Reference"}; - case 1090493483: /*related*/ return new String[] {"Reference"}; - case -332612366: /*basedOn*/ return new String[] {"Reference"}; - default: return super.getTypesForProperty(hash, name); - } - - } - - @Override - public Base addChild(String name) throws FHIRException { - if (name.equals("encounter")) { - return addEncounter(); - } - else if (name.equals("event")) { - return addEvent(); - } - else if (name.equals("period")) { - this.period = new Period(); - return this.period; - } - else if (name.equals("facilityType")) { - this.facilityType = new CodeableConcept(); - return this.facilityType; - } - else if (name.equals("practiceSetting")) { - this.practiceSetting = new CodeableConcept(); - return this.practiceSetting; - } - else if (name.equals("sourcePatientInfo")) { - this.sourcePatientInfo = new Reference(); - return this.sourcePatientInfo; - } - else if (name.equals("related")) { - return addRelated(); - } - else if (name.equals("basedOn")) { - return addBasedOn(); - } - else - return super.addChild(name); - } - - public DocumentReferenceContextComponent copy() { - DocumentReferenceContextComponent dst = new DocumentReferenceContextComponent(); - copyValues(dst); - return dst; - } - - public void copyValues(DocumentReferenceContextComponent dst) { - super.copyValues(dst); - if (encounter != null) { - dst.encounter = new ArrayList(); - for (Reference i : encounter) - dst.encounter.add(i.copy()); - }; - if (event != null) { - dst.event = new ArrayList(); - for (CodeableConcept i : event) - dst.event.add(i.copy()); - }; - dst.period = period == null ? null : period.copy(); - dst.facilityType = facilityType == null ? null : facilityType.copy(); - dst.practiceSetting = practiceSetting == null ? null : practiceSetting.copy(); - dst.sourcePatientInfo = sourcePatientInfo == null ? null : sourcePatientInfo.copy(); - if (related != null) { - dst.related = new ArrayList(); - for (Reference i : related) - dst.related.add(i.copy()); - }; - if (basedOn != null) { - dst.basedOn = new ArrayList(); - for (Reference i : basedOn) - dst.basedOn.add(i.copy()); - }; - } - - @Override - public boolean equalsDeep(Base other_) { - if (!super.equalsDeep(other_)) - return false; - if (!(other_ instanceof DocumentReferenceContextComponent)) - return false; - DocumentReferenceContextComponent o = (DocumentReferenceContextComponent) other_; - return compareDeep(encounter, o.encounter, true) && compareDeep(event, o.event, true) && compareDeep(period, o.period, true) - && compareDeep(facilityType, o.facilityType, true) && compareDeep(practiceSetting, o.practiceSetting, true) - && compareDeep(sourcePatientInfo, o.sourcePatientInfo, true) && compareDeep(related, o.related, true) - && compareDeep(basedOn, o.basedOn, true); - } - - @Override - public boolean equalsShallow(Base other_) { - if (!super.equalsShallow(other_)) - return false; - if (!(other_ instanceof DocumentReferenceContextComponent)) - return false; - DocumentReferenceContextComponent o = (DocumentReferenceContextComponent) other_; - return true; - } - - public boolean isEmpty() { - return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(encounter, event, period - , facilityType, practiceSetting, sourcePatientInfo, related, basedOn); - } - - public String fhirType() { - return "DocumentReference.context"; - - } - - } - - /** - * Document identifier as assigned by the source of the document. This identifier is specific to this version of the document. This unique identifier may be used elsewhere to identify this version of the document. - */ - @Child(name = "masterIdentifier", type = {Identifier.class}, order=0, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Master Version Specific Identifier", formalDefinition="Document identifier as assigned by the source of the document. This identifier is specific to this version of the document. This unique identifier may be used elsewhere to identify this version of the document." ) - protected Identifier masterIdentifier; - /** * Other identifiers associated with the document, including version independent identifiers. */ - @Child(name = "identifier", type = {Identifier.class}, order=1, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "identifier", type = {Identifier.class}, order=0, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Other identifiers for the document", formalDefinition="Other identifiers associated with the document, including version independent identifiers." ) protected List identifier; + /** + * A procedure that is fulfilled in whole or in part by the creation of this media. + */ + @Child(name = "basedOn", type = {ServiceRequest.class, CarePlan.class}, order=1, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="Procedure that caused this media to be created", formalDefinition="A procedure that is fulfilled in whole or in part by the creation of this media." ) + protected List basedOn; + /** * The status of this document reference. */ @@ -1167,52 +1024,90 @@ public class DocumentReference extends DomainResource { @Description(shortDefinition="Who/what is the subject of the document", formalDefinition="Who or what the document is about. The document can be about a person, (patient or healthcare practitioner), a device (e.g. a machine) or even a group of subjects (such as a document about a herd of farm animals, or a set of patients that share a common exposure)." ) protected Reference subject; + /** + * Describes the clinical encounter or type of care that the document content is associated with. + */ + @Child(name = "encounter", type = {Encounter.class}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="Context of the document content", formalDefinition="Describes the clinical encounter or type of care that the document content is associated with." ) + protected List encounter; + + /** + * This list of codes represents the main clinical acts, such as a colonoscopy or an appendectomy, being documented. In some cases, the event is inherent in the type Code, such as a "History and Physical Report" in which the procedure being documented is necessarily a "History and Physical" act. + */ + @Child(name = "event", type = {CodeableConcept.class}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="Main clinical acts documented", formalDefinition="This list of codes represents the main clinical acts, such as a colonoscopy or an appendectomy, being documented. In some cases, the event is inherent in the type Code, such as a \"History and Physical Report\" in which the procedure being documented is necessarily a \"History and Physical\" act." ) + @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://terminology.hl7.org/ValueSet/v3-ActCode") + protected List event; + + /** + * The kind of facility where the patient was seen. + */ + @Child(name = "facilityType", type = {CodeableConcept.class}, order=9, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="Kind of facility where patient was seen", formalDefinition="The kind of facility where the patient was seen." ) + @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/c80-facilitycodes") + protected CodeableConcept facilityType; + + /** + * This property may convey specifics about the practice setting where the content was created, often reflecting the clinical specialty. + */ + @Child(name = "practiceSetting", type = {CodeableConcept.class}, order=10, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="Additional details about where the content was created (e.g. clinical specialty)", formalDefinition="This property may convey specifics about the practice setting where the content was created, often reflecting the clinical specialty." ) + @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/c80-practice-codes") + protected CodeableConcept practiceSetting; + + /** + * The time period over which the service that is described by the document was provided. + */ + @Child(name = "period", type = {Period.class}, order=11, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="Time of service that is being documented", formalDefinition="The time period over which the service that is described by the document was provided." ) + protected Period period; + /** * When the document reference was created. */ - @Child(name = "date", type = {InstantType.class}, order=7, min=0, max=1, modifier=false, summary=true) + @Child(name = "date", type = {InstantType.class}, order=12, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="When this document reference was created", formalDefinition="When the document reference was created." ) protected InstantType date; /** * Identifies who is responsible for adding the information to the document. */ - @Child(name = "author", type = {Practitioner.class, PractitionerRole.class, Organization.class, Device.class, Patient.class, RelatedPerson.class, CareTeam.class}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "author", type = {Practitioner.class, PractitionerRole.class, Organization.class, Device.class, Patient.class, RelatedPerson.class, CareTeam.class}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Who and/or what authored the document", formalDefinition="Identifies who is responsible for adding the information to the document." ) protected List author; /** - * Which person or organization authenticates that this document is valid. + * A participant who has attested to the accuracy of the composition/document. */ - @Child(name = "authenticator", type = {Practitioner.class, PractitionerRole.class, Organization.class}, order=9, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Who/what authenticated the document", formalDefinition="Which person or organization authenticates that this document is valid." ) - protected Reference authenticator; + @Child(name = "attester", type = {}, order=14, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="Attests to accuracy of composition", formalDefinition="A participant who has attested to the accuracy of the composition/document." ) + protected List attester; /** * Identifies the organization or group who is responsible for ongoing maintenance of and access to the document. */ - @Child(name = "custodian", type = {Organization.class}, order=10, min=0, max=1, modifier=false, summary=false) + @Child(name = "custodian", type = {Organization.class}, order=15, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Organization which maintains the document", formalDefinition="Identifies the organization or group who is responsible for ongoing maintenance of and access to the document." ) protected Reference custodian; /** * Relationships that this document has with other document references that already exist. */ - @Child(name = "relatesTo", type = {}, order=11, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "relatesTo", type = {}, order=16, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Relationships to other documents", formalDefinition="Relationships that this document has with other document references that already exist." ) protected List relatesTo; /** * Human-readable description of the source document. */ - @Child(name = "description", type = {StringType.class}, order=12, min=0, max=1, modifier=false, summary=true) + @Child(name = "description", type = {MarkdownType.class}, order=17, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Human-readable description", formalDefinition="Human-readable description of the source document." ) - protected StringType description; + protected MarkdownType description; /** * A set of Security-Tag codes specifying the level of privacy/security of the Document. Note that DocumentReference.meta.security contains the security labels of the "reference" to the document, while DocumentReference.securityLabel contains a snapshot of the security labels on the document the reference refers to. */ - @Child(name = "securityLabel", type = {CodeableConcept.class}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "securityLabel", type = {CodeableConcept.class}, order=18, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Document security-tags", formalDefinition="A set of Security-Tag codes specifying the level of privacy/security of the Document. Note that DocumentReference.meta.security contains the security labels of the \"reference\" to the document, while DocumentReference.securityLabel contains a snapshot of the security labels on the document the reference refers to." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/security-labels") protected List securityLabel; @@ -1220,18 +1115,25 @@ public class DocumentReference extends DomainResource { /** * The document and format referenced. If there are multiple content element repetitions, these must all represent the same document in different format, or attachment metadata. */ - @Child(name = "content", type = {}, order=14, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "content", type = {}, order=19, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Document referenced", formalDefinition="The document and format referenced. If there are multiple content element repetitions, these must all represent the same document in different format, or attachment metadata." ) protected List content; /** - * The clinical context in which the document was prepared. + * The Patient Information as known when the document was published. May be a reference to a version specific, or contained. */ - @Child(name = "context", type = {}, order=15, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Clinical context of document", formalDefinition="The clinical context in which the document was prepared." ) - protected DocumentReferenceContextComponent context; + @Child(name = "sourcePatientInfo", type = {Patient.class}, order=20, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="Patient demographics from source", formalDefinition="The Patient Information as known when the document was published. May be a reference to a version specific, or contained." ) + protected Reference sourcePatientInfo; - private static final long serialVersionUID = -521547148L; + /** + * Related identifiers or resources associated with the DocumentReference. + */ + @Child(name = "related", type = {Reference.class}, order=21, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="Related identifiers or resources", formalDefinition="Related identifiers or resources associated with the DocumentReference." ) + protected List related; + + private static final long serialVersionUID = -1169558405L; /** * Constructor @@ -1249,30 +1151,6 @@ public class DocumentReference extends DomainResource { this.addContent(content); } - /** - * @return {@link #masterIdentifier} (Document identifier as assigned by the source of the document. This identifier is specific to this version of the document. This unique identifier may be used elsewhere to identify this version of the document.) - */ - public Identifier getMasterIdentifier() { - if (this.masterIdentifier == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create DocumentReference.masterIdentifier"); - else if (Configuration.doAutoCreate()) - this.masterIdentifier = new Identifier(); // cc - return this.masterIdentifier; - } - - public boolean hasMasterIdentifier() { - return this.masterIdentifier != null && !this.masterIdentifier.isEmpty(); - } - - /** - * @param value {@link #masterIdentifier} (Document identifier as assigned by the source of the document. This identifier is specific to this version of the document. This unique identifier may be used elsewhere to identify this version of the document.) - */ - public DocumentReference setMasterIdentifier(Identifier value) { - this.masterIdentifier = value; - return this; - } - /** * @return {@link #identifier} (Other identifiers associated with the document, including version independent identifiers.) */ @@ -1326,6 +1204,59 @@ public class DocumentReference extends DomainResource { return getIdentifier().get(0); } + /** + * @return {@link #basedOn} (A procedure that is fulfilled in whole or in part by the creation of this media.) + */ + public List getBasedOn() { + if (this.basedOn == null) + this.basedOn = new ArrayList(); + return this.basedOn; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public DocumentReference setBasedOn(List theBasedOn) { + this.basedOn = theBasedOn; + return this; + } + + public boolean hasBasedOn() { + if (this.basedOn == null) + return false; + for (Reference item : this.basedOn) + if (!item.isEmpty()) + return true; + return false; + } + + public Reference addBasedOn() { //3 + Reference t = new Reference(); + if (this.basedOn == null) + this.basedOn = new ArrayList(); + this.basedOn.add(t); + return t; + } + + public DocumentReference addBasedOn(Reference t) { //3 + if (t == null) + return this; + if (this.basedOn == null) + this.basedOn = new ArrayList(); + this.basedOn.add(t); + return this; + } + + /** + * @return The first repetition of repeating field {@link #basedOn}, creating it if it does not already exist {3} + */ + public Reference getBasedOnFirstRep() { + if (getBasedOn().isEmpty()) { + addBasedOn(); + } + return getBasedOn().get(0); + } + /** * @return {@link #status} (The status of this document reference.). This is the underlying object with id, value and extensions. The accessor "getStatus" gives direct access to the value */ @@ -1521,6 +1452,184 @@ public class DocumentReference extends DomainResource { return this; } + /** + * @return {@link #encounter} (Describes the clinical encounter or type of care that the document content is associated with.) + */ + public List getEncounter() { + if (this.encounter == null) + this.encounter = new ArrayList(); + return this.encounter; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public DocumentReference setEncounter(List theEncounter) { + this.encounter = theEncounter; + return this; + } + + public boolean hasEncounter() { + if (this.encounter == null) + return false; + for (Reference item : this.encounter) + if (!item.isEmpty()) + return true; + return false; + } + + public Reference addEncounter() { //3 + Reference t = new Reference(); + if (this.encounter == null) + this.encounter = new ArrayList(); + this.encounter.add(t); + return t; + } + + public DocumentReference addEncounter(Reference t) { //3 + if (t == null) + return this; + if (this.encounter == null) + this.encounter = new ArrayList(); + this.encounter.add(t); + return this; + } + + /** + * @return The first repetition of repeating field {@link #encounter}, creating it if it does not already exist {3} + */ + public Reference getEncounterFirstRep() { + if (getEncounter().isEmpty()) { + addEncounter(); + } + return getEncounter().get(0); + } + + /** + * @return {@link #event} (This list of codes represents the main clinical acts, such as a colonoscopy or an appendectomy, being documented. In some cases, the event is inherent in the type Code, such as a "History and Physical Report" in which the procedure being documented is necessarily a "History and Physical" act.) + */ + public List getEvent() { + if (this.event == null) + this.event = new ArrayList(); + return this.event; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public DocumentReference setEvent(List theEvent) { + this.event = theEvent; + return this; + } + + public boolean hasEvent() { + if (this.event == null) + return false; + for (CodeableConcept item : this.event) + if (!item.isEmpty()) + return true; + return false; + } + + public CodeableConcept addEvent() { //3 + CodeableConcept t = new CodeableConcept(); + if (this.event == null) + this.event = new ArrayList(); + this.event.add(t); + return t; + } + + public DocumentReference addEvent(CodeableConcept t) { //3 + if (t == null) + return this; + if (this.event == null) + this.event = new ArrayList(); + this.event.add(t); + return this; + } + + /** + * @return The first repetition of repeating field {@link #event}, creating it if it does not already exist {3} + */ + public CodeableConcept getEventFirstRep() { + if (getEvent().isEmpty()) { + addEvent(); + } + return getEvent().get(0); + } + + /** + * @return {@link #facilityType} (The kind of facility where the patient was seen.) + */ + public CodeableConcept getFacilityType() { + if (this.facilityType == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create DocumentReference.facilityType"); + else if (Configuration.doAutoCreate()) + this.facilityType = new CodeableConcept(); // cc + return this.facilityType; + } + + public boolean hasFacilityType() { + return this.facilityType != null && !this.facilityType.isEmpty(); + } + + /** + * @param value {@link #facilityType} (The kind of facility where the patient was seen.) + */ + public DocumentReference setFacilityType(CodeableConcept value) { + this.facilityType = value; + return this; + } + + /** + * @return {@link #practiceSetting} (This property may convey specifics about the practice setting where the content was created, often reflecting the clinical specialty.) + */ + public CodeableConcept getPracticeSetting() { + if (this.practiceSetting == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create DocumentReference.practiceSetting"); + else if (Configuration.doAutoCreate()) + this.practiceSetting = new CodeableConcept(); // cc + return this.practiceSetting; + } + + public boolean hasPracticeSetting() { + return this.practiceSetting != null && !this.practiceSetting.isEmpty(); + } + + /** + * @param value {@link #practiceSetting} (This property may convey specifics about the practice setting where the content was created, often reflecting the clinical specialty.) + */ + public DocumentReference setPracticeSetting(CodeableConcept value) { + this.practiceSetting = value; + return this; + } + + /** + * @return {@link #period} (The time period over which the service that is described by the document was provided.) + */ + public Period getPeriod() { + if (this.period == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create DocumentReference.period"); + else if (Configuration.doAutoCreate()) + this.period = new Period(); // cc + return this.period; + } + + public boolean hasPeriod() { + return this.period != null && !this.period.isEmpty(); + } + + /** + * @param value {@link #period} (The time period over which the service that is described by the document was provided.) + */ + public DocumentReference setPeriod(Period value) { + this.period = value; + return this; + } + /** * @return {@link #date} (When the document reference was created.). This is the underlying object with id, value and extensions. The accessor "getDate" gives direct access to the value */ @@ -1624,29 +1733,58 @@ public class DocumentReference extends DomainResource { } /** - * @return {@link #authenticator} (Which person or organization authenticates that this document is valid.) + * @return {@link #attester} (A participant who has attested to the accuracy of the composition/document.) */ - public Reference getAuthenticator() { - if (this.authenticator == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create DocumentReference.authenticator"); - else if (Configuration.doAutoCreate()) - this.authenticator = new Reference(); // cc - return this.authenticator; - } - - public boolean hasAuthenticator() { - return this.authenticator != null && !this.authenticator.isEmpty(); + public List getAttester() { + if (this.attester == null) + this.attester = new ArrayList(); + return this.attester; } /** - * @param value {@link #authenticator} (Which person or organization authenticates that this document is valid.) + * @return Returns a reference to this for easy method chaining */ - public DocumentReference setAuthenticator(Reference value) { - this.authenticator = value; + public DocumentReference setAttester(List theAttester) { + this.attester = theAttester; return this; } + public boolean hasAttester() { + if (this.attester == null) + return false; + for (DocumentReferenceAttesterComponent item : this.attester) + if (!item.isEmpty()) + return true; + return false; + } + + public DocumentReferenceAttesterComponent addAttester() { //3 + DocumentReferenceAttesterComponent t = new DocumentReferenceAttesterComponent(); + if (this.attester == null) + this.attester = new ArrayList(); + this.attester.add(t); + return t; + } + + public DocumentReference addAttester(DocumentReferenceAttesterComponent t) { //3 + if (t == null) + return this; + if (this.attester == null) + this.attester = new ArrayList(); + this.attester.add(t); + return this; + } + + /** + * @return The first repetition of repeating field {@link #attester}, creating it if it does not already exist {3} + */ + public DocumentReferenceAttesterComponent getAttesterFirstRep() { + if (getAttester().isEmpty()) { + addAttester(); + } + return getAttester().get(0); + } + /** * @return {@link #custodian} (Identifies the organization or group who is responsible for ongoing maintenance of and access to the document.) */ @@ -1727,12 +1865,12 @@ public class DocumentReference extends DomainResource { /** * @return {@link #description} (Human-readable description of the source document.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value */ - public StringType getDescriptionElement() { + public MarkdownType getDescriptionElement() { if (this.description == null) if (Configuration.errorOnAutoCreate()) throw new Error("Attempt to auto-create DocumentReference.description"); else if (Configuration.doAutoCreate()) - this.description = new StringType(); // bb + this.description = new MarkdownType(); // bb return this.description; } @@ -1747,7 +1885,7 @@ public class DocumentReference extends DomainResource { /** * @param value {@link #description} (Human-readable description of the source document.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value */ - public DocumentReference setDescriptionElement(StringType value) { + public DocumentReference setDescriptionElement(MarkdownType value) { this.description = value; return this; } @@ -1763,11 +1901,11 @@ public class DocumentReference extends DomainResource { * @param value Human-readable description of the source document. */ public DocumentReference setDescription(String value) { - if (Utilities.noString(value)) + if (value == null) this.description = null; else { if (this.description == null) - this.description = new StringType(); + this.description = new MarkdownType(); this.description.setValue(value); } return this; @@ -1880,68 +2018,133 @@ public class DocumentReference extends DomainResource { } /** - * @return {@link #context} (The clinical context in which the document was prepared.) + * @return {@link #sourcePatientInfo} (The Patient Information as known when the document was published. May be a reference to a version specific, or contained.) */ - public DocumentReferenceContextComponent getContext() { - if (this.context == null) + public Reference getSourcePatientInfo() { + if (this.sourcePatientInfo == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create DocumentReference.context"); + throw new Error("Attempt to auto-create DocumentReference.sourcePatientInfo"); else if (Configuration.doAutoCreate()) - this.context = new DocumentReferenceContextComponent(); // cc - return this.context; + this.sourcePatientInfo = new Reference(); // cc + return this.sourcePatientInfo; } - public boolean hasContext() { - return this.context != null && !this.context.isEmpty(); + public boolean hasSourcePatientInfo() { + return this.sourcePatientInfo != null && !this.sourcePatientInfo.isEmpty(); } /** - * @param value {@link #context} (The clinical context in which the document was prepared.) + * @param value {@link #sourcePatientInfo} (The Patient Information as known when the document was published. May be a reference to a version specific, or contained.) */ - public DocumentReference setContext(DocumentReferenceContextComponent value) { - this.context = value; + public DocumentReference setSourcePatientInfo(Reference value) { + this.sourcePatientInfo = value; return this; } + /** + * @return {@link #related} (Related identifiers or resources associated with the DocumentReference.) + */ + public List getRelated() { + if (this.related == null) + this.related = new ArrayList(); + return this.related; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public DocumentReference setRelated(List theRelated) { + this.related = theRelated; + return this; + } + + public boolean hasRelated() { + if (this.related == null) + return false; + for (Reference item : this.related) + if (!item.isEmpty()) + return true; + return false; + } + + public Reference addRelated() { //3 + Reference t = new Reference(); + if (this.related == null) + this.related = new ArrayList(); + this.related.add(t); + return t; + } + + public DocumentReference addRelated(Reference t) { //3 + if (t == null) + return this; + if (this.related == null) + this.related = new ArrayList(); + this.related.add(t); + return this; + } + + /** + * @return The first repetition of repeating field {@link #related}, creating it if it does not already exist {3} + */ + public Reference getRelatedFirstRep() { + if (getRelated().isEmpty()) { + addRelated(); + } + return getRelated().get(0); + } + protected void listChildren(List children) { super.listChildren(children); - children.add(new Property("masterIdentifier", "Identifier", "Document identifier as assigned by the source of the document. This identifier is specific to this version of the document. This unique identifier may be used elsewhere to identify this version of the document.", 0, 1, masterIdentifier)); children.add(new Property("identifier", "Identifier", "Other identifiers associated with the document, including version independent identifiers.", 0, java.lang.Integer.MAX_VALUE, identifier)); + children.add(new Property("basedOn", "Reference(ServiceRequest|CarePlan)", "A procedure that is fulfilled in whole or in part by the creation of this media.", 0, java.lang.Integer.MAX_VALUE, basedOn)); children.add(new Property("status", "code", "The status of this document reference.", 0, 1, status)); children.add(new Property("docStatus", "code", "The status of the underlying document.", 0, 1, docStatus)); children.add(new Property("type", "CodeableConcept", "Specifies the particular kind of document referenced (e.g. History and Physical, Discharge Summary, Progress Note). This usually equates to the purpose of making the document referenced.", 0, 1, type)); children.add(new Property("category", "CodeableConcept", "A categorization for the type of document referenced - helps for indexing and searching. This may be implied by or derived from the code specified in the DocumentReference.type.", 0, java.lang.Integer.MAX_VALUE, category)); children.add(new Property("subject", "Reference(Patient|Practitioner|Group|Device|PractitionerRole|Specimen|Organization|Location)", "Who or what the document is about. The document can be about a person, (patient or healthcare practitioner), a device (e.g. a machine) or even a group of subjects (such as a document about a herd of farm animals, or a set of patients that share a common exposure).", 0, 1, subject)); + children.add(new Property("encounter", "Reference(Encounter)", "Describes the clinical encounter or type of care that the document content is associated with.", 0, java.lang.Integer.MAX_VALUE, encounter)); + children.add(new Property("event", "CodeableConcept", "This list of codes represents the main clinical acts, such as a colonoscopy or an appendectomy, being documented. In some cases, the event is inherent in the type Code, such as a \"History and Physical Report\" in which the procedure being documented is necessarily a \"History and Physical\" act.", 0, java.lang.Integer.MAX_VALUE, event)); + children.add(new Property("facilityType", "CodeableConcept", "The kind of facility where the patient was seen.", 0, 1, facilityType)); + children.add(new Property("practiceSetting", "CodeableConcept", "This property may convey specifics about the practice setting where the content was created, often reflecting the clinical specialty.", 0, 1, practiceSetting)); + children.add(new Property("period", "Period", "The time period over which the service that is described by the document was provided.", 0, 1, period)); children.add(new Property("date", "instant", "When the document reference was created.", 0, 1, date)); children.add(new Property("author", "Reference(Practitioner|PractitionerRole|Organization|Device|Patient|RelatedPerson|CareTeam)", "Identifies who is responsible for adding the information to the document.", 0, java.lang.Integer.MAX_VALUE, author)); - children.add(new Property("authenticator", "Reference(Practitioner|PractitionerRole|Organization)", "Which person or organization authenticates that this document is valid.", 0, 1, authenticator)); + children.add(new Property("attester", "", "A participant who has attested to the accuracy of the composition/document.", 0, java.lang.Integer.MAX_VALUE, attester)); children.add(new Property("custodian", "Reference(Organization)", "Identifies the organization or group who is responsible for ongoing maintenance of and access to the document.", 0, 1, custodian)); children.add(new Property("relatesTo", "", "Relationships that this document has with other document references that already exist.", 0, java.lang.Integer.MAX_VALUE, relatesTo)); - children.add(new Property("description", "string", "Human-readable description of the source document.", 0, 1, description)); + children.add(new Property("description", "markdown", "Human-readable description of the source document.", 0, 1, description)); children.add(new Property("securityLabel", "CodeableConcept", "A set of Security-Tag codes specifying the level of privacy/security of the Document. Note that DocumentReference.meta.security contains the security labels of the \"reference\" to the document, while DocumentReference.securityLabel contains a snapshot of the security labels on the document the reference refers to.", 0, java.lang.Integer.MAX_VALUE, securityLabel)); children.add(new Property("content", "", "The document and format referenced. If there are multiple content element repetitions, these must all represent the same document in different format, or attachment metadata.", 0, java.lang.Integer.MAX_VALUE, content)); - children.add(new Property("context", "", "The clinical context in which the document was prepared.", 0, 1, context)); + children.add(new Property("sourcePatientInfo", "Reference(Patient)", "The Patient Information as known when the document was published. May be a reference to a version specific, or contained.", 0, 1, sourcePatientInfo)); + children.add(new Property("related", "Reference(Any)", "Related identifiers or resources associated with the DocumentReference.", 0, java.lang.Integer.MAX_VALUE, related)); } @Override public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { switch (_hash) { - case 243769515: /*masterIdentifier*/ return new Property("masterIdentifier", "Identifier", "Document identifier as assigned by the source of the document. This identifier is specific to this version of the document. This unique identifier may be used elsewhere to identify this version of the document.", 0, 1, masterIdentifier); case -1618432855: /*identifier*/ return new Property("identifier", "Identifier", "Other identifiers associated with the document, including version independent identifiers.", 0, java.lang.Integer.MAX_VALUE, identifier); + case -332612366: /*basedOn*/ return new Property("basedOn", "Reference(ServiceRequest|CarePlan)", "A procedure that is fulfilled in whole or in part by the creation of this media.", 0, java.lang.Integer.MAX_VALUE, basedOn); case -892481550: /*status*/ return new Property("status", "code", "The status of this document reference.", 0, 1, status); case -23496886: /*docStatus*/ return new Property("docStatus", "code", "The status of the underlying document.", 0, 1, docStatus); case 3575610: /*type*/ return new Property("type", "CodeableConcept", "Specifies the particular kind of document referenced (e.g. History and Physical, Discharge Summary, Progress Note). This usually equates to the purpose of making the document referenced.", 0, 1, type); case 50511102: /*category*/ return new Property("category", "CodeableConcept", "A categorization for the type of document referenced - helps for indexing and searching. This may be implied by or derived from the code specified in the DocumentReference.type.", 0, java.lang.Integer.MAX_VALUE, category); case -1867885268: /*subject*/ return new Property("subject", "Reference(Patient|Practitioner|Group|Device|PractitionerRole|Specimen|Organization|Location)", "Who or what the document is about. The document can be about a person, (patient or healthcare practitioner), a device (e.g. a machine) or even a group of subjects (such as a document about a herd of farm animals, or a set of patients that share a common exposure).", 0, 1, subject); + case 1524132147: /*encounter*/ return new Property("encounter", "Reference(Encounter)", "Describes the clinical encounter or type of care that the document content is associated with.", 0, java.lang.Integer.MAX_VALUE, encounter); + case 96891546: /*event*/ return new Property("event", "CodeableConcept", "This list of codes represents the main clinical acts, such as a colonoscopy or an appendectomy, being documented. In some cases, the event is inherent in the type Code, such as a \"History and Physical Report\" in which the procedure being documented is necessarily a \"History and Physical\" act.", 0, java.lang.Integer.MAX_VALUE, event); + case 370698365: /*facilityType*/ return new Property("facilityType", "CodeableConcept", "The kind of facility where the patient was seen.", 0, 1, facilityType); + case 331373717: /*practiceSetting*/ return new Property("practiceSetting", "CodeableConcept", "This property may convey specifics about the practice setting where the content was created, often reflecting the clinical specialty.", 0, 1, practiceSetting); + case -991726143: /*period*/ return new Property("period", "Period", "The time period over which the service that is described by the document was provided.", 0, 1, period); case 3076014: /*date*/ return new Property("date", "instant", "When the document reference was created.", 0, 1, date); case -1406328437: /*author*/ return new Property("author", "Reference(Practitioner|PractitionerRole|Organization|Device|Patient|RelatedPerson|CareTeam)", "Identifies who is responsible for adding the information to the document.", 0, java.lang.Integer.MAX_VALUE, author); - case 1815000435: /*authenticator*/ return new Property("authenticator", "Reference(Practitioner|PractitionerRole|Organization)", "Which person or organization authenticates that this document is valid.", 0, 1, authenticator); + case 542920370: /*attester*/ return new Property("attester", "", "A participant who has attested to the accuracy of the composition/document.", 0, java.lang.Integer.MAX_VALUE, attester); case 1611297262: /*custodian*/ return new Property("custodian", "Reference(Organization)", "Identifies the organization or group who is responsible for ongoing maintenance of and access to the document.", 0, 1, custodian); case -7765931: /*relatesTo*/ return new Property("relatesTo", "", "Relationships that this document has with other document references that already exist.", 0, java.lang.Integer.MAX_VALUE, relatesTo); - case -1724546052: /*description*/ return new Property("description", "string", "Human-readable description of the source document.", 0, 1, description); + case -1724546052: /*description*/ return new Property("description", "markdown", "Human-readable description of the source document.", 0, 1, description); case -722296940: /*securityLabel*/ return new Property("securityLabel", "CodeableConcept", "A set of Security-Tag codes specifying the level of privacy/security of the Document. Note that DocumentReference.meta.security contains the security labels of the \"reference\" to the document, while DocumentReference.securityLabel contains a snapshot of the security labels on the document the reference refers to.", 0, java.lang.Integer.MAX_VALUE, securityLabel); case 951530617: /*content*/ return new Property("content", "", "The document and format referenced. If there are multiple content element repetitions, these must all represent the same document in different format, or attachment metadata.", 0, java.lang.Integer.MAX_VALUE, content); - case 951530927: /*context*/ return new Property("context", "", "The clinical context in which the document was prepared.", 0, 1, context); + case 2031381048: /*sourcePatientInfo*/ return new Property("sourcePatientInfo", "Reference(Patient)", "The Patient Information as known when the document was published. May be a reference to a version specific, or contained.", 0, 1, sourcePatientInfo); + case 1090493483: /*related*/ return new Property("related", "Reference(Any)", "Related identifiers or resources associated with the DocumentReference.", 0, java.lang.Integer.MAX_VALUE, related); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -1950,22 +2153,28 @@ public class DocumentReference extends DomainResource { @Override public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException { switch (hash) { - case 243769515: /*masterIdentifier*/ return this.masterIdentifier == null ? new Base[0] : new Base[] {this.masterIdentifier}; // Identifier case -1618432855: /*identifier*/ return this.identifier == null ? new Base[0] : this.identifier.toArray(new Base[this.identifier.size()]); // Identifier + case -332612366: /*basedOn*/ return this.basedOn == null ? new Base[0] : this.basedOn.toArray(new Base[this.basedOn.size()]); // Reference case -892481550: /*status*/ return this.status == null ? new Base[0] : new Base[] {this.status}; // Enumeration case -23496886: /*docStatus*/ return this.docStatus == null ? new Base[0] : new Base[] {this.docStatus}; // Enumeration case 3575610: /*type*/ return this.type == null ? new Base[0] : new Base[] {this.type}; // CodeableConcept case 50511102: /*category*/ return this.category == null ? new Base[0] : this.category.toArray(new Base[this.category.size()]); // CodeableConcept case -1867885268: /*subject*/ return this.subject == null ? new Base[0] : new Base[] {this.subject}; // Reference + case 1524132147: /*encounter*/ return this.encounter == null ? new Base[0] : this.encounter.toArray(new Base[this.encounter.size()]); // Reference + case 96891546: /*event*/ return this.event == null ? new Base[0] : this.event.toArray(new Base[this.event.size()]); // CodeableConcept + case 370698365: /*facilityType*/ return this.facilityType == null ? new Base[0] : new Base[] {this.facilityType}; // CodeableConcept + case 331373717: /*practiceSetting*/ return this.practiceSetting == null ? new Base[0] : new Base[] {this.practiceSetting}; // CodeableConcept + case -991726143: /*period*/ return this.period == null ? new Base[0] : new Base[] {this.period}; // Period case 3076014: /*date*/ return this.date == null ? new Base[0] : new Base[] {this.date}; // InstantType case -1406328437: /*author*/ return this.author == null ? new Base[0] : this.author.toArray(new Base[this.author.size()]); // Reference - case 1815000435: /*authenticator*/ return this.authenticator == null ? new Base[0] : new Base[] {this.authenticator}; // Reference + case 542920370: /*attester*/ return this.attester == null ? new Base[0] : this.attester.toArray(new Base[this.attester.size()]); // DocumentReferenceAttesterComponent 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()]); // DocumentReferenceRelatesToComponent - case -1724546052: /*description*/ return this.description == null ? new Base[0] : new Base[] {this.description}; // StringType + case -1724546052: /*description*/ return this.description == null ? new Base[0] : new Base[] {this.description}; // MarkdownType case -722296940: /*securityLabel*/ return this.securityLabel == null ? new Base[0] : this.securityLabel.toArray(new Base[this.securityLabel.size()]); // CodeableConcept case 951530617: /*content*/ return this.content == null ? new Base[0] : this.content.toArray(new Base[this.content.size()]); // DocumentReferenceContentComponent - case 951530927: /*context*/ return this.context == null ? new Base[0] : new Base[] {this.context}; // DocumentReferenceContextComponent + case 2031381048: /*sourcePatientInfo*/ return this.sourcePatientInfo == null ? new Base[0] : new Base[] {this.sourcePatientInfo}; // Reference + case 1090493483: /*related*/ return this.related == null ? new Base[0] : this.related.toArray(new Base[this.related.size()]); // Reference default: return super.getProperty(hash, name, checkValid); } @@ -1974,12 +2183,12 @@ public class DocumentReference extends DomainResource { @Override public Base setProperty(int hash, String name, Base value) throws FHIRException { switch (hash) { - case 243769515: // masterIdentifier - this.masterIdentifier = TypeConvertor.castToIdentifier(value); // Identifier - return value; case -1618432855: // identifier this.getIdentifier().add(TypeConvertor.castToIdentifier(value)); // Identifier return value; + case -332612366: // basedOn + this.getBasedOn().add(TypeConvertor.castToReference(value)); // Reference + return value; case -892481550: // status value = new DocumentReferenceStatusEnumFactory().fromType(TypeConvertor.castToCode(value)); this.status = (Enumeration) value; // Enumeration @@ -1997,14 +2206,29 @@ public class DocumentReference extends DomainResource { case -1867885268: // subject this.subject = TypeConvertor.castToReference(value); // Reference return value; + case 1524132147: // encounter + this.getEncounter().add(TypeConvertor.castToReference(value)); // Reference + return value; + case 96891546: // event + this.getEvent().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept + return value; + case 370698365: // facilityType + this.facilityType = TypeConvertor.castToCodeableConcept(value); // CodeableConcept + return value; + case 331373717: // practiceSetting + this.practiceSetting = TypeConvertor.castToCodeableConcept(value); // CodeableConcept + return value; + case -991726143: // period + this.period = TypeConvertor.castToPeriod(value); // Period + return value; case 3076014: // date this.date = TypeConvertor.castToInstant(value); // InstantType return value; case -1406328437: // author this.getAuthor().add(TypeConvertor.castToReference(value)); // Reference return value; - case 1815000435: // authenticator - this.authenticator = TypeConvertor.castToReference(value); // Reference + case 542920370: // attester + this.getAttester().add((DocumentReferenceAttesterComponent) value); // DocumentReferenceAttesterComponent return value; case 1611297262: // custodian this.custodian = TypeConvertor.castToReference(value); // Reference @@ -2013,7 +2237,7 @@ public class DocumentReference extends DomainResource { this.getRelatesTo().add((DocumentReferenceRelatesToComponent) value); // DocumentReferenceRelatesToComponent return value; case -1724546052: // description - this.description = TypeConvertor.castToString(value); // StringType + this.description = TypeConvertor.castToMarkdown(value); // MarkdownType return value; case -722296940: // securityLabel this.getSecurityLabel().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept @@ -2021,8 +2245,11 @@ public class DocumentReference extends DomainResource { case 951530617: // content this.getContent().add((DocumentReferenceContentComponent) value); // DocumentReferenceContentComponent return value; - case 951530927: // context - this.context = (DocumentReferenceContextComponent) value; // DocumentReferenceContextComponent + case 2031381048: // sourcePatientInfo + this.sourcePatientInfo = TypeConvertor.castToReference(value); // Reference + return value; + case 1090493483: // related + this.getRelated().add(TypeConvertor.castToReference(value)); // Reference return value; default: return super.setProperty(hash, name, value); } @@ -2031,10 +2258,10 @@ public class DocumentReference extends DomainResource { @Override public Base setProperty(String name, Base value) throws FHIRException { - if (name.equals("masterIdentifier")) { - this.masterIdentifier = TypeConvertor.castToIdentifier(value); // Identifier - } else if (name.equals("identifier")) { + if (name.equals("identifier")) { this.getIdentifier().add(TypeConvertor.castToIdentifier(value)); + } else if (name.equals("basedOn")) { + this.getBasedOn().add(TypeConvertor.castToReference(value)); } else if (name.equals("status")) { value = new DocumentReferenceStatusEnumFactory().fromType(TypeConvertor.castToCode(value)); this.status = (Enumeration) value; // Enumeration @@ -2047,24 +2274,36 @@ public class DocumentReference extends DomainResource { this.getCategory().add(TypeConvertor.castToCodeableConcept(value)); } else if (name.equals("subject")) { this.subject = TypeConvertor.castToReference(value); // Reference + } else if (name.equals("encounter")) { + this.getEncounter().add(TypeConvertor.castToReference(value)); + } else if (name.equals("event")) { + this.getEvent().add(TypeConvertor.castToCodeableConcept(value)); + } else if (name.equals("facilityType")) { + this.facilityType = TypeConvertor.castToCodeableConcept(value); // CodeableConcept + } else if (name.equals("practiceSetting")) { + this.practiceSetting = TypeConvertor.castToCodeableConcept(value); // CodeableConcept + } else if (name.equals("period")) { + this.period = TypeConvertor.castToPeriod(value); // Period } else if (name.equals("date")) { this.date = TypeConvertor.castToInstant(value); // InstantType } else if (name.equals("author")) { this.getAuthor().add(TypeConvertor.castToReference(value)); - } else if (name.equals("authenticator")) { - this.authenticator = TypeConvertor.castToReference(value); // Reference + } else if (name.equals("attester")) { + this.getAttester().add((DocumentReferenceAttesterComponent) value); } else if (name.equals("custodian")) { this.custodian = TypeConvertor.castToReference(value); // Reference } else if (name.equals("relatesTo")) { this.getRelatesTo().add((DocumentReferenceRelatesToComponent) value); } else if (name.equals("description")) { - this.description = TypeConvertor.castToString(value); // StringType + this.description = TypeConvertor.castToMarkdown(value); // MarkdownType } else if (name.equals("securityLabel")) { this.getSecurityLabel().add(TypeConvertor.castToCodeableConcept(value)); } else if (name.equals("content")) { this.getContent().add((DocumentReferenceContentComponent) value); - } else if (name.equals("context")) { - this.context = (DocumentReferenceContextComponent) value; // DocumentReferenceContextComponent + } else if (name.equals("sourcePatientInfo")) { + this.sourcePatientInfo = TypeConvertor.castToReference(value); // Reference + } else if (name.equals("related")) { + this.getRelated().add(TypeConvertor.castToReference(value)); } else return super.setProperty(name, value); return value; @@ -2073,22 +2312,28 @@ public class DocumentReference extends DomainResource { @Override public Base makeProperty(int hash, String name) throws FHIRException { switch (hash) { - case 243769515: return getMasterIdentifier(); case -1618432855: return addIdentifier(); + case -332612366: return addBasedOn(); case -892481550: return getStatusElement(); case -23496886: return getDocStatusElement(); case 3575610: return getType(); case 50511102: return addCategory(); case -1867885268: return getSubject(); + case 1524132147: return addEncounter(); + case 96891546: return addEvent(); + case 370698365: return getFacilityType(); + case 331373717: return getPracticeSetting(); + case -991726143: return getPeriod(); case 3076014: return getDateElement(); case -1406328437: return addAuthor(); - case 1815000435: return getAuthenticator(); + case 542920370: return addAttester(); case 1611297262: return getCustodian(); case -7765931: return addRelatesTo(); case -1724546052: return getDescriptionElement(); case -722296940: return addSecurityLabel(); case 951530617: return addContent(); - case 951530927: return getContext(); + case 2031381048: return getSourcePatientInfo(); + case 1090493483: return addRelated(); default: return super.makeProperty(hash, name); } @@ -2097,22 +2342,28 @@ public class DocumentReference extends DomainResource { @Override public String[] getTypesForProperty(int hash, String name) throws FHIRException { switch (hash) { - case 243769515: /*masterIdentifier*/ return new String[] {"Identifier"}; case -1618432855: /*identifier*/ return new String[] {"Identifier"}; + case -332612366: /*basedOn*/ return new String[] {"Reference"}; case -892481550: /*status*/ return new String[] {"code"}; case -23496886: /*docStatus*/ return new String[] {"code"}; case 3575610: /*type*/ return new String[] {"CodeableConcept"}; case 50511102: /*category*/ return new String[] {"CodeableConcept"}; case -1867885268: /*subject*/ return new String[] {"Reference"}; + case 1524132147: /*encounter*/ return new String[] {"Reference"}; + case 96891546: /*event*/ return new String[] {"CodeableConcept"}; + case 370698365: /*facilityType*/ return new String[] {"CodeableConcept"}; + case 331373717: /*practiceSetting*/ return new String[] {"CodeableConcept"}; + case -991726143: /*period*/ return new String[] {"Period"}; case 3076014: /*date*/ return new String[] {"instant"}; case -1406328437: /*author*/ return new String[] {"Reference"}; - case 1815000435: /*authenticator*/ return new String[] {"Reference"}; + case 542920370: /*attester*/ return new String[] {}; case 1611297262: /*custodian*/ return new String[] {"Reference"}; case -7765931: /*relatesTo*/ return new String[] {}; - case -1724546052: /*description*/ return new String[] {"string"}; + case -1724546052: /*description*/ return new String[] {"markdown"}; case -722296940: /*securityLabel*/ return new String[] {"CodeableConcept"}; case 951530617: /*content*/ return new String[] {}; - case 951530927: /*context*/ return new String[] {}; + case 2031381048: /*sourcePatientInfo*/ return new String[] {"Reference"}; + case 1090493483: /*related*/ return new String[] {"Reference"}; default: return super.getTypesForProperty(hash, name); } @@ -2120,13 +2371,12 @@ public class DocumentReference extends DomainResource { @Override public Base addChild(String name) throws FHIRException { - if (name.equals("masterIdentifier")) { - this.masterIdentifier = new Identifier(); - return this.masterIdentifier; - } - else if (name.equals("identifier")) { + if (name.equals("identifier")) { return addIdentifier(); } + else if (name.equals("basedOn")) { + return addBasedOn(); + } else if (name.equals("status")) { throw new FHIRException("Cannot call addChild on a primitive type DocumentReference.status"); } @@ -2144,15 +2394,32 @@ public class DocumentReference extends DomainResource { this.subject = new Reference(); return this.subject; } + else if (name.equals("encounter")) { + return addEncounter(); + } + else if (name.equals("event")) { + return addEvent(); + } + else if (name.equals("facilityType")) { + this.facilityType = new CodeableConcept(); + return this.facilityType; + } + else if (name.equals("practiceSetting")) { + this.practiceSetting = new CodeableConcept(); + return this.practiceSetting; + } + else if (name.equals("period")) { + this.period = new Period(); + return this.period; + } else if (name.equals("date")) { throw new FHIRException("Cannot call addChild on a primitive type DocumentReference.date"); } else if (name.equals("author")) { return addAuthor(); } - else if (name.equals("authenticator")) { - this.authenticator = new Reference(); - return this.authenticator; + else if (name.equals("attester")) { + return addAttester(); } else if (name.equals("custodian")) { this.custodian = new Reference(); @@ -2170,9 +2437,12 @@ public class DocumentReference extends DomainResource { else if (name.equals("content")) { return addContent(); } - else if (name.equals("context")) { - this.context = new DocumentReferenceContextComponent(); - return this.context; + else if (name.equals("sourcePatientInfo")) { + this.sourcePatientInfo = new Reference(); + return this.sourcePatientInfo; + } + else if (name.equals("related")) { + return addRelated(); } else return super.addChild(name); @@ -2191,12 +2461,16 @@ public class DocumentReference extends DomainResource { public void copyValues(DocumentReference dst) { super.copyValues(dst); - dst.masterIdentifier = masterIdentifier == null ? null : masterIdentifier.copy(); if (identifier != null) { dst.identifier = new ArrayList(); for (Identifier i : identifier) dst.identifier.add(i.copy()); }; + if (basedOn != null) { + dst.basedOn = new ArrayList(); + for (Reference i : basedOn) + dst.basedOn.add(i.copy()); + }; dst.status = status == null ? null : status.copy(); dst.docStatus = docStatus == null ? null : docStatus.copy(); dst.type = type == null ? null : type.copy(); @@ -2206,13 +2480,30 @@ public class DocumentReference extends DomainResource { dst.category.add(i.copy()); }; dst.subject = subject == null ? null : subject.copy(); + if (encounter != null) { + dst.encounter = new ArrayList(); + for (Reference i : encounter) + dst.encounter.add(i.copy()); + }; + if (event != null) { + dst.event = new ArrayList(); + for (CodeableConcept i : event) + dst.event.add(i.copy()); + }; + dst.facilityType = facilityType == null ? null : facilityType.copy(); + dst.practiceSetting = practiceSetting == null ? null : practiceSetting.copy(); + dst.period = period == null ? null : period.copy(); dst.date = date == null ? null : date.copy(); if (author != null) { dst.author = new ArrayList(); for (Reference i : author) dst.author.add(i.copy()); }; - dst.authenticator = authenticator == null ? null : authenticator.copy(); + if (attester != null) { + dst.attester = new ArrayList(); + for (DocumentReferenceAttesterComponent i : attester) + dst.attester.add(i.copy()); + }; dst.custodian = custodian == null ? null : custodian.copy(); if (relatesTo != null) { dst.relatesTo = new ArrayList(); @@ -2230,7 +2521,12 @@ public class DocumentReference extends DomainResource { for (DocumentReferenceContentComponent i : content) dst.content.add(i.copy()); }; - dst.context = context == null ? null : context.copy(); + dst.sourcePatientInfo = sourcePatientInfo == null ? null : sourcePatientInfo.copy(); + if (related != null) { + dst.related = new ArrayList(); + for (Reference i : related) + dst.related.add(i.copy()); + }; } protected DocumentReference typedCopy() { @@ -2244,12 +2540,15 @@ public class DocumentReference extends DomainResource { if (!(other_ instanceof DocumentReference)) return false; DocumentReference o = (DocumentReference) other_; - return compareDeep(masterIdentifier, o.masterIdentifier, true) && compareDeep(identifier, o.identifier, true) - && compareDeep(status, o.status, true) && compareDeep(docStatus, o.docStatus, true) && compareDeep(type, o.type, true) - && compareDeep(category, o.category, true) && compareDeep(subject, o.subject, true) && compareDeep(date, o.date, true) - && compareDeep(author, o.author, true) && compareDeep(authenticator, o.authenticator, true) && compareDeep(custodian, o.custodian, true) - && compareDeep(relatesTo, o.relatesTo, true) && compareDeep(description, o.description, true) && compareDeep(securityLabel, o.securityLabel, true) - && compareDeep(content, o.content, true) && compareDeep(context, o.context, true); + return compareDeep(identifier, o.identifier, true) && compareDeep(basedOn, o.basedOn, true) && compareDeep(status, o.status, true) + && compareDeep(docStatus, o.docStatus, true) && compareDeep(type, o.type, true) && compareDeep(category, o.category, true) + && compareDeep(subject, o.subject, true) && compareDeep(encounter, o.encounter, true) && compareDeep(event, o.event, true) + && compareDeep(facilityType, o.facilityType, true) && compareDeep(practiceSetting, o.practiceSetting, true) + && compareDeep(period, o.period, true) && compareDeep(date, o.date, true) && compareDeep(author, o.author, true) + && compareDeep(attester, o.attester, true) && compareDeep(custodian, o.custodian, true) && compareDeep(relatesTo, o.relatesTo, true) + && compareDeep(description, o.description, true) && compareDeep(securityLabel, o.securityLabel, true) + && compareDeep(content, o.content, true) && compareDeep(sourcePatientInfo, o.sourcePatientInfo, true) + && compareDeep(related, o.related, true); } @Override @@ -2264,9 +2563,10 @@ public class DocumentReference extends DomainResource { } public boolean isEmpty() { - return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(masterIdentifier, identifier - , status, docStatus, type, category, subject, date, author, authenticator, custodian - , relatesTo, description, securityLabel, content, context); + return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, basedOn, status + , docStatus, type, category, subject, encounter, event, facilityType, practiceSetting + , period, date, author, attester, custodian, relatesTo, description, securityLabel + , content, sourcePatientInfo, related); } @Override @@ -2275,30 +2575,30 @@ public class DocumentReference extends DomainResource { } /** - * Search parameter: authenticator + * Search parameter: attester *

- * Description: Who/what authenticated the document
+ * Description: Who attested the composition
* Type: reference
- * Path: DocumentReference.authenticator
+ * Path: DocumentReference.attester.party
*

*/ - @SearchParamDefinition(name="authenticator", path="DocumentReference.authenticator", description="Who/what authenticated the document", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Practitioner") }, target={Organization.class, Practitioner.class, PractitionerRole.class } ) - public static final String SP_AUTHENTICATOR = "authenticator"; + @SearchParamDefinition(name="attester", path="DocumentReference.attester.party", description="Who attested the composition", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Practitioner") }, target={Organization.class, Patient.class, Practitioner.class, PractitionerRole.class, RelatedPerson.class } ) + public static final String SP_ATTESTER = "attester"; /** - * Fluent Client search parameter constant for authenticator + * Fluent Client search parameter constant for attester *

- * Description: Who/what authenticated the document
+ * Description: Who attested the composition
* Type: reference
- * Path: DocumentReference.authenticator
+ * Path: DocumentReference.attester.party
*

*/ - public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam AUTHENTICATOR = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_AUTHENTICATOR); + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ATTESTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ATTESTER); /** * Constant for fluent queries to be used to add include statements. Specifies - * the path value of "DocumentReference:authenticator". + * the path value of "DocumentReference:attester". */ - public static final ca.uhn.fhir.model.api.Include INCLUDE_AUTHENTICATOR = new ca.uhn.fhir.model.api.Include("DocumentReference:authenticator").toLocked(); + public static final ca.uhn.fhir.model.api.Include INCLUDE_ATTESTER = new ca.uhn.fhir.model.api.Include("DocumentReference:attester").toLocked(); /** * Search parameter: author @@ -2331,17 +2631,17 @@ public class DocumentReference extends DomainResource { *

* Description: Procedure that caused this media to be created
* Type: reference
- * Path: DocumentReference.context.basedOn
+ * Path: DocumentReference.basedOn
*

*/ - @SearchParamDefinition(name="based-on", path="DocumentReference.context.basedOn", description="Procedure that caused this media to be created", type="reference", target={CarePlan.class, ServiceRequest.class } ) + @SearchParamDefinition(name="based-on", path="DocumentReference.basedOn", description="Procedure that caused this media to be created", type="reference", target={CarePlan.class, ServiceRequest.class } ) public static final String SP_BASED_ON = "based-on"; /** * Fluent Client search parameter constant for based-on *

* Description: Procedure that caused this media to be created
* Type: reference
- * Path: DocumentReference.context.basedOn
+ * Path: DocumentReference.basedOn
*

*/ public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam BASED_ON = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_BASED_ON); @@ -2503,17 +2803,17 @@ public class DocumentReference extends DomainResource { *

* Description: Main clinical acts documented
* Type: token
- * Path: DocumentReference.context.event
+ * Path: DocumentReference.event
*

*/ - @SearchParamDefinition(name="event", path="DocumentReference.context.event", description="Main clinical acts documented", type="token" ) + @SearchParamDefinition(name="event", path="DocumentReference.event", description="Main clinical acts documented", type="token" ) public static final String SP_EVENT = "event"; /** * Fluent Client search parameter constant for event *

* Description: Main clinical acts documented
* Type: token
- * Path: DocumentReference.context.event
+ * Path: DocumentReference.event
*

*/ public static final ca.uhn.fhir.rest.gclient.TokenClientParam EVENT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_EVENT); @@ -2523,17 +2823,17 @@ public class DocumentReference extends DomainResource { *

* Description: Kind of facility where patient was seen
* Type: token
- * Path: DocumentReference.context.facilityType
+ * Path: DocumentReference.facilityType
*

*/ - @SearchParamDefinition(name="facility", path="DocumentReference.context.facilityType", description="Kind of facility where patient was seen", type="token" ) + @SearchParamDefinition(name="facility", path="DocumentReference.facilityType", description="Kind of facility where patient was seen", type="token" ) public static final String SP_FACILITY = "facility"; /** * Fluent Client search parameter constant for facility *

* Description: Kind of facility where patient was seen
* Type: token
- * Path: DocumentReference.context.facilityType
+ * Path: DocumentReference.facilityType
*

*/ public static final ca.uhn.fhir.rest.gclient.TokenClientParam FACILITY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_FACILITY); @@ -2603,17 +2903,17 @@ public class DocumentReference extends DomainResource { *

* Description: Time of service that is being documented
* Type: date
- * Path: DocumentReference.context.period
+ * Path: DocumentReference.period
*

*/ - @SearchParamDefinition(name="period", path="DocumentReference.context.period", description="Time of service that is being documented", type="date" ) + @SearchParamDefinition(name="period", path="DocumentReference.period", description="Time of service that is being documented", type="date" ) public static final String SP_PERIOD = "period"; /** * Fluent Client search parameter constant for period *

* Description: Time of service that is being documented
* Type: date
- * Path: DocumentReference.context.period
+ * Path: DocumentReference.period
*

*/ public static final ca.uhn.fhir.rest.gclient.DateClientParam PERIOD = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_PERIOD); @@ -2623,17 +2923,17 @@ public class DocumentReference extends DomainResource { *

* Description: Related identifiers or resources
* Type: reference
- * Path: DocumentReference.context.related
+ * Path: DocumentReference.related
*

*/ - @SearchParamDefinition(name="related", path="DocumentReference.context.related", description="Related identifiers or resources", 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="related", path="DocumentReference.related", description="Related identifiers or resources", 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_RELATED = "related"; /** * Fluent Client search parameter constant for related *

* Description: Related identifiers or resources
* Type: reference
- * Path: DocumentReference.context.related
+ * Path: DocumentReference.related
*

*/ public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam RELATED = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_RELATED); @@ -2735,17 +3035,17 @@ public class DocumentReference extends DomainResource { *

* Description: Additional details about where the content was created (e.g. clinical specialty)
* Type: token
- * Path: DocumentReference.context.practiceSetting
+ * Path: DocumentReference.practiceSetting
*

*/ - @SearchParamDefinition(name="setting", path="DocumentReference.context.practiceSetting", description="Additional details about where the content was created (e.g. clinical specialty)", type="token" ) + @SearchParamDefinition(name="setting", path="DocumentReference.practiceSetting", description="Additional details about where the content was created (e.g. clinical specialty)", type="token" ) public static final String SP_SETTING = "setting"; /** * Fluent Client search parameter constant for setting *

* Description: Additional details about where the content was created (e.g. clinical specialty)
* Type: token
- * Path: DocumentReference.context.practiceSetting
+ * Path: DocumentReference.practiceSetting
*

*/ public static final ca.uhn.fhir.rest.gclient.TokenClientParam SETTING = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SETTING); @@ -2815,10 +3115,10 @@ public class DocumentReference 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 @@ -2839,7 +3139,7 @@ public class DocumentReference 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); @@ -2865,7 +3165,7 @@ public class DocumentReference 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 @@ -2887,10 +3187,10 @@ public class DocumentReference 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 @@ -2907,7 +3207,7 @@ public class DocumentReference 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 @@ -2929,7 +3229,7 @@ public class DocumentReference 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); @@ -3065,4 +3365,5 @@ public class DocumentReference 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/DomainResource.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DomainResource.java index 7d182790c..1c7e56d1f 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DomainResource.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DomainResource.java @@ -1,8 +1,6 @@ package org.hl7.fhir.r5.model; - - /* Copyright (c) 2011+, HL7, Inc. All rights reserved. @@ -31,20 +29,29 @@ 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.Collections; +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 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 java.util.Collections; +import org.hl7.fhir.instance.model.api.IDomainResource; +import org.hl7.fhir.instance.model.api.IBaseDatatypeElement; import org.hl7.fhir.instance.model.api.IBaseHasExtensions; import org.hl7.fhir.instance.model.api.IBaseHasModifierExtensions; -import org.hl7.fhir.instance.model.api.IDomainResource; - -import ca.uhn.fhir.model.api.annotation.Child; -import ca.uhn.fhir.model.api.annotation.Description; -import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; /** * A resource that includes narrative, extensions, and contained resources. */ @@ -58,10 +65,10 @@ public abstract class DomainResource extends Resource implements IBaseHasExtensi protected Narrative text; /** - * These resources do not have an independent existence apart from the resource that contains them - they cannot be identified independently, and nor can they have their own independent transaction scope. + * These resources do not have an independent existence apart from the resource that contains them - they cannot be identified independently, nor can they have their own independent transaction scope. */ @Child(name = "contained", type = {Resource.class}, order=1, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Contained, inline Resources", formalDefinition="These resources do not have an independent existence apart from the resource that contains them - they cannot be identified independently, and nor can they have their own independent transaction scope." ) + @Description(shortDefinition="Contained, inline Resources", formalDefinition="These resources do not have an independent existence apart from the resource that contains them - they cannot be identified independently, nor can they have their own independent transaction scope." ) protected List contained; /** @@ -114,7 +121,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or } /** - * @return {@link #contained} (These resources do not have an independent existence apart from the resource that contains them - they cannot be identified independently, and nor can they have their own independent transaction scope.) + * @return {@link #contained} (These resources do not have an independent existence apart from the resource that contains them - they cannot be identified independently, nor can they have their own independent transaction scope.) */ public List getContained() { if (this.contained == null) @@ -239,7 +246,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or protected void listChildren(List children) { super.listChildren(children); children.add(new Property("text", "Narrative", "A human-readable narrative that contains a summary of the resource and can be used to represent the content of the resource to a human. The narrative need not encode all the structured data, but is required to contain sufficient detail to make it \"clinically safe\" for a human to just read the narrative. Resource definitions may define what content should be represented in the narrative to ensure clinical safety.", 0, 1, text)); - children.add(new Property("contained", "Resource", "These resources do not have an independent existence apart from the resource that contains them - they cannot be identified independently, and nor can they have their own independent transaction scope.", 0, java.lang.Integer.MAX_VALUE, contained)); + children.add(new Property("contained", "Resource", "These resources do not have an independent existence apart from the resource that contains them - they cannot be identified independently, nor can they have their own independent transaction scope.", 0, java.lang.Integer.MAX_VALUE, contained)); children.add(new Property("extension", "Extension", "May be used to represent additional information that is not part of the basic definition of the resource. To make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension.", 0, java.lang.Integer.MAX_VALUE, extension)); children.add(new Property("modifierExtension", "Extension", "May be used to represent additional information that is not part of the basic definition of the resource and that modifies the understanding of the element that contains it and/or the understanding of the containing element's descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer is allowed to define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions.\n\nModifier extensions SHALL NOT change the meaning of any elements on Resource or DomainResource (including cannot change the meaning of modifierExtension itself).", 0, java.lang.Integer.MAX_VALUE, modifierExtension)); } @@ -248,7 +255,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { switch (_hash) { case 3556653: /*text*/ return new Property("text", "Narrative", "A human-readable narrative that contains a summary of the resource and can be used to represent the content of the resource to a human. The narrative need not encode all the structured data, but is required to contain sufficient detail to make it \"clinically safe\" for a human to just read the narrative. Resource definitions may define what content should be represented in the narrative to ensure clinical safety.", 0, 1, text); - case -410956685: /*contained*/ return new Property("contained", "Resource", "These resources do not have an independent existence apart from the resource that contains them - they cannot be identified independently, and nor can they have their own independent transaction scope.", 0, java.lang.Integer.MAX_VALUE, contained); + case -410956685: /*contained*/ return new Property("contained", "Resource", "These resources do not have an independent existence apart from the resource that contains them - they cannot be identified independently, nor can they have their own independent transaction scope.", 0, java.lang.Integer.MAX_VALUE, contained); case -612557761: /*extension*/ return new Property("extension", "Extension", "May be used to represent additional information that is not part of the basic definition of the resource. To make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension.", 0, java.lang.Integer.MAX_VALUE, extension); case -298878168: /*modifierExtension*/ return new Property("modifierExtension", "Extension", "May be used to represent additional information that is not part of the basic definition of the resource and that modifies the understanding of the element that contains it and/or the understanding of the containing element's descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer is allowed to define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions.\n\nModifier extensions SHALL NOT change the meaning of any elements on Resource or DomainResource (including cannot change the meaning of modifierExtension itself).", 0, java.lang.Integer.MAX_VALUE, modifierExtension); default: return super.getNamedProperty(_hash, _name, _checkValid); @@ -420,8 +427,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or public static final ca.uhn.fhir.rest.gclient.StringClientParam TEXT = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_TEXT); // 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); } @@ -503,8 +509,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or } return Collections.unmodifiableList(retVal); } - - // end addition -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Dosage.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Dosage.java index e7465ec84..b79ed6dbb 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Dosage.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Dosage.java @@ -1,8 +1,6 @@ package org.hl7.fhir.r5.model; - - /* Copyright (c) 2011+, HL7, Inc. All rights reserved. @@ -31,20 +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.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 Dosage Type: Indicates how the medication is/was taken or should be taken by the patient. @@ -1279,4 +1278,5 @@ public class Dosage extends BackboneType implements ICompositeType { } -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Duration.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Duration.java index 7325c4366..1c21d0f03 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Duration.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Duration.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 Duration Type: A length of time. @@ -42,4 +79,5 @@ public class Duration 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/Element.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Element.java index 21f082ba0..31994c68f 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Element.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Element.java @@ -1,8 +1,6 @@ package org.hl7.fhir.r5.model; - - /* Copyright (c) 2011+, HL7, Inc. All rights reserved. @@ -31,19 +29,24 @@ 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.IBaseElement; -import org.hl7.fhir.instance.model.api.IBaseHasExtensions; 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.IBaseElement; +import org.hl7.fhir.instance.model.api.IBaseHasExtensions; /** * Base StructureDefinition for Element Type: Base definition for all elements in a resource. */ @@ -300,7 +303,7 @@ public abstract class Element extends Base implements IBaseHasExtensions, IBaseE } // Manual code (from Configuration.txt)t: - @Override + @Override public String getIdBase() { return getId(); } @@ -426,6 +429,8 @@ public abstract class Element extends Base implements IBaseHasExtensions, IBaseE throw new FHIRException("Extension could not be converted to a string"); return ext.get(0).getValue().primitiveValue(); } + // end addition -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ElementDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ElementDefinition.java index ad0bddb2a..23f8a9426 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ElementDefinition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ElementDefinition.java @@ -1,8 +1,6 @@ package org.hl7.fhir.r5.model; - - /* Copyright (c) 2011+, HL7, Inc. All rights reserved. @@ -31,24 +29,28 @@ 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.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.ICompositeType; import org.hl7.fhir.r5.model.Enumerations.BindingStrength; import org.hl7.fhir.r5.model.Enumerations.BindingStrengthEnumFactory; import org.hl7.fhir.r5.utils.ToolingExtensions; +import org.hl7.fhir.instance.model.api.IBaseDatatypeElement; import org.hl7.fhir.utilities.CommaSeparatedStringBuilder; -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.DatatypeDef; -import ca.uhn.fhir.model.api.annotation.Description; /** * Base StructureDefinition for ElementDefinition Type: Captures constraints on each element within the resource, profile, or extension. */ @@ -2248,8 +2250,7 @@ public class ElementDefinition extends BackboneType implements ICompositeType { } // added from java-adornments.txt: - - public boolean hasTarget() { +public boolean hasTarget() { return Utilities.existsInList(getCode(), "Reference", "canonical", "CodeableReference"); } @@ -11276,122 +11277,122 @@ When pattern[x] is used to constrain a complex object, it means that each proper } // Manual code (from Configuration.txt)t: - - public String toString() { - if (hasId()) - return getId(); - if (hasSliceName()) - return getPath()+":"+getSliceName(); - else - return getPath(); - } - - public void makeBase(String path, int min, String max) { - ElementDefinitionBaseComponent self = getBase(); - self.setPath(path); - self.setMin(min); - self.setMax(max); - } - - public void makeBase() { - ElementDefinitionBaseComponent self = getBase(); - self.setPath(getPath()); - self.setMin(getMin()); - self.setMax(getMax()); - } - - - public String typeSummary() { - CommaSeparatedStringBuilder b = new CommaSeparatedStringBuilder(); - for (TypeRefComponent tr : getType()) { - if (tr.hasCode()) - b.append(tr.getWorkingCode()); - } - return b.toString(); - } - - public String typeSummaryVB() { - CommaSeparatedStringBuilder b = new CommaSeparatedStringBuilder("|"); - for (TypeRefComponent tr : getType()) { - if (tr.hasCode()) - b.append(tr.getWorkingCode()); - } - return b.toString().replace(" ", ""); - } - - public TypeRefComponent getType(String code) { - for (TypeRefComponent tr : getType()) - if (tr.getCode().equals(code)) + + + public String toString() { + if (hasId()) + return getId(); + if (hasSliceName()) + return getPath()+":"+getSliceName(); + else + return getPath(); + } + + public void makeBase(String path, int min, String max) { + ElementDefinitionBaseComponent self = getBase(); + self.setPath(path); + self.setMin(min); + self.setMax(max); + } + + public void makeBase() { + ElementDefinitionBaseComponent self = getBase(); + self.setPath(getPath()); + self.setMin(getMin()); + self.setMax(getMax()); + } + + + public String typeSummary() { + CommaSeparatedStringBuilder b = new CommaSeparatedStringBuilder(); + for (TypeRefComponent tr : getType()) { + if (tr.hasCode()) + b.append(tr.getWorkingCode()); + } + return b.toString(); + } + + public String typeSummaryVB() { + CommaSeparatedStringBuilder b = new CommaSeparatedStringBuilder("|"); + for (TypeRefComponent tr : getType()) { + if (tr.hasCode()) + b.append(tr.getWorkingCode()); + } + return b.toString().replace(" ", ""); + } + + public TypeRefComponent getType(String code) { + for (TypeRefComponent tr : getType()) + if (tr.getCode().equals(code)) + return tr; + TypeRefComponent tr = new TypeRefComponent(); + tr.setCode(code); + type.add(tr); return tr; - TypeRefComponent tr = new TypeRefComponent(); - tr.setCode(code); - type.add(tr); - return tr; - } + } - public static final boolean NOT_MODIFIER = false; - public static final boolean NOT_IN_SUMMARY = false; - public static final boolean IS_MODIFIER = true; - public static final boolean IS_IN_SUMMARY = true; - public ElementDefinition(boolean defaults, boolean modifier, boolean inSummary) { - super(); - if (defaults) { - setIsModifier(modifier); - setIsSummary(inSummary); - } - } + public static final boolean NOT_MODIFIER = false; + public static final boolean NOT_IN_SUMMARY = false; + public static final boolean IS_MODIFIER = true; + public static final boolean IS_IN_SUMMARY = true; + public ElementDefinition(boolean defaults, boolean modifier, boolean inSummary) { + super(); + if (defaults) { + setIsModifier(modifier); + setIsSummary(inSummary); + } + } - public String present() { - return hasId() ? getId() : getPath(); - } + public String present() { + return hasId() ? getId() : getPath(); + } - public boolean hasCondition(IdType id) { - for (IdType c : getCondition()) { - if (c.primitiveValue().equals(id.primitiveValue())) - return true; - } - return false; - } + public boolean hasCondition(IdType id) { + for (IdType c : getCondition()) { + if (c.primitiveValue().equals(id.primitiveValue())) + return true; + } + return false; + } - public boolean hasConstraint(String key) { - for (ElementDefinitionConstraintComponent c : getConstraint()) { - if (c.getKey().equals(key)) - return true; - } - return false; - } + public boolean hasConstraint(String key) { + for (ElementDefinitionConstraintComponent c : getConstraint()) { + if (c.getKey().equals(key)) + return true; + } + return false; + } - public boolean hasCode(Coding c) { - for (Coding t : getCode()) { - if (t.getSystem().equals(c.getSystem()) && t.getCode().equals(c.getCode())) - return true; - } - return false; - } + public boolean hasCode(Coding c) { + for (Coding t : getCode()) { + if (t.getSystem().equals(c.getSystem()) && t.getCode().equals(c.getCode())) + return true; + } + return false; + } - public boolean isChoice() { - return getPath().endsWith("[x]"); - } + public boolean isChoice() { + return getPath().endsWith("[x]"); + } - public String getName() { - return hasPath() ? getPath().contains(".") ? getPath().substring(getPath().lastIndexOf(".")+1) : getPath() : null; - } + public String getName() { + return hasPath() ? getPath().contains(".") ? getPath().substring(getPath().lastIndexOf(".")+1) : getPath() : null; + } - public boolean unbounded() { - return getMax().equals("*") || Integer.parseInt(getMax()) > 1; - } - - public boolean isMandatory() { - return getMin() > 0; - } - - public boolean isInlineType() { - return getType().size() == 1 && Utilities.existsInList(getType().get(0).getCode(), "Element", "BackboneElement"); - } + public boolean unbounded() { + return getMax().equals("*") || Integer.parseInt(getMax()) > 1; + } + public boolean isMandatory() { + return getMin() > 0; + } + public boolean isInlineType() { + return getType().size() == 1 && Utilities.existsInList(getType().get(0).getCode(), "Element", "BackboneElement"); + } // end addition -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Encounter.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Encounter.java index 51e438f64..17814b548 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Encounter.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Encounter.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; /** * An interaction between a patient and healthcare provider(s) for the purpose of providing healthcare service(s) or assessing the health status of a patient. @@ -4462,7 +4464,7 @@ public class Encounter 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 @@ -4484,10 +4486,10 @@ public class Encounter 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 @@ -4504,7 +4506,7 @@ public class Encounter 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 @@ -4526,7 +4528,7 @@ public class Encounter 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); @@ -4662,4 +4664,5 @@ public class Encounter 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/Endpoint.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Endpoint.java index be8f9af17..e835dcb79 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Endpoint.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Endpoint.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; /** * The technical details of an endpoint that can be used for electronic services, such as for web services providing XDS.b or a REST endpoint for another FHIR server. This may include any security context information. @@ -1217,4 +1220,5 @@ public class Endpoint 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/EnrollmentRequest.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EnrollmentRequest.java index 3a1ebbbd1..46a17983b 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EnrollmentRequest.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EnrollmentRequest.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.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.FinancialResourceStatusCodes; -import org.hl7.fhir.r5.model.Enumerations.FinancialResourceStatusCodesEnumFactory; - -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; /** * This resource provides the insurance enrollment details to the insurer regarding a specified coverage. @@ -667,4 +668,5 @@ public class EnrollmentRequest extends DomainResource { public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("EnrollmentRequest:subject").toLocked(); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EnrollmentResponse.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EnrollmentResponse.java index 9184e0187..1e306b1ae 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EnrollmentResponse.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EnrollmentResponse.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.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.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 enrollment and plan details from the processing of an EnrollmentRequest resource. @@ -743,4 +741,5 @@ public class EnrollmentResponse 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/Enumerations.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Enumerations.java index 9997e20f7..76a474056 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Enumerations.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Enumerations.java @@ -1,8 +1,38 @@ 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 org.hl7.fhir.instance.model.api.*; import org.hl7.fhir.exceptions.FHIRException; public class Enumerations { @@ -28,19 +58,20 @@ public class Enumerations { // DocumentReferenceStatus: The status of the document reference.[DocumentManifest, DocumentReference] // DocumentRelationshipType: The type of relationship between documents.[Composition, DocumentReference] // EventStatus: Codes identifying the lifecycle stage of an event.[ClinicalImpression, Communication, NutritionIntake, Procedure] +// EvidenceVariableHandling: The handling of the variable in statistical analysis for exposures or outcomes (E.g. Dichotomous, Continuous, Descriptive).[EvidenceVariable, Statistic] // FHIRAllTypes: A list of all the concrete types defined in this version of the FHIR specification - Abstract Types, Data Types and Resource Types.[DataRequirement, OperationDefinition, ParameterDefinition] // FHIRVersion: All published FHIR Versions.[CapabilityStatement, CapabilityStatement2, ImplementationGuide, StructureDefinition] // FilterOperator: The kind of operation to perform as a part of a property based filter.[CodeSystem, ValueSet] // FinancialResourceStatusCodes: This value set includes Status codes.[Claim, ClaimResponse, Coverage, CoverageEligibilityRequest, CoverageEligibilityResponse, EnrollmentRequest, EnrollmentResponse, PaymentNotice, PaymentReconciliation, VisionPrescription] // InvoicePriceComponentType: Codes indicating the kind of the price component.[ChargeItemDefinition, Invoice] -// ListMode: The processing mode that applies to this list.[Composition, List] +// ListMode: The processing mode that applies to this list.[Composition, EvidenceReport, List] // MeasureImprovementNotation: Observation values that indicate what change in a measurement value or score is indicative of an improvement in the measured item or scored issue.[Measure, MeasureReport] // MimeTypes: This value set includes all possible codes from BCP-13 (http://tools.ietf.org/html/bcp13)[Attachment, Binary, CapabilityStatement, CapabilityStatement2, ElementDefinition, Endpoint, Signature, Subscription, TestScript] // NoteType: The presentation types of notes.[ClaimResponse, ExplanationOfBenefit, PaymentReconciliation] // ObservationStatus: Codes providing the status of an observation.[DetectedIssue, Observation, RiskAssessment] // OperationParameterUse: Whether an operation parameter is an input or an output parameter.[OperationDefinition, ParameterDefinition] // ParticipationStatus: The Participation status of an appointment.[Appointment, AppointmentResponse] -// PublicationStatus: The lifecycle status of an artifact.[ActivityDefinition, CanonicalResource, CapabilityStatement, CapabilityStatement2, ChargeItemDefinition, Citation, CodeSystem, CompartmentDefinition, ConceptMap, ConditionDefinition, EventDefinition, Evidence, EvidenceFocus, EvidenceVariable, ExampleScenario, GraphDefinition, ImplementationGuide, InsurancePlan, Library, Measure, MessageDefinition, NamingSystem, ObservationDefinition, OperationDefinition, PlanDefinition, Questionnaire, SearchParameter, SpecimenDefinition, StructureDefinition, StructureMap, SubscriptionTopic, TerminologyCapabilities, TestScript, ValueSet] +// PublicationStatus: The lifecycle status of an artifact.[ActivityDefinition, CanonicalResource, CapabilityStatement, CapabilityStatement2, ChargeItemDefinition, Citation, CodeSystem, CompartmentDefinition, ConceptMap, ConditionDefinition, EventDefinition, Evidence, EvidenceReport, EvidenceVariable, ExampleScenario, GraphDefinition, ImplementationGuide, InsurancePlan, Library, Measure, MessageDefinition, NamingSystem, ObservationDefinition, OperationDefinition, PlanDefinition, Questionnaire, SearchParameter, SpecimenDefinition, StructureDefinition, StructureMap, SubscriptionTopic, TerminologyCapabilities, TestScript, ValueSet] // QuantityComparator: How the Quantity should be understood and represented.[Age, Count, Distance, Duration, Quantity] // RequestIntent: Codes indicating the degree of authority/intentionality associated with a request.[ActivityDefinition, DeviceRequest, NutritionOrder, RequestGroup, ServiceRequest] // RequestPriority: The clinical priority of a diagnostic order.[ActivityDefinition, Communication, CommunicationRequest, DeviceRequest, MedicationRequest, PlanDefinition, RequestGroup, ServiceRequest, SupplyRequest, Task] @@ -1370,19 +1401,19 @@ public class Enumerations { public enum ClaimProcessingCodes { /** - * null + * The Claim/Pre-authorization/Pre-determination has been received but processing has not begun. */ QUEUED, /** - * The processing completed without errors. + * The processing has completed without errors */ COMPLETE, /** - * The processing identified errors. + * One or more errors have been detected in the Claim */ ERROR, /** - * No errors have been detected and some of the adjudication has been performed. + * No errors have been detected in the Claim and some of the adjudication has been performed. */ PARTIAL, /** @@ -1422,10 +1453,10 @@ public class Enumerations { } public String getDefinition() { switch (this) { - case QUEUED: return ""; - case COMPLETE: return "The processing completed without errors."; - case ERROR: return "The processing identified errors."; - case PARTIAL: return "No errors have been detected and some of the adjudication has been performed."; + case QUEUED: return "The Claim/Pre-authorization/Pre-determination has been received but processing has not begun."; + case COMPLETE: return "The processing has completed without errors"; + case ERROR: return "One or more errors have been detected in the Claim"; + case PARTIAL: return "No errors have been detected in the Claim and some of the adjudication has been performed."; default: return "?"; } } @@ -2059,19 +2090,19 @@ public class Enumerations { */ UDILABELNAME, /** - * User Friendly name. + * The 'user friendly name' typically is the name of the device on the package it came in or some combination of that name with the model number, serial number, or other attribute that makes the name easy to understand for the user of that device. It is often exposed in communicating devices transport protocols. It is provided to help users identify the device when reported in discovery operations. */ USERFRIENDLYNAME, /** - * Patient Reported name. + * A name as provided by a patient of the device, for example "knee implant", when documenting, e.g., self-reported device. */ PATIENTREPORTEDNAME, /** - * Manufacturer name. + * The formal name as provided by the manufacturer of the device. */ MANUFACTURERNAME, /** - * Model name. + * The name of the model. The manufacturer-name or user-friendly-name may include that as a component. */ MODELNAME, /** @@ -2124,10 +2155,10 @@ public class Enumerations { public String getDefinition() { switch (this) { case UDILABELNAME: return "UDI Label name."; - case USERFRIENDLYNAME: return "User Friendly name."; - case PATIENTREPORTEDNAME: return "Patient Reported name."; - case MANUFACTURERNAME: return "Manufacturer name."; - case MODELNAME: return "Model name."; + case USERFRIENDLYNAME: return "The 'user friendly name' typically is the name of the device on the package it came in or some combination of that name with the model number, serial number, or other attribute that makes the name easy to understand for the user of that device. It is often exposed in communicating devices transport protocols. It is provided to help users identify the device when reported in discovery operations."; + case PATIENTREPORTEDNAME: return "A name as provided by a patient of the device, for example \"knee implant\", when documenting, e.g., self-reported device."; + case MANUFACTURERNAME: return "The formal name as provided by the manufacturer of the device."; + case MODELNAME: return "The name of the model. The manufacturer-name or user-friendly-name may include that as a component."; case OTHER: return "other."; default: return "?"; } @@ -2617,6 +2648,127 @@ public class Enumerations { } } + public enum EvidenceVariableHandling { + /** + * A continuous variable is one for which, within the limits the variable ranges, any value is possible (from STATO http://purl.obolibrary.org/obo/STATO_0000251). + */ + CONTINUOUS, + /** + * A dichotomous variable is a categorical variable which is defined to have only 2 categories or possible values (from STATO http://purl.obolibrary.org/obo/STATO_0000090). + */ + DICHOTOMOUS, + /** + * An ordinal variable is a categorical variable where the discrete possible values are ordered or correspond to an implicit ranking (from STATO http://purl.obolibrary.org/obo/STATO_0000228). + */ + ORDINAL, + /** + * A polychotomous variable is a categorical variable which is defined to have minimally 2 categories or possible values. (from STATO http://purl.obolibrary.org/obo/STATO_0000087). Suggestion to limit code use to situations when neither dichotomous nor ordinal variables apply. + */ + POLYCHOTOMOUS, + /** + * added to help the parsers + */ + NULL; + public static EvidenceVariableHandling fromCode(String codeString) throws FHIRException { + if (codeString == null || "".equals(codeString)) + return null; + if ("continuous".equals(codeString)) + return CONTINUOUS; + if ("dichotomous".equals(codeString)) + return DICHOTOMOUS; + if ("ordinal".equals(codeString)) + return ORDINAL; + if ("polychotomous".equals(codeString)) + return POLYCHOTOMOUS; + throw new FHIRException("Unknown EvidenceVariableHandling code '"+codeString+"'"); + } + public String toCode() { + switch (this) { + case CONTINUOUS: return "continuous"; + case DICHOTOMOUS: return "dichotomous"; + case ORDINAL: return "ordinal"; + case POLYCHOTOMOUS: return "polychotomous"; + default: return "?"; + } + } + public String getSystem() { + switch (this) { + case CONTINUOUS: return "http://hl7.org/fhir/variable-handling"; + case DICHOTOMOUS: return "http://hl7.org/fhir/variable-handling"; + case ORDINAL: return "http://hl7.org/fhir/variable-handling"; + case POLYCHOTOMOUS: return "http://hl7.org/fhir/variable-handling"; + default: return "?"; + } + } + public String getDefinition() { + switch (this) { + case CONTINUOUS: return "A continuous variable is one for which, within the limits the variable ranges, any value is possible (from STATO http://purl.obolibrary.org/obo/STATO_0000251)."; + case DICHOTOMOUS: return "A dichotomous variable is a categorical variable which is defined to have only 2 categories or possible values (from STATO http://purl.obolibrary.org/obo/STATO_0000090)."; + case ORDINAL: return "An ordinal variable is a categorical variable where the discrete possible values are ordered or correspond to an implicit ranking (from STATO http://purl.obolibrary.org/obo/STATO_0000228)."; + case POLYCHOTOMOUS: return "A polychotomous variable is a categorical variable which is defined to have minimally 2 categories or possible values. (from STATO http://purl.obolibrary.org/obo/STATO_0000087). Suggestion to limit code use to situations when neither dichotomous nor ordinal variables apply."; + default: return "?"; + } + } + public String getDisplay() { + switch (this) { + case CONTINUOUS: return "continuous variable"; + case DICHOTOMOUS: return "dichotomous variable"; + case ORDINAL: return "ordinal variable"; + case POLYCHOTOMOUS: return "polychotomous variable"; + default: return "?"; + } + } + } + + public static class EvidenceVariableHandlingEnumFactory implements EnumFactory { + public EvidenceVariableHandling fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + if (codeString == null || "".equals(codeString)) + return null; + if ("continuous".equals(codeString)) + return EvidenceVariableHandling.CONTINUOUS; + if ("dichotomous".equals(codeString)) + return EvidenceVariableHandling.DICHOTOMOUS; + if ("ordinal".equals(codeString)) + return EvidenceVariableHandling.ORDINAL; + if ("polychotomous".equals(codeString)) + return EvidenceVariableHandling.POLYCHOTOMOUS; + throw new IllegalArgumentException("Unknown EvidenceVariableHandling 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 ("continuous".equals(codeString)) + return new Enumeration(this, EvidenceVariableHandling.CONTINUOUS); + if ("dichotomous".equals(codeString)) + return new Enumeration(this, EvidenceVariableHandling.DICHOTOMOUS); + if ("ordinal".equals(codeString)) + return new Enumeration(this, EvidenceVariableHandling.ORDINAL); + if ("polychotomous".equals(codeString)) + return new Enumeration(this, EvidenceVariableHandling.POLYCHOTOMOUS); + throw new FHIRException("Unknown EvidenceVariableHandling code '"+codeString+"'"); + } + public String toCode(EvidenceVariableHandling code) { + if (code == EvidenceVariableHandling.CONTINUOUS) + return "continuous"; + if (code == EvidenceVariableHandling.DICHOTOMOUS) + return "dichotomous"; + if (code == EvidenceVariableHandling.ORDINAL) + return "ordinal"; + if (code == EvidenceVariableHandling.POLYCHOTOMOUS) + return "polychotomous"; + return "?"; + } + public String toSystem(EvidenceVariableHandling code) { + return code.getSystem(); + } + } + public enum FHIRAllTypes { /** * 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. @@ -2802,10 +2954,6 @@ public class Enumerations { * A fact or piece of data from a study of a large quantity of numerical data. A mathematical or quantified characteristic of a group of observations. */ STATISTIC, - /** - * Chemical substances are a single substance type whose primary defining element is the molecular structure. Chemical substances shall be defined on the basis of their complete covalent molecular structure; the presence of a salt (counter-ion) and/or solvates (water, alcohols) is also captured. Purity, grade, physical form or particle size are not taken into account in the definition of a chemical substance or in the assignment of a Substance ID. - */ - SUBSTANCEAMOUNT, /** * Specifies an event that may occur multiple times. Timing schedules are used to record when things are planned, expected or requested to occur. The most common usage is in dosage instructions for medications. They are also used when planning care of various kinds, and may be used for reporting the schedule to which past regular activities were carried out. */ @@ -3124,9 +3272,9 @@ into another (possibly the same) biological entity. */ EVIDENCE, /** - * EvidenceFocus. + * The EvidenceReport. */ - EVIDENCEFOCUS, + EVIDENCEREPORT, /** * The EvidenceVariable resource describes an element that knowledge (Evidence) is about. */ @@ -3228,7 +3376,7 @@ into another (possibly the same) biological entity. */ MEASUREREPORT, /** - * This resource is primarily used for the identification and definition of a medication for the purposes of prescribing, dispensing, and administering a medication as well as for making statements about medication use. + * This resource is primarily used for the identification and definition of a medication, including ingredients, for the purposes of prescribing, dispensing, and administering a medication as well as for making statements about medication use. */ MEDICATION, /** @@ -3310,7 +3458,7 @@ The primary difference between a medicationusage and a medicationadministration */ ORGANIZATIONAFFILIATION, /** - * A medicinal product in a container or package. + * A medically related item or items, in a container or package. */ PACKAGEDPRODUCTDEFINITION, /** @@ -3450,7 +3598,7 @@ The primary difference between a medicationusage and a medicationadministration */ SUBSTANCENUCLEICACID, /** - * Todo. + * Properties of a substance specific to it being a polymer. */ SUBSTANCEPOLYMER, /** @@ -3608,8 +3756,6 @@ The primary difference between a medicationusage and a medicationadministration return SIMPLEQUANTITY; if ("Statistic".equals(codeString)) return STATISTIC; - if ("SubstanceAmount".equals(codeString)) - return SUBSTANCEAMOUNT; if ("Timing".equals(codeString)) return TIMING; if ("TriggerDefinition".equals(codeString)) @@ -3768,8 +3914,8 @@ The primary difference between a medicationusage and a medicationadministration return EVENTDEFINITION; if ("Evidence".equals(codeString)) return EVIDENCE; - if ("EvidenceFocus".equals(codeString)) - return EVIDENCEFOCUS; + if ("EvidenceReport".equals(codeString)) + return EVIDENCEREPORT; if ("EvidenceVariable".equals(codeString)) return EVIDENCEVARIABLE; if ("ExampleScenario".equals(codeString)) @@ -4010,7 +4156,6 @@ The primary difference between a medicationusage and a medicationadministration case SIGNATURE: return "Signature"; case SIMPLEQUANTITY: return "SimpleQuantity"; case STATISTIC: return "Statistic"; - case SUBSTANCEAMOUNT: return "SubstanceAmount"; case TIMING: return "Timing"; case TRIGGERDEFINITION: return "TriggerDefinition"; case USAGECONTEXT: return "UsageContext"; @@ -4090,7 +4235,7 @@ The primary difference between a medicationusage and a medicationadministration case EPISODEOFCARE: return "EpisodeOfCare"; case EVENTDEFINITION: return "EventDefinition"; case EVIDENCE: return "Evidence"; - case EVIDENCEFOCUS: return "EvidenceFocus"; + case EVIDENCEREPORT: return "EvidenceReport"; case EVIDENCEVARIABLE: return "EvidenceVariable"; case EXAMPLESCENARIO: return "ExampleScenario"; case EXPLANATIONOFBENEFIT: return "ExplanationOfBenefit"; @@ -4237,7 +4382,6 @@ The primary difference between a medicationusage and a medicationadministration case SIGNATURE: return "http://hl7.org/fhir/data-types"; case SIMPLEQUANTITY: return "http://hl7.org/fhir/data-types"; case STATISTIC: return "http://hl7.org/fhir/data-types"; - case SUBSTANCEAMOUNT: return "http://hl7.org/fhir/data-types"; case TIMING: return "http://hl7.org/fhir/data-types"; case TRIGGERDEFINITION: return "http://hl7.org/fhir/data-types"; case USAGECONTEXT: return "http://hl7.org/fhir/data-types"; @@ -4317,7 +4461,7 @@ The primary difference between a medicationusage and a medicationadministration case EPISODEOFCARE: return "http://hl7.org/fhir/resource-types"; case EVENTDEFINITION: return "http://hl7.org/fhir/resource-types"; case EVIDENCE: return "http://hl7.org/fhir/resource-types"; - case EVIDENCEFOCUS: return "http://hl7.org/fhir/resource-types"; + case EVIDENCEREPORT: return "http://hl7.org/fhir/resource-types"; case EVIDENCEVARIABLE: return "http://hl7.org/fhir/resource-types"; case EXAMPLESCENARIO: return "http://hl7.org/fhir/resource-types"; case EXPLANATIONOFBENEFIT: return "http://hl7.org/fhir/resource-types"; @@ -4464,7 +4608,6 @@ The primary difference between a medicationusage and a medicationadministration case SIGNATURE: return "A signature along with supporting context. The signature may be a digital signature that is cryptographic in nature, or some other signature acceptable to the domain. This other signature may be as simple as a graphical image representing a hand-written signature, or a signature ceremony Different signature approaches have different utilities."; case SIMPLEQUANTITY: return ""; case STATISTIC: return "A fact or piece of data from a study of a large quantity of numerical data. A mathematical or quantified characteristic of a group of observations."; - case SUBSTANCEAMOUNT: return "Chemical substances are a single substance type whose primary defining element is the molecular structure. Chemical substances shall be defined on the basis of their complete covalent molecular structure; the presence of a salt (counter-ion) and/or solvates (water, alcohols) is also captured. Purity, grade, physical form or particle size are not taken into account in the definition of a chemical substance or in the assignment of a Substance ID."; case TIMING: return "Specifies an event that may occur multiple times. Timing schedules are used to record when things are planned, expected or requested to occur. The most common usage is in dosage instructions for medications. They are also used when planning care of various kinds, and may be used for reporting the schedule to which past regular activities were carried out."; case TRIGGERDEFINITION: return "A description of a triggering event. Triggering events can be named events, data events, or periodic, as determined by the type element."; case USAGECONTEXT: return "Specifies clinical/business/etc. metadata that can be used to retrieve, index and/or categorize an artifact. This metadata can either be specific to the applicable population (e.g., age category, DRG) or the specific context of care (e.g., venue, care setting, provider of care)."; @@ -4544,7 +4687,7 @@ The primary difference between a medicationusage and a medicationadministration case EPISODEOFCARE: return "An association between a patient and an organization / healthcare provider(s) during which time encounters may occur. The managing organization assumes a level of responsibility for the patient during this time."; case EVENTDEFINITION: return "The EventDefinition resource provides a reusable description of when a particular event can occur."; case EVIDENCE: return "This represents statistics, certainty, both the intended and actual population, and evidence variables."; - case EVIDENCEFOCUS: return "EvidenceFocus."; + case EVIDENCEREPORT: return "The EvidenceReport."; case EVIDENCEVARIABLE: return "The EvidenceVariable resource describes an element that knowledge (Evidence) is about."; case EXAMPLESCENARIO: return "Example of workflow instance."; case EXPLANATIONOFBENEFIT: return "This resource provides: the claim details; adjudication details from the processing of a Claim; and optionally account balance information, for informing the subscriber of the benefits provided."; @@ -4570,7 +4713,7 @@ The primary difference between a medicationusage and a medicationadministration case MANUFACTUREDITEMDEFINITION: return "The definition and characteristics of a medicinal manufactured item, such as a tablet or capsule, as contained in a packaged medicinal product."; case MEASURE: return "The Measure resource provides the definition of a quality measure."; case MEASUREREPORT: return "The MeasureReport resource contains the results of the calculation of a measure; and optionally a reference to the resources involved in that calculation."; - case MEDICATION: return "This resource is primarily used for the identification and definition of a medication for the purposes of prescribing, dispensing, and administering a medication as well as for making statements about medication use."; + case MEDICATION: return "This resource is primarily used for the identification and definition of a medication, including ingredients, for the purposes of prescribing, dispensing, and administering a medication as well as for making statements about medication use."; case MEDICATIONADMINISTRATION: return "Describes the event of a patient consuming or otherwise being administered a medication. This may be as simple as swallowing a tablet or it may be a long running infusion. Related resources tie this event to the authorizing prescription, and the specific encounter between patient and health care practitioner."; case MEDICATIONDISPENSE: return "Indicates that a medication product is to be or has been dispensed for a named person/patient. This includes a description of the medication product (supply) provided and the instructions for administering the medication. The medication dispense is the result of a pharmacy system responding to a medication order."; case MEDICATIONKNOWLEDGE: return "Information about a medication that is used to support knowledge."; @@ -4590,7 +4733,7 @@ The primary difference between a medicationusage and a medicationadministration case OPERATIONOUTCOME: return "A collection of error, warning, or information messages that result from a system action."; case ORGANIZATION: return "A formally or informally recognized grouping of people or organizations formed for the purpose of achieving some form of collective action. Includes companies, institutions, corporations, departments, community groups, healthcare practice groups, payer/insurer, etc."; case ORGANIZATIONAFFILIATION: return "Defines an affiliation/assotiation/relationship between 2 distinct oganizations, that is not a part-of relationship/sub-division relationship."; - case PACKAGEDPRODUCTDEFINITION: return "A medicinal product in a container or package."; + case PACKAGEDPRODUCTDEFINITION: return "A medically related item or items, in a container or package."; case PARAMETERS: return "This resource is a non-persisted resource used to pass information into and back from an [operation](operations.html). It has no other use, and there is no RESTful endpoint associated with it."; case PATIENT: return "Demographics and other administrative information about an individual or animal receiving care or other health-related services."; case PAYMENTNOTICE: return "This resource provides the status of the payment for goods and services rendered, and the request and response resource references."; @@ -4625,7 +4768,7 @@ The primary difference between a medicationusage and a medicationadministration case SUBSTANCE: return "A homogeneous material with a definite composition."; case SUBSTANCEDEFINITION: return "The detailed description of a substance, typically at a level beyond what is used for prescribing."; case SUBSTANCENUCLEICACID: return "Nucleic acids are defined by three distinct elements: the base, sugar and linkage. Individual substance/moiety IDs will be created for each of these elements. The nucleotide sequence will be always entered in the 5’-3’ direction."; - case SUBSTANCEPOLYMER: return "Todo."; + case SUBSTANCEPOLYMER: return "Properties of a substance specific to it being a polymer."; case SUBSTANCEPROTEIN: return "A SubstanceProtein is defined as a single unit of a linear amino acid sequence, or a combination of subunits that are either covalently linked or have a defined invariant stoichiometric relationship. This includes all synthetic, recombinant and purified SubstanceProteins of defined sequence, whether the use is therapeutic or prophylactic. This set of elements will be used to describe albumins, coagulation factors, cytokines, growth factors, peptide/SubstanceProtein hormones, enzymes, toxins, toxoids, recombinant vaccines, and immunomodulators."; case SUBSTANCEREFERENCEINFORMATION: return "Todo."; case SUBSTANCESOURCEMATERIAL: return "Source material shall capture information on the taxonomic and anatomical origins as well as the fraction of a material that can result in or can be modified to form a substance. This set of data elements shall be used to define polymer substances isolated from biological matrices. Taxonomic and anatomical origins shall be described using a controlled vocabulary as required. This information is captured for naturally derived polymers ( . starch) and structurally diverse substances. For Organisms belonging to the Kingdom Plantae the Substance level defines the fresh material of a single species or infraspecies, the Herbal Drug and the Herbal preparation. For Herbal preparations, the fraction information will be captured at the Substance information level and additional information for herbal extracts will be captured at the Specified Substance Group 1 information level. See for further explanation the Substance Class: Structurally Diverse and the herbal annex."; @@ -4691,7 +4834,6 @@ The primary difference between a medicationusage and a medicationadministration case SIGNATURE: return "Signature"; case SIMPLEQUANTITY: return "SimpleQuantity"; case STATISTIC: return "Statistic"; - case SUBSTANCEAMOUNT: return "SubstanceAmount"; case TIMING: return "Timing"; case TRIGGERDEFINITION: return "TriggerDefinition"; case USAGECONTEXT: return "UsageContext"; @@ -4771,7 +4913,7 @@ The primary difference between a medicationusage and a medicationadministration case EPISODEOFCARE: return "EpisodeOfCare"; case EVENTDEFINITION: return "EventDefinition"; case EVIDENCE: return "Evidence"; - case EVIDENCEFOCUS: return "EvidenceFocus"; + case EVIDENCEREPORT: return "EvidenceReport"; case EVIDENCEVARIABLE: return "EvidenceVariable"; case EXAMPLESCENARIO: return "ExampleScenario"; case EXPLANATIONOFBENEFIT: return "ExplanationOfBenefit"; @@ -4969,8 +5111,6 @@ The primary difference between a medicationusage and a medicationadministration return FHIRAllTypes.SIMPLEQUANTITY; if ("Statistic".equals(codeString)) return FHIRAllTypes.STATISTIC; - if ("SubstanceAmount".equals(codeString)) - return FHIRAllTypes.SUBSTANCEAMOUNT; if ("Timing".equals(codeString)) return FHIRAllTypes.TIMING; if ("TriggerDefinition".equals(codeString)) @@ -5129,8 +5269,8 @@ The primary difference between a medicationusage and a medicationadministration return FHIRAllTypes.EVENTDEFINITION; if ("Evidence".equals(codeString)) return FHIRAllTypes.EVIDENCE; - if ("EvidenceFocus".equals(codeString)) - return FHIRAllTypes.EVIDENCEFOCUS; + if ("EvidenceReport".equals(codeString)) + return FHIRAllTypes.EVIDENCEREPORT; if ("EvidenceVariable".equals(codeString)) return FHIRAllTypes.EVIDENCEVARIABLE; if ("ExampleScenario".equals(codeString)) @@ -5423,8 +5563,6 @@ The primary difference between a medicationusage and a medicationadministration return new Enumeration(this, FHIRAllTypes.SIMPLEQUANTITY); if ("Statistic".equals(codeString)) return new Enumeration(this, FHIRAllTypes.STATISTIC); - if ("SubstanceAmount".equals(codeString)) - return new Enumeration(this, FHIRAllTypes.SUBSTANCEAMOUNT); if ("Timing".equals(codeString)) return new Enumeration(this, FHIRAllTypes.TIMING); if ("TriggerDefinition".equals(codeString)) @@ -5583,8 +5721,8 @@ The primary difference between a medicationusage and a medicationadministration return new Enumeration(this, FHIRAllTypes.EVENTDEFINITION); if ("Evidence".equals(codeString)) return new Enumeration(this, FHIRAllTypes.EVIDENCE); - if ("EvidenceFocus".equals(codeString)) - return new Enumeration(this, FHIRAllTypes.EVIDENCEFOCUS); + if ("EvidenceReport".equals(codeString)) + return new Enumeration(this, FHIRAllTypes.EVIDENCEREPORT); if ("EvidenceVariable".equals(codeString)) return new Enumeration(this, FHIRAllTypes.EVIDENCEVARIABLE); if ("ExampleScenario".equals(codeString)) @@ -5870,8 +6008,6 @@ The primary difference between a medicationusage and a medicationadministration return "SimpleQuantity"; if (code == FHIRAllTypes.STATISTIC) return "Statistic"; - if (code == FHIRAllTypes.SUBSTANCEAMOUNT) - return "SubstanceAmount"; if (code == FHIRAllTypes.TIMING) return "Timing"; if (code == FHIRAllTypes.TRIGGERDEFINITION) @@ -6030,8 +6166,8 @@ The primary difference between a medicationusage and a medicationadministration return "EventDefinition"; if (code == FHIRAllTypes.EVIDENCE) return "Evidence"; - if (code == FHIRAllTypes.EVIDENCEFOCUS) - return "EvidenceFocus"; + if (code == FHIRAllTypes.EVIDENCEREPORT) + return "EvidenceReport"; if (code == FHIRAllTypes.EVIDENCEVARIABLE) return "EvidenceVariable"; if (code == FHIRAllTypes.EXAMPLESCENARIO) @@ -6334,6 +6470,10 @@ The primary difference between a medicationusage and a medicationadministration * R5 Preview #2. */ _4_4_0, + /** + * R5 Preview #3. + */ + _4_5_0, /** * added to help the parsers */ @@ -6393,6 +6533,8 @@ The primary difference between a medicationusage and a medicationadministration return _4_2_0; if ("4.4.0".equals(codeString)) return _4_4_0; + if ("4.5.0".equals(codeString)) + return _4_5_0; throw new FHIRException("Unknown FHIRVersion code '"+codeString+"'"); } public String toCode() { @@ -6423,6 +6565,7 @@ The primary difference between a medicationusage and a medicationadministration case _4_1_0: return "4.1.0"; case _4_2_0: return "4.2.0"; case _4_4_0: return "4.4.0"; + case _4_5_0: return "4.5.0"; default: return "?"; } } @@ -6454,6 +6597,7 @@ The primary difference between a medicationusage and a medicationadministration case _4_1_0: return "http://hl7.org/fhir/FHIR-version"; case _4_2_0: return "http://hl7.org/fhir/FHIR-version"; case _4_4_0: return "http://hl7.org/fhir/FHIR-version"; + case _4_5_0: return "http://hl7.org/fhir/FHIR-version"; default: return "?"; } } @@ -6485,6 +6629,7 @@ The primary difference between a medicationusage and a medicationadministration case _4_1_0: return "Interim Version."; case _4_2_0: return "R5 Preview #1."; case _4_4_0: return "R5 Preview #2."; + case _4_5_0: return "R5 Preview #3."; default: return "?"; } } @@ -6516,11 +6661,12 @@ The primary difference between a medicationusage and a medicationadministration case _4_1_0: return "4.1.0"; case _4_2_0: return "4.2.0"; case _4_4_0: return "4.4.0"; + case _4_5_0: return "4.5.0"; default: return "?"; } } // manual code from configuration.txt: - public String toCode(int len) { +public String toCode(int len) { return toCode().substring(0, len); } @@ -6581,8 +6727,7 @@ The primary difference between a medicationusage and a medicationadministration @Override public String toString() { return toCode(); - } - + } // end addition } @@ -6643,6 +6788,8 @@ The primary difference between a medicationusage and a medicationadministration return FHIRVersion._4_2_0; if ("4.4.0".equals(codeString)) return FHIRVersion._4_4_0; + if ("4.5.0".equals(codeString)) + return FHIRVersion._4_5_0; throw new IllegalArgumentException("Unknown FHIRVersion code '"+codeString+"'"); } public Enumeration fromType(Base code) throws FHIRException { @@ -6705,6 +6852,8 @@ The primary difference between a medicationusage and a medicationadministration return new Enumeration(this, FHIRVersion._4_2_0); if ("4.4.0".equals(codeString)) return new Enumeration(this, FHIRVersion._4_4_0); + if ("4.5.0".equals(codeString)) + return new Enumeration(this, FHIRVersion._4_5_0); throw new FHIRException("Unknown FHIRVersion code '"+codeString+"'"); } public String toCode(FHIRVersion code) { @@ -6760,6 +6909,8 @@ The primary difference between a medicationusage and a medicationadministration return "4.2.0"; if (code == FHIRVersion._4_4_0) return "4.4.0"; + if (code == FHIRVersion._4_5_0) + return "4.5.0"; return "?"; } public String toSystem(FHIRVersion code) { @@ -8949,9 +9100,9 @@ into another (possibly the same) biological entity. */ EVIDENCE, /** - * EvidenceFocus. + * The EvidenceReport. */ - EVIDENCEFOCUS, + EVIDENCEREPORT, /** * The EvidenceVariable resource describes an element that knowledge (Evidence) is about. */ @@ -9053,7 +9204,7 @@ into another (possibly the same) biological entity. */ MEASUREREPORT, /** - * This resource is primarily used for the identification and definition of a medication for the purposes of prescribing, dispensing, and administering a medication as well as for making statements about medication use. + * This resource is primarily used for the identification and definition of a medication, including ingredients, for the purposes of prescribing, dispensing, and administering a medication as well as for making statements about medication use. */ MEDICATION, /** @@ -9135,7 +9286,7 @@ The primary difference between a medicationusage and a medicationadministration */ ORGANIZATIONAFFILIATION, /** - * A medicinal product in a container or package. + * A medically related item or items, in a container or package. */ PACKAGEDPRODUCTDEFINITION, /** @@ -9275,7 +9426,7 @@ The primary difference between a medicationusage and a medicationadministration */ SUBSTANCENUCLEICACID, /** - * Todo. + * Properties of a substance specific to it being a polymer. */ SUBSTANCEPOLYMER, /** @@ -9443,8 +9594,8 @@ The primary difference between a medicationusage and a medicationadministration return EVENTDEFINITION; if ("Evidence".equals(codeString)) return EVIDENCE; - if ("EvidenceFocus".equals(codeString)) - return EVIDENCEFOCUS; + if ("EvidenceReport".equals(codeString)) + return EVIDENCEREPORT; if ("EvidenceVariable".equals(codeString)) return EVIDENCEVARIABLE; if ("ExampleScenario".equals(codeString)) @@ -9690,7 +9841,7 @@ The primary difference between a medicationusage and a medicationadministration case EPISODEOFCARE: return "EpisodeOfCare"; case EVENTDEFINITION: return "EventDefinition"; case EVIDENCE: return "Evidence"; - case EVIDENCEFOCUS: return "EvidenceFocus"; + case EVIDENCEREPORT: return "EvidenceReport"; case EVIDENCEVARIABLE: return "EvidenceVariable"; case EXAMPLESCENARIO: return "ExampleScenario"; case EXPLANATIONOFBENEFIT: return "ExplanationOfBenefit"; @@ -9844,7 +9995,7 @@ The primary difference between a medicationusage and a medicationadministration case EPISODEOFCARE: return "http://hl7.org/fhir/resource-types"; case EVENTDEFINITION: return "http://hl7.org/fhir/resource-types"; case EVIDENCE: return "http://hl7.org/fhir/resource-types"; - case EVIDENCEFOCUS: return "http://hl7.org/fhir/resource-types"; + case EVIDENCEREPORT: return "http://hl7.org/fhir/resource-types"; case EVIDENCEVARIABLE: return "http://hl7.org/fhir/resource-types"; case EXAMPLESCENARIO: return "http://hl7.org/fhir/resource-types"; case EXPLANATIONOFBENEFIT: return "http://hl7.org/fhir/resource-types"; @@ -9998,7 +10149,7 @@ The primary difference between a medicationusage and a medicationadministration case EPISODEOFCARE: return "An association between a patient and an organization / healthcare provider(s) during which time encounters may occur. The managing organization assumes a level of responsibility for the patient during this time."; case EVENTDEFINITION: return "The EventDefinition resource provides a reusable description of when a particular event can occur."; case EVIDENCE: return "This represents statistics, certainty, both the intended and actual population, and evidence variables."; - case EVIDENCEFOCUS: return "EvidenceFocus."; + case EVIDENCEREPORT: return "The EvidenceReport."; case EVIDENCEVARIABLE: return "The EvidenceVariable resource describes an element that knowledge (Evidence) is about."; case EXAMPLESCENARIO: return "Example of workflow instance."; case EXPLANATIONOFBENEFIT: return "This resource provides: the claim details; adjudication details from the processing of a Claim; and optionally account balance information, for informing the subscriber of the benefits provided."; @@ -10024,7 +10175,7 @@ The primary difference between a medicationusage and a medicationadministration case MANUFACTUREDITEMDEFINITION: return "The definition and characteristics of a medicinal manufactured item, such as a tablet or capsule, as contained in a packaged medicinal product."; case MEASURE: return "The Measure resource provides the definition of a quality measure."; case MEASUREREPORT: return "The MeasureReport resource contains the results of the calculation of a measure; and optionally a reference to the resources involved in that calculation."; - case MEDICATION: return "This resource is primarily used for the identification and definition of a medication for the purposes of prescribing, dispensing, and administering a medication as well as for making statements about medication use."; + case MEDICATION: return "This resource is primarily used for the identification and definition of a medication, including ingredients, for the purposes of prescribing, dispensing, and administering a medication as well as for making statements about medication use."; case MEDICATIONADMINISTRATION: return "Describes the event of a patient consuming or otherwise being administered a medication. This may be as simple as swallowing a tablet or it may be a long running infusion. Related resources tie this event to the authorizing prescription, and the specific encounter between patient and health care practitioner."; case MEDICATIONDISPENSE: return "Indicates that a medication product is to be or has been dispensed for a named person/patient. This includes a description of the medication product (supply) provided and the instructions for administering the medication. The medication dispense is the result of a pharmacy system responding to a medication order."; case MEDICATIONKNOWLEDGE: return "Information about a medication that is used to support knowledge."; @@ -10044,7 +10195,7 @@ The primary difference between a medicationusage and a medicationadministration case OPERATIONOUTCOME: return "A collection of error, warning, or information messages that result from a system action."; case ORGANIZATION: return "A formally or informally recognized grouping of people or organizations formed for the purpose of achieving some form of collective action. Includes companies, institutions, corporations, departments, community groups, healthcare practice groups, payer/insurer, etc."; case ORGANIZATIONAFFILIATION: return "Defines an affiliation/assotiation/relationship between 2 distinct oganizations, that is not a part-of relationship/sub-division relationship."; - case PACKAGEDPRODUCTDEFINITION: return "A medicinal product in a container or package."; + case PACKAGEDPRODUCTDEFINITION: return "A medically related item or items, in a container or package."; case PARAMETERS: return "This resource is a non-persisted resource used to pass information into and back from an [operation](operations.html). It has no other use, and there is no RESTful endpoint associated with it."; case PATIENT: return "Demographics and other administrative information about an individual or animal receiving care or other health-related services."; case PAYMENTNOTICE: return "This resource provides the status of the payment for goods and services rendered, and the request and response resource references."; @@ -10079,7 +10230,7 @@ The primary difference between a medicationusage and a medicationadministration case SUBSTANCE: return "A homogeneous material with a definite composition."; case SUBSTANCEDEFINITION: return "The detailed description of a substance, typically at a level beyond what is used for prescribing."; case SUBSTANCENUCLEICACID: return "Nucleic acids are defined by three distinct elements: the base, sugar and linkage. Individual substance/moiety IDs will be created for each of these elements. The nucleotide sequence will be always entered in the 5’-3’ direction."; - case SUBSTANCEPOLYMER: return "Todo."; + case SUBSTANCEPOLYMER: return "Properties of a substance specific to it being a polymer."; case SUBSTANCEPROTEIN: return "A SubstanceProtein is defined as a single unit of a linear amino acid sequence, or a combination of subunits that are either covalently linked or have a defined invariant stoichiometric relationship. This includes all synthetic, recombinant and purified SubstanceProteins of defined sequence, whether the use is therapeutic or prophylactic. This set of elements will be used to describe albumins, coagulation factors, cytokines, growth factors, peptide/SubstanceProtein hormones, enzymes, toxins, toxoids, recombinant vaccines, and immunomodulators."; case SUBSTANCEREFERENCEINFORMATION: return "Todo."; case SUBSTANCESOURCEMATERIAL: return "Source material shall capture information on the taxonomic and anatomical origins as well as the fraction of a material that can result in or can be modified to form a substance. This set of data elements shall be used to define polymer substances isolated from biological matrices. Taxonomic and anatomical origins shall be described using a controlled vocabulary as required. This information is captured for naturally derived polymers ( . starch) and structurally diverse substances. For Organisms belonging to the Kingdom Plantae the Substance level defines the fresh material of a single species or infraspecies, the Herbal Drug and the Herbal preparation. For Herbal preparations, the fraction information will be captured at the Substance information level and additional information for herbal extracts will be captured at the Specified Substance Group 1 information level. See for further explanation the Substance Class: Structurally Diverse and the herbal annex."; @@ -10152,7 +10303,7 @@ The primary difference between a medicationusage and a medicationadministration case EPISODEOFCARE: return "EpisodeOfCare"; case EVENTDEFINITION: return "EventDefinition"; case EVIDENCE: return "Evidence"; - case EVIDENCEFOCUS: return "EvidenceFocus"; + case EVIDENCEREPORT: return "EvidenceReport"; case EVIDENCEVARIABLE: return "EvidenceVariable"; case EXAMPLESCENARIO: return "ExampleScenario"; case EXPLANATIONOFBENEFIT: return "ExplanationOfBenefit"; @@ -10366,8 +10517,8 @@ The primary difference between a medicationusage and a medicationadministration return ResourceTypeEnum.EVENTDEFINITION; if ("Evidence".equals(codeString)) return ResourceTypeEnum.EVIDENCE; - if ("EvidenceFocus".equals(codeString)) - return ResourceTypeEnum.EVIDENCEFOCUS; + if ("EvidenceReport".equals(codeString)) + return ResourceTypeEnum.EVIDENCEREPORT; if ("EvidenceVariable".equals(codeString)) return ResourceTypeEnum.EVIDENCEVARIABLE; if ("ExampleScenario".equals(codeString)) @@ -10674,8 +10825,8 @@ The primary difference between a medicationusage and a medicationadministration return new Enumeration(this, ResourceTypeEnum.EVENTDEFINITION); if ("Evidence".equals(codeString)) return new Enumeration(this, ResourceTypeEnum.EVIDENCE); - if ("EvidenceFocus".equals(codeString)) - return new Enumeration(this, ResourceTypeEnum.EVIDENCEFOCUS); + if ("EvidenceReport".equals(codeString)) + return new Enumeration(this, ResourceTypeEnum.EVIDENCEREPORT); if ("EvidenceVariable".equals(codeString)) return new Enumeration(this, ResourceTypeEnum.EVIDENCEVARIABLE); if ("ExampleScenario".equals(codeString)) @@ -10975,8 +11126,8 @@ The primary difference between a medicationusage and a medicationadministration return "EventDefinition"; if (code == ResourceTypeEnum.EVIDENCE) return "Evidence"; - if (code == ResourceTypeEnum.EVIDENCEFOCUS) - return "EvidenceFocus"; + if (code == ResourceTypeEnum.EVIDENCEREPORT) + return "EvidenceReport"; if (code == ResourceTypeEnum.EVIDENCEVARIABLE) return "EvidenceVariable"; if (code == ResourceTypeEnum.EXAMPLESCENARIO) @@ -11984,4 +12135,5 @@ The primary difference between a medicationusage and a medicationadministration } -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EpisodeOfCare.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EpisodeOfCare.java index 74e6da236..fa13ddb91 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EpisodeOfCare.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EpisodeOfCare.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; /** * An association between a patient and an organization / healthcare provider(s) during which time encounters may occur. The managing organization assumes a level of responsibility for the patient during this time. @@ -1859,7 +1861,7 @@ public class EpisodeOfCare 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 @@ -1881,10 +1883,10 @@ public class EpisodeOfCare 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 @@ -1901,7 +1903,7 @@ public class EpisodeOfCare 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 @@ -1923,7 +1925,7 @@ public class EpisodeOfCare 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); @@ -2059,4 +2061,5 @@ public class EpisodeOfCare 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/EventDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EventDefinition.java index e0fa2a1bf..e6932ffc4 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EventDefinition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EventDefinition.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.PublicationStatus; -import org.hl7.fhir.r5.model.Enumerations.PublicationStatusEnumFactory; 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; /** * The EventDefinition resource provides a reusable description of when a particular event can occur. @@ -2236,7 +2236,7 @@ public class EventDefinition extends MetadataResource { * Path: EventDefinition.relatedArtifact.where(type='composed-of').resource
*

*/ - @SearchParamDefinition(name="composed-of", path="EventDefinition.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="EventDefinition.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 @@ -2382,7 +2382,7 @@ public class EventDefinition extends MetadataResource { * Path: EventDefinition.relatedArtifact.where(type='depends-on').resource
*

*/ - @SearchParamDefinition(name="depends-on", path="EventDefinition.relatedArtifact.where(type='depends-on').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="depends-on", path="EventDefinition.relatedArtifact.where(type='depends-on').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_DEPENDS_ON = "depends-on"; /** * Fluent Client search parameter constant for depends-on @@ -2408,7 +2408,7 @@ public class EventDefinition extends MetadataResource { * Path: EventDefinition.relatedArtifact.where(type='derived-from').resource
*

*/ - @SearchParamDefinition(name="derived-from", path="EventDefinition.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="EventDefinition.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 @@ -2534,7 +2534,7 @@ public class EventDefinition extends MetadataResource { * Path: EventDefinition.relatedArtifact.where(type='predecessor').resource
*

*/ - @SearchParamDefinition(name="predecessor", path="EventDefinition.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="EventDefinition.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 @@ -2600,7 +2600,7 @@ public class EventDefinition extends MetadataResource { * Path: EventDefinition.relatedArtifact.where(type='successor').resource
*

*/ - @SearchParamDefinition(name="successor", path="EventDefinition.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="EventDefinition.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 @@ -2699,4 +2699,5 @@ public class EventDefinition 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/Evidence.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Evidence.java index d1fef6ac9..58ae13aae 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Evidence.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Evidence.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; /** * This represents statistics, certainty, both the intended and actual population, and evidence variables. @@ -58,10 +56,10 @@ public class Evidence extends MetadataResource { @Block() public static class EvidenceVariableDefinitionComponent extends BackboneElement implements IBaseBackboneElement { /** - * Description of the variable. + * A text description or summary of the variable. */ @Child(name = "description", type = {MarkdownType.class}, order=1, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Description of the variable", formalDefinition="Description of the variable." ) + @Description(shortDefinition="A text description or summary of the variable", formalDefinition="A text description or summary of the variable." ) protected MarkdownType description; /** @@ -119,7 +117,7 @@ public class Evidence extends MetadataResource { } /** - * @return {@link #description} (Description of the variable.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value + * @return {@link #description} (A text description or summary of the variable.). 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) @@ -139,7 +137,7 @@ public class Evidence extends MetadataResource { } /** - * @param value {@link #description} (Description of the variable.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value + * @param value {@link #description} (A text description or summary of the variable.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value */ public EvidenceVariableDefinitionComponent setDescriptionElement(MarkdownType value) { this.description = value; @@ -147,14 +145,14 @@ public class Evidence extends MetadataResource { } /** - * @return Description of the variable. + * @return A text description or summary of the variable. */ public String getDescription() { return this.description == null ? null : this.description.getValue(); } /** - * @param value Description of the variable. + * @param value A text description or summary of the variable. */ public EvidenceVariableDefinitionComponent setDescription(String value) { if (value == null) @@ -318,7 +316,7 @@ public class Evidence extends MetadataResource { protected void listChildren(List children) { super.listChildren(children); - children.add(new Property("description", "markdown", "Description of the variable.", 0, 1, description)); + children.add(new Property("description", "markdown", "A text description or summary of the variable.", 0, 1, description)); children.add(new Property("note", "Annotation", "Footnotes and/or explanatory notes.", 0, java.lang.Integer.MAX_VALUE, note)); children.add(new Property("variableRole", "CodeableConcept", "population | subpopulation | exposure | referenceExposure | measuredVariable | confounder.", 0, 1, variableRole)); children.add(new Property("observed", "Reference(Group|EvidenceVariable)", "Definition of the actual variable related to the statistic(s).", 0, 1, observed)); @@ -329,7 +327,7 @@ public class Evidence extends MetadataResource { @Override public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { switch (_hash) { - case -1724546052: /*description*/ return new Property("description", "markdown", "Description of the variable.", 0, 1, description); + case -1724546052: /*description*/ return new Property("description", "markdown", "A text description or summary of the variable.", 0, 1, description); case 3387378: /*note*/ return new Property("note", "Annotation", "Footnotes and/or explanatory notes.", 0, java.lang.Integer.MAX_VALUE, note); case -372889326: /*variableRole*/ return new Property("variableRole", "CodeableConcept", "population | subpopulation | exposure | referenceExposure | measuredVariable | confounder.", 0, 1, variableRole); case 348607176: /*observed*/ return new Property("observed", "Reference(Group|EvidenceVariable)", "Definition of the actual variable related to the statistic(s).", 0, 1, observed); @@ -521,26 +519,26 @@ public class Evidence extends MetadataResource { /** * Footnotes and/or explanatory notes. */ - @Child(name = "note", type = {Annotation.class}, order=2, min=0, max=1, modifier=false, summary=false) + @Child(name = "note", type = {Annotation.class}, order=2, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Footnotes and/or explanatory notes", formalDefinition="Footnotes and/or explanatory notes." ) - protected Annotation note; + protected List note; /** - * Rating of certainty. + * Quality or certainty of the Evidence. */ @Child(name = "rating", type = {CodeableConcept.class}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Rating of certainty", formalDefinition="Rating of certainty." ) - @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/certainty-rating") + @Description(shortDefinition="Quality or certainty of the Evidence", formalDefinition="Quality or certainty of the Evidence." ) + @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/evidence-quality") protected List rating; /** - * Subcomponent of certainty. + * A domain or subdomain of certainty rating. */ @Child(name = "certaintySubcomponent", type = {}, order=4, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Subcomponent of certainty", formalDefinition="Subcomponent of certainty." ) + @Description(shortDefinition="A domain or subdomain of certainty rating", formalDefinition="A domain or subdomain of certainty rating." ) protected List certaintySubcomponent; - private static final long serialVersionUID = -1718011695L; + private static final long serialVersionUID = 775762511L; /** * Constructor @@ -601,29 +599,58 @@ public class Evidence extends MetadataResource { /** * @return {@link #note} (Footnotes and/or explanatory notes.) */ - public Annotation getNote() { + public List getNote() { if (this.note == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create EvidenceCertaintyComponent.note"); - else if (Configuration.doAutoCreate()) - this.note = new Annotation(); // cc + this.note = new ArrayList(); return this.note; } - public boolean hasNote() { - return this.note != null && !this.note.isEmpty(); + /** + * @return Returns a reference to this for easy method chaining + */ + public EvidenceCertaintyComponent setNote(List theNote) { + this.note = theNote; + return this; } - /** - * @param value {@link #note} (Footnotes and/or explanatory notes.) - */ - public EvidenceCertaintyComponent setNote(Annotation value) { - this.note = value; + public boolean hasNote() { + if (this.note == null) + return false; + for (Annotation item : this.note) + if (!item.isEmpty()) + return true; + return false; + } + + public Annotation addNote() { //3 + Annotation t = new Annotation(); + if (this.note == null) + this.note = new ArrayList(); + this.note.add(t); + return t; + } + + public EvidenceCertaintyComponent addNote(Annotation t) { //3 + if (t == null) + return this; + if (this.note == null) + this.note = new ArrayList(); + this.note.add(t); return this; } /** - * @return {@link #rating} (Rating of certainty.) + * @return The first repetition of repeating field {@link #note}, creating it if it does not already exist {3} + */ + public Annotation getNoteFirstRep() { + if (getNote().isEmpty()) { + addNote(); + } + return getNote().get(0); + } + + /** + * @return {@link #rating} (Quality or certainty of the Evidence.) */ public List getRating() { if (this.rating == null) @@ -676,7 +703,7 @@ public class Evidence extends MetadataResource { } /** - * @return {@link #certaintySubcomponent} (Subcomponent of certainty.) + * @return {@link #certaintySubcomponent} (A domain or subdomain of certainty rating.) */ public List getCertaintySubcomponent() { if (this.certaintySubcomponent == null) @@ -731,18 +758,18 @@ public class Evidence extends MetadataResource { protected void listChildren(List children) { super.listChildren(children); children.add(new Property("description", "string", "Textual description of certainty.", 0, 1, description)); - children.add(new Property("note", "Annotation", "Footnotes and/or explanatory notes.", 0, 1, note)); - children.add(new Property("rating", "CodeableConcept", "Rating of certainty.", 0, java.lang.Integer.MAX_VALUE, rating)); - children.add(new Property("certaintySubcomponent", "", "Subcomponent of certainty.", 0, java.lang.Integer.MAX_VALUE, certaintySubcomponent)); + children.add(new Property("note", "Annotation", "Footnotes and/or explanatory notes.", 0, java.lang.Integer.MAX_VALUE, note)); + children.add(new Property("rating", "CodeableConcept", "Quality or certainty of the Evidence.", 0, java.lang.Integer.MAX_VALUE, rating)); + children.add(new Property("certaintySubcomponent", "", "A domain or subdomain of certainty rating.", 0, java.lang.Integer.MAX_VALUE, certaintySubcomponent)); } @Override public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { switch (_hash) { case -1724546052: /*description*/ return new Property("description", "string", "Textual description of certainty.", 0, 1, description); - case 3387378: /*note*/ return new Property("note", "Annotation", "Footnotes and/or explanatory notes.", 0, 1, note); - case -938102371: /*rating*/ return new Property("rating", "CodeableConcept", "Rating of certainty.", 0, java.lang.Integer.MAX_VALUE, rating); - case 1806398212: /*certaintySubcomponent*/ return new Property("certaintySubcomponent", "", "Subcomponent of certainty.", 0, java.lang.Integer.MAX_VALUE, certaintySubcomponent); + case 3387378: /*note*/ return new Property("note", "Annotation", "Footnotes and/or explanatory notes.", 0, java.lang.Integer.MAX_VALUE, note); + case -938102371: /*rating*/ return new Property("rating", "CodeableConcept", "Quality or certainty of the Evidence.", 0, java.lang.Integer.MAX_VALUE, rating); + case 1806398212: /*certaintySubcomponent*/ return new Property("certaintySubcomponent", "", "A domain or subdomain of certainty rating.", 0, java.lang.Integer.MAX_VALUE, certaintySubcomponent); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -752,7 +779,7 @@ public class Evidence extends MetadataResource { public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException { switch (hash) { case -1724546052: /*description*/ return this.description == null ? new Base[0] : new Base[] {this.description}; // StringType - case 3387378: /*note*/ return this.note == null ? new Base[0] : new Base[] {this.note}; // Annotation + case 3387378: /*note*/ return this.note == null ? new Base[0] : this.note.toArray(new Base[this.note.size()]); // Annotation case -938102371: /*rating*/ return this.rating == null ? new Base[0] : this.rating.toArray(new Base[this.rating.size()]); // CodeableConcept case 1806398212: /*certaintySubcomponent*/ return this.certaintySubcomponent == null ? new Base[0] : this.certaintySubcomponent.toArray(new Base[this.certaintySubcomponent.size()]); // EvidenceCertaintyCertaintySubcomponentComponent default: return super.getProperty(hash, name, checkValid); @@ -767,7 +794,7 @@ public class Evidence extends MetadataResource { this.description = TypeConvertor.castToString(value); // StringType return value; case 3387378: // note - this.note = TypeConvertor.castToAnnotation(value); // Annotation + this.getNote().add(TypeConvertor.castToAnnotation(value)); // Annotation return value; case -938102371: // rating this.getRating().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept @@ -785,7 +812,7 @@ public class Evidence extends MetadataResource { if (name.equals("description")) { this.description = TypeConvertor.castToString(value); // StringType } else if (name.equals("note")) { - this.note = TypeConvertor.castToAnnotation(value); // Annotation + this.getNote().add(TypeConvertor.castToAnnotation(value)); } else if (name.equals("rating")) { this.getRating().add(TypeConvertor.castToCodeableConcept(value)); } else if (name.equals("certaintySubcomponent")) { @@ -799,7 +826,7 @@ public class Evidence extends MetadataResource { public Base makeProperty(int hash, String name) throws FHIRException { switch (hash) { case -1724546052: return getDescriptionElement(); - case 3387378: return getNote(); + case 3387378: return addNote(); case -938102371: return addRating(); case 1806398212: return addCertaintySubcomponent(); default: return super.makeProperty(hash, name); @@ -825,8 +852,7 @@ public class Evidence extends MetadataResource { throw new FHIRException("Cannot call addChild on a primitive type Evidence.certainty.description"); } else if (name.equals("note")) { - this.note = new Annotation(); - return this.note; + return addNote(); } else if (name.equals("rating")) { return addRating(); @@ -847,7 +873,11 @@ public class Evidence extends MetadataResource { public void copyValues(EvidenceCertaintyComponent dst) { super.copyValues(dst); dst.description = description == null ? null : description.copy(); - dst.note = note == null ? null : note.copy(); + if (note != null) { + dst.note = new ArrayList(); + for (Annotation i : note) + dst.note.add(i.copy()); + }; if (rating != null) { dst.rating = new ArrayList(); for (CodeableConcept i : rating) @@ -905,27 +935,27 @@ public class Evidence extends MetadataResource { /** * Footnotes and/or explanatory notes. */ - @Child(name = "note", type = {Annotation.class}, order=2, min=0, max=1, modifier=false, summary=false) + @Child(name = "note", type = {Annotation.class}, order=2, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Footnotes and/or explanatory notes", formalDefinition="Footnotes and/or explanatory notes." ) - protected Annotation note; + protected List note; /** - * Type of certainty being rated. + * Aspect of quality or certainty being rated. */ @Child(name = "type", type = {CodeableConcept.class}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Type of certainty being rated", formalDefinition="Type of certainty being rated." ) + @Description(shortDefinition="Aspect of quality or certainty being rated", formalDefinition="Aspect of quality or certainty being rated." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/certainty-subcomponent-type") protected List type; /** - * Rating of certainty subcomponent. + * Quality or certainty of the aspect. */ @Child(name = "rating", type = {CodeableConcept.class}, order=4, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Rating of certainty subcomponent", formalDefinition="Rating of certainty subcomponent." ) + @Description(shortDefinition="Quality or certainty of the aspect", formalDefinition="Quality or certainty of the aspect." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/certainty-subcomponent-rating") protected List rating; - private static final long serialVersionUID = 2048436483L; + private static final long serialVersionUID = 619041733L; /** * Constructor @@ -986,29 +1016,58 @@ public class Evidence extends MetadataResource { /** * @return {@link #note} (Footnotes and/or explanatory notes.) */ - public Annotation getNote() { + public List getNote() { if (this.note == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create EvidenceCertaintyCertaintySubcomponentComponent.note"); - else if (Configuration.doAutoCreate()) - this.note = new Annotation(); // cc + this.note = new ArrayList(); return this.note; } - public boolean hasNote() { - return this.note != null && !this.note.isEmpty(); + /** + * @return Returns a reference to this for easy method chaining + */ + public EvidenceCertaintyCertaintySubcomponentComponent setNote(List theNote) { + this.note = theNote; + return this; } - /** - * @param value {@link #note} (Footnotes and/or explanatory notes.) - */ - public EvidenceCertaintyCertaintySubcomponentComponent setNote(Annotation value) { - this.note = value; + public boolean hasNote() { + if (this.note == null) + return false; + for (Annotation item : this.note) + if (!item.isEmpty()) + return true; + return false; + } + + public Annotation addNote() { //3 + Annotation t = new Annotation(); + if (this.note == null) + this.note = new ArrayList(); + this.note.add(t); + return t; + } + + public EvidenceCertaintyCertaintySubcomponentComponent addNote(Annotation t) { //3 + if (t == null) + return this; + if (this.note == null) + this.note = new ArrayList(); + this.note.add(t); return this; } /** - * @return {@link #type} (Type of certainty being rated.) + * @return The first repetition of repeating field {@link #note}, creating it if it does not already exist {3} + */ + public Annotation getNoteFirstRep() { + if (getNote().isEmpty()) { + addNote(); + } + return getNote().get(0); + } + + /** + * @return {@link #type} (Aspect of quality or certainty being rated.) */ public List getType() { if (this.type == null) @@ -1061,7 +1120,7 @@ public class Evidence extends MetadataResource { } /** - * @return {@link #rating} (Rating of certainty subcomponent.) + * @return {@link #rating} (Quality or certainty of the aspect.) */ public List getRating() { if (this.rating == null) @@ -1116,18 +1175,18 @@ public class Evidence extends MetadataResource { protected void listChildren(List children) { super.listChildren(children); children.add(new Property("description", "string", "Textual description of certainty subcomponent.", 0, 1, description)); - children.add(new Property("note", "Annotation", "Footnotes and/or explanatory notes.", 0, 1, note)); - children.add(new Property("type", "CodeableConcept", "Type of certainty being rated.", 0, java.lang.Integer.MAX_VALUE, type)); - children.add(new Property("rating", "CodeableConcept", "Rating of certainty subcomponent.", 0, java.lang.Integer.MAX_VALUE, rating)); + children.add(new Property("note", "Annotation", "Footnotes and/or explanatory notes.", 0, java.lang.Integer.MAX_VALUE, note)); + children.add(new Property("type", "CodeableConcept", "Aspect of quality or certainty being rated.", 0, java.lang.Integer.MAX_VALUE, type)); + children.add(new Property("rating", "CodeableConcept", "Quality or certainty of the aspect.", 0, java.lang.Integer.MAX_VALUE, rating)); } @Override public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { switch (_hash) { case -1724546052: /*description*/ return new Property("description", "string", "Textual description of certainty subcomponent.", 0, 1, description); - case 3387378: /*note*/ return new Property("note", "Annotation", "Footnotes and/or explanatory notes.", 0, 1, note); - case 3575610: /*type*/ return new Property("type", "CodeableConcept", "Type of certainty being rated.", 0, java.lang.Integer.MAX_VALUE, type); - case -938102371: /*rating*/ return new Property("rating", "CodeableConcept", "Rating of certainty subcomponent.", 0, java.lang.Integer.MAX_VALUE, rating); + case 3387378: /*note*/ return new Property("note", "Annotation", "Footnotes and/or explanatory notes.", 0, java.lang.Integer.MAX_VALUE, note); + case 3575610: /*type*/ return new Property("type", "CodeableConcept", "Aspect of quality or certainty being rated.", 0, java.lang.Integer.MAX_VALUE, type); + case -938102371: /*rating*/ return new Property("rating", "CodeableConcept", "Quality or certainty of the aspect.", 0, java.lang.Integer.MAX_VALUE, rating); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -1137,7 +1196,7 @@ public class Evidence extends MetadataResource { public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException { switch (hash) { case -1724546052: /*description*/ return this.description == null ? new Base[0] : new Base[] {this.description}; // StringType - case 3387378: /*note*/ return this.note == null ? new Base[0] : new Base[] {this.note}; // Annotation + case 3387378: /*note*/ return this.note == null ? new Base[0] : this.note.toArray(new Base[this.note.size()]); // Annotation case 3575610: /*type*/ return this.type == null ? new Base[0] : this.type.toArray(new Base[this.type.size()]); // CodeableConcept case -938102371: /*rating*/ return this.rating == null ? new Base[0] : this.rating.toArray(new Base[this.rating.size()]); // CodeableConcept default: return super.getProperty(hash, name, checkValid); @@ -1152,7 +1211,7 @@ public class Evidence extends MetadataResource { this.description = TypeConvertor.castToString(value); // StringType return value; case 3387378: // note - this.note = TypeConvertor.castToAnnotation(value); // Annotation + this.getNote().add(TypeConvertor.castToAnnotation(value)); // Annotation return value; case 3575610: // type this.getType().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept @@ -1170,7 +1229,7 @@ public class Evidence extends MetadataResource { if (name.equals("description")) { this.description = TypeConvertor.castToString(value); // StringType } else if (name.equals("note")) { - this.note = TypeConvertor.castToAnnotation(value); // Annotation + this.getNote().add(TypeConvertor.castToAnnotation(value)); } else if (name.equals("type")) { this.getType().add(TypeConvertor.castToCodeableConcept(value)); } else if (name.equals("rating")) { @@ -1184,7 +1243,7 @@ public class Evidence extends MetadataResource { public Base makeProperty(int hash, String name) throws FHIRException { switch (hash) { case -1724546052: return getDescriptionElement(); - case 3387378: return getNote(); + case 3387378: return addNote(); case 3575610: return addType(); case -938102371: return addRating(); default: return super.makeProperty(hash, name); @@ -1210,8 +1269,7 @@ public class Evidence extends MetadataResource { throw new FHIRException("Cannot call addChild on a primitive type Evidence.certainty.certaintySubcomponent.description"); } else if (name.equals("note")) { - this.note = new Annotation(); - return this.note; + return addNote(); } else if (name.equals("type")) { return addType(); @@ -1232,7 +1290,11 @@ public class Evidence extends MetadataResource { public void copyValues(EvidenceCertaintyCertaintySubcomponentComponent dst) { super.copyValues(dst); dst.description = description == null ? null : description.copy(); - dst.note = note == null ? null : note.copy(); + if (note != null) { + dst.note = new ArrayList(); + for (Annotation i : note) + dst.note.add(i.copy()); + }; if (type != null) { dst.type = new ArrayList(); for (CodeableConcept i : type) @@ -1325,7 +1387,7 @@ public class Evidence 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 evidence instances. */ @Child(name = "useContext", type = {UsageContext.class}, order=6, 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 evidence instances." ) + @Description(shortDefinition="The context that the content is intended to support", 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 evidence instances." ) protected List useContext; /** @@ -1343,51 +1405,86 @@ public class Evidence extends MetadataResource { protected DateType lastReviewDate; /** - * Contact detail and role for contributor to summary. + * The name of the organization or individual that published the evidence. */ - @Child(name = "contributor", type = {Contributor.class}, order=9, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Contact detail and role for contributor to summary", formalDefinition="Contact detail and role for contributor to summary." ) - protected List contributor; + @Child(name = "publisher", type = {StringType.class}, order=9, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="Name of the publisher (organization or individual)", formalDefinition="The name of the organization or individual that published the evidence." ) + protected StringType publisher; + + /** + * Contact details to assist a user in finding and communicating with the publisher. + */ + @Child(name = "contact", type = {ContactDetail.class}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="Contact details for the publisher", formalDefinition="Contact details to assist a user in finding and communicating with the publisher." ) + protected List contact; + + /** + * An individiual, organization, or device primarily involved in the creation and maintenance of the content. + */ + @Child(name = "author", type = {ContactDetail.class}, order=11, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="Who authored the content", formalDefinition="An individiual, organization, or device primarily involved in the creation and maintenance of the content." ) + protected List author; + + /** + * An individiual, organization, or device primarily responsible for internal coherence of the content. + */ + @Child(name = "editor", type = {ContactDetail.class}, order=12, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="Who edited the content", formalDefinition="An individiual, organization, or device primarily responsible for internal coherence of the content." ) + protected List editor; + + /** + * An individiual, organization, or device primarily responsible for review of some aspect of the content. + */ + @Child(name = "reviewer", type = {ContactDetail.class}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="Who reviewed the content", formalDefinition="An individiual, organization, or device primarily responsible for review of some aspect of the content." ) + protected List reviewer; + + /** + * An individiual, organization, or device responsible for officially endorsing the content for use in some setting. + */ + @Child(name = "endorser", type = {ContactDetail.class}, order=14, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="Who endorsed the content", formalDefinition="An individiual, organization, or device responsible for officially endorsing the content for use in some setting." ) + protected List endorser; /** * Link or citation to artifact associated with the summary. */ - @Child(name = "relatedArtifact", type = {RelatedArtifact.class}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "relatedArtifact", type = {RelatedArtifact.class}, order=15, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Link or citation to artifact associated with the summary", formalDefinition="Link or citation to artifact associated with the summary." ) protected List relatedArtifact; /** * A free text natural language description of the evidence from a consumer's perspective. */ - @Child(name = "description", type = {MarkdownType.class}, order=11, min=0, max=1, modifier=false, summary=false) + @Child(name = "description", type = {MarkdownType.class}, order=16, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Description of the particular summary", formalDefinition="A free text natural language description of the evidence from a consumer's perspective." ) protected MarkdownType description; /** * Declarative description of the Evidence. */ - @Child(name = "assertion", type = {MarkdownType.class}, order=12, min=0, max=1, modifier=false, summary=false) + @Child(name = "assertion", type = {MarkdownType.class}, order=17, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Declarative description of the Evidence", formalDefinition="Declarative description of the Evidence." ) protected MarkdownType assertion; /** * Footnotes and/or explanatory notes. */ - @Child(name = "note", type = {Annotation.class}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "note", type = {Annotation.class}, order=18, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Footnotes and/or explanatory notes", formalDefinition="Footnotes and/or explanatory notes." ) protected List note; /** - * Evidence variable. + * Evidence variable such as population, exposure, or outcome. */ - @Child(name = "variableDefinition", type = {}, order=14, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Evidence variable", formalDefinition="Evidence variable." ) + @Child(name = "variableDefinition", type = {}, order=19, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="Evidence variable such as population, exposure, or outcome", formalDefinition="Evidence variable such as population, exposure, or outcome." ) protected List variableDefinition; /** * The particular type of synthesis if this is a synthesis summary. */ - @Child(name = "synthesisType", type = {CodeableConcept.class}, order=15, min=0, max=1, modifier=false, summary=false) + @Child(name = "synthesisType", type = {CodeableConcept.class}, order=20, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="The particular type of synthesis if this is a synthesis summary", formalDefinition="The particular type of synthesis if this is a synthesis summary." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/synthesis-type") protected CodeableConcept synthesisType; @@ -1395,7 +1492,7 @@ public class Evidence extends MetadataResource { /** * The type of study that produced this summary. */ - @Child(name = "studyType", type = {CodeableConcept.class}, order=16, min=0, max=1, modifier=false, summary=false) + @Child(name = "studyType", type = {CodeableConcept.class}, order=21, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="The type of study that produced this summary", formalDefinition="The type of study that produced this summary." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/study-type") protected CodeableConcept studyType; @@ -1403,25 +1500,25 @@ public class Evidence extends MetadataResource { /** * The statistic value(s). */ - @Child(name = "statistic", type = {Statistic.class}, order=17, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "statistic", type = {Statistic.class}, order=22, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Values and parameters for a single statistic", formalDefinition="The statistic value(s)." ) protected List statistic; /** * Ordered distribution. */ - @Child(name = "distribution", type = {OrderedDistribution.class}, order=18, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "distribution", type = {OrderedDistribution.class}, order=23, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="An ordered group of statistics", formalDefinition="Ordered distribution." ) protected List distribution; /** * Level of certainty. */ - @Child(name = "certainty", type = {}, order=19, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "certainty", type = {}, order=24, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Level of certainty", formalDefinition="Level of certainty." ) protected List certainty; - private static final long serialVersionUID = -1916823019L; + private static final long serialVersionUID = 100960848L; /** * Constructor @@ -1885,56 +1982,317 @@ public class Evidence extends MetadataResource { } /** - * @return {@link #contributor} (Contact detail and role for contributor to summary.) + * @return {@link #publisher} (The name of the organization or individual that published the evidence.). This is the underlying object with id, value and extensions. The accessor "getPublisher" gives direct access to the value */ - public List getContributor() { - if (this.contributor == null) - this.contributor = new ArrayList(); - return this.contributor; + public StringType getPublisherElement() { + if (this.publisher == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create Evidence.publisher"); + else if (Configuration.doAutoCreate()) + this.publisher = new StringType(); // bb + return this.publisher; + } + + public boolean hasPublisherElement() { + return this.publisher != null && !this.publisher.isEmpty(); + } + + public boolean hasPublisher() { + return this.publisher != null && !this.publisher.isEmpty(); + } + + /** + * @param value {@link #publisher} (The name of the organization or individual that published the evidence.). This is the underlying object with id, value and extensions. The accessor "getPublisher" gives direct access to the value + */ + public Evidence setPublisherElement(StringType value) { + this.publisher = value; + return this; + } + + /** + * @return The name of the organization or individual that published the evidence. + */ + public String getPublisher() { + return this.publisher == null ? null : this.publisher.getValue(); + } + + /** + * @param value The name of the organization or individual that published the evidence. + */ + public Evidence setPublisher(String value) { + if (Utilities.noString(value)) + this.publisher = null; + else { + if (this.publisher == null) + this.publisher = new StringType(); + this.publisher.setValue(value); + } + return this; + } + + /** + * @return {@link #contact} (Contact details to assist a user in finding and communicating with the publisher.) + */ + public List getContact() { + if (this.contact == null) + this.contact = new ArrayList(); + return this.contact; } /** * @return Returns a reference to this for easy method chaining */ - public Evidence setContributor(List theContributor) { - this.contributor = theContributor; + public Evidence setContact(List theContact) { + this.contact = theContact; return this; } - public boolean hasContributor() { - if (this.contributor == null) + public boolean hasContact() { + if (this.contact == null) return false; - for (Contributor item : this.contributor) + for (ContactDetail item : this.contact) if (!item.isEmpty()) return true; return false; } - public Contributor addContributor() { //3 - Contributor t = new Contributor(); - if (this.contributor == null) - this.contributor = new ArrayList(); - this.contributor.add(t); + public ContactDetail addContact() { //3 + ContactDetail t = new ContactDetail(); + if (this.contact == null) + this.contact = new ArrayList(); + this.contact.add(t); return t; } - public Evidence addContributor(Contributor t) { //3 + public Evidence addContact(ContactDetail t) { //3 if (t == null) return this; - if (this.contributor == null) - this.contributor = new ArrayList(); - this.contributor.add(t); + if (this.contact == null) + this.contact = new ArrayList(); + this.contact.add(t); return this; } /** - * @return The first repetition of repeating field {@link #contributor}, creating it if it does not already exist {3} + * @return The first repetition of repeating field {@link #contact}, creating it if it does not already exist {3} */ - public Contributor getContributorFirstRep() { - if (getContributor().isEmpty()) { - addContributor(); + public ContactDetail getContactFirstRep() { + if (getContact().isEmpty()) { + addContact(); } - return getContributor().get(0); + return getContact().get(0); + } + + /** + * @return {@link #author} (An individiual, organization, or device primarily involved in the creation and maintenance of the content.) + */ + public List getAuthor() { + if (this.author == null) + this.author = new ArrayList(); + return this.author; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public Evidence setAuthor(List theAuthor) { + this.author = theAuthor; + return this; + } + + public boolean hasAuthor() { + if (this.author == null) + return false; + for (ContactDetail item : this.author) + if (!item.isEmpty()) + return true; + return false; + } + + public ContactDetail addAuthor() { //3 + ContactDetail t = new ContactDetail(); + if (this.author == null) + this.author = new ArrayList(); + this.author.add(t); + return t; + } + + public Evidence addAuthor(ContactDetail t) { //3 + if (t == null) + return this; + if (this.author == null) + this.author = new ArrayList(); + this.author.add(t); + return this; + } + + /** + * @return The first repetition of repeating field {@link #author}, creating it if it does not already exist {3} + */ + public ContactDetail getAuthorFirstRep() { + if (getAuthor().isEmpty()) { + addAuthor(); + } + return getAuthor().get(0); + } + + /** + * @return {@link #editor} (An individiual, organization, or device primarily responsible for internal coherence of the content.) + */ + public List getEditor() { + if (this.editor == null) + this.editor = new ArrayList(); + return this.editor; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public Evidence setEditor(List theEditor) { + this.editor = theEditor; + return this; + } + + public boolean hasEditor() { + if (this.editor == null) + return false; + for (ContactDetail item : this.editor) + if (!item.isEmpty()) + return true; + return false; + } + + public ContactDetail addEditor() { //3 + ContactDetail t = new ContactDetail(); + if (this.editor == null) + this.editor = new ArrayList(); + this.editor.add(t); + return t; + } + + public Evidence addEditor(ContactDetail t) { //3 + if (t == null) + return this; + if (this.editor == null) + this.editor = new ArrayList(); + this.editor.add(t); + return this; + } + + /** + * @return The first repetition of repeating field {@link #editor}, creating it if it does not already exist {3} + */ + public ContactDetail getEditorFirstRep() { + if (getEditor().isEmpty()) { + addEditor(); + } + return getEditor().get(0); + } + + /** + * @return {@link #reviewer} (An individiual, organization, or device primarily responsible for review of some aspect of the content.) + */ + public List getReviewer() { + if (this.reviewer == null) + this.reviewer = new ArrayList(); + return this.reviewer; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public Evidence setReviewer(List theReviewer) { + this.reviewer = theReviewer; + return this; + } + + public boolean hasReviewer() { + if (this.reviewer == null) + return false; + for (ContactDetail item : this.reviewer) + if (!item.isEmpty()) + return true; + return false; + } + + public ContactDetail addReviewer() { //3 + ContactDetail t = new ContactDetail(); + if (this.reviewer == null) + this.reviewer = new ArrayList(); + this.reviewer.add(t); + return t; + } + + public Evidence addReviewer(ContactDetail t) { //3 + if (t == null) + return this; + if (this.reviewer == null) + this.reviewer = new ArrayList(); + this.reviewer.add(t); + return this; + } + + /** + * @return The first repetition of repeating field {@link #reviewer}, creating it if it does not already exist {3} + */ + public ContactDetail getReviewerFirstRep() { + if (getReviewer().isEmpty()) { + addReviewer(); + } + return getReviewer().get(0); + } + + /** + * @return {@link #endorser} (An individiual, organization, or device responsible for officially endorsing the content for use in some setting.) + */ + public List getEndorser() { + if (this.endorser == null) + this.endorser = new ArrayList(); + return this.endorser; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public Evidence setEndorser(List theEndorser) { + this.endorser = theEndorser; + return this; + } + + public boolean hasEndorser() { + if (this.endorser == null) + return false; + for (ContactDetail item : this.endorser) + if (!item.isEmpty()) + return true; + return false; + } + + public ContactDetail addEndorser() { //3 + ContactDetail t = new ContactDetail(); + if (this.endorser == null) + this.endorser = new ArrayList(); + this.endorser.add(t); + return t; + } + + public Evidence addEndorser(ContactDetail t) { //3 + if (t == null) + return this; + if (this.endorser == null) + this.endorser = new ArrayList(); + this.endorser.add(t); + return this; + } + + /** + * @return The first repetition of repeating field {@link #endorser}, creating it if it does not already exist {3} + */ + public ContactDetail getEndorserFirstRep() { + if (getEndorser().isEmpty()) { + addEndorser(); + } + return getEndorser().get(0); } /** @@ -2142,7 +2500,7 @@ public class Evidence extends MetadataResource { } /** - * @return {@link #variableDefinition} (Evidence variable.) + * @return {@link #variableDefinition} (Evidence variable such as population, exposure, or outcome.) */ public List getVariableDefinition() { if (this.variableDefinition == null) @@ -2477,77 +2835,6 @@ public class Evidence extends MetadataResource { * not supported on this implementation */ @Override - public int getPublisherMax() { - return 0; - } - /** - * @return {@link #publisher} (The name of the organization or individual that published the evidence.). This is the underlying object with id, value and extensions. The accessor "getPublisher" gives direct access to the value - */ - public StringType getPublisherElement() { - throw new Error("The resource type \"Evidence\" does not implement the property \"publisher\""); - } - - public boolean hasPublisherElement() { - return false; - } - public boolean hasPublisher() { - return false; - } - - /** - * @param value {@link #publisher} (The name of the organization or individual that published the evidence.). This is the underlying object with id, value and extensions. The accessor "getPublisher" gives direct access to the value - */ - public Evidence setPublisherElement(StringType value) { - throw new Error("The resource type \"Evidence\" does not implement the property \"publisher\""); - } - public String getPublisher() { - throw new Error("The resource type \"Evidence\" does not implement the property \"publisher\""); - } - /** - * @param value The name of the organization or individual that published the evidence. - */ - public Evidence setPublisher(String value) { - throw new Error("The resource type \"Evidence\" does not implement the property \"publisher\""); - } - /** - * not supported on this implementation - */ - @Override - public int getContactMax() { - return 0; - } - /** - * @return {@link #contact} (Contact details to assist a user in finding and communicating with the publisher.) - */ - public List getContact() { - return new ArrayList<>(); - } - /** - * @return Returns a reference to this for easy method chaining - */ - public Evidence setContact(List theContact) { - throw new Error("The resource type \"Evidence\" does not implement the property \"contact\""); - } - public boolean hasContact() { - return false; - } - - public ContactDetail addContact() { //3 - throw new Error("The resource type \"Evidence\" does not implement the property \"contact\""); - } - public Evidence addContact(ContactDetail t) { //3 - throw new Error("The resource type \"Evidence\" does not implement the property \"contact\""); - } - /** - * @return The first repetition of repeating field {@link #contact}, creating it if it does not already exist {2} - */ - public ContactDetail getContactFirstRep() { - throw new Error("The resource type \"Evidence\" does not implement the property \"contact\""); - } - /** - * not supported on this implementation - */ - @Override public int getJurisdictionMax() { return 0; } @@ -2685,12 +2972,17 @@ public class Evidence extends MetadataResource { 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 evidence instances.", 0, java.lang.Integer.MAX_VALUE, useContext)); children.add(new Property("approvalDate", "date", "The date on which the resource content was approved by the publisher. Approval happens once when the content is officially approved for usage.", 0, 1, approvalDate)); children.add(new Property("lastReviewDate", "date", "The date on which the resource content was last reviewed. Review happens periodically after approval but does not change the original approval date.", 0, 1, lastReviewDate)); - children.add(new Property("contributor", "Contributor", "Contact detail and role for contributor to summary.", 0, java.lang.Integer.MAX_VALUE, contributor)); + children.add(new Property("publisher", "string", "The name of the organization or individual that published the evidence.", 0, 1, publisher)); + children.add(new Property("contact", "ContactDetail", "Contact details to assist a user in finding and communicating with the publisher.", 0, java.lang.Integer.MAX_VALUE, contact)); + children.add(new Property("author", "ContactDetail", "An individiual, organization, or device primarily involved in the creation and maintenance of the content.", 0, java.lang.Integer.MAX_VALUE, author)); + children.add(new Property("editor", "ContactDetail", "An individiual, organization, or device primarily responsible for internal coherence of the content.", 0, java.lang.Integer.MAX_VALUE, editor)); + children.add(new Property("reviewer", "ContactDetail", "An individiual, organization, or device primarily responsible for review of some aspect of the content.", 0, java.lang.Integer.MAX_VALUE, reviewer)); + children.add(new Property("endorser", "ContactDetail", "An individiual, organization, or device responsible for officially endorsing the content for use in some setting.", 0, java.lang.Integer.MAX_VALUE, endorser)); children.add(new Property("relatedArtifact", "RelatedArtifact", "Link or citation to artifact associated with the summary.", 0, java.lang.Integer.MAX_VALUE, relatedArtifact)); children.add(new Property("description", "markdown", "A free text natural language description of the evidence from a consumer's perspective.", 0, 1, description)); children.add(new Property("assertion", "markdown", "Declarative description of the Evidence.", 0, 1, assertion)); children.add(new Property("note", "Annotation", "Footnotes and/or explanatory notes.", 0, java.lang.Integer.MAX_VALUE, note)); - children.add(new Property("variableDefinition", "", "Evidence variable.", 0, java.lang.Integer.MAX_VALUE, variableDefinition)); + children.add(new Property("variableDefinition", "", "Evidence variable such as population, exposure, or outcome.", 0, java.lang.Integer.MAX_VALUE, variableDefinition)); children.add(new Property("synthesisType", "CodeableConcept", "The particular type of synthesis if this is a synthesis summary.", 0, 1, synthesisType)); children.add(new Property("studyType", "CodeableConcept", "The type of study that produced this summary.", 0, 1, studyType)); children.add(new Property("statistic", "Statistic", "The statistic value(s).", 0, java.lang.Integer.MAX_VALUE, statistic)); @@ -2710,12 +3002,17 @@ public class Evidence extends MetadataResource { 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 evidence instances.", 0, java.lang.Integer.MAX_VALUE, useContext); case 223539345: /*approvalDate*/ return new Property("approvalDate", "date", "The date on which the resource content was approved by the publisher. Approval happens once when the content is officially approved for usage.", 0, 1, approvalDate); case -1687512484: /*lastReviewDate*/ return new Property("lastReviewDate", "date", "The date on which the resource content was last reviewed. Review happens periodically after approval but does not change the original approval date.", 0, 1, lastReviewDate); - case -1895276325: /*contributor*/ return new Property("contributor", "Contributor", "Contact detail and role for contributor to summary.", 0, java.lang.Integer.MAX_VALUE, contributor); + case 1447404028: /*publisher*/ return new Property("publisher", "string", "The name of the organization or individual that published the evidence.", 0, 1, publisher); + case 951526432: /*contact*/ return new Property("contact", "ContactDetail", "Contact details to assist a user in finding and communicating with the publisher.", 0, java.lang.Integer.MAX_VALUE, contact); + case -1406328437: /*author*/ return new Property("author", "ContactDetail", "An individiual, organization, or device primarily involved in the creation and maintenance of the content.", 0, java.lang.Integer.MAX_VALUE, author); + case -1307827859: /*editor*/ return new Property("editor", "ContactDetail", "An individiual, organization, or device primarily responsible for internal coherence of the content.", 0, java.lang.Integer.MAX_VALUE, editor); + case -261190139: /*reviewer*/ return new Property("reviewer", "ContactDetail", "An individiual, organization, or device primarily responsible for review of some aspect of the content.", 0, java.lang.Integer.MAX_VALUE, reviewer); + case 1740277666: /*endorser*/ return new Property("endorser", "ContactDetail", "An individiual, organization, or device responsible for officially endorsing the content for use in some setting.", 0, java.lang.Integer.MAX_VALUE, endorser); case 666807069: /*relatedArtifact*/ return new Property("relatedArtifact", "RelatedArtifact", "Link or citation to artifact associated with the summary.", 0, java.lang.Integer.MAX_VALUE, relatedArtifact); case -1724546052: /*description*/ return new Property("description", "markdown", "A free text natural language description of the evidence from a consumer's perspective.", 0, 1, description); case 1314395906: /*assertion*/ return new Property("assertion", "markdown", "Declarative description of the Evidence.", 0, 1, assertion); case 3387378: /*note*/ return new Property("note", "Annotation", "Footnotes and/or explanatory notes.", 0, java.lang.Integer.MAX_VALUE, note); - case -1807222545: /*variableDefinition*/ return new Property("variableDefinition", "", "Evidence variable.", 0, java.lang.Integer.MAX_VALUE, variableDefinition); + case -1807222545: /*variableDefinition*/ return new Property("variableDefinition", "", "Evidence variable such as population, exposure, or outcome.", 0, java.lang.Integer.MAX_VALUE, variableDefinition); case 672726254: /*synthesisType*/ return new Property("synthesisType", "CodeableConcept", "The particular type of synthesis if this is a synthesis summary.", 0, 1, synthesisType); case -1955265373: /*studyType*/ return new Property("studyType", "CodeableConcept", "The type of study that produced this summary.", 0, 1, studyType); case -2081261232: /*statistic*/ return new Property("statistic", "Statistic", "The statistic value(s).", 0, java.lang.Integer.MAX_VALUE, statistic); @@ -2738,7 +3035,12 @@ public class Evidence extends MetadataResource { case -669707736: /*useContext*/ return this.useContext == null ? new Base[0] : this.useContext.toArray(new Base[this.useContext.size()]); // UsageContext case 223539345: /*approvalDate*/ return this.approvalDate == null ? new Base[0] : new Base[] {this.approvalDate}; // DateType case -1687512484: /*lastReviewDate*/ return this.lastReviewDate == null ? new Base[0] : new Base[] {this.lastReviewDate}; // DateType - case -1895276325: /*contributor*/ return this.contributor == null ? new Base[0] : this.contributor.toArray(new Base[this.contributor.size()]); // Contributor + case 1447404028: /*publisher*/ return this.publisher == null ? new Base[0] : new Base[] {this.publisher}; // StringType + case 951526432: /*contact*/ return this.contact == null ? new Base[0] : this.contact.toArray(new Base[this.contact.size()]); // ContactDetail + case -1406328437: /*author*/ return this.author == null ? new Base[0] : this.author.toArray(new Base[this.author.size()]); // ContactDetail + case -1307827859: /*editor*/ return this.editor == null ? new Base[0] : this.editor.toArray(new Base[this.editor.size()]); // ContactDetail + case -261190139: /*reviewer*/ return this.reviewer == null ? new Base[0] : this.reviewer.toArray(new Base[this.reviewer.size()]); // ContactDetail + case 1740277666: /*endorser*/ return this.endorser == null ? new Base[0] : this.endorser.toArray(new Base[this.endorser.size()]); // ContactDetail case 666807069: /*relatedArtifact*/ return this.relatedArtifact == null ? new Base[0] : this.relatedArtifact.toArray(new Base[this.relatedArtifact.size()]); // RelatedArtifact case -1724546052: /*description*/ return this.description == null ? new Base[0] : new Base[] {this.description}; // MarkdownType case 1314395906: /*assertion*/ return this.assertion == null ? new Base[0] : new Base[] {this.assertion}; // MarkdownType @@ -2785,8 +3087,23 @@ public class Evidence extends MetadataResource { case -1687512484: // lastReviewDate this.lastReviewDate = TypeConvertor.castToDate(value); // DateType return value; - case -1895276325: // contributor - this.getContributor().add(TypeConvertor.castToContributor(value)); // Contributor + case 1447404028: // publisher + this.publisher = TypeConvertor.castToString(value); // StringType + return value; + case 951526432: // contact + this.getContact().add(TypeConvertor.castToContactDetail(value)); // ContactDetail + return value; + case -1406328437: // author + this.getAuthor().add(TypeConvertor.castToContactDetail(value)); // ContactDetail + return value; + case -1307827859: // editor + this.getEditor().add(TypeConvertor.castToContactDetail(value)); // ContactDetail + return value; + case -261190139: // reviewer + this.getReviewer().add(TypeConvertor.castToContactDetail(value)); // ContactDetail + return value; + case 1740277666: // endorser + this.getEndorser().add(TypeConvertor.castToContactDetail(value)); // ContactDetail return value; case 666807069: // relatedArtifact this.getRelatedArtifact().add(TypeConvertor.castToRelatedArtifact(value)); // RelatedArtifact @@ -2844,8 +3161,18 @@ public class Evidence extends MetadataResource { this.approvalDate = TypeConvertor.castToDate(value); // DateType } else if (name.equals("lastReviewDate")) { this.lastReviewDate = TypeConvertor.castToDate(value); // DateType - } else if (name.equals("contributor")) { - this.getContributor().add(TypeConvertor.castToContributor(value)); + } else if (name.equals("publisher")) { + this.publisher = TypeConvertor.castToString(value); // StringType + } else if (name.equals("contact")) { + this.getContact().add(TypeConvertor.castToContactDetail(value)); + } else if (name.equals("author")) { + this.getAuthor().add(TypeConvertor.castToContactDetail(value)); + } else if (name.equals("editor")) { + this.getEditor().add(TypeConvertor.castToContactDetail(value)); + } else if (name.equals("reviewer")) { + this.getReviewer().add(TypeConvertor.castToContactDetail(value)); + } else if (name.equals("endorser")) { + this.getEndorser().add(TypeConvertor.castToContactDetail(value)); } else if (name.equals("relatedArtifact")) { this.getRelatedArtifact().add(TypeConvertor.castToRelatedArtifact(value)); } else if (name.equals("description")) { @@ -2883,7 +3210,12 @@ public class Evidence extends MetadataResource { case -669707736: return addUseContext(); case 223539345: return getApprovalDateElement(); case -1687512484: return getLastReviewDateElement(); - case -1895276325: return addContributor(); + case 1447404028: return getPublisherElement(); + case 951526432: return addContact(); + case -1406328437: return addAuthor(); + case -1307827859: return addEditor(); + case -261190139: return addReviewer(); + case 1740277666: return addEndorser(); case 666807069: return addRelatedArtifact(); case -1724546052: return getDescriptionElement(); case 1314395906: return getAssertionElement(); @@ -2911,7 +3243,12 @@ public class Evidence extends MetadataResource { case -669707736: /*useContext*/ return new String[] {"UsageContext"}; case 223539345: /*approvalDate*/ return new String[] {"date"}; case -1687512484: /*lastReviewDate*/ return new String[] {"date"}; - case -1895276325: /*contributor*/ return new String[] {"Contributor"}; + case 1447404028: /*publisher*/ return new String[] {"string"}; + case 951526432: /*contact*/ return new String[] {"ContactDetail"}; + case -1406328437: /*author*/ return new String[] {"ContactDetail"}; + case -1307827859: /*editor*/ return new String[] {"ContactDetail"}; + case -261190139: /*reviewer*/ return new String[] {"ContactDetail"}; + case 1740277666: /*endorser*/ return new String[] {"ContactDetail"}; case 666807069: /*relatedArtifact*/ return new String[] {"RelatedArtifact"}; case -1724546052: /*description*/ return new String[] {"markdown"}; case 1314395906: /*assertion*/ return new String[] {"markdown"}; @@ -2956,8 +3293,23 @@ public class Evidence extends MetadataResource { else if (name.equals("lastReviewDate")) { throw new FHIRException("Cannot call addChild on a primitive type Evidence.lastReviewDate"); } - else if (name.equals("contributor")) { - return addContributor(); + else if (name.equals("publisher")) { + throw new FHIRException("Cannot call addChild on a primitive type Evidence.publisher"); + } + else if (name.equals("contact")) { + return addContact(); + } + else if (name.equals("author")) { + return addAuthor(); + } + else if (name.equals("editor")) { + return addEditor(); + } + else if (name.equals("reviewer")) { + return addReviewer(); + } + else if (name.equals("endorser")) { + return addEndorser(); } else if (name.equals("relatedArtifact")) { return addRelatedArtifact(); @@ -3025,10 +3377,31 @@ public class Evidence extends MetadataResource { }; dst.approvalDate = approvalDate == null ? null : approvalDate.copy(); dst.lastReviewDate = lastReviewDate == null ? null : lastReviewDate.copy(); - if (contributor != null) { - dst.contributor = new ArrayList(); - for (Contributor i : contributor) - dst.contributor.add(i.copy()); + dst.publisher = publisher == null ? null : publisher.copy(); + if (contact != null) { + dst.contact = new ArrayList(); + for (ContactDetail i : contact) + dst.contact.add(i.copy()); + }; + if (author != null) { + dst.author = new ArrayList(); + for (ContactDetail i : author) + dst.author.add(i.copy()); + }; + if (editor != null) { + dst.editor = new ArrayList(); + for (ContactDetail i : editor) + dst.editor.add(i.copy()); + }; + if (reviewer != null) { + dst.reviewer = new ArrayList(); + for (ContactDetail i : reviewer) + dst.reviewer.add(i.copy()); + }; + if (endorser != null) { + dst.endorser = new ArrayList(); + for (ContactDetail i : endorser) + dst.endorser.add(i.copy()); }; if (relatedArtifact != null) { dst.relatedArtifact = new ArrayList(); @@ -3080,11 +3453,12 @@ public class Evidence extends MetadataResource { return compareDeep(url, o.url, true) && compareDeep(identifier, o.identifier, true) && compareDeep(version, o.version, true) && compareDeep(title, o.title, true) && compareDeep(status, o.status, true) && compareDeep(date, o.date, true) && compareDeep(useContext, o.useContext, true) && compareDeep(approvalDate, o.approvalDate, true) - && compareDeep(lastReviewDate, o.lastReviewDate, true) && compareDeep(contributor, o.contributor, true) - && compareDeep(relatedArtifact, o.relatedArtifact, true) && compareDeep(description, o.description, true) - && compareDeep(assertion, o.assertion, true) && compareDeep(note, o.note, true) && compareDeep(variableDefinition, o.variableDefinition, true) - && compareDeep(synthesisType, o.synthesisType, true) && compareDeep(studyType, o.studyType, true) - && compareDeep(statistic, o.statistic, true) && compareDeep(distribution, o.distribution, true) + && compareDeep(lastReviewDate, o.lastReviewDate, true) && compareDeep(publisher, o.publisher, true) + && compareDeep(contact, o.contact, true) && compareDeep(author, o.author, true) && compareDeep(editor, o.editor, true) + && compareDeep(reviewer, o.reviewer, true) && compareDeep(endorser, o.endorser, true) && compareDeep(relatedArtifact, o.relatedArtifact, true) + && compareDeep(description, o.description, true) && compareDeep(assertion, o.assertion, true) && compareDeep(note, o.note, true) + && compareDeep(variableDefinition, o.variableDefinition, true) && compareDeep(synthesisType, o.synthesisType, true) + && compareDeep(studyType, o.studyType, true) && compareDeep(statistic, o.statistic, true) && compareDeep(distribution, o.distribution, true) && compareDeep(certainty, o.certainty, true); } @@ -3097,15 +3471,16 @@ public class Evidence extends MetadataResource { Evidence o = (Evidence) other_; return compareValues(url, o.url, true) && compareValues(version, o.version, true) && compareValues(title, o.title, true) && compareValues(status, o.status, true) && compareValues(date, o.date, true) && compareValues(approvalDate, o.approvalDate, true) - && compareValues(lastReviewDate, o.lastReviewDate, true) && compareValues(description, o.description, true) - && compareValues(assertion, o.assertion, true); + && compareValues(lastReviewDate, o.lastReviewDate, true) && compareValues(publisher, o.publisher, true) + && compareValues(description, o.description, true) && compareValues(assertion, o.assertion, true); } public boolean isEmpty() { return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(url, identifier, version - , title, status, date, useContext, approvalDate, lastReviewDate, contributor, relatedArtifact - , description, assertion, note, variableDefinition, synthesisType, studyType, statistic - , distribution, certainty); + , title, status, date, useContext, approvalDate, lastReviewDate, publisher, contact + , author, editor, reviewer, endorser, relatedArtifact, description, assertion + , note, variableDefinition, synthesisType, studyType, statistic, distribution, certainty + ); } @Override @@ -3273,6 +3648,26 @@ public class Evidence extends MetadataResource { */ public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + /** + * Search parameter: publisher + *

+ * Description: Name of the publisher of the evidence
+ * Type: string
+ * Path: Evidence.publisher
+ *

+ */ + @SearchParamDefinition(name="publisher", path="Evidence.publisher", description="Name of the publisher of the evidence", type="string" ) + public static final String SP_PUBLISHER = "publisher"; + /** + * Fluent Client search parameter constant for publisher + *

+ * Description: Name of the publisher of the evidence
+ * Type: string
+ * Path: Evidence.publisher
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam PUBLISHER = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_PUBLISHER); + /** * Search parameter: status *

@@ -3354,4 +3749,5 @@ public class Evidence 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/EvidenceFocus.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EvidenceFocus.java deleted file mode 100644 index 44100ba71..000000000 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EvidenceFocus.java +++ /dev/null @@ -1,2029 +0,0 @@ -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 Mon, May 11, 2020 09:58+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 ca.uhn.fhir.model.api.annotation.ResourceDef; -import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; - -/** - * EvidenceFocus. - */ -@ResourceDef(name="EvidenceFocus", profile="http://hl7.org/fhir/StructureDefinition/EvidenceFocus") -public class EvidenceFocus extends MetadataResource { - - @Block() - public static class EvidenceFocusCharacteristicComponent extends BackboneElement implements IBaseBackboneElement { - /** - * Characteristic code. - */ - @Child(name = "code", type = {CodeableConcept.class}, order=1, min=1, max=1, modifier=false, summary=true) - @Description(shortDefinition="Characteristic code", formalDefinition="Characteristic code." ) - @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/evfocus-characteristic-code") - protected CodeableConcept code; - - /** - * Characteristic value. - */ - @Child(name = "value", type = {Reference.class, CodeableConcept.class, BooleanType.class, Quantity.class, Range.class}, order=2, min=1, max=1, modifier=false, summary=true) - @Description(shortDefinition="Characteristic value", formalDefinition="Characteristic value." ) - protected DataType value; - - /** - * Is used to express not the characteristic. - */ - @Child(name = "exclude", type = {BooleanType.class}, order=3, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Is used to express not the characteristic", formalDefinition="Is used to express not the characteristic." ) - protected BooleanType exclude; - - /** - * Timeframe for the characteristic. - */ - @Child(name = "period", type = {Period.class}, order=4, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Timeframe for the characteristic", formalDefinition="Timeframe for the characteristic." ) - protected Period period; - - private static final long serialVersionUID = 279867823L; - - /** - * Constructor - */ - public EvidenceFocusCharacteristicComponent() { - super(); - } - - /** - * Constructor - */ - public EvidenceFocusCharacteristicComponent(CodeableConcept code, DataType value) { - super(); - this.setCode(code); - this.setValue(value); - } - - /** - * @return {@link #code} (Characteristic code.) - */ - public CodeableConcept getCode() { - if (this.code == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create EvidenceFocusCharacteristicComponent.code"); - else if (Configuration.doAutoCreate()) - this.code = new CodeableConcept(); // cc - return this.code; - } - - public boolean hasCode() { - return this.code != null && !this.code.isEmpty(); - } - - /** - * @param value {@link #code} (Characteristic code.) - */ - public EvidenceFocusCharacteristicComponent setCode(CodeableConcept value) { - this.code = value; - return this; - } - - /** - * @return {@link #value} (Characteristic value.) - */ - public DataType getValue() { - return this.value; - } - - /** - * @return {@link #value} (Characteristic value.) - */ - public Reference getValueReference() throws FHIRException { - if (this.value == null) - this.value = new Reference(); - if (!(this.value instanceof Reference)) - throw new FHIRException("Type mismatch: the type Reference was expected, but "+this.value.getClass().getName()+" was encountered"); - return (Reference) this.value; - } - - public boolean hasValueReference() { - return this != null && this.value instanceof Reference; - } - - /** - * @return {@link #value} (Characteristic value.) - */ - public CodeableConcept getValueCodeableConcept() throws FHIRException { - if (this.value == null) - this.value = new CodeableConcept(); - if (!(this.value instanceof CodeableConcept)) - throw new FHIRException("Type mismatch: the type CodeableConcept was expected, but "+this.value.getClass().getName()+" was encountered"); - return (CodeableConcept) this.value; - } - - public boolean hasValueCodeableConcept() { - return this != null && this.value instanceof CodeableConcept; - } - - /** - * @return {@link #value} (Characteristic value.) - */ - public BooleanType getValueBooleanType() throws FHIRException { - if (this.value == null) - this.value = new BooleanType(); - if (!(this.value instanceof BooleanType)) - throw new FHIRException("Type mismatch: the type BooleanType was expected, but "+this.value.getClass().getName()+" was encountered"); - return (BooleanType) this.value; - } - - public boolean hasValueBooleanType() { - return this != null && this.value instanceof BooleanType; - } - - /** - * @return {@link #value} (Characteristic value.) - */ - public Quantity getValueQuantity() throws FHIRException { - if (this.value == null) - this.value = new Quantity(); - if (!(this.value instanceof Quantity)) - throw new FHIRException("Type mismatch: the type Quantity was expected, but "+this.value.getClass().getName()+" was encountered"); - return (Quantity) this.value; - } - - public boolean hasValueQuantity() { - return this != null && this.value instanceof Quantity; - } - - /** - * @return {@link #value} (Characteristic value.) - */ - public Range getValueRange() throws FHIRException { - if (this.value == null) - this.value = new Range(); - if (!(this.value instanceof Range)) - throw new FHIRException("Type mismatch: the type Range was expected, but "+this.value.getClass().getName()+" was encountered"); - return (Range) this.value; - } - - public boolean hasValueRange() { - return this != null && this.value instanceof Range; - } - - public boolean hasValue() { - return this.value != null && !this.value.isEmpty(); - } - - /** - * @param value {@link #value} (Characteristic value.) - */ - public EvidenceFocusCharacteristicComponent setValue(DataType value) { - if (value != null && !(value instanceof Reference || value instanceof CodeableConcept || value instanceof BooleanType || value instanceof Quantity || value instanceof Range)) - throw new Error("Not the right type for EvidenceFocus.characteristic.value[x]: "+value.fhirType()); - this.value = value; - return this; - } - - /** - * @return {@link #exclude} (Is used to express not the characteristic.). This is the underlying object with id, value and extensions. The accessor "getExclude" gives direct access to the value - */ - public BooleanType getExcludeElement() { - if (this.exclude == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create EvidenceFocusCharacteristicComponent.exclude"); - else if (Configuration.doAutoCreate()) - this.exclude = new BooleanType(); // bb - return this.exclude; - } - - public boolean hasExcludeElement() { - return this.exclude != null && !this.exclude.isEmpty(); - } - - public boolean hasExclude() { - return this.exclude != null && !this.exclude.isEmpty(); - } - - /** - * @param value {@link #exclude} (Is used to express not the characteristic.). This is the underlying object with id, value and extensions. The accessor "getExclude" gives direct access to the value - */ - public EvidenceFocusCharacteristicComponent setExcludeElement(BooleanType value) { - this.exclude = value; - return this; - } - - /** - * @return Is used to express not the characteristic. - */ - public boolean getExclude() { - return this.exclude == null || this.exclude.isEmpty() ? false : this.exclude.getValue(); - } - - /** - * @param value Is used to express not the characteristic. - */ - public EvidenceFocusCharacteristicComponent setExclude(boolean value) { - if (this.exclude == null) - this.exclude = new BooleanType(); - this.exclude.setValue(value); - return this; - } - - /** - * @return {@link #period} (Timeframe for the characteristic.) - */ - public Period getPeriod() { - if (this.period == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create EvidenceFocusCharacteristicComponent.period"); - else if (Configuration.doAutoCreate()) - this.period = new Period(); // cc - return this.period; - } - - public boolean hasPeriod() { - return this.period != null && !this.period.isEmpty(); - } - - /** - * @param value {@link #period} (Timeframe for the characteristic.) - */ - public EvidenceFocusCharacteristicComponent setPeriod(Period value) { - this.period = value; - return this; - } - - protected void listChildren(List children) { - super.listChildren(children); - children.add(new Property("code", "CodeableConcept", "Characteristic code.", 0, 1, code)); - children.add(new Property("value[x]", "Reference(Any)|CodeableConcept|boolean|Quantity|Range", "Characteristic value.", 0, 1, value)); - children.add(new Property("exclude", "boolean", "Is used to express not the characteristic.", 0, 1, exclude)); - children.add(new Property("period", "Period", "Timeframe for the characteristic.", 0, 1, period)); - } - - @Override - public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { - switch (_hash) { - case 3059181: /*code*/ return new Property("code", "CodeableConcept", "Characteristic code.", 0, 1, code); - case -1410166417: /*value[x]*/ return new Property("value[x]", "Reference(Any)|CodeableConcept|boolean|Quantity|Range", "Characteristic value.", 0, 1, value); - case 111972721: /*value*/ return new Property("value[x]", "Reference(Any)|CodeableConcept|boolean|Quantity|Range", "Characteristic value.", 0, 1, value); - case 1755241690: /*valueReference*/ return new Property("value[x]", "Reference(Any)", "Characteristic value.", 0, 1, value); - case 924902896: /*valueCodeableConcept*/ return new Property("value[x]", "CodeableConcept", "Characteristic value.", 0, 1, value); - case 733421943: /*valueBoolean*/ return new Property("value[x]", "boolean", "Characteristic value.", 0, 1, value); - case -2029823716: /*valueQuantity*/ return new Property("value[x]", "Quantity", "Characteristic value.", 0, 1, value); - case 2030761548: /*valueRange*/ return new Property("value[x]", "Range", "Characteristic value.", 0, 1, value); - case -1321148966: /*exclude*/ return new Property("exclude", "boolean", "Is used to express not the characteristic.", 0, 1, exclude); - case -991726143: /*period*/ return new Property("period", "Period", "Timeframe for the characteristic.", 0, 1, period); - default: return super.getNamedProperty(_hash, _name, _checkValid); - } - - } - - @Override - public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException { - switch (hash) { - case 3059181: /*code*/ return this.code == null ? new Base[0] : new Base[] {this.code}; // CodeableConcept - case 111972721: /*value*/ return this.value == null ? new Base[0] : new Base[] {this.value}; // DataType - case -1321148966: /*exclude*/ return this.exclude == null ? new Base[0] : new Base[] {this.exclude}; // BooleanType - case -991726143: /*period*/ return this.period == null ? new Base[0] : new Base[] {this.period}; // Period - default: return super.getProperty(hash, name, checkValid); - } - - } - - @Override - public Base setProperty(int hash, String name, Base value) throws FHIRException { - switch (hash) { - case 3059181: // code - this.code = TypeConvertor.castToCodeableConcept(value); // CodeableConcept - return value; - case 111972721: // value - this.value = TypeConvertor.castToType(value); // DataType - return value; - case -1321148966: // exclude - this.exclude = TypeConvertor.castToBoolean(value); // BooleanType - return value; - case -991726143: // period - this.period = TypeConvertor.castToPeriod(value); // Period - return value; - default: return super.setProperty(hash, name, value); - } - - } - - @Override - public Base setProperty(String name, Base value) throws FHIRException { - if (name.equals("code")) { - this.code = TypeConvertor.castToCodeableConcept(value); // CodeableConcept - } else if (name.equals("value[x]")) { - this.value = TypeConvertor.castToType(value); // DataType - } else if (name.equals("exclude")) { - this.exclude = TypeConvertor.castToBoolean(value); // BooleanType - } else if (name.equals("period")) { - this.period = TypeConvertor.castToPeriod(value); // Period - } else - return super.setProperty(name, value); - return value; - } - - @Override - public Base makeProperty(int hash, String name) throws FHIRException { - switch (hash) { - case 3059181: return getCode(); - case -1410166417: return getValue(); - case 111972721: return getValue(); - case -1321148966: return getExcludeElement(); - case -991726143: return getPeriod(); - default: return super.makeProperty(hash, name); - } - - } - - @Override - public String[] getTypesForProperty(int hash, String name) throws FHIRException { - switch (hash) { - case 3059181: /*code*/ return new String[] {"CodeableConcept"}; - case 111972721: /*value*/ return new String[] {"Reference", "CodeableConcept", "boolean", "Quantity", "Range"}; - case -1321148966: /*exclude*/ return new String[] {"boolean"}; - case -991726143: /*period*/ return new String[] {"Period"}; - default: return super.getTypesForProperty(hash, name); - } - - } - - @Override - public Base addChild(String name) throws FHIRException { - if (name.equals("code")) { - this.code = new CodeableConcept(); - return this.code; - } - else if (name.equals("valueReference")) { - this.value = new Reference(); - return this.value; - } - else if (name.equals("valueCodeableConcept")) { - this.value = new CodeableConcept(); - return this.value; - } - else if (name.equals("valueBoolean")) { - this.value = new BooleanType(); - return this.value; - } - else if (name.equals("valueQuantity")) { - this.value = new Quantity(); - return this.value; - } - else if (name.equals("valueRange")) { - this.value = new Range(); - return this.value; - } - else if (name.equals("exclude")) { - throw new FHIRException("Cannot call addChild on a primitive type EvidenceFocus.characteristic.exclude"); - } - else if (name.equals("period")) { - this.period = new Period(); - return this.period; - } - else - return super.addChild(name); - } - - public EvidenceFocusCharacteristicComponent copy() { - EvidenceFocusCharacteristicComponent dst = new EvidenceFocusCharacteristicComponent(); - copyValues(dst); - return dst; - } - - public void copyValues(EvidenceFocusCharacteristicComponent dst) { - super.copyValues(dst); - dst.code = code == null ? null : code.copy(); - dst.value = value == null ? null : value.copy(); - dst.exclude = exclude == null ? null : exclude.copy(); - dst.period = period == null ? null : period.copy(); - } - - @Override - public boolean equalsDeep(Base other_) { - if (!super.equalsDeep(other_)) - return false; - if (!(other_ instanceof EvidenceFocusCharacteristicComponent)) - return false; - EvidenceFocusCharacteristicComponent o = (EvidenceFocusCharacteristicComponent) other_; - return compareDeep(code, o.code, true) && compareDeep(value, o.value, true) && compareDeep(exclude, o.exclude, true) - && compareDeep(period, o.period, true); - } - - @Override - public boolean equalsShallow(Base other_) { - if (!super.equalsShallow(other_)) - return false; - if (!(other_ instanceof EvidenceFocusCharacteristicComponent)) - return false; - EvidenceFocusCharacteristicComponent o = (EvidenceFocusCharacteristicComponent) other_; - return compareValues(exclude, o.exclude, true); - } - - public boolean isEmpty() { - return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(code, value, exclude, period - ); - } - - public String fhirType() { - return "EvidenceFocus.characteristic"; - - } - - } - - /** - * An absolute URI that is used to identify this EvidenceFocus 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. - */ - @Child(name = "url", type = {UriType.class}, order=0, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Canonical identifier for this EvidenceFocus, represented as a globally unique URI", formalDefinition="An absolute URI that is used to identify this EvidenceFocus 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; - - /** - * 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. - */ - @Child(name = "identifier", type = {Identifier.class}, order=1, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Unique to the EvidenceFocus Resource", 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." ) - protected List identifier; - - /** - * 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=2, 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; - - /** - * A natural language name identifying the evidence focus. This name should be usable as an identifier for the module by machine processing applications such as code generation. - */ - @Child(name = "name", type = {StringType.class}, order=3, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Name", formalDefinition="A natural language name identifying the evidence focus. This name should be usable as an identifier for the module by machine processing applications such as code generation." ) - protected StringType name; - - /** - * The status of this summary. Enables tracking the life-cycle of the content. - */ - @Child(name = "status", type = {CodeType.class}, order=4, 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; - - /** - * 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 evidence focus instances. - */ - @Child(name = "useContext", type = {UsageContext.class}, order=5, 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 evidence focus instances." ) - protected List useContext; - - /** - * The date (and optionally time) when the evidence focus was published. The date must change when the business version changes and it must change if the status code changes. In addition, it should change when the substantive content of the evidence focus changes. - */ - @Child(name = "date", type = {DateTimeType.class}, order=6, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Date created", formalDefinition="The date (and optionally time) when the evidence focus was published. The date must change when the business version changes and it must change if the status code changes. In addition, it should change when the substantive content of the evidence focus changes." ) - protected DateTimeType date; - - /** - * Used for general notes and annotations not coded elsewhere. - */ - @Child(name = "note", type = {Annotation.class}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Footnotes and/or explanatory notes", formalDefinition="Used for general notes and annotations not coded elsewhere." ) - protected List note; - - /** - * A copyright statement relating to the evidence focus and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the evidence focus. - */ - @Child(name = "copyright", type = {MarkdownType.class}, order=8, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Copyright", formalDefinition="A copyright statement relating to the evidence focus and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the evidence focus." ) - protected MarkdownType copyright; - - /** - * Citation for this EvidenceFocus resource. - */ - @Child(name = "citeAs", type = {Citation.class}, order=9, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Citation for this EvidenceFocus resource", formalDefinition="Citation for this EvidenceFocus resource." ) - protected Reference citeAs; - - /** - * Characteristic. - */ - @Child(name = "characteristic", type = {}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Characteristic", formalDefinition="Characteristic." ) - protected List characteristic; - - /** - * Additional documentation. - */ - @Child(name = "relatedArtifact", type = {RelatedArtifact.class}, order=11, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Additional documentation", formalDefinition="Additional documentation." ) - protected List relatedArtifact; - - private static final long serialVersionUID = 1053034569L; - - /** - * Constructor - */ - public EvidenceFocus() { - super(); - } - - /** - * Constructor - */ - public EvidenceFocus(PublicationStatus status) { - super(); - this.setStatus(status); - } - - /** - * @return {@link #url} (An absolute URI that is used to identify this EvidenceFocus 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.). This is the underlying object with id, value and extensions. The accessor "getUrl" gives direct access to the value - */ - public UriType getUrlElement() { - if (this.url == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create EvidenceFocus.url"); - else if (Configuration.doAutoCreate()) - this.url = new UriType(); // bb - return this.url; - } - - public boolean hasUrlElement() { - return this.url != null && !this.url.isEmpty(); - } - - public boolean hasUrl() { - return this.url != null && !this.url.isEmpty(); - } - - /** - * @param value {@link #url} (An absolute URI that is used to identify this EvidenceFocus 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.). This is the underlying object with id, value and extensions. The accessor "getUrl" gives direct access to the value - */ - public EvidenceFocus setUrlElement(UriType value) { - this.url = value; - return this; - } - - /** - * @return An absolute URI that is used to identify this EvidenceFocus 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. - */ - public String getUrl() { - return this.url == null ? null : this.url.getValue(); - } - - /** - * @param value An absolute URI that is used to identify this EvidenceFocus 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. - */ - public EvidenceFocus setUrl(String value) { - if (Utilities.noString(value)) - this.url = null; - else { - if (this.url == null) - this.url = new UriType(); - this.url.setValue(value); - } - return this; - } - - /** - * @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.) - */ - 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 EvidenceFocus 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 EvidenceFocus 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 #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 EvidenceFocus.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 EvidenceFocus 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 EvidenceFocus 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 #name} (A natural language name identifying the evidence focus. This name should be usable as an identifier for the module by machine processing applications such as code generation.). 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 EvidenceFocus.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} (A natural language name identifying the evidence focus. This name should be usable as an identifier for the module by machine processing applications such as code generation.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value - */ - public EvidenceFocus setNameElement(StringType value) { - this.name = value; - return this; - } - - /** - * @return A natural language name identifying the evidence focus. This name should be usable as an identifier for the module by machine processing applications such as code generation. - */ - public String getName() { - return this.name == null ? null : this.name.getValue(); - } - - /** - * @param value A natural language name identifying the evidence focus. This name should be usable as an identifier for the module by machine processing applications such as code generation. - */ - public EvidenceFocus 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 #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 - */ - public Enumeration getStatusElement() { - if (this.status == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create EvidenceFocus.status"); - else if (Configuration.doAutoCreate()) - this.status = new Enumeration(new PublicationStatusEnumFactory()); // bb - return this.status; - } - - public boolean hasStatusElement() { - return this.status != null && !this.status.isEmpty(); - } - - public boolean hasStatus() { - return this.status != null && !this.status.isEmpty(); - } - - /** - * @param value {@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 - */ - public EvidenceFocus setStatusElement(Enumeration value) { - this.status = value; - return this; - } - - /** - * @return The status of this summary. Enables tracking the life-cycle of the content. - */ - public PublicationStatus getStatus() { - return this.status == null ? null : this.status.getValue(); - } - - /** - * @param value The status of this summary. Enables tracking the life-cycle of the content. - */ - public EvidenceFocus setStatus(PublicationStatus value) { - if (this.status == null) - this.status = new Enumeration(new PublicationStatusEnumFactory()); - this.status.setValue(value); - return this; - } - - /** - * @return {@link #useContext} (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 evidence focus instances.) - */ - public List getUseContext() { - if (this.useContext == null) - this.useContext = new ArrayList(); - return this.useContext; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public EvidenceFocus setUseContext(List theUseContext) { - this.useContext = theUseContext; - return this; - } - - public boolean hasUseContext() { - if (this.useContext == null) - return false; - for (UsageContext item : this.useContext) - if (!item.isEmpty()) - return true; - return false; - } - - public UsageContext addUseContext() { //3 - UsageContext t = new UsageContext(); - if (this.useContext == null) - this.useContext = new ArrayList(); - this.useContext.add(t); - return t; - } - - public EvidenceFocus addUseContext(UsageContext t) { //3 - if (t == null) - return this; - if (this.useContext == null) - this.useContext = new ArrayList(); - this.useContext.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #useContext}, creating it if it does not already exist {3} - */ - public UsageContext getUseContextFirstRep() { - if (getUseContext().isEmpty()) { - addUseContext(); - } - return getUseContext().get(0); - } - - /** - * @return {@link #date} (The date (and optionally time) when the evidence focus was published. The date must change when the business version changes and it must change if the status code changes. In addition, it should change when the substantive content of the evidence focus changes.). This is the underlying object with id, value and extensions. The accessor "getDate" gives direct access to the value - */ - public DateTimeType getDateElement() { - if (this.date == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create EvidenceFocus.date"); - else if (Configuration.doAutoCreate()) - this.date = new DateTimeType(); // 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} (The date (and optionally time) when the evidence focus was published. The date must change when the business version changes and it must change if the status code changes. In addition, it should change when the substantive content of the evidence focus changes.). This is the underlying object with id, value and extensions. The accessor "getDate" gives direct access to the value - */ - public EvidenceFocus setDateElement(DateTimeType value) { - this.date = value; - return this; - } - - /** - * @return The date (and optionally time) when the evidence focus was published. The date must change when the business version changes and it must change if the status code changes. In addition, it should change when the substantive content of the evidence focus changes. - */ - public Date getDate() { - return this.date == null ? null : this.date.getValue(); - } - - /** - * @param value The date (and optionally time) when the evidence focus was published. The date must change when the business version changes and it must change if the status code changes. In addition, it should change when the substantive content of the evidence focus changes. - */ - public EvidenceFocus setDate(Date value) { - if (value == null) - this.date = null; - else { - if (this.date == null) - this.date = new DateTimeType(); - this.date.setValue(value); - } - return this; - } - - /** - * @return {@link #note} (Used for general notes and annotations not coded elsewhere.) - */ - public List getNote() { - if (this.note == null) - this.note = new ArrayList(); - return this.note; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public EvidenceFocus setNote(List theNote) { - this.note = theNote; - return this; - } - - public boolean hasNote() { - if (this.note == null) - return false; - for (Annotation item : this.note) - if (!item.isEmpty()) - return true; - return false; - } - - public Annotation addNote() { //3 - Annotation t = new Annotation(); - if (this.note == null) - this.note = new ArrayList(); - this.note.add(t); - return t; - } - - public EvidenceFocus addNote(Annotation t) { //3 - if (t == null) - return this; - if (this.note == null) - this.note = new ArrayList(); - this.note.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #note}, creating it if it does not already exist {3} - */ - public Annotation getNoteFirstRep() { - if (getNote().isEmpty()) { - addNote(); - } - return getNote().get(0); - } - - /** - * @return {@link #copyright} (A copyright statement relating to the evidence focus and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the evidence focus.). This is the underlying object with id, value and extensions. The accessor "getCopyright" gives direct access to the value - */ - public MarkdownType getCopyrightElement() { - if (this.copyright == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create EvidenceFocus.copyright"); - else if (Configuration.doAutoCreate()) - this.copyright = new MarkdownType(); // bb - return this.copyright; - } - - public boolean hasCopyrightElement() { - return this.copyright != null && !this.copyright.isEmpty(); - } - - public boolean hasCopyright() { - return this.copyright != null && !this.copyright.isEmpty(); - } - - /** - * @param value {@link #copyright} (A copyright statement relating to the evidence focus and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the evidence focus.). This is the underlying object with id, value and extensions. The accessor "getCopyright" gives direct access to the value - */ - public EvidenceFocus setCopyrightElement(MarkdownType value) { - this.copyright = value; - return this; - } - - /** - * @return A copyright statement relating to the evidence focus and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the evidence focus. - */ - public String getCopyright() { - return this.copyright == null ? null : this.copyright.getValue(); - } - - /** - * @param value A copyright statement relating to the evidence focus and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the evidence focus. - */ - public EvidenceFocus setCopyright(String value) { - if (value == null) - this.copyright = null; - else { - if (this.copyright == null) - this.copyright = new MarkdownType(); - this.copyright.setValue(value); - } - return this; - } - - /** - * @return {@link #citeAs} (Citation for this EvidenceFocus resource.) - */ - public Reference getCiteAs() { - if (this.citeAs == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create EvidenceFocus.citeAs"); - else if (Configuration.doAutoCreate()) - this.citeAs = new Reference(); // cc - return this.citeAs; - } - - public boolean hasCiteAs() { - return this.citeAs != null && !this.citeAs.isEmpty(); - } - - /** - * @param value {@link #citeAs} (Citation for this EvidenceFocus resource.) - */ - public EvidenceFocus setCiteAs(Reference value) { - this.citeAs = value; - return this; - } - - /** - * @return {@link #characteristic} (Characteristic.) - */ - public List getCharacteristic() { - if (this.characteristic == null) - this.characteristic = new ArrayList(); - return this.characteristic; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public EvidenceFocus setCharacteristic(List theCharacteristic) { - this.characteristic = theCharacteristic; - return this; - } - - public boolean hasCharacteristic() { - if (this.characteristic == null) - return false; - for (EvidenceFocusCharacteristicComponent item : this.characteristic) - if (!item.isEmpty()) - return true; - return false; - } - - public EvidenceFocusCharacteristicComponent addCharacteristic() { //3 - EvidenceFocusCharacteristicComponent t = new EvidenceFocusCharacteristicComponent(); - if (this.characteristic == null) - this.characteristic = new ArrayList(); - this.characteristic.add(t); - return t; - } - - public EvidenceFocus addCharacteristic(EvidenceFocusCharacteristicComponent t) { //3 - if (t == null) - return this; - if (this.characteristic == null) - this.characteristic = new ArrayList(); - this.characteristic.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #characteristic}, creating it if it does not already exist {3} - */ - public EvidenceFocusCharacteristicComponent getCharacteristicFirstRep() { - if (getCharacteristic().isEmpty()) { - addCharacteristic(); - } - return getCharacteristic().get(0); - } - - /** - * @return {@link #relatedArtifact} (Additional documentation.) - */ - public List getRelatedArtifact() { - if (this.relatedArtifact == null) - this.relatedArtifact = new ArrayList(); - return this.relatedArtifact; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public EvidenceFocus setRelatedArtifact(List theRelatedArtifact) { - this.relatedArtifact = theRelatedArtifact; - return this; - } - - public boolean hasRelatedArtifact() { - if (this.relatedArtifact == null) - return false; - for (RelatedArtifact item : this.relatedArtifact) - if (!item.isEmpty()) - return true; - return false; - } - - public RelatedArtifact addRelatedArtifact() { //3 - RelatedArtifact t = new RelatedArtifact(); - if (this.relatedArtifact == null) - this.relatedArtifact = new ArrayList(); - this.relatedArtifact.add(t); - return t; - } - - public EvidenceFocus addRelatedArtifact(RelatedArtifact t) { //3 - if (t == null) - return this; - if (this.relatedArtifact == null) - this.relatedArtifact = new ArrayList(); - this.relatedArtifact.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #relatedArtifact}, creating it if it does not already exist {3} - */ - public RelatedArtifact getRelatedArtifactFirstRep() { - if (getRelatedArtifact().isEmpty()) { - addRelatedArtifact(); - } - return getRelatedArtifact().get(0); - } - - /** - * not supported on this implementation - */ - @Override - public int getTitleMax() { - return 0; - } - /** - * @return {@link #title} (A short, descriptive, user-friendly title for the evidence focus.). This is the underlying object with id, value and extensions. The accessor "getTitle" gives direct access to the value - */ - public StringType getTitleElement() { - throw new Error("The resource type \"EvidenceFocus\" does not implement the property \"title\""); - } - - public boolean hasTitleElement() { - return false; - } - public boolean hasTitle() { - return false; - } - - /** - * @param value {@link #title} (A short, descriptive, user-friendly title for the evidence focus.). This is the underlying object with id, value and extensions. The accessor "getTitle" gives direct access to the value - */ - public EvidenceFocus setTitleElement(StringType value) { - throw new Error("The resource type \"EvidenceFocus\" does not implement the property \"title\""); - } - public String getTitle() { - throw new Error("The resource type \"EvidenceFocus\" does not implement the property \"title\""); - } - /** - * @param value A short, descriptive, user-friendly title for the evidence focus. - */ - public EvidenceFocus setTitle(String value) { - throw new Error("The resource type \"EvidenceFocus\" does not implement the property \"title\""); - } - /** - * not supported on this implementation - */ - @Override - public int getExperimentalMax() { - return 0; - } - /** - * @return {@link #experimental} (A Boolean value to indicate that this evidence focus is authored for testing purposes (or education/evaluation/marketing) and is not intended to be used for genuine usage.). This is the underlying object with id, value and extensions. The accessor "getExperimental" gives direct access to the value - */ - public BooleanType getExperimentalElement() { - throw new Error("The resource type \"EvidenceFocus\" does not implement the property \"experimental\""); - } - - public boolean hasExperimentalElement() { - return false; - } - public boolean hasExperimental() { - return false; - } - - /** - * @param value {@link #experimental} (A Boolean value to indicate that this evidence focus is authored for testing purposes (or education/evaluation/marketing) and is not intended to be used for genuine usage.). This is the underlying object with id, value and extensions. The accessor "getExperimental" gives direct access to the value - */ - public EvidenceFocus setExperimentalElement(BooleanType value) { - throw new Error("The resource type \"EvidenceFocus\" does not implement the property \"experimental\""); - } - public boolean getExperimental() { - throw new Error("The resource type \"EvidenceFocus\" does not implement the property \"experimental\""); - } - /** - * @param value A Boolean value to indicate that this evidence focus is authored for testing purposes (or education/evaluation/marketing) and is not intended to be used for genuine usage. - */ - public EvidenceFocus setExperimental(boolean value) { - throw new Error("The resource type \"EvidenceFocus\" does not implement the property \"experimental\""); - } - /** - * not supported on this implementation - */ - @Override - public int getPublisherMax() { - return 0; - } - /** - * @return {@link #publisher} (The name of the organization or individual that published the evidence focus.). This is the underlying object with id, value and extensions. The accessor "getPublisher" gives direct access to the value - */ - public StringType getPublisherElement() { - throw new Error("The resource type \"EvidenceFocus\" does not implement the property \"publisher\""); - } - - public boolean hasPublisherElement() { - return false; - } - public boolean hasPublisher() { - return false; - } - - /** - * @param value {@link #publisher} (The name of the organization or individual that published the evidence focus.). This is the underlying object with id, value and extensions. The accessor "getPublisher" gives direct access to the value - */ - public EvidenceFocus setPublisherElement(StringType value) { - throw new Error("The resource type \"EvidenceFocus\" does not implement the property \"publisher\""); - } - public String getPublisher() { - throw new Error("The resource type \"EvidenceFocus\" does not implement the property \"publisher\""); - } - /** - * @param value The name of the organization or individual that published the evidence focus. - */ - public EvidenceFocus setPublisher(String value) { - throw new Error("The resource type \"EvidenceFocus\" does not implement the property \"publisher\""); - } - /** - * not supported on this implementation - */ - @Override - public int getContactMax() { - return 0; - } - /** - * @return {@link #contact} (Contact details to assist a user in finding and communicating with the publisher.) - */ - public List getContact() { - return new ArrayList<>(); - } - /** - * @return Returns a reference to this for easy method chaining - */ - public EvidenceFocus setContact(List theContact) { - throw new Error("The resource type \"EvidenceFocus\" does not implement the property \"contact\""); - } - public boolean hasContact() { - return false; - } - - public ContactDetail addContact() { //3 - throw new Error("The resource type \"EvidenceFocus\" does not implement the property \"contact\""); - } - public EvidenceFocus addContact(ContactDetail t) { //3 - throw new Error("The resource type \"EvidenceFocus\" does not implement the property \"contact\""); - } - /** - * @return The first repetition of repeating field {@link #contact}, creating it if it does not already exist {2} - */ - public ContactDetail getContactFirstRep() { - throw new Error("The resource type \"EvidenceFocus\" does not implement the property \"contact\""); - } - /** - * not supported on this implementation - */ - @Override - public int getDescriptionMax() { - return 0; - } - /** - * @return {@link #description} (A free text natural language description of the evidence focus from a consumer's perspective.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value - */ - public MarkdownType getDescriptionElement() { - throw new Error("The resource type \"EvidenceFocus\" does not implement the property \"description\""); - } - - public boolean hasDescriptionElement() { - return false; - } - public boolean hasDescription() { - return false; - } - - /** - * @param value {@link #description} (A free text natural language description of the evidence focus from a consumer's perspective.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value - */ - public EvidenceFocus setDescriptionElement(MarkdownType value) { - throw new Error("The resource type \"EvidenceFocus\" does not implement the property \"description\""); - } - public String getDescription() { - throw new Error("The resource type \"EvidenceFocus\" does not implement the property \"description\""); - } - /** - * @param value A free text natural language description of the evidence focus from a consumer's perspective. - */ - public EvidenceFocus setDescription(String value) { - throw new Error("The resource type \"EvidenceFocus\" does not implement the property \"description\""); - } - /** - * not supported on this implementation - */ - @Override - public int getJurisdictionMax() { - return 0; - } - /** - * @return {@link #jurisdiction} (A legal or geographic region in which the evidence focus is intended to be used.) - */ - public List getJurisdiction() { - return new ArrayList<>(); - } - /** - * @return Returns a reference to this for easy method chaining - */ - public EvidenceFocus setJurisdiction(List theJurisdiction) { - throw new Error("The resource type \"EvidenceFocus\" does not implement the property \"jurisdiction\""); - } - public boolean hasJurisdiction() { - return false; - } - - public CodeableConcept addJurisdiction() { //3 - throw new Error("The resource type \"EvidenceFocus\" does not implement the property \"jurisdiction\""); - } - public EvidenceFocus addJurisdiction(CodeableConcept t) { //3 - throw new Error("The resource type \"EvidenceFocus\" does not implement the property \"jurisdiction\""); - } - /** - * @return The first repetition of repeating field {@link #jurisdiction}, creating it if it does not already exist {2} - */ - public CodeableConcept getJurisdictionFirstRep() { - throw new Error("The resource type \"EvidenceFocus\" does not implement the property \"jurisdiction\""); - } - /** - * not supported on this implementation - */ - @Override - public int getPurposeMax() { - return 0; - } - /** - * @return {@link #purpose} (Explanation of why this evidence focus is needed and why it has been designed as it has.). This is the underlying object with id, value and extensions. The accessor "getPurpose" gives direct access to the value - */ - public MarkdownType getPurposeElement() { - throw new Error("The resource type \"EvidenceFocus\" does not implement the property \"purpose\""); - } - - public boolean hasPurposeElement() { - return false; - } - public boolean hasPurpose() { - return false; - } - - /** - * @param value {@link #purpose} (Explanation of why this evidence focus is needed and why it has been designed as it has.). This is the underlying object with id, value and extensions. The accessor "getPurpose" gives direct access to the value - */ - public EvidenceFocus setPurposeElement(MarkdownType value) { - throw new Error("The resource type \"EvidenceFocus\" does not implement the property \"purpose\""); - } - public String getPurpose() { - throw new Error("The resource type \"EvidenceFocus\" does not implement the property \"purpose\""); - } - /** - * @param value Explanation of why this evidence focus is needed and why it has been designed as it has. - */ - public EvidenceFocus setPurpose(String value) { - throw new Error("The resource type \"EvidenceFocus\" does not implement the property \"purpose\""); - } - /** - * not supported on this implementation - */ - @Override - public int getApprovalDateMax() { - return 0; - } - /** - * @return {@link #approvalDate} (The date on which the resource content was approved by the publisher. Approval happens once when the content is officially approved for usage.). This is the underlying object with id, value and extensions. The accessor "getApprovalDate" gives direct access to the value - */ - public DateType getApprovalDateElement() { - throw new Error("The resource type \"EvidenceFocus\" does not implement the property \"approvalDate\""); - } - - public boolean hasApprovalDateElement() { - return false; - } - public boolean hasApprovalDate() { - return false; - } - - /** - * @param value {@link #approvalDate} (The date on which the resource content was approved by the publisher. Approval happens once when the content is officially approved for usage.). This is the underlying object with id, value and extensions. The accessor "getApprovalDate" gives direct access to the value - */ - public EvidenceFocus setApprovalDateElement(DateType value) { - throw new Error("The resource type \"EvidenceFocus\" does not implement the property \"approvalDate\""); - } - public Date getApprovalDate() { - throw new Error("The resource type \"EvidenceFocus\" does not implement the property \"approvalDate\""); - } - /** - * @param value The date on which the resource content was approved by the publisher. Approval happens once when the content is officially approved for usage. - */ - public EvidenceFocus setApprovalDate(Date value) { - throw new Error("The resource type \"EvidenceFocus\" does not implement the property \"approvalDate\""); - } - /** - * not supported on this implementation - */ - @Override - public int getLastReviewDateMax() { - return 0; - } - /** - * @return {@link #lastReviewDate} (The date on which the resource content was last reviewed. Review happens periodically after approval but does not change the original approval date.). This is the underlying object with id, value and extensions. The accessor "getLastReviewDate" gives direct access to the value - */ - public DateType getLastReviewDateElement() { - throw new Error("The resource type \"EvidenceFocus\" does not implement the property \"lastReviewDate\""); - } - - public boolean hasLastReviewDateElement() { - return false; - } - public boolean hasLastReviewDate() { - return false; - } - - /** - * @param value {@link #lastReviewDate} (The date on which the resource content was last reviewed. Review happens periodically after approval but does not change the original approval date.). This is the underlying object with id, value and extensions. The accessor "getLastReviewDate" gives direct access to the value - */ - public EvidenceFocus setLastReviewDateElement(DateType value) { - throw new Error("The resource type \"EvidenceFocus\" does not implement the property \"lastReviewDate\""); - } - public Date getLastReviewDate() { - throw new Error("The resource type \"EvidenceFocus\" does not implement the property \"lastReviewDate\""); - } - /** - * @param value The date on which the resource content was last reviewed. Review happens periodically after approval but does not change the original approval date. - */ - public EvidenceFocus setLastReviewDate(Date value) { - throw new Error("The resource type \"EvidenceFocus\" does not implement the property \"lastReviewDate\""); - } - /** - * not supported on this implementation - */ - @Override - public int getEffectivePeriodMax() { - return 0; - } - /** - * @return {@link #effectivePeriod} (The period during which the evidence focus content was or is planned to be in active use.) - */ - public Period getEffectivePeriod() { - throw new Error("The resource type \"EvidenceFocus\" does not implement the property \"effectivePeriod\""); - } - public boolean hasEffectivePeriod() { - return false; - } - /** - * @param value {@link #effectivePeriod} (The period during which the evidence focus content was or is planned to be in active use.) - */ - public EvidenceFocus setEffectivePeriod(Period value) { - throw new Error("The resource type \"EvidenceFocus\" does not implement the property \"effectivePeriod\""); - } - - protected void listChildren(List children) { - super.listChildren(children); - children.add(new Property("url", "uri", "An absolute URI that is used to identify this EvidenceFocus 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("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.", 0, java.lang.Integer.MAX_VALUE, identifier)); - 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("name", "string", "A natural language name identifying the evidence focus. This name should be usable as an identifier for the module by machine processing applications such as code generation.", 0, 1, name)); - 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 evidence focus instances.", 0, java.lang.Integer.MAX_VALUE, useContext)); - children.add(new Property("date", "dateTime", "The date (and optionally time) when the evidence focus was published. The date must change when the business version changes and it must change if the status code changes. In addition, it should change when the substantive content of the evidence focus changes.", 0, 1, date)); - 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("copyright", "markdown", "A copyright statement relating to the evidence focus and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the evidence focus.", 0, 1, copyright)); - children.add(new Property("citeAs", "Reference(Citation)", "Citation for this EvidenceFocus resource.", 0, 1, citeAs)); - children.add(new Property("characteristic", "", "Characteristic.", 0, java.lang.Integer.MAX_VALUE, characteristic)); - children.add(new Property("relatedArtifact", "RelatedArtifact", "Additional documentation.", 0, java.lang.Integer.MAX_VALUE, relatedArtifact)); - } - - @Override - 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 EvidenceFocus 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 -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.", 0, java.lang.Integer.MAX_VALUE, identifier); - 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 3373707: /*name*/ return new Property("name", "string", "A natural language name identifying the evidence focus. This name should be usable as an identifier for the module by machine processing applications such as code generation.", 0, 1, name); - 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 evidence focus instances.", 0, java.lang.Integer.MAX_VALUE, useContext); - case 3076014: /*date*/ return new Property("date", "dateTime", "The date (and optionally time) when the evidence focus was published. The date must change when the business version changes and it must change if the status code changes. In addition, it should change when the substantive content of the evidence focus changes.", 0, 1, date); - 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 1522889671: /*copyright*/ return new Property("copyright", "markdown", "A copyright statement relating to the evidence focus and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the evidence focus.", 0, 1, copyright); - case -1360156695: /*citeAs*/ return new Property("citeAs", "Reference(Citation)", "Citation for this EvidenceFocus resource.", 0, 1, citeAs); - case 366313883: /*characteristic*/ return new Property("characteristic", "", "Characteristic.", 0, java.lang.Integer.MAX_VALUE, characteristic); - case 666807069: /*relatedArtifact*/ return new Property("relatedArtifact", "RelatedArtifact", "Additional documentation.", 0, java.lang.Integer.MAX_VALUE, relatedArtifact); - default: return super.getNamedProperty(_hash, _name, _checkValid); - } - - } - - @Override - 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 -1618432855: /*identifier*/ return this.identifier == null ? new Base[0] : this.identifier.toArray(new Base[this.identifier.size()]); // Identifier - case 351608024: /*version*/ return this.version == null ? new Base[0] : new Base[] {this.version}; // StringType - case 3373707: /*name*/ return this.name == null ? new Base[0] : new Base[] {this.name}; // 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 3076014: /*date*/ return this.date == null ? new Base[0] : new Base[] {this.date}; // DateTimeType - case 3387378: /*note*/ return this.note == null ? new Base[0] : this.note.toArray(new Base[this.note.size()]); // Annotation - case 1522889671: /*copyright*/ return this.copyright == null ? new Base[0] : new Base[] {this.copyright}; // MarkdownType - case -1360156695: /*citeAs*/ return this.citeAs == null ? new Base[0] : new Base[] {this.citeAs}; // Reference - case 366313883: /*characteristic*/ return this.characteristic == null ? new Base[0] : this.characteristic.toArray(new Base[this.characteristic.size()]); // EvidenceFocusCharacteristicComponent - case 666807069: /*relatedArtifact*/ return this.relatedArtifact == null ? new Base[0] : this.relatedArtifact.toArray(new Base[this.relatedArtifact.size()]); // RelatedArtifact - default: return super.getProperty(hash, name, checkValid); - } - - } - - @Override - public Base setProperty(int hash, String name, Base value) throws FHIRException { - switch (hash) { - case 116079: // url - this.url = TypeConvertor.castToUri(value); // UriType - return value; - case -1618432855: // identifier - this.getIdentifier().add(TypeConvertor.castToIdentifier(value)); // Identifier - return value; - case 351608024: // version - this.version = TypeConvertor.castToString(value); // StringType - return value; - case 3373707: // name - this.name = TypeConvertor.castToString(value); // StringType - return value; - case -892481550: // status - value = new PublicationStatusEnumFactory().fromType(TypeConvertor.castToCode(value)); - this.status = (Enumeration) value; // Enumeration - return value; - case -669707736: // useContext - this.getUseContext().add(TypeConvertor.castToUsageContext(value)); // UsageContext - return value; - case 3076014: // date - this.date = TypeConvertor.castToDateTime(value); // DateTimeType - return value; - case 3387378: // note - this.getNote().add(TypeConvertor.castToAnnotation(value)); // Annotation - return value; - case 1522889671: // copyright - this.copyright = TypeConvertor.castToMarkdown(value); // MarkdownType - return value; - case -1360156695: // citeAs - this.citeAs = TypeConvertor.castToReference(value); // Reference - return value; - case 366313883: // characteristic - this.getCharacteristic().add((EvidenceFocusCharacteristicComponent) value); // EvidenceFocusCharacteristicComponent - return value; - case 666807069: // relatedArtifact - this.getRelatedArtifact().add(TypeConvertor.castToRelatedArtifact(value)); // RelatedArtifact - return value; - default: return super.setProperty(hash, name, value); - } - - } - - @Override - public Base setProperty(String name, Base value) throws FHIRException { - if (name.equals("url")) { - this.url = TypeConvertor.castToUri(value); // UriType - } else if (name.equals("identifier")) { - this.getIdentifier().add(TypeConvertor.castToIdentifier(value)); - } else if (name.equals("version")) { - this.version = TypeConvertor.castToString(value); // StringType - } else if (name.equals("name")) { - this.name = TypeConvertor.castToString(value); // StringType - } else if (name.equals("status")) { - value = new PublicationStatusEnumFactory().fromType(TypeConvertor.castToCode(value)); - this.status = (Enumeration) value; // Enumeration - } else if (name.equals("useContext")) { - this.getUseContext().add(TypeConvertor.castToUsageContext(value)); - } else if (name.equals("date")) { - this.date = TypeConvertor.castToDateTime(value); // DateTimeType - } else if (name.equals("note")) { - this.getNote().add(TypeConvertor.castToAnnotation(value)); - } else if (name.equals("copyright")) { - this.copyright = TypeConvertor.castToMarkdown(value); // MarkdownType - } else if (name.equals("citeAs")) { - this.citeAs = TypeConvertor.castToReference(value); // Reference - } else if (name.equals("characteristic")) { - this.getCharacteristic().add((EvidenceFocusCharacteristicComponent) value); - } else if (name.equals("relatedArtifact")) { - this.getRelatedArtifact().add(TypeConvertor.castToRelatedArtifact(value)); - } else - return super.setProperty(name, value); - return value; - } - - @Override - public Base makeProperty(int hash, String name) throws FHIRException { - switch (hash) { - case 116079: return getUrlElement(); - case -1618432855: return addIdentifier(); - case 351608024: return getVersionElement(); - case 3373707: return getNameElement(); - case -892481550: return getStatusElement(); - case -669707736: return addUseContext(); - case 3076014: return getDateElement(); - case 3387378: return addNote(); - case 1522889671: return getCopyrightElement(); - case -1360156695: return getCiteAs(); - case 366313883: return addCharacteristic(); - case 666807069: return addRelatedArtifact(); - default: return super.makeProperty(hash, name); - } - - } - - @Override - public String[] getTypesForProperty(int hash, String name) throws FHIRException { - switch (hash) { - case 116079: /*url*/ return new String[] {"uri"}; - case -1618432855: /*identifier*/ return new String[] {"Identifier"}; - case 351608024: /*version*/ return new String[] {"string"}; - case 3373707: /*name*/ return new String[] {"string"}; - case -892481550: /*status*/ return new String[] {"code"}; - case -669707736: /*useContext*/ return new String[] {"UsageContext"}; - case 3076014: /*date*/ return new String[] {"dateTime"}; - case 3387378: /*note*/ return new String[] {"Annotation"}; - case 1522889671: /*copyright*/ return new String[] {"markdown"}; - case -1360156695: /*citeAs*/ return new String[] {"Reference"}; - case 366313883: /*characteristic*/ return new String[] {}; - case 666807069: /*relatedArtifact*/ return new String[] {"RelatedArtifact"}; - default: return super.getTypesForProperty(hash, name); - } - - } - - @Override - public Base addChild(String name) throws FHIRException { - if (name.equals("url")) { - throw new FHIRException("Cannot call addChild on a primitive type EvidenceFocus.url"); - } - else if (name.equals("identifier")) { - return addIdentifier(); - } - else if (name.equals("version")) { - throw new FHIRException("Cannot call addChild on a primitive type EvidenceFocus.version"); - } - else if (name.equals("name")) { - throw new FHIRException("Cannot call addChild on a primitive type EvidenceFocus.name"); - } - else if (name.equals("status")) { - throw new FHIRException("Cannot call addChild on a primitive type EvidenceFocus.status"); - } - else if (name.equals("useContext")) { - return addUseContext(); - } - else if (name.equals("date")) { - throw new FHIRException("Cannot call addChild on a primitive type EvidenceFocus.date"); - } - else if (name.equals("note")) { - return addNote(); - } - else if (name.equals("copyright")) { - throw new FHIRException("Cannot call addChild on a primitive type EvidenceFocus.copyright"); - } - else if (name.equals("citeAs")) { - this.citeAs = new Reference(); - return this.citeAs; - } - else if (name.equals("characteristic")) { - return addCharacteristic(); - } - else if (name.equals("relatedArtifact")) { - return addRelatedArtifact(); - } - else - return super.addChild(name); - } - - public String fhirType() { - return "EvidenceFocus"; - - } - - public EvidenceFocus copy() { - EvidenceFocus dst = new EvidenceFocus(); - copyValues(dst); - return dst; - } - - public void copyValues(EvidenceFocus dst) { - super.copyValues(dst); - dst.url = url == null ? null : url.copy(); - if (identifier != null) { - dst.identifier = new ArrayList(); - for (Identifier i : identifier) - dst.identifier.add(i.copy()); - }; - dst.version = version == null ? null : version.copy(); - dst.name = name == null ? null : name.copy(); - dst.status = status == null ? null : status.copy(); - if (useContext != null) { - dst.useContext = new ArrayList(); - for (UsageContext i : useContext) - dst.useContext.add(i.copy()); - }; - dst.date = date == null ? null : date.copy(); - if (note != null) { - dst.note = new ArrayList(); - for (Annotation i : note) - dst.note.add(i.copy()); - }; - dst.copyright = copyright == null ? null : copyright.copy(); - dst.citeAs = citeAs == null ? null : citeAs.copy(); - if (characteristic != null) { - dst.characteristic = new ArrayList(); - for (EvidenceFocusCharacteristicComponent i : characteristic) - dst.characteristic.add(i.copy()); - }; - if (relatedArtifact != null) { - dst.relatedArtifact = new ArrayList(); - for (RelatedArtifact i : relatedArtifact) - dst.relatedArtifact.add(i.copy()); - }; - } - - protected EvidenceFocus typedCopy() { - return copy(); - } - - @Override - public boolean equalsDeep(Base other_) { - if (!super.equalsDeep(other_)) - return false; - if (!(other_ instanceof EvidenceFocus)) - return false; - EvidenceFocus o = (EvidenceFocus) other_; - return compareDeep(url, o.url, true) && compareDeep(identifier, o.identifier, true) && compareDeep(version, o.version, true) - && compareDeep(name, o.name, true) && compareDeep(status, o.status, true) && compareDeep(useContext, o.useContext, true) - && compareDeep(date, o.date, true) && compareDeep(note, o.note, true) && compareDeep(copyright, o.copyright, true) - && compareDeep(citeAs, o.citeAs, true) && compareDeep(characteristic, o.characteristic, true) && compareDeep(relatedArtifact, o.relatedArtifact, true) - ; - } - - @Override - public boolean equalsShallow(Base other_) { - if (!super.equalsShallow(other_)) - return false; - if (!(other_ instanceof EvidenceFocus)) - return false; - EvidenceFocus o = (EvidenceFocus) other_; - return compareValues(url, o.url, true) && compareValues(version, o.version, true) && compareValues(name, o.name, true) - && compareValues(status, o.status, true) && compareValues(date, o.date, true) && compareValues(copyright, o.copyright, true) - ; - } - - public boolean isEmpty() { - return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(url, identifier, version - , name, status, useContext, date, note, copyright, citeAs, characteristic, relatedArtifact - ); - } - - @Override - public ResourceType getResourceType() { - return ResourceType.EvidenceFocus; - } - - /** - * Search parameter: context-quantity - *

- * Description: A quantity- or range-valued use context assigned to the evidence focus
- * Type: quantity
- * Path: (EvidenceFocus.useContext.value as Quantity) | (EvidenceFocus.useContext.value as Range)
- *

- */ - @SearchParamDefinition(name="context-quantity", path="(EvidenceFocus.useContext.value as Quantity) | (EvidenceFocus.useContext.value as Range)", description="A quantity- or range-valued use context assigned to the evidence focus", type="quantity" ) - public static final String SP_CONTEXT_QUANTITY = "context-quantity"; - /** - * Fluent Client search parameter constant for context-quantity - *

- * Description: A quantity- or range-valued use context assigned to the evidence focus
- * Type: quantity
- * Path: (EvidenceFocus.useContext.value as Quantity) | (EvidenceFocus.useContext.value as Range)
- *

- */ - public static final ca.uhn.fhir.rest.gclient.QuantityClientParam CONTEXT_QUANTITY = new ca.uhn.fhir.rest.gclient.QuantityClientParam(SP_CONTEXT_QUANTITY); - - /** - * Search parameter: context-type-quantity - *

- * Description: A use context type and quantity- or range-based value assigned to the evidence focus
- * Type: composite
- * Path: EvidenceFocus.useContext
- *

- */ - @SearchParamDefinition(name="context-type-quantity", path="EvidenceFocus.useContext", description="A use context type and quantity- or range-based value assigned to the evidence focus", type="composite", compositeOf={"context-type", "context-quantity"} ) - public static final String SP_CONTEXT_TYPE_QUANTITY = "context-type-quantity"; - /** - * Fluent Client search parameter constant for context-type-quantity - *

- * Description: A use context type and quantity- or range-based value assigned to the evidence focus
- * Type: composite
- * Path: EvidenceFocus.useContext
- *

- */ - public static final ca.uhn.fhir.rest.gclient.CompositeClientParam CONTEXT_TYPE_QUANTITY = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_CONTEXT_TYPE_QUANTITY); - - /** - * Search parameter: context-type-value - *

- * Description: A use context type and value assigned to the evidence focus
- * Type: composite
- * Path: EvidenceFocus.useContext
- *

- */ - @SearchParamDefinition(name="context-type-value", path="EvidenceFocus.useContext", description="A use context type and value assigned to the evidence focus", type="composite", compositeOf={"context-type", "context"} ) - public static final String SP_CONTEXT_TYPE_VALUE = "context-type-value"; - /** - * Fluent Client search parameter constant for context-type-value - *

- * Description: A use context type and value assigned to the evidence focus
- * Type: composite
- * Path: EvidenceFocus.useContext
- *

- */ - public static final ca.uhn.fhir.rest.gclient.CompositeClientParam CONTEXT_TYPE_VALUE = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_CONTEXT_TYPE_VALUE); - - /** - * Search parameter: context-type - *

- * Description: A type of use context assigned to the evidence focus
- * Type: token
- * Path: EvidenceFocus.useContext.code
- *

- */ - @SearchParamDefinition(name="context-type", path="EvidenceFocus.useContext.code", description="A type of use context assigned to the evidence focus", type="token" ) - public static final String SP_CONTEXT_TYPE = "context-type"; - /** - * Fluent Client search parameter constant for context-type - *

- * Description: A type of use context assigned to the evidence focus
- * Type: token
- * Path: EvidenceFocus.useContext.code
- *

- */ - public static final ca.uhn.fhir.rest.gclient.TokenClientParam CONTEXT_TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CONTEXT_TYPE); - - /** - * Search parameter: context - *

- * Description: A use context assigned to the evidence focus
- * Type: token
- * Path: (EvidenceFocus.useContext.value as CodeableConcept)
- *

- */ - @SearchParamDefinition(name="context", path="(EvidenceFocus.useContext.value as CodeableConcept)", description="A use context assigned to the evidence focus", type="token" ) - public static final String SP_CONTEXT = "context"; - /** - * Fluent Client search parameter constant for context - *

- * Description: A use context assigned to the evidence focus
- * Type: token
- * Path: (EvidenceFocus.useContext.value as CodeableConcept)
- *

- */ - public static final ca.uhn.fhir.rest.gclient.TokenClientParam CONTEXT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CONTEXT); - - /** - * Search parameter: date - *

- * Description: The evidence focus publication date
- * Type: date
- * Path: EvidenceFocus.date
- *

- */ - @SearchParamDefinition(name="date", path="EvidenceFocus.date", description="The evidence focus publication date", type="date" ) - public static final String SP_DATE = "date"; - /** - * Fluent Client search parameter constant for date - *

- * Description: The evidence focus publication date
- * Type: date
- * Path: EvidenceFocus.date
- *

- */ - public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE); - - /** - * Search parameter: identifier - *

- * Description: External identifier for the evidence focus
- * Type: token
- * Path: EvidenceFocus.identifier
- *

- */ - @SearchParamDefinition(name="identifier", path="EvidenceFocus.identifier", description="External identifier for the evidence focus", type="token" ) - public static final String SP_IDENTIFIER = "identifier"; - /** - * Fluent Client search parameter constant for identifier - *

- * Description: External identifier for the evidence focus
- * Type: token
- * Path: EvidenceFocus.identifier
- *

- */ - public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); - - /** - * Search parameter: name - *

- * Description: Computationally friendly name of the evidence focus
- * Type: string
- * Path: EvidenceFocus.name
- *

- */ - @SearchParamDefinition(name="name", path="EvidenceFocus.name", description="Computationally friendly name of the evidence focus", type="string" ) - public static final String SP_NAME = "name"; - /** - * Fluent Client search parameter constant for name - *

- * Description: Computationally friendly name of the evidence focus
- * Type: string
- * Path: EvidenceFocus.name
- *

- */ - public static final ca.uhn.fhir.rest.gclient.StringClientParam NAME = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_NAME); - - /** - * Search parameter: status - *

- * Description: The current status of the evidence focus
- * Type: token
- * Path: EvidenceFocus.status
- *

- */ - @SearchParamDefinition(name="status", path="EvidenceFocus.status", description="The current status of the evidence focus", type="token" ) - public static final String SP_STATUS = "status"; - /** - * Fluent Client search parameter constant for status - *

- * Description: The current status of the evidence focus
- * Type: token
- * Path: EvidenceFocus.status
- *

- */ - public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); - - /** - * Search parameter: url - *

- * Description: The uri that identifies the evidence focus
- * Type: uri
- * Path: EvidenceFocus.url
- *

- */ - @SearchParamDefinition(name="url", path="EvidenceFocus.url", description="The uri that identifies the evidence focus", type="uri" ) - public static final String SP_URL = "url"; - /** - * Fluent Client search parameter constant for url - *

- * Description: The uri that identifies the evidence focus
- * Type: uri
- * Path: EvidenceFocus.url
- *

- */ - 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 evidence focus
- * Type: token
- * Path: EvidenceFocus.version
- *

- */ - @SearchParamDefinition(name="version", path="EvidenceFocus.version", description="The business version of the evidence focus", type="token" ) - public static final String SP_VERSION = "version"; - /** - * Fluent Client search parameter constant for version - *

- * Description: The business version of the evidence focus
- * Type: token
- * Path: EvidenceFocus.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/EvidenceReport.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EvidenceReport.java new file mode 100644 index 000000000..090b42817 --- /dev/null +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EvidenceReport.java @@ -0,0 +1,3954 @@ +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.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 EvidenceReport. + */ +@ResourceDef(name="EvidenceReport", profile="http://hl7.org/fhir/StructureDefinition/EvidenceReport") +public class EvidenceReport extends MetadataResource { + + public enum ReportRelationshipType { + /** + * This document replaces or supersedes the target document. + */ + REPLACES, + /** + * This document notes corrections or changes to replace or supersede parts of the target document. + */ + AMENDS, + /** + * This document adds additional information to the target document. + */ + APPENDS, + /** + * This document was generated by transforming the target document (eg format or language conversion). + */ + TRANSFORMS, + /** + * added to help the parsers with the generic types + */ + NULL; + public static ReportRelationshipType fromCode(String codeString) throws FHIRException { + if (codeString == null || "".equals(codeString)) + return null; + if ("replaces".equals(codeString)) + return REPLACES; + if ("amends".equals(codeString)) + return AMENDS; + if ("appends".equals(codeString)) + return APPENDS; + if ("transforms".equals(codeString)) + return TRANSFORMS; + if (Configuration.isAcceptInvalidEnums()) + return null; + else + throw new FHIRException("Unknown ReportRelationshipType code '"+codeString+"'"); + } + public String toCode() { + switch (this) { + case REPLACES: return "replaces"; + case AMENDS: return "amends"; + case APPENDS: return "appends"; + case TRANSFORMS: return "transforms"; + default: return "?"; + } + } + public String getSystem() { + switch (this) { + case REPLACES: return "http://hl7.org/fhir/report-relation-type"; + case AMENDS: return "http://hl7.org/fhir/report-relation-type"; + case APPENDS: return "http://hl7.org/fhir/report-relation-type"; + case TRANSFORMS: return "http://hl7.org/fhir/report-relation-type"; + default: return "?"; + } + } + public String getDefinition() { + switch (this) { + case REPLACES: return "This document replaces or supersedes the target document."; + case AMENDS: return "This document notes corrections or changes to replace or supersede parts of the target document."; + case APPENDS: return "This document adds additional information to the target document."; + case TRANSFORMS: return "This document was generated by transforming the target document (eg format or language conversion)."; + default: return "?"; + } + } + public String getDisplay() { + switch (this) { + case REPLACES: return "Replaces"; + case AMENDS: return "Amends"; + case APPENDS: return "Appends"; + case TRANSFORMS: return "Transforms"; + default: return "?"; + } + } + } + + public static class ReportRelationshipTypeEnumFactory implements EnumFactory { + public ReportRelationshipType fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + if (codeString == null || "".equals(codeString)) + return null; + if ("replaces".equals(codeString)) + return ReportRelationshipType.REPLACES; + if ("amends".equals(codeString)) + return ReportRelationshipType.AMENDS; + if ("appends".equals(codeString)) + return ReportRelationshipType.APPENDS; + if ("transforms".equals(codeString)) + return ReportRelationshipType.TRANSFORMS; + throw new IllegalArgumentException("Unknown ReportRelationshipType 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 ("replaces".equals(codeString)) + return new Enumeration(this, ReportRelationshipType.REPLACES); + if ("amends".equals(codeString)) + return new Enumeration(this, ReportRelationshipType.AMENDS); + if ("appends".equals(codeString)) + return new Enumeration(this, ReportRelationshipType.APPENDS); + if ("transforms".equals(codeString)) + return new Enumeration(this, ReportRelationshipType.TRANSFORMS); + throw new FHIRException("Unknown ReportRelationshipType code '"+codeString+"'"); + } + public String toCode(ReportRelationshipType code) { + if (code == ReportRelationshipType.REPLACES) + return "replaces"; + if (code == ReportRelationshipType.AMENDS) + return "amends"; + if (code == ReportRelationshipType.APPENDS) + return "appends"; + if (code == ReportRelationshipType.TRANSFORMS) + return "transforms"; + return "?"; + } + public String toSystem(ReportRelationshipType code) { + return code.getSystem(); + } + } + + @Block() + public static class EvidenceReportSubjectComponent extends BackboneElement implements IBaseBackboneElement { + /** + * Characteristic. + */ + @Child(name = "characteristic", type = {}, order=1, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="Characteristic", formalDefinition="Characteristic." ) + protected List characteristic; + + /** + * Used for general notes and annotations not coded elsewhere. + */ + @Child(name = "note", type = {Annotation.class}, order=2, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="Footnotes and/or explanatory notes", formalDefinition="Used for general notes and annotations not coded elsewhere." ) + protected List note; + + private static final long serialVersionUID = -734040873L; + + /** + * Constructor + */ + public EvidenceReportSubjectComponent() { + super(); + } + + /** + * @return {@link #characteristic} (Characteristic.) + */ + public List getCharacteristic() { + if (this.characteristic == null) + this.characteristic = new ArrayList(); + return this.characteristic; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public EvidenceReportSubjectComponent setCharacteristic(List theCharacteristic) { + this.characteristic = theCharacteristic; + return this; + } + + public boolean hasCharacteristic() { + if (this.characteristic == null) + return false; + for (EvidenceReportSubjectCharacteristicComponent item : this.characteristic) + if (!item.isEmpty()) + return true; + return false; + } + + public EvidenceReportSubjectCharacteristicComponent addCharacteristic() { //3 + EvidenceReportSubjectCharacteristicComponent t = new EvidenceReportSubjectCharacteristicComponent(); + if (this.characteristic == null) + this.characteristic = new ArrayList(); + this.characteristic.add(t); + return t; + } + + public EvidenceReportSubjectComponent addCharacteristic(EvidenceReportSubjectCharacteristicComponent t) { //3 + if (t == null) + return this; + if (this.characteristic == null) + this.characteristic = new ArrayList(); + this.characteristic.add(t); + return this; + } + + /** + * @return The first repetition of repeating field {@link #characteristic}, creating it if it does not already exist {3} + */ + public EvidenceReportSubjectCharacteristicComponent getCharacteristicFirstRep() { + if (getCharacteristic().isEmpty()) { + addCharacteristic(); + } + return getCharacteristic().get(0); + } + + /** + * @return {@link #note} (Used for general notes and annotations not coded elsewhere.) + */ + public List getNote() { + if (this.note == null) + this.note = new ArrayList(); + return this.note; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public EvidenceReportSubjectComponent setNote(List theNote) { + this.note = theNote; + return this; + } + + public boolean hasNote() { + if (this.note == null) + return false; + for (Annotation item : this.note) + if (!item.isEmpty()) + return true; + return false; + } + + public Annotation addNote() { //3 + Annotation t = new Annotation(); + if (this.note == null) + this.note = new ArrayList(); + this.note.add(t); + return t; + } + + public EvidenceReportSubjectComponent addNote(Annotation t) { //3 + if (t == null) + return this; + if (this.note == null) + this.note = new ArrayList(); + this.note.add(t); + return this; + } + + /** + * @return The first repetition of repeating field {@link #note}, creating it if it does not already exist {3} + */ + public Annotation getNoteFirstRep() { + if (getNote().isEmpty()) { + addNote(); + } + return getNote().get(0); + } + + protected void listChildren(List children) { + super.listChildren(children); + children.add(new Property("characteristic", "", "Characteristic.", 0, java.lang.Integer.MAX_VALUE, characteristic)); + children.add(new Property("note", "Annotation", "Used for general notes and annotations not coded elsewhere.", 0, java.lang.Integer.MAX_VALUE, note)); + } + + @Override + public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { + switch (_hash) { + case 366313883: /*characteristic*/ return new Property("characteristic", "", "Characteristic.", 0, java.lang.Integer.MAX_VALUE, characteristic); + case 3387378: /*note*/ return new Property("note", "Annotation", "Used for general notes and annotations not coded elsewhere.", 0, java.lang.Integer.MAX_VALUE, note); + default: return super.getNamedProperty(_hash, _name, _checkValid); + } + + } + + @Override + public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException { + switch (hash) { + case 366313883: /*characteristic*/ return this.characteristic == null ? new Base[0] : this.characteristic.toArray(new Base[this.characteristic.size()]); // EvidenceReportSubjectCharacteristicComponent + case 3387378: /*note*/ return this.note == null ? new Base[0] : this.note.toArray(new Base[this.note.size()]); // Annotation + default: return super.getProperty(hash, name, checkValid); + } + + } + + @Override + public Base setProperty(int hash, String name, Base value) throws FHIRException { + switch (hash) { + case 366313883: // characteristic + this.getCharacteristic().add((EvidenceReportSubjectCharacteristicComponent) value); // EvidenceReportSubjectCharacteristicComponent + return value; + case 3387378: // note + this.getNote().add(TypeConvertor.castToAnnotation(value)); // Annotation + return value; + default: return super.setProperty(hash, name, value); + } + + } + + @Override + public Base setProperty(String name, Base value) throws FHIRException { + if (name.equals("characteristic")) { + this.getCharacteristic().add((EvidenceReportSubjectCharacteristicComponent) value); + } else if (name.equals("note")) { + this.getNote().add(TypeConvertor.castToAnnotation(value)); + } else + return super.setProperty(name, value); + return value; + } + + @Override + public Base makeProperty(int hash, String name) throws FHIRException { + switch (hash) { + case 366313883: return addCharacteristic(); + case 3387378: return addNote(); + default: return super.makeProperty(hash, name); + } + + } + + @Override + public String[] getTypesForProperty(int hash, String name) throws FHIRException { + switch (hash) { + case 366313883: /*characteristic*/ return new String[] {}; + case 3387378: /*note*/ return new String[] {"Annotation"}; + default: return super.getTypesForProperty(hash, name); + } + + } + + @Override + public Base addChild(String name) throws FHIRException { + if (name.equals("characteristic")) { + return addCharacteristic(); + } + else if (name.equals("note")) { + return addNote(); + } + else + return super.addChild(name); + } + + public EvidenceReportSubjectComponent copy() { + EvidenceReportSubjectComponent dst = new EvidenceReportSubjectComponent(); + copyValues(dst); + return dst; + } + + public void copyValues(EvidenceReportSubjectComponent dst) { + super.copyValues(dst); + if (characteristic != null) { + dst.characteristic = new ArrayList(); + for (EvidenceReportSubjectCharacteristicComponent i : characteristic) + dst.characteristic.add(i.copy()); + }; + if (note != null) { + dst.note = new ArrayList(); + for (Annotation i : note) + dst.note.add(i.copy()); + }; + } + + @Override + public boolean equalsDeep(Base other_) { + if (!super.equalsDeep(other_)) + return false; + if (!(other_ instanceof EvidenceReportSubjectComponent)) + return false; + EvidenceReportSubjectComponent o = (EvidenceReportSubjectComponent) other_; + return compareDeep(characteristic, o.characteristic, true) && compareDeep(note, o.note, true); + } + + @Override + public boolean equalsShallow(Base other_) { + if (!super.equalsShallow(other_)) + return false; + if (!(other_ instanceof EvidenceReportSubjectComponent)) + return false; + EvidenceReportSubjectComponent o = (EvidenceReportSubjectComponent) other_; + return true; + } + + public boolean isEmpty() { + return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(characteristic, note); + } + + public String fhirType() { + return "EvidenceReport.subject"; + + } + + } + + @Block() + public static class EvidenceReportSubjectCharacteristicComponent extends BackboneElement implements IBaseBackboneElement { + /** + * Characteristic code. + */ + @Child(name = "code", type = {CodeableConcept.class}, order=1, min=1, max=1, modifier=false, summary=false) + @Description(shortDefinition="Characteristic code", formalDefinition="Characteristic code." ) + @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/focus-characteristic-code") + protected CodeableConcept code; + + /** + * Characteristic value. + */ + @Child(name = "value", type = {Reference.class, CodeableConcept.class, BooleanType.class, Quantity.class, Range.class}, order=2, min=1, max=1, modifier=false, summary=false) + @Description(shortDefinition="Characteristic value", formalDefinition="Characteristic value." ) + protected DataType value; + + /** + * Is used to express not the characteristic. + */ + @Child(name = "exclude", type = {BooleanType.class}, order=3, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="Is used to express not the characteristic", formalDefinition="Is used to express not the characteristic." ) + protected BooleanType exclude; + + /** + * Timeframe for the characteristic. + */ + @Child(name = "period", type = {Period.class}, order=4, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="Timeframe for the characteristic", formalDefinition="Timeframe for the characteristic." ) + protected Period period; + + private static final long serialVersionUID = 279867823L; + + /** + * Constructor + */ + public EvidenceReportSubjectCharacteristicComponent() { + super(); + } + + /** + * Constructor + */ + public EvidenceReportSubjectCharacteristicComponent(CodeableConcept code, DataType value) { + super(); + this.setCode(code); + this.setValue(value); + } + + /** + * @return {@link #code} (Characteristic code.) + */ + public CodeableConcept getCode() { + if (this.code == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create EvidenceReportSubjectCharacteristicComponent.code"); + else if (Configuration.doAutoCreate()) + this.code = new CodeableConcept(); // cc + return this.code; + } + + public boolean hasCode() { + return this.code != null && !this.code.isEmpty(); + } + + /** + * @param value {@link #code} (Characteristic code.) + */ + public EvidenceReportSubjectCharacteristicComponent setCode(CodeableConcept value) { + this.code = value; + return this; + } + + /** + * @return {@link #value} (Characteristic value.) + */ + public DataType getValue() { + return this.value; + } + + /** + * @return {@link #value} (Characteristic value.) + */ + public Reference getValueReference() throws FHIRException { + if (this.value == null) + this.value = new Reference(); + if (!(this.value instanceof Reference)) + throw new FHIRException("Type mismatch: the type Reference was expected, but "+this.value.getClass().getName()+" was encountered"); + return (Reference) this.value; + } + + public boolean hasValueReference() { + return this != null && this.value instanceof Reference; + } + + /** + * @return {@link #value} (Characteristic value.) + */ + public CodeableConcept getValueCodeableConcept() throws FHIRException { + if (this.value == null) + this.value = new CodeableConcept(); + if (!(this.value instanceof CodeableConcept)) + throw new FHIRException("Type mismatch: the type CodeableConcept was expected, but "+this.value.getClass().getName()+" was encountered"); + return (CodeableConcept) this.value; + } + + public boolean hasValueCodeableConcept() { + return this != null && this.value instanceof CodeableConcept; + } + + /** + * @return {@link #value} (Characteristic value.) + */ + public BooleanType getValueBooleanType() throws FHIRException { + if (this.value == null) + this.value = new BooleanType(); + if (!(this.value instanceof BooleanType)) + throw new FHIRException("Type mismatch: the type BooleanType was expected, but "+this.value.getClass().getName()+" was encountered"); + return (BooleanType) this.value; + } + + public boolean hasValueBooleanType() { + return this != null && this.value instanceof BooleanType; + } + + /** + * @return {@link #value} (Characteristic value.) + */ + public Quantity getValueQuantity() throws FHIRException { + if (this.value == null) + this.value = new Quantity(); + if (!(this.value instanceof Quantity)) + throw new FHIRException("Type mismatch: the type Quantity was expected, but "+this.value.getClass().getName()+" was encountered"); + return (Quantity) this.value; + } + + public boolean hasValueQuantity() { + return this != null && this.value instanceof Quantity; + } + + /** + * @return {@link #value} (Characteristic value.) + */ + public Range getValueRange() throws FHIRException { + if (this.value == null) + this.value = new Range(); + if (!(this.value instanceof Range)) + throw new FHIRException("Type mismatch: the type Range was expected, but "+this.value.getClass().getName()+" was encountered"); + return (Range) this.value; + } + + public boolean hasValueRange() { + return this != null && this.value instanceof Range; + } + + public boolean hasValue() { + return this.value != null && !this.value.isEmpty(); + } + + /** + * @param value {@link #value} (Characteristic value.) + */ + public EvidenceReportSubjectCharacteristicComponent setValue(DataType value) { + if (value != null && !(value instanceof Reference || value instanceof CodeableConcept || value instanceof BooleanType || value instanceof Quantity || value instanceof Range)) + throw new Error("Not the right type for EvidenceReport.subject.characteristic.value[x]: "+value.fhirType()); + this.value = value; + return this; + } + + /** + * @return {@link #exclude} (Is used to express not the characteristic.). This is the underlying object with id, value and extensions. The accessor "getExclude" gives direct access to the value + */ + public BooleanType getExcludeElement() { + if (this.exclude == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create EvidenceReportSubjectCharacteristicComponent.exclude"); + else if (Configuration.doAutoCreate()) + this.exclude = new BooleanType(); // bb + return this.exclude; + } + + public boolean hasExcludeElement() { + return this.exclude != null && !this.exclude.isEmpty(); + } + + public boolean hasExclude() { + return this.exclude != null && !this.exclude.isEmpty(); + } + + /** + * @param value {@link #exclude} (Is used to express not the characteristic.). This is the underlying object with id, value and extensions. The accessor "getExclude" gives direct access to the value + */ + public EvidenceReportSubjectCharacteristicComponent setExcludeElement(BooleanType value) { + this.exclude = value; + return this; + } + + /** + * @return Is used to express not the characteristic. + */ + public boolean getExclude() { + return this.exclude == null || this.exclude.isEmpty() ? false : this.exclude.getValue(); + } + + /** + * @param value Is used to express not the characteristic. + */ + public EvidenceReportSubjectCharacteristicComponent setExclude(boolean value) { + if (this.exclude == null) + this.exclude = new BooleanType(); + this.exclude.setValue(value); + return this; + } + + /** + * @return {@link #period} (Timeframe for the characteristic.) + */ + public Period getPeriod() { + if (this.period == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create EvidenceReportSubjectCharacteristicComponent.period"); + else if (Configuration.doAutoCreate()) + this.period = new Period(); // cc + return this.period; + } + + public boolean hasPeriod() { + return this.period != null && !this.period.isEmpty(); + } + + /** + * @param value {@link #period} (Timeframe for the characteristic.) + */ + public EvidenceReportSubjectCharacteristicComponent setPeriod(Period value) { + this.period = value; + return this; + } + + protected void listChildren(List children) { + super.listChildren(children); + children.add(new Property("code", "CodeableConcept", "Characteristic code.", 0, 1, code)); + children.add(new Property("value[x]", "Reference(Any)|CodeableConcept|boolean|Quantity|Range", "Characteristic value.", 0, 1, value)); + children.add(new Property("exclude", "boolean", "Is used to express not the characteristic.", 0, 1, exclude)); + children.add(new Property("period", "Period", "Timeframe for the characteristic.", 0, 1, period)); + } + + @Override + public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { + switch (_hash) { + case 3059181: /*code*/ return new Property("code", "CodeableConcept", "Characteristic code.", 0, 1, code); + case -1410166417: /*value[x]*/ return new Property("value[x]", "Reference(Any)|CodeableConcept|boolean|Quantity|Range", "Characteristic value.", 0, 1, value); + case 111972721: /*value*/ return new Property("value[x]", "Reference(Any)|CodeableConcept|boolean|Quantity|Range", "Characteristic value.", 0, 1, value); + case 1755241690: /*valueReference*/ return new Property("value[x]", "Reference(Any)", "Characteristic value.", 0, 1, value); + case 924902896: /*valueCodeableConcept*/ return new Property("value[x]", "CodeableConcept", "Characteristic value.", 0, 1, value); + case 733421943: /*valueBoolean*/ return new Property("value[x]", "boolean", "Characteristic value.", 0, 1, value); + case -2029823716: /*valueQuantity*/ return new Property("value[x]", "Quantity", "Characteristic value.", 0, 1, value); + case 2030761548: /*valueRange*/ return new Property("value[x]", "Range", "Characteristic value.", 0, 1, value); + case -1321148966: /*exclude*/ return new Property("exclude", "boolean", "Is used to express not the characteristic.", 0, 1, exclude); + case -991726143: /*period*/ return new Property("period", "Period", "Timeframe for the characteristic.", 0, 1, period); + default: return super.getNamedProperty(_hash, _name, _checkValid); + } + + } + + @Override + public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException { + switch (hash) { + case 3059181: /*code*/ return this.code == null ? new Base[0] : new Base[] {this.code}; // CodeableConcept + case 111972721: /*value*/ return this.value == null ? new Base[0] : new Base[] {this.value}; // DataType + case -1321148966: /*exclude*/ return this.exclude == null ? new Base[0] : new Base[] {this.exclude}; // BooleanType + case -991726143: /*period*/ return this.period == null ? new Base[0] : new Base[] {this.period}; // Period + default: return super.getProperty(hash, name, checkValid); + } + + } + + @Override + public Base setProperty(int hash, String name, Base value) throws FHIRException { + switch (hash) { + case 3059181: // code + this.code = TypeConvertor.castToCodeableConcept(value); // CodeableConcept + return value; + case 111972721: // value + this.value = TypeConvertor.castToType(value); // DataType + return value; + case -1321148966: // exclude + this.exclude = TypeConvertor.castToBoolean(value); // BooleanType + return value; + case -991726143: // period + this.period = TypeConvertor.castToPeriod(value); // Period + return value; + default: return super.setProperty(hash, name, value); + } + + } + + @Override + public Base setProperty(String name, Base value) throws FHIRException { + if (name.equals("code")) { + this.code = TypeConvertor.castToCodeableConcept(value); // CodeableConcept + } else if (name.equals("value[x]")) { + this.value = TypeConvertor.castToType(value); // DataType + } else if (name.equals("exclude")) { + this.exclude = TypeConvertor.castToBoolean(value); // BooleanType + } else if (name.equals("period")) { + this.period = TypeConvertor.castToPeriod(value); // Period + } else + return super.setProperty(name, value); + return value; + } + + @Override + public Base makeProperty(int hash, String name) throws FHIRException { + switch (hash) { + case 3059181: return getCode(); + case -1410166417: return getValue(); + case 111972721: return getValue(); + case -1321148966: return getExcludeElement(); + case -991726143: return getPeriod(); + default: return super.makeProperty(hash, name); + } + + } + + @Override + public String[] getTypesForProperty(int hash, String name) throws FHIRException { + switch (hash) { + case 3059181: /*code*/ return new String[] {"CodeableConcept"}; + case 111972721: /*value*/ return new String[] {"Reference", "CodeableConcept", "boolean", "Quantity", "Range"}; + case -1321148966: /*exclude*/ return new String[] {"boolean"}; + case -991726143: /*period*/ return new String[] {"Period"}; + default: return super.getTypesForProperty(hash, name); + } + + } + + @Override + public Base addChild(String name) throws FHIRException { + if (name.equals("code")) { + this.code = new CodeableConcept(); + return this.code; + } + else if (name.equals("valueReference")) { + this.value = new Reference(); + return this.value; + } + else if (name.equals("valueCodeableConcept")) { + this.value = new CodeableConcept(); + return this.value; + } + else if (name.equals("valueBoolean")) { + this.value = new BooleanType(); + return this.value; + } + else if (name.equals("valueQuantity")) { + this.value = new Quantity(); + return this.value; + } + else if (name.equals("valueRange")) { + this.value = new Range(); + return this.value; + } + else if (name.equals("exclude")) { + throw new FHIRException("Cannot call addChild on a primitive type EvidenceReport.subject.characteristic.exclude"); + } + else if (name.equals("period")) { + this.period = new Period(); + return this.period; + } + else + return super.addChild(name); + } + + public EvidenceReportSubjectCharacteristicComponent copy() { + EvidenceReportSubjectCharacteristicComponent dst = new EvidenceReportSubjectCharacteristicComponent(); + copyValues(dst); + return dst; + } + + public void copyValues(EvidenceReportSubjectCharacteristicComponent dst) { + super.copyValues(dst); + dst.code = code == null ? null : code.copy(); + dst.value = value == null ? null : value.copy(); + dst.exclude = exclude == null ? null : exclude.copy(); + dst.period = period == null ? null : period.copy(); + } + + @Override + public boolean equalsDeep(Base other_) { + if (!super.equalsDeep(other_)) + return false; + if (!(other_ instanceof EvidenceReportSubjectCharacteristicComponent)) + return false; + EvidenceReportSubjectCharacteristicComponent o = (EvidenceReportSubjectCharacteristicComponent) other_; + return compareDeep(code, o.code, true) && compareDeep(value, o.value, true) && compareDeep(exclude, o.exclude, true) + && compareDeep(period, o.period, true); + } + + @Override + public boolean equalsShallow(Base other_) { + if (!super.equalsShallow(other_)) + return false; + if (!(other_ instanceof EvidenceReportSubjectCharacteristicComponent)) + return false; + EvidenceReportSubjectCharacteristicComponent o = (EvidenceReportSubjectCharacteristicComponent) other_; + return compareValues(exclude, o.exclude, true); + } + + public boolean isEmpty() { + return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(code, value, exclude, period + ); + } + + public String fhirType() { + return "EvidenceReport.subject.characteristic"; + + } + + } + + @Block() + public static class EvidenceReportRelatesToComponent extends BackboneElement implements IBaseBackboneElement { + /** + * The type of relationship that this composition has with anther composition or document. + */ + @Child(name = "code", type = {CodeType.class}, order=1, min=1, max=1, modifier=false, summary=false) + @Description(shortDefinition="replaces | amends | appends | transforms", formalDefinition="The type of relationship that this composition has with anther composition or document." ) + @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/report-relation-type") + protected Enumeration code; + + /** + * The target composition/document of this relationship. + */ + @Child(name = "target", type = {Identifier.class, EvidenceReport.class}, order=2, min=1, max=1, modifier=false, summary=false) + @Description(shortDefinition="Target of the relationship", formalDefinition="The target composition/document of this relationship." ) + protected DataType target; + + private static final long serialVersionUID = -1091549831L; + + /** + * Constructor + */ + public EvidenceReportRelatesToComponent() { + super(); + } + + /** + * Constructor + */ + public EvidenceReportRelatesToComponent(ReportRelationshipType code, DataType target) { + super(); + this.setCode(code); + this.setTarget(target); + } + + /** + * @return {@link #code} (The type of relationship that this composition has with anther composition or document.). This is the underlying object with id, value and extensions. The accessor "getCode" gives direct access to the value + */ + public Enumeration getCodeElement() { + if (this.code == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create EvidenceReportRelatesToComponent.code"); + else if (Configuration.doAutoCreate()) + this.code = new Enumeration(new ReportRelationshipTypeEnumFactory()); // bb + return this.code; + } + + public boolean hasCodeElement() { + return this.code != null && !this.code.isEmpty(); + } + + public boolean hasCode() { + return this.code != null && !this.code.isEmpty(); + } + + /** + * @param value {@link #code} (The type of relationship that this composition has with anther composition or document.). This is the underlying object with id, value and extensions. The accessor "getCode" gives direct access to the value + */ + public EvidenceReportRelatesToComponent setCodeElement(Enumeration value) { + this.code = value; + return this; + } + + /** + * @return The type of relationship that this composition has with anther composition or document. + */ + public ReportRelationshipType getCode() { + return this.code == null ? null : this.code.getValue(); + } + + /** + * @param value The type of relationship that this composition has with anther composition or document. + */ + public EvidenceReportRelatesToComponent setCode(ReportRelationshipType value) { + if (this.code == null) + this.code = new Enumeration(new ReportRelationshipTypeEnumFactory()); + this.code.setValue(value); + return this; + } + + /** + * @return {@link #target} (The target composition/document of this relationship.) + */ + public DataType getTarget() { + return this.target; + } + + /** + * @return {@link #target} (The target composition/document of this relationship.) + */ + public Identifier getTargetIdentifier() throws FHIRException { + if (this.target == null) + this.target = new Identifier(); + if (!(this.target instanceof Identifier)) + throw new FHIRException("Type mismatch: the type Identifier was expected, but "+this.target.getClass().getName()+" was encountered"); + return (Identifier) this.target; + } + + public boolean hasTargetIdentifier() { + return this != null && this.target instanceof Identifier; + } + + /** + * @return {@link #target} (The target composition/document of this relationship.) + */ + public Reference getTargetReference() throws FHIRException { + if (this.target == null) + this.target = new Reference(); + if (!(this.target instanceof Reference)) + throw new FHIRException("Type mismatch: the type Reference was expected, but "+this.target.getClass().getName()+" was encountered"); + return (Reference) this.target; + } + + public boolean hasTargetReference() { + return this != null && this.target instanceof Reference; + } + + public boolean hasTarget() { + return this.target != null && !this.target.isEmpty(); + } + + /** + * @param value {@link #target} (The target composition/document of this relationship.) + */ + public EvidenceReportRelatesToComponent setTarget(DataType value) { + if (value != null && !(value instanceof Identifier || value instanceof Reference)) + throw new Error("Not the right type for EvidenceReport.relatesTo.target[x]: "+value.fhirType()); + this.target = value; + return this; + } + + protected void listChildren(List children) { + super.listChildren(children); + children.add(new Property("code", "code", "The type of relationship that this composition has with anther composition or document.", 0, 1, code)); + children.add(new Property("target[x]", "Identifier|Reference(EvidenceReport)", "The target composition/document of this relationship.", 0, 1, target)); + } + + @Override + public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { + switch (_hash) { + case 3059181: /*code*/ return new Property("code", "code", "The type of relationship that this composition has with anther composition or document.", 0, 1, code); + case -815579825: /*target[x]*/ return new Property("target[x]", "Identifier|Reference(EvidenceReport)", "The target composition/document of this relationship.", 0, 1, target); + case -880905839: /*target*/ return new Property("target[x]", "Identifier|Reference(EvidenceReport)", "The target composition/document of this relationship.", 0, 1, target); + case 1690892570: /*targetIdentifier*/ return new Property("target[x]", "Identifier", "The target composition/document of this relationship.", 0, 1, target); + case 1259806906: /*targetReference*/ return new Property("target[x]", "Reference(EvidenceReport)", "The target composition/document of this relationship.", 0, 1, target); + default: return super.getNamedProperty(_hash, _name, _checkValid); + } + + } + + @Override + public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException { + switch (hash) { + case 3059181: /*code*/ return this.code == null ? new Base[0] : new Base[] {this.code}; // Enumeration + case -880905839: /*target*/ return this.target == null ? new Base[0] : new Base[] {this.target}; // DataType + default: return super.getProperty(hash, name, checkValid); + } + + } + + @Override + public Base setProperty(int hash, String name, Base value) throws FHIRException { + switch (hash) { + case 3059181: // code + value = new ReportRelationshipTypeEnumFactory().fromType(TypeConvertor.castToCode(value)); + this.code = (Enumeration) value; // Enumeration + return value; + case -880905839: // target + this.target = TypeConvertor.castToType(value); // DataType + return value; + default: return super.setProperty(hash, name, value); + } + + } + + @Override + public Base setProperty(String name, Base value) throws FHIRException { + if (name.equals("code")) { + value = new ReportRelationshipTypeEnumFactory().fromType(TypeConvertor.castToCode(value)); + this.code = (Enumeration) value; // Enumeration + } else if (name.equals("target[x]")) { + this.target = TypeConvertor.castToType(value); // DataType + } else + return super.setProperty(name, value); + return value; + } + + @Override + public Base makeProperty(int hash, String name) throws FHIRException { + switch (hash) { + case 3059181: return getCodeElement(); + case -815579825: return getTarget(); + case -880905839: return getTarget(); + default: return super.makeProperty(hash, name); + } + + } + + @Override + public String[] getTypesForProperty(int hash, String name) throws FHIRException { + switch (hash) { + case 3059181: /*code*/ return new String[] {"code"}; + case -880905839: /*target*/ return new String[] {"Identifier", "Reference"}; + default: return super.getTypesForProperty(hash, name); + } + + } + + @Override + public Base addChild(String name) throws FHIRException { + if (name.equals("code")) { + throw new FHIRException("Cannot call addChild on a primitive type EvidenceReport.relatesTo.code"); + } + else if (name.equals("targetIdentifier")) { + this.target = new Identifier(); + return this.target; + } + else if (name.equals("targetReference")) { + this.target = new Reference(); + return this.target; + } + else + return super.addChild(name); + } + + public EvidenceReportRelatesToComponent copy() { + EvidenceReportRelatesToComponent dst = new EvidenceReportRelatesToComponent(); + copyValues(dst); + return dst; + } + + public void copyValues(EvidenceReportRelatesToComponent dst) { + super.copyValues(dst); + dst.code = code == null ? null : code.copy(); + dst.target = target == null ? null : target.copy(); + } + + @Override + public boolean equalsDeep(Base other_) { + if (!super.equalsDeep(other_)) + return false; + if (!(other_ instanceof EvidenceReportRelatesToComponent)) + return false; + EvidenceReportRelatesToComponent o = (EvidenceReportRelatesToComponent) other_; + return compareDeep(code, o.code, true) && compareDeep(target, o.target, true); + } + + @Override + public boolean equalsShallow(Base other_) { + if (!super.equalsShallow(other_)) + return false; + if (!(other_ instanceof EvidenceReportRelatesToComponent)) + return false; + EvidenceReportRelatesToComponent o = (EvidenceReportRelatesToComponent) other_; + return compareValues(code, o.code, true); + } + + public boolean isEmpty() { + return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(code, target); + } + + public String fhirType() { + return "EvidenceReport.relatesTo"; + + } + + } + + @Block() + public static class SectionComponent extends BackboneElement implements IBaseBackboneElement { + /** + * The label for this particular section. This will be part of the rendered content for the document, and is often used to build a table of contents. + */ + @Child(name = "title", type = {StringType.class}, order=1, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="Label for section (e.g. for ToC)", formalDefinition="The label for this particular section. This will be part of the rendered content for the document, and is often used to build a table of contents." ) + protected StringType title; + + /** + * A code identifying the kind of content contained within the section. This should be consistent with the section title. + */ + @Child(name = "focus", type = {CodeableConcept.class}, order=2, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="Classification of section (recommended)", formalDefinition="A code identifying the kind of content contained within the section. This should be consistent with the section title." ) + @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/evidence-report-section") + protected CodeableConcept focus; + + /** + * A definitional Resource identifying the kind of content contained within the section. This should be consistent with the section title. + */ + @Child(name = "focusReference", type = {Reference.class}, order=3, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="Classification of section by Resource", formalDefinition="A definitional Resource identifying the kind of content contained within the section. This should be consistent with the section title." ) + protected Reference focusReference; + + /** + * Identifies who is responsible for the information in this section, not necessarily who typed it in. + */ + @Child(name = "author", type = {Person.class, Device.class, Group.class, Organization.class}, order=4, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="Who and/or what authored the section", formalDefinition="Identifies who is responsible for the information in this section, not necessarily who typed it in." ) + protected List author; + + /** + * A human-readable narrative that contains the attested content of the section, used to represent the content of the resource to a human. The narrative need not encode all the structured data, but is peferred to contain sufficient detail to make it acceptable for a human to just read the narrative. + */ + @Child(name = "text", type = {Narrative.class}, order=5, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="Text summary of the section, for human interpretation", formalDefinition="A human-readable narrative that contains the attested content of the section, used to represent the content of the resource to a human. The narrative need not encode all the structured data, but is peferred to contain sufficient detail to make it acceptable for a human to just read the narrative." ) + protected Narrative text; + + /** + * How the entry list was prepared - whether it is a working list that is suitable for being maintained on an ongoing basis, or if it represents a snapshot of a list of items from another source, or whether it is a prepared list where items may be marked as added, modified or deleted. + */ + @Child(name = "mode", type = {CodeType.class}, order=6, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="working | snapshot | changes", formalDefinition="How the entry list was prepared - whether it is a working list that is suitable for being maintained on an ongoing basis, or if it represents a snapshot of a list of items from another source, or whether it is a prepared list where items may be marked as added, modified or deleted." ) + @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/list-mode") + protected Enumeration mode; + + /** + * Specifies the order applied to the items in the section entries. + */ + @Child(name = "orderedBy", type = {CodeableConcept.class}, order=7, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="Order of section entries", formalDefinition="Specifies the order applied to the items in the section entries." ) + @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/list-order") + protected CodeableConcept orderedBy; + + /** + * Specifies any type of classification of the evidence report. + */ + @Child(name = "entryClassifier", type = {CodeableConcept.class}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="Extensible classifiers", formalDefinition="Specifies any type of classification of the evidence report." ) + @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/evidence-classifier-code") + protected List entryClassifier; + + /** + * A reference to the actual resource from which the narrative in the section is derived. + */ + @Child(name = "entryReference", type = {Reference.class}, order=9, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="A reference to data that supports this section", formalDefinition="A reference to the actual resource from which the narrative in the section is derived." ) + protected List entryReference; + + /** + * If the section is empty, why the list is empty. An empty section typically has some text explaining the empty reason. + */ + @Child(name = "emptyReason", type = {CodeableConcept.class}, order=10, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="Why the section is empty", formalDefinition="If the section is empty, why the list is empty. An empty section typically has some text explaining the empty reason." ) + @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/list-empty-reason") + protected CodeableConcept emptyReason; + + /** + * A nested sub-section within this section. + */ + @Child(name = "section", type = {SectionComponent.class}, order=11, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="Nested Section", formalDefinition="A nested sub-section within this section." ) + protected List section; + + private static final long serialVersionUID = -354142458L; + + /** + * Constructor + */ + public SectionComponent() { + super(); + } + + /** + * @return {@link #title} (The label for this particular section. This will be part of the rendered content for the document, and is often used to build a table of contents.). This is the underlying object with id, value and extensions. The accessor "getTitle" gives direct access to the value + */ + public StringType getTitleElement() { + if (this.title == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create SectionComponent.title"); + else if (Configuration.doAutoCreate()) + this.title = new StringType(); // bb + return this.title; + } + + public boolean hasTitleElement() { + return this.title != null && !this.title.isEmpty(); + } + + public boolean hasTitle() { + return this.title != null && !this.title.isEmpty(); + } + + /** + * @param value {@link #title} (The label for this particular section. This will be part of the rendered content for the document, and is often used to build a table of contents.). This is the underlying object with id, value and extensions. The accessor "getTitle" gives direct access to the value + */ + public SectionComponent setTitleElement(StringType value) { + this.title = value; + return this; + } + + /** + * @return The label for this particular section. This will be part of the rendered content for the document, and is often used to build a table of contents. + */ + public String getTitle() { + return this.title == null ? null : this.title.getValue(); + } + + /** + * @param value The label for this particular section. This will be part of the rendered content for the document, and is often used to build a table of contents. + */ + public SectionComponent setTitle(String value) { + if (Utilities.noString(value)) + this.title = null; + else { + if (this.title == null) + this.title = new StringType(); + this.title.setValue(value); + } + return this; + } + + /** + * @return {@link #focus} (A code identifying the kind of content contained within the section. This should be consistent with the section title.) + */ + public CodeableConcept getFocus() { + if (this.focus == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create SectionComponent.focus"); + else if (Configuration.doAutoCreate()) + this.focus = new CodeableConcept(); // cc + return this.focus; + } + + public boolean hasFocus() { + return this.focus != null && !this.focus.isEmpty(); + } + + /** + * @param value {@link #focus} (A code identifying the kind of content contained within the section. This should be consistent with the section title.) + */ + public SectionComponent setFocus(CodeableConcept value) { + this.focus = value; + return this; + } + + /** + * @return {@link #focusReference} (A definitional Resource identifying the kind of content contained within the section. This should be consistent with the section title.) + */ + public Reference getFocusReference() { + if (this.focusReference == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create SectionComponent.focusReference"); + else if (Configuration.doAutoCreate()) + this.focusReference = new Reference(); // cc + return this.focusReference; + } + + public boolean hasFocusReference() { + return this.focusReference != null && !this.focusReference.isEmpty(); + } + + /** + * @param value {@link #focusReference} (A definitional Resource identifying the kind of content contained within the section. This should be consistent with the section title.) + */ + public SectionComponent setFocusReference(Reference value) { + this.focusReference = value; + return this; + } + + /** + * @return {@link #author} (Identifies who is responsible for the information in this section, not necessarily who typed it in.) + */ + public List getAuthor() { + if (this.author == null) + this.author = new ArrayList(); + return this.author; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public SectionComponent setAuthor(List theAuthor) { + this.author = theAuthor; + return this; + } + + public boolean hasAuthor() { + if (this.author == null) + return false; + for (Reference item : this.author) + if (!item.isEmpty()) + return true; + return false; + } + + public Reference addAuthor() { //3 + Reference t = new Reference(); + if (this.author == null) + this.author = new ArrayList(); + this.author.add(t); + return t; + } + + public SectionComponent addAuthor(Reference t) { //3 + if (t == null) + return this; + if (this.author == null) + this.author = new ArrayList(); + this.author.add(t); + return this; + } + + /** + * @return The first repetition of repeating field {@link #author}, creating it if it does not already exist {3} + */ + public Reference getAuthorFirstRep() { + if (getAuthor().isEmpty()) { + addAuthor(); + } + return getAuthor().get(0); + } + + /** + * @return {@link #text} (A human-readable narrative that contains the attested content of the section, used to represent the content of the resource to a human. The narrative need not encode all the structured data, but is peferred to contain sufficient detail to make it acceptable for a human to just read the narrative.) + */ + public Narrative getText() { + if (this.text == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create SectionComponent.text"); + else if (Configuration.doAutoCreate()) + this.text = new Narrative(); // cc + return this.text; + } + + public boolean hasText() { + return this.text != null && !this.text.isEmpty(); + } + + /** + * @param value {@link #text} (A human-readable narrative that contains the attested content of the section, used to represent the content of the resource to a human. The narrative need not encode all the structured data, but is peferred to contain sufficient detail to make it acceptable for a human to just read the narrative.) + */ + public SectionComponent setText(Narrative value) { + this.text = value; + return this; + } + + /** + * @return {@link #mode} (How the entry list was prepared - whether it is a working list that is suitable for being maintained on an ongoing basis, or if it represents a snapshot of a list of items from another source, or whether it is a prepared list where items may be marked as added, modified or deleted.). 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 SectionComponent.mode"); + else if (Configuration.doAutoCreate()) + this.mode = new Enumeration(new ListModeEnumFactory()); // 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} (How the entry list was prepared - whether it is a working list that is suitable for being maintained on an ongoing basis, or if it represents a snapshot of a list of items from another source, or whether it is a prepared list where items may be marked as added, modified or deleted.). This is the underlying object with id, value and extensions. The accessor "getMode" gives direct access to the value + */ + public SectionComponent setModeElement(Enumeration value) { + this.mode = value; + return this; + } + + /** + * @return How the entry list was prepared - whether it is a working list that is suitable for being maintained on an ongoing basis, or if it represents a snapshot of a list of items from another source, or whether it is a prepared list where items may be marked as added, modified or deleted. + */ + public ListMode getMode() { + return this.mode == null ? null : this.mode.getValue(); + } + + /** + * @param value How the entry list was prepared - whether it is a working list that is suitable for being maintained on an ongoing basis, or if it represents a snapshot of a list of items from another source, or whether it is a prepared list where items may be marked as added, modified or deleted. + */ + public SectionComponent setMode(ListMode value) { + if (value == null) + this.mode = null; + else { + if (this.mode == null) + this.mode = new Enumeration(new ListModeEnumFactory()); + this.mode.setValue(value); + } + return this; + } + + /** + * @return {@link #orderedBy} (Specifies the order applied to the items in the section entries.) + */ + public CodeableConcept getOrderedBy() { + if (this.orderedBy == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create SectionComponent.orderedBy"); + else if (Configuration.doAutoCreate()) + this.orderedBy = new CodeableConcept(); // cc + return this.orderedBy; + } + + public boolean hasOrderedBy() { + return this.orderedBy != null && !this.orderedBy.isEmpty(); + } + + /** + * @param value {@link #orderedBy} (Specifies the order applied to the items in the section entries.) + */ + public SectionComponent setOrderedBy(CodeableConcept value) { + this.orderedBy = value; + return this; + } + + /** + * @return {@link #entryClassifier} (Specifies any type of classification of the evidence report.) + */ + public List getEntryClassifier() { + if (this.entryClassifier == null) + this.entryClassifier = new ArrayList(); + return this.entryClassifier; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public SectionComponent setEntryClassifier(List theEntryClassifier) { + this.entryClassifier = theEntryClassifier; + return this; + } + + public boolean hasEntryClassifier() { + if (this.entryClassifier == null) + return false; + for (CodeableConcept item : this.entryClassifier) + if (!item.isEmpty()) + return true; + return false; + } + + public CodeableConcept addEntryClassifier() { //3 + CodeableConcept t = new CodeableConcept(); + if (this.entryClassifier == null) + this.entryClassifier = new ArrayList(); + this.entryClassifier.add(t); + return t; + } + + public SectionComponent addEntryClassifier(CodeableConcept t) { //3 + if (t == null) + return this; + if (this.entryClassifier == null) + this.entryClassifier = new ArrayList(); + this.entryClassifier.add(t); + return this; + } + + /** + * @return The first repetition of repeating field {@link #entryClassifier}, creating it if it does not already exist {3} + */ + public CodeableConcept getEntryClassifierFirstRep() { + if (getEntryClassifier().isEmpty()) { + addEntryClassifier(); + } + return getEntryClassifier().get(0); + } + + /** + * @return {@link #entryReference} (A reference to the actual resource from which the narrative in the section is derived.) + */ + public List getEntryReference() { + if (this.entryReference == null) + this.entryReference = new ArrayList(); + return this.entryReference; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public SectionComponent setEntryReference(List theEntryReference) { + this.entryReference = theEntryReference; + return this; + } + + public boolean hasEntryReference() { + if (this.entryReference == null) + return false; + for (Reference item : this.entryReference) + if (!item.isEmpty()) + return true; + return false; + } + + public Reference addEntryReference() { //3 + Reference t = new Reference(); + if (this.entryReference == null) + this.entryReference = new ArrayList(); + this.entryReference.add(t); + return t; + } + + public SectionComponent addEntryReference(Reference t) { //3 + if (t == null) + return this; + if (this.entryReference == null) + this.entryReference = new ArrayList(); + this.entryReference.add(t); + return this; + } + + /** + * @return The first repetition of repeating field {@link #entryReference}, creating it if it does not already exist {3} + */ + public Reference getEntryReferenceFirstRep() { + if (getEntryReference().isEmpty()) { + addEntryReference(); + } + return getEntryReference().get(0); + } + + /** + * @return {@link #emptyReason} (If the section is empty, why the list is empty. An empty section typically has some text explaining the empty reason.) + */ + public CodeableConcept getEmptyReason() { + if (this.emptyReason == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create SectionComponent.emptyReason"); + else if (Configuration.doAutoCreate()) + this.emptyReason = new CodeableConcept(); // cc + return this.emptyReason; + } + + public boolean hasEmptyReason() { + return this.emptyReason != null && !this.emptyReason.isEmpty(); + } + + /** + * @param value {@link #emptyReason} (If the section is empty, why the list is empty. An empty section typically has some text explaining the empty reason.) + */ + public SectionComponent setEmptyReason(CodeableConcept value) { + this.emptyReason = value; + return this; + } + + /** + * @return {@link #section} (A nested sub-section within this section.) + */ + public List getSection() { + if (this.section == null) + this.section = new ArrayList(); + return this.section; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public SectionComponent setSection(List theSection) { + this.section = theSection; + return this; + } + + public boolean hasSection() { + if (this.section == null) + return false; + for (SectionComponent item : this.section) + if (!item.isEmpty()) + return true; + return false; + } + + public SectionComponent addSection() { //3 + SectionComponent t = new SectionComponent(); + if (this.section == null) + this.section = new ArrayList(); + this.section.add(t); + return t; + } + + public SectionComponent addSection(SectionComponent t) { //3 + if (t == null) + return this; + if (this.section == null) + this.section = new ArrayList(); + this.section.add(t); + return this; + } + + /** + * @return The first repetition of repeating field {@link #section}, creating it if it does not already exist {3} + */ + public SectionComponent getSectionFirstRep() { + if (getSection().isEmpty()) { + addSection(); + } + return getSection().get(0); + } + + protected void listChildren(List children) { + super.listChildren(children); + children.add(new Property("title", "string", "The label for this particular section. This will be part of the rendered content for the document, and is often used to build a table of contents.", 0, 1, title)); + children.add(new Property("focus", "CodeableConcept", "A code identifying the kind of content contained within the section. This should be consistent with the section title.", 0, 1, focus)); + children.add(new Property("focusReference", "Reference(Any)", "A definitional Resource identifying the kind of content contained within the section. This should be consistent with the section title.", 0, 1, focusReference)); + children.add(new Property("author", "Reference(Person|Device|Group|Organization)", "Identifies who is responsible for the information in this section, not necessarily who typed it in.", 0, java.lang.Integer.MAX_VALUE, author)); + children.add(new Property("text", "Narrative", "A human-readable narrative that contains the attested content of the section, used to represent the content of the resource to a human. The narrative need not encode all the structured data, but is peferred to contain sufficient detail to make it acceptable for a human to just read the narrative.", 0, 1, text)); + children.add(new Property("mode", "code", "How the entry list was prepared - whether it is a working list that is suitable for being maintained on an ongoing basis, or if it represents a snapshot of a list of items from another source, or whether it is a prepared list where items may be marked as added, modified or deleted.", 0, 1, mode)); + children.add(new Property("orderedBy", "CodeableConcept", "Specifies the order applied to the items in the section entries.", 0, 1, orderedBy)); + children.add(new Property("entryClassifier", "CodeableConcept", "Specifies any type of classification of the evidence report.", 0, java.lang.Integer.MAX_VALUE, entryClassifier)); + children.add(new Property("entryReference", "Reference(Any)", "A reference to the actual resource from which the narrative in the section is derived.", 0, java.lang.Integer.MAX_VALUE, entryReference)); + children.add(new Property("emptyReason", "CodeableConcept", "If the section is empty, why the list is empty. An empty section typically has some text explaining the empty reason.", 0, 1, emptyReason)); + children.add(new Property("section", "@EvidenceReport.section", "A nested sub-section within this section.", 0, java.lang.Integer.MAX_VALUE, section)); + } + + @Override + public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { + switch (_hash) { + case 110371416: /*title*/ return new Property("title", "string", "The label for this particular section. This will be part of the rendered content for the document, and is often used to build a table of contents.", 0, 1, title); + case 97604824: /*focus*/ return new Property("focus", "CodeableConcept", "A code identifying the kind of content contained within the section. This should be consistent with the section title.", 0, 1, focus); + case 1823604051: /*focusReference*/ return new Property("focusReference", "Reference(Any)", "A definitional Resource identifying the kind of content contained within the section. This should be consistent with the section title.", 0, 1, focusReference); + case -1406328437: /*author*/ return new Property("author", "Reference(Person|Device|Group|Organization)", "Identifies who is responsible for the information in this section, not necessarily who typed it in.", 0, java.lang.Integer.MAX_VALUE, author); + case 3556653: /*text*/ return new Property("text", "Narrative", "A human-readable narrative that contains the attested content of the section, used to represent the content of the resource to a human. The narrative need not encode all the structured data, but is peferred to contain sufficient detail to make it acceptable for a human to just read the narrative.", 0, 1, text); + case 3357091: /*mode*/ return new Property("mode", "code", "How the entry list was prepared - whether it is a working list that is suitable for being maintained on an ongoing basis, or if it represents a snapshot of a list of items from another source, or whether it is a prepared list where items may be marked as added, modified or deleted.", 0, 1, mode); + case -391079516: /*orderedBy*/ return new Property("orderedBy", "CodeableConcept", "Specifies the order applied to the items in the section entries.", 0, 1, orderedBy); + case -948201421: /*entryClassifier*/ return new Property("entryClassifier", "CodeableConcept", "Specifies any type of classification of the evidence report.", 0, java.lang.Integer.MAX_VALUE, entryClassifier); + case 438810361: /*entryReference*/ return new Property("entryReference", "Reference(Any)", "A reference to the actual resource from which the narrative in the section is derived.", 0, java.lang.Integer.MAX_VALUE, entryReference); + case 1140135409: /*emptyReason*/ return new Property("emptyReason", "CodeableConcept", "If the section is empty, why the list is empty. An empty section typically has some text explaining the empty reason.", 0, 1, emptyReason); + case 1970241253: /*section*/ return new Property("section", "@EvidenceReport.section", "A nested sub-section within this section.", 0, java.lang.Integer.MAX_VALUE, section); + default: return super.getNamedProperty(_hash, _name, _checkValid); + } + + } + + @Override + public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException { + switch (hash) { + case 110371416: /*title*/ return this.title == null ? new Base[0] : new Base[] {this.title}; // StringType + case 97604824: /*focus*/ return this.focus == null ? new Base[0] : new Base[] {this.focus}; // CodeableConcept + case 1823604051: /*focusReference*/ return this.focusReference == null ? new Base[0] : new Base[] {this.focusReference}; // Reference + case -1406328437: /*author*/ return this.author == null ? new Base[0] : this.author.toArray(new Base[this.author.size()]); // Reference + case 3556653: /*text*/ return this.text == null ? new Base[0] : new Base[] {this.text}; // Narrative + case 3357091: /*mode*/ return this.mode == null ? new Base[0] : new Base[] {this.mode}; // Enumeration + case -391079516: /*orderedBy*/ return this.orderedBy == null ? new Base[0] : new Base[] {this.orderedBy}; // CodeableConcept + case -948201421: /*entryClassifier*/ return this.entryClassifier == null ? new Base[0] : this.entryClassifier.toArray(new Base[this.entryClassifier.size()]); // CodeableConcept + case 438810361: /*entryReference*/ return this.entryReference == null ? new Base[0] : this.entryReference.toArray(new Base[this.entryReference.size()]); // Reference + case 1140135409: /*emptyReason*/ return this.emptyReason == null ? new Base[0] : new Base[] {this.emptyReason}; // CodeableConcept + case 1970241253: /*section*/ return this.section == null ? new Base[0] : this.section.toArray(new Base[this.section.size()]); // SectionComponent + default: return super.getProperty(hash, name, checkValid); + } + + } + + @Override + public Base setProperty(int hash, String name, Base value) throws FHIRException { + switch (hash) { + case 110371416: // title + this.title = TypeConvertor.castToString(value); // StringType + return value; + case 97604824: // focus + this.focus = TypeConvertor.castToCodeableConcept(value); // CodeableConcept + return value; + case 1823604051: // focusReference + this.focusReference = TypeConvertor.castToReference(value); // Reference + return value; + case -1406328437: // author + this.getAuthor().add(TypeConvertor.castToReference(value)); // Reference + return value; + case 3556653: // text + this.text = TypeConvertor.castToNarrative(value); // Narrative + return value; + case 3357091: // mode + value = new ListModeEnumFactory().fromType(TypeConvertor.castToCode(value)); + this.mode = (Enumeration) value; // Enumeration + return value; + case -391079516: // orderedBy + this.orderedBy = TypeConvertor.castToCodeableConcept(value); // CodeableConcept + return value; + case -948201421: // entryClassifier + this.getEntryClassifier().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept + return value; + case 438810361: // entryReference + this.getEntryReference().add(TypeConvertor.castToReference(value)); // Reference + return value; + case 1140135409: // emptyReason + this.emptyReason = TypeConvertor.castToCodeableConcept(value); // CodeableConcept + return value; + case 1970241253: // section + this.getSection().add((SectionComponent) value); // SectionComponent + return value; + default: return super.setProperty(hash, name, value); + } + + } + + @Override + public Base setProperty(String name, Base value) throws FHIRException { + if (name.equals("title")) { + this.title = TypeConvertor.castToString(value); // StringType + } else if (name.equals("focus")) { + this.focus = TypeConvertor.castToCodeableConcept(value); // CodeableConcept + } else if (name.equals("focusReference")) { + this.focusReference = TypeConvertor.castToReference(value); // Reference + } else if (name.equals("author")) { + this.getAuthor().add(TypeConvertor.castToReference(value)); + } else if (name.equals("text")) { + this.text = TypeConvertor.castToNarrative(value); // Narrative + } else if (name.equals("mode")) { + value = new ListModeEnumFactory().fromType(TypeConvertor.castToCode(value)); + this.mode = (Enumeration) value; // Enumeration + } else if (name.equals("orderedBy")) { + this.orderedBy = TypeConvertor.castToCodeableConcept(value); // CodeableConcept + } else if (name.equals("entryClassifier")) { + this.getEntryClassifier().add(TypeConvertor.castToCodeableConcept(value)); + } else if (name.equals("entryReference")) { + this.getEntryReference().add(TypeConvertor.castToReference(value)); + } else if (name.equals("emptyReason")) { + this.emptyReason = TypeConvertor.castToCodeableConcept(value); // CodeableConcept + } else if (name.equals("section")) { + this.getSection().add((SectionComponent) value); + } else + return super.setProperty(name, value); + return value; + } + + @Override + public Base makeProperty(int hash, String name) throws FHIRException { + switch (hash) { + case 110371416: return getTitleElement(); + case 97604824: return getFocus(); + case 1823604051: return getFocusReference(); + case -1406328437: return addAuthor(); + case 3556653: return getText(); + case 3357091: return getModeElement(); + case -391079516: return getOrderedBy(); + case -948201421: return addEntryClassifier(); + case 438810361: return addEntryReference(); + case 1140135409: return getEmptyReason(); + case 1970241253: return addSection(); + default: return super.makeProperty(hash, name); + } + + } + + @Override + public String[] getTypesForProperty(int hash, String name) throws FHIRException { + switch (hash) { + case 110371416: /*title*/ return new String[] {"string"}; + case 97604824: /*focus*/ return new String[] {"CodeableConcept"}; + case 1823604051: /*focusReference*/ return new String[] {"Reference"}; + case -1406328437: /*author*/ return new String[] {"Reference"}; + case 3556653: /*text*/ return new String[] {"Narrative"}; + case 3357091: /*mode*/ return new String[] {"code"}; + case -391079516: /*orderedBy*/ return new String[] {"CodeableConcept"}; + case -948201421: /*entryClassifier*/ return new String[] {"CodeableConcept"}; + case 438810361: /*entryReference*/ return new String[] {"Reference"}; + case 1140135409: /*emptyReason*/ return new String[] {"CodeableConcept"}; + case 1970241253: /*section*/ return new String[] {"@EvidenceReport.section"}; + default: return super.getTypesForProperty(hash, name); + } + + } + + @Override + public Base addChild(String name) throws FHIRException { + if (name.equals("title")) { + throw new FHIRException("Cannot call addChild on a primitive type EvidenceReport.section.title"); + } + else if (name.equals("focus")) { + this.focus = new CodeableConcept(); + return this.focus; + } + else if (name.equals("focusReference")) { + this.focusReference = new Reference(); + return this.focusReference; + } + else if (name.equals("author")) { + return addAuthor(); + } + else if (name.equals("text")) { + this.text = new Narrative(); + return this.text; + } + else if (name.equals("mode")) { + throw new FHIRException("Cannot call addChild on a primitive type EvidenceReport.section.mode"); + } + else if (name.equals("orderedBy")) { + this.orderedBy = new CodeableConcept(); + return this.orderedBy; + } + else if (name.equals("entryClassifier")) { + return addEntryClassifier(); + } + else if (name.equals("entryReference")) { + return addEntryReference(); + } + else if (name.equals("emptyReason")) { + this.emptyReason = new CodeableConcept(); + return this.emptyReason; + } + else if (name.equals("section")) { + return addSection(); + } + else + return super.addChild(name); + } + + public SectionComponent copy() { + SectionComponent dst = new SectionComponent(); + copyValues(dst); + return dst; + } + + public void copyValues(SectionComponent dst) { + super.copyValues(dst); + dst.title = title == null ? null : title.copy(); + dst.focus = focus == null ? null : focus.copy(); + dst.focusReference = focusReference == null ? null : focusReference.copy(); + if (author != null) { + dst.author = new ArrayList(); + for (Reference i : author) + dst.author.add(i.copy()); + }; + dst.text = text == null ? null : text.copy(); + dst.mode = mode == null ? null : mode.copy(); + dst.orderedBy = orderedBy == null ? null : orderedBy.copy(); + if (entryClassifier != null) { + dst.entryClassifier = new ArrayList(); + for (CodeableConcept i : entryClassifier) + dst.entryClassifier.add(i.copy()); + }; + if (entryReference != null) { + dst.entryReference = new ArrayList(); + for (Reference i : entryReference) + dst.entryReference.add(i.copy()); + }; + dst.emptyReason = emptyReason == null ? null : emptyReason.copy(); + if (section != null) { + dst.section = new ArrayList(); + for (SectionComponent i : section) + dst.section.add(i.copy()); + }; + } + + @Override + public boolean equalsDeep(Base other_) { + if (!super.equalsDeep(other_)) + return false; + if (!(other_ instanceof SectionComponent)) + return false; + SectionComponent o = (SectionComponent) other_; + return compareDeep(title, o.title, true) && compareDeep(focus, o.focus, true) && compareDeep(focusReference, o.focusReference, true) + && compareDeep(author, o.author, true) && compareDeep(text, o.text, true) && compareDeep(mode, o.mode, true) + && compareDeep(orderedBy, o.orderedBy, true) && compareDeep(entryClassifier, o.entryClassifier, true) + && compareDeep(entryReference, o.entryReference, true) && compareDeep(emptyReason, o.emptyReason, true) + && compareDeep(section, o.section, true); + } + + @Override + public boolean equalsShallow(Base other_) { + if (!super.equalsShallow(other_)) + return false; + if (!(other_ instanceof SectionComponent)) + return false; + SectionComponent o = (SectionComponent) other_; + return compareValues(title, o.title, true) && compareValues(mode, o.mode, true); + } + + public boolean isEmpty() { + return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(title, focus, focusReference + , author, text, mode, orderedBy, entryClassifier, entryReference, emptyReason + , section); + } + + public String fhirType() { + return "EvidenceReport.section"; + + } + + } + + /** + * An absolute URI that is used to identify this EvidenceReport 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. + */ + @Child(name = "url", type = {UriType.class}, order=0, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="Canonical identifier for this EvidenceReport, represented as a globally unique URI", formalDefinition="An absolute URI that is used to identify this EvidenceReport 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 status of this summary. Enables tracking the life-cycle of the content. + */ + @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; + + /** + * 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 evidence report instances. + */ + @Child(name = "useContext", type = {UsageContext.class}, order=2, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="The context that the content is intended to support", 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 evidence report instances." ) + protected List useContext; + + /** + * A formal identifier that is used to identify this EvidenceReport when it is represented in other formats, or referenced in a specification, model, design or an instance. + */ + @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 EvidenceReport when it is represented in other formats, or referenced in a specification, model, design or an instance." ) + protected List identifier; + + /** + * A formal identifier that is used to identify things closely related to this EvidenceReport. + */ + @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 EvidenceReport." ) + protected List relatedIdentifier; + + /** + * Citation Resource or display of suggested citation for this report. + */ + @Child(name = "citeAs", type = {Citation.class}, order=5, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="Citation for this report", formalDefinition="Citation Resource or display of suggested citation for this report." ) + protected Reference citeAs; + + /** + * Specifies the kind of report, such as grouping of classifiers, search results, or human-compiled expression. + */ + @Child(name = "type", type = {CodeableConcept.class}, order=6, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="Kind of report", formalDefinition="Specifies the kind of report, such as grouping of classifiers, search results, or human-compiled expression." ) + @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/evidence-report-type") + protected CodeableConcept type; + + /** + * Used for footnotes and annotations. + */ + @Child(name = "note", type = {Annotation.class}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="Used for footnotes and annotations", formalDefinition="Used for footnotes and annotations." ) + protected List note; + + /** + * Link, description or reference to artifact associated with the report. + */ + @Child(name = "relatedArtifact", type = {RelatedArtifact.class}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="Link, description or reference to artifact associated with the report", formalDefinition="Link, description or reference to artifact associated with the report." ) + protected List relatedArtifact; + + /** + * Specifies the subject or focus of the report. Answers "What is this report about?". + */ + @Child(name = "subject", type = {}, order=9, min=1, max=1, modifier=false, summary=true) + @Description(shortDefinition="Focus of the report", formalDefinition="Specifies the subject or focus of the report. Answers \"What is this report about?\"." ) + protected EvidenceReportSubjectComponent subject; + + /** + * The name of the organization or individual that published the evidence report. + */ + @Child(name = "publisher", type = {StringType.class}, order=10, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="Name of the publisher (organization or individual)", formalDefinition="The name of the organization or individual that published the evidence report." ) + protected StringType publisher; + + /** + * Contact details to assist a user in finding and communicating with the publisher. + */ + @Child(name = "contact", type = {ContactDetail.class}, order=11, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="Contact details for the publisher", formalDefinition="Contact details to assist a user in finding and communicating with the publisher." ) + protected List contact; + + /** + * An individiual, organization, or device primarily involved in the creation and maintenance of the content. + */ + @Child(name = "author", type = {ContactDetail.class}, order=12, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="Who authored the content", formalDefinition="An individiual, organization, or device primarily involved in the creation and maintenance of the content." ) + protected List author; + + /** + * An individiual, organization, or device primarily responsible for internal coherence of the content. + */ + @Child(name = "editor", type = {ContactDetail.class}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="Who edited the content", formalDefinition="An individiual, organization, or device primarily responsible for internal coherence of the content." ) + protected List editor; + + /** + * An individiual, organization, or device primarily responsible for review of some aspect of the content. + */ + @Child(name = "reviewer", type = {ContactDetail.class}, order=14, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="Who reviewed the content", formalDefinition="An individiual, organization, or device primarily responsible for review of some aspect of the content." ) + protected List reviewer; + + /** + * An individiual, organization, or device responsible for officially endorsing the content for use in some setting. + */ + @Child(name = "endorser", type = {ContactDetail.class}, order=15, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="Who endorsed the content", formalDefinition="An individiual, organization, or device responsible for officially endorsing the content for use in some setting." ) + protected List endorser; + + /** + * Relationships that this composition has with other compositions or documents that already exist. + */ + @Child(name = "relatesTo", type = {}, order=16, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="Relationships to other compositions/documents", formalDefinition="Relationships that this composition has with other compositions or documents that already exist." ) + protected List relatesTo; + + /** + * The root of the sections that make up the composition. + */ + @Child(name = "section", type = {}, order=17, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @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 = 867867967L; + + /** + * Constructor + */ + public EvidenceReport() { + super(); + } + + /** + * Constructor + */ + public EvidenceReport(PublicationStatus status, EvidenceReportSubjectComponent subject) { + super(); + this.setStatus(status); + this.setSubject(subject); + } + + /** + * @return {@link #url} (An absolute URI that is used to identify this EvidenceReport 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.). This is the underlying object with id, value and extensions. The accessor "getUrl" gives direct access to the value + */ + public UriType getUrlElement() { + if (this.url == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create EvidenceReport.url"); + else if (Configuration.doAutoCreate()) + this.url = new UriType(); // bb + return this.url; + } + + public boolean hasUrlElement() { + return this.url != null && !this.url.isEmpty(); + } + + public boolean hasUrl() { + return this.url != null && !this.url.isEmpty(); + } + + /** + * @param value {@link #url} (An absolute URI that is used to identify this EvidenceReport 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.). This is the underlying object with id, value and extensions. The accessor "getUrl" gives direct access to the value + */ + public EvidenceReport setUrlElement(UriType value) { + this.url = value; + return this; + } + + /** + * @return An absolute URI that is used to identify this EvidenceReport 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. + */ + public String getUrl() { + return this.url == null ? null : this.url.getValue(); + } + + /** + * @param value An absolute URI that is used to identify this EvidenceReport 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. + */ + public EvidenceReport setUrl(String value) { + if (Utilities.noString(value)) + this.url = null; + else { + if (this.url == null) + this.url = new UriType(); + this.url.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 + */ + public Enumeration getStatusElement() { + if (this.status == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create EvidenceReport.status"); + else if (Configuration.doAutoCreate()) + this.status = new Enumeration(new PublicationStatusEnumFactory()); // bb + return this.status; + } + + public boolean hasStatusElement() { + return this.status != null && !this.status.isEmpty(); + } + + public boolean hasStatus() { + return this.status != null && !this.status.isEmpty(); + } + + /** + * @param value {@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 + */ + public EvidenceReport setStatusElement(Enumeration value) { + this.status = value; + return this; + } + + /** + * @return The status of this summary. Enables tracking the life-cycle of the content. + */ + public PublicationStatus getStatus() { + return this.status == null ? null : this.status.getValue(); + } + + /** + * @param value The status of this summary. Enables tracking the life-cycle of the content. + */ + public EvidenceReport setStatus(PublicationStatus value) { + if (this.status == null) + this.status = new Enumeration(new PublicationStatusEnumFactory()); + this.status.setValue(value); + return this; + } + + /** + * @return {@link #useContext} (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 evidence report instances.) + */ + public List getUseContext() { + if (this.useContext == null) + this.useContext = new ArrayList(); + return this.useContext; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public EvidenceReport setUseContext(List theUseContext) { + this.useContext = theUseContext; + return this; + } + + public boolean hasUseContext() { + if (this.useContext == null) + return false; + for (UsageContext item : this.useContext) + if (!item.isEmpty()) + return true; + return false; + } + + public UsageContext addUseContext() { //3 + UsageContext t = new UsageContext(); + if (this.useContext == null) + this.useContext = new ArrayList(); + this.useContext.add(t); + return t; + } + + public EvidenceReport addUseContext(UsageContext t) { //3 + if (t == null) + return this; + if (this.useContext == null) + this.useContext = new ArrayList(); + this.useContext.add(t); + return this; + } + + /** + * @return The first repetition of repeating field {@link #useContext}, creating it if it does not already exist {3} + */ + public UsageContext getUseContextFirstRep() { + if (getUseContext().isEmpty()) { + addUseContext(); + } + return getUseContext().get(0); + } + + /** + * @return {@link #identifier} (A formal identifier that is used to identify this EvidenceReport when it is represented in other formats, or referenced in a specification, model, design or an instance.) + */ + 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 EvidenceReport 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 EvidenceReport 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 #relatedIdentifier} (A formal identifier that is used to identify things closely related to this EvidenceReport.) + */ + public List getRelatedIdentifier() { + if (this.relatedIdentifier == null) + this.relatedIdentifier = new ArrayList(); + return this.relatedIdentifier; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public EvidenceReport setRelatedIdentifier(List theRelatedIdentifier) { + this.relatedIdentifier = theRelatedIdentifier; + return this; + } + + public boolean hasRelatedIdentifier() { + if (this.relatedIdentifier == null) + return false; + for (Identifier item : this.relatedIdentifier) + if (!item.isEmpty()) + return true; + return false; + } + + public Identifier addRelatedIdentifier() { //3 + Identifier t = new Identifier(); + if (this.relatedIdentifier == null) + this.relatedIdentifier = new ArrayList(); + this.relatedIdentifier.add(t); + return t; + } + + public EvidenceReport addRelatedIdentifier(Identifier t) { //3 + if (t == null) + return this; + if (this.relatedIdentifier == null) + this.relatedIdentifier = new ArrayList(); + this.relatedIdentifier.add(t); + return this; + } + + /** + * @return The first repetition of repeating field {@link #relatedIdentifier}, creating it if it does not already exist {3} + */ + public Identifier getRelatedIdentifierFirstRep() { + if (getRelatedIdentifier().isEmpty()) { + addRelatedIdentifier(); + } + return getRelatedIdentifier().get(0); + } + + /** + * @return {@link #citeAs} (Citation Resource or display of suggested citation for this report.) + */ + public Reference getCiteAs() { + if (this.citeAs == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create EvidenceReport.citeAs"); + else if (Configuration.doAutoCreate()) + this.citeAs = new Reference(); // cc + return this.citeAs; + } + + public boolean hasCiteAs() { + return this.citeAs != null && !this.citeAs.isEmpty(); + } + + /** + * @param value {@link #citeAs} (Citation Resource or display of suggested citation for this report.) + */ + public EvidenceReport setCiteAs(Reference value) { + this.citeAs = value; + return this; + } + + /** + * @return {@link #type} (Specifies the kind of report, such as grouping of classifiers, search results, or human-compiled expression.) + */ + public CodeableConcept getType() { + if (this.type == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create EvidenceReport.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} (Specifies the kind of report, such as grouping of classifiers, search results, or human-compiled expression.) + */ + public EvidenceReport setType(CodeableConcept value) { + this.type = value; + return this; + } + + /** + * @return {@link #note} (Used for footnotes and annotations.) + */ + public List getNote() { + if (this.note == null) + this.note = new ArrayList(); + return this.note; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public EvidenceReport setNote(List theNote) { + this.note = theNote; + return this; + } + + public boolean hasNote() { + if (this.note == null) + return false; + for (Annotation item : this.note) + if (!item.isEmpty()) + return true; + return false; + } + + public Annotation addNote() { //3 + Annotation t = new Annotation(); + if (this.note == null) + this.note = new ArrayList(); + this.note.add(t); + return t; + } + + public EvidenceReport addNote(Annotation t) { //3 + if (t == null) + return this; + if (this.note == null) + this.note = new ArrayList(); + this.note.add(t); + return this; + } + + /** + * @return The first repetition of repeating field {@link #note}, creating it if it does not already exist {3} + */ + public Annotation getNoteFirstRep() { + if (getNote().isEmpty()) { + addNote(); + } + return getNote().get(0); + } + + /** + * @return {@link #relatedArtifact} (Link, description or reference to artifact associated with the report.) + */ + public List getRelatedArtifact() { + if (this.relatedArtifact == null) + this.relatedArtifact = new ArrayList(); + return this.relatedArtifact; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public EvidenceReport setRelatedArtifact(List theRelatedArtifact) { + this.relatedArtifact = theRelatedArtifact; + return this; + } + + public boolean hasRelatedArtifact() { + if (this.relatedArtifact == null) + return false; + for (RelatedArtifact item : this.relatedArtifact) + if (!item.isEmpty()) + return true; + return false; + } + + public RelatedArtifact addRelatedArtifact() { //3 + RelatedArtifact t = new RelatedArtifact(); + if (this.relatedArtifact == null) + this.relatedArtifact = new ArrayList(); + this.relatedArtifact.add(t); + return t; + } + + public EvidenceReport addRelatedArtifact(RelatedArtifact t) { //3 + if (t == null) + return this; + if (this.relatedArtifact == null) + this.relatedArtifact = new ArrayList(); + this.relatedArtifact.add(t); + return this; + } + + /** + * @return The first repetition of repeating field {@link #relatedArtifact}, creating it if it does not already exist {3} + */ + public RelatedArtifact getRelatedArtifactFirstRep() { + if (getRelatedArtifact().isEmpty()) { + addRelatedArtifact(); + } + return getRelatedArtifact().get(0); + } + + /** + * @return {@link #subject} (Specifies the subject or focus of the report. Answers "What is this report about?".) + */ + public EvidenceReportSubjectComponent getSubject() { + if (this.subject == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create EvidenceReport.subject"); + else if (Configuration.doAutoCreate()) + this.subject = new EvidenceReportSubjectComponent(); // cc + return this.subject; + } + + public boolean hasSubject() { + return this.subject != null && !this.subject.isEmpty(); + } + + /** + * @param value {@link #subject} (Specifies the subject or focus of the report. Answers "What is this report about?".) + */ + public EvidenceReport setSubject(EvidenceReportSubjectComponent value) { + this.subject = value; + return this; + } + + /** + * @return {@link #publisher} (The name of the organization or individual that published the evidence report.). This is the underlying object with id, value and extensions. The accessor "getPublisher" gives direct access to the value + */ + public StringType getPublisherElement() { + if (this.publisher == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create EvidenceReport.publisher"); + else if (Configuration.doAutoCreate()) + this.publisher = new StringType(); // bb + return this.publisher; + } + + public boolean hasPublisherElement() { + return this.publisher != null && !this.publisher.isEmpty(); + } + + public boolean hasPublisher() { + return this.publisher != null && !this.publisher.isEmpty(); + } + + /** + * @param value {@link #publisher} (The name of the organization or individual that published the evidence report.). This is the underlying object with id, value and extensions. The accessor "getPublisher" gives direct access to the value + */ + public EvidenceReport setPublisherElement(StringType value) { + this.publisher = value; + return this; + } + + /** + * @return The name of the organization or individual that published the evidence report. + */ + public String getPublisher() { + return this.publisher == null ? null : this.publisher.getValue(); + } + + /** + * @param value The name of the organization or individual that published the evidence report. + */ + public EvidenceReport setPublisher(String value) { + if (Utilities.noString(value)) + this.publisher = null; + else { + if (this.publisher == null) + this.publisher = new StringType(); + this.publisher.setValue(value); + } + return this; + } + + /** + * @return {@link #contact} (Contact details to assist a user in finding and communicating with the publisher.) + */ + public List getContact() { + if (this.contact == null) + this.contact = new ArrayList(); + return this.contact; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public EvidenceReport setContact(List theContact) { + this.contact = theContact; + return this; + } + + public boolean hasContact() { + if (this.contact == null) + return false; + for (ContactDetail item : this.contact) + if (!item.isEmpty()) + return true; + return false; + } + + public ContactDetail addContact() { //3 + ContactDetail t = new ContactDetail(); + if (this.contact == null) + this.contact = new ArrayList(); + this.contact.add(t); + return t; + } + + public EvidenceReport addContact(ContactDetail t) { //3 + if (t == null) + return this; + if (this.contact == null) + this.contact = new ArrayList(); + this.contact.add(t); + return this; + } + + /** + * @return The first repetition of repeating field {@link #contact}, creating it if it does not already exist {3} + */ + public ContactDetail getContactFirstRep() { + if (getContact().isEmpty()) { + addContact(); + } + return getContact().get(0); + } + + /** + * @return {@link #author} (An individiual, organization, or device primarily involved in the creation and maintenance of the content.) + */ + public List getAuthor() { + if (this.author == null) + this.author = new ArrayList(); + return this.author; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public EvidenceReport setAuthor(List theAuthor) { + this.author = theAuthor; + return this; + } + + public boolean hasAuthor() { + if (this.author == null) + return false; + for (ContactDetail item : this.author) + if (!item.isEmpty()) + return true; + return false; + } + + public ContactDetail addAuthor() { //3 + ContactDetail t = new ContactDetail(); + if (this.author == null) + this.author = new ArrayList(); + this.author.add(t); + return t; + } + + public EvidenceReport addAuthor(ContactDetail t) { //3 + if (t == null) + return this; + if (this.author == null) + this.author = new ArrayList(); + this.author.add(t); + return this; + } + + /** + * @return The first repetition of repeating field {@link #author}, creating it if it does not already exist {3} + */ + public ContactDetail getAuthorFirstRep() { + if (getAuthor().isEmpty()) { + addAuthor(); + } + return getAuthor().get(0); + } + + /** + * @return {@link #editor} (An individiual, organization, or device primarily responsible for internal coherence of the content.) + */ + public List getEditor() { + if (this.editor == null) + this.editor = new ArrayList(); + return this.editor; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public EvidenceReport setEditor(List theEditor) { + this.editor = theEditor; + return this; + } + + public boolean hasEditor() { + if (this.editor == null) + return false; + for (ContactDetail item : this.editor) + if (!item.isEmpty()) + return true; + return false; + } + + public ContactDetail addEditor() { //3 + ContactDetail t = new ContactDetail(); + if (this.editor == null) + this.editor = new ArrayList(); + this.editor.add(t); + return t; + } + + public EvidenceReport addEditor(ContactDetail t) { //3 + if (t == null) + return this; + if (this.editor == null) + this.editor = new ArrayList(); + this.editor.add(t); + return this; + } + + /** + * @return The first repetition of repeating field {@link #editor}, creating it if it does not already exist {3} + */ + public ContactDetail getEditorFirstRep() { + if (getEditor().isEmpty()) { + addEditor(); + } + return getEditor().get(0); + } + + /** + * @return {@link #reviewer} (An individiual, organization, or device primarily responsible for review of some aspect of the content.) + */ + public List getReviewer() { + if (this.reviewer == null) + this.reviewer = new ArrayList(); + return this.reviewer; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public EvidenceReport setReviewer(List theReviewer) { + this.reviewer = theReviewer; + return this; + } + + public boolean hasReviewer() { + if (this.reviewer == null) + return false; + for (ContactDetail item : this.reviewer) + if (!item.isEmpty()) + return true; + return false; + } + + public ContactDetail addReviewer() { //3 + ContactDetail t = new ContactDetail(); + if (this.reviewer == null) + this.reviewer = new ArrayList(); + this.reviewer.add(t); + return t; + } + + public EvidenceReport addReviewer(ContactDetail t) { //3 + if (t == null) + return this; + if (this.reviewer == null) + this.reviewer = new ArrayList(); + this.reviewer.add(t); + return this; + } + + /** + * @return The first repetition of repeating field {@link #reviewer}, creating it if it does not already exist {3} + */ + public ContactDetail getReviewerFirstRep() { + if (getReviewer().isEmpty()) { + addReviewer(); + } + return getReviewer().get(0); + } + + /** + * @return {@link #endorser} (An individiual, organization, or device responsible for officially endorsing the content for use in some setting.) + */ + public List getEndorser() { + if (this.endorser == null) + this.endorser = new ArrayList(); + return this.endorser; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public EvidenceReport setEndorser(List theEndorser) { + this.endorser = theEndorser; + return this; + } + + public boolean hasEndorser() { + if (this.endorser == null) + return false; + for (ContactDetail item : this.endorser) + if (!item.isEmpty()) + return true; + return false; + } + + public ContactDetail addEndorser() { //3 + ContactDetail t = new ContactDetail(); + if (this.endorser == null) + this.endorser = new ArrayList(); + this.endorser.add(t); + return t; + } + + public EvidenceReport addEndorser(ContactDetail t) { //3 + if (t == null) + return this; + if (this.endorser == null) + this.endorser = new ArrayList(); + this.endorser.add(t); + return this; + } + + /** + * @return The first repetition of repeating field {@link #endorser}, creating it if it does not already exist {3} + */ + public ContactDetail getEndorserFirstRep() { + if (getEndorser().isEmpty()) { + addEndorser(); + } + return getEndorser().get(0); + } + + /** + * @return {@link #relatesTo} (Relationships that this composition has with other compositions or documents that already exist.) + */ + public List getRelatesTo() { + if (this.relatesTo == null) + this.relatesTo = new ArrayList(); + return this.relatesTo; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public EvidenceReport setRelatesTo(List theRelatesTo) { + this.relatesTo = theRelatesTo; + return this; + } + + public boolean hasRelatesTo() { + if (this.relatesTo == null) + return false; + for (EvidenceReportRelatesToComponent item : this.relatesTo) + if (!item.isEmpty()) + return true; + return false; + } + + public EvidenceReportRelatesToComponent addRelatesTo() { //3 + EvidenceReportRelatesToComponent t = new EvidenceReportRelatesToComponent(); + if (this.relatesTo == null) + this.relatesTo = new ArrayList(); + this.relatesTo.add(t); + return t; + } + + public EvidenceReport addRelatesTo(EvidenceReportRelatesToComponent t) { //3 + if (t == null) + return this; + if (this.relatesTo == null) + this.relatesTo = new ArrayList(); + this.relatesTo.add(t); + return this; + } + + /** + * @return The first repetition of repeating field {@link #relatesTo}, creating it if it does not already exist {3} + */ + public EvidenceReportRelatesToComponent getRelatesToFirstRep() { + if (getRelatesTo().isEmpty()) { + addRelatesTo(); + } + return getRelatesTo().get(0); + } + + /** + * @return {@link #section} (The root of the sections that make up the composition.) + */ + public List getSection() { + if (this.section == null) + this.section = new ArrayList(); + return this.section; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public EvidenceReport setSection(List theSection) { + this.section = theSection; + return this; + } + + public boolean hasSection() { + if (this.section == null) + return false; + for (SectionComponent item : this.section) + if (!item.isEmpty()) + return true; + return false; + } + + public SectionComponent addSection() { //3 + SectionComponent t = new SectionComponent(); + if (this.section == null) + this.section = new ArrayList(); + this.section.add(t); + return t; + } + + public EvidenceReport addSection(SectionComponent t) { //3 + if (t == null) + return this; + if (this.section == null) + this.section = new ArrayList(); + this.section.add(t); + return this; + } + + /** + * @return The first repetition of repeating field {@link #section}, creating it if it does not already exist {3} + */ + public SectionComponent getSectionFirstRep() { + if (getSection().isEmpty()) { + addSection(); + } + return getSection().get(0); + } + + /** + * 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 evidence report when it is referenced in a specification, model, design or instance. This is an arbitrary value managed by the evidence report 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 \"EvidenceReport\" 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 evidence report when it is referenced in a specification, model, design or instance. This is an arbitrary value managed by the evidence report 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 EvidenceReport setVersionElement(StringType value) { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"version\""); + } + public String getVersion() { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"version\""); + } + /** + * @param value The identifier that is used to identify this version of the evidence report when it is referenced in a specification, model, design or instance. This is an arbitrary value managed by the evidence report 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 EvidenceReport setVersion(String value) { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"version\""); + } + /** + * not supported on this implementation + */ + @Override + public int getNameMax() { + return 0; + } + /** + * @return {@link #name} (A natural language name identifying the evidence report. This name should be usable as an identifier for the module by machine processing applications such as code generation.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value + */ + public StringType getNameElement() { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"name\""); + } + + public boolean hasNameElement() { + return false; + } + public boolean hasName() { + return false; + } + + /** + * @param value {@link #name} (A natural language name identifying the evidence report. This name should be usable as an identifier for the module by machine processing applications such as code generation.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value + */ + public EvidenceReport setNameElement(StringType value) { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"name\""); + } + public String getName() { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"name\""); + } + /** + * @param value A natural language name identifying the evidence report. This name should be usable as an identifier for the module by machine processing applications such as code generation. + */ + public EvidenceReport setName(String value) { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"name\""); + } + /** + * not supported on this implementation + */ + @Override + public int getTitleMax() { + return 0; + } + /** + * @return {@link #title} (A short, descriptive, user-friendly title for the evidence report.). This is the underlying object with id, value and extensions. The accessor "getTitle" gives direct access to the value + */ + public StringType getTitleElement() { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"title\""); + } + + public boolean hasTitleElement() { + return false; + } + public boolean hasTitle() { + return false; + } + + /** + * @param value {@link #title} (A short, descriptive, user-friendly title for the evidence report.). This is the underlying object with id, value and extensions. The accessor "getTitle" gives direct access to the value + */ + public EvidenceReport setTitleElement(StringType value) { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"title\""); + } + public String getTitle() { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"title\""); + } + /** + * @param value A short, descriptive, user-friendly title for the evidence report. + */ + public EvidenceReport setTitle(String value) { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"title\""); + } + /** + * not supported on this implementation + */ + @Override + public int getExperimentalMax() { + return 0; + } + /** + * @return {@link #experimental} (A Boolean value to indicate that this evidence report is authored for testing purposes (or education/evaluation/marketing) and is not intended to be used for genuine usage.). This is the underlying object with id, value and extensions. The accessor "getExperimental" gives direct access to the value + */ + public BooleanType getExperimentalElement() { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"experimental\""); + } + + public boolean hasExperimentalElement() { + return false; + } + public boolean hasExperimental() { + return false; + } + + /** + * @param value {@link #experimental} (A Boolean value to indicate that this evidence report is authored for testing purposes (or education/evaluation/marketing) and is not intended to be used for genuine usage.). This is the underlying object with id, value and extensions. The accessor "getExperimental" gives direct access to the value + */ + public EvidenceReport setExperimentalElement(BooleanType value) { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"experimental\""); + } + public boolean getExperimental() { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"experimental\""); + } + /** + * @param value A Boolean value to indicate that this evidence report is authored for testing purposes (or education/evaluation/marketing) and is not intended to be used for genuine usage. + */ + public EvidenceReport setExperimental(boolean value) { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"experimental\""); + } + /** + * not supported on this implementation + */ + @Override + public int getDateMax() { + return 0; + } + /** + * @return {@link #date} (The date (and optionally time) when the evidence report was published. The date must change when the business version changes and it must change if the status code changes. In addition, it should change when the substantive content of the evidence report changes.). This is the underlying object with id, value and extensions. The accessor "getDate" gives direct access to the value + */ + public DateTimeType getDateElement() { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"date\""); + } + + public boolean hasDateElement() { + return false; + } + public boolean hasDate() { + return false; + } + + /** + * @param value {@link #date} (The date (and optionally time) when the evidence report was published. The date must change when the business version changes and it must change if the status code changes. In addition, it should change when the substantive content of the evidence report changes.). This is the underlying object with id, value and extensions. The accessor "getDate" gives direct access to the value + */ + public EvidenceReport setDateElement(DateTimeType value) { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"date\""); + } + public Date getDate() { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"date\""); + } + /** + * @param value The date (and optionally time) when the evidence report was published. The date must change when the business version changes and it must change if the status code changes. In addition, it should change when the substantive content of the evidence report changes. + */ + public EvidenceReport setDate(Date value) { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"date\""); + } + /** + * not supported on this implementation + */ + @Override + public int getDescriptionMax() { + return 0; + } + /** + * @return {@link #description} (A free text natural language description of the evidence report from a consumer's perspective.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value + */ + public MarkdownType getDescriptionElement() { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"description\""); + } + + public boolean hasDescriptionElement() { + return false; + } + public boolean hasDescription() { + return false; + } + + /** + * @param value {@link #description} (A free text natural language description of the evidence report from a consumer's perspective.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value + */ + public EvidenceReport setDescriptionElement(MarkdownType value) { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"description\""); + } + public String getDescription() { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"description\""); + } + /** + * @param value A free text natural language description of the evidence report from a consumer's perspective. + */ + public EvidenceReport setDescription(String value) { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"description\""); + } + /** + * not supported on this implementation + */ + @Override + public int getJurisdictionMax() { + return 0; + } + /** + * @return {@link #jurisdiction} (A legal or geographic region in which the evidence report is intended to be used.) + */ + public List getJurisdiction() { + return new ArrayList<>(); + } + /** + * @return Returns a reference to this for easy method chaining + */ + public EvidenceReport setJurisdiction(List theJurisdiction) { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"jurisdiction\""); + } + public boolean hasJurisdiction() { + return false; + } + + public CodeableConcept addJurisdiction() { //3 + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"jurisdiction\""); + } + public EvidenceReport addJurisdiction(CodeableConcept t) { //3 + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"jurisdiction\""); + } + /** + * @return The first repetition of repeating field {@link #jurisdiction}, creating it if it does not already exist {2} + */ + public CodeableConcept getJurisdictionFirstRep() { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"jurisdiction\""); + } + /** + * not supported on this implementation + */ + @Override + public int getPurposeMax() { + return 0; + } + /** + * @return {@link #purpose} (Explanation of why this evidence report is needed and why it has been designed as it has.). This is the underlying object with id, value and extensions. The accessor "getPurpose" gives direct access to the value + */ + public MarkdownType getPurposeElement() { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"purpose\""); + } + + public boolean hasPurposeElement() { + return false; + } + public boolean hasPurpose() { + return false; + } + + /** + * @param value {@link #purpose} (Explanation of why this evidence report is needed and why it has been designed as it has.). This is the underlying object with id, value and extensions. The accessor "getPurpose" gives direct access to the value + */ + public EvidenceReport setPurposeElement(MarkdownType value) { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"purpose\""); + } + public String getPurpose() { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"purpose\""); + } + /** + * @param value Explanation of why this evidence report is needed and why it has been designed as it has. + */ + public EvidenceReport setPurpose(String value) { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"purpose\""); + } + /** + * not supported on this implementation + */ + @Override + public int getCopyrightMax() { + return 0; + } + /** + * @return {@link #copyright} (A copyright statement relating to the evidence report and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the evidence report.). This is the underlying object with id, value and extensions. The accessor "getCopyright" gives direct access to the value + */ + public MarkdownType getCopyrightElement() { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"copyright\""); + } + + public boolean hasCopyrightElement() { + return false; + } + public boolean hasCopyright() { + return false; + } + + /** + * @param value {@link #copyright} (A copyright statement relating to the evidence report and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the evidence report.). This is the underlying object with id, value and extensions. The accessor "getCopyright" gives direct access to the value + */ + public EvidenceReport setCopyrightElement(MarkdownType value) { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"copyright\""); + } + public String getCopyright() { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"copyright\""); + } + /** + * @param value A copyright statement relating to the evidence report and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the evidence report. + */ + public EvidenceReport setCopyright(String value) { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"copyright\""); + } + /** + * not supported on this implementation + */ + @Override + public int getApprovalDateMax() { + return 0; + } + /** + * @return {@link #approvalDate} (The date on which the resource content was approved by the publisher. Approval happens once when the content is officially approved for usage.). This is the underlying object with id, value and extensions. The accessor "getApprovalDate" gives direct access to the value + */ + public DateType getApprovalDateElement() { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"approvalDate\""); + } + + public boolean hasApprovalDateElement() { + return false; + } + public boolean hasApprovalDate() { + return false; + } + + /** + * @param value {@link #approvalDate} (The date on which the resource content was approved by the publisher. Approval happens once when the content is officially approved for usage.). This is the underlying object with id, value and extensions. The accessor "getApprovalDate" gives direct access to the value + */ + public EvidenceReport setApprovalDateElement(DateType value) { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"approvalDate\""); + } + public Date getApprovalDate() { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"approvalDate\""); + } + /** + * @param value The date on which the resource content was approved by the publisher. Approval happens once when the content is officially approved for usage. + */ + public EvidenceReport setApprovalDate(Date value) { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"approvalDate\""); + } + /** + * not supported on this implementation + */ + @Override + public int getLastReviewDateMax() { + return 0; + } + /** + * @return {@link #lastReviewDate} (The date on which the resource content was last reviewed. Review happens periodically after approval but does not change the original approval date.). This is the underlying object with id, value and extensions. The accessor "getLastReviewDate" gives direct access to the value + */ + public DateType getLastReviewDateElement() { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"lastReviewDate\""); + } + + public boolean hasLastReviewDateElement() { + return false; + } + public boolean hasLastReviewDate() { + return false; + } + + /** + * @param value {@link #lastReviewDate} (The date on which the resource content was last reviewed. Review happens periodically after approval but does not change the original approval date.). This is the underlying object with id, value and extensions. The accessor "getLastReviewDate" gives direct access to the value + */ + public EvidenceReport setLastReviewDateElement(DateType value) { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"lastReviewDate\""); + } + public Date getLastReviewDate() { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"lastReviewDate\""); + } + /** + * @param value The date on which the resource content was last reviewed. Review happens periodically after approval but does not change the original approval date. + */ + public EvidenceReport setLastReviewDate(Date value) { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"lastReviewDate\""); + } + /** + * not supported on this implementation + */ + @Override + public int getEffectivePeriodMax() { + return 0; + } + /** + * @return {@link #effectivePeriod} (The period during which the evidence report content was or is planned to be in active use.) + */ + public Period getEffectivePeriod() { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"effectivePeriod\""); + } + public boolean hasEffectivePeriod() { + return false; + } + /** + * @param value {@link #effectivePeriod} (The period during which the evidence report content was or is planned to be in active use.) + */ + public EvidenceReport setEffectivePeriod(Period value) { + throw new Error("The resource type \"EvidenceReport\" does not implement the property \"effectivePeriod\""); + } + + protected void listChildren(List children) { + super.listChildren(children); + children.add(new Property("url", "uri", "An absolute URI that is used to identify this EvidenceReport 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("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 evidence report instances.", 0, java.lang.Integer.MAX_VALUE, useContext)); + children.add(new Property("identifier", "Identifier", "A formal identifier that is used to identify this EvidenceReport 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 EvidenceReport.", 0, java.lang.Integer.MAX_VALUE, relatedIdentifier)); + children.add(new Property("citeAs", "Reference(Citation)", "Citation Resource or display of suggested citation for this report.", 0, 1, citeAs)); + children.add(new Property("type", "CodeableConcept", "Specifies the kind of report, such as grouping of classifiers, search results, or human-compiled expression.", 0, 1, type)); + children.add(new Property("note", "Annotation", "Used for footnotes and annotations.", 0, java.lang.Integer.MAX_VALUE, note)); + children.add(new Property("relatedArtifact", "RelatedArtifact", "Link, description or reference to artifact associated with the report.", 0, java.lang.Integer.MAX_VALUE, relatedArtifact)); + children.add(new Property("subject", "", "Specifies the subject or focus of the report. Answers \"What is this report about?\".", 0, 1, subject)); + children.add(new Property("publisher", "string", "The name of the organization or individual that published the evidence report.", 0, 1, publisher)); + children.add(new Property("contact", "ContactDetail", "Contact details to assist a user in finding and communicating with the publisher.", 0, java.lang.Integer.MAX_VALUE, contact)); + children.add(new Property("author", "ContactDetail", "An individiual, organization, or device primarily involved in the creation and maintenance of the content.", 0, java.lang.Integer.MAX_VALUE, author)); + children.add(new Property("editor", "ContactDetail", "An individiual, organization, or device primarily responsible for internal coherence of the content.", 0, java.lang.Integer.MAX_VALUE, editor)); + children.add(new Property("reviewer", "ContactDetail", "An individiual, organization, or device primarily responsible for review of some aspect of the content.", 0, java.lang.Integer.MAX_VALUE, reviewer)); + children.add(new Property("endorser", "ContactDetail", "An individiual, organization, or device responsible for officially endorsing the content for use in some setting.", 0, java.lang.Integer.MAX_VALUE, endorser)); + children.add(new Property("relatesTo", "", "Relationships that this composition has with other compositions or documents that already exist.", 0, java.lang.Integer.MAX_VALUE, relatesTo)); + children.add(new Property("section", "", "The root of the sections that make up the composition.", 0, java.lang.Integer.MAX_VALUE, section)); + } + + @Override + 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 EvidenceReport 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 -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 evidence report 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 EvidenceReport 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 EvidenceReport.", 0, java.lang.Integer.MAX_VALUE, relatedIdentifier); + case -1360156695: /*citeAs*/ return new Property("citeAs", "Reference(Citation)", "Citation Resource or display of suggested citation for this report.", 0, 1, citeAs); + case 3575610: /*type*/ return new Property("type", "CodeableConcept", "Specifies the kind of report, such as grouping of classifiers, search results, or human-compiled expression.", 0, 1, type); + case 3387378: /*note*/ return new Property("note", "Annotation", "Used for footnotes and annotations.", 0, java.lang.Integer.MAX_VALUE, note); + case 666807069: /*relatedArtifact*/ return new Property("relatedArtifact", "RelatedArtifact", "Link, description or reference to artifact associated with the report.", 0, java.lang.Integer.MAX_VALUE, relatedArtifact); + case -1867885268: /*subject*/ return new Property("subject", "", "Specifies the subject or focus of the report. Answers \"What is this report about?\".", 0, 1, subject); + case 1447404028: /*publisher*/ return new Property("publisher", "string", "The name of the organization or individual that published the evidence report.", 0, 1, publisher); + case 951526432: /*contact*/ return new Property("contact", "ContactDetail", "Contact details to assist a user in finding and communicating with the publisher.", 0, java.lang.Integer.MAX_VALUE, contact); + case -1406328437: /*author*/ return new Property("author", "ContactDetail", "An individiual, organization, or device primarily involved in the creation and maintenance of the content.", 0, java.lang.Integer.MAX_VALUE, author); + case -1307827859: /*editor*/ return new Property("editor", "ContactDetail", "An individiual, organization, or device primarily responsible for internal coherence of the content.", 0, java.lang.Integer.MAX_VALUE, editor); + case -261190139: /*reviewer*/ return new Property("reviewer", "ContactDetail", "An individiual, organization, or device primarily responsible for review of some aspect of the content.", 0, java.lang.Integer.MAX_VALUE, reviewer); + case 1740277666: /*endorser*/ return new Property("endorser", "ContactDetail", "An individiual, organization, or device responsible for officially endorsing the content for use in some setting.", 0, java.lang.Integer.MAX_VALUE, endorser); + case -7765931: /*relatesTo*/ return new Property("relatesTo", "", "Relationships that this composition has with other compositions or documents that already exist.", 0, java.lang.Integer.MAX_VALUE, relatesTo); + case 1970241253: /*section*/ return new Property("section", "", "The root of the sections that make up the composition.", 0, java.lang.Integer.MAX_VALUE, section); + default: return super.getNamedProperty(_hash, _name, _checkValid); + } + + } + + @Override + 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 -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 -1360156695: /*citeAs*/ return this.citeAs == null ? new Base[0] : new Base[] {this.citeAs}; // Reference + case 3575610: /*type*/ return this.type == null ? new Base[0] : new Base[] {this.type}; // CodeableConcept + case 3387378: /*note*/ return this.note == null ? new Base[0] : this.note.toArray(new Base[this.note.size()]); // Annotation + case 666807069: /*relatedArtifact*/ return this.relatedArtifact == null ? new Base[0] : this.relatedArtifact.toArray(new Base[this.relatedArtifact.size()]); // RelatedArtifact + case -1867885268: /*subject*/ return this.subject == null ? new Base[0] : new Base[] {this.subject}; // EvidenceReportSubjectComponent + case 1447404028: /*publisher*/ return this.publisher == null ? new Base[0] : new Base[] {this.publisher}; // StringType + case 951526432: /*contact*/ return this.contact == null ? new Base[0] : this.contact.toArray(new Base[this.contact.size()]); // ContactDetail + case -1406328437: /*author*/ return this.author == null ? new Base[0] : this.author.toArray(new Base[this.author.size()]); // ContactDetail + case -1307827859: /*editor*/ return this.editor == null ? new Base[0] : this.editor.toArray(new Base[this.editor.size()]); // ContactDetail + case -261190139: /*reviewer*/ return this.reviewer == null ? new Base[0] : this.reviewer.toArray(new Base[this.reviewer.size()]); // ContactDetail + case 1740277666: /*endorser*/ return this.endorser == null ? new Base[0] : this.endorser.toArray(new Base[this.endorser.size()]); // ContactDetail + case -7765931: /*relatesTo*/ return this.relatesTo == null ? new Base[0] : this.relatesTo.toArray(new Base[this.relatesTo.size()]); // EvidenceReportRelatesToComponent + case 1970241253: /*section*/ return this.section == null ? new Base[0] : this.section.toArray(new Base[this.section.size()]); // SectionComponent + default: return super.getProperty(hash, name, checkValid); + } + + } + + @Override + public Base setProperty(int hash, String name, Base value) throws FHIRException { + switch (hash) { + case 116079: // url + this.url = TypeConvertor.castToUri(value); // UriType + return value; + case -892481550: // status + value = new PublicationStatusEnumFactory().fromType(TypeConvertor.castToCode(value)); + this.status = (Enumeration) value; // Enumeration + return value; + case -669707736: // useContext + this.getUseContext().add(TypeConvertor.castToUsageContext(value)); // UsageContext + return value; + case -1618432855: // identifier + this.getIdentifier().add(TypeConvertor.castToIdentifier(value)); // Identifier + return value; + case -1007604940: // relatedIdentifier + this.getRelatedIdentifier().add(TypeConvertor.castToIdentifier(value)); // Identifier + return value; + case -1360156695: // citeAs + this.citeAs = TypeConvertor.castToReference(value); // Reference + return value; + case 3575610: // type + this.type = TypeConvertor.castToCodeableConcept(value); // CodeableConcept + return value; + case 3387378: // note + this.getNote().add(TypeConvertor.castToAnnotation(value)); // Annotation + return value; + case 666807069: // relatedArtifact + this.getRelatedArtifact().add(TypeConvertor.castToRelatedArtifact(value)); // RelatedArtifact + return value; + case -1867885268: // subject + this.subject = (EvidenceReportSubjectComponent) value; // EvidenceReportSubjectComponent + return value; + case 1447404028: // publisher + this.publisher = TypeConvertor.castToString(value); // StringType + return value; + case 951526432: // contact + this.getContact().add(TypeConvertor.castToContactDetail(value)); // ContactDetail + return value; + case -1406328437: // author + this.getAuthor().add(TypeConvertor.castToContactDetail(value)); // ContactDetail + return value; + case -1307827859: // editor + this.getEditor().add(TypeConvertor.castToContactDetail(value)); // ContactDetail + return value; + case -261190139: // reviewer + this.getReviewer().add(TypeConvertor.castToContactDetail(value)); // ContactDetail + return value; + case 1740277666: // endorser + this.getEndorser().add(TypeConvertor.castToContactDetail(value)); // ContactDetail + return value; + case -7765931: // relatesTo + this.getRelatesTo().add((EvidenceReportRelatesToComponent) value); // EvidenceReportRelatesToComponent + return value; + case 1970241253: // section + this.getSection().add((SectionComponent) value); // SectionComponent + return value; + default: return super.setProperty(hash, name, value); + } + + } + + @Override + public Base setProperty(String name, Base value) throws FHIRException { + if (name.equals("url")) { + this.url = TypeConvertor.castToUri(value); // UriType + } else if (name.equals("status")) { + value = new PublicationStatusEnumFactory().fromType(TypeConvertor.castToCode(value)); + this.status = (Enumeration) value; // Enumeration + } else if (name.equals("useContext")) { + this.getUseContext().add(TypeConvertor.castToUsageContext(value)); + } else if (name.equals("identifier")) { + this.getIdentifier().add(TypeConvertor.castToIdentifier(value)); + } else if (name.equals("relatedIdentifier")) { + this.getRelatedIdentifier().add(TypeConvertor.castToIdentifier(value)); + } else if (name.equals("citeAs")) { + this.citeAs = TypeConvertor.castToReference(value); // Reference + } else if (name.equals("type")) { + this.type = TypeConvertor.castToCodeableConcept(value); // CodeableConcept + } else if (name.equals("note")) { + this.getNote().add(TypeConvertor.castToAnnotation(value)); + } else if (name.equals("relatedArtifact")) { + this.getRelatedArtifact().add(TypeConvertor.castToRelatedArtifact(value)); + } else if (name.equals("subject")) { + this.subject = (EvidenceReportSubjectComponent) value; // EvidenceReportSubjectComponent + } else if (name.equals("publisher")) { + this.publisher = TypeConvertor.castToString(value); // StringType + } else if (name.equals("contact")) { + this.getContact().add(TypeConvertor.castToContactDetail(value)); + } else if (name.equals("author")) { + this.getAuthor().add(TypeConvertor.castToContactDetail(value)); + } else if (name.equals("editor")) { + this.getEditor().add(TypeConvertor.castToContactDetail(value)); + } else if (name.equals("reviewer")) { + this.getReviewer().add(TypeConvertor.castToContactDetail(value)); + } else if (name.equals("endorser")) { + this.getEndorser().add(TypeConvertor.castToContactDetail(value)); + } else if (name.equals("relatesTo")) { + this.getRelatesTo().add((EvidenceReportRelatesToComponent) value); + } else if (name.equals("section")) { + this.getSection().add((SectionComponent) value); + } else + return super.setProperty(name, value); + return value; + } + + @Override + public Base makeProperty(int hash, String name) throws FHIRException { + switch (hash) { + case 116079: return getUrlElement(); + case -892481550: return getStatusElement(); + case -669707736: return addUseContext(); + case -1618432855: return addIdentifier(); + case -1007604940: return addRelatedIdentifier(); + case -1360156695: return getCiteAs(); + case 3575610: return getType(); + case 3387378: return addNote(); + case 666807069: return addRelatedArtifact(); + case -1867885268: return getSubject(); + case 1447404028: return getPublisherElement(); + case 951526432: return addContact(); + case -1406328437: return addAuthor(); + case -1307827859: return addEditor(); + case -261190139: return addReviewer(); + case 1740277666: return addEndorser(); + case -7765931: return addRelatesTo(); + case 1970241253: return addSection(); + default: return super.makeProperty(hash, name); + } + + } + + @Override + public String[] getTypesForProperty(int hash, String name) throws FHIRException { + switch (hash) { + case 116079: /*url*/ return new String[] {"uri"}; + 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 -1360156695: /*citeAs*/ return new String[] {"Reference"}; + case 3575610: /*type*/ return new String[] {"CodeableConcept"}; + case 3387378: /*note*/ return new String[] {"Annotation"}; + case 666807069: /*relatedArtifact*/ return new String[] {"RelatedArtifact"}; + case -1867885268: /*subject*/ return new String[] {}; + case 1447404028: /*publisher*/ return new String[] {"string"}; + case 951526432: /*contact*/ return new String[] {"ContactDetail"}; + case -1406328437: /*author*/ return new String[] {"ContactDetail"}; + case -1307827859: /*editor*/ return new String[] {"ContactDetail"}; + case -261190139: /*reviewer*/ return new String[] {"ContactDetail"}; + case 1740277666: /*endorser*/ return new String[] {"ContactDetail"}; + case -7765931: /*relatesTo*/ return new String[] {}; + case 1970241253: /*section*/ return new String[] {}; + default: return super.getTypesForProperty(hash, name); + } + + } + + @Override + public Base addChild(String name) throws FHIRException { + if (name.equals("url")) { + throw new FHIRException("Cannot call addChild on a primitive type EvidenceReport.url"); + } + else if (name.equals("status")) { + throw new FHIRException("Cannot call addChild on a primitive type EvidenceReport.status"); + } + else if (name.equals("useContext")) { + return addUseContext(); + } + else if (name.equals("identifier")) { + return addIdentifier(); + } + else if (name.equals("relatedIdentifier")) { + return addRelatedIdentifier(); + } + else if (name.equals("citeAs")) { + this.citeAs = new Reference(); + return this.citeAs; + } + else if (name.equals("type")) { + this.type = new CodeableConcept(); + return this.type; + } + else if (name.equals("note")) { + return addNote(); + } + else if (name.equals("relatedArtifact")) { + return addRelatedArtifact(); + } + else if (name.equals("subject")) { + this.subject = new EvidenceReportSubjectComponent(); + return this.subject; + } + else if (name.equals("publisher")) { + throw new FHIRException("Cannot call addChild on a primitive type EvidenceReport.publisher"); + } + else if (name.equals("contact")) { + return addContact(); + } + else if (name.equals("author")) { + return addAuthor(); + } + else if (name.equals("editor")) { + return addEditor(); + } + else if (name.equals("reviewer")) { + return addReviewer(); + } + else if (name.equals("endorser")) { + return addEndorser(); + } + else if (name.equals("relatesTo")) { + return addRelatesTo(); + } + else if (name.equals("section")) { + return addSection(); + } + else + return super.addChild(name); + } + + public String fhirType() { + return "EvidenceReport"; + + } + + public EvidenceReport copy() { + EvidenceReport dst = new EvidenceReport(); + copyValues(dst); + return dst; + } + + public void copyValues(EvidenceReport dst) { + super.copyValues(dst); + dst.url = url == null ? null : url.copy(); + dst.status = status == null ? null : status.copy(); + if (useContext != null) { + dst.useContext = new ArrayList(); + for (UsageContext i : useContext) + dst.useContext.add(i.copy()); + }; + if (identifier != null) { + dst.identifier = new ArrayList(); + for (Identifier i : identifier) + dst.identifier.add(i.copy()); + }; + if (relatedIdentifier != null) { + dst.relatedIdentifier = new ArrayList(); + for (Identifier i : relatedIdentifier) + dst.relatedIdentifier.add(i.copy()); + }; + dst.citeAs = citeAs == null ? null : citeAs.copy(); + dst.type = type == null ? null : type.copy(); + if (note != null) { + dst.note = new ArrayList(); + for (Annotation i : note) + dst.note.add(i.copy()); + }; + if (relatedArtifact != null) { + dst.relatedArtifact = new ArrayList(); + for (RelatedArtifact i : relatedArtifact) + dst.relatedArtifact.add(i.copy()); + }; + dst.subject = subject == null ? null : subject.copy(); + dst.publisher = publisher == null ? null : publisher.copy(); + if (contact != null) { + dst.contact = new ArrayList(); + for (ContactDetail i : contact) + dst.contact.add(i.copy()); + }; + if (author != null) { + dst.author = new ArrayList(); + for (ContactDetail i : author) + dst.author.add(i.copy()); + }; + if (editor != null) { + dst.editor = new ArrayList(); + for (ContactDetail i : editor) + dst.editor.add(i.copy()); + }; + if (reviewer != null) { + dst.reviewer = new ArrayList(); + for (ContactDetail i : reviewer) + dst.reviewer.add(i.copy()); + }; + if (endorser != null) { + dst.endorser = new ArrayList(); + for (ContactDetail i : endorser) + dst.endorser.add(i.copy()); + }; + if (relatesTo != null) { + dst.relatesTo = new ArrayList(); + for (EvidenceReportRelatesToComponent i : relatesTo) + dst.relatesTo.add(i.copy()); + }; + if (section != null) { + dst.section = new ArrayList(); + for (SectionComponent i : section) + dst.section.add(i.copy()); + }; + } + + protected EvidenceReport typedCopy() { + return copy(); + } + + @Override + public boolean equalsDeep(Base other_) { + if (!super.equalsDeep(other_)) + return false; + if (!(other_ instanceof EvidenceReport)) + return false; + EvidenceReport o = (EvidenceReport) other_; + 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(citeAs, o.citeAs, true) && compareDeep(type, o.type, true) && compareDeep(note, o.note, true) + && compareDeep(relatedArtifact, o.relatedArtifact, true) && compareDeep(subject, o.subject, true) + && compareDeep(publisher, o.publisher, true) && compareDeep(contact, o.contact, true) && compareDeep(author, o.author, true) + && compareDeep(editor, o.editor, true) && compareDeep(reviewer, o.reviewer, true) && compareDeep(endorser, o.endorser, true) + && compareDeep(relatesTo, o.relatesTo, true) && compareDeep(section, o.section, true); + } + + @Override + public boolean equalsShallow(Base other_) { + if (!super.equalsShallow(other_)) + return false; + if (!(other_ instanceof EvidenceReport)) + return false; + EvidenceReport o = (EvidenceReport) other_; + return compareValues(url, o.url, true) && compareValues(status, o.status, true) && compareValues(publisher, o.publisher, true) + ; + } + + public boolean isEmpty() { + return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(url, status, useContext + , identifier, relatedIdentifier, citeAs, type, note, relatedArtifact, subject + , publisher, contact, author, editor, reviewer, endorser, relatesTo, section + ); + } + + @Override + public ResourceType getResourceType() { + return ResourceType.EvidenceReport; + } + + /** + * Search parameter: context-quantity + *

+ * Description: A quantity- or range-valued use context assigned to the evidence report
+ * Type: quantity
+ * Path: (EvidenceReport.useContext.value as Quantity) | (EvidenceReport.useContext.value as Range)
+ *

+ */ + @SearchParamDefinition(name="context-quantity", path="(EvidenceReport.useContext.value as Quantity) | (EvidenceReport.useContext.value as Range)", description="A quantity- or range-valued use context assigned to the evidence report", type="quantity" ) + public static final String SP_CONTEXT_QUANTITY = "context-quantity"; + /** + * Fluent Client search parameter constant for context-quantity + *

+ * Description: A quantity- or range-valued use context assigned to the evidence report
+ * Type: quantity
+ * Path: (EvidenceReport.useContext.value as Quantity) | (EvidenceReport.useContext.value as Range)
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.QuantityClientParam CONTEXT_QUANTITY = new ca.uhn.fhir.rest.gclient.QuantityClientParam(SP_CONTEXT_QUANTITY); + + /** + * Search parameter: context-type-quantity + *

+ * Description: A use context type and quantity- or range-based value assigned to the evidence report
+ * Type: composite
+ * Path: EvidenceReport.useContext
+ *

+ */ + @SearchParamDefinition(name="context-type-quantity", path="EvidenceReport.useContext", description="A use context type and quantity- or range-based value assigned to the evidence report", type="composite", compositeOf={"context-type", "context-quantity"} ) + public static final String SP_CONTEXT_TYPE_QUANTITY = "context-type-quantity"; + /** + * Fluent Client search parameter constant for context-type-quantity + *

+ * Description: A use context type and quantity- or range-based value assigned to the evidence report
+ * Type: composite
+ * Path: EvidenceReport.useContext
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.CompositeClientParam CONTEXT_TYPE_QUANTITY = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_CONTEXT_TYPE_QUANTITY); + + /** + * Search parameter: context-type-value + *

+ * Description: A use context type and value assigned to the evidence report
+ * Type: composite
+ * Path: EvidenceReport.useContext
+ *

+ */ + @SearchParamDefinition(name="context-type-value", path="EvidenceReport.useContext", description="A use context type and value assigned to the evidence report", type="composite", compositeOf={"context-type", "context"} ) + public static final String SP_CONTEXT_TYPE_VALUE = "context-type-value"; + /** + * Fluent Client search parameter constant for context-type-value + *

+ * Description: A use context type and value assigned to the evidence report
+ * Type: composite
+ * Path: EvidenceReport.useContext
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.CompositeClientParam CONTEXT_TYPE_VALUE = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_CONTEXT_TYPE_VALUE); + + /** + * Search parameter: context-type + *

+ * Description: A type of use context assigned to the evidence report
+ * Type: token
+ * Path: EvidenceReport.useContext.code
+ *

+ */ + @SearchParamDefinition(name="context-type", path="EvidenceReport.useContext.code", description="A type of use context assigned to the evidence report", type="token" ) + public static final String SP_CONTEXT_TYPE = "context-type"; + /** + * Fluent Client search parameter constant for context-type + *

+ * Description: A type of use context assigned to the evidence report
+ * Type: token
+ * Path: EvidenceReport.useContext.code
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CONTEXT_TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CONTEXT_TYPE); + + /** + * Search parameter: context + *

+ * Description: A use context assigned to the evidence report
+ * Type: token
+ * Path: (EvidenceReport.useContext.value as CodeableConcept)
+ *

+ */ + @SearchParamDefinition(name="context", path="(EvidenceReport.useContext.value as CodeableConcept)", description="A use context assigned to the evidence report", type="token" ) + public static final String SP_CONTEXT = "context"; + /** + * Fluent Client search parameter constant for context + *

+ * Description: A use context assigned to the evidence report
+ * Type: token
+ * Path: (EvidenceReport.useContext.value as CodeableConcept)
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CONTEXT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CONTEXT); + + /** + * Search parameter: identifier + *

+ * Description: External identifier for the evidence report
+ * Type: token
+ * Path: EvidenceReport.identifier
+ *

+ */ + @SearchParamDefinition(name="identifier", path="EvidenceReport.identifier", description="External identifier for the evidence report", type="token" ) + public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: External identifier for the evidence report
+ * Type: token
+ * Path: EvidenceReport.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: publisher + *

+ * Description: Name of the publisher of the evidence report
+ * Type: string
+ * Path: EvidenceReport.publisher
+ *

+ */ + @SearchParamDefinition(name="publisher", path="EvidenceReport.publisher", description="Name of the publisher of the evidence report", type="string" ) + public static final String SP_PUBLISHER = "publisher"; + /** + * Fluent Client search parameter constant for publisher + *

+ * Description: Name of the publisher of the evidence report
+ * Type: string
+ * Path: EvidenceReport.publisher
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam PUBLISHER = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_PUBLISHER); + + /** + * Search parameter: status + *

+ * Description: The current status of the evidence report
+ * Type: token
+ * Path: EvidenceReport.status
+ *

+ */ + @SearchParamDefinition(name="status", path="EvidenceReport.status", description="The current status of the evidence report", type="token" ) + public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: The current status of the evidence report
+ * Type: token
+ * Path: EvidenceReport.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + + /** + * Search parameter: url + *

+ * Description: The uri that identifies the evidence report
+ * Type: uri
+ * Path: EvidenceReport.url
+ *

+ */ + @SearchParamDefinition(name="url", path="EvidenceReport.url", description="The uri that identifies the evidence report", type="uri" ) + public static final String SP_URL = "url"; + /** + * Fluent Client search parameter constant for url + *

+ * Description: The uri that identifies the evidence report
+ * Type: uri
+ * Path: EvidenceReport.url
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.UriClientParam URL = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_URL); + + +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EvidenceVariable.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EvidenceVariable.java index 78819edbc..cdceff1b8 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EvidenceVariable.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EvidenceVariable.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 EvidenceVariable resource describes an element that knowledge (Evidence) is about. @@ -147,114 +145,6 @@ public class EvidenceVariable extends MetadataResource { } } - public enum EvidenceVariableType { - /** - * The variable is dichotomous, such as present or absent. - */ - DICHOTOMOUS, - /** - * The variable is a continuous result such as a quantity. - */ - CONTINUOUS, - /** - * The variable is described narratively rather than quantitatively. - */ - DESCRIPTIVE, - /** - * added to help the parsers with the generic types - */ - NULL; - public static EvidenceVariableType fromCode(String codeString) throws FHIRException { - if (codeString == null || "".equals(codeString)) - return null; - if ("dichotomous".equals(codeString)) - return DICHOTOMOUS; - if ("continuous".equals(codeString)) - return CONTINUOUS; - if ("descriptive".equals(codeString)) - return DESCRIPTIVE; - if (Configuration.isAcceptInvalidEnums()) - return null; - else - throw new FHIRException("Unknown EvidenceVariableType code '"+codeString+"'"); - } - public String toCode() { - switch (this) { - case DICHOTOMOUS: return "dichotomous"; - case CONTINUOUS: return "continuous"; - case DESCRIPTIVE: return "descriptive"; - default: return "?"; - } - } - public String getSystem() { - switch (this) { - case DICHOTOMOUS: return "http://hl7.org/fhir/variable-type"; - case CONTINUOUS: return "http://hl7.org/fhir/variable-type"; - case DESCRIPTIVE: return "http://hl7.org/fhir/variable-type"; - default: return "?"; - } - } - public String getDefinition() { - switch (this) { - case DICHOTOMOUS: return "The variable is dichotomous, such as present or absent."; - case CONTINUOUS: return "The variable is a continuous result such as a quantity."; - case DESCRIPTIVE: return "The variable is described narratively rather than quantitatively."; - default: return "?"; - } - } - public String getDisplay() { - switch (this) { - case DICHOTOMOUS: return "Dichotomous"; - case CONTINUOUS: return "Continuous"; - case DESCRIPTIVE: return "Descriptive"; - default: return "?"; - } - } - } - - public static class EvidenceVariableTypeEnumFactory implements EnumFactory { - public EvidenceVariableType fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - if (codeString == null || "".equals(codeString)) - return null; - if ("dichotomous".equals(codeString)) - return EvidenceVariableType.DICHOTOMOUS; - if ("continuous".equals(codeString)) - return EvidenceVariableType.CONTINUOUS; - if ("descriptive".equals(codeString)) - return EvidenceVariableType.DESCRIPTIVE; - throw new IllegalArgumentException("Unknown EvidenceVariableType 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 ("dichotomous".equals(codeString)) - return new Enumeration(this, EvidenceVariableType.DICHOTOMOUS); - if ("continuous".equals(codeString)) - return new Enumeration(this, EvidenceVariableType.CONTINUOUS); - if ("descriptive".equals(codeString)) - return new Enumeration(this, EvidenceVariableType.DESCRIPTIVE); - throw new FHIRException("Unknown EvidenceVariableType code '"+codeString+"'"); - } - public String toCode(EvidenceVariableType code) { - if (code == EvidenceVariableType.DICHOTOMOUS) - return "dichotomous"; - if (code == EvidenceVariableType.CONTINUOUS) - return "continuous"; - if (code == EvidenceVariableType.DESCRIPTIVE) - return "descriptive"; - return "?"; - } - public String toSystem(EvidenceVariableType code) { - return code.getSystem(); - } - } - public enum GroupMeasure { /** * Aggregated using Mean of participant values. @@ -1351,6 +1241,286 @@ public class EvidenceVariable extends MetadataResource { } + } + + @Block() + public static class EvidenceVariableCategoryComponent extends BackboneElement implements IBaseBackboneElement { + /** + * A human-readable title or representation of the grouping. + */ + @Child(name = "name", type = {StringType.class}, order=1, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="Description of the grouping", formalDefinition="A human-readable title or representation of the grouping." ) + protected StringType name; + + /** + * Value or set of values that define the grouping. + */ + @Child(name = "value", type = {CodeableConcept.class, Quantity.class, Range.class}, order=2, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="Definition of the grouping", formalDefinition="Value or set of values that define the grouping." ) + protected DataType value; + + private static final long serialVersionUID = 1839679495L; + + /** + * Constructor + */ + public EvidenceVariableCategoryComponent() { + super(); + } + + /** + * @return {@link #name} (A human-readable title or representation of the grouping.). 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 EvidenceVariableCategoryComponent.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} (A human-readable title or representation of the grouping.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value + */ + public EvidenceVariableCategoryComponent setNameElement(StringType value) { + this.name = value; + return this; + } + + /** + * @return A human-readable title or representation of the grouping. + */ + public String getName() { + return this.name == null ? null : this.name.getValue(); + } + + /** + * @param value A human-readable title or representation of the grouping. + */ + public EvidenceVariableCategoryComponent 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 #value} (Value or set of values that define the grouping.) + */ + public DataType getValue() { + return this.value; + } + + /** + * @return {@link #value} (Value or set of values that define the grouping.) + */ + public CodeableConcept getValueCodeableConcept() throws FHIRException { + if (this.value == null) + this.value = new CodeableConcept(); + if (!(this.value instanceof CodeableConcept)) + throw new FHIRException("Type mismatch: the type CodeableConcept was expected, but "+this.value.getClass().getName()+" was encountered"); + return (CodeableConcept) this.value; + } + + public boolean hasValueCodeableConcept() { + return this != null && this.value instanceof CodeableConcept; + } + + /** + * @return {@link #value} (Value or set of values that define the grouping.) + */ + public Quantity getValueQuantity() throws FHIRException { + if (this.value == null) + this.value = new Quantity(); + if (!(this.value instanceof Quantity)) + throw new FHIRException("Type mismatch: the type Quantity was expected, but "+this.value.getClass().getName()+" was encountered"); + return (Quantity) this.value; + } + + public boolean hasValueQuantity() { + return this != null && this.value instanceof Quantity; + } + + /** + * @return {@link #value} (Value or set of values that define the grouping.) + */ + public Range getValueRange() throws FHIRException { + if (this.value == null) + this.value = new Range(); + if (!(this.value instanceof Range)) + throw new FHIRException("Type mismatch: the type Range was expected, but "+this.value.getClass().getName()+" was encountered"); + return (Range) this.value; + } + + public boolean hasValueRange() { + return this != null && this.value instanceof Range; + } + + public boolean hasValue() { + return this.value != null && !this.value.isEmpty(); + } + + /** + * @param value {@link #value} (Value or set of values that define the grouping.) + */ + public EvidenceVariableCategoryComponent setValue(DataType value) { + if (value != null && !(value instanceof CodeableConcept || value instanceof Quantity || value instanceof Range)) + throw new Error("Not the right type for EvidenceVariable.category.value[x]: "+value.fhirType()); + this.value = value; + return this; + } + + protected void listChildren(List children) { + super.listChildren(children); + children.add(new Property("name", "string", "A human-readable title or representation of the grouping.", 0, 1, name)); + children.add(new Property("value[x]", "CodeableConcept|Quantity|Range", "Value or set of values that define the grouping.", 0, 1, value)); + } + + @Override + public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { + switch (_hash) { + case 3373707: /*name*/ return new Property("name", "string", "A human-readable title or representation of the grouping.", 0, 1, name); + case -1410166417: /*value[x]*/ return new Property("value[x]", "CodeableConcept|Quantity|Range", "Value or set of values that define the grouping.", 0, 1, value); + case 111972721: /*value*/ return new Property("value[x]", "CodeableConcept|Quantity|Range", "Value or set of values that define the grouping.", 0, 1, value); + case 924902896: /*valueCodeableConcept*/ return new Property("value[x]", "CodeableConcept", "Value or set of values that define the grouping.", 0, 1, value); + case -2029823716: /*valueQuantity*/ return new Property("value[x]", "Quantity", "Value or set of values that define the grouping.", 0, 1, value); + case 2030761548: /*valueRange*/ return new Property("value[x]", "Range", "Value or set of values that define the grouping.", 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 3373707: /*name*/ return this.name == null ? new Base[0] : new Base[] {this.name}; // StringType + case 111972721: /*value*/ return this.value == null ? new Base[0] : new Base[] {this.value}; // DataType + default: return super.getProperty(hash, name, checkValid); + } + + } + + @Override + public Base setProperty(int hash, String name, Base value) throws FHIRException { + switch (hash) { + case 3373707: // name + this.name = TypeConvertor.castToString(value); // StringType + return value; + case 111972721: // value + this.value = TypeConvertor.castToType(value); // DataType + return value; + default: return super.setProperty(hash, name, value); + } + + } + + @Override + public Base setProperty(String name, Base value) throws FHIRException { + if (name.equals("name")) { + this.name = TypeConvertor.castToString(value); // StringType + } else if (name.equals("value[x]")) { + this.value = TypeConvertor.castToType(value); // DataType + } else + return super.setProperty(name, value); + return value; + } + + @Override + public Base makeProperty(int hash, String name) throws FHIRException { + switch (hash) { + case 3373707: return getNameElement(); + case -1410166417: return getValue(); + case 111972721: return getValue(); + default: return super.makeProperty(hash, name); + } + + } + + @Override + public String[] getTypesForProperty(int hash, String name) throws FHIRException { + switch (hash) { + case 3373707: /*name*/ return new String[] {"string"}; + case 111972721: /*value*/ return new String[] {"CodeableConcept", "Quantity", "Range"}; + default: return super.getTypesForProperty(hash, name); + } + + } + + @Override + public Base addChild(String name) throws FHIRException { + if (name.equals("name")) { + throw new FHIRException("Cannot call addChild on a primitive type EvidenceVariable.category.name"); + } + else if (name.equals("valueCodeableConcept")) { + this.value = new CodeableConcept(); + return this.value; + } + else if (name.equals("valueQuantity")) { + this.value = new Quantity(); + return this.value; + } + else if (name.equals("valueRange")) { + this.value = new Range(); + return this.value; + } + else + return super.addChild(name); + } + + public EvidenceVariableCategoryComponent copy() { + EvidenceVariableCategoryComponent dst = new EvidenceVariableCategoryComponent(); + copyValues(dst); + return dst; + } + + public void copyValues(EvidenceVariableCategoryComponent dst) { + super.copyValues(dst); + dst.name = name == null ? null : name.copy(); + dst.value = value == null ? null : value.copy(); + } + + @Override + public boolean equalsDeep(Base other_) { + if (!super.equalsDeep(other_)) + return false; + if (!(other_ instanceof EvidenceVariableCategoryComponent)) + return false; + EvidenceVariableCategoryComponent o = (EvidenceVariableCategoryComponent) other_; + return compareDeep(name, o.name, true) && compareDeep(value, o.value, true); + } + + @Override + public boolean equalsShallow(Base other_) { + if (!super.equalsShallow(other_)) + return false; + if (!(other_ instanceof EvidenceVariableCategoryComponent)) + return false; + EvidenceVariableCategoryComponent o = (EvidenceVariableCategoryComponent) other_; + return compareValues(name, o.name, true); + } + + public boolean isEmpty() { + return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(name, value); + } + + public String fhirType() { + return "EvidenceVariable.category"; + + } + } /** @@ -1417,139 +1587,87 @@ public class EvidenceVariable extends MetadataResource { @Description(shortDefinition="Date last changed", formalDefinition="The date (and optionally time) when the evidence variable was published. The date must change when the business version changes and it must change if the status code changes. In addition, it should change when the substantive content of the evidence variable changes." ) protected DateTimeType date; - /** - * The name of the organization or individual that published the evidence variable. - */ - @Child(name = "publisher", type = {StringType.class}, order=9, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Name of the publisher (organization or individual)", formalDefinition="The name of the organization or individual that published the evidence variable." ) - protected StringType publisher; - - /** - * Contact details to assist a user in finding and communicating with the publisher. - */ - @Child(name = "contact", type = {ContactDetail.class}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Contact details for the publisher", formalDefinition="Contact details to assist a user in finding and communicating with the publisher." ) - protected List contact; - /** * A free text natural language description of the evidence variable from a consumer's perspective. */ - @Child(name = "description", type = {MarkdownType.class}, order=11, min=0, max=1, modifier=false, summary=true) + @Child(name = "description", type = {MarkdownType.class}, order=9, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Natural language description of the evidence variable", formalDefinition="A free text natural language description of the evidence variable from a consumer's perspective." ) protected MarkdownType description; /** * A human-readable string to clarify or explain concepts about the resource. */ - @Child(name = "note", type = {Annotation.class}, order=12, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "note", type = {Annotation.class}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Used for footnotes or explanatory notes", formalDefinition="A human-readable string to clarify or explain concepts about the resource." ) protected List note; /** * 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 evidence variable instances. */ - @Child(name = "useContext", type = {UsageContext.class}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "useContext", type = {UsageContext.class}, order=11, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="The context that the content is intended to support", 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 evidence variable instances." ) protected List useContext; /** - * A legal or geographic region in which the evidence variable is intended to be used. + * The name of the organization or individual that published the evidence variable. */ - @Child(name = "jurisdiction", type = {CodeableConcept.class}, order=14, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Intended jurisdiction for evidence variable (if applicable)", formalDefinition="A legal or geographic region in which the evidence variable is intended to be used." ) - @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/jurisdiction") - protected List jurisdiction; + @Child(name = "publisher", type = {StringType.class}, order=12, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="Name of the publisher (organization or individual)", formalDefinition="The name of the organization or individual that published the evidence variable." ) + protected StringType publisher; /** - * A copyright statement relating to the evidence variable and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the evidence variable. + * Contact details to assist a user in finding and communicating with the publisher. */ - @Child(name = "copyright", type = {MarkdownType.class}, order=15, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Use and/or publishing restrictions", formalDefinition="A copyright statement relating to the evidence variable and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the evidence variable." ) - protected MarkdownType copyright; - - /** - * The date on which the resource content was approved by the publisher. Approval happens once when the content is officially approved for usage. - */ - @Child(name = "approvalDate", type = {DateType.class}, order=16, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="When the evidence variable was approved by publisher", formalDefinition="The date on which the resource content was approved by the publisher. Approval happens once when the content is officially approved for usage." ) - protected DateType approvalDate; - - /** - * The date on which the resource content was last reviewed. Review happens periodically after approval but does not change the original approval date. - */ - @Child(name = "lastReviewDate", type = {DateType.class}, order=17, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="When the evidence variable was last reviewed", formalDefinition="The date on which the resource content was last reviewed. Review happens periodically after approval but does not change the original approval date." ) - protected DateType lastReviewDate; - - /** - * The period during which the evidence variable content was or is planned to be in active use. - */ - @Child(name = "effectivePeriod", type = {Period.class}, order=18, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="When the evidence variable is expected to be used", formalDefinition="The period during which the evidence variable content was or is planned to be in active use." ) - protected Period effectivePeriod; - - /** - * Descriptive topics related to the content of the EvidenceVariable. Topics provide a high-level categorization grouping types of EvidenceVariables that can be useful for filtering and searching. - */ - @Child(name = "topic", type = {CodeableConcept.class}, order=19, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="The category of the EvidenceVariable, such as Education, Treatment, Assessment, etc.", formalDefinition="Descriptive topics related to the content of the EvidenceVariable. Topics provide a high-level categorization grouping types of EvidenceVariables that can be useful for filtering and searching." ) - @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/definition-topic") - protected List topic; + @Child(name = "contact", type = {ContactDetail.class}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="Contact details for the publisher", formalDefinition="Contact details to assist a user in finding and communicating with the publisher." ) + protected List contact; /** * An individiual or organization primarily involved in the creation and maintenance of the content. */ - @Child(name = "author", type = {ContactDetail.class}, order=20, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "author", type = {ContactDetail.class}, order=14, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Who authored the content", formalDefinition="An individiual or organization primarily involved in the creation and maintenance of the content." ) protected List author; /** * An individual or organization primarily responsible for internal coherence of the content. */ - @Child(name = "editor", type = {ContactDetail.class}, order=21, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "editor", type = {ContactDetail.class}, order=15, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Who edited the content", formalDefinition="An individual or organization primarily responsible for internal coherence of the content." ) protected List editor; /** * An individual or organization primarily responsible for review of some aspect of the content. */ - @Child(name = "reviewer", type = {ContactDetail.class}, order=22, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "reviewer", type = {ContactDetail.class}, order=16, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Who reviewed the content", formalDefinition="An individual or organization primarily responsible for review of some aspect of the content." ) protected List reviewer; /** * An individual or organization responsible for officially endorsing the content for use in some setting. */ - @Child(name = "endorser", type = {ContactDetail.class}, order=23, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "endorser", type = {ContactDetail.class}, order=17, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Who endorsed the content", formalDefinition="An individual or organization responsible for officially endorsing the content for use in some setting." ) protected List endorser; /** * Related artifacts such as additional documentation, justification, or bibliographic references. */ - @Child(name = "relatedArtifact", type = {RelatedArtifact.class}, order=24, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "relatedArtifact", type = {RelatedArtifact.class}, order=18, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Additional documentation, citations, etc.", formalDefinition="Related artifacts such as additional documentation, justification, or bibliographic references." ) protected List relatedArtifact; - /** - * Used for an outcome to classify. - */ - @Child(name = "type", type = {CodeType.class}, order=25, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="dichotomous | continuous | descriptive", formalDefinition="Used for an outcome to classify." ) - @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/variable-type") - protected Enumeration type; - /** * True if the actual variable measured, false if a conceptual representation of the intended variable. */ - @Child(name = "actual", type = {BooleanType.class}, order=26, min=0, max=1, modifier=false, summary=false) + @Child(name = "actual", type = {BooleanType.class}, order=19, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Actual or conceptual", formalDefinition="True if the actual variable measured, false if a conceptual representation of the intended variable." ) protected BooleanType actual; /** * Used to specify if two or more characteristics are combined with OR or AND. */ - @Child(name = "characteristicCombination", type = {CodeType.class}, order=27, min=0, max=1, modifier=false, summary=false) + @Child(name = "characteristicCombination", type = {CodeType.class}, order=20, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="intersection | union", formalDefinition="Used to specify if two or more characteristics are combined with OR or AND." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/characteristic-combination") protected Enumeration characteristicCombination; @@ -1557,11 +1675,26 @@ public class EvidenceVariable extends MetadataResource { /** * A characteristic that defines the members of the evidence element. Multiple characteristics are applied with "and" semantics. */ - @Child(name = "characteristic", type = {}, order=28, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "characteristic", type = {}, order=21, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="What defines the members of the evidence element", formalDefinition="A characteristic that defines the members of the evidence element. Multiple characteristics are applied with \"and\" semantics." ) protected List characteristic; - private static final long serialVersionUID = 769110431L; + /** + * Used for an outcome to classify. + */ + @Child(name = "handling", type = {CodeType.class}, order=22, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="continuous | dichotomous | ordinal | polychotomous", formalDefinition="Used for an outcome to classify." ) + @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/variable-handling") + protected Enumeration handling; + + /** + * A grouping (or set of values) described along with other groupings to specify the set of groupings allowed for the variable. + */ + @Child(name = "category", type = {}, order=23, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="A grouping for ordinal or polychotomous variables", formalDefinition="A grouping (or set of values) described along with other groupings to specify the set of groupings allowed for the variable." ) + protected List category; + + private static final long serialVersionUID = 449375263L; /** * Constructor @@ -2019,108 +2152,6 @@ public class EvidenceVariable extends MetadataResource { return this; } - /** - * @return {@link #publisher} (The name of the organization or individual that published the evidence variable.). This is the underlying object with id, value and extensions. The accessor "getPublisher" gives direct access to the value - */ - public StringType getPublisherElement() { - if (this.publisher == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create EvidenceVariable.publisher"); - else if (Configuration.doAutoCreate()) - this.publisher = new StringType(); // bb - return this.publisher; - } - - public boolean hasPublisherElement() { - return this.publisher != null && !this.publisher.isEmpty(); - } - - public boolean hasPublisher() { - return this.publisher != null && !this.publisher.isEmpty(); - } - - /** - * @param value {@link #publisher} (The name of the organization or individual that published the evidence variable.). This is the underlying object with id, value and extensions. The accessor "getPublisher" gives direct access to the value - */ - public EvidenceVariable setPublisherElement(StringType value) { - this.publisher = value; - return this; - } - - /** - * @return The name of the organization or individual that published the evidence variable. - */ - public String getPublisher() { - return this.publisher == null ? null : this.publisher.getValue(); - } - - /** - * @param value The name of the organization or individual that published the evidence variable. - */ - public EvidenceVariable setPublisher(String value) { - if (Utilities.noString(value)) - this.publisher = null; - else { - if (this.publisher == null) - this.publisher = new StringType(); - this.publisher.setValue(value); - } - return this; - } - - /** - * @return {@link #contact} (Contact details to assist a user in finding and communicating with the publisher.) - */ - public List getContact() { - if (this.contact == null) - this.contact = new ArrayList(); - return this.contact; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public EvidenceVariable setContact(List theContact) { - this.contact = theContact; - return this; - } - - public boolean hasContact() { - if (this.contact == null) - return false; - for (ContactDetail item : this.contact) - if (!item.isEmpty()) - return true; - return false; - } - - public ContactDetail addContact() { //3 - ContactDetail t = new ContactDetail(); - if (this.contact == null) - this.contact = new ArrayList(); - this.contact.add(t); - return t; - } - - public EvidenceVariable addContact(ContactDetail t) { //3 - if (t == null) - return this; - if (this.contact == null) - this.contact = new ArrayList(); - this.contact.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #contact}, creating it if it does not already exist {3} - */ - public ContactDetail getContactFirstRep() { - if (getContact().isEmpty()) { - addContact(); - } - return getContact().get(0); - } - /** * @return {@link #description} (A free text natural language description of the evidence variable from a consumer's perspective.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value */ @@ -2277,280 +2308,105 @@ public class EvidenceVariable extends MetadataResource { } /** - * @return {@link #jurisdiction} (A legal or geographic region in which the evidence variable is intended to be used.) + * @return {@link #publisher} (The name of the organization or individual that published the evidence variable.). This is the underlying object with id, value and extensions. The accessor "getPublisher" gives direct access to the value */ - public List getJurisdiction() { - if (this.jurisdiction == null) - this.jurisdiction = new ArrayList(); - return this.jurisdiction; + public StringType getPublisherElement() { + if (this.publisher == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create EvidenceVariable.publisher"); + else if (Configuration.doAutoCreate()) + this.publisher = new StringType(); // bb + return this.publisher; + } + + public boolean hasPublisherElement() { + return this.publisher != null && !this.publisher.isEmpty(); + } + + public boolean hasPublisher() { + return this.publisher != null && !this.publisher.isEmpty(); + } + + /** + * @param value {@link #publisher} (The name of the organization or individual that published the evidence variable.). This is the underlying object with id, value and extensions. The accessor "getPublisher" gives direct access to the value + */ + public EvidenceVariable setPublisherElement(StringType value) { + this.publisher = value; + return this; + } + + /** + * @return The name of the organization or individual that published the evidence variable. + */ + public String getPublisher() { + return this.publisher == null ? null : this.publisher.getValue(); + } + + /** + * @param value The name of the organization or individual that published the evidence variable. + */ + public EvidenceVariable setPublisher(String value) { + if (Utilities.noString(value)) + this.publisher = null; + else { + if (this.publisher == null) + this.publisher = new StringType(); + this.publisher.setValue(value); + } + return this; + } + + /** + * @return {@link #contact} (Contact details to assist a user in finding and communicating with the publisher.) + */ + public List getContact() { + if (this.contact == null) + this.contact = new ArrayList(); + return this.contact; } /** * @return Returns a reference to this for easy method chaining */ - public EvidenceVariable setJurisdiction(List theJurisdiction) { - this.jurisdiction = theJurisdiction; + public EvidenceVariable setContact(List theContact) { + this.contact = theContact; return this; } - public boolean hasJurisdiction() { - if (this.jurisdiction == null) + public boolean hasContact() { + if (this.contact == null) return false; - for (CodeableConcept item : this.jurisdiction) + for (ContactDetail item : this.contact) if (!item.isEmpty()) return true; return false; } - public CodeableConcept addJurisdiction() { //3 - CodeableConcept t = new CodeableConcept(); - if (this.jurisdiction == null) - this.jurisdiction = new ArrayList(); - this.jurisdiction.add(t); + public ContactDetail addContact() { //3 + ContactDetail t = new ContactDetail(); + if (this.contact == null) + this.contact = new ArrayList(); + this.contact.add(t); return t; } - public EvidenceVariable addJurisdiction(CodeableConcept t) { //3 + public EvidenceVariable addContact(ContactDetail t) { //3 if (t == null) return this; - if (this.jurisdiction == null) - this.jurisdiction = new ArrayList(); - this.jurisdiction.add(t); + if (this.contact == null) + this.contact = new ArrayList(); + this.contact.add(t); return this; } /** - * @return The first repetition of repeating field {@link #jurisdiction}, creating it if it does not already exist {3} + * @return The first repetition of repeating field {@link #contact}, creating it if it does not already exist {3} */ - public CodeableConcept getJurisdictionFirstRep() { - if (getJurisdiction().isEmpty()) { - addJurisdiction(); + public ContactDetail getContactFirstRep() { + if (getContact().isEmpty()) { + addContact(); } - return getJurisdiction().get(0); - } - - /** - * @return {@link #copyright} (A copyright statement relating to the evidence variable and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the evidence variable.). This is the underlying object with id, value and extensions. The accessor "getCopyright" gives direct access to the value - */ - public MarkdownType getCopyrightElement() { - if (this.copyright == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create EvidenceVariable.copyright"); - else if (Configuration.doAutoCreate()) - this.copyright = new MarkdownType(); // bb - return this.copyright; - } - - public boolean hasCopyrightElement() { - return this.copyright != null && !this.copyright.isEmpty(); - } - - public boolean hasCopyright() { - return this.copyright != null && !this.copyright.isEmpty(); - } - - /** - * @param value {@link #copyright} (A copyright statement relating to the evidence variable and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the evidence variable.). This is the underlying object with id, value and extensions. The accessor "getCopyright" gives direct access to the value - */ - public EvidenceVariable setCopyrightElement(MarkdownType value) { - this.copyright = value; - return this; - } - - /** - * @return A copyright statement relating to the evidence variable and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the evidence variable. - */ - public String getCopyright() { - return this.copyright == null ? null : this.copyright.getValue(); - } - - /** - * @param value A copyright statement relating to the evidence variable and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the evidence variable. - */ - public EvidenceVariable setCopyright(String value) { - if (value == null) - this.copyright = null; - else { - if (this.copyright == null) - this.copyright = new MarkdownType(); - this.copyright.setValue(value); - } - return this; - } - - /** - * @return {@link #approvalDate} (The date on which the resource content was approved by the publisher. Approval happens once when the content is officially approved for usage.). This is the underlying object with id, value and extensions. The accessor "getApprovalDate" gives direct access to the value - */ - public DateType getApprovalDateElement() { - if (this.approvalDate == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create EvidenceVariable.approvalDate"); - else if (Configuration.doAutoCreate()) - this.approvalDate = new DateType(); // bb - return this.approvalDate; - } - - public boolean hasApprovalDateElement() { - return this.approvalDate != null && !this.approvalDate.isEmpty(); - } - - public boolean hasApprovalDate() { - return this.approvalDate != null && !this.approvalDate.isEmpty(); - } - - /** - * @param value {@link #approvalDate} (The date on which the resource content was approved by the publisher. Approval happens once when the content is officially approved for usage.). This is the underlying object with id, value and extensions. The accessor "getApprovalDate" gives direct access to the value - */ - public EvidenceVariable setApprovalDateElement(DateType value) { - this.approvalDate = value; - return this; - } - - /** - * @return The date on which the resource content was approved by the publisher. Approval happens once when the content is officially approved for usage. - */ - public Date getApprovalDate() { - return this.approvalDate == null ? null : this.approvalDate.getValue(); - } - - /** - * @param value The date on which the resource content was approved by the publisher. Approval happens once when the content is officially approved for usage. - */ - public EvidenceVariable setApprovalDate(Date value) { - if (value == null) - this.approvalDate = null; - else { - if (this.approvalDate == null) - this.approvalDate = new DateType(); - this.approvalDate.setValue(value); - } - return this; - } - - /** - * @return {@link #lastReviewDate} (The date on which the resource content was last reviewed. Review happens periodically after approval but does not change the original approval date.). This is the underlying object with id, value and extensions. The accessor "getLastReviewDate" gives direct access to the value - */ - public DateType getLastReviewDateElement() { - if (this.lastReviewDate == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create EvidenceVariable.lastReviewDate"); - else if (Configuration.doAutoCreate()) - this.lastReviewDate = new DateType(); // bb - return this.lastReviewDate; - } - - public boolean hasLastReviewDateElement() { - return this.lastReviewDate != null && !this.lastReviewDate.isEmpty(); - } - - public boolean hasLastReviewDate() { - return this.lastReviewDate != null && !this.lastReviewDate.isEmpty(); - } - - /** - * @param value {@link #lastReviewDate} (The date on which the resource content was last reviewed. Review happens periodically after approval but does not change the original approval date.). This is the underlying object with id, value and extensions. The accessor "getLastReviewDate" gives direct access to the value - */ - public EvidenceVariable setLastReviewDateElement(DateType value) { - this.lastReviewDate = value; - return this; - } - - /** - * @return The date on which the resource content was last reviewed. Review happens periodically after approval but does not change the original approval date. - */ - public Date getLastReviewDate() { - return this.lastReviewDate == null ? null : this.lastReviewDate.getValue(); - } - - /** - * @param value The date on which the resource content was last reviewed. Review happens periodically after approval but does not change the original approval date. - */ - public EvidenceVariable setLastReviewDate(Date value) { - if (value == null) - this.lastReviewDate = null; - else { - if (this.lastReviewDate == null) - this.lastReviewDate = new DateType(); - this.lastReviewDate.setValue(value); - } - return this; - } - - /** - * @return {@link #effectivePeriod} (The period during which the evidence variable content was or is planned to be in active use.) - */ - public Period getEffectivePeriod() { - if (this.effectivePeriod == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create EvidenceVariable.effectivePeriod"); - else if (Configuration.doAutoCreate()) - this.effectivePeriod = new Period(); // cc - return this.effectivePeriod; - } - - public boolean hasEffectivePeriod() { - return this.effectivePeriod != null && !this.effectivePeriod.isEmpty(); - } - - /** - * @param value {@link #effectivePeriod} (The period during which the evidence variable content was or is planned to be in active use.) - */ - public EvidenceVariable setEffectivePeriod(Period value) { - this.effectivePeriod = value; - return this; - } - - /** - * @return {@link #topic} (Descriptive topics related to the content of the EvidenceVariable. Topics provide a high-level categorization grouping types of EvidenceVariables that can be useful for filtering and searching.) - */ - public List getTopic() { - if (this.topic == null) - this.topic = new ArrayList(); - return this.topic; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public EvidenceVariable setTopic(List theTopic) { - this.topic = theTopic; - return this; - } - - public boolean hasTopic() { - if (this.topic == null) - return false; - for (CodeableConcept item : this.topic) - if (!item.isEmpty()) - return true; - return false; - } - - public CodeableConcept addTopic() { //3 - CodeableConcept t = new CodeableConcept(); - if (this.topic == null) - this.topic = new ArrayList(); - this.topic.add(t); - return t; - } - - public EvidenceVariable addTopic(CodeableConcept t) { //3 - if (t == null) - return this; - if (this.topic == null) - this.topic = new ArrayList(); - this.topic.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #topic}, creating it if it does not already exist {3} - */ - public CodeableConcept getTopicFirstRep() { - if (getTopic().isEmpty()) { - addTopic(); - } - return getTopic().get(0); + return getContact().get(0); } /** @@ -2818,55 +2674,6 @@ public class EvidenceVariable extends MetadataResource { return getRelatedArtifact().get(0); } - /** - * @return {@link #type} (Used for an outcome to classify.). This is the underlying object with id, value and extensions. The accessor "getType" gives direct access to the value - */ - public Enumeration getTypeElement() { - if (this.type == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create EvidenceVariable.type"); - else if (Configuration.doAutoCreate()) - this.type = new Enumeration(new EvidenceVariableTypeEnumFactory()); // bb - return this.type; - } - - public boolean hasTypeElement() { - return this.type != null && !this.type.isEmpty(); - } - - public boolean hasType() { - return this.type != null && !this.type.isEmpty(); - } - - /** - * @param value {@link #type} (Used for an outcome to classify.). This is the underlying object with id, value and extensions. The accessor "getType" gives direct access to the value - */ - public EvidenceVariable setTypeElement(Enumeration value) { - this.type = value; - return this; - } - - /** - * @return Used for an outcome to classify. - */ - public EvidenceVariableType getType() { - return this.type == null ? null : this.type.getValue(); - } - - /** - * @param value Used for an outcome to classify. - */ - public EvidenceVariable setType(EvidenceVariableType value) { - if (value == null) - this.type = null; - else { - if (this.type == null) - this.type = new Enumeration(new EvidenceVariableTypeEnumFactory()); - this.type.setValue(value); - } - return this; - } - /** * @return {@link #actual} (True if the actual variable measured, false if a conceptual representation of the intended variable.). This is the underlying object with id, value and extensions. The accessor "getActual" gives direct access to the value */ @@ -3014,6 +2821,108 @@ public class EvidenceVariable extends MetadataResource { return getCharacteristic().get(0); } + /** + * @return {@link #handling} (Used for an outcome to classify.). This is the underlying object with id, value and extensions. The accessor "getHandling" gives direct access to the value + */ + public Enumeration getHandlingElement() { + if (this.handling == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create EvidenceVariable.handling"); + else if (Configuration.doAutoCreate()) + this.handling = new Enumeration(new EvidenceVariableHandlingEnumFactory()); // bb + return this.handling; + } + + public boolean hasHandlingElement() { + return this.handling != null && !this.handling.isEmpty(); + } + + public boolean hasHandling() { + return this.handling != null && !this.handling.isEmpty(); + } + + /** + * @param value {@link #handling} (Used for an outcome to classify.). This is the underlying object with id, value and extensions. The accessor "getHandling" gives direct access to the value + */ + public EvidenceVariable setHandlingElement(Enumeration value) { + this.handling = value; + return this; + } + + /** + * @return Used for an outcome to classify. + */ + public EvidenceVariableHandling getHandling() { + return this.handling == null ? null : this.handling.getValue(); + } + + /** + * @param value Used for an outcome to classify. + */ + public EvidenceVariable setHandling(EvidenceVariableHandling value) { + if (value == null) + this.handling = null; + else { + if (this.handling == null) + this.handling = new Enumeration(new EvidenceVariableHandlingEnumFactory()); + this.handling.setValue(value); + } + return this; + } + + /** + * @return {@link #category} (A grouping (or set of values) described along with other groupings to specify the set of groupings allowed for the variable.) + */ + public List getCategory() { + if (this.category == null) + this.category = new ArrayList(); + return this.category; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public EvidenceVariable setCategory(List theCategory) { + this.category = theCategory; + return this; + } + + public boolean hasCategory() { + if (this.category == null) + return false; + for (EvidenceVariableCategoryComponent item : this.category) + if (!item.isEmpty()) + return true; + return false; + } + + public EvidenceVariableCategoryComponent addCategory() { //3 + EvidenceVariableCategoryComponent t = new EvidenceVariableCategoryComponent(); + if (this.category == null) + this.category = new ArrayList(); + this.category.add(t); + return t; + } + + public EvidenceVariable addCategory(EvidenceVariableCategoryComponent t) { //3 + if (t == null) + return this; + if (this.category == null) + this.category = new ArrayList(); + this.category.add(t); + return this; + } + + /** + * @return The first repetition of repeating field {@link #category}, creating it if it does not already exist {3} + */ + public EvidenceVariableCategoryComponent getCategoryFirstRep() { + if (getCategory().isEmpty()) { + addCategory(); + } + return getCategory().get(0); + } + /** * not supported on this implementation */ @@ -3054,6 +2963,41 @@ public class EvidenceVariable extends MetadataResource { * not supported on this implementation */ @Override + public int getJurisdictionMax() { + return 0; + } + /** + * @return {@link #jurisdiction} (A legal or geographic region in which the evidence variable is intended to be used.) + */ + public List getJurisdiction() { + return new ArrayList<>(); + } + /** + * @return Returns a reference to this for easy method chaining + */ + public EvidenceVariable setJurisdiction(List theJurisdiction) { + throw new Error("The resource type \"EvidenceVariable\" does not implement the property \"jurisdiction\""); + } + public boolean hasJurisdiction() { + return false; + } + + public CodeableConcept addJurisdiction() { //3 + throw new Error("The resource type \"EvidenceVariable\" does not implement the property \"jurisdiction\""); + } + public EvidenceVariable addJurisdiction(CodeableConcept t) { //3 + throw new Error("The resource type \"EvidenceVariable\" does not implement the property \"jurisdiction\""); + } + /** + * @return The first repetition of repeating field {@link #jurisdiction}, creating it if it does not already exist {2} + */ + public CodeableConcept getJurisdictionFirstRep() { + throw new Error("The resource type \"EvidenceVariable\" does not implement the property \"jurisdiction\""); + } + /** + * not supported on this implementation + */ + @Override public int getPurposeMax() { return 0; } @@ -3086,6 +3030,137 @@ public class EvidenceVariable extends MetadataResource { public EvidenceVariable setPurpose(String value) { throw new Error("The resource type \"EvidenceVariable\" does not implement the property \"purpose\""); } + /** + * not supported on this implementation + */ + @Override + public int getCopyrightMax() { + return 0; + } + /** + * @return {@link #copyright} (A copyright statement relating to the evidence variable and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the evidence variable.). This is the underlying object with id, value and extensions. The accessor "getCopyright" gives direct access to the value + */ + public MarkdownType getCopyrightElement() { + throw new Error("The resource type \"EvidenceVariable\" does not implement the property \"copyright\""); + } + + public boolean hasCopyrightElement() { + return false; + } + public boolean hasCopyright() { + return false; + } + + /** + * @param value {@link #copyright} (A copyright statement relating to the evidence variable and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the evidence variable.). This is the underlying object with id, value and extensions. The accessor "getCopyright" gives direct access to the value + */ + public EvidenceVariable setCopyrightElement(MarkdownType value) { + throw new Error("The resource type \"EvidenceVariable\" does not implement the property \"copyright\""); + } + public String getCopyright() { + throw new Error("The resource type \"EvidenceVariable\" does not implement the property \"copyright\""); + } + /** + * @param value A copyright statement relating to the evidence variable and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the evidence variable. + */ + public EvidenceVariable setCopyright(String value) { + throw new Error("The resource type \"EvidenceVariable\" does not implement the property \"copyright\""); + } + /** + * not supported on this implementation + */ + @Override + public int getApprovalDateMax() { + return 0; + } + /** + * @return {@link #approvalDate} (The date on which the resource content was approved by the publisher. Approval happens once when the content is officially approved for usage.). This is the underlying object with id, value and extensions. The accessor "getApprovalDate" gives direct access to the value + */ + public DateType getApprovalDateElement() { + throw new Error("The resource type \"EvidenceVariable\" does not implement the property \"approvalDate\""); + } + + public boolean hasApprovalDateElement() { + return false; + } + public boolean hasApprovalDate() { + return false; + } + + /** + * @param value {@link #approvalDate} (The date on which the resource content was approved by the publisher. Approval happens once when the content is officially approved for usage.). This is the underlying object with id, value and extensions. The accessor "getApprovalDate" gives direct access to the value + */ + public EvidenceVariable setApprovalDateElement(DateType value) { + throw new Error("The resource type \"EvidenceVariable\" does not implement the property \"approvalDate\""); + } + public Date getApprovalDate() { + throw new Error("The resource type \"EvidenceVariable\" does not implement the property \"approvalDate\""); + } + /** + * @param value The date on which the resource content was approved by the publisher. Approval happens once when the content is officially approved for usage. + */ + public EvidenceVariable setApprovalDate(Date value) { + throw new Error("The resource type \"EvidenceVariable\" does not implement the property \"approvalDate\""); + } + /** + * not supported on this implementation + */ + @Override + public int getLastReviewDateMax() { + return 0; + } + /** + * @return {@link #lastReviewDate} (The date on which the resource content was last reviewed. Review happens periodically after approval but does not change the original approval date.). This is the underlying object with id, value and extensions. The accessor "getLastReviewDate" gives direct access to the value + */ + public DateType getLastReviewDateElement() { + throw new Error("The resource type \"EvidenceVariable\" does not implement the property \"lastReviewDate\""); + } + + public boolean hasLastReviewDateElement() { + return false; + } + public boolean hasLastReviewDate() { + return false; + } + + /** + * @param value {@link #lastReviewDate} (The date on which the resource content was last reviewed. Review happens periodically after approval but does not change the original approval date.). This is the underlying object with id, value and extensions. The accessor "getLastReviewDate" gives direct access to the value + */ + public EvidenceVariable setLastReviewDateElement(DateType value) { + throw new Error("The resource type \"EvidenceVariable\" does not implement the property \"lastReviewDate\""); + } + public Date getLastReviewDate() { + throw new Error("The resource type \"EvidenceVariable\" does not implement the property \"lastReviewDate\""); + } + /** + * @param value The date on which the resource content was last reviewed. Review happens periodically after approval but does not change the original approval date. + */ + public EvidenceVariable setLastReviewDate(Date value) { + throw new Error("The resource type \"EvidenceVariable\" does not implement the property \"lastReviewDate\""); + } + /** + * not supported on this implementation + */ + @Override + public int getEffectivePeriodMax() { + return 0; + } + /** + * @return {@link #effectivePeriod} (The period during which the evidence variable content was or is planned to be in active use.) + */ + public Period getEffectivePeriod() { + throw new Error("The resource type \"EvidenceVariable\" does not implement the property \"effectivePeriod\""); + } + public boolean hasEffectivePeriod() { + return false; + } + /** + * @param value {@link #effectivePeriod} (The period during which the evidence variable content was or is planned to be in active use.) + */ + public EvidenceVariable setEffectivePeriod(Period value) { + throw new Error("The resource type \"EvidenceVariable\" does not implement the property \"effectivePeriod\""); + } + protected void listChildren(List children) { super.listChildren(children); children.add(new Property("url", "uri", "An absolute URI that is used to identify this evidence variable 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 evidence variable is (or will be) published. This URL can be the target of a canonical reference. It SHALL remain the same when the evidence variable is stored on different servers.", 0, 1, url)); @@ -3097,26 +3172,21 @@ public class EvidenceVariable extends MetadataResource { children.add(new Property("subtitle", "string", "An explanatory or alternate title for the EvidenceVariable giving additional information about its content.", 0, 1, subtitle)); children.add(new Property("status", "code", "The status of this evidence variable. Enables tracking the life-cycle of the content.", 0, 1, status)); children.add(new Property("date", "dateTime", "The date (and optionally time) when the evidence variable was published. The date must change when the business version changes and it must change if the status code changes. In addition, it should change when the substantive content of the evidence variable changes.", 0, 1, date)); - children.add(new Property("publisher", "string", "The name of the organization or individual that published the evidence variable.", 0, 1, publisher)); - children.add(new Property("contact", "ContactDetail", "Contact details to assist a user in finding and communicating with the publisher.", 0, java.lang.Integer.MAX_VALUE, contact)); children.add(new Property("description", "markdown", "A free text natural language description of the evidence variable from a consumer's perspective.", 0, 1, description)); children.add(new Property("note", "Annotation", "A human-readable string to clarify or explain concepts about the resource.", 0, java.lang.Integer.MAX_VALUE, note)); 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 evidence variable instances.", 0, java.lang.Integer.MAX_VALUE, useContext)); - children.add(new Property("jurisdiction", "CodeableConcept", "A legal or geographic region in which the evidence variable is intended to be used.", 0, java.lang.Integer.MAX_VALUE, jurisdiction)); - children.add(new Property("copyright", "markdown", "A copyright statement relating to the evidence variable and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the evidence variable.", 0, 1, copyright)); - children.add(new Property("approvalDate", "date", "The date on which the resource content was approved by the publisher. Approval happens once when the content is officially approved for usage.", 0, 1, approvalDate)); - children.add(new Property("lastReviewDate", "date", "The date on which the resource content was last reviewed. Review happens periodically after approval but does not change the original approval date.", 0, 1, lastReviewDate)); - children.add(new Property("effectivePeriod", "Period", "The period during which the evidence variable content was or is planned to be in active use.", 0, 1, effectivePeriod)); - children.add(new Property("topic", "CodeableConcept", "Descriptive topics related to the content of the EvidenceVariable. Topics provide a high-level categorization grouping types of EvidenceVariables that can be useful for filtering and searching.", 0, java.lang.Integer.MAX_VALUE, topic)); + children.add(new Property("publisher", "string", "The name of the organization or individual that published the evidence variable.", 0, 1, publisher)); + children.add(new Property("contact", "ContactDetail", "Contact details to assist a user in finding and communicating with the publisher.", 0, java.lang.Integer.MAX_VALUE, contact)); children.add(new Property("author", "ContactDetail", "An individiual or organization primarily involved in the creation and maintenance of the content.", 0, java.lang.Integer.MAX_VALUE, author)); children.add(new Property("editor", "ContactDetail", "An individual or organization primarily responsible for internal coherence of the content.", 0, java.lang.Integer.MAX_VALUE, editor)); children.add(new Property("reviewer", "ContactDetail", "An individual or organization primarily responsible for review of some aspect of the content.", 0, java.lang.Integer.MAX_VALUE, reviewer)); children.add(new Property("endorser", "ContactDetail", "An individual or organization responsible for officially endorsing the content for use in some setting.", 0, java.lang.Integer.MAX_VALUE, endorser)); children.add(new Property("relatedArtifact", "RelatedArtifact", "Related artifacts such as additional documentation, justification, or bibliographic references.", 0, java.lang.Integer.MAX_VALUE, relatedArtifact)); - children.add(new Property("type", "code", "Used for an outcome to classify.", 0, 1, type)); children.add(new Property("actual", "boolean", "True if the actual variable measured, false if a conceptual representation of the intended variable.", 0, 1, actual)); children.add(new Property("characteristicCombination", "code", "Used to specify if two or more characteristics are combined with OR or AND.", 0, 1, characteristicCombination)); children.add(new Property("characteristic", "", "A characteristic that defines the members of the evidence element. Multiple characteristics are applied with \"and\" semantics.", 0, java.lang.Integer.MAX_VALUE, characteristic)); + children.add(new Property("handling", "code", "Used for an outcome to classify.", 0, 1, handling)); + children.add(new Property("category", "", "A grouping (or set of values) described along with other groupings to specify the set of groupings allowed for the variable.", 0, java.lang.Integer.MAX_VALUE, category)); } @Override @@ -3131,26 +3201,21 @@ public class EvidenceVariable extends MetadataResource { case -2060497896: /*subtitle*/ return new Property("subtitle", "string", "An explanatory or alternate title for the EvidenceVariable giving additional information about its content.", 0, 1, subtitle); case -892481550: /*status*/ return new Property("status", "code", "The status of this evidence variable. Enables tracking the life-cycle of the content.", 0, 1, status); case 3076014: /*date*/ return new Property("date", "dateTime", "The date (and optionally time) when the evidence variable was published. The date must change when the business version changes and it must change if the status code changes. In addition, it should change when the substantive content of the evidence variable changes.", 0, 1, date); - case 1447404028: /*publisher*/ return new Property("publisher", "string", "The name of the organization or individual that published the evidence variable.", 0, 1, publisher); - case 951526432: /*contact*/ return new Property("contact", "ContactDetail", "Contact details to assist a user in finding and communicating with the publisher.", 0, java.lang.Integer.MAX_VALUE, contact); case -1724546052: /*description*/ return new Property("description", "markdown", "A free text natural language description of the evidence variable from a consumer's perspective.", 0, 1, description); case 3387378: /*note*/ return new Property("note", "Annotation", "A human-readable string to clarify or explain concepts about the resource.", 0, java.lang.Integer.MAX_VALUE, note); 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 evidence variable instances.", 0, java.lang.Integer.MAX_VALUE, useContext); - case -507075711: /*jurisdiction*/ return new Property("jurisdiction", "CodeableConcept", "A legal or geographic region in which the evidence variable is intended to be used.", 0, java.lang.Integer.MAX_VALUE, jurisdiction); - case 1522889671: /*copyright*/ return new Property("copyright", "markdown", "A copyright statement relating to the evidence variable and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the evidence variable.", 0, 1, copyright); - case 223539345: /*approvalDate*/ return new Property("approvalDate", "date", "The date on which the resource content was approved by the publisher. Approval happens once when the content is officially approved for usage.", 0, 1, approvalDate); - case -1687512484: /*lastReviewDate*/ return new Property("lastReviewDate", "date", "The date on which the resource content was last reviewed. Review happens periodically after approval but does not change the original approval date.", 0, 1, lastReviewDate); - case -403934648: /*effectivePeriod*/ return new Property("effectivePeriod", "Period", "The period during which the evidence variable content was or is planned to be in active use.", 0, 1, effectivePeriod); - case 110546223: /*topic*/ return new Property("topic", "CodeableConcept", "Descriptive topics related to the content of the EvidenceVariable. Topics provide a high-level categorization grouping types of EvidenceVariables that can be useful for filtering and searching.", 0, java.lang.Integer.MAX_VALUE, topic); + case 1447404028: /*publisher*/ return new Property("publisher", "string", "The name of the organization or individual that published the evidence variable.", 0, 1, publisher); + case 951526432: /*contact*/ return new Property("contact", "ContactDetail", "Contact details to assist a user in finding and communicating with the publisher.", 0, java.lang.Integer.MAX_VALUE, contact); case -1406328437: /*author*/ return new Property("author", "ContactDetail", "An individiual or organization primarily involved in the creation and maintenance of the content.", 0, java.lang.Integer.MAX_VALUE, author); case -1307827859: /*editor*/ return new Property("editor", "ContactDetail", "An individual or organization primarily responsible for internal coherence of the content.", 0, java.lang.Integer.MAX_VALUE, editor); case -261190139: /*reviewer*/ return new Property("reviewer", "ContactDetail", "An individual or organization primarily responsible for review of some aspect of the content.", 0, java.lang.Integer.MAX_VALUE, reviewer); case 1740277666: /*endorser*/ return new Property("endorser", "ContactDetail", "An individual or organization responsible for officially endorsing the content for use in some setting.", 0, java.lang.Integer.MAX_VALUE, endorser); case 666807069: /*relatedArtifact*/ return new Property("relatedArtifact", "RelatedArtifact", "Related artifacts such as additional documentation, justification, or bibliographic references.", 0, java.lang.Integer.MAX_VALUE, relatedArtifact); - case 3575610: /*type*/ return new Property("type", "code", "Used for an outcome to classify.", 0, 1, type); case -1422939762: /*actual*/ return new Property("actual", "boolean", "True if the actual variable measured, false if a conceptual representation of the intended variable.", 0, 1, actual); case -861347276: /*characteristicCombination*/ return new Property("characteristicCombination", "code", "Used to specify if two or more characteristics are combined with OR or AND.", 0, 1, characteristicCombination); case 366313883: /*characteristic*/ return new Property("characteristic", "", "A characteristic that defines the members of the evidence element. Multiple characteristics are applied with \"and\" semantics.", 0, java.lang.Integer.MAX_VALUE, characteristic); + case 2072805: /*handling*/ return new Property("handling", "code", "Used for an outcome to classify.", 0, 1, handling); + case 50511102: /*category*/ return new Property("category", "", "A grouping (or set of values) described along with other groupings to specify the set of groupings allowed for the variable.", 0, java.lang.Integer.MAX_VALUE, category); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -3168,26 +3233,21 @@ public class EvidenceVariable extends MetadataResource { case -2060497896: /*subtitle*/ return this.subtitle == null ? new Base[0] : new Base[] {this.subtitle}; // StringType case -892481550: /*status*/ return this.status == null ? new Base[0] : new Base[] {this.status}; // Enumeration case 3076014: /*date*/ return this.date == null ? new Base[0] : new Base[] {this.date}; // DateTimeType - case 1447404028: /*publisher*/ return this.publisher == null ? new Base[0] : new Base[] {this.publisher}; // StringType - case 951526432: /*contact*/ return this.contact == null ? new Base[0] : this.contact.toArray(new Base[this.contact.size()]); // ContactDetail case -1724546052: /*description*/ return this.description == null ? new Base[0] : new Base[] {this.description}; // MarkdownType case 3387378: /*note*/ return this.note == null ? new Base[0] : this.note.toArray(new Base[this.note.size()]); // Annotation case -669707736: /*useContext*/ return this.useContext == null ? new Base[0] : this.useContext.toArray(new Base[this.useContext.size()]); // UsageContext - case -507075711: /*jurisdiction*/ return this.jurisdiction == null ? new Base[0] : this.jurisdiction.toArray(new Base[this.jurisdiction.size()]); // CodeableConcept - case 1522889671: /*copyright*/ return this.copyright == null ? new Base[0] : new Base[] {this.copyright}; // MarkdownType - case 223539345: /*approvalDate*/ return this.approvalDate == null ? new Base[0] : new Base[] {this.approvalDate}; // DateType - case -1687512484: /*lastReviewDate*/ return this.lastReviewDate == null ? new Base[0] : new Base[] {this.lastReviewDate}; // DateType - case -403934648: /*effectivePeriod*/ return this.effectivePeriod == null ? new Base[0] : new Base[] {this.effectivePeriod}; // Period - case 110546223: /*topic*/ return this.topic == null ? new Base[0] : this.topic.toArray(new Base[this.topic.size()]); // CodeableConcept + case 1447404028: /*publisher*/ return this.publisher == null ? new Base[0] : new Base[] {this.publisher}; // StringType + case 951526432: /*contact*/ return this.contact == null ? new Base[0] : this.contact.toArray(new Base[this.contact.size()]); // ContactDetail case -1406328437: /*author*/ return this.author == null ? new Base[0] : this.author.toArray(new Base[this.author.size()]); // ContactDetail case -1307827859: /*editor*/ return this.editor == null ? new Base[0] : this.editor.toArray(new Base[this.editor.size()]); // ContactDetail case -261190139: /*reviewer*/ return this.reviewer == null ? new Base[0] : this.reviewer.toArray(new Base[this.reviewer.size()]); // ContactDetail case 1740277666: /*endorser*/ return this.endorser == null ? new Base[0] : this.endorser.toArray(new Base[this.endorser.size()]); // ContactDetail case 666807069: /*relatedArtifact*/ return this.relatedArtifact == null ? new Base[0] : this.relatedArtifact.toArray(new Base[this.relatedArtifact.size()]); // RelatedArtifact - case 3575610: /*type*/ return this.type == null ? new Base[0] : new Base[] {this.type}; // Enumeration case -1422939762: /*actual*/ return this.actual == null ? new Base[0] : new Base[] {this.actual}; // BooleanType case -861347276: /*characteristicCombination*/ return this.characteristicCombination == null ? new Base[0] : new Base[] {this.characteristicCombination}; // Enumeration case 366313883: /*characteristic*/ return this.characteristic == null ? new Base[0] : this.characteristic.toArray(new Base[this.characteristic.size()]); // EvidenceVariableCharacteristicComponent + case 2072805: /*handling*/ return this.handling == null ? new Base[0] : new Base[] {this.handling}; // Enumeration + case 50511102: /*category*/ return this.category == null ? new Base[0] : this.category.toArray(new Base[this.category.size()]); // EvidenceVariableCategoryComponent default: return super.getProperty(hash, name, checkValid); } @@ -3224,12 +3284,6 @@ public class EvidenceVariable extends MetadataResource { case 3076014: // date this.date = TypeConvertor.castToDateTime(value); // DateTimeType return value; - case 1447404028: // publisher - this.publisher = TypeConvertor.castToString(value); // StringType - return value; - case 951526432: // contact - this.getContact().add(TypeConvertor.castToContactDetail(value)); // ContactDetail - return value; case -1724546052: // description this.description = TypeConvertor.castToMarkdown(value); // MarkdownType return value; @@ -3239,23 +3293,11 @@ public class EvidenceVariable extends MetadataResource { case -669707736: // useContext this.getUseContext().add(TypeConvertor.castToUsageContext(value)); // UsageContext return value; - case -507075711: // jurisdiction - this.getJurisdiction().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept + case 1447404028: // publisher + this.publisher = TypeConvertor.castToString(value); // StringType return value; - case 1522889671: // copyright - this.copyright = TypeConvertor.castToMarkdown(value); // MarkdownType - return value; - case 223539345: // approvalDate - this.approvalDate = TypeConvertor.castToDate(value); // DateType - return value; - case -1687512484: // lastReviewDate - this.lastReviewDate = TypeConvertor.castToDate(value); // DateType - return value; - case -403934648: // effectivePeriod - this.effectivePeriod = TypeConvertor.castToPeriod(value); // Period - return value; - case 110546223: // topic - this.getTopic().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept + case 951526432: // contact + this.getContact().add(TypeConvertor.castToContactDetail(value)); // ContactDetail return value; case -1406328437: // author this.getAuthor().add(TypeConvertor.castToContactDetail(value)); // ContactDetail @@ -3272,10 +3314,6 @@ public class EvidenceVariable extends MetadataResource { case 666807069: // relatedArtifact this.getRelatedArtifact().add(TypeConvertor.castToRelatedArtifact(value)); // RelatedArtifact return value; - case 3575610: // type - value = new EvidenceVariableTypeEnumFactory().fromType(TypeConvertor.castToCode(value)); - this.type = (Enumeration) value; // Enumeration - return value; case -1422939762: // actual this.actual = TypeConvertor.castToBoolean(value); // BooleanType return value; @@ -3286,6 +3324,13 @@ public class EvidenceVariable extends MetadataResource { case 366313883: // characteristic this.getCharacteristic().add((EvidenceVariableCharacteristicComponent) value); // EvidenceVariableCharacteristicComponent return value; + case 2072805: // handling + value = new EvidenceVariableHandlingEnumFactory().fromType(TypeConvertor.castToCode(value)); + this.handling = (Enumeration) value; // Enumeration + return value; + case 50511102: // category + this.getCategory().add((EvidenceVariableCategoryComponent) value); // EvidenceVariableCategoryComponent + return value; default: return super.setProperty(hash, name, value); } @@ -3312,28 +3357,16 @@ public class EvidenceVariable extends MetadataResource { this.status = (Enumeration) value; // Enumeration } else if (name.equals("date")) { this.date = TypeConvertor.castToDateTime(value); // DateTimeType - } else if (name.equals("publisher")) { - this.publisher = TypeConvertor.castToString(value); // StringType - } else if (name.equals("contact")) { - this.getContact().add(TypeConvertor.castToContactDetail(value)); } else if (name.equals("description")) { this.description = TypeConvertor.castToMarkdown(value); // MarkdownType } else if (name.equals("note")) { this.getNote().add(TypeConvertor.castToAnnotation(value)); } else if (name.equals("useContext")) { this.getUseContext().add(TypeConvertor.castToUsageContext(value)); - } else if (name.equals("jurisdiction")) { - this.getJurisdiction().add(TypeConvertor.castToCodeableConcept(value)); - } else if (name.equals("copyright")) { - this.copyright = TypeConvertor.castToMarkdown(value); // MarkdownType - } else if (name.equals("approvalDate")) { - this.approvalDate = TypeConvertor.castToDate(value); // DateType - } else if (name.equals("lastReviewDate")) { - this.lastReviewDate = TypeConvertor.castToDate(value); // DateType - } else if (name.equals("effectivePeriod")) { - this.effectivePeriod = TypeConvertor.castToPeriod(value); // Period - } else if (name.equals("topic")) { - this.getTopic().add(TypeConvertor.castToCodeableConcept(value)); + } else if (name.equals("publisher")) { + this.publisher = TypeConvertor.castToString(value); // StringType + } else if (name.equals("contact")) { + this.getContact().add(TypeConvertor.castToContactDetail(value)); } else if (name.equals("author")) { this.getAuthor().add(TypeConvertor.castToContactDetail(value)); } else if (name.equals("editor")) { @@ -3344,9 +3377,6 @@ public class EvidenceVariable extends MetadataResource { this.getEndorser().add(TypeConvertor.castToContactDetail(value)); } else if (name.equals("relatedArtifact")) { this.getRelatedArtifact().add(TypeConvertor.castToRelatedArtifact(value)); - } else if (name.equals("type")) { - value = new EvidenceVariableTypeEnumFactory().fromType(TypeConvertor.castToCode(value)); - this.type = (Enumeration) value; // Enumeration } else if (name.equals("actual")) { this.actual = TypeConvertor.castToBoolean(value); // BooleanType } else if (name.equals("characteristicCombination")) { @@ -3354,6 +3384,11 @@ public class EvidenceVariable extends MetadataResource { this.characteristicCombination = (Enumeration) value; // Enumeration } else if (name.equals("characteristic")) { this.getCharacteristic().add((EvidenceVariableCharacteristicComponent) value); + } else if (name.equals("handling")) { + value = new EvidenceVariableHandlingEnumFactory().fromType(TypeConvertor.castToCode(value)); + this.handling = (Enumeration) value; // Enumeration + } else if (name.equals("category")) { + this.getCategory().add((EvidenceVariableCategoryComponent) value); } else return super.setProperty(name, value); return value; @@ -3371,26 +3406,21 @@ public class EvidenceVariable extends MetadataResource { case -2060497896: return getSubtitleElement(); case -892481550: return getStatusElement(); case 3076014: return getDateElement(); - case 1447404028: return getPublisherElement(); - case 951526432: return addContact(); case -1724546052: return getDescriptionElement(); case 3387378: return addNote(); case -669707736: return addUseContext(); - case -507075711: return addJurisdiction(); - case 1522889671: return getCopyrightElement(); - case 223539345: return getApprovalDateElement(); - case -1687512484: return getLastReviewDateElement(); - case -403934648: return getEffectivePeriod(); - case 110546223: return addTopic(); + case 1447404028: return getPublisherElement(); + case 951526432: return addContact(); case -1406328437: return addAuthor(); case -1307827859: return addEditor(); case -261190139: return addReviewer(); case 1740277666: return addEndorser(); case 666807069: return addRelatedArtifact(); - case 3575610: return getTypeElement(); case -1422939762: return getActualElement(); case -861347276: return getCharacteristicCombinationElement(); case 366313883: return addCharacteristic(); + case 2072805: return getHandlingElement(); + case 50511102: return addCategory(); default: return super.makeProperty(hash, name); } @@ -3408,26 +3438,21 @@ public class EvidenceVariable extends MetadataResource { case -2060497896: /*subtitle*/ return new String[] {"string"}; case -892481550: /*status*/ return new String[] {"code"}; case 3076014: /*date*/ return new String[] {"dateTime"}; - case 1447404028: /*publisher*/ return new String[] {"string"}; - case 951526432: /*contact*/ return new String[] {"ContactDetail"}; case -1724546052: /*description*/ return new String[] {"markdown"}; case 3387378: /*note*/ return new String[] {"Annotation"}; case -669707736: /*useContext*/ return new String[] {"UsageContext"}; - case -507075711: /*jurisdiction*/ return new String[] {"CodeableConcept"}; - case 1522889671: /*copyright*/ return new String[] {"markdown"}; - case 223539345: /*approvalDate*/ return new String[] {"date"}; - case -1687512484: /*lastReviewDate*/ return new String[] {"date"}; - case -403934648: /*effectivePeriod*/ return new String[] {"Period"}; - case 110546223: /*topic*/ return new String[] {"CodeableConcept"}; + case 1447404028: /*publisher*/ return new String[] {"string"}; + case 951526432: /*contact*/ return new String[] {"ContactDetail"}; case -1406328437: /*author*/ return new String[] {"ContactDetail"}; case -1307827859: /*editor*/ return new String[] {"ContactDetail"}; case -261190139: /*reviewer*/ return new String[] {"ContactDetail"}; case 1740277666: /*endorser*/ return new String[] {"ContactDetail"}; case 666807069: /*relatedArtifact*/ return new String[] {"RelatedArtifact"}; - case 3575610: /*type*/ return new String[] {"code"}; case -1422939762: /*actual*/ return new String[] {"boolean"}; case -861347276: /*characteristicCombination*/ return new String[] {"code"}; case 366313883: /*characteristic*/ return new String[] {}; + case 2072805: /*handling*/ return new String[] {"code"}; + case 50511102: /*category*/ return new String[] {}; default: return super.getTypesForProperty(hash, name); } @@ -3462,12 +3487,6 @@ public class EvidenceVariable extends MetadataResource { else if (name.equals("date")) { throw new FHIRException("Cannot call addChild on a primitive type EvidenceVariable.date"); } - else if (name.equals("publisher")) { - throw new FHIRException("Cannot call addChild on a primitive type EvidenceVariable.publisher"); - } - else if (name.equals("contact")) { - return addContact(); - } else if (name.equals("description")) { throw new FHIRException("Cannot call addChild on a primitive type EvidenceVariable.description"); } @@ -3477,24 +3496,11 @@ public class EvidenceVariable extends MetadataResource { else if (name.equals("useContext")) { return addUseContext(); } - else if (name.equals("jurisdiction")) { - return addJurisdiction(); + else if (name.equals("publisher")) { + throw new FHIRException("Cannot call addChild on a primitive type EvidenceVariable.publisher"); } - else if (name.equals("copyright")) { - throw new FHIRException("Cannot call addChild on a primitive type EvidenceVariable.copyright"); - } - else if (name.equals("approvalDate")) { - throw new FHIRException("Cannot call addChild on a primitive type EvidenceVariable.approvalDate"); - } - else if (name.equals("lastReviewDate")) { - throw new FHIRException("Cannot call addChild on a primitive type EvidenceVariable.lastReviewDate"); - } - else if (name.equals("effectivePeriod")) { - this.effectivePeriod = new Period(); - return this.effectivePeriod; - } - else if (name.equals("topic")) { - return addTopic(); + else if (name.equals("contact")) { + return addContact(); } else if (name.equals("author")) { return addAuthor(); @@ -3511,9 +3517,6 @@ public class EvidenceVariable extends MetadataResource { else if (name.equals("relatedArtifact")) { return addRelatedArtifact(); } - else if (name.equals("type")) { - throw new FHIRException("Cannot call addChild on a primitive type EvidenceVariable.type"); - } else if (name.equals("actual")) { throw new FHIRException("Cannot call addChild on a primitive type EvidenceVariable.actual"); } @@ -3523,6 +3526,12 @@ public class EvidenceVariable extends MetadataResource { else if (name.equals("characteristic")) { return addCharacteristic(); } + else if (name.equals("handling")) { + throw new FHIRException("Cannot call addChild on a primitive type EvidenceVariable.handling"); + } + else if (name.equals("category")) { + return addCategory(); + } else return super.addChild(name); } @@ -3553,12 +3562,6 @@ public class EvidenceVariable extends MetadataResource { dst.subtitle = subtitle == null ? null : subtitle.copy(); dst.status = status == null ? null : status.copy(); dst.date = date == null ? null : date.copy(); - dst.publisher = publisher == null ? null : publisher.copy(); - if (contact != null) { - dst.contact = new ArrayList(); - for (ContactDetail i : contact) - dst.contact.add(i.copy()); - }; dst.description = description == null ? null : description.copy(); if (note != null) { dst.note = new ArrayList(); @@ -3570,19 +3573,11 @@ public class EvidenceVariable extends MetadataResource { for (UsageContext i : useContext) dst.useContext.add(i.copy()); }; - if (jurisdiction != null) { - dst.jurisdiction = new ArrayList(); - for (CodeableConcept i : jurisdiction) - dst.jurisdiction.add(i.copy()); - }; - dst.copyright = copyright == null ? null : copyright.copy(); - dst.approvalDate = approvalDate == null ? null : approvalDate.copy(); - dst.lastReviewDate = lastReviewDate == null ? null : lastReviewDate.copy(); - dst.effectivePeriod = effectivePeriod == null ? null : effectivePeriod.copy(); - if (topic != null) { - dst.topic = new ArrayList(); - for (CodeableConcept i : topic) - dst.topic.add(i.copy()); + dst.publisher = publisher == null ? null : publisher.copy(); + if (contact != null) { + dst.contact = new ArrayList(); + for (ContactDetail i : contact) + dst.contact.add(i.copy()); }; if (author != null) { dst.author = new ArrayList(); @@ -3609,7 +3604,6 @@ public class EvidenceVariable extends MetadataResource { for (RelatedArtifact i : relatedArtifact) dst.relatedArtifact.add(i.copy()); }; - dst.type = type == null ? null : type.copy(); dst.actual = actual == null ? null : actual.copy(); dst.characteristicCombination = characteristicCombination == null ? null : characteristicCombination.copy(); if (characteristic != null) { @@ -3617,6 +3611,12 @@ public class EvidenceVariable extends MetadataResource { for (EvidenceVariableCharacteristicComponent i : characteristic) dst.characteristic.add(i.copy()); }; + dst.handling = handling == null ? null : handling.copy(); + if (category != null) { + dst.category = new ArrayList(); + for (EvidenceVariableCategoryComponent i : category) + dst.category.add(i.copy()); + }; } protected EvidenceVariable typedCopy() { @@ -3633,14 +3633,12 @@ public class EvidenceVariable extends MetadataResource { return compareDeep(url, o.url, true) && compareDeep(identifier, o.identifier, true) && compareDeep(version, o.version, true) && compareDeep(name, o.name, true) && compareDeep(title, o.title, true) && compareDeep(shortTitle, o.shortTitle, true) && compareDeep(subtitle, o.subtitle, true) && compareDeep(status, o.status, true) && compareDeep(date, o.date, true) - && compareDeep(publisher, o.publisher, true) && compareDeep(contact, o.contact, true) && compareDeep(description, o.description, true) - && compareDeep(note, o.note, true) && compareDeep(useContext, o.useContext, true) && compareDeep(jurisdiction, o.jurisdiction, true) - && compareDeep(copyright, o.copyright, true) && compareDeep(approvalDate, o.approvalDate, true) - && compareDeep(lastReviewDate, o.lastReviewDate, true) && compareDeep(effectivePeriod, o.effectivePeriod, true) - && compareDeep(topic, o.topic, true) && compareDeep(author, o.author, true) && compareDeep(editor, o.editor, true) - && compareDeep(reviewer, o.reviewer, true) && compareDeep(endorser, o.endorser, true) && compareDeep(relatedArtifact, o.relatedArtifact, true) - && compareDeep(type, o.type, true) && compareDeep(actual, o.actual, true) && compareDeep(characteristicCombination, o.characteristicCombination, true) - && compareDeep(characteristic, o.characteristic, true); + && compareDeep(description, o.description, true) && compareDeep(note, o.note, true) && compareDeep(useContext, o.useContext, true) + && compareDeep(publisher, o.publisher, true) && compareDeep(contact, o.contact, true) && compareDeep(author, o.author, true) + && compareDeep(editor, o.editor, true) && compareDeep(reviewer, o.reviewer, true) && compareDeep(endorser, o.endorser, true) + && compareDeep(relatedArtifact, o.relatedArtifact, true) && compareDeep(actual, o.actual, true) + && compareDeep(characteristicCombination, o.characteristicCombination, true) && compareDeep(characteristic, o.characteristic, true) + && compareDeep(handling, o.handling, true) && compareDeep(category, o.category, true); } @Override @@ -3652,18 +3650,16 @@ public class EvidenceVariable extends MetadataResource { EvidenceVariable o = (EvidenceVariable) other_; return compareValues(url, o.url, true) && compareValues(version, o.version, true) && compareValues(name, o.name, true) && compareValues(title, o.title, true) && compareValues(shortTitle, o.shortTitle, true) && compareValues(subtitle, o.subtitle, true) - && compareValues(status, o.status, true) && compareValues(date, o.date, true) && compareValues(publisher, o.publisher, true) - && compareValues(description, o.description, true) && compareValues(copyright, o.copyright, true) && compareValues(approvalDate, o.approvalDate, true) - && compareValues(lastReviewDate, o.lastReviewDate, true) && compareValues(type, o.type, true) && compareValues(actual, o.actual, true) - && compareValues(characteristicCombination, o.characteristicCombination, true); + && compareValues(status, o.status, true) && compareValues(date, o.date, true) && compareValues(description, o.description, true) + && compareValues(publisher, o.publisher, true) && compareValues(actual, o.actual, true) && compareValues(characteristicCombination, o.characteristicCombination, true) + && compareValues(handling, o.handling, true); } public boolean isEmpty() { return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(url, identifier, version - , name, title, shortTitle, subtitle, status, date, publisher, contact, description - , note, useContext, jurisdiction, copyright, approvalDate, lastReviewDate, effectivePeriod - , topic, author, editor, reviewer, endorser, relatedArtifact, type, actual, characteristicCombination - , characteristic); + , name, title, shortTitle, subtitle, status, date, description, note, useContext + , publisher, contact, author, editor, reviewer, endorser, relatedArtifact, actual + , characteristicCombination, characteristic, handling, category); } @Override @@ -3679,7 +3675,7 @@ public class EvidenceVariable extends MetadataResource { * Path: EvidenceVariable.relatedArtifact.where(type='composed-of').resource
*

*/ - @SearchParamDefinition(name="composed-of", path="EvidenceVariable.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="EvidenceVariable.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 @@ -3825,7 +3821,7 @@ public class EvidenceVariable extends MetadataResource { * Path: EvidenceVariable.relatedArtifact.where(type='depends-on').resource
*

*/ - @SearchParamDefinition(name="depends-on", path="EvidenceVariable.relatedArtifact.where(type='depends-on').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="depends-on", path="EvidenceVariable.relatedArtifact.where(type='depends-on').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_DEPENDS_ON = "depends-on"; /** * Fluent Client search parameter constant for depends-on @@ -3851,7 +3847,7 @@ public class EvidenceVariable extends MetadataResource { * Path: EvidenceVariable.relatedArtifact.where(type='derived-from').resource
*

*/ - @SearchParamDefinition(name="derived-from", path="EvidenceVariable.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="EvidenceVariable.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 @@ -3889,26 +3885,6 @@ public class EvidenceVariable extends MetadataResource { */ public static final ca.uhn.fhir.rest.gclient.StringClientParam DESCRIPTION = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_DESCRIPTION); - /** - * Search parameter: effective - *

- * Description: The time during which the evidence variable is intended to be in use
- * Type: date
- * Path: EvidenceVariable.effectivePeriod
- *

- */ - @SearchParamDefinition(name="effective", path="EvidenceVariable.effectivePeriod", description="The time during which the evidence variable is intended to be in use", type="date" ) - public static final String SP_EFFECTIVE = "effective"; - /** - * Fluent Client search parameter constant for effective - *

- * Description: The time during which the evidence variable is intended to be in use
- * Type: date
- * Path: EvidenceVariable.effectivePeriod
- *

- */ - public static final ca.uhn.fhir.rest.gclient.DateClientParam EFFECTIVE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_EFFECTIVE); - /** * Search parameter: identifier *

@@ -3929,26 +3905,6 @@ public class EvidenceVariable extends MetadataResource { */ public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); - /** - * Search parameter: jurisdiction - *

- * Description: Intended jurisdiction for the evidence variable
- * Type: token
- * Path: EvidenceVariable.jurisdiction
- *

- */ - @SearchParamDefinition(name="jurisdiction", path="EvidenceVariable.jurisdiction", description="Intended jurisdiction for the evidence variable", type="token" ) - public static final String SP_JURISDICTION = "jurisdiction"; - /** - * Fluent Client search parameter constant for jurisdiction - *

- * Description: Intended jurisdiction for the evidence variable
- * Type: token
- * Path: EvidenceVariable.jurisdiction
- *

- */ - public static final ca.uhn.fhir.rest.gclient.TokenClientParam JURISDICTION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_JURISDICTION); - /** * Search parameter: name *

@@ -3977,7 +3933,7 @@ public class EvidenceVariable extends MetadataResource { * Path: EvidenceVariable.relatedArtifact.where(type='predecessor').resource
*

*/ - @SearchParamDefinition(name="predecessor", path="EvidenceVariable.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="EvidenceVariable.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 @@ -4043,7 +3999,7 @@ public class EvidenceVariable extends MetadataResource { * Path: EvidenceVariable.relatedArtifact.where(type='successor').resource
*

*/ - @SearchParamDefinition(name="successor", path="EvidenceVariable.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="EvidenceVariable.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 @@ -4086,17 +4042,17 @@ public class EvidenceVariable extends MetadataResource { *

* Description: Topics associated with the EvidenceVariable
* Type: token
- * Path: EvidenceVariable.topic
+ * Path: null
*

*/ - @SearchParamDefinition(name="topic", path="EvidenceVariable.topic", description="Topics associated with the EvidenceVariable", type="token" ) + @SearchParamDefinition(name="topic", path="", description="Topics associated with the EvidenceVariable", type="token" ) public static final String SP_TOPIC = "topic"; /** * Fluent Client search parameter constant for topic *

* Description: Topics associated with the EvidenceVariable
* Type: token
- * Path: EvidenceVariable.topic
+ * Path: null
*

*/ public static final ca.uhn.fhir.rest.gclient.TokenClientParam TOPIC = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TOPIC); @@ -4142,4 +4098,5 @@ public class EvidenceVariable 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/ExampleScenario.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ExampleScenario.java index 6bd574d95..240508d8b 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ExampleScenario.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ExampleScenario.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; /** * Example of workflow instance. @@ -5275,4 +5273,5 @@ public class ExampleScenario 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/ExplanationOfBenefit.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ExplanationOfBenefit.java index 70c82d73f..03a3d87f0 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ExplanationOfBenefit.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ExplanationOfBenefit.java @@ -1,10 +1,6 @@ package org.hl7.fhir.r5.model; - - -import java.math.BigDecimal; - /* Copyright (c) 2011+, HL7, Inc. All rights reserved. @@ -33,27 +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.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 claim details; adjudication details from the processing of a Claim; and optionally account balance information, for informing the subscriber of the benefits provided. @@ -15171,4 +15164,5 @@ public class ExplanationOfBenefit extends DomainResource { public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBDETAIL_UDI = new ca.uhn.fhir.model.api.Include("ExplanationOfBenefit:subdetail-udi").toLocked(); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Expression.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Expression.java index faca7f8ed..b09288ba4 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Expression.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Expression.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 Expression Type: A expression that is evaluated in a specified context and returns a value. The context of use of the expression must specify the context in which the expression is evaluated, and how the result of the expression is used. @@ -487,4 +519,5 @@ public class Expression 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/Extension.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Extension.java index 5e085b30c..79c080921 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Extension.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Extension.java @@ -1,18 +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.IBaseDatatypeElement; import org.hl7.fhir.exceptions.FHIRException; -import org.hl7.fhir.instance.model.api.IBaseDatatype; -import org.hl7.fhir.instance.model.api.IBaseExtension; -import org.hl7.fhir.instance.model.api.IBaseHasExtensions; - +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.IBaseExtension; +import org.hl7.fhir.instance.model.api.IBaseDatatype; +import org.hl7.fhir.instance.model.api.IBaseHasExtensions; /** * Base StructureDefinition for Extension Type: Optional Extension Element - found in all resources. */ @@ -1272,4 +1307,5 @@ public class Extension extends BaseExtension implements IBaseExtension
* 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 @@ -2930,7 +2930,7 @@ public class FamilyMemberHistory 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 @@ -2952,7 +2952,7 @@ public class FamilyMemberHistory 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); @@ -3052,4 +3052,5 @@ public class FamilyMemberHistory extends DomainResource { public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("FamilyMemberHistory:patient").toLocked(); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Flag.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Flag.java index 47e19fdfc..d3f61ff7b 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Flag.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Flag.java @@ -1,8 +1,6 @@ package org.hl7.fhir.r5.model; - - /* Copyright (c) 2011+, HL7, Inc. All rights reserved. @@ -31,17 +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; /** * Prospective warnings of potential issues when providing care to the patient. @@ -910,10 +914,10 @@ public class Flag 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", 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", target={Encounter.class } ) public static final String SP_ENCOUNTER = "encounter"; /** * Fluent Client search parameter constant for encounter @@ -934,7 +938,7 @@ public class Flag 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); @@ -1040,4 +1044,5 @@ public class Flag extends DomainResource { public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("Flag:patient").toLocked(); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Goal.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Goal.java index cc568091e..0505581d5 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Goal.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Goal.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; /** * Describes the intended objective(s) for a patient, group or organization care, for example, weight loss, restoring an activity of daily living, obtaining herd immunity via immunization, meeting a process improvement objective, etc. @@ -2011,7 +2011,7 @@ public class Goal 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 @@ -2033,10 +2033,10 @@ public class Goal 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 @@ -2053,7 +2053,7 @@ public class Goal 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 @@ -2075,7 +2075,7 @@ public class Goal 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); @@ -2175,4 +2175,5 @@ public class Goal extends DomainResource { public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("Goal:patient").toLocked(); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/GraphDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/GraphDefinition.java index 70e4606c3..85c6c6c8b 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/GraphDefinition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/GraphDefinition.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 formal computable definition of a graph of resources - that is, a coherent set of resources that form a graph by following references. The Graph Definition resource defines a set and makes rules about the set. @@ -3771,4 +3767,5 @@ public class GraphDefinition 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/Group.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Group.java index 2e1990ca5..20630ea7d 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Group.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Group.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; /** * Represents a defined collection of entities that may be discussed or acted upon collectively but which are not expected to act collectively, and are not formally or legally recognized; i.e. a collection of entities that isn't an Organization. @@ -1909,4 +1910,5 @@ public class Group extends DomainResource { public static final ca.uhn.fhir.rest.gclient.TokenClientParam VALUE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_VALUE); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/GuidanceResponse.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/GuidanceResponse.java index 0fed6d506..6925132ea 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/GuidanceResponse.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/GuidanceResponse.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 guidance response is the formal response to a guidance request, including any output parameters returned by the evaluation, as well as the description of any proposed actions to be taken. @@ -1337,4 +1340,5 @@ public class GuidanceResponse extends DomainResource { public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("GuidanceResponse:subject").toLocked(); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/HealthcareService.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/HealthcareService.java index 1fea03414..427bd52f5 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/HealthcareService.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/HealthcareService.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.DaysOfWeek; -import org.hl7.fhir.r5.model.Enumerations.DaysOfWeekEnumFactory; 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 details of a healthcare service available at a location. @@ -3068,4 +3067,5 @@ public class HealthcareService extends DomainResource { public static final ca.uhn.fhir.rest.gclient.TokenClientParam SPECIALTY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SPECIALTY); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/HumanName.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/HumanName.java index e07c7cde1..0f2ca0983 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/HumanName.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/HumanName.java @@ -1,8 +1,6 @@ package org.hl7.fhir.r5.model; - - /* Copyright (c) 2011+, HL7, Inc. All rights reserved. @@ -31,20 +29,24 @@ 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.instance.model.api.IPrimitiveType; -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; + import ca.uhn.fhir.util.DatatypeUtil; +import org.hl7.fhir.instance.model.api.IPrimitiveType; /** * Base StructureDefinition for HumanName Type: A human's name with the ability to identify parts and usage. */ @@ -855,7 +857,7 @@ public class HumanName extends DataType implements ICompositeType { } // Manual code (from Configuration.txt)t: - /** +/** /** * Returns all repetitions of {@link #getGiven() given name} as a space separated string * @@ -920,9 +922,8 @@ public class HumanName extends DataType implements ICompositeType { b.append(next.getValue()); } return b.toString(); - } - - + } // end addition -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Identifier.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Identifier.java index 11c950565..5f09d925b 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Identifier.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Identifier.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 Identifier Type: An identifier - identifies some entity uniquely and unambiguously. Typically this is used for business identifiers. @@ -625,4 +657,5 @@ public class Identifier 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/ImagingStudy.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImagingStudy.java index 373216968..a3372586c 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImagingStudy.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImagingStudy.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; /** * Representation of the content produced in a DICOM imaging study. A study comprises a set of series, each of which includes a set of Service-Object Pair Instances (SOP Instances - images or other data) acquired or produced in a common context. A series is of only one modality (e.g. X-ray, CT, MR, ultrasound), but a study may have multiple series of different modalities. @@ -450,7 +450,7 @@ public class ImagingStudy extends DomainResource { */ @Child(name = "laterality", type = {Coding.class}, order=8, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Body part laterality", formalDefinition="The laterality of the (possibly paired) anatomic structures examined. E.g., the left knee, both lungs, or unpaired abdomen. If present, shall be consistent with any laterality information indicated in ImagingStudy.series.bodySite." ) - @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/bodysite-laterality") + @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://dicom.nema.org/medical/dicom/current/output/chtml/part16/sect_CID_244.html") protected Coding laterality; /** @@ -3608,7 +3608,7 @@ public class ImagingStudy 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 @@ -3630,10 +3630,10 @@ public class ImagingStudy 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 @@ -3650,7 +3650,7 @@ public class ImagingStudy 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 @@ -3672,7 +3672,7 @@ public class ImagingStudy 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); @@ -3772,4 +3772,5 @@ public class ImagingStudy extends DomainResource { public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("ImagingStudy:patient").toLocked(); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Immunization.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Immunization.java index 9b41fc158..529e9f507 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Immunization.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Immunization.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; /** * Describes the event of a patient being administered a vaccine or a record of an immunization as reported by a patient, a clinician or another party. @@ -1516,10 +1516,31 @@ public class Immunization extends DomainResource { @Description(shortDefinition="Business identifier", formalDefinition="A unique identifier assigned to this immunization record." ) protected List identifier; + /** + * The URL pointing to a FHIR-defined protocol, guideline, orderset or other definition that is adhered to in whole or in part by this Immunization. + */ + @Child(name = "instantiatesCanonical", type = {CanonicalType.class}, order=1, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="Instantiates FHIR protocol or definition for the immunization event", formalDefinition="The URL pointing to a FHIR-defined protocol, guideline, orderset or other definition that is adhered to in whole or in part by this Immunization." ) + protected List instantiatesCanonical; + + /** + * The URL pointing to an externally maintained protocol, guideline, orderset or other definition that is adhered to in whole or in part by this Immunization. + */ + @Child(name = "instantiatesUri", type = {UriType.class}, order=2, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="Instantiates external protocol or definition for the immunization event", formalDefinition="The URL pointing to an externally maintained protocol, guideline, orderset or other definition that is adhered to in whole or in part by this Immunization." ) + protected List instantiatesUri; + + /** + * A plan, order or recommendation fulfilled in whole or in part by this immunization. + */ + @Child(name = "basedOn", type = {CarePlan.class, MedicationRequest.class, ImmunizationRecommendation.class}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="Authority that the immunization event is based on", formalDefinition="A plan, order or recommendation fulfilled in whole or in part by this immunization." ) + protected List basedOn; + /** * Indicates the current status of the immunization event. */ - @Child(name = "status", type = {CodeType.class}, order=1, min=1, max=1, modifier=true, summary=true) + @Child(name = "status", type = {CodeType.class}, order=4, min=1, max=1, modifier=true, summary=true) @Description(shortDefinition="completed | entered-in-error | not-done", formalDefinition="Indicates the current status of the immunization event." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/immunization-status") protected Enumeration status; @@ -1527,7 +1548,7 @@ public class Immunization extends DomainResource { /** * Indicates the reason the immunization event was not performed. */ - @Child(name = "statusReason", type = {CodeableConcept.class}, order=2, min=0, max=1, modifier=false, summary=false) + @Child(name = "statusReason", type = {CodeableConcept.class}, order=5, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Reason for current status", formalDefinition="Indicates the reason the immunization event was not performed." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/immunization-status-reason") protected CodeableConcept statusReason; @@ -1535,50 +1556,71 @@ public class Immunization extends DomainResource { /** * Vaccine that was administered or was to be administered. */ - @Child(name = "vaccineCode", type = {CodeableConcept.class}, order=3, min=1, max=1, modifier=false, summary=true) + @Child(name = "vaccineCode", type = {CodeableConcept.class}, order=6, min=1, max=1, modifier=false, summary=true) @Description(shortDefinition="Vaccine product administered", formalDefinition="Vaccine that was administered or was to be administered." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/vaccine-code") protected CodeableConcept vaccineCode; + /** + * Name of vaccine manufacturer. + */ + @Child(name = "manufacturer", type = {Organization.class}, order=7, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="Vaccine manufacturer", formalDefinition="Name of vaccine manufacturer." ) + protected Reference manufacturer; + + /** + * Lot number of the vaccine product. + */ + @Child(name = "lotNumber", type = {StringType.class}, order=8, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="Vaccine lot number", formalDefinition="Lot number of the vaccine product." ) + protected StringType lotNumber; + + /** + * Date vaccine batch expires. + */ + @Child(name = "expirationDate", type = {DateType.class}, order=9, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="Vaccine expiration date", formalDefinition="Date vaccine batch expires." ) + protected DateType expirationDate; + /** * The patient who either received or did not receive the immunization. */ - @Child(name = "patient", type = {Patient.class}, order=4, min=1, max=1, modifier=false, summary=true) + @Child(name = "patient", type = {Patient.class}, order=10, min=1, max=1, modifier=false, summary=true) @Description(shortDefinition="Who was immunized", formalDefinition="The patient who either received or did not receive the immunization." ) protected Reference patient; /** * The visit or admission or other contact between patient and health care provider the immunization was performed as part of. */ - @Child(name = "encounter", type = {Encounter.class}, order=5, min=0, max=1, modifier=false, summary=false) + @Child(name = "encounter", type = {Encounter.class}, order=11, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Encounter immunization was part of", formalDefinition="The visit or admission or other contact between patient and health care provider the immunization was performed as part of." ) protected Reference encounter; /** * Date vaccine administered or was to be administered. */ - @Child(name = "occurrence", type = {DateTimeType.class, StringType.class}, order=6, min=1, max=1, modifier=false, summary=true) + @Child(name = "occurrence", type = {DateTimeType.class, StringType.class}, order=12, min=1, max=1, modifier=false, summary=true) @Description(shortDefinition="Vaccine administration date", formalDefinition="Date vaccine administered or was to be administered." ) protected DataType occurrence; /** * The date the occurrence of the immunization was first captured in the record - potentially significantly after the occurrence of the event. */ - @Child(name = "recorded", type = {DateTimeType.class}, order=7, min=0, max=1, modifier=false, summary=false) + @Child(name = "recorded", type = {DateTimeType.class}, order=13, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="When the immunization was first captured in the subject's record", formalDefinition="The date the occurrence of the immunization was first captured in the record - potentially significantly after the occurrence of the event." ) protected DateTimeType recorded; /** * Indicates if this record was captured as a secondary 'reported' record rather than as an original primary source-of-truth record. */ - @Child(name = "primarySource", type = {BooleanType.class}, order=8, min=0, max=1, modifier=false, summary=true) + @Child(name = "primarySource", type = {BooleanType.class}, order=14, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Indicates context the data was recorded in", formalDefinition="Indicates if this record was captured as a secondary 'reported' record rather than as an original primary source-of-truth record." ) protected BooleanType primarySource; /** * Typically the source of the data when the report of the immunization event is not based on information from the person who administered the vaccine. */ - @Child(name = "informationSource", type = {CodeableConcept.class, Patient.class, Practitioner.class, PractitionerRole.class, RelatedPerson.class, Organization.class}, order=9, min=0, max=1, modifier=false, summary=false) + @Child(name = "informationSource", type = {CodeableConcept.class, Patient.class, Practitioner.class, PractitionerRole.class, RelatedPerson.class, Organization.class}, order=15, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Indicates the source of a reported record", formalDefinition="Typically the source of the data when the report of the immunization event is not based on information from the person who administered the vaccine." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/immunization-origin") protected DataType informationSource; @@ -1586,35 +1628,14 @@ public class Immunization extends DomainResource { /** * The service delivery location where the vaccine administration occurred. */ - @Child(name = "location", type = {Location.class}, order=10, min=0, max=1, modifier=false, summary=false) + @Child(name = "location", type = {Location.class}, order=16, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Where immunization occurred", formalDefinition="The service delivery location where the vaccine administration occurred." ) protected Reference location; - /** - * Name of vaccine manufacturer. - */ - @Child(name = "manufacturer", type = {Organization.class}, order=11, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Vaccine manufacturer", formalDefinition="Name of vaccine manufacturer." ) - protected Reference manufacturer; - - /** - * Lot number of the vaccine product. - */ - @Child(name = "lotNumber", type = {StringType.class}, order=12, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Vaccine lot number", formalDefinition="Lot number of the vaccine product." ) - protected StringType lotNumber; - - /** - * Date vaccine batch expires. - */ - @Child(name = "expirationDate", type = {DateType.class}, order=13, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Vaccine expiration date", formalDefinition="Date vaccine batch expires." ) - protected DateType expirationDate; - /** * Body site where vaccine was administered. */ - @Child(name = "site", type = {CodeableConcept.class}, order=14, min=0, max=1, modifier=false, summary=false) + @Child(name = "site", type = {CodeableConcept.class}, order=17, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Body site vaccine was administered", formalDefinition="Body site where vaccine was administered." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/immunization-site") protected CodeableConcept site; @@ -1622,7 +1643,7 @@ public class Immunization extends DomainResource { /** * The path by which the vaccine product is taken into the body. */ - @Child(name = "route", type = {CodeableConcept.class}, order=15, min=0, max=1, modifier=false, summary=false) + @Child(name = "route", type = {CodeableConcept.class}, order=18, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="How vaccine entered body", formalDefinition="The path by which the vaccine product is taken into the body." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/immunization-route") protected CodeableConcept route; @@ -1630,28 +1651,28 @@ public class Immunization extends DomainResource { /** * The quantity of vaccine product that was administered. */ - @Child(name = "doseQuantity", type = {Quantity.class}, order=16, min=0, max=1, modifier=false, summary=false) + @Child(name = "doseQuantity", type = {Quantity.class}, order=19, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Amount of vaccine administered", formalDefinition="The quantity of vaccine product that was administered." ) protected Quantity doseQuantity; /** * Indicates who performed the immunization event. */ - @Child(name = "performer", type = {}, order=17, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "performer", type = {}, order=20, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Who performed event", formalDefinition="Indicates who performed the immunization event." ) protected List performer; /** * Extra information about the immunization that is not conveyed by the other attributes. */ - @Child(name = "note", type = {Annotation.class}, order=18, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "note", type = {Annotation.class}, order=21, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Additional immunization notes", formalDefinition="Extra information about the immunization that is not conveyed by the other attributes." ) protected List note; /** * Describes why the immunization occurred in coded or textual form, or Indicates another resource (Condition, Observation or DiagnosticReport) whose existence justifies this immunization. */ - @Child(name = "reason", type = {CodeableReference.class}, order=19, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "reason", type = {CodeableReference.class}, order=22, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Why immunization occurred", formalDefinition="Describes why the immunization occurred in coded or textual form, or Indicates another resource (Condition, Observation or DiagnosticReport) whose existence justifies this immunization." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/immunization-reason") protected List reason; @@ -1659,14 +1680,14 @@ public class Immunization extends DomainResource { /** * Indication if a dose is considered to be subpotent. By default, a dose should be considered to be potent. */ - @Child(name = "isSubpotent", type = {BooleanType.class}, order=20, min=0, max=1, modifier=true, summary=true) + @Child(name = "isSubpotent", type = {BooleanType.class}, order=23, min=0, max=1, modifier=true, summary=true) @Description(shortDefinition="Dose potency", formalDefinition="Indication if a dose is considered to be subpotent. By default, a dose should be considered to be potent." ) protected BooleanType isSubpotent; /** * Reason why a dose is considered to be subpotent. */ - @Child(name = "subpotentReason", type = {CodeableConcept.class}, order=21, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "subpotentReason", type = {CodeableConcept.class}, order=24, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Reason for being subpotent", formalDefinition="Reason why a dose is considered to be subpotent." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/immunization-subpotent-reason") protected List subpotentReason; @@ -1674,14 +1695,14 @@ public class Immunization extends DomainResource { /** * Educational material presented to the patient (or guardian) at the time of vaccine administration. */ - @Child(name = "education", type = {}, order=22, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "education", type = {}, order=25, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Educational material presented to patient", formalDefinition="Educational material presented to the patient (or guardian) at the time of vaccine administration." ) protected List education; /** * Indicates a patient's eligibility for a funding program. */ - @Child(name = "programEligibility", type = {CodeableConcept.class}, order=23, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "programEligibility", type = {CodeableConcept.class}, order=26, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Patient eligibility for a vaccination program", formalDefinition="Indicates a patient's eligibility for a funding program." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/immunization-program-eligibility") protected List programEligibility; @@ -1689,7 +1710,7 @@ public class Immunization extends DomainResource { /** * Indicates the source of the vaccine actually administered. This may be different than the patient eligibility (e.g. the patient may be eligible for a publically purchased vaccine but due to inventory issues, vaccine purchased with private funds was actually administered). */ - @Child(name = "fundingSource", type = {CodeableConcept.class}, order=24, min=0, max=1, modifier=false, summary=false) + @Child(name = "fundingSource", type = {CodeableConcept.class}, order=27, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Funding source for the vaccine", formalDefinition="Indicates the source of the vaccine actually administered. This may be different than the patient eligibility (e.g. the patient may be eligible for a publically purchased vaccine but due to inventory issues, vaccine purchased with private funds was actually administered)." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/immunization-funding-source") protected CodeableConcept fundingSource; @@ -1697,18 +1718,18 @@ public class Immunization extends DomainResource { /** * Categorical data indicating that an adverse event is associated in time to an immunization. */ - @Child(name = "reaction", type = {}, order=25, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "reaction", type = {}, order=28, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Details of a reaction that follows immunization", formalDefinition="Categorical data indicating that an adverse event is associated in time to an immunization." ) protected List reaction; /** * The protocol (set of recommendations) being followed by the provider who administered the dose. */ - @Child(name = "protocolApplied", type = {}, order=26, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "protocolApplied", type = {}, order=29, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Protocol followed by the provider", formalDefinition="The protocol (set of recommendations) being followed by the provider who administered the dose." ) protected List protocolApplied; - private static final long serialVersionUID = -1125457837L; + private static final long serialVersionUID = 35822108L; /** * Constructor @@ -1781,6 +1802,181 @@ public class Immunization extends DomainResource { return getIdentifier().get(0); } + /** + * @return {@link #instantiatesCanonical} (The URL pointing to a FHIR-defined protocol, guideline, orderset or other definition that is adhered to in whole or in part by this Immunization.) + */ + public List getInstantiatesCanonical() { + if (this.instantiatesCanonical == null) + this.instantiatesCanonical = new ArrayList(); + return this.instantiatesCanonical; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public Immunization setInstantiatesCanonical(List theInstantiatesCanonical) { + this.instantiatesCanonical = theInstantiatesCanonical; + return this; + } + + public boolean hasInstantiatesCanonical() { + if (this.instantiatesCanonical == null) + return false; + for (CanonicalType item : this.instantiatesCanonical) + if (!item.isEmpty()) + return true; + return false; + } + + /** + * @return {@link #instantiatesCanonical} (The URL pointing to a FHIR-defined protocol, guideline, orderset or other definition that is adhered to in whole or in part by this Immunization.) + */ + public CanonicalType addInstantiatesCanonicalElement() {//2 + CanonicalType t = new CanonicalType(); + if (this.instantiatesCanonical == null) + this.instantiatesCanonical = new ArrayList(); + this.instantiatesCanonical.add(t); + return t; + } + + /** + * @param value {@link #instantiatesCanonical} (The URL pointing to a FHIR-defined protocol, guideline, orderset or other definition that is adhered to in whole or in part by this Immunization.) + */ + public Immunization addInstantiatesCanonical(String value) { //1 + CanonicalType t = new CanonicalType(); + t.setValue(value); + if (this.instantiatesCanonical == null) + this.instantiatesCanonical = new ArrayList(); + this.instantiatesCanonical.add(t); + return this; + } + + /** + * @param value {@link #instantiatesCanonical} (The URL pointing to a FHIR-defined protocol, guideline, orderset or other definition that is adhered to in whole or in part by this Immunization.) + */ + public boolean hasInstantiatesCanonical(String value) { + if (this.instantiatesCanonical == null) + return false; + for (CanonicalType v : this.instantiatesCanonical) + if (v.getValue().equals(value)) // canonical + return true; + return false; + } + + /** + * @return {@link #instantiatesUri} (The URL pointing to an externally maintained protocol, guideline, orderset or other definition that is adhered to in whole or in part by this Immunization.) + */ + public List getInstantiatesUri() { + if (this.instantiatesUri == null) + this.instantiatesUri = new ArrayList(); + return this.instantiatesUri; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public Immunization setInstantiatesUri(List theInstantiatesUri) { + this.instantiatesUri = theInstantiatesUri; + return this; + } + + public boolean hasInstantiatesUri() { + if (this.instantiatesUri == null) + return false; + for (UriType item : this.instantiatesUri) + if (!item.isEmpty()) + return true; + return false; + } + + /** + * @return {@link #instantiatesUri} (The URL pointing to an externally maintained protocol, guideline, orderset or other definition that is adhered to in whole or in part by this Immunization.) + */ + public UriType addInstantiatesUriElement() {//2 + UriType t = new UriType(); + if (this.instantiatesUri == null) + this.instantiatesUri = new ArrayList(); + this.instantiatesUri.add(t); + return t; + } + + /** + * @param value {@link #instantiatesUri} (The URL pointing to an externally maintained protocol, guideline, orderset or other definition that is adhered to in whole or in part by this Immunization.) + */ + public Immunization addInstantiatesUri(String value) { //1 + UriType t = new UriType(); + t.setValue(value); + if (this.instantiatesUri == null) + this.instantiatesUri = new ArrayList(); + this.instantiatesUri.add(t); + return this; + } + + /** + * @param value {@link #instantiatesUri} (The URL pointing to an externally maintained protocol, guideline, orderset or other definition that is adhered to in whole or in part by this Immunization.) + */ + public boolean hasInstantiatesUri(String value) { + if (this.instantiatesUri == null) + return false; + for (UriType v : this.instantiatesUri) + if (v.getValue().equals(value)) // uri + return true; + return false; + } + + /** + * @return {@link #basedOn} (A plan, order or recommendation fulfilled in whole or in part by this immunization.) + */ + public List getBasedOn() { + if (this.basedOn == null) + this.basedOn = new ArrayList(); + return this.basedOn; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public Immunization setBasedOn(List theBasedOn) { + this.basedOn = theBasedOn; + return this; + } + + public boolean hasBasedOn() { + if (this.basedOn == null) + return false; + for (Reference item : this.basedOn) + if (!item.isEmpty()) + return true; + return false; + } + + public Reference addBasedOn() { //3 + Reference t = new Reference(); + if (this.basedOn == null) + this.basedOn = new ArrayList(); + this.basedOn.add(t); + return t; + } + + public Immunization addBasedOn(Reference t) { //3 + if (t == null) + return this; + if (this.basedOn == null) + this.basedOn = new ArrayList(); + this.basedOn.add(t); + return this; + } + + /** + * @return The first repetition of repeating field {@link #basedOn}, creating it if it does not already exist {3} + */ + public Reference getBasedOnFirstRep() { + if (getBasedOn().isEmpty()) { + addBasedOn(); + } + return getBasedOn().get(0); + } + /** * @return {@link #status} (Indicates the current status of the immunization event.). This is the underlying object with id, value and extensions. The accessor "getStatus" gives direct access to the value */ @@ -1874,6 +2070,128 @@ public class Immunization extends DomainResource { return this; } + /** + * @return {@link #manufacturer} (Name of vaccine manufacturer.) + */ + public Reference getManufacturer() { + if (this.manufacturer == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create Immunization.manufacturer"); + else if (Configuration.doAutoCreate()) + this.manufacturer = new Reference(); // cc + return this.manufacturer; + } + + public boolean hasManufacturer() { + return this.manufacturer != null && !this.manufacturer.isEmpty(); + } + + /** + * @param value {@link #manufacturer} (Name of vaccine manufacturer.) + */ + public Immunization setManufacturer(Reference value) { + this.manufacturer = value; + return this; + } + + /** + * @return {@link #lotNumber} (Lot number of the vaccine product.). This is the underlying object with id, value and extensions. The accessor "getLotNumber" gives direct access to the value + */ + public StringType getLotNumberElement() { + if (this.lotNumber == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create Immunization.lotNumber"); + else if (Configuration.doAutoCreate()) + this.lotNumber = new StringType(); // bb + return this.lotNumber; + } + + public boolean hasLotNumberElement() { + return this.lotNumber != null && !this.lotNumber.isEmpty(); + } + + public boolean hasLotNumber() { + return this.lotNumber != null && !this.lotNumber.isEmpty(); + } + + /** + * @param value {@link #lotNumber} (Lot number of the vaccine product.). This is the underlying object with id, value and extensions. The accessor "getLotNumber" gives direct access to the value + */ + public Immunization setLotNumberElement(StringType value) { + this.lotNumber = value; + return this; + } + + /** + * @return Lot number of the vaccine product. + */ + public String getLotNumber() { + return this.lotNumber == null ? null : this.lotNumber.getValue(); + } + + /** + * @param value Lot number of the vaccine product. + */ + public Immunization setLotNumber(String value) { + if (Utilities.noString(value)) + this.lotNumber = null; + else { + if (this.lotNumber == null) + this.lotNumber = new StringType(); + this.lotNumber.setValue(value); + } + return this; + } + + /** + * @return {@link #expirationDate} (Date vaccine batch expires.). This is the underlying object with id, value and extensions. The accessor "getExpirationDate" gives direct access to the value + */ + public DateType getExpirationDateElement() { + if (this.expirationDate == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create Immunization.expirationDate"); + else if (Configuration.doAutoCreate()) + this.expirationDate = new DateType(); // bb + return this.expirationDate; + } + + public boolean hasExpirationDateElement() { + return this.expirationDate != null && !this.expirationDate.isEmpty(); + } + + public boolean hasExpirationDate() { + return this.expirationDate != null && !this.expirationDate.isEmpty(); + } + + /** + * @param value {@link #expirationDate} (Date vaccine batch expires.). This is the underlying object with id, value and extensions. The accessor "getExpirationDate" gives direct access to the value + */ + public Immunization setExpirationDateElement(DateType value) { + this.expirationDate = value; + return this; + } + + /** + * @return Date vaccine batch expires. + */ + public Date getExpirationDate() { + return this.expirationDate == null ? null : this.expirationDate.getValue(); + } + + /** + * @param value Date vaccine batch expires. + */ + public Immunization setExpirationDate(Date value) { + if (value == null) + this.expirationDate = null; + else { + if (this.expirationDate == null) + this.expirationDate = new DateType(); + this.expirationDate.setValue(value); + } + return this; + } + /** * @return {@link #patient} (The patient who either received or did not receive the immunization.) */ @@ -2142,128 +2460,6 @@ public class Immunization extends DomainResource { return this; } - /** - * @return {@link #manufacturer} (Name of vaccine manufacturer.) - */ - public Reference getManufacturer() { - if (this.manufacturer == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create Immunization.manufacturer"); - else if (Configuration.doAutoCreate()) - this.manufacturer = new Reference(); // cc - return this.manufacturer; - } - - public boolean hasManufacturer() { - return this.manufacturer != null && !this.manufacturer.isEmpty(); - } - - /** - * @param value {@link #manufacturer} (Name of vaccine manufacturer.) - */ - public Immunization setManufacturer(Reference value) { - this.manufacturer = value; - return this; - } - - /** - * @return {@link #lotNumber} (Lot number of the vaccine product.). This is the underlying object with id, value and extensions. The accessor "getLotNumber" gives direct access to the value - */ - public StringType getLotNumberElement() { - if (this.lotNumber == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create Immunization.lotNumber"); - else if (Configuration.doAutoCreate()) - this.lotNumber = new StringType(); // bb - return this.lotNumber; - } - - public boolean hasLotNumberElement() { - return this.lotNumber != null && !this.lotNumber.isEmpty(); - } - - public boolean hasLotNumber() { - return this.lotNumber != null && !this.lotNumber.isEmpty(); - } - - /** - * @param value {@link #lotNumber} (Lot number of the vaccine product.). This is the underlying object with id, value and extensions. The accessor "getLotNumber" gives direct access to the value - */ - public Immunization setLotNumberElement(StringType value) { - this.lotNumber = value; - return this; - } - - /** - * @return Lot number of the vaccine product. - */ - public String getLotNumber() { - return this.lotNumber == null ? null : this.lotNumber.getValue(); - } - - /** - * @param value Lot number of the vaccine product. - */ - public Immunization setLotNumber(String value) { - if (Utilities.noString(value)) - this.lotNumber = null; - else { - if (this.lotNumber == null) - this.lotNumber = new StringType(); - this.lotNumber.setValue(value); - } - return this; - } - - /** - * @return {@link #expirationDate} (Date vaccine batch expires.). This is the underlying object with id, value and extensions. The accessor "getExpirationDate" gives direct access to the value - */ - public DateType getExpirationDateElement() { - if (this.expirationDate == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create Immunization.expirationDate"); - else if (Configuration.doAutoCreate()) - this.expirationDate = new DateType(); // bb - return this.expirationDate; - } - - public boolean hasExpirationDateElement() { - return this.expirationDate != null && !this.expirationDate.isEmpty(); - } - - public boolean hasExpirationDate() { - return this.expirationDate != null && !this.expirationDate.isEmpty(); - } - - /** - * @param value {@link #expirationDate} (Date vaccine batch expires.). This is the underlying object with id, value and extensions. The accessor "getExpirationDate" gives direct access to the value - */ - public Immunization setExpirationDateElement(DateType value) { - this.expirationDate = value; - return this; - } - - /** - * @return Date vaccine batch expires. - */ - public Date getExpirationDate() { - return this.expirationDate == null ? null : this.expirationDate.getValue(); - } - - /** - * @param value Date vaccine batch expires. - */ - public Immunization setExpirationDate(Date value) { - if (value == null) - this.expirationDate = null; - else { - if (this.expirationDate == null) - this.expirationDate = new DateType(); - this.expirationDate.setValue(value); - } - return this; - } - /** * @return {@link #site} (Body site where vaccine was administered.) */ @@ -2832,9 +3028,15 @@ public class Immunization extends DomainResource { protected void listChildren(List children) { super.listChildren(children); children.add(new Property("identifier", "Identifier", "A unique identifier assigned to this immunization record.", 0, java.lang.Integer.MAX_VALUE, identifier)); + children.add(new Property("instantiatesCanonical", "canonical(ActivityDefinition|EventDefinition|EvidenceVariable|Measure|OperationDefinition|PlanDefinition|Questionnaire|SubscriptionTopic)", "The URL pointing to a FHIR-defined protocol, guideline, orderset or other definition that is adhered to in whole or in part by this Immunization.", 0, java.lang.Integer.MAX_VALUE, instantiatesCanonical)); + children.add(new Property("instantiatesUri", "uri", "The URL pointing to an externally maintained protocol, guideline, orderset or other definition that is adhered to in whole or in part by this Immunization.", 0, java.lang.Integer.MAX_VALUE, instantiatesUri)); + children.add(new Property("basedOn", "Reference(CarePlan|MedicationRequest|ImmunizationRecommendation)", "A plan, order or recommendation fulfilled in whole or in part by this immunization.", 0, java.lang.Integer.MAX_VALUE, basedOn)); children.add(new Property("status", "code", "Indicates the current status of the immunization event.", 0, 1, status)); children.add(new Property("statusReason", "CodeableConcept", "Indicates the reason the immunization event was not performed.", 0, 1, statusReason)); children.add(new Property("vaccineCode", "CodeableConcept", "Vaccine that was administered or was to be administered.", 0, 1, vaccineCode)); + children.add(new Property("manufacturer", "Reference(Organization)", "Name of vaccine manufacturer.", 0, 1, manufacturer)); + children.add(new Property("lotNumber", "string", "Lot number of the vaccine product.", 0, 1, lotNumber)); + children.add(new Property("expirationDate", "date", "Date vaccine batch expires.", 0, 1, expirationDate)); children.add(new Property("patient", "Reference(Patient)", "The patient who either received or did not receive the immunization.", 0, 1, patient)); children.add(new Property("encounter", "Reference(Encounter)", "The visit or admission or other contact between patient and health care provider the immunization was performed as part of.", 0, 1, encounter)); children.add(new Property("occurrence[x]", "dateTime|string", "Date vaccine administered or was to be administered.", 0, 1, occurrence)); @@ -2842,9 +3044,6 @@ public class Immunization extends DomainResource { children.add(new Property("primarySource", "boolean", "Indicates if this record was captured as a secondary 'reported' record rather than as an original primary source-of-truth record.", 0, 1, primarySource)); children.add(new Property("informationSource[x]", "CodeableConcept|Reference(Patient|Practitioner|PractitionerRole|RelatedPerson|Organization)", "Typically the source of the data when the report of the immunization event is not based on information from the person who administered the vaccine.", 0, 1, informationSource)); children.add(new Property("location", "Reference(Location)", "The service delivery location where the vaccine administration occurred.", 0, 1, location)); - children.add(new Property("manufacturer", "Reference(Organization)", "Name of vaccine manufacturer.", 0, 1, manufacturer)); - children.add(new Property("lotNumber", "string", "Lot number of the vaccine product.", 0, 1, lotNumber)); - children.add(new Property("expirationDate", "date", "Date vaccine batch expires.", 0, 1, expirationDate)); children.add(new Property("site", "CodeableConcept", "Body site where vaccine was administered.", 0, 1, site)); children.add(new Property("route", "CodeableConcept", "The path by which the vaccine product is taken into the body.", 0, 1, route)); children.add(new Property("doseQuantity", "Quantity", "The quantity of vaccine product that was administered.", 0, 1, doseQuantity)); @@ -2864,9 +3063,15 @@ public class Immunization extends DomainResource { public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { switch (_hash) { case -1618432855: /*identifier*/ return new Property("identifier", "Identifier", "A unique identifier assigned to this immunization record.", 0, java.lang.Integer.MAX_VALUE, identifier); + case 8911915: /*instantiatesCanonical*/ return new Property("instantiatesCanonical", "canonical(ActivityDefinition|EventDefinition|EvidenceVariable|Measure|OperationDefinition|PlanDefinition|Questionnaire|SubscriptionTopic)", "The URL pointing to a FHIR-defined protocol, guideline, orderset or other definition that is adhered to in whole or in part by this Immunization.", 0, java.lang.Integer.MAX_VALUE, instantiatesCanonical); + case -1926393373: /*instantiatesUri*/ return new Property("instantiatesUri", "uri", "The URL pointing to an externally maintained protocol, guideline, orderset or other definition that is adhered to in whole or in part by this Immunization.", 0, java.lang.Integer.MAX_VALUE, instantiatesUri); + case -332612366: /*basedOn*/ return new Property("basedOn", "Reference(CarePlan|MedicationRequest|ImmunizationRecommendation)", "A plan, order or recommendation fulfilled in whole or in part by this immunization.", 0, java.lang.Integer.MAX_VALUE, basedOn); case -892481550: /*status*/ return new Property("status", "code", "Indicates the current status of the immunization event.", 0, 1, status); case 2051346646: /*statusReason*/ return new Property("statusReason", "CodeableConcept", "Indicates the reason the immunization event was not performed.", 0, 1, statusReason); case 664556354: /*vaccineCode*/ return new Property("vaccineCode", "CodeableConcept", "Vaccine that was administered or was to be administered.", 0, 1, vaccineCode); + case -1969347631: /*manufacturer*/ return new Property("manufacturer", "Reference(Organization)", "Name of vaccine manufacturer.", 0, 1, manufacturer); + case 462547450: /*lotNumber*/ return new Property("lotNumber", "string", "Lot number of the vaccine product.", 0, 1, lotNumber); + case -668811523: /*expirationDate*/ return new Property("expirationDate", "date", "Date vaccine batch expires.", 0, 1, expirationDate); case -791418107: /*patient*/ return new Property("patient", "Reference(Patient)", "The patient who either received or did not receive the immunization.", 0, 1, patient); case 1524132147: /*encounter*/ return new Property("encounter", "Reference(Encounter)", "The visit or admission or other contact between patient and health care provider the immunization was performed as part of.", 0, 1, encounter); case -2022646513: /*occurrence[x]*/ return new Property("occurrence[x]", "dateTime|string", "Date vaccine administered or was to be administered.", 0, 1, occurrence); @@ -2880,9 +3085,6 @@ public class Immunization extends DomainResource { case -1849314246: /*informationSourceCodeableConcept*/ return new Property("informationSource[x]", "CodeableConcept", "Typically the source of the data when the report of the immunization event is not based on information from the person who administered the vaccine.", 0, 1, informationSource); case -1721324892: /*informationSourceReference*/ return new Property("informationSource[x]", "Reference(Patient|Practitioner|PractitionerRole|RelatedPerson|Organization)", "Typically the source of the data when the report of the immunization event is not based on information from the person who administered the vaccine.", 0, 1, informationSource); case 1901043637: /*location*/ return new Property("location", "Reference(Location)", "The service delivery location where the vaccine administration occurred.", 0, 1, location); - case -1969347631: /*manufacturer*/ return new Property("manufacturer", "Reference(Organization)", "Name of vaccine manufacturer.", 0, 1, manufacturer); - case 462547450: /*lotNumber*/ return new Property("lotNumber", "string", "Lot number of the vaccine product.", 0, 1, lotNumber); - case -668811523: /*expirationDate*/ return new Property("expirationDate", "date", "Date vaccine batch expires.", 0, 1, expirationDate); case 3530567: /*site*/ return new Property("site", "CodeableConcept", "Body site where vaccine was administered.", 0, 1, site); case 108704329: /*route*/ return new Property("route", "CodeableConcept", "The path by which the vaccine product is taken into the body.", 0, 1, route); case -2083618872: /*doseQuantity*/ return new Property("doseQuantity", "Quantity", "The quantity of vaccine product that was administered.", 0, 1, doseQuantity); @@ -2905,9 +3107,15 @@ public class Immunization extends DomainResource { public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException { switch (hash) { case -1618432855: /*identifier*/ return this.identifier == null ? new Base[0] : this.identifier.toArray(new Base[this.identifier.size()]); // Identifier + case 8911915: /*instantiatesCanonical*/ return this.instantiatesCanonical == null ? new Base[0] : this.instantiatesCanonical.toArray(new Base[this.instantiatesCanonical.size()]); // CanonicalType + case -1926393373: /*instantiatesUri*/ return this.instantiatesUri == null ? new Base[0] : this.instantiatesUri.toArray(new Base[this.instantiatesUri.size()]); // UriType + case -332612366: /*basedOn*/ return this.basedOn == null ? new Base[0] : this.basedOn.toArray(new Base[this.basedOn.size()]); // Reference case -892481550: /*status*/ return this.status == null ? new Base[0] : new Base[] {this.status}; // Enumeration case 2051346646: /*statusReason*/ return this.statusReason == null ? new Base[0] : new Base[] {this.statusReason}; // CodeableConcept case 664556354: /*vaccineCode*/ return this.vaccineCode == null ? new Base[0] : new Base[] {this.vaccineCode}; // CodeableConcept + case -1969347631: /*manufacturer*/ return this.manufacturer == null ? new Base[0] : new Base[] {this.manufacturer}; // Reference + case 462547450: /*lotNumber*/ return this.lotNumber == null ? new Base[0] : new Base[] {this.lotNumber}; // StringType + case -668811523: /*expirationDate*/ return this.expirationDate == null ? new Base[0] : new Base[] {this.expirationDate}; // DateType case -791418107: /*patient*/ return this.patient == null ? new Base[0] : new Base[] {this.patient}; // Reference case 1524132147: /*encounter*/ return this.encounter == null ? new Base[0] : new Base[] {this.encounter}; // Reference case 1687874001: /*occurrence*/ return this.occurrence == null ? new Base[0] : new Base[] {this.occurrence}; // DataType @@ -2915,9 +3123,6 @@ public class Immunization extends DomainResource { case -528721731: /*primarySource*/ return this.primarySource == null ? new Base[0] : new Base[] {this.primarySource}; // BooleanType case -2123220889: /*informationSource*/ return this.informationSource == null ? new Base[0] : new Base[] {this.informationSource}; // DataType case 1901043637: /*location*/ return this.location == null ? new Base[0] : new Base[] {this.location}; // Reference - case -1969347631: /*manufacturer*/ return this.manufacturer == null ? new Base[0] : new Base[] {this.manufacturer}; // Reference - case 462547450: /*lotNumber*/ return this.lotNumber == null ? new Base[0] : new Base[] {this.lotNumber}; // StringType - case -668811523: /*expirationDate*/ return this.expirationDate == null ? new Base[0] : new Base[] {this.expirationDate}; // DateType case 3530567: /*site*/ return this.site == null ? new Base[0] : new Base[] {this.site}; // CodeableConcept case 108704329: /*route*/ return this.route == null ? new Base[0] : new Base[] {this.route}; // CodeableConcept case -2083618872: /*doseQuantity*/ return this.doseQuantity == null ? new Base[0] : new Base[] {this.doseQuantity}; // Quantity @@ -2942,6 +3147,15 @@ public class Immunization extends DomainResource { case -1618432855: // identifier this.getIdentifier().add(TypeConvertor.castToIdentifier(value)); // Identifier return value; + case 8911915: // instantiatesCanonical + this.getInstantiatesCanonical().add(TypeConvertor.castToCanonical(value)); // CanonicalType + return value; + case -1926393373: // instantiatesUri + this.getInstantiatesUri().add(TypeConvertor.castToUri(value)); // UriType + return value; + case -332612366: // basedOn + this.getBasedOn().add(TypeConvertor.castToReference(value)); // Reference + return value; case -892481550: // status value = new ImmunizationStatusCodesEnumFactory().fromType(TypeConvertor.castToCode(value)); this.status = (Enumeration) value; // Enumeration @@ -2952,6 +3166,15 @@ public class Immunization extends DomainResource { case 664556354: // vaccineCode this.vaccineCode = TypeConvertor.castToCodeableConcept(value); // CodeableConcept return value; + case -1969347631: // manufacturer + this.manufacturer = TypeConvertor.castToReference(value); // Reference + return value; + case 462547450: // lotNumber + this.lotNumber = TypeConvertor.castToString(value); // StringType + return value; + case -668811523: // expirationDate + this.expirationDate = TypeConvertor.castToDate(value); // DateType + return value; case -791418107: // patient this.patient = TypeConvertor.castToReference(value); // Reference return value; @@ -2973,15 +3196,6 @@ public class Immunization extends DomainResource { case 1901043637: // location this.location = TypeConvertor.castToReference(value); // Reference return value; - case -1969347631: // manufacturer - this.manufacturer = TypeConvertor.castToReference(value); // Reference - return value; - case 462547450: // lotNumber - this.lotNumber = TypeConvertor.castToString(value); // StringType - return value; - case -668811523: // expirationDate - this.expirationDate = TypeConvertor.castToDate(value); // DateType - return value; case 3530567: // site this.site = TypeConvertor.castToCodeableConcept(value); // CodeableConcept return value; @@ -3030,6 +3244,12 @@ public class Immunization extends DomainResource { public Base setProperty(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().add(TypeConvertor.castToIdentifier(value)); + } else if (name.equals("instantiatesCanonical")) { + this.getInstantiatesCanonical().add(TypeConvertor.castToCanonical(value)); + } else if (name.equals("instantiatesUri")) { + this.getInstantiatesUri().add(TypeConvertor.castToUri(value)); + } else if (name.equals("basedOn")) { + this.getBasedOn().add(TypeConvertor.castToReference(value)); } else if (name.equals("status")) { value = new ImmunizationStatusCodesEnumFactory().fromType(TypeConvertor.castToCode(value)); this.status = (Enumeration) value; // Enumeration @@ -3037,6 +3257,12 @@ public class Immunization extends DomainResource { this.statusReason = TypeConvertor.castToCodeableConcept(value); // CodeableConcept } else if (name.equals("vaccineCode")) { this.vaccineCode = TypeConvertor.castToCodeableConcept(value); // CodeableConcept + } else if (name.equals("manufacturer")) { + this.manufacturer = TypeConvertor.castToReference(value); // Reference + } else if (name.equals("lotNumber")) { + this.lotNumber = TypeConvertor.castToString(value); // StringType + } else if (name.equals("expirationDate")) { + this.expirationDate = TypeConvertor.castToDate(value); // DateType } else if (name.equals("patient")) { this.patient = TypeConvertor.castToReference(value); // Reference } else if (name.equals("encounter")) { @@ -3051,12 +3277,6 @@ public class Immunization extends DomainResource { this.informationSource = TypeConvertor.castToType(value); // DataType } else if (name.equals("location")) { this.location = TypeConvertor.castToReference(value); // Reference - } else if (name.equals("manufacturer")) { - this.manufacturer = TypeConvertor.castToReference(value); // Reference - } else if (name.equals("lotNumber")) { - this.lotNumber = TypeConvertor.castToString(value); // StringType - } else if (name.equals("expirationDate")) { - this.expirationDate = TypeConvertor.castToDate(value); // DateType } else if (name.equals("site")) { this.site = TypeConvertor.castToCodeableConcept(value); // CodeableConcept } else if (name.equals("route")) { @@ -3092,9 +3312,15 @@ public class Immunization extends DomainResource { public Base makeProperty(int hash, String name) throws FHIRException { switch (hash) { case -1618432855: return addIdentifier(); + case 8911915: return addInstantiatesCanonicalElement(); + case -1926393373: return addInstantiatesUriElement(); + case -332612366: return addBasedOn(); case -892481550: return getStatusElement(); case 2051346646: return getStatusReason(); case 664556354: return getVaccineCode(); + case -1969347631: return getManufacturer(); + case 462547450: return getLotNumberElement(); + case -668811523: return getExpirationDateElement(); case -791418107: return getPatient(); case 1524132147: return getEncounter(); case -2022646513: return getOccurrence(); @@ -3104,9 +3330,6 @@ public class Immunization extends DomainResource { case -890044743: return getInformationSource(); case -2123220889: return getInformationSource(); case 1901043637: return getLocation(); - case -1969347631: return getManufacturer(); - case 462547450: return getLotNumberElement(); - case -668811523: return getExpirationDateElement(); case 3530567: return getSite(); case 108704329: return getRoute(); case -2083618872: return getDoseQuantity(); @@ -3129,9 +3352,15 @@ public class Immunization extends DomainResource { public String[] getTypesForProperty(int hash, String name) throws FHIRException { switch (hash) { case -1618432855: /*identifier*/ return new String[] {"Identifier"}; + case 8911915: /*instantiatesCanonical*/ return new String[] {"canonical"}; + case -1926393373: /*instantiatesUri*/ return new String[] {"uri"}; + case -332612366: /*basedOn*/ return new String[] {"Reference"}; case -892481550: /*status*/ return new String[] {"code"}; case 2051346646: /*statusReason*/ return new String[] {"CodeableConcept"}; case 664556354: /*vaccineCode*/ return new String[] {"CodeableConcept"}; + case -1969347631: /*manufacturer*/ return new String[] {"Reference"}; + case 462547450: /*lotNumber*/ return new String[] {"string"}; + case -668811523: /*expirationDate*/ return new String[] {"date"}; case -791418107: /*patient*/ return new String[] {"Reference"}; case 1524132147: /*encounter*/ return new String[] {"Reference"}; case 1687874001: /*occurrence*/ return new String[] {"dateTime", "string"}; @@ -3139,9 +3368,6 @@ public class Immunization extends DomainResource { case -528721731: /*primarySource*/ return new String[] {"boolean"}; case -2123220889: /*informationSource*/ return new String[] {"CodeableConcept", "Reference"}; case 1901043637: /*location*/ return new String[] {"Reference"}; - case -1969347631: /*manufacturer*/ return new String[] {"Reference"}; - case 462547450: /*lotNumber*/ return new String[] {"string"}; - case -668811523: /*expirationDate*/ return new String[] {"date"}; case 3530567: /*site*/ return new String[] {"CodeableConcept"}; case 108704329: /*route*/ return new String[] {"CodeableConcept"}; case -2083618872: /*doseQuantity*/ return new String[] {"Quantity"}; @@ -3165,6 +3391,15 @@ public class Immunization extends DomainResource { if (name.equals("identifier")) { return addIdentifier(); } + else if (name.equals("instantiatesCanonical")) { + throw new FHIRException("Cannot call addChild on a primitive type Immunization.instantiatesCanonical"); + } + else if (name.equals("instantiatesUri")) { + throw new FHIRException("Cannot call addChild on a primitive type Immunization.instantiatesUri"); + } + else if (name.equals("basedOn")) { + return addBasedOn(); + } else if (name.equals("status")) { throw new FHIRException("Cannot call addChild on a primitive type Immunization.status"); } @@ -3176,6 +3411,16 @@ public class Immunization extends DomainResource { this.vaccineCode = new CodeableConcept(); return this.vaccineCode; } + else if (name.equals("manufacturer")) { + this.manufacturer = new Reference(); + return this.manufacturer; + } + else if (name.equals("lotNumber")) { + throw new FHIRException("Cannot call addChild on a primitive type Immunization.lotNumber"); + } + else if (name.equals("expirationDate")) { + throw new FHIRException("Cannot call addChild on a primitive type Immunization.expirationDate"); + } else if (name.equals("patient")) { this.patient = new Reference(); return this.patient; @@ -3210,16 +3455,6 @@ public class Immunization extends DomainResource { this.location = new Reference(); return this.location; } - else if (name.equals("manufacturer")) { - this.manufacturer = new Reference(); - return this.manufacturer; - } - else if (name.equals("lotNumber")) { - throw new FHIRException("Cannot call addChild on a primitive type Immunization.lotNumber"); - } - else if (name.equals("expirationDate")) { - throw new FHIRException("Cannot call addChild on a primitive type Immunization.expirationDate"); - } else if (name.equals("site")) { this.site = new CodeableConcept(); return this.site; @@ -3285,9 +3520,27 @@ public class Immunization extends DomainResource { for (Identifier i : identifier) dst.identifier.add(i.copy()); }; + if (instantiatesCanonical != null) { + dst.instantiatesCanonical = new ArrayList(); + for (CanonicalType i : instantiatesCanonical) + dst.instantiatesCanonical.add(i.copy()); + }; + if (instantiatesUri != null) { + dst.instantiatesUri = new ArrayList(); + for (UriType i : instantiatesUri) + dst.instantiatesUri.add(i.copy()); + }; + if (basedOn != null) { + dst.basedOn = new ArrayList(); + for (Reference i : basedOn) + dst.basedOn.add(i.copy()); + }; dst.status = status == null ? null : status.copy(); dst.statusReason = statusReason == null ? null : statusReason.copy(); dst.vaccineCode = vaccineCode == null ? null : vaccineCode.copy(); + dst.manufacturer = manufacturer == null ? null : manufacturer.copy(); + dst.lotNumber = lotNumber == null ? null : lotNumber.copy(); + dst.expirationDate = expirationDate == null ? null : expirationDate.copy(); dst.patient = patient == null ? null : patient.copy(); dst.encounter = encounter == null ? null : encounter.copy(); dst.occurrence = occurrence == null ? null : occurrence.copy(); @@ -3295,9 +3548,6 @@ public class Immunization extends DomainResource { dst.primarySource = primarySource == null ? null : primarySource.copy(); dst.informationSource = informationSource == null ? null : informationSource.copy(); dst.location = location == null ? null : location.copy(); - dst.manufacturer = manufacturer == null ? null : manufacturer.copy(); - dst.lotNumber = lotNumber == null ? null : lotNumber.copy(); - dst.expirationDate = expirationDate == null ? null : expirationDate.copy(); dst.site = site == null ? null : site.copy(); dst.route = route == null ? null : route.copy(); dst.doseQuantity = doseQuantity == null ? null : doseQuantity.copy(); @@ -3356,12 +3606,14 @@ public class Immunization extends DomainResource { if (!(other_ instanceof Immunization)) return false; Immunization o = (Immunization) other_; - return compareDeep(identifier, o.identifier, true) && compareDeep(status, o.status, true) && compareDeep(statusReason, o.statusReason, true) - && compareDeep(vaccineCode, o.vaccineCode, true) && compareDeep(patient, o.patient, true) && compareDeep(encounter, o.encounter, true) - && compareDeep(occurrence, o.occurrence, true) && compareDeep(recorded, o.recorded, true) && compareDeep(primarySource, o.primarySource, true) - && compareDeep(informationSource, o.informationSource, true) && compareDeep(location, o.location, true) + return compareDeep(identifier, o.identifier, true) && compareDeep(instantiatesCanonical, o.instantiatesCanonical, true) + && compareDeep(instantiatesUri, o.instantiatesUri, true) && compareDeep(basedOn, o.basedOn, true) + && compareDeep(status, o.status, true) && compareDeep(statusReason, o.statusReason, true) && compareDeep(vaccineCode, o.vaccineCode, true) && compareDeep(manufacturer, o.manufacturer, true) && compareDeep(lotNumber, o.lotNumber, true) - && compareDeep(expirationDate, o.expirationDate, true) && compareDeep(site, o.site, true) && compareDeep(route, o.route, true) + && compareDeep(expirationDate, o.expirationDate, true) && compareDeep(patient, o.patient, true) + && compareDeep(encounter, o.encounter, true) && compareDeep(occurrence, o.occurrence, true) && compareDeep(recorded, o.recorded, true) + && compareDeep(primarySource, o.primarySource, true) && compareDeep(informationSource, o.informationSource, true) + && compareDeep(location, o.location, true) && compareDeep(site, o.site, true) && compareDeep(route, o.route, true) && compareDeep(doseQuantity, o.doseQuantity, true) && compareDeep(performer, o.performer, true) && compareDeep(note, o.note, true) && compareDeep(reason, o.reason, true) && compareDeep(isSubpotent, o.isSubpotent, true) && compareDeep(subpotentReason, o.subpotentReason, true) && compareDeep(education, o.education, true) @@ -3377,17 +3629,19 @@ public class Immunization extends DomainResource { if (!(other_ instanceof Immunization)) return false; Immunization o = (Immunization) other_; - return compareValues(status, o.status, true) && compareValues(recorded, o.recorded, true) && compareValues(primarySource, o.primarySource, true) - && compareValues(lotNumber, o.lotNumber, true) && compareValues(expirationDate, o.expirationDate, true) + return compareValues(instantiatesCanonical, o.instantiatesCanonical, true) && compareValues(instantiatesUri, o.instantiatesUri, true) + && compareValues(status, o.status, true) && compareValues(lotNumber, o.lotNumber, true) && compareValues(expirationDate, o.expirationDate, true) + && compareValues(recorded, o.recorded, true) && compareValues(primarySource, o.primarySource, true) && compareValues(isSubpotent, o.isSubpotent, true); } public boolean isEmpty() { - return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, status, statusReason - , vaccineCode, patient, encounter, occurrence, recorded, primarySource, informationSource - , location, manufacturer, lotNumber, expirationDate, site, route, doseQuantity - , performer, note, reason, isSubpotent, subpotentReason, education, programEligibility - , fundingSource, reaction, protocolApplied); + return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, instantiatesCanonical + , instantiatesUri, basedOn, status, statusReason, vaccineCode, manufacturer, lotNumber + , expirationDate, patient, encounter, occurrence, recorded, primarySource, informationSource + , location, site, route, doseQuantity, performer, note, reason, isSubpotent + , subpotentReason, education, programEligibility, fundingSource, reaction, protocolApplied + ); } @Override @@ -3758,7 +4012,7 @@ public class Immunization 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 @@ -3780,10 +4034,10 @@ public class Immunization 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 @@ -3800,7 +4054,7 @@ public class Immunization 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 @@ -3822,7 +4076,7 @@ public class Immunization 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); @@ -3922,4 +4176,5 @@ public class Immunization extends DomainResource { public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("Immunization:patient").toLocked(); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImmunizationEvaluation.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImmunizationEvaluation.java index 82367fc29..3e8100667 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImmunizationEvaluation.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImmunizationEvaluation.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 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 a comparison of an immunization event against published recommendations to determine if the administration is "valid" in relation to those recommendations. @@ -1239,4 +1241,5 @@ public class ImmunizationEvaluation extends DomainResource { public static final ca.uhn.fhir.rest.gclient.TokenClientParam TARGET_DISEASE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TARGET_DISEASE); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImmunizationRecommendation.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImmunizationRecommendation.java index 31870371a..7f20c27f4 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImmunizationRecommendation.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImmunizationRecommendation.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 patient's point-in-time set of recommendations (i.e. forecasting) according to a published schedule with optional supporting justification. @@ -1294,35 +1294,49 @@ public class ImmunizationRecommendation extends DomainResource { @Description(shortDefinition="Business identifier", formalDefinition="A unique identifier assigned to this particular recommendation record." ) protected List identifier; + /** + * The URL pointing to a FHIR-defined protocol, guideline or other definition that is adhered to in whole or in part by this ImmunizationRecommendation. + */ + @Child(name = "instantiatesCanonical", type = {CanonicalType.class}, order=1, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="Instantiates FHIR protocol or definition for the immunization recommendation", formalDefinition="The URL pointing to a FHIR-defined protocol, guideline or other definition that is adhered to in whole or in part by this ImmunizationRecommendation." ) + protected List instantiatesCanonical; + + /** + * The URL pointing to an externally maintained protocol, guideline or other definition that is adhered to in whole or in part by this ImmunizationRecommendation. + */ + @Child(name = "instantiatesUri", type = {UriType.class}, order=2, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="Instantiates external protocol or definition for the immunization recommendation", formalDefinition="The URL pointing to an externally maintained protocol, guideline or other definition that is adhered to in whole or in part by this ImmunizationRecommendation." ) + protected List instantiatesUri; + /** * The patient the recommendation(s) are for. */ - @Child(name = "patient", type = {Patient.class}, order=1, min=1, max=1, modifier=false, summary=true) + @Child(name = "patient", type = {Patient.class}, order=3, min=1, max=1, modifier=false, summary=true) @Description(shortDefinition="Who this profile is for", formalDefinition="The patient the recommendation(s) are for." ) protected Reference patient; /** * The date the immunization recommendation(s) were created. */ - @Child(name = "date", type = {DateTimeType.class}, order=2, min=1, max=1, modifier=false, summary=true) + @Child(name = "date", type = {DateTimeType.class}, order=4, min=1, max=1, modifier=false, summary=true) @Description(shortDefinition="Date recommendation(s) created", formalDefinition="The date the immunization recommendation(s) were created." ) protected DateTimeType date; /** * Indicates the authority who published the protocol (e.g. ACIP). */ - @Child(name = "authority", type = {Organization.class}, order=3, min=0, max=1, modifier=false, summary=false) + @Child(name = "authority", type = {Organization.class}, order=5, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Who is responsible for protocol", formalDefinition="Indicates the authority who published the protocol (e.g. ACIP)." ) protected Reference authority; /** * Vaccine administration recommendations. */ - @Child(name = "recommendation", type = {}, order=4, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "recommendation", type = {}, order=6, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Vaccine administration recommendations", formalDefinition="Vaccine administration recommendations." ) protected List recommendation; - private static final long serialVersionUID = 534427937L; + private static final long serialVersionUID = -1997592129L; /** * Constructor @@ -1394,6 +1408,128 @@ public class ImmunizationRecommendation extends DomainResource { return getIdentifier().get(0); } + /** + * @return {@link #instantiatesCanonical} (The URL pointing to a FHIR-defined protocol, guideline or other definition that is adhered to in whole or in part by this ImmunizationRecommendation.) + */ + public List getInstantiatesCanonical() { + if (this.instantiatesCanonical == null) + this.instantiatesCanonical = new ArrayList(); + return this.instantiatesCanonical; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public ImmunizationRecommendation setInstantiatesCanonical(List theInstantiatesCanonical) { + this.instantiatesCanonical = theInstantiatesCanonical; + return this; + } + + public boolean hasInstantiatesCanonical() { + if (this.instantiatesCanonical == null) + return false; + for (CanonicalType item : this.instantiatesCanonical) + if (!item.isEmpty()) + return true; + return false; + } + + /** + * @return {@link #instantiatesCanonical} (The URL pointing to a FHIR-defined protocol, guideline or other definition that is adhered to in whole or in part by this ImmunizationRecommendation.) + */ + public CanonicalType addInstantiatesCanonicalElement() {//2 + CanonicalType t = new CanonicalType(); + if (this.instantiatesCanonical == null) + this.instantiatesCanonical = new ArrayList(); + this.instantiatesCanonical.add(t); + return t; + } + + /** + * @param value {@link #instantiatesCanonical} (The URL pointing to a FHIR-defined protocol, guideline or other definition that is adhered to in whole or in part by this ImmunizationRecommendation.) + */ + public ImmunizationRecommendation addInstantiatesCanonical(String value) { //1 + CanonicalType t = new CanonicalType(); + t.setValue(value); + if (this.instantiatesCanonical == null) + this.instantiatesCanonical = new ArrayList(); + this.instantiatesCanonical.add(t); + return this; + } + + /** + * @param value {@link #instantiatesCanonical} (The URL pointing to a FHIR-defined protocol, guideline or other definition that is adhered to in whole or in part by this ImmunizationRecommendation.) + */ + public boolean hasInstantiatesCanonical(String value) { + if (this.instantiatesCanonical == null) + return false; + for (CanonicalType v : this.instantiatesCanonical) + if (v.getValue().equals(value)) // canonical + return true; + return false; + } + + /** + * @return {@link #instantiatesUri} (The URL pointing to an externally maintained protocol, guideline or other definition that is adhered to in whole or in part by this ImmunizationRecommendation.) + */ + public List getInstantiatesUri() { + if (this.instantiatesUri == null) + this.instantiatesUri = new ArrayList(); + return this.instantiatesUri; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public ImmunizationRecommendation setInstantiatesUri(List theInstantiatesUri) { + this.instantiatesUri = theInstantiatesUri; + return this; + } + + public boolean hasInstantiatesUri() { + if (this.instantiatesUri == null) + return false; + for (UriType item : this.instantiatesUri) + if (!item.isEmpty()) + return true; + return false; + } + + /** + * @return {@link #instantiatesUri} (The URL pointing to an externally maintained protocol, guideline or other definition that is adhered to in whole or in part by this ImmunizationRecommendation.) + */ + public UriType addInstantiatesUriElement() {//2 + UriType t = new UriType(); + if (this.instantiatesUri == null) + this.instantiatesUri = new ArrayList(); + this.instantiatesUri.add(t); + return t; + } + + /** + * @param value {@link #instantiatesUri} (The URL pointing to an externally maintained protocol, guideline or other definition that is adhered to in whole or in part by this ImmunizationRecommendation.) + */ + public ImmunizationRecommendation addInstantiatesUri(String value) { //1 + UriType t = new UriType(); + t.setValue(value); + if (this.instantiatesUri == null) + this.instantiatesUri = new ArrayList(); + this.instantiatesUri.add(t); + return this; + } + + /** + * @param value {@link #instantiatesUri} (The URL pointing to an externally maintained protocol, guideline or other definition that is adhered to in whole or in part by this ImmunizationRecommendation.) + */ + public boolean hasInstantiatesUri(String value) { + if (this.instantiatesUri == null) + return false; + for (UriType v : this.instantiatesUri) + if (v.getValue().equals(value)) // uri + return true; + return false; + } + /** * @return {@link #patient} (The patient the recommendation(s) are for.) */ @@ -1543,6 +1679,8 @@ public class ImmunizationRecommendation extends DomainResource { protected void listChildren(List children) { super.listChildren(children); children.add(new Property("identifier", "Identifier", "A unique identifier assigned to this particular recommendation record.", 0, java.lang.Integer.MAX_VALUE, identifier)); + children.add(new Property("instantiatesCanonical", "canonical(ActivityDefinition|EventDefinition|EvidenceVariable|Measure|OperationDefinition|PlanDefinition|Questionnaire|SubscriptionTopic)", "The URL pointing to a FHIR-defined protocol, guideline or other definition that is adhered to in whole or in part by this ImmunizationRecommendation.", 0, java.lang.Integer.MAX_VALUE, instantiatesCanonical)); + children.add(new Property("instantiatesUri", "uri", "The URL pointing to an externally maintained protocol, guideline or other definition that is adhered to in whole or in part by this ImmunizationRecommendation.", 0, java.lang.Integer.MAX_VALUE, instantiatesUri)); children.add(new Property("patient", "Reference(Patient)", "The patient the recommendation(s) are for.", 0, 1, patient)); children.add(new Property("date", "dateTime", "The date the immunization recommendation(s) were created.", 0, 1, date)); children.add(new Property("authority", "Reference(Organization)", "Indicates the authority who published the protocol (e.g. ACIP).", 0, 1, authority)); @@ -1553,6 +1691,8 @@ public class ImmunizationRecommendation extends DomainResource { public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { switch (_hash) { case -1618432855: /*identifier*/ return new Property("identifier", "Identifier", "A unique identifier assigned to this particular recommendation record.", 0, java.lang.Integer.MAX_VALUE, identifier); + case 8911915: /*instantiatesCanonical*/ return new Property("instantiatesCanonical", "canonical(ActivityDefinition|EventDefinition|EvidenceVariable|Measure|OperationDefinition|PlanDefinition|Questionnaire|SubscriptionTopic)", "The URL pointing to a FHIR-defined protocol, guideline or other definition that is adhered to in whole or in part by this ImmunizationRecommendation.", 0, java.lang.Integer.MAX_VALUE, instantiatesCanonical); + case -1926393373: /*instantiatesUri*/ return new Property("instantiatesUri", "uri", "The URL pointing to an externally maintained protocol, guideline or other definition that is adhered to in whole or in part by this ImmunizationRecommendation.", 0, java.lang.Integer.MAX_VALUE, instantiatesUri); case -791418107: /*patient*/ return new Property("patient", "Reference(Patient)", "The patient the recommendation(s) are for.", 0, 1, patient); case 3076014: /*date*/ return new Property("date", "dateTime", "The date the immunization recommendation(s) were created.", 0, 1, date); case 1475610435: /*authority*/ return new Property("authority", "Reference(Organization)", "Indicates the authority who published the protocol (e.g. ACIP).", 0, 1, authority); @@ -1566,6 +1706,8 @@ public class ImmunizationRecommendation extends DomainResource { public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException { switch (hash) { case -1618432855: /*identifier*/ return this.identifier == null ? new Base[0] : this.identifier.toArray(new Base[this.identifier.size()]); // Identifier + case 8911915: /*instantiatesCanonical*/ return this.instantiatesCanonical == null ? new Base[0] : this.instantiatesCanonical.toArray(new Base[this.instantiatesCanonical.size()]); // CanonicalType + case -1926393373: /*instantiatesUri*/ return this.instantiatesUri == null ? new Base[0] : this.instantiatesUri.toArray(new Base[this.instantiatesUri.size()]); // UriType case -791418107: /*patient*/ return this.patient == null ? new Base[0] : new Base[] {this.patient}; // Reference case 3076014: /*date*/ return this.date == null ? new Base[0] : new Base[] {this.date}; // DateTimeType case 1475610435: /*authority*/ return this.authority == null ? new Base[0] : new Base[] {this.authority}; // Reference @@ -1581,6 +1723,12 @@ public class ImmunizationRecommendation extends DomainResource { case -1618432855: // identifier this.getIdentifier().add(TypeConvertor.castToIdentifier(value)); // Identifier return value; + case 8911915: // instantiatesCanonical + this.getInstantiatesCanonical().add(TypeConvertor.castToCanonical(value)); // CanonicalType + return value; + case -1926393373: // instantiatesUri + this.getInstantiatesUri().add(TypeConvertor.castToUri(value)); // UriType + return value; case -791418107: // patient this.patient = TypeConvertor.castToReference(value); // Reference return value; @@ -1602,6 +1750,10 @@ public class ImmunizationRecommendation extends DomainResource { public Base setProperty(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.getIdentifier().add(TypeConvertor.castToIdentifier(value)); + } else if (name.equals("instantiatesCanonical")) { + this.getInstantiatesCanonical().add(TypeConvertor.castToCanonical(value)); + } else if (name.equals("instantiatesUri")) { + this.getInstantiatesUri().add(TypeConvertor.castToUri(value)); } else if (name.equals("patient")) { this.patient = TypeConvertor.castToReference(value); // Reference } else if (name.equals("date")) { @@ -1619,6 +1771,8 @@ public class ImmunizationRecommendation extends DomainResource { public Base makeProperty(int hash, String name) throws FHIRException { switch (hash) { case -1618432855: return addIdentifier(); + case 8911915: return addInstantiatesCanonicalElement(); + case -1926393373: return addInstantiatesUriElement(); case -791418107: return getPatient(); case 3076014: return getDateElement(); case 1475610435: return getAuthority(); @@ -1632,6 +1786,8 @@ public class ImmunizationRecommendation extends DomainResource { public String[] getTypesForProperty(int hash, String name) throws FHIRException { switch (hash) { case -1618432855: /*identifier*/ return new String[] {"Identifier"}; + case 8911915: /*instantiatesCanonical*/ return new String[] {"canonical"}; + case -1926393373: /*instantiatesUri*/ return new String[] {"uri"}; case -791418107: /*patient*/ return new String[] {"Reference"}; case 3076014: /*date*/ return new String[] {"dateTime"}; case 1475610435: /*authority*/ return new String[] {"Reference"}; @@ -1646,6 +1802,12 @@ public class ImmunizationRecommendation extends DomainResource { if (name.equals("identifier")) { return addIdentifier(); } + else if (name.equals("instantiatesCanonical")) { + throw new FHIRException("Cannot call addChild on a primitive type ImmunizationRecommendation.instantiatesCanonical"); + } + else if (name.equals("instantiatesUri")) { + throw new FHIRException("Cannot call addChild on a primitive type ImmunizationRecommendation.instantiatesUri"); + } else if (name.equals("patient")) { this.patient = new Reference(); return this.patient; @@ -1682,6 +1844,16 @@ public class ImmunizationRecommendation extends DomainResource { for (Identifier i : identifier) dst.identifier.add(i.copy()); }; + if (instantiatesCanonical != null) { + dst.instantiatesCanonical = new ArrayList(); + for (CanonicalType i : instantiatesCanonical) + dst.instantiatesCanonical.add(i.copy()); + }; + if (instantiatesUri != null) { + dst.instantiatesUri = new ArrayList(); + for (UriType i : instantiatesUri) + dst.instantiatesUri.add(i.copy()); + }; dst.patient = patient == null ? null : patient.copy(); dst.date = date == null ? null : date.copy(); dst.authority = authority == null ? null : authority.copy(); @@ -1703,8 +1875,9 @@ public class ImmunizationRecommendation extends DomainResource { if (!(other_ instanceof ImmunizationRecommendation)) return false; ImmunizationRecommendation o = (ImmunizationRecommendation) other_; - return compareDeep(identifier, o.identifier, true) && compareDeep(patient, o.patient, true) && compareDeep(date, o.date, true) - && compareDeep(authority, o.authority, true) && compareDeep(recommendation, o.recommendation, true) + return compareDeep(identifier, o.identifier, true) && compareDeep(instantiatesCanonical, o.instantiatesCanonical, true) + && compareDeep(instantiatesUri, o.instantiatesUri, true) && compareDeep(patient, o.patient, true) + && compareDeep(date, o.date, true) && compareDeep(authority, o.authority, true) && compareDeep(recommendation, o.recommendation, true) ; } @@ -1715,12 +1888,13 @@ public class ImmunizationRecommendation extends DomainResource { if (!(other_ instanceof ImmunizationRecommendation)) return false; ImmunizationRecommendation o = (ImmunizationRecommendation) other_; - return compareValues(date, o.date, true); + return compareValues(instantiatesCanonical, o.instantiatesCanonical, true) && compareValues(instantiatesUri, o.instantiatesUri, true) + && compareValues(date, o.date, true); } public boolean isEmpty() { - return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, patient, date - , authority, recommendation); + return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, instantiatesCanonical + , instantiatesUri, patient, date, authority, recommendation); } @Override @@ -1776,7 +1950,7 @@ public class ImmunizationRecommendation extends DomainResource { * Path: ImmunizationRecommendation.recommendation.supportingPatientInformation
*

*/ - @SearchParamDefinition(name="information", path="ImmunizationRecommendation.recommendation.supportingPatientInformation", description="Patient observations supporting recommendation", 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="information", path="ImmunizationRecommendation.recommendation.supportingPatientInformation", description="Patient observations supporting recommendation", 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_INFORMATION = "information"; /** * Fluent Client search parameter constant for information @@ -1907,4 +2081,5 @@ public class ImmunizationRecommendation extends DomainResource { public static final ca.uhn.fhir.rest.gclient.TokenClientParam VACCINE_TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_VACCINE_TYPE); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImplementationGuide.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImplementationGuide.java index 239dbfd87..ca43d5179 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImplementationGuide.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImplementationGuide.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.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.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 rules of how a particular interoperability or standards problem is solved - typically through the use of FHIR resources. This resource is used to gather all the parts of an implementation guide into a logical whole and to publish a computable definition of all the parts. @@ -7631,8 +7627,6 @@ public class ImplementationGuide extends CanonicalResource { // added from java-adornments.txt: - - // end addition } @@ -9456,7 +9450,6 @@ public class ImplementationGuide extends CanonicalResource { } // added from java-adornments.txt: - // end addition } @@ -9911,10 +9904,10 @@ public class ImplementationGuide extends CanonicalResource { protected Enumeration license; /** - * The version(s) of the FHIR specification that this ImplementationGuide targets - e.g. describes how to use. The value of this element is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 4.4.0. for this version. + * The version(s) of the FHIR specification that this ImplementationGuide targets - e.g. describes how to use. The value of this element is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 4.5.0. for this version. */ @Child(name = "fhirVersion", type = {CodeType.class}, order=15, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="FHIR Version(s) this Implementation Guide targets", formalDefinition="The version(s) of the FHIR specification that this ImplementationGuide targets - e.g. describes how to use. The value of this element is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 4.4.0. for this version." ) + @Description(shortDefinition="FHIR Version(s) this Implementation Guide targets", formalDefinition="The version(s) of the FHIR specification that this ImplementationGuide targets - e.g. describes how to use. The value of this element is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 4.5.0. for this version." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/FHIR-version") protected List> fhirVersion; @@ -10695,7 +10688,7 @@ public class ImplementationGuide extends CanonicalResource { } /** - * @return {@link #fhirVersion} (The version(s) of the FHIR specification that this ImplementationGuide targets - e.g. describes how to use. The value of this element is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 4.4.0. for this version.) + * @return {@link #fhirVersion} (The version(s) of the FHIR specification that this ImplementationGuide targets - e.g. describes how to use. The value of this element is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 4.5.0. for this version.) */ public List> getFhirVersion() { if (this.fhirVersion == null) @@ -10721,7 +10714,7 @@ public class ImplementationGuide extends CanonicalResource { } /** - * @return {@link #fhirVersion} (The version(s) of the FHIR specification that this ImplementationGuide targets - e.g. describes how to use. The value of this element is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 4.4.0. for this version.) + * @return {@link #fhirVersion} (The version(s) of the FHIR specification that this ImplementationGuide targets - e.g. describes how to use. The value of this element is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 4.5.0. for this version.) */ public Enumeration addFhirVersionElement() {//2 Enumeration t = new Enumeration(new FHIRVersionEnumFactory()); @@ -10732,7 +10725,7 @@ public class ImplementationGuide extends CanonicalResource { } /** - * @param value {@link #fhirVersion} (The version(s) of the FHIR specification that this ImplementationGuide targets - e.g. describes how to use. The value of this element is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 4.4.0. for this version.) + * @param value {@link #fhirVersion} (The version(s) of the FHIR specification that this ImplementationGuide targets - e.g. describes how to use. The value of this element is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 4.5.0. for this version.) */ public ImplementationGuide addFhirVersion(FHIRVersion value) { //1 Enumeration t = new Enumeration(new FHIRVersionEnumFactory()); @@ -10744,7 +10737,7 @@ public class ImplementationGuide extends CanonicalResource { } /** - * @param value {@link #fhirVersion} (The version(s) of the FHIR specification that this ImplementationGuide targets - e.g. describes how to use. The value of this element is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 4.4.0. for this version.) + * @param value {@link #fhirVersion} (The version(s) of the FHIR specification that this ImplementationGuide targets - e.g. describes how to use. The value of this element is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 4.5.0. for this version.) */ public boolean hasFhirVersion(FHIRVersion value) { if (this.fhirVersion == null) @@ -10997,7 +10990,7 @@ public class ImplementationGuide extends CanonicalResource { children.add(new Property("copyright", "markdown", "A copyright statement relating to the implementation guide and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the implementation guide.", 0, 1, copyright)); children.add(new Property("packageId", "id", "The NPM package name for this Implementation Guide, used in the NPM package distribution, which is the primary mechanism by which FHIR based tooling manages IG dependencies. This value must be globally unique, and should be assigned with care.", 0, 1, packageId)); children.add(new Property("license", "code", "The license that applies to this Implementation Guide, using an SPDX license code, or 'not-open-source'.", 0, 1, license)); - children.add(new Property("fhirVersion", "code", "The version(s) of the FHIR specification that this ImplementationGuide targets - e.g. describes how to use. The value of this element is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 4.4.0. for this version.", 0, java.lang.Integer.MAX_VALUE, fhirVersion)); + children.add(new Property("fhirVersion", "code", "The version(s) of the FHIR specification that this ImplementationGuide targets - e.g. describes how to use. The value of this element is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 4.5.0. for this version.", 0, java.lang.Integer.MAX_VALUE, fhirVersion)); children.add(new Property("dependsOn", "", "Another implementation guide that this implementation depends on. Typically, an implementation guide uses value sets, profiles etc.defined in other implementation guides.", 0, java.lang.Integer.MAX_VALUE, dependsOn)); children.add(new Property("global", "", "A set of profiles that all resources covered by this implementation guide must conform to.", 0, java.lang.Integer.MAX_VALUE, global)); children.add(new Property("definition", "", "The information needed by an IG publisher tool to publish the whole implementation guide.", 0, 1, definition)); @@ -11022,7 +11015,7 @@ public class ImplementationGuide extends CanonicalResource { case 1522889671: /*copyright*/ return new Property("copyright", "markdown", "A copyright statement relating to the implementation guide and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the implementation guide.", 0, 1, copyright); case 1802060801: /*packageId*/ return new Property("packageId", "id", "The NPM package name for this Implementation Guide, used in the NPM package distribution, which is the primary mechanism by which FHIR based tooling manages IG dependencies. This value must be globally unique, and should be assigned with care.", 0, 1, packageId); case 166757441: /*license*/ return new Property("license", "code", "The license that applies to this Implementation Guide, using an SPDX license code, or 'not-open-source'.", 0, 1, license); - case 461006061: /*fhirVersion*/ return new Property("fhirVersion", "code", "The version(s) of the FHIR specification that this ImplementationGuide targets - e.g. describes how to use. The value of this element is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 4.4.0. for this version.", 0, java.lang.Integer.MAX_VALUE, fhirVersion); + case 461006061: /*fhirVersion*/ return new Property("fhirVersion", "code", "The version(s) of the FHIR specification that this ImplementationGuide targets - e.g. describes how to use. The value of this element is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 4.5.0. for this version.", 0, java.lang.Integer.MAX_VALUE, fhirVersion); case -1109214266: /*dependsOn*/ return new Property("dependsOn", "", "Another implementation guide that this implementation depends on. Typically, an implementation guide uses value sets, profiles etc.defined in other implementation guides.", 0, java.lang.Integer.MAX_VALUE, dependsOn); case -1243020381: /*global*/ return new Property("global", "", "A set of profiles that all resources covered by this implementation guide must conform to.", 0, java.lang.Integer.MAX_VALUE, global); case -1014418093: /*definition*/ return new Property("definition", "", "The information needed by an IG publisher tool to publish the whole implementation guide.", 0, 1, definition); @@ -11491,7 +11484,7 @@ public class ImplementationGuide extends CanonicalResource { * Path: ImplementationGuide.definition.resource.reference
*

*/ - @SearchParamDefinition(name="resource", path="ImplementationGuide.definition.resource.reference", description="Location of the 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="resource", path="ImplementationGuide.definition.resource.reference", description="Location of the 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_RESOURCE = "resource"; /** * Fluent Client search parameter constant for resource @@ -12228,4 +12221,5 @@ public class ImplementationGuide 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/Ingredient.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Ingredient.java index 672ca4618..b45520c1c 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Ingredient.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Ingredient.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; /** * An ingredient of a manufactured item or pharmaceutical product. @@ -53,62 +54,47 @@ import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; public class Ingredient extends DomainResource { @Block() - public static class IngredientSpecifiedSubstanceComponent extends BackboneElement implements IBaseBackboneElement { + public static class IngredientSubstanceComponent extends BackboneElement implements IBaseBackboneElement { /** - * Substance as a 'specified substance', implying extra substance related characteristics. + * A code or full resource that represents the ingredient substance. */ @Child(name = "code", type = {CodeableConcept.class, SubstanceDefinition.class, Substance.class}, order=1, min=1, max=1, modifier=false, summary=true) - @Description(shortDefinition="Substance as a 'specified substance', implying extra substance related characteristics", formalDefinition="Substance as a 'specified substance', implying extra substance related characteristics." ) + @Description(shortDefinition="A code or full resource that represents the ingredient substance", formalDefinition="A code or full resource that represents the ingredient substance." ) protected DataType code; - /** - * The group of specified substance, e.g. group 1 to 4. - */ - @Child(name = "group", type = {CodeableConcept.class}, order=2, min=1, max=1, modifier=false, summary=true) - @Description(shortDefinition="The group of specified substance, e.g. group 1 to 4", formalDefinition="The group of specified substance, e.g. group 1 to 4." ) - protected CodeableConcept group; - - /** - * Confidentiality level of the specified substance as the ingredient. - */ - @Child(name = "confidentiality", type = {CodeableConcept.class}, order=3, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Confidentiality level of the specified substance as the ingredient", formalDefinition="Confidentiality level of the specified substance as the ingredient." ) - protected CodeableConcept confidentiality; - /** * Quantity of the substance or specified substance present in the manufactured item or pharmaceutical product. */ - @Child(name = "strength", type = {}, order=4, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "strength", type = {}, order=2, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Quantity of the substance or specified substance present in the manufactured item or pharmaceutical product", formalDefinition="Quantity of the substance or specified substance present in the manufactured item or pharmaceutical product." ) - protected List strength; + protected List strength; - private static final long serialVersionUID = -972862616L; + private static final long serialVersionUID = -70189331L; /** * Constructor */ - public IngredientSpecifiedSubstanceComponent() { + public IngredientSubstanceComponent() { super(); } /** * Constructor */ - public IngredientSpecifiedSubstanceComponent(DataType code, CodeableConcept group) { + public IngredientSubstanceComponent(DataType code) { super(); this.setCode(code); - this.setGroup(group); } /** - * @return {@link #code} (Substance as a 'specified substance', implying extra substance related characteristics.) + * @return {@link #code} (A code or full resource that represents the ingredient substance.) */ public DataType getCode() { return this.code; } /** - * @return {@link #code} (Substance as a 'specified substance', implying extra substance related characteristics.) + * @return {@link #code} (A code or full resource that represents the ingredient substance.) */ public CodeableConcept getCodeCodeableConcept() throws FHIRException { if (this.code == null) @@ -123,7 +109,7 @@ public class Ingredient extends DomainResource { } /** - * @return {@link #code} (Substance as a 'specified substance', implying extra substance related characteristics.) + * @return {@link #code} (A code or full resource that represents the ingredient substance.) */ public Reference getCodeReference() throws FHIRException { if (this.code == null) @@ -142,76 +128,28 @@ public class Ingredient extends DomainResource { } /** - * @param value {@link #code} (Substance as a 'specified substance', implying extra substance related characteristics.) + * @param value {@link #code} (A code or full resource that represents the ingredient substance.) */ - public IngredientSpecifiedSubstanceComponent setCode(DataType value) { + public IngredientSubstanceComponent setCode(DataType value) { if (value != null && !(value instanceof CodeableConcept || value instanceof Reference)) - throw new Error("Not the right type for Ingredient.specifiedSubstance.code[x]: "+value.fhirType()); + throw new Error("Not the right type for Ingredient.substance.code[x]: "+value.fhirType()); this.code = value; return this; } - /** - * @return {@link #group} (The group of specified substance, e.g. group 1 to 4.) - */ - public CodeableConcept getGroup() { - if (this.group == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create IngredientSpecifiedSubstanceComponent.group"); - else if (Configuration.doAutoCreate()) - this.group = new CodeableConcept(); // cc - return this.group; - } - - public boolean hasGroup() { - return this.group != null && !this.group.isEmpty(); - } - - /** - * @param value {@link #group} (The group of specified substance, e.g. group 1 to 4.) - */ - public IngredientSpecifiedSubstanceComponent setGroup(CodeableConcept value) { - this.group = value; - return this; - } - - /** - * @return {@link #confidentiality} (Confidentiality level of the specified substance as the ingredient.) - */ - public CodeableConcept getConfidentiality() { - if (this.confidentiality == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create IngredientSpecifiedSubstanceComponent.confidentiality"); - else if (Configuration.doAutoCreate()) - this.confidentiality = new CodeableConcept(); // cc - return this.confidentiality; - } - - public boolean hasConfidentiality() { - return this.confidentiality != null && !this.confidentiality.isEmpty(); - } - - /** - * @param value {@link #confidentiality} (Confidentiality level of the specified substance as the ingredient.) - */ - public IngredientSpecifiedSubstanceComponent setConfidentiality(CodeableConcept value) { - this.confidentiality = value; - return this; - } - /** * @return {@link #strength} (Quantity of the substance or specified substance present in the manufactured item or pharmaceutical product.) */ - public List getStrength() { + public List getStrength() { if (this.strength == null) - this.strength = new ArrayList(); + this.strength = new ArrayList(); return this.strength; } /** * @return Returns a reference to this for easy method chaining */ - public IngredientSpecifiedSubstanceComponent setStrength(List theStrength) { + public IngredientSubstanceComponent setStrength(List theStrength) { this.strength = theStrength; return this; } @@ -219,25 +157,25 @@ public class Ingredient extends DomainResource { public boolean hasStrength() { if (this.strength == null) return false; - for (IngredientSpecifiedSubstanceStrengthComponent item : this.strength) + for (IngredientSubstanceStrengthComponent item : this.strength) if (!item.isEmpty()) return true; return false; } - public IngredientSpecifiedSubstanceStrengthComponent addStrength() { //3 - IngredientSpecifiedSubstanceStrengthComponent t = new IngredientSpecifiedSubstanceStrengthComponent(); + public IngredientSubstanceStrengthComponent addStrength() { //3 + IngredientSubstanceStrengthComponent t = new IngredientSubstanceStrengthComponent(); if (this.strength == null) - this.strength = new ArrayList(); + this.strength = new ArrayList(); this.strength.add(t); return t; } - public IngredientSpecifiedSubstanceComponent addStrength(IngredientSpecifiedSubstanceStrengthComponent t) { //3 + public IngredientSubstanceComponent addStrength(IngredientSubstanceStrengthComponent t) { //3 if (t == null) return this; if (this.strength == null) - this.strength = new ArrayList(); + this.strength = new ArrayList(); this.strength.add(t); return this; } @@ -245,7 +183,7 @@ public class Ingredient extends DomainResource { /** * @return The first repetition of repeating field {@link #strength}, creating it if it does not already exist {3} */ - public IngredientSpecifiedSubstanceStrengthComponent getStrengthFirstRep() { + public IngredientSubstanceStrengthComponent getStrengthFirstRep() { if (getStrength().isEmpty()) { addStrength(); } @@ -254,21 +192,17 @@ public class Ingredient extends DomainResource { protected void listChildren(List children) { super.listChildren(children); - children.add(new Property("code[x]", "CodeableConcept|Reference(SubstanceDefinition|Substance)", "Substance as a 'specified substance', implying extra substance related characteristics.", 0, 1, code)); - children.add(new Property("group", "CodeableConcept", "The group of specified substance, e.g. group 1 to 4.", 0, 1, group)); - children.add(new Property("confidentiality", "CodeableConcept", "Confidentiality level of the specified substance as the ingredient.", 0, 1, confidentiality)); + children.add(new Property("code[x]", "CodeableConcept|Reference(SubstanceDefinition|Substance)", "A code or full resource that represents the ingredient substance.", 0, 1, code)); children.add(new Property("strength", "", "Quantity of the substance or specified substance present in the manufactured item or pharmaceutical product.", 0, java.lang.Integer.MAX_VALUE, strength)); } @Override public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { switch (_hash) { - case 941839219: /*code[x]*/ return new Property("code[x]", "CodeableConcept|Reference(SubstanceDefinition|Substance)", "Substance as a 'specified substance', implying extra substance related characteristics.", 0, 1, code); - case 3059181: /*code*/ return new Property("code[x]", "CodeableConcept|Reference(SubstanceDefinition|Substance)", "Substance as a 'specified substance', implying extra substance related characteristics.", 0, 1, code); - case 4899316: /*codeCodeableConcept*/ return new Property("code[x]", "CodeableConcept", "Substance as a 'specified substance', implying extra substance related characteristics.", 0, 1, code); - case 1565461470: /*codeReference*/ return new Property("code[x]", "Reference(SubstanceDefinition|Substance)", "Substance as a 'specified substance', implying extra substance related characteristics.", 0, 1, code); - case 98629247: /*group*/ return new Property("group", "CodeableConcept", "The group of specified substance, e.g. group 1 to 4.", 0, 1, group); - case -1923018202: /*confidentiality*/ return new Property("confidentiality", "CodeableConcept", "Confidentiality level of the specified substance as the ingredient.", 0, 1, confidentiality); + case 941839219: /*code[x]*/ return new Property("code[x]", "CodeableConcept|Reference(SubstanceDefinition|Substance)", "A code or full resource that represents the ingredient substance.", 0, 1, code); + case 3059181: /*code*/ return new Property("code[x]", "CodeableConcept|Reference(SubstanceDefinition|Substance)", "A code or full resource that represents the ingredient substance.", 0, 1, code); + case 4899316: /*codeCodeableConcept*/ return new Property("code[x]", "CodeableConcept", "A code or full resource that represents the ingredient substance.", 0, 1, code); + case 1565461470: /*codeReference*/ return new Property("code[x]", "Reference(SubstanceDefinition|Substance)", "A code or full resource that represents the ingredient substance.", 0, 1, code); case 1791316033: /*strength*/ return new Property("strength", "", "Quantity of the substance or specified substance present in the manufactured item or pharmaceutical product.", 0, java.lang.Integer.MAX_VALUE, strength); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -279,9 +213,7 @@ public class Ingredient extends DomainResource { public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException { switch (hash) { case 3059181: /*code*/ return this.code == null ? new Base[0] : new Base[] {this.code}; // DataType - case 98629247: /*group*/ return this.group == null ? new Base[0] : new Base[] {this.group}; // CodeableConcept - case -1923018202: /*confidentiality*/ return this.confidentiality == null ? new Base[0] : new Base[] {this.confidentiality}; // CodeableConcept - case 1791316033: /*strength*/ return this.strength == null ? new Base[0] : this.strength.toArray(new Base[this.strength.size()]); // IngredientSpecifiedSubstanceStrengthComponent + case 1791316033: /*strength*/ return this.strength == null ? new Base[0] : this.strength.toArray(new Base[this.strength.size()]); // IngredientSubstanceStrengthComponent default: return super.getProperty(hash, name, checkValid); } @@ -293,14 +225,8 @@ public class Ingredient extends DomainResource { case 3059181: // code this.code = TypeConvertor.castToType(value); // DataType return value; - case 98629247: // group - this.group = TypeConvertor.castToCodeableConcept(value); // CodeableConcept - return value; - case -1923018202: // confidentiality - this.confidentiality = TypeConvertor.castToCodeableConcept(value); // CodeableConcept - return value; case 1791316033: // strength - this.getStrength().add((IngredientSpecifiedSubstanceStrengthComponent) value); // IngredientSpecifiedSubstanceStrengthComponent + this.getStrength().add((IngredientSubstanceStrengthComponent) value); // IngredientSubstanceStrengthComponent return value; default: return super.setProperty(hash, name, value); } @@ -311,12 +237,8 @@ public class Ingredient extends DomainResource { public Base setProperty(String name, Base value) throws FHIRException { if (name.equals("code[x]")) { this.code = TypeConvertor.castToType(value); // DataType - } else if (name.equals("group")) { - this.group = TypeConvertor.castToCodeableConcept(value); // CodeableConcept - } else if (name.equals("confidentiality")) { - this.confidentiality = TypeConvertor.castToCodeableConcept(value); // CodeableConcept } else if (name.equals("strength")) { - this.getStrength().add((IngredientSpecifiedSubstanceStrengthComponent) value); + this.getStrength().add((IngredientSubstanceStrengthComponent) value); } else return super.setProperty(name, value); return value; @@ -327,8 +249,6 @@ public class Ingredient extends DomainResource { switch (hash) { case 941839219: return getCode(); case 3059181: return getCode(); - case 98629247: return getGroup(); - case -1923018202: return getConfidentiality(); case 1791316033: return addStrength(); default: return super.makeProperty(hash, name); } @@ -339,8 +259,6 @@ public class Ingredient extends DomainResource { public String[] getTypesForProperty(int hash, String name) throws FHIRException { switch (hash) { case 3059181: /*code*/ return new String[] {"CodeableConcept", "Reference"}; - case 98629247: /*group*/ return new String[] {"CodeableConcept"}; - case -1923018202: /*confidentiality*/ return new String[] {"CodeableConcept"}; case 1791316033: /*strength*/ return new String[] {}; default: return super.getTypesForProperty(hash, name); } @@ -357,14 +275,6 @@ public class Ingredient extends DomainResource { this.code = new Reference(); return this.code; } - else if (name.equals("group")) { - this.group = new CodeableConcept(); - return this.group; - } - else if (name.equals("confidentiality")) { - this.confidentiality = new CodeableConcept(); - return this.confidentiality; - } else if (name.equals("strength")) { return addStrength(); } @@ -372,20 +282,18 @@ public class Ingredient extends DomainResource { return super.addChild(name); } - public IngredientSpecifiedSubstanceComponent copy() { - IngredientSpecifiedSubstanceComponent dst = new IngredientSpecifiedSubstanceComponent(); + public IngredientSubstanceComponent copy() { + IngredientSubstanceComponent dst = new IngredientSubstanceComponent(); copyValues(dst); return dst; } - public void copyValues(IngredientSpecifiedSubstanceComponent dst) { + public void copyValues(IngredientSubstanceComponent dst) { super.copyValues(dst); dst.code = code == null ? null : code.copy(); - dst.group = group == null ? null : group.copy(); - dst.confidentiality = confidentiality == null ? null : confidentiality.copy(); if (strength != null) { - dst.strength = new ArrayList(); - for (IngredientSpecifiedSubstanceStrengthComponent i : strength) + dst.strength = new ArrayList(); + for (IngredientSubstanceStrengthComponent i : strength) dst.strength.add(i.copy()); }; } @@ -394,37 +302,35 @@ public class Ingredient extends DomainResource { public boolean equalsDeep(Base other_) { if (!super.equalsDeep(other_)) return false; - if (!(other_ instanceof IngredientSpecifiedSubstanceComponent)) + if (!(other_ instanceof IngredientSubstanceComponent)) return false; - IngredientSpecifiedSubstanceComponent o = (IngredientSpecifiedSubstanceComponent) other_; - return compareDeep(code, o.code, true) && compareDeep(group, o.group, true) && compareDeep(confidentiality, o.confidentiality, true) - && compareDeep(strength, o.strength, true); + IngredientSubstanceComponent o = (IngredientSubstanceComponent) other_; + return compareDeep(code, o.code, true) && compareDeep(strength, o.strength, true); } @Override public boolean equalsShallow(Base other_) { if (!super.equalsShallow(other_)) return false; - if (!(other_ instanceof IngredientSpecifiedSubstanceComponent)) + if (!(other_ instanceof IngredientSubstanceComponent)) return false; - IngredientSpecifiedSubstanceComponent o = (IngredientSpecifiedSubstanceComponent) other_; + IngredientSubstanceComponent o = (IngredientSubstanceComponent) other_; return true; } public boolean isEmpty() { - return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(code, group, confidentiality - , strength); + return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(code, strength); } public String fhirType() { - return "Ingredient.specifiedSubstance"; + return "Ingredient.substance"; } } @Block() - public static class IngredientSpecifiedSubstanceStrengthComponent extends BackboneElement implements IBaseBackboneElement { + public static class IngredientSubstanceStrengthComponent extends BackboneElement implements IBaseBackboneElement { /** * The quantity of substance in the unit of presentation, or in the volume (or mass) of the single pharmaceutical product or manufactured item. */ @@ -486,14 +392,14 @@ public class Ingredient extends DomainResource { */ @Child(name = "referenceStrength", type = {}, order=9, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Strength expressed in terms of a reference substance", formalDefinition="Strength expressed in terms of a reference substance." ) - protected List referenceStrength; + protected List referenceStrength; - private static final long serialVersionUID = 1809762128L; + private static final long serialVersionUID = 475292608L; /** * Constructor */ - public IngredientSpecifiedSubstanceStrengthComponent() { + public IngredientSubstanceStrengthComponent() { super(); } @@ -503,7 +409,7 @@ public class Ingredient extends DomainResource { public Ratio getPresentation() { if (this.presentation == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create IngredientSpecifiedSubstanceStrengthComponent.presentation"); + throw new Error("Attempt to auto-create IngredientSubstanceStrengthComponent.presentation"); else if (Configuration.doAutoCreate()) this.presentation = new Ratio(); // cc return this.presentation; @@ -516,7 +422,7 @@ public class Ingredient extends DomainResource { /** * @param value {@link #presentation} (The quantity of substance in the unit of presentation, or in the volume (or mass) of the single pharmaceutical product or manufactured item.) */ - public IngredientSpecifiedSubstanceStrengthComponent setPresentation(Ratio value) { + public IngredientSubstanceStrengthComponent setPresentation(Ratio value) { this.presentation = value; return this; } @@ -527,7 +433,7 @@ public class Ingredient extends DomainResource { public Ratio getPresentationHighLimit() { if (this.presentationHighLimit == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create IngredientSpecifiedSubstanceStrengthComponent.presentationHighLimit"); + throw new Error("Attempt to auto-create IngredientSubstanceStrengthComponent.presentationHighLimit"); else if (Configuration.doAutoCreate()) this.presentationHighLimit = new Ratio(); // cc return this.presentationHighLimit; @@ -540,7 +446,7 @@ public class Ingredient extends DomainResource { /** * @param value {@link #presentationHighLimit} (An upper limit for the quantity of substance in the unit of presentation. For use when there is a range of strengths, this is the high limit, with the presentation attribute becoming the lower limit.) */ - public IngredientSpecifiedSubstanceStrengthComponent setPresentationHighLimit(Ratio value) { + public IngredientSubstanceStrengthComponent setPresentationHighLimit(Ratio value) { this.presentationHighLimit = value; return this; } @@ -551,7 +457,7 @@ public class Ingredient extends DomainResource { public StringType getPresentationTextElement() { if (this.presentationText == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create IngredientSpecifiedSubstanceStrengthComponent.presentationText"); + throw new Error("Attempt to auto-create IngredientSubstanceStrengthComponent.presentationText"); else if (Configuration.doAutoCreate()) this.presentationText = new StringType(); // bb return this.presentationText; @@ -568,7 +474,7 @@ public class Ingredient extends DomainResource { /** * @param value {@link #presentationText} (A textual represention of either the whole of the presentation strength or a part of it - with the rest being in Strength.presentation as a ratio.). This is the underlying object with id, value and extensions. The accessor "getPresentationText" gives direct access to the value */ - public IngredientSpecifiedSubstanceStrengthComponent setPresentationTextElement(StringType value) { + public IngredientSubstanceStrengthComponent setPresentationTextElement(StringType value) { this.presentationText = value; return this; } @@ -583,7 +489,7 @@ public class Ingredient extends DomainResource { /** * @param value A textual represention of either the whole of the presentation strength or a part of it - with the rest being in Strength.presentation as a ratio. */ - public IngredientSpecifiedSubstanceStrengthComponent setPresentationText(String value) { + public IngredientSubstanceStrengthComponent setPresentationText(String value) { if (Utilities.noString(value)) this.presentationText = null; else { @@ -600,7 +506,7 @@ public class Ingredient extends DomainResource { public Ratio getConcentration() { if (this.concentration == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create IngredientSpecifiedSubstanceStrengthComponent.concentration"); + throw new Error("Attempt to auto-create IngredientSubstanceStrengthComponent.concentration"); else if (Configuration.doAutoCreate()) this.concentration = new Ratio(); // cc return this.concentration; @@ -613,7 +519,7 @@ public class Ingredient extends DomainResource { /** * @param value {@link #concentration} (The strength per unitary volume (or mass).) */ - public IngredientSpecifiedSubstanceStrengthComponent setConcentration(Ratio value) { + public IngredientSubstanceStrengthComponent setConcentration(Ratio value) { this.concentration = value; return this; } @@ -624,7 +530,7 @@ public class Ingredient extends DomainResource { public Ratio getConcentrationHighLimit() { if (this.concentrationHighLimit == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create IngredientSpecifiedSubstanceStrengthComponent.concentrationHighLimit"); + throw new Error("Attempt to auto-create IngredientSubstanceStrengthComponent.concentrationHighLimit"); else if (Configuration.doAutoCreate()) this.concentrationHighLimit = new Ratio(); // cc return this.concentrationHighLimit; @@ -637,7 +543,7 @@ public class Ingredient extends DomainResource { /** * @param value {@link #concentrationHighLimit} (An upper limit for the strength per unitary volume (or mass), for when there is a range. The concentration attribute then becomes the lower limit.) */ - public IngredientSpecifiedSubstanceStrengthComponent setConcentrationHighLimit(Ratio value) { + public IngredientSubstanceStrengthComponent setConcentrationHighLimit(Ratio value) { this.concentrationHighLimit = value; return this; } @@ -648,7 +554,7 @@ public class Ingredient extends DomainResource { public StringType getConcentrationTextElement() { if (this.concentrationText == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create IngredientSpecifiedSubstanceStrengthComponent.concentrationText"); + throw new Error("Attempt to auto-create IngredientSubstanceStrengthComponent.concentrationText"); else if (Configuration.doAutoCreate()) this.concentrationText = new StringType(); // bb return this.concentrationText; @@ -665,7 +571,7 @@ public class Ingredient extends DomainResource { /** * @param value {@link #concentrationText} (A textual represention of either the whole of the concentration strength or a part of it - with the rest being in Strength.concentration as a ratio.). This is the underlying object with id, value and extensions. The accessor "getConcentrationText" gives direct access to the value */ - public IngredientSpecifiedSubstanceStrengthComponent setConcentrationTextElement(StringType value) { + public IngredientSubstanceStrengthComponent setConcentrationTextElement(StringType value) { this.concentrationText = value; return this; } @@ -680,7 +586,7 @@ public class Ingredient extends DomainResource { /** * @param value A textual represention of either the whole of the concentration strength or a part of it - with the rest being in Strength.concentration as a ratio. */ - public IngredientSpecifiedSubstanceStrengthComponent setConcentrationText(String value) { + public IngredientSubstanceStrengthComponent setConcentrationText(String value) { if (Utilities.noString(value)) this.concentrationText = null; else { @@ -697,7 +603,7 @@ public class Ingredient extends DomainResource { public StringType getMeasurementPointElement() { if (this.measurementPoint == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create IngredientSpecifiedSubstanceStrengthComponent.measurementPoint"); + throw new Error("Attempt to auto-create IngredientSubstanceStrengthComponent.measurementPoint"); else if (Configuration.doAutoCreate()) this.measurementPoint = new StringType(); // bb return this.measurementPoint; @@ -714,7 +620,7 @@ public class Ingredient extends DomainResource { /** * @param value {@link #measurementPoint} (For when strength is measured at a particular point or distance.). This is the underlying object with id, value and extensions. The accessor "getMeasurementPoint" gives direct access to the value */ - public IngredientSpecifiedSubstanceStrengthComponent setMeasurementPointElement(StringType value) { + public IngredientSubstanceStrengthComponent setMeasurementPointElement(StringType value) { this.measurementPoint = value; return this; } @@ -729,7 +635,7 @@ public class Ingredient extends DomainResource { /** * @param value For when strength is measured at a particular point or distance. */ - public IngredientSpecifiedSubstanceStrengthComponent setMeasurementPoint(String value) { + public IngredientSubstanceStrengthComponent setMeasurementPoint(String value) { if (Utilities.noString(value)) this.measurementPoint = null; else { @@ -752,7 +658,7 @@ public class Ingredient extends DomainResource { /** * @return Returns a reference to this for easy method chaining */ - public IngredientSpecifiedSubstanceStrengthComponent setCountry(List theCountry) { + public IngredientSubstanceStrengthComponent setCountry(List theCountry) { this.country = theCountry; return this; } @@ -774,7 +680,7 @@ public class Ingredient extends DomainResource { return t; } - public IngredientSpecifiedSubstanceStrengthComponent addCountry(CodeableConcept t) { //3 + public IngredientSubstanceStrengthComponent addCountry(CodeableConcept t) { //3 if (t == null) return this; if (this.country == null) @@ -796,16 +702,16 @@ public class Ingredient extends DomainResource { /** * @return {@link #referenceStrength} (Strength expressed in terms of a reference substance.) */ - public List getReferenceStrength() { + public List getReferenceStrength() { if (this.referenceStrength == null) - this.referenceStrength = new ArrayList(); + this.referenceStrength = new ArrayList(); return this.referenceStrength; } /** * @return Returns a reference to this for easy method chaining */ - public IngredientSpecifiedSubstanceStrengthComponent setReferenceStrength(List theReferenceStrength) { + public IngredientSubstanceStrengthComponent setReferenceStrength(List theReferenceStrength) { this.referenceStrength = theReferenceStrength; return this; } @@ -813,25 +719,25 @@ public class Ingredient extends DomainResource { public boolean hasReferenceStrength() { if (this.referenceStrength == null) return false; - for (IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent item : this.referenceStrength) + for (IngredientSubstanceStrengthReferenceStrengthComponent item : this.referenceStrength) if (!item.isEmpty()) return true; return false; } - public IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent addReferenceStrength() { //3 - IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent t = new IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent(); + public IngredientSubstanceStrengthReferenceStrengthComponent addReferenceStrength() { //3 + IngredientSubstanceStrengthReferenceStrengthComponent t = new IngredientSubstanceStrengthReferenceStrengthComponent(); if (this.referenceStrength == null) - this.referenceStrength = new ArrayList(); + this.referenceStrength = new ArrayList(); this.referenceStrength.add(t); return t; } - public IngredientSpecifiedSubstanceStrengthComponent addReferenceStrength(IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent t) { //3 + public IngredientSubstanceStrengthComponent addReferenceStrength(IngredientSubstanceStrengthReferenceStrengthComponent t) { //3 if (t == null) return this; if (this.referenceStrength == null) - this.referenceStrength = new ArrayList(); + this.referenceStrength = new ArrayList(); this.referenceStrength.add(t); return this; } @@ -839,7 +745,7 @@ public class Ingredient extends DomainResource { /** * @return The first repetition of repeating field {@link #referenceStrength}, creating it if it does not already exist {3} */ - public IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent getReferenceStrengthFirstRep() { + public IngredientSubstanceStrengthReferenceStrengthComponent getReferenceStrengthFirstRep() { if (getReferenceStrength().isEmpty()) { addReferenceStrength(); } @@ -887,7 +793,7 @@ public class Ingredient extends DomainResource { case 1398611770: /*concentrationText*/ return this.concentrationText == null ? new Base[0] : new Base[] {this.concentrationText}; // StringType case 235437876: /*measurementPoint*/ return this.measurementPoint == null ? new Base[0] : new Base[] {this.measurementPoint}; // StringType case 957831062: /*country*/ return this.country == null ? new Base[0] : this.country.toArray(new Base[this.country.size()]); // CodeableConcept - case 1943566508: /*referenceStrength*/ return this.referenceStrength == null ? new Base[0] : this.referenceStrength.toArray(new Base[this.referenceStrength.size()]); // IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent + case 1943566508: /*referenceStrength*/ return this.referenceStrength == null ? new Base[0] : this.referenceStrength.toArray(new Base[this.referenceStrength.size()]); // IngredientSubstanceStrengthReferenceStrengthComponent default: return super.getProperty(hash, name, checkValid); } @@ -921,7 +827,7 @@ public class Ingredient extends DomainResource { this.getCountry().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept return value; case 1943566508: // referenceStrength - this.getReferenceStrength().add((IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent) value); // IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent + this.getReferenceStrength().add((IngredientSubstanceStrengthReferenceStrengthComponent) value); // IngredientSubstanceStrengthReferenceStrengthComponent return value; default: return super.setProperty(hash, name, value); } @@ -947,7 +853,7 @@ public class Ingredient extends DomainResource { } else if (name.equals("country")) { this.getCountry().add(TypeConvertor.castToCodeableConcept(value)); } else if (name.equals("referenceStrength")) { - this.getReferenceStrength().add((IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent) value); + this.getReferenceStrength().add((IngredientSubstanceStrengthReferenceStrengthComponent) value); } else return super.setProperty(name, value); return value; @@ -998,7 +904,7 @@ public class Ingredient extends DomainResource { return this.presentationHighLimit; } else if (name.equals("presentationText")) { - throw new FHIRException("Cannot call addChild on a primitive type Ingredient.specifiedSubstance.strength.presentationText"); + throw new FHIRException("Cannot call addChild on a primitive type Ingredient.substance.strength.presentationText"); } else if (name.equals("concentration")) { this.concentration = new Ratio(); @@ -1009,10 +915,10 @@ public class Ingredient extends DomainResource { return this.concentrationHighLimit; } else if (name.equals("concentrationText")) { - throw new FHIRException("Cannot call addChild on a primitive type Ingredient.specifiedSubstance.strength.concentrationText"); + throw new FHIRException("Cannot call addChild on a primitive type Ingredient.substance.strength.concentrationText"); } else if (name.equals("measurementPoint")) { - throw new FHIRException("Cannot call addChild on a primitive type Ingredient.specifiedSubstance.strength.measurementPoint"); + throw new FHIRException("Cannot call addChild on a primitive type Ingredient.substance.strength.measurementPoint"); } else if (name.equals("country")) { return addCountry(); @@ -1024,13 +930,13 @@ public class Ingredient extends DomainResource { return super.addChild(name); } - public IngredientSpecifiedSubstanceStrengthComponent copy() { - IngredientSpecifiedSubstanceStrengthComponent dst = new IngredientSpecifiedSubstanceStrengthComponent(); + public IngredientSubstanceStrengthComponent copy() { + IngredientSubstanceStrengthComponent dst = new IngredientSubstanceStrengthComponent(); copyValues(dst); return dst; } - public void copyValues(IngredientSpecifiedSubstanceStrengthComponent dst) { + public void copyValues(IngredientSubstanceStrengthComponent dst) { super.copyValues(dst); dst.presentation = presentation == null ? null : presentation.copy(); dst.presentationHighLimit = presentationHighLimit == null ? null : presentationHighLimit.copy(); @@ -1045,8 +951,8 @@ public class Ingredient extends DomainResource { dst.country.add(i.copy()); }; if (referenceStrength != null) { - dst.referenceStrength = new ArrayList(); - for (IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent i : referenceStrength) + dst.referenceStrength = new ArrayList(); + for (IngredientSubstanceStrengthReferenceStrengthComponent i : referenceStrength) dst.referenceStrength.add(i.copy()); }; } @@ -1055,9 +961,9 @@ public class Ingredient extends DomainResource { public boolean equalsDeep(Base other_) { if (!super.equalsDeep(other_)) return false; - if (!(other_ instanceof IngredientSpecifiedSubstanceStrengthComponent)) + if (!(other_ instanceof IngredientSubstanceStrengthComponent)) return false; - IngredientSpecifiedSubstanceStrengthComponent o = (IngredientSpecifiedSubstanceStrengthComponent) other_; + IngredientSubstanceStrengthComponent o = (IngredientSubstanceStrengthComponent) other_; return compareDeep(presentation, o.presentation, true) && compareDeep(presentationHighLimit, o.presentationHighLimit, true) && compareDeep(presentationText, o.presentationText, true) && compareDeep(concentration, o.concentration, true) && compareDeep(concentrationHighLimit, o.concentrationHighLimit, true) && compareDeep(concentrationText, o.concentrationText, true) @@ -1069,9 +975,9 @@ public class Ingredient extends DomainResource { public boolean equalsShallow(Base other_) { if (!super.equalsShallow(other_)) return false; - if (!(other_ instanceof IngredientSpecifiedSubstanceStrengthComponent)) + if (!(other_ instanceof IngredientSubstanceStrengthComponent)) return false; - IngredientSpecifiedSubstanceStrengthComponent o = (IngredientSpecifiedSubstanceStrengthComponent) other_; + IngredientSubstanceStrengthComponent o = (IngredientSubstanceStrengthComponent) other_; return compareValues(presentationText, o.presentationText, true) && compareValues(concentrationText, o.concentrationText, true) && compareValues(measurementPoint, o.measurementPoint, true); } @@ -1083,14 +989,14 @@ public class Ingredient extends DomainResource { } public String fhirType() { - return "Ingredient.specifiedSubstance.strength"; + return "Ingredient.substance.strength"; } } @Block() - public static class IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent extends BackboneElement implements IBaseBackboneElement { + public static class IngredientSubstanceStrengthReferenceStrengthComponent extends BackboneElement implements IBaseBackboneElement { /** * Relevant reference substance. */ @@ -1131,14 +1037,14 @@ public class Ingredient extends DomainResource { /** * Constructor */ - public IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent() { + public IngredientSubstanceStrengthReferenceStrengthComponent() { super(); } /** * Constructor */ - public IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent(Ratio strength) { + public IngredientSubstanceStrengthReferenceStrengthComponent(Ratio strength) { super(); this.setStrength(strength); } @@ -1187,9 +1093,9 @@ public class Ingredient extends DomainResource { /** * @param value {@link #substance} (Relevant reference substance.) */ - public IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent setSubstance(DataType value) { + public IngredientSubstanceStrengthReferenceStrengthComponent setSubstance(DataType value) { if (value != null && !(value instanceof CodeableConcept || value instanceof Reference)) - throw new Error("Not the right type for Ingredient.specifiedSubstance.strength.referenceStrength.substance[x]: "+value.fhirType()); + throw new Error("Not the right type for Ingredient.substance.strength.referenceStrength.substance[x]: "+value.fhirType()); this.substance = value; return this; } @@ -1200,7 +1106,7 @@ public class Ingredient extends DomainResource { public Ratio getStrength() { if (this.strength == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent.strength"); + throw new Error("Attempt to auto-create IngredientSubstanceStrengthReferenceStrengthComponent.strength"); else if (Configuration.doAutoCreate()) this.strength = new Ratio(); // cc return this.strength; @@ -1213,7 +1119,7 @@ public class Ingredient extends DomainResource { /** * @param value {@link #strength} (Strength expressed in terms of a reference substance.) */ - public IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent setStrength(Ratio value) { + public IngredientSubstanceStrengthReferenceStrengthComponent setStrength(Ratio value) { this.strength = value; return this; } @@ -1224,7 +1130,7 @@ public class Ingredient extends DomainResource { public Ratio getStrengthHighLimit() { if (this.strengthHighLimit == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent.strengthHighLimit"); + throw new Error("Attempt to auto-create IngredientSubstanceStrengthReferenceStrengthComponent.strengthHighLimit"); else if (Configuration.doAutoCreate()) this.strengthHighLimit = new Ratio(); // cc return this.strengthHighLimit; @@ -1237,7 +1143,7 @@ public class Ingredient extends DomainResource { /** * @param value {@link #strengthHighLimit} (Strength expressed in terms of a reference substance, upper limit.) */ - public IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent setStrengthHighLimit(Ratio value) { + public IngredientSubstanceStrengthReferenceStrengthComponent setStrengthHighLimit(Ratio value) { this.strengthHighLimit = value; return this; } @@ -1248,7 +1154,7 @@ public class Ingredient extends DomainResource { public StringType getMeasurementPointElement() { if (this.measurementPoint == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent.measurementPoint"); + throw new Error("Attempt to auto-create IngredientSubstanceStrengthReferenceStrengthComponent.measurementPoint"); else if (Configuration.doAutoCreate()) this.measurementPoint = new StringType(); // bb return this.measurementPoint; @@ -1265,7 +1171,7 @@ public class Ingredient extends DomainResource { /** * @param value {@link #measurementPoint} (For when strength is measured at a particular point or distance.). This is the underlying object with id, value and extensions. The accessor "getMeasurementPoint" gives direct access to the value */ - public IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent setMeasurementPointElement(StringType value) { + public IngredientSubstanceStrengthReferenceStrengthComponent setMeasurementPointElement(StringType value) { this.measurementPoint = value; return this; } @@ -1280,7 +1186,7 @@ public class Ingredient extends DomainResource { /** * @param value For when strength is measured at a particular point or distance. */ - public IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent setMeasurementPoint(String value) { + public IngredientSubstanceStrengthReferenceStrengthComponent setMeasurementPoint(String value) { if (Utilities.noString(value)) this.measurementPoint = null; else { @@ -1303,7 +1209,7 @@ public class Ingredient extends DomainResource { /** * @return Returns a reference to this for easy method chaining */ - public IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent setCountry(List theCountry) { + public IngredientSubstanceStrengthReferenceStrengthComponent setCountry(List theCountry) { this.country = theCountry; return this; } @@ -1325,7 +1231,7 @@ public class Ingredient extends DomainResource { return t; } - public IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent addCountry(CodeableConcept t) { //3 + public IngredientSubstanceStrengthReferenceStrengthComponent addCountry(CodeableConcept t) { //3 if (t == null) return this; if (this.country == null) @@ -1468,7 +1374,7 @@ public class Ingredient extends DomainResource { return this.strengthHighLimit; } else if (name.equals("measurementPoint")) { - throw new FHIRException("Cannot call addChild on a primitive type Ingredient.specifiedSubstance.strength.referenceStrength.measurementPoint"); + throw new FHIRException("Cannot call addChild on a primitive type Ingredient.substance.strength.referenceStrength.measurementPoint"); } else if (name.equals("country")) { return addCountry(); @@ -1477,13 +1383,13 @@ public class Ingredient extends DomainResource { return super.addChild(name); } - public IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent copy() { - IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent dst = new IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent(); + public IngredientSubstanceStrengthReferenceStrengthComponent copy() { + IngredientSubstanceStrengthReferenceStrengthComponent dst = new IngredientSubstanceStrengthReferenceStrengthComponent(); copyValues(dst); return dst; } - public void copyValues(IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent dst) { + public void copyValues(IngredientSubstanceStrengthReferenceStrengthComponent dst) { super.copyValues(dst); dst.substance = substance == null ? null : substance.copy(); dst.strength = strength == null ? null : strength.copy(); @@ -1500,9 +1406,9 @@ public class Ingredient extends DomainResource { public boolean equalsDeep(Base other_) { if (!super.equalsDeep(other_)) return false; - if (!(other_ instanceof IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent)) + if (!(other_ instanceof IngredientSubstanceStrengthReferenceStrengthComponent)) return false; - IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent o = (IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent) other_; + IngredientSubstanceStrengthReferenceStrengthComponent o = (IngredientSubstanceStrengthReferenceStrengthComponent) other_; return compareDeep(substance, o.substance, true) && compareDeep(strength, o.strength, true) && compareDeep(strengthHighLimit, o.strengthHighLimit, true) && compareDeep(measurementPoint, o.measurementPoint, true) && compareDeep(country, o.country, true) ; @@ -1512,9 +1418,9 @@ public class Ingredient extends DomainResource { public boolean equalsShallow(Base other_) { if (!super.equalsShallow(other_)) return false; - if (!(other_ instanceof IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent)) + if (!(other_ instanceof IngredientSubstanceStrengthReferenceStrengthComponent)) return false; - IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent o = (IngredientSpecifiedSubstanceStrengthReferenceStrengthComponent) other_; + IngredientSubstanceStrengthReferenceStrengthComponent o = (IngredientSubstanceStrengthReferenceStrengthComponent) other_; return compareValues(measurementPoint, o.measurementPoint, true); } @@ -1524,54 +1430,69 @@ public class Ingredient extends DomainResource { } public String fhirType() { - return "Ingredient.specifiedSubstance.strength.referenceStrength"; + return "Ingredient.substance.strength.referenceStrength"; } } @Block() - public static class IngredientSubstanceComponent extends BackboneElement implements IBaseBackboneElement { + public static class IngredientSpecifiedSubstanceComponent extends BackboneElement implements IBaseBackboneElement { /** - * A code that represents the ingredient substance. + * Substance as a 'specified substance', implying extra substance related characteristics. */ @Child(name = "code", type = {CodeableConcept.class, SubstanceDefinition.class, Substance.class}, order=1, min=1, max=1, modifier=false, summary=true) - @Description(shortDefinition="A code that represents the ingredient substance", formalDefinition="A code that represents the ingredient substance." ) + @Description(shortDefinition="Substance as a 'specified substance', implying extra substance related characteristics", formalDefinition="Substance as a 'specified substance', implying extra substance related characteristics." ) protected DataType code; + /** + * The group of specified substance, e.g. group 1 to 4. + */ + @Child(name = "group", type = {CodeableConcept.class}, order=2, min=1, max=1, modifier=false, summary=true) + @Description(shortDefinition="The group of specified substance, e.g. group 1 to 4", formalDefinition="The group of specified substance, e.g. group 1 to 4." ) + protected CodeableConcept group; + + /** + * Confidentiality level of the specified substance as the ingredient. + */ + @Child(name = "confidentiality", type = {CodeableConcept.class}, order=3, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="Confidentiality level of the specified substance as the ingredient", formalDefinition="Confidentiality level of the specified substance as the ingredient." ) + protected CodeableConcept confidentiality; + /** * Quantity of the substance or specified substance present in the manufactured item or pharmaceutical product. */ - @Child(name = "strength", type = {IngredientSpecifiedSubstanceStrengthComponent.class}, order=2, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "strength", type = {IngredientSubstanceStrengthComponent.class}, order=4, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Quantity of the substance or specified substance present in the manufactured item or pharmaceutical product", formalDefinition="Quantity of the substance or specified substance present in the manufactured item or pharmaceutical product." ) - protected List strength; + protected List strength; - private static final long serialVersionUID = -43161323L; + private static final long serialVersionUID = 99263290L; /** * Constructor */ - public IngredientSubstanceComponent() { + public IngredientSpecifiedSubstanceComponent() { super(); } /** * Constructor */ - public IngredientSubstanceComponent(DataType code) { + public IngredientSpecifiedSubstanceComponent(DataType code, CodeableConcept group) { super(); this.setCode(code); + this.setGroup(group); } /** - * @return {@link #code} (A code that represents the ingredient substance.) + * @return {@link #code} (Substance as a 'specified substance', implying extra substance related characteristics.) */ public DataType getCode() { return this.code; } /** - * @return {@link #code} (A code that represents the ingredient substance.) + * @return {@link #code} (Substance as a 'specified substance', implying extra substance related characteristics.) */ public CodeableConcept getCodeCodeableConcept() throws FHIRException { if (this.code == null) @@ -1586,7 +1507,7 @@ public class Ingredient extends DomainResource { } /** - * @return {@link #code} (A code that represents the ingredient substance.) + * @return {@link #code} (Substance as a 'specified substance', implying extra substance related characteristics.) */ public Reference getCodeReference() throws FHIRException { if (this.code == null) @@ -1605,28 +1526,76 @@ public class Ingredient extends DomainResource { } /** - * @param value {@link #code} (A code that represents the ingredient substance.) + * @param value {@link #code} (Substance as a 'specified substance', implying extra substance related characteristics.) */ - public IngredientSubstanceComponent setCode(DataType value) { + public IngredientSpecifiedSubstanceComponent setCode(DataType value) { if (value != null && !(value instanceof CodeableConcept || value instanceof Reference)) - throw new Error("Not the right type for Ingredient.substance.code[x]: "+value.fhirType()); + throw new Error("Not the right type for Ingredient.specifiedSubstance.code[x]: "+value.fhirType()); this.code = value; return this; } + /** + * @return {@link #group} (The group of specified substance, e.g. group 1 to 4.) + */ + public CodeableConcept getGroup() { + if (this.group == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create IngredientSpecifiedSubstanceComponent.group"); + else if (Configuration.doAutoCreate()) + this.group = new CodeableConcept(); // cc + return this.group; + } + + public boolean hasGroup() { + return this.group != null && !this.group.isEmpty(); + } + + /** + * @param value {@link #group} (The group of specified substance, e.g. group 1 to 4.) + */ + public IngredientSpecifiedSubstanceComponent setGroup(CodeableConcept value) { + this.group = value; + return this; + } + + /** + * @return {@link #confidentiality} (Confidentiality level of the specified substance as the ingredient.) + */ + public CodeableConcept getConfidentiality() { + if (this.confidentiality == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create IngredientSpecifiedSubstanceComponent.confidentiality"); + else if (Configuration.doAutoCreate()) + this.confidentiality = new CodeableConcept(); // cc + return this.confidentiality; + } + + public boolean hasConfidentiality() { + return this.confidentiality != null && !this.confidentiality.isEmpty(); + } + + /** + * @param value {@link #confidentiality} (Confidentiality level of the specified substance as the ingredient.) + */ + public IngredientSpecifiedSubstanceComponent setConfidentiality(CodeableConcept value) { + this.confidentiality = value; + return this; + } + /** * @return {@link #strength} (Quantity of the substance or specified substance present in the manufactured item or pharmaceutical product.) */ - public List getStrength() { + public List getStrength() { if (this.strength == null) - this.strength = new ArrayList(); + this.strength = new ArrayList(); return this.strength; } /** * @return Returns a reference to this for easy method chaining */ - public IngredientSubstanceComponent setStrength(List theStrength) { + public IngredientSpecifiedSubstanceComponent setStrength(List theStrength) { this.strength = theStrength; return this; } @@ -1634,25 +1603,25 @@ public class Ingredient extends DomainResource { public boolean hasStrength() { if (this.strength == null) return false; - for (IngredientSpecifiedSubstanceStrengthComponent item : this.strength) + for (IngredientSubstanceStrengthComponent item : this.strength) if (!item.isEmpty()) return true; return false; } - public IngredientSpecifiedSubstanceStrengthComponent addStrength() { //3 - IngredientSpecifiedSubstanceStrengthComponent t = new IngredientSpecifiedSubstanceStrengthComponent(); + public IngredientSubstanceStrengthComponent addStrength() { //3 + IngredientSubstanceStrengthComponent t = new IngredientSubstanceStrengthComponent(); if (this.strength == null) - this.strength = new ArrayList(); + this.strength = new ArrayList(); this.strength.add(t); return t; } - public IngredientSubstanceComponent addStrength(IngredientSpecifiedSubstanceStrengthComponent t) { //3 + public IngredientSpecifiedSubstanceComponent addStrength(IngredientSubstanceStrengthComponent t) { //3 if (t == null) return this; if (this.strength == null) - this.strength = new ArrayList(); + this.strength = new ArrayList(); this.strength.add(t); return this; } @@ -1660,7 +1629,7 @@ public class Ingredient extends DomainResource { /** * @return The first repetition of repeating field {@link #strength}, creating it if it does not already exist {3} */ - public IngredientSpecifiedSubstanceStrengthComponent getStrengthFirstRep() { + public IngredientSubstanceStrengthComponent getStrengthFirstRep() { if (getStrength().isEmpty()) { addStrength(); } @@ -1669,18 +1638,22 @@ public class Ingredient extends DomainResource { protected void listChildren(List children) { super.listChildren(children); - children.add(new Property("code[x]", "CodeableConcept|Reference(SubstanceDefinition|Substance)", "A code that represents the ingredient substance.", 0, 1, code)); - children.add(new Property("strength", "@Ingredient.specifiedSubstance.strength", "Quantity of the substance or specified substance present in the manufactured item or pharmaceutical product.", 0, java.lang.Integer.MAX_VALUE, strength)); + children.add(new Property("code[x]", "CodeableConcept|Reference(SubstanceDefinition|Substance)", "Substance as a 'specified substance', implying extra substance related characteristics.", 0, 1, code)); + children.add(new Property("group", "CodeableConcept", "The group of specified substance, e.g. group 1 to 4.", 0, 1, group)); + children.add(new Property("confidentiality", "CodeableConcept", "Confidentiality level of the specified substance as the ingredient.", 0, 1, confidentiality)); + children.add(new Property("strength", "@Ingredient.substance.strength", "Quantity of the substance or specified substance present in the manufactured item or pharmaceutical product.", 0, java.lang.Integer.MAX_VALUE, strength)); } @Override public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { switch (_hash) { - case 941839219: /*code[x]*/ return new Property("code[x]", "CodeableConcept|Reference(SubstanceDefinition|Substance)", "A code that represents the ingredient substance.", 0, 1, code); - case 3059181: /*code*/ return new Property("code[x]", "CodeableConcept|Reference(SubstanceDefinition|Substance)", "A code that represents the ingredient substance.", 0, 1, code); - case 4899316: /*codeCodeableConcept*/ return new Property("code[x]", "CodeableConcept", "A code that represents the ingredient substance.", 0, 1, code); - case 1565461470: /*codeReference*/ return new Property("code[x]", "Reference(SubstanceDefinition|Substance)", "A code that represents the ingredient substance.", 0, 1, code); - case 1791316033: /*strength*/ return new Property("strength", "@Ingredient.specifiedSubstance.strength", "Quantity of the substance or specified substance present in the manufactured item or pharmaceutical product.", 0, java.lang.Integer.MAX_VALUE, strength); + case 941839219: /*code[x]*/ return new Property("code[x]", "CodeableConcept|Reference(SubstanceDefinition|Substance)", "Substance as a 'specified substance', implying extra substance related characteristics.", 0, 1, code); + case 3059181: /*code*/ return new Property("code[x]", "CodeableConcept|Reference(SubstanceDefinition|Substance)", "Substance as a 'specified substance', implying extra substance related characteristics.", 0, 1, code); + case 4899316: /*codeCodeableConcept*/ return new Property("code[x]", "CodeableConcept", "Substance as a 'specified substance', implying extra substance related characteristics.", 0, 1, code); + case 1565461470: /*codeReference*/ return new Property("code[x]", "Reference(SubstanceDefinition|Substance)", "Substance as a 'specified substance', implying extra substance related characteristics.", 0, 1, code); + case 98629247: /*group*/ return new Property("group", "CodeableConcept", "The group of specified substance, e.g. group 1 to 4.", 0, 1, group); + case -1923018202: /*confidentiality*/ return new Property("confidentiality", "CodeableConcept", "Confidentiality level of the specified substance as the ingredient.", 0, 1, confidentiality); + case 1791316033: /*strength*/ return new Property("strength", "@Ingredient.substance.strength", "Quantity of the substance or specified substance present in the manufactured item or pharmaceutical product.", 0, java.lang.Integer.MAX_VALUE, strength); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -1690,7 +1663,9 @@ public class Ingredient extends DomainResource { public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException { switch (hash) { case 3059181: /*code*/ return this.code == null ? new Base[0] : new Base[] {this.code}; // DataType - case 1791316033: /*strength*/ return this.strength == null ? new Base[0] : this.strength.toArray(new Base[this.strength.size()]); // IngredientSpecifiedSubstanceStrengthComponent + case 98629247: /*group*/ return this.group == null ? new Base[0] : new Base[] {this.group}; // CodeableConcept + case -1923018202: /*confidentiality*/ return this.confidentiality == null ? new Base[0] : new Base[] {this.confidentiality}; // CodeableConcept + case 1791316033: /*strength*/ return this.strength == null ? new Base[0] : this.strength.toArray(new Base[this.strength.size()]); // IngredientSubstanceStrengthComponent default: return super.getProperty(hash, name, checkValid); } @@ -1702,8 +1677,14 @@ public class Ingredient extends DomainResource { case 3059181: // code this.code = TypeConvertor.castToType(value); // DataType return value; + case 98629247: // group + this.group = TypeConvertor.castToCodeableConcept(value); // CodeableConcept + return value; + case -1923018202: // confidentiality + this.confidentiality = TypeConvertor.castToCodeableConcept(value); // CodeableConcept + return value; case 1791316033: // strength - this.getStrength().add((IngredientSpecifiedSubstanceStrengthComponent) value); // IngredientSpecifiedSubstanceStrengthComponent + this.getStrength().add((IngredientSubstanceStrengthComponent) value); // IngredientSubstanceStrengthComponent return value; default: return super.setProperty(hash, name, value); } @@ -1714,8 +1695,12 @@ public class Ingredient extends DomainResource { public Base setProperty(String name, Base value) throws FHIRException { if (name.equals("code[x]")) { this.code = TypeConvertor.castToType(value); // DataType + } else if (name.equals("group")) { + this.group = TypeConvertor.castToCodeableConcept(value); // CodeableConcept + } else if (name.equals("confidentiality")) { + this.confidentiality = TypeConvertor.castToCodeableConcept(value); // CodeableConcept } else if (name.equals("strength")) { - this.getStrength().add((IngredientSpecifiedSubstanceStrengthComponent) value); + this.getStrength().add((IngredientSubstanceStrengthComponent) value); } else return super.setProperty(name, value); return value; @@ -1726,6 +1711,8 @@ public class Ingredient extends DomainResource { switch (hash) { case 941839219: return getCode(); case 3059181: return getCode(); + case 98629247: return getGroup(); + case -1923018202: return getConfidentiality(); case 1791316033: return addStrength(); default: return super.makeProperty(hash, name); } @@ -1736,7 +1723,9 @@ public class Ingredient extends DomainResource { public String[] getTypesForProperty(int hash, String name) throws FHIRException { switch (hash) { case 3059181: /*code*/ return new String[] {"CodeableConcept", "Reference"}; - case 1791316033: /*strength*/ return new String[] {"@Ingredient.specifiedSubstance.strength"}; + case 98629247: /*group*/ return new String[] {"CodeableConcept"}; + case -1923018202: /*confidentiality*/ return new String[] {"CodeableConcept"}; + case 1791316033: /*strength*/ return new String[] {"@Ingredient.substance.strength"}; default: return super.getTypesForProperty(hash, name); } @@ -1752,6 +1741,14 @@ public class Ingredient extends DomainResource { this.code = new Reference(); return this.code; } + else if (name.equals("group")) { + this.group = new CodeableConcept(); + return this.group; + } + else if (name.equals("confidentiality")) { + this.confidentiality = new CodeableConcept(); + return this.confidentiality; + } else if (name.equals("strength")) { return addStrength(); } @@ -1759,18 +1756,20 @@ public class Ingredient extends DomainResource { return super.addChild(name); } - public IngredientSubstanceComponent copy() { - IngredientSubstanceComponent dst = new IngredientSubstanceComponent(); + public IngredientSpecifiedSubstanceComponent copy() { + IngredientSpecifiedSubstanceComponent dst = new IngredientSpecifiedSubstanceComponent(); copyValues(dst); return dst; } - public void copyValues(IngredientSubstanceComponent dst) { + public void copyValues(IngredientSpecifiedSubstanceComponent dst) { super.copyValues(dst); dst.code = code == null ? null : code.copy(); + dst.group = group == null ? null : group.copy(); + dst.confidentiality = confidentiality == null ? null : confidentiality.copy(); if (strength != null) { - dst.strength = new ArrayList(); - for (IngredientSpecifiedSubstanceStrengthComponent i : strength) + dst.strength = new ArrayList(); + for (IngredientSubstanceStrengthComponent i : strength) dst.strength.add(i.copy()); }; } @@ -1779,28 +1778,30 @@ public class Ingredient extends DomainResource { public boolean equalsDeep(Base other_) { if (!super.equalsDeep(other_)) return false; - if (!(other_ instanceof IngredientSubstanceComponent)) + if (!(other_ instanceof IngredientSpecifiedSubstanceComponent)) return false; - IngredientSubstanceComponent o = (IngredientSubstanceComponent) other_; - return compareDeep(code, o.code, true) && compareDeep(strength, o.strength, true); + IngredientSpecifiedSubstanceComponent o = (IngredientSpecifiedSubstanceComponent) other_; + return compareDeep(code, o.code, true) && compareDeep(group, o.group, true) && compareDeep(confidentiality, o.confidentiality, true) + && compareDeep(strength, o.strength, true); } @Override public boolean equalsShallow(Base other_) { if (!super.equalsShallow(other_)) return false; - if (!(other_ instanceof IngredientSubstanceComponent)) + if (!(other_ instanceof IngredientSpecifiedSubstanceComponent)) return false; - IngredientSubstanceComponent o = (IngredientSubstanceComponent) other_; + IngredientSpecifiedSubstanceComponent o = (IngredientSpecifiedSubstanceComponent) other_; return true; } public boolean isEmpty() { - return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(code, strength); + return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(code, group, confidentiality + , strength); } public String fhirType() { - return "Ingredient.substance"; + return "Ingredient.specifiedSubstance"; } @@ -1848,21 +1849,21 @@ public class Ingredient extends DomainResource { @Description(shortDefinition="The organization that manufactures this ingredient", formalDefinition="The organization that manufactures this ingredient." ) protected List manufacturer; - /** - * A specified substance that comprises this ingredient. - */ - @Child(name = "specifiedSubstance", type = {}, order=6, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="A specified substance that comprises this ingredient", formalDefinition="A specified substance that comprises this ingredient." ) - protected List specifiedSubstance; - /** * The substance that comprises this ingredient. */ - @Child(name = "substance", type = {}, order=7, min=0, max=1, modifier=false, summary=true) + @Child(name = "substance", type = {}, order=6, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="The substance that comprises this ingredient", formalDefinition="The substance that comprises this ingredient." ) protected IngredientSubstanceComponent substance; - private static final long serialVersionUID = 463176628L; + /** + * A specified substance that comprises this ingredient. + */ + @Child(name = "specifiedSubstance", type = {}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="A specified substance that comprises this ingredient", formalDefinition="A specified substance that comprises this ingredient." ) + protected List specifiedSubstance; + + private static final long serialVersionUID = -1831018128L; /** * Constructor @@ -2127,6 +2128,30 @@ public class Ingredient extends DomainResource { return getManufacturer().get(0); } + /** + * @return {@link #substance} (The substance that comprises this ingredient.) + */ + public IngredientSubstanceComponent getSubstance() { + if (this.substance == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create Ingredient.substance"); + else if (Configuration.doAutoCreate()) + this.substance = new IngredientSubstanceComponent(); // cc + return this.substance; + } + + public boolean hasSubstance() { + return this.substance != null && !this.substance.isEmpty(); + } + + /** + * @param value {@link #substance} (The substance that comprises this ingredient.) + */ + public Ingredient setSubstance(IngredientSubstanceComponent value) { + this.substance = value; + return this; + } + /** * @return {@link #specifiedSubstance} (A specified substance that comprises this ingredient.) */ @@ -2180,30 +2205,6 @@ public class Ingredient extends DomainResource { return getSpecifiedSubstance().get(0); } - /** - * @return {@link #substance} (The substance that comprises this ingredient.) - */ - public IngredientSubstanceComponent getSubstance() { - if (this.substance == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create Ingredient.substance"); - else if (Configuration.doAutoCreate()) - this.substance = new IngredientSubstanceComponent(); // cc - return this.substance; - } - - public boolean hasSubstance() { - return this.substance != null && !this.substance.isEmpty(); - } - - /** - * @param value {@link #substance} (The substance that comprises this ingredient.) - */ - public Ingredient setSubstance(IngredientSubstanceComponent value) { - this.substance = value; - return this; - } - protected void listChildren(List children) { super.listChildren(children); children.add(new Property("identifier", "Identifier", "The identifier(s) of this Ingredient that are assigned by business processes and/or used to refer to it when a direct URL reference to the resource itself is not appropriate.", 0, 1, identifier)); @@ -2212,8 +2213,8 @@ public class Ingredient extends DomainResource { children.add(new Property("description", "markdown", "A general description of the ingredient, or any supporting text. May be used for an unstructured list of excipients.", 0, 1, description)); children.add(new Property("allergenicIndicator", "boolean", "If the ingredient is a known or suspected allergen.", 0, 1, allergenicIndicator)); children.add(new Property("manufacturer", "Reference(Organization)", "The organization that manufactures this ingredient.", 0, java.lang.Integer.MAX_VALUE, manufacturer)); - children.add(new Property("specifiedSubstance", "", "A specified substance that comprises this ingredient.", 0, java.lang.Integer.MAX_VALUE, specifiedSubstance)); children.add(new Property("substance", "", "The substance that comprises this ingredient.", 0, 1, substance)); + children.add(new Property("specifiedSubstance", "", "A specified substance that comprises this ingredient.", 0, java.lang.Integer.MAX_VALUE, specifiedSubstance)); } @Override @@ -2225,8 +2226,8 @@ public class Ingredient extends DomainResource { case -1724546052: /*description*/ return new Property("description", "markdown", "A general description of the ingredient, or any supporting text. May be used for an unstructured list of excipients.", 0, 1, description); case 75406931: /*allergenicIndicator*/ return new Property("allergenicIndicator", "boolean", "If the ingredient is a known or suspected allergen.", 0, 1, allergenicIndicator); case -1969347631: /*manufacturer*/ return new Property("manufacturer", "Reference(Organization)", "The organization that manufactures this ingredient.", 0, java.lang.Integer.MAX_VALUE, manufacturer); - case -331477600: /*specifiedSubstance*/ return new Property("specifiedSubstance", "", "A specified substance that comprises this ingredient.", 0, java.lang.Integer.MAX_VALUE, specifiedSubstance); case 530040176: /*substance*/ return new Property("substance", "", "The substance that comprises this ingredient.", 0, 1, substance); + case -331477600: /*specifiedSubstance*/ return new Property("specifiedSubstance", "", "A specified substance that comprises this ingredient.", 0, java.lang.Integer.MAX_VALUE, specifiedSubstance); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -2241,8 +2242,8 @@ public class Ingredient extends DomainResource { case -1724546052: /*description*/ return this.description == null ? new Base[0] : new Base[] {this.description}; // MarkdownType case 75406931: /*allergenicIndicator*/ return this.allergenicIndicator == null ? new Base[0] : new Base[] {this.allergenicIndicator}; // BooleanType case -1969347631: /*manufacturer*/ return this.manufacturer == null ? new Base[0] : this.manufacturer.toArray(new Base[this.manufacturer.size()]); // Reference - case -331477600: /*specifiedSubstance*/ return this.specifiedSubstance == null ? new Base[0] : this.specifiedSubstance.toArray(new Base[this.specifiedSubstance.size()]); // IngredientSpecifiedSubstanceComponent case 530040176: /*substance*/ return this.substance == null ? new Base[0] : new Base[] {this.substance}; // IngredientSubstanceComponent + case -331477600: /*specifiedSubstance*/ return this.specifiedSubstance == null ? new Base[0] : this.specifiedSubstance.toArray(new Base[this.specifiedSubstance.size()]); // IngredientSpecifiedSubstanceComponent default: return super.getProperty(hash, name, checkValid); } @@ -2269,12 +2270,12 @@ public class Ingredient extends DomainResource { case -1969347631: // manufacturer this.getManufacturer().add(TypeConvertor.castToReference(value)); // Reference return value; - case -331477600: // specifiedSubstance - this.getSpecifiedSubstance().add((IngredientSpecifiedSubstanceComponent) value); // IngredientSpecifiedSubstanceComponent - return value; case 530040176: // substance this.substance = (IngredientSubstanceComponent) value; // IngredientSubstanceComponent return value; + case -331477600: // specifiedSubstance + this.getSpecifiedSubstance().add((IngredientSpecifiedSubstanceComponent) value); // IngredientSpecifiedSubstanceComponent + return value; default: return super.setProperty(hash, name, value); } @@ -2294,10 +2295,10 @@ public class Ingredient extends DomainResource { this.allergenicIndicator = TypeConvertor.castToBoolean(value); // BooleanType } else if (name.equals("manufacturer")) { this.getManufacturer().add(TypeConvertor.castToReference(value)); - } else if (name.equals("specifiedSubstance")) { - this.getSpecifiedSubstance().add((IngredientSpecifiedSubstanceComponent) value); } else if (name.equals("substance")) { this.substance = (IngredientSubstanceComponent) value; // IngredientSubstanceComponent + } else if (name.equals("specifiedSubstance")) { + this.getSpecifiedSubstance().add((IngredientSpecifiedSubstanceComponent) value); } else return super.setProperty(name, value); return value; @@ -2312,8 +2313,8 @@ public class Ingredient extends DomainResource { case -1724546052: return getDescriptionElement(); case 75406931: return getAllergenicIndicatorElement(); case -1969347631: return addManufacturer(); - case -331477600: return addSpecifiedSubstance(); case 530040176: return getSubstance(); + case -331477600: return addSpecifiedSubstance(); default: return super.makeProperty(hash, name); } @@ -2328,8 +2329,8 @@ public class Ingredient extends DomainResource { case -1724546052: /*description*/ return new String[] {"markdown"}; case 75406931: /*allergenicIndicator*/ return new String[] {"boolean"}; case -1969347631: /*manufacturer*/ return new String[] {"Reference"}; - case -331477600: /*specifiedSubstance*/ return new String[] {}; case 530040176: /*substance*/ return new String[] {}; + case -331477600: /*specifiedSubstance*/ return new String[] {}; default: return super.getTypesForProperty(hash, name); } @@ -2357,13 +2358,13 @@ public class Ingredient extends DomainResource { else if (name.equals("manufacturer")) { return addManufacturer(); } - else if (name.equals("specifiedSubstance")) { - return addSpecifiedSubstance(); - } else if (name.equals("substance")) { this.substance = new IngredientSubstanceComponent(); return this.substance; } + else if (name.equals("specifiedSubstance")) { + return addSpecifiedSubstance(); + } else return super.addChild(name); } @@ -2395,12 +2396,12 @@ public class Ingredient extends DomainResource { for (Reference i : manufacturer) dst.manufacturer.add(i.copy()); }; + dst.substance = substance == null ? null : substance.copy(); if (specifiedSubstance != null) { dst.specifiedSubstance = new ArrayList(); for (IngredientSpecifiedSubstanceComponent i : specifiedSubstance) dst.specifiedSubstance.add(i.copy()); }; - dst.substance = substance == null ? null : substance.copy(); } protected Ingredient typedCopy() { @@ -2416,8 +2417,8 @@ public class Ingredient extends DomainResource { Ingredient o = (Ingredient) other_; return compareDeep(identifier, o.identifier, true) && compareDeep(role, o.role, true) && compareDeep(function, o.function, true) && compareDeep(description, o.description, true) && compareDeep(allergenicIndicator, o.allergenicIndicator, true) - && compareDeep(manufacturer, o.manufacturer, true) && compareDeep(specifiedSubstance, o.specifiedSubstance, true) - && compareDeep(substance, o.substance, true); + && compareDeep(manufacturer, o.manufacturer, true) && compareDeep(substance, o.substance, true) + && compareDeep(specifiedSubstance, o.specifiedSubstance, true); } @Override @@ -2433,7 +2434,7 @@ public class Ingredient extends DomainResource { public boolean isEmpty() { return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, role, function - , description, allergenicIndicator, manufacturer, specifiedSubstance, substance); + , description, allergenicIndicator, manufacturer, substance, specifiedSubstance); } @Override @@ -2441,6 +2442,26 @@ public class Ingredient extends DomainResource { return ResourceType.Ingredient; } + /** + * Search parameter: function + *

+ * Description: A classification of the ingredient identifying its precise purpose(s) in the drug product. This extends the Ingredient.role to add more detail. Example: Antioxidant, Alkalizing Agent
+ * Type: token
+ * Path: Ingredient.function
+ *

+ */ + @SearchParamDefinition(name="function", path="Ingredient.function", description="A classification of the ingredient identifying its precise purpose(s) in the drug product. This extends the Ingredient.role to add more detail. Example: Antioxidant, Alkalizing Agent", type="token" ) + public static final String SP_FUNCTION = "function"; + /** + * Fluent Client search parameter constant for function + *

+ * Description: A classification of the ingredient identifying its precise purpose(s) in the drug product. This extends the Ingredient.role to add more detail. Example: Antioxidant, Alkalizing Agent
+ * Type: token
+ * Path: Ingredient.function
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam FUNCTION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_FUNCTION); + /** * Search parameter: identifier *

@@ -2462,44 +2483,195 @@ public class Ingredient extends DomainResource { public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); /** - * Search parameter: specified-substance + * Search parameter: manufacturer + *

+ * Description: The organization that manufactures this ingredient
+ * Type: reference
+ * Path: Ingredient.manufacturer
+ *

+ */ + @SearchParamDefinition(name="manufacturer", path="Ingredient.manufacturer", description="The organization that manufactures this ingredient", type="reference", target={Organization.class } ) + public static final String SP_MANUFACTURER = "manufacturer"; + /** + * Fluent Client search parameter constant for manufacturer + *

+ * Description: The organization that manufactures this ingredient
+ * Type: reference
+ * Path: Ingredient.manufacturer
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam MANUFACTURER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_MANUFACTURER); + +/** + * Constant for fluent queries to be used to add include statements. Specifies + * the path value of "Ingredient:manufacturer". + */ + public static final ca.uhn.fhir.model.api.Include INCLUDE_MANUFACTURER = new ca.uhn.fhir.model.api.Include("Ingredient:manufacturer").toLocked(); + + /** + * Search parameter: role + *

+ * Description: Ingredient role within a drug product e.g. Active ingredient, Excipient
+ * Type: token
+ * Path: Ingredient.role
+ *

+ */ + @SearchParamDefinition(name="role", path="Ingredient.role", description="Ingredient role within a drug product e.g. Active ingredient, Excipient", type="token" ) + public static final String SP_ROLE = "role"; + /** + * Fluent Client search parameter constant for role + *

+ * Description: Ingredient role within a drug product e.g. Active ingredient, Excipient
+ * Type: token
+ * Path: Ingredient.role
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam ROLE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ROLE); + + /** + * Search parameter: specified-substance-code *

* Description: Substance as a 'specified substance', implying extra substance related characteristics
* Type: token
- * Path: (Ingredient.specifiedSubstance.code as CodeableConcept)
+ * Path: Ingredient.specifiedSubstance.code
*

*/ - @SearchParamDefinition(name="specified-substance", path="(Ingredient.specifiedSubstance.code as CodeableConcept)", description="Substance as a 'specified substance', implying extra substance related characteristics", type="token" ) + @SearchParamDefinition(name="specified-substance-code", path="Ingredient.specifiedSubstance.code", description="Substance as a 'specified substance', implying extra substance related characteristics", type="token" ) + public static final String SP_SPECIFIED_SUBSTANCE_CODE = "specified-substance-code"; + /** + * Fluent Client search parameter constant for specified-substance-code + *

+ * Description: Substance as a 'specified substance', implying extra substance related characteristics
+ * Type: token
+ * Path: Ingredient.specifiedSubstance.code
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam SPECIFIED_SUBSTANCE_CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SPECIFIED_SUBSTANCE_CODE); + + /** + * Search parameter: specified-substance-definition + *

+ * Description: Substance as a 'specified substance', implying extra substance related characteristics
+ * Type: reference
+ * Path: Ingredient.specifiedSubstance.code.where(resolve() is SubstanceDefinition)
+ *

+ */ + @SearchParamDefinition(name="specified-substance-definition", path="Ingredient.specifiedSubstance.code.where(resolve() is SubstanceDefinition)", description="Substance as a 'specified substance', implying extra substance related characteristics", type="reference", target={SubstanceDefinition.class } ) + public static final String SP_SPECIFIED_SUBSTANCE_DEFINITION = "specified-substance-definition"; + /** + * Fluent Client search parameter constant for specified-substance-definition + *

+ * Description: Substance as a 'specified substance', implying extra substance related characteristics
+ * Type: reference
+ * Path: Ingredient.specifiedSubstance.code.where(resolve() is SubstanceDefinition)
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SPECIFIED_SUBSTANCE_DEFINITION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SPECIFIED_SUBSTANCE_DEFINITION); + +/** + * Constant for fluent queries to be used to add include statements. Specifies + * the path value of "Ingredient:specified-substance-definition". + */ + public static final ca.uhn.fhir.model.api.Include INCLUDE_SPECIFIED_SUBSTANCE_DEFINITION = new ca.uhn.fhir.model.api.Include("Ingredient:specified-substance-definition").toLocked(); + + /** + * Search parameter: specified-substance + *

+ * Description: Substance as a 'specified substance', implying extra substance related characteristics
+ * Type: reference
+ * Path: Ingredient.specifiedSubstance.code.where(resolve() is Substance)
+ *

+ */ + @SearchParamDefinition(name="specified-substance", path="Ingredient.specifiedSubstance.code.where(resolve() is Substance)", description="Substance as a 'specified substance', implying extra substance related characteristics", type="reference", target={Substance.class } ) public static final String SP_SPECIFIED_SUBSTANCE = "specified-substance"; /** * Fluent Client search parameter constant for specified-substance *

* Description: Substance as a 'specified substance', implying extra substance related characteristics
- * Type: token
- * Path: (Ingredient.specifiedSubstance.code as CodeableConcept)
+ * Type: reference
+ * Path: Ingredient.specifiedSubstance.code.where(resolve() is Substance)
*

*/ - public static final ca.uhn.fhir.rest.gclient.TokenClientParam SPECIFIED_SUBSTANCE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SPECIFIED_SUBSTANCE); + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SPECIFIED_SUBSTANCE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SPECIFIED_SUBSTANCE); + +/** + * Constant for fluent queries to be used to add include statements. Specifies + * the path value of "Ingredient:specified-substance". + */ + public static final ca.uhn.fhir.model.api.Include INCLUDE_SPECIFIED_SUBSTANCE = new ca.uhn.fhir.model.api.Include("Ingredient:specified-substance").toLocked(); + + /** + * Search parameter: substance-code + *

+ * Description: A code or full resource that represents the ingredient substance
+ * Type: token
+ * Path: Ingredient.substance.code
+ *

+ */ + @SearchParamDefinition(name="substance-code", path="Ingredient.substance.code", description="A code or full resource that represents the ingredient substance", type="token" ) + public static final String SP_SUBSTANCE_CODE = "substance-code"; + /** + * Fluent Client search parameter constant for substance-code + *

+ * Description: A code or full resource that represents the ingredient substance
+ * Type: token
+ * Path: Ingredient.substance.code
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam SUBSTANCE_CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SUBSTANCE_CODE); + + /** + * Search parameter: substance-definition + *

+ * Description: A code or full resource that represents the ingredient substance
+ * Type: reference
+ * Path: Ingredient.substance.code.where(resolve() is SubstanceDefinition)
+ *

+ */ + @SearchParamDefinition(name="substance-definition", path="Ingredient.substance.code.where(resolve() is SubstanceDefinition)", description="A code or full resource that represents the ingredient substance", type="reference", target={SubstanceDefinition.class } ) + public static final String SP_SUBSTANCE_DEFINITION = "substance-definition"; + /** + * Fluent Client search parameter constant for substance-definition + *

+ * Description: A code or full resource that represents the ingredient substance
+ * Type: reference
+ * Path: Ingredient.substance.code.where(resolve() is SubstanceDefinition)
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBSTANCE_DEFINITION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBSTANCE_DEFINITION); + +/** + * Constant for fluent queries to be used to add include statements. Specifies + * the path value of "Ingredient:substance-definition". + */ + public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBSTANCE_DEFINITION = new ca.uhn.fhir.model.api.Include("Ingredient:substance-definition").toLocked(); /** * Search parameter: substance *

- * Description: A code that represents the ingredient substance
- * Type: token
- * Path: (Ingredient.substance.code as CodeableConcept)
+ * Description: A code or full resource that represents the ingredient substance
+ * Type: reference
+ * Path: Ingredient.substance.code.where(resolve() is Substance)
*

*/ - @SearchParamDefinition(name="substance", path="(Ingredient.substance.code as CodeableConcept)", description="A code that represents the ingredient substance", type="token" ) + @SearchParamDefinition(name="substance", path="Ingredient.substance.code.where(resolve() is Substance)", description="A code or full resource that represents the ingredient substance", type="reference", target={Substance.class } ) public static final String SP_SUBSTANCE = "substance"; /** * Fluent Client search parameter constant for substance *

- * Description: A code that represents the ingredient substance
- * Type: token
- * Path: (Ingredient.substance.code as CodeableConcept)
+ * Description: A code or full resource that represents the ingredient substance
+ * Type: reference
+ * Path: Ingredient.substance.code.where(resolve() is Substance)
*

*/ - public static final ca.uhn.fhir.rest.gclient.TokenClientParam SUBSTANCE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SUBSTANCE); + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBSTANCE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBSTANCE); + +/** + * Constant for fluent queries to be used to add include statements. Specifies + * the path value of "Ingredient:substance". + */ + public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBSTANCE = new ca.uhn.fhir.model.api.Include("Ingredient:substance").toLocked(); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/InstantType.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/InstantType.java index ba95c0698..4c584b911 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/InstantType.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/InstantType.java @@ -1,10 +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; - /* Copyright (c) 2011+, HL7, Inc. All rights reserved. @@ -39,6 +34,11 @@ import java.util.zip.DataFormatException; import ca.uhn.fhir.model.api.TemporalPrecisionEnum; import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import java.util.Calendar; +import java.util.Date; +import java.util.TimeZone; +import java.util.zip.DataFormatException; + /** * Represents a FHIR instant datatype. Valid precisions values for this type are: *
    diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/InsurancePlan.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/InsurancePlan.java index dba7a2a5a..7a550b808 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/InsurancePlan.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/InsurancePlan.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.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; /** * Details of a Health Insurance product/plan provided by an organization. @@ -4335,4 +4334,5 @@ public class InsurancePlan 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/Integer64Type.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Integer64Type.java index 91ac20f35..99010e11c 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Integer64Type.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Integer64Type.java @@ -31,12 +31,14 @@ package org.hl7.fhir.r5.model; +import org.hl7.fhir.instance.model.api.IBaseIntegerDatatype; + import ca.uhn.fhir.model.api.annotation.DatatypeDef; /** - * Primitive type "integer" in FHIR: A signed 64-bit integer + * Primitive type "integer" in FHIR: A signed 32-bit integer */ -@DatatypeDef(name = "integer64") +@DatatypeDef(name = "integer") public class Integer64Type extends PrimitiveType /* implements IBaseInteger64Datatype */ { private static final long serialVersionUID = 3L; @@ -74,8 +76,12 @@ public class Integer64Type extends PrimitiveType /* implements IBaseIntege * @throws IllegalArgumentException If the value is too large to fit in a signed integer */ public Integer64Type(Long theValue) { + if (theValue < java.lang.Long.MIN_VALUE || theValue > java.lang.Long.MAX_VALUE) { + throw new IllegalArgumentException + (theValue + " cannot be cast to int without changing its value."); + } if(theValue!=null) { - setValue(theValue); + setValue((long)theValue.longValue()); } } diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/IntegerType.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/IntegerType.java index f0a92e532..136a75f03 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/IntegerType.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/IntegerType.java @@ -76,12 +76,12 @@ public class IntegerType extends PrimitiveType implements IBaseIntegerD * @throws IllegalArgumentException If the value is too large to fit in a signed integer */ public IntegerType(Long theValue) { + if (theValue < java.lang.Integer.MIN_VALUE || theValue > java.lang.Integer.MAX_VALUE) { + throw new IllegalArgumentException + (theValue + " cannot be cast to int without changing its value."); + } if(theValue!=null) { - if (theValue < java.lang.Integer.MIN_VALUE || theValue > java.lang.Integer.MAX_VALUE) { - throw new IllegalArgumentException - (theValue + " cannot be cast to int without changing its value."); - } - setValue(theValue.intValue()); + setValue((int)theValue.longValue()); } } diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Invoice.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Invoice.java index 9b8e58a7a..64d9e4688 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Invoice.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Invoice.java @@ -1,10 +1,6 @@ package org.hl7.fhir.r5.model; - - -import java.math.BigDecimal; - /* Copyright (c) 2011+, HL7, Inc. All rights reserved. @@ -33,23 +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 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; /** * Invoice containing collected ChargeItems from an Account with calculated individual and total price for Billing purpose. @@ -2536,4 +2533,5 @@ public class Invoice 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/Library.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Library.java index 6afc00fb8..dddba7285 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Library.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Library.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.PublicationStatus; -import org.hl7.fhir.r5.model.Enumerations.PublicationStatusEnumFactory; 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; /** * The Library resource is a general-purpose container for knowledge asset definitions. It can be used to describe and expose existing knowledge assets such as logic libraries and information model descriptions, as well as to describe a collection of knowledge assets. @@ -2440,7 +2440,7 @@ public class Library extends MetadataResource { * Path: Library.relatedArtifact.where(type='composed-of').resource
    *

    */ - @SearchParamDefinition(name="composed-of", path="Library.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="Library.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 @@ -2606,7 +2606,7 @@ public class Library extends MetadataResource { * Path: Library.relatedArtifact.where(type='depends-on').resource
    *

    */ - @SearchParamDefinition(name="depends-on", path="Library.relatedArtifact.where(type='depends-on').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="depends-on", path="Library.relatedArtifact.where(type='depends-on').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_DEPENDS_ON = "depends-on"; /** * Fluent Client search parameter constant for depends-on @@ -2632,7 +2632,7 @@ public class Library extends MetadataResource { * Path: Library.relatedArtifact.where(type='derived-from').resource
    *

    */ - @SearchParamDefinition(name="derived-from", path="Library.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="Library.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 @@ -2758,7 +2758,7 @@ public class Library extends MetadataResource { * Path: Library.relatedArtifact.where(type='predecessor').resource
    *

    */ - @SearchParamDefinition(name="predecessor", path="Library.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="Library.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 @@ -2824,7 +2824,7 @@ public class Library extends MetadataResource { * Path: Library.relatedArtifact.where(type='successor').resource
    *

    */ - @SearchParamDefinition(name="successor", path="Library.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="Library.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 @@ -2943,4 +2943,5 @@ public class Library 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/Linkage.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Linkage.java index 062b74c60..eaa91e6bd 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Linkage.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Linkage.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; /** * Identifies two or more records (resource instances) that refer to the same real-world "occurrence". @@ -739,7 +741,7 @@ public class Linkage extends DomainResource { * Path: Linkage.item.resource
    *

    */ - @SearchParamDefinition(name="item", path="Linkage.item.resource", description="Matches on any item in the Linkage", 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="Linkage.item.resource", description="Matches on any item in the Linkage", 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 @@ -765,7 +767,7 @@ public class Linkage extends DomainResource { * Path: Linkage.item.resource
    *

    */ - @SearchParamDefinition(name="source", path="Linkage.item.resource", description="Matches on any item in the Linkage with a type of 'source'", 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="source", path="Linkage.item.resource", description="Matches on any item in the Linkage with a type of 'source'", 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_SOURCE = "source"; /** * Fluent Client search parameter constant for source @@ -784,4 +786,5 @@ public class Linkage extends DomainResource { public static final ca.uhn.fhir.model.api.Include INCLUDE_SOURCE = new ca.uhn.fhir.model.api.Include("Linkage:source").toLocked(); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ListResource.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ListResource.java index 061410772..87e4c56b0 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ListResource.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ListResource.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.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 list is a curated collection of resources. @@ -1460,7 +1458,7 @@ public class ListResource extends DomainResource { * Path: List.entry.item
    *

    */ - @SearchParamDefinition(name="item", path="List.entry.item", description="Actual entry", 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="List.entry.item", description="Actual entry", 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 @@ -1719,10 +1717,10 @@ public class ListResource 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", 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", target={Encounter.class } ) public static final String SP_ENCOUNTER = "encounter"; /** * Fluent Client search parameter constant for encounter @@ -1743,7 +1741,7 @@ public class ListResource 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); @@ -1769,7 +1767,7 @@ public class ListResource 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 @@ -1791,10 +1789,10 @@ public class ListResource 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 @@ -1811,7 +1809,7 @@ public class ListResource 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 @@ -1833,7 +1831,7 @@ public class ListResource 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); @@ -1933,4 +1931,5 @@ public class ListResource extends DomainResource { public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("List:patient").toLocked(); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Location.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Location.java index 318df1964..9b21347ba 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Location.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Location.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,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.DaysOfWeek; -import org.hl7.fhir.r5.model.Enumerations.DaysOfWeekEnumFactory; +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; /** * Details and position information for a physical place where services are provided and resources and participants may be stored, found, contained, or accommodated. @@ -2605,4 +2603,5 @@ Requires the near-distance parameter to be provided also
    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/ManufacturedItemDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ManufacturedItemDefinition.java index 524b90e9d..5c0a03762 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ManufacturedItemDefinition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ManufacturedItemDefinition.java @@ -1,8 +1,6 @@ package org.hl7.fhir.r5.model; - - /* Copyright (c) 2011+, HL7, Inc. All rights reserved. @@ -31,19 +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; /** * The definition and characteristics of a medicinal manufactured item, such as a tablet or capsule, as contained in a packaged medicinal product. @@ -924,5 +925,32 @@ public class ManufacturedItemDefinition 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 that make up this manufactured item
    + * Type: reference
    + * Path: ManufacturedItemDefinition.ingredient
    + *

    + */ + @SearchParamDefinition(name="ingredient", path="ManufacturedItemDefinition.ingredient", description="The ingredients that make up this manufactured item", type="reference", target={Ingredient.class } ) + public static final String SP_INGREDIENT = "ingredient"; + /** + * Fluent Client search parameter constant for ingredient + *

    + * Description: The ingredients that make up this manufactured item
    + * Type: reference
    + * Path: ManufacturedItemDefinition.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 "ManufacturedItemDefinition:ingredient". + */ + public static final ca.uhn.fhir.model.api.Include INCLUDE_INGREDIENT = new ca.uhn.fhir.model.api.Include("ManufacturedItemDefinition:ingredient").toLocked(); + + +} -} \ No newline at end of file diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MarketingStatus.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MarketingStatus.java index 6e948c01b..267bacbfa 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MarketingStatus.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MarketingStatus.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 MarketingStatus Type: The marketing status describes the date when a medicinal product is actually put on the market or the date as of which it is no longer available. @@ -22,7 +53,7 @@ public class MarketingStatus extends BackboneType implements ICompositeType { /** * The country in which the marketing authorisation has been granted shall be specified It should be specified using the ISO 3166 ‑ 1 alpha-2 code elements. */ - @Child(name = "country", type = {CodeableConcept.class}, order=0, min=1, max=1, modifier=false, summary=true) + @Child(name = "country", type = {CodeableConcept.class}, order=0, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="The country in which the marketing authorisation has been granted shall be specified It should be specified using the ISO 3166 ‑ 1 alpha-2 code elements", formalDefinition="The country in which the marketing authorisation has been granted shall be specified It should be specified using the ISO 3166 ‑ 1 alpha-2 code elements." ) protected CodeableConcept country; @@ -43,7 +74,7 @@ public class MarketingStatus extends BackboneType implements ICompositeType { /** * The date when the Medicinal Product is placed on the market by the Marketing Authorisation Holder (or where applicable, the manufacturer/distributor) in a country and/or jurisdiction shall be provided A complete date consisting of day, month and year shall be specified using the ISO 8601 date format NOTE “Placed on the market” refers to the release of the Medicinal Product into the distribution chain. */ - @Child(name = "dateRange", type = {Period.class}, order=3, min=1, max=1, modifier=false, summary=true) + @Child(name = "dateRange", type = {Period.class}, order=3, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="The date when the Medicinal Product is placed on the market by the Marketing Authorisation Holder (or where applicable, the manufacturer/distributor) in a country and/or jurisdiction shall be provided A complete date consisting of day, month and year shall be specified using the ISO 8601 date format NOTE “Placed on the market” refers to the release of the Medicinal Product into the distribution chain", formalDefinition="The date when the Medicinal Product is placed on the market by the Marketing Authorisation Holder (or where applicable, the manufacturer/distributor) in a country and/or jurisdiction shall be provided A complete date consisting of day, month and year shall be specified using the ISO 8601 date format NOTE “Placed on the market” refers to the release of the Medicinal Product into the distribution chain." ) protected Period dateRange; @@ -66,11 +97,9 @@ public class MarketingStatus extends BackboneType implements ICompositeType { /** * Constructor */ - public MarketingStatus(CodeableConcept country, CodeableConcept status, Period dateRange) { + public MarketingStatus(CodeableConcept status) { super(); - this.setCountry(country); this.setStatus(status); - this.setDateRange(dateRange); } /** @@ -396,4 +425,5 @@ public class MarketingStatus extends BackboneType implements ICompositeType { } -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Measure.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Measure.java index 36dcc1b38..4de7fcc4b 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Measure.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Measure.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 Measure resource provides the definition of a quality measure. @@ -4795,7 +4793,7 @@ public class Measure extends MetadataResource { * Path: Measure.relatedArtifact.where(type='composed-of').resource
    *

    */ - @SearchParamDefinition(name="composed-of", path="Measure.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="Measure.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 @@ -4941,7 +4939,7 @@ public class Measure extends MetadataResource { * Path: Measure.relatedArtifact.where(type='depends-on').resource | Measure.library
    *

    */ - @SearchParamDefinition(name="depends-on", path="Measure.relatedArtifact.where(type='depends-on').resource | Measure.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="Measure.relatedArtifact.where(type='depends-on').resource | Measure.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 @@ -4967,7 +4965,7 @@ public class Measure extends MetadataResource { * Path: Measure.relatedArtifact.where(type='derived-from').resource
    *

    */ - @SearchParamDefinition(name="derived-from", path="Measure.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="Measure.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 @@ -5093,7 +5091,7 @@ public class Measure extends MetadataResource { * Path: Measure.relatedArtifact.where(type='predecessor').resource
    *

    */ - @SearchParamDefinition(name="predecessor", path="Measure.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="Measure.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 @@ -5159,7 +5157,7 @@ public class Measure extends MetadataResource { * Path: Measure.relatedArtifact.where(type='successor').resource
    *

    */ - @SearchParamDefinition(name="successor", path="Measure.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="Measure.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 @@ -5258,4 +5256,5 @@ public class Measure 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/MeasureReport.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MeasureReport.java index 50eaed543..04798606f 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MeasureReport.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MeasureReport.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; /** * The MeasureReport resource contains the results of the calculation of a measure; and optionally a reference to the resources involved in that calculation. @@ -2870,7 +2871,7 @@ public class MeasureReport extends DomainResource { * Path: MeasureReport.evaluatedResource
    *

    */ - @SearchParamDefinition(name="evaluated-resource", path="MeasureReport.evaluatedResource", description="An evaluated resource referenced by the measure report", 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="evaluated-resource", path="MeasureReport.evaluatedResource", description="An evaluated resource referenced by the measure report", 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_EVALUATED_RESOURCE = "evaluated-resource"; /** * Fluent Client search parameter constant for evaluated-resource @@ -3053,4 +3054,5 @@ public class MeasureReport extends DomainResource { public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("MeasureReport:subject").toLocked(); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Medication.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Medication.java index e079fb902..580bea45b 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Medication.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Medication.java @@ -1,8 +1,6 @@ package org.hl7.fhir.r5.model; - - /* Copyright (c) 2011+, HL7, Inc. All rights reserved. @@ -31,24 +29,26 @@ 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; /** - * This resource is primarily used for the identification and definition of a medication for the purposes of prescribing, dispensing, and administering a medication as well as for making statements about medication use. + * This resource is primarily used for the identification and definition of a medication, including ingredients, for the purposes of prescribing, dispensing, and administering a medication as well as for making statements about medication use. */ @ResourceDef(name="Medication", profile="http://hl7.org/fhir/StructureDefinition/Medication") public class Medication extends DomainResource { @@ -1549,4 +1549,5 @@ public class Medication extends DomainResource { public static final ca.uhn.fhir.rest.gclient.TokenClientParam CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CODE); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicationAdministration.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicationAdministration.java index 27daa1883..61b71b552 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicationAdministration.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicationAdministration.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; /** * Describes the event of a patient consuming or otherwise being administered a medication. This may be as simple as swallowing a tablet or it may be a long running infusion. Related resources tie this event to the authorizing prescription, and the specific encounter between patient and health care practitioner. @@ -907,10 +907,10 @@ public class MedicationAdministration extends DomainResource { protected List instantiatesUri; /** - * A plan that is fulfilled in whole or in part by this MedicationDispense. + * A plan that is fulfilled in whole or in part by this MedicationAdministration. */ @Child(name = "basedOn", type = {CarePlan.class}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Plan that is fulfilled by this dispense", formalDefinition="A plan that is fulfilled in whole or in part by this MedicationDispense." ) + @Description(shortDefinition="Plan this is fulfilled by this administration", formalDefinition="A plan that is fulfilled in whole or in part by this MedicationAdministration." ) protected List basedOn; /** @@ -1233,7 +1233,7 @@ public class MedicationAdministration extends DomainResource { } /** - * @return {@link #basedOn} (A plan that is fulfilled in whole or in part by this MedicationDispense.) + * @return {@link #basedOn} (A plan that is fulfilled in whole or in part by this MedicationAdministration.) */ public List getBasedOn() { if (this.basedOn == null) @@ -2032,7 +2032,7 @@ public class MedicationAdministration extends DomainResource { children.add(new Property("identifier", "Identifier", "Identifiers associated with this Medication Administration that are defined by business processes and/or used to refer to it when a direct URL reference to the resource itself is not appropriate. They are business identifiers assigned to this resource by the performer or other systems and remain constant as the resource is updated and propagates from server to server.", 0, java.lang.Integer.MAX_VALUE, identifier)); children.add(new Property("instantiatesCanonical", "canonical(PlanDefinition|ActivityDefinition)", "A protocol, guideline, orderset, or other definition that was adhered to in whole or in part by this event.", 0, java.lang.Integer.MAX_VALUE, instantiatesCanonical)); children.add(new Property("instantiatesUri", "uri", "The URL pointing to an externally maintained protocol, guideline, orderset or other definition that is adhered to in whole or in part by this MedicationAdministration.", 0, java.lang.Integer.MAX_VALUE, instantiatesUri)); - children.add(new Property("basedOn", "Reference(CarePlan)", "A plan that is fulfilled in whole or in part by this MedicationDispense.", 0, java.lang.Integer.MAX_VALUE, basedOn)); + children.add(new Property("basedOn", "Reference(CarePlan)", "A plan that is fulfilled in whole or in part by this MedicationAdministration.", 0, java.lang.Integer.MAX_VALUE, basedOn)); children.add(new Property("partOf", "Reference(MedicationAdministration|Procedure)", "A larger event of which this particular event is a component or step.", 0, java.lang.Integer.MAX_VALUE, partOf)); children.add(new Property("status", "code", "Will generally be set to show that the administration has been completed. For some long running administrations such as infusions, it is possible for an administration to be started but not completed or it may be paused while some other process is under way.", 0, 1, status)); children.add(new Property("statusReason", "CodeableConcept", "A code indicating why the administration was not performed.", 0, java.lang.Integer.MAX_VALUE, statusReason)); @@ -2058,7 +2058,7 @@ public class MedicationAdministration extends DomainResource { case -1618432855: /*identifier*/ return new Property("identifier", "Identifier", "Identifiers associated with this Medication Administration that are defined by business processes and/or used to refer to it when a direct URL reference to the resource itself is not appropriate. They are business identifiers assigned to this resource by the performer or other systems and remain constant as the resource is updated and propagates from server to server.", 0, java.lang.Integer.MAX_VALUE, identifier); case 8911915: /*instantiatesCanonical*/ return new Property("instantiatesCanonical", "canonical(PlanDefinition|ActivityDefinition)", "A protocol, guideline, orderset, or other definition that was adhered to in whole or in part by this event.", 0, java.lang.Integer.MAX_VALUE, instantiatesCanonical); case -1926393373: /*instantiatesUri*/ return new Property("instantiatesUri", "uri", "The URL pointing to an externally maintained protocol, guideline, orderset or other definition that is adhered to in whole or in part by this MedicationAdministration.", 0, java.lang.Integer.MAX_VALUE, instantiatesUri); - case -332612366: /*basedOn*/ return new Property("basedOn", "Reference(CarePlan)", "A plan that is fulfilled in whole or in part by this MedicationDispense.", 0, java.lang.Integer.MAX_VALUE, basedOn); + case -332612366: /*basedOn*/ return new Property("basedOn", "Reference(CarePlan)", "A plan that is fulfilled in whole or in part by this MedicationAdministration.", 0, java.lang.Integer.MAX_VALUE, basedOn); case -995410646: /*partOf*/ return new Property("partOf", "Reference(MedicationAdministration|Procedure)", "A larger event of which this particular event is a component or step.", 0, java.lang.Integer.MAX_VALUE, partOf); case -892481550: /*status*/ return new Property("status", "code", "Will generally be set to show that the administration has been completed. For some long running administrations such as infusions, it is possible for an administration to be started but not completed or it may be paused while some other process is under way.", 0, 1, status); case 2051346646: /*statusReason*/ return new Property("statusReason", "CodeableConcept", "A code indicating why the administration was not performed.", 0, java.lang.Integer.MAX_VALUE, statusReason); @@ -2743,7 +2743,7 @@ public class MedicationAdministration 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 @@ -2765,10 +2765,10 @@ public class MedicationAdministration 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 @@ -2785,7 +2785,7 @@ public class MedicationAdministration 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 @@ -2807,7 +2807,7 @@ public class MedicationAdministration 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); @@ -2912,13 +2912,12 @@ public class MedicationAdministration extends DomainResource { * Description: Multiple Resources: * [MedicationAdministration](medicationadministration.html): Date administration happened (or did not happen) -* [MedicationRequest](medicationrequest.html): Returns medication request to be administered on a specific date
    * Type: date
    - * Path: MedicationAdministration.occurence | MedicationRequest.dosageInstruction.timing.event
    + * Path: MedicationAdministration.occurence
    *

    */ - @SearchParamDefinition(name="date", path="MedicationAdministration.occurence | MedicationRequest.dosageInstruction.timing.event", description="Multiple Resources: \r\n\r\n* [MedicationAdministration](medicationadministration.html): Date administration happened (or did not happen)\r\n* [MedicationRequest](medicationrequest.html): Returns medication request to be administered on a specific date\r\n", type="date" ) + @SearchParamDefinition(name="date", path="MedicationAdministration.occurence", description="Multiple Resources: \r\n\r\n* [MedicationAdministration](medicationadministration.html): Date administration happened (or did not happen)\r\n", type="date" ) public static final String SP_DATE = "date"; /** * Fluent Client search parameter constant for date @@ -2926,10 +2925,9 @@ public class MedicationAdministration extends DomainResource { * Description: Multiple Resources: * [MedicationAdministration](medicationadministration.html): Date administration happened (or did not happen) -* [MedicationRequest](medicationrequest.html): Returns medication request to be administered on a specific date
    * Type: date
    - * Path: MedicationAdministration.occurence | MedicationRequest.dosageInstruction.timing.event
    + * Path: MedicationAdministration.occurence
    *

    */ public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE); @@ -3039,4 +3037,5 @@ public class MedicationAdministration 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/MedicationDispense.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicationDispense.java index 38c6c9594..1a49d7245 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicationDispense.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicationDispense.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; /** * Indicates that a medication product is to be or has been dispensed for a named person/patient. This includes a description of the medication product (supply) provided and the instructions for administering the medication. The medication dispense is the result of a pharmacy system responding to a medication order. @@ -839,10 +839,10 @@ public class MedicationDispense extends DomainResource { protected List basedOn; /** - * The procedure that trigger the dispense. + * The procedure or medication administration that triggered the dispense. */ - @Child(name = "partOf", type = {Procedure.class}, order=2, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Event that dispense is part of", formalDefinition="The procedure that trigger the dispense." ) + @Child(name = "partOf", type = {Procedure.class, MedicationAdministration.class}, order=2, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="Event that dispense is part of", formalDefinition="The procedure or medication administration that triggered the dispense." ) protected List partOf; /** @@ -880,7 +880,7 @@ public class MedicationDispense extends DomainResource { /** * A link to a resource representing the person or the group to whom the medication will be given. */ - @Child(name = "subject", type = {Patient.class, Group.class}, order=7, min=0, max=1, modifier=false, summary=true) + @Child(name = "subject", type = {Patient.class, Group.class}, order=7, min=1, max=1, modifier=false, summary=true) @Description(shortDefinition="Who the dispense is for", formalDefinition="A link to a resource representing the person or the group to whom the medication will be given." ) protected Reference subject; @@ -1023,10 +1023,11 @@ public class MedicationDispense extends DomainResource { /** * Constructor */ - public MedicationDispense(MedicationDispenseStatusCodes status, CodeableReference medication) { + public MedicationDispense(MedicationDispenseStatusCodes status, CodeableReference medication, Reference subject) { super(); this.setStatus(status); this.setMedication(medication); + this.setSubject(subject); } /** @@ -1136,7 +1137,7 @@ public class MedicationDispense extends DomainResource { } /** - * @return {@link #partOf} (The procedure that trigger the dispense.) + * @return {@link #partOf} (The procedure or medication administration that triggered the dispense.) */ public List getPartOf() { if (this.partOf == null) @@ -2101,7 +2102,7 @@ public class MedicationDispense extends DomainResource { super.listChildren(children); children.add(new Property("identifier", "Identifier", "Identifiers associated with this Medication Dispense that are defined by business processes and/or used to refer to it when a direct URL reference to the resource itself is not appropriate. They are business identifiers assigned to this resource by the performer or other systems and remain constant as the resource is updated and propagates from server to server.", 0, java.lang.Integer.MAX_VALUE, identifier)); children.add(new Property("basedOn", "Reference(CarePlan)", "A plan that is fulfilled in whole or in part by this MedicationDispense.", 0, java.lang.Integer.MAX_VALUE, basedOn)); - children.add(new Property("partOf", "Reference(Procedure)", "The procedure that trigger the dispense.", 0, java.lang.Integer.MAX_VALUE, partOf)); + children.add(new Property("partOf", "Reference(Procedure|MedicationAdministration)", "The procedure or medication administration that triggered the dispense.", 0, java.lang.Integer.MAX_VALUE, partOf)); children.add(new Property("status", "code", "A code specifying the state of the set of dispense events.", 0, 1, status)); children.add(new Property("statusReason", "CodeableReference(DetectedIssue)", "Indicates the reason why a dispense was not performed.", 0, 1, statusReason)); children.add(new Property("category", "CodeableConcept", "Indicates the type of medication dispense (for example, drug classification like ATC, where meds would be administered, legal category of the medication.).", 0, java.lang.Integer.MAX_VALUE, category)); @@ -2132,7 +2133,7 @@ public class MedicationDispense extends DomainResource { switch (_hash) { case -1618432855: /*identifier*/ return new Property("identifier", "Identifier", "Identifiers associated with this Medication Dispense that are defined by business processes and/or used to refer to it when a direct URL reference to the resource itself is not appropriate. They are business identifiers assigned to this resource by the performer or other systems and remain constant as the resource is updated and propagates from server to server.", 0, java.lang.Integer.MAX_VALUE, identifier); case -332612366: /*basedOn*/ return new Property("basedOn", "Reference(CarePlan)", "A plan that is fulfilled in whole or in part by this MedicationDispense.", 0, java.lang.Integer.MAX_VALUE, basedOn); - case -995410646: /*partOf*/ return new Property("partOf", "Reference(Procedure)", "The procedure that trigger the dispense.", 0, java.lang.Integer.MAX_VALUE, partOf); + case -995410646: /*partOf*/ return new Property("partOf", "Reference(Procedure|MedicationAdministration)", "The procedure or medication administration that triggered the dispense.", 0, java.lang.Integer.MAX_VALUE, partOf); case -892481550: /*status*/ return new Property("status", "code", "A code specifying the state of the set of dispense events.", 0, 1, status); case 2051346646: /*statusReason*/ return new Property("statusReason", "CodeableReference(DetectedIssue)", "Indicates the reason why a dispense was not performed.", 0, 1, statusReason); case 50511102: /*category*/ return new Property("category", "CodeableConcept", "Indicates the type of medication dispense (for example, drug classification like ATC, where meds would be administered, legal category of the medication.).", 0, java.lang.Integer.MAX_VALUE, category); @@ -2924,7 +2925,7 @@ public class MedicationDispense 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 @@ -2946,10 +2947,10 @@ public class MedicationDispense 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 @@ -2966,7 +2967,7 @@ public class MedicationDispense 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 @@ -2988,7 +2989,7 @@ public class MedicationDispense 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); @@ -3190,4 +3191,5 @@ public class MedicationDispense 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/MedicationKnowledge.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicationKnowledge.java index e4ed66eaa..fe91ec859 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicationKnowledge.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicationKnowledge.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; /** * Information about a medication that is used to support knowledge. @@ -54,15 +55,15 @@ public class MedicationKnowledge extends DomainResource { public enum MedicationKnowledgeStatusCodes { /** - * The medication is available for use. + * */ ACTIVE, /** - * The medication is not available for use. + * */ INACTIVE, /** - * The medication was entered in error. + * */ ENTEREDINERROR, /** @@ -101,9 +102,9 @@ public class MedicationKnowledge extends DomainResource { } public String getDefinition() { switch (this) { - case ACTIVE: return "The medication is available for use."; - case INACTIVE: return "The medication is not available for use."; - case ENTEREDINERROR: return "The medication was entered in error."; + case ACTIVE: return ""; + case INACTIVE: return ""; + case ENTEREDINERROR: return ""; default: return "?"; } } @@ -938,28 +939,36 @@ public class MedicationKnowledge extends DomainResource { @Block() public static class MedicationKnowledgeCostComponent extends BackboneElement implements IBaseBackboneElement { + /** + * The date range for which the cost information of the medication is effective. + */ + @Child(name = "effectiveDate", type = {Period.class}, order=1, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="The date range for which the cost is effective", formalDefinition="The date range for which the cost information of the medication is effective." ) + protected List effectiveDate; + /** * The category of the cost information. For example, manufacturers' cost, patient cost, claim reimbursement cost, actual acquisition cost. */ - @Child(name = "type", type = {CodeableConcept.class}, order=1, min=1, max=1, modifier=false, summary=false) + @Child(name = "type", type = {CodeableConcept.class}, order=2, min=1, max=1, modifier=false, summary=false) @Description(shortDefinition="The category of the cost information", formalDefinition="The category of the cost information. For example, manufacturers' cost, patient cost, claim reimbursement cost, actual acquisition cost." ) protected CodeableConcept type; /** * The source or owner that assigns the price to the medication. */ - @Child(name = "source", type = {StringType.class}, order=2, min=0, max=1, modifier=false, summary=false) + @Child(name = "source", type = {StringType.class}, order=3, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="The source or owner for the price information", formalDefinition="The source or owner that assigns the price to the medication." ) protected StringType source; /** - * The price of the medication. + * The price or representation of the cost (for example, Band A, Band B or $, $$) of the medication. */ - @Child(name = "cost", type = {Money.class}, order=3, min=1, max=1, modifier=false, summary=false) - @Description(shortDefinition="The price of the medication", formalDefinition="The price of the medication." ) - protected Money cost; + @Child(name = "cost", type = {Money.class, CodeableConcept.class}, order=4, min=1, max=1, modifier=false, summary=false) + @Description(shortDefinition="The price or category of the cost of the medication", formalDefinition="The price or representation of the cost (for example, Band A, Band B or $, $$) of the medication." ) + @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/medication-cost-category") + protected DataType cost; - private static final long serialVersionUID = 244671378L; + private static final long serialVersionUID = 747402134L; /** * Constructor @@ -971,12 +980,65 @@ public class MedicationKnowledge extends DomainResource { /** * Constructor */ - public MedicationKnowledgeCostComponent(CodeableConcept type, Money cost) { + public MedicationKnowledgeCostComponent(CodeableConcept type, DataType cost) { super(); this.setType(type); this.setCost(cost); } + /** + * @return {@link #effectiveDate} (The date range for which the cost information of the medication is effective.) + */ + public List getEffectiveDate() { + if (this.effectiveDate == null) + this.effectiveDate = new ArrayList(); + return this.effectiveDate; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public MedicationKnowledgeCostComponent setEffectiveDate(List theEffectiveDate) { + this.effectiveDate = theEffectiveDate; + return this; + } + + public boolean hasEffectiveDate() { + if (this.effectiveDate == null) + return false; + for (Period item : this.effectiveDate) + if (!item.isEmpty()) + return true; + return false; + } + + public Period addEffectiveDate() { //3 + Period t = new Period(); + if (this.effectiveDate == null) + this.effectiveDate = new ArrayList(); + this.effectiveDate.add(t); + return t; + } + + public MedicationKnowledgeCostComponent addEffectiveDate(Period t) { //3 + if (t == null) + return this; + if (this.effectiveDate == null) + this.effectiveDate = new ArrayList(); + this.effectiveDate.add(t); + return this; + } + + /** + * @return The first repetition of repeating field {@link #effectiveDate}, creating it if it does not already exist {3} + */ + public Period getEffectiveDateFirstRep() { + if (getEffectiveDate().isEmpty()) { + addEffectiveDate(); + } + return getEffectiveDate().get(0); + } + /** * @return {@link #type} (The category of the cost information. For example, manufacturers' cost, patient cost, claim reimbursement cost, actual acquisition cost.) */ @@ -1051,42 +1113,74 @@ public class MedicationKnowledge extends DomainResource { } /** - * @return {@link #cost} (The price of the medication.) + * @return {@link #cost} (The price or representation of the cost (for example, Band A, Band B or $, $$) of the medication.) */ - public Money getCost() { - if (this.cost == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicationKnowledgeCostComponent.cost"); - else if (Configuration.doAutoCreate()) - this.cost = new Money(); // cc + public DataType getCost() { return this.cost; } + /** + * @return {@link #cost} (The price or representation of the cost (for example, Band A, Band B or $, $$) of the medication.) + */ + public Money getCostMoney() throws FHIRException { + if (this.cost == null) + this.cost = new Money(); + if (!(this.cost instanceof Money)) + throw new FHIRException("Type mismatch: the type Money was expected, but "+this.cost.getClass().getName()+" was encountered"); + return (Money) this.cost; + } + + public boolean hasCostMoney() { + return this != null && this.cost instanceof Money; + } + + /** + * @return {@link #cost} (The price or representation of the cost (for example, Band A, Band B or $, $$) of the medication.) + */ + public CodeableConcept getCostCodeableConcept() throws FHIRException { + if (this.cost == null) + this.cost = new CodeableConcept(); + if (!(this.cost instanceof CodeableConcept)) + throw new FHIRException("Type mismatch: the type CodeableConcept was expected, but "+this.cost.getClass().getName()+" was encountered"); + return (CodeableConcept) this.cost; + } + + public boolean hasCostCodeableConcept() { + return this != null && this.cost instanceof CodeableConcept; + } + public boolean hasCost() { return this.cost != null && !this.cost.isEmpty(); } /** - * @param value {@link #cost} (The price of the medication.) + * @param value {@link #cost} (The price or representation of the cost (for example, Band A, Band B or $, $$) of the medication.) */ - public MedicationKnowledgeCostComponent setCost(Money value) { + public MedicationKnowledgeCostComponent setCost(DataType value) { + if (value != null && !(value instanceof Money || value instanceof CodeableConcept)) + throw new Error("Not the right type for MedicationKnowledge.cost.cost[x]: "+value.fhirType()); this.cost = value; return this; } protected void listChildren(List children) { super.listChildren(children); + children.add(new Property("effectiveDate", "Period", "The date range for which the cost information of the medication is effective.", 0, java.lang.Integer.MAX_VALUE, effectiveDate)); children.add(new Property("type", "CodeableConcept", "The category of the cost information. For example, manufacturers' cost, patient cost, claim reimbursement cost, actual acquisition cost.", 0, 1, type)); children.add(new Property("source", "string", "The source or owner that assigns the price to the medication.", 0, 1, source)); - children.add(new Property("cost", "Money", "The price of the medication.", 0, 1, cost)); + children.add(new Property("cost[x]", "Money|CodeableConcept", "The price or representation of the cost (for example, Band A, Band B or $, $$) of the medication.", 0, 1, cost)); } @Override public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { switch (_hash) { + case -930389515: /*effectiveDate*/ return new Property("effectiveDate", "Period", "The date range for which the cost information of the medication is effective.", 0, java.lang.Integer.MAX_VALUE, effectiveDate); case 3575610: /*type*/ return new Property("type", "CodeableConcept", "The category of the cost information. For example, manufacturers' cost, patient cost, claim reimbursement cost, actual acquisition cost.", 0, 1, type); case -896505829: /*source*/ return new Property("source", "string", "The source or owner that assigns the price to the medication.", 0, 1, source); - case 3059661: /*cost*/ return new Property("cost", "Money", "The price of the medication.", 0, 1, cost); + case 956138899: /*cost[x]*/ return new Property("cost[x]", "Money|CodeableConcept", "The price or representation of the cost (for example, Band A, Band B or $, $$) of the medication.", 0, 1, cost); + case 3059661: /*cost*/ return new Property("cost[x]", "Money|CodeableConcept", "The price or representation of the cost (for example, Band A, Band B or $, $$) of the medication.", 0, 1, cost); + case -286697229: /*costMoney*/ return new Property("cost[x]", "Money", "The price or representation of the cost (for example, Band A, Band B or $, $$) of the medication.", 0, 1, cost); + case -238369772: /*costCodeableConcept*/ return new Property("cost[x]", "CodeableConcept", "The price or representation of the cost (for example, Band A, Band B or $, $$) of the medication.", 0, 1, cost); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -1095,9 +1189,10 @@ public class MedicationKnowledge extends DomainResource { @Override public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException { switch (hash) { + case -930389515: /*effectiveDate*/ return this.effectiveDate == null ? new Base[0] : this.effectiveDate.toArray(new Base[this.effectiveDate.size()]); // Period case 3575610: /*type*/ return this.type == null ? new Base[0] : new Base[] {this.type}; // CodeableConcept case -896505829: /*source*/ return this.source == null ? new Base[0] : new Base[] {this.source}; // StringType - case 3059661: /*cost*/ return this.cost == null ? new Base[0] : new Base[] {this.cost}; // Money + case 3059661: /*cost*/ return this.cost == null ? new Base[0] : new Base[] {this.cost}; // DataType default: return super.getProperty(hash, name, checkValid); } @@ -1106,6 +1201,9 @@ public class MedicationKnowledge extends DomainResource { @Override public Base setProperty(int hash, String name, Base value) throws FHIRException { switch (hash) { + case -930389515: // effectiveDate + this.getEffectiveDate().add(TypeConvertor.castToPeriod(value)); // Period + return value; case 3575610: // type this.type = TypeConvertor.castToCodeableConcept(value); // CodeableConcept return value; @@ -1113,7 +1211,7 @@ public class MedicationKnowledge extends DomainResource { this.source = TypeConvertor.castToString(value); // StringType return value; case 3059661: // cost - this.cost = TypeConvertor.castToMoney(value); // Money + this.cost = TypeConvertor.castToType(value); // DataType return value; default: return super.setProperty(hash, name, value); } @@ -1122,12 +1220,14 @@ public class MedicationKnowledge extends DomainResource { @Override public Base setProperty(String name, Base value) throws FHIRException { - if (name.equals("type")) { + if (name.equals("effectiveDate")) { + this.getEffectiveDate().add(TypeConvertor.castToPeriod(value)); + } else if (name.equals("type")) { this.type = TypeConvertor.castToCodeableConcept(value); // CodeableConcept } else if (name.equals("source")) { this.source = TypeConvertor.castToString(value); // StringType - } else if (name.equals("cost")) { - this.cost = TypeConvertor.castToMoney(value); // Money + } else if (name.equals("cost[x]")) { + this.cost = TypeConvertor.castToType(value); // DataType } else return super.setProperty(name, value); return value; @@ -1136,8 +1236,10 @@ public class MedicationKnowledge extends DomainResource { @Override public Base makeProperty(int hash, String name) throws FHIRException { switch (hash) { + case -930389515: return addEffectiveDate(); case 3575610: return getType(); case -896505829: return getSourceElement(); + case 956138899: return getCost(); case 3059661: return getCost(); default: return super.makeProperty(hash, name); } @@ -1147,9 +1249,10 @@ public class MedicationKnowledge extends DomainResource { @Override public String[] getTypesForProperty(int hash, String name) throws FHIRException { switch (hash) { + case -930389515: /*effectiveDate*/ return new String[] {"Period"}; case 3575610: /*type*/ return new String[] {"CodeableConcept"}; case -896505829: /*source*/ return new String[] {"string"}; - case 3059661: /*cost*/ return new String[] {"Money"}; + case 3059661: /*cost*/ return new String[] {"Money", "CodeableConcept"}; default: return super.getTypesForProperty(hash, name); } @@ -1157,17 +1260,24 @@ public class MedicationKnowledge extends DomainResource { @Override public Base addChild(String name) throws FHIRException { - if (name.equals("type")) { + if (name.equals("effectiveDate")) { + return addEffectiveDate(); + } + else if (name.equals("type")) { this.type = new CodeableConcept(); return this.type; } else if (name.equals("source")) { throw new FHIRException("Cannot call addChild on a primitive type MedicationKnowledge.cost.source"); } - else if (name.equals("cost")) { + else if (name.equals("costMoney")) { this.cost = new Money(); return this.cost; } + else if (name.equals("costCodeableConcept")) { + this.cost = new CodeableConcept(); + return this.cost; + } else return super.addChild(name); } @@ -1180,6 +1290,11 @@ public class MedicationKnowledge extends DomainResource { public void copyValues(MedicationKnowledgeCostComponent dst) { super.copyValues(dst); + if (effectiveDate != null) { + dst.effectiveDate = new ArrayList(); + for (Period i : effectiveDate) + dst.effectiveDate.add(i.copy()); + }; dst.type = type == null ? null : type.copy(); dst.source = source == null ? null : source.copy(); dst.cost = cost == null ? null : cost.copy(); @@ -1192,8 +1307,8 @@ public class MedicationKnowledge extends DomainResource { if (!(other_ instanceof MedicationKnowledgeCostComponent)) return false; MedicationKnowledgeCostComponent o = (MedicationKnowledgeCostComponent) other_; - return compareDeep(type, o.type, true) && compareDeep(source, o.source, true) && compareDeep(cost, o.cost, true) - ; + return compareDeep(effectiveDate, o.effectiveDate, true) && compareDeep(type, o.type, true) && compareDeep(source, o.source, true) + && compareDeep(cost, o.cost, true); } @Override @@ -1207,7 +1322,8 @@ public class MedicationKnowledge extends DomainResource { } public boolean isEmpty() { - return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(type, source, cost); + return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(effectiveDate, type, source + , cost); } public String fhirType() { @@ -2484,10 +2600,24 @@ public class MedicationKnowledge extends DomainResource { @Block() public static class MedicationKnowledgePackagingComponent extends BackboneElement implements IBaseBackboneElement { + /** + * The business identifier of the packaged medication. + */ + @Child(name = "identifier", type = {Identifier.class}, order=1, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="Business identifier of the packaged medication", formalDefinition="The business identifier of the packaged medication." ) + protected Identifier identifier; + + /** + * The cost of the packaged medication. + */ + @Child(name = "cost", type = {MedicationKnowledgeCostComponent.class}, order=2, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="Cost of the packaged medication", formalDefinition="The cost of the packaged medication." ) + protected MedicationKnowledgeCostComponent cost; + /** * A code that defines the specific type of packaging that the medication can be found in (e.g. blister sleeve, tube, bottle). */ - @Child(name = "type", type = {CodeableConcept.class}, order=1, min=0, max=1, modifier=false, summary=false) + @Child(name = "type", type = {CodeableConcept.class}, order=3, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="A code that defines the specific type of packaging that the medication can be found in", formalDefinition="A code that defines the specific type of packaging that the medication can be found in (e.g. blister sleeve, tube, bottle)." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/medicationknowledge-package-type") protected CodeableConcept type; @@ -2495,32 +2625,32 @@ public class MedicationKnowledge extends DomainResource { /** * The number of product units the package would contain if fully loaded. */ - @Child(name = "quantity", type = {Quantity.class}, order=2, min=0, max=1, modifier=false, summary=false) + @Child(name = "quantity", type = {Quantity.class}, order=4, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="The number of product units the package would contain if fully loaded", formalDefinition="The number of product units the package would contain if fully loaded." ) protected Quantity quantity; /** * The device used to administer the medication (e.g. scoop, applicator, syringe). */ - @Child(name = "device", type = {Device.class}, order=3, min=0, max=1, modifier=false, summary=false) + @Child(name = "device", type = {Device.class}, order=5, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="The device used to administer the medication (e.g. scoop, applicator, syringe)", formalDefinition="The device used to administer the medication (e.g. scoop, applicator, syringe)." ) protected Reference device; /** * Material type of the package item. */ - @Child(name = "material", type = {CodeableConcept.class}, order=4, min=0, max=1, modifier=false, summary=false) + @Child(name = "material", type = {CodeableConcept.class}, order=6, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Material type of the package item", formalDefinition="Material type of the package item." ) protected CodeableConcept material; /** * Allows packages within packages (e.g. blister packages within a box or vials of medications within a box). */ - @Child(name = "packaging", type = {MedicationKnowledgePackagingComponent.class}, order=5, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "packaging", type = {MedicationKnowledgePackagingComponent.class}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Allows packages within packages", formalDefinition="Allows packages within packages (e.g. blister packages within a box or vials of medications within a box)." ) protected List packaging; - private static final long serialVersionUID = 574843440L; + private static final long serialVersionUID = -811886104L; /** * Constructor @@ -2529,6 +2659,54 @@ public class MedicationKnowledge extends DomainResource { super(); } + /** + * @return {@link #identifier} (The business identifier of the packaged medication.) + */ + public Identifier getIdentifier() { + if (this.identifier == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create MedicationKnowledgePackagingComponent.identifier"); + else if (Configuration.doAutoCreate()) + this.identifier = new Identifier(); // cc + return this.identifier; + } + + public boolean hasIdentifier() { + return this.identifier != null && !this.identifier.isEmpty(); + } + + /** + * @param value {@link #identifier} (The business identifier of the packaged medication.) + */ + public MedicationKnowledgePackagingComponent setIdentifier(Identifier value) { + this.identifier = value; + return this; + } + + /** + * @return {@link #cost} (The cost of the packaged medication.) + */ + public MedicationKnowledgeCostComponent getCost() { + if (this.cost == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create MedicationKnowledgePackagingComponent.cost"); + else if (Configuration.doAutoCreate()) + this.cost = new MedicationKnowledgeCostComponent(); // cc + return this.cost; + } + + public boolean hasCost() { + return this.cost != null && !this.cost.isEmpty(); + } + + /** + * @param value {@link #cost} (The cost of the packaged medication.) + */ + public MedicationKnowledgePackagingComponent setCost(MedicationKnowledgeCostComponent value) { + this.cost = value; + return this; + } + /** * @return {@link #type} (A code that defines the specific type of packaging that the medication can be found in (e.g. blister sleeve, tube, bottle).) */ @@ -2680,6 +2858,8 @@ public class MedicationKnowledge extends DomainResource { protected void listChildren(List children) { super.listChildren(children); + children.add(new Property("identifier", "Identifier", "The business identifier of the packaged medication.", 0, 1, identifier)); + children.add(new Property("cost", "@MedicationKnowledge.cost", "The cost of the packaged medication.", 0, 1, cost)); children.add(new Property("type", "CodeableConcept", "A code that defines the specific type of packaging that the medication can be found in (e.g. blister sleeve, tube, bottle).", 0, 1, type)); children.add(new Property("quantity", "Quantity", "The number of product units the package would contain if fully loaded.", 0, 1, quantity)); children.add(new Property("device", "Reference(Device)", "The device used to administer the medication (e.g. scoop, applicator, syringe).", 0, 1, device)); @@ -2690,6 +2870,8 @@ public class MedicationKnowledge extends DomainResource { @Override public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { switch (_hash) { + case -1618432855: /*identifier*/ return new Property("identifier", "Identifier", "The business identifier of the packaged medication.", 0, 1, identifier); + case 3059661: /*cost*/ return new Property("cost", "@MedicationKnowledge.cost", "The cost of the packaged medication.", 0, 1, cost); case 3575610: /*type*/ return new Property("type", "CodeableConcept", "A code that defines the specific type of packaging that the medication can be found in (e.g. blister sleeve, tube, bottle).", 0, 1, type); case -1285004149: /*quantity*/ return new Property("quantity", "Quantity", "The number of product units the package would contain if fully loaded.", 0, 1, quantity); case -1335157162: /*device*/ return new Property("device", "Reference(Device)", "The device used to administer the medication (e.g. scoop, applicator, syringe).", 0, 1, device); @@ -2703,6 +2885,8 @@ public class MedicationKnowledge extends DomainResource { @Override public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException { switch (hash) { + case -1618432855: /*identifier*/ return this.identifier == null ? new Base[0] : new Base[] {this.identifier}; // Identifier + case 3059661: /*cost*/ return this.cost == null ? new Base[0] : new Base[] {this.cost}; // MedicationKnowledgeCostComponent case 3575610: /*type*/ return this.type == null ? new Base[0] : new Base[] {this.type}; // CodeableConcept case -1285004149: /*quantity*/ return this.quantity == null ? new Base[0] : new Base[] {this.quantity}; // Quantity case -1335157162: /*device*/ return this.device == null ? new Base[0] : new Base[] {this.device}; // Reference @@ -2716,6 +2900,12 @@ public class MedicationKnowledge extends DomainResource { @Override public Base setProperty(int hash, String name, Base value) throws FHIRException { switch (hash) { + case -1618432855: // identifier + this.identifier = TypeConvertor.castToIdentifier(value); // Identifier + return value; + case 3059661: // cost + this.cost = (MedicationKnowledgeCostComponent) value; // MedicationKnowledgeCostComponent + return value; case 3575610: // type this.type = TypeConvertor.castToCodeableConcept(value); // CodeableConcept return value; @@ -2738,7 +2928,11 @@ public class MedicationKnowledge extends DomainResource { @Override public Base setProperty(String name, Base value) throws FHIRException { - if (name.equals("type")) { + if (name.equals("identifier")) { + this.identifier = TypeConvertor.castToIdentifier(value); // Identifier + } else if (name.equals("cost")) { + this.cost = (MedicationKnowledgeCostComponent) value; // MedicationKnowledgeCostComponent + } else if (name.equals("type")) { this.type = TypeConvertor.castToCodeableConcept(value); // CodeableConcept } else if (name.equals("quantity")) { this.quantity = TypeConvertor.castToQuantity(value); // Quantity @@ -2756,6 +2950,8 @@ public class MedicationKnowledge extends DomainResource { @Override public Base makeProperty(int hash, String name) throws FHIRException { switch (hash) { + case -1618432855: return getIdentifier(); + case 3059661: return getCost(); case 3575610: return getType(); case -1285004149: return getQuantity(); case -1335157162: return getDevice(); @@ -2769,6 +2965,8 @@ public class MedicationKnowledge extends DomainResource { @Override public String[] getTypesForProperty(int hash, String name) throws FHIRException { switch (hash) { + case -1618432855: /*identifier*/ return new String[] {"Identifier"}; + case 3059661: /*cost*/ return new String[] {"@MedicationKnowledge.cost"}; case 3575610: /*type*/ return new String[] {"CodeableConcept"}; case -1285004149: /*quantity*/ return new String[] {"Quantity"}; case -1335157162: /*device*/ return new String[] {"Reference"}; @@ -2781,7 +2979,15 @@ public class MedicationKnowledge extends DomainResource { @Override public Base addChild(String name) throws FHIRException { - if (name.equals("type")) { + if (name.equals("identifier")) { + this.identifier = new Identifier(); + return this.identifier; + } + else if (name.equals("cost")) { + this.cost = new MedicationKnowledgeCostComponent(); + return this.cost; + } + else if (name.equals("type")) { this.type = new CodeableConcept(); return this.type; } @@ -2812,6 +3018,8 @@ public class MedicationKnowledge extends DomainResource { public void copyValues(MedicationKnowledgePackagingComponent dst) { super.copyValues(dst); + dst.identifier = identifier == null ? null : identifier.copy(); + dst.cost = cost == null ? null : cost.copy(); dst.type = type == null ? null : type.copy(); dst.quantity = quantity == null ? null : quantity.copy(); dst.device = device == null ? null : device.copy(); @@ -2830,8 +3038,9 @@ public class MedicationKnowledge extends DomainResource { if (!(other_ instanceof MedicationKnowledgePackagingComponent)) return false; MedicationKnowledgePackagingComponent o = (MedicationKnowledgePackagingComponent) other_; - return compareDeep(type, o.type, true) && compareDeep(quantity, o.quantity, true) && compareDeep(device, o.device, true) - && compareDeep(material, o.material, true) && compareDeep(packaging, o.packaging, true); + return compareDeep(identifier, o.identifier, true) && compareDeep(cost, o.cost, true) && compareDeep(type, o.type, true) + && compareDeep(quantity, o.quantity, true) && compareDeep(device, o.device, true) && compareDeep(material, o.material, true) + && compareDeep(packaging, o.packaging, true); } @Override @@ -2845,8 +3054,8 @@ public class MedicationKnowledge extends DomainResource { } public boolean isEmpty() { - return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(type, quantity, device, material - , packaging); + return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, cost, type, quantity + , device, material, packaging); } public String fhirType() { @@ -4218,17 +4427,24 @@ public class MedicationKnowledge extends DomainResource { @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/medicationknowledge-status") protected Enumeration status; + /** + * The creator or owner of the knowledge or information about the medication. + */ + @Child(name = "author", type = {Organization.class}, order=3, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="Creator or owner of the knowledge or information about the medication", formalDefinition="The creator or owner of the knowledge or information about the medication." ) + protected Reference author; + /** * Describes the details of the manufacturer of the medication product. This is not intended to represent the distributor of a medication product. */ - @Child(name = "manufacturer", type = {Organization.class}, order=3, min=0, max=1, modifier=false, summary=true) + @Child(name = "manufacturer", type = {Organization.class}, order=4, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Manufacturer of the item", formalDefinition="Describes the details of the manufacturer of the medication product. This is not intended to represent the distributor of a medication product." ) protected Reference manufacturer; /** * Describes the form of the item. Powder; tablets; capsule. */ - @Child(name = "doseForm", type = {CodeableConcept.class}, order=4, min=0, max=1, modifier=false, summary=false) + @Child(name = "doseForm", type = {CodeableConcept.class}, order=5, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="powder | tablets | capsule +", formalDefinition="Describes the form of the item. Powder; tablets; capsule." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/medication-form-codes") protected CodeableConcept doseForm; @@ -4236,70 +4452,77 @@ public class MedicationKnowledge extends DomainResource { /** * Specific amount of the drug in the packaged product. For example, when specifying a product that has the same strength (For example, Insulin glargine 100 unit per mL solution for injection), this attribute provides additional clarification of the package amount (For example, 3 mL, 10mL, etc.). */ - @Child(name = "amount", type = {Quantity.class}, order=5, min=0, max=1, modifier=false, summary=true) + @Child(name = "amount", type = {Quantity.class}, order=6, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Amount of drug in package", formalDefinition="Specific amount of the drug in the packaged product. For example, when specifying a product that has the same strength (For example, Insulin glargine 100 unit per mL solution for injection), this attribute provides additional clarification of the package amount (For example, 3 mL, 10mL, etc.)." ) protected Quantity amount; /** * Additional names for a medication, for example, the name(s) given to a medication in different countries. For example, acetaminophen and paracetamol or salbutamol and albuterol. */ - @Child(name = "synonym", type = {StringType.class}, order=6, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "synonym", type = {StringType.class}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Additional names for a medication", formalDefinition="Additional names for a medication, for example, the name(s) given to a medication in different countries. For example, acetaminophen and paracetamol or salbutamol and albuterol." ) protected List synonym; /** - * Associated or related knowledge about a medication. + * Associated or related medications. For example, if the medication is a branded product (e.g. Crestor), this is the Therapeutic Moeity (e.g. Rosuvastatin) or if this is a generic medication (e.g. Rosuvastatin), this would link to a branded product (e.g. Crestor. */ - @Child(name = "relatedMedicationKnowledge", type = {}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Associated or related medication information", formalDefinition="Associated or related knowledge about a medication." ) + @Child(name = "relatedMedicationKnowledge", type = {}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="Associated or related medication information", formalDefinition="Associated or related medications. For example, if the medication is a branded product (e.g. Crestor), this is the Therapeutic Moeity (e.g. Rosuvastatin) or if this is a generic medication (e.g. Rosuvastatin), this would link to a branded product (e.g. Crestor." ) protected List relatedMedicationKnowledge; /** - * Associated or related medications. For example, if the medication is a branded product (e.g. Crestor), this is the Therapeutic Moeity (e.g. Rosuvastatin) or if this is a generic medication (e.g. Rosuvastatin), this would link to a branded product (e.g. Crestor). + * Links to associated medications that could be prescribed, dispensed or administered. */ - @Child(name = "associatedMedication", type = {Medication.class}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="A medication resource that is associated with this medication", formalDefinition="Associated or related medications. For example, if the medication is a branded product (e.g. Crestor), this is the Therapeutic Moeity (e.g. Rosuvastatin) or if this is a generic medication (e.g. Rosuvastatin), this would link to a branded product (e.g. Crestor)." ) + @Child(name = "associatedMedication", type = {Medication.class}, order=9, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="A medication resource that is associated with this medication", formalDefinition="Links to associated medications that could be prescribed, dispensed or administered." ) protected List associatedMedication; + /** + * Associated definitions for this medication. + */ + @Child(name = "associatedDefinition", type = {MedicinalProductDefinition.class}, order=10, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="A definition resource that is associated with this medication", formalDefinition="Associated definitions for this medication." ) + protected Reference associatedDefinition; + /** * Category of the medication or product (e.g. branded product, therapeutic moeity, generic product, innovator product, etc.). */ - @Child(name = "productType", type = {CodeableConcept.class}, order=9, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "productType", type = {CodeableConcept.class}, order=11, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Category of the medication or product", formalDefinition="Category of the medication or product (e.g. branded product, therapeutic moeity, generic product, innovator product, etc.)." ) protected List productType; /** * Associated documentation about the medication. */ - @Child(name = "monograph", type = {}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "monograph", type = {}, order=12, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Associated documentation about the medication", formalDefinition="Associated documentation about the medication." ) protected List monograph; /** * Identifies a particular constituent of interest in the product. */ - @Child(name = "ingredient", type = {}, order=11, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "ingredient", type = {}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Active or inactive ingredient", formalDefinition="Identifies a particular constituent of interest in the product." ) protected List ingredient; /** * A device associated with the medication (for example, a drug coated catheter or a drug impregnated dressing). */ - @Child(name = "device", type = {Device.class}, order=12, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "device", type = {Device.class}, order=14, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="A device associated with the medication (for example, a drug coated catheter or a drug impregnated dressing)", formalDefinition="A device associated with the medication (for example, a drug coated catheter or a drug impregnated dressing)." ) protected List device; /** * The instructions for preparing the medication. */ - @Child(name = "preparationInstruction", type = {MarkdownType.class}, order=13, min=0, max=1, modifier=false, summary=false) + @Child(name = "preparationInstruction", type = {MarkdownType.class}, order=15, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="The instructions for preparing the medication", formalDefinition="The instructions for preparing the medication." ) protected MarkdownType preparationInstruction; /** * The intended or approved route of administration. */ - @Child(name = "intendedRoute", type = {CodeableConcept.class}, order=14, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "intendedRoute", type = {CodeableConcept.class}, order=16, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="The intended or approved route of administration", formalDefinition="The intended or approved route of administration." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/route-codes") protected List intendedRoute; @@ -4307,67 +4530,67 @@ public class MedicationKnowledge extends DomainResource { /** * The price of the medication. */ - @Child(name = "cost", type = {}, order=15, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "cost", type = {}, order=17, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="The pricing of the medication", formalDefinition="The price of the medication." ) protected List cost; /** * The program under which the medication is reviewed. */ - @Child(name = "monitoringProgram", type = {}, order=16, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "monitoringProgram", type = {}, order=18, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Program under which a medication is reviewed", formalDefinition="The program under which the medication is reviewed." ) protected List monitoringProgram; /** * Guidelines or protocols that are applicable for the administration of the medication. */ - @Child(name = "administrationGuideline", type = {}, order=17, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "administrationGuideline", type = {}, order=19, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Guidelines or protocols for administration of the medication", formalDefinition="Guidelines or protocols that are applicable for the administration of the medication." ) protected List administrationGuideline; /** * Categorization of the medication within a formulary or classification system. */ - @Child(name = "medicineClassification", type = {}, order=18, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "medicineClassification", type = {}, order=20, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Categorization of the medication within a formulary or classification system", formalDefinition="Categorization of the medication within a formulary or classification system." ) protected List medicineClassification; /** * Information that only applies to packages (not products). */ - @Child(name = "packaging", type = {}, order=19, min=0, max=1, modifier=false, summary=false) + @Child(name = "packaging", type = {}, order=21, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Details about packaged medications", formalDefinition="Information that only applies to packages (not products)." ) - protected MedicationKnowledgePackagingComponent packaging; + protected List packaging; /** * Specifies descriptive properties of the medicine, such as color, shape, imprints, etc. */ - @Child(name = "drugCharacteristic", type = {}, order=20, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "drugCharacteristic", type = {}, order=22, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Specifies descriptive properties of the medicine", formalDefinition="Specifies descriptive properties of the medicine, such as color, shape, imprints, etc." ) protected List drugCharacteristic; /** * Potential clinical issue with or between medication(s) (for example, drug-drug interaction, drug-disease contraindication, drug-allergy interaction, etc.). */ - @Child(name = "clinicalUseIssue", type = {ClinicalUseIssue.class}, order=21, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "clinicalUseIssue", type = {ClinicalUseIssue.class}, order=23, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Potential clinical issue with or between medication(s)", formalDefinition="Potential clinical issue with or between medication(s) (for example, drug-drug interaction, drug-disease contraindication, drug-allergy interaction, etc.)." ) protected List clinicalUseIssue; /** * Regulatory information about a medication. */ - @Child(name = "regulatory", type = {}, order=22, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "regulatory", type = {}, order=24, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Regulatory information about a medication", formalDefinition="Regulatory information about a medication." ) protected List regulatory; /** * The time course of drug absorption, distribution, metabolism and excretion of a medication from the body. */ - @Child(name = "kineticCharacteristic", type = {}, order=23, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "kineticCharacteristic", type = {}, order=25, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="The time course of drug absorption, distribution, metabolism and excretion of a medication from the body", formalDefinition="The time course of drug absorption, distribution, metabolism and excretion of a medication from the body." ) protected List kineticCharacteristic; - private static final long serialVersionUID = -489255977L; + private static final long serialVersionUID = 2074985965L; /** * Constructor @@ -4502,6 +4725,30 @@ public class MedicationKnowledge extends DomainResource { return this; } + /** + * @return {@link #author} (The creator or owner of the knowledge or information about the medication.) + */ + public Reference getAuthor() { + if (this.author == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create MedicationKnowledge.author"); + else if (Configuration.doAutoCreate()) + this.author = new Reference(); // cc + return this.author; + } + + public boolean hasAuthor() { + return this.author != null && !this.author.isEmpty(); + } + + /** + * @param value {@link #author} (The creator or owner of the knowledge or information about the medication.) + */ + public MedicationKnowledge setAuthor(Reference value) { + this.author = value; + return this; + } + /** * @return {@link #manufacturer} (Describes the details of the manufacturer of the medication product. This is not intended to represent the distributor of a medication product.) */ @@ -4636,7 +4883,7 @@ public class MedicationKnowledge extends DomainResource { } /** - * @return {@link #relatedMedicationKnowledge} (Associated or related knowledge about a medication.) + * @return {@link #relatedMedicationKnowledge} (Associated or related medications. For example, if the medication is a branded product (e.g. Crestor), this is the Therapeutic Moeity (e.g. Rosuvastatin) or if this is a generic medication (e.g. Rosuvastatin), this would link to a branded product (e.g. Crestor.) */ public List getRelatedMedicationKnowledge() { if (this.relatedMedicationKnowledge == null) @@ -4689,7 +4936,7 @@ public class MedicationKnowledge extends DomainResource { } /** - * @return {@link #associatedMedication} (Associated or related medications. For example, if the medication is a branded product (e.g. Crestor), this is the Therapeutic Moeity (e.g. Rosuvastatin) or if this is a generic medication (e.g. Rosuvastatin), this would link to a branded product (e.g. Crestor).) + * @return {@link #associatedMedication} (Links to associated medications that could be prescribed, dispensed or administered.) */ public List getAssociatedMedication() { if (this.associatedMedication == null) @@ -4741,6 +4988,30 @@ public class MedicationKnowledge extends DomainResource { return getAssociatedMedication().get(0); } + /** + * @return {@link #associatedDefinition} (Associated definitions for this medication.) + */ + public Reference getAssociatedDefinition() { + if (this.associatedDefinition == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create MedicationKnowledge.associatedDefinition"); + else if (Configuration.doAutoCreate()) + this.associatedDefinition = new Reference(); // cc + return this.associatedDefinition; + } + + public boolean hasAssociatedDefinition() { + return this.associatedDefinition != null && !this.associatedDefinition.isEmpty(); + } + + /** + * @param value {@link #associatedDefinition} (Associated definitions for this medication.) + */ + public MedicationKnowledge setAssociatedDefinition(Reference value) { + this.associatedDefinition = value; + return this; + } + /** * @return {@link #productType} (Category of the medication or product (e.g. branded product, therapeutic moeity, generic product, innovator product, etc.).) */ @@ -5270,25 +5541,54 @@ public class MedicationKnowledge extends DomainResource { /** * @return {@link #packaging} (Information that only applies to packages (not products).) */ - public MedicationKnowledgePackagingComponent getPackaging() { + public List getPackaging() { if (this.packaging == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicationKnowledge.packaging"); - else if (Configuration.doAutoCreate()) - this.packaging = new MedicationKnowledgePackagingComponent(); // cc + this.packaging = new ArrayList(); return this.packaging; } + /** + * @return Returns a reference to this for easy method chaining + */ + public MedicationKnowledge setPackaging(List thePackaging) { + this.packaging = thePackaging; + return this; + } + public boolean hasPackaging() { - return this.packaging != null && !this.packaging.isEmpty(); + if (this.packaging == null) + return false; + for (MedicationKnowledgePackagingComponent item : this.packaging) + if (!item.isEmpty()) + return true; + return false; + } + + public MedicationKnowledgePackagingComponent addPackaging() { //3 + MedicationKnowledgePackagingComponent t = new MedicationKnowledgePackagingComponent(); + if (this.packaging == null) + this.packaging = new ArrayList(); + this.packaging.add(t); + return t; + } + + public MedicationKnowledge addPackaging(MedicationKnowledgePackagingComponent t) { //3 + if (t == null) + return this; + if (this.packaging == null) + this.packaging = new ArrayList(); + this.packaging.add(t); + return this; } /** - * @param value {@link #packaging} (Information that only applies to packages (not products).) + * @return The first repetition of repeating field {@link #packaging}, creating it if it does not already exist {3} */ - public MedicationKnowledge setPackaging(MedicationKnowledgePackagingComponent value) { - this.packaging = value; - return this; + public MedicationKnowledgePackagingComponent getPackagingFirstRep() { + if (getPackaging().isEmpty()) { + addPackaging(); + } + return getPackaging().get(0); } /** @@ -5508,12 +5808,14 @@ public class MedicationKnowledge extends DomainResource { children.add(new Property("identifier", "Identifier", "Business identifier for this medication.", 0, java.lang.Integer.MAX_VALUE, identifier)); children.add(new Property("code", "CodeableConcept", "A code that specifies this medication, or a textual description if no code is available. Usage note: This could be a standard medication code such as a code from RxNorm, SNOMED CT, IDMP etc. It could also be a national or local formulary code, optionally with translations to other code systems.", 0, 1, code)); children.add(new Property("status", "code", "A code to indicate if the medication is in active use. The status refers to the validity about the information of the medication and not to its medicinal properties.", 0, 1, status)); + children.add(new Property("author", "Reference(Organization)", "The creator or owner of the knowledge or information about the medication.", 0, 1, author)); children.add(new Property("manufacturer", "Reference(Organization)", "Describes the details of the manufacturer of the medication product. This is not intended to represent the distributor of a medication product.", 0, 1, manufacturer)); children.add(new Property("doseForm", "CodeableConcept", "Describes the form of the item. Powder; tablets; capsule.", 0, 1, doseForm)); children.add(new Property("amount", "Quantity", "Specific amount of the drug in the packaged product. For example, when specifying a product that has the same strength (For example, Insulin glargine 100 unit per mL solution for injection), this attribute provides additional clarification of the package amount (For example, 3 mL, 10mL, etc.).", 0, 1, amount)); children.add(new Property("synonym", "string", "Additional names for a medication, for example, the name(s) given to a medication in different countries. For example, acetaminophen and paracetamol or salbutamol and albuterol.", 0, java.lang.Integer.MAX_VALUE, synonym)); - children.add(new Property("relatedMedicationKnowledge", "", "Associated or related knowledge about a medication.", 0, java.lang.Integer.MAX_VALUE, relatedMedicationKnowledge)); - children.add(new Property("associatedMedication", "Reference(Medication)", "Associated or related medications. For example, if the medication is a branded product (e.g. Crestor), this is the Therapeutic Moeity (e.g. Rosuvastatin) or if this is a generic medication (e.g. Rosuvastatin), this would link to a branded product (e.g. Crestor).", 0, java.lang.Integer.MAX_VALUE, associatedMedication)); + children.add(new Property("relatedMedicationKnowledge", "", "Associated or related medications. For example, if the medication is a branded product (e.g. Crestor), this is the Therapeutic Moeity (e.g. Rosuvastatin) or if this is a generic medication (e.g. Rosuvastatin), this would link to a branded product (e.g. Crestor.", 0, java.lang.Integer.MAX_VALUE, relatedMedicationKnowledge)); + children.add(new Property("associatedMedication", "Reference(Medication)", "Links to associated medications that could be prescribed, dispensed or administered.", 0, java.lang.Integer.MAX_VALUE, associatedMedication)); + children.add(new Property("associatedDefinition", "Reference(MedicinalProductDefinition)", "Associated definitions for this medication.", 0, 1, associatedDefinition)); children.add(new Property("productType", "CodeableConcept", "Category of the medication or product (e.g. branded product, therapeutic moeity, generic product, innovator product, etc.).", 0, java.lang.Integer.MAX_VALUE, productType)); children.add(new Property("monograph", "", "Associated documentation about the medication.", 0, java.lang.Integer.MAX_VALUE, monograph)); children.add(new Property("ingredient", "", "Identifies a particular constituent of interest in the product.", 0, java.lang.Integer.MAX_VALUE, ingredient)); @@ -5524,7 +5826,7 @@ public class MedicationKnowledge extends DomainResource { children.add(new Property("monitoringProgram", "", "The program under which the medication is reviewed.", 0, java.lang.Integer.MAX_VALUE, monitoringProgram)); children.add(new Property("administrationGuideline", "", "Guidelines or protocols that are applicable for the administration of the medication.", 0, java.lang.Integer.MAX_VALUE, administrationGuideline)); children.add(new Property("medicineClassification", "", "Categorization of the medication within a formulary or classification system.", 0, java.lang.Integer.MAX_VALUE, medicineClassification)); - children.add(new Property("packaging", "", "Information that only applies to packages (not products).", 0, 1, packaging)); + children.add(new Property("packaging", "", "Information that only applies to packages (not products).", 0, java.lang.Integer.MAX_VALUE, packaging)); children.add(new Property("drugCharacteristic", "", "Specifies descriptive properties of the medicine, such as color, shape, imprints, etc.", 0, java.lang.Integer.MAX_VALUE, drugCharacteristic)); children.add(new Property("clinicalUseIssue", "Reference(ClinicalUseIssue)", "Potential clinical issue with or between medication(s) (for example, drug-drug interaction, drug-disease contraindication, drug-allergy interaction, etc.).", 0, java.lang.Integer.MAX_VALUE, clinicalUseIssue)); children.add(new Property("regulatory", "", "Regulatory information about a medication.", 0, java.lang.Integer.MAX_VALUE, regulatory)); @@ -5537,12 +5839,14 @@ public class MedicationKnowledge extends DomainResource { case -1618432855: /*identifier*/ return new Property("identifier", "Identifier", "Business identifier for this medication.", 0, java.lang.Integer.MAX_VALUE, identifier); case 3059181: /*code*/ return new Property("code", "CodeableConcept", "A code that specifies this medication, or a textual description if no code is available. Usage note: This could be a standard medication code such as a code from RxNorm, SNOMED CT, IDMP etc. It could also be a national or local formulary code, optionally with translations to other code systems.", 0, 1, code); case -892481550: /*status*/ return new Property("status", "code", "A code to indicate if the medication is in active use. The status refers to the validity about the information of the medication and not to its medicinal properties.", 0, 1, status); + case -1406328437: /*author*/ return new Property("author", "Reference(Organization)", "The creator or owner of the knowledge or information about the medication.", 0, 1, author); case -1969347631: /*manufacturer*/ return new Property("manufacturer", "Reference(Organization)", "Describes the details of the manufacturer of the medication product. This is not intended to represent the distributor of a medication product.", 0, 1, manufacturer); case 1303858817: /*doseForm*/ return new Property("doseForm", "CodeableConcept", "Describes the form of the item. Powder; tablets; capsule.", 0, 1, doseForm); case -1413853096: /*amount*/ return new Property("amount", "Quantity", "Specific amount of the drug in the packaged product. For example, when specifying a product that has the same strength (For example, Insulin glargine 100 unit per mL solution for injection), this attribute provides additional clarification of the package amount (For example, 3 mL, 10mL, etc.).", 0, 1, amount); case -1742128133: /*synonym*/ return new Property("synonym", "string", "Additional names for a medication, for example, the name(s) given to a medication in different countries. For example, acetaminophen and paracetamol or salbutamol and albuterol.", 0, java.lang.Integer.MAX_VALUE, synonym); - case 723067972: /*relatedMedicationKnowledge*/ return new Property("relatedMedicationKnowledge", "", "Associated or related knowledge about a medication.", 0, java.lang.Integer.MAX_VALUE, relatedMedicationKnowledge); - case 1312779381: /*associatedMedication*/ return new Property("associatedMedication", "Reference(Medication)", "Associated or related medications. For example, if the medication is a branded product (e.g. Crestor), this is the Therapeutic Moeity (e.g. Rosuvastatin) or if this is a generic medication (e.g. Rosuvastatin), this would link to a branded product (e.g. Crestor).", 0, java.lang.Integer.MAX_VALUE, associatedMedication); + case 723067972: /*relatedMedicationKnowledge*/ return new Property("relatedMedicationKnowledge", "", "Associated or related medications. For example, if the medication is a branded product (e.g. Crestor), this is the Therapeutic Moeity (e.g. Rosuvastatin) or if this is a generic medication (e.g. Rosuvastatin), this would link to a branded product (e.g. Crestor.", 0, java.lang.Integer.MAX_VALUE, relatedMedicationKnowledge); + case 1312779381: /*associatedMedication*/ return new Property("associatedMedication", "Reference(Medication)", "Links to associated medications that could be prescribed, dispensed or administered.", 0, java.lang.Integer.MAX_VALUE, associatedMedication); + case -1700604167: /*associatedDefinition*/ return new Property("associatedDefinition", "Reference(MedicinalProductDefinition)", "Associated definitions for this medication.", 0, 1, associatedDefinition); case -1491615543: /*productType*/ return new Property("productType", "CodeableConcept", "Category of the medication or product (e.g. branded product, therapeutic moeity, generic product, innovator product, etc.).", 0, java.lang.Integer.MAX_VALUE, productType); case -1442980789: /*monograph*/ return new Property("monograph", "", "Associated documentation about the medication.", 0, java.lang.Integer.MAX_VALUE, monograph); case -206409263: /*ingredient*/ return new Property("ingredient", "", "Identifies a particular constituent of interest in the product.", 0, java.lang.Integer.MAX_VALUE, ingredient); @@ -5553,7 +5857,7 @@ public class MedicationKnowledge extends DomainResource { case 569848092: /*monitoringProgram*/ return new Property("monitoringProgram", "", "The program under which the medication is reviewed.", 0, java.lang.Integer.MAX_VALUE, monitoringProgram); case -815253966: /*administrationGuideline*/ return new Property("administrationGuideline", "", "Guidelines or protocols that are applicable for the administration of the medication.", 0, java.lang.Integer.MAX_VALUE, administrationGuideline); case 1791551680: /*medicineClassification*/ return new Property("medicineClassification", "", "Categorization of the medication within a formulary or classification system.", 0, java.lang.Integer.MAX_VALUE, medicineClassification); - case 1802065795: /*packaging*/ return new Property("packaging", "", "Information that only applies to packages (not products).", 0, 1, packaging); + case 1802065795: /*packaging*/ return new Property("packaging", "", "Information that only applies to packages (not products).", 0, java.lang.Integer.MAX_VALUE, packaging); case -844126885: /*drugCharacteristic*/ return new Property("drugCharacteristic", "", "Specifies descriptive properties of the medicine, such as color, shape, imprints, etc.", 0, java.lang.Integer.MAX_VALUE, drugCharacteristic); case 251885509: /*clinicalUseIssue*/ return new Property("clinicalUseIssue", "Reference(ClinicalUseIssue)", "Potential clinical issue with or between medication(s) (for example, drug-drug interaction, drug-disease contraindication, drug-allergy interaction, etc.).", 0, java.lang.Integer.MAX_VALUE, clinicalUseIssue); case -27327848: /*regulatory*/ return new Property("regulatory", "", "Regulatory information about a medication.", 0, java.lang.Integer.MAX_VALUE, regulatory); @@ -5569,12 +5873,14 @@ public class MedicationKnowledge extends DomainResource { case -1618432855: /*identifier*/ return this.identifier == null ? new Base[0] : this.identifier.toArray(new Base[this.identifier.size()]); // Identifier case 3059181: /*code*/ return this.code == null ? new Base[0] : new Base[] {this.code}; // CodeableConcept case -892481550: /*status*/ return this.status == null ? new Base[0] : new Base[] {this.status}; // Enumeration + case -1406328437: /*author*/ return this.author == null ? new Base[0] : new Base[] {this.author}; // Reference case -1969347631: /*manufacturer*/ return this.manufacturer == null ? new Base[0] : new Base[] {this.manufacturer}; // Reference case 1303858817: /*doseForm*/ return this.doseForm == null ? new Base[0] : new Base[] {this.doseForm}; // CodeableConcept case -1413853096: /*amount*/ return this.amount == null ? new Base[0] : new Base[] {this.amount}; // Quantity case -1742128133: /*synonym*/ return this.synonym == null ? new Base[0] : this.synonym.toArray(new Base[this.synonym.size()]); // StringType case 723067972: /*relatedMedicationKnowledge*/ return this.relatedMedicationKnowledge == null ? new Base[0] : this.relatedMedicationKnowledge.toArray(new Base[this.relatedMedicationKnowledge.size()]); // MedicationKnowledgeRelatedMedicationKnowledgeComponent case 1312779381: /*associatedMedication*/ return this.associatedMedication == null ? new Base[0] : this.associatedMedication.toArray(new Base[this.associatedMedication.size()]); // Reference + case -1700604167: /*associatedDefinition*/ return this.associatedDefinition == null ? new Base[0] : new Base[] {this.associatedDefinition}; // Reference case -1491615543: /*productType*/ return this.productType == null ? new Base[0] : this.productType.toArray(new Base[this.productType.size()]); // CodeableConcept case -1442980789: /*monograph*/ return this.monograph == null ? new Base[0] : this.monograph.toArray(new Base[this.monograph.size()]); // MedicationKnowledgeMonographComponent case -206409263: /*ingredient*/ return this.ingredient == null ? new Base[0] : this.ingredient.toArray(new Base[this.ingredient.size()]); // MedicationKnowledgeIngredientComponent @@ -5585,7 +5891,7 @@ public class MedicationKnowledge extends DomainResource { case 569848092: /*monitoringProgram*/ return this.monitoringProgram == null ? new Base[0] : this.monitoringProgram.toArray(new Base[this.monitoringProgram.size()]); // MedicationKnowledgeMonitoringProgramComponent case -815253966: /*administrationGuideline*/ return this.administrationGuideline == null ? new Base[0] : this.administrationGuideline.toArray(new Base[this.administrationGuideline.size()]); // MedicationKnowledgeAdministrationGuidelineComponent case 1791551680: /*medicineClassification*/ return this.medicineClassification == null ? new Base[0] : this.medicineClassification.toArray(new Base[this.medicineClassification.size()]); // MedicationKnowledgeMedicineClassificationComponent - case 1802065795: /*packaging*/ return this.packaging == null ? new Base[0] : new Base[] {this.packaging}; // MedicationKnowledgePackagingComponent + case 1802065795: /*packaging*/ return this.packaging == null ? new Base[0] : this.packaging.toArray(new Base[this.packaging.size()]); // MedicationKnowledgePackagingComponent case -844126885: /*drugCharacteristic*/ return this.drugCharacteristic == null ? new Base[0] : this.drugCharacteristic.toArray(new Base[this.drugCharacteristic.size()]); // MedicationKnowledgeDrugCharacteristicComponent case 251885509: /*clinicalUseIssue*/ return this.clinicalUseIssue == null ? new Base[0] : this.clinicalUseIssue.toArray(new Base[this.clinicalUseIssue.size()]); // Reference case -27327848: /*regulatory*/ return this.regulatory == null ? new Base[0] : this.regulatory.toArray(new Base[this.regulatory.size()]); // MedicationKnowledgeRegulatoryComponent @@ -5608,6 +5914,9 @@ public class MedicationKnowledge extends DomainResource { value = new MedicationKnowledgeStatusCodesEnumFactory().fromType(TypeConvertor.castToCode(value)); this.status = (Enumeration) value; // Enumeration return value; + case -1406328437: // author + this.author = TypeConvertor.castToReference(value); // Reference + return value; case -1969347631: // manufacturer this.manufacturer = TypeConvertor.castToReference(value); // Reference return value; @@ -5626,6 +5935,9 @@ public class MedicationKnowledge extends DomainResource { case 1312779381: // associatedMedication this.getAssociatedMedication().add(TypeConvertor.castToReference(value)); // Reference return value; + case -1700604167: // associatedDefinition + this.associatedDefinition = TypeConvertor.castToReference(value); // Reference + return value; case -1491615543: // productType this.getProductType().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept return value; @@ -5657,7 +5969,7 @@ public class MedicationKnowledge extends DomainResource { this.getMedicineClassification().add((MedicationKnowledgeMedicineClassificationComponent) value); // MedicationKnowledgeMedicineClassificationComponent return value; case 1802065795: // packaging - this.packaging = (MedicationKnowledgePackagingComponent) value; // MedicationKnowledgePackagingComponent + this.getPackaging().add((MedicationKnowledgePackagingComponent) value); // MedicationKnowledgePackagingComponent return value; case -844126885: // drugCharacteristic this.getDrugCharacteristic().add((MedicationKnowledgeDrugCharacteristicComponent) value); // MedicationKnowledgeDrugCharacteristicComponent @@ -5685,6 +5997,8 @@ public class MedicationKnowledge extends DomainResource { } else if (name.equals("status")) { value = new MedicationKnowledgeStatusCodesEnumFactory().fromType(TypeConvertor.castToCode(value)); this.status = (Enumeration) value; // Enumeration + } else if (name.equals("author")) { + this.author = TypeConvertor.castToReference(value); // Reference } else if (name.equals("manufacturer")) { this.manufacturer = TypeConvertor.castToReference(value); // Reference } else if (name.equals("doseForm")) { @@ -5697,6 +6011,8 @@ public class MedicationKnowledge extends DomainResource { this.getRelatedMedicationKnowledge().add((MedicationKnowledgeRelatedMedicationKnowledgeComponent) value); } else if (name.equals("associatedMedication")) { this.getAssociatedMedication().add(TypeConvertor.castToReference(value)); + } else if (name.equals("associatedDefinition")) { + this.associatedDefinition = TypeConvertor.castToReference(value); // Reference } else if (name.equals("productType")) { this.getProductType().add(TypeConvertor.castToCodeableConcept(value)); } else if (name.equals("monograph")) { @@ -5718,7 +6034,7 @@ public class MedicationKnowledge extends DomainResource { } else if (name.equals("medicineClassification")) { this.getMedicineClassification().add((MedicationKnowledgeMedicineClassificationComponent) value); } else if (name.equals("packaging")) { - this.packaging = (MedicationKnowledgePackagingComponent) value; // MedicationKnowledgePackagingComponent + this.getPackaging().add((MedicationKnowledgePackagingComponent) value); } else if (name.equals("drugCharacteristic")) { this.getDrugCharacteristic().add((MedicationKnowledgeDrugCharacteristicComponent) value); } else if (name.equals("clinicalUseIssue")) { @@ -5738,12 +6054,14 @@ public class MedicationKnowledge extends DomainResource { case -1618432855: return addIdentifier(); case 3059181: return getCode(); case -892481550: return getStatusElement(); + case -1406328437: return getAuthor(); case -1969347631: return getManufacturer(); case 1303858817: return getDoseForm(); case -1413853096: return getAmount(); case -1742128133: return addSynonymElement(); case 723067972: return addRelatedMedicationKnowledge(); case 1312779381: return addAssociatedMedication(); + case -1700604167: return getAssociatedDefinition(); case -1491615543: return addProductType(); case -1442980789: return addMonograph(); case -206409263: return addIngredient(); @@ -5754,7 +6072,7 @@ public class MedicationKnowledge extends DomainResource { case 569848092: return addMonitoringProgram(); case -815253966: return addAdministrationGuideline(); case 1791551680: return addMedicineClassification(); - case 1802065795: return getPackaging(); + case 1802065795: return addPackaging(); case -844126885: return addDrugCharacteristic(); case 251885509: return addClinicalUseIssue(); case -27327848: return addRegulatory(); @@ -5770,12 +6088,14 @@ public class MedicationKnowledge extends DomainResource { case -1618432855: /*identifier*/ return new String[] {"Identifier"}; case 3059181: /*code*/ return new String[] {"CodeableConcept"}; case -892481550: /*status*/ return new String[] {"code"}; + case -1406328437: /*author*/ return new String[] {"Reference"}; case -1969347631: /*manufacturer*/ return new String[] {"Reference"}; case 1303858817: /*doseForm*/ return new String[] {"CodeableConcept"}; case -1413853096: /*amount*/ return new String[] {"Quantity"}; case -1742128133: /*synonym*/ return new String[] {"string"}; case 723067972: /*relatedMedicationKnowledge*/ return new String[] {}; case 1312779381: /*associatedMedication*/ return new String[] {"Reference"}; + case -1700604167: /*associatedDefinition*/ return new String[] {"Reference"}; case -1491615543: /*productType*/ return new String[] {"CodeableConcept"}; case -1442980789: /*monograph*/ return new String[] {}; case -206409263: /*ingredient*/ return new String[] {}; @@ -5808,6 +6128,10 @@ public class MedicationKnowledge extends DomainResource { else if (name.equals("status")) { throw new FHIRException("Cannot call addChild on a primitive type MedicationKnowledge.status"); } + else if (name.equals("author")) { + this.author = new Reference(); + return this.author; + } else if (name.equals("manufacturer")) { this.manufacturer = new Reference(); return this.manufacturer; @@ -5829,6 +6153,10 @@ public class MedicationKnowledge extends DomainResource { else if (name.equals("associatedMedication")) { return addAssociatedMedication(); } + else if (name.equals("associatedDefinition")) { + this.associatedDefinition = new Reference(); + return this.associatedDefinition; + } else if (name.equals("productType")) { return addProductType(); } @@ -5860,8 +6188,7 @@ public class MedicationKnowledge extends DomainResource { return addMedicineClassification(); } else if (name.equals("packaging")) { - this.packaging = new MedicationKnowledgePackagingComponent(); - return this.packaging; + return addPackaging(); } else if (name.equals("drugCharacteristic")) { return addDrugCharacteristic(); @@ -5899,6 +6226,7 @@ public class MedicationKnowledge extends DomainResource { }; dst.code = code == null ? null : code.copy(); dst.status = status == null ? null : status.copy(); + dst.author = author == null ? null : author.copy(); dst.manufacturer = manufacturer == null ? null : manufacturer.copy(); dst.doseForm = doseForm == null ? null : doseForm.copy(); dst.amount = amount == null ? null : amount.copy(); @@ -5917,6 +6245,7 @@ public class MedicationKnowledge extends DomainResource { for (Reference i : associatedMedication) dst.associatedMedication.add(i.copy()); }; + dst.associatedDefinition = associatedDefinition == null ? null : associatedDefinition.copy(); if (productType != null) { dst.productType = new ArrayList(); for (CodeableConcept i : productType) @@ -5963,7 +6292,11 @@ public class MedicationKnowledge extends DomainResource { for (MedicationKnowledgeMedicineClassificationComponent i : medicineClassification) dst.medicineClassification.add(i.copy()); }; - dst.packaging = packaging == null ? null : packaging.copy(); + if (packaging != null) { + dst.packaging = new ArrayList(); + for (MedicationKnowledgePackagingComponent i : packaging) + dst.packaging.add(i.copy()); + }; if (drugCharacteristic != null) { dst.drugCharacteristic = new ArrayList(); for (MedicationKnowledgeDrugCharacteristicComponent i : drugCharacteristic) @@ -5998,12 +6331,12 @@ public class MedicationKnowledge extends DomainResource { return false; MedicationKnowledge o = (MedicationKnowledge) other_; return compareDeep(identifier, o.identifier, true) && compareDeep(code, o.code, true) && compareDeep(status, o.status, true) - && compareDeep(manufacturer, o.manufacturer, true) && compareDeep(doseForm, o.doseForm, true) && compareDeep(amount, o.amount, true) - && compareDeep(synonym, o.synonym, true) && compareDeep(relatedMedicationKnowledge, o.relatedMedicationKnowledge, true) - && compareDeep(associatedMedication, o.associatedMedication, true) && compareDeep(productType, o.productType, true) - && compareDeep(monograph, o.monograph, true) && compareDeep(ingredient, o.ingredient, true) && compareDeep(device, o.device, true) - && compareDeep(preparationInstruction, o.preparationInstruction, true) && compareDeep(intendedRoute, o.intendedRoute, true) - && compareDeep(cost, o.cost, true) && compareDeep(monitoringProgram, o.monitoringProgram, true) + && compareDeep(author, o.author, true) && compareDeep(manufacturer, o.manufacturer, true) && compareDeep(doseForm, o.doseForm, true) + && compareDeep(amount, o.amount, true) && compareDeep(synonym, o.synonym, true) && compareDeep(relatedMedicationKnowledge, o.relatedMedicationKnowledge, true) + && compareDeep(associatedMedication, o.associatedMedication, true) && compareDeep(associatedDefinition, o.associatedDefinition, true) + && compareDeep(productType, o.productType, true) && compareDeep(monograph, o.monograph, true) && compareDeep(ingredient, o.ingredient, true) + && compareDeep(device, o.device, true) && compareDeep(preparationInstruction, o.preparationInstruction, true) + && compareDeep(intendedRoute, o.intendedRoute, true) && compareDeep(cost, o.cost, true) && compareDeep(monitoringProgram, o.monitoringProgram, true) && compareDeep(administrationGuideline, o.administrationGuideline, true) && compareDeep(medicineClassification, o.medicineClassification, true) && compareDeep(packaging, o.packaging, true) && compareDeep(drugCharacteristic, o.drugCharacteristic, true) && compareDeep(clinicalUseIssue, o.clinicalUseIssue, true) && compareDeep(regulatory, o.regulatory, true) @@ -6023,10 +6356,11 @@ public class MedicationKnowledge extends DomainResource { public boolean isEmpty() { return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, code, status - , manufacturer, doseForm, amount, synonym, relatedMedicationKnowledge, associatedMedication - , productType, monograph, ingredient, device, preparationInstruction, intendedRoute - , cost, monitoringProgram, administrationGuideline, medicineClassification, packaging - , drugCharacteristic, clinicalUseIssue, regulatory, kineticCharacteristic); + , author, manufacturer, doseForm, amount, synonym, relatedMedicationKnowledge, associatedMedication + , associatedDefinition, productType, monograph, ingredient, device, preparationInstruction + , intendedRoute, cost, monitoringProgram, administrationGuideline, medicineClassification + , packaging, drugCharacteristic, clinicalUseIssue, regulatory, kineticCharacteristic + ); } @Override @@ -6292,6 +6626,46 @@ public class MedicationKnowledge extends DomainResource { */ public static final ca.uhn.fhir.model.api.Include INCLUDE_MONOGRAPH = new ca.uhn.fhir.model.api.Include("MedicationKnowledge:monograph").toLocked(); + /** + * Search parameter: packaging-cost-concept + *

    + * Description: The cost of the packaged medication, if the cost is a CodeableConcept
    + * Type: token
    + * Path: null
    + *

    + */ + @SearchParamDefinition(name="packaging-cost-concept", path="", description="The cost of the packaged medication, if the cost is a CodeableConcept", type="token" ) + public static final String SP_PACKAGING_COST_CONCEPT = "packaging-cost-concept"; + /** + * Fluent Client search parameter constant for packaging-cost-concept + *

    + * Description: The cost of the packaged medication, if the cost is a CodeableConcept
    + * Type: token
    + * Path: null
    + *

    + */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam PACKAGING_COST_CONCEPT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_PACKAGING_COST_CONCEPT); + + /** + * Search parameter: packaging-cost + *

    + * Description: The cost of the packaged medication, if the cost is Money
    + * Type: quantity
    + * Path: null
    + *

    + */ + @SearchParamDefinition(name="packaging-cost", path="", description="The cost of the packaged medication, if the cost is Money", type="quantity" ) + public static final String SP_PACKAGING_COST = "packaging-cost"; + /** + * Fluent Client search parameter constant for packaging-cost + *

    + * Description: The cost of the packaged medication, if the cost is Money
    + * Type: quantity
    + * Path: null
    + *

    + */ + public static final ca.uhn.fhir.rest.gclient.QuantityClientParam PACKAGING_COST = new ca.uhn.fhir.rest.gclient.QuantityClientParam(SP_PACKAGING_COST); + /** * Search parameter: product-type *

    @@ -6353,4 +6727,5 @@ public class MedicationKnowledge 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/MedicationRequest.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicationRequest.java index 9fafe5946..4bc0ddd9e 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicationRequest.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicationRequest.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.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; /** * An order or request for both supply of the medication and the instructions for administration of the medication to a patient. The resource is called "MedicationRequest" rather than "MedicationPrescription" or "MedicationOrder" to generalize the use across inpatient and outpatient settings, including care plans, etc., and to harmonize with workflow patterns. @@ -261,7 +259,7 @@ public class MedicationRequest extends DomainResource { */ COMPLETED, /** - * Some of the actions that are implied by the medication request may have occurred. For example, the medication may have been dispensed and the patient may have taken some of the medication. Clinical decision support systems should take this status into account + * The prescription was recorded against the wrong patient or for some reason should not have been recorded (e.g. wrong medication, wrong dose, etc). Some of the actions that are implied by the medication request may have occurred. For example, the medication may have been dispensed and the patient may have taken some of the medication. */ ENTEREDINERROR, /** @@ -336,7 +334,7 @@ public class MedicationRequest extends DomainResource { case ONHOLD: return "Actions implied by the prescription are to be temporarily halted. The prescription might or might not be resumed. May also be called 'suspended'."; case CANCELLED: return "The prescription has been withdrawn before any administrations have occurred"; case COMPLETED: return "All actions that are implied by the prescription have occurred."; - case ENTEREDINERROR: return "Some of the actions that are implied by the medication request may have occurred. For example, the medication may have been dispensed and the patient may have taken some of the medication. Clinical decision support systems should take this status into account"; + case ENTEREDINERROR: return "The prescription was recorded against the wrong patient or for some reason should not have been recorded (e.g. wrong medication, wrong dose, etc). Some of the actions that are implied by the medication request may have occurred. For example, the medication may have been dispensed and the patient may have taken some of the medication."; case STOPPED: return "Actions implied by the prescription are to be permanently halted, before all of the administrations occurred. This should not be used if the original order was entered in error"; case DRAFT: return "The prescription is not yet 'actionable', e.g. it is a work in progress, requires sign-off, verification or needs to be run through decision support process."; case UNKNOWN: return "The authoring/source system does not know which of the status values currently applies for this observation. Note: This concept is not to be used for 'other' - one of the listed statuses is presumed to apply, but the authoring/source system does not know which."; @@ -1382,10 +1380,10 @@ public class MedicationRequest extends DomainResource { protected Enumeration priority; /** - * If true indicates that the provider is asking for the medication request not to occur. + * If true, indicates that the provider is asking for the patient to either stop taking or to not start taking the specified medication. For example, the patient is taking an existing medication and the provider is changing their medication. They want to create two seperate requests: one to stop using the current medication and another to start the new medication. */ @Child(name = "doNotPerform", type = {BooleanType.class}, order=6, min=0, max=1, modifier=true, summary=true) - @Description(shortDefinition="True if request is prohibiting action", formalDefinition="If true indicates that the provider is asking for the medication request not to occur." ) + @Description(shortDefinition="True if patient is to stop taking or not to start taking the medication", formalDefinition="If true, indicates that the provider is asking for the patient to either stop taking or to not start taking the specified medication. For example, the patient is taking an existing medication and the provider is changing their medication. They want to create two seperate requests: one to stop using the current medication and another to start the new medication." ) protected BooleanType doNotPerform; /** @@ -1864,7 +1862,7 @@ public class MedicationRequest extends DomainResource { } /** - * @return {@link #doNotPerform} (If true indicates that the provider is asking for the medication request not to occur.). This is the underlying object with id, value and extensions. The accessor "getDoNotPerform" gives direct access to the value + * @return {@link #doNotPerform} (If true, indicates that the provider is asking for the patient to either stop taking or to not start taking the specified medication. For example, the patient is taking an existing medication and the provider is changing their medication. They want to create two seperate requests: one to stop using the current medication and another to start the new medication.). This is the underlying object with id, value and extensions. The accessor "getDoNotPerform" gives direct access to the value */ public BooleanType getDoNotPerformElement() { if (this.doNotPerform == null) @@ -1884,7 +1882,7 @@ public class MedicationRequest extends DomainResource { } /** - * @param value {@link #doNotPerform} (If true indicates that the provider is asking for the medication request not to occur.). This is the underlying object with id, value and extensions. The accessor "getDoNotPerform" gives direct access to the value + * @param value {@link #doNotPerform} (If true, indicates that the provider is asking for the patient to either stop taking or to not start taking the specified medication. For example, the patient is taking an existing medication and the provider is changing their medication. They want to create two seperate requests: one to stop using the current medication and another to start the new medication.). This is the underlying object with id, value and extensions. The accessor "getDoNotPerform" gives direct access to the value */ public MedicationRequest setDoNotPerformElement(BooleanType value) { this.doNotPerform = value; @@ -1892,14 +1890,14 @@ public class MedicationRequest extends DomainResource { } /** - * @return If true indicates that the provider is asking for the medication request not to occur. + * @return If true, indicates that the provider is asking for the patient to either stop taking or to not start taking the specified medication. For example, the patient is taking an existing medication and the provider is changing their medication. They want to create two seperate requests: one to stop using the current medication and another to start the new medication. */ public boolean getDoNotPerform() { return this.doNotPerform == null || this.doNotPerform.isEmpty() ? false : this.doNotPerform.getValue(); } /** - * @param value If true indicates that the provider is asking for the medication request not to occur. + * @param value If true, indicates that the provider is asking for the patient to either stop taking or to not start taking the specified medication. For example, the patient is taking an existing medication and the provider is changing their medication. They want to create two seperate requests: one to stop using the current medication and another to start the new medication. */ public MedicationRequest setDoNotPerform(boolean value) { if (this.doNotPerform == null) @@ -2917,7 +2915,7 @@ public class MedicationRequest extends DomainResource { children.add(new Property("intent", "code", "Whether the request is a proposal, plan, or an original order.", 0, 1, intent)); children.add(new Property("category", "CodeableConcept", "Indicates the grouping or category of medication request (for example, drug classification like ATC, where meds would be administered, legal category of the medication.).", 0, java.lang.Integer.MAX_VALUE, category)); children.add(new Property("priority", "code", "Indicates how quickly the Medication Request should be addressed with respect to other requests.", 0, 1, priority)); - children.add(new Property("doNotPerform", "boolean", "If true indicates that the provider is asking for the medication request not to occur.", 0, 1, doNotPerform)); + children.add(new Property("doNotPerform", "boolean", "If true, indicates that the provider is asking for the patient to either stop taking or to not start taking the specified medication. For example, the patient is taking an existing medication and the provider is changing their medication. They want to create two seperate requests: one to stop using the current medication and another to start the new medication.", 0, 1, doNotPerform)); children.add(new Property("reported", "boolean", "Indicates if this record was captured as a secondary 'reported' record rather than as an original primary source-of-truth record. It may also indicate the source of the report.", 0, 1, reported)); children.add(new Property("informationSource", "Reference(Patient|Practitioner|PractitionerRole|RelatedPerson|Organization)", "The person or organization who provided the information about this request, if the source is someone other than the requestor. This is often used when the MedicationRequest is reported by another person.", 0, 1, informationSource)); children.add(new Property("medication", "CodeableReference(Medication)", "Identifies the medication being requested. This is a link to a resource that represents the medication which may be the details of the medication or simply an attribute carrying a code that identifies the medication from a known list of medications.", 0, 1, medication)); @@ -2955,7 +2953,7 @@ public class MedicationRequest extends DomainResource { case -1183762788: /*intent*/ return new Property("intent", "code", "Whether the request is a proposal, plan, or an original order.", 0, 1, intent); case 50511102: /*category*/ return new Property("category", "CodeableConcept", "Indicates the grouping or category of medication request (for example, drug classification like ATC, where meds would be administered, legal category of the medication.).", 0, java.lang.Integer.MAX_VALUE, category); case -1165461084: /*priority*/ return new Property("priority", "code", "Indicates how quickly the Medication Request should be addressed with respect to other requests.", 0, 1, priority); - case -1788508167: /*doNotPerform*/ return new Property("doNotPerform", "boolean", "If true indicates that the provider is asking for the medication request not to occur.", 0, 1, doNotPerform); + case -1788508167: /*doNotPerform*/ return new Property("doNotPerform", "boolean", "If true, indicates that the provider is asking for the patient to either stop taking or to not start taking the specified medication. For example, the patient is taking an existing medication and the provider is changing their medication. They want to create two seperate requests: one to stop using the current medication and another to start the new medication.", 0, 1, doNotPerform); case -427039533: /*reported*/ return new Property("reported", "boolean", "Indicates if this record was captured as a secondary 'reported' record rather than as an original primary source-of-truth record. It may also indicate the source of the report.", 0, 1, reported); case -2123220889: /*informationSource*/ return new Property("informationSource", "Reference(Patient|Practitioner|PractitionerRole|RelatedPerson|Organization)", "The person or organization who provided the information about this request, if the source is someone other than the requestor. This is often used when the MedicationRequest is reported by another person.", 0, 1, informationSource); case 1998965455: /*medication*/ return new Property("medication", "CodeableReference(Medication)", "Identifies the medication being requested. This is a link to a resource that represents the medication which may be the details of the medication or simply an attribute carrying a code that identifies the medication from a known list of medications.", 0, 1, medication); @@ -3605,6 +3603,26 @@ public class MedicationRequest extends DomainResource { */ public static final ca.uhn.fhir.rest.gclient.TokenClientParam CATEGORY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CATEGORY); + /** + * Search parameter: combo-date + *

    + * Description: Returns medication request to be administered on a specific date or within a date range
    + * Type: date
    + * Path: MedicationRequest.dosageInstruction.timing.event | (MedicationRequest.dosageInstruction.timing.repeat.bounds as Period)
    + *

    + */ + @SearchParamDefinition(name="combo-date", path="MedicationRequest.dosageInstruction.timing.event | (MedicationRequest.dosageInstruction.timing.repeat.bounds as Period)", description="Returns medication request to be administered on a specific date or within a date range", type="date" ) + public static final String SP_COMBO_DATE = "combo-date"; + /** + * Fluent Client search parameter constant for combo-date + *

    + * Description: Returns medication request to be administered on a specific date or within a date range
    + * Type: date
    + * Path: MedicationRequest.dosageInstruction.timing.event | (MedicationRequest.dosageInstruction.timing.repeat.bounds as Period)
    + *

    + */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam COMBO_DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_COMBO_DATE); + /** * Search parameter: intended-dispenser *

    @@ -3836,7 +3854,7 @@ public class MedicationRequest 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 @@ -3858,10 +3876,10 @@ public class MedicationRequest 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 @@ -3878,7 +3896,7 @@ public class MedicationRequest 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 @@ -3900,7 +3918,7 @@ public class MedicationRequest 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); @@ -3999,34 +4017,6 @@ public class MedicationRequest extends DomainResource { */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("MedicationRequest:patient").toLocked(); - /** - * Search parameter: date - *

    - * Description: Multiple Resources: - -* [MedicationAdministration](medicationadministration.html): Date administration happened (or did not happen) -* [MedicationRequest](medicationrequest.html): Returns medication request to be administered on a specific date -
    - * Type: date
    - * Path: MedicationAdministration.occurence | MedicationRequest.dosageInstruction.timing.event
    - *

    - */ - @SearchParamDefinition(name="date", path="MedicationAdministration.occurence | MedicationRequest.dosageInstruction.timing.event", description="Multiple Resources: \r\n\r\n* [MedicationAdministration](medicationadministration.html): Date administration happened (or did not happen)\r\n* [MedicationRequest](medicationrequest.html): Returns medication request to be administered on a specific date\r\n", type="date" ) - public static final String SP_DATE = "date"; - /** - * Fluent Client search parameter constant for date - *

    - * Description: Multiple Resources: - -* [MedicationAdministration](medicationadministration.html): Date administration happened (or did not happen) -* [MedicationRequest](medicationrequest.html): Returns medication request to be administered on a specific date -
    - * Type: date
    - * Path: MedicationAdministration.occurence | MedicationRequest.dosageInstruction.timing.event
    - *

    - */ - public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE); - /** * Search parameter: encounter *

    @@ -4132,4 +4122,5 @@ public class MedicationRequest 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/MedicationUsage.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicationUsage.java index c9b65b832..c380ed35b 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicationUsage.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicationUsage.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 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 medication that is being consumed by a patient. A MedicationUsage may indicate that the patient may be taking the medication now or has taken the medication in the past or will be taking the medication in the future. The source of this information can be the patient, significant other (such as a family member or spouse), or a clinician. A common scenario where this information is captured is during the history taking process during a patient visit or stay. The medication information may come from sources such as the patient's memory, from a prescription bottle, or from a list of medications the patient, clinician or other party maintains. @@ -1852,7 +1854,7 @@ public class MedicationUsage 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 @@ -1874,10 +1876,10 @@ public class MedicationUsage 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 @@ -1894,7 +1896,7 @@ public class MedicationUsage 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 @@ -1916,7 +1918,7 @@ public class MedicationUsage 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); @@ -2086,4 +2088,5 @@ public class MedicationUsage 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/MedicinalProductDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicinalProductDefinition.java index a7b6ec5a4..0e723c4a9 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicinalProductDefinition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicinalProductDefinition.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; /** * Detailed definition of a medicinal product, typically for uses other than direct patient care (e.g. regulatory use). @@ -1142,9 +1142,9 @@ public class MedicinalProductDefinition extends DomainResource { /** * Reference to another product, e.g. for linking authorised to investigational product. */ - @Child(name = "product", type = {Identifier.class, MedicinalProductDefinition.class}, order=1, min=1, max=1, modifier=false, summary=true) + @Child(name = "product", type = {CodeableReference.class}, order=1, min=1, max=1, modifier=false, summary=true) @Description(shortDefinition="Reference to another product, e.g. for linking authorised to investigational product", formalDefinition="Reference to another product, e.g. for linking authorised to investigational product." ) - protected DataType product; + protected CodeableReference product; /** * The type of relationship, for instance branded to generic, product to development product (investigational), parallel import version. @@ -1153,7 +1153,7 @@ public class MedicinalProductDefinition extends DomainResource { @Description(shortDefinition="The type of relationship, for instance branded to generic, product to development product (investigational), parallel import version", formalDefinition="The type of relationship, for instance branded to generic, product to development product (investigational), parallel import version." ) protected CodeableConcept type; - private static final long serialVersionUID = 606573338L; + private static final long serialVersionUID = -1746125578L; /** * Constructor @@ -1165,7 +1165,7 @@ public class MedicinalProductDefinition extends DomainResource { /** * Constructor */ - public MedicinalProductDefinitionCrossReferenceComponent(DataType product) { + public MedicinalProductDefinitionCrossReferenceComponent(CodeableReference product) { super(); this.setProduct(product); } @@ -1173,40 +1173,15 @@ public class MedicinalProductDefinition extends DomainResource { /** * @return {@link #product} (Reference to another product, e.g. for linking authorised to investigational product.) */ - public DataType getProduct() { + public CodeableReference getProduct() { + if (this.product == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create MedicinalProductDefinitionCrossReferenceComponent.product"); + else if (Configuration.doAutoCreate()) + this.product = new CodeableReference(); // cc return this.product; } - /** - * @return {@link #product} (Reference to another product, e.g. for linking authorised to investigational product.) - */ - public Identifier getProductIdentifier() throws FHIRException { - if (this.product == null) - this.product = new Identifier(); - if (!(this.product instanceof Identifier)) - throw new FHIRException("Type mismatch: the type Identifier was expected, but "+this.product.getClass().getName()+" was encountered"); - return (Identifier) this.product; - } - - public boolean hasProductIdentifier() { - return this != null && this.product instanceof Identifier; - } - - /** - * @return {@link #product} (Reference to another product, e.g. for linking authorised to investigational product.) - */ - public Reference getProductReference() throws FHIRException { - if (this.product == null) - this.product = new Reference(); - if (!(this.product instanceof Reference)) - throw new FHIRException("Type mismatch: the type Reference was expected, but "+this.product.getClass().getName()+" was encountered"); - return (Reference) this.product; - } - - public boolean hasProductReference() { - return this != null && this.product instanceof Reference; - } - public boolean hasProduct() { return this.product != null && !this.product.isEmpty(); } @@ -1214,9 +1189,7 @@ public class MedicinalProductDefinition extends DomainResource { /** * @param value {@link #product} (Reference to another product, e.g. for linking authorised to investigational product.) */ - public MedicinalProductDefinitionCrossReferenceComponent setProduct(DataType value) { - if (value != null && !(value instanceof Identifier || value instanceof Reference)) - throw new Error("Not the right type for MedicinalProductDefinition.crossReference.product[x]: "+value.fhirType()); + public MedicinalProductDefinitionCrossReferenceComponent setProduct(CodeableReference value) { this.product = value; return this; } @@ -1247,17 +1220,14 @@ public class MedicinalProductDefinition extends DomainResource { protected void listChildren(List children) { super.listChildren(children); - children.add(new Property("product[x]", "Identifier|Reference(MedicinalProductDefinition)", "Reference to another product, e.g. for linking authorised to investigational product.", 0, 1, product)); + children.add(new Property("product", "CodeableReference(MedicinalProductDefinition)", "Reference to another product, e.g. for linking authorised to investigational product.", 0, 1, product)); children.add(new Property("type", "CodeableConcept", "The type of relationship, for instance branded to generic, product to development product (investigational), parallel import version.", 0, 1, type)); } @Override public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { switch (_hash) { - case 1753005361: /*product[x]*/ return new Property("product[x]", "Identifier|Reference(MedicinalProductDefinition)", "Reference to another product, e.g. for linking authorised to investigational product.", 0, 1, product); - case -309474065: /*product*/ return new Property("product[x]", "Identifier|Reference(MedicinalProductDefinition)", "Reference to another product, e.g. for linking authorised to investigational product.", 0, 1, product); - case 2006726392: /*productIdentifier*/ return new Property("product[x]", "Identifier", "Reference to another product, e.g. for linking authorised to investigational product.", 0, 1, product); - case -669667556: /*productReference*/ return new Property("product[x]", "Reference(MedicinalProductDefinition)", "Reference to another product, e.g. for linking authorised to investigational product.", 0, 1, product); + case -309474065: /*product*/ return new Property("product", "CodeableReference(MedicinalProductDefinition)", "Reference to another product, e.g. for linking authorised to investigational product.", 0, 1, product); case 3575610: /*type*/ return new Property("type", "CodeableConcept", "The type of relationship, for instance branded to generic, product to development product (investigational), parallel import version.", 0, 1, type); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -1267,7 +1237,7 @@ public class MedicinalProductDefinition extends DomainResource { @Override public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException { switch (hash) { - case -309474065: /*product*/ return this.product == null ? new Base[0] : new Base[] {this.product}; // DataType + case -309474065: /*product*/ return this.product == null ? new Base[0] : new Base[] {this.product}; // CodeableReference case 3575610: /*type*/ return this.type == null ? new Base[0] : new Base[] {this.type}; // CodeableConcept default: return super.getProperty(hash, name, checkValid); } @@ -1278,7 +1248,7 @@ public class MedicinalProductDefinition extends DomainResource { public Base setProperty(int hash, String name, Base value) throws FHIRException { switch (hash) { case -309474065: // product - this.product = TypeConvertor.castToType(value); // DataType + this.product = TypeConvertor.castToCodeableReference(value); // CodeableReference return value; case 3575610: // type this.type = TypeConvertor.castToCodeableConcept(value); // CodeableConcept @@ -1290,8 +1260,8 @@ public class MedicinalProductDefinition extends DomainResource { @Override public Base setProperty(String name, Base value) throws FHIRException { - if (name.equals("product[x]")) { - this.product = TypeConvertor.castToType(value); // DataType + if (name.equals("product")) { + this.product = TypeConvertor.castToCodeableReference(value); // CodeableReference } else if (name.equals("type")) { this.type = TypeConvertor.castToCodeableConcept(value); // CodeableConcept } else @@ -1302,7 +1272,6 @@ public class MedicinalProductDefinition extends DomainResource { @Override public Base makeProperty(int hash, String name) throws FHIRException { switch (hash) { - case 1753005361: return getProduct(); case -309474065: return getProduct(); case 3575610: return getType(); default: return super.makeProperty(hash, name); @@ -1313,7 +1282,7 @@ public class MedicinalProductDefinition extends DomainResource { @Override public String[] getTypesForProperty(int hash, String name) throws FHIRException { switch (hash) { - case -309474065: /*product*/ return new String[] {"Identifier", "Reference"}; + case -309474065: /*product*/ return new String[] {"CodeableReference"}; case 3575610: /*type*/ return new String[] {"CodeableConcept"}; default: return super.getTypesForProperty(hash, name); } @@ -1322,12 +1291,8 @@ public class MedicinalProductDefinition extends DomainResource { @Override public Base addChild(String name) throws FHIRException { - if (name.equals("productIdentifier")) { - this.product = new Identifier(); - return this.product; - } - else if (name.equals("productReference")) { - this.product = new Reference(); + if (name.equals("product")) { + this.product = new CodeableReference(); return this.product; } else if (name.equals("type")) { @@ -1813,10 +1778,10 @@ public class MedicinalProductDefinition extends DomainResource { protected CodeableConcept combinedPharmaceuticalDoseForm; /** - * General combined description of indication(s) for this product. See also MedicinalProductDefinitionIndication. + * General combined description of indication(s) for this product, for use when a structured set is not available. See also the ClinicalUseIssue resource, which can be used for more structured indications, and can be made to reference to this resource. */ @Child(name = "indication", type = {MarkdownType.class}, order=8, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="General combined description of indication(s) for this product. See also MedicinalProductDefinitionIndication", formalDefinition="General combined description of indication(s) for this product. See also MedicinalProductDefinitionIndication." ) + @Description(shortDefinition="General combined description of indication(s) for this product, for use when a structured set is not available. See also the ClinicalUseIssue resource, which can be used for more structured indications, and can be made to reference to this resource", formalDefinition="General combined description of indication(s) for this product, for use when a structured set is not available. See also the ClinicalUseIssue resource, which can be used for more structured indications, and can be made to reference to this resource." ) protected MarkdownType indication; /** @@ -1850,9 +1815,9 @@ public class MedicinalProductDefinition extends DomainResource { /** * Allows the product to be classified by various systems. */ - @Child(name = "productClassification", type = {CodeableConcept.class}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "classification", type = {CodeableConcept.class}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Allows the product to be classified by various systems", formalDefinition="Allows the product to be classified by various systems." ) - protected List productClassification; + protected List classification; /** * Allows the key product features to be recorded, such as "suger free", "modified release", "parallel import". @@ -1889,56 +1854,63 @@ public class MedicinalProductDefinition extends DomainResource { @Description(shortDefinition="The ingredients of this medicinal product - when not specified elsewhere. This is only needed if the ingredients are not specified by the pharmaceuticalProduct or packagedMedicinalProduct references above. In cases where those levels of detail are not used, the ingredients may be specified directly here", formalDefinition="The ingredients of this medicinal product - when not specified elsewhere. This is only needed if the ingredients are not specified by the pharmaceuticalProduct or packagedMedicinalProduct references above. In cases where those levels of detail are not used, the ingredients may be specified directly here." ) protected List ingredient; + /** + * Any component of the drug product which is not the chemical entity defined as the drug substance or an excipient in the drug product. This includes process-related impurities and contaminants, product-related impurities including degradation products. + */ + @Child(name = "impurity", type = {SubstanceDefinition.class}, order=19, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="Any component of the drug product which is not the chemical entity defined as the drug substance or an excipient in the drug product. This includes process-related impurities and contaminants, product-related impurities including degradation products", formalDefinition="Any component of the drug product which is not the chemical entity defined as the drug substance or an excipient in the drug product. This includes process-related impurities and contaminants, product-related impurities including degradation products." ) + protected List impurity; + /** * Supporting documentation, typically for regulatory submission. */ - @Child(name = "attachedDocument", type = {DocumentReference.class}, order=19, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "attachedDocument", type = {DocumentReference.class}, order=20, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Supporting documentation, typically for regulatory submission", formalDefinition="Supporting documentation, typically for regulatory submission." ) protected List attachedDocument; /** * A master file for to the medicinal product (e.g. Pharmacovigilance System Master File). */ - @Child(name = "masterFile", type = {DocumentReference.class}, order=20, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "masterFile", type = {DocumentReference.class}, order=21, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="A master file for to the medicinal product (e.g. Pharmacovigilance System Master File)", formalDefinition="A master file for to the medicinal product (e.g. Pharmacovigilance System Master File)." ) protected List masterFile; /** * A product specific contact, person (in a role), or an organization. */ - @Child(name = "contact", type = {}, order=21, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "contact", type = {}, order=22, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="A product specific contact, person (in a role), or an organization", formalDefinition="A product specific contact, person (in a role), or an organization." ) protected List contact; /** * Clinical trials or studies that this product is involved in. */ - @Child(name = "clinicalTrial", type = {ResearchStudy.class}, order=22, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "clinicalTrial", type = {ResearchStudy.class}, order=23, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Clinical trials or studies that this product is involved in", formalDefinition="Clinical trials or studies that this product is involved in." ) protected List clinicalTrial; /** * The product's name, including full name and possibly coded parts. */ - @Child(name = "name", type = {}, order=23, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "name", type = {}, order=24, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="The product's name, including full name and possibly coded parts", formalDefinition="The product's name, including full name and possibly coded parts." ) protected List name; /** * Reference to another product, e.g. for linking authorised to investigational product. */ - @Child(name = "crossReference", type = {}, order=24, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "crossReference", type = {}, order=25, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Reference to another product, e.g. for linking authorised to investigational product", formalDefinition="Reference to another product, e.g. for linking authorised to investigational product." ) protected List crossReference; /** * An operation applied to the product, for manufacturing or adminsitrative purpose. */ - @Child(name = "manufacturingBusinessOperation", type = {}, order=25, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "manufacturingBusinessOperation", type = {}, order=26, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="An operation applied to the product, for manufacturing or adminsitrative purpose", formalDefinition="An operation applied to the product, for manufacturing or adminsitrative purpose." ) protected List manufacturingBusinessOperation; - private static final long serialVersionUID = -585909008L; + private static final long serialVersionUID = -1167088375L; /** * Constructor @@ -2252,7 +2224,7 @@ public class MedicinalProductDefinition extends DomainResource { } /** - * @return {@link #indication} (General combined description of indication(s) for this product. See also MedicinalProductDefinitionIndication.). This is the underlying object with id, value and extensions. The accessor "getIndication" gives direct access to the value + * @return {@link #indication} (General combined description of indication(s) for this product, for use when a structured set is not available. See also the ClinicalUseIssue resource, which can be used for more structured indications, and can be made to reference to this resource.). This is the underlying object with id, value and extensions. The accessor "getIndication" gives direct access to the value */ public MarkdownType getIndicationElement() { if (this.indication == null) @@ -2272,7 +2244,7 @@ public class MedicinalProductDefinition extends DomainResource { } /** - * @param value {@link #indication} (General combined description of indication(s) for this product. See also MedicinalProductDefinitionIndication.). This is the underlying object with id, value and extensions. The accessor "getIndication" gives direct access to the value + * @param value {@link #indication} (General combined description of indication(s) for this product, for use when a structured set is not available. See also the ClinicalUseIssue resource, which can be used for more structured indications, and can be made to reference to this resource.). This is the underlying object with id, value and extensions. The accessor "getIndication" gives direct access to the value */ public MedicinalProductDefinition setIndicationElement(MarkdownType value) { this.indication = value; @@ -2280,14 +2252,14 @@ public class MedicinalProductDefinition extends DomainResource { } /** - * @return General combined description of indication(s) for this product. See also MedicinalProductDefinitionIndication. + * @return General combined description of indication(s) for this product, for use when a structured set is not available. See also the ClinicalUseIssue resource, which can be used for more structured indications, and can be made to reference to this resource. */ public String getIndication() { return this.indication == null ? null : this.indication.getValue(); } /** - * @param value General combined description of indication(s) for this product. See also MedicinalProductDefinitionIndication. + * @param value General combined description of indication(s) for this product, for use when a structured set is not available. See also the ClinicalUseIssue resource, which can be used for more structured indications, and can be made to reference to this resource. */ public MedicinalProductDefinition setIndication(String value) { if (value == null) @@ -2426,56 +2398,56 @@ public class MedicinalProductDefinition extends DomainResource { } /** - * @return {@link #productClassification} (Allows the product to be classified by various systems.) + * @return {@link #classification} (Allows the product to be classified by various systems.) */ - public List getProductClassification() { - if (this.productClassification == null) - this.productClassification = new ArrayList(); - return this.productClassification; + public List getClassification() { + if (this.classification == null) + this.classification = new ArrayList(); + return this.classification; } /** * @return Returns a reference to this for easy method chaining */ - public MedicinalProductDefinition setProductClassification(List theProductClassification) { - this.productClassification = theProductClassification; + public MedicinalProductDefinition setClassification(List theClassification) { + this.classification = theClassification; return this; } - public boolean hasProductClassification() { - if (this.productClassification == null) + public boolean hasClassification() { + if (this.classification == null) return false; - for (CodeableConcept item : this.productClassification) + for (CodeableConcept item : this.classification) if (!item.isEmpty()) return true; return false; } - public CodeableConcept addProductClassification() { //3 + public CodeableConcept addClassification() { //3 CodeableConcept t = new CodeableConcept(); - if (this.productClassification == null) - this.productClassification = new ArrayList(); - this.productClassification.add(t); + if (this.classification == null) + this.classification = new ArrayList(); + this.classification.add(t); return t; } - public MedicinalProductDefinition addProductClassification(CodeableConcept t) { //3 + public MedicinalProductDefinition addClassification(CodeableConcept t) { //3 if (t == null) return this; - if (this.productClassification == null) - this.productClassification = new ArrayList(); - this.productClassification.add(t); + if (this.classification == null) + this.classification = new ArrayList(); + this.classification.add(t); return this; } /** - * @return The first repetition of repeating field {@link #productClassification}, creating it if it does not already exist {3} + * @return The first repetition of repeating field {@link #classification}, creating it if it does not already exist {3} */ - public CodeableConcept getProductClassificationFirstRep() { - if (getProductClassification().isEmpty()) { - addProductClassification(); + public CodeableConcept getClassificationFirstRep() { + if (getClassification().isEmpty()) { + addClassification(); } - return getProductClassification().get(0); + return getClassification().get(0); } /** @@ -2743,6 +2715,59 @@ public class MedicinalProductDefinition extends DomainResource { return getIngredient().get(0); } + /** + * @return {@link #impurity} (Any component of the drug product which is not the chemical entity defined as the drug substance or an excipient in the drug product. This includes process-related impurities and contaminants, product-related impurities including degradation products.) + */ + public List getImpurity() { + if (this.impurity == null) + this.impurity = new ArrayList(); + return this.impurity; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public MedicinalProductDefinition setImpurity(List theImpurity) { + this.impurity = theImpurity; + return this; + } + + public boolean hasImpurity() { + if (this.impurity == null) + return false; + for (Reference item : this.impurity) + if (!item.isEmpty()) + return true; + return false; + } + + public Reference addImpurity() { //3 + Reference t = new Reference(); + if (this.impurity == null) + this.impurity = new ArrayList(); + this.impurity.add(t); + return t; + } + + public MedicinalProductDefinition addImpurity(Reference t) { //3 + if (t == null) + return this; + if (this.impurity == null) + this.impurity = new ArrayList(); + this.impurity.add(t); + return this; + } + + /** + * @return The first repetition of repeating field {@link #impurity}, creating it if it does not already exist {3} + */ + public Reference getImpurityFirstRep() { + if (getImpurity().isEmpty()) { + addImpurity(); + } + return getImpurity().get(0); + } + /** * @return {@link #attachedDocument} (Supporting documentation, typically for regulatory submission.) */ @@ -3124,17 +3149,18 @@ public class MedicinalProductDefinition extends DomainResource { children.add(new Property("statusDate", "dateTime", "The date at which the given status became applicable.", 0, 1, statusDate)); children.add(new Property("description", "markdown", "General description of this product.", 0, 1, description)); children.add(new Property("combinedPharmaceuticalDoseForm", "CodeableConcept", "The dose form for a single part product, or combined form of a multiple part product.", 0, 1, combinedPharmaceuticalDoseForm)); - children.add(new Property("indication", "markdown", "General combined description of indication(s) for this product. See also MedicinalProductDefinitionIndication.", 0, 1, indication)); + children.add(new Property("indication", "markdown", "General combined description of indication(s) for this product, for use when a structured set is not available. See also the ClinicalUseIssue resource, which can be used for more structured indications, and can be made to reference to this resource.", 0, 1, indication)); children.add(new Property("legalStatusOfSupply", "CodeableConcept", "The legal status of supply of the medicinal product as classified by the regulator.", 0, 1, legalStatusOfSupply)); children.add(new Property("additionalMonitoringIndicator", "CodeableConcept", "Whether the Medicinal Product is subject to additional monitoring for regulatory reasons.", 0, 1, additionalMonitoringIndicator)); children.add(new Property("specialMeasures", "CodeableConcept", "Whether the Medicinal Product is subject to special measures for regulatory reasons.", 0, java.lang.Integer.MAX_VALUE, specialMeasures)); children.add(new Property("paediatricUseIndicator", "CodeableConcept", "If authorised for use in children.", 0, 1, paediatricUseIndicator)); - children.add(new Property("productClassification", "CodeableConcept", "Allows the product to be classified by various systems.", 0, java.lang.Integer.MAX_VALUE, productClassification)); + children.add(new Property("classification", "CodeableConcept", "Allows the product to be classified by various systems.", 0, java.lang.Integer.MAX_VALUE, classification)); children.add(new Property("characteristic", "CodeableConcept", "Allows the key product features to be recorded, such as \"suger free\", \"modified release\", \"parallel import\".", 0, java.lang.Integer.MAX_VALUE, characteristic)); children.add(new Property("marketingStatus", "MarketingStatus", "Marketing status of the medicinal product, in contrast to marketing authorizaton.", 0, java.lang.Integer.MAX_VALUE, marketingStatus)); children.add(new Property("pharmaceuticalProduct", "Reference(AdministrableProductDefinition)", "Pharmaceutical aspects of product.", 0, java.lang.Integer.MAX_VALUE, pharmaceuticalProduct)); children.add(new Property("packagedMedicinalProduct", "Reference(PackagedProductDefinition)", "Package representation for the product.", 0, java.lang.Integer.MAX_VALUE, packagedMedicinalProduct)); children.add(new Property("ingredient", "Reference(Ingredient)", "The ingredients of this medicinal product - when not specified elsewhere. This is only needed if the ingredients are not specified by the pharmaceuticalProduct or packagedMedicinalProduct references above. In cases where those levels of detail are not used, the ingredients may be specified directly here.", 0, java.lang.Integer.MAX_VALUE, ingredient)); + children.add(new Property("impurity", "Reference(SubstanceDefinition)", "Any component of the drug product which is not the chemical entity defined as the drug substance or an excipient in the drug product. This includes process-related impurities and contaminants, product-related impurities including degradation products.", 0, java.lang.Integer.MAX_VALUE, impurity)); children.add(new Property("attachedDocument", "Reference(DocumentReference)", "Supporting documentation, typically for regulatory submission.", 0, java.lang.Integer.MAX_VALUE, attachedDocument)); children.add(new Property("masterFile", "Reference(DocumentReference)", "A master file for to the medicinal product (e.g. Pharmacovigilance System Master File).", 0, java.lang.Integer.MAX_VALUE, masterFile)); children.add(new Property("contact", "", "A product specific contact, person (in a role), or an organization.", 0, java.lang.Integer.MAX_VALUE, contact)); @@ -3155,17 +3181,18 @@ public class MedicinalProductDefinition extends DomainResource { case 247524032: /*statusDate*/ return new Property("statusDate", "dateTime", "The date at which the given status became applicable.", 0, 1, statusDate); case -1724546052: /*description*/ return new Property("description", "markdown", "General description of this product.", 0, 1, description); case -1992898487: /*combinedPharmaceuticalDoseForm*/ return new Property("combinedPharmaceuticalDoseForm", "CodeableConcept", "The dose form for a single part product, or combined form of a multiple part product.", 0, 1, combinedPharmaceuticalDoseForm); - case -597168804: /*indication*/ return new Property("indication", "markdown", "General combined description of indication(s) for this product. See also MedicinalProductDefinitionIndication.", 0, 1, indication); + case -597168804: /*indication*/ return new Property("indication", "markdown", "General combined description of indication(s) for this product, for use when a structured set is not available. See also the ClinicalUseIssue resource, which can be used for more structured indications, and can be made to reference to this resource.", 0, 1, indication); case -844874031: /*legalStatusOfSupply*/ return new Property("legalStatusOfSupply", "CodeableConcept", "The legal status of supply of the medicinal product as classified by the regulator.", 0, 1, legalStatusOfSupply); case 1935999744: /*additionalMonitoringIndicator*/ return new Property("additionalMonitoringIndicator", "CodeableConcept", "Whether the Medicinal Product is subject to additional monitoring for regulatory reasons.", 0, 1, additionalMonitoringIndicator); case 975102638: /*specialMeasures*/ return new Property("specialMeasures", "CodeableConcept", "Whether the Medicinal Product is subject to special measures for regulatory reasons.", 0, java.lang.Integer.MAX_VALUE, specialMeasures); case -1019867160: /*paediatricUseIndicator*/ return new Property("paediatricUseIndicator", "CodeableConcept", "If authorised for use in children.", 0, 1, paediatricUseIndicator); - case 1247936181: /*productClassification*/ return new Property("productClassification", "CodeableConcept", "Allows the product to be classified by various systems.", 0, java.lang.Integer.MAX_VALUE, productClassification); + case 382350310: /*classification*/ return new Property("classification", "CodeableConcept", "Allows the product to be classified by various systems.", 0, java.lang.Integer.MAX_VALUE, classification); case 366313883: /*characteristic*/ return new Property("characteristic", "CodeableConcept", "Allows the key product features to be recorded, such as \"suger free\", \"modified release\", \"parallel import\".", 0, java.lang.Integer.MAX_VALUE, characteristic); case 70767032: /*marketingStatus*/ return new Property("marketingStatus", "MarketingStatus", "Marketing status of the medicinal product, in contrast to marketing authorizaton.", 0, java.lang.Integer.MAX_VALUE, marketingStatus); case 443273260: /*pharmaceuticalProduct*/ return new Property("pharmaceuticalProduct", "Reference(AdministrableProductDefinition)", "Pharmaceutical aspects of product.", 0, java.lang.Integer.MAX_VALUE, pharmaceuticalProduct); case -361025513: /*packagedMedicinalProduct*/ return new Property("packagedMedicinalProduct", "Reference(PackagedProductDefinition)", "Package representation for the product.", 0, java.lang.Integer.MAX_VALUE, packagedMedicinalProduct); case -206409263: /*ingredient*/ return new Property("ingredient", "Reference(Ingredient)", "The ingredients of this medicinal product - when not specified elsewhere. This is only needed if the ingredients are not specified by the pharmaceuticalProduct or packagedMedicinalProduct references above. In cases where those levels of detail are not used, the ingredients may be specified directly here.", 0, java.lang.Integer.MAX_VALUE, ingredient); + case -416837467: /*impurity*/ return new Property("impurity", "Reference(SubstanceDefinition)", "Any component of the drug product which is not the chemical entity defined as the drug substance or an excipient in the drug product. This includes process-related impurities and contaminants, product-related impurities including degradation products.", 0, java.lang.Integer.MAX_VALUE, impurity); case -513945889: /*attachedDocument*/ return new Property("attachedDocument", "Reference(DocumentReference)", "Supporting documentation, typically for regulatory submission.", 0, java.lang.Integer.MAX_VALUE, attachedDocument); case -2039573762: /*masterFile*/ return new Property("masterFile", "Reference(DocumentReference)", "A master file for to the medicinal product (e.g. Pharmacovigilance System Master File).", 0, java.lang.Integer.MAX_VALUE, masterFile); case 951526432: /*contact*/ return new Property("contact", "", "A product specific contact, person (in a role), or an organization.", 0, java.lang.Integer.MAX_VALUE, contact); @@ -3194,12 +3221,13 @@ public class MedicinalProductDefinition extends DomainResource { case 1935999744: /*additionalMonitoringIndicator*/ return this.additionalMonitoringIndicator == null ? new Base[0] : new Base[] {this.additionalMonitoringIndicator}; // CodeableConcept case 975102638: /*specialMeasures*/ return this.specialMeasures == null ? new Base[0] : this.specialMeasures.toArray(new Base[this.specialMeasures.size()]); // CodeableConcept case -1019867160: /*paediatricUseIndicator*/ return this.paediatricUseIndicator == null ? new Base[0] : new Base[] {this.paediatricUseIndicator}; // CodeableConcept - case 1247936181: /*productClassification*/ return this.productClassification == null ? new Base[0] : this.productClassification.toArray(new Base[this.productClassification.size()]); // CodeableConcept + case 382350310: /*classification*/ return this.classification == null ? new Base[0] : this.classification.toArray(new Base[this.classification.size()]); // CodeableConcept case 366313883: /*characteristic*/ return this.characteristic == null ? new Base[0] : this.characteristic.toArray(new Base[this.characteristic.size()]); // CodeableConcept case 70767032: /*marketingStatus*/ return this.marketingStatus == null ? new Base[0] : this.marketingStatus.toArray(new Base[this.marketingStatus.size()]); // MarketingStatus case 443273260: /*pharmaceuticalProduct*/ return this.pharmaceuticalProduct == null ? new Base[0] : this.pharmaceuticalProduct.toArray(new Base[this.pharmaceuticalProduct.size()]); // Reference case -361025513: /*packagedMedicinalProduct*/ return this.packagedMedicinalProduct == null ? new Base[0] : this.packagedMedicinalProduct.toArray(new Base[this.packagedMedicinalProduct.size()]); // Reference case -206409263: /*ingredient*/ return this.ingredient == null ? new Base[0] : this.ingredient.toArray(new Base[this.ingredient.size()]); // Reference + case -416837467: /*impurity*/ return this.impurity == null ? new Base[0] : this.impurity.toArray(new Base[this.impurity.size()]); // Reference case -513945889: /*attachedDocument*/ return this.attachedDocument == null ? new Base[0] : this.attachedDocument.toArray(new Base[this.attachedDocument.size()]); // Reference case -2039573762: /*masterFile*/ return this.masterFile == null ? new Base[0] : this.masterFile.toArray(new Base[this.masterFile.size()]); // Reference case 951526432: /*contact*/ return this.contact == null ? new Base[0] : this.contact.toArray(new Base[this.contact.size()]); // MedicinalProductDefinitionContactComponent @@ -3254,8 +3282,8 @@ public class MedicinalProductDefinition extends DomainResource { case -1019867160: // paediatricUseIndicator this.paediatricUseIndicator = TypeConvertor.castToCodeableConcept(value); // CodeableConcept return value; - case 1247936181: // productClassification - this.getProductClassification().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept + case 382350310: // classification + this.getClassification().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept return value; case 366313883: // characteristic this.getCharacteristic().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept @@ -3272,6 +3300,9 @@ public class MedicinalProductDefinition extends DomainResource { case -206409263: // ingredient this.getIngredient().add(TypeConvertor.castToReference(value)); // Reference return value; + case -416837467: // impurity + this.getImpurity().add(TypeConvertor.castToReference(value)); // Reference + return value; case -513945889: // attachedDocument this.getAttachedDocument().add(TypeConvertor.castToReference(value)); // Reference return value; @@ -3326,8 +3357,8 @@ public class MedicinalProductDefinition extends DomainResource { this.getSpecialMeasures().add(TypeConvertor.castToCodeableConcept(value)); } else if (name.equals("paediatricUseIndicator")) { this.paediatricUseIndicator = TypeConvertor.castToCodeableConcept(value); // CodeableConcept - } else if (name.equals("productClassification")) { - this.getProductClassification().add(TypeConvertor.castToCodeableConcept(value)); + } else if (name.equals("classification")) { + this.getClassification().add(TypeConvertor.castToCodeableConcept(value)); } else if (name.equals("characteristic")) { this.getCharacteristic().add(TypeConvertor.castToCodeableConcept(value)); } else if (name.equals("marketingStatus")) { @@ -3338,6 +3369,8 @@ public class MedicinalProductDefinition extends DomainResource { this.getPackagedMedicinalProduct().add(TypeConvertor.castToReference(value)); } else if (name.equals("ingredient")) { this.getIngredient().add(TypeConvertor.castToReference(value)); + } else if (name.equals("impurity")) { + this.getImpurity().add(TypeConvertor.castToReference(value)); } else if (name.equals("attachedDocument")) { this.getAttachedDocument().add(TypeConvertor.castToReference(value)); } else if (name.equals("masterFile")) { @@ -3373,12 +3406,13 @@ public class MedicinalProductDefinition extends DomainResource { case 1935999744: return getAdditionalMonitoringIndicator(); case 975102638: return addSpecialMeasures(); case -1019867160: return getPaediatricUseIndicator(); - case 1247936181: return addProductClassification(); + case 382350310: return addClassification(); case 366313883: return addCharacteristic(); case 70767032: return addMarketingStatus(); case 443273260: return addPharmaceuticalProduct(); case -361025513: return addPackagedMedicinalProduct(); case -206409263: return addIngredient(); + case -416837467: return addImpurity(); case -513945889: return addAttachedDocument(); case -2039573762: return addMasterFile(); case 951526432: return addContact(); @@ -3407,12 +3441,13 @@ public class MedicinalProductDefinition extends DomainResource { case 1935999744: /*additionalMonitoringIndicator*/ return new String[] {"CodeableConcept"}; case 975102638: /*specialMeasures*/ return new String[] {"CodeableConcept"}; case -1019867160: /*paediatricUseIndicator*/ return new String[] {"CodeableConcept"}; - case 1247936181: /*productClassification*/ return new String[] {"CodeableConcept"}; + case 382350310: /*classification*/ return new String[] {"CodeableConcept"}; case 366313883: /*characteristic*/ return new String[] {"CodeableConcept"}; case 70767032: /*marketingStatus*/ return new String[] {"MarketingStatus"}; case 443273260: /*pharmaceuticalProduct*/ return new String[] {"Reference"}; case -361025513: /*packagedMedicinalProduct*/ return new String[] {"Reference"}; case -206409263: /*ingredient*/ return new String[] {"Reference"}; + case -416837467: /*impurity*/ return new String[] {"Reference"}; case -513945889: /*attachedDocument*/ return new String[] {"Reference"}; case -2039573762: /*masterFile*/ return new String[] {"Reference"}; case 951526432: /*contact*/ return new String[] {}; @@ -3473,8 +3508,8 @@ public class MedicinalProductDefinition extends DomainResource { this.paediatricUseIndicator = new CodeableConcept(); return this.paediatricUseIndicator; } - else if (name.equals("productClassification")) { - return addProductClassification(); + else if (name.equals("classification")) { + return addClassification(); } else if (name.equals("characteristic")) { return addCharacteristic(); @@ -3491,6 +3526,9 @@ public class MedicinalProductDefinition extends DomainResource { else if (name.equals("ingredient")) { return addIngredient(); } + else if (name.equals("impurity")) { + return addImpurity(); + } else if (name.equals("attachedDocument")) { return addAttachedDocument(); } @@ -3550,10 +3588,10 @@ public class MedicinalProductDefinition extends DomainResource { dst.specialMeasures.add(i.copy()); }; dst.paediatricUseIndicator = paediatricUseIndicator == null ? null : paediatricUseIndicator.copy(); - if (productClassification != null) { - dst.productClassification = new ArrayList(); - for (CodeableConcept i : productClassification) - dst.productClassification.add(i.copy()); + if (classification != null) { + dst.classification = new ArrayList(); + for (CodeableConcept i : classification) + dst.classification.add(i.copy()); }; if (characteristic != null) { dst.characteristic = new ArrayList(); @@ -3580,6 +3618,11 @@ public class MedicinalProductDefinition extends DomainResource { for (Reference i : ingredient) dst.ingredient.add(i.copy()); }; + if (impurity != null) { + dst.impurity = new ArrayList(); + for (Reference i : impurity) + dst.impurity.add(i.copy()); + }; if (attachedDocument != null) { dst.attachedDocument = new ArrayList(); for (Reference i : attachedDocument) @@ -3633,10 +3676,10 @@ public class MedicinalProductDefinition extends DomainResource { && compareDeep(description, o.description, true) && compareDeep(combinedPharmaceuticalDoseForm, o.combinedPharmaceuticalDoseForm, true) && compareDeep(indication, o.indication, true) && compareDeep(legalStatusOfSupply, o.legalStatusOfSupply, true) && compareDeep(additionalMonitoringIndicator, o.additionalMonitoringIndicator, true) && compareDeep(specialMeasures, o.specialMeasures, true) - && compareDeep(paediatricUseIndicator, o.paediatricUseIndicator, true) && compareDeep(productClassification, o.productClassification, true) + && compareDeep(paediatricUseIndicator, o.paediatricUseIndicator, true) && compareDeep(classification, o.classification, true) && compareDeep(characteristic, o.characteristic, true) && compareDeep(marketingStatus, o.marketingStatus, true) && compareDeep(pharmaceuticalProduct, o.pharmaceuticalProduct, true) && compareDeep(packagedMedicinalProduct, o.packagedMedicinalProduct, true) - && compareDeep(ingredient, o.ingredient, true) && compareDeep(attachedDocument, o.attachedDocument, true) + && compareDeep(ingredient, o.ingredient, true) && compareDeep(impurity, o.impurity, true) && compareDeep(attachedDocument, o.attachedDocument, true) && compareDeep(masterFile, o.masterFile, true) && compareDeep(contact, o.contact, true) && compareDeep(clinicalTrial, o.clinicalTrial, true) && compareDeep(name, o.name, true) && compareDeep(crossReference, o.crossReference, true) && compareDeep(manufacturingBusinessOperation, o.manufacturingBusinessOperation, true) ; @@ -3657,9 +3700,9 @@ public class MedicinalProductDefinition extends DomainResource { return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, type, domain , version, status, statusDate, description, combinedPharmaceuticalDoseForm, indication , legalStatusOfSupply, additionalMonitoringIndicator, specialMeasures, paediatricUseIndicator - , productClassification, characteristic, marketingStatus, pharmaceuticalProduct, packagedMedicinalProduct - , ingredient, attachedDocument, masterFile, contact, clinicalTrial, name, crossReference - , manufacturingBusinessOperation); + , classification, characteristic, marketingStatus, pharmaceuticalProduct, packagedMedicinalProduct + , ingredient, impurity, attachedDocument, masterFile, contact, clinicalTrial, name + , crossReference, manufacturingBusinessOperation); } @Override @@ -3753,6 +3796,32 @@ public class MedicinalProductDefinition 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 medicinal product - when not specified elsewhere. This is only needed if the ingredients are not specified by the pharmaceuticalProduct or packagedMedicinalProduct references above. In cases where those levels of detail are not used, the ingredients may be specified directly here
    + * Type: reference
    + * Path: MedicinalProductDefinition.ingredient
    + *

    + */ + @SearchParamDefinition(name="ingredient", path="MedicinalProductDefinition.ingredient", description="The ingredients of this medicinal product - when not specified elsewhere. This is only needed if the ingredients are not specified by the pharmaceuticalProduct or packagedMedicinalProduct references above. In cases where those levels of detail are not used, the ingredients may be specified directly here", type="reference", target={Ingredient.class } ) + public static final String SP_INGREDIENT = "ingredient"; + /** + * Fluent Client search parameter constant for ingredient + *

    + * Description: The ingredients of this medicinal product - when not specified elsewhere. This is only needed if the ingredients are not specified by the pharmaceuticalProduct or packagedMedicinalProduct references above. In cases where those levels of detail are not used, the ingredients may be specified directly here
    + * Type: reference
    + * Path: MedicinalProductDefinition.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 "MedicinalProductDefinition:ingredient". + */ + public static final ca.uhn.fhir.model.api.Include INCLUDE_INGREDIENT = new ca.uhn.fhir.model.api.Include("MedicinalProductDefinition:ingredient").toLocked(); + /** * Search parameter: master-file *

    @@ -3824,17 +3893,17 @@ public class MedicinalProductDefinition extends DomainResource { *

    * Description: Allows the product to be classified by various systems
    * Type: token
    - * Path: MedicinalProductDefinition.productClassification
    + * Path: MedicinalProductDefinition.classification
    *

    */ - @SearchParamDefinition(name="product-classification", path="MedicinalProductDefinition.productClassification", description="Allows the product to be classified by various systems", type="token" ) + @SearchParamDefinition(name="product-classification", path="MedicinalProductDefinition.classification", description="Allows the product to be classified by various systems", type="token" ) public static final String SP_PRODUCT_CLASSIFICATION = "product-classification"; /** * Fluent Client search parameter constant for product-classification *

    * Description: Allows the product to be classified by various systems
    * Type: token
    - * Path: MedicinalProductDefinition.productClassification
    + * Path: MedicinalProductDefinition.classification
    *

    */ public static final ca.uhn.fhir.rest.gclient.TokenClientParam PRODUCT_CLASSIFICATION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_PRODUCT_CLASSIFICATION); @@ -3880,4 +3949,5 @@ public class MedicinalProductDefinition 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/MessageDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MessageDefinition.java index 65a3f511e..7dfca38a6 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MessageDefinition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MessageDefinition.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; /** * Defines the characteristics of a message that can be shared between systems, including the type of event that initiates the message, the content to be transmitted and what response(s), if any, are permitted. @@ -3704,4 +3702,5 @@ public class MessageDefinition 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/MessageHeader.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MessageHeader.java index 4448ab5a9..8a2b54f47 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MessageHeader.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MessageHeader.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 header for a message exchange that is either requesting or responding to an action. The reference(s) that are the subject of the action as well as other information related to the action are typically transmitted in a bundle in which the MessageHeader resource instance is the first resource in the bundle. @@ -2149,7 +2150,7 @@ public class MessageHeader extends DomainResource { * Path: MessageHeader.focus
    *

    */ - @SearchParamDefinition(name="focus", path="MessageHeader.focus", description="The actual content of the message", 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="focus", path="MessageHeader.focus", description="The actual content of the message", 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_FOCUS = "focus"; /** * Fluent Client search parameter constant for focus @@ -2332,4 +2333,5 @@ public class MessageHeader extends DomainResource { public static final ca.uhn.fhir.model.api.Include INCLUDE_TARGET = new ca.uhn.fhir.model.api.Include("MessageHeader:target").toLocked(); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Meta.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Meta.java index b04c4325a..f575c20e4 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Meta.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Meta.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.instance.model.api.IBaseMetaType; 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.IBaseMetaType; /** * Base StructureDefinition for Meta Type: The metadata about a resource. This is content in the resource that is maintained by the infrastructure. Changes to the content might not always be associated with version changes to the resource. */ @@ -618,7 +620,7 @@ public class Meta extends DataType implements IBaseMetaType { } // Manual code (from Configuration.txt)t: - /** +/** * Convenience method which adds a tag * * @param theSystem The code system @@ -656,7 +658,7 @@ public class Meta extends DataType implements IBaseMetaType { } 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/MetadataResource.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MetadataResource.java index ddd1ba874..c1b59ddb3 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MetadataResource.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MetadataResource.java @@ -1,12 +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.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 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. @@ -180,4 +218,5 @@ public abstract class MetadataResource extends CanonicalResource { } -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MolecularSequence.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MolecularSequence.java index 5084f0346..9d639a1d7 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MolecularSequence.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MolecularSequence.java @@ -1,10 +1,6 @@ package org.hl7.fhir.r5.model; - - -import java.math.BigDecimal; - /* Copyright (c) 2011+, HL7, Inc. All rights reserved. @@ -33,20 +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; /** * Raw data describing a biological sequence. @@ -6527,4 +6527,5 @@ public class MolecularSequence extends DomainResource { public static final ca.uhn.fhir.rest.gclient.NumberClientParam WINDOW_START = new ca.uhn.fhir.rest.gclient.NumberClientParam(SP_WINDOW_START); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Money.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Money.java index 8962b5299..eac2a78a1 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Money.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Money.java @@ -1,18 +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 Money Type: An amount of economic utility in some recognized currency. @@ -289,4 +321,5 @@ public class Money 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/MoneyQuantity.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MoneyQuantity.java index b1c553c85..6465b046a 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MoneyQuantity.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MoneyQuantity.java @@ -35,6 +35,8 @@ package org.hl7.fhir.r5.model; // Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.Block; /** * 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. */ diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/NamingSystem.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/NamingSystem.java index 47ee82a70..a7314fd5c 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/NamingSystem.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/NamingSystem.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 curated namespace that issues unique symbols within that namespace for the identification of concepts, people, devices, etc. Represents a "System" used within the Identifier and Coding data types. @@ -2925,4 +2923,5 @@ public class NamingSystem 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/Narrative.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Narrative.java index a39520a51..ed105f493 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Narrative.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Narrative.java @@ -1,18 +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.exceptions.FHIRException; -import org.hl7.fhir.instance.model.api.INarrative; import org.hl7.fhir.utilities.xhtml.NodeType; import org.hl7.fhir.utilities.xhtml.XhtmlNode; - +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.INarrative; /** * Base StructureDefinition for Narrative Type: A human-readable summary of the resource conveying the essential clinical and business information for the resource. */ @@ -374,4 +409,5 @@ public class Narrative extends BaseNarrative implements INarrative { } -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/NutritionIntake.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/NutritionIntake.java index 127d760ea..7bb3e8b32 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/NutritionIntake.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/NutritionIntake.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.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 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 record of food or fluid that is being consumed by a patient. A NutritionIntake may indicate that the patient may be consuming the food or fluid now or has consumed the food or fluid in the past. The source of this information can be the patient, significant other (such as a family member or spouse), or a clinician. A common scenario where this information is captured is during the history taking process during a patient visit or stay or through an app that tracks food or fluids consumed. The consumption information may come from sources such as the patient's memory, from a nutrition label, or from a clinician documenting observed intake. @@ -2748,4 +2747,5 @@ public class NutritionIntake extends DomainResource { public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("NutritionIntake:subject").toLocked(); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/NutritionOrder.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/NutritionOrder.java index a3537babb..b6a27f3e9 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/NutritionOrder.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/NutritionOrder.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.RequestIntent; -import org.hl7.fhir.r5.model.Enumerations.RequestIntentEnumFactory; -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; /** * A request to supply a diet, formula feeding (enteral) or oral nutritional supplement to a patient/resident. @@ -3890,10 +3886,10 @@ public class NutritionOrder 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 @@ -3914,7 +3910,7 @@ public class NutritionOrder 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); @@ -3940,7 +3936,7 @@ public class NutritionOrder 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 @@ -3962,10 +3958,10 @@ public class NutritionOrder 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 @@ -3982,7 +3978,7 @@ public class NutritionOrder 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 @@ -4004,7 +4000,7 @@ public class NutritionOrder 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); @@ -4104,4 +4100,5 @@ public class NutritionOrder extends DomainResource { public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("NutritionOrder:patient").toLocked(); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/NutritionProduct.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/NutritionProduct.java index 3442f48b4..9172e4835 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/NutritionProduct.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/NutritionProduct.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 food or fluid product that is consumed by patients. @@ -168,6 +168,7 @@ public class NutritionProduct extends DomainResource { */ @Child(name = "item", type = {CodeableReference.class}, order=1, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="The (relevant) nutrients in the product", formalDefinition="The (relevant) nutrients in the product." ) + @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/nutrition-product-nutrient") protected CodeableReference item; /** @@ -642,6 +643,7 @@ public class NutritionProduct extends DomainResource { */ @Child(name = "type", type = {CodeableConcept.class}, order=1, min=1, max=1, modifier=false, summary=false) @Description(shortDefinition="Code specifying the type of characteristic", formalDefinition="A code specifying which characteristic of the product is being described (for example, colour, shape)." ) + @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/measurement-property") protected CodeableConcept type; /** @@ -1419,6 +1421,7 @@ public class NutritionProduct extends DomainResource { */ @Child(name = "category", type = {CodeableConcept.class}, order=1, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="A category or class of the nutrition product (halal, kosher, gluten free, vegan, etc)", formalDefinition="Nutrition products can have different classifications - according to its nutritional properties, preparation methods, etc." ) + @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/nutrition-product-category") protected List category; /** @@ -1426,6 +1429,7 @@ public class NutritionProduct extends DomainResource { */ @Child(name = "code", type = {CodeableConcept.class}, order=2, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="A code designating a specific type of nutritional product", formalDefinition="The code assigned to the product, for example a manufacturer number or other terminology." ) + @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/edible-substance-type") protected CodeableConcept code; /** @@ -1450,10 +1454,11 @@ public class NutritionProduct extends DomainResource { protected List ingredient; /** - * Allergens that are known to be a part of this nutrition product. + * Allergens that are known or suspected to be a part of this nutrition product. */ @Child(name = "knownAllergen", type = {CodeableReference.class}, order=6, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Allergens that are known to be a part of this nutrition product", formalDefinition="Allergens that are known to be a part of this nutrition product." ) + @Description(shortDefinition="Known or suspected allergens that are a part of this product", formalDefinition="Allergens that are known or suspected to be a part of this nutrition product." ) + @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/allergen-class") protected List knownAllergen; /** @@ -1776,7 +1781,7 @@ public class NutritionProduct extends DomainResource { } /** - * @return {@link #knownAllergen} (Allergens that are known to be a part of this nutrition product.) + * @return {@link #knownAllergen} (Allergens that are known or suspected to be a part of this nutrition product.) */ public List getKnownAllergen() { if (this.knownAllergen == null) @@ -1966,7 +1971,7 @@ public class NutritionProduct extends DomainResource { children.add(new Property("manufacturer", "Reference(Organization)", "The organisation (manufacturer, representative or legal authorisation holder) that is responsible for the device.", 0, java.lang.Integer.MAX_VALUE, manufacturer)); children.add(new Property("nutrient", "", "The product's nutritional information expressed by the nutrients.", 0, java.lang.Integer.MAX_VALUE, nutrient)); children.add(new Property("ingredient", "", "Ingredients contained in this product.", 0, java.lang.Integer.MAX_VALUE, ingredient)); - children.add(new Property("knownAllergen", "CodeableReference(Substance)", "Allergens that are known to be a part of this nutrition product.", 0, java.lang.Integer.MAX_VALUE, knownAllergen)); + children.add(new Property("knownAllergen", "CodeableReference(Substance)", "Allergens that are known or suspected to be a part of this nutrition product.", 0, java.lang.Integer.MAX_VALUE, knownAllergen)); children.add(new Property("productCharacteristic", "", "Specifies descriptive properties of the nutrition product.", 0, java.lang.Integer.MAX_VALUE, productCharacteristic)); children.add(new Property("instance", "", "Conveys instance-level information about this product item. One or several physical, countable instances or occurrences of the product.", 0, 1, instance)); children.add(new Property("note", "Annotation", "Comments made about the product.", 0, java.lang.Integer.MAX_VALUE, note)); @@ -1981,7 +1986,7 @@ public class NutritionProduct extends DomainResource { case -1969347631: /*manufacturer*/ return new Property("manufacturer", "Reference(Organization)", "The organisation (manufacturer, representative or legal authorisation holder) that is responsible for the device.", 0, java.lang.Integer.MAX_VALUE, manufacturer); case -1671151641: /*nutrient*/ return new Property("nutrient", "", "The product's nutritional information expressed by the nutrients.", 0, java.lang.Integer.MAX_VALUE, nutrient); case -206409263: /*ingredient*/ return new Property("ingredient", "", "Ingredients contained in this product.", 0, java.lang.Integer.MAX_VALUE, ingredient); - case 1093336805: /*knownAllergen*/ return new Property("knownAllergen", "CodeableReference(Substance)", "Allergens that are known to be a part of this nutrition product.", 0, java.lang.Integer.MAX_VALUE, knownAllergen); + case 1093336805: /*knownAllergen*/ return new Property("knownAllergen", "CodeableReference(Substance)", "Allergens that are known or suspected to be a part of this nutrition product.", 0, java.lang.Integer.MAX_VALUE, knownAllergen); case 1231899754: /*productCharacteristic*/ return new Property("productCharacteristic", "", "Specifies descriptive properties of the nutrition product.", 0, java.lang.Integer.MAX_VALUE, productCharacteristic); case 555127957: /*instance*/ return new Property("instance", "", "Conveys instance-level information about this product item. One or several physical, countable instances or occurrences of the product.", 0, 1, instance); case 3387378: /*note*/ return new Property("note", "Annotation", "Comments made about the product.", 0, java.lang.Integer.MAX_VALUE, note); @@ -2280,4 +2285,5 @@ public class NutritionProduct 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/Observation.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Observation.java index 1641e080e..93ae28fca 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Observation.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Observation.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; /** * Measurements and simple assertions made about a patient, device or other subject. @@ -3584,7 +3582,7 @@ public class Observation extends DomainResource { * Path: Observation.focus
    *

    */ - @SearchParamDefinition(name="focus", path="Observation.focus", description="The focus of an observation when the focus is not the patient of record.", 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="focus", path="Observation.focus", description="The focus of an observation when the focus is not the patient of record.", 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_FOCUS = "focus"; /** * Fluent Client search parameter constant for focus @@ -3981,10 +3979,10 @@ public class Observation 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 @@ -4005,7 +4003,7 @@ public class Observation 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); @@ -4031,7 +4029,7 @@ public class Observation 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 @@ -4053,10 +4051,10 @@ public class Observation 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 @@ -4073,7 +4071,7 @@ public class Observation 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 @@ -4095,7 +4093,7 @@ public class Observation 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); @@ -4194,105 +4192,6 @@ public class Observation extends DomainResource { */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("Observation:patient").toLocked(); - /** - * Search parameter: amino-acid-change - *

    - * Description: HGVS Protein Change
    - * Type: string
    - * Path: Observation.extension('http://hl7.org/fhir/StructureDefinition/observation-geneticsAminoAcidChangeName')
    - *

    - */ - @SearchParamDefinition(name="amino-acid-change", path="Observation.extension('http://hl7.org/fhir/StructureDefinition/observation-geneticsAminoAcidChangeName')", description="HGVS Protein Change", type="string" ) - public static final String SP_AMINO_ACID_CHANGE = "amino-acid-change"; - /** - * Fluent Client search parameter constant for amino-acid-change - *

    - * Description: HGVS Protein Change
    - * Type: string
    - * Path: Observation.extension('http://hl7.org/fhir/StructureDefinition/observation-geneticsAminoAcidChangeName')
    - *

    - */ - public static final ca.uhn.fhir.rest.gclient.StringClientParam AMINO_ACID_CHANGE = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_AMINO_ACID_CHANGE); - /** - * Search parameter: dna-variant - *

    - * Description: HGVS DNA variant
    - * Type: string
    - * Path: Observation.extension('http://hl7.org/fhir/StructureDefinition/observation-geneticsDnaVariant')
    - *

    - */ - @SearchParamDefinition(name="dna-variant", path="Observation.extension('http://hl7.org/fhir/StructureDefinition/observation-geneticsDnaVariant')", description="HGVS DNA variant", type="string" ) - public static final String SP_DNA_VARIANT = "dna-variant"; - /** - * Fluent Client search parameter constant for dna-variant - *

    - * Description: HGVS DNA variant
    - * Type: string
    - * Path: Observation.extension('http://hl7.org/fhir/StructureDefinition/observation-geneticsDnaVariant')
    - *

    - */ - public static final ca.uhn.fhir.rest.gclient.StringClientParam DNA_VARIANT = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_DNA_VARIANT); +} - /** - * Search parameter: gene-amino-acid-change - *

    - * Description: HGNC gene symbol and HGVS Protein change
    - * Type: string
    - * Path: Observation.extension('http://hl7.org/fhir/StructureDefinition/observation-geneticsAminoAcidChangeName')
    - *

    - */ - @SearchParamDefinition(name="gene-amino-acid-change", path="Observation.extension('http://hl7.org/fhir/StructureDefinition/observation-geneticsAminoAcidChangeName')", description="HGNC gene symbol and HGVS Protein change", type="string" ) - public static final String SP_GENE_AMINO_ACID_CHANGE = "gene-amino-acid-change"; - /** - * Fluent Client search parameter constant for gene-amino-acid-change - *

    - * Description: HGNC gene symbol and HGVS Protein change
    - * Type: string
    - * Path: Observation.extension('http://hl7.org/fhir/StructureDefinition/observation-geneticsAminoAcidChangeName')
    - *

    - */ - public static final ca.uhn.fhir.rest.gclient.StringClientParam GENE_AMINO_ACID_CHANGE = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_GENE_AMINO_ACID_CHANGE); - - /** - * Search parameter: gene-dnavariant - *

    - * Description: HGNC gene symbol and HGVS DNA Variant
    - * Type: string
    - * Path: Observation.extension('http://hl7.org/fhir/StructureDefinition/observation-geneticsDnaVariant')
    - *

    - */ - @SearchParamDefinition(name="gene-dnavariant", path="Observation.extension('http://hl7.org/fhir/StructureDefinition/observation-geneticsDnaVariant')", description="HGNC gene symbol and HGVS DNA Variant", type="string" ) - public static final String SP_GENE_DNAVARIANT = "gene-dnavariant"; - /** - * Fluent Client search parameter constant for gene-dnavariant - *

    - * Description: HGNC gene symbol and HGVS DNA Variant
    - * Type: string
    - * Path: Observation.extension('http://hl7.org/fhir/StructureDefinition/observation-geneticsDnaVariant')
    - *

    - */ - public static final ca.uhn.fhir.rest.gclient.StringClientParam GENE_DNAVARIANT = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_GENE_DNAVARIANT); - - /** - * Search parameter: gene-identifier - *

    - * Description: HGNC gene symbol and identifier
    - * Type: token
    - * Path: Observation.extension('http://hl7.org/fhir/StructureDefinition/observation-geneticsGene')
    - *

    - */ - @SearchParamDefinition(name="gene-identifier", path="Observation.extension('http://hl7.org/fhir/StructureDefinition/observation-geneticsGene')", description="HGNC gene symbol and identifier", type="token" ) - public static final String SP_GENE_IDENTIFIER = "gene-identifier"; - /** - * Fluent Client search parameter constant for gene-identifier - *

    - * Description: HGNC gene symbol and identifier
    - * Type: token
    - * Path: Observation.extension('http://hl7.org/fhir/StructureDefinition/observation-geneticsGene')
    - *

    - */ - public static final ca.uhn.fhir.rest.gclient.TokenClientParam GENE_IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_GENE_IDENTIFIER); - - -} \ No newline at end of file diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ObservationDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ObservationDefinition.java index c51407a13..f6f5be7a2 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ObservationDefinition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ObservationDefinition.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.AdministrativeGender; -import org.hl7.fhir.r5.model.Enumerations.AdministrativeGenderEnumFactory; -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; /** * Set of definitional characteristics for a kind of observation or measurement produced or consumed by an orderable health care service. @@ -4486,4 +4481,5 @@ public class ObservationDefinition 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/OperationDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/OperationDefinition.java index b3d8e8138..dcbe4e26b 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/OperationDefinition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/OperationDefinition.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.BindingStrength; -import org.hl7.fhir.r5.model.Enumerations.BindingStrengthEnumFactory; -import org.hl7.fhir.r5.model.Enumerations.FHIRAllTypes; -import org.hl7.fhir.r5.model.Enumerations.FHIRAllTypesEnumFactory; -import org.hl7.fhir.r5.model.Enumerations.OperationParameterUse; -import org.hl7.fhir.r5.model.Enumerations.OperationParameterUseEnumFactory; -import org.hl7.fhir.r5.model.Enumerations.PublicationStatus; -import org.hl7.fhir.r5.model.Enumerations.PublicationStatusEnumFactory; -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 formal computable definition of an operation (on the RESTful interface) or a named query (using the search interaction). @@ -4789,4 +4779,5 @@ public class OperationDefinition 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/OperationOutcome.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/OperationOutcome.java index df7fd9aa2..ff7b644ec 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/OperationOutcome.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/OperationOutcome.java @@ -1,8 +1,6 @@ package org.hl7.fhir.r5.model; - - /* Copyright (c) 2011+, HL7, Inc. All rights reserved. @@ -31,20 +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.IBaseOperationOutcome; 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.IBaseOperationOutcome; /** * A collection of error, warning, or information messages that result from a system action. */ @@ -1491,4 +1494,5 @@ For resource issues, this will be a simple XPath limited to element names, repet } -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/OrderedDistribution.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/OrderedDistribution.java index a5fad1f8e..be16597d4 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/OrderedDistribution.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/OrderedDistribution.java @@ -1,8 +1,6 @@ package org.hl7.fhir.r5.model; - - /* Copyright (c) 2011+, HL7, Inc. All rights reserved. @@ -31,20 +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.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 OrderedDistribution Type: An ordered list (distribution) of statistics. @@ -822,4 +821,5 @@ public class OrderedDistribution extends BackboneType implements ICompositeType } -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Organization.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Organization.java index 7278c43c0..d3e5c8c73 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Organization.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Organization.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 formally or informally recognized grouping of people or organizations formed for the purpose of achieving some form of collective action. Includes companies, institutions, corporations, departments, community groups, healthcare practice groups, payer/insurer, etc. @@ -1509,4 +1510,5 @@ public class Organization 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/OrganizationAffiliation.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/OrganizationAffiliation.java index 94c4c015e..fec5c8cf4 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/OrganizationAffiliation.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/OrganizationAffiliation.java @@ -1,8 +1,6 @@ package org.hl7.fhir.r5.model; - - /* Copyright (c) 2011+, HL7, Inc. All rights reserved. @@ -31,17 +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; /** * Defines an affiliation/assotiation/relationship between 2 distinct oganizations, that is not a part-of relationship/sub-division relationship. @@ -1316,4 +1319,5 @@ public class OrganizationAffiliation extends DomainResource { public static final ca.uhn.fhir.rest.gclient.TokenClientParam TELECOM = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TELECOM); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PackagedProductDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PackagedProductDefinition.java index 5ab843e67..468301b13 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PackagedProductDefinition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PackagedProductDefinition.java @@ -1,8 +1,6 @@ package org.hl7.fhir.r5.model; - - /* Copyright (c) 2011+, HL7, Inc. All rights reserved. @@ -31,24 +29,26 @@ 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 medicinal product in a container or package. + * A medically related item or items, in a container or package. */ @ResourceDef(name="PackagedProductDefinition", profile="http://hl7.org/fhir/StructureDefinition/PackagedProductDefinition") public class PackagedProductDefinition extends DomainResource { @@ -274,17 +274,17 @@ public class PackagedProductDefinition extends DomainResource { protected List identifier; /** - * The physical type of the container of the medicine. + * The physical type of the container of the items. */ @Child(name = "type", type = {CodeableConcept.class}, order=2, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="The physical type of the container of the medicine", formalDefinition="The physical type of the container of the medicine." ) + @Description(shortDefinition="The physical type of the container of the items", formalDefinition="The physical type of the container of the items." ) protected CodeableConcept type; /** - * The quantity of this package in the medicinal product, at the current level of packaging. If specified, the outermost level is always 1. + * The quantity of this level of packaging in the package that contains it. If specified, the outermost level is always 1. */ @Child(name = "quantity", type = {IntegerType.class}, order=3, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="The quantity of this package in the medicinal product, at the current level of packaging. If specified, the outermost level is always 1", formalDefinition="The quantity of this package in the medicinal product, at the current level of packaging. If specified, the outermost level is always 1." ) + @Description(shortDefinition="The quantity of this level of packaging in the package that contains it. If specified, the outermost level is always 1", formalDefinition="The quantity of this level of packaging in the package that contains it. If specified, the outermost level is always 1." ) protected IntegerType quantity; /** @@ -309,10 +309,10 @@ public class PackagedProductDefinition extends DomainResource { protected List shelfLifeStorage; /** - * Manufacturer of this Package Item. + * Manufacturer of this package Item. */ @Child(name = "manufacturer", type = {Organization.class}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Manufacturer of this Package Item", formalDefinition="Manufacturer of this Package Item." ) + @Description(shortDefinition="Manufacturer of this package Item", formalDefinition="Manufacturer of this package Item." ) protected List manufacturer; /** @@ -399,7 +399,7 @@ public class PackagedProductDefinition extends DomainResource { } /** - * @return {@link #type} (The physical type of the container of the medicine.) + * @return {@link #type} (The physical type of the container of the items.) */ public CodeableConcept getType() { if (this.type == null) @@ -415,7 +415,7 @@ public class PackagedProductDefinition extends DomainResource { } /** - * @param value {@link #type} (The physical type of the container of the medicine.) + * @param value {@link #type} (The physical type of the container of the items.) */ public PackagedProductDefinitionPackageComponent setType(CodeableConcept value) { this.type = value; @@ -423,7 +423,7 @@ public class PackagedProductDefinition extends DomainResource { } /** - * @return {@link #quantity} (The quantity of this package in the medicinal product, at the current level of packaging. If specified, the outermost level is always 1.). This is the underlying object with id, value and extensions. The accessor "getQuantity" gives direct access to the value + * @return {@link #quantity} (The quantity of this level of packaging in the package that contains it. If specified, the outermost level is always 1.). This is the underlying object with id, value and extensions. The accessor "getQuantity" gives direct access to the value */ public IntegerType getQuantityElement() { if (this.quantity == null) @@ -443,7 +443,7 @@ public class PackagedProductDefinition extends DomainResource { } /** - * @param value {@link #quantity} (The quantity of this package in the medicinal product, at the current level of packaging. If specified, the outermost level is always 1.). This is the underlying object with id, value and extensions. The accessor "getQuantity" gives direct access to the value + * @param value {@link #quantity} (The quantity of this level of packaging in the package that contains it. If specified, the outermost level is always 1.). This is the underlying object with id, value and extensions. The accessor "getQuantity" gives direct access to the value */ public PackagedProductDefinitionPackageComponent setQuantityElement(IntegerType value) { this.quantity = value; @@ -451,14 +451,14 @@ public class PackagedProductDefinition extends DomainResource { } /** - * @return The quantity of this package in the medicinal product, at the current level of packaging. If specified, the outermost level is always 1. + * @return The quantity of this level of packaging in the package that contains it. If specified, the outermost level is always 1. */ public int getQuantity() { return this.quantity == null || this.quantity.isEmpty() ? 0 : this.quantity.getValue(); } /** - * @param value The quantity of this package in the medicinal product, at the current level of packaging. If specified, the outermost level is always 1. + * @param value The quantity of this level of packaging in the package that contains it. If specified, the outermost level is always 1. */ public PackagedProductDefinitionPackageComponent setQuantity(int value) { if (this.quantity == null) @@ -627,7 +627,7 @@ public class PackagedProductDefinition extends DomainResource { } /** - * @return {@link #manufacturer} (Manufacturer of this Package Item.) + * @return {@link #manufacturer} (Manufacturer of this package Item.) */ public List getManufacturer() { if (this.manufacturer == null) @@ -841,12 +841,12 @@ public class PackagedProductDefinition extends DomainResource { protected void listChildren(List children) { super.listChildren(children); children.add(new Property("identifier", "Identifier", "Including possibly Data Carrier Identifier.", 0, java.lang.Integer.MAX_VALUE, identifier)); - children.add(new Property("type", "CodeableConcept", "The physical type of the container of the medicine.", 0, 1, type)); - children.add(new Property("quantity", "integer", "The quantity of this package in the medicinal product, at the current level of packaging. If specified, the outermost level is always 1.", 0, 1, quantity)); + children.add(new Property("type", "CodeableConcept", "The physical type of the container of the items.", 0, 1, type)); + children.add(new Property("quantity", "integer", "The quantity of this level of packaging in the package that contains it. If specified, the outermost level is always 1.", 0, 1, quantity)); children.add(new Property("material", "CodeableConcept", "Material type of the package item.", 0, java.lang.Integer.MAX_VALUE, material)); children.add(new Property("alternateMaterial", "CodeableConcept", "A possible alternate material for the packaging.", 0, java.lang.Integer.MAX_VALUE, alternateMaterial)); children.add(new Property("shelfLifeStorage", "ProductShelfLife", "Shelf Life and storage information.", 0, java.lang.Integer.MAX_VALUE, shelfLifeStorage)); - children.add(new Property("manufacturer", "Reference(Organization)", "Manufacturer of this Package Item.", 0, java.lang.Integer.MAX_VALUE, manufacturer)); + children.add(new Property("manufacturer", "Reference(Organization)", "Manufacturer of this package Item.", 0, java.lang.Integer.MAX_VALUE, manufacturer)); children.add(new Property("property", "", "General characteristics of this item.", 0, java.lang.Integer.MAX_VALUE, property)); children.add(new Property("containedItem", "", "The item(s) within the packaging.", 0, java.lang.Integer.MAX_VALUE, containedItem)); children.add(new Property("package", "@PackagedProductDefinition.package", "Allows containers within containers.", 0, java.lang.Integer.MAX_VALUE, package_)); @@ -856,12 +856,12 @@ public class PackagedProductDefinition extends DomainResource { public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { switch (_hash) { case -1618432855: /*identifier*/ return new Property("identifier", "Identifier", "Including possibly Data Carrier Identifier.", 0, java.lang.Integer.MAX_VALUE, identifier); - case 3575610: /*type*/ return new Property("type", "CodeableConcept", "The physical type of the container of the medicine.", 0, 1, type); - case -1285004149: /*quantity*/ return new Property("quantity", "integer", "The quantity of this package in the medicinal product, at the current level of packaging. If specified, the outermost level is always 1.", 0, 1, quantity); + case 3575610: /*type*/ return new Property("type", "CodeableConcept", "The physical type of the container of the items.", 0, 1, type); + case -1285004149: /*quantity*/ return new Property("quantity", "integer", "The quantity of this level of packaging in the package that contains it. If specified, the outermost level is always 1.", 0, 1, quantity); case 299066663: /*material*/ return new Property("material", "CodeableConcept", "Material type of the package item.", 0, java.lang.Integer.MAX_VALUE, material); case -1021448255: /*alternateMaterial*/ return new Property("alternateMaterial", "CodeableConcept", "A possible alternate material for the packaging.", 0, java.lang.Integer.MAX_VALUE, alternateMaterial); case 172049237: /*shelfLifeStorage*/ return new Property("shelfLifeStorage", "ProductShelfLife", "Shelf Life and storage information.", 0, java.lang.Integer.MAX_VALUE, shelfLifeStorage); - case -1969347631: /*manufacturer*/ return new Property("manufacturer", "Reference(Organization)", "Manufacturer of this Package Item.", 0, java.lang.Integer.MAX_VALUE, manufacturer); + case -1969347631: /*manufacturer*/ return new Property("manufacturer", "Reference(Organization)", "Manufacturer of this package Item.", 0, java.lang.Integer.MAX_VALUE, manufacturer); case -993141291: /*property*/ return new Property("property", "", "General characteristics of this item.", 0, java.lang.Integer.MAX_VALUE, property); case 1953679910: /*containedItem*/ return new Property("containedItem", "", "The item(s) within the packaging.", 0, java.lang.Integer.MAX_VALUE, containedItem); case -807062458: /*package*/ return new Property("package", "@PackagedProductDefinition.package", "Allows containers within containers.", 0, java.lang.Integer.MAX_VALUE, package_); @@ -1422,10 +1422,10 @@ public class PackagedProductDefinition extends DomainResource { @Block() public static class PackagedProductDefinitionPackageContainedItemComponent extends BackboneElement implements IBaseBackboneElement { /** - * The manufactured item or device as contained in the packaged medicinal product. + * The actual item(s) of medication, as manufactured, or a device (typically, but not necessarily, a co-packaged one), or other medically related item (such as food, biologicals, raw materials, medical fluids, gases etc.), as contained in the package. */ - @Child(name = "item", type = {ManufacturedItemDefinition.class, DeviceDefinition.class}, order=1, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="The manufactured item or device as contained in the packaged medicinal product", formalDefinition="The manufactured item or device as contained in the packaged medicinal product." ) + @Child(name = "item", type = {ManufacturedItemDefinition.class, DeviceDefinition.class, BiologicallyDerivedProduct.class, NutritionProduct.class}, order=1, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="The actual item(s) of medication, as manufactured, or a device (typically, but not necessarily, a co-packaged one), or other medically related item (such as food, biologicals, raw materials, medical fluids, gases etc.), as contained in the package", formalDefinition="The actual item(s) of medication, as manufactured, or a device (typically, but not necessarily, a co-packaged one), or other medically related item (such as food, biologicals, raw materials, medical fluids, gases etc.), as contained in the package." ) protected List item; /** @@ -1445,7 +1445,7 @@ public class PackagedProductDefinition extends DomainResource { } /** - * @return {@link #item} (The manufactured item or device as contained in the packaged medicinal product.) + * @return {@link #item} (The actual item(s) of medication, as manufactured, or a device (typically, but not necessarily, a co-packaged one), or other medically related item (such as food, biologicals, raw materials, medical fluids, gases etc.), as contained in the package.) */ public List getItem() { if (this.item == null) @@ -1550,14 +1550,14 @@ public class PackagedProductDefinition extends DomainResource { protected void listChildren(List children) { super.listChildren(children); - children.add(new Property("item", "Reference(ManufacturedItemDefinition|DeviceDefinition)", "The manufactured item or device as contained in the packaged medicinal product.", 0, java.lang.Integer.MAX_VALUE, item)); + children.add(new Property("item", "Reference(ManufacturedItemDefinition|DeviceDefinition|BiologicallyDerivedProduct|NutritionProduct)", "The actual item(s) of medication, as manufactured, or a device (typically, but not necessarily, a co-packaged one), or other medically related item (such as food, biologicals, raw materials, medical fluids, gases etc.), as contained in the package.", 0, java.lang.Integer.MAX_VALUE, item)); children.add(new Property("amount[x]", "Quantity|integer", "The number of this type of item within this packaging.", 0, 1, amount)); } @Override public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { switch (_hash) { - case 3242771: /*item*/ return new Property("item", "Reference(ManufacturedItemDefinition|DeviceDefinition)", "The manufactured item or device as contained in the packaged medicinal product.", 0, java.lang.Integer.MAX_VALUE, item); + case 3242771: /*item*/ return new Property("item", "Reference(ManufacturedItemDefinition|DeviceDefinition|BiologicallyDerivedProduct|NutritionProduct)", "The actual item(s) of medication, as manufactured, or a device (typically, but not necessarily, a co-packaged one), or other medically related item (such as food, biologicals, raw materials, medical fluids, gases etc.), as contained in the package.", 0, java.lang.Integer.MAX_VALUE, item); case 646780200: /*amount[x]*/ return new Property("amount[x]", "Quantity|integer", "The number of this type of item within this packaging.", 0, 1, amount); case -1413853096: /*amount*/ return new Property("amount[x]", "Quantity|integer", "The number of this type of item within this packaging.", 0, 1, amount); case 1664303363: /*amountQuantity*/ return new Property("amount[x]", "Quantity", "The number of this type of item within this packaging.", 0, 1, amount); @@ -1695,98 +1695,105 @@ public class PackagedProductDefinition extends DomainResource { protected List identifier; /** - * A name for this product pack. Typically what it would be listed as in a drug formulary. + * A name for this package. Typically what it would be listed as in a drug formulary or catalogue, inventory etc. */ @Child(name = "name", type = {StringType.class}, order=1, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="A name for this product pack. Typically what it would be listed as in a drug formulary", formalDefinition="A name for this product pack. Typically what it would be listed as in a drug formulary." ) + @Description(shortDefinition="A name for this package. Typically what it would be listed as in a drug formulary or catalogue, inventory etc", formalDefinition="A name for this package. Typically what it would be listed as in a drug formulary or catalogue, inventory etc." ) protected StringType name; + /** + * A high level category e.g. medicinal product, raw material, shipping/transport container, etc. + */ + @Child(name = "type", type = {CodeableConcept.class}, order=2, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="A high level category e.g. medicinal product, raw material, shipping/transport container, etc", formalDefinition="A high level category e.g. medicinal product, raw material, shipping/transport container, etc." ) + protected CodeableConcept type; + /** * The product that this is a pack for. */ - @Child(name = "subject", type = {MedicinalProductDefinition.class}, order=2, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "subject", type = {MedicinalProductDefinition.class}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="The product that this is a pack for", formalDefinition="The product that this is a pack for." ) protected List subject; /** - * The status within the lifecycle of this product. A high level status, this is not intended to duplicate details carried elswhere such as legal status, or authorization or marketing status. + * The status within the lifecycle of this item. A high level status, this is not intended to duplicate details carried elsewhere such as legal status, or authorization or marketing status. */ - @Child(name = "status", type = {CodeableConcept.class}, order=3, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="The status within the lifecycle of this product. A high level status, this is not intended to duplicate details carried elswhere such as legal status, or authorization or marketing status", formalDefinition="The status within the lifecycle of this product. A high level status, this is not intended to duplicate details carried elswhere such as legal status, or authorization or marketing status." ) + @Child(name = "status", type = {CodeableConcept.class}, order=4, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="The status within the lifecycle of this item. A high level status, this is not intended to duplicate details carried elsewhere such as legal status, or authorization or marketing status", formalDefinition="The status within the lifecycle of this item. A high level status, this is not intended to duplicate details carried elsewhere such as legal status, or authorization or marketing status." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/publication-status") protected CodeableConcept status; /** * The date at which the given status became applicable. */ - @Child(name = "statusDate", type = {DateTimeType.class}, order=4, min=0, max=1, modifier=false, summary=true) + @Child(name = "statusDate", type = {DateTimeType.class}, order=5, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="The date at which the given status became applicable", formalDefinition="The date at which the given status became applicable." ) protected DateTimeType statusDate; /** - * Textual description. Note that this is not the name of the product. + * Textual description. Note that this is not the name of the package or product. */ - @Child(name = "description", type = {MarkdownType.class}, order=5, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Textual description. Note that this is not the name of the product", formalDefinition="Textual description. Note that this is not the name of the product." ) + @Child(name = "description", type = {MarkdownType.class}, order=6, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="Textual description. Note that this is not the name of the package or product", formalDefinition="Textual description. Note that this is not the name of the package or product." ) protected MarkdownType description; /** - * The legal status of supply of the medicinal product as classified by the regulator. + * The legal status of supply of the packaged item as classified by the regulator. */ - @Child(name = "legalStatusOfSupply", type = {CodeableConcept.class}, order=6, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="The legal status of supply of the medicinal product as classified by the regulator", formalDefinition="The legal status of supply of the medicinal product as classified by the regulator." ) + @Child(name = "legalStatusOfSupply", type = {CodeableConcept.class}, order=7, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="The legal status of supply of the packaged item as classified by the regulator", formalDefinition="The legal status of supply of the packaged item as classified by the regulator." ) protected CodeableConcept legalStatusOfSupply; /** * Marketing information. */ - @Child(name = "marketingStatus", type = {MarketingStatus.class}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "marketingStatus", type = {MarketingStatus.class}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Marketing information", formalDefinition="Marketing information." ) protected List marketingStatus; /** - * Allows the key product features to be recorded, such as "hospital pack", "nurse prescribable", "calendar pack". + * Allows the key features to be recorded, such as "hospital pack", "nurse prescribable", "calendar pack". */ - @Child(name = "characteristic", type = {CodeableConcept.class}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Allows the key product features to be recorded, such as \"hospital pack\", \"nurse prescribable\", \"calendar pack\"", formalDefinition="Allows the key product features to be recorded, such as \"hospital pack\", \"nurse prescribable\", \"calendar pack\"." ) + @Child(name = "characteristic", type = {CodeableConcept.class}, order=9, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="Allows the key features to be recorded, such as \"hospital pack\", \"nurse prescribable\", \"calendar pack\"", formalDefinition="Allows the key features to be recorded, such as \"hospital pack\", \"nurse prescribable\", \"calendar pack\"." ) protected List characteristic; /** * States whether a drug product is supplied with another item such as a diluent or adjuvant. */ - @Child(name = "copackagedIndicator", type = {BooleanType.class}, order=9, min=0, max=1, modifier=false, summary=true) + @Child(name = "copackagedIndicator", type = {BooleanType.class}, order=10, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="States whether a drug product is supplied with another item such as a diluent or adjuvant", formalDefinition="States whether a drug product is supplied with another item such as a diluent or adjuvant." ) protected BooleanType copackagedIndicator; /** - * Manufacturer of this Package Item. + * An authorization for this package type. */ - @Child(name = "marketingAuthorization", type = {RegulatedAuthorization.class}, order=10, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Manufacturer of this Package Item", formalDefinition="Manufacturer of this Package Item." ) + @Child(name = "marketingAuthorization", type = {RegulatedAuthorization.class}, order=11, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="An authorization for this package type", formalDefinition="An authorization for this package type." ) protected Reference marketingAuthorization; /** - * Manufacturer of this Package Item. + * Manufacturer of this package type. */ - @Child(name = "manufacturer", type = {Organization.class}, order=11, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Manufacturer of this Package Item", formalDefinition="Manufacturer of this Package Item." ) + @Child(name = "manufacturer", type = {Organization.class}, order=12, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="Manufacturer of this package type", formalDefinition="Manufacturer of this package type." ) protected List manufacturer; /** * Batch numbering. */ - @Child(name = "batchIdentifier", type = {}, order=12, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "batchIdentifier", type = {}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Batch numbering", formalDefinition="Batch numbering." ) protected List batchIdentifier; /** - * A packaging item, as a contained for medicine, possibly with other packaging items within. + * A packaging item, as a container for medically related items, possibly with other packaging items within. */ - @Child(name = "package", type = {}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="A packaging item, as a contained for medicine, possibly with other packaging items within", formalDefinition="A packaging item, as a contained for medicine, possibly with other packaging items within." ) + @Child(name = "package", type = {}, order=14, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="A packaging item, as a container for medically related items, possibly with other packaging items within", formalDefinition="A packaging item, as a container for medically related items, possibly with other packaging items within." ) protected List package_; - private static final long serialVersionUID = 1013618678L; + private static final long serialVersionUID = -1301762817L; /** * Constructor @@ -1849,7 +1856,7 @@ public class PackagedProductDefinition extends DomainResource { } /** - * @return {@link #name} (A name for this product pack. Typically what it would be listed as in a drug formulary.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value + * @return {@link #name} (A name for this package. Typically what it would be listed as in a drug formulary or catalogue, inventory etc.). 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) @@ -1869,7 +1876,7 @@ public class PackagedProductDefinition extends DomainResource { } /** - * @param value {@link #name} (A name for this product pack. Typically what it would be listed as in a drug formulary.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value + * @param value {@link #name} (A name for this package. Typically what it would be listed as in a drug formulary or catalogue, inventory etc.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value */ public PackagedProductDefinition setNameElement(StringType value) { this.name = value; @@ -1877,14 +1884,14 @@ public class PackagedProductDefinition extends DomainResource { } /** - * @return A name for this product pack. Typically what it would be listed as in a drug formulary. + * @return A name for this package. Typically what it would be listed as in a drug formulary or catalogue, inventory etc. */ public String getName() { return this.name == null ? null : this.name.getValue(); } /** - * @param value A name for this product pack. Typically what it would be listed as in a drug formulary. + * @param value A name for this package. Typically what it would be listed as in a drug formulary or catalogue, inventory etc. */ public PackagedProductDefinition setName(String value) { if (Utilities.noString(value)) @@ -1897,6 +1904,30 @@ public class PackagedProductDefinition extends DomainResource { return this; } + /** + * @return {@link #type} (A high level category e.g. medicinal product, raw material, shipping/transport container, etc.) + */ + public CodeableConcept getType() { + if (this.type == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create PackagedProductDefinition.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} (A high level category e.g. medicinal product, raw material, shipping/transport container, etc.) + */ + public PackagedProductDefinition setType(CodeableConcept value) { + this.type = value; + return this; + } + /** * @return {@link #subject} (The product that this is a pack for.) */ @@ -1951,7 +1982,7 @@ public class PackagedProductDefinition extends DomainResource { } /** - * @return {@link #status} (The status within the lifecycle of this product. A high level status, this is not intended to duplicate details carried elswhere such as legal status, or authorization or marketing status.) + * @return {@link #status} (The status within the lifecycle of this item. A high level status, this is not intended to duplicate details carried elsewhere such as legal status, or authorization or marketing status.) */ public CodeableConcept getStatus() { if (this.status == null) @@ -1967,7 +1998,7 @@ public class PackagedProductDefinition extends DomainResource { } /** - * @param value {@link #status} (The status within the lifecycle of this product. A high level status, this is not intended to duplicate details carried elswhere such as legal status, or authorization or marketing status.) + * @param value {@link #status} (The status within the lifecycle of this item. A high level status, this is not intended to duplicate details carried elsewhere such as legal status, or authorization or marketing status.) */ public PackagedProductDefinition setStatus(CodeableConcept value) { this.status = value; @@ -2024,7 +2055,7 @@ public class PackagedProductDefinition extends DomainResource { } /** - * @return {@link #description} (Textual description. Note that this is not the name of the product.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value + * @return {@link #description} (Textual description. Note that this is not the name of the package or product.). 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) @@ -2044,7 +2075,7 @@ public class PackagedProductDefinition extends DomainResource { } /** - * @param value {@link #description} (Textual description. Note that this is not the name of the product.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value + * @param value {@link #description} (Textual description. Note that this is not the name of the package or product.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value */ public PackagedProductDefinition setDescriptionElement(MarkdownType value) { this.description = value; @@ -2052,14 +2083,14 @@ public class PackagedProductDefinition extends DomainResource { } /** - * @return Textual description. Note that this is not the name of the product. + * @return Textual description. Note that this is not the name of the package or product. */ public String getDescription() { return this.description == null ? null : this.description.getValue(); } /** - * @param value Textual description. Note that this is not the name of the product. + * @param value Textual description. Note that this is not the name of the package or product. */ public PackagedProductDefinition setDescription(String value) { if (value == null) @@ -2073,7 +2104,7 @@ public class PackagedProductDefinition extends DomainResource { } /** - * @return {@link #legalStatusOfSupply} (The legal status of supply of the medicinal product as classified by the regulator.) + * @return {@link #legalStatusOfSupply} (The legal status of supply of the packaged item as classified by the regulator.) */ public CodeableConcept getLegalStatusOfSupply() { if (this.legalStatusOfSupply == null) @@ -2089,7 +2120,7 @@ public class PackagedProductDefinition extends DomainResource { } /** - * @param value {@link #legalStatusOfSupply} (The legal status of supply of the medicinal product as classified by the regulator.) + * @param value {@link #legalStatusOfSupply} (The legal status of supply of the packaged item as classified by the regulator.) */ public PackagedProductDefinition setLegalStatusOfSupply(CodeableConcept value) { this.legalStatusOfSupply = value; @@ -2150,7 +2181,7 @@ public class PackagedProductDefinition extends DomainResource { } /** - * @return {@link #characteristic} (Allows the key product features to be recorded, such as "hospital pack", "nurse prescribable", "calendar pack".) + * @return {@link #characteristic} (Allows the key features to be recorded, such as "hospital pack", "nurse prescribable", "calendar pack".) */ public List getCharacteristic() { if (this.characteristic == null) @@ -2248,7 +2279,7 @@ public class PackagedProductDefinition extends DomainResource { } /** - * @return {@link #marketingAuthorization} (Manufacturer of this Package Item.) + * @return {@link #marketingAuthorization} (An authorization for this package type.) */ public Reference getMarketingAuthorization() { if (this.marketingAuthorization == null) @@ -2264,7 +2295,7 @@ public class PackagedProductDefinition extends DomainResource { } /** - * @param value {@link #marketingAuthorization} (Manufacturer of this Package Item.) + * @param value {@link #marketingAuthorization} (An authorization for this package type.) */ public PackagedProductDefinition setMarketingAuthorization(Reference value) { this.marketingAuthorization = value; @@ -2272,7 +2303,7 @@ public class PackagedProductDefinition extends DomainResource { } /** - * @return {@link #manufacturer} (Manufacturer of this Package Item.) + * @return {@link #manufacturer} (Manufacturer of this package type.) */ public List getManufacturer() { if (this.manufacturer == null) @@ -2378,7 +2409,7 @@ public class PackagedProductDefinition extends DomainResource { } /** - * @return {@link #package_} (A packaging item, as a contained for medicine, possibly with other packaging items within.) + * @return {@link #package_} (A packaging item, as a container for medically related items, possibly with other packaging items within.) */ public List getPackage() { if (this.package_ == null) @@ -2433,38 +2464,40 @@ public class PackagedProductDefinition extends DomainResource { protected void listChildren(List children) { super.listChildren(children); children.add(new Property("identifier", "Identifier", "Unique identifier.", 0, java.lang.Integer.MAX_VALUE, identifier)); - children.add(new Property("name", "string", "A name for this product pack. Typically what it would be listed as in a drug formulary.", 0, 1, name)); + children.add(new Property("name", "string", "A name for this package. Typically what it would be listed as in a drug formulary or catalogue, inventory etc.", 0, 1, name)); + children.add(new Property("type", "CodeableConcept", "A high level category e.g. medicinal product, raw material, shipping/transport container, etc.", 0, 1, type)); children.add(new Property("subject", "Reference(MedicinalProductDefinition)", "The product that this is a pack for.", 0, java.lang.Integer.MAX_VALUE, subject)); - children.add(new Property("status", "CodeableConcept", "The status within the lifecycle of this product. A high level status, this is not intended to duplicate details carried elswhere such as legal status, or authorization or marketing status.", 0, 1, status)); + children.add(new Property("status", "CodeableConcept", "The status within the lifecycle of this item. A high level status, this is not intended to duplicate details carried elsewhere such as legal status, or authorization or marketing status.", 0, 1, status)); children.add(new Property("statusDate", "dateTime", "The date at which the given status became applicable.", 0, 1, statusDate)); - children.add(new Property("description", "markdown", "Textual description. Note that this is not the name of the product.", 0, 1, description)); - children.add(new Property("legalStatusOfSupply", "CodeableConcept", "The legal status of supply of the medicinal product as classified by the regulator.", 0, 1, legalStatusOfSupply)); + children.add(new Property("description", "markdown", "Textual description. Note that this is not the name of the package or product.", 0, 1, description)); + children.add(new Property("legalStatusOfSupply", "CodeableConcept", "The legal status of supply of the packaged item as classified by the regulator.", 0, 1, legalStatusOfSupply)); children.add(new Property("marketingStatus", "MarketingStatus", "Marketing information.", 0, java.lang.Integer.MAX_VALUE, marketingStatus)); - children.add(new Property("characteristic", "CodeableConcept", "Allows the key product features to be recorded, such as \"hospital pack\", \"nurse prescribable\", \"calendar pack\".", 0, java.lang.Integer.MAX_VALUE, characteristic)); + children.add(new Property("characteristic", "CodeableConcept", "Allows the key features to be recorded, such as \"hospital pack\", \"nurse prescribable\", \"calendar pack\".", 0, java.lang.Integer.MAX_VALUE, characteristic)); children.add(new Property("copackagedIndicator", "boolean", "States whether a drug product is supplied with another item such as a diluent or adjuvant.", 0, 1, copackagedIndicator)); - children.add(new Property("marketingAuthorization", "Reference(RegulatedAuthorization)", "Manufacturer of this Package Item.", 0, 1, marketingAuthorization)); - children.add(new Property("manufacturer", "Reference(Organization)", "Manufacturer of this Package Item.", 0, java.lang.Integer.MAX_VALUE, manufacturer)); + children.add(new Property("marketingAuthorization", "Reference(RegulatedAuthorization)", "An authorization for this package type.", 0, 1, marketingAuthorization)); + children.add(new Property("manufacturer", "Reference(Organization)", "Manufacturer of this package type.", 0, java.lang.Integer.MAX_VALUE, manufacturer)); children.add(new Property("batchIdentifier", "", "Batch numbering.", 0, java.lang.Integer.MAX_VALUE, batchIdentifier)); - children.add(new Property("package", "", "A packaging item, as a contained for medicine, possibly with other packaging items within.", 0, java.lang.Integer.MAX_VALUE, package_)); + children.add(new Property("package", "", "A packaging item, as a container for medically related items, possibly with other packaging items within.", 0, java.lang.Integer.MAX_VALUE, package_)); } @Override public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { switch (_hash) { case -1618432855: /*identifier*/ return new Property("identifier", "Identifier", "Unique identifier.", 0, java.lang.Integer.MAX_VALUE, identifier); - case 3373707: /*name*/ return new Property("name", "string", "A name for this product pack. Typically what it would be listed as in a drug formulary.", 0, 1, name); + case 3373707: /*name*/ return new Property("name", "string", "A name for this package. Typically what it would be listed as in a drug formulary or catalogue, inventory etc.", 0, 1, name); + case 3575610: /*type*/ return new Property("type", "CodeableConcept", "A high level category e.g. medicinal product, raw material, shipping/transport container, etc.", 0, 1, type); case -1867885268: /*subject*/ return new Property("subject", "Reference(MedicinalProductDefinition)", "The product that this is a pack for.", 0, java.lang.Integer.MAX_VALUE, subject); - case -892481550: /*status*/ return new Property("status", "CodeableConcept", "The status within the lifecycle of this product. A high level status, this is not intended to duplicate details carried elswhere such as legal status, or authorization or marketing status.", 0, 1, status); + case -892481550: /*status*/ return new Property("status", "CodeableConcept", "The status within the lifecycle of this item. A high level status, this is not intended to duplicate details carried elsewhere such as legal status, or authorization or marketing status.", 0, 1, status); case 247524032: /*statusDate*/ return new Property("statusDate", "dateTime", "The date at which the given status became applicable.", 0, 1, statusDate); - case -1724546052: /*description*/ return new Property("description", "markdown", "Textual description. Note that this is not the name of the product.", 0, 1, description); - case -844874031: /*legalStatusOfSupply*/ return new Property("legalStatusOfSupply", "CodeableConcept", "The legal status of supply of the medicinal product as classified by the regulator.", 0, 1, legalStatusOfSupply); + case -1724546052: /*description*/ return new Property("description", "markdown", "Textual description. Note that this is not the name of the package or product.", 0, 1, description); + case -844874031: /*legalStatusOfSupply*/ return new Property("legalStatusOfSupply", "CodeableConcept", "The legal status of supply of the packaged item as classified by the regulator.", 0, 1, legalStatusOfSupply); case 70767032: /*marketingStatus*/ return new Property("marketingStatus", "MarketingStatus", "Marketing information.", 0, java.lang.Integer.MAX_VALUE, marketingStatus); - case 366313883: /*characteristic*/ return new Property("characteristic", "CodeableConcept", "Allows the key product features to be recorded, such as \"hospital pack\", \"nurse prescribable\", \"calendar pack\".", 0, java.lang.Integer.MAX_VALUE, characteristic); + case 366313883: /*characteristic*/ return new Property("characteristic", "CodeableConcept", "Allows the key features to be recorded, such as \"hospital pack\", \"nurse prescribable\", \"calendar pack\".", 0, java.lang.Integer.MAX_VALUE, characteristic); case -1638663195: /*copackagedIndicator*/ return new Property("copackagedIndicator", "boolean", "States whether a drug product is supplied with another item such as a diluent or adjuvant.", 0, 1, copackagedIndicator); - case 571831283: /*marketingAuthorization*/ return new Property("marketingAuthorization", "Reference(RegulatedAuthorization)", "Manufacturer of this Package Item.", 0, 1, marketingAuthorization); - case -1969347631: /*manufacturer*/ return new Property("manufacturer", "Reference(Organization)", "Manufacturer of this Package Item.", 0, java.lang.Integer.MAX_VALUE, manufacturer); + case 571831283: /*marketingAuthorization*/ return new Property("marketingAuthorization", "Reference(RegulatedAuthorization)", "An authorization for this package type.", 0, 1, marketingAuthorization); + case -1969347631: /*manufacturer*/ return new Property("manufacturer", "Reference(Organization)", "Manufacturer of this package type.", 0, java.lang.Integer.MAX_VALUE, manufacturer); case -1688395901: /*batchIdentifier*/ return new Property("batchIdentifier", "", "Batch numbering.", 0, java.lang.Integer.MAX_VALUE, batchIdentifier); - case -807062458: /*package*/ return new Property("package", "", "A packaging item, as a contained for medicine, possibly with other packaging items within.", 0, java.lang.Integer.MAX_VALUE, package_); + case -807062458: /*package*/ return new Property("package", "", "A packaging item, as a container for medically related items, possibly with other packaging items within.", 0, java.lang.Integer.MAX_VALUE, package_); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -2475,6 +2508,7 @@ public class PackagedProductDefinition extends DomainResource { switch (hash) { 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 3575610: /*type*/ return this.type == null ? new Base[0] : new Base[] {this.type}; // CodeableConcept case -1867885268: /*subject*/ return this.subject == null ? new Base[0] : this.subject.toArray(new Base[this.subject.size()]); // Reference case -892481550: /*status*/ return this.status == null ? new Base[0] : new Base[] {this.status}; // CodeableConcept case 247524032: /*statusDate*/ return this.statusDate == null ? new Base[0] : new Base[] {this.statusDate}; // DateTimeType @@ -2501,6 +2535,9 @@ public class PackagedProductDefinition extends DomainResource { case 3373707: // name this.name = TypeConvertor.castToString(value); // StringType return value; + case 3575610: // type + this.type = TypeConvertor.castToCodeableConcept(value); // CodeableConcept + return value; case -1867885268: // subject this.getSubject().add(TypeConvertor.castToReference(value)); // Reference return value; @@ -2548,6 +2585,8 @@ public class PackagedProductDefinition extends DomainResource { this.getIdentifier().add(TypeConvertor.castToIdentifier(value)); } else if (name.equals("name")) { this.name = TypeConvertor.castToString(value); // StringType + } else if (name.equals("type")) { + this.type = TypeConvertor.castToCodeableConcept(value); // CodeableConcept } else if (name.equals("subject")) { this.getSubject().add(TypeConvertor.castToReference(value)); } else if (name.equals("status")) { @@ -2582,6 +2621,7 @@ public class PackagedProductDefinition extends DomainResource { switch (hash) { case -1618432855: return addIdentifier(); case 3373707: return getNameElement(); + case 3575610: return getType(); case -1867885268: return addSubject(); case -892481550: return getStatus(); case 247524032: return getStatusDateElement(); @@ -2604,6 +2644,7 @@ public class PackagedProductDefinition extends DomainResource { switch (hash) { case -1618432855: /*identifier*/ return new String[] {"Identifier"}; case 3373707: /*name*/ return new String[] {"string"}; + case 3575610: /*type*/ return new String[] {"CodeableConcept"}; case -1867885268: /*subject*/ return new String[] {"Reference"}; case -892481550: /*status*/ return new String[] {"CodeableConcept"}; case 247524032: /*statusDate*/ return new String[] {"dateTime"}; @@ -2629,6 +2670,10 @@ public class PackagedProductDefinition extends DomainResource { else if (name.equals("name")) { throw new FHIRException("Cannot call addChild on a primitive type PackagedProductDefinition.name"); } + else if (name.equals("type")) { + this.type = new CodeableConcept(); + return this.type; + } else if (name.equals("subject")) { return addSubject(); } @@ -2691,6 +2736,7 @@ public class PackagedProductDefinition extends DomainResource { dst.identifier.add(i.copy()); }; dst.name = name == null ? null : name.copy(); + dst.type = type == null ? null : type.copy(); if (subject != null) { dst.subject = new ArrayList(); for (Reference i : subject) @@ -2740,13 +2786,13 @@ public class PackagedProductDefinition extends DomainResource { if (!(other_ instanceof PackagedProductDefinition)) return false; PackagedProductDefinition o = (PackagedProductDefinition) other_; - return compareDeep(identifier, o.identifier, true) && compareDeep(name, o.name, true) && compareDeep(subject, o.subject, true) - && compareDeep(status, o.status, true) && compareDeep(statusDate, o.statusDate, true) && compareDeep(description, o.description, true) - && compareDeep(legalStatusOfSupply, o.legalStatusOfSupply, true) && compareDeep(marketingStatus, o.marketingStatus, true) - && compareDeep(characteristic, o.characteristic, true) && compareDeep(copackagedIndicator, o.copackagedIndicator, true) - && compareDeep(marketingAuthorization, o.marketingAuthorization, true) && compareDeep(manufacturer, o.manufacturer, true) - && compareDeep(batchIdentifier, o.batchIdentifier, true) && compareDeep(package_, o.package_, true) - ; + return compareDeep(identifier, o.identifier, true) && compareDeep(name, o.name, true) && compareDeep(type, o.type, true) + && compareDeep(subject, o.subject, true) && compareDeep(status, o.status, true) && compareDeep(statusDate, o.statusDate, true) + && compareDeep(description, o.description, true) && compareDeep(legalStatusOfSupply, o.legalStatusOfSupply, true) + && compareDeep(marketingStatus, o.marketingStatus, true) && compareDeep(characteristic, o.characteristic, true) + && compareDeep(copackagedIndicator, o.copackagedIndicator, true) && compareDeep(marketingAuthorization, o.marketingAuthorization, true) + && compareDeep(manufacturer, o.manufacturer, true) && compareDeep(batchIdentifier, o.batchIdentifier, true) + && compareDeep(package_, o.package_, true); } @Override @@ -2761,7 +2807,7 @@ public class PackagedProductDefinition extends DomainResource { } public boolean isEmpty() { - return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, name, subject + return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, name, type, subject , status, statusDate, description, legalStatusOfSupply, marketingStatus, characteristic , copackagedIndicator, marketingAuthorization, manufacturer, batchIdentifier, package_ ); @@ -2773,21 +2819,73 @@ public class PackagedProductDefinition extends DomainResource { } /** - * Search parameter: device + * Search parameter: biological *

    - * Description: A device associated within packaged product
    + * Description: A biologically derived product within this packaged product
    * Type: reference
    - * Path: null
    + * Path: PackagedProductDefinition.package.containedItem.item.where(resolve() is BiologicallyDerivedProduct)
    *

    */ - @SearchParamDefinition(name="device", path="", description="A device associated within packaged product", type="reference", target={DeviceDefinition.class } ) + @SearchParamDefinition(name="biological", path="PackagedProductDefinition.package.containedItem.item.where(resolve() is BiologicallyDerivedProduct)", description="A biologically derived product within this packaged product", type="reference", target={BiologicallyDerivedProduct.class } ) + public static final String SP_BIOLOGICAL = "biological"; + /** + * Fluent Client search parameter constant for biological + *

    + * Description: A biologically derived product within this packaged product
    + * Type: reference
    + * Path: PackagedProductDefinition.package.containedItem.item.where(resolve() is BiologicallyDerivedProduct)
    + *

    + */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam BIOLOGICAL = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_BIOLOGICAL); + +/** + * Constant for fluent queries to be used to add include statements. Specifies + * the path value of "PackagedProductDefinition:biological". + */ + public static final ca.uhn.fhir.model.api.Include INCLUDE_BIOLOGICAL = new ca.uhn.fhir.model.api.Include("PackagedProductDefinition:biological").toLocked(); + + /** + * Search parameter: contained-item + *

    + * Description: Any of the contained items within this packaged product
    + * Type: reference
    + * Path: PackagedProductDefinition.package.containedItem.item
    + *

    + */ + @SearchParamDefinition(name="contained-item", path="PackagedProductDefinition.package.containedItem.item", description="Any of the contained items within this packaged product", type="reference", target={BiologicallyDerivedProduct.class, DeviceDefinition.class, ManufacturedItemDefinition.class, NutritionProduct.class } ) + public static final String SP_CONTAINED_ITEM = "contained-item"; + /** + * Fluent Client search parameter constant for contained-item + *

    + * Description: Any of the contained items within this packaged product
    + * Type: reference
    + * Path: PackagedProductDefinition.package.containedItem.item
    + *

    + */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam CONTAINED_ITEM = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_CONTAINED_ITEM); + +/** + * Constant for fluent queries to be used to add include statements. Specifies + * the path value of "PackagedProductDefinition:contained-item". + */ + public static final ca.uhn.fhir.model.api.Include INCLUDE_CONTAINED_ITEM = new ca.uhn.fhir.model.api.Include("PackagedProductDefinition:contained-item").toLocked(); + + /** + * Search parameter: device + *

    + * Description: A device within this packaged product
    + * Type: reference
    + * Path: PackagedProductDefinition.package.containedItem.item.where(resolve() is DeviceDefinition)
    + *

    + */ + @SearchParamDefinition(name="device", path="PackagedProductDefinition.package.containedItem.item.where(resolve() is DeviceDefinition)", description="A device within this packaged product", type="reference", target={DeviceDefinition.class } ) public static final String SP_DEVICE = "device"; /** * Fluent Client search parameter constant for device *

    - * Description: A device associated within packaged product
    + * Description: A device within this packaged product
    * Type: reference
    - * Path: null
    + * Path: PackagedProductDefinition.package.containedItem.item.where(resolve() is DeviceDefinition)
    *

    */ public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam DEVICE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_DEVICE); @@ -2823,17 +2921,17 @@ public class PackagedProductDefinition extends DomainResource { *

    * Description: A manufactured item of medication within this packaged product
    * Type: reference
    - * Path: null
    + * Path: PackagedProductDefinition.package.containedItem.item.where(resolve() is ManufacturedItemDefinition)
    *

    */ - @SearchParamDefinition(name="manufactured-item", path="", description="A manufactured item of medication within this packaged product", type="reference", target={ManufacturedItemDefinition.class } ) + @SearchParamDefinition(name="manufactured-item", path="PackagedProductDefinition.package.containedItem.item.where(resolve() is ManufacturedItemDefinition)", description="A manufactured item of medication within this packaged product", type="reference", target={ManufacturedItemDefinition.class } ) public static final String SP_MANUFACTURED_ITEM = "manufactured-item"; /** * Fluent Client search parameter constant for manufactured-item *

    * Description: A manufactured item of medication within this packaged product
    * Type: reference
    - * Path: null
    + * Path: PackagedProductDefinition.package.containedItem.item.where(resolve() is ManufacturedItemDefinition)
    *

    */ public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam MANUFACTURED_ITEM = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_MANUFACTURED_ITEM); @@ -2844,40 +2942,92 @@ public class PackagedProductDefinition extends DomainResource { */ public static final ca.uhn.fhir.model.api.Include INCLUDE_MANUFACTURED_ITEM = new ca.uhn.fhir.model.api.Include("PackagedProductDefinition:manufactured-item").toLocked(); + /** + * Search parameter: medication + *

    + * Description: A manufactured item of medication within this packaged product
    + * Type: reference
    + * Path: PackagedProductDefinition.package.containedItem.item.where(resolve() is ManufacturedItemDefinition)
    + *

    + */ + @SearchParamDefinition(name="medication", path="PackagedProductDefinition.package.containedItem.item.where(resolve() is ManufacturedItemDefinition)", description="A manufactured item of medication within this packaged product", type="reference", target={ManufacturedItemDefinition.class } ) + public static final String SP_MEDICATION = "medication"; + /** + * Fluent Client search parameter constant for medication + *

    + * Description: A manufactured item of medication within this packaged product
    + * Type: reference
    + * Path: PackagedProductDefinition.package.containedItem.item.where(resolve() is ManufacturedItemDefinition)
    + *

    + */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam MEDICATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_MEDICATION); + +/** + * Constant for fluent queries to be used to add include statements. Specifies + * the path value of "PackagedProductDefinition:medication". + */ + public static final ca.uhn.fhir.model.api.Include INCLUDE_MEDICATION = new ca.uhn.fhir.model.api.Include("PackagedProductDefinition:medication").toLocked(); + /** * Search parameter: name *

    - * Description: A name for this product pack. Typically what it would be listed as in a drug formulary
    + * Description: A name for this package. Typically what it would be listed as in a drug formulary or catalogue, inventory etc
    * Type: token
    * Path: PackagedProductDefinition.name
    *

    */ - @SearchParamDefinition(name="name", path="PackagedProductDefinition.name", description="A name for this product pack. Typically what it would be listed as in a drug formulary", type="token" ) + @SearchParamDefinition(name="name", path="PackagedProductDefinition.name", description="A name for this package. Typically what it would be listed as in a drug formulary or catalogue, inventory etc", type="token" ) public static final String SP_NAME = "name"; /** * Fluent Client search parameter constant for name *

    - * Description: A name for this product pack. Typically what it would be listed as in a drug formulary
    + * Description: A name for this package. Typically what it would be listed as in a drug formulary or catalogue, inventory etc
    * Type: token
    * Path: PackagedProductDefinition.name
    *

    */ public static final ca.uhn.fhir.rest.gclient.TokenClientParam NAME = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_NAME); + /** + * Search parameter: nutrition + *

    + * Description: A nutrition product within this packaged product
    + * Type: reference
    + * Path: PackagedProductDefinition.package.containedItem.item.where(resolve() is NutritionProduct)
    + *

    + */ + @SearchParamDefinition(name="nutrition", path="PackagedProductDefinition.package.containedItem.item.where(resolve() is NutritionProduct)", description="A nutrition product within this packaged product", type="reference", target={NutritionProduct.class } ) + public static final String SP_NUTRITION = "nutrition"; + /** + * Fluent Client search parameter constant for nutrition + *

    + * Description: A nutrition product within this packaged product
    + * Type: reference
    + * Path: PackagedProductDefinition.package.containedItem.item.where(resolve() is NutritionProduct)
    + *

    + */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam NUTRITION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_NUTRITION); + +/** + * Constant for fluent queries to be used to add include statements. Specifies + * the path value of "PackagedProductDefinition:nutrition". + */ + public static final ca.uhn.fhir.model.api.Include INCLUDE_NUTRITION = new ca.uhn.fhir.model.api.Include("PackagedProductDefinition:nutrition").toLocked(); + /** * Search parameter: status *

    - * Description: The status within the lifecycle of this product. A high level status, this is not intended to duplicate details carried elswhere such as legal status, or authorization or marketing status
    + * Description: The status within the lifecycle of this item. A high level status, this is not intended to duplicate details carried elsewhere such as legal status, or authorization or marketing status
    * Type: token
    * Path: PackagedProductDefinition.status
    *

    */ - @SearchParamDefinition(name="status", path="PackagedProductDefinition.status", description="The status within the lifecycle of this product. A high level status, this is not intended to duplicate details carried elswhere such as legal status, or authorization or marketing status", type="token" ) + @SearchParamDefinition(name="status", path="PackagedProductDefinition.status", description="The status within the lifecycle of this item. A high level status, this is not intended to duplicate details carried elsewhere such as legal status, or authorization or marketing status", type="token" ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status *

    - * Description: The status within the lifecycle of this product. A high level status, this is not intended to duplicate details carried elswhere such as legal status, or authorization or marketing status
    + * Description: The status within the lifecycle of this item. A high level status, this is not intended to duplicate details carried elsewhere such as legal status, or authorization or marketing status
    * Type: token
    * Path: PackagedProductDefinition.status
    *

    @@ -2911,4 +3061,5 @@ public class PackagedProductDefinition extends DomainResource { public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("PackagedProductDefinition:subject").toLocked(); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ParameterDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ParameterDefinition.java index 532d897c8..35d8cce2c 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ParameterDefinition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ParameterDefinition.java @@ -1,21 +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.r5.model.Enumerations.FHIRAllTypes; -import org.hl7.fhir.r5.model.Enumerations.FHIRAllTypesEnumFactory; -import org.hl7.fhir.r5.model.Enumerations.OperationParameterUse; -import org.hl7.fhir.r5.model.Enumerations.OperationParameterUseEnumFactory; -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 ParameterDefinition Type: The parameters to the module. This collection specifies both the input and output parameters. Input parameters are provided by the caller as part of the $evaluate operation. Output parameters are included in the GuidanceResponse. @@ -631,4 +659,5 @@ public class ParameterDefinition 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/Parameters.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Parameters.java index 5bea920a7..c2159b2aa 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Parameters.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Parameters.java @@ -1,8 +1,6 @@ package org.hl7.fhir.r5.model; - - /* Copyright (c) 2011+, HL7, Inc. All rights reserved. @@ -31,20 +29,26 @@ 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.instance.model.api.IBaseParameters; -import org.hl7.fhir.utilities.CommaSeparatedStringBuilder; - -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; + +import org.hl7.fhir.instance.model.api.IBaseParameters; +import org.hl7.fhir.utilities.CommaSeparatedStringBuilder; /** * This resource is a non-persisted resource used to pass information into and back from an [operation](operations.html). It has no other use, and there is no RESTful endpoint associated with it. */ @@ -61,17 +65,17 @@ public class Parameters extends Resource implements IBaseParameters { protected StringType name; /** - * If the parameter is a data type. + * Conveys the content if the parameter is a data type. */ @Child(name = "value", type = {Base64BinaryType.class, BooleanType.class, CanonicalType.class, CodeType.class, DateType.class, DateTimeType.class, DecimalType.class, IdType.class, InstantType.class, IntegerType.class, Integer64Type.class, MarkdownType.class, OidType.class, PositiveIntType.class, StringType.class, TimeType.class, UnsignedIntType.class, UriType.class, UrlType.class, UuidType.class, Address.class, Age.class, Annotation.class, Attachment.class, CodeableConcept.class, Coding.class, ContactPoint.class, Count.class, Distance.class, Duration.class, HumanName.class, Identifier.class, Money.class, Period.class, Quantity.class, Range.class, Ratio.class, Reference.class, SampledData.class, Signature.class, Timing.class, ContactDetail.class, Contributor.class, DataRequirement.class, Expression.class, ParameterDefinition.class, RelatedArtifact.class, TriggerDefinition.class, UsageContext.class, Dosage.class, Meta.class}, order=2, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="If parameter is a data type", formalDefinition="If the parameter is a data type." ) + @Description(shortDefinition="If parameter is a data type", formalDefinition="Conveys the content if the parameter is a data type." ) protected DataType value; /** - * If the parameter is a whole resource. + * Conveys the content if the parameter is a whole resource. */ @Child(name = "resource", type = {Resource.class}, order=3, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="If parameter is a whole resource", formalDefinition="If the parameter is a whole resource." ) + @Description(shortDefinition="If parameter is a whole resource", formalDefinition="Conveys the content if the parameter is a whole resource." ) protected Resource resource; /** @@ -144,14 +148,14 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public DataType getValue() { return this.value; } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public Base64BinaryType getValueBase64BinaryType() throws FHIRException { if (this.value == null) @@ -166,7 +170,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public BooleanType getValueBooleanType() throws FHIRException { if (this.value == null) @@ -181,7 +185,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public CanonicalType getValueCanonicalType() throws FHIRException { if (this.value == null) @@ -196,7 +200,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public CodeType getValueCodeType() throws FHIRException { if (this.value == null) @@ -211,7 +215,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public DateType getValueDateType() throws FHIRException { if (this.value == null) @@ -226,7 +230,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public DateTimeType getValueDateTimeType() throws FHIRException { if (this.value == null) @@ -241,7 +245,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public DecimalType getValueDecimalType() throws FHIRException { if (this.value == null) @@ -256,7 +260,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public IdType getValueIdType() throws FHIRException { if (this.value == null) @@ -271,7 +275,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public InstantType getValueInstantType() throws FHIRException { if (this.value == null) @@ -286,7 +290,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public IntegerType getValueIntegerType() throws FHIRException { if (this.value == null) @@ -301,7 +305,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public Integer64Type getValueInteger64Type() throws FHIRException { if (this.value == null) @@ -316,7 +320,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public MarkdownType getValueMarkdownType() throws FHIRException { if (this.value == null) @@ -331,7 +335,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public OidType getValueOidType() throws FHIRException { if (this.value == null) @@ -346,7 +350,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public PositiveIntType getValuePositiveIntType() throws FHIRException { if (this.value == null) @@ -361,7 +365,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public StringType getValueStringType() throws FHIRException { if (this.value == null) @@ -376,7 +380,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public TimeType getValueTimeType() throws FHIRException { if (this.value == null) @@ -391,7 +395,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public UnsignedIntType getValueUnsignedIntType() throws FHIRException { if (this.value == null) @@ -406,7 +410,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public UriType getValueUriType() throws FHIRException { if (this.value == null) @@ -421,7 +425,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public UrlType getValueUrlType() throws FHIRException { if (this.value == null) @@ -436,7 +440,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public UuidType getValueUuidType() throws FHIRException { if (this.value == null) @@ -451,7 +455,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public Address getValueAddress() throws FHIRException { if (this.value == null) @@ -466,7 +470,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public Age getValueAge() throws FHIRException { if (this.value == null) @@ -481,7 +485,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public Annotation getValueAnnotation() throws FHIRException { if (this.value == null) @@ -496,7 +500,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public Attachment getValueAttachment() throws FHIRException { if (this.value == null) @@ -511,7 +515,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public CodeableConcept getValueCodeableConcept() throws FHIRException { if (this.value == null) @@ -526,7 +530,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public Coding getValueCoding() throws FHIRException { if (this.value == null) @@ -541,7 +545,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public ContactPoint getValueContactPoint() throws FHIRException { if (this.value == null) @@ -556,7 +560,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public Count getValueCount() throws FHIRException { if (this.value == null) @@ -571,7 +575,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public Distance getValueDistance() throws FHIRException { if (this.value == null) @@ -586,7 +590,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public Duration getValueDuration() throws FHIRException { if (this.value == null) @@ -601,7 +605,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public HumanName getValueHumanName() throws FHIRException { if (this.value == null) @@ -616,7 +620,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public Identifier getValueIdentifier() throws FHIRException { if (this.value == null) @@ -631,7 +635,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public Money getValueMoney() throws FHIRException { if (this.value == null) @@ -646,7 +650,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public Period getValuePeriod() throws FHIRException { if (this.value == null) @@ -661,7 +665,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public Quantity getValueQuantity() throws FHIRException { if (this.value == null) @@ -676,7 +680,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public Range getValueRange() throws FHIRException { if (this.value == null) @@ -691,7 +695,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public Ratio getValueRatio() throws FHIRException { if (this.value == null) @@ -706,7 +710,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public Reference getValueReference() throws FHIRException { if (this.value == null) @@ -721,7 +725,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public SampledData getValueSampledData() throws FHIRException { if (this.value == null) @@ -736,7 +740,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public Signature getValueSignature() throws FHIRException { if (this.value == null) @@ -751,7 +755,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public Timing getValueTiming() throws FHIRException { if (this.value == null) @@ -766,7 +770,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public ContactDetail getValueContactDetail() throws FHIRException { if (this.value == null) @@ -781,7 +785,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public Contributor getValueContributor() throws FHIRException { if (this.value == null) @@ -796,7 +800,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public DataRequirement getValueDataRequirement() throws FHIRException { if (this.value == null) @@ -811,7 +815,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public Expression getValueExpression() throws FHIRException { if (this.value == null) @@ -826,7 +830,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public ParameterDefinition getValueParameterDefinition() throws FHIRException { if (this.value == null) @@ -841,7 +845,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public RelatedArtifact getValueRelatedArtifact() throws FHIRException { if (this.value == null) @@ -856,7 +860,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public TriggerDefinition getValueTriggerDefinition() throws FHIRException { if (this.value == null) @@ -871,7 +875,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public UsageContext getValueUsageContext() throws FHIRException { if (this.value == null) @@ -886,7 +890,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public Dosage getValueDosage() throws FHIRException { if (this.value == null) @@ -901,7 +905,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #value} (If the parameter is a data type.) + * @return {@link #value} (Conveys the content if the parameter is a data type.) */ public Meta getValueMeta() throws FHIRException { if (this.value == null) @@ -920,7 +924,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @param value {@link #value} (If the parameter is a data type.) + * @param value {@link #value} (Conveys the content if the parameter is a data type.) */ public ParametersParameterComponent setValue(DataType value) { if (value != null && !(value instanceof Base64BinaryType || value instanceof BooleanType || value instanceof CanonicalType || value instanceof CodeType || value instanceof DateType || value instanceof DateTimeType || value instanceof DecimalType || value instanceof IdType || value instanceof InstantType || value instanceof IntegerType || value instanceof Integer64Type || value instanceof MarkdownType || value instanceof OidType || value instanceof PositiveIntType || value instanceof StringType || value instanceof TimeType || value instanceof UnsignedIntType || value instanceof UriType || value instanceof UrlType || value instanceof UuidType || value instanceof Address || value instanceof Age || value instanceof Annotation || value instanceof Attachment || value instanceof CodeableConcept || value instanceof Coding || value instanceof ContactPoint || value instanceof Count || value instanceof Distance || value instanceof Duration || value instanceof HumanName || value instanceof Identifier || value instanceof Money || value instanceof Period || value instanceof Quantity || value instanceof Range || value instanceof Ratio || value instanceof Reference || value instanceof SampledData || value instanceof Signature || value instanceof Timing || value instanceof ContactDetail || value instanceof Contributor || value instanceof DataRequirement || value instanceof Expression || value instanceof ParameterDefinition || value instanceof RelatedArtifact || value instanceof TriggerDefinition || value instanceof UsageContext || value instanceof Dosage || value instanceof Meta)) @@ -930,7 +934,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @return {@link #resource} (If the parameter is a whole resource.) + * @return {@link #resource} (Conveys the content if the parameter is a whole resource.) */ public Resource getResource() { return this.resource; @@ -941,7 +945,7 @@ public class Parameters extends Resource implements IBaseParameters { } /** - * @param value {@link #resource} (If the parameter is a whole resource.) + * @param value {@link #resource} (Conveys the content if the parameter is a whole resource.) */ public ParametersParameterComponent setResource(Resource value) { this.resource = value; @@ -1004,8 +1008,8 @@ public class Parameters extends Resource implements IBaseParameters { protected void listChildren(List children) { super.listChildren(children); children.add(new Property("name", "string", "The name of the parameter (reference to the operation definition).", 0, 1, name)); - children.add(new Property("value[x]", "base64Binary|boolean|canonical|code|date|dateTime|decimal|id|instant|integer|integer64|markdown|oid|positiveInt|string|time|unsignedInt|uri|url|uuid|Address|Age|Annotation|Attachment|CodeableConcept|Coding|ContactPoint|Count|Distance|Duration|HumanName|Identifier|Money|Period|Quantity|Range|Ratio|Reference|SampledData|Signature|Timing|ContactDetail|Contributor|DataRequirement|Expression|ParameterDefinition|RelatedArtifact|TriggerDefinition|UsageContext|Dosage|Meta", "If the parameter is a data type.", 0, 1, value)); - children.add(new Property("resource", "Resource", "If the parameter is a whole resource.", 0, 1, resource)); + children.add(new Property("value[x]", "base64Binary|boolean|canonical|code|date|dateTime|decimal|id|instant|integer|integer64|markdown|oid|positiveInt|string|time|unsignedInt|uri|url|uuid|Address|Age|Annotation|Attachment|CodeableConcept|Coding|ContactPoint|Count|Distance|Duration|HumanName|Identifier|Money|Period|Quantity|Range|Ratio|Reference|SampledData|Signature|Timing|ContactDetail|Contributor|DataRequirement|Expression|ParameterDefinition|RelatedArtifact|TriggerDefinition|UsageContext|Dosage|Meta", "Conveys the content if the parameter is a data type.", 0, 1, value)); + children.add(new Property("resource", "Resource", "Conveys the content if the parameter is a whole resource.", 0, 1, resource)); children.add(new Property("part", "@Parameters.parameter", "A named part of a multi-part parameter.", 0, java.lang.Integer.MAX_VALUE, part)); } @@ -1013,60 +1017,60 @@ public class Parameters extends Resource implements IBaseParameters { public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { switch (_hash) { case 3373707: /*name*/ return new Property("name", "string", "The name of the parameter (reference to the operation definition).", 0, 1, name); - case -1410166417: /*value[x]*/ return new Property("value[x]", "base64Binary|boolean|canonical|code|date|dateTime|decimal|id|instant|integer|integer64|markdown|oid|positiveInt|string|time|unsignedInt|uri|url|uuid|Address|Age|Annotation|Attachment|CodeableConcept|Coding|ContactPoint|Count|Distance|Duration|HumanName|Identifier|Money|Period|Quantity|Range|Ratio|Reference|SampledData|Signature|Timing|ContactDetail|Contributor|DataRequirement|Expression|ParameterDefinition|RelatedArtifact|TriggerDefinition|UsageContext|Dosage|Meta", "If the parameter is a data type.", 0, 1, value); - case 111972721: /*value*/ return new Property("value[x]", "base64Binary|boolean|canonical|code|date|dateTime|decimal|id|instant|integer|integer64|markdown|oid|positiveInt|string|time|unsignedInt|uri|url|uuid|Address|Age|Annotation|Attachment|CodeableConcept|Coding|ContactPoint|Count|Distance|Duration|HumanName|Identifier|Money|Period|Quantity|Range|Ratio|Reference|SampledData|Signature|Timing|ContactDetail|Contributor|DataRequirement|Expression|ParameterDefinition|RelatedArtifact|TriggerDefinition|UsageContext|Dosage|Meta", "If the parameter is a data type.", 0, 1, value); - case -1535024575: /*valueBase64Binary*/ return new Property("value[x]", "base64Binary", "If the parameter is a data type.", 0, 1, value); - case 733421943: /*valueBoolean*/ return new Property("value[x]", "boolean", "If the parameter is a data type.", 0, 1, value); - case -786218365: /*valueCanonical*/ return new Property("value[x]", "canonical", "If the parameter is a data type.", 0, 1, value); - case -766209282: /*valueCode*/ return new Property("value[x]", "code", "If the parameter is a data type.", 0, 1, value); - case -766192449: /*valueDate*/ return new Property("value[x]", "date", "If the parameter is a data type.", 0, 1, value); - case 1047929900: /*valueDateTime*/ return new Property("value[x]", "dateTime", "If the parameter is a data type.", 0, 1, value); - case -2083993440: /*valueDecimal*/ return new Property("value[x]", "decimal", "If the parameter is a data type.", 0, 1, value); - case 231604844: /*valueId*/ return new Property("value[x]", "id", "If the parameter is a data type.", 0, 1, value); - case -1668687056: /*valueInstant*/ return new Property("value[x]", "instant", "If the parameter is a data type.", 0, 1, value); - case -1668204915: /*valueInteger*/ return new Property("value[x]", "integer", "If the parameter is a data type.", 0, 1, value); - case -1122120181: /*valueInteger64*/ return new Property("value[x]", "integer64", "If the parameter is a data type.", 0, 1, value); - case -497880704: /*valueMarkdown*/ return new Property("value[x]", "markdown", "If the parameter is a data type.", 0, 1, value); - case -1410178407: /*valueOid*/ return new Property("value[x]", "oid", "If the parameter is a data type.", 0, 1, value); - case -1249932027: /*valuePositiveInt*/ return new Property("value[x]", "positiveInt", "If the parameter is a data type.", 0, 1, value); - case -1424603934: /*valueString*/ return new Property("value[x]", "string", "If the parameter is a data type.", 0, 1, value); - case -765708322: /*valueTime*/ return new Property("value[x]", "time", "If the parameter is a data type.", 0, 1, value); - case 26529417: /*valueUnsignedInt*/ return new Property("value[x]", "unsignedInt", "If the parameter is a data type.", 0, 1, value); - case -1410172357: /*valueUri*/ return new Property("value[x]", "uri", "If the parameter is a data type.", 0, 1, value); - case -1410172354: /*valueUrl*/ return new Property("value[x]", "url", "If the parameter is a data type.", 0, 1, value); - case -765667124: /*valueUuid*/ return new Property("value[x]", "uuid", "If the parameter is a data type.", 0, 1, value); - case -478981821: /*valueAddress*/ return new Property("value[x]", "Address", "If the parameter is a data type.", 0, 1, value); - case -1410191922: /*valueAge*/ return new Property("value[x]", "Age", "If the parameter is a data type.", 0, 1, value); - case -67108992: /*valueAnnotation*/ return new Property("value[x]", "Annotation", "If the parameter is a data type.", 0, 1, value); - case -475566732: /*valueAttachment*/ return new Property("value[x]", "Attachment", "If the parameter is a data type.", 0, 1, value); - case 924902896: /*valueCodeableConcept*/ return new Property("value[x]", "CodeableConcept", "If the parameter is a data type.", 0, 1, value); - case -1887705029: /*valueCoding*/ return new Property("value[x]", "Coding", "If the parameter is a data type.", 0, 1, value); - case 944904545: /*valueContactPoint*/ return new Property("value[x]", "ContactPoint", "If the parameter is a data type.", 0, 1, value); - case 2017332766: /*valueCount*/ return new Property("value[x]", "Count", "If the parameter is a data type.", 0, 1, value); - case -456359802: /*valueDistance*/ return new Property("value[x]", "Distance", "If the parameter is a data type.", 0, 1, value); - case 1558135333: /*valueDuration*/ return new Property("value[x]", "Duration", "If the parameter is a data type.", 0, 1, value); - case -2026205465: /*valueHumanName*/ return new Property("value[x]", "HumanName", "If the parameter is a data type.", 0, 1, value); - case -130498310: /*valueIdentifier*/ return new Property("value[x]", "Identifier", "If the parameter is a data type.", 0, 1, value); - case 2026560975: /*valueMoney*/ return new Property("value[x]", "Money", "If the parameter is a data type.", 0, 1, value); - case -1524344174: /*valuePeriod*/ return new Property("value[x]", "Period", "If the parameter is a data type.", 0, 1, value); - case -2029823716: /*valueQuantity*/ return new Property("value[x]", "Quantity", "If the parameter is a data type.", 0, 1, value); - case 2030761548: /*valueRange*/ return new Property("value[x]", "Range", "If the parameter is a data type.", 0, 1, value); - case 2030767386: /*valueRatio*/ return new Property("value[x]", "Ratio", "If the parameter is a data type.", 0, 1, value); - case 1755241690: /*valueReference*/ return new Property("value[x]", "Reference", "If the parameter is a data type.", 0, 1, value); - case -962229101: /*valueSampledData*/ return new Property("value[x]", "SampledData", "If the parameter is a data type.", 0, 1, value); - case -540985785: /*valueSignature*/ return new Property("value[x]", "Signature", "If the parameter is a data type.", 0, 1, value); - case -1406282469: /*valueTiming*/ return new Property("value[x]", "Timing", "If the parameter is a data type.", 0, 1, value); - case -1125200224: /*valueContactDetail*/ return new Property("value[x]", "ContactDetail", "If the parameter is a data type.", 0, 1, value); - case 1281021610: /*valueContributor*/ return new Property("value[x]", "Contributor", "If the parameter is a data type.", 0, 1, value); - case 1710554248: /*valueDataRequirement*/ return new Property("value[x]", "DataRequirement", "If the parameter is a data type.", 0, 1, value); - case -307517719: /*valueExpression*/ return new Property("value[x]", "Expression", "If the parameter is a data type.", 0, 1, value); - case 1387478187: /*valueParameterDefinition*/ return new Property("value[x]", "ParameterDefinition", "If the parameter is a data type.", 0, 1, value); - case 1748214124: /*valueRelatedArtifact*/ return new Property("value[x]", "RelatedArtifact", "If the parameter is a data type.", 0, 1, value); - case 976830394: /*valueTriggerDefinition*/ return new Property("value[x]", "TriggerDefinition", "If the parameter is a data type.", 0, 1, value); - case 588000479: /*valueUsageContext*/ return new Property("value[x]", "UsageContext", "If the parameter is a data type.", 0, 1, value); - case -1858636920: /*valueDosage*/ return new Property("value[x]", "Dosage", "If the parameter is a data type.", 0, 1, value); - case -765920490: /*valueMeta*/ return new Property("value[x]", "Meta", "If the parameter is a data type.", 0, 1, value); - case -341064690: /*resource*/ return new Property("resource", "Resource", "If the parameter is a whole resource.", 0, 1, resource); + case -1410166417: /*value[x]*/ return new Property("value[x]", "base64Binary|boolean|canonical|code|date|dateTime|decimal|id|instant|integer|integer64|markdown|oid|positiveInt|string|time|unsignedInt|uri|url|uuid|Address|Age|Annotation|Attachment|CodeableConcept|Coding|ContactPoint|Count|Distance|Duration|HumanName|Identifier|Money|Period|Quantity|Range|Ratio|Reference|SampledData|Signature|Timing|ContactDetail|Contributor|DataRequirement|Expression|ParameterDefinition|RelatedArtifact|TriggerDefinition|UsageContext|Dosage|Meta", "Conveys the content if the parameter is a data type.", 0, 1, value); + case 111972721: /*value*/ return new Property("value[x]", "base64Binary|boolean|canonical|code|date|dateTime|decimal|id|instant|integer|integer64|markdown|oid|positiveInt|string|time|unsignedInt|uri|url|uuid|Address|Age|Annotation|Attachment|CodeableConcept|Coding|ContactPoint|Count|Distance|Duration|HumanName|Identifier|Money|Period|Quantity|Range|Ratio|Reference|SampledData|Signature|Timing|ContactDetail|Contributor|DataRequirement|Expression|ParameterDefinition|RelatedArtifact|TriggerDefinition|UsageContext|Dosage|Meta", "Conveys the content if the parameter is a data type.", 0, 1, value); + case -1535024575: /*valueBase64Binary*/ return new Property("value[x]", "base64Binary", "Conveys the content if the parameter is a data type.", 0, 1, value); + case 733421943: /*valueBoolean*/ return new Property("value[x]", "boolean", "Conveys the content if the parameter is a data type.", 0, 1, value); + case -786218365: /*valueCanonical*/ return new Property("value[x]", "canonical", "Conveys the content if the parameter is a data type.", 0, 1, value); + case -766209282: /*valueCode*/ return new Property("value[x]", "code", "Conveys the content if the parameter is a data type.", 0, 1, value); + case -766192449: /*valueDate*/ return new Property("value[x]", "date", "Conveys the content if the parameter is a data type.", 0, 1, value); + case 1047929900: /*valueDateTime*/ return new Property("value[x]", "dateTime", "Conveys the content if the parameter is a data type.", 0, 1, value); + case -2083993440: /*valueDecimal*/ return new Property("value[x]", "decimal", "Conveys the content if the parameter is a data type.", 0, 1, value); + case 231604844: /*valueId*/ return new Property("value[x]", "id", "Conveys the content if the parameter is a data type.", 0, 1, value); + case -1668687056: /*valueInstant*/ return new Property("value[x]", "instant", "Conveys the content if the parameter is a data type.", 0, 1, value); + case -1668204915: /*valueInteger*/ return new Property("value[x]", "integer", "Conveys the content if the parameter is a data type.", 0, 1, value); + case -1122120181: /*valueInteger64*/ return new Property("value[x]", "integer64", "Conveys the content if the parameter is a data type.", 0, 1, value); + case -497880704: /*valueMarkdown*/ return new Property("value[x]", "markdown", "Conveys the content if the parameter is a data type.", 0, 1, value); + case -1410178407: /*valueOid*/ return new Property("value[x]", "oid", "Conveys the content if the parameter is a data type.", 0, 1, value); + case -1249932027: /*valuePositiveInt*/ return new Property("value[x]", "positiveInt", "Conveys the content if the parameter is a data type.", 0, 1, value); + case -1424603934: /*valueString*/ return new Property("value[x]", "string", "Conveys the content if the parameter is a data type.", 0, 1, value); + case -765708322: /*valueTime*/ return new Property("value[x]", "time", "Conveys the content if the parameter is a data type.", 0, 1, value); + case 26529417: /*valueUnsignedInt*/ return new Property("value[x]", "unsignedInt", "Conveys the content if the parameter is a data type.", 0, 1, value); + case -1410172357: /*valueUri*/ return new Property("value[x]", "uri", "Conveys the content if the parameter is a data type.", 0, 1, value); + case -1410172354: /*valueUrl*/ return new Property("value[x]", "url", "Conveys the content if the parameter is a data type.", 0, 1, value); + case -765667124: /*valueUuid*/ return new Property("value[x]", "uuid", "Conveys the content if the parameter is a data type.", 0, 1, value); + case -478981821: /*valueAddress*/ return new Property("value[x]", "Address", "Conveys the content if the parameter is a data type.", 0, 1, value); + case -1410191922: /*valueAge*/ return new Property("value[x]", "Age", "Conveys the content if the parameter is a data type.", 0, 1, value); + case -67108992: /*valueAnnotation*/ return new Property("value[x]", "Annotation", "Conveys the content if the parameter is a data type.", 0, 1, value); + case -475566732: /*valueAttachment*/ return new Property("value[x]", "Attachment", "Conveys the content if the parameter is a data type.", 0, 1, value); + case 924902896: /*valueCodeableConcept*/ return new Property("value[x]", "CodeableConcept", "Conveys the content if the parameter is a data type.", 0, 1, value); + case -1887705029: /*valueCoding*/ return new Property("value[x]", "Coding", "Conveys the content if the parameter is a data type.", 0, 1, value); + case 944904545: /*valueContactPoint*/ return new Property("value[x]", "ContactPoint", "Conveys the content if the parameter is a data type.", 0, 1, value); + case 2017332766: /*valueCount*/ return new Property("value[x]", "Count", "Conveys the content if the parameter is a data type.", 0, 1, value); + case -456359802: /*valueDistance*/ return new Property("value[x]", "Distance", "Conveys the content if the parameter is a data type.", 0, 1, value); + case 1558135333: /*valueDuration*/ return new Property("value[x]", "Duration", "Conveys the content if the parameter is a data type.", 0, 1, value); + case -2026205465: /*valueHumanName*/ return new Property("value[x]", "HumanName", "Conveys the content if the parameter is a data type.", 0, 1, value); + case -130498310: /*valueIdentifier*/ return new Property("value[x]", "Identifier", "Conveys the content if the parameter is a data type.", 0, 1, value); + case 2026560975: /*valueMoney*/ return new Property("value[x]", "Money", "Conveys the content if the parameter is a data type.", 0, 1, value); + case -1524344174: /*valuePeriod*/ return new Property("value[x]", "Period", "Conveys the content if the parameter is a data type.", 0, 1, value); + case -2029823716: /*valueQuantity*/ return new Property("value[x]", "Quantity", "Conveys the content if the parameter is a data type.", 0, 1, value); + case 2030761548: /*valueRange*/ return new Property("value[x]", "Range", "Conveys the content if the parameter is a data type.", 0, 1, value); + case 2030767386: /*valueRatio*/ return new Property("value[x]", "Ratio", "Conveys the content if the parameter is a data type.", 0, 1, value); + case 1755241690: /*valueReference*/ return new Property("value[x]", "Reference", "Conveys the content if the parameter is a data type.", 0, 1, value); + case -962229101: /*valueSampledData*/ return new Property("value[x]", "SampledData", "Conveys the content if the parameter is a data type.", 0, 1, value); + case -540985785: /*valueSignature*/ return new Property("value[x]", "Signature", "Conveys the content if the parameter is a data type.", 0, 1, value); + case -1406282469: /*valueTiming*/ return new Property("value[x]", "Timing", "Conveys the content if the parameter is a data type.", 0, 1, value); + case -1125200224: /*valueContactDetail*/ return new Property("value[x]", "ContactDetail", "Conveys the content if the parameter is a data type.", 0, 1, value); + case 1281021610: /*valueContributor*/ return new Property("value[x]", "Contributor", "Conveys the content if the parameter is a data type.", 0, 1, value); + case 1710554248: /*valueDataRequirement*/ return new Property("value[x]", "DataRequirement", "Conveys the content if the parameter is a data type.", 0, 1, value); + case -307517719: /*valueExpression*/ return new Property("value[x]", "Expression", "Conveys the content if the parameter is a data type.", 0, 1, value); + case 1387478187: /*valueParameterDefinition*/ return new Property("value[x]", "ParameterDefinition", "Conveys the content if the parameter is a data type.", 0, 1, value); + case 1748214124: /*valueRelatedArtifact*/ return new Property("value[x]", "RelatedArtifact", "Conveys the content if the parameter is a data type.", 0, 1, value); + case 976830394: /*valueTriggerDefinition*/ return new Property("value[x]", "TriggerDefinition", "Conveys the content if the parameter is a data type.", 0, 1, value); + case 588000479: /*valueUsageContext*/ return new Property("value[x]", "UsageContext", "Conveys the content if the parameter is a data type.", 0, 1, value); + case -1858636920: /*valueDosage*/ return new Property("value[x]", "Dosage", "Conveys the content if the parameter is a data type.", 0, 1, value); + case -765920490: /*valueMeta*/ return new Property("value[x]", "Meta", "Conveys the content if the parameter is a data type.", 0, 1, value); + case -341064690: /*resource*/ return new Property("resource", "Resource", "Conveys the content if the parameter is a whole resource.", 0, 1, resource); case 3433459: /*part*/ return new Property("part", "@Parameters.parameter", "A named part of a multi-part parameter.", 0, java.lang.Integer.MAX_VALUE, part); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -1414,7 +1418,7 @@ public class Parameters extends Resource implements IBaseParameters { } // added from java-adornments.txt: - public String toString() { +public String toString() { String s = getName() + " = "; if (hasValue()) { if (getValue().isPrimitive()) { @@ -1433,7 +1437,6 @@ public class Parameters extends Resource implements IBaseParameters { } return s; } - // end addition } @@ -1630,8 +1633,7 @@ public class Parameters extends Resource implements IBaseParameters { } // Manual code (from Configuration.txt)t: - - public Parameters addParameter(String name, boolean b) { +public Parameters addParameter(String name, boolean b) { addParameter().setName(name).setValue(new BooleanType(b)); return this; } @@ -1722,7 +1724,7 @@ public class Parameters extends Resource implements IBaseParameters { } return false; } - // end addition -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Patient.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Patient.java index 6dc520f6f..1e72fa441 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Patient.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Patient.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.utilities.Utilities; +import org.hl7.fhir.r5.model.Enumerations.*; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.r5.model.Enumerations.AdministrativeGender; -import org.hl7.fhir.r5.model.Enumerations.AdministrativeGenderEnumFactory; - -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; /** * Demographics and other administrative information about an individual or animal receiving care or other health-related services. @@ -3211,4 +3210,5 @@ Deceased patients may also be marked as inactive for the same reasons, but may b public static final ca.uhn.fhir.rest.gclient.StringClientParam MOTHERSMAIDENNAME = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_MOTHERSMAIDENNAME); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PaymentNotice.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PaymentNotice.java index 78695a26d..5edabaa83 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PaymentNotice.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PaymentNotice.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.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.FinancialResourceStatusCodes; -import org.hl7.fhir.r5.model.Enumerations.FinancialResourceStatusCodesEnumFactory; - -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; /** * This resource provides the status of the payment for goods and services rendered, and the request and response resource references. @@ -931,7 +932,7 @@ public class PaymentNotice extends DomainResource { * Path: PaymentNotice.request
    *

    */ - @SearchParamDefinition(name="request", path="PaymentNotice.request", description="The Claim", 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="request", path="PaymentNotice.request", description="The Claim", 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_REQUEST = "request"; /** * Fluent Client search parameter constant for request @@ -957,7 +958,7 @@ public class PaymentNotice extends DomainResource { * Path: PaymentNotice.response
    *

    */ - @SearchParamDefinition(name="response", path="PaymentNotice.response", description="The ClaimResponse", 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="response", path="PaymentNotice.response", description="The ClaimResponse", 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_RESPONSE = "response"; /** * Fluent Client search parameter constant for response @@ -996,4 +997,5 @@ public class PaymentNotice 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/PaymentReconciliation.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PaymentReconciliation.java index 8f866fcc8..e80a8f384 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PaymentReconciliation.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PaymentReconciliation.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.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.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 details including amount of a payment and allocates the payment items being paid. @@ -2131,4 +2125,5 @@ public class PaymentReconciliation 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/Period.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Period.java index f0e86479d..cfcda5ec7 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Period.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Period.java @@ -1,18 +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.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.TemporalPrecisionEnum; 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 ca.uhn.fhir.model.api.TemporalPrecisionEnum; /** * Base StructureDefinition for Period Type: A time period defined by a start and end date and optionally time. */ @@ -269,7 +301,7 @@ public class Period extends DataType implements ICompositeType { } // Manual code (from Configuration.txt)t: - /** +/** * Sets the value for start () * *

    @@ -293,9 +325,8 @@ public class Period extends DataType implements ICompositeType { public Period setEnd( Date theDate, TemporalPrecisionEnum thePrecision) { end = new DateTimeType(theDate, thePrecision); return this; - } - - + } // end addition -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Permission.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Permission.java index f1b6f59cc..af1f118e7 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Permission.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Permission.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; /** * Permission. @@ -1589,4 +1590,5 @@ public class Permission 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/Person.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Person.java index a93399b1b..3a9be47ee 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Person.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Person.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.utilities.Utilities; +import org.hl7.fhir.r5.model.Enumerations.*; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.r5.model.Enumerations.AdministrativeGender; -import org.hl7.fhir.r5.model.Enumerations.AdministrativeGenderEnumFactory; - -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; /** * Demographics and administrative information about a person independent of a specific health-related context. @@ -1783,4 +1782,5 @@ public class Person extends DomainResource { public static final ca.uhn.fhir.rest.gclient.TokenClientParam TELECOM = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TELECOM); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PlanDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PlanDefinition.java index 7481f5181..2062bcb45 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PlanDefinition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PlanDefinition.java @@ -1,8 +1,6 @@ package org.hl7.fhir.r5.model; - - /* Copyright (c) 2011+, HL7, Inc. All rights reserved. @@ -31,41 +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.ActionCardinalityBehavior; -import org.hl7.fhir.r5.model.Enumerations.ActionCardinalityBehaviorEnumFactory; -import org.hl7.fhir.r5.model.Enumerations.ActionConditionKind; -import org.hl7.fhir.r5.model.Enumerations.ActionConditionKindEnumFactory; -import org.hl7.fhir.r5.model.Enumerations.ActionGroupingBehavior; -import org.hl7.fhir.r5.model.Enumerations.ActionGroupingBehaviorEnumFactory; -import org.hl7.fhir.r5.model.Enumerations.ActionParticipantType; -import org.hl7.fhir.r5.model.Enumerations.ActionParticipantTypeEnumFactory; -import org.hl7.fhir.r5.model.Enumerations.ActionPrecheckBehavior; -import org.hl7.fhir.r5.model.Enumerations.ActionPrecheckBehaviorEnumFactory; -import org.hl7.fhir.r5.model.Enumerations.ActionRelationshipType; -import org.hl7.fhir.r5.model.Enumerations.ActionRelationshipTypeEnumFactory; -import org.hl7.fhir.r5.model.Enumerations.ActionRequiredBehavior; -import org.hl7.fhir.r5.model.Enumerations.ActionRequiredBehaviorEnumFactory; -import org.hl7.fhir.r5.model.Enumerations.ActionSelectionBehavior; -import org.hl7.fhir.r5.model.Enumerations.ActionSelectionBehaviorEnumFactory; -import org.hl7.fhir.r5.model.Enumerations.PublicationStatus; -import org.hl7.fhir.r5.model.Enumerations.PublicationStatusEnumFactory; -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 various types of plans as a sharable, consumable, and executable artifact. The resource is general enough to support the description of a broad range of clinical artifacts such as clinical decision support rules, order sets and protocols. @@ -3735,7 +3715,7 @@ public class PlanDefinition 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", 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; @@ -6573,7 +6553,7 @@ public class PlanDefinition extends MetadataResource { * Path: PlanDefinition.relatedArtifact.where(type='composed-of').resource
    *

    */ - @SearchParamDefinition(name="composed-of", path="PlanDefinition.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="PlanDefinition.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 @@ -6745,7 +6725,7 @@ public class PlanDefinition extends MetadataResource { * Path: PlanDefinition.relatedArtifact.where(type='depends-on').resource | PlanDefinition.library
    *

    */ - @SearchParamDefinition(name="depends-on", path="PlanDefinition.relatedArtifact.where(type='depends-on').resource | PlanDefinition.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="PlanDefinition.relatedArtifact.where(type='depends-on').resource | PlanDefinition.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 @@ -6771,7 +6751,7 @@ public class PlanDefinition extends MetadataResource { * Path: PlanDefinition.relatedArtifact.where(type='derived-from').resource
    *

    */ - @SearchParamDefinition(name="derived-from", path="PlanDefinition.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="PlanDefinition.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 @@ -6897,7 +6877,7 @@ public class PlanDefinition extends MetadataResource { * Path: PlanDefinition.relatedArtifact.where(type='predecessor').resource
    *

    */ - @SearchParamDefinition(name="predecessor", path="PlanDefinition.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="PlanDefinition.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 @@ -6963,7 +6943,7 @@ public class PlanDefinition extends MetadataResource { * Path: PlanDefinition.relatedArtifact.where(type='successor').resource
    *

    */ - @SearchParamDefinition(name="successor", path="PlanDefinition.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="PlanDefinition.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 @@ -7082,4 +7062,5 @@ public class PlanDefinition 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/Population.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Population.java index a9f004d8a..1090b97c0 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Population.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Population.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 Population Type: A populatioof people with some set of grouping criteria. @@ -349,4 +381,5 @@ public class Population extends BackboneType implements ICompositeType { } -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Practitioner.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Practitioner.java index 120688051..8625894cd 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Practitioner.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Practitioner.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.utilities.Utilities; +import org.hl7.fhir.r5.model.Enumerations.*; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.r5.model.Enumerations.AdministrativeGender; -import org.hl7.fhir.r5.model.Enumerations.AdministrativeGenderEnumFactory; - -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 person who is directly or indirectly involved in the provisioning of healthcare. @@ -68,7 +67,7 @@ public class Practitioner extends DomainResource { */ @Child(name = "code", type = {CodeableConcept.class}, order=2, min=1, max=1, modifier=false, summary=false) @Description(shortDefinition="Coded representation of the qualification", formalDefinition="Coded representation of the qualification." ) - @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://terminology.hl7.org/ValueSet/v2-2.7-0360") + @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://terminology.hl7.org/ValueSet/v2-0360") protected CodeableConcept code; /** @@ -1760,4 +1759,5 @@ public class Practitioner extends DomainResource { public static final ca.uhn.fhir.rest.gclient.TokenClientParam TELECOM = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TELECOM); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PractitionerRole.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PractitionerRole.java index 7a1ede124..846ab3341 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PractitionerRole.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PractitionerRole.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.DaysOfWeek; -import org.hl7.fhir.r5.model.Enumerations.DaysOfWeekEnumFactory; 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 specific set of Roles/Locations/specialties/services that a practitioner may perform at an organization for a period of time. @@ -57,18 +56,18 @@ public class PractitionerRole extends DomainResource { @Block() public static class PractitionerRoleAvailableTimeComponent extends BackboneElement implements IBaseBackboneElement { /** - * Indicates which days of the week are available between the start and end Times. + * Indicates which days of the week are available between the start and end times. */ @Child(name = "daysOfWeek", type = {CodeType.class}, order=1, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="mon | tue | wed | thu | fri | sat | sun", formalDefinition="Indicates which days of the week are available between the start and end Times." ) + @Description(shortDefinition="mon | tue | wed | thu | fri | sat | sun", formalDefinition="Indicates which days of the week are available between the start and end times." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/days-of-week") protected List> daysOfWeek; /** - * Is this always available? (hence times are irrelevant) e.g. 24 hour service. + * Indicates always available, hence times are irrelevant. (e.g. 24-hour service). */ @Child(name = "allDay", type = {BooleanType.class}, order=2, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Always available? e.g. 24 hour service", formalDefinition="Is this always available? (hence times are irrelevant) e.g. 24 hour service." ) + @Description(shortDefinition="Always available? e.g. 24 hour service", formalDefinition="Indicates always available, hence times are irrelevant. (e.g. 24-hour service)." ) protected BooleanType allDay; /** @@ -95,7 +94,7 @@ public class PractitionerRole extends DomainResource { } /** - * @return {@link #daysOfWeek} (Indicates which days of the week are available between the start and end Times.) + * @return {@link #daysOfWeek} (Indicates which days of the week are available between the start and end times.) */ public List> getDaysOfWeek() { if (this.daysOfWeek == null) @@ -121,7 +120,7 @@ public class PractitionerRole extends DomainResource { } /** - * @return {@link #daysOfWeek} (Indicates which days of the week are available between the start and end Times.) + * @return {@link #daysOfWeek} (Indicates which days of the week are available between the start and end times.) */ public Enumeration addDaysOfWeekElement() {//2 Enumeration t = new Enumeration(new DaysOfWeekEnumFactory()); @@ -132,7 +131,7 @@ public class PractitionerRole extends DomainResource { } /** - * @param value {@link #daysOfWeek} (Indicates which days of the week are available between the start and end Times.) + * @param value {@link #daysOfWeek} (Indicates which days of the week are available between the start and end times.) */ public PractitionerRoleAvailableTimeComponent addDaysOfWeek(DaysOfWeek value) { //1 Enumeration t = new Enumeration(new DaysOfWeekEnumFactory()); @@ -144,7 +143,7 @@ public class PractitionerRole extends DomainResource { } /** - * @param value {@link #daysOfWeek} (Indicates which days of the week are available between the start and end Times.) + * @param value {@link #daysOfWeek} (Indicates which days of the week are available between the start and end times.) */ public boolean hasDaysOfWeek(DaysOfWeek value) { if (this.daysOfWeek == null) @@ -156,7 +155,7 @@ public class PractitionerRole extends DomainResource { } /** - * @return {@link #allDay} (Is this always available? (hence times are irrelevant) e.g. 24 hour service.). This is the underlying object with id, value and extensions. The accessor "getAllDay" gives direct access to the value + * @return {@link #allDay} (Indicates always available, hence times are irrelevant. (e.g. 24-hour service).). This is the underlying object with id, value and extensions. The accessor "getAllDay" gives direct access to the value */ public BooleanType getAllDayElement() { if (this.allDay == null) @@ -176,7 +175,7 @@ public class PractitionerRole extends DomainResource { } /** - * @param value {@link #allDay} (Is this always available? (hence times are irrelevant) e.g. 24 hour service.). This is the underlying object with id, value and extensions. The accessor "getAllDay" gives direct access to the value + * @param value {@link #allDay} (Indicates always available, hence times are irrelevant. (e.g. 24-hour service).). This is the underlying object with id, value and extensions. The accessor "getAllDay" gives direct access to the value */ public PractitionerRoleAvailableTimeComponent setAllDayElement(BooleanType value) { this.allDay = value; @@ -184,14 +183,14 @@ public class PractitionerRole extends DomainResource { } /** - * @return Is this always available? (hence times are irrelevant) e.g. 24 hour service. + * @return Indicates always available, hence times are irrelevant. (e.g. 24-hour service). */ public boolean getAllDay() { return this.allDay == null || this.allDay.isEmpty() ? false : this.allDay.getValue(); } /** - * @param value Is this always available? (hence times are irrelevant) e.g. 24 hour service. + * @param value Indicates always available, hence times are irrelevant. (e.g. 24-hour service). */ public PractitionerRoleAvailableTimeComponent setAllDay(boolean value) { if (this.allDay == null) @@ -300,8 +299,8 @@ public class PractitionerRole extends DomainResource { protected void listChildren(List children) { super.listChildren(children); - children.add(new Property("daysOfWeek", "code", "Indicates which days of the week are available between the start and end Times.", 0, java.lang.Integer.MAX_VALUE, daysOfWeek)); - children.add(new Property("allDay", "boolean", "Is this always available? (hence times are irrelevant) e.g. 24 hour service.", 0, 1, allDay)); + children.add(new Property("daysOfWeek", "code", "Indicates which days of the week are available between the start and end times.", 0, java.lang.Integer.MAX_VALUE, daysOfWeek)); + children.add(new Property("allDay", "boolean", "Indicates always available, hence times are irrelevant. (e.g. 24-hour service).", 0, 1, allDay)); children.add(new Property("availableStartTime", "time", "The opening time of day. Note: If the AllDay flag is set, then this time is ignored.", 0, 1, availableStartTime)); children.add(new Property("availableEndTime", "time", "The closing time of day. Note: If the AllDay flag is set, then this time is ignored.", 0, 1, availableEndTime)); } @@ -309,8 +308,8 @@ public class PractitionerRole extends DomainResource { @Override public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { switch (_hash) { - case 68050338: /*daysOfWeek*/ return new Property("daysOfWeek", "code", "Indicates which days of the week are available between the start and end Times.", 0, java.lang.Integer.MAX_VALUE, daysOfWeek); - case -1414913477: /*allDay*/ return new Property("allDay", "boolean", "Is this always available? (hence times are irrelevant) e.g. 24 hour service.", 0, 1, allDay); + case 68050338: /*daysOfWeek*/ return new Property("daysOfWeek", "code", "Indicates which days of the week are available between the start and end times.", 0, java.lang.Integer.MAX_VALUE, daysOfWeek); + case -1414913477: /*allDay*/ return new Property("allDay", "boolean", "Indicates always available, hence times are irrelevant. (e.g. 24-hour service).", 0, 1, allDay); case -1039453818: /*availableStartTime*/ return new Property("availableStartTime", "time", "The opening time of day. Note: If the AllDay flag is set, then this time is ignored.", 0, 1, availableStartTime); case 101151551: /*availableEndTime*/ return new Property("availableEndTime", "time", "The closing time of day. Note: If the AllDay flag is set, then this time is ignored.", 0, 1, availableEndTime); default: return super.getNamedProperty(_hash, _name, _checkValid); @@ -2124,4 +2123,5 @@ public class PractitionerRole extends DomainResource { public static final ca.uhn.fhir.rest.gclient.TokenClientParam TELECOM = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TELECOM); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Procedure.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Procedure.java index c6d62f9b8..b596e8e2a 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Procedure.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Procedure.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.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 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 action that is or was performed on or for a patient. This can be a physical intervention like an operation, or less invasive like long term services, counseling, or hypnotherapy. @@ -3027,10 +3026,10 @@ public class Procedure 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 @@ -3051,7 +3050,7 @@ public class Procedure 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); @@ -3077,7 +3076,7 @@ public class Procedure 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 @@ -3099,10 +3098,10 @@ public class Procedure 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 @@ -3119,7 +3118,7 @@ public class Procedure 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 @@ -3141,7 +3140,7 @@ public class Procedure 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); @@ -3241,4 +3240,5 @@ public class Procedure extends DomainResource { public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("Procedure:patient").toLocked(); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ProdCharacteristic.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ProdCharacteristic.java index 0262f4940..7e3f1cba1 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ProdCharacteristic.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ProdCharacteristic.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 ProdCharacteristic Type: The marketing status describes the date when a medicinal product is actually put on the market or the date as of which it is no longer available. @@ -807,4 +808,5 @@ public class ProdCharacteristic extends BackboneType implements ICompositeType { } -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ProductShelfLife.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ProductShelfLife.java index 55c9ee547..842239034 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ProductShelfLife.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ProductShelfLife.java @@ -1,8 +1,6 @@ package org.hl7.fhir.r5.model; - - /* Copyright (c) 2011+, HL7, Inc. All rights reserved. @@ -31,17 +29,20 @@ 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 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 ProductShelfLife Type: The shelf-life and storage information for a medicinal product item or container can be described using this class. @@ -49,35 +50,28 @@ import ca.uhn.fhir.model.api.annotation.Description; @DatatypeDef(name="ProductShelfLife") public class ProductShelfLife extends BackboneType implements ICompositeType { - /** - * Unique identifier for the packaged Medicinal Product. - */ - @Child(name = "identifier", type = {Identifier.class}, order=0, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Unique identifier for the packaged Medicinal Product", formalDefinition="Unique identifier for the packaged Medicinal Product." ) - protected Identifier identifier; - /** * This describes the shelf life, taking into account various scenarios such as shelf life of the packaged Medicinal Product itself, shelf life after transformation where necessary and shelf life after the first opening of a bottle, etc. The shelf life type shall be specified using an appropriate controlled vocabulary The controlled term and the controlled term identifier shall be specified. */ - @Child(name = "type", type = {CodeableConcept.class}, order=1, min=1, max=1, modifier=false, summary=true) + @Child(name = "type", type = {CodeableConcept.class}, order=0, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="This describes the shelf life, taking into account various scenarios such as shelf life of the packaged Medicinal Product itself, shelf life after transformation where necessary and shelf life after the first opening of a bottle, etc. The shelf life type shall be specified using an appropriate controlled vocabulary The controlled term and the controlled term identifier shall be specified", formalDefinition="This describes the shelf life, taking into account various scenarios such as shelf life of the packaged Medicinal Product itself, shelf life after transformation where necessary and shelf life after the first opening of a bottle, etc. The shelf life type shall be specified using an appropriate controlled vocabulary The controlled term and the controlled term identifier shall be specified." ) protected CodeableConcept type; /** * The shelf life time period can be specified using a numerical value for the period of time and its unit of time measurement The unit of measurement shall be specified in accordance with ISO 11240 and the resulting terminology The symbol and the symbol identifier shall be used. */ - @Child(name = "period", type = {Quantity.class}, order=2, min=1, max=1, modifier=false, summary=true) + @Child(name = "period", type = {Quantity.class, StringType.class}, order=1, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="The shelf life time period can be specified using a numerical value for the period of time and its unit of time measurement The unit of measurement shall be specified in accordance with ISO 11240 and the resulting terminology The symbol and the symbol identifier shall be used", formalDefinition="The shelf life time period can be specified using a numerical value for the period of time and its unit of time measurement The unit of measurement shall be specified in accordance with ISO 11240 and the resulting terminology The symbol and the symbol identifier shall be used." ) - protected Quantity period; + protected DataType period; /** * Special precautions for storage, if any, can be specified using an appropriate controlled vocabulary The controlled term and the controlled term identifier shall be specified. */ - @Child(name = "specialPrecautionsForStorage", type = {CodeableConcept.class}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "specialPrecautionsForStorage", type = {CodeableConcept.class}, order=2, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Special precautions for storage, if any, can be specified using an appropriate controlled vocabulary The controlled term and the controlled term identifier shall be specified", formalDefinition="Special precautions for storage, if any, can be specified using an appropriate controlled vocabulary The controlled term and the controlled term identifier shall be specified." ) protected List specialPrecautionsForStorage; - private static final long serialVersionUID = -1561196410L; + private static final long serialVersionUID = 675017411L; /** * Constructor @@ -86,39 +80,6 @@ public class ProductShelfLife extends BackboneType implements ICompositeType { super(); } - /** - * Constructor - */ - public ProductShelfLife(CodeableConcept type, Quantity period) { - super(); - this.setType(type); - this.setPeriod(period); - } - - /** - * @return {@link #identifier} (Unique identifier for the packaged Medicinal Product.) - */ - public Identifier getIdentifier() { - if (this.identifier == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create ProductShelfLife.identifier"); - else if (Configuration.doAutoCreate()) - this.identifier = new Identifier(); // cc - return this.identifier; - } - - public boolean hasIdentifier() { - return this.identifier != null && !this.identifier.isEmpty(); - } - - /** - * @param value {@link #identifier} (Unique identifier for the packaged Medicinal Product.) - */ - public ProductShelfLife setIdentifier(Identifier value) { - this.identifier = value; - return this; - } - /** * @return {@link #type} (This describes the shelf life, taking into account various scenarios such as shelf life of the packaged Medicinal Product itself, shelf life after transformation where necessary and shelf life after the first opening of a bottle, etc. The shelf life type shall be specified using an appropriate controlled vocabulary The controlled term and the controlled term identifier shall be specified.) */ @@ -146,15 +107,40 @@ public class ProductShelfLife extends BackboneType implements ICompositeType { /** * @return {@link #period} (The shelf life time period can be specified using a numerical value for the period of time and its unit of time measurement The unit of measurement shall be specified in accordance with ISO 11240 and the resulting terminology The symbol and the symbol identifier shall be used.) */ - public Quantity getPeriod() { - if (this.period == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create ProductShelfLife.period"); - else if (Configuration.doAutoCreate()) - this.period = new Quantity(); // cc + public DataType getPeriod() { return this.period; } + /** + * @return {@link #period} (The shelf life time period can be specified using a numerical value for the period of time and its unit of time measurement The unit of measurement shall be specified in accordance with ISO 11240 and the resulting terminology The symbol and the symbol identifier shall be used.) + */ + public Quantity getPeriodQuantity() throws FHIRException { + if (this.period == null) + this.period = new Quantity(); + if (!(this.period instanceof Quantity)) + throw new FHIRException("Type mismatch: the type Quantity was expected, but "+this.period.getClass().getName()+" was encountered"); + return (Quantity) this.period; + } + + public boolean hasPeriodQuantity() { + return this != null && this.period instanceof Quantity; + } + + /** + * @return {@link #period} (The shelf life time period can be specified using a numerical value for the period of time and its unit of time measurement The unit of measurement shall be specified in accordance with ISO 11240 and the resulting terminology The symbol and the symbol identifier shall be used.) + */ + public StringType getPeriodStringType() throws FHIRException { + if (this.period == null) + this.period = new StringType(); + if (!(this.period instanceof StringType)) + throw new FHIRException("Type mismatch: the type StringType was expected, but "+this.period.getClass().getName()+" was encountered"); + return (StringType) this.period; + } + + public boolean hasPeriodStringType() { + return this != null && this.period instanceof StringType; + } + public boolean hasPeriod() { return this.period != null && !this.period.isEmpty(); } @@ -162,7 +148,9 @@ public class ProductShelfLife extends BackboneType implements ICompositeType { /** * @param value {@link #period} (The shelf life time period can be specified using a numerical value for the period of time and its unit of time measurement The unit of measurement shall be specified in accordance with ISO 11240 and the resulting terminology The symbol and the symbol identifier shall be used.) */ - public ProductShelfLife setPeriod(Quantity value) { + public ProductShelfLife setPeriod(DataType value) { + if (value != null && !(value instanceof Quantity || value instanceof StringType)) + throw new Error("Not the right type for ProductShelfLife.period[x]: "+value.fhirType()); this.period = value; return this; } @@ -222,18 +210,19 @@ public class ProductShelfLife extends BackboneType implements ICompositeType { protected void listChildren(List children) { super.listChildren(children); - children.add(new Property("identifier", "Identifier", "Unique identifier for the packaged Medicinal Product.", 0, 1, identifier)); children.add(new Property("type", "CodeableConcept", "This describes the shelf life, taking into account various scenarios such as shelf life of the packaged Medicinal Product itself, shelf life after transformation where necessary and shelf life after the first opening of a bottle, etc. The shelf life type shall be specified using an appropriate controlled vocabulary The controlled term and the controlled term identifier shall be specified.", 0, 1, type)); - children.add(new Property("period", "Quantity", "The shelf life time period can be specified using a numerical value for the period of time and its unit of time measurement The unit of measurement shall be specified in accordance with ISO 11240 and the resulting terminology The symbol and the symbol identifier shall be used.", 0, 1, period)); + children.add(new Property("period[x]", "Quantity|string", "The shelf life time period can be specified using a numerical value for the period of time and its unit of time measurement The unit of measurement shall be specified in accordance with ISO 11240 and the resulting terminology The symbol and the symbol identifier shall be used.", 0, 1, period)); children.add(new Property("specialPrecautionsForStorage", "CodeableConcept", "Special precautions for storage, if any, can be specified using an appropriate controlled vocabulary The controlled term and the controlled term identifier shall be specified.", 0, java.lang.Integer.MAX_VALUE, specialPrecautionsForStorage)); } @Override public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { switch (_hash) { - case -1618432855: /*identifier*/ return new Property("identifier", "Identifier", "Unique identifier for the packaged Medicinal Product.", 0, 1, identifier); case 3575610: /*type*/ return new Property("type", "CodeableConcept", "This describes the shelf life, taking into account various scenarios such as shelf life of the packaged Medicinal Product itself, shelf life after transformation where necessary and shelf life after the first opening of a bottle, etc. The shelf life type shall be specified using an appropriate controlled vocabulary The controlled term and the controlled term identifier shall be specified.", 0, 1, type); - case -991726143: /*period*/ return new Property("period", "Quantity", "The shelf life time period can be specified using a numerical value for the period of time and its unit of time measurement The unit of measurement shall be specified in accordance with ISO 11240 and the resulting terminology The symbol and the symbol identifier shall be used.", 0, 1, period); + case 566594335: /*period[x]*/ return new Property("period[x]", "Quantity|string", "The shelf life time period can be specified using a numerical value for the period of time and its unit of time measurement The unit of measurement shall be specified in accordance with ISO 11240 and the resulting terminology The symbol and the symbol identifier shall be used.", 0, 1, period); + case -991726143: /*period*/ return new Property("period[x]", "Quantity|string", "The shelf life time period can be specified using a numerical value for the period of time and its unit of time measurement The unit of measurement shall be specified in accordance with ISO 11240 and the resulting terminology The symbol and the symbol identifier shall be used.", 0, 1, period); + case -143069844: /*periodQuantity*/ return new Property("period[x]", "Quantity", "The shelf life time period can be specified using a numerical value for the period of time and its unit of time measurement The unit of measurement shall be specified in accordance with ISO 11240 and the resulting terminology The symbol and the symbol identifier shall be used.", 0, 1, period); + case -41636558: /*periodString*/ return new Property("period[x]", "string", "The shelf life time period can be specified using a numerical value for the period of time and its unit of time measurement The unit of measurement shall be specified in accordance with ISO 11240 and the resulting terminology The symbol and the symbol identifier shall be used.", 0, 1, period); case 2103459492: /*specialPrecautionsForStorage*/ return new Property("specialPrecautionsForStorage", "CodeableConcept", "Special precautions for storage, if any, can be specified using an appropriate controlled vocabulary The controlled term and the controlled term identifier shall be specified.", 0, java.lang.Integer.MAX_VALUE, specialPrecautionsForStorage); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -243,9 +232,8 @@ public class ProductShelfLife extends BackboneType implements ICompositeType { @Override public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException { switch (hash) { - case -1618432855: /*identifier*/ return this.identifier == null ? new Base[0] : new Base[] {this.identifier}; // Identifier case 3575610: /*type*/ return this.type == null ? new Base[0] : new Base[] {this.type}; // CodeableConcept - case -991726143: /*period*/ return this.period == null ? new Base[0] : new Base[] {this.period}; // Quantity + case -991726143: /*period*/ return this.period == null ? new Base[0] : new Base[] {this.period}; // DataType case 2103459492: /*specialPrecautionsForStorage*/ return this.specialPrecautionsForStorage == null ? new Base[0] : this.specialPrecautionsForStorage.toArray(new Base[this.specialPrecautionsForStorage.size()]); // CodeableConcept default: return super.getProperty(hash, name, checkValid); } @@ -255,14 +243,11 @@ public class ProductShelfLife extends BackboneType implements ICompositeType { @Override public Base setProperty(int hash, String name, Base value) throws FHIRException { switch (hash) { - case -1618432855: // identifier - this.identifier = TypeConvertor.castToIdentifier(value); // Identifier - return value; case 3575610: // type this.type = TypeConvertor.castToCodeableConcept(value); // CodeableConcept return value; case -991726143: // period - this.period = TypeConvertor.castToQuantity(value); // Quantity + this.period = TypeConvertor.castToType(value); // DataType return value; case 2103459492: // specialPrecautionsForStorage this.getSpecialPrecautionsForStorage().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept @@ -274,12 +259,10 @@ public class ProductShelfLife extends BackboneType implements ICompositeType { @Override public Base setProperty(String name, Base value) throws FHIRException { - if (name.equals("identifier")) { - this.identifier = TypeConvertor.castToIdentifier(value); // Identifier - } else if (name.equals("type")) { + if (name.equals("type")) { this.type = TypeConvertor.castToCodeableConcept(value); // CodeableConcept - } else if (name.equals("period")) { - this.period = TypeConvertor.castToQuantity(value); // Quantity + } else if (name.equals("period[x]")) { + this.period = TypeConvertor.castToType(value); // DataType } else if (name.equals("specialPrecautionsForStorage")) { this.getSpecialPrecautionsForStorage().add(TypeConvertor.castToCodeableConcept(value)); } else @@ -290,8 +273,8 @@ public class ProductShelfLife extends BackboneType implements ICompositeType { @Override public Base makeProperty(int hash, String name) throws FHIRException { switch (hash) { - case -1618432855: return getIdentifier(); case 3575610: return getType(); + case 566594335: return getPeriod(); case -991726143: return getPeriod(); case 2103459492: return addSpecialPrecautionsForStorage(); default: return super.makeProperty(hash, name); @@ -302,9 +285,8 @@ public class ProductShelfLife extends BackboneType implements ICompositeType { @Override public String[] getTypesForProperty(int hash, String name) throws FHIRException { switch (hash) { - case -1618432855: /*identifier*/ return new String[] {"Identifier"}; case 3575610: /*type*/ return new String[] {"CodeableConcept"}; - case -991726143: /*period*/ return new String[] {"Quantity"}; + case -991726143: /*period*/ return new String[] {"Quantity", "string"}; case 2103459492: /*specialPrecautionsForStorage*/ return new String[] {"CodeableConcept"}; default: return super.getTypesForProperty(hash, name); } @@ -313,18 +295,18 @@ public class ProductShelfLife extends BackboneType implements ICompositeType { @Override public Base addChild(String name) throws FHIRException { - if (name.equals("identifier")) { - this.identifier = new Identifier(); - return this.identifier; - } - else if (name.equals("type")) { + if (name.equals("type")) { this.type = new CodeableConcept(); return this.type; } - else if (name.equals("period")) { + else if (name.equals("periodQuantity")) { this.period = new Quantity(); return this.period; } + else if (name.equals("periodString")) { + this.period = new StringType(); + return this.period; + } else if (name.equals("specialPrecautionsForStorage")) { return addSpecialPrecautionsForStorage(); } @@ -345,7 +327,6 @@ public class ProductShelfLife extends BackboneType implements ICompositeType { public void copyValues(ProductShelfLife dst) { super.copyValues(dst); - dst.identifier = identifier == null ? null : identifier.copy(); dst.type = type == null ? null : type.copy(); dst.period = period == null ? null : period.copy(); if (specialPrecautionsForStorage != null) { @@ -366,8 +347,8 @@ public class ProductShelfLife extends BackboneType implements ICompositeType { if (!(other_ instanceof ProductShelfLife)) return false; ProductShelfLife o = (ProductShelfLife) other_; - return compareDeep(identifier, o.identifier, true) && compareDeep(type, o.type, true) && compareDeep(period, o.period, true) - && compareDeep(specialPrecautionsForStorage, o.specialPrecautionsForStorage, true); + return compareDeep(type, o.type, true) && compareDeep(period, o.period, true) && compareDeep(specialPrecautionsForStorage, o.specialPrecautionsForStorage, true) + ; } @Override @@ -381,9 +362,10 @@ public class ProductShelfLife extends BackboneType implements ICompositeType { } public boolean isEmpty() { - return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, type, period - , specialPrecautionsForStorage); + return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(type, period, specialPrecautionsForStorage + ); } -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Provenance.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Provenance.java index 9a4ef163c..026c20e62 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Provenance.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Provenance.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; /** * Provenance of a resource is a record that describes entities and processes involved in producing and delivering or otherwise influencing that resource. Provenance provides a critical foundation for assessing authenticity, enabling trust, and allowing reproducibility. Provenance assertions are a form of contextual metadata and can themselves become important records with their own provenance. Provenance statement indicates clinical significance in terms of confidence in authenticity, reliability, and trustworthiness, integrity, and stage in lifecycle (e.g. Document Completion - has the artifact been legally authenticated), all of which may impact security, privacy, and trust policies. @@ -199,7 +200,7 @@ public class Provenance extends DomainResource { */ @Child(name = "type", type = {CodeableConcept.class}, order=1, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="How the agent participated", formalDefinition="The primary act of participation of the agent with respect to the activity." ) - @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 CodeableConcept type; /** @@ -1780,7 +1781,7 @@ public class Provenance extends DomainResource { * Path: Provenance.entity.what
    *

    */ - @SearchParamDefinition(name="entity", path="Provenance.entity.what", description="Identity of entity", 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="Provenance.entity.what", description="Identity of entity", 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 @@ -1898,7 +1899,7 @@ public class Provenance extends DomainResource { * Path: Provenance.target
    *

    */ - @SearchParamDefinition(name="target", path="Provenance.target", description="Target Reference(s) (usually version specific)", 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="target", path="Provenance.target", description="Target Reference(s) (usually version specific)", 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_TARGET = "target"; /** * Fluent Client search parameter constant for target @@ -1937,4 +1938,5 @@ public class Provenance extends DomainResource { public static final ca.uhn.fhir.rest.gclient.DateClientParam WHEN = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_WHEN); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Quantity.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Quantity.java index 30404f9bb..0dcf5f198 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Quantity.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Quantity.java @@ -1,20 +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.r5.model.Enumerations.QuantityComparator; -import org.hl7.fhir.r5.model.Enumerations.QuantityComparatorEnumFactory; -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 Quantity 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. @@ -557,8 +587,7 @@ public class Quantity extends DataType implements ICompositeType, ICoding { } // Manual code (from Configuration.txt)t: - - @Override +@Override public String getVersion() { return null; } @@ -595,9 +624,7 @@ public class Quantity extends DataType implements ICompositeType, ICoding { res.setCode(code); 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/Questionnaire.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Questionnaire.java index 2113eaef2..148a022c1 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Questionnaire.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Questionnaire.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 structured set of questions intended to guide the collection of answers from end-users. Questionnaires provide detailed control over order, presentation, phraseology and grouping to allow coherent, consistent data collection. @@ -1963,8 +1961,7 @@ public class Questionnaire extends MetadataResource { } // added from java-adornments.txt: - - public QuestionnaireItemComponent getQuestion(String linkId) { +public QuestionnaireItemComponent getQuestion(String linkId) { if (linkId == null) return null; for (QuestionnaireItemComponent i : getItem()) { @@ -1999,8 +1996,6 @@ public class Questionnaire extends MetadataResource { } return false; } - - // end addition } @@ -5360,8 +5355,7 @@ public class Questionnaire extends MetadataResource { 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 QuestionnaireItemComponent getQuestion(String linkId) { +public QuestionnaireItemComponent getQuestion(String linkId) { if (linkId == null) return null; for (QuestionnaireItemComponent i : getItem()) { @@ -5382,8 +5376,7 @@ public class Questionnaire extends MetadataResource { } 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/QuestionnaireResponse.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/QuestionnaireResponse.java index 4822b13ab..048a85efa 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/QuestionnaireResponse.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/QuestionnaireResponse.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 structured set of questions and their answers. The questions are ordered and grouped into coherent subsets, corresponding to the structure of the grouping of the questionnaire being responded to. @@ -2195,7 +2195,7 @@ public class QuestionnaireResponse extends DomainResource { * Path: QuestionnaireResponse.subject
    *

    */ - @SearchParamDefinition(name="subject", path="QuestionnaireResponse.subject", description="The subject of the questionnaire response", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Patient") }, 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="QuestionnaireResponse.subject", description="The subject of the questionnaire response", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Patient") }, 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 @@ -2240,4 +2240,5 @@ public class QuestionnaireResponse extends DomainResource { public static final ca.uhn.fhir.model.api.Include INCLUDE_ITEM_SUBJECT = new ca.uhn.fhir.model.api.Include("QuestionnaireResponse:item-subject").toLocked(); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Range.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Range.java index 5a6365458..a9df92cc5 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Range.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Range.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 Range Type: A set of ordered Quantities defined by a low and high limit. @@ -220,4 +252,5 @@ public class Range 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/Ratio.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Ratio.java index 231288691..d73b174b5 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Ratio.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Ratio.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 Ratio Type: A relationship of two Quantity values - expressed as a numerator and a denominator. @@ -221,4 +253,5 @@ public class Ratio 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/Reference.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Reference.java index 41561050c..2a0180ba2 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Reference.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Reference.java @@ -1,20 +1,54 @@ 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.IAnyResource; -import org.hl7.fhir.instance.model.api.IBaseReference; -import org.hl7.fhir.instance.model.api.ICompositeType; -import org.hl7.fhir.instance.model.api.IIdType; 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.IAnyResource; +import org.hl7.fhir.instance.model.api.IBaseReference; +import org.hl7.fhir.instance.model.api.ICompositeType; +import org.hl7.fhir.instance.model.api.IIdType; /** * Base StructureDefinition for Reference Type: A reference from one resource to another. */ @@ -428,8 +462,7 @@ The type is the Canonical URL of Resource Definition that is the type this refer } // Manual code (from Configuration.txt)t: - - @Override +@Override public String toString() { if (hasReference()) return "Reference["+getReference()+"]"; @@ -455,8 +488,8 @@ The type is the Canonical URL of Resource Definition that is the type this refer setReference(null); } return this; - } - + } // end addition -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RegulatedAuthorization.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RegulatedAuthorization.java index 4ac016aa3..c1b572b3e 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RegulatedAuthorization.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RegulatedAuthorization.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; /** * The regulatory authorization of a medicinal product, device or process. @@ -715,7 +715,7 @@ public class RegulatedAuthorization extends DomainResource { /** * The type of product or service that is being authorized. */ - @Child(name = "subject", type = {MedicinalProductDefinition.class, PackagedProductDefinition.class, DeviceDefinition.class, ResearchStudy.class, ActivityDefinition.class, PlanDefinition.class, ObservationDefinition.class}, order=1, min=0, max=1, modifier=false, summary=true) + @Child(name = "subject", type = {MedicinalProductDefinition.class, BiologicallyDerivedProduct.class, NutritionProduct.class, PackagedProductDefinition.class, SubstanceDefinition.class, DeviceDefinition.class, ResearchStudy.class, ActivityDefinition.class, PlanDefinition.class, ObservationDefinition.class, Practitioner.class, Organization.class, Location.class}, order=1, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="The type of product or service that is being authorized", formalDefinition="The type of product or service that is being authorized." ) protected Reference subject; @@ -797,10 +797,10 @@ public class RegulatedAuthorization extends DomainResource { protected List jurisdictionalAuthorization; /** - * Marketing Authorization Holder. + * The organization that holds the granted authorization. */ @Child(name = "holder", type = {Organization.class}, order=13, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Marketing Authorization Holder", formalDefinition="Marketing Authorization Holder." ) + @Description(shortDefinition="The organization that holds the granted authorization", formalDefinition="The organization that holds the granted authorization." ) protected Reference holder; /** @@ -1361,7 +1361,7 @@ public class RegulatedAuthorization extends DomainResource { } /** - * @return {@link #holder} (Marketing Authorization Holder.) + * @return {@link #holder} (The organization that holds the granted authorization.) */ public Reference getHolder() { if (this.holder == null) @@ -1377,7 +1377,7 @@ public class RegulatedAuthorization extends DomainResource { } /** - * @param value {@link #holder} (Marketing Authorization Holder.) + * @param value {@link #holder} (The organization that holds the granted authorization.) */ public RegulatedAuthorization setHolder(Reference value) { this.holder = value; @@ -1435,7 +1435,7 @@ public class RegulatedAuthorization extends DomainResource { protected void listChildren(List children) { super.listChildren(children); children.add(new Property("identifier", "Identifier", "Business identifier for the authorization, typically assigned by the authorizing body.", 0, java.lang.Integer.MAX_VALUE, identifier)); - children.add(new Property("subject", "Reference(MedicinalProductDefinition|PackagedProductDefinition|DeviceDefinition|ResearchStudy|ActivityDefinition|PlanDefinition|ObservationDefinition)", "The type of product or service that is being authorized.", 0, 1, subject)); + children.add(new Property("subject", "Reference(MedicinalProductDefinition|BiologicallyDerivedProduct|NutritionProduct|PackagedProductDefinition|SubstanceDefinition|DeviceDefinition|ResearchStudy|ActivityDefinition|PlanDefinition|ObservationDefinition|Practitioner|Organization|Location)", "The type of product or service that is being authorized.", 0, 1, subject)); children.add(new Property("type", "CodeableConcept", "Overall type of this authorization, for example drug marketing approval, orphan drug designation.", 0, 1, type)); children.add(new Property("description", "markdown", "General textual supporting information.", 0, 1, description)); children.add(new Property("region", "CodeableConcept", "The region (country, jurisdiction etc.) in which the marketing authorization has been granted.", 0, java.lang.Integer.MAX_VALUE, region)); @@ -1447,7 +1447,7 @@ public class RegulatedAuthorization extends DomainResource { children.add(new Property("basis", "CodeableConcept", "The legal or regulatory framework against which this authorization is granted, or other reasons for it.", 0, java.lang.Integer.MAX_VALUE, basis)); children.add(new Property("relatedDate", "", "Other dates associated with the authorization. It is common for an authorization to have renewal dates, initial time limited phases and so on.", 0, java.lang.Integer.MAX_VALUE, relatedDate)); children.add(new Property("jurisdictionalAuthorization", "Reference(RegulatedAuthorization)", "Authorization in areas within a country.", 0, java.lang.Integer.MAX_VALUE, jurisdictionalAuthorization)); - children.add(new Property("holder", "Reference(Organization)", "Marketing Authorization Holder.", 0, 1, holder)); + children.add(new Property("holder", "Reference(Organization)", "The organization that holds the granted authorization.", 0, 1, holder)); children.add(new Property("regulator", "Reference(Organization)", "Medicines Regulatory Agency.", 0, 1, regulator)); children.add(new Property("case", "", "The case or regulatory procedure for granting or amending a marketing authorization.", 0, 1, case_)); } @@ -1456,7 +1456,7 @@ public class RegulatedAuthorization extends DomainResource { public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { switch (_hash) { case -1618432855: /*identifier*/ return new Property("identifier", "Identifier", "Business identifier for the authorization, typically assigned by the authorizing body.", 0, java.lang.Integer.MAX_VALUE, identifier); - case -1867885268: /*subject*/ return new Property("subject", "Reference(MedicinalProductDefinition|PackagedProductDefinition|DeviceDefinition|ResearchStudy|ActivityDefinition|PlanDefinition|ObservationDefinition)", "The type of product or service that is being authorized.", 0, 1, subject); + case -1867885268: /*subject*/ return new Property("subject", "Reference(MedicinalProductDefinition|BiologicallyDerivedProduct|NutritionProduct|PackagedProductDefinition|SubstanceDefinition|DeviceDefinition|ResearchStudy|ActivityDefinition|PlanDefinition|ObservationDefinition|Practitioner|Organization|Location)", "The type of product or service that is being authorized.", 0, 1, subject); case 3575610: /*type*/ return new Property("type", "CodeableConcept", "Overall type of this authorization, for example drug marketing approval, orphan drug designation.", 0, 1, type); case -1724546052: /*description*/ return new Property("description", "markdown", "General textual supporting information.", 0, 1, description); case -934795532: /*region*/ return new Property("region", "CodeableConcept", "The region (country, jurisdiction etc.) in which the marketing authorization has been granted.", 0, java.lang.Integer.MAX_VALUE, region); @@ -1471,7 +1471,7 @@ public class RegulatedAuthorization extends DomainResource { case 93508670: /*basis*/ return new Property("basis", "CodeableConcept", "The legal or regulatory framework against which this authorization is granted, or other reasons for it.", 0, java.lang.Integer.MAX_VALUE, basis); case 1112535673: /*relatedDate*/ return new Property("relatedDate", "", "Other dates associated with the authorization. It is common for an authorization to have renewal dates, initial time limited phases and so on.", 0, java.lang.Integer.MAX_VALUE, relatedDate); case 1459432557: /*jurisdictionalAuthorization*/ return new Property("jurisdictionalAuthorization", "Reference(RegulatedAuthorization)", "Authorization in areas within a country.", 0, java.lang.Integer.MAX_VALUE, jurisdictionalAuthorization); - case -1211707988: /*holder*/ return new Property("holder", "Reference(Organization)", "Marketing Authorization Holder.", 0, 1, holder); + case -1211707988: /*holder*/ return new Property("holder", "Reference(Organization)", "The organization that holds the granted authorization.", 0, 1, holder); case 414760449: /*regulator*/ return new Property("regulator", "Reference(Organization)", "Medicines Regulatory Agency.", 0, 1, regulator); case 3046192: /*case*/ return new Property("case", "", "The case or regulatory procedure for granting or amending a marketing authorization.", 0, 1, case_); default: return super.getNamedProperty(_hash, _name, _checkValid); @@ -1850,17 +1850,17 @@ public class RegulatedAuthorization extends DomainResource { /** * Search parameter: holder *

    - * Description: Marketing Authorization Holder
    + * Description: The organization that holds the granted authorization
    * Type: reference
    * Path: RegulatedAuthorization.holder
    *

    */ - @SearchParamDefinition(name="holder", path="RegulatedAuthorization.holder", description="Marketing Authorization Holder", type="reference", target={Organization.class } ) + @SearchParamDefinition(name="holder", path="RegulatedAuthorization.holder", description="The organization that holds the granted authorization", type="reference", target={Organization.class } ) public static final String SP_HOLDER = "holder"; /** * Fluent Client search parameter constant for holder *

    - * Description: Marketing Authorization Holder
    + * Description: The organization that holds the granted authorization
    * Type: reference
    * Path: RegulatedAuthorization.holder
    *

    @@ -1941,7 +1941,7 @@ public class RegulatedAuthorization extends DomainResource { * Path: RegulatedAuthorization.subject
    *

    */ - @SearchParamDefinition(name="subject", path="RegulatedAuthorization.subject", description="The type of product or service that is being authorized", type="reference", target={ActivityDefinition.class, DeviceDefinition.class, MedicinalProductDefinition.class, ObservationDefinition.class, PackagedProductDefinition.class, PlanDefinition.class, ResearchStudy.class } ) + @SearchParamDefinition(name="subject", path="RegulatedAuthorization.subject", description="The type of product or service that is being authorized", type="reference", target={ActivityDefinition.class, BiologicallyDerivedProduct.class, DeviceDefinition.class, Location.class, MedicinalProductDefinition.class, NutritionProduct.class, ObservationDefinition.class, Organization.class, PackagedProductDefinition.class, PlanDefinition.class, Practitioner.class, ResearchStudy.class, SubstanceDefinition.class } ) public static final String SP_SUBJECT = "subject"; /** * Fluent Client search parameter constant for subject @@ -1960,4 +1960,5 @@ public class RegulatedAuthorization extends DomainResource { public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("RegulatedAuthorization:subject").toLocked(); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RelatedArtifact.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RelatedArtifact.java index ebd07bad1..0cb9950e8 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RelatedArtifact.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RelatedArtifact.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 RelatedArtifact Type: Related artifacts such as additional documentation, justification, or bibliographic references. @@ -795,4 +827,5 @@ public class RelatedArtifact 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/RelatedPerson.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RelatedPerson.java index 241656887..8e5eeeeeb 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RelatedPerson.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RelatedPerson.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.utilities.Utilities; +import org.hl7.fhir.r5.model.Enumerations.*; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.r5.model.Enumerations.AdministrativeGender; -import org.hl7.fhir.r5.model.Enumerations.AdministrativeGenderEnumFactory; - -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; /** * Information about a person that is involved in the care for a patient, but who is not the target of healthcare, nor has a formal responsibility in the care process. @@ -1756,4 +1755,5 @@ public class RelatedPerson extends DomainResource { public static final ca.uhn.fhir.rest.gclient.TokenClientParam TELECOM = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TELECOM); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RequestGroup.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RequestGroup.java index fea8aff1d..c7ca91d22 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RequestGroup.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RequestGroup.java @@ -1,8 +1,6 @@ package org.hl7.fhir.r5.model; - - /* Copyright (c) 2011+, HL7, Inc. All rights reserved. @@ -31,41 +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.ActionCardinalityBehavior; -import org.hl7.fhir.r5.model.Enumerations.ActionCardinalityBehaviorEnumFactory; -import org.hl7.fhir.r5.model.Enumerations.ActionConditionKind; -import org.hl7.fhir.r5.model.Enumerations.ActionConditionKindEnumFactory; -import org.hl7.fhir.r5.model.Enumerations.ActionGroupingBehavior; -import org.hl7.fhir.r5.model.Enumerations.ActionGroupingBehaviorEnumFactory; -import org.hl7.fhir.r5.model.Enumerations.ActionPrecheckBehavior; -import org.hl7.fhir.r5.model.Enumerations.ActionPrecheckBehaviorEnumFactory; -import org.hl7.fhir.r5.model.Enumerations.ActionRelationshipType; -import org.hl7.fhir.r5.model.Enumerations.ActionRelationshipTypeEnumFactory; -import org.hl7.fhir.r5.model.Enumerations.ActionRequiredBehavior; -import org.hl7.fhir.r5.model.Enumerations.ActionRequiredBehaviorEnumFactory; -import org.hl7.fhir.r5.model.Enumerations.ActionSelectionBehavior; -import org.hl7.fhir.r5.model.Enumerations.ActionSelectionBehaviorEnumFactory; -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 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 group of related requests that can be used to capture intended activities that have inter-dependencies such as "give this medication after that one". @@ -3806,4 +3786,5 @@ public class RequestGroup extends DomainResource { public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("RequestGroup:subject").toLocked(); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ResearchStudy.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ResearchStudy.java index 07dff69fe..602aa3afe 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ResearchStudy.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ResearchStudy.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 process where a researcher or organization plans and then executes a series of steps intended to increase the field of healthcare-related knowledge. This includes studies of safety, efficacy, comparative effectiveness and other information about medications, devices, therapies and other interventional and investigative techniques. A ResearchStudy involves the gathering of information about human or animal subjects. @@ -2900,4 +2901,5 @@ public class ResearchStudy extends DomainResource { public static final ca.uhn.fhir.rest.gclient.StringClientParam TITLE = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_TITLE); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ResearchSubject.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ResearchSubject.java index ec6d16731..cdeea25e3 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ResearchSubject.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ResearchSubject.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 physical entity which is the primary unit of operational and/or administrative interest in a study. @@ -1531,4 +1531,5 @@ public class ResearchSubject extends DomainResource { public static final ca.uhn.fhir.model.api.Include INCLUDE_STUDY = new ca.uhn.fhir.model.api.Include("ResearchSubject:study").toLocked(); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Resource.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Resource.java index 663b38e3e..9873980a1 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Resource.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Resource.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.exceptions.FHIRException; -import org.hl7.fhir.instance.model.api.IAnyResource; 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.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.IAnyResource; /** * This is the base resource type for everything. */ @@ -378,8 +415,7 @@ public abstract class Resource extends BaseResource implements IAnyResource { } // Manual code (from Configuration.txt)t: - - @Override +@Override public String getIdBase() { return getId(); } @@ -393,8 +429,7 @@ public abstract class Resource extends BaseResource implements IAnyResource { public String getLanguage(String defValue) { return hasLanguage() ? getLanguage() : defValue; } - - // end addition -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ResourceFactory.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ResourceFactory.java index f06a7c3bd..e46de5e56 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ResourceFactory.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ResourceFactory.java @@ -1,7 +1,5 @@ package org.hl7.fhir.r5.model; - - /* Copyright (c) 2011+, HL7, Inc. All rights reserved. @@ -30,7 +28,7 @@ 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 @@ -147,8 +145,8 @@ public class ResourceFactory extends Factory { return new EventDefinition(); if ("Evidence".equals(name)) return new Evidence(); - if ("EvidenceFocus".equals(name)) - return new EvidenceFocus(); + if ("EvidenceReport".equals(name)) + return new EvidenceReport(); if ("EvidenceVariable".equals(name)) return new EvidenceVariable(); if ("ExampleScenario".equals(name)) @@ -455,8 +453,6 @@ public class ResourceFactory extends Factory { return new Signature(); if ("Statistic".equals(name)) return new Statistic(); - if ("SubstanceAmount".equals(name)) - return new SubstanceAmount(); if ("Timing".equals(name)) return new Timing(); if ("TriggerDefinition".equals(name)) @@ -542,7 +538,7 @@ public class ResourceFactory extends Factory { case -1093178557: return new EpisodeOfCare(); case 1851868013: return new EventDefinition(); case 447611511: return new Evidence(); - case -1696443231: return new EvidenceFocus(); + case -715436405: return new EvidenceReport(); case -1162161645: return new EvidenceVariable(); case 1175230202: return new ExampleScenario(); case -1001676601: return new ExplanationOfBenefit(); @@ -673,7 +669,6 @@ public class ResourceFactory extends Factory { case 1824308900: return new SampledData(); case -1217415016: return new Signature(); case -77293264: return new Statistic(); - case 1549526472: return new SubstanceAmount(); case -1789797270: return new Timing(); case 770498827: return new TriggerDefinition(); case 1071332590: return new UsageContext(); diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ResourceType.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ResourceType.java index a78ba0592..9cbcffa2b 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ResourceType.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ResourceType.java @@ -1,7 +1,5 @@ package org.hl7.fhir.r5.model; - - /* Copyright (c) 2011+, HL7, Inc. All rights reserved. @@ -30,7 +28,7 @@ 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 @@ -91,7 +89,7 @@ Account, EpisodeOfCare, EventDefinition, Evidence, - EvidenceFocus, + EvidenceReport, EvidenceVariable, ExampleScenario, ExplanationOfBenefit, @@ -296,8 +294,8 @@ Account, return "eventdefinition"; case Evidence: return "evidence"; - case EvidenceFocus: - return "evidencefocus"; + case EvidenceReport: + return "evidencereport"; case EvidenceVariable: return "evidencevariable"; case ExampleScenario: @@ -597,8 +595,8 @@ Account, return EventDefinition; if ("Evidence".equals(code)) return Evidence; - if ("EvidenceFocus".equals(code)) - return EvidenceFocus; + if ("EvidenceReport".equals(code)) + return EvidenceReport; if ("EvidenceVariable".equals(code)) return EvidenceVariable; if ("ExampleScenario".equals(code)) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RiskAssessment.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RiskAssessment.java index ddd774237..cfc214c2f 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RiskAssessment.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RiskAssessment.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,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.ObservationStatus; -import org.hl7.fhir.r5.model.Enumerations.ObservationStatusEnumFactory; +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; /** * An assessment of the likely outcome(s) for a patient or other subject as well as the likelihood of each outcome. @@ -1905,10 +1903,10 @@ public class RiskAssessment 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", 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", target={Encounter.class } ) public static final String SP_ENCOUNTER = "encounter"; /** * Fluent Client search parameter constant for encounter @@ -1929,7 +1927,7 @@ public class RiskAssessment 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); @@ -1955,7 +1953,7 @@ public class RiskAssessment 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 @@ -1977,10 +1975,10 @@ public class RiskAssessment 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 @@ -1997,7 +1995,7 @@ public class RiskAssessment 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 @@ -2019,7 +2017,7 @@ public class RiskAssessment 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); @@ -2119,4 +2117,5 @@ public class RiskAssessment extends DomainResource { public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("RiskAssessment:patient").toLocked(); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SampledData.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SampledData.java index c0c11fa11..af67d67fe 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SampledData.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SampledData.java @@ -1,18 +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 SampledData Type: A series of measurements taken by a device, with upper and lower limits. There may be more than one dimension in the data. @@ -675,4 +707,5 @@ public class SampledData 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/Schedule.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Schedule.java index f39584df3..9a3dccbc4 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Schedule.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Schedule.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; /** * A container for slots of time that may be available for booking appointments. @@ -898,4 +901,5 @@ public class Schedule extends DomainResource { public static final ca.uhn.fhir.rest.gclient.TokenClientParam SPECIALTY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SPECIALTY); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SearchParameter.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SearchParameter.java index fa28861c9..604addf74 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SearchParameter.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SearchParameter.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.PublicationStatus; -import org.hl7.fhir.r5.model.Enumerations.PublicationStatusEnumFactory; -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 search parameter that defines a named search item that can be used to search/filter on a resource. @@ -3880,4 +3876,5 @@ public class SearchParameter 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/ServiceRequest.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ServiceRequest.java index 72b053be0..1fdcbbff9 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ServiceRequest.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ServiceRequest.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.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 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 record of a request for service such as diagnostic investigations, treatments, or operations to be performed. @@ -2902,10 +2898,10 @@ public class ServiceRequest 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 @@ -2926,7 +2922,7 @@ public class ServiceRequest 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); @@ -2952,7 +2948,7 @@ public class ServiceRequest 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 @@ -2974,10 +2970,10 @@ public class ServiceRequest 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 @@ -2994,7 +2990,7 @@ public class ServiceRequest 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 @@ -3016,7 +3012,7 @@ public class ServiceRequest 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); @@ -3116,4 +3112,5 @@ public class ServiceRequest extends DomainResource { public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("ServiceRequest:patient").toLocked(); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Signature.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Signature.java index 2083d64f6..63b4fe568 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Signature.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Signature.java @@ -1,8 +1,6 @@ package org.hl7.fhir.r5.model; - - /* Copyright (c) 2011+, HL7, Inc. All rights reserved. @@ -31,19 +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 Signature Type: A signature along with supporting context. The signature may be a digital signature that is cryptographic in nature, or some other signature acceptable to the domain. This other signature may be as simple as a graphical image representing a hand-written signature, or a signature ceremony Different signature approaches have different utilities. @@ -624,4 +624,5 @@ public class Signature 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/SimpleQuantity.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SimpleQuantity.java index c8c4045c0..0889f9933 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SimpleQuantity.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SimpleQuantity.java @@ -35,6 +35,8 @@ package org.hl7.fhir.r5.model; // Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.Block; /** * 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. */ diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Slot.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Slot.java index 3e25a1ef3..0e887beb2 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Slot.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Slot.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 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 slot of time on a schedule that may be available for booking appointments. @@ -1235,4 +1237,5 @@ public class Slot 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/Specimen.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Specimen.java index a65599753..566fac542 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Specimen.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Specimen.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 sample to be used for analysis. @@ -2812,4 +2812,5 @@ public class Specimen 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/SpecimenDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SpecimenDefinition.java index 2fd86b170..df0a12514 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SpecimenDefinition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SpecimenDefinition.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 kind of specimen with associated set of requirements. @@ -4101,4 +4099,5 @@ public class SpecimenDefinition 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/Statistic.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Statistic.java index 14b589709..e58254510 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Statistic.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Statistic.java @@ -1,10 +1,6 @@ package org.hl7.fhir.r5.model; - - -import java.math.BigDecimal; - /* Copyright (c) 2011+, HL7, Inc. All rights reserved. @@ -33,20 +29,22 @@ 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.IBaseDatatypeElement; -import org.hl7.fhir.instance.model.api.ICompositeType; +import java.math.*; 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 Statistic Type: A fact or piece of data from a study of a large quantity of numerical data. A mathematical or quantified characteristic of a group of observations. @@ -91,14 +89,7 @@ public class Statistic extends BackboneType implements ICompositeType { @Description(shortDefinition="Number of participants with known results for measured variables", formalDefinition="Number of participants with known results for measured variables." ) protected IntegerType knownDataCount; - /** - * Number of participants with “positive” results, only used to report actual numerator count for a proportion. - */ - @Child(name = "numeratorCount", type = {IntegerType.class}, order=6, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Number of participants with “positive” results, only used to report actual numerator count for a proportion", formalDefinition="Number of participants with “positive” results, only used to report actual numerator count for a proportion." ) - protected IntegerType numeratorCount; - - private static final long serialVersionUID = 1908820199L; + private static final long serialVersionUID = -2042101071L; /** * Constructor @@ -344,51 +335,6 @@ public class Statistic extends BackboneType implements ICompositeType { return this; } - /** - * @return {@link #numeratorCount} (Number of participants with “positive” results, only used to report actual numerator count for a proportion.). This is the underlying object with id, value and extensions. The accessor "getNumeratorCount" gives direct access to the value - */ - public IntegerType getNumeratorCountElement() { - if (this.numeratorCount == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create StatisticSampleSizeComponent.numeratorCount"); - else if (Configuration.doAutoCreate()) - this.numeratorCount = new IntegerType(); // bb - return this.numeratorCount; - } - - public boolean hasNumeratorCountElement() { - return this.numeratorCount != null && !this.numeratorCount.isEmpty(); - } - - public boolean hasNumeratorCount() { - return this.numeratorCount != null && !this.numeratorCount.isEmpty(); - } - - /** - * @param value {@link #numeratorCount} (Number of participants with “positive” results, only used to report actual numerator count for a proportion.). This is the underlying object with id, value and extensions. The accessor "getNumeratorCount" gives direct access to the value - */ - public StatisticSampleSizeComponent setNumeratorCountElement(IntegerType value) { - this.numeratorCount = value; - return this; - } - - /** - * @return Number of participants with “positive” results, only used to report actual numerator count for a proportion. - */ - public int getNumeratorCount() { - return this.numeratorCount == null || this.numeratorCount.isEmpty() ? 0 : this.numeratorCount.getValue(); - } - - /** - * @param value Number of participants with “positive” results, only used to report actual numerator count for a proportion. - */ - public StatisticSampleSizeComponent setNumeratorCount(int value) { - if (this.numeratorCount == null) - this.numeratorCount = new IntegerType(); - this.numeratorCount.setValue(value); - return this; - } - protected void listChildren(List children) { super.listChildren(children); children.add(new Property("description", "string", "Human-readable summary of population sample size.", 0, 1, description)); @@ -396,7 +342,6 @@ public class Statistic extends BackboneType implements ICompositeType { children.add(new Property("numberOfStudies", "integer", "Number of participants in the population.", 0, 1, numberOfStudies)); children.add(new Property("numberOfParticipants", "integer", "A human-readable string to clarify or explain concepts about the sample size.", 0, 1, numberOfParticipants)); children.add(new Property("knownDataCount", "integer", "Number of participants with known results for measured variables.", 0, 1, knownDataCount)); - children.add(new Property("numeratorCount", "integer", "Number of participants with “positive” results, only used to report actual numerator count for a proportion.", 0, 1, numeratorCount)); } @Override @@ -407,7 +352,6 @@ public class Statistic extends BackboneType implements ICompositeType { case -177467129: /*numberOfStudies*/ return new Property("numberOfStudies", "integer", "Number of participants in the population.", 0, 1, numberOfStudies); case 1799357120: /*numberOfParticipants*/ return new Property("numberOfParticipants", "integer", "A human-readable string to clarify or explain concepts about the sample size.", 0, 1, numberOfParticipants); case -937344126: /*knownDataCount*/ return new Property("knownDataCount", "integer", "Number of participants with known results for measured variables.", 0, 1, knownDataCount); - case -755509242: /*numeratorCount*/ return new Property("numeratorCount", "integer", "Number of participants with “positive” results, only used to report actual numerator count for a proportion.", 0, 1, numeratorCount); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -421,7 +365,6 @@ public class Statistic extends BackboneType implements ICompositeType { case -177467129: /*numberOfStudies*/ return this.numberOfStudies == null ? new Base[0] : new Base[] {this.numberOfStudies}; // IntegerType case 1799357120: /*numberOfParticipants*/ return this.numberOfParticipants == null ? new Base[0] : new Base[] {this.numberOfParticipants}; // IntegerType case -937344126: /*knownDataCount*/ return this.knownDataCount == null ? new Base[0] : new Base[] {this.knownDataCount}; // IntegerType - case -755509242: /*numeratorCount*/ return this.numeratorCount == null ? new Base[0] : new Base[] {this.numeratorCount}; // IntegerType default: return super.getProperty(hash, name, checkValid); } @@ -445,9 +388,6 @@ public class Statistic extends BackboneType implements ICompositeType { case -937344126: // knownDataCount this.knownDataCount = TypeConvertor.castToInteger(value); // IntegerType return value; - case -755509242: // numeratorCount - this.numeratorCount = TypeConvertor.castToInteger(value); // IntegerType - return value; default: return super.setProperty(hash, name, value); } @@ -465,8 +405,6 @@ public class Statistic extends BackboneType implements ICompositeType { this.numberOfParticipants = TypeConvertor.castToInteger(value); // IntegerType } else if (name.equals("knownDataCount")) { this.knownDataCount = TypeConvertor.castToInteger(value); // IntegerType - } else if (name.equals("numeratorCount")) { - this.numeratorCount = TypeConvertor.castToInteger(value); // IntegerType } else return super.setProperty(name, value); return value; @@ -480,7 +418,6 @@ public class Statistic extends BackboneType implements ICompositeType { case -177467129: return getNumberOfStudiesElement(); case 1799357120: return getNumberOfParticipantsElement(); case -937344126: return getKnownDataCountElement(); - case -755509242: return getNumeratorCountElement(); default: return super.makeProperty(hash, name); } @@ -494,7 +431,6 @@ public class Statistic extends BackboneType implements ICompositeType { case -177467129: /*numberOfStudies*/ return new String[] {"integer"}; case 1799357120: /*numberOfParticipants*/ return new String[] {"integer"}; case -937344126: /*knownDataCount*/ return new String[] {"integer"}; - case -755509242: /*numeratorCount*/ return new String[] {"integer"}; default: return super.getTypesForProperty(hash, name); } @@ -517,9 +453,6 @@ public class Statistic extends BackboneType implements ICompositeType { else if (name.equals("knownDataCount")) { throw new FHIRException("Cannot call addChild on a primitive type Statistic.sampleSize.knownDataCount"); } - else if (name.equals("numeratorCount")) { - throw new FHIRException("Cannot call addChild on a primitive type Statistic.sampleSize.numeratorCount"); - } else return super.addChild(name); } @@ -541,7 +474,6 @@ public class Statistic extends BackboneType implements ICompositeType { dst.numberOfStudies = numberOfStudies == null ? null : numberOfStudies.copy(); dst.numberOfParticipants = numberOfParticipants == null ? null : numberOfParticipants.copy(); dst.knownDataCount = knownDataCount == null ? null : knownDataCount.copy(); - dst.numeratorCount = numeratorCount == null ? null : numeratorCount.copy(); } @Override @@ -553,7 +485,7 @@ public class Statistic extends BackboneType implements ICompositeType { StatisticSampleSizeComponent o = (StatisticSampleSizeComponent) other_; return compareDeep(description, o.description, true) && compareDeep(note, o.note, true) && compareDeep(numberOfStudies, o.numberOfStudies, true) && compareDeep(numberOfParticipants, o.numberOfParticipants, true) && compareDeep(knownDataCount, o.knownDataCount, true) - && compareDeep(numeratorCount, o.numeratorCount, true); + ; } @Override @@ -565,12 +497,12 @@ public class Statistic extends BackboneType implements ICompositeType { StatisticSampleSizeComponent o = (StatisticSampleSizeComponent) other_; return compareValues(description, o.description, true) && compareValues(numberOfStudies, o.numberOfStudies, true) && compareValues(numberOfParticipants, o.numberOfParticipants, true) && compareValues(knownDataCount, o.knownDataCount, true) - && compareValues(numeratorCount, o.numeratorCount, true); + ; } public boolean isEmpty() { return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(description, note, numberOfStudies - , numberOfParticipants, knownDataCount, numeratorCount); + , numberOfParticipants, knownDataCount); } public String fhirType() { @@ -586,7 +518,7 @@ public class Statistic extends BackboneType implements ICompositeType { * Human-readable summary of the estimate. */ @Child(name = "description", type = {StringType.class}, order=1, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Textual description of the precision estimate", formalDefinition="Human-readable summary of the estimate." ) + @Description(shortDefinition="Textual description of the attribute estimate", formalDefinition="Human-readable summary of the estimate." ) protected StringType description; /** @@ -597,18 +529,18 @@ public class Statistic extends BackboneType implements ICompositeType { protected List note; /** - * The estimateType of precision estimate, eg confidence interval or p value type. + * The type of attribute estimate, eg confidence interval or p value. */ @Child(name = "type", type = {CodeableConcept.class}, order=3, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="The estimateType of precision estimate, eg confidence interval or p value type", formalDefinition="The estimateType of precision estimate, eg confidence interval or p value type." ) + @Description(shortDefinition="The type of attribute estimate, eg confidence interval or p value", formalDefinition="The type of attribute estimate, eg confidence interval or p value." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/attribute-estimate-type") protected CodeableConcept type; /** - * The singular quantity of the precision estimate, for precision estimates represented as single values; also used to report unit of measure. + * The singular quantity of the attribute estimate, for attribute estimates represented as single values; also used to report unit of measure. */ @Child(name = "quantity", type = {Quantity.class}, order=4, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="The singular quantity of the precision estimate, for precision estimates represented as single values; also used to report unit of measure", formalDefinition="The singular quantity of the precision estimate, for precision estimates represented as single values; also used to report unit of measure." ) + @Description(shortDefinition="The singular quantity of the attribute estimate, for attribute estimates represented as single values; also used to report unit of measure", formalDefinition="The singular quantity of the attribute estimate, for attribute estimates represented as single values; also used to report unit of measure." ) protected Quantity quantity; /** @@ -622,17 +554,17 @@ public class Statistic extends BackboneType implements ICompositeType { * Lower bound of confidence interval. */ @Child(name = "range", type = {Range.class}, order=6, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Lower and upper bound values of the precision estimate", formalDefinition="Lower bound of confidence interval." ) + @Description(shortDefinition="Lower and upper bound values of the attribute estimate", formalDefinition="Lower bound of confidence interval." ) protected Range range; /** - * An estimate of the precision of the estimate. + * A nested attribute estimate; which is the attribute estimate of an attribute estimate. */ - @Child(name = "estimateQualifier", type = {}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="An estimate of the precision of the estimate", formalDefinition="An estimate of the precision of the estimate." ) - protected List estimateQualifier; + @Child(name = "attributeEstimate", type = {}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="A nested attribute estimate; which is the attribute estimate of an attribute estimate", formalDefinition="A nested attribute estimate; which is the attribute estimate of an attribute estimate." ) + protected List attributeEstimate; - private static final long serialVersionUID = -682237703L; + private static final long serialVersionUID = 2062805621L; /** * Constructor @@ -744,7 +676,7 @@ public class Statistic extends BackboneType implements ICompositeType { } /** - * @return {@link #type} (The estimateType of precision estimate, eg confidence interval or p value type.) + * @return {@link #type} (The type of attribute estimate, eg confidence interval or p value.) */ public CodeableConcept getType() { if (this.type == null) @@ -760,7 +692,7 @@ public class Statistic extends BackboneType implements ICompositeType { } /** - * @param value {@link #type} (The estimateType of precision estimate, eg confidence interval or p value type.) + * @param value {@link #type} (The type of attribute estimate, eg confidence interval or p value.) */ public StatisticAttributeEstimateComponent setType(CodeableConcept value) { this.type = value; @@ -768,7 +700,7 @@ public class Statistic extends BackboneType implements ICompositeType { } /** - * @return {@link #quantity} (The singular quantity of the precision estimate, for precision estimates represented as single values; also used to report unit of measure.) + * @return {@link #quantity} (The singular quantity of the attribute estimate, for attribute estimates represented as single values; also used to report unit of measure.) */ public Quantity getQuantity() { if (this.quantity == null) @@ -784,7 +716,7 @@ public class Statistic extends BackboneType implements ICompositeType { } /** - * @param value {@link #quantity} (The singular quantity of the precision estimate, for precision estimates represented as single values; also used to report unit of measure.) + * @param value {@link #quantity} (The singular quantity of the attribute estimate, for attribute estimates represented as single values; also used to report unit of measure.) */ public StatisticAttributeEstimateComponent setQuantity(Quantity value) { this.quantity = value; @@ -883,67 +815,67 @@ public class Statistic extends BackboneType implements ICompositeType { } /** - * @return {@link #estimateQualifier} (An estimate of the precision of the estimate.) + * @return {@link #attributeEstimate} (A nested attribute estimate; which is the attribute estimate of an attribute estimate.) */ - public List getEstimateQualifier() { - if (this.estimateQualifier == null) - this.estimateQualifier = new ArrayList(); - return this.estimateQualifier; + public List getAttributeEstimate() { + if (this.attributeEstimate == null) + this.attributeEstimate = new ArrayList(); + return this.attributeEstimate; } /** * @return Returns a reference to this for easy method chaining */ - public StatisticAttributeEstimateComponent setEstimateQualifier(List theEstimateQualifier) { - this.estimateQualifier = theEstimateQualifier; + public StatisticAttributeEstimateComponent setAttributeEstimate(List theAttributeEstimate) { + this.attributeEstimate = theAttributeEstimate; return this; } - public boolean hasEstimateQualifier() { - if (this.estimateQualifier == null) + public boolean hasAttributeEstimate() { + if (this.attributeEstimate == null) return false; - for (StatisticAttributeEstimateEstimateQualifierComponent item : this.estimateQualifier) + for (StatisticAttributeEstimateAttributeEstimateComponent item : this.attributeEstimate) if (!item.isEmpty()) return true; return false; } - public StatisticAttributeEstimateEstimateQualifierComponent addEstimateQualifier() { //3 - StatisticAttributeEstimateEstimateQualifierComponent t = new StatisticAttributeEstimateEstimateQualifierComponent(); - if (this.estimateQualifier == null) - this.estimateQualifier = new ArrayList(); - this.estimateQualifier.add(t); + public StatisticAttributeEstimateAttributeEstimateComponent addAttributeEstimate() { //3 + StatisticAttributeEstimateAttributeEstimateComponent t = new StatisticAttributeEstimateAttributeEstimateComponent(); + if (this.attributeEstimate == null) + this.attributeEstimate = new ArrayList(); + this.attributeEstimate.add(t); return t; } - public StatisticAttributeEstimateComponent addEstimateQualifier(StatisticAttributeEstimateEstimateQualifierComponent t) { //3 + public StatisticAttributeEstimateComponent addAttributeEstimate(StatisticAttributeEstimateAttributeEstimateComponent t) { //3 if (t == null) return this; - if (this.estimateQualifier == null) - this.estimateQualifier = new ArrayList(); - this.estimateQualifier.add(t); + if (this.attributeEstimate == null) + this.attributeEstimate = new ArrayList(); + this.attributeEstimate.add(t); return this; } /** - * @return The first repetition of repeating field {@link #estimateQualifier}, creating it if it does not already exist {3} + * @return The first repetition of repeating field {@link #attributeEstimate}, creating it if it does not already exist {3} */ - public StatisticAttributeEstimateEstimateQualifierComponent getEstimateQualifierFirstRep() { - if (getEstimateQualifier().isEmpty()) { - addEstimateQualifier(); + public StatisticAttributeEstimateAttributeEstimateComponent getAttributeEstimateFirstRep() { + if (getAttributeEstimate().isEmpty()) { + addAttributeEstimate(); } - return getEstimateQualifier().get(0); + return getAttributeEstimate().get(0); } protected void listChildren(List children) { super.listChildren(children); children.add(new Property("description", "string", "Human-readable summary of the estimate.", 0, 1, description)); children.add(new Property("note", "Annotation", "Footnote or explanatory note about the estimate.", 0, java.lang.Integer.MAX_VALUE, note)); - children.add(new Property("type", "CodeableConcept", "The estimateType of precision estimate, eg confidence interval or p value type.", 0, 1, type)); - children.add(new Property("quantity", "Quantity", "The singular quantity of the precision estimate, for precision estimates represented as single values; also used to report unit of measure.", 0, 1, quantity)); + children.add(new Property("type", "CodeableConcept", "The type of attribute estimate, eg confidence interval or p value.", 0, 1, type)); + children.add(new Property("quantity", "Quantity", "The singular quantity of the attribute estimate, for attribute estimates represented as single values; also used to report unit of measure.", 0, 1, quantity)); children.add(new Property("level", "decimal", "Use 95 for a 95% confidence interval.", 0, 1, level)); children.add(new Property("range", "Range", "Lower bound of confidence interval.", 0, 1, range)); - children.add(new Property("estimateQualifier", "", "An estimate of the precision of the estimate.", 0, java.lang.Integer.MAX_VALUE, estimateQualifier)); + children.add(new Property("attributeEstimate", "", "A nested attribute estimate; which is the attribute estimate of an attribute estimate.", 0, java.lang.Integer.MAX_VALUE, attributeEstimate)); } @Override @@ -951,11 +883,11 @@ public class Statistic extends BackboneType implements ICompositeType { switch (_hash) { case -1724546052: /*description*/ return new Property("description", "string", "Human-readable summary of the estimate.", 0, 1, description); case 3387378: /*note*/ return new Property("note", "Annotation", "Footnote or explanatory note about the estimate.", 0, java.lang.Integer.MAX_VALUE, note); - case 3575610: /*type*/ return new Property("type", "CodeableConcept", "The estimateType of precision estimate, eg confidence interval or p value type.", 0, 1, type); - case -1285004149: /*quantity*/ return new Property("quantity", "Quantity", "The singular quantity of the precision estimate, for precision estimates represented as single values; also used to report unit of measure.", 0, 1, quantity); + case 3575610: /*type*/ return new Property("type", "CodeableConcept", "The type of attribute estimate, eg confidence interval or p value.", 0, 1, type); + case -1285004149: /*quantity*/ return new Property("quantity", "Quantity", "The singular quantity of the attribute estimate, for attribute estimates represented as single values; also used to report unit of measure.", 0, 1, quantity); case 102865796: /*level*/ return new Property("level", "decimal", "Use 95 for a 95% confidence interval.", 0, 1, level); case 108280125: /*range*/ return new Property("range", "Range", "Lower bound of confidence interval.", 0, 1, range); - case 11745378: /*estimateQualifier*/ return new Property("estimateQualifier", "", "An estimate of the precision of the estimate.", 0, java.lang.Integer.MAX_VALUE, estimateQualifier); + case -1539581980: /*attributeEstimate*/ return new Property("attributeEstimate", "", "A nested attribute estimate; which is the attribute estimate of an attribute estimate.", 0, java.lang.Integer.MAX_VALUE, attributeEstimate); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -970,7 +902,7 @@ public class Statistic extends BackboneType implements ICompositeType { case -1285004149: /*quantity*/ return this.quantity == null ? new Base[0] : new Base[] {this.quantity}; // Quantity case 102865796: /*level*/ return this.level == null ? new Base[0] : new Base[] {this.level}; // DecimalType case 108280125: /*range*/ return this.range == null ? new Base[0] : new Base[] {this.range}; // Range - case 11745378: /*estimateQualifier*/ return this.estimateQualifier == null ? new Base[0] : this.estimateQualifier.toArray(new Base[this.estimateQualifier.size()]); // StatisticAttributeEstimateEstimateQualifierComponent + case -1539581980: /*attributeEstimate*/ return this.attributeEstimate == null ? new Base[0] : this.attributeEstimate.toArray(new Base[this.attributeEstimate.size()]); // StatisticAttributeEstimateAttributeEstimateComponent default: return super.getProperty(hash, name, checkValid); } @@ -997,8 +929,8 @@ public class Statistic extends BackboneType implements ICompositeType { case 108280125: // range this.range = TypeConvertor.castToRange(value); // Range return value; - case 11745378: // estimateQualifier - this.getEstimateQualifier().add((StatisticAttributeEstimateEstimateQualifierComponent) value); // StatisticAttributeEstimateEstimateQualifierComponent + case -1539581980: // attributeEstimate + this.getAttributeEstimate().add((StatisticAttributeEstimateAttributeEstimateComponent) value); // StatisticAttributeEstimateAttributeEstimateComponent return value; default: return super.setProperty(hash, name, value); } @@ -1019,8 +951,8 @@ public class Statistic extends BackboneType implements ICompositeType { this.level = TypeConvertor.castToDecimal(value); // DecimalType } else if (name.equals("range")) { this.range = TypeConvertor.castToRange(value); // Range - } else if (name.equals("estimateQualifier")) { - this.getEstimateQualifier().add((StatisticAttributeEstimateEstimateQualifierComponent) value); + } else if (name.equals("attributeEstimate")) { + this.getAttributeEstimate().add((StatisticAttributeEstimateAttributeEstimateComponent) value); } else return super.setProperty(name, value); return value; @@ -1035,7 +967,7 @@ public class Statistic extends BackboneType implements ICompositeType { case -1285004149: return getQuantity(); case 102865796: return getLevelElement(); case 108280125: return getRange(); - case 11745378: return addEstimateQualifier(); + case -1539581980: return addAttributeEstimate(); default: return super.makeProperty(hash, name); } @@ -1050,7 +982,7 @@ public class Statistic extends BackboneType implements ICompositeType { case -1285004149: /*quantity*/ return new String[] {"Quantity"}; case 102865796: /*level*/ return new String[] {"decimal"}; case 108280125: /*range*/ return new String[] {"Range"}; - case 11745378: /*estimateQualifier*/ return new String[] {}; + case -1539581980: /*attributeEstimate*/ return new String[] {}; default: return super.getTypesForProperty(hash, name); } @@ -1079,8 +1011,8 @@ public class Statistic extends BackboneType implements ICompositeType { this.range = new Range(); return this.range; } - else if (name.equals("estimateQualifier")) { - return addEstimateQualifier(); + else if (name.equals("attributeEstimate")) { + return addAttributeEstimate(); } else return super.addChild(name); @@ -1104,10 +1036,10 @@ public class Statistic extends BackboneType implements ICompositeType { dst.quantity = quantity == null ? null : quantity.copy(); dst.level = level == null ? null : level.copy(); dst.range = range == null ? null : range.copy(); - if (estimateQualifier != null) { - dst.estimateQualifier = new ArrayList(); - for (StatisticAttributeEstimateEstimateQualifierComponent i : estimateQualifier) - dst.estimateQualifier.add(i.copy()); + if (attributeEstimate != null) { + dst.attributeEstimate = new ArrayList(); + for (StatisticAttributeEstimateAttributeEstimateComponent i : attributeEstimate) + dst.attributeEstimate.add(i.copy()); }; } @@ -1120,7 +1052,7 @@ public class Statistic extends BackboneType implements ICompositeType { StatisticAttributeEstimateComponent o = (StatisticAttributeEstimateComponent) other_; return compareDeep(description, o.description, true) && compareDeep(note, o.note, true) && compareDeep(type, o.type, true) && compareDeep(quantity, o.quantity, true) && compareDeep(level, o.level, true) && compareDeep(range, o.range, true) - && compareDeep(estimateQualifier, o.estimateQualifier, true); + && compareDeep(attributeEstimate, o.attributeEstimate, true); } @Override @@ -1135,7 +1067,7 @@ public class Statistic extends BackboneType implements ICompositeType { public boolean isEmpty() { return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(description, note, type - , quantity, level, range, estimateQualifier); + , quantity, level, range, attributeEstimate); } public String fhirType() { @@ -1146,12 +1078,12 @@ public class Statistic extends BackboneType implements ICompositeType { } @Block() - public static class StatisticAttributeEstimateEstimateQualifierComponent extends Element implements IBaseDatatypeElement { + public static class StatisticAttributeEstimateAttributeEstimateComponent extends Element implements IBaseDatatypeElement { /** * Human-readable summary of the estimate. */ @Child(name = "description", type = {StringType.class}, order=1, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Textual description of the precision estimate", formalDefinition="Human-readable summary of the estimate." ) + @Description(shortDefinition="Textual description of the attribute estimate", formalDefinition="Human-readable summary of the estimate." ) protected StringType description; /** @@ -1162,10 +1094,10 @@ public class Statistic extends BackboneType implements ICompositeType { protected List note; /** - * The estimateType of attribute estimate, eg confidence interval or p value type. + * The type of attribute estimate, eg confidence interval or p value. */ @Child(name = "type", type = {CodeableConcept.class}, order=3, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="The estimateType of attribute estimate, eg confidence interval or p value type", formalDefinition="The estimateType of attribute estimate, eg confidence interval or p value type." ) + @Description(shortDefinition="The type of attribute estimate, eg confidence interval or p value", formalDefinition="The type of attribute estimate, eg confidence interval or p value." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/attribute-estimate-type") protected CodeableConcept type; @@ -1187,7 +1119,7 @@ public class Statistic extends BackboneType implements ICompositeType { * Lower bound of confidence interval. */ @Child(name = "range", type = {Range.class}, order=6, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Lower and upper bound values of the precision estimate", formalDefinition="Lower bound of confidence interval." ) + @Description(shortDefinition="Lower and upper bound values of the attribute estimate", formalDefinition="Lower bound of confidence interval." ) protected Range range; private static final long serialVersionUID = 1873606362L; @@ -1195,7 +1127,7 @@ public class Statistic extends BackboneType implements ICompositeType { /** * Constructor */ - public StatisticAttributeEstimateEstimateQualifierComponent() { + public StatisticAttributeEstimateAttributeEstimateComponent() { super(); } @@ -1205,7 +1137,7 @@ public class Statistic extends BackboneType implements ICompositeType { public StringType getDescriptionElement() { if (this.description == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create StatisticAttributeEstimateEstimateQualifierComponent.description"); + throw new Error("Attempt to auto-create StatisticAttributeEstimateAttributeEstimateComponent.description"); else if (Configuration.doAutoCreate()) this.description = new StringType(); // bb return this.description; @@ -1222,7 +1154,7 @@ public class Statistic extends BackboneType implements ICompositeType { /** * @param value {@link #description} (Human-readable summary of the estimate.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value */ - public StatisticAttributeEstimateEstimateQualifierComponent setDescriptionElement(StringType value) { + public StatisticAttributeEstimateAttributeEstimateComponent setDescriptionElement(StringType value) { this.description = value; return this; } @@ -1237,7 +1169,7 @@ public class Statistic extends BackboneType implements ICompositeType { /** * @param value Human-readable summary of the estimate. */ - public StatisticAttributeEstimateEstimateQualifierComponent setDescription(String value) { + public StatisticAttributeEstimateAttributeEstimateComponent setDescription(String value) { if (Utilities.noString(value)) this.description = null; else { @@ -1260,7 +1192,7 @@ public class Statistic extends BackboneType implements ICompositeType { /** * @return Returns a reference to this for easy method chaining */ - public StatisticAttributeEstimateEstimateQualifierComponent setNote(List theNote) { + public StatisticAttributeEstimateAttributeEstimateComponent setNote(List theNote) { this.note = theNote; return this; } @@ -1282,7 +1214,7 @@ public class Statistic extends BackboneType implements ICompositeType { return t; } - public StatisticAttributeEstimateEstimateQualifierComponent addNote(Annotation t) { //3 + public StatisticAttributeEstimateAttributeEstimateComponent addNote(Annotation t) { //3 if (t == null) return this; if (this.note == null) @@ -1302,12 +1234,12 @@ public class Statistic extends BackboneType implements ICompositeType { } /** - * @return {@link #type} (The estimateType of attribute estimate, eg confidence interval or p value type.) + * @return {@link #type} (The type of attribute estimate, eg confidence interval or p value.) */ public CodeableConcept getType() { if (this.type == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create StatisticAttributeEstimateEstimateQualifierComponent.type"); + throw new Error("Attempt to auto-create StatisticAttributeEstimateAttributeEstimateComponent.type"); else if (Configuration.doAutoCreate()) this.type = new CodeableConcept(); // cc return this.type; @@ -1318,9 +1250,9 @@ public class Statistic extends BackboneType implements ICompositeType { } /** - * @param value {@link #type} (The estimateType of attribute estimate, eg confidence interval or p value type.) + * @param value {@link #type} (The type of attribute estimate, eg confidence interval or p value.) */ - public StatisticAttributeEstimateEstimateQualifierComponent setType(CodeableConcept value) { + public StatisticAttributeEstimateAttributeEstimateComponent setType(CodeableConcept value) { this.type = value; return this; } @@ -1331,7 +1263,7 @@ public class Statistic extends BackboneType implements ICompositeType { public Quantity getQuantity() { if (this.quantity == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create StatisticAttributeEstimateEstimateQualifierComponent.quantity"); + throw new Error("Attempt to auto-create StatisticAttributeEstimateAttributeEstimateComponent.quantity"); else if (Configuration.doAutoCreate()) this.quantity = new Quantity(); // cc return this.quantity; @@ -1344,7 +1276,7 @@ public class Statistic extends BackboneType implements ICompositeType { /** * @param value {@link #quantity} (The singular quantity of the attribute estimate, for attribute estimates represented as single values; also used to report unit of measure.) */ - public StatisticAttributeEstimateEstimateQualifierComponent setQuantity(Quantity value) { + public StatisticAttributeEstimateAttributeEstimateComponent setQuantity(Quantity value) { this.quantity = value; return this; } @@ -1355,7 +1287,7 @@ public class Statistic extends BackboneType implements ICompositeType { public DecimalType getLevelElement() { if (this.level == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create StatisticAttributeEstimateEstimateQualifierComponent.level"); + throw new Error("Attempt to auto-create StatisticAttributeEstimateAttributeEstimateComponent.level"); else if (Configuration.doAutoCreate()) this.level = new DecimalType(); // bb return this.level; @@ -1372,7 +1304,7 @@ public class Statistic extends BackboneType implements ICompositeType { /** * @param value {@link #level} (Use 95 for a 95% confidence interval.). This is the underlying object with id, value and extensions. The accessor "getLevel" gives direct access to the value */ - public StatisticAttributeEstimateEstimateQualifierComponent setLevelElement(DecimalType value) { + public StatisticAttributeEstimateAttributeEstimateComponent setLevelElement(DecimalType value) { this.level = value; return this; } @@ -1387,7 +1319,7 @@ public class Statistic extends BackboneType implements ICompositeType { /** * @param value Use 95 for a 95% confidence interval. */ - public StatisticAttributeEstimateEstimateQualifierComponent setLevel(BigDecimal value) { + public StatisticAttributeEstimateAttributeEstimateComponent setLevel(BigDecimal value) { if (value == null) this.level = null; else { @@ -1401,7 +1333,7 @@ public class Statistic extends BackboneType implements ICompositeType { /** * @param value Use 95 for a 95% confidence interval. */ - public StatisticAttributeEstimateEstimateQualifierComponent setLevel(long value) { + public StatisticAttributeEstimateAttributeEstimateComponent setLevel(long value) { this.level = new DecimalType(); this.level.setValue(value); return this; @@ -1410,7 +1342,7 @@ public class Statistic extends BackboneType implements ICompositeType { /** * @param value Use 95 for a 95% confidence interval. */ - public StatisticAttributeEstimateEstimateQualifierComponent setLevel(double value) { + public StatisticAttributeEstimateAttributeEstimateComponent setLevel(double value) { this.level = new DecimalType(); this.level.setValue(value); return this; @@ -1422,7 +1354,7 @@ public class Statistic extends BackboneType implements ICompositeType { public Range getRange() { if (this.range == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create StatisticAttributeEstimateEstimateQualifierComponent.range"); + throw new Error("Attempt to auto-create StatisticAttributeEstimateAttributeEstimateComponent.range"); else if (Configuration.doAutoCreate()) this.range = new Range(); // cc return this.range; @@ -1435,7 +1367,7 @@ public class Statistic extends BackboneType implements ICompositeType { /** * @param value {@link #range} (Lower bound of confidence interval.) */ - public StatisticAttributeEstimateEstimateQualifierComponent setRange(Range value) { + public StatisticAttributeEstimateAttributeEstimateComponent setRange(Range value) { this.range = value; return this; } @@ -1444,7 +1376,7 @@ public class Statistic extends BackboneType implements ICompositeType { super.listChildren(children); children.add(new Property("description", "string", "Human-readable summary of the estimate.", 0, 1, description)); children.add(new Property("note", "Annotation", "Footnote or explanatory note about the estimate.", 0, java.lang.Integer.MAX_VALUE, note)); - children.add(new Property("type", "CodeableConcept", "The estimateType of attribute estimate, eg confidence interval or p value type.", 0, 1, type)); + children.add(new Property("type", "CodeableConcept", "The type of attribute estimate, eg confidence interval or p value.", 0, 1, type)); children.add(new Property("quantity", "Quantity", "The singular quantity of the attribute estimate, for attribute estimates represented as single values; also used to report unit of measure.", 0, 1, quantity)); children.add(new Property("level", "decimal", "Use 95 for a 95% confidence interval.", 0, 1, level)); children.add(new Property("range", "Range", "Lower bound of confidence interval.", 0, 1, range)); @@ -1455,7 +1387,7 @@ public class Statistic extends BackboneType implements ICompositeType { switch (_hash) { case -1724546052: /*description*/ return new Property("description", "string", "Human-readable summary of the estimate.", 0, 1, description); case 3387378: /*note*/ return new Property("note", "Annotation", "Footnote or explanatory note about the estimate.", 0, java.lang.Integer.MAX_VALUE, note); - case 3575610: /*type*/ return new Property("type", "CodeableConcept", "The estimateType of attribute estimate, eg confidence interval or p value type.", 0, 1, type); + case 3575610: /*type*/ return new Property("type", "CodeableConcept", "The type of attribute estimate, eg confidence interval or p value.", 0, 1, type); case -1285004149: /*quantity*/ return new Property("quantity", "Quantity", "The singular quantity of the attribute estimate, for attribute estimates represented as single values; also used to report unit of measure.", 0, 1, quantity); case 102865796: /*level*/ return new Property("level", "decimal", "Use 95 for a 95% confidence interval.", 0, 1, level); case 108280125: /*range*/ return new Property("range", "Range", "Lower bound of confidence interval.", 0, 1, range); @@ -1554,7 +1486,7 @@ public class Statistic extends BackboneType implements ICompositeType { @Override public Base addChild(String name) throws FHIRException { if (name.equals("description")) { - throw new FHIRException("Cannot call addChild on a primitive type Statistic.attributeEstimate.estimateQualifier.description"); + throw new FHIRException("Cannot call addChild on a primitive type Statistic.attributeEstimate.attributeEstimate.description"); } else if (name.equals("note")) { return addNote(); @@ -1568,7 +1500,7 @@ public class Statistic extends BackboneType implements ICompositeType { return this.quantity; } else if (name.equals("level")) { - throw new FHIRException("Cannot call addChild on a primitive type Statistic.attributeEstimate.estimateQualifier.level"); + throw new FHIRException("Cannot call addChild on a primitive type Statistic.attributeEstimate.attributeEstimate.level"); } else if (name.equals("range")) { this.range = new Range(); @@ -1578,13 +1510,13 @@ public class Statistic extends BackboneType implements ICompositeType { return super.addChild(name); } - public StatisticAttributeEstimateEstimateQualifierComponent copy() { - StatisticAttributeEstimateEstimateQualifierComponent dst = new StatisticAttributeEstimateEstimateQualifierComponent(); + public StatisticAttributeEstimateAttributeEstimateComponent copy() { + StatisticAttributeEstimateAttributeEstimateComponent dst = new StatisticAttributeEstimateAttributeEstimateComponent(); copyValues(dst); return dst; } - public void copyValues(StatisticAttributeEstimateEstimateQualifierComponent dst) { + public void copyValues(StatisticAttributeEstimateAttributeEstimateComponent dst) { super.copyValues(dst); dst.description = description == null ? null : description.copy(); if (note != null) { @@ -1602,9 +1534,9 @@ public class Statistic extends BackboneType implements ICompositeType { public boolean equalsDeep(Base other_) { if (!super.equalsDeep(other_)) return false; - if (!(other_ instanceof StatisticAttributeEstimateEstimateQualifierComponent)) + if (!(other_ instanceof StatisticAttributeEstimateAttributeEstimateComponent)) return false; - StatisticAttributeEstimateEstimateQualifierComponent o = (StatisticAttributeEstimateEstimateQualifierComponent) other_; + StatisticAttributeEstimateAttributeEstimateComponent o = (StatisticAttributeEstimateAttributeEstimateComponent) other_; return compareDeep(description, o.description, true) && compareDeep(note, o.note, true) && compareDeep(type, o.type, true) && compareDeep(quantity, o.quantity, true) && compareDeep(level, o.level, true) && compareDeep(range, o.range, true) ; @@ -1614,9 +1546,9 @@ public class Statistic extends BackboneType implements ICompositeType { public boolean equalsShallow(Base other_) { if (!super.equalsShallow(other_)) return false; - if (!(other_ instanceof StatisticAttributeEstimateEstimateQualifierComponent)) + if (!(other_ instanceof StatisticAttributeEstimateAttributeEstimateComponent)) return false; - StatisticAttributeEstimateEstimateQualifierComponent o = (StatisticAttributeEstimateEstimateQualifierComponent) other_; + StatisticAttributeEstimateAttributeEstimateComponent o = (StatisticAttributeEstimateAttributeEstimateComponent) other_; return compareValues(description, o.description, true) && compareValues(level, o.level, true); } @@ -1626,7 +1558,837 @@ public class Statistic extends BackboneType implements ICompositeType { } public String fhirType() { - return "Statistic.attributeEstimate.estimateQualifier"; + return "Statistic.attributeEstimate.attributeEstimate"; + + } + + } + + @Block() + public static class StatisticModelCharacteristicComponent extends Element implements IBaseDatatypeElement { + /** + * Description of a component of the method to generate the statistic. + */ + @Child(name = "code", type = {CodeableConcept.class}, order=1, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="Model specification", formalDefinition="Description of a component of the method to generate the statistic." ) + @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/statistic-model-code") + protected CodeableConcept code; + + /** + * Further specification of a component of the method to generate the statistic. + */ + @Child(name = "value", type = {CodeableConcept.class, BooleanType.class, Quantity.class, Range.class}, order=2, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="Model specification details", formalDefinition="Further specification of a component of the method to generate the statistic." ) + @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/statistic-model-method") + protected DataType value; + + /** + * A variable adjusted for in the adjusted analysis. + */ + @Child(name = "variable", type = {}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="A variable adjusted for in the adjusted analysis", formalDefinition="A variable adjusted for in the adjusted analysis." ) + protected List variable; + + private static final long serialVersionUID = 215509186L; + + /** + * Constructor + */ + public StatisticModelCharacteristicComponent() { + super(); + } + + /** + * @return {@link #code} (Description of a component of the method to generate the statistic.) + */ + public CodeableConcept getCode() { + if (this.code == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create StatisticModelCharacteristicComponent.code"); + else if (Configuration.doAutoCreate()) + this.code = new CodeableConcept(); // cc + return this.code; + } + + public boolean hasCode() { + return this.code != null && !this.code.isEmpty(); + } + + /** + * @param value {@link #code} (Description of a component of the method to generate the statistic.) + */ + public StatisticModelCharacteristicComponent setCode(CodeableConcept value) { + this.code = value; + return this; + } + + /** + * @return {@link #value} (Further specification of a component of the method to generate the statistic.) + */ + public DataType getValue() { + return this.value; + } + + /** + * @return {@link #value} (Further specification of a component of the method to generate the statistic.) + */ + public CodeableConcept getValueCodeableConcept() throws FHIRException { + if (this.value == null) + this.value = new CodeableConcept(); + if (!(this.value instanceof CodeableConcept)) + throw new FHIRException("Type mismatch: the type CodeableConcept was expected, but "+this.value.getClass().getName()+" was encountered"); + return (CodeableConcept) this.value; + } + + public boolean hasValueCodeableConcept() { + return this != null && this.value instanceof CodeableConcept; + } + + /** + * @return {@link #value} (Further specification of a component of the method to generate the statistic.) + */ + public BooleanType getValueBooleanType() throws FHIRException { + if (this.value == null) + this.value = new BooleanType(); + if (!(this.value instanceof BooleanType)) + throw new FHIRException("Type mismatch: the type BooleanType was expected, but "+this.value.getClass().getName()+" was encountered"); + return (BooleanType) this.value; + } + + public boolean hasValueBooleanType() { + return this != null && this.value instanceof BooleanType; + } + + /** + * @return {@link #value} (Further specification of a component of the method to generate the statistic.) + */ + public Quantity getValueQuantity() throws FHIRException { + if (this.value == null) + this.value = new Quantity(); + if (!(this.value instanceof Quantity)) + throw new FHIRException("Type mismatch: the type Quantity was expected, but "+this.value.getClass().getName()+" was encountered"); + return (Quantity) this.value; + } + + public boolean hasValueQuantity() { + return this != null && this.value instanceof Quantity; + } + + /** + * @return {@link #value} (Further specification of a component of the method to generate the statistic.) + */ + public Range getValueRange() throws FHIRException { + if (this.value == null) + this.value = new Range(); + if (!(this.value instanceof Range)) + throw new FHIRException("Type mismatch: the type Range was expected, but "+this.value.getClass().getName()+" was encountered"); + return (Range) this.value; + } + + public boolean hasValueRange() { + return this != null && this.value instanceof Range; + } + + public boolean hasValue() { + return this.value != null && !this.value.isEmpty(); + } + + /** + * @param value {@link #value} (Further specification of a component of the method to generate the statistic.) + */ + public StatisticModelCharacteristicComponent setValue(DataType value) { + if (value != null && !(value instanceof CodeableConcept || value instanceof BooleanType || value instanceof Quantity || value instanceof Range)) + throw new Error("Not the right type for Statistic.modelCharacteristic.value[x]: "+value.fhirType()); + this.value = value; + return this; + } + + /** + * @return {@link #variable} (A variable adjusted for in the adjusted analysis.) + */ + public List getVariable() { + if (this.variable == null) + this.variable = new ArrayList(); + return this.variable; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public StatisticModelCharacteristicComponent setVariable(List theVariable) { + this.variable = theVariable; + return this; + } + + public boolean hasVariable() { + if (this.variable == null) + return false; + for (StatisticModelCharacteristicVariableComponent item : this.variable) + if (!item.isEmpty()) + return true; + return false; + } + + public StatisticModelCharacteristicVariableComponent addVariable() { //3 + StatisticModelCharacteristicVariableComponent t = new StatisticModelCharacteristicVariableComponent(); + if (this.variable == null) + this.variable = new ArrayList(); + this.variable.add(t); + return t; + } + + public StatisticModelCharacteristicComponent addVariable(StatisticModelCharacteristicVariableComponent t) { //3 + if (t == null) + return this; + if (this.variable == null) + this.variable = new ArrayList(); + this.variable.add(t); + return this; + } + + /** + * @return The first repetition of repeating field {@link #variable}, creating it if it does not already exist {3} + */ + public StatisticModelCharacteristicVariableComponent getVariableFirstRep() { + if (getVariable().isEmpty()) { + addVariable(); + } + return getVariable().get(0); + } + + protected void listChildren(List children) { + super.listChildren(children); + children.add(new Property("code", "CodeableConcept", "Description of a component of the method to generate the statistic.", 0, 1, code)); + children.add(new Property("value[x]", "CodeableConcept|boolean|Quantity|Range", "Further specification of a component of the method to generate the statistic.", 0, 1, value)); + children.add(new Property("variable", "", "A variable adjusted for in the adjusted analysis.", 0, java.lang.Integer.MAX_VALUE, variable)); + } + + @Override + public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { + switch (_hash) { + case 3059181: /*code*/ return new Property("code", "CodeableConcept", "Description of a component of the method to generate the statistic.", 0, 1, code); + case -1410166417: /*value[x]*/ return new Property("value[x]", "CodeableConcept|boolean|Quantity|Range", "Further specification of a component of the method to generate the statistic.", 0, 1, value); + case 111972721: /*value*/ return new Property("value[x]", "CodeableConcept|boolean|Quantity|Range", "Further specification of a component of the method to generate the statistic.", 0, 1, value); + case 924902896: /*valueCodeableConcept*/ return new Property("value[x]", "CodeableConcept", "Further specification of a component of the method to generate the statistic.", 0, 1, value); + case 733421943: /*valueBoolean*/ return new Property("value[x]", "boolean", "Further specification of a component of the method to generate the statistic.", 0, 1, value); + case -2029823716: /*valueQuantity*/ return new Property("value[x]", "Quantity", "Further specification of a component of the method to generate the statistic.", 0, 1, value); + case 2030761548: /*valueRange*/ return new Property("value[x]", "Range", "Further specification of a component of the method to generate the statistic.", 0, 1, value); + case -1249586564: /*variable*/ return new Property("variable", "", "A variable adjusted for in the adjusted analysis.", 0, java.lang.Integer.MAX_VALUE, variable); + default: return super.getNamedProperty(_hash, _name, _checkValid); + } + + } + + @Override + public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException { + switch (hash) { + case 3059181: /*code*/ return this.code == null ? new Base[0] : new Base[] {this.code}; // CodeableConcept + case 111972721: /*value*/ return this.value == null ? new Base[0] : new Base[] {this.value}; // DataType + case -1249586564: /*variable*/ return this.variable == null ? new Base[0] : this.variable.toArray(new Base[this.variable.size()]); // StatisticModelCharacteristicVariableComponent + default: return super.getProperty(hash, name, checkValid); + } + + } + + @Override + public Base setProperty(int hash, String name, Base value) throws FHIRException { + switch (hash) { + case 3059181: // code + this.code = TypeConvertor.castToCodeableConcept(value); // CodeableConcept + return value; + case 111972721: // value + this.value = TypeConvertor.castToType(value); // DataType + return value; + case -1249586564: // variable + this.getVariable().add((StatisticModelCharacteristicVariableComponent) value); // StatisticModelCharacteristicVariableComponent + return value; + default: return super.setProperty(hash, name, value); + } + + } + + @Override + public Base setProperty(String name, Base value) throws FHIRException { + if (name.equals("code")) { + this.code = TypeConvertor.castToCodeableConcept(value); // CodeableConcept + } else if (name.equals("value[x]")) { + this.value = TypeConvertor.castToType(value); // DataType + } else if (name.equals("variable")) { + this.getVariable().add((StatisticModelCharacteristicVariableComponent) value); + } else + return super.setProperty(name, value); + return value; + } + + @Override + public Base makeProperty(int hash, String name) throws FHIRException { + switch (hash) { + case 3059181: return getCode(); + case -1410166417: return getValue(); + case 111972721: return getValue(); + case -1249586564: return addVariable(); + default: return super.makeProperty(hash, name); + } + + } + + @Override + public String[] getTypesForProperty(int hash, String name) throws FHIRException { + switch (hash) { + case 3059181: /*code*/ return new String[] {"CodeableConcept"}; + case 111972721: /*value*/ return new String[] {"CodeableConcept", "boolean", "Quantity", "Range"}; + case -1249586564: /*variable*/ return new String[] {}; + default: return super.getTypesForProperty(hash, name); + } + + } + + @Override + public Base addChild(String name) throws FHIRException { + if (name.equals("code")) { + this.code = new CodeableConcept(); + return this.code; + } + else if (name.equals("valueCodeableConcept")) { + this.value = new CodeableConcept(); + return this.value; + } + else if (name.equals("valueBoolean")) { + this.value = new BooleanType(); + return this.value; + } + else if (name.equals("valueQuantity")) { + this.value = new Quantity(); + return this.value; + } + else if (name.equals("valueRange")) { + this.value = new Range(); + return this.value; + } + else if (name.equals("variable")) { + return addVariable(); + } + else + return super.addChild(name); + } + + public StatisticModelCharacteristicComponent copy() { + StatisticModelCharacteristicComponent dst = new StatisticModelCharacteristicComponent(); + copyValues(dst); + return dst; + } + + public void copyValues(StatisticModelCharacteristicComponent dst) { + super.copyValues(dst); + dst.code = code == null ? null : code.copy(); + dst.value = value == null ? null : value.copy(); + if (variable != null) { + dst.variable = new ArrayList(); + for (StatisticModelCharacteristicVariableComponent i : variable) + dst.variable.add(i.copy()); + }; + } + + @Override + public boolean equalsDeep(Base other_) { + if (!super.equalsDeep(other_)) + return false; + if (!(other_ instanceof StatisticModelCharacteristicComponent)) + return false; + StatisticModelCharacteristicComponent o = (StatisticModelCharacteristicComponent) other_; + return compareDeep(code, o.code, true) && compareDeep(value, o.value, true) && compareDeep(variable, o.variable, true) + ; + } + + @Override + public boolean equalsShallow(Base other_) { + if (!super.equalsShallow(other_)) + return false; + if (!(other_ instanceof StatisticModelCharacteristicComponent)) + return false; + StatisticModelCharacteristicComponent o = (StatisticModelCharacteristicComponent) other_; + return true; + } + + public boolean isEmpty() { + return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(code, value, variable); + } + + public String fhirType() { + return "Statistic.modelCharacteristic"; + + } + + } + + @Block() + public static class StatisticModelCharacteristicVariableComponent extends Element implements IBaseDatatypeElement { + /** + * Description of the variable. + */ + @Child(name = "variableDefinition", type = {Group.class, EvidenceVariable.class}, order=1, min=1, max=1, modifier=false, summary=true) + @Description(shortDefinition="Description of the variable", formalDefinition="Description of the variable." ) + protected Reference variableDefinition; + + /** + * How the variable is classified for use in adjusted analysis. + */ + @Child(name = "handling", type = {CodeType.class}, order=2, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="continuous | dichotomous | ordinal | polychotomous", formalDefinition="How the variable is classified for use in adjusted analysis." ) + @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/variable-handling") + protected Enumeration handling; + + /** + * Description for grouping of ordinal or polychotomous variables. + */ + @Child(name = "valueCategory", type = {CodeableConcept.class}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="Description for grouping of ordinal or polychotomous variables", formalDefinition="Description for grouping of ordinal or polychotomous variables." ) + protected List valueCategory; + + /** + * Discrete value for grouping of ordinal or polychotomous variables. + */ + @Child(name = "valueQuantity", type = {Quantity.class}, order=4, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="Discrete value for grouping of ordinal or polychotomous variables", formalDefinition="Discrete value for grouping of ordinal or polychotomous variables." ) + protected List valueQuantity; + + /** + * Range of values for grouping of ordinal or polychotomous variables. + */ + @Child(name = "valueRange", type = {Range.class}, order=5, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="Range of values for grouping of ordinal or polychotomous variables", formalDefinition="Range of values for grouping of ordinal or polychotomous variables." ) + protected List valueRange; + + private static final long serialVersionUID = 1516174900L; + + /** + * Constructor + */ + public StatisticModelCharacteristicVariableComponent() { + super(); + } + + /** + * Constructor + */ + public StatisticModelCharacteristicVariableComponent(Reference variableDefinition) { + super(); + this.setVariableDefinition(variableDefinition); + } + + /** + * @return {@link #variableDefinition} (Description of the variable.) + */ + public Reference getVariableDefinition() { + if (this.variableDefinition == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create StatisticModelCharacteristicVariableComponent.variableDefinition"); + else if (Configuration.doAutoCreate()) + this.variableDefinition = new Reference(); // cc + return this.variableDefinition; + } + + public boolean hasVariableDefinition() { + return this.variableDefinition != null && !this.variableDefinition.isEmpty(); + } + + /** + * @param value {@link #variableDefinition} (Description of the variable.) + */ + public StatisticModelCharacteristicVariableComponent setVariableDefinition(Reference value) { + this.variableDefinition = value; + return this; + } + + /** + * @return {@link #handling} (How the variable is classified for use in adjusted analysis.). This is the underlying object with id, value and extensions. The accessor "getHandling" gives direct access to the value + */ + public Enumeration getHandlingElement() { + if (this.handling == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create StatisticModelCharacteristicVariableComponent.handling"); + else if (Configuration.doAutoCreate()) + this.handling = new Enumeration(new EvidenceVariableHandlingEnumFactory()); // bb + return this.handling; + } + + public boolean hasHandlingElement() { + return this.handling != null && !this.handling.isEmpty(); + } + + public boolean hasHandling() { + return this.handling != null && !this.handling.isEmpty(); + } + + /** + * @param value {@link #handling} (How the variable is classified for use in adjusted analysis.). This is the underlying object with id, value and extensions. The accessor "getHandling" gives direct access to the value + */ + public StatisticModelCharacteristicVariableComponent setHandlingElement(Enumeration value) { + this.handling = value; + return this; + } + + /** + * @return How the variable is classified for use in adjusted analysis. + */ + public EvidenceVariableHandling getHandling() { + return this.handling == null ? null : this.handling.getValue(); + } + + /** + * @param value How the variable is classified for use in adjusted analysis. + */ + public StatisticModelCharacteristicVariableComponent setHandling(EvidenceVariableHandling value) { + if (value == null) + this.handling = null; + else { + if (this.handling == null) + this.handling = new Enumeration(new EvidenceVariableHandlingEnumFactory()); + this.handling.setValue(value); + } + return this; + } + + /** + * @return {@link #valueCategory} (Description for grouping of ordinal or polychotomous variables.) + */ + public List getValueCategory() { + if (this.valueCategory == null) + this.valueCategory = new ArrayList(); + return this.valueCategory; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public StatisticModelCharacteristicVariableComponent setValueCategory(List theValueCategory) { + this.valueCategory = theValueCategory; + return this; + } + + public boolean hasValueCategory() { + if (this.valueCategory == null) + return false; + for (CodeableConcept item : this.valueCategory) + if (!item.isEmpty()) + return true; + return false; + } + + public CodeableConcept addValueCategory() { //3 + CodeableConcept t = new CodeableConcept(); + if (this.valueCategory == null) + this.valueCategory = new ArrayList(); + this.valueCategory.add(t); + return t; + } + + public StatisticModelCharacteristicVariableComponent addValueCategory(CodeableConcept t) { //3 + if (t == null) + return this; + if (this.valueCategory == null) + this.valueCategory = new ArrayList(); + this.valueCategory.add(t); + return this; + } + + /** + * @return The first repetition of repeating field {@link #valueCategory}, creating it if it does not already exist {3} + */ + public CodeableConcept getValueCategoryFirstRep() { + if (getValueCategory().isEmpty()) { + addValueCategory(); + } + return getValueCategory().get(0); + } + + /** + * @return {@link #valueQuantity} (Discrete value for grouping of ordinal or polychotomous variables.) + */ + public List getValueQuantity() { + if (this.valueQuantity == null) + this.valueQuantity = new ArrayList(); + return this.valueQuantity; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public StatisticModelCharacteristicVariableComponent setValueQuantity(List theValueQuantity) { + this.valueQuantity = theValueQuantity; + return this; + } + + public boolean hasValueQuantity() { + if (this.valueQuantity == null) + return false; + for (Quantity item : this.valueQuantity) + if (!item.isEmpty()) + return true; + return false; + } + + public Quantity addValueQuantity() { //3 + Quantity t = new Quantity(); + if (this.valueQuantity == null) + this.valueQuantity = new ArrayList(); + this.valueQuantity.add(t); + return t; + } + + public StatisticModelCharacteristicVariableComponent addValueQuantity(Quantity t) { //3 + if (t == null) + return this; + if (this.valueQuantity == null) + this.valueQuantity = new ArrayList(); + this.valueQuantity.add(t); + return this; + } + + /** + * @return The first repetition of repeating field {@link #valueQuantity}, creating it if it does not already exist {3} + */ + public Quantity getValueQuantityFirstRep() { + if (getValueQuantity().isEmpty()) { + addValueQuantity(); + } + return getValueQuantity().get(0); + } + + /** + * @return {@link #valueRange} (Range of values for grouping of ordinal or polychotomous variables.) + */ + public List getValueRange() { + if (this.valueRange == null) + this.valueRange = new ArrayList(); + return this.valueRange; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public StatisticModelCharacteristicVariableComponent setValueRange(List theValueRange) { + this.valueRange = theValueRange; + return this; + } + + public boolean hasValueRange() { + if (this.valueRange == null) + return false; + for (Range item : this.valueRange) + if (!item.isEmpty()) + return true; + return false; + } + + public Range addValueRange() { //3 + Range t = new Range(); + if (this.valueRange == null) + this.valueRange = new ArrayList(); + this.valueRange.add(t); + return t; + } + + public StatisticModelCharacteristicVariableComponent addValueRange(Range t) { //3 + if (t == null) + return this; + if (this.valueRange == null) + this.valueRange = new ArrayList(); + this.valueRange.add(t); + return this; + } + + /** + * @return The first repetition of repeating field {@link #valueRange}, creating it if it does not already exist {3} + */ + public Range getValueRangeFirstRep() { + if (getValueRange().isEmpty()) { + addValueRange(); + } + return getValueRange().get(0); + } + + protected void listChildren(List children) { + super.listChildren(children); + children.add(new Property("variableDefinition", "Reference(Group|EvidenceVariable)", "Description of the variable.", 0, 1, variableDefinition)); + children.add(new Property("handling", "code", "How the variable is classified for use in adjusted analysis.", 0, 1, handling)); + children.add(new Property("valueCategory", "CodeableConcept", "Description for grouping of ordinal or polychotomous variables.", 0, java.lang.Integer.MAX_VALUE, valueCategory)); + children.add(new Property("valueQuantity", "Quantity", "Discrete value for grouping of ordinal or polychotomous variables.", 0, java.lang.Integer.MAX_VALUE, valueQuantity)); + children.add(new Property("valueRange", "Range", "Range of values for grouping of ordinal or polychotomous variables.", 0, java.lang.Integer.MAX_VALUE, valueRange)); + } + + @Override + public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { + switch (_hash) { + case -1807222545: /*variableDefinition*/ return new Property("variableDefinition", "Reference(Group|EvidenceVariable)", "Description of the variable.", 0, 1, variableDefinition); + case 2072805: /*handling*/ return new Property("handling", "code", "How the variable is classified for use in adjusted analysis.", 0, 1, handling); + case -694308465: /*valueCategory*/ return new Property("valueCategory", "CodeableConcept", "Description for grouping of ordinal or polychotomous variables.", 0, java.lang.Integer.MAX_VALUE, valueCategory); + case -2029823716: /*valueQuantity*/ return new Property("valueQuantity", "Quantity", "Discrete value for grouping of ordinal or polychotomous variables.", 0, java.lang.Integer.MAX_VALUE, valueQuantity); + case 2030761548: /*valueRange*/ return new Property("valueRange", "Range", "Range of values for grouping of ordinal or polychotomous variables.", 0, java.lang.Integer.MAX_VALUE, valueRange); + default: return super.getNamedProperty(_hash, _name, _checkValid); + } + + } + + @Override + public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException { + switch (hash) { + case -1807222545: /*variableDefinition*/ return this.variableDefinition == null ? new Base[0] : new Base[] {this.variableDefinition}; // Reference + case 2072805: /*handling*/ return this.handling == null ? new Base[0] : new Base[] {this.handling}; // Enumeration + case -694308465: /*valueCategory*/ return this.valueCategory == null ? new Base[0] : this.valueCategory.toArray(new Base[this.valueCategory.size()]); // CodeableConcept + case -2029823716: /*valueQuantity*/ return this.valueQuantity == null ? new Base[0] : this.valueQuantity.toArray(new Base[this.valueQuantity.size()]); // Quantity + case 2030761548: /*valueRange*/ return this.valueRange == null ? new Base[0] : this.valueRange.toArray(new Base[this.valueRange.size()]); // Range + default: return super.getProperty(hash, name, checkValid); + } + + } + + @Override + public Base setProperty(int hash, String name, Base value) throws FHIRException { + switch (hash) { + case -1807222545: // variableDefinition + this.variableDefinition = TypeConvertor.castToReference(value); // Reference + return value; + case 2072805: // handling + value = new EvidenceVariableHandlingEnumFactory().fromType(TypeConvertor.castToCode(value)); + this.handling = (Enumeration) value; // Enumeration + return value; + case -694308465: // valueCategory + this.getValueCategory().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept + return value; + case -2029823716: // valueQuantity + this.getValueQuantity().add(TypeConvertor.castToQuantity(value)); // Quantity + return value; + case 2030761548: // valueRange + this.getValueRange().add(TypeConvertor.castToRange(value)); // Range + return value; + default: return super.setProperty(hash, name, value); + } + + } + + @Override + public Base setProperty(String name, Base value) throws FHIRException { + if (name.equals("variableDefinition")) { + this.variableDefinition = TypeConvertor.castToReference(value); // Reference + } else if (name.equals("handling")) { + value = new EvidenceVariableHandlingEnumFactory().fromType(TypeConvertor.castToCode(value)); + this.handling = (Enumeration) value; // Enumeration + } else if (name.equals("valueCategory")) { + this.getValueCategory().add(TypeConvertor.castToCodeableConcept(value)); + } else if (name.equals("valueQuantity")) { + this.getValueQuantity().add(TypeConvertor.castToQuantity(value)); + } else if (name.equals("valueRange")) { + this.getValueRange().add(TypeConvertor.castToRange(value)); + } else + return super.setProperty(name, value); + return value; + } + + @Override + public Base makeProperty(int hash, String name) throws FHIRException { + switch (hash) { + case -1807222545: return getVariableDefinition(); + case 2072805: return getHandlingElement(); + case -694308465: return addValueCategory(); + case -2029823716: return addValueQuantity(); + case 2030761548: return addValueRange(); + default: return super.makeProperty(hash, name); + } + + } + + @Override + public String[] getTypesForProperty(int hash, String name) throws FHIRException { + switch (hash) { + case -1807222545: /*variableDefinition*/ return new String[] {"Reference"}; + case 2072805: /*handling*/ return new String[] {"code"}; + case -694308465: /*valueCategory*/ return new String[] {"CodeableConcept"}; + case -2029823716: /*valueQuantity*/ return new String[] {"Quantity"}; + case 2030761548: /*valueRange*/ return new String[] {"Range"}; + default: return super.getTypesForProperty(hash, name); + } + + } + + @Override + public Base addChild(String name) throws FHIRException { + if (name.equals("variableDefinition")) { + this.variableDefinition = new Reference(); + return this.variableDefinition; + } + else if (name.equals("handling")) { + throw new FHIRException("Cannot call addChild on a primitive type Statistic.modelCharacteristic.variable.handling"); + } + else if (name.equals("valueCategory")) { + return addValueCategory(); + } + else if (name.equals("valueQuantity")) { + return addValueQuantity(); + } + else if (name.equals("valueRange")) { + return addValueRange(); + } + else + return super.addChild(name); + } + + public StatisticModelCharacteristicVariableComponent copy() { + StatisticModelCharacteristicVariableComponent dst = new StatisticModelCharacteristicVariableComponent(); + copyValues(dst); + return dst; + } + + public void copyValues(StatisticModelCharacteristicVariableComponent dst) { + super.copyValues(dst); + dst.variableDefinition = variableDefinition == null ? null : variableDefinition.copy(); + dst.handling = handling == null ? null : handling.copy(); + if (valueCategory != null) { + dst.valueCategory = new ArrayList(); + for (CodeableConcept i : valueCategory) + dst.valueCategory.add(i.copy()); + }; + if (valueQuantity != null) { + dst.valueQuantity = new ArrayList(); + for (Quantity i : valueQuantity) + dst.valueQuantity.add(i.copy()); + }; + if (valueRange != null) { + dst.valueRange = new ArrayList(); + for (Range i : valueRange) + dst.valueRange.add(i.copy()); + }; + } + + @Override + public boolean equalsDeep(Base other_) { + if (!super.equalsDeep(other_)) + return false; + if (!(other_ instanceof StatisticModelCharacteristicVariableComponent)) + return false; + StatisticModelCharacteristicVariableComponent o = (StatisticModelCharacteristicVariableComponent) other_; + return compareDeep(variableDefinition, o.variableDefinition, true) && compareDeep(handling, o.handling, true) + && compareDeep(valueCategory, o.valueCategory, true) && compareDeep(valueQuantity, o.valueQuantity, true) + && compareDeep(valueRange, o.valueRange, true); + } + + @Override + public boolean equalsShallow(Base other_) { + if (!super.equalsShallow(other_)) + return false; + if (!(other_ instanceof StatisticModelCharacteristicVariableComponent)) + return false; + StatisticModelCharacteristicVariableComponent o = (StatisticModelCharacteristicVariableComponent) other_; + return compareValues(handling, o.handling, true); + } + + public boolean isEmpty() { + return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(variableDefinition, handling + , valueCategory, valueQuantity, valueRange); + } + + public String fhirType() { + return "Statistic.modelCharacteristic.variable"; } @@ -1661,21 +2423,35 @@ public class Statistic extends BackboneType implements ICompositeType { @Description(shortDefinition="Statistic value", formalDefinition="Statistic value." ) protected Quantity quantity; + /** + * The number of events associated with the statistic. + */ + @Child(name = "numberOfEvents", type = {IntegerType.class}, order=4, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="The number of events associated with the statistic", formalDefinition="The number of events associated with the statistic." ) + protected IntegerType numberOfEvents; + /** * Number of samples in the statistic. */ - @Child(name = "sampleSize", type = {}, order=4, min=0, max=1, modifier=false, summary=true) + @Child(name = "sampleSize", type = {}, order=5, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Number of samples in the statistic", formalDefinition="Number of samples in the statistic." ) protected StatisticSampleSizeComponent sampleSize; /** - * An estimate of the precision of the statistic. + * A statistical attribute of the statistic such as a measure of heterogeneity. */ - @Child(name = "attributeEstimate", type = {}, order=5, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="An estimate of the precision of the statistic", formalDefinition="An estimate of the precision of the statistic." ) + @Child(name = "attributeEstimate", type = {}, order=6, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="An attribute of the Statistic", formalDefinition="A statistical attribute of the statistic such as a measure of heterogeneity." ) protected List attributeEstimate; - private static final long serialVersionUID = 1999038309L; + /** + * A component of the method to generate the statistic. + */ + @Child(name = "modelCharacteristic", type = {}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="Model characteristic", formalDefinition="A component of the method to generate the statistic." ) + protected List modelCharacteristic; + + private static final long serialVersionUID = -1410335525L; /** * Constructor @@ -1834,6 +2610,51 @@ public class Statistic extends BackboneType implements ICompositeType { return this; } + /** + * @return {@link #numberOfEvents} (The number of events associated with the statistic.). This is the underlying object with id, value and extensions. The accessor "getNumberOfEvents" gives direct access to the value + */ + public IntegerType getNumberOfEventsElement() { + if (this.numberOfEvents == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create Statistic.numberOfEvents"); + else if (Configuration.doAutoCreate()) + this.numberOfEvents = new IntegerType(); // bb + return this.numberOfEvents; + } + + public boolean hasNumberOfEventsElement() { + return this.numberOfEvents != null && !this.numberOfEvents.isEmpty(); + } + + public boolean hasNumberOfEvents() { + return this.numberOfEvents != null && !this.numberOfEvents.isEmpty(); + } + + /** + * @param value {@link #numberOfEvents} (The number of events associated with the statistic.). This is the underlying object with id, value and extensions. The accessor "getNumberOfEvents" gives direct access to the value + */ + public Statistic setNumberOfEventsElement(IntegerType value) { + this.numberOfEvents = value; + return this; + } + + /** + * @return The number of events associated with the statistic. + */ + public int getNumberOfEvents() { + return this.numberOfEvents == null || this.numberOfEvents.isEmpty() ? 0 : this.numberOfEvents.getValue(); + } + + /** + * @param value The number of events associated with the statistic. + */ + public Statistic setNumberOfEvents(int value) { + if (this.numberOfEvents == null) + this.numberOfEvents = new IntegerType(); + this.numberOfEvents.setValue(value); + return this; + } + /** * @return {@link #sampleSize} (Number of samples in the statistic.) */ @@ -1859,7 +2680,7 @@ public class Statistic extends BackboneType implements ICompositeType { } /** - * @return {@link #attributeEstimate} (An estimate of the precision of the statistic.) + * @return {@link #attributeEstimate} (A statistical attribute of the statistic such as a measure of heterogeneity.) */ public List getAttributeEstimate() { if (this.attributeEstimate == null) @@ -1911,14 +2732,69 @@ public class Statistic extends BackboneType implements ICompositeType { return getAttributeEstimate().get(0); } + /** + * @return {@link #modelCharacteristic} (A component of the method to generate the statistic.) + */ + public List getModelCharacteristic() { + if (this.modelCharacteristic == null) + this.modelCharacteristic = new ArrayList(); + return this.modelCharacteristic; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public Statistic setModelCharacteristic(List theModelCharacteristic) { + this.modelCharacteristic = theModelCharacteristic; + return this; + } + + public boolean hasModelCharacteristic() { + if (this.modelCharacteristic == null) + return false; + for (StatisticModelCharacteristicComponent item : this.modelCharacteristic) + if (!item.isEmpty()) + return true; + return false; + } + + public StatisticModelCharacteristicComponent addModelCharacteristic() { //3 + StatisticModelCharacteristicComponent t = new StatisticModelCharacteristicComponent(); + if (this.modelCharacteristic == null) + this.modelCharacteristic = new ArrayList(); + this.modelCharacteristic.add(t); + return t; + } + + public Statistic addModelCharacteristic(StatisticModelCharacteristicComponent t) { //3 + if (t == null) + return this; + if (this.modelCharacteristic == null) + this.modelCharacteristic = new ArrayList(); + this.modelCharacteristic.add(t); + return this; + } + + /** + * @return The first repetition of repeating field {@link #modelCharacteristic}, creating it if it does not already exist {3} + */ + public StatisticModelCharacteristicComponent getModelCharacteristicFirstRep() { + if (getModelCharacteristic().isEmpty()) { + addModelCharacteristic(); + } + return getModelCharacteristic().get(0); + } + protected void listChildren(List children) { super.listChildren(children); children.add(new Property("description", "string", "A description of the content value of the statistic.", 0, 1, description)); children.add(new Property("note", "Annotation", "Footnotes and/or explanatory notes.", 0, java.lang.Integer.MAX_VALUE, note)); children.add(new Property("statisticType", "CodeableConcept", "Type of statistic, eg relative risk.", 0, 1, statisticType)); children.add(new Property("quantity", "Quantity", "Statistic value.", 0, 1, quantity)); + children.add(new Property("numberOfEvents", "integer", "The number of events associated with the statistic.", 0, 1, numberOfEvents)); children.add(new Property("sampleSize", "", "Number of samples in the statistic.", 0, 1, sampleSize)); - children.add(new Property("attributeEstimate", "", "An estimate of the precision of the statistic.", 0, java.lang.Integer.MAX_VALUE, attributeEstimate)); + children.add(new Property("attributeEstimate", "", "A statistical attribute of the statistic such as a measure of heterogeneity.", 0, java.lang.Integer.MAX_VALUE, attributeEstimate)); + children.add(new Property("modelCharacteristic", "", "A component of the method to generate the statistic.", 0, java.lang.Integer.MAX_VALUE, modelCharacteristic)); } @Override @@ -1928,8 +2804,10 @@ public class Statistic extends BackboneType implements ICompositeType { case 3387378: /*note*/ return new Property("note", "Annotation", "Footnotes and/or explanatory notes.", 0, java.lang.Integer.MAX_VALUE, note); case -392342358: /*statisticType*/ return new Property("statisticType", "CodeableConcept", "Type of statistic, eg relative risk.", 0, 1, statisticType); case -1285004149: /*quantity*/ return new Property("quantity", "Quantity", "Statistic value.", 0, 1, quantity); + case 1534510137: /*numberOfEvents*/ return new Property("numberOfEvents", "integer", "The number of events associated with the statistic.", 0, 1, numberOfEvents); case 143123659: /*sampleSize*/ return new Property("sampleSize", "", "Number of samples in the statistic.", 0, 1, sampleSize); - case -1539581980: /*attributeEstimate*/ return new Property("attributeEstimate", "", "An estimate of the precision of the statistic.", 0, java.lang.Integer.MAX_VALUE, attributeEstimate); + case -1539581980: /*attributeEstimate*/ return new Property("attributeEstimate", "", "A statistical attribute of the statistic such as a measure of heterogeneity.", 0, java.lang.Integer.MAX_VALUE, attributeEstimate); + case 274795812: /*modelCharacteristic*/ return new Property("modelCharacteristic", "", "A component of the method to generate the statistic.", 0, java.lang.Integer.MAX_VALUE, modelCharacteristic); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -1942,8 +2820,10 @@ public class Statistic extends BackboneType implements ICompositeType { case 3387378: /*note*/ return this.note == null ? new Base[0] : this.note.toArray(new Base[this.note.size()]); // Annotation case -392342358: /*statisticType*/ return this.statisticType == null ? new Base[0] : new Base[] {this.statisticType}; // CodeableConcept case -1285004149: /*quantity*/ return this.quantity == null ? new Base[0] : new Base[] {this.quantity}; // Quantity + case 1534510137: /*numberOfEvents*/ return this.numberOfEvents == null ? new Base[0] : new Base[] {this.numberOfEvents}; // IntegerType case 143123659: /*sampleSize*/ return this.sampleSize == null ? new Base[0] : new Base[] {this.sampleSize}; // StatisticSampleSizeComponent case -1539581980: /*attributeEstimate*/ return this.attributeEstimate == null ? new Base[0] : this.attributeEstimate.toArray(new Base[this.attributeEstimate.size()]); // StatisticAttributeEstimateComponent + case 274795812: /*modelCharacteristic*/ return this.modelCharacteristic == null ? new Base[0] : this.modelCharacteristic.toArray(new Base[this.modelCharacteristic.size()]); // StatisticModelCharacteristicComponent default: return super.getProperty(hash, name, checkValid); } @@ -1964,12 +2844,18 @@ public class Statistic extends BackboneType implements ICompositeType { case -1285004149: // quantity this.quantity = TypeConvertor.castToQuantity(value); // Quantity return value; + case 1534510137: // numberOfEvents + this.numberOfEvents = TypeConvertor.castToInteger(value); // IntegerType + return value; case 143123659: // sampleSize this.sampleSize = (StatisticSampleSizeComponent) value; // StatisticSampleSizeComponent return value; case -1539581980: // attributeEstimate this.getAttributeEstimate().add((StatisticAttributeEstimateComponent) value); // StatisticAttributeEstimateComponent return value; + case 274795812: // modelCharacteristic + this.getModelCharacteristic().add((StatisticModelCharacteristicComponent) value); // StatisticModelCharacteristicComponent + return value; default: return super.setProperty(hash, name, value); } @@ -1985,10 +2871,14 @@ public class Statistic extends BackboneType implements ICompositeType { this.statisticType = TypeConvertor.castToCodeableConcept(value); // CodeableConcept } else if (name.equals("quantity")) { this.quantity = TypeConvertor.castToQuantity(value); // Quantity + } else if (name.equals("numberOfEvents")) { + this.numberOfEvents = TypeConvertor.castToInteger(value); // IntegerType } else if (name.equals("sampleSize")) { this.sampleSize = (StatisticSampleSizeComponent) value; // StatisticSampleSizeComponent } else if (name.equals("attributeEstimate")) { this.getAttributeEstimate().add((StatisticAttributeEstimateComponent) value); + } else if (name.equals("modelCharacteristic")) { + this.getModelCharacteristic().add((StatisticModelCharacteristicComponent) value); } else return super.setProperty(name, value); return value; @@ -2001,8 +2891,10 @@ public class Statistic extends BackboneType implements ICompositeType { case 3387378: return addNote(); case -392342358: return getStatisticType(); case -1285004149: return getQuantity(); + case 1534510137: return getNumberOfEventsElement(); case 143123659: return getSampleSize(); case -1539581980: return addAttributeEstimate(); + case 274795812: return addModelCharacteristic(); default: return super.makeProperty(hash, name); } @@ -2015,8 +2907,10 @@ public class Statistic extends BackboneType implements ICompositeType { case 3387378: /*note*/ return new String[] {"Annotation"}; case -392342358: /*statisticType*/ return new String[] {"CodeableConcept"}; case -1285004149: /*quantity*/ return new String[] {"Quantity"}; + case 1534510137: /*numberOfEvents*/ return new String[] {"integer"}; case 143123659: /*sampleSize*/ return new String[] {}; case -1539581980: /*attributeEstimate*/ return new String[] {}; + case 274795812: /*modelCharacteristic*/ return new String[] {}; default: return super.getTypesForProperty(hash, name); } @@ -2038,6 +2932,9 @@ public class Statistic extends BackboneType implements ICompositeType { this.quantity = new Quantity(); return this.quantity; } + else if (name.equals("numberOfEvents")) { + throw new FHIRException("Cannot call addChild on a primitive type Statistic.numberOfEvents"); + } else if (name.equals("sampleSize")) { this.sampleSize = new StatisticSampleSizeComponent(); return this.sampleSize; @@ -2045,6 +2942,9 @@ public class Statistic extends BackboneType implements ICompositeType { else if (name.equals("attributeEstimate")) { return addAttributeEstimate(); } + else if (name.equals("modelCharacteristic")) { + return addModelCharacteristic(); + } else return super.addChild(name); } @@ -2070,12 +2970,18 @@ public class Statistic extends BackboneType implements ICompositeType { }; dst.statisticType = statisticType == null ? null : statisticType.copy(); dst.quantity = quantity == null ? null : quantity.copy(); + dst.numberOfEvents = numberOfEvents == null ? null : numberOfEvents.copy(); dst.sampleSize = sampleSize == null ? null : sampleSize.copy(); if (attributeEstimate != null) { dst.attributeEstimate = new ArrayList(); for (StatisticAttributeEstimateComponent i : attributeEstimate) dst.attributeEstimate.add(i.copy()); }; + if (modelCharacteristic != null) { + dst.modelCharacteristic = new ArrayList(); + for (StatisticModelCharacteristicComponent i : modelCharacteristic) + dst.modelCharacteristic.add(i.copy()); + }; } protected Statistic typedCopy() { @@ -2090,8 +2996,9 @@ public class Statistic extends BackboneType implements ICompositeType { return false; Statistic o = (Statistic) other_; return compareDeep(description, o.description, true) && compareDeep(note, o.note, true) && compareDeep(statisticType, o.statisticType, true) - && compareDeep(quantity, o.quantity, true) && compareDeep(sampleSize, o.sampleSize, true) && compareDeep(attributeEstimate, o.attributeEstimate, true) - ; + && compareDeep(quantity, o.quantity, true) && compareDeep(numberOfEvents, o.numberOfEvents, true) + && compareDeep(sampleSize, o.sampleSize, true) && compareDeep(attributeEstimate, o.attributeEstimate, true) + && compareDeep(modelCharacteristic, o.modelCharacteristic, true); } @Override @@ -2101,13 +3008,15 @@ public class Statistic extends BackboneType implements ICompositeType { if (!(other_ instanceof Statistic)) return false; Statistic o = (Statistic) other_; - return compareValues(description, o.description, true); + return compareValues(description, o.description, true) && compareValues(numberOfEvents, o.numberOfEvents, true) + ; } public boolean isEmpty() { return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(description, note, statisticType - , quantity, sampleSize, attributeEstimate); + , quantity, numberOfEvents, sampleSize, attributeEstimate, modelCharacteristic); } -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/StructureDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/StructureDefinition.java index 1a3128b2b..32c1c8b89 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/StructureDefinition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/StructureDefinition.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.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.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 FHIR structure. This resource is used to describe the underlying resources, data types defined in FHIR, and also for describing extensions and constraints on resources and data types. @@ -1536,10 +1532,10 @@ public class StructureDefinition extends CanonicalResource { protected List keyword; /** - * The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 4.4.0. for this version. + * The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 4.5.0. for this version. */ @Child(name = "fhirVersion", type = {CodeType.class}, order=16, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="FHIR Version this StructureDefinition targets", formalDefinition="The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 4.4.0. for this version." ) + @Description(shortDefinition="FHIR Version this StructureDefinition targets", formalDefinition="The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 4.5.0. for this version." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/FHIR-version") protected Enumeration fhirVersion; @@ -2427,7 +2423,7 @@ public class StructureDefinition extends CanonicalResource { } /** - * @return {@link #fhirVersion} (The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 4.4.0. for this version.). This is the underlying object with id, value and extensions. The accessor "getFhirVersion" gives direct access to the value + * @return {@link #fhirVersion} (The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 4.5.0. for this version.). This is the underlying object with id, value and extensions. The accessor "getFhirVersion" gives direct access to the value */ public Enumeration getFhirVersionElement() { if (this.fhirVersion == null) @@ -2447,7 +2443,7 @@ public class StructureDefinition extends CanonicalResource { } /** - * @param value {@link #fhirVersion} (The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 4.4.0. for this version.). This is the underlying object with id, value and extensions. The accessor "getFhirVersion" gives direct access to the value + * @param value {@link #fhirVersion} (The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 4.5.0. for this version.). This is the underlying object with id, value and extensions. The accessor "getFhirVersion" gives direct access to the value */ public StructureDefinition setFhirVersionElement(Enumeration value) { this.fhirVersion = value; @@ -2455,14 +2451,14 @@ public class StructureDefinition extends CanonicalResource { } /** - * @return The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 4.4.0. for this version. + * @return The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 4.5.0. for this version. */ public FHIRVersion getFhirVersion() { return this.fhirVersion == null ? null : this.fhirVersion.getValue(); } /** - * @param value The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 4.4.0. for this version. + * @param value The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 4.5.0. for this version. */ public StructureDefinition setFhirVersion(FHIRVersion value) { if (value == null) @@ -2941,7 +2937,7 @@ public class StructureDefinition extends CanonicalResource { children.add(new Property("purpose", "markdown", "Explanation of why this structure definition is needed and why it has been designed as it has.", 0, 1, purpose)); children.add(new Property("copyright", "markdown", "A copyright statement relating to the structure definition and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the structure definition.", 0, 1, copyright)); children.add(new Property("keyword", "Coding", "A set of key words or terms from external terminologies that may be used to assist with indexing and searching of templates nby describing the use of this structure definition, or the content it describes.", 0, java.lang.Integer.MAX_VALUE, keyword)); - children.add(new Property("fhirVersion", "code", "The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 4.4.0. for this version.", 0, 1, fhirVersion)); + children.add(new Property("fhirVersion", "code", "The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 4.5.0. for this version.", 0, 1, fhirVersion)); children.add(new Property("mapping", "", "An external specification that the content is mapped to.", 0, java.lang.Integer.MAX_VALUE, mapping)); children.add(new Property("kind", "code", "Defines the kind of structure that this definition is describing.", 0, 1, kind)); children.add(new Property("abstract", "boolean", "Whether structure this definition describes is abstract or not - that is, whether the structure is not intended to be instantiated. For Resources and Data types, abstract types will never be exchanged between systems.", 0, 1, abstract_)); @@ -2973,7 +2969,7 @@ public class StructureDefinition extends CanonicalResource { case -220463842: /*purpose*/ return new Property("purpose", "markdown", "Explanation of why this structure definition is needed and why it has been designed as it has.", 0, 1, purpose); case 1522889671: /*copyright*/ return new Property("copyright", "markdown", "A copyright statement relating to the structure definition and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the structure definition.", 0, 1, copyright); case -814408215: /*keyword*/ return new Property("keyword", "Coding", "A set of key words or terms from external terminologies that may be used to assist with indexing and searching of templates nby describing the use of this structure definition, or the content it describes.", 0, java.lang.Integer.MAX_VALUE, keyword); - case 461006061: /*fhirVersion*/ return new Property("fhirVersion", "code", "The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 4.4.0. for this version.", 0, 1, fhirVersion); + case 461006061: /*fhirVersion*/ return new Property("fhirVersion", "code", "The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 4.5.0. for this version.", 0, 1, fhirVersion); case 837556430: /*mapping*/ return new Property("mapping", "", "An external specification that the content is mapped to.", 0, java.lang.Integer.MAX_VALUE, mapping); case 3292052: /*kind*/ return new Property("kind", "code", "Defines the kind of structure that this definition is describing.", 0, 1, kind); case 1732898850: /*abstract*/ return new Property("abstract", "boolean", "Whether structure this definition describes is abstract or not - that is, whether the structure is not intended to be instantiated. For Resources and Data types, abstract types will never be exchanged between systems.", 0, 1, abstract_); @@ -4456,8 +4452,7 @@ public class StructureDefinition 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 String describeType() { +public String describeType() { if ("Extension".equals(getType())) return "Extension" ; switch (getKind()) { @@ -4469,8 +4464,7 @@ public class StructureDefinition extends CanonicalResource { return "Definition"; } } - - // end addition -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/StructureMap.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/StructureMap.java index 53e0fb73a..d0f8da9ef 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/StructureMap.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/StructureMap.java @@ -1,8 +1,6 @@ package org.hl7.fhir.r5.model; - - /* Copyright (c) 2011+, HL7, Inc. All rights reserved. @@ -31,24 +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.r5.model.Enumerations.PublicationStatus; -import org.hl7.fhir.r5.model.Enumerations.PublicationStatusEnumFactory; -import org.hl7.fhir.r5.utils.StructureMapUtilities; 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.r5.utils.StructureMapUtilities; /** * A Map of relationships between 2 structures that can be used to transform data. */ @@ -148,10 +147,6 @@ public class StructureMap extends CanonicalResource { } public enum StructureMapGroupTypeMode { - /** - * This group is not a default group for the types. - */ - NONE, /** * This group is a default mapping group for the specified types and for the primary source type. */ @@ -167,8 +162,6 @@ public class StructureMap extends CanonicalResource { public static StructureMapGroupTypeMode fromCode(String codeString) throws FHIRException { if (codeString == null || "".equals(codeString)) return null; - if ("none".equals(codeString)) - return NONE; if ("types".equals(codeString)) return TYPES; if ("type-and-types".equals(codeString)) @@ -180,7 +173,6 @@ public class StructureMap extends CanonicalResource { } public String toCode() { switch (this) { - case NONE: return "none"; case TYPES: return "types"; case TYPEANDTYPES: return "type-and-types"; default: return "?"; @@ -188,7 +180,6 @@ public class StructureMap extends CanonicalResource { } public String getSystem() { switch (this) { - case NONE: return "http://hl7.org/fhir/map-group-type-mode"; case TYPES: return "http://hl7.org/fhir/map-group-type-mode"; case TYPEANDTYPES: return "http://hl7.org/fhir/map-group-type-mode"; default: return "?"; @@ -196,7 +187,6 @@ public class StructureMap extends CanonicalResource { } public String getDefinition() { switch (this) { - case NONE: return "This group is not a default group for the types."; case TYPES: return "This group is a default mapping group for the specified types and for the primary source type."; case TYPEANDTYPES: return "This group is a default mapping group for the specified types."; default: return "?"; @@ -204,7 +194,6 @@ public class StructureMap extends CanonicalResource { } public String getDisplay() { switch (this) { - case NONE: return "Not a Default"; case TYPES: return "Default for Type Combination"; case TYPEANDTYPES: return "Default for type + combination"; default: return "?"; @@ -217,8 +206,6 @@ public class StructureMap extends CanonicalResource { if (codeString == null || "".equals(codeString)) if (codeString == null || "".equals(codeString)) return null; - if ("none".equals(codeString)) - return StructureMapGroupTypeMode.NONE; if ("types".equals(codeString)) return StructureMapGroupTypeMode.TYPES; if ("type-and-types".equals(codeString)) @@ -233,8 +220,6 @@ public class StructureMap extends CanonicalResource { String codeString = ((PrimitiveType) code).asStringValue(); if (codeString == null || "".equals(codeString)) return null; - if ("none".equals(codeString)) - return new Enumeration(this, StructureMapGroupTypeMode.NONE); if ("types".equals(codeString)) return new Enumeration(this, StructureMapGroupTypeMode.TYPES); if ("type-and-types".equals(codeString)) @@ -242,8 +227,6 @@ public class StructureMap extends CanonicalResource { throw new FHIRException("Unknown StructureMapGroupTypeMode code '"+codeString+"'"); } public String toCode(StructureMapGroupTypeMode code) { - if (code == StructureMapGroupTypeMode.NONE) - return "none"; if (code == StructureMapGroupTypeMode.TYPES) return "types"; if (code == StructureMapGroupTypeMode.TYPEANDTYPES) @@ -1482,8 +1465,8 @@ public class StructureMap extends CanonicalResource { /** * If this is the default rule set to apply for the source type or this combination of types. */ - @Child(name = "typeMode", type = {CodeType.class}, order=3, min=1, max=1, modifier=false, summary=true) - @Description(shortDefinition="none | types | type-and-types", formalDefinition="If this is the default rule set to apply for the source type or this combination of types." ) + @Child(name = "typeMode", type = {CodeType.class}, order=3, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="types | type-and-types", formalDefinition="If this is the default rule set to apply for the source type or this combination of types." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/map-group-type-mode") protected Enumeration typeMode; @@ -1504,7 +1487,7 @@ public class StructureMap extends CanonicalResource { /** * Transform Rule from source to target. */ - @Child(name = "rule", type = {}, order=6, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "rule", type = {}, order=6, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Transform Rule from source to target", formalDefinition="Transform Rule from source to target." ) protected List rule; @@ -1520,12 +1503,10 @@ public class StructureMap extends CanonicalResource { /** * Constructor */ - public StructureMapGroupComponent(String name, StructureMapGroupTypeMode typeMode, StructureMapGroupInputComponent input, StructureMapGroupRuleComponent rule) { + public StructureMapGroupComponent(String name, StructureMapGroupInputComponent input) { super(); this.setName(name); - this.setTypeMode(typeMode); this.addInput(input); - this.addRule(rule); } /** @@ -1661,9 +1642,13 @@ public class StructureMap extends CanonicalResource { * @param value If this is the default rule set to apply for the source type or this combination of types. */ public StructureMapGroupComponent setTypeMode(StructureMapGroupTypeMode value) { + if (value == null) + this.typeMode = null; + else { if (this.typeMode == null) this.typeMode = new Enumeration(new StructureMapGroupTypeModeEnumFactory()); this.typeMode.setValue(value); + } return this; } @@ -2017,12 +2002,9 @@ public class StructureMap extends CanonicalResource { } // added from java-adornments.txt: - - public String toString() { +public String toString() { return StructureMapUtilities.groupToString(this); } - - // end addition } @@ -2427,7 +2409,7 @@ public class StructureMap extends CanonicalResource { /** * Name of the rule for internal references. */ - @Child(name = "name", type = {IdType.class}, order=1, min=1, max=1, modifier=false, summary=true) + @Child(name = "name", type = {IdType.class}, order=1, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Name of the rule for internal references", formalDefinition="Name of the rule for internal references." ) protected IdType name; @@ -2478,9 +2460,8 @@ public class StructureMap extends CanonicalResource { /** * Constructor */ - public StructureMapGroupRuleComponent(String name, StructureMapGroupRuleSourceComponent source) { + public StructureMapGroupRuleComponent(StructureMapGroupRuleSourceComponent source) { super(); - this.setName(name); this.addSource(source); } @@ -2523,9 +2504,13 @@ public class StructureMap extends CanonicalResource { * @param value Name of the rule for internal references. */ public StructureMapGroupRuleComponent setName(String value) { + if (Utilities.noString(value)) + this.name = null; + else { if (this.name == null) this.name = new IdType(); this.name.setValue(value); + } return this; } @@ -2990,12 +2975,9 @@ public class StructureMap extends CanonicalResource { } // added from java-adornments.txt: - - public String toString() { +public String toString() { return StructureMapUtilities.ruleToString(this); } - - // end addition } @@ -4878,12 +4860,9 @@ public class StructureMap extends CanonicalResource { } // added from java-adornments.txt: - - public String toString() { +public String toString() { return StructureMapUtilities.sourceToString(this); } - - // end addition } @@ -5593,12 +5572,9 @@ public class StructureMap extends CanonicalResource { } // added from java-adornments.txt: - - public String toString() { +public String toString() { return StructureMapUtilities.targetToString(this); } - - // end addition } @@ -5859,13 +5835,9 @@ public class StructureMap extends CanonicalResource { } // added from java-adornments.txt: - - public String toString() { +public String toString() { return value == null ? "null!" : value.toString(); } - - - // end addition } @@ -8345,12 +8317,10 @@ public class StructureMap 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 String toString() { +public String toString() { return StructureMapUtilities.render(this); } - - // end addition -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Subscription.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Subscription.java index d63113a52..bde3a1fe9 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Subscription.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Subscription.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.SubscriptionSearchModifier; -import org.hl7.fhir.r5.model.Enumerations.SubscriptionSearchModifierEnumFactory; -import org.hl7.fhir.r5.model.Enumerations.SubscriptionState; -import org.hl7.fhir.r5.model.Enumerations.SubscriptionStateEnumFactory; 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 subscription resource describes a particular client's request to be notified about a SubscriptionTopic. @@ -548,18 +544,10 @@ public class Subscription extends DomainResource { @Description(shortDefinition="Criteria for narrowing the subscription topic stream", formalDefinition="The filter properties to be applied to narrow the subscription topic stream. When multiple filters are applied, evaluates to true if all the conditions are met; otherwise it returns false. (i.e., logical AND)." ) protected List filterBy; - /** - * A record of the last error that occurred when the server processed a notification. - */ - @Child(name = "error", type = {CodeableConcept.class}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Latest error code or note", formalDefinition="A record of the last error that occurred when the server processed a notification." ) - @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/subscription-error") - protected List error; - /** * The type of channel to send notifications on. */ - @Child(name = "channelType", type = {Coding.class}, order=9, min=1, max=1, modifier=false, summary=true) + @Child(name = "channelType", type = {Coding.class}, order=8, min=1, max=1, modifier=false, summary=true) @Description(shortDefinition="Channel type for notifications", formalDefinition="The type of channel to send notifications on." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/subscription-channel-type") protected Coding channelType; @@ -567,35 +555,35 @@ public class Subscription extends DomainResource { /** * The url that describes the actual end-point to send messages to. */ - @Child(name = "endpoint", type = {UrlType.class}, order=10, min=0, max=1, modifier=false, summary=true) + @Child(name = "endpoint", type = {UrlType.class}, order=9, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Where the channel points to", formalDefinition="The url that describes the actual end-point to send messages to." ) protected UrlType endpoint; /** * Additional headers / information to send as part of the notification. */ - @Child(name = "header", type = {StringType.class}, order=11, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "header", type = {StringType.class}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Usage depends on the channel type", formalDefinition="Additional headers / information to send as part of the notification." ) protected List header; /** * If present, a 'hearbeat" notification (keepalive) is sent via this channel with an the interval period equal to this elements integer value in seconds. If not present, a heartbeat notification is not sent. */ - @Child(name = "heartbeatPeriod", type = {UnsignedIntType.class}, order=12, min=0, max=1, modifier=false, summary=true) + @Child(name = "heartbeatPeriod", type = {UnsignedIntType.class}, order=11, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Interval in seconds to send 'heartbeat' notification", formalDefinition="If present, a 'hearbeat\" notification (keepalive) is sent via this channel with an the interval period equal to this elements integer value in seconds. If not present, a heartbeat notification is not sent." ) protected UnsignedIntType heartbeatPeriod; /** * If present, the maximum amount of time a server will allow before failing a notification attempt. */ - @Child(name = "timeout", type = {UnsignedIntType.class}, order=13, min=0, max=1, modifier=false, summary=true) + @Child(name = "timeout", type = {UnsignedIntType.class}, order=12, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Timeout in seconds to attempt notification delivery", formalDefinition="If present, the maximum amount of time a server will allow before failing a notification attempt." ) protected UnsignedIntType timeout; /** * The mime type to send the payload in - either application/fhir+xml, or application/fhir+json. The MIME types "text/plain" and "text/html" may also be used for Email subscriptions. */ - @Child(name = "contentType", type = {CodeType.class}, order=14, min=0, max=1, modifier=false, summary=true) + @Child(name = "contentType", type = {CodeType.class}, order=13, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="MIME type to send, or omit for no payload", formalDefinition="The mime type to send the payload in - either application/fhir+xml, or application/fhir+json. The MIME types \"text/plain\" and \"text/html\" may also be used for Email subscriptions." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/mimetypes") protected CodeType contentType; @@ -603,12 +591,12 @@ public class Subscription extends DomainResource { /** * How much of the resource content to deliver in the notification payload. The choices are an empty payload, only the resource id, or the full resource content. */ - @Child(name = "content", type = {CodeType.class}, order=15, min=0, max=1, modifier=false, summary=true) + @Child(name = "content", type = {CodeType.class}, order=14, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="empty | id-only | full-resource", formalDefinition="How much of the resource content to deliver in the notification payload. The choices are an empty payload, only the resource id, or the full resource content." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/subscription-payload-content") protected Enumeration content; - private static final long serialVersionUID = -779068822L; + private static final long serialVersionUID = 753899441L; /** * Constructor @@ -1002,59 +990,6 @@ public class Subscription extends DomainResource { return getFilterBy().get(0); } - /** - * @return {@link #error} (A record of the last error that occurred when the server processed a notification.) - */ - public List getError() { - if (this.error == null) - this.error = new ArrayList(); - return this.error; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public Subscription setError(List theError) { - this.error = theError; - return this; - } - - public boolean hasError() { - if (this.error == null) - return false; - for (CodeableConcept item : this.error) - if (!item.isEmpty()) - return true; - return false; - } - - public CodeableConcept addError() { //3 - CodeableConcept t = new CodeableConcept(); - if (this.error == null) - this.error = new ArrayList(); - this.error.add(t); - return t; - } - - public Subscription addError(CodeableConcept t) { //3 - if (t == null) - return this; - if (this.error == null) - this.error = new ArrayList(); - this.error.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #error}, creating it if it does not already exist {3} - */ - public CodeableConcept getErrorFirstRep() { - if (getError().isEmpty()) { - addError(); - } - return getError().get(0); - } - /** * @return {@link #channelType} (The type of channel to send notifications on.) */ @@ -1387,7 +1322,6 @@ public class Subscription extends DomainResource { children.add(new Property("end", "instant", "The time for the server to turn the subscription off.", 0, 1, end)); children.add(new Property("reason", "string", "A description of why this subscription is defined.", 0, 1, reason)); children.add(new Property("filterBy", "", "The filter properties to be applied to narrow the subscription topic stream. When multiple filters are applied, evaluates to true if all the conditions are met; otherwise it returns false. (i.e., logical AND).", 0, java.lang.Integer.MAX_VALUE, filterBy)); - children.add(new Property("error", "CodeableConcept", "A record of the last error that occurred when the server processed a notification.", 0, java.lang.Integer.MAX_VALUE, error)); children.add(new Property("channelType", "Coding", "The type of channel to send notifications on.", 0, 1, channelType)); children.add(new Property("endpoint", "url", "The url that describes the actual end-point to send messages to.", 0, 1, endpoint)); children.add(new Property("header", "string", "Additional headers / information to send as part of the notification.", 0, java.lang.Integer.MAX_VALUE, header)); @@ -1408,7 +1342,6 @@ public class Subscription extends DomainResource { case 100571: /*end*/ return new Property("end", "instant", "The time for the server to turn the subscription off.", 0, 1, end); case -934964668: /*reason*/ return new Property("reason", "string", "A description of why this subscription is defined.", 0, 1, reason); case -721168913: /*filterBy*/ return new Property("filterBy", "", "The filter properties to be applied to narrow the subscription topic stream. When multiple filters are applied, evaluates to true if all the conditions are met; otherwise it returns false. (i.e., logical AND).", 0, java.lang.Integer.MAX_VALUE, filterBy); - case 96784904: /*error*/ return new Property("error", "CodeableConcept", "A record of the last error that occurred when the server processed a notification.", 0, java.lang.Integer.MAX_VALUE, error); case 274155229: /*channelType*/ return new Property("channelType", "Coding", "The type of channel to send notifications on.", 0, 1, channelType); case 1741102485: /*endpoint*/ return new Property("endpoint", "url", "The url that describes the actual end-point to send messages to.", 0, 1, endpoint); case -1221270899: /*header*/ return new Property("header", "string", "Additional headers / information to send as part of the notification.", 0, java.lang.Integer.MAX_VALUE, header); @@ -1432,7 +1365,6 @@ public class Subscription extends DomainResource { case 100571: /*end*/ return this.end == null ? new Base[0] : new Base[] {this.end}; // InstantType case -934964668: /*reason*/ return this.reason == null ? new Base[0] : new Base[] {this.reason}; // StringType case -721168913: /*filterBy*/ return this.filterBy == null ? new Base[0] : this.filterBy.toArray(new Base[this.filterBy.size()]); // SubscriptionFilterByComponent - case 96784904: /*error*/ return this.error == null ? new Base[0] : this.error.toArray(new Base[this.error.size()]); // CodeableConcept case 274155229: /*channelType*/ return this.channelType == null ? new Base[0] : new Base[] {this.channelType}; // Coding case 1741102485: /*endpoint*/ return this.endpoint == null ? new Base[0] : new Base[] {this.endpoint}; // UrlType case -1221270899: /*header*/ return this.header == null ? new Base[0] : this.header.toArray(new Base[this.header.size()]); // StringType @@ -1473,9 +1405,6 @@ public class Subscription extends DomainResource { case -721168913: // filterBy this.getFilterBy().add((SubscriptionFilterByComponent) value); // SubscriptionFilterByComponent return value; - case 96784904: // error - this.getError().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept - return value; case 274155229: // channelType this.channelType = TypeConvertor.castToCoding(value); // Coding return value; @@ -1522,8 +1451,6 @@ public class Subscription extends DomainResource { this.reason = TypeConvertor.castToString(value); // StringType } else if (name.equals("filterBy")) { this.getFilterBy().add((SubscriptionFilterByComponent) value); - } else if (name.equals("error")) { - this.getError().add(TypeConvertor.castToCodeableConcept(value)); } else if (name.equals("channelType")) { this.channelType = TypeConvertor.castToCoding(value); // Coding } else if (name.equals("endpoint")) { @@ -1555,7 +1482,6 @@ public class Subscription extends DomainResource { case 100571: return getEndElement(); case -934964668: return getReasonElement(); case -721168913: return addFilterBy(); - case 96784904: return addError(); case 274155229: return getChannelType(); case 1741102485: return getEndpointElement(); case -1221270899: return addHeaderElement(); @@ -1579,7 +1505,6 @@ public class Subscription extends DomainResource { case 100571: /*end*/ return new String[] {"instant"}; case -934964668: /*reason*/ return new String[] {"string"}; case -721168913: /*filterBy*/ return new String[] {}; - case 96784904: /*error*/ return new String[] {"CodeableConcept"}; case 274155229: /*channelType*/ return new String[] {"Coding"}; case 1741102485: /*endpoint*/ return new String[] {"url"}; case -1221270899: /*header*/ return new String[] {"string"}; @@ -1619,9 +1544,6 @@ public class Subscription extends DomainResource { else if (name.equals("filterBy")) { return addFilterBy(); } - else if (name.equals("error")) { - return addError(); - } else if (name.equals("channelType")) { this.channelType = new Coding(); return this.channelType; @@ -1681,11 +1603,6 @@ public class Subscription extends DomainResource { for (SubscriptionFilterByComponent i : filterBy) dst.filterBy.add(i.copy()); }; - if (error != null) { - dst.error = new ArrayList(); - for (CodeableConcept i : error) - dst.error.add(i.copy()); - }; dst.channelType = channelType == null ? null : channelType.copy(); dst.endpoint = endpoint == null ? null : endpoint.copy(); if (header != null) { @@ -1712,10 +1629,10 @@ public class Subscription extends DomainResource { Subscription o = (Subscription) other_; return compareDeep(identifier, o.identifier, true) && compareDeep(name, o.name, true) && compareDeep(status, o.status, true) && compareDeep(topic, o.topic, true) && compareDeep(contact, o.contact, true) && compareDeep(end, o.end, true) - && compareDeep(reason, o.reason, true) && compareDeep(filterBy, o.filterBy, true) && compareDeep(error, o.error, true) - && compareDeep(channelType, o.channelType, true) && compareDeep(endpoint, o.endpoint, true) && compareDeep(header, o.header, true) - && compareDeep(heartbeatPeriod, o.heartbeatPeriod, true) && compareDeep(timeout, o.timeout, true) - && compareDeep(contentType, o.contentType, true) && compareDeep(content, o.content, true); + && compareDeep(reason, o.reason, true) && compareDeep(filterBy, o.filterBy, true) && compareDeep(channelType, o.channelType, true) + && compareDeep(endpoint, o.endpoint, true) && compareDeep(header, o.header, true) && compareDeep(heartbeatPeriod, o.heartbeatPeriod, true) + && compareDeep(timeout, o.timeout, true) && compareDeep(contentType, o.contentType, true) && compareDeep(content, o.content, true) + ; } @Override @@ -1733,8 +1650,8 @@ public class Subscription extends DomainResource { public boolean isEmpty() { return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, name, status - , topic, contact, end, reason, filterBy, error, channelType, endpoint, header - , heartbeatPeriod, timeout, contentType, content); + , topic, contact, end, reason, filterBy, channelType, endpoint, header, heartbeatPeriod + , timeout, contentType, content); } @Override @@ -1843,4 +1760,5 @@ public class Subscription 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/SubscriptionStatus.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubscriptionStatus.java index 977a28033..a331c7b6a 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubscriptionStatus.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubscriptionStatus.java @@ -1,17 +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.SubscriptionState; -import org.hl7.fhir.r5.model.Enumerations.SubscriptionStateEnumFactory; - -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; /** * The SubscriptionStatus resource describes the state of a Subscription during notifications. @@ -21,17 +55,21 @@ public class SubscriptionStatus extends DomainResource { public enum SubscriptionNotificationType { /** - * The notification is being sent as part of the setup or verification of a communications channel. + * The status was generated as part of the setup or verification of a communications channel. */ HANDSHAKE, /** - * The notification is being sent because there has not been a notification generated over an extended period of time. + * The status was generated to perform a heartbeat notification to the subscriber. */ HEARTBEAT, /** - * The notification is being sent due to an event for the subscriber. + * The status was generated for an event to the subscriber. */ EVENTNOTIFICATION, + /** + * The status was generated in response to a query/request. + */ + QUERYSTATUS, /** * added to help the parsers with the generic types */ @@ -45,6 +83,8 @@ public class SubscriptionStatus extends DomainResource { return HEARTBEAT; if ("event-notification".equals(codeString)) return EVENTNOTIFICATION; + if ("query-status".equals(codeString)) + return QUERYSTATUS; if (Configuration.isAcceptInvalidEnums()) return null; else @@ -55,6 +95,7 @@ public class SubscriptionStatus extends DomainResource { case HANDSHAKE: return "handshake"; case HEARTBEAT: return "heartbeat"; case EVENTNOTIFICATION: return "event-notification"; + case QUERYSTATUS: return "query-status"; default: return "?"; } } @@ -63,14 +104,16 @@ public class SubscriptionStatus extends DomainResource { case HANDSHAKE: return "http://hl7.org/fhir/subscription-notification-type"; case HEARTBEAT: return "http://hl7.org/fhir/subscription-notification-type"; case EVENTNOTIFICATION: return "http://hl7.org/fhir/subscription-notification-type"; + case QUERYSTATUS: return "http://hl7.org/fhir/subscription-notification-type"; default: return "?"; } } public String getDefinition() { switch (this) { - case HANDSHAKE: return "The notification is being sent as part of the setup or verification of a communications channel."; - case HEARTBEAT: return "The notification is being sent because there has not been a notification generated over an extended period of time."; - case EVENTNOTIFICATION: return "The notification is being sent due to an event for the subscriber."; + case HANDSHAKE: return "The status was generated as part of the setup or verification of a communications channel."; + case HEARTBEAT: return "The status was generated to perform a heartbeat notification to the subscriber."; + case EVENTNOTIFICATION: return "The status was generated for an event to the subscriber."; + case QUERYSTATUS: return "The status was generated in response to a query/request."; default: return "?"; } } @@ -79,6 +122,7 @@ public class SubscriptionStatus extends DomainResource { case HANDSHAKE: return "Handshake"; case HEARTBEAT: return "Heartbeat"; case EVENTNOTIFICATION: return "Event Notification"; + case QUERYSTATUS: return "Query Status"; default: return "?"; } } @@ -95,6 +139,8 @@ public class SubscriptionStatus extends DomainResource { return SubscriptionNotificationType.HEARTBEAT; if ("event-notification".equals(codeString)) return SubscriptionNotificationType.EVENTNOTIFICATION; + if ("query-status".equals(codeString)) + return SubscriptionNotificationType.QUERYSTATUS; throw new IllegalArgumentException("Unknown SubscriptionNotificationType code '"+codeString+"'"); } public Enumeration fromType(Base code) throws FHIRException { @@ -111,6 +157,8 @@ public class SubscriptionStatus extends DomainResource { return new Enumeration(this, SubscriptionNotificationType.HEARTBEAT); if ("event-notification".equals(codeString)) return new Enumeration(this, SubscriptionNotificationType.EVENTNOTIFICATION); + if ("query-status".equals(codeString)) + return new Enumeration(this, SubscriptionNotificationType.QUERYSTATUS); throw new FHIRException("Unknown SubscriptionNotificationType code '"+codeString+"'"); } public String toCode(SubscriptionNotificationType code) { @@ -120,6 +168,8 @@ public class SubscriptionStatus extends DomainResource { return "heartbeat"; if (code == SubscriptionNotificationType.EVENTNOTIFICATION) return "event-notification"; + if (code == SubscriptionNotificationType.QUERYSTATUS) + return "query-status"; return "?"; } public String toSystem(SubscriptionNotificationType code) { @@ -130,10 +180,10 @@ public class SubscriptionStatus extends DomainResource { /** * The type of event being conveyed with this notificaiton. */ - @Child(name = "notificationType", type = {CodeType.class}, order=0, min=1, max=1, modifier=true, summary=true) - @Description(shortDefinition="handshake | heartbeat | event-notification", formalDefinition="The type of event being conveyed with this notificaiton." ) + @Child(name = "type", type = {CodeType.class}, order=0, min=1, max=1, modifier=true, summary=true) + @Description(shortDefinition="handshake | heartbeat | event-notification | query-status", formalDefinition="The type of event being conveyed with this notificaiton." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/subscription-notification-type") - protected Enumeration notificationType; + protected Enumeration type; /** * The total number of actual events which have been generated since the Subscription was created (inclusive of this notification) - regardless of how many have been successfully communicated. This number is NOT incremented for handshake and heartbeat notifications. @@ -167,11 +217,19 @@ public class SubscriptionStatus extends DomainResource { /** * The reference to the SubscriptionTopic for the Subscription which generated this notification. */ - @Child(name = "topic", type = {SubscriptionTopic.class}, order=5, min=1, max=1, modifier=false, summary=true) + @Child(name = "topic", type = {CanonicalType.class}, order=5, min=1, max=1, modifier=false, summary=true) @Description(shortDefinition="Reference to the SubscriptionTopic this notification relates to", formalDefinition="The reference to the SubscriptionTopic for the Subscription which generated this notification." ) - protected Reference topic; + protected CanonicalType topic; - private static final long serialVersionUID = -1378030794L; + /** + * A record of errors that occurred when the server processed a notification. + */ + @Child(name = "error", type = {CodeableConcept.class}, order=6, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="List of errors on the subscription", formalDefinition="A record of errors that occurred when the server processed a notification." ) + @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/subscription-error") + protected List error; + + private static final long serialVersionUID = 259495855L; /** * Constructor @@ -183,55 +241,55 @@ public class SubscriptionStatus extends DomainResource { /** * Constructor */ - public SubscriptionStatus(SubscriptionNotificationType notificationType, Reference subscription, Reference topic) { + public SubscriptionStatus(SubscriptionNotificationType type, Reference subscription, String topic) { super(); - this.setNotificationType(notificationType); + this.setType(type); this.setSubscription(subscription); this.setTopic(topic); } /** - * @return {@link #notificationType} (The type of event being conveyed with this notificaiton.). This is the underlying object with id, value and extensions. The accessor "getNotificationType" gives direct access to the value + * @return {@link #type} (The type of event being conveyed with this notificaiton.). This is the underlying object with id, value and extensions. The accessor "getType" gives direct access to the value */ - public Enumeration getNotificationTypeElement() { - if (this.notificationType == null) + public Enumeration getTypeElement() { + if (this.type == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create SubscriptionStatus.notificationType"); + throw new Error("Attempt to auto-create SubscriptionStatus.type"); else if (Configuration.doAutoCreate()) - this.notificationType = new Enumeration(new SubscriptionNotificationTypeEnumFactory()); // bb - return this.notificationType; + this.type = new Enumeration(new SubscriptionNotificationTypeEnumFactory()); // bb + return this.type; } - public boolean hasNotificationTypeElement() { - return this.notificationType != null && !this.notificationType.isEmpty(); + public boolean hasTypeElement() { + return this.type != null && !this.type.isEmpty(); } - public boolean hasNotificationType() { - return this.notificationType != null && !this.notificationType.isEmpty(); + public boolean hasType() { + return this.type != null && !this.type.isEmpty(); } /** - * @param value {@link #notificationType} (The type of event being conveyed with this notificaiton.). This is the underlying object with id, value and extensions. The accessor "getNotificationType" gives direct access to the value + * @param value {@link #type} (The type of event being conveyed with this notificaiton.). This is the underlying object with id, value and extensions. The accessor "getType" gives direct access to the value */ - public SubscriptionStatus setNotificationTypeElement(Enumeration value) { - this.notificationType = value; + public SubscriptionStatus setTypeElement(Enumeration value) { + this.type = value; return this; } /** * @return The type of event being conveyed with this notificaiton. */ - public SubscriptionNotificationType getNotificationType() { - return this.notificationType == null ? null : this.notificationType.getValue(); + public SubscriptionNotificationType getType() { + return this.type == null ? null : this.type.getValue(); } /** * @param value The type of event being conveyed with this notificaiton. */ - public SubscriptionStatus setNotificationType(SubscriptionNotificationType value) { - if (this.notificationType == null) - this.notificationType = new Enumeration(new SubscriptionNotificationTypeEnumFactory()); - this.notificationType.setValue(value); + public SubscriptionStatus setType(SubscriptionNotificationType value) { + if (this.type == null) + this.type = new Enumeration(new SubscriptionNotificationTypeEnumFactory()); + this.type.setValue(value); return this; } @@ -398,48 +456,124 @@ public class SubscriptionStatus extends DomainResource { } /** - * @return {@link #topic} (The reference to the SubscriptionTopic for the Subscription which generated this notification.) + * @return {@link #topic} (The reference to the SubscriptionTopic for the Subscription which generated this notification.). This is the underlying object with id, value and extensions. The accessor "getTopic" gives direct access to the value */ - public Reference getTopic() { + public CanonicalType getTopicElement() { if (this.topic == null) if (Configuration.errorOnAutoCreate()) throw new Error("Attempt to auto-create SubscriptionStatus.topic"); else if (Configuration.doAutoCreate()) - this.topic = new Reference(); // cc + this.topic = new CanonicalType(); // bb return this.topic; } + public boolean hasTopicElement() { + return this.topic != null && !this.topic.isEmpty(); + } + public boolean hasTopic() { return this.topic != null && !this.topic.isEmpty(); } /** - * @param value {@link #topic} (The reference to the SubscriptionTopic for the Subscription which generated this notification.) + * @param value {@link #topic} (The reference to the SubscriptionTopic for the Subscription which generated this notification.). This is the underlying object with id, value and extensions. The accessor "getTopic" gives direct access to the value */ - public SubscriptionStatus setTopic(Reference value) { + public SubscriptionStatus setTopicElement(CanonicalType value) { this.topic = value; return this; } + /** + * @return The reference to the SubscriptionTopic for the Subscription which generated this notification. + */ + public String getTopic() { + return this.topic == null ? null : this.topic.getValue(); + } + + /** + * @param value The reference to the SubscriptionTopic for the Subscription which generated this notification. + */ + public SubscriptionStatus setTopic(String value) { + if (this.topic == null) + this.topic = new CanonicalType(); + this.topic.setValue(value); + return this; + } + + /** + * @return {@link #error} (A record of errors that occurred when the server processed a notification.) + */ + public List getError() { + if (this.error == null) + this.error = new ArrayList(); + return this.error; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public SubscriptionStatus setError(List theError) { + this.error = theError; + return this; + } + + public boolean hasError() { + if (this.error == null) + return false; + for (CodeableConcept item : this.error) + if (!item.isEmpty()) + return true; + return false; + } + + public CodeableConcept addError() { //3 + CodeableConcept t = new CodeableConcept(); + if (this.error == null) + this.error = new ArrayList(); + this.error.add(t); + return t; + } + + public SubscriptionStatus addError(CodeableConcept t) { //3 + if (t == null) + return this; + if (this.error == null) + this.error = new ArrayList(); + this.error.add(t); + return this; + } + + /** + * @return The first repetition of repeating field {@link #error}, creating it if it does not already exist {3} + */ + public CodeableConcept getErrorFirstRep() { + if (getError().isEmpty()) { + addError(); + } + return getError().get(0); + } + protected void listChildren(List children) { super.listChildren(children); - children.add(new Property("notificationType", "code", "The type of event being conveyed with this notificaiton.", 0, 1, notificationType)); + children.add(new Property("type", "code", "The type of event being conveyed with this notificaiton.", 0, 1, type)); children.add(new Property("eventsSinceSubscriptionStart", "integer64", "The total number of actual events which have been generated since the Subscription was created (inclusive of this notification) - regardless of how many have been successfully communicated. This number is NOT incremented for handshake and heartbeat notifications.", 0, 1, eventsSinceSubscriptionStart)); children.add(new Property("eventsInNotification", "integer", "The total number of actual events represented within this notification. For handshake and heartbeat notifications, this will be zero or not present. For event-notifications, this number may be one or more, depending on server batching.", 0, 1, eventsInNotification)); children.add(new Property("subscription", "Reference(Subscription)", "The reference to the Subscription which generated this notification.", 0, 1, subscription)); children.add(new Property("status", "code", "The status of the subscription, which marks the server state for managing the subscription.", 0, 1, status)); - children.add(new Property("topic", "Reference(SubscriptionTopic)", "The reference to the SubscriptionTopic for the Subscription which generated this notification.", 0, 1, topic)); + children.add(new Property("topic", "canonical(SubscriptionTopic)", "The reference to the SubscriptionTopic for the Subscription which generated this notification.", 0, 1, topic)); + children.add(new Property("error", "CodeableConcept", "A record of errors that occurred when the server processed a notification.", 0, java.lang.Integer.MAX_VALUE, error)); } @Override public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { switch (_hash) { - case 1611538117: /*notificationType*/ return new Property("notificationType", "code", "The type of event being conveyed with this notificaiton.", 0, 1, notificationType); + case 3575610: /*type*/ return new Property("type", "code", "The type of event being conveyed with this notificaiton.", 0, 1, type); case 304566692: /*eventsSinceSubscriptionStart*/ return new Property("eventsSinceSubscriptionStart", "integer64", "The total number of actual events which have been generated since the Subscription was created (inclusive of this notification) - regardless of how many have been successfully communicated. This number is NOT incremented for handshake and heartbeat notifications.", 0, 1, eventsSinceSubscriptionStart); case 191408169: /*eventsInNotification*/ return new Property("eventsInNotification", "integer", "The total number of actual events represented within this notification. For handshake and heartbeat notifications, this will be zero or not present. For event-notifications, this number may be one or more, depending on server batching.", 0, 1, eventsInNotification); case 341203229: /*subscription*/ return new Property("subscription", "Reference(Subscription)", "The reference to the Subscription which generated this notification.", 0, 1, subscription); case -892481550: /*status*/ return new Property("status", "code", "The status of the subscription, which marks the server state for managing the subscription.", 0, 1, status); - case 110546223: /*topic*/ return new Property("topic", "Reference(SubscriptionTopic)", "The reference to the SubscriptionTopic for the Subscription which generated this notification.", 0, 1, topic); + case 110546223: /*topic*/ return new Property("topic", "canonical(SubscriptionTopic)", "The reference to the SubscriptionTopic for the Subscription which generated this notification.", 0, 1, topic); + case 96784904: /*error*/ return new Property("error", "CodeableConcept", "A record of errors that occurred when the server processed a notification.", 0, java.lang.Integer.MAX_VALUE, error); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -448,12 +582,13 @@ public class SubscriptionStatus extends DomainResource { @Override public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException { switch (hash) { - case 1611538117: /*notificationType*/ return this.notificationType == null ? new Base[0] : new Base[] {this.notificationType}; // Enumeration + case 3575610: /*type*/ return this.type == null ? new Base[0] : new Base[] {this.type}; // Enumeration case 304566692: /*eventsSinceSubscriptionStart*/ return this.eventsSinceSubscriptionStart == null ? new Base[0] : new Base[] {this.eventsSinceSubscriptionStart}; // Integer64Type case 191408169: /*eventsInNotification*/ return this.eventsInNotification == null ? new Base[0] : new Base[] {this.eventsInNotification}; // IntegerType case 341203229: /*subscription*/ return this.subscription == null ? new Base[0] : new Base[] {this.subscription}; // Reference case -892481550: /*status*/ return this.status == null ? new Base[0] : new Base[] {this.status}; // Enumeration - case 110546223: /*topic*/ return this.topic == null ? new Base[0] : new Base[] {this.topic}; // Reference + case 110546223: /*topic*/ return this.topic == null ? new Base[0] : new Base[] {this.topic}; // CanonicalType + case 96784904: /*error*/ return this.error == null ? new Base[0] : this.error.toArray(new Base[this.error.size()]); // CodeableConcept default: return super.getProperty(hash, name, checkValid); } @@ -462,9 +597,9 @@ public class SubscriptionStatus extends DomainResource { @Override public Base setProperty(int hash, String name, Base value) throws FHIRException { switch (hash) { - case 1611538117: // notificationType + case 3575610: // type value = new SubscriptionNotificationTypeEnumFactory().fromType(TypeConvertor.castToCode(value)); - this.notificationType = (Enumeration) value; // Enumeration + this.type = (Enumeration) value; // Enumeration return value; case 304566692: // eventsSinceSubscriptionStart this.eventsSinceSubscriptionStart = TypeConvertor.castToInteger64(value); // Integer64Type @@ -480,7 +615,10 @@ public class SubscriptionStatus extends DomainResource { this.status = (Enumeration) value; // Enumeration return value; case 110546223: // topic - this.topic = TypeConvertor.castToReference(value); // Reference + this.topic = TypeConvertor.castToCanonical(value); // CanonicalType + return value; + case 96784904: // error + this.getError().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept return value; default: return super.setProperty(hash, name, value); } @@ -489,9 +627,9 @@ public class SubscriptionStatus extends DomainResource { @Override public Base setProperty(String name, Base value) throws FHIRException { - if (name.equals("notificationType")) { + if (name.equals("type")) { value = new SubscriptionNotificationTypeEnumFactory().fromType(TypeConvertor.castToCode(value)); - this.notificationType = (Enumeration) value; // Enumeration + this.type = (Enumeration) value; // Enumeration } else if (name.equals("eventsSinceSubscriptionStart")) { this.eventsSinceSubscriptionStart = TypeConvertor.castToInteger64(value); // Integer64Type } else if (name.equals("eventsInNotification")) { @@ -502,7 +640,9 @@ public class SubscriptionStatus extends DomainResource { value = new SubscriptionStateEnumFactory().fromType(TypeConvertor.castToCode(value)); this.status = (Enumeration) value; // Enumeration } else if (name.equals("topic")) { - this.topic = TypeConvertor.castToReference(value); // Reference + this.topic = TypeConvertor.castToCanonical(value); // CanonicalType + } else if (name.equals("error")) { + this.getError().add(TypeConvertor.castToCodeableConcept(value)); } else return super.setProperty(name, value); return value; @@ -511,12 +651,13 @@ public class SubscriptionStatus extends DomainResource { @Override public Base makeProperty(int hash, String name) throws FHIRException { switch (hash) { - case 1611538117: return getNotificationTypeElement(); + case 3575610: return getTypeElement(); case 304566692: return getEventsSinceSubscriptionStartElement(); case 191408169: return getEventsInNotificationElement(); case 341203229: return getSubscription(); case -892481550: return getStatusElement(); - case 110546223: return getTopic(); + case 110546223: return getTopicElement(); + case 96784904: return addError(); default: return super.makeProperty(hash, name); } @@ -525,12 +666,13 @@ public class SubscriptionStatus extends DomainResource { @Override public String[] getTypesForProperty(int hash, String name) throws FHIRException { switch (hash) { - case 1611538117: /*notificationType*/ return new String[] {"code"}; + case 3575610: /*type*/ return new String[] {"code"}; case 304566692: /*eventsSinceSubscriptionStart*/ return new String[] {"integer64"}; case 191408169: /*eventsInNotification*/ return new String[] {"integer"}; case 341203229: /*subscription*/ return new String[] {"Reference"}; case -892481550: /*status*/ return new String[] {"code"}; - case 110546223: /*topic*/ return new String[] {"Reference"}; + case 110546223: /*topic*/ return new String[] {"canonical"}; + case 96784904: /*error*/ return new String[] {"CodeableConcept"}; default: return super.getTypesForProperty(hash, name); } @@ -538,8 +680,8 @@ public class SubscriptionStatus extends DomainResource { @Override public Base addChild(String name) throws FHIRException { - if (name.equals("notificationType")) { - throw new FHIRException("Cannot call addChild on a primitive type SubscriptionStatus.notificationType"); + if (name.equals("type")) { + throw new FHIRException("Cannot call addChild on a primitive type SubscriptionStatus.type"); } else if (name.equals("eventsSinceSubscriptionStart")) { throw new FHIRException("Cannot call addChild on a primitive type SubscriptionStatus.eventsSinceSubscriptionStart"); @@ -555,8 +697,10 @@ public class SubscriptionStatus extends DomainResource { throw new FHIRException("Cannot call addChild on a primitive type SubscriptionStatus.status"); } else if (name.equals("topic")) { - this.topic = new Reference(); - return this.topic; + throw new FHIRException("Cannot call addChild on a primitive type SubscriptionStatus.topic"); + } + else if (name.equals("error")) { + return addError(); } else return super.addChild(name); @@ -575,12 +719,17 @@ public class SubscriptionStatus extends DomainResource { public void copyValues(SubscriptionStatus dst) { super.copyValues(dst); - dst.notificationType = notificationType == null ? null : notificationType.copy(); + dst.type = type == null ? null : type.copy(); dst.eventsSinceSubscriptionStart = eventsSinceSubscriptionStart == null ? null : eventsSinceSubscriptionStart.copy(); dst.eventsInNotification = eventsInNotification == null ? null : eventsInNotification.copy(); dst.subscription = subscription == null ? null : subscription.copy(); dst.status = status == null ? null : status.copy(); dst.topic = topic == null ? null : topic.copy(); + if (error != null) { + dst.error = new ArrayList(); + for (CodeableConcept i : error) + dst.error.add(i.copy()); + }; } protected SubscriptionStatus typedCopy() { @@ -594,9 +743,10 @@ public class SubscriptionStatus extends DomainResource { if (!(other_ instanceof SubscriptionStatus)) return false; SubscriptionStatus o = (SubscriptionStatus) other_; - return compareDeep(notificationType, o.notificationType, true) && compareDeep(eventsSinceSubscriptionStart, o.eventsSinceSubscriptionStart, true) + return compareDeep(type, o.type, true) && compareDeep(eventsSinceSubscriptionStart, o.eventsSinceSubscriptionStart, true) && compareDeep(eventsInNotification, o.eventsInNotification, true) && compareDeep(subscription, o.subscription, true) - && compareDeep(status, o.status, true) && compareDeep(topic, o.topic, true); + && compareDeep(status, o.status, true) && compareDeep(topic, o.topic, true) && compareDeep(error, o.error, true) + ; } @Override @@ -606,14 +756,14 @@ public class SubscriptionStatus extends DomainResource { if (!(other_ instanceof SubscriptionStatus)) return false; SubscriptionStatus o = (SubscriptionStatus) other_; - return compareValues(notificationType, o.notificationType, true) && compareValues(eventsSinceSubscriptionStart, o.eventsSinceSubscriptionStart, true) + return compareValues(type, o.type, true) && compareValues(eventsSinceSubscriptionStart, o.eventsSinceSubscriptionStart, true) && compareValues(eventsInNotification, o.eventsInNotification, true) && compareValues(status, o.status, true) - ; + && compareValues(topic, o.topic, true); } public boolean isEmpty() { - return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(notificationType, eventsSinceSubscriptionStart - , eventsInNotification, subscription, status, topic); + return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(type, eventsSinceSubscriptionStart + , eventsInNotification, subscription, status, topic, error); } @Override @@ -622,4 +772,5 @@ public class SubscriptionStatus extends DomainResource { } -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubscriptionTopic.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubscriptionTopic.java index 2e85465f5..f779366c9 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubscriptionTopic.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubscriptionTopic.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.PublicationStatus; -import org.hl7.fhir.r5.model.Enumerations.PublicationStatusEnumFactory; -import org.hl7.fhir.r5.model.Enumerations.SubscriptionSearchModifier; -import org.hl7.fhir.r5.model.Enumerations.SubscriptionSearchModifierEnumFactory; 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 a stream of resource state changes identified by trigger criteria and annotated with labels useful to filter projections from this topic. @@ -1319,7 +1315,7 @@ public class SubscriptionTopic extends DomainResource { /** * An absolute URL that is used to identify this SubscriptionTopic when it is referenced in a specification, model, design or an instance. This SHALL be a URL, SHOULD be globally unique, and SHOULD be an address at which this Topic is (or will be) published. The URL SHOULD include the major version of the Topic. For more information see [Technical and Business Versions](resource.html#versions). */ - @Child(name = "url", type = {UriType.class}, order=0, min=0, max=1, modifier=false, summary=true) + @Child(name = "url", type = {UriType.class}, order=0, min=1, max=1, modifier=false, summary=true) @Description(shortDefinition="Logical canonical URL to reference this SubscriptionTopic (globally unique)", formalDefinition="An absolute URL that is used to identify this SubscriptionTopic when it is referenced in a specification, model, design or an instance. This SHALL be a URL, SHOULD be globally unique, and SHOULD be an address at which this Topic is (or will be) published. The URL SHOULD include the major version of the Topic. For more information see [Technical and Business Versions](resource.html#versions)." ) protected UriType url; @@ -1347,21 +1343,14 @@ public class SubscriptionTopic extends DomainResource { /** * The canonical URL pointing to another FHIR-defined SubscriptionTopic that is adhered to in whole or in part by this SubscriptionTopic. */ - @Child(name = "derivedFromCanonical", type = {CanonicalType.class}, order=4, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "derivedFrom", type = {CanonicalType.class}, order=4, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Based on FHIR protocol or definition", formalDefinition="The canonical URL pointing to another FHIR-defined SubscriptionTopic that is adhered to in whole or in part by this SubscriptionTopic." ) - protected List derivedFromCanonical; - - /** - * The URL pointing to an externally-defined SubscriptionTopic or other definition that is adhered to in whole or in part by this definition. - */ - @Child(name = "derivedFromUri", type = {UriType.class}, order=5, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Based on external protocol or definition", formalDefinition="The URL pointing to an externally-defined SubscriptionTopic or other definition that is adhered to in whole or in part by this definition." ) - protected List derivedFromUri; + protected List derivedFrom; /** * The current state of the SubscriptionTopic. */ - @Child(name = "status", type = {CodeType.class}, order=6, min=1, max=1, modifier=true, summary=true) + @Child(name = "status", type = {CodeType.class}, order=5, min=1, max=1, modifier=true, summary=true) @Description(shortDefinition="draft | active | retired | unknown", formalDefinition="The current state of the SubscriptionTopic." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/publication-status") protected Enumeration status; @@ -1369,49 +1358,49 @@ public class SubscriptionTopic extends DomainResource { /** * A flag to indicate that this TopSubscriptionTopicic is authored for testing purposes (or education/evaluation/marketing), and is not intended to be used for genuine usage. */ - @Child(name = "experimental", type = {BooleanType.class}, order=7, min=0, max=1, modifier=true, summary=true) + @Child(name = "experimental", type = {BooleanType.class}, order=6, min=0, max=1, modifier=true, summary=true) @Description(shortDefinition="If for testing purposes, not real usage", formalDefinition="A flag to indicate that this TopSubscriptionTopicic is authored for testing purposes (or education/evaluation/marketing), and is not intended to be used for genuine usage." ) protected BooleanType experimental; /** * For draft definitions, indicates the date of initial creation. For active definitions, represents the date of activation. For withdrawn definitions, indicates the date of withdrawal. */ - @Child(name = "date", type = {DateTimeType.class}, order=8, min=0, max=1, modifier=false, summary=true) + @Child(name = "date", type = {DateTimeType.class}, order=7, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Date status first applied", formalDefinition="For draft definitions, indicates the date of initial creation. For active definitions, represents the date of activation. For withdrawn definitions, indicates the date of withdrawal." ) protected DateTimeType date; /** * Helps establish the "authority/credibility" of the SubscriptionTopic. May also allow for contact. */ - @Child(name = "publisher", type = {Practitioner.class, PractitionerRole.class, Organization.class}, order=9, min=0, max=1, modifier=false, summary=true) + @Child(name = "publisher", type = {Practitioner.class, PractitionerRole.class, Organization.class}, order=8, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="The name of the individual or organization that published the SubscriptionTopic", formalDefinition="Helps establish the \"authority/credibility\" of the SubscriptionTopic. May also allow for contact." ) protected Reference publisher; /** * Contact details to assist a user in finding and communicating with the publisher. */ - @Child(name = "contact", type = {ContactDetail.class}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "contact", type = {ContactDetail.class}, order=9, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Contact details for the publisher", formalDefinition="Contact details to assist a user in finding and communicating with the publisher." ) protected List contact; /** * A free text natural language description of the Topic from the consumer's perspective. */ - @Child(name = "description", type = {MarkdownType.class}, order=11, min=0, max=1, modifier=false, summary=false) + @Child(name = "description", type = {MarkdownType.class}, order=10, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Natural language description of the ToSubscriptionTopicpic", formalDefinition="A free text natural language description of the Topic from the consumer's perspective." ) protected MarkdownType description; /** * The content was developed with a focus and intent of supporting the contexts that are listed. These terms may be used to assist with indexing and searching of code system definitions. */ - @Child(name = "useContext", type = {UsageContext.class}, order=12, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "useContext", type = {UsageContext.class}, order=11, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Content intends to support these contexts", formalDefinition="The content was developed with a focus and intent of supporting the contexts that are listed. These terms may be used to assist with indexing and searching of code system definitions." ) protected List useContext; /** * A jurisdiction in which the Topic is intended to be used. */ - @Child(name = "jurisdiction", type = {CodeableConcept.class}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "jurisdiction", type = {CodeableConcept.class}, order=12, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Intended jurisdiction for Topic (if applicable)", formalDefinition="A jurisdiction in which the Topic is intended to be used." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/jurisdiction") protected List jurisdiction; @@ -1419,53 +1408,53 @@ public class SubscriptionTopic extends DomainResource { /** * Explains why this Topic is needed and why it has been designed as it has. */ - @Child(name = "purpose", type = {MarkdownType.class}, order=14, min=0, max=1, modifier=false, summary=false) + @Child(name = "purpose", type = {MarkdownType.class}, order=13, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Why this SubscriptionTopic is defined", formalDefinition="Explains why this Topic is needed and why it has been designed as it has." ) protected MarkdownType purpose; /** * A copyright statement relating to the SubscriptionTopic and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the SubscriptionTopic. */ - @Child(name = "copyright", type = {MarkdownType.class}, order=15, min=0, max=1, modifier=false, summary=false) + @Child(name = "copyright", type = {MarkdownType.class}, order=14, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Use and/or publishing restrictions", formalDefinition="A copyright statement relating to the SubscriptionTopic and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the SubscriptionTopic." ) protected MarkdownType copyright; /** * The date on which the asset content was approved by the publisher. Approval happens once when the content is officially approved for usage. */ - @Child(name = "approvalDate", type = {DateType.class}, order=16, min=0, max=1, modifier=false, summary=false) + @Child(name = "approvalDate", type = {DateType.class}, order=15, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="When SubscriptionTopic is/was approved by publisher", formalDefinition="The date on which the asset content was approved by the publisher. Approval happens once when the content is officially approved for usage." ) protected DateType approvalDate; /** * The date on which the asset content was last reviewed. Review happens periodically after that, but doesn't change the original approval date. */ - @Child(name = "lastReviewDate", type = {DateType.class}, order=17, min=0, max=1, modifier=false, summary=false) + @Child(name = "lastReviewDate", type = {DateType.class}, order=16, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Last review date for the SubscriptionTopic", formalDefinition="The date on which the asset content was last reviewed. Review happens periodically after that, but doesn't change the original approval date." ) protected DateType lastReviewDate; /** * The period during which the SubscriptionTopic content was or is planned to be effective. */ - @Child(name = "effectivePeriod", type = {Period.class}, order=18, min=0, max=1, modifier=false, summary=true) + @Child(name = "effectivePeriod", type = {Period.class}, order=17, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="The effective date range for the SubscriptionTopic", formalDefinition="The period during which the SubscriptionTopic content was or is planned to be effective." ) protected Period effectivePeriod; /** * The criteria for including updates to a nominated resource in the subscription topic. Thie criteria may be just a human readable description and/or a full FHIR search string or FHIRPath expression. */ - @Child(name = "resourceTrigger", type = {}, order=19, min=0, max=1, modifier=false, summary=true) + @Child(name = "resourceTrigger", type = {}, order=18, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Criteria for including a resource update in the subscription topic", formalDefinition="The criteria for including updates to a nominated resource in the subscription topic. Thie criteria may be just a human readable description and/or a full FHIR search string or FHIRPath expression." ) protected SubscriptionTopicResourceTriggerComponent resourceTrigger; /** * List of properties by which Subscriptions on the subscription topic can be filtered. */ - @Child(name = "canFilterBy", type = {}, order=20, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "canFilterBy", type = {}, order=19, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Properties by which a Subscription can further filter a SubscriptionTopic", formalDefinition="List of properties by which Subscriptions on the subscription topic can be filtered." ) protected List canFilterBy; - private static final long serialVersionUID = 2064987797L; + private static final long serialVersionUID = 1023095226L; /** * Constructor @@ -1477,8 +1466,9 @@ public class SubscriptionTopic extends DomainResource { /** * Constructor */ - public SubscriptionTopic(PublicationStatus status) { + public SubscriptionTopic(String url, PublicationStatus status) { super(); + this.setUrl(url); this.setStatus(status); } @@ -1521,13 +1511,9 @@ public class SubscriptionTopic extends DomainResource { * @param value An absolute URL that is used to identify this SubscriptionTopic when it is referenced in a specification, model, design or an instance. This SHALL be a URL, SHOULD be globally unique, and SHOULD be an address at which this Topic is (or will be) published. The URL SHOULD include the major version of the Topic. For more information see [Technical and Business Versions](resource.html#versions). */ public SubscriptionTopic setUrl(String value) { - if (Utilities.noString(value)) - this.url = null; - else { if (this.url == null) this.url = new UriType(); this.url.setValue(value); - } return this; } @@ -1683,127 +1669,66 @@ public class SubscriptionTopic extends DomainResource { } /** - * @return {@link #derivedFromCanonical} (The canonical URL pointing to another FHIR-defined SubscriptionTopic that is adhered to in whole or in part by this SubscriptionTopic.) + * @return {@link #derivedFrom} (The canonical URL pointing to another FHIR-defined SubscriptionTopic that is adhered to in whole or in part by this SubscriptionTopic.) */ - public List getDerivedFromCanonical() { - if (this.derivedFromCanonical == null) - this.derivedFromCanonical = new ArrayList(); - return this.derivedFromCanonical; + public List getDerivedFrom() { + if (this.derivedFrom == null) + this.derivedFrom = new ArrayList(); + return this.derivedFrom; } /** * @return Returns a reference to this for easy method chaining */ - public SubscriptionTopic setDerivedFromCanonical(List theDerivedFromCanonical) { - this.derivedFromCanonical = theDerivedFromCanonical; + public SubscriptionTopic setDerivedFrom(List theDerivedFrom) { + this.derivedFrom = theDerivedFrom; return this; } - public boolean hasDerivedFromCanonical() { - if (this.derivedFromCanonical == null) + public boolean hasDerivedFrom() { + if (this.derivedFrom == null) return false; - for (CanonicalType item : this.derivedFromCanonical) + for (CanonicalType item : this.derivedFrom) if (!item.isEmpty()) return true; return false; } /** - * @return {@link #derivedFromCanonical} (The canonical URL pointing to another FHIR-defined SubscriptionTopic that is adhered to in whole or in part by this SubscriptionTopic.) + * @return {@link #derivedFrom} (The canonical URL pointing to another FHIR-defined SubscriptionTopic that is adhered to in whole or in part by this SubscriptionTopic.) */ - public CanonicalType addDerivedFromCanonicalElement() {//2 + public CanonicalType addDerivedFromElement() {//2 CanonicalType t = new CanonicalType(); - if (this.derivedFromCanonical == null) - this.derivedFromCanonical = new ArrayList(); - this.derivedFromCanonical.add(t); + if (this.derivedFrom == null) + this.derivedFrom = new ArrayList(); + this.derivedFrom.add(t); return t; } /** - * @param value {@link #derivedFromCanonical} (The canonical URL pointing to another FHIR-defined SubscriptionTopic that is adhered to in whole or in part by this SubscriptionTopic.) + * @param value {@link #derivedFrom} (The canonical URL pointing to another FHIR-defined SubscriptionTopic that is adhered to in whole or in part by this SubscriptionTopic.) */ - public SubscriptionTopic addDerivedFromCanonical(String value) { //1 + public SubscriptionTopic addDerivedFrom(String value) { //1 CanonicalType t = new CanonicalType(); t.setValue(value); - if (this.derivedFromCanonical == null) - this.derivedFromCanonical = new ArrayList(); - this.derivedFromCanonical.add(t); + if (this.derivedFrom == null) + this.derivedFrom = new ArrayList(); + this.derivedFrom.add(t); return this; } /** - * @param value {@link #derivedFromCanonical} (The canonical URL pointing to another FHIR-defined SubscriptionTopic that is adhered to in whole or in part by this SubscriptionTopic.) + * @param value {@link #derivedFrom} (The canonical URL pointing to another FHIR-defined SubscriptionTopic that is adhered to in whole or in part by this SubscriptionTopic.) */ - public boolean hasDerivedFromCanonical(String value) { - if (this.derivedFromCanonical == null) + public boolean hasDerivedFrom(String value) { + if (this.derivedFrom == null) return false; - for (CanonicalType v : this.derivedFromCanonical) + for (CanonicalType v : this.derivedFrom) if (v.getValue().equals(value)) // canonical return true; return false; } - /** - * @return {@link #derivedFromUri} (The URL pointing to an externally-defined SubscriptionTopic or other definition that is adhered to in whole or in part by this definition.) - */ - public List getDerivedFromUri() { - if (this.derivedFromUri == null) - this.derivedFromUri = new ArrayList(); - return this.derivedFromUri; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public SubscriptionTopic setDerivedFromUri(List theDerivedFromUri) { - this.derivedFromUri = theDerivedFromUri; - return this; - } - - public boolean hasDerivedFromUri() { - if (this.derivedFromUri == null) - return false; - for (UriType item : this.derivedFromUri) - if (!item.isEmpty()) - return true; - return false; - } - - /** - * @return {@link #derivedFromUri} (The URL pointing to an externally-defined SubscriptionTopic or other definition that is adhered to in whole or in part by this definition.) - */ - public UriType addDerivedFromUriElement() {//2 - UriType t = new UriType(); - if (this.derivedFromUri == null) - this.derivedFromUri = new ArrayList(); - this.derivedFromUri.add(t); - return t; - } - - /** - * @param value {@link #derivedFromUri} (The URL pointing to an externally-defined SubscriptionTopic or other definition that is adhered to in whole or in part by this definition.) - */ - public SubscriptionTopic addDerivedFromUri(String value) { //1 - UriType t = new UriType(); - t.setValue(value); - if (this.derivedFromUri == null) - this.derivedFromUri = new ArrayList(); - this.derivedFromUri.add(t); - return this; - } - - /** - * @param value {@link #derivedFromUri} (The URL pointing to an externally-defined SubscriptionTopic or other definition that is adhered to in whole or in part by this definition.) - */ - public boolean hasDerivedFromUri(String value) { - if (this.derivedFromUri == null) - return false; - for (UriType v : this.derivedFromUri) - if (v.getValue().equals(value)) // uri - return true; - return false; - } - /** * @return {@link #status} (The current state of the SubscriptionTopic.). This is the underlying object with id, value and extensions. The accessor "getStatus" gives direct access to the value */ @@ -2478,8 +2403,7 @@ public class SubscriptionTopic extends DomainResource { children.add(new Property("identifier", "Identifier", "Business identifiers assigned to this SubscriptionTopic by the performer and/or other systems. These identifiers remain constant as the resource is updated and propagates from server to server.", 0, java.lang.Integer.MAX_VALUE, identifier)); children.add(new Property("version", "string", "The identifier that is used to identify this version of the SubscriptionTopic when it is referenced in a specification, model, design or instance. This is an arbitrary value managed by the Topic 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 are orderable.", 0, 1, version)); children.add(new Property("title", "string", "A short, descriptive, user-friendly title for the SubscriptionTopic, for example, \"admission\".", 0, 1, title)); - children.add(new Property("derivedFromCanonical", "canonical(SubscriptionTopic)", "The canonical URL pointing to another FHIR-defined SubscriptionTopic that is adhered to in whole or in part by this SubscriptionTopic.", 0, java.lang.Integer.MAX_VALUE, derivedFromCanonical)); - children.add(new Property("derivedFromUri", "uri", "The URL pointing to an externally-defined SubscriptionTopic or other definition that is adhered to in whole or in part by this definition.", 0, java.lang.Integer.MAX_VALUE, derivedFromUri)); + children.add(new Property("derivedFrom", "canonical(SubscriptionTopic)", "The canonical URL pointing to another FHIR-defined SubscriptionTopic that is adhered to in whole or in part by this SubscriptionTopic.", 0, java.lang.Integer.MAX_VALUE, derivedFrom)); children.add(new Property("status", "code", "The current state of the SubscriptionTopic.", 0, 1, status)); children.add(new Property("experimental", "boolean", "A flag to indicate that this TopSubscriptionTopicic is authored for testing purposes (or education/evaluation/marketing), and is not intended to be used for genuine usage.", 0, 1, experimental)); children.add(new Property("date", "dateTime", "For draft definitions, indicates the date of initial creation. For active definitions, represents the date of activation. For withdrawn definitions, indicates the date of withdrawal.", 0, 1, date)); @@ -2504,8 +2428,7 @@ public class SubscriptionTopic extends DomainResource { case -1618432855: /*identifier*/ return new Property("identifier", "Identifier", "Business identifiers assigned to this SubscriptionTopic by the performer and/or other systems. These identifiers remain constant as the resource is updated and propagates from server to server.", 0, java.lang.Integer.MAX_VALUE, identifier); case 351608024: /*version*/ return new Property("version", "string", "The identifier that is used to identify this version of the SubscriptionTopic when it is referenced in a specification, model, design or instance. This is an arbitrary value managed by the Topic 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 are orderable.", 0, 1, version); case 110371416: /*title*/ return new Property("title", "string", "A short, descriptive, user-friendly title for the SubscriptionTopic, for example, \"admission\".", 0, 1, title); - case -978133683: /*derivedFromCanonical*/ return new Property("derivedFromCanonical", "canonical(SubscriptionTopic)", "The canonical URL pointing to another FHIR-defined SubscriptionTopic that is adhered to in whole or in part by this SubscriptionTopic.", 0, java.lang.Integer.MAX_VALUE, derivedFromCanonical); - case -1076333435: /*derivedFromUri*/ return new Property("derivedFromUri", "uri", "The URL pointing to an externally-defined SubscriptionTopic or other definition that is adhered to in whole or in part by this definition.", 0, java.lang.Integer.MAX_VALUE, derivedFromUri); + case 1077922663: /*derivedFrom*/ return new Property("derivedFrom", "canonical(SubscriptionTopic)", "The canonical URL pointing to another FHIR-defined SubscriptionTopic that is adhered to in whole or in part by this SubscriptionTopic.", 0, java.lang.Integer.MAX_VALUE, derivedFrom); case -892481550: /*status*/ return new Property("status", "code", "The current state of the SubscriptionTopic.", 0, 1, status); case -404562712: /*experimental*/ return new Property("experimental", "boolean", "A flag to indicate that this TopSubscriptionTopicic is authored for testing purposes (or education/evaluation/marketing), and is not intended to be used for genuine usage.", 0, 1, experimental); case 3076014: /*date*/ return new Property("date", "dateTime", "For draft definitions, indicates the date of initial creation. For active definitions, represents the date of activation. For withdrawn definitions, indicates the date of withdrawal.", 0, 1, date); @@ -2533,8 +2456,7 @@ public class SubscriptionTopic extends DomainResource { case -1618432855: /*identifier*/ return this.identifier == null ? new Base[0] : this.identifier.toArray(new Base[this.identifier.size()]); // Identifier case 351608024: /*version*/ return this.version == null ? new Base[0] : new Base[] {this.version}; // StringType case 110371416: /*title*/ return this.title == null ? new Base[0] : new Base[] {this.title}; // StringType - case -978133683: /*derivedFromCanonical*/ return this.derivedFromCanonical == null ? new Base[0] : this.derivedFromCanonical.toArray(new Base[this.derivedFromCanonical.size()]); // CanonicalType - case -1076333435: /*derivedFromUri*/ return this.derivedFromUri == null ? new Base[0] : this.derivedFromUri.toArray(new Base[this.derivedFromUri.size()]); // UriType + case 1077922663: /*derivedFrom*/ return this.derivedFrom == null ? new Base[0] : this.derivedFrom.toArray(new Base[this.derivedFrom.size()]); // CanonicalType case -892481550: /*status*/ return this.status == null ? new Base[0] : new Base[] {this.status}; // Enumeration case -404562712: /*experimental*/ return this.experimental == null ? new Base[0] : new Base[] {this.experimental}; // BooleanType case 3076014: /*date*/ return this.date == null ? new Base[0] : new Base[] {this.date}; // DateTimeType @@ -2570,11 +2492,8 @@ public class SubscriptionTopic extends DomainResource { case 110371416: // title this.title = TypeConvertor.castToString(value); // StringType return value; - case -978133683: // derivedFromCanonical - this.getDerivedFromCanonical().add(TypeConvertor.castToCanonical(value)); // CanonicalType - return value; - case -1076333435: // derivedFromUri - this.getDerivedFromUri().add(TypeConvertor.castToUri(value)); // UriType + case 1077922663: // derivedFrom + this.getDerivedFrom().add(TypeConvertor.castToCanonical(value)); // CanonicalType return value; case -892481550: // status value = new PublicationStatusEnumFactory().fromType(TypeConvertor.castToCode(value)); @@ -2637,10 +2556,8 @@ public class SubscriptionTopic extends DomainResource { this.version = TypeConvertor.castToString(value); // StringType } else if (name.equals("title")) { this.title = TypeConvertor.castToString(value); // StringType - } else if (name.equals("derivedFromCanonical")) { - this.getDerivedFromCanonical().add(TypeConvertor.castToCanonical(value)); - } else if (name.equals("derivedFromUri")) { - this.getDerivedFromUri().add(TypeConvertor.castToUri(value)); + } else if (name.equals("derivedFrom")) { + this.getDerivedFrom().add(TypeConvertor.castToCanonical(value)); } else if (name.equals("status")) { value = new PublicationStatusEnumFactory().fromType(TypeConvertor.castToCode(value)); this.status = (Enumeration) value; // Enumeration @@ -2684,8 +2601,7 @@ public class SubscriptionTopic extends DomainResource { case -1618432855: return addIdentifier(); case 351608024: return getVersionElement(); case 110371416: return getTitleElement(); - case -978133683: return addDerivedFromCanonicalElement(); - case -1076333435: return addDerivedFromUriElement(); + case 1077922663: return addDerivedFromElement(); case -892481550: return getStatusElement(); case -404562712: return getExperimentalElement(); case 3076014: return getDateElement(); @@ -2713,8 +2629,7 @@ public class SubscriptionTopic extends DomainResource { case -1618432855: /*identifier*/ return new String[] {"Identifier"}; case 351608024: /*version*/ return new String[] {"string"}; case 110371416: /*title*/ return new String[] {"string"}; - case -978133683: /*derivedFromCanonical*/ return new String[] {"canonical"}; - case -1076333435: /*derivedFromUri*/ return new String[] {"uri"}; + case 1077922663: /*derivedFrom*/ return new String[] {"canonical"}; case -892481550: /*status*/ return new String[] {"code"}; case -404562712: /*experimental*/ return new String[] {"boolean"}; case 3076014: /*date*/ return new String[] {"dateTime"}; @@ -2749,11 +2664,8 @@ public class SubscriptionTopic extends DomainResource { else if (name.equals("title")) { throw new FHIRException("Cannot call addChild on a primitive type SubscriptionTopic.title"); } - else if (name.equals("derivedFromCanonical")) { - throw new FHIRException("Cannot call addChild on a primitive type SubscriptionTopic.derivedFromCanonical"); - } - else if (name.equals("derivedFromUri")) { - throw new FHIRException("Cannot call addChild on a primitive type SubscriptionTopic.derivedFromUri"); + else if (name.equals("derivedFrom")) { + throw new FHIRException("Cannot call addChild on a primitive type SubscriptionTopic.derivedFrom"); } else if (name.equals("status")) { throw new FHIRException("Cannot call addChild on a primitive type SubscriptionTopic.status"); @@ -2828,15 +2740,10 @@ public class SubscriptionTopic extends DomainResource { }; dst.version = version == null ? null : version.copy(); dst.title = title == null ? null : title.copy(); - if (derivedFromCanonical != null) { - dst.derivedFromCanonical = new ArrayList(); - for (CanonicalType i : derivedFromCanonical) - dst.derivedFromCanonical.add(i.copy()); - }; - if (derivedFromUri != null) { - dst.derivedFromUri = new ArrayList(); - for (UriType i : derivedFromUri) - dst.derivedFromUri.add(i.copy()); + if (derivedFrom != null) { + dst.derivedFrom = new ArrayList(); + for (CanonicalType i : derivedFrom) + dst.derivedFrom.add(i.copy()); }; dst.status = status == null ? null : status.copy(); dst.experimental = experimental == null ? null : experimental.copy(); @@ -2883,10 +2790,9 @@ public class SubscriptionTopic extends DomainResource { return false; SubscriptionTopic o = (SubscriptionTopic) other_; return compareDeep(url, o.url, true) && compareDeep(identifier, o.identifier, true) && compareDeep(version, o.version, true) - && compareDeep(title, o.title, true) && compareDeep(derivedFromCanonical, o.derivedFromCanonical, true) - && compareDeep(derivedFromUri, o.derivedFromUri, true) && compareDeep(status, o.status, true) && compareDeep(experimental, o.experimental, true) - && compareDeep(date, o.date, true) && compareDeep(publisher, o.publisher, true) && compareDeep(contact, o.contact, true) - && compareDeep(description, o.description, true) && compareDeep(useContext, o.useContext, true) + && compareDeep(title, o.title, true) && compareDeep(derivedFrom, o.derivedFrom, true) && compareDeep(status, o.status, true) + && compareDeep(experimental, o.experimental, true) && compareDeep(date, o.date, true) && compareDeep(publisher, o.publisher, true) + && compareDeep(contact, o.contact, true) && compareDeep(description, o.description, true) && compareDeep(useContext, o.useContext, true) && compareDeep(jurisdiction, o.jurisdiction, true) && compareDeep(purpose, o.purpose, true) && compareDeep(copyright, o.copyright, true) && compareDeep(approvalDate, o.approvalDate, true) && compareDeep(lastReviewDate, o.lastReviewDate, true) && compareDeep(effectivePeriod, o.effectivePeriod, true) && compareDeep(resourceTrigger, o.resourceTrigger, true) @@ -2901,18 +2807,17 @@ public class SubscriptionTopic extends DomainResource { return false; SubscriptionTopic o = (SubscriptionTopic) other_; return compareValues(url, o.url, true) && compareValues(version, o.version, true) && compareValues(title, o.title, true) - && compareValues(derivedFromCanonical, o.derivedFromCanonical, true) && compareValues(derivedFromUri, o.derivedFromUri, true) - && compareValues(status, o.status, true) && compareValues(experimental, o.experimental, true) && compareValues(date, o.date, true) - && compareValues(description, o.description, true) && compareValues(purpose, o.purpose, true) && compareValues(copyright, o.copyright, true) - && compareValues(approvalDate, o.approvalDate, true) && compareValues(lastReviewDate, o.lastReviewDate, true) - ; + && compareValues(derivedFrom, o.derivedFrom, true) && compareValues(status, o.status, true) && compareValues(experimental, o.experimental, true) + && compareValues(date, o.date, true) && compareValues(description, o.description, true) && compareValues(purpose, o.purpose, true) + && compareValues(copyright, o.copyright, true) && compareValues(approvalDate, o.approvalDate, true) + && compareValues(lastReviewDate, o.lastReviewDate, true); } public boolean isEmpty() { return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(url, identifier, version - , title, derivedFromCanonical, derivedFromUri, status, experimental, date, publisher - , contact, description, useContext, jurisdiction, purpose, copyright, approvalDate - , lastReviewDate, effectivePeriod, resourceTrigger, canFilterBy); + , title, derivedFrom, status, experimental, date, publisher, contact, description + , useContext, jurisdiction, purpose, copyright, approvalDate, lastReviewDate, effectivePeriod + , resourceTrigger, canFilterBy); } @Override @@ -2940,6 +2845,26 @@ public class SubscriptionTopic extends DomainResource { */ public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE); + /** + * Search parameter: derived-or-self + *

    + * Description: A server defined search that matches either the url or derivedFrom
    + * Type: uri
    + * Path: SubscriptionTopic.url | SubscriptionTopic.derivedFrom
    + *

    + */ + @SearchParamDefinition(name="derived-or-self", path="SubscriptionTopic.url | SubscriptionTopic.derivedFrom", description="A server defined search that matches either the url or derivedFrom", type="uri" ) + public static final String SP_DERIVED_OR_SELF = "derived-or-self"; + /** + * Fluent Client search parameter constant for derived-or-self + *

    + * Description: A server defined search that matches either the url or derivedFrom
    + * Type: uri
    + * Path: SubscriptionTopic.url | SubscriptionTopic.derivedFrom
    + *

    + */ + public static final ca.uhn.fhir.rest.gclient.UriClientParam DERIVED_OR_SELF = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_DERIVED_OR_SELF); + /** * Search parameter: identifier *

    @@ -3107,4 +3032,5 @@ public class SubscriptionTopic extends DomainResource { 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/Substance.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Substance.java index a2c19f6e4..ac79f4195 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Substance.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Substance.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 homogeneous material with a definite composition. @@ -1474,4 +1474,5 @@ public class Substance extends DomainResource { public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBSTANCE_REFERENCE = new ca.uhn.fhir.model.api.Include("Substance:substance-reference").toLocked(); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceAmount.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceAmount.java index a09f9ac49..4e1eb0725 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceAmount.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceAmount.java @@ -3,17 +3,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 Mon, May 11, 2020 09:58+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.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 SubstanceAmount Type: Chemical substances are a single substance type whose primary defining element is the molecular structure. Chemical substances shall be defined on the basis of their complete covalent molecular structure; the presence of a salt (counter-ion) and/or solvates (water, alcohols) is also captured. Purity, grade, physical form or particle size are not taken into account in the definition of a chemical substance or in the assignment of a Substance ID. diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceDefinition.java index cf80d83a9..8cf60f271 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceDefinition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceDefinition.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 detailed description of a substance, typically at a level beyond what is used for prescribing. @@ -644,9 +644,9 @@ public class SubstanceDefinition extends DomainResource { /** * A substance upon which a defining property depends (e.g. for solubility: in water, in alcohol). */ - @Child(name = "definingSubstance", type = {SubstanceDefinition.class, Substance.class, CodeableConcept.class}, order=4, min=0, max=1, modifier=false, summary=true) + @Child(name = "definingSubstance", type = {CodeableReference.class}, order=4, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="A substance upon which a defining property depends (e.g. for solubility: in water, in alcohol)", formalDefinition="A substance upon which a defining property depends (e.g. for solubility: in water, in alcohol)." ) - protected DataType definingSubstance; + protected CodeableReference definingSubstance; /** * Quantitative value for this property. @@ -669,7 +669,7 @@ public class SubstanceDefinition extends DomainResource { @Description(shortDefinition="Supporting literature", formalDefinition="Supporting literature." ) protected List source; - private static final long serialVersionUID = 1019727375L; + private static final long serialVersionUID = 468287211L; /** * Constructor @@ -778,40 +778,15 @@ public class SubstanceDefinition extends DomainResource { /** * @return {@link #definingSubstance} (A substance upon which a defining property depends (e.g. for solubility: in water, in alcohol).) */ - public DataType getDefiningSubstance() { + public CodeableReference getDefiningSubstance() { + if (this.definingSubstance == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create SubstanceDefinitionPropertyComponent.definingSubstance"); + else if (Configuration.doAutoCreate()) + this.definingSubstance = new CodeableReference(); // cc return this.definingSubstance; } - /** - * @return {@link #definingSubstance} (A substance upon which a defining property depends (e.g. for solubility: in water, in alcohol).) - */ - public Reference getDefiningSubstanceReference() throws FHIRException { - if (this.definingSubstance == null) - this.definingSubstance = new Reference(); - if (!(this.definingSubstance instanceof Reference)) - throw new FHIRException("Type mismatch: the type Reference was expected, but "+this.definingSubstance.getClass().getName()+" was encountered"); - return (Reference) this.definingSubstance; - } - - public boolean hasDefiningSubstanceReference() { - return this != null && this.definingSubstance instanceof Reference; - } - - /** - * @return {@link #definingSubstance} (A substance upon which a defining property depends (e.g. for solubility: in water, in alcohol).) - */ - public CodeableConcept getDefiningSubstanceCodeableConcept() throws FHIRException { - if (this.definingSubstance == null) - this.definingSubstance = new CodeableConcept(); - if (!(this.definingSubstance instanceof CodeableConcept)) - throw new FHIRException("Type mismatch: the type CodeableConcept was expected, but "+this.definingSubstance.getClass().getName()+" was encountered"); - return (CodeableConcept) this.definingSubstance; - } - - public boolean hasDefiningSubstanceCodeableConcept() { - return this != null && this.definingSubstance instanceof CodeableConcept; - } - public boolean hasDefiningSubstance() { return this.definingSubstance != null && !this.definingSubstance.isEmpty(); } @@ -819,9 +794,7 @@ public class SubstanceDefinition extends DomainResource { /** * @param value {@link #definingSubstance} (A substance upon which a defining property depends (e.g. for solubility: in water, in alcohol).) */ - public SubstanceDefinitionPropertyComponent setDefiningSubstance(DataType value) { - if (value != null && !(value instanceof Reference || value instanceof CodeableConcept)) - throw new Error("Not the right type for SubstanceDefinition.property.definingSubstance[x]: "+value.fhirType()); + public SubstanceDefinitionPropertyComponent setDefiningSubstance(CodeableReference value) { this.definingSubstance = value; return this; } @@ -959,7 +932,7 @@ public class SubstanceDefinition extends DomainResource { children.add(new Property("category", "CodeableConcept", "A category for this property, e.g. Physical, Chemical, Enzymatic.", 0, 1, category)); children.add(new Property("code", "CodeableConcept", "Property type e.g. viscosity, pH, isoelectric point.", 0, 1, code)); children.add(new Property("parameters", "string", "Parameters that were used in the measurement of a property (e.g. for viscosity: measured at 20C with a pH of 7.1).", 0, 1, parameters)); - children.add(new Property("definingSubstance[x]", "Reference(SubstanceDefinition|Substance)|CodeableConcept", "A substance upon which a defining property depends (e.g. for solubility: in water, in alcohol).", 0, 1, definingSubstance)); + children.add(new Property("definingSubstance", "CodeableReference(SubstanceDefinition|Substance)", "A substance upon which a defining property depends (e.g. for solubility: in water, in alcohol).", 0, 1, definingSubstance)); children.add(new Property("amount[x]", "Quantity|string", "Quantitative value for this property.", 0, 1, amount)); children.add(new Property("referenceRange", "Range", "Range of typical values.", 0, 1, referenceRange)); children.add(new Property("source", "Reference(DocumentReference)", "Supporting literature.", 0, java.lang.Integer.MAX_VALUE, source)); @@ -971,10 +944,7 @@ public class SubstanceDefinition extends DomainResource { case 50511102: /*category*/ return new Property("category", "CodeableConcept", "A category for this property, e.g. Physical, Chemical, Enzymatic.", 0, 1, category); case 3059181: /*code*/ return new Property("code", "CodeableConcept", "Property type e.g. viscosity, pH, isoelectric point.", 0, 1, code); case 458736106: /*parameters*/ return new Property("parameters", "string", "Parameters that were used in the measurement of a property (e.g. for viscosity: measured at 20C with a pH of 7.1).", 0, 1, parameters); - case 1535270120: /*definingSubstance[x]*/ return new Property("definingSubstance[x]", "Reference(SubstanceDefinition|Substance)|CodeableConcept", "A substance upon which a defining property depends (e.g. for solubility: in water, in alcohol).", 0, 1, definingSubstance); - case 1901076632: /*definingSubstance*/ return new Property("definingSubstance[x]", "Reference(SubstanceDefinition|Substance)|CodeableConcept", "A substance upon which a defining property depends (e.g. for solubility: in water, in alcohol).", 0, 1, definingSubstance); - case -2101581421: /*definingSubstanceReference*/ return new Property("definingSubstance[x]", "Reference(SubstanceDefinition|Substance)", "A substance upon which a defining property depends (e.g. for solubility: in water, in alcohol).", 0, 1, definingSubstance); - case -1438235671: /*definingSubstanceCodeableConcept*/ return new Property("definingSubstance[x]", "CodeableConcept", "A substance upon which a defining property depends (e.g. for solubility: in water, in alcohol).", 0, 1, definingSubstance); + case 1901076632: /*definingSubstance*/ return new Property("definingSubstance", "CodeableReference(SubstanceDefinition|Substance)", "A substance upon which a defining property depends (e.g. for solubility: in water, in alcohol).", 0, 1, definingSubstance); case 646780200: /*amount[x]*/ return new Property("amount[x]", "Quantity|string", "Quantitative value for this property.", 0, 1, amount); case -1413853096: /*amount*/ return new Property("amount[x]", "Quantity|string", "Quantitative value for this property.", 0, 1, amount); case 1664303363: /*amountQuantity*/ return new Property("amount[x]", "Quantity", "Quantitative value for this property.", 0, 1, amount); @@ -992,7 +962,7 @@ public class SubstanceDefinition extends DomainResource { case 50511102: /*category*/ return this.category == null ? new Base[0] : new Base[] {this.category}; // CodeableConcept case 3059181: /*code*/ return this.code == null ? new Base[0] : new Base[] {this.code}; // CodeableConcept case 458736106: /*parameters*/ return this.parameters == null ? new Base[0] : new Base[] {this.parameters}; // StringType - case 1901076632: /*definingSubstance*/ return this.definingSubstance == null ? new Base[0] : new Base[] {this.definingSubstance}; // DataType + case 1901076632: /*definingSubstance*/ return this.definingSubstance == null ? new Base[0] : new Base[] {this.definingSubstance}; // CodeableReference case -1413853096: /*amount*/ return this.amount == null ? new Base[0] : new Base[] {this.amount}; // DataType case -1912545102: /*referenceRange*/ return this.referenceRange == null ? new Base[0] : new Base[] {this.referenceRange}; // Range case -896505829: /*source*/ return this.source == null ? new Base[0] : this.source.toArray(new Base[this.source.size()]); // Reference @@ -1014,7 +984,7 @@ public class SubstanceDefinition extends DomainResource { this.parameters = TypeConvertor.castToString(value); // StringType return value; case 1901076632: // definingSubstance - this.definingSubstance = TypeConvertor.castToType(value); // DataType + this.definingSubstance = TypeConvertor.castToCodeableReference(value); // CodeableReference return value; case -1413853096: // amount this.amount = TypeConvertor.castToType(value); // DataType @@ -1038,8 +1008,8 @@ public class SubstanceDefinition extends DomainResource { this.code = TypeConvertor.castToCodeableConcept(value); // CodeableConcept } else if (name.equals("parameters")) { this.parameters = TypeConvertor.castToString(value); // StringType - } else if (name.equals("definingSubstance[x]")) { - this.definingSubstance = TypeConvertor.castToType(value); // DataType + } else if (name.equals("definingSubstance")) { + this.definingSubstance = TypeConvertor.castToCodeableReference(value); // CodeableReference } else if (name.equals("amount[x]")) { this.amount = TypeConvertor.castToType(value); // DataType } else if (name.equals("referenceRange")) { @@ -1057,7 +1027,6 @@ public class SubstanceDefinition extends DomainResource { case 50511102: return getCategory(); case 3059181: return getCode(); case 458736106: return getParametersElement(); - case 1535270120: return getDefiningSubstance(); case 1901076632: return getDefiningSubstance(); case 646780200: return getAmount(); case -1413853096: return getAmount(); @@ -1074,7 +1043,7 @@ public class SubstanceDefinition extends DomainResource { case 50511102: /*category*/ return new String[] {"CodeableConcept"}; case 3059181: /*code*/ return new String[] {"CodeableConcept"}; case 458736106: /*parameters*/ return new String[] {"string"}; - case 1901076632: /*definingSubstance*/ return new String[] {"Reference", "CodeableConcept"}; + case 1901076632: /*definingSubstance*/ return new String[] {"CodeableReference"}; case -1413853096: /*amount*/ return new String[] {"Quantity", "string"}; case -1912545102: /*referenceRange*/ return new String[] {"Range"}; case -896505829: /*source*/ return new String[] {"Reference"}; @@ -1096,12 +1065,8 @@ public class SubstanceDefinition extends DomainResource { else if (name.equals("parameters")) { throw new FHIRException("Cannot call addChild on a primitive type SubstanceDefinition.property.parameters"); } - else if (name.equals("definingSubstanceReference")) { - this.definingSubstance = new Reference(); - return this.definingSubstance; - } - else if (name.equals("definingSubstanceCodeableConcept")) { - this.definingSubstance = new CodeableConcept(); + else if (name.equals("definingSubstance")) { + this.definingSubstance = new CodeableReference(); return this.definingSubstance; } else if (name.equals("amountQuantity")) { @@ -1237,10 +1202,10 @@ public class SubstanceDefinition extends DomainResource { protected List sourceDocument; /** - * Molecular structural representation. + * A depiction of the structure or characterization of the substance. */ @Child(name = "representation", type = {}, order=9, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Molecular structural representation", formalDefinition="Molecular structural representation." ) + @Description(shortDefinition="A depiction of the structure or characterization of the substance", formalDefinition="A depiction of the structure or characterization of the substance." ) protected List representation; private static final long serialVersionUID = -1648605311L; @@ -1582,7 +1547,7 @@ public class SubstanceDefinition extends DomainResource { } /** - * @return {@link #representation} (Molecular structural representation.) + * @return {@link #representation} (A depiction of the structure or characterization of the substance.) */ public List getRepresentation() { if (this.representation == null) @@ -1644,7 +1609,7 @@ public class SubstanceDefinition extends DomainResource { children.add(new Property("molecularWeight", "@SubstanceDefinition.structure.isotope.molecularWeight", "The molecular weight or weight range (for proteins, polymers or nucleic acids).", 0, 1, molecularWeight)); children.add(new Property("technique", "CodeableConcept", "The method used to elucidate the structure or characterization of the drug substance. Examples: X-ray, HPLC, NMR, Peptide mapping, Ligand binding assay.", 0, java.lang.Integer.MAX_VALUE, technique)); children.add(new Property("sourceDocument", "Reference(DocumentReference)", "Supporting literature about the source of information.", 0, java.lang.Integer.MAX_VALUE, sourceDocument)); - children.add(new Property("representation", "", "Molecular structural representation.", 0, java.lang.Integer.MAX_VALUE, representation)); + children.add(new Property("representation", "", "A depiction of the structure or characterization of the substance.", 0, java.lang.Integer.MAX_VALUE, representation)); } @Override @@ -1658,7 +1623,7 @@ public class SubstanceDefinition extends DomainResource { case 635625672: /*molecularWeight*/ return new Property("molecularWeight", "@SubstanceDefinition.structure.isotope.molecularWeight", "The molecular weight or weight range (for proteins, polymers or nucleic acids).", 0, 1, molecularWeight); case 1469675088: /*technique*/ return new Property("technique", "CodeableConcept", "The method used to elucidate the structure or characterization of the drug substance. Examples: X-ray, HPLC, NMR, Peptide mapping, Ligand binding assay.", 0, java.lang.Integer.MAX_VALUE, technique); case -501788074: /*sourceDocument*/ return new Property("sourceDocument", "Reference(DocumentReference)", "Supporting literature about the source of information.", 0, java.lang.Integer.MAX_VALUE, sourceDocument); - case -671065907: /*representation*/ return new Property("representation", "", "Molecular structural representation.", 0, java.lang.Integer.MAX_VALUE, representation); + case -671065907: /*representation*/ return new Property("representation", "", "A depiction of the structure or characterization of the substance.", 0, java.lang.Integer.MAX_VALUE, representation); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -2477,34 +2442,34 @@ public class SubstanceDefinition extends DomainResource { @Block() public static class SubstanceDefinitionStructureRepresentationComponent extends BackboneElement implements IBaseBackboneElement { /** - * The type of structure (e.g. Full, Partial, Representative). + * The kind of structural representation (e.g. full, partial) or the technique used to derive the analytical characterization of the substance (e.g. x-ray, HPLC, NMR, peptide mapping, ligand binding assay, etc.). */ @Child(name = "type", type = {CodeableConcept.class}, order=1, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="The type of structure (e.g. Full, Partial, Representative)", formalDefinition="The type of structure (e.g. Full, Partial, Representative)." ) + @Description(shortDefinition="The kind of structural representation (e.g. full, partial) or the technique used to derive the analytical characterization of the substance (e.g. x-ray, HPLC, NMR, peptide mapping, ligand binding assay, etc.)", formalDefinition="The kind of structural representation (e.g. full, partial) or the technique used to derive the analytical characterization of the substance (e.g. x-ray, HPLC, NMR, peptide mapping, ligand binding assay, etc.)." ) protected CodeableConcept type; /** - * The structural representation as text string in a standard format e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF. + * The structural representation or characterization as a text string in a standard format. */ @Child(name = "representation", type = {StringType.class}, order=2, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="The structural representation as text string in a standard format e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF", formalDefinition="The structural representation as text string in a standard format e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF." ) + @Description(shortDefinition="The structural representation or characterization as a text string in a standard format", formalDefinition="The structural representation or characterization as a text string in a standard format." ) protected StringType representation; /** - * The format of the representation e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF. + * The format of the representation e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF. The logical content type rather than the physical file format of a document. */ @Child(name = "format", type = {CodeableConcept.class}, order=3, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="The format of the representation e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF", formalDefinition="The format of the representation e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF." ) + @Description(shortDefinition="The format of the representation e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF. The logical content type rather than the physical file format of a document", formalDefinition="The format of the representation e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF. The logical content type rather than the physical file format of a document." ) protected CodeableConcept format; /** - * An attached file with the structural representation. + * An attached file with the structural representation or characterization e.g. a molecular structure graphic of the substance, a JCAMP or AnIML file. */ - @Child(name = "attachment", type = {Attachment.class}, order=4, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="An attached file with the structural representation", formalDefinition="An attached file with the structural representation." ) - protected Attachment attachment; + @Child(name = "document", type = {DocumentReference.class}, order=4, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="An attached file with the structural representation or characterization e.g. a molecular structure graphic of the substance, a JCAMP or AnIML file", formalDefinition="An attached file with the structural representation or characterization e.g. a molecular structure graphic of the substance, a JCAMP or AnIML file." ) + protected Reference document; - private static final long serialVersionUID = -1385695515L; + private static final long serialVersionUID = 138704347L; /** * Constructor @@ -2514,7 +2479,7 @@ public class SubstanceDefinition extends DomainResource { } /** - * @return {@link #type} (The type of structure (e.g. Full, Partial, Representative).) + * @return {@link #type} (The kind of structural representation (e.g. full, partial) or the technique used to derive the analytical characterization of the substance (e.g. x-ray, HPLC, NMR, peptide mapping, ligand binding assay, etc.).) */ public CodeableConcept getType() { if (this.type == null) @@ -2530,7 +2495,7 @@ public class SubstanceDefinition extends DomainResource { } /** - * @param value {@link #type} (The type of structure (e.g. Full, Partial, Representative).) + * @param value {@link #type} (The kind of structural representation (e.g. full, partial) or the technique used to derive the analytical characterization of the substance (e.g. x-ray, HPLC, NMR, peptide mapping, ligand binding assay, etc.).) */ public SubstanceDefinitionStructureRepresentationComponent setType(CodeableConcept value) { this.type = value; @@ -2538,7 +2503,7 @@ public class SubstanceDefinition extends DomainResource { } /** - * @return {@link #representation} (The structural representation as text string in a standard format e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF.). This is the underlying object with id, value and extensions. The accessor "getRepresentation" gives direct access to the value + * @return {@link #representation} (The structural representation or characterization as a text string in a standard format.). This is the underlying object with id, value and extensions. The accessor "getRepresentation" gives direct access to the value */ public StringType getRepresentationElement() { if (this.representation == null) @@ -2558,7 +2523,7 @@ public class SubstanceDefinition extends DomainResource { } /** - * @param value {@link #representation} (The structural representation as text string in a standard format e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF.). This is the underlying object with id, value and extensions. The accessor "getRepresentation" gives direct access to the value + * @param value {@link #representation} (The structural representation or characterization as a text string in a standard format.). This is the underlying object with id, value and extensions. The accessor "getRepresentation" gives direct access to the value */ public SubstanceDefinitionStructureRepresentationComponent setRepresentationElement(StringType value) { this.representation = value; @@ -2566,14 +2531,14 @@ public class SubstanceDefinition extends DomainResource { } /** - * @return The structural representation as text string in a standard format e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF. + * @return The structural representation or characterization as a text string in a standard format. */ public String getRepresentation() { return this.representation == null ? null : this.representation.getValue(); } /** - * @param value The structural representation as text string in a standard format e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF. + * @param value The structural representation or characterization as a text string in a standard format. */ public SubstanceDefinitionStructureRepresentationComponent setRepresentation(String value) { if (Utilities.noString(value)) @@ -2587,7 +2552,7 @@ public class SubstanceDefinition extends DomainResource { } /** - * @return {@link #format} (The format of the representation e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF.) + * @return {@link #format} (The format of the representation e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF. The logical content type rather than the physical file format of a document.) */ public CodeableConcept getFormat() { if (this.format == null) @@ -2603,7 +2568,7 @@ public class SubstanceDefinition extends DomainResource { } /** - * @param value {@link #format} (The format of the representation e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF.) + * @param value {@link #format} (The format of the representation e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF. The logical content type rather than the physical file format of a document.) */ public SubstanceDefinitionStructureRepresentationComponent setFormat(CodeableConcept value) { this.format = value; @@ -2611,44 +2576,44 @@ public class SubstanceDefinition extends DomainResource { } /** - * @return {@link #attachment} (An attached file with the structural representation.) + * @return {@link #document} (An attached file with the structural representation or characterization e.g. a molecular structure graphic of the substance, a JCAMP or AnIML file.) */ - public Attachment getAttachment() { - if (this.attachment == null) + public Reference getDocument() { + if (this.document == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create SubstanceDefinitionStructureRepresentationComponent.attachment"); + throw new Error("Attempt to auto-create SubstanceDefinitionStructureRepresentationComponent.document"); else if (Configuration.doAutoCreate()) - this.attachment = new Attachment(); // cc - return this.attachment; + this.document = new Reference(); // cc + return this.document; } - public boolean hasAttachment() { - return this.attachment != null && !this.attachment.isEmpty(); + public boolean hasDocument() { + return this.document != null && !this.document.isEmpty(); } /** - * @param value {@link #attachment} (An attached file with the structural representation.) + * @param value {@link #document} (An attached file with the structural representation or characterization e.g. a molecular structure graphic of the substance, a JCAMP or AnIML file.) */ - public SubstanceDefinitionStructureRepresentationComponent setAttachment(Attachment value) { - this.attachment = value; + public SubstanceDefinitionStructureRepresentationComponent setDocument(Reference value) { + this.document = value; return this; } protected void listChildren(List children) { super.listChildren(children); - children.add(new Property("type", "CodeableConcept", "The type of structure (e.g. Full, Partial, Representative).", 0, 1, type)); - children.add(new Property("representation", "string", "The structural representation as text string in a standard format e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF.", 0, 1, representation)); - children.add(new Property("format", "CodeableConcept", "The format of the representation e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF.", 0, 1, format)); - children.add(new Property("attachment", "Attachment", "An attached file with the structural representation.", 0, 1, attachment)); + children.add(new Property("type", "CodeableConcept", "The kind of structural representation (e.g. full, partial) or the technique used to derive the analytical characterization of the substance (e.g. x-ray, HPLC, NMR, peptide mapping, ligand binding assay, etc.).", 0, 1, type)); + children.add(new Property("representation", "string", "The structural representation or characterization as a text string in a standard format.", 0, 1, representation)); + children.add(new Property("format", "CodeableConcept", "The format of the representation e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF. The logical content type rather than the physical file format of a document.", 0, 1, format)); + children.add(new Property("document", "Reference(DocumentReference)", "An attached file with the structural representation or characterization e.g. a molecular structure graphic of the substance, a JCAMP or AnIML file.", 0, 1, document)); } @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 structure (e.g. Full, Partial, Representative).", 0, 1, type); - case -671065907: /*representation*/ return new Property("representation", "string", "The structural representation as text string in a standard format e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF.", 0, 1, representation); - case -1268779017: /*format*/ return new Property("format", "CodeableConcept", "The format of the representation e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF.", 0, 1, format); - case -1963501277: /*attachment*/ return new Property("attachment", "Attachment", "An attached file with the structural representation.", 0, 1, attachment); + case 3575610: /*type*/ return new Property("type", "CodeableConcept", "The kind of structural representation (e.g. full, partial) or the technique used to derive the analytical characterization of the substance (e.g. x-ray, HPLC, NMR, peptide mapping, ligand binding assay, etc.).", 0, 1, type); + case -671065907: /*representation*/ return new Property("representation", "string", "The structural representation or characterization as a text string in a standard format.", 0, 1, representation); + case -1268779017: /*format*/ return new Property("format", "CodeableConcept", "The format of the representation e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF. The logical content type rather than the physical file format of a document.", 0, 1, format); + case 861720859: /*document*/ return new Property("document", "Reference(DocumentReference)", "An attached file with the structural representation or characterization e.g. a molecular structure graphic of the substance, a JCAMP or AnIML file.", 0, 1, document); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -2660,7 +2625,7 @@ public class SubstanceDefinition extends DomainResource { case 3575610: /*type*/ return this.type == null ? new Base[0] : new Base[] {this.type}; // CodeableConcept case -671065907: /*representation*/ return this.representation == null ? new Base[0] : new Base[] {this.representation}; // StringType case -1268779017: /*format*/ return this.format == null ? new Base[0] : new Base[] {this.format}; // CodeableConcept - case -1963501277: /*attachment*/ return this.attachment == null ? new Base[0] : new Base[] {this.attachment}; // Attachment + case 861720859: /*document*/ return this.document == null ? new Base[0] : new Base[] {this.document}; // Reference default: return super.getProperty(hash, name, checkValid); } @@ -2678,8 +2643,8 @@ public class SubstanceDefinition extends DomainResource { case -1268779017: // format this.format = TypeConvertor.castToCodeableConcept(value); // CodeableConcept return value; - case -1963501277: // attachment - this.attachment = TypeConvertor.castToAttachment(value); // Attachment + case 861720859: // document + this.document = TypeConvertor.castToReference(value); // Reference return value; default: return super.setProperty(hash, name, value); } @@ -2694,8 +2659,8 @@ public class SubstanceDefinition extends DomainResource { this.representation = TypeConvertor.castToString(value); // StringType } else if (name.equals("format")) { this.format = TypeConvertor.castToCodeableConcept(value); // CodeableConcept - } else if (name.equals("attachment")) { - this.attachment = TypeConvertor.castToAttachment(value); // Attachment + } else if (name.equals("document")) { + this.document = TypeConvertor.castToReference(value); // Reference } else return super.setProperty(name, value); return value; @@ -2707,7 +2672,7 @@ public class SubstanceDefinition extends DomainResource { case 3575610: return getType(); case -671065907: return getRepresentationElement(); case -1268779017: return getFormat(); - case -1963501277: return getAttachment(); + case 861720859: return getDocument(); default: return super.makeProperty(hash, name); } @@ -2719,7 +2684,7 @@ public class SubstanceDefinition extends DomainResource { case 3575610: /*type*/ return new String[] {"CodeableConcept"}; case -671065907: /*representation*/ return new String[] {"string"}; case -1268779017: /*format*/ return new String[] {"CodeableConcept"}; - case -1963501277: /*attachment*/ return new String[] {"Attachment"}; + case 861720859: /*document*/ return new String[] {"Reference"}; default: return super.getTypesForProperty(hash, name); } @@ -2738,9 +2703,9 @@ public class SubstanceDefinition extends DomainResource { this.format = new CodeableConcept(); return this.format; } - else if (name.equals("attachment")) { - this.attachment = new Attachment(); - return this.attachment; + else if (name.equals("document")) { + this.document = new Reference(); + return this.document; } else return super.addChild(name); @@ -2757,7 +2722,7 @@ public class SubstanceDefinition extends DomainResource { dst.type = type == null ? null : type.copy(); dst.representation = representation == null ? null : representation.copy(); dst.format = format == null ? null : format.copy(); - dst.attachment = attachment == null ? null : attachment.copy(); + dst.document = document == null ? null : document.copy(); } @Override @@ -2768,7 +2733,7 @@ public class SubstanceDefinition extends DomainResource { return false; SubstanceDefinitionStructureRepresentationComponent o = (SubstanceDefinitionStructureRepresentationComponent) other_; return compareDeep(type, o.type, true) && compareDeep(representation, o.representation, true) && compareDeep(format, o.format, true) - && compareDeep(attachment, o.attachment, true); + && compareDeep(document, o.document, true); } @Override @@ -2783,7 +2748,7 @@ public class SubstanceDefinition extends DomainResource { public boolean isEmpty() { return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(type, representation, format - , attachment); + , document); } public String fhirType() { @@ -5010,133 +4975,140 @@ public class SubstanceDefinition extends DomainResource { @Description(shortDefinition="High level categorization, e.g. polymer or nucleic acid, or food, chemical, biological", formalDefinition="High level categorization, e.g. polymer or nucleic acid, or food, chemical, biological." ) protected CodeableConcept category; + /** + * A lower level classification than category, such as the general types of polymer (linear or branch chain) or type of impurity (process related or contaminant). + */ + @Child(name = "classification", type = {CodeableConcept.class}, order=4, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="A lower level classification than category, such as the general types of polymer (linear or branch chain) or type of impurity (process related or contaminant)", formalDefinition="A lower level classification than category, such as the general types of polymer (linear or branch chain) or type of impurity (process related or contaminant)." ) + protected List classification; + /** * If the substance applies to only human or veterinary use. */ - @Child(name = "domain", type = {CodeableConcept.class}, order=4, min=0, max=1, modifier=false, summary=true) + @Child(name = "domain", type = {CodeableConcept.class}, order=5, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="If the substance applies to only human or veterinary use", formalDefinition="If the substance applies to only human or veterinary use." ) protected CodeableConcept domain; /** * Textual description of the substance. */ - @Child(name = "description", type = {MarkdownType.class}, order=5, min=0, max=1, modifier=false, summary=true) + @Child(name = "description", type = {MarkdownType.class}, order=6, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Textual description of the substance", formalDefinition="Textual description of the substance." ) protected MarkdownType description; /** * Supporting literature. */ - @Child(name = "source", type = {DocumentReference.class}, order=6, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "source", type = {DocumentReference.class}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Supporting literature", formalDefinition="Supporting literature." ) protected List source; /** * Textual comment about this record of a substance. */ - @Child(name = "note", type = {Annotation.class}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "note", type = {Annotation.class}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Textual comment about this record of a substance", formalDefinition="Textual comment about this record of a substance." ) protected List note; /** * A company that makes this substance. */ - @Child(name = "manufacturer", type = {Organization.class}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "manufacturer", type = {Organization.class}, order=9, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="A company that makes this substance", formalDefinition="A company that makes this substance." ) protected List manufacturer; /** * A company that supplies this substance. */ - @Child(name = "supplier", type = {Organization.class}, order=9, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "supplier", type = {Organization.class}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="A company that supplies this substance", formalDefinition="A company that supplies this substance." ) protected List supplier; /** * Moiety, for structural modifications. */ - @Child(name = "moiety", type = {}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "moiety", type = {}, order=11, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Moiety, for structural modifications", formalDefinition="Moiety, for structural modifications." ) protected List moiety; /** * General specifications for this substance, including how it is related to other substances. */ - @Child(name = "property", type = {}, order=11, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "property", type = {}, order=12, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="General specifications for this substance, including how it is related to other substances", formalDefinition="General specifications for this substance, including how it is related to other substances." ) protected List property; /** * General information detailing this substance. */ - @Child(name = "referenceInformation", type = {SubstanceReferenceInformation.class}, order=12, min=0, max=1, modifier=false, summary=true) + @Child(name = "referenceInformation", type = {SubstanceReferenceInformation.class}, order=13, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="General information detailing this substance", formalDefinition="General information detailing this substance." ) protected Reference referenceInformation; /** * Structural information. */ - @Child(name = "structure", type = {}, order=13, min=0, max=1, modifier=false, summary=true) + @Child(name = "structure", type = {}, order=14, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Structural information", formalDefinition="Structural information." ) protected SubstanceDefinitionStructureComponent structure; /** * Codes associated with the substance. */ - @Child(name = "code", type = {}, order=14, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "code", type = {}, order=15, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Codes associated with the substance", formalDefinition="Codes associated with the substance." ) protected List code; /** * Names applicable to this substance. */ - @Child(name = "name", type = {}, order=15, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "name", type = {}, order=16, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Names applicable to this substance", formalDefinition="Names applicable to this substance." ) protected List name; /** * The molecular weight or weight range (for proteins, polymers or nucleic acids). */ - @Child(name = "molecularWeight", type = {SubstanceDefinitionStructureIsotopeMolecularWeightComponent.class}, order=16, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "molecularWeight", type = {SubstanceDefinitionStructureIsotopeMolecularWeightComponent.class}, order=17, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="The molecular weight or weight range (for proteins, polymers or nucleic acids)", formalDefinition="The molecular weight or weight range (for proteins, polymers or nucleic acids)." ) protected List molecularWeight; /** * A link between this substance and another, with details of the relationship. */ - @Child(name = "relationship", type = {}, order=17, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "relationship", type = {}, order=18, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="A link between this substance and another, with details of the relationship", formalDefinition="A link between this substance and another, with details of the relationship." ) protected List relationship; /** * Data items specific to nucleic acids. */ - @Child(name = "nucleicAcid", type = {SubstanceNucleicAcid.class}, order=18, min=0, max=1, modifier=false, summary=true) + @Child(name = "nucleicAcid", type = {SubstanceNucleicAcid.class}, order=19, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Data items specific to nucleic acids", formalDefinition="Data items specific to nucleic acids." ) protected Reference nucleicAcid; /** * Data items specific to polymers. */ - @Child(name = "polymer", type = {SubstancePolymer.class}, order=19, min=0, max=1, modifier=false, summary=true) + @Child(name = "polymer", type = {SubstancePolymer.class}, order=20, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Data items specific to polymers", formalDefinition="Data items specific to polymers." ) protected Reference polymer; /** * Data items specific to proteins. */ - @Child(name = "protein", type = {SubstanceProtein.class}, order=20, min=0, max=1, modifier=false, summary=true) + @Child(name = "protein", type = {SubstanceProtein.class}, order=21, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Data items specific to proteins", formalDefinition="Data items specific to proteins." ) protected Reference protein; /** * Material or taxonomic/anatomical source for the substance. */ - @Child(name = "sourceMaterial", type = {SubstanceSourceMaterial.class}, order=21, min=0, max=1, modifier=false, summary=true) + @Child(name = "sourceMaterial", type = {SubstanceSourceMaterial.class}, order=22, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Material or taxonomic/anatomical source for the substance", formalDefinition="Material or taxonomic/anatomical source for the substance." ) protected Reference sourceMaterial; - private static final long serialVersionUID = 63520388L; + private static final long serialVersionUID = 1928000355L; /** * Constructor @@ -5266,6 +5238,59 @@ public class SubstanceDefinition extends DomainResource { return this; } + /** + * @return {@link #classification} (A lower level classification than category, such as the general types of polymer (linear or branch chain) or type of impurity (process related or contaminant).) + */ + public List getClassification() { + if (this.classification == null) + this.classification = new ArrayList(); + return this.classification; + } + + /** + * @return Returns a reference to this for easy method chaining + */ + public SubstanceDefinition setClassification(List theClassification) { + this.classification = theClassification; + return this; + } + + public boolean hasClassification() { + if (this.classification == null) + return false; + for (CodeableConcept item : this.classification) + if (!item.isEmpty()) + return true; + return false; + } + + public CodeableConcept addClassification() { //3 + CodeableConcept t = new CodeableConcept(); + if (this.classification == null) + this.classification = new ArrayList(); + this.classification.add(t); + return t; + } + + public SubstanceDefinition addClassification(CodeableConcept t) { //3 + if (t == null) + return this; + if (this.classification == null) + this.classification = new ArrayList(); + this.classification.add(t); + return this; + } + + /** + * @return The first repetition of repeating field {@link #classification}, creating it if it does not already exist {3} + */ + public CodeableConcept getClassificationFirstRep() { + if (getClassification().isEmpty()) { + addClassification(); + } + return getClassification().get(0); + } + /** * @return {@link #domain} (If the substance applies to only human or veterinary use.) */ @@ -6019,6 +6044,7 @@ public class SubstanceDefinition extends DomainResource { children.add(new Property("version", "string", "A business level identifier of the substance.", 0, 1, version)); children.add(new Property("status", "CodeableConcept", "Status of substance within the catalogue e.g. approved.", 0, 1, status)); children.add(new Property("category", "CodeableConcept", "High level categorization, e.g. polymer or nucleic acid, or food, chemical, biological.", 0, 1, category)); + children.add(new Property("classification", "CodeableConcept", "A lower level classification than category, such as the general types of polymer (linear or branch chain) or type of impurity (process related or contaminant).", 0, java.lang.Integer.MAX_VALUE, classification)); children.add(new Property("domain", "CodeableConcept", "If the substance applies to only human or veterinary use.", 0, 1, domain)); children.add(new Property("description", "markdown", "Textual description of the substance.", 0, 1, description)); children.add(new Property("source", "Reference(DocumentReference)", "Supporting literature.", 0, java.lang.Integer.MAX_VALUE, source)); @@ -6046,6 +6072,7 @@ public class SubstanceDefinition extends DomainResource { case 351608024: /*version*/ return new Property("version", "string", "A business level identifier of the substance.", 0, 1, version); case -892481550: /*status*/ return new Property("status", "CodeableConcept", "Status of substance within the catalogue e.g. approved.", 0, 1, status); case 50511102: /*category*/ return new Property("category", "CodeableConcept", "High level categorization, e.g. polymer or nucleic acid, or food, chemical, biological.", 0, 1, category); + case 382350310: /*classification*/ return new Property("classification", "CodeableConcept", "A lower level classification than category, such as the general types of polymer (linear or branch chain) or type of impurity (process related or contaminant).", 0, java.lang.Integer.MAX_VALUE, classification); case -1326197564: /*domain*/ return new Property("domain", "CodeableConcept", "If the substance applies to only human or veterinary use.", 0, 1, domain); case -1724546052: /*description*/ return new Property("description", "markdown", "Textual description of the substance.", 0, 1, description); case -896505829: /*source*/ return new Property("source", "Reference(DocumentReference)", "Supporting literature.", 0, java.lang.Integer.MAX_VALUE, source); @@ -6076,6 +6103,7 @@ public class SubstanceDefinition extends DomainResource { 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}; // CodeableConcept case 50511102: /*category*/ return this.category == null ? new Base[0] : new Base[] {this.category}; // CodeableConcept + case 382350310: /*classification*/ return this.classification == null ? new Base[0] : this.classification.toArray(new Base[this.classification.size()]); // CodeableConcept case -1326197564: /*domain*/ return this.domain == null ? new Base[0] : new Base[] {this.domain}; // CodeableConcept case -1724546052: /*description*/ return this.description == null ? new Base[0] : new Base[] {this.description}; // MarkdownType case -896505829: /*source*/ return this.source == null ? new Base[0] : this.source.toArray(new Base[this.source.size()]); // Reference @@ -6114,6 +6142,9 @@ public class SubstanceDefinition extends DomainResource { case 50511102: // category this.category = TypeConvertor.castToCodeableConcept(value); // CodeableConcept return value; + case 382350310: // classification + this.getClassification().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept + return value; case -1326197564: // domain this.domain = TypeConvertor.castToCodeableConcept(value); // CodeableConcept return value; @@ -6183,6 +6214,8 @@ public class SubstanceDefinition extends DomainResource { this.status = TypeConvertor.castToCodeableConcept(value); // CodeableConcept } else if (name.equals("category")) { this.category = TypeConvertor.castToCodeableConcept(value); // CodeableConcept + } else if (name.equals("classification")) { + this.getClassification().add(TypeConvertor.castToCodeableConcept(value)); } else if (name.equals("domain")) { this.domain = TypeConvertor.castToCodeableConcept(value); // CodeableConcept } else if (name.equals("description")) { @@ -6231,6 +6264,7 @@ public class SubstanceDefinition extends DomainResource { case 351608024: return getVersionElement(); case -892481550: return getStatus(); case 50511102: return getCategory(); + case 382350310: return addClassification(); case -1326197564: return getDomain(); case -1724546052: return getDescriptionElement(); case -896505829: return addSource(); @@ -6261,6 +6295,7 @@ public class SubstanceDefinition extends DomainResource { case 351608024: /*version*/ return new String[] {"string"}; case -892481550: /*status*/ return new String[] {"CodeableConcept"}; case 50511102: /*category*/ return new String[] {"CodeableConcept"}; + case 382350310: /*classification*/ return new String[] {"CodeableConcept"}; case -1326197564: /*domain*/ return new String[] {"CodeableConcept"}; case -1724546052: /*description*/ return new String[] {"markdown"}; case -896505829: /*source*/ return new String[] {"Reference"}; @@ -6301,6 +6336,9 @@ public class SubstanceDefinition extends DomainResource { this.category = new CodeableConcept(); return this.category; } + else if (name.equals("classification")) { + return addClassification(); + } else if (name.equals("domain")) { this.domain = new CodeableConcept(); return this.domain; @@ -6383,6 +6421,11 @@ public class SubstanceDefinition extends DomainResource { dst.version = version == null ? null : version.copy(); dst.status = status == null ? null : status.copy(); dst.category = category == null ? null : category.copy(); + if (classification != null) { + dst.classification = new ArrayList(); + for (CodeableConcept i : classification) + dst.classification.add(i.copy()); + }; dst.domain = domain == null ? null : domain.copy(); dst.description = description == null ? null : description.copy(); if (source != null) { @@ -6455,14 +6498,14 @@ public class SubstanceDefinition extends DomainResource { return false; SubstanceDefinition o = (SubstanceDefinition) other_; return compareDeep(identifier, o.identifier, true) && compareDeep(version, o.version, true) && compareDeep(status, o.status, true) - && compareDeep(category, o.category, true) && compareDeep(domain, o.domain, true) && compareDeep(description, o.description, true) - && compareDeep(source, o.source, true) && compareDeep(note, o.note, true) && compareDeep(manufacturer, o.manufacturer, true) - && compareDeep(supplier, o.supplier, true) && compareDeep(moiety, o.moiety, true) && compareDeep(property, o.property, true) - && compareDeep(referenceInformation, o.referenceInformation, true) && compareDeep(structure, o.structure, true) - && compareDeep(code, o.code, true) && compareDeep(name, o.name, true) && compareDeep(molecularWeight, o.molecularWeight, true) - && compareDeep(relationship, o.relationship, true) && compareDeep(nucleicAcid, o.nucleicAcid, true) - && compareDeep(polymer, o.polymer, true) && compareDeep(protein, o.protein, true) && compareDeep(sourceMaterial, o.sourceMaterial, true) - ; + && compareDeep(category, o.category, true) && compareDeep(classification, o.classification, true) + && compareDeep(domain, o.domain, true) && compareDeep(description, o.description, true) && compareDeep(source, o.source, true) + && compareDeep(note, o.note, true) && compareDeep(manufacturer, o.manufacturer, true) && compareDeep(supplier, o.supplier, true) + && compareDeep(moiety, o.moiety, true) && compareDeep(property, o.property, true) && compareDeep(referenceInformation, o.referenceInformation, true) + && compareDeep(structure, o.structure, true) && compareDeep(code, o.code, true) && compareDeep(name, o.name, true) + && compareDeep(molecularWeight, o.molecularWeight, true) && compareDeep(relationship, o.relationship, true) + && compareDeep(nucleicAcid, o.nucleicAcid, true) && compareDeep(polymer, o.polymer, true) && compareDeep(protein, o.protein, true) + && compareDeep(sourceMaterial, o.sourceMaterial, true); } @Override @@ -6477,9 +6520,9 @@ public class SubstanceDefinition extends DomainResource { public boolean isEmpty() { return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, version, status - , category, domain, description, source, note, manufacturer, supplier, moiety - , property, referenceInformation, structure, code, name, molecularWeight, relationship - , nucleicAcid, polymer, protein, sourceMaterial); + , category, classification, domain, description, source, note, manufacturer, supplier + , moiety, property, referenceInformation, structure, code, name, molecularWeight + , relationship, nucleicAcid, polymer, protein, sourceMaterial); } @Override @@ -6588,4 +6631,5 @@ public class SubstanceDefinition extends DomainResource { public static final ca.uhn.fhir.rest.gclient.StringClientParam NAME = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_NAME); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceNucleicAcid.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceNucleicAcid.java index c42adc3a6..bf15629b6 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceNucleicAcid.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceNucleicAcid.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.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; /** * Nucleic acids are defined by three distinct elements: the base, sugar and linkage. Individual substance/moiety IDs will be created for each of these elements. The nucleotide sequence will be always entered in the 5’-3’ direction. @@ -1751,4 +1753,5 @@ public class SubstanceNucleicAcid extends DomainResource { } -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstancePolymer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstancePolymer.java index 5fb659405..5463e6bf0 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstancePolymer.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstancePolymer.java @@ -1,8 +1,6 @@ package org.hl7.fhir.r5.model; - - /* Copyright (c) 2011+, HL7, Inc. All rights reserved. @@ -31,22 +29,26 @@ 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; /** - * Todo. + * Properties of a substance specific to it being a polymer. */ @ResourceDef(name="SubstancePolymer", profile="http://hl7.org/fhir/StructureDefinition/SubstancePolymer") public class SubstancePolymer extends DomainResource { @@ -54,17 +56,17 @@ public class SubstancePolymer extends DomainResource { @Block() public static class SubstancePolymerMonomerSetComponent extends BackboneElement implements IBaseBackboneElement { /** - * Todo. + * Captures the type of ratio to the entire polymer, e.g. Monomer/Polymer ratio, SRU/Polymer Ratio. */ @Child(name = "ratioType", type = {CodeableConcept.class}, order=1, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Todo", formalDefinition="Todo." ) + @Description(shortDefinition="Captures the type of ratio to the entire polymer, e.g. Monomer/Polymer ratio, SRU/Polymer Ratio", formalDefinition="Captures the type of ratio to the entire polymer, e.g. Monomer/Polymer ratio, SRU/Polymer Ratio." ) protected CodeableConcept ratioType; /** - * Todo. + * The starting materials - monomer(s) used in the synthesis of the polymer. */ @Child(name = "startingMaterial", type = {}, order=2, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Todo", formalDefinition="Todo." ) + @Description(shortDefinition="The starting materials - monomer(s) used in the synthesis of the polymer", formalDefinition="The starting materials - monomer(s) used in the synthesis of the polymer." ) protected List startingMaterial; private static final long serialVersionUID = -933825014L; @@ -77,7 +79,7 @@ public class SubstancePolymer extends DomainResource { } /** - * @return {@link #ratioType} (Todo.) + * @return {@link #ratioType} (Captures the type of ratio to the entire polymer, e.g. Monomer/Polymer ratio, SRU/Polymer Ratio.) */ public CodeableConcept getRatioType() { if (this.ratioType == null) @@ -93,7 +95,7 @@ public class SubstancePolymer extends DomainResource { } /** - * @param value {@link #ratioType} (Todo.) + * @param value {@link #ratioType} (Captures the type of ratio to the entire polymer, e.g. Monomer/Polymer ratio, SRU/Polymer Ratio.) */ public SubstancePolymerMonomerSetComponent setRatioType(CodeableConcept value) { this.ratioType = value; @@ -101,7 +103,7 @@ public class SubstancePolymer extends DomainResource { } /** - * @return {@link #startingMaterial} (Todo.) + * @return {@link #startingMaterial} (The starting materials - monomer(s) used in the synthesis of the polymer.) */ public List getStartingMaterial() { if (this.startingMaterial == null) @@ -155,15 +157,15 @@ public class SubstancePolymer extends DomainResource { protected void listChildren(List children) { super.listChildren(children); - children.add(new Property("ratioType", "CodeableConcept", "Todo.", 0, 1, ratioType)); - children.add(new Property("startingMaterial", "", "Todo.", 0, java.lang.Integer.MAX_VALUE, startingMaterial)); + children.add(new Property("ratioType", "CodeableConcept", "Captures the type of ratio to the entire polymer, e.g. Monomer/Polymer ratio, SRU/Polymer Ratio.", 0, 1, ratioType)); + children.add(new Property("startingMaterial", "", "The starting materials - monomer(s) used in the synthesis of the polymer.", 0, java.lang.Integer.MAX_VALUE, startingMaterial)); } @Override public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { switch (_hash) { - case 344937957: /*ratioType*/ return new Property("ratioType", "CodeableConcept", "Todo.", 0, 1, ratioType); - case 442919303: /*startingMaterial*/ return new Property("startingMaterial", "", "Todo.", 0, java.lang.Integer.MAX_VALUE, startingMaterial); + case 344937957: /*ratioType*/ return new Property("ratioType", "CodeableConcept", "Captures the type of ratio to the entire polymer, e.g. Monomer/Polymer ratio, SRU/Polymer Ratio.", 0, 1, ratioType); + case 442919303: /*startingMaterial*/ return new Property("startingMaterial", "", "The starting materials - monomer(s) used in the synthesis of the polymer.", 0, java.lang.Integer.MAX_VALUE, startingMaterial); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -289,34 +291,34 @@ public class SubstancePolymer extends DomainResource { @Block() public static class SubstancePolymerMonomerSetStartingMaterialComponent extends BackboneElement implements IBaseBackboneElement { /** - * Todo. + * The type of substance for this starting material. */ @Child(name = "code", type = {CodeableConcept.class}, order=1, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Todo", formalDefinition="Todo." ) + @Description(shortDefinition="The type of substance for this starting material", formalDefinition="The type of substance for this starting material." ) protected CodeableConcept code; /** - * Todo. + * Substance high level category, e.g. chemical substance. */ @Child(name = "category", type = {CodeableConcept.class}, order=2, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Todo", formalDefinition="Todo." ) + @Description(shortDefinition="Substance high level category, e.g. chemical substance", formalDefinition="Substance high level category, e.g. chemical substance." ) protected CodeableConcept category; /** - * Todo. + * Used to specify whether the attribute described is a defining element for the unique identification of the polymer. */ @Child(name = "isDefining", type = {BooleanType.class}, order=3, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Todo", formalDefinition="Todo." ) + @Description(shortDefinition="Used to specify whether the attribute described is a defining element for the unique identification of the polymer", formalDefinition="Used to specify whether the attribute described is a defining element for the unique identification of the polymer." ) protected BooleanType isDefining; /** - * Todo. + * A percentage. */ - @Child(name = "amount", type = {SubstanceAmount.class}, order=4, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Todo", formalDefinition="Todo." ) - protected SubstanceAmount amount; + @Child(name = "amount", type = {Quantity.class}, order=4, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="A percentage", formalDefinition="A percentage." ) + protected Quantity amount; - private static final long serialVersionUID = -254439457L; + private static final long serialVersionUID = -1199515148L; /** * Constructor @@ -326,7 +328,7 @@ public class SubstancePolymer extends DomainResource { } /** - * @return {@link #code} (Todo.) + * @return {@link #code} (The type of substance for this starting material.) */ public CodeableConcept getCode() { if (this.code == null) @@ -342,7 +344,7 @@ public class SubstancePolymer extends DomainResource { } /** - * @param value {@link #code} (Todo.) + * @param value {@link #code} (The type of substance for this starting material.) */ public SubstancePolymerMonomerSetStartingMaterialComponent setCode(CodeableConcept value) { this.code = value; @@ -350,7 +352,7 @@ public class SubstancePolymer extends DomainResource { } /** - * @return {@link #category} (Todo.) + * @return {@link #category} (Substance high level category, e.g. chemical substance.) */ public CodeableConcept getCategory() { if (this.category == null) @@ -366,7 +368,7 @@ public class SubstancePolymer extends DomainResource { } /** - * @param value {@link #category} (Todo.) + * @param value {@link #category} (Substance high level category, e.g. chemical substance.) */ public SubstancePolymerMonomerSetStartingMaterialComponent setCategory(CodeableConcept value) { this.category = value; @@ -374,7 +376,7 @@ public class SubstancePolymer extends DomainResource { } /** - * @return {@link #isDefining} (Todo.). This is the underlying object with id, value and extensions. The accessor "getIsDefining" gives direct access to the value + * @return {@link #isDefining} (Used to specify whether the attribute described is a defining element for the unique identification of the polymer.). This is the underlying object with id, value and extensions. The accessor "getIsDefining" gives direct access to the value */ public BooleanType getIsDefiningElement() { if (this.isDefining == null) @@ -394,7 +396,7 @@ public class SubstancePolymer extends DomainResource { } /** - * @param value {@link #isDefining} (Todo.). This is the underlying object with id, value and extensions. The accessor "getIsDefining" gives direct access to the value + * @param value {@link #isDefining} (Used to specify whether the attribute described is a defining element for the unique identification of the polymer.). This is the underlying object with id, value and extensions. The accessor "getIsDefining" gives direct access to the value */ public SubstancePolymerMonomerSetStartingMaterialComponent setIsDefiningElement(BooleanType value) { this.isDefining = value; @@ -402,14 +404,14 @@ public class SubstancePolymer extends DomainResource { } /** - * @return Todo. + * @return Used to specify whether the attribute described is a defining element for the unique identification of the polymer. */ public boolean getIsDefining() { return this.isDefining == null || this.isDefining.isEmpty() ? false : this.isDefining.getValue(); } /** - * @param value Todo. + * @param value Used to specify whether the attribute described is a defining element for the unique identification of the polymer. */ public SubstancePolymerMonomerSetStartingMaterialComponent setIsDefining(boolean value) { if (this.isDefining == null) @@ -419,14 +421,14 @@ public class SubstancePolymer extends DomainResource { } /** - * @return {@link #amount} (Todo.) + * @return {@link #amount} (A percentage.) */ - public SubstanceAmount getAmount() { + public Quantity getAmount() { if (this.amount == null) if (Configuration.errorOnAutoCreate()) throw new Error("Attempt to auto-create SubstancePolymerMonomerSetStartingMaterialComponent.amount"); else if (Configuration.doAutoCreate()) - this.amount = new SubstanceAmount(); // cc + this.amount = new Quantity(); // cc return this.amount; } @@ -435,28 +437,28 @@ public class SubstancePolymer extends DomainResource { } /** - * @param value {@link #amount} (Todo.) + * @param value {@link #amount} (A percentage.) */ - public SubstancePolymerMonomerSetStartingMaterialComponent setAmount(SubstanceAmount value) { + public SubstancePolymerMonomerSetStartingMaterialComponent setAmount(Quantity value) { this.amount = value; return this; } protected void listChildren(List children) { super.listChildren(children); - children.add(new Property("code", "CodeableConcept", "Todo.", 0, 1, code)); - children.add(new Property("category", "CodeableConcept", "Todo.", 0, 1, category)); - children.add(new Property("isDefining", "boolean", "Todo.", 0, 1, isDefining)); - children.add(new Property("amount", "SubstanceAmount", "Todo.", 0, 1, amount)); + children.add(new Property("code", "CodeableConcept", "The type of substance for this starting material.", 0, 1, code)); + children.add(new Property("category", "CodeableConcept", "Substance high level category, e.g. chemical substance.", 0, 1, category)); + children.add(new Property("isDefining", "boolean", "Used to specify whether the attribute described is a defining element for the unique identification of the polymer.", 0, 1, isDefining)); + children.add(new Property("amount", "Quantity", "A percentage.", 0, 1, amount)); } @Override public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { switch (_hash) { - case 3059181: /*code*/ return new Property("code", "CodeableConcept", "Todo.", 0, 1, code); - case 50511102: /*category*/ return new Property("category", "CodeableConcept", "Todo.", 0, 1, category); - case -141812990: /*isDefining*/ return new Property("isDefining", "boolean", "Todo.", 0, 1, isDefining); - case -1413853096: /*amount*/ return new Property("amount", "SubstanceAmount", "Todo.", 0, 1, amount); + case 3059181: /*code*/ return new Property("code", "CodeableConcept", "The type of substance for this starting material.", 0, 1, code); + case 50511102: /*category*/ return new Property("category", "CodeableConcept", "Substance high level category, e.g. chemical substance.", 0, 1, category); + case -141812990: /*isDefining*/ return new Property("isDefining", "boolean", "Used to specify whether the attribute described is a defining element for the unique identification of the polymer.", 0, 1, isDefining); + case -1413853096: /*amount*/ return new Property("amount", "Quantity", "A percentage.", 0, 1, amount); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -468,7 +470,7 @@ public class SubstancePolymer extends DomainResource { case 3059181: /*code*/ return this.code == null ? new Base[0] : new Base[] {this.code}; // CodeableConcept case 50511102: /*category*/ return this.category == null ? new Base[0] : new Base[] {this.category}; // CodeableConcept case -141812990: /*isDefining*/ return this.isDefining == null ? new Base[0] : new Base[] {this.isDefining}; // BooleanType - case -1413853096: /*amount*/ return this.amount == null ? new Base[0] : new Base[] {this.amount}; // SubstanceAmount + case -1413853096: /*amount*/ return this.amount == null ? new Base[0] : new Base[] {this.amount}; // Quantity default: return super.getProperty(hash, name, checkValid); } @@ -487,7 +489,7 @@ public class SubstancePolymer extends DomainResource { this.isDefining = TypeConvertor.castToBoolean(value); // BooleanType return value; case -1413853096: // amount - this.amount = TypeConvertor.castToSubstanceAmount(value); // SubstanceAmount + this.amount = TypeConvertor.castToQuantity(value); // Quantity return value; default: return super.setProperty(hash, name, value); } @@ -503,7 +505,7 @@ public class SubstancePolymer extends DomainResource { } else if (name.equals("isDefining")) { this.isDefining = TypeConvertor.castToBoolean(value); // BooleanType } else if (name.equals("amount")) { - this.amount = TypeConvertor.castToSubstanceAmount(value); // SubstanceAmount + this.amount = TypeConvertor.castToQuantity(value); // Quantity } else return super.setProperty(name, value); return value; @@ -527,7 +529,7 @@ public class SubstancePolymer extends DomainResource { case 3059181: /*code*/ return new String[] {"CodeableConcept"}; case 50511102: /*category*/ return new String[] {"CodeableConcept"}; case -141812990: /*isDefining*/ return new String[] {"boolean"}; - case -1413853096: /*amount*/ return new String[] {"SubstanceAmount"}; + case -1413853096: /*amount*/ return new String[] {"Quantity"}; default: return super.getTypesForProperty(hash, name); } @@ -547,7 +549,7 @@ public class SubstancePolymer extends DomainResource { throw new FHIRException("Cannot call addChild on a primitive type SubstancePolymer.monomerSet.startingMaterial.isDefining"); } else if (name.equals("amount")) { - this.amount = new SubstanceAmount(); + this.amount = new Quantity(); return this.amount; } else @@ -604,34 +606,27 @@ public class SubstancePolymer extends DomainResource { @Block() public static class SubstancePolymerRepeatComponent extends BackboneElement implements IBaseBackboneElement { /** - * Todo. + * A representation of an (average) molecular formula from a polymer. */ - @Child(name = "numberOfUnits", type = {IntegerType.class}, order=1, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Todo", formalDefinition="Todo." ) - protected IntegerType numberOfUnits; - - /** - * Todo. - */ - @Child(name = "averageMolecularFormula", type = {StringType.class}, order=2, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Todo", formalDefinition="Todo." ) + @Child(name = "averageMolecularFormula", type = {StringType.class}, order=1, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="A representation of an (average) molecular formula from a polymer", formalDefinition="A representation of an (average) molecular formula from a polymer." ) protected StringType averageMolecularFormula; /** - * Todo. + * How the quantitative amount of Structural Repeat Units is captured (e.g. Exact, Numeric, Average). */ - @Child(name = "repeatUnitAmountType", type = {CodeableConcept.class}, order=3, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Todo", formalDefinition="Todo." ) + @Child(name = "repeatUnitAmountType", type = {CodeableConcept.class}, order=2, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="How the quantitative amount of Structural Repeat Units is captured (e.g. Exact, Numeric, Average)", formalDefinition="How the quantitative amount of Structural Repeat Units is captured (e.g. Exact, Numeric, Average)." ) protected CodeableConcept repeatUnitAmountType; /** - * Todo. + * An SRU - Structural Repeat Unit. */ - @Child(name = "repeatUnit", type = {}, order=4, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Todo", formalDefinition="Todo." ) + @Child(name = "repeatUnit", type = {}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="An SRU - Structural Repeat Unit", formalDefinition="An SRU - Structural Repeat Unit." ) protected List repeatUnit; - private static final long serialVersionUID = -988147059L; + private static final long serialVersionUID = -366644176L; /** * Constructor @@ -641,52 +636,7 @@ public class SubstancePolymer extends DomainResource { } /** - * @return {@link #numberOfUnits} (Todo.). This is the underlying object with id, value and extensions. The accessor "getNumberOfUnits" gives direct access to the value - */ - public IntegerType getNumberOfUnitsElement() { - if (this.numberOfUnits == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create SubstancePolymerRepeatComponent.numberOfUnits"); - else if (Configuration.doAutoCreate()) - this.numberOfUnits = new IntegerType(); // bb - return this.numberOfUnits; - } - - public boolean hasNumberOfUnitsElement() { - return this.numberOfUnits != null && !this.numberOfUnits.isEmpty(); - } - - public boolean hasNumberOfUnits() { - return this.numberOfUnits != null && !this.numberOfUnits.isEmpty(); - } - - /** - * @param value {@link #numberOfUnits} (Todo.). This is the underlying object with id, value and extensions. The accessor "getNumberOfUnits" gives direct access to the value - */ - public SubstancePolymerRepeatComponent setNumberOfUnitsElement(IntegerType value) { - this.numberOfUnits = value; - return this; - } - - /** - * @return Todo. - */ - public int getNumberOfUnits() { - return this.numberOfUnits == null || this.numberOfUnits.isEmpty() ? 0 : this.numberOfUnits.getValue(); - } - - /** - * @param value Todo. - */ - public SubstancePolymerRepeatComponent setNumberOfUnits(int value) { - if (this.numberOfUnits == null) - this.numberOfUnits = new IntegerType(); - this.numberOfUnits.setValue(value); - return this; - } - - /** - * @return {@link #averageMolecularFormula} (Todo.). This is the underlying object with id, value and extensions. The accessor "getAverageMolecularFormula" gives direct access to the value + * @return {@link #averageMolecularFormula} (A representation of an (average) molecular formula from a polymer.). This is the underlying object with id, value and extensions. The accessor "getAverageMolecularFormula" gives direct access to the value */ public StringType getAverageMolecularFormulaElement() { if (this.averageMolecularFormula == null) @@ -706,7 +656,7 @@ public class SubstancePolymer extends DomainResource { } /** - * @param value {@link #averageMolecularFormula} (Todo.). This is the underlying object with id, value and extensions. The accessor "getAverageMolecularFormula" gives direct access to the value + * @param value {@link #averageMolecularFormula} (A representation of an (average) molecular formula from a polymer.). This is the underlying object with id, value and extensions. The accessor "getAverageMolecularFormula" gives direct access to the value */ public SubstancePolymerRepeatComponent setAverageMolecularFormulaElement(StringType value) { this.averageMolecularFormula = value; @@ -714,14 +664,14 @@ public class SubstancePolymer extends DomainResource { } /** - * @return Todo. + * @return A representation of an (average) molecular formula from a polymer. */ public String getAverageMolecularFormula() { return this.averageMolecularFormula == null ? null : this.averageMolecularFormula.getValue(); } /** - * @param value Todo. + * @param value A representation of an (average) molecular formula from a polymer. */ public SubstancePolymerRepeatComponent setAverageMolecularFormula(String value) { if (Utilities.noString(value)) @@ -735,7 +685,7 @@ public class SubstancePolymer extends DomainResource { } /** - * @return {@link #repeatUnitAmountType} (Todo.) + * @return {@link #repeatUnitAmountType} (How the quantitative amount of Structural Repeat Units is captured (e.g. Exact, Numeric, Average).) */ public CodeableConcept getRepeatUnitAmountType() { if (this.repeatUnitAmountType == null) @@ -751,7 +701,7 @@ public class SubstancePolymer extends DomainResource { } /** - * @param value {@link #repeatUnitAmountType} (Todo.) + * @param value {@link #repeatUnitAmountType} (How the quantitative amount of Structural Repeat Units is captured (e.g. Exact, Numeric, Average).) */ public SubstancePolymerRepeatComponent setRepeatUnitAmountType(CodeableConcept value) { this.repeatUnitAmountType = value; @@ -759,7 +709,7 @@ public class SubstancePolymer extends DomainResource { } /** - * @return {@link #repeatUnit} (Todo.) + * @return {@link #repeatUnit} (An SRU - Structural Repeat Unit.) */ public List getRepeatUnit() { if (this.repeatUnit == null) @@ -813,19 +763,17 @@ public class SubstancePolymer extends DomainResource { protected void listChildren(List children) { super.listChildren(children); - children.add(new Property("numberOfUnits", "integer", "Todo.", 0, 1, numberOfUnits)); - children.add(new Property("averageMolecularFormula", "string", "Todo.", 0, 1, averageMolecularFormula)); - children.add(new Property("repeatUnitAmountType", "CodeableConcept", "Todo.", 0, 1, repeatUnitAmountType)); - children.add(new Property("repeatUnit", "", "Todo.", 0, java.lang.Integer.MAX_VALUE, repeatUnit)); + children.add(new Property("averageMolecularFormula", "string", "A representation of an (average) molecular formula from a polymer.", 0, 1, averageMolecularFormula)); + children.add(new Property("repeatUnitAmountType", "CodeableConcept", "How the quantitative amount of Structural Repeat Units is captured (e.g. Exact, Numeric, Average).", 0, 1, repeatUnitAmountType)); + children.add(new Property("repeatUnit", "", "An SRU - Structural Repeat Unit.", 0, java.lang.Integer.MAX_VALUE, repeatUnit)); } @Override public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { switch (_hash) { - case -1321430961: /*numberOfUnits*/ return new Property("numberOfUnits", "integer", "Todo.", 0, 1, numberOfUnits); - case 111461715: /*averageMolecularFormula*/ return new Property("averageMolecularFormula", "string", "Todo.", 0, 1, averageMolecularFormula); - case -1994025263: /*repeatUnitAmountType*/ return new Property("repeatUnitAmountType", "CodeableConcept", "Todo.", 0, 1, repeatUnitAmountType); - case 1159607743: /*repeatUnit*/ return new Property("repeatUnit", "", "Todo.", 0, java.lang.Integer.MAX_VALUE, repeatUnit); + case 111461715: /*averageMolecularFormula*/ return new Property("averageMolecularFormula", "string", "A representation of an (average) molecular formula from a polymer.", 0, 1, averageMolecularFormula); + case -1994025263: /*repeatUnitAmountType*/ return new Property("repeatUnitAmountType", "CodeableConcept", "How the quantitative amount of Structural Repeat Units is captured (e.g. Exact, Numeric, Average).", 0, 1, repeatUnitAmountType); + case 1159607743: /*repeatUnit*/ return new Property("repeatUnit", "", "An SRU - Structural Repeat Unit.", 0, java.lang.Integer.MAX_VALUE, repeatUnit); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -834,7 +782,6 @@ public class SubstancePolymer extends DomainResource { @Override public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException { switch (hash) { - case -1321430961: /*numberOfUnits*/ return this.numberOfUnits == null ? new Base[0] : new Base[] {this.numberOfUnits}; // IntegerType case 111461715: /*averageMolecularFormula*/ return this.averageMolecularFormula == null ? new Base[0] : new Base[] {this.averageMolecularFormula}; // StringType case -1994025263: /*repeatUnitAmountType*/ return this.repeatUnitAmountType == null ? new Base[0] : new Base[] {this.repeatUnitAmountType}; // CodeableConcept case 1159607743: /*repeatUnit*/ return this.repeatUnit == null ? new Base[0] : this.repeatUnit.toArray(new Base[this.repeatUnit.size()]); // SubstancePolymerRepeatRepeatUnitComponent @@ -846,9 +793,6 @@ public class SubstancePolymer extends DomainResource { @Override public Base setProperty(int hash, String name, Base value) throws FHIRException { switch (hash) { - case -1321430961: // numberOfUnits - this.numberOfUnits = TypeConvertor.castToInteger(value); // IntegerType - return value; case 111461715: // averageMolecularFormula this.averageMolecularFormula = TypeConvertor.castToString(value); // StringType return value; @@ -865,9 +809,7 @@ public class SubstancePolymer extends DomainResource { @Override public Base setProperty(String name, Base value) throws FHIRException { - if (name.equals("numberOfUnits")) { - this.numberOfUnits = TypeConvertor.castToInteger(value); // IntegerType - } else if (name.equals("averageMolecularFormula")) { + if (name.equals("averageMolecularFormula")) { this.averageMolecularFormula = TypeConvertor.castToString(value); // StringType } else if (name.equals("repeatUnitAmountType")) { this.repeatUnitAmountType = TypeConvertor.castToCodeableConcept(value); // CodeableConcept @@ -881,7 +823,6 @@ public class SubstancePolymer extends DomainResource { @Override public Base makeProperty(int hash, String name) throws FHIRException { switch (hash) { - case -1321430961: return getNumberOfUnitsElement(); case 111461715: return getAverageMolecularFormulaElement(); case -1994025263: return getRepeatUnitAmountType(); case 1159607743: return addRepeatUnit(); @@ -893,7 +834,6 @@ public class SubstancePolymer extends DomainResource { @Override public String[] getTypesForProperty(int hash, String name) throws FHIRException { switch (hash) { - case -1321430961: /*numberOfUnits*/ return new String[] {"integer"}; case 111461715: /*averageMolecularFormula*/ return new String[] {"string"}; case -1994025263: /*repeatUnitAmountType*/ return new String[] {"CodeableConcept"}; case 1159607743: /*repeatUnit*/ return new String[] {}; @@ -904,10 +844,7 @@ public class SubstancePolymer extends DomainResource { @Override public Base addChild(String name) throws FHIRException { - if (name.equals("numberOfUnits")) { - throw new FHIRException("Cannot call addChild on a primitive type SubstancePolymer.repeat.numberOfUnits"); - } - else if (name.equals("averageMolecularFormula")) { + if (name.equals("averageMolecularFormula")) { throw new FHIRException("Cannot call addChild on a primitive type SubstancePolymer.repeat.averageMolecularFormula"); } else if (name.equals("repeatUnitAmountType")) { @@ -929,7 +866,6 @@ public class SubstancePolymer extends DomainResource { public void copyValues(SubstancePolymerRepeatComponent dst) { super.copyValues(dst); - dst.numberOfUnits = numberOfUnits == null ? null : numberOfUnits.copy(); dst.averageMolecularFormula = averageMolecularFormula == null ? null : averageMolecularFormula.copy(); dst.repeatUnitAmountType = repeatUnitAmountType == null ? null : repeatUnitAmountType.copy(); if (repeatUnit != null) { @@ -946,9 +882,8 @@ public class SubstancePolymer extends DomainResource { if (!(other_ instanceof SubstancePolymerRepeatComponent)) return false; SubstancePolymerRepeatComponent o = (SubstancePolymerRepeatComponent) other_; - return compareDeep(numberOfUnits, o.numberOfUnits, true) && compareDeep(averageMolecularFormula, o.averageMolecularFormula, true) - && compareDeep(repeatUnitAmountType, o.repeatUnitAmountType, true) && compareDeep(repeatUnit, o.repeatUnit, true) - ; + return compareDeep(averageMolecularFormula, o.averageMolecularFormula, true) && compareDeep(repeatUnitAmountType, o.repeatUnitAmountType, true) + && compareDeep(repeatUnit, o.repeatUnit, true); } @Override @@ -958,13 +893,12 @@ public class SubstancePolymer extends DomainResource { if (!(other_ instanceof SubstancePolymerRepeatComponent)) return false; SubstancePolymerRepeatComponent o = (SubstancePolymerRepeatComponent) other_; - return compareValues(numberOfUnits, o.numberOfUnits, true) && compareValues(averageMolecularFormula, o.averageMolecularFormula, true) - ; + return compareValues(averageMolecularFormula, o.averageMolecularFormula, true); } public boolean isEmpty() { - return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(numberOfUnits, averageMolecularFormula - , repeatUnitAmountType, repeatUnit); + return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(averageMolecularFormula, repeatUnitAmountType + , repeatUnit); } public String fhirType() { @@ -977,41 +911,41 @@ public class SubstancePolymer extends DomainResource { @Block() public static class SubstancePolymerRepeatRepeatUnitComponent extends BackboneElement implements IBaseBackboneElement { /** - * Todo. + * Structural repeat units are essential elements for defining polymers. */ @Child(name = "unit", type = {StringType.class}, order=1, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Todo", formalDefinition="Todo." ) + @Description(shortDefinition="Structural repeat units are essential elements for defining polymers", formalDefinition="Structural repeat units are essential elements for defining polymers." ) protected StringType unit; /** - * Todo. + * The orientation of the polymerisation, e.g. head-tail, head-head, random. */ @Child(name = "orientation", type = {CodeableConcept.class}, order=2, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Todo", formalDefinition="Todo." ) + @Description(shortDefinition="The orientation of the polymerisation, e.g. head-tail, head-head, random", formalDefinition="The orientation of the polymerisation, e.g. head-tail, head-head, random." ) protected CodeableConcept orientation; /** - * Todo. + * Number of repeats of this unit. */ - @Child(name = "amount", type = {SubstanceAmount.class}, order=3, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Todo", formalDefinition="Todo." ) - protected SubstanceAmount amount; + @Child(name = "amount", type = {IntegerType.class}, order=3, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="Number of repeats of this unit", formalDefinition="Number of repeats of this unit." ) + protected IntegerType amount; /** - * Todo. + * Applies to homopolymer and block co-polymers where the degree of polymerisation within a block can be described. */ @Child(name = "degreeOfPolymerisation", type = {}, order=4, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Todo", formalDefinition="Todo." ) + @Description(shortDefinition="Applies to homopolymer and block co-polymers where the degree of polymerisation within a block can be described", formalDefinition="Applies to homopolymer and block co-polymers where the degree of polymerisation within a block can be described." ) protected List degreeOfPolymerisation; /** - * Todo. + * A graphical structure for this SRU. */ @Child(name = "structuralRepresentation", type = {}, order=5, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Todo", formalDefinition="Todo." ) + @Description(shortDefinition="A graphical structure for this SRU", formalDefinition="A graphical structure for this SRU." ) protected List structuralRepresentation; - private static final long serialVersionUID = -1739084500L; + private static final long serialVersionUID = 727054044L; /** * Constructor @@ -1021,7 +955,7 @@ public class SubstancePolymer extends DomainResource { } /** - * @return {@link #unit} (Todo.). This is the underlying object with id, value and extensions. The accessor "getUnit" gives direct access to the value + * @return {@link #unit} (Structural repeat units are essential elements for defining polymers.). This is the underlying object with id, value and extensions. The accessor "getUnit" gives direct access to the value */ public StringType getUnitElement() { if (this.unit == null) @@ -1041,7 +975,7 @@ public class SubstancePolymer extends DomainResource { } /** - * @param value {@link #unit} (Todo.). This is the underlying object with id, value and extensions. The accessor "getUnit" gives direct access to the value + * @param value {@link #unit} (Structural repeat units are essential elements for defining polymers.). This is the underlying object with id, value and extensions. The accessor "getUnit" gives direct access to the value */ public SubstancePolymerRepeatRepeatUnitComponent setUnitElement(StringType value) { this.unit = value; @@ -1049,14 +983,14 @@ public class SubstancePolymer extends DomainResource { } /** - * @return Todo. + * @return Structural repeat units are essential elements for defining polymers. */ public String getUnit() { return this.unit == null ? null : this.unit.getValue(); } /** - * @param value Todo. + * @param value Structural repeat units are essential elements for defining polymers. */ public SubstancePolymerRepeatRepeatUnitComponent setUnit(String value) { if (Utilities.noString(value)) @@ -1070,7 +1004,7 @@ public class SubstancePolymer extends DomainResource { } /** - * @return {@link #orientation} (Todo.) + * @return {@link #orientation} (The orientation of the polymerisation, e.g. head-tail, head-head, random.) */ public CodeableConcept getOrientation() { if (this.orientation == null) @@ -1086,7 +1020,7 @@ public class SubstancePolymer extends DomainResource { } /** - * @param value {@link #orientation} (Todo.) + * @param value {@link #orientation} (The orientation of the polymerisation, e.g. head-tail, head-head, random.) */ public SubstancePolymerRepeatRepeatUnitComponent setOrientation(CodeableConcept value) { this.orientation = value; @@ -1094,31 +1028,52 @@ public class SubstancePolymer extends DomainResource { } /** - * @return {@link #amount} (Todo.) + * @return {@link #amount} (Number of repeats of this unit.). This is the underlying object with id, value and extensions. The accessor "getAmount" gives direct access to the value */ - public SubstanceAmount getAmount() { + public IntegerType getAmountElement() { if (this.amount == null) if (Configuration.errorOnAutoCreate()) throw new Error("Attempt to auto-create SubstancePolymerRepeatRepeatUnitComponent.amount"); else if (Configuration.doAutoCreate()) - this.amount = new SubstanceAmount(); // cc + this.amount = new IntegerType(); // bb return this.amount; } + public boolean hasAmountElement() { + return this.amount != null && !this.amount.isEmpty(); + } + public boolean hasAmount() { return this.amount != null && !this.amount.isEmpty(); } /** - * @param value {@link #amount} (Todo.) + * @param value {@link #amount} (Number of repeats of this unit.). This is the underlying object with id, value and extensions. The accessor "getAmount" gives direct access to the value */ - public SubstancePolymerRepeatRepeatUnitComponent setAmount(SubstanceAmount value) { + public SubstancePolymerRepeatRepeatUnitComponent setAmountElement(IntegerType value) { this.amount = value; return this; } /** - * @return {@link #degreeOfPolymerisation} (Todo.) + * @return Number of repeats of this unit. + */ + public int getAmount() { + return this.amount == null || this.amount.isEmpty() ? 0 : this.amount.getValue(); + } + + /** + * @param value Number of repeats of this unit. + */ + public SubstancePolymerRepeatRepeatUnitComponent setAmount(int value) { + if (this.amount == null) + this.amount = new IntegerType(); + this.amount.setValue(value); + return this; + } + + /** + * @return {@link #degreeOfPolymerisation} (Applies to homopolymer and block co-polymers where the degree of polymerisation within a block can be described.) */ public List getDegreeOfPolymerisation() { if (this.degreeOfPolymerisation == null) @@ -1171,7 +1126,7 @@ public class SubstancePolymer extends DomainResource { } /** - * @return {@link #structuralRepresentation} (Todo.) + * @return {@link #structuralRepresentation} (A graphical structure for this SRU.) */ public List getStructuralRepresentation() { if (this.structuralRepresentation == null) @@ -1225,21 +1180,21 @@ public class SubstancePolymer extends DomainResource { protected void listChildren(List children) { super.listChildren(children); - children.add(new Property("unit", "string", "Todo.", 0, 1, unit)); - children.add(new Property("orientation", "CodeableConcept", "Todo.", 0, 1, orientation)); - children.add(new Property("amount", "SubstanceAmount", "Todo.", 0, 1, amount)); - children.add(new Property("degreeOfPolymerisation", "", "Todo.", 0, java.lang.Integer.MAX_VALUE, degreeOfPolymerisation)); - children.add(new Property("structuralRepresentation", "", "Todo.", 0, java.lang.Integer.MAX_VALUE, structuralRepresentation)); + children.add(new Property("unit", "string", "Structural repeat units are essential elements for defining polymers.", 0, 1, unit)); + children.add(new Property("orientation", "CodeableConcept", "The orientation of the polymerisation, e.g. head-tail, head-head, random.", 0, 1, orientation)); + children.add(new Property("amount", "integer", "Number of repeats of this unit.", 0, 1, amount)); + children.add(new Property("degreeOfPolymerisation", "", "Applies to homopolymer and block co-polymers where the degree of polymerisation within a block can be described.", 0, java.lang.Integer.MAX_VALUE, degreeOfPolymerisation)); + children.add(new Property("structuralRepresentation", "", "A graphical structure for this SRU.", 0, java.lang.Integer.MAX_VALUE, structuralRepresentation)); } @Override public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { switch (_hash) { - case 3594628: /*unit*/ return new Property("unit", "string", "Todo.", 0, 1, unit); - case -1439500848: /*orientation*/ return new Property("orientation", "CodeableConcept", "Todo.", 0, 1, orientation); - case -1413853096: /*amount*/ return new Property("amount", "SubstanceAmount", "Todo.", 0, 1, amount); - case -159251872: /*degreeOfPolymerisation*/ return new Property("degreeOfPolymerisation", "", "Todo.", 0, java.lang.Integer.MAX_VALUE, degreeOfPolymerisation); - case 14311178: /*structuralRepresentation*/ return new Property("structuralRepresentation", "", "Todo.", 0, java.lang.Integer.MAX_VALUE, structuralRepresentation); + case 3594628: /*unit*/ return new Property("unit", "string", "Structural repeat units are essential elements for defining polymers.", 0, 1, unit); + case -1439500848: /*orientation*/ return new Property("orientation", "CodeableConcept", "The orientation of the polymerisation, e.g. head-tail, head-head, random.", 0, 1, orientation); + case -1413853096: /*amount*/ return new Property("amount", "integer", "Number of repeats of this unit.", 0, 1, amount); + case -159251872: /*degreeOfPolymerisation*/ return new Property("degreeOfPolymerisation", "", "Applies to homopolymer and block co-polymers where the degree of polymerisation within a block can be described.", 0, java.lang.Integer.MAX_VALUE, degreeOfPolymerisation); + case 14311178: /*structuralRepresentation*/ return new Property("structuralRepresentation", "", "A graphical structure for this SRU.", 0, java.lang.Integer.MAX_VALUE, structuralRepresentation); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -1250,7 +1205,7 @@ public class SubstancePolymer extends DomainResource { switch (hash) { case 3594628: /*unit*/ return this.unit == null ? new Base[0] : new Base[] {this.unit}; // StringType case -1439500848: /*orientation*/ return this.orientation == null ? new Base[0] : new Base[] {this.orientation}; // CodeableConcept - case -1413853096: /*amount*/ return this.amount == null ? new Base[0] : new Base[] {this.amount}; // SubstanceAmount + case -1413853096: /*amount*/ return this.amount == null ? new Base[0] : new Base[] {this.amount}; // IntegerType case -159251872: /*degreeOfPolymerisation*/ return this.degreeOfPolymerisation == null ? new Base[0] : this.degreeOfPolymerisation.toArray(new Base[this.degreeOfPolymerisation.size()]); // SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent case 14311178: /*structuralRepresentation*/ return this.structuralRepresentation == null ? new Base[0] : this.structuralRepresentation.toArray(new Base[this.structuralRepresentation.size()]); // SubstancePolymerRepeatRepeatUnitStructuralRepresentationComponent default: return super.getProperty(hash, name, checkValid); @@ -1268,7 +1223,7 @@ public class SubstancePolymer extends DomainResource { this.orientation = TypeConvertor.castToCodeableConcept(value); // CodeableConcept return value; case -1413853096: // amount - this.amount = TypeConvertor.castToSubstanceAmount(value); // SubstanceAmount + this.amount = TypeConvertor.castToInteger(value); // IntegerType return value; case -159251872: // degreeOfPolymerisation this.getDegreeOfPolymerisation().add((SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent) value); // SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent @@ -1288,7 +1243,7 @@ public class SubstancePolymer extends DomainResource { } else if (name.equals("orientation")) { this.orientation = TypeConvertor.castToCodeableConcept(value); // CodeableConcept } else if (name.equals("amount")) { - this.amount = TypeConvertor.castToSubstanceAmount(value); // SubstanceAmount + this.amount = TypeConvertor.castToInteger(value); // IntegerType } else if (name.equals("degreeOfPolymerisation")) { this.getDegreeOfPolymerisation().add((SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent) value); } else if (name.equals("structuralRepresentation")) { @@ -1303,7 +1258,7 @@ public class SubstancePolymer extends DomainResource { switch (hash) { case 3594628: return getUnitElement(); case -1439500848: return getOrientation(); - case -1413853096: return getAmount(); + case -1413853096: return getAmountElement(); case -159251872: return addDegreeOfPolymerisation(); case 14311178: return addStructuralRepresentation(); default: return super.makeProperty(hash, name); @@ -1316,7 +1271,7 @@ public class SubstancePolymer extends DomainResource { switch (hash) { case 3594628: /*unit*/ return new String[] {"string"}; case -1439500848: /*orientation*/ return new String[] {"CodeableConcept"}; - case -1413853096: /*amount*/ return new String[] {"SubstanceAmount"}; + case -1413853096: /*amount*/ return new String[] {"integer"}; case -159251872: /*degreeOfPolymerisation*/ return new String[] {}; case 14311178: /*structuralRepresentation*/ return new String[] {}; default: return super.getTypesForProperty(hash, name); @@ -1334,8 +1289,7 @@ public class SubstancePolymer extends DomainResource { return this.orientation; } else if (name.equals("amount")) { - this.amount = new SubstanceAmount(); - return this.amount; + throw new FHIRException("Cannot call addChild on a primitive type SubstancePolymer.repeat.repeatUnit.amount"); } else if (name.equals("degreeOfPolymerisation")) { return addDegreeOfPolymerisation(); @@ -1389,7 +1343,7 @@ public class SubstancePolymer extends DomainResource { if (!(other_ instanceof SubstancePolymerRepeatRepeatUnitComponent)) return false; SubstancePolymerRepeatRepeatUnitComponent o = (SubstancePolymerRepeatRepeatUnitComponent) other_; - return compareValues(unit, o.unit, true); + return compareValues(unit, o.unit, true) && compareValues(amount, o.amount, true); } public boolean isEmpty() { @@ -1407,20 +1361,34 @@ public class SubstancePolymer extends DomainResource { @Block() public static class SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent extends BackboneElement implements IBaseBackboneElement { /** - * Todo. + * The type of the degree of polymerisation shall be described, e.g. SRU/Polymer Ratio. */ - @Child(name = "degree", type = {CodeableConcept.class}, order=1, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Todo", formalDefinition="Todo." ) - protected CodeableConcept degree; + @Child(name = "type", type = {CodeableConcept.class}, order=1, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="The type of the degree of polymerisation shall be described, e.g. SRU/Polymer Ratio", formalDefinition="The type of the degree of polymerisation shall be described, e.g. SRU/Polymer Ratio." ) + protected CodeableConcept type; /** - * Todo. + * An average amount of polymerisation. */ - @Child(name = "amount", type = {SubstanceAmount.class}, order=2, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Todo", formalDefinition="Todo." ) - protected SubstanceAmount amount; + @Child(name = "average", type = {IntegerType.class}, order=2, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="An average amount of polymerisation", formalDefinition="An average amount of polymerisation." ) + protected IntegerType average; - private static final long serialVersionUID = -1487452773L; + /** + * A low expected limit of the amount. + */ + @Child(name = "low", type = {IntegerType.class}, order=3, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="A low expected limit of the amount", formalDefinition="A low expected limit of the amount." ) + protected IntegerType low; + + /** + * A high expected limit of the amount. + */ + @Child(name = "high", type = {IntegerType.class}, order=4, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="A high expected limit of the amount", formalDefinition="A high expected limit of the amount." ) + protected IntegerType high; + + private static final long serialVersionUID = -1950663748L; /** * Constructor @@ -1430,64 +1398,179 @@ public class SubstancePolymer extends DomainResource { } /** - * @return {@link #degree} (Todo.) + * @return {@link #type} (The type of the degree of polymerisation shall be described, e.g. SRU/Polymer Ratio.) */ - public CodeableConcept getDegree() { - if (this.degree == null) + public CodeableConcept getType() { + if (this.type == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent.degree"); + throw new Error("Attempt to auto-create SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent.type"); else if (Configuration.doAutoCreate()) - this.degree = new CodeableConcept(); // cc - return this.degree; + this.type = new CodeableConcept(); // cc + return this.type; } - public boolean hasDegree() { - return this.degree != null && !this.degree.isEmpty(); + public boolean hasType() { + return this.type != null && !this.type.isEmpty(); } /** - * @param value {@link #degree} (Todo.) + * @param value {@link #type} (The type of the degree of polymerisation shall be described, e.g. SRU/Polymer Ratio.) */ - public SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent setDegree(CodeableConcept value) { - this.degree = value; + public SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent setType(CodeableConcept value) { + this.type = value; return this; } /** - * @return {@link #amount} (Todo.) + * @return {@link #average} (An average amount of polymerisation.). This is the underlying object with id, value and extensions. The accessor "getAverage" gives direct access to the value */ - public SubstanceAmount getAmount() { - if (this.amount == null) + public IntegerType getAverageElement() { + if (this.average == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent.amount"); + throw new Error("Attempt to auto-create SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent.average"); else if (Configuration.doAutoCreate()) - this.amount = new SubstanceAmount(); // cc - return this.amount; + this.average = new IntegerType(); // bb + return this.average; } - public boolean hasAmount() { - return this.amount != null && !this.amount.isEmpty(); + public boolean hasAverageElement() { + return this.average != null && !this.average.isEmpty(); + } + + public boolean hasAverage() { + return this.average != null && !this.average.isEmpty(); } /** - * @param value {@link #amount} (Todo.) + * @param value {@link #average} (An average amount of polymerisation.). This is the underlying object with id, value and extensions. The accessor "getAverage" gives direct access to the value */ - public SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent setAmount(SubstanceAmount value) { - this.amount = value; + public SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent setAverageElement(IntegerType value) { + this.average = value; + return this; + } + + /** + * @return An average amount of polymerisation. + */ + public int getAverage() { + return this.average == null || this.average.isEmpty() ? 0 : this.average.getValue(); + } + + /** + * @param value An average amount of polymerisation. + */ + public SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent setAverage(int value) { + if (this.average == null) + this.average = new IntegerType(); + this.average.setValue(value); + return this; + } + + /** + * @return {@link #low} (A low expected limit of the amount.). This is the underlying object with id, value and extensions. The accessor "getLow" gives direct access to the value + */ + public IntegerType getLowElement() { + if (this.low == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent.low"); + else if (Configuration.doAutoCreate()) + this.low = new IntegerType(); // bb + return this.low; + } + + public boolean hasLowElement() { + return this.low != null && !this.low.isEmpty(); + } + + public boolean hasLow() { + return this.low != null && !this.low.isEmpty(); + } + + /** + * @param value {@link #low} (A low expected limit of the amount.). This is the underlying object with id, value and extensions. The accessor "getLow" gives direct access to the value + */ + public SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent setLowElement(IntegerType value) { + this.low = value; + return this; + } + + /** + * @return A low expected limit of the amount. + */ + public int getLow() { + return this.low == null || this.low.isEmpty() ? 0 : this.low.getValue(); + } + + /** + * @param value A low expected limit of the amount. + */ + public SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent setLow(int value) { + if (this.low == null) + this.low = new IntegerType(); + this.low.setValue(value); + return this; + } + + /** + * @return {@link #high} (A high expected limit of the amount.). This is the underlying object with id, value and extensions. The accessor "getHigh" gives direct access to the value + */ + public IntegerType getHighElement() { + if (this.high == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent.high"); + else if (Configuration.doAutoCreate()) + this.high = new IntegerType(); // bb + return this.high; + } + + public boolean hasHighElement() { + return this.high != null && !this.high.isEmpty(); + } + + public boolean hasHigh() { + return this.high != null && !this.high.isEmpty(); + } + + /** + * @param value {@link #high} (A high expected limit of the amount.). This is the underlying object with id, value and extensions. The accessor "getHigh" gives direct access to the value + */ + public SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent setHighElement(IntegerType value) { + this.high = value; + return this; + } + + /** + * @return A high expected limit of the amount. + */ + public int getHigh() { + return this.high == null || this.high.isEmpty() ? 0 : this.high.getValue(); + } + + /** + * @param value A high expected limit of the amount. + */ + public SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent setHigh(int value) { + if (this.high == null) + this.high = new IntegerType(); + this.high.setValue(value); return this; } protected void listChildren(List children) { super.listChildren(children); - children.add(new Property("degree", "CodeableConcept", "Todo.", 0, 1, degree)); - children.add(new Property("amount", "SubstanceAmount", "Todo.", 0, 1, amount)); + children.add(new Property("type", "CodeableConcept", "The type of the degree of polymerisation shall be described, e.g. SRU/Polymer Ratio.", 0, 1, type)); + children.add(new Property("average", "integer", "An average amount of polymerisation.", 0, 1, average)); + children.add(new Property("low", "integer", "A low expected limit of the amount.", 0, 1, low)); + children.add(new Property("high", "integer", "A high expected limit of the amount.", 0, 1, high)); } @Override public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { switch (_hash) { - case -1335595316: /*degree*/ return new Property("degree", "CodeableConcept", "Todo.", 0, 1, degree); - case -1413853096: /*amount*/ return new Property("amount", "SubstanceAmount", "Todo.", 0, 1, amount); + case 3575610: /*type*/ return new Property("type", "CodeableConcept", "The type of the degree of polymerisation shall be described, e.g. SRU/Polymer Ratio.", 0, 1, type); + case -631448035: /*average*/ return new Property("average", "integer", "An average amount of polymerisation.", 0, 1, average); + case 107348: /*low*/ return new Property("low", "integer", "A low expected limit of the amount.", 0, 1, low); + case 3202466: /*high*/ return new Property("high", "integer", "A high expected limit of the amount.", 0, 1, high); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -1496,8 +1579,10 @@ public class SubstancePolymer extends DomainResource { @Override public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException { switch (hash) { - case -1335595316: /*degree*/ return this.degree == null ? new Base[0] : new Base[] {this.degree}; // CodeableConcept - case -1413853096: /*amount*/ return this.amount == null ? new Base[0] : new Base[] {this.amount}; // SubstanceAmount + case 3575610: /*type*/ return this.type == null ? new Base[0] : new Base[] {this.type}; // CodeableConcept + case -631448035: /*average*/ return this.average == null ? new Base[0] : new Base[] {this.average}; // IntegerType + case 107348: /*low*/ return this.low == null ? new Base[0] : new Base[] {this.low}; // IntegerType + case 3202466: /*high*/ return this.high == null ? new Base[0] : new Base[] {this.high}; // IntegerType default: return super.getProperty(hash, name, checkValid); } @@ -1506,11 +1591,17 @@ public class SubstancePolymer extends DomainResource { @Override public Base setProperty(int hash, String name, Base value) throws FHIRException { switch (hash) { - case -1335595316: // degree - this.degree = TypeConvertor.castToCodeableConcept(value); // CodeableConcept + case 3575610: // type + this.type = TypeConvertor.castToCodeableConcept(value); // CodeableConcept return value; - case -1413853096: // amount - this.amount = TypeConvertor.castToSubstanceAmount(value); // SubstanceAmount + case -631448035: // average + this.average = TypeConvertor.castToInteger(value); // IntegerType + return value; + case 107348: // low + this.low = TypeConvertor.castToInteger(value); // IntegerType + return value; + case 3202466: // high + this.high = TypeConvertor.castToInteger(value); // IntegerType return value; default: return super.setProperty(hash, name, value); } @@ -1519,10 +1610,14 @@ public class SubstancePolymer extends DomainResource { @Override public Base setProperty(String name, Base value) throws FHIRException { - if (name.equals("degree")) { - this.degree = TypeConvertor.castToCodeableConcept(value); // CodeableConcept - } else if (name.equals("amount")) { - this.amount = TypeConvertor.castToSubstanceAmount(value); // SubstanceAmount + if (name.equals("type")) { + this.type = TypeConvertor.castToCodeableConcept(value); // CodeableConcept + } else if (name.equals("average")) { + this.average = TypeConvertor.castToInteger(value); // IntegerType + } else if (name.equals("low")) { + this.low = TypeConvertor.castToInteger(value); // IntegerType + } else if (name.equals("high")) { + this.high = TypeConvertor.castToInteger(value); // IntegerType } else return super.setProperty(name, value); return value; @@ -1531,8 +1626,10 @@ public class SubstancePolymer extends DomainResource { @Override public Base makeProperty(int hash, String name) throws FHIRException { switch (hash) { - case -1335595316: return getDegree(); - case -1413853096: return getAmount(); + case 3575610: return getType(); + case -631448035: return getAverageElement(); + case 107348: return getLowElement(); + case 3202466: return getHighElement(); default: return super.makeProperty(hash, name); } @@ -1541,8 +1638,10 @@ public class SubstancePolymer extends DomainResource { @Override public String[] getTypesForProperty(int hash, String name) throws FHIRException { switch (hash) { - case -1335595316: /*degree*/ return new String[] {"CodeableConcept"}; - case -1413853096: /*amount*/ return new String[] {"SubstanceAmount"}; + case 3575610: /*type*/ return new String[] {"CodeableConcept"}; + case -631448035: /*average*/ return new String[] {"integer"}; + case 107348: /*low*/ return new String[] {"integer"}; + case 3202466: /*high*/ return new String[] {"integer"}; default: return super.getTypesForProperty(hash, name); } @@ -1550,13 +1649,18 @@ public class SubstancePolymer extends DomainResource { @Override public Base addChild(String name) throws FHIRException { - if (name.equals("degree")) { - this.degree = new CodeableConcept(); - return this.degree; + if (name.equals("type")) { + this.type = new CodeableConcept(); + return this.type; } - else if (name.equals("amount")) { - this.amount = new SubstanceAmount(); - return this.amount; + else if (name.equals("average")) { + throw new FHIRException("Cannot call addChild on a primitive type SubstancePolymer.repeat.repeatUnit.degreeOfPolymerisation.average"); + } + else if (name.equals("low")) { + throw new FHIRException("Cannot call addChild on a primitive type SubstancePolymer.repeat.repeatUnit.degreeOfPolymerisation.low"); + } + else if (name.equals("high")) { + throw new FHIRException("Cannot call addChild on a primitive type SubstancePolymer.repeat.repeatUnit.degreeOfPolymerisation.high"); } else return super.addChild(name); @@ -1570,8 +1674,10 @@ public class SubstancePolymer extends DomainResource { public void copyValues(SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent dst) { super.copyValues(dst); - dst.degree = degree == null ? null : degree.copy(); - dst.amount = amount == null ? null : amount.copy(); + dst.type = type == null ? null : type.copy(); + dst.average = average == null ? null : average.copy(); + dst.low = low == null ? null : low.copy(); + dst.high = high == null ? null : high.copy(); } @Override @@ -1581,7 +1687,8 @@ public class SubstancePolymer extends DomainResource { if (!(other_ instanceof SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent)) return false; SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent o = (SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent) other_; - return compareDeep(degree, o.degree, true) && compareDeep(amount, o.amount, true); + return compareDeep(type, o.type, true) && compareDeep(average, o.average, true) && compareDeep(low, o.low, true) + && compareDeep(high, o.high, true); } @Override @@ -1591,11 +1698,13 @@ public class SubstancePolymer extends DomainResource { if (!(other_ instanceof SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent)) return false; SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent o = (SubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent) other_; - return true; + return compareValues(average, o.average, true) && compareValues(low, o.low, true) && compareValues(high, o.high, true) + ; } public boolean isEmpty() { - return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(degree, amount); + return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(type, average, low, high + ); } public String fhirType() { @@ -1608,31 +1717,31 @@ public class SubstancePolymer extends DomainResource { @Block() public static class SubstancePolymerRepeatRepeatUnitStructuralRepresentationComponent extends BackboneElement implements IBaseBackboneElement { /** - * Todo. + * The type of structure (e.g. Full, Partial, Representative). */ @Child(name = "type", type = {CodeableConcept.class}, order=1, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Todo", formalDefinition="Todo." ) + @Description(shortDefinition="The type of structure (e.g. Full, Partial, Representative)", formalDefinition="The type of structure (e.g. Full, Partial, Representative)." ) protected CodeableConcept type; /** - * Todo. + * The structural representation as text string in a standard format e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF. */ @Child(name = "representation", type = {StringType.class}, order=2, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Todo", formalDefinition="Todo." ) + @Description(shortDefinition="The structural representation as text string in a standard format e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF", formalDefinition="The structural representation as text string in a standard format e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF." ) protected StringType representation; /** - * Todo. + * The format of the representation e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF. */ @Child(name = "format", type = {CodeableConcept.class}, order=3, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Todo", formalDefinition="Todo." ) + @Description(shortDefinition="The format of the representation e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF", formalDefinition="The format of the representation e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF." ) protected CodeableConcept format; /** - * Todo. + * An attached file with the structural representation. */ @Child(name = "attachment", type = {Attachment.class}, order=4, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Todo", formalDefinition="Todo." ) + @Description(shortDefinition="An attached file with the structural representation", formalDefinition="An attached file with the structural representation." ) protected Attachment attachment; private static final long serialVersionUID = -1385695515L; @@ -1645,7 +1754,7 @@ public class SubstancePolymer extends DomainResource { } /** - * @return {@link #type} (Todo.) + * @return {@link #type} (The type of structure (e.g. Full, Partial, Representative).) */ public CodeableConcept getType() { if (this.type == null) @@ -1661,7 +1770,7 @@ public class SubstancePolymer extends DomainResource { } /** - * @param value {@link #type} (Todo.) + * @param value {@link #type} (The type of structure (e.g. Full, Partial, Representative).) */ public SubstancePolymerRepeatRepeatUnitStructuralRepresentationComponent setType(CodeableConcept value) { this.type = value; @@ -1669,7 +1778,7 @@ public class SubstancePolymer extends DomainResource { } /** - * @return {@link #representation} (Todo.). This is the underlying object with id, value and extensions. The accessor "getRepresentation" gives direct access to the value + * @return {@link #representation} (The structural representation as text string in a standard format e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF.). This is the underlying object with id, value and extensions. The accessor "getRepresentation" gives direct access to the value */ public StringType getRepresentationElement() { if (this.representation == null) @@ -1689,7 +1798,7 @@ public class SubstancePolymer extends DomainResource { } /** - * @param value {@link #representation} (Todo.). This is the underlying object with id, value and extensions. The accessor "getRepresentation" gives direct access to the value + * @param value {@link #representation} (The structural representation as text string in a standard format e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF.). This is the underlying object with id, value and extensions. The accessor "getRepresentation" gives direct access to the value */ public SubstancePolymerRepeatRepeatUnitStructuralRepresentationComponent setRepresentationElement(StringType value) { this.representation = value; @@ -1697,14 +1806,14 @@ public class SubstancePolymer extends DomainResource { } /** - * @return Todo. + * @return The structural representation as text string in a standard format e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF. */ public String getRepresentation() { return this.representation == null ? null : this.representation.getValue(); } /** - * @param value Todo. + * @param value The structural representation as text string in a standard format e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF. */ public SubstancePolymerRepeatRepeatUnitStructuralRepresentationComponent setRepresentation(String value) { if (Utilities.noString(value)) @@ -1718,7 +1827,7 @@ public class SubstancePolymer extends DomainResource { } /** - * @return {@link #format} (Todo.) + * @return {@link #format} (The format of the representation e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF.) */ public CodeableConcept getFormat() { if (this.format == null) @@ -1734,7 +1843,7 @@ public class SubstancePolymer extends DomainResource { } /** - * @param value {@link #format} (Todo.) + * @param value {@link #format} (The format of the representation e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF.) */ public SubstancePolymerRepeatRepeatUnitStructuralRepresentationComponent setFormat(CodeableConcept value) { this.format = value; @@ -1742,7 +1851,7 @@ public class SubstancePolymer extends DomainResource { } /** - * @return {@link #attachment} (Todo.) + * @return {@link #attachment} (An attached file with the structural representation.) */ public Attachment getAttachment() { if (this.attachment == null) @@ -1758,7 +1867,7 @@ public class SubstancePolymer extends DomainResource { } /** - * @param value {@link #attachment} (Todo.) + * @param value {@link #attachment} (An attached file with the structural representation.) */ public SubstancePolymerRepeatRepeatUnitStructuralRepresentationComponent setAttachment(Attachment value) { this.attachment = value; @@ -1767,19 +1876,19 @@ public class SubstancePolymer extends DomainResource { protected void listChildren(List children) { super.listChildren(children); - children.add(new Property("type", "CodeableConcept", "Todo.", 0, 1, type)); - children.add(new Property("representation", "string", "Todo.", 0, 1, representation)); - children.add(new Property("format", "CodeableConcept", "Todo.", 0, 1, format)); - children.add(new Property("attachment", "Attachment", "Todo.", 0, 1, attachment)); + children.add(new Property("type", "CodeableConcept", "The type of structure (e.g. Full, Partial, Representative).", 0, 1, type)); + children.add(new Property("representation", "string", "The structural representation as text string in a standard format e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF.", 0, 1, representation)); + children.add(new Property("format", "CodeableConcept", "The format of the representation e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF.", 0, 1, format)); + children.add(new Property("attachment", "Attachment", "An attached file with the structural representation.", 0, 1, attachment)); } @Override public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { switch (_hash) { - case 3575610: /*type*/ return new Property("type", "CodeableConcept", "Todo.", 0, 1, type); - case -671065907: /*representation*/ return new Property("representation", "string", "Todo.", 0, 1, representation); - case -1268779017: /*format*/ return new Property("format", "CodeableConcept", "Todo.", 0, 1, format); - case -1963501277: /*attachment*/ return new Property("attachment", "Attachment", "Todo.", 0, 1, attachment); + case 3575610: /*type*/ return new Property("type", "CodeableConcept", "The type of structure (e.g. Full, Partial, Representative).", 0, 1, type); + case -671065907: /*representation*/ return new Property("representation", "string", "The structural representation as text string in a standard format e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF.", 0, 1, representation); + case -1268779017: /*format*/ return new Property("format", "CodeableConcept", "The format of the representation e.g. InChI, SMILES, MOLFILE, CDX, SDF, PDB, mmCIF.", 0, 1, format); + case -1963501277: /*attachment*/ return new Property("attachment", "Attachment", "An attached file with the structural representation.", 0, 1, attachment); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -1925,38 +2034,38 @@ public class SubstancePolymer extends DomainResource { } /** - * Todo. + * A business idenfier for this polymer, but typically this is handled by a SubstanceDefinition identifier. */ @Child(name = "identifier", type = {Identifier.class}, order=0, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Todo", formalDefinition="Todo." ) + @Description(shortDefinition="A business idenfier for this polymer, but typically this is handled by a SubstanceDefinition identifier", formalDefinition="A business idenfier for this polymer, but typically this is handled by a SubstanceDefinition identifier." ) protected Identifier identifier; /** - * Todo. + * Overall type of the polymer. */ @Child(name = "class", type = {CodeableConcept.class}, order=1, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Todo", formalDefinition="Todo." ) + @Description(shortDefinition="Overall type of the polymer", formalDefinition="Overall type of the polymer." ) protected CodeableConcept class_; /** - * Todo. + * Polymer geometry, e.g. linear, branched, cross-linked, network or dendritic. */ @Child(name = "geometry", type = {CodeableConcept.class}, order=2, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Todo", formalDefinition="Todo." ) + @Description(shortDefinition="Polymer geometry, e.g. linear, branched, cross-linked, network or dendritic", formalDefinition="Polymer geometry, e.g. linear, branched, cross-linked, network or dendritic." ) protected CodeableConcept geometry; /** - * Todo. + * Descrtibes the copolymer sequence type (polymer connectivity). */ @Child(name = "copolymerConnectivity", type = {CodeableConcept.class}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Todo", formalDefinition="Todo." ) + @Description(shortDefinition="Descrtibes the copolymer sequence type (polymer connectivity)", formalDefinition="Descrtibes the copolymer sequence type (polymer connectivity)." ) protected List copolymerConnectivity; /** - * Todo. This is intended to connect to a repeating full modification structure, also used by Protein and Nucleic Acid . String is just a placeholder. + * Todo - this is intended to connect to a repeating full modification structure, also used by Protein and Nucleic Acid . String is just a placeholder. */ @Child(name = "modification", type = {StringType.class}, order=4, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Todo. This is intended to connect to a repeating full modification structure, also used by Protein and Nucleic Acid . String is just a placeholder", formalDefinition="Todo. This is intended to connect to a repeating full modification structure, also used by Protein and Nucleic Acid . String is just a placeholder." ) + @Description(shortDefinition="Todo - this is intended to connect to a repeating full modification structure, also used by Protein and Nucleic Acid . String is just a placeholder", formalDefinition="Todo - this is intended to connect to a repeating full modification structure, also used by Protein and Nucleic Acid . String is just a placeholder." ) protected StringType modification; /** @@ -1967,10 +2076,10 @@ public class SubstancePolymer extends DomainResource { protected List monomerSet; /** - * Todo. + * Specifies and quantifies the repeated units and their configuration. */ @Child(name = "repeat", type = {}, order=6, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Todo", formalDefinition="Todo." ) + @Description(shortDefinition="Specifies and quantifies the repeated units and their configuration", formalDefinition="Specifies and quantifies the repeated units and their configuration." ) protected List repeat; private static final long serialVersionUID = 11937102L; @@ -1983,7 +2092,7 @@ public class SubstancePolymer extends DomainResource { } /** - * @return {@link #identifier} (Todo.) + * @return {@link #identifier} (A business idenfier for this polymer, but typically this is handled by a SubstanceDefinition identifier.) */ public Identifier getIdentifier() { if (this.identifier == null) @@ -1999,7 +2108,7 @@ public class SubstancePolymer extends DomainResource { } /** - * @param value {@link #identifier} (Todo.) + * @param value {@link #identifier} (A business idenfier for this polymer, but typically this is handled by a SubstanceDefinition identifier.) */ public SubstancePolymer setIdentifier(Identifier value) { this.identifier = value; @@ -2007,7 +2116,7 @@ public class SubstancePolymer extends DomainResource { } /** - * @return {@link #class_} (Todo.) + * @return {@link #class_} (Overall type of the polymer.) */ public CodeableConcept getClass_() { if (this.class_ == null) @@ -2023,7 +2132,7 @@ public class SubstancePolymer extends DomainResource { } /** - * @param value {@link #class_} (Todo.) + * @param value {@link #class_} (Overall type of the polymer.) */ public SubstancePolymer setClass_(CodeableConcept value) { this.class_ = value; @@ -2031,7 +2140,7 @@ public class SubstancePolymer extends DomainResource { } /** - * @return {@link #geometry} (Todo.) + * @return {@link #geometry} (Polymer geometry, e.g. linear, branched, cross-linked, network or dendritic.) */ public CodeableConcept getGeometry() { if (this.geometry == null) @@ -2047,7 +2156,7 @@ public class SubstancePolymer extends DomainResource { } /** - * @param value {@link #geometry} (Todo.) + * @param value {@link #geometry} (Polymer geometry, e.g. linear, branched, cross-linked, network or dendritic.) */ public SubstancePolymer setGeometry(CodeableConcept value) { this.geometry = value; @@ -2055,7 +2164,7 @@ public class SubstancePolymer extends DomainResource { } /** - * @return {@link #copolymerConnectivity} (Todo.) + * @return {@link #copolymerConnectivity} (Descrtibes the copolymer sequence type (polymer connectivity).) */ public List getCopolymerConnectivity() { if (this.copolymerConnectivity == null) @@ -2108,7 +2217,7 @@ public class SubstancePolymer extends DomainResource { } /** - * @return {@link #modification} (Todo. This is intended to connect to a repeating full modification structure, also used by Protein and Nucleic Acid . String is just a placeholder.). This is the underlying object with id, value and extensions. The accessor "getModification" gives direct access to the value + * @return {@link #modification} (Todo - this is intended to connect to a repeating full modification structure, also used by Protein and Nucleic Acid . String is just a placeholder.). This is the underlying object with id, value and extensions. The accessor "getModification" gives direct access to the value */ public StringType getModificationElement() { if (this.modification == null) @@ -2128,7 +2237,7 @@ public class SubstancePolymer extends DomainResource { } /** - * @param value {@link #modification} (Todo. This is intended to connect to a repeating full modification structure, also used by Protein and Nucleic Acid . String is just a placeholder.). This is the underlying object with id, value and extensions. The accessor "getModification" gives direct access to the value + * @param value {@link #modification} (Todo - this is intended to connect to a repeating full modification structure, also used by Protein and Nucleic Acid . String is just a placeholder.). This is the underlying object with id, value and extensions. The accessor "getModification" gives direct access to the value */ public SubstancePolymer setModificationElement(StringType value) { this.modification = value; @@ -2136,14 +2245,14 @@ public class SubstancePolymer extends DomainResource { } /** - * @return Todo. This is intended to connect to a repeating full modification structure, also used by Protein and Nucleic Acid . String is just a placeholder. + * @return Todo - this is intended to connect to a repeating full modification structure, also used by Protein and Nucleic Acid . String is just a placeholder. */ public String getModification() { return this.modification == null ? null : this.modification.getValue(); } /** - * @param value Todo. This is intended to connect to a repeating full modification structure, also used by Protein and Nucleic Acid . String is just a placeholder. + * @param value Todo - this is intended to connect to a repeating full modification structure, also used by Protein and Nucleic Acid . String is just a placeholder. */ public SubstancePolymer setModification(String value) { if (Utilities.noString(value)) @@ -2210,7 +2319,7 @@ public class SubstancePolymer extends DomainResource { } /** - * @return {@link #repeat} (Todo.) + * @return {@link #repeat} (Specifies and quantifies the repeated units and their configuration.) */ public List getRepeat() { if (this.repeat == null) @@ -2264,25 +2373,25 @@ public class SubstancePolymer extends DomainResource { protected void listChildren(List children) { super.listChildren(children); - children.add(new Property("identifier", "Identifier", "Todo.", 0, 1, identifier)); - children.add(new Property("class", "CodeableConcept", "Todo.", 0, 1, class_)); - children.add(new Property("geometry", "CodeableConcept", "Todo.", 0, 1, geometry)); - children.add(new Property("copolymerConnectivity", "CodeableConcept", "Todo.", 0, java.lang.Integer.MAX_VALUE, copolymerConnectivity)); - children.add(new Property("modification", "string", "Todo. This is intended to connect to a repeating full modification structure, also used by Protein and Nucleic Acid . String is just a placeholder.", 0, 1, modification)); + children.add(new Property("identifier", "Identifier", "A business idenfier for this polymer, but typically this is handled by a SubstanceDefinition identifier.", 0, 1, identifier)); + children.add(new Property("class", "CodeableConcept", "Overall type of the polymer.", 0, 1, class_)); + children.add(new Property("geometry", "CodeableConcept", "Polymer geometry, e.g. linear, branched, cross-linked, network or dendritic.", 0, 1, geometry)); + children.add(new Property("copolymerConnectivity", "CodeableConcept", "Descrtibes the copolymer sequence type (polymer connectivity).", 0, java.lang.Integer.MAX_VALUE, copolymerConnectivity)); + children.add(new Property("modification", "string", "Todo - this is intended to connect to a repeating full modification structure, also used by Protein and Nucleic Acid . String is just a placeholder.", 0, 1, modification)); children.add(new Property("monomerSet", "", "Todo.", 0, java.lang.Integer.MAX_VALUE, monomerSet)); - children.add(new Property("repeat", "", "Todo.", 0, java.lang.Integer.MAX_VALUE, repeat)); + children.add(new Property("repeat", "", "Specifies and quantifies the repeated units and their configuration.", 0, java.lang.Integer.MAX_VALUE, repeat)); } @Override public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { switch (_hash) { - case -1618432855: /*identifier*/ return new Property("identifier", "Identifier", "Todo.", 0, 1, identifier); - case 94742904: /*class*/ return new Property("class", "CodeableConcept", "Todo.", 0, 1, class_); - case 1846020210: /*geometry*/ return new Property("geometry", "CodeableConcept", "Todo.", 0, 1, geometry); - case 997107577: /*copolymerConnectivity*/ return new Property("copolymerConnectivity", "CodeableConcept", "Todo.", 0, java.lang.Integer.MAX_VALUE, copolymerConnectivity); - case -684600932: /*modification*/ return new Property("modification", "string", "Todo. This is intended to connect to a repeating full modification structure, also used by Protein and Nucleic Acid . String is just a placeholder.", 0, 1, modification); + case -1618432855: /*identifier*/ return new Property("identifier", "Identifier", "A business idenfier for this polymer, but typically this is handled by a SubstanceDefinition identifier.", 0, 1, identifier); + case 94742904: /*class*/ return new Property("class", "CodeableConcept", "Overall type of the polymer.", 0, 1, class_); + case 1846020210: /*geometry*/ return new Property("geometry", "CodeableConcept", "Polymer geometry, e.g. linear, branched, cross-linked, network or dendritic.", 0, 1, geometry); + case 997107577: /*copolymerConnectivity*/ return new Property("copolymerConnectivity", "CodeableConcept", "Descrtibes the copolymer sequence type (polymer connectivity).", 0, java.lang.Integer.MAX_VALUE, copolymerConnectivity); + case -684600932: /*modification*/ return new Property("modification", "string", "Todo - this is intended to connect to a repeating full modification structure, also used by Protein and Nucleic Acid . String is just a placeholder.", 0, 1, modification); case -1622483765: /*monomerSet*/ return new Property("monomerSet", "", "Todo.", 0, java.lang.Integer.MAX_VALUE, monomerSet); - case -934531685: /*repeat*/ return new Property("repeat", "", "Todo.", 0, java.lang.Integer.MAX_VALUE, repeat); + case -934531685: /*repeat*/ return new Property("repeat", "", "Specifies and quantifies the repeated units and their configuration.", 0, java.lang.Integer.MAX_VALUE, repeat); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -2484,4 +2593,5 @@ public class SubstancePolymer extends DomainResource { } -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceProtein.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceProtein.java index 978327e1e..1ef2d30f3 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceProtein.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceProtein.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.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 SubstanceProtein is defined as a single unit of a linear amino acid sequence, or a combination of subunits that are either covalently linked or have a defined invariant stoichiometric relationship. This includes all synthetic, recombinant and purified SubstanceProteins of defined sequence, whether the use is therapeutic or prophylactic. This set of elements will be used to describe albumins, coagulation factors, cytokines, growth factors, peptide/SubstanceProtein hormones, enzymes, toxins, toxoids, recombinant vaccines, and immunomodulators. @@ -1042,4 +1044,5 @@ public class SubstanceProtein extends DomainResource { } -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceReferenceInformation.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceReferenceInformation.java index 966e65f26..5e41c9f3d 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceReferenceInformation.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceReferenceInformation.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.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; /** * Todo. @@ -610,365 +612,6 @@ public class SubstanceReferenceInformation extends DomainResource { } - } - - @Block() - public static class SubstanceReferenceInformationClassificationComponent extends BackboneElement implements IBaseBackboneElement { - /** - * Todo. - */ - @Child(name = "domain", type = {CodeableConcept.class}, order=1, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Todo", formalDefinition="Todo." ) - protected CodeableConcept domain; - - /** - * Todo. - */ - @Child(name = "classification", type = {CodeableConcept.class}, order=2, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Todo", formalDefinition="Todo." ) - protected CodeableConcept classification; - - /** - * Todo. - */ - @Child(name = "subtype", type = {CodeableConcept.class}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Todo", formalDefinition="Todo." ) - protected List subtype; - - /** - * Todo. - */ - @Child(name = "source", type = {DocumentReference.class}, order=4, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Todo", formalDefinition="Todo." ) - protected List source; - - private static final long serialVersionUID = 185411369L; - - /** - * Constructor - */ - public SubstanceReferenceInformationClassificationComponent() { - super(); - } - - /** - * @return {@link #domain} (Todo.) - */ - public CodeableConcept getDomain() { - if (this.domain == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create SubstanceReferenceInformationClassificationComponent.domain"); - else if (Configuration.doAutoCreate()) - this.domain = new CodeableConcept(); // cc - return this.domain; - } - - public boolean hasDomain() { - return this.domain != null && !this.domain.isEmpty(); - } - - /** - * @param value {@link #domain} (Todo.) - */ - public SubstanceReferenceInformationClassificationComponent setDomain(CodeableConcept value) { - this.domain = value; - return this; - } - - /** - * @return {@link #classification} (Todo.) - */ - public CodeableConcept getClassification() { - if (this.classification == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create SubstanceReferenceInformationClassificationComponent.classification"); - else if (Configuration.doAutoCreate()) - this.classification = new CodeableConcept(); // cc - return this.classification; - } - - public boolean hasClassification() { - return this.classification != null && !this.classification.isEmpty(); - } - - /** - * @param value {@link #classification} (Todo.) - */ - public SubstanceReferenceInformationClassificationComponent setClassification(CodeableConcept value) { - this.classification = value; - return this; - } - - /** - * @return {@link #subtype} (Todo.) - */ - public List getSubtype() { - if (this.subtype == null) - this.subtype = new ArrayList(); - return this.subtype; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public SubstanceReferenceInformationClassificationComponent setSubtype(List theSubtype) { - this.subtype = theSubtype; - return this; - } - - public boolean hasSubtype() { - if (this.subtype == null) - return false; - for (CodeableConcept item : this.subtype) - if (!item.isEmpty()) - return true; - return false; - } - - public CodeableConcept addSubtype() { //3 - CodeableConcept t = new CodeableConcept(); - if (this.subtype == null) - this.subtype = new ArrayList(); - this.subtype.add(t); - return t; - } - - public SubstanceReferenceInformationClassificationComponent addSubtype(CodeableConcept t) { //3 - if (t == null) - return this; - if (this.subtype == null) - this.subtype = new ArrayList(); - this.subtype.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #subtype}, creating it if it does not already exist {3} - */ - public CodeableConcept getSubtypeFirstRep() { - if (getSubtype().isEmpty()) { - addSubtype(); - } - return getSubtype().get(0); - } - - /** - * @return {@link #source} (Todo.) - */ - public List getSource() { - if (this.source == null) - this.source = new ArrayList(); - return this.source; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public SubstanceReferenceInformationClassificationComponent setSource(List theSource) { - this.source = theSource; - return this; - } - - public boolean hasSource() { - if (this.source == null) - return false; - for (Reference item : this.source) - if (!item.isEmpty()) - return true; - return false; - } - - public Reference addSource() { //3 - Reference t = new Reference(); - if (this.source == null) - this.source = new ArrayList(); - this.source.add(t); - return t; - } - - public SubstanceReferenceInformationClassificationComponent addSource(Reference t) { //3 - if (t == null) - return this; - if (this.source == null) - this.source = new ArrayList(); - this.source.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #source}, creating it if it does not already exist {3} - */ - public Reference getSourceFirstRep() { - if (getSource().isEmpty()) { - addSource(); - } - return getSource().get(0); - } - - protected void listChildren(List children) { - super.listChildren(children); - children.add(new Property("domain", "CodeableConcept", "Todo.", 0, 1, domain)); - children.add(new Property("classification", "CodeableConcept", "Todo.", 0, 1, classification)); - children.add(new Property("subtype", "CodeableConcept", "Todo.", 0, java.lang.Integer.MAX_VALUE, subtype)); - children.add(new Property("source", "Reference(DocumentReference)", "Todo.", 0, java.lang.Integer.MAX_VALUE, source)); - } - - @Override - public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { - switch (_hash) { - case -1326197564: /*domain*/ return new Property("domain", "CodeableConcept", "Todo.", 0, 1, domain); - case 382350310: /*classification*/ return new Property("classification", "CodeableConcept", "Todo.", 0, 1, classification); - case -1867567750: /*subtype*/ return new Property("subtype", "CodeableConcept", "Todo.", 0, java.lang.Integer.MAX_VALUE, subtype); - case -896505829: /*source*/ return new Property("source", "Reference(DocumentReference)", "Todo.", 0, java.lang.Integer.MAX_VALUE, source); - default: return super.getNamedProperty(_hash, _name, _checkValid); - } - - } - - @Override - public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException { - switch (hash) { - case -1326197564: /*domain*/ return this.domain == null ? new Base[0] : new Base[] {this.domain}; // CodeableConcept - case 382350310: /*classification*/ return this.classification == null ? new Base[0] : new Base[] {this.classification}; // CodeableConcept - case -1867567750: /*subtype*/ return this.subtype == null ? new Base[0] : this.subtype.toArray(new Base[this.subtype.size()]); // CodeableConcept - case -896505829: /*source*/ return this.source == null ? new Base[0] : this.source.toArray(new Base[this.source.size()]); // Reference - default: return super.getProperty(hash, name, checkValid); - } - - } - - @Override - public Base setProperty(int hash, String name, Base value) throws FHIRException { - switch (hash) { - case -1326197564: // domain - this.domain = TypeConvertor.castToCodeableConcept(value); // CodeableConcept - return value; - case 382350310: // classification - this.classification = TypeConvertor.castToCodeableConcept(value); // CodeableConcept - return value; - case -1867567750: // subtype - this.getSubtype().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept - return value; - case -896505829: // source - this.getSource().add(TypeConvertor.castToReference(value)); // Reference - return value; - default: return super.setProperty(hash, name, value); - } - - } - - @Override - public Base setProperty(String name, Base value) throws FHIRException { - if (name.equals("domain")) { - this.domain = TypeConvertor.castToCodeableConcept(value); // CodeableConcept - } else if (name.equals("classification")) { - this.classification = TypeConvertor.castToCodeableConcept(value); // CodeableConcept - } else if (name.equals("subtype")) { - this.getSubtype().add(TypeConvertor.castToCodeableConcept(value)); - } else if (name.equals("source")) { - this.getSource().add(TypeConvertor.castToReference(value)); - } else - return super.setProperty(name, value); - return value; - } - - @Override - public Base makeProperty(int hash, String name) throws FHIRException { - switch (hash) { - case -1326197564: return getDomain(); - case 382350310: return getClassification(); - case -1867567750: return addSubtype(); - case -896505829: return addSource(); - default: return super.makeProperty(hash, name); - } - - } - - @Override - public String[] getTypesForProperty(int hash, String name) throws FHIRException { - switch (hash) { - case -1326197564: /*domain*/ return new String[] {"CodeableConcept"}; - case 382350310: /*classification*/ return new String[] {"CodeableConcept"}; - case -1867567750: /*subtype*/ return new String[] {"CodeableConcept"}; - case -896505829: /*source*/ return new String[] {"Reference"}; - default: return super.getTypesForProperty(hash, name); - } - - } - - @Override - public Base addChild(String name) throws FHIRException { - if (name.equals("domain")) { - this.domain = new CodeableConcept(); - return this.domain; - } - else if (name.equals("classification")) { - this.classification = new CodeableConcept(); - return this.classification; - } - else if (name.equals("subtype")) { - return addSubtype(); - } - else if (name.equals("source")) { - return addSource(); - } - else - return super.addChild(name); - } - - public SubstanceReferenceInformationClassificationComponent copy() { - SubstanceReferenceInformationClassificationComponent dst = new SubstanceReferenceInformationClassificationComponent(); - copyValues(dst); - return dst; - } - - public void copyValues(SubstanceReferenceInformationClassificationComponent dst) { - super.copyValues(dst); - dst.domain = domain == null ? null : domain.copy(); - dst.classification = classification == null ? null : classification.copy(); - if (subtype != null) { - dst.subtype = new ArrayList(); - for (CodeableConcept i : subtype) - dst.subtype.add(i.copy()); - }; - if (source != null) { - dst.source = new ArrayList(); - for (Reference i : source) - dst.source.add(i.copy()); - }; - } - - @Override - public boolean equalsDeep(Base other_) { - if (!super.equalsDeep(other_)) - return false; - if (!(other_ instanceof SubstanceReferenceInformationClassificationComponent)) - return false; - SubstanceReferenceInformationClassificationComponent o = (SubstanceReferenceInformationClassificationComponent) other_; - return compareDeep(domain, o.domain, true) && compareDeep(classification, o.classification, true) - && compareDeep(subtype, o.subtype, true) && compareDeep(source, o.source, true); - } - - @Override - public boolean equalsShallow(Base other_) { - if (!super.equalsShallow(other_)) - return false; - if (!(other_ instanceof SubstanceReferenceInformationClassificationComponent)) - return false; - SubstanceReferenceInformationClassificationComponent o = (SubstanceReferenceInformationClassificationComponent) other_; - return true; - } - - public boolean isEmpty() { - return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(domain, classification, subtype - , source); - } - - public String fhirType() { - return "SubstanceReferenceInformation.classification"; - - } - } @Block() @@ -1562,18 +1205,11 @@ public class SubstanceReferenceInformation extends DomainResource { /** * Todo. */ - @Child(name = "classification", type = {}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Todo", formalDefinition="Todo." ) - protected List classification; - - /** - * Todo. - */ - @Child(name = "target", type = {}, order=4, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "target", type = {}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Todo", formalDefinition="Todo." ) protected List target; - private static final long serialVersionUID = 890303332L; + private static final long serialVersionUID = -496299386L; /** * Constructor @@ -1737,59 +1373,6 @@ public class SubstanceReferenceInformation extends DomainResource { return getGeneElement().get(0); } - /** - * @return {@link #classification} (Todo.) - */ - public List getClassification() { - if (this.classification == null) - this.classification = new ArrayList(); - return this.classification; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public SubstanceReferenceInformation setClassification(List theClassification) { - this.classification = theClassification; - return this; - } - - public boolean hasClassification() { - if (this.classification == null) - return false; - for (SubstanceReferenceInformationClassificationComponent item : this.classification) - if (!item.isEmpty()) - return true; - return false; - } - - public SubstanceReferenceInformationClassificationComponent addClassification() { //3 - SubstanceReferenceInformationClassificationComponent t = new SubstanceReferenceInformationClassificationComponent(); - if (this.classification == null) - this.classification = new ArrayList(); - this.classification.add(t); - return t; - } - - public SubstanceReferenceInformation addClassification(SubstanceReferenceInformationClassificationComponent t) { //3 - if (t == null) - return this; - if (this.classification == null) - this.classification = new ArrayList(); - this.classification.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #classification}, creating it if it does not already exist {3} - */ - public SubstanceReferenceInformationClassificationComponent getClassificationFirstRep() { - if (getClassification().isEmpty()) { - addClassification(); - } - return getClassification().get(0); - } - /** * @return {@link #target} (Todo.) */ @@ -1848,7 +1431,6 @@ public class SubstanceReferenceInformation extends DomainResource { children.add(new Property("comment", "string", "Todo.", 0, 1, comment)); children.add(new Property("gene", "", "Todo.", 0, java.lang.Integer.MAX_VALUE, gene)); children.add(new Property("geneElement", "", "Todo.", 0, java.lang.Integer.MAX_VALUE, geneElement)); - children.add(new Property("classification", "", "Todo.", 0, java.lang.Integer.MAX_VALUE, classification)); children.add(new Property("target", "", "Todo.", 0, java.lang.Integer.MAX_VALUE, target)); } @@ -1858,7 +1440,6 @@ public class SubstanceReferenceInformation extends DomainResource { case 950398559: /*comment*/ return new Property("comment", "string", "Todo.", 0, 1, comment); case 3169045: /*gene*/ return new Property("gene", "", "Todo.", 0, java.lang.Integer.MAX_VALUE, gene); case -94918105: /*geneElement*/ return new Property("geneElement", "", "Todo.", 0, java.lang.Integer.MAX_VALUE, geneElement); - case 382350310: /*classification*/ return new Property("classification", "", "Todo.", 0, java.lang.Integer.MAX_VALUE, classification); case -880905839: /*target*/ return new Property("target", "", "Todo.", 0, java.lang.Integer.MAX_VALUE, target); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -1871,7 +1452,6 @@ public class SubstanceReferenceInformation extends DomainResource { case 950398559: /*comment*/ return this.comment == null ? new Base[0] : new Base[] {this.comment}; // StringType case 3169045: /*gene*/ return this.gene == null ? new Base[0] : this.gene.toArray(new Base[this.gene.size()]); // SubstanceReferenceInformationGeneComponent case -94918105: /*geneElement*/ return this.geneElement == null ? new Base[0] : this.geneElement.toArray(new Base[this.geneElement.size()]); // SubstanceReferenceInformationGeneElementComponent - case 382350310: /*classification*/ return this.classification == null ? new Base[0] : this.classification.toArray(new Base[this.classification.size()]); // SubstanceReferenceInformationClassificationComponent case -880905839: /*target*/ return this.target == null ? new Base[0] : this.target.toArray(new Base[this.target.size()]); // SubstanceReferenceInformationTargetComponent default: return super.getProperty(hash, name, checkValid); } @@ -1890,9 +1470,6 @@ public class SubstanceReferenceInformation extends DomainResource { case -94918105: // geneElement this.getGeneElement().add((SubstanceReferenceInformationGeneElementComponent) value); // SubstanceReferenceInformationGeneElementComponent return value; - case 382350310: // classification - this.getClassification().add((SubstanceReferenceInformationClassificationComponent) value); // SubstanceReferenceInformationClassificationComponent - return value; case -880905839: // target this.getTarget().add((SubstanceReferenceInformationTargetComponent) value); // SubstanceReferenceInformationTargetComponent return value; @@ -1909,8 +1486,6 @@ public class SubstanceReferenceInformation extends DomainResource { this.getGene().add((SubstanceReferenceInformationGeneComponent) value); } else if (name.equals("geneElement")) { this.getGeneElement().add((SubstanceReferenceInformationGeneElementComponent) value); - } else if (name.equals("classification")) { - this.getClassification().add((SubstanceReferenceInformationClassificationComponent) value); } else if (name.equals("target")) { this.getTarget().add((SubstanceReferenceInformationTargetComponent) value); } else @@ -1924,7 +1499,6 @@ public class SubstanceReferenceInformation extends DomainResource { case 950398559: return getCommentElement(); case 3169045: return addGene(); case -94918105: return addGeneElement(); - case 382350310: return addClassification(); case -880905839: return addTarget(); default: return super.makeProperty(hash, name); } @@ -1937,7 +1511,6 @@ public class SubstanceReferenceInformation extends DomainResource { case 950398559: /*comment*/ return new String[] {"string"}; case 3169045: /*gene*/ return new String[] {}; case -94918105: /*geneElement*/ return new String[] {}; - case 382350310: /*classification*/ return new String[] {}; case -880905839: /*target*/ return new String[] {}; default: return super.getTypesForProperty(hash, name); } @@ -1955,9 +1528,6 @@ public class SubstanceReferenceInformation extends DomainResource { else if (name.equals("geneElement")) { return addGeneElement(); } - else if (name.equals("classification")) { - return addClassification(); - } else if (name.equals("target")) { return addTarget(); } @@ -1989,11 +1559,6 @@ public class SubstanceReferenceInformation extends DomainResource { for (SubstanceReferenceInformationGeneElementComponent i : geneElement) dst.geneElement.add(i.copy()); }; - if (classification != null) { - dst.classification = new ArrayList(); - for (SubstanceReferenceInformationClassificationComponent i : classification) - dst.classification.add(i.copy()); - }; if (target != null) { dst.target = new ArrayList(); for (SubstanceReferenceInformationTargetComponent i : target) @@ -2013,7 +1578,7 @@ public class SubstanceReferenceInformation extends DomainResource { return false; SubstanceReferenceInformation o = (SubstanceReferenceInformation) other_; return compareDeep(comment, o.comment, true) && compareDeep(gene, o.gene, true) && compareDeep(geneElement, o.geneElement, true) - && compareDeep(classification, o.classification, true) && compareDeep(target, o.target, true); + && compareDeep(target, o.target, true); } @Override @@ -2028,7 +1593,7 @@ public class SubstanceReferenceInformation extends DomainResource { public boolean isEmpty() { return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(comment, gene, geneElement - , classification, target); + , target); } @Override @@ -2037,4 +1602,5 @@ public class SubstanceReferenceInformation extends DomainResource { } -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceSourceMaterial.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceSourceMaterial.java index ddaec40df..1cc5a3e1d 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceSourceMaterial.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceSourceMaterial.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.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; /** * Source material shall capture information on the taxonomic and anatomical origins as well as the fraction of a material that can result in or can be modified to form a substance. This set of data elements shall be used to define polymer substances isolated from biological matrices. Taxonomic and anatomical origins shall be described using a controlled vocabulary as required. This information is captured for naturally derived polymers ( . starch) and structurally diverse substances. For Organisms belonging to the Kingdom Plantae the Substance level defines the fresh material of a single species or infraspecies, the Herbal Drug and the Herbal preparation. For Herbal preparations, the fraction information will be captured at the Substance information level and additional information for herbal extracts will be captured at the Specified Substance Group 1 information level. See for further explanation the Substance Class: Structurally Diverse and the herbal annex. @@ -2932,4 +2934,5 @@ public class SubstanceSourceMaterial extends DomainResource { } -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SupplyDelivery.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SupplyDelivery.java index d3251918d..622a362ad 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SupplyDelivery.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SupplyDelivery.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; /** * Record of delivery of what is supplied. @@ -1336,7 +1338,7 @@ public class SupplyDelivery 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 @@ -1358,10 +1360,10 @@ public class SupplyDelivery 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 @@ -1378,7 +1380,7 @@ public class SupplyDelivery 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 @@ -1400,7 +1402,7 @@ public class SupplyDelivery 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); @@ -1500,4 +1502,5 @@ public class SupplyDelivery extends DomainResource { public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("SupplyDelivery:patient").toLocked(); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SupplyRequest.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SupplyRequest.java index b5bff141d..4b2aa36ff 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SupplyRequest.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SupplyRequest.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.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 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 record of a request for a medication, substance or device used in the healthcare setting. @@ -1731,7 +1730,7 @@ public class SupplyRequest 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 @@ -1753,10 +1752,10 @@ public class SupplyRequest 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 @@ -1773,7 +1772,7 @@ public class SupplyRequest 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 @@ -1795,10 +1794,11 @@ public class SupplyRequest 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); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Task.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Task.java index 896e516e6..8c7c52d3d 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Task.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Task.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.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; /** * A task to be performed. @@ -528,10 +526,10 @@ public class Task extends DomainResource { protected Period period; /** - * For requests that are targeted to more than on potential recipient/target, for whom is fulfillment sought? + * For requests that are targeted to more than one potential recipient/target, to identify who is fulfillment is sought for. */ @Child(name = "recipient", type = {Patient.class, Practitioner.class, PractitionerRole.class, RelatedPerson.class, Group.class, Organization.class}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="For whom is fulfillment sought?", formalDefinition="For requests that are targeted to more than on potential recipient/target, for whom is fulfillment sought?" ) + @Description(shortDefinition="For whom is fulfillment sought?", formalDefinition="For requests that are targeted to more than one potential recipient/target, to identify who is fulfillment is sought for." ) protected List recipient; private static final long serialVersionUID = 1673996066L; @@ -613,7 +611,7 @@ public class Task extends DomainResource { } /** - * @return {@link #recipient} (For requests that are targeted to more than on potential recipient/target, for whom is fulfillment sought?) + * @return {@link #recipient} (For requests that are targeted to more than one potential recipient/target, to identify who is fulfillment is sought for.) */ public List getRecipient() { if (this.recipient == null) @@ -669,7 +667,7 @@ public class Task extends DomainResource { super.listChildren(children); children.add(new Property("repetitions", "positiveInt", "Indicates the number of times the requested action should occur.", 0, 1, repetitions)); children.add(new Property("period", "Period", "Over what time-period is fulfillment sought.", 0, 1, period)); - children.add(new Property("recipient", "Reference(Patient|Practitioner|PractitionerRole|RelatedPerson|Group|Organization)", "For requests that are targeted to more than on potential recipient/target, for whom is fulfillment sought?", 0, java.lang.Integer.MAX_VALUE, recipient)); + children.add(new Property("recipient", "Reference(Patient|Practitioner|PractitionerRole|RelatedPerson|Group|Organization)", "For requests that are targeted to more than one potential recipient/target, to identify who is fulfillment is sought for.", 0, java.lang.Integer.MAX_VALUE, recipient)); } @Override @@ -677,7 +675,7 @@ public class Task extends DomainResource { switch (_hash) { case 984367650: /*repetitions*/ return new Property("repetitions", "positiveInt", "Indicates the number of times the requested action should occur.", 0, 1, repetitions); case -991726143: /*period*/ return new Property("period", "Period", "Over what time-period is fulfillment sought.", 0, 1, period); - case 820081177: /*recipient*/ return new Property("recipient", "Reference(Patient|Practitioner|PractitionerRole|RelatedPerson|Group|Organization)", "For requests that are targeted to more than on potential recipient/target, for whom is fulfillment sought?", 0, java.lang.Integer.MAX_VALUE, recipient); + case 820081177: /*recipient*/ return new Property("recipient", "Reference(Patient|Practitioner|PractitionerRole|RelatedPerson|Group|Organization)", "For requests that are targeted to more than one potential recipient/target, to identify who is fulfillment is sought for.", 0, java.lang.Integer.MAX_VALUE, recipient); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -5342,7 +5340,7 @@ public class Task extends DomainResource { * Path: Task.basedOn
    *

    */ - @SearchParamDefinition(name="based-on", path="Task.basedOn", description="Search by requests this task is based on", 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="Task.basedOn", description="Search by requests this task is based on", 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 @@ -5434,7 +5432,7 @@ public class Task extends DomainResource { * Path: Task.focus
    *

    */ - @SearchParamDefinition(name="focus", path="Task.focus", description="Search by task focus", 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="focus", path="Task.focus", description="Search by task focus", 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_FOCUS = "focus"; /** * Fluent Client search parameter constant for focus @@ -5724,7 +5722,7 @@ public class Task extends DomainResource { * Path: Task.for
    *

    */ - @SearchParamDefinition(name="subject", path="Task.for", description="Search by subject", 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="Task.for", description="Search by subject", 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 @@ -5743,4 +5741,5 @@ public class Task extends DomainResource { public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("Task:subject").toLocked(); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/TerminologyCapabilities.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/TerminologyCapabilities.java index acd771530..5aa0f9405 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/TerminologyCapabilities.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/TerminologyCapabilities.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.CapabilityStatementKind; -import org.hl7.fhir.r5.model.Enumerations.CapabilityStatementKindEnumFactory; -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 TerminologyCapabilities resource documents a set of capabilities (behaviors) of a FHIR Terminology Server that may be used as a statement of actual server functionality or a statement of required or desired server implementation. @@ -658,10 +654,10 @@ public class TerminologyCapabilities extends CanonicalResource { @Block() public static class TerminologyCapabilitiesCodeSystemComponent extends BackboneElement implements IBaseBackboneElement { /** - * URI for the Code System. + * Canonical identifier for the code system, represented as a URI. */ @Child(name = "uri", type = {CanonicalType.class}, order=1, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="URI for the Code System", formalDefinition="URI for the Code System." ) + @Description(shortDefinition="Canonical identifier for the code system, represented as a URI", formalDefinition="Canonical identifier for the code system, represented as a URI." ) protected CanonicalType uri; /** @@ -688,7 +684,7 @@ public class TerminologyCapabilities extends CanonicalResource { } /** - * @return {@link #uri} (URI for the Code System.). This is the underlying object with id, value and extensions. The accessor "getUri" gives direct access to the value + * @return {@link #uri} (Canonical identifier for the code system, represented as a URI.). This is the underlying object with id, value and extensions. The accessor "getUri" gives direct access to the value */ public CanonicalType getUriElement() { if (this.uri == null) @@ -708,7 +704,7 @@ public class TerminologyCapabilities extends CanonicalResource { } /** - * @param value {@link #uri} (URI for the Code System.). This is the underlying object with id, value and extensions. The accessor "getUri" gives direct access to the value + * @param value {@link #uri} (Canonical identifier for the code system, represented as a URI.). This is the underlying object with id, value and extensions. The accessor "getUri" gives direct access to the value */ public TerminologyCapabilitiesCodeSystemComponent setUriElement(CanonicalType value) { this.uri = value; @@ -716,14 +712,14 @@ public class TerminologyCapabilities extends CanonicalResource { } /** - * @return URI for the Code System. + * @return Canonical identifier for the code system, represented as a URI. */ public String getUri() { return this.uri == null ? null : this.uri.getValue(); } /** - * @param value URI for the Code System. + * @param value Canonical identifier for the code system, represented as a URI. */ public TerminologyCapabilitiesCodeSystemComponent setUri(String value) { if (Utilities.noString(value)) @@ -836,7 +832,7 @@ public class TerminologyCapabilities extends CanonicalResource { protected void listChildren(List children) { super.listChildren(children); - children.add(new Property("uri", "canonical(CodeSystem)", "URI for the Code System.", 0, 1, uri)); + children.add(new Property("uri", "canonical(CodeSystem)", "Canonical identifier for the code system, represented as a URI.", 0, 1, uri)); children.add(new Property("version", "", "For the code system, a list of versions that are supported by the server.", 0, java.lang.Integer.MAX_VALUE, version)); children.add(new Property("subsumption", "boolean", "True if subsumption is supported for this version of the code system.", 0, 1, subsumption)); } @@ -844,7 +840,7 @@ public class TerminologyCapabilities extends CanonicalResource { @Override public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { switch (_hash) { - case 116076: /*uri*/ return new Property("uri", "canonical(CodeSystem)", "URI for the Code System.", 0, 1, uri); + case 116076: /*uri*/ return new Property("uri", "canonical(CodeSystem)", "Canonical identifier for the code system, represented as a URI.", 0, 1, uri); case 351608024: /*version*/ return new Property("version", "", "For the code system, a list of versions that are supported by the server.", 0, java.lang.Integer.MAX_VALUE, version); case -499084711: /*subsumption*/ return new Property("subsumption", "boolean", "True if subsumption is supported for this version of the code system.", 0, 1, subsumption); default: return super.getNamedProperty(_hash, _name, _checkValid); @@ -1832,10 +1828,10 @@ public class TerminologyCapabilities extends CanonicalResource { protected BooleanType paging; /** - * Allow request for incomplete expansions? + * True if requests for incomplete expansions are allowed. */ @Child(name = "incomplete", type = {BooleanType.class}, order=3, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Allow request for incomplete expansions?", formalDefinition="Allow request for incomplete expansions?" ) + @Description(shortDefinition="Allow request for incomplete expansions?", formalDefinition="True if requests for incomplete expansions are allowed." ) protected BooleanType incomplete; /** @@ -1952,7 +1948,7 @@ public class TerminologyCapabilities extends CanonicalResource { } /** - * @return {@link #incomplete} (Allow request for incomplete expansions?). This is the underlying object with id, value and extensions. The accessor "getIncomplete" gives direct access to the value + * @return {@link #incomplete} (True if requests for incomplete expansions are allowed.). This is the underlying object with id, value and extensions. The accessor "getIncomplete" gives direct access to the value */ public BooleanType getIncompleteElement() { if (this.incomplete == null) @@ -1972,7 +1968,7 @@ public class TerminologyCapabilities extends CanonicalResource { } /** - * @param value {@link #incomplete} (Allow request for incomplete expansions?). This is the underlying object with id, value and extensions. The accessor "getIncomplete" gives direct access to the value + * @param value {@link #incomplete} (True if requests for incomplete expansions are allowed.). This is the underlying object with id, value and extensions. The accessor "getIncomplete" gives direct access to the value */ public TerminologyCapabilitiesExpansionComponent setIncompleteElement(BooleanType value) { this.incomplete = value; @@ -1980,14 +1976,14 @@ public class TerminologyCapabilities extends CanonicalResource { } /** - * @return Allow request for incomplete expansions? + * @return True if requests for incomplete expansions are allowed. */ public boolean getIncomplete() { return this.incomplete == null || this.incomplete.isEmpty() ? false : this.incomplete.getValue(); } /** - * @param value Allow request for incomplete expansions? + * @param value True if requests for incomplete expansions are allowed. */ public TerminologyCapabilitiesExpansionComponent setIncomplete(boolean value) { if (this.incomplete == null) @@ -2102,7 +2098,7 @@ public class TerminologyCapabilities extends CanonicalResource { super.listChildren(children); children.add(new Property("hierarchical", "boolean", "Whether the server can return nested value sets.", 0, 1, hierarchical)); children.add(new Property("paging", "boolean", "Whether the server supports paging on expansion.", 0, 1, paging)); - children.add(new Property("incomplete", "boolean", "Allow request for incomplete expansions?", 0, 1, incomplete)); + children.add(new Property("incomplete", "boolean", "True if requests for incomplete expansions are allowed.", 0, 1, incomplete)); children.add(new Property("parameter", "", "Supported expansion parameter.", 0, java.lang.Integer.MAX_VALUE, parameter)); children.add(new Property("textFilter", "markdown", "Documentation about text searching works.", 0, 1, textFilter)); } @@ -2112,7 +2108,7 @@ public class TerminologyCapabilities extends CanonicalResource { switch (_hash) { case 857636745: /*hierarchical*/ return new Property("hierarchical", "boolean", "Whether the server can return nested value sets.", 0, 1, hierarchical); case -995747956: /*paging*/ return new Property("paging", "boolean", "Whether the server supports paging on expansion.", 0, 1, paging); - case -1010022050: /*incomplete*/ return new Property("incomplete", "boolean", "Allow request for incomplete expansions?", 0, 1, incomplete); + case -1010022050: /*incomplete*/ return new Property("incomplete", "boolean", "True if requests for incomplete expansions are allowed.", 0, 1, incomplete); case 1954460585: /*parameter*/ return new Property("parameter", "", "Supported expansion parameter.", 0, java.lang.Integer.MAX_VALUE, parameter); case 1469359877: /*textFilter*/ return new Property("textFilter", "markdown", "Documentation about text searching works.", 0, 1, textFilter); default: return super.getNamedProperty(_hash, _name, _checkValid); @@ -2276,10 +2272,10 @@ public class TerminologyCapabilities extends CanonicalResource { @Block() public static class TerminologyCapabilitiesExpansionParameterComponent extends BackboneElement implements IBaseBackboneElement { /** - * Expansion Parameter name. + * Name of the supported expansion parameter. */ @Child(name = "name", type = {CodeType.class}, order=1, min=1, max=1, modifier=false, summary=false) - @Description(shortDefinition="Expansion Parameter name", formalDefinition="Expansion Parameter name." ) + @Description(shortDefinition="Name of the supported expansion parameter", formalDefinition="Name of the supported expansion parameter." ) protected CodeType name; /** @@ -2307,7 +2303,7 @@ public class TerminologyCapabilities extends CanonicalResource { } /** - * @return {@link #name} (Expansion Parameter name.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value + * @return {@link #name} (Name of the supported expansion parameter.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value */ public CodeType getNameElement() { if (this.name == null) @@ -2327,7 +2323,7 @@ public class TerminologyCapabilities extends CanonicalResource { } /** - * @param value {@link #name} (Expansion Parameter name.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value + * @param value {@link #name} (Name of the supported expansion parameter.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value */ public TerminologyCapabilitiesExpansionParameterComponent setNameElement(CodeType value) { this.name = value; @@ -2335,14 +2331,14 @@ public class TerminologyCapabilities extends CanonicalResource { } /** - * @return Expansion Parameter name. + * @return Name of the supported expansion parameter. */ public String getName() { return this.name == null ? null : this.name.getValue(); } /** - * @param value Expansion Parameter name. + * @param value Name of the supported expansion parameter. */ public TerminologyCapabilitiesExpansionParameterComponent setName(String value) { if (this.name == null) @@ -2402,14 +2398,14 @@ public class TerminologyCapabilities extends CanonicalResource { protected void listChildren(List children) { super.listChildren(children); - children.add(new Property("name", "code", "Expansion Parameter name.", 0, 1, name)); + children.add(new Property("name", "code", "Name of the supported expansion parameter.", 0, 1, name)); children.add(new Property("documentation", "string", "Description of support for parameter.", 0, 1, documentation)); } @Override public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { switch (_hash) { - case 3373707: /*name*/ return new Property("name", "code", "Expansion Parameter name.", 0, 1, name); + case 3373707: /*name*/ return new Property("name", "code", "Name of the supported expansion parameter.", 0, 1, name); case 1587405498: /*documentation*/ return new Property("documentation", "string", "Description of support for parameter.", 0, 1, documentation); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -5599,4 +5595,5 @@ public class TerminologyCapabilities 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/TestReport.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/TestReport.java index d87950483..1f429928c 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/TestReport.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/TestReport.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; /** * A summary of information based on the results of executing a TestScript. @@ -3861,4 +3860,5 @@ public class TestReport extends DomainResource { public static final ca.uhn.fhir.model.api.Include INCLUDE_TESTSCRIPT = new ca.uhn.fhir.model.api.Include("TestReport:testscript").toLocked(); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/TestScript.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/TestScript.java index 3fe3e21e4..567a1d5ef 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/TestScript.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/TestScript.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 structured set of tests against a FHIR server or client implementation to determine compliance against the FHIR specification. @@ -820,10 +818,6 @@ public class TestScript extends CanonicalResource { * A fact or piece of data from a study of a large quantity of numerical data. A mathematical or quantified characteristic of a group of observations. */ STATISTIC, - /** - * Chemical substances are a single substance type whose primary defining element is the molecular structure. Chemical substances shall be defined on the basis of their complete covalent molecular structure; the presence of a salt (counter-ion) and/or solvates (water, alcohols) is also captured. Purity, grade, physical form or particle size are not taken into account in the definition of a chemical substance or in the assignment of a Substance ID. - */ - SUBSTANCEAMOUNT, /** * Specifies an event that may occur multiple times. Timing schedules are used to record when things are planned, expected or requested to occur. The most common usage is in dosage instructions for medications. They are also used when planning care of various kinds, and may be used for reporting the schedule to which past regular activities were carried out. */ @@ -1141,9 +1135,9 @@ public class TestScript extends CanonicalResource { */ EVIDENCE, /** - * EvidenceFocus. + * The EvidenceReport. */ - EVIDENCEFOCUS, + EVIDENCEREPORT, /** * The EvidenceVariable resource describes an element that knowledge (Evidence) is about. */ @@ -1245,7 +1239,7 @@ public class TestScript extends CanonicalResource { */ MEASUREREPORT, /** - * This resource is primarily used for the identification and definition of a medication for the purposes of prescribing, dispensing, and administering a medication as well as for making statements about medication use. + * This resource is primarily used for the identification and definition of a medication, including ingredients, for the purposes of prescribing, dispensing, and administering a medication as well as for making statements about medication use. */ MEDICATION, /** @@ -1325,7 +1319,7 @@ public class TestScript extends CanonicalResource { */ ORGANIZATIONAFFILIATION, /** - * A medicinal product in a container or package. + * A medically related item or items, in a container or package. */ PACKAGEDPRODUCTDEFINITION, /** @@ -1465,7 +1459,7 @@ public class TestScript extends CanonicalResource { */ SUBSTANCENUCLEICACID, /** - * Todo. + * Properties of a substance specific to it being a polymer. */ SUBSTANCEPOLYMER, /** @@ -1615,8 +1609,6 @@ public class TestScript extends CanonicalResource { return SIMPLEQUANTITY; if ("Statistic".equals(codeString)) return STATISTIC; - if ("SubstanceAmount".equals(codeString)) - return SUBSTANCEAMOUNT; if ("Timing".equals(codeString)) return TIMING; if ("TriggerDefinition".equals(codeString)) @@ -1775,8 +1767,8 @@ public class TestScript extends CanonicalResource { return EVENTDEFINITION; if ("Evidence".equals(codeString)) return EVIDENCE; - if ("EvidenceFocus".equals(codeString)) - return EVIDENCEFOCUS; + if ("EvidenceReport".equals(codeString)) + return EVIDENCEREPORT; if ("EvidenceVariable".equals(codeString)) return EVIDENCEVARIABLE; if ("ExampleScenario".equals(codeString)) @@ -2016,7 +2008,6 @@ public class TestScript extends CanonicalResource { case SIGNATURE: return "Signature"; case SIMPLEQUANTITY: return "SimpleQuantity"; case STATISTIC: return "Statistic"; - case SUBSTANCEAMOUNT: return "SubstanceAmount"; case TIMING: return "Timing"; case TRIGGERDEFINITION: return "TriggerDefinition"; case USAGECONTEXT: return "UsageContext"; @@ -2096,7 +2087,7 @@ public class TestScript extends CanonicalResource { case EPISODEOFCARE: return "EpisodeOfCare"; case EVENTDEFINITION: return "EventDefinition"; case EVIDENCE: return "Evidence"; - case EVIDENCEFOCUS: return "EvidenceFocus"; + case EVIDENCEREPORT: return "EvidenceReport"; case EVIDENCEVARIABLE: return "EvidenceVariable"; case EXAMPLESCENARIO: return "ExampleScenario"; case EXPLANATIONOFBENEFIT: return "ExplanationOfBenefit"; @@ -2241,7 +2232,6 @@ public class TestScript extends CanonicalResource { case SIGNATURE: return "http://hl7.org/fhir/data-types"; case SIMPLEQUANTITY: return "http://hl7.org/fhir/data-types"; case STATISTIC: return "http://hl7.org/fhir/data-types"; - case SUBSTANCEAMOUNT: return "http://hl7.org/fhir/data-types"; case TIMING: return "http://hl7.org/fhir/data-types"; case TRIGGERDEFINITION: return "http://hl7.org/fhir/data-types"; case USAGECONTEXT: return "http://hl7.org/fhir/data-types"; @@ -2321,7 +2311,7 @@ public class TestScript extends CanonicalResource { case EPISODEOFCARE: return "http://hl7.org/fhir/resource-types"; case EVENTDEFINITION: return "http://hl7.org/fhir/resource-types"; case EVIDENCE: return "http://hl7.org/fhir/resource-types"; - case EVIDENCEFOCUS: return "http://hl7.org/fhir/resource-types"; + case EVIDENCEREPORT: return "http://hl7.org/fhir/resource-types"; case EVIDENCEVARIABLE: return "http://hl7.org/fhir/resource-types"; case EXAMPLESCENARIO: return "http://hl7.org/fhir/resource-types"; case EXPLANATIONOFBENEFIT: return "http://hl7.org/fhir/resource-types"; @@ -2466,7 +2456,6 @@ public class TestScript extends CanonicalResource { case SIGNATURE: return "A signature along with supporting context. The signature may be a digital signature that is cryptographic in nature, or some other signature acceptable to the domain. This other signature may be as simple as a graphical image representing a hand-written signature, or a signature ceremony Different signature approaches have different utilities."; case SIMPLEQUANTITY: return ""; case STATISTIC: return "A fact or piece of data from a study of a large quantity of numerical data. A mathematical or quantified characteristic of a group of observations."; - case SUBSTANCEAMOUNT: return "Chemical substances are a single substance type whose primary defining element is the molecular structure. Chemical substances shall be defined on the basis of their complete covalent molecular structure; the presence of a salt (counter-ion) and/or solvates (water, alcohols) is also captured. Purity, grade, physical form or particle size are not taken into account in the definition of a chemical substance or in the assignment of a Substance ID."; case TIMING: return "Specifies an event that may occur multiple times. Timing schedules are used to record when things are planned, expected or requested to occur. The most common usage is in dosage instructions for medications. They are also used when planning care of various kinds, and may be used for reporting the schedule to which past regular activities were carried out."; case TRIGGERDEFINITION: return "A description of a triggering event. Triggering events can be named events, data events, or periodic, as determined by the type element."; case USAGECONTEXT: return "Specifies clinical/business/etc. metadata that can be used to retrieve, index and/or categorize an artifact. This metadata can either be specific to the applicable population (e.g., age category, DRG) or the specific context of care (e.g., venue, care setting, provider of care)."; @@ -2546,7 +2535,7 @@ public class TestScript extends CanonicalResource { case EPISODEOFCARE: return "An association between a patient and an organization / healthcare provider(s) during which time encounters may occur. The managing organization assumes a level of responsibility for the patient during this time."; case EVENTDEFINITION: return "The EventDefinition resource provides a reusable description of when a particular event can occur."; case EVIDENCE: return "This represents statistics, certainty, both the intended and actual population, and evidence variables."; - case EVIDENCEFOCUS: return "EvidenceFocus."; + case EVIDENCEREPORT: return "The EvidenceReport."; case EVIDENCEVARIABLE: return "The EvidenceVariable resource describes an element that knowledge (Evidence) is about."; case EXAMPLESCENARIO: return "Example of workflow instance."; case EXPLANATIONOFBENEFIT: return "This resource provides: the claim details; adjudication details from the processing of a Claim; and optionally account balance information, for informing the subscriber of the benefits provided."; @@ -2572,7 +2561,7 @@ public class TestScript extends CanonicalResource { case MANUFACTUREDITEMDEFINITION: return "The definition and characteristics of a medicinal manufactured item, such as a tablet or capsule, as contained in a packaged medicinal product."; case MEASURE: return "The Measure resource provides the definition of a quality measure."; case MEASUREREPORT: return "The MeasureReport resource contains the results of the calculation of a measure; and optionally a reference to the resources involved in that calculation."; - case MEDICATION: return "This resource is primarily used for the identification and definition of a medication for the purposes of prescribing, dispensing, and administering a medication as well as for making statements about medication use."; + case MEDICATION: return "This resource is primarily used for the identification and definition of a medication, including ingredients, for the purposes of prescribing, dispensing, and administering a medication as well as for making statements about medication use."; case MEDICATIONADMINISTRATION: return "Describes the event of a patient consuming or otherwise being administered a medication. This may be as simple as swallowing a tablet or it may be a long running infusion. Related resources tie this event to the authorizing prescription, and the specific encounter between patient and health care practitioner."; case MEDICATIONDISPENSE: return "Indicates that a medication product is to be or has been dispensed for a named person/patient. This includes a description of the medication product (supply) provided and the instructions for administering the medication. The medication dispense is the result of a pharmacy system responding to a medication order."; case MEDICATIONKNOWLEDGE: return "Information about a medication that is used to support knowledge."; @@ -2592,7 +2581,7 @@ public class TestScript extends CanonicalResource { case OPERATIONOUTCOME: return "A collection of error, warning, or information messages that result from a system action."; case ORGANIZATION: return "A formally or informally recognized grouping of people or organizations formed for the purpose of achieving some form of collective action. Includes companies, institutions, corporations, departments, community groups, healthcare practice groups, payer/insurer, etc."; case ORGANIZATIONAFFILIATION: return "Defines an affiliation/assotiation/relationship between 2 distinct oganizations, that is not a part-of relationship/sub-division relationship."; - case PACKAGEDPRODUCTDEFINITION: return "A medicinal product in a container or package."; + case PACKAGEDPRODUCTDEFINITION: return "A medically related item or items, in a container or package."; case PARAMETERS: return "This resource is a non-persisted resource used to pass information into and back from an [operation](operations.html). It has no other use, and there is no RESTful endpoint associated with it."; case PATIENT: return "Demographics and other administrative information about an individual or animal receiving care or other health-related services."; case PAYMENTNOTICE: return "This resource provides the status of the payment for goods and services rendered, and the request and response resource references."; @@ -2627,7 +2616,7 @@ public class TestScript extends CanonicalResource { case SUBSTANCE: return "A homogeneous material with a definite composition."; case SUBSTANCEDEFINITION: return "The detailed description of a substance, typically at a level beyond what is used for prescribing."; case SUBSTANCENUCLEICACID: return "Nucleic acids are defined by three distinct elements: the base, sugar and linkage. Individual substance/moiety IDs will be created for each of these elements. The nucleotide sequence will be always entered in the 5’-3’ direction."; - case SUBSTANCEPOLYMER: return "Todo."; + case SUBSTANCEPOLYMER: return "Properties of a substance specific to it being a polymer."; case SUBSTANCEPROTEIN: return "A SubstanceProtein is defined as a single unit of a linear amino acid sequence, or a combination of subunits that are either covalently linked or have a defined invariant stoichiometric relationship. This includes all synthetic, recombinant and purified SubstanceProteins of defined sequence, whether the use is therapeutic or prophylactic. This set of elements will be used to describe albumins, coagulation factors, cytokines, growth factors, peptide/SubstanceProtein hormones, enzymes, toxins, toxoids, recombinant vaccines, and immunomodulators."; case SUBSTANCEREFERENCEINFORMATION: return "Todo."; case SUBSTANCESOURCEMATERIAL: return "Source material shall capture information on the taxonomic and anatomical origins as well as the fraction of a material that can result in or can be modified to form a substance. This set of data elements shall be used to define polymer substances isolated from biological matrices. Taxonomic and anatomical origins shall be described using a controlled vocabulary as required. This information is captured for naturally derived polymers ( . starch) and structurally diverse substances. For Organisms belonging to the Kingdom Plantae the Substance level defines the fresh material of a single species or infraspecies, the Herbal Drug and the Herbal preparation. For Herbal preparations, the fraction information will be captured at the Substance information level and additional information for herbal extracts will be captured at the Specified Substance Group 1 information level. See for further explanation the Substance Class: Structurally Diverse and the herbal annex."; @@ -2691,7 +2680,6 @@ public class TestScript extends CanonicalResource { case SIGNATURE: return "Signature"; case SIMPLEQUANTITY: return "SimpleQuantity"; case STATISTIC: return "Statistic"; - case SUBSTANCEAMOUNT: return "SubstanceAmount"; case TIMING: return "Timing"; case TRIGGERDEFINITION: return "TriggerDefinition"; case USAGECONTEXT: return "UsageContext"; @@ -2771,7 +2759,7 @@ public class TestScript extends CanonicalResource { case EPISODEOFCARE: return "EpisodeOfCare"; case EVENTDEFINITION: return "EventDefinition"; case EVIDENCE: return "Evidence"; - case EVIDENCEFOCUS: return "EvidenceFocus"; + case EVIDENCEREPORT: return "EvidenceReport"; case EVIDENCEVARIABLE: return "EvidenceVariable"; case EXAMPLESCENARIO: return "ExampleScenario"; case EXPLANATIONOFBENEFIT: return "ExplanationOfBenefit"; @@ -2967,8 +2955,6 @@ public class TestScript extends CanonicalResource { return FHIRDefinedType.SIMPLEQUANTITY; if ("Statistic".equals(codeString)) return FHIRDefinedType.STATISTIC; - if ("SubstanceAmount".equals(codeString)) - return FHIRDefinedType.SUBSTANCEAMOUNT; if ("Timing".equals(codeString)) return FHIRDefinedType.TIMING; if ("TriggerDefinition".equals(codeString)) @@ -3127,8 +3113,8 @@ public class TestScript extends CanonicalResource { return FHIRDefinedType.EVENTDEFINITION; if ("Evidence".equals(codeString)) return FHIRDefinedType.EVIDENCE; - if ("EvidenceFocus".equals(codeString)) - return FHIRDefinedType.EVIDENCEFOCUS; + if ("EvidenceReport".equals(codeString)) + return FHIRDefinedType.EVIDENCEREPORT; if ("EvidenceVariable".equals(codeString)) return FHIRDefinedType.EVIDENCEVARIABLE; if ("ExampleScenario".equals(codeString)) @@ -3417,8 +3403,6 @@ public class TestScript extends CanonicalResource { return new Enumeration(this, FHIRDefinedType.SIMPLEQUANTITY); if ("Statistic".equals(codeString)) return new Enumeration(this, FHIRDefinedType.STATISTIC); - if ("SubstanceAmount".equals(codeString)) - return new Enumeration(this, FHIRDefinedType.SUBSTANCEAMOUNT); if ("Timing".equals(codeString)) return new Enumeration(this, FHIRDefinedType.TIMING); if ("TriggerDefinition".equals(codeString)) @@ -3577,8 +3561,8 @@ public class TestScript extends CanonicalResource { return new Enumeration(this, FHIRDefinedType.EVENTDEFINITION); if ("Evidence".equals(codeString)) return new Enumeration(this, FHIRDefinedType.EVIDENCE); - if ("EvidenceFocus".equals(codeString)) - return new Enumeration(this, FHIRDefinedType.EVIDENCEFOCUS); + if ("EvidenceReport".equals(codeString)) + return new Enumeration(this, FHIRDefinedType.EVIDENCEREPORT); if ("EvidenceVariable".equals(codeString)) return new Enumeration(this, FHIRDefinedType.EVIDENCEVARIABLE); if ("ExampleScenario".equals(codeString)) @@ -3860,8 +3844,6 @@ public class TestScript extends CanonicalResource { return "SimpleQuantity"; if (code == FHIRDefinedType.STATISTIC) return "Statistic"; - if (code == FHIRDefinedType.SUBSTANCEAMOUNT) - return "SubstanceAmount"; if (code == FHIRDefinedType.TIMING) return "Timing"; if (code == FHIRDefinedType.TRIGGERDEFINITION) @@ -4020,8 +4002,8 @@ public class TestScript extends CanonicalResource { return "EventDefinition"; if (code == FHIRDefinedType.EVIDENCE) return "Evidence"; - if (code == FHIRDefinedType.EVIDENCEFOCUS) - return "EvidenceFocus"; + if (code == FHIRDefinedType.EVIDENCEREPORT) + return "EvidenceReport"; if (code == FHIRDefinedType.EVIDENCEVARIABLE) return "EvidenceVariable"; if (code == FHIRDefinedType.EXAMPLESCENARIO) @@ -13655,4 +13637,5 @@ public class TestScript 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/Timing.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Timing.java index 2ae8dd361..a48eb7acd 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Timing.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Timing.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,22 @@ 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 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.r5.model.Enumerations.DaysOfWeek; -import org.hl7.fhir.r5.model.Enumerations.DaysOfWeekEnumFactory; - -import ca.uhn.fhir.model.api.annotation.Block; 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 Timing Type: Specifies an event that may occur multiple times. Timing schedules are used to record when things are planned, expected or requested to occur. The most common usage is in dosage instructions for medications. They are also used when planning care of various kinds, and may be used for reporting the schedule to which past regular activities were carried out. @@ -106,59 +102,59 @@ public class Timing extends BackboneType implements ICompositeType { */ PHS, /** - * Description: Prior to beginning a regular period of extended sleep (this would exclude naps). Note that this might occur at different times of day depending on a person's regular sleep schedule. + * */ HS, /** - * Description: Upon waking up from a regular period of sleep, in order to start regular activities (this would exclude waking up from a nap or temporarily waking up during a period of sleep)\r\n\n \n Usage Notes: e.g.\r\n\n Take pulse rate on waking in management of thyrotoxicosis.\r\n\n Take BP on waking in management of hypertension\r\n\n Take basal body temperature on waking in establishing date of ovulation + * */ WAKE, /** - * Description: meal (from lat. ante cibus) + * */ C, /** - * Description: breakfast (from lat. cibus matutinus) + * */ CM, /** - * Description: lunch (from lat. cibus diurnus) + * */ CD, /** - * Description: dinner (from lat. cibus vespertinus) + * */ CV, /** - * before meal (from lat. ante cibus) + * */ AC, /** - * before breakfast (from lat. ante cibus matutinus) + * */ ACM, /** - * before lunch (from lat. ante cibus diurnus) + * */ ACD, /** - * before dinner (from lat. ante cibus vespertinus) + * */ ACV, /** - * after meal (from lat. post cibus) + * */ PC, /** - * after breakfast (from lat. post cibus matutinus) + * */ PCM, /** - * after lunch (from lat. post cibus diurnus) + * */ PCD, /** - * after dinner (from lat. post cibus vespertinus) + * */ PCV, /** @@ -301,20 +297,20 @@ public class Timing extends BackboneType implements ICompositeType { case EVE_LATE: return "Event occurs during the late evening. The exact time is unspecified and established by institution convention or patient interpretation."; case NIGHT: return "Event occurs during the night. The exact time is unspecified and established by institution convention or patient interpretation."; case PHS: return "Event occurs [offset] after subject goes to sleep. The exact time is unspecified and established by institution convention or patient interpretation."; - case HS: return "Description: Prior to beginning a regular period of extended sleep (this would exclude naps). Note that this might occur at different times of day depending on a person's regular sleep schedule."; - case WAKE: return "Description: Upon waking up from a regular period of sleep, in order to start regular activities (this would exclude waking up from a nap or temporarily waking up during a period of sleep)\r\n\n \n Usage Notes: e.g.\r\n\n Take pulse rate on waking in management of thyrotoxicosis.\r\n\n Take BP on waking in management of hypertension\r\n\n Take basal body temperature on waking in establishing date of ovulation"; - case C: return "Description: meal (from lat. ante cibus)"; - case CM: return "Description: breakfast (from lat. cibus matutinus)"; - case CD: return "Description: lunch (from lat. cibus diurnus)"; - case CV: return "Description: dinner (from lat. cibus vespertinus)"; - case AC: return "before meal (from lat. ante cibus)"; - case ACM: return "before breakfast (from lat. ante cibus matutinus)"; - case ACD: return "before lunch (from lat. ante cibus diurnus)"; - case ACV: return "before dinner (from lat. ante cibus vespertinus)"; - case PC: return "after meal (from lat. post cibus)"; - case PCM: return "after breakfast (from lat. post cibus matutinus)"; - case PCD: return "after lunch (from lat. post cibus diurnus)"; - case PCV: return "after dinner (from lat. post cibus vespertinus)"; + case HS: return ""; + case WAKE: return ""; + case C: return ""; + case CM: return ""; + case CD: return ""; + case CV: return ""; + case AC: return ""; + case ACM: return ""; + case ACD: return ""; + case ACV: return ""; + case PC: return ""; + case PCM: return ""; + case PCD: return ""; + case PCV: return ""; default: return "?"; } } @@ -2308,4 +2304,5 @@ public class Timing extends BackboneType implements ICompositeType { } -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/TriggerDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/TriggerDefinition.java index 447cc618d..ba117a983 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/TriggerDefinition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/TriggerDefinition.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 TriggerDefinition Type: A description of a triggering event. Triggering events can be named events, data events, or periodic, as determined by the type element. @@ -742,4 +743,5 @@ public class TriggerDefinition 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/UsageContext.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/UsageContext.java index dc4406c5a..dc1809ad9 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/UsageContext.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/UsageContext.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 UsageContext Type: Specifies clinical/business/etc. metadata that can be used to retrieve, index and/or categorize an artifact. This metadata can either be specific to the applicable population (e.g., age category, DRG) or the specific context of care (e.g., venue, care setting, provider of care). @@ -306,4 +338,5 @@ public class UsageContext 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/UuidType.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/UuidType.java index 022204df8..dc20e39fa 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/UuidType.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/UuidType.java @@ -1,7 +1,5 @@ package org.hl7.fhir.r5.model; -import java.net.URI; - /* Copyright (c) 2011+, HL7, Inc. All rights reserved. @@ -35,6 +33,8 @@ import java.net.URI; import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import java.net.URI; + @DatatypeDef(name = "uuid", profileOf = UriType.class) public class UuidType extends UriType { diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ValueSet.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ValueSet.java index 6a2c69496..315dfe681 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ValueSet.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ValueSet.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; /** * A ValueSet resource instance specifies a set of codes drawn from one or more code systems, intended for use in a particular context. Value sets link between [[[CodeSystem]]] definitions and their use in [coded elements](terminologies.html). @@ -6559,4 +6555,5 @@ public class ValueSet 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/VerificationResult.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/VerificationResult.java index 6f4bf3c07..1cc4ab801 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/VerificationResult.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/VerificationResult.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; /** * Describes validation requirements, source(s), status and dates for one or more elements. @@ -2657,7 +2657,7 @@ public class VerificationResult extends DomainResource { * Path: VerificationResult.target
    *

    */ - @SearchParamDefinition(name="target", path="VerificationResult.target", description="A resource that was validated", 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="target", path="VerificationResult.target", description="A resource that was validated", 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_TARGET = "target"; /** * Fluent Client search parameter constant for target @@ -2676,4 +2676,5 @@ public class VerificationResult extends DomainResource { public static final ca.uhn.fhir.model.api.Include INCLUDE_TARGET = new ca.uhn.fhir.model.api.Include("VerificationResult:target").toLocked(); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/VisionPrescription.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/VisionPrescription.java index f259d3458..35e6d87b1 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/VisionPrescription.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/VisionPrescription.java @@ -1,10 +1,6 @@ package org.hl7.fhir.r5.model; - - -import java.math.BigDecimal; - /* Copyright (c) 2011+, HL7, Inc. All rights reserved. @@ -33,23 +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 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; /** * An authorization for the provision of glasses and/or contact lenses to a patient. @@ -2435,10 +2432,10 @@ public class VisionPrescription 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 @@ -2459,7 +2456,7 @@ public class VisionPrescription 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); @@ -2485,7 +2482,7 @@ public class VisionPrescription 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 @@ -2507,10 +2504,10 @@ public class VisionPrescription 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 @@ -2527,7 +2524,7 @@ public class VisionPrescription 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 @@ -2549,7 +2546,7 @@ public class VisionPrescription 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); @@ -2649,4 +2646,5 @@ public class VisionPrescription extends DomainResource { public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("VisionPrescription:patient").toLocked(); -} \ No newline at end of file +} + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/LiquidEngine.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/LiquidEngine.java index 56350a4ea..31100c7bf 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/LiquidEngine.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/LiquidEngine.java @@ -52,13 +52,13 @@ import org.hl7.fhir.utilities.xhtml.XhtmlNode; public class LiquidEngine implements IEvaluationContext { - public interface ILiquidEngineIcludeResolver { + public interface ILiquidEngineIncludeResolver { public String fetchInclude(LiquidEngine engine, String name); } private IEvaluationContext externalHostServices; private FHIRPathEngine engine; - private ILiquidEngineIcludeResolver includeResolver; + private ILiquidEngineIncludeResolver includeResolver; private class LiquidEngineContext { private Object externalContext; @@ -83,11 +83,11 @@ public class LiquidEngine implements IEvaluationContext { engine.setHostServices(this); } - public ILiquidEngineIcludeResolver getIncludeResolver() { + public ILiquidEngineIncludeResolver getIncludeResolver() { return includeResolver; } - public void setIncludeResolver(ILiquidEngineIcludeResolver includeResolver) { + public void setIncludeResolver(ILiquidEngineIncludeResolver includeResolver) { this.includeResolver = includeResolver; } diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/MappingSheetParser.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/MappingSheetParser.java index 0c5f71ab3..d93b0d09f 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/MappingSheetParser.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/MappingSheetParser.java @@ -248,7 +248,6 @@ public class MappingSheetParser { if (metadata.containsKey("copyright")) map.setCopyright(metadata.get("copyright")); StructureMapGroupComponent grp = map.addGroup(); - grp.setTypeMode(StructureMapGroupTypeMode.NONE); for (MappingRow row : rows) { StructureMapGroupRuleComponent rule = grp.addRule(); rule.setName(row.getSequence()); diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/StructureMapUtilities.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/StructureMapUtilities.java index 7a9e32749..cc9e9ba1a 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/StructureMapUtilities.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/StructureMapUtilities.java @@ -890,8 +890,7 @@ public class StructureMapUtilities { lexer.token("types"); group.setTypeMode(StructureMapGroupTypeMode.TYPES); } - } else - group.setTypeMode(StructureMapGroupTypeMode.NONE); + } group.setName(lexer.take()); if (lexer.hasToken("(")) { newFmt = true; @@ -908,7 +907,6 @@ public class StructureMapUtilities { group.setExtends(lexer.take()); } if (newFmt) { - group.setTypeMode(StructureMapGroupTypeMode.NONE); if (lexer.hasToken("<")) { lexer.token("<"); lexer.token("<"); @@ -1605,7 +1603,7 @@ public class StructureMapUtilities { } private boolean matchesByType(StructureMap map, StructureMapGroupComponent grp, String srcType, String tgtType) throws FHIRException { - if (grp.getTypeMode() == StructureMapGroupTypeMode.NONE) + if (!grp.hasTypeMode()) return false; if (grp.getInput().size() != 2 || grp.getInput().get(0).getMode() != StructureMapInputMode.SOURCE || grp.getInput().get(1).getMode() != StructureMapInputMode.TARGET) return false; diff --git a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/LiquidEngineTests.java b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/LiquidEngineTests.java index 86db28836..19e31dad6 100644 --- a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/LiquidEngineTests.java +++ b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/LiquidEngineTests.java @@ -14,7 +14,7 @@ import org.hl7.fhir.r5.formats.XmlParser; import org.hl7.fhir.r5.model.Resource; import org.hl7.fhir.r5.test.utils.TestingUtilities; import org.hl7.fhir.r5.utils.LiquidEngine; -import org.hl7.fhir.r5.utils.LiquidEngine.ILiquidEngineIcludeResolver; +import org.hl7.fhir.r5.utils.LiquidEngine.ILiquidEngineIncludeResolver; import org.hl7.fhir.r5.utils.LiquidEngine.LiquidDocument; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; @@ -27,7 +27,7 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -public class LiquidEngineTests implements ILiquidEngineIcludeResolver { +public class LiquidEngineTests implements ILiquidEngineIncludeResolver { private static Map resources = new HashedMap<>(); private static JsonObject testdoc = null; diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/VersionUtilities.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/VersionUtilities.java index d6630d87b..74dff6626 100644 --- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/VersionUtilities.java +++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/VersionUtilities.java @@ -55,8 +55,8 @@ public class VersionUtilities { } } - public static final String CURRENT_VERSION = "4.4"; - public static final String CURRENT_FULL_VERSION = "4.4.0"; + public static final String CURRENT_VERSION = "4.5"; + public static final String CURRENT_FULL_VERSION = "4.5.0"; public static String packageForVersion(String v) { if (isR2Ver(v)) { @@ -147,6 +147,9 @@ public class VersionUtilities { } public static boolean versionsCompatible(String v1, String v2) { + if (v1 == null || v2 == null) { + return false; + } String[] v1l = v1.split("\\|"); String[] v2l = v2.split("\\|"); for (String vs1 : v1l) { diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/BaseValidator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/BaseValidator.java index 284c70da8..c35b966e4 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/BaseValidator.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/BaseValidator.java @@ -603,8 +603,10 @@ public class BaseValidator { fr = context.fetchResource(ValueSet.class, reference); } } - if (fr == null) + if (fr == null) { fr = ValueSetUtilities.generateImplicitValueSet(reference); + } + timeTracker.tx(t); return fr; }