From 094b73af0476a56aac81ca5696ae3f87a14d6fde Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Tue, 31 Dec 2019 14:31:28 +1100 Subject: [PATCH] 4.2.0 release --- .../convertors/VersionConvertor_10_50.java | 64 +- .../convertors/VersionConvertor_30_50.java | 209 +++-- .../convertors/VersionConvertor_40_50.java | 16 + .../convertors/conv40_50/Appointment.java | 16 +- .../fhir/convertors/conv40_50/CarePlan.java | 37 +- .../fhir/convertors/conv40_50/CareTeam.java | 16 +- .../conv40_50/ClinicalImpression.java | 12 +- .../convertors/conv40_50/Communication.java | 16 +- .../conv40_50/CommunicationRequest.java | 16 +- .../fhir/convertors/conv40_50/Contract.java | 21 +- .../convertors/conv40_50/DeviceRequest.java | 16 +- .../conv40_50/DeviceUseStatement.java | 16 +- .../fhir/convertors/conv40_50/Encounter.java | 16 +- .../conv40_50/FamilyMemberHistory.java | 16 +- .../hl7/fhir/convertors/conv40_50/Goal.java | 16 +- .../conv40_50/GuidanceResponse.java | 16 +- .../convertors/conv40_50/ImagingStudy.java | 15 +- .../convertors/conv40_50/Immunization.java | 16 +- .../conv40_50/MedicationAdministration.java | 15 +- .../conv40_50/MedicationKnowledge.java | 4 +- .../conv40_50/MedicationRequest.java | 6 +- .../conv40_50/MedicationStatement.java | 16 +- .../fhir/convertors/conv40_50/Procedure.java | 30 +- .../convertors/conv40_50/RequestGroup.java | 16 +- .../convertors/conv40_50/RiskAssessment.java | 16 +- .../convertors/conv40_50/ServiceRequest.java | 30 +- .../convertors/conv40_50/SupplyRequest.java | 16 +- .../configuration/Constants.java | 18 + .../configuration/FHIRVersion.java | 2 +- .../configuration/XmlParser.java | 1 - .../core/generator/codegen/Configuration.java | 6 +- .../generator/codegen/JavaBaseGenerator.java | 4 +- .../codegen/JavaConstantsGenerator.java | 45 + .../generator/engine/JavaCoreGenerator.java | 5 + .../generator/loader/DefinitionsLoader.java | 26 +- .../org/hl7/fhir/r5/formats/JsonParser.java | 804 ++++++------------ .../org/hl7/fhir/r5/formats/RdfParser.java | 233 ++--- .../org/hl7/fhir/r5/formats/XmlParser.java | 515 ++++------- .../java/org/hl7/fhir/r5/model/Account.java | 2 +- .../hl7/fhir/r5/model/ActivityDefinition.java | 2 +- .../java/org/hl7/fhir/r5/model/Address.java | 2 +- .../model/AdministrableProductDefinition.java | 2 +- .../org/hl7/fhir/r5/model/AdverseEvent.java | 2 +- .../main/java/org/hl7/fhir/r5/model/Age.java | 2 +- .../hl7/fhir/r5/model/AllergyIntolerance.java | 2 +- .../org/hl7/fhir/r5/model/Annotation.java | 2 +- .../org/hl7/fhir/r5/model/Appointment.java | 231 ++--- .../fhir/r5/model/AppointmentResponse.java | 2 +- .../org/hl7/fhir/r5/model/Attachment.java | 2 +- .../org/hl7/fhir/r5/model/AuditEvent.java | 2 +- .../hl7/fhir/r5/model/BackboneElement.java | 2 +- .../org/hl7/fhir/r5/model/BackboneType.java | 2 +- .../java/org/hl7/fhir/r5/model/Basic.java | 2 +- .../java/org/hl7/fhir/r5/model/Binary.java | 2 +- .../r5/model/BiologicallyDerivedProduct.java | 2 +- .../org/hl7/fhir/r5/model/BodyStructure.java | 2 +- .../java/org/hl7/fhir/r5/model/Bundle.java | 2 +- .../hl7/fhir/r5/model/CanonicalResource.java | 2 +- .../fhir/r5/model/CapabilityStatement.java | 2 +- .../fhir/r5/model/CapabilityStatement2.java | 2 +- .../java/org/hl7/fhir/r5/model/CarePlan.java | 579 ++++--------- .../java/org/hl7/fhir/r5/model/CareTeam.java | 177 ++-- .../org/hl7/fhir/r5/model/CatalogEntry.java | 2 +- .../org/hl7/fhir/r5/model/ChargeItem.java | 2 +- .../fhir/r5/model/ChargeItemDefinition.java | 2 +- .../java/org/hl7/fhir/r5/model/Claim.java | 2 +- .../org/hl7/fhir/r5/model/ClaimResponse.java | 2 +- .../hl7/fhir/r5/model/ClinicalImpression.java | 134 +-- .../hl7/fhir/r5/model/ClinicalUseIssue.java | 2 +- .../org/hl7/fhir/r5/model/CodeSystem.java | 2 +- .../hl7/fhir/r5/model/CodeableConcept.java | 2 +- .../hl7/fhir/r5/model/CodeableReference.java | 2 +- .../java/org/hl7/fhir/r5/model/Coding.java | 2 +- .../org/hl7/fhir/r5/model/Communication.java | 174 ++-- .../fhir/r5/model/CommunicationRequest.java | 171 +--- .../fhir/r5/model/CompartmentDefinition.java | 2 +- .../org/hl7/fhir/r5/model/Composition.java | 2 +- .../org/hl7/fhir/r5/model/ConceptMap.java | 2 +- .../java/org/hl7/fhir/r5/model/Condition.java | 2 +- .../fhir/r5/model/ConditionDefinition.java | 2 +- .../java/org/hl7/fhir/r5/model/Consent.java | 2 +- .../java/org/hl7/fhir/r5/model/Constants.java | 47 +- .../org/hl7/fhir/r5/model/ContactDetail.java | 2 +- .../org/hl7/fhir/r5/model/ContactPoint.java | 2 +- .../java/org/hl7/fhir/r5/model/Contract.java | 245 +----- .../org/hl7/fhir/r5/model/Contributor.java | 2 +- .../java/org/hl7/fhir/r5/model/Count.java | 2 +- .../java/org/hl7/fhir/r5/model/Coverage.java | 2 +- .../r5/model/CoverageEligibilityRequest.java | 2 +- .../r5/model/CoverageEligibilityResponse.java | 2 +- .../hl7/fhir/r5/model/DataRequirement.java | 2 +- .../java/org/hl7/fhir/r5/model/DataType.java | 2 +- .../org/hl7/fhir/r5/model/DetectedIssue.java | 2 +- .../java/org/hl7/fhir/r5/model/Device.java | 2 +- .../hl7/fhir/r5/model/DeviceDefinition.java | 2 +- .../org/hl7/fhir/r5/model/DeviceMetric.java | 2 +- .../org/hl7/fhir/r5/model/DeviceRequest.java | 183 ++-- .../hl7/fhir/r5/model/DeviceUseStatement.java | 180 ++-- .../hl7/fhir/r5/model/DiagnosticReport.java | 2 +- .../java/org/hl7/fhir/r5/model/Distance.java | 2 +- .../hl7/fhir/r5/model/DocumentManifest.java | 2 +- .../hl7/fhir/r5/model/DocumentReference.java | 2 +- .../org/hl7/fhir/r5/model/DomainResource.java | 2 +- .../java/org/hl7/fhir/r5/model/Dosage.java | 2 +- .../java/org/hl7/fhir/r5/model/Duration.java | 2 +- .../java/org/hl7/fhir/r5/model/Element.java | 2 +- .../hl7/fhir/r5/model/ElementDefinition.java | 7 +- .../java/org/hl7/fhir/r5/model/Encounter.java | 209 ++--- .../java/org/hl7/fhir/r5/model/Endpoint.java | 2 +- .../hl7/fhir/r5/model/EnrollmentRequest.java | 2 +- .../hl7/fhir/r5/model/EnrollmentResponse.java | 2 +- .../org/hl7/fhir/r5/model/Enumerations.java | 36 +- .../org/hl7/fhir/r5/model/EpisodeOfCare.java | 2 +- .../hl7/fhir/r5/model/EventDefinition.java | 2 +- .../java/org/hl7/fhir/r5/model/Evidence.java | 2 +- .../hl7/fhir/r5/model/EvidenceVariable.java | 2 +- .../hl7/fhir/r5/model/ExampleScenario.java | 2 +- .../fhir/r5/model/ExplanationOfBenefit.java | 2 +- .../org/hl7/fhir/r5/model/Expression.java | 2 +- .../java/org/hl7/fhir/r5/model/Extension.java | 2 +- .../fhir/r5/model/FamilyMemberHistory.java | 184 ++-- .../main/java/org/hl7/fhir/r5/model/Flag.java | 2 +- .../main/java/org/hl7/fhir/r5/model/Goal.java | 170 +--- .../hl7/fhir/r5/model/GraphDefinition.java | 2 +- .../java/org/hl7/fhir/r5/model/Group.java | 2 +- .../hl7/fhir/r5/model/GuidanceResponse.java | 191 ++--- .../hl7/fhir/r5/model/HealthcareService.java | 2 +- .../java/org/hl7/fhir/r5/model/HumanName.java | 2 +- .../org/hl7/fhir/r5/model/Identifier.java | 2 +- .../org/hl7/fhir/r5/model/ImagingStudy.java | 188 ++-- .../org/hl7/fhir/r5/model/Immunization.java | 212 ++--- .../fhir/r5/model/ImmunizationEvaluation.java | 2 +- .../r5/model/ImmunizationRecommendation.java | 2 +- .../fhir/r5/model/ImplementationGuide.java | 44 +- .../org/hl7/fhir/r5/model/Ingredient.java | 2 +- .../org/hl7/fhir/r5/model/InsurancePlan.java | 2 +- .../java/org/hl7/fhir/r5/model/Invoice.java | 2 +- .../java/org/hl7/fhir/r5/model/Library.java | 2 +- .../java/org/hl7/fhir/r5/model/Linkage.java | 2 +- .../org/hl7/fhir/r5/model/ListResource.java | 2 +- .../java/org/hl7/fhir/r5/model/Location.java | 2 +- .../r5/model/ManufacturedItemDefinition.java | 2 +- .../hl7/fhir/r5/model/MarketingStatus.java | 2 +- .../java/org/hl7/fhir/r5/model/Measure.java | 2 +- .../org/hl7/fhir/r5/model/MeasureReport.java | 2 +- .../org/hl7/fhir/r5/model/Medication.java | 50 +- .../r5/model/MedicationAdministration.java | 204 ++--- .../hl7/fhir/r5/model/MedicationDispense.java | 104 ++- .../fhir/r5/model/MedicationKnowledge.java | 102 ++- .../hl7/fhir/r5/model/MedicationRequest.java | 169 ++-- .../hl7/fhir/r5/model/MedicationUsage.java | 253 +++--- .../r5/model/MedicinalProductDefinition.java | 530 +++++++----- .../hl7/fhir/r5/model/MessageDefinition.java | 2 +- .../org/hl7/fhir/r5/model/MessageHeader.java | 2 +- .../main/java/org/hl7/fhir/r5/model/Meta.java | 2 +- .../hl7/fhir/r5/model/MetadataResource.java | 2 +- .../hl7/fhir/r5/model/MolecularSequence.java | 2 +- .../java/org/hl7/fhir/r5/model/Money.java | 2 +- .../org/hl7/fhir/r5/model/NamingSystem.java | 2 +- .../java/org/hl7/fhir/r5/model/Narrative.java | 2 +- .../hl7/fhir/r5/model/NutritionIntake.java | 135 +-- .../org/hl7/fhir/r5/model/NutritionOrder.java | 2 +- .../org/hl7/fhir/r5/model/Observation.java | 2 +- .../fhir/r5/model/ObservationDefinition.java | 2 +- .../fhir/r5/model/OperationDefinition.java | 2 +- .../hl7/fhir/r5/model/OperationOutcome.java | 2 +- .../fhir/r5/model/OrderedDistribution.java | 2 +- .../org/hl7/fhir/r5/model/Organization.java | 2 +- .../r5/model/OrganizationAffiliation.java | 2 +- .../r5/model/PackagedProductDefinition.java | 2 +- .../fhir/r5/model/ParameterDefinition.java | 2 +- .../org/hl7/fhir/r5/model/Parameters.java | 2 +- .../java/org/hl7/fhir/r5/model/Patient.java | 2 +- .../org/hl7/fhir/r5/model/PaymentNotice.java | 2 +- .../fhir/r5/model/PaymentReconciliation.java | 2 +- .../java/org/hl7/fhir/r5/model/Period.java | 2 +- .../java/org/hl7/fhir/r5/model/Person.java | 2 +- .../org/hl7/fhir/r5/model/PlanDefinition.java | 2 +- .../org/hl7/fhir/r5/model/Population.java | 2 +- .../org/hl7/fhir/r5/model/Practitioner.java | 2 +- .../hl7/fhir/r5/model/PractitionerRole.java | 2 +- .../java/org/hl7/fhir/r5/model/Procedure.java | 379 +++------ .../hl7/fhir/r5/model/ProdCharacteristic.java | 2 +- .../hl7/fhir/r5/model/ProductShelfLife.java | 2 +- .../org/hl7/fhir/r5/model/Provenance.java | 2 +- .../java/org/hl7/fhir/r5/model/Quantity.java | 2 +- .../org/hl7/fhir/r5/model/Questionnaire.java | 2 +- .../fhir/r5/model/QuestionnaireResponse.java | 2 +- .../java/org/hl7/fhir/r5/model/Range.java | 2 +- .../java/org/hl7/fhir/r5/model/Ratio.java | 2 +- .../java/org/hl7/fhir/r5/model/Reference.java | 2 +- .../fhir/r5/model/RegulatedAuthorization.java | 10 +- .../hl7/fhir/r5/model/RelatedArtifact.java | 2 +- .../org/hl7/fhir/r5/model/RelatedPerson.java | 2 +- .../org/hl7/fhir/r5/model/RequestGroup.java | 176 ++-- .../org/hl7/fhir/r5/model/ResearchStudy.java | 2 +- .../hl7/fhir/r5/model/ResearchSubject.java | 2 +- .../java/org/hl7/fhir/r5/model/Resource.java | 2 +- .../hl7/fhir/r5/model/ResourceFactory.java | 2 +- .../org/hl7/fhir/r5/model/RiskAssessment.java | 180 ++-- .../org/hl7/fhir/r5/model/SampledData.java | 2 +- .../java/org/hl7/fhir/r5/model/Schedule.java | 2 +- .../hl7/fhir/r5/model/SearchParameter.java | 2 +- .../org/hl7/fhir/r5/model/ServiceRequest.java | 355 +++----- .../java/org/hl7/fhir/r5/model/Signature.java | 2 +- .../main/java/org/hl7/fhir/r5/model/Slot.java | 2 +- .../java/org/hl7/fhir/r5/model/Specimen.java | 2 +- .../hl7/fhir/r5/model/SpecimenDefinition.java | 2 +- .../java/org/hl7/fhir/r5/model/Statistic.java | 2 +- .../fhir/r5/model/StructureDefinition.java | 18 +- .../org/hl7/fhir/r5/model/StructureMap.java | 2 +- .../org/hl7/fhir/r5/model/Subscription.java | 2 +- .../java/org/hl7/fhir/r5/model/Substance.java | 2 +- .../hl7/fhir/r5/model/SubstanceAmount.java | 2 +- .../fhir/r5/model/SubstanceDefinition.java | 141 ++- .../fhir/r5/model/SubstanceNucleicAcid.java | 2 +- .../hl7/fhir/r5/model/SubstancePolymer.java | 2 +- .../hl7/fhir/r5/model/SubstanceProtein.java | 2 +- .../model/SubstanceReferenceInformation.java | 2 +- .../r5/model/SubstanceSourceMaterial.java | 2 +- .../org/hl7/fhir/r5/model/SupplyDelivery.java | 2 +- .../org/hl7/fhir/r5/model/SupplyRequest.java | 175 ++-- .../main/java/org/hl7/fhir/r5/model/Task.java | 2 +- .../r5/model/TerminologyCapabilities.java | 2 +- .../org/hl7/fhir/r5/model/TestReport.java | 2 +- .../org/hl7/fhir/r5/model/TestScript.java | 2 +- .../java/org/hl7/fhir/r5/model/Timing.java | 2 +- .../java/org/hl7/fhir/r5/model/Topic.java | 2 +- .../hl7/fhir/r5/model/TriggerDefinition.java | 2 +- .../org/hl7/fhir/r5/model/UsageContext.java | 2 +- .../java/org/hl7/fhir/r5/model/ValueSet.java | 2 +- .../hl7/fhir/r5/model/VerificationResult.java | 2 +- .../hl7/fhir/r5/model/VisionPrescription.java | 2 +- .../hl7/fhir/utilities/VersionUtilities.java | 4 +- pom.xml | 2 +- 235 files changed, 3498 insertions(+), 5529 deletions(-) create mode 100644 org.hl7.fhir.core.generator/configuration/Constants.java create mode 100644 org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/codegen/JavaConstantsGenerator.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 18f0217d6..ed15eb335 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 @@ -43,6 +43,7 @@ import org.hl7.fhir.r5.model.CodeSystem.CodeSystemContentMode; import org.hl7.fhir.r5.model.CodeSystem.ConceptDefinitionComponent; import org.hl7.fhir.r5.model.CodeSystem.ConceptDefinitionDesignationComponent; import org.hl7.fhir.r5.model.CodeType; +import org.hl7.fhir.r5.model.CodeableReference; import org.hl7.fhir.r5.model.ConceptMap; import org.hl7.fhir.r5.model.ConceptMap.ConceptMapGroupComponent; import org.hl7.fhir.r5.model.ConceptMap.SourceElementComponent; @@ -2979,7 +2980,7 @@ public class VersionConvertor_10_50 { tgt.addCategory(convertCodeableConcept(t)); tgt.setDescription(src.getDescription()); for (org.hl7.fhir.dstu2.model.Reference t : src.getAddresses()) - tgt.addAddressesReference(convertReference(t)); + tgt.addAddresses(convertReferenceToCodableReference(t)); // for (org.hl7.fhir.dstu2.model.Reference t : src.getSupport()) // tgt.addSupport(convertReference(t)); // for (org.hl7.fhir.dstu2.model.CarePlan.CarePlanRelatedPlanComponent t : src.getRelatedPlan()) @@ -2994,6 +2995,18 @@ public class VersionConvertor_10_50 { return tgt; } + private CodeableReference convertReferenceToCodableReference(Reference src) { + CodeableReference tgt = new CodeableReference(); + tgt.setReference(convertReference(src)); + return tgt; + } + + private CodeableReference convertCodeableConceptToCodableReference(CodeableConcept src) { + CodeableReference tgt = new CodeableReference(); + tgt.setConcept(convertCodeableConcept(src)); + return tgt; + } + public org.hl7.fhir.dstu2.model.CarePlan convertCarePlan(org.hl7.fhir.r5.model.CarePlan src) throws FHIRException { if (src == null || src.isEmpty()) return null; @@ -3013,8 +3026,11 @@ public class VersionConvertor_10_50 { for (org.hl7.fhir.r5.model.CodeableConcept t : src.getCategory()) tgt.addCategory(convertCodeableConcept(t)); tgt.setDescription(src.getDescription()); - for (org.hl7.fhir.r5.model.Reference t : src.getAddressesReference()) - tgt.addAddresses(convertReference(t)); + for (CodeableReference t : src.getAddresses()) { + if (t.hasReference()) { + tgt.addAddresses(convertReference(t.getReference())); + } + } // for (org.hl7.fhir.r5.model.Reference t : src.getSupport()) // tgt.addSupport(convertReference(t)); // for (org.hl7.fhir.r5.model.CarePlan.CarePlanRelatedPlanComponent t : src.getRelatedPlan()) @@ -3153,9 +3169,9 @@ public class VersionConvertor_10_50 { // tgt.setKind().add(convertCodeableConcept(src.getCategory())); tgt.setCode(convertCodeableConcept(src.getCode())); for (org.hl7.fhir.dstu2.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); + tgt.addReason(convertCodeableConceptToCodableReference(t)); for (org.hl7.fhir.dstu2.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + tgt.addReason(convertReferenceToCodableReference(t)); for (org.hl7.fhir.dstu2.model.Reference t : src.getGoal()) tgt.addGoal(convertReference(t)); tgt.setStatus(convertCarePlanActivityStatus(src.getStatus())); @@ -3179,10 +3195,12 @@ public class VersionConvertor_10_50 { copyElement(src, tgt); // tgt.setCategory(convertCodeableConcept(src.getKind())); tgt.setCode(convertCodeableConcept(src.getCode())); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); - for (org.hl7.fhir.r5.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + for (CodeableReference t : src.getReason()) + if(t.hasConcept()) + tgt.addReasonCode(convertCodeableConcept(t.getConcept())); + for (CodeableReference t : src.getReason()) + if(t.hasReference()) + tgt.addReasonReference(convertReference(t.getReference())); for (org.hl7.fhir.r5.model.Reference t : src.getGoal()) tgt.addGoal(convertReference(t)); tgt.setStatus(convertCarePlanActivityStatus(src.getStatus())); @@ -3373,7 +3391,7 @@ public class VersionConvertor_10_50 { tgt.setSent(src.getSent()); tgt.setReceived(src.getReceived()); for (org.hl7.fhir.dstu2.model.CodeableConcept t : src.getReason()) - tgt.addReasonCode(convertCodeableConcept(t)); + tgt.addReason(convertCodeableConceptToCodableReference(t)); tgt.setSubject(convertReference(src.getSubject())); return tgt; } @@ -3397,8 +3415,9 @@ public class VersionConvertor_10_50 { tgt.setEncounter(convertReference(src.getEncounter())); tgt.setSent(src.getSent()); tgt.setReceived(src.getReceived()); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReasonCode()) - tgt.addReason(convertCodeableConcept(t)); + for (CodeableReference t : src.getReason()) + if (t.hasConcept()) + tgt.addReason(convertCodeableConcept(t.getConcept())); tgt.setSubject(convertReference(src.getSubject())); return tgt; } @@ -3467,7 +3486,7 @@ public class VersionConvertor_10_50 { tgt.setEncounter(convertReference(src.getEncounter())); tgt.setOccurrence(convertType(src.getScheduled())); for (org.hl7.fhir.dstu2.model.CodeableConcept t : src.getReason()) - tgt.addReasonCode(convertCodeableConcept(t)); + tgt.addReason(convertCodeableConceptToCodableReference(t)); tgt.setAuthoredOn(src.getRequestedOn()); tgt.setSubject(convertReference(src.getSubject())); tgt.setPriority(convertPriorityCode(src.getPriority())); @@ -3507,8 +3526,9 @@ public class VersionConvertor_10_50 { tgt.setStatus(convertCommunicationRequestStatus(src.getStatus())); tgt.setEncounter(convertReference(src.getEncounter())); tgt.setScheduled(convertType(src.getOccurrence())); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReasonCode()) - tgt.addReason(convertCodeableConcept(t)); + for (CodeableReference t : src.getReason()) + if (t.hasConcept()) + tgt.addReason(convertCodeableConcept(t.getConcept())); tgt.setRequestedOn(src.getAuthoredOn()); tgt.setSubject(convertReference(src.getSubject())); tgt.setPriority(convertPriorityCode(src.getPriority())); @@ -5748,7 +5768,7 @@ public class VersionConvertor_10_50 { for (org.hl7.fhir.dstu2.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(convertIdentifier(t)); for (org.hl7.fhir.dstu2.model.CodeableConcept t : src.getIndication()) - tgt.addReasonCode(convertCodeableConcept(t)); + tgt.addReason(convertCodeableConceptToCodableReference(t)); for (org.hl7.fhir.dstu2.model.StringType t : src.getNotes()) tgt.addNote().setText(t.getValue()); tgt.setRecordedOn(src.getRecordedOn()); @@ -5766,8 +5786,9 @@ public class VersionConvertor_10_50 { tgt.setDevice(convertReference(src.getDevice())); for (org.hl7.fhir.r5.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(convertIdentifier(t)); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReasonCode()) - tgt.addIndication(convertCodeableConcept(t)); + for (CodeableReference t : src.getReason()) + if (t.hasConcept()) + tgt.addIndication(convertCodeableConcept(t.getConcept())); for (Annotation t : src.getNote()) tgt.addNotes(t.getText()); tgt.setRecordedOn(src.getRecordedOn()); @@ -6274,7 +6295,7 @@ public class VersionConvertor_10_50 { tgt.setPeriod(convertPeriod(src.getPeriod())); tgt.setLength(convertDuration(src.getLength())); for (org.hl7.fhir.dstu2.model.CodeableConcept t : src.getReason()) - tgt.addReasonCode(convertCodeableConcept(t)); + tgt.addReason(convertCodeableConceptToCodableReference(t)); tgt.setHospitalization(convertEncounterHospitalizationComponent(src.getHospitalization())); for (org.hl7.fhir.dstu2.model.Encounter.EncounterLocationComponent t : src.getLocation()) tgt.addLocation(convertEncounterLocationComponent(t)); @@ -6307,8 +6328,9 @@ public class VersionConvertor_10_50 { tgt.setAppointment(convertReference(src.getAppointmentFirstRep())); tgt.setPeriod(convertPeriod(src.getPeriod())); tgt.setLength(convertDuration(src.getLength())); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReasonCode()) - tgt.addReason(convertCodeableConcept(t)); + for (CodeableReference t : src.getReason()) + if (t.hasConcept()) + tgt.addReason(convertCodeableConcept(t.getConcept())); tgt.setHospitalization(convertEncounterHospitalizationComponent(src.getHospitalization())); for (org.hl7.fhir.r5.model.Encounter.EncounterLocationComponent t : src.getLocation()) tgt.addLocation(convertEncounterLocationComponent(t)); diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_30_50.java index 8e8b4c6a2..0bf3b787c 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_30_50.java @@ -3656,6 +3656,20 @@ public class VersionConvertor_30_50 { } } + private static CodeableReference convertReferenceToCodableReference(org.hl7.fhir.dstu3.model.Reference src) { + CodeableReference tgt = new CodeableReference(); + tgt.setReference(convertReference(src)); + return tgt; + } + + private static CodeableReference convertCodeableConceptToCodableReference(org.hl7.fhir.dstu3.model.CodeableConcept src) { + CodeableReference tgt = new CodeableReference(); + tgt.setConcept(convertCodeableConcept(src)); + return tgt; + } + + + public static org.hl7.fhir.r5.model.Appointment convertAppointment(org.hl7.fhir.dstu3.model.Appointment src) throws FHIRException { if (src == null) return null; @@ -3674,9 +3688,9 @@ public class VersionConvertor_30_50 { if (src.hasAppointmentType()) tgt.setAppointmentType(convertCodeableConcept(src.getAppointmentType())); for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getReason()) - tgt.addReasonCode(convertCodeableConcept(t)); + tgt.addReason(convertCodeableConceptToCodableReference(t)); for (org.hl7.fhir.dstu3.model.Reference t : src.getIndication()) - tgt.addReasonReference(convertReference(t)); + tgt.addReason(convertReferenceToCodableReference(t)); if (src.hasPriority()) tgt.setPriority(src.getPriority()); if (src.hasDescription()) @@ -3721,10 +3735,12 @@ public class VersionConvertor_30_50 { tgt.addSpecialty(convertCodeableConcept(t)); if (src.hasAppointmentType()) tgt.setAppointmentType(convertCodeableConcept(src.getAppointmentType())); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReasonCode()) - tgt.addReason(convertCodeableConcept(t)); - for (org.hl7.fhir.r5.model.Reference t : src.getReasonReference()) - tgt.addIndication(convertReference(t)); + for (CodeableReference t : src.getReason()) + if (t.hasConcept()) + tgt.addReason(convertCodeableConcept(t.getConcept())); + for (CodeableReference t : src.getReason()) + if (t.hasReference()) + tgt.addIndication(convertReference(t.getReference())); if (src.hasPriority()) tgt.setPriority(src.getPriority()); if (src.hasDescription()) @@ -5561,7 +5577,7 @@ public class VersionConvertor_30_50 { tgt.addCareTeam(convertReference(t)); } for (org.hl7.fhir.dstu3.model.Reference t : src.getAddresses()) { - tgt.addAddressesReference(convertReference(t)); + tgt.addAddresses(convertReferenceToCodableReference(t)); } for (org.hl7.fhir.dstu3.model.Reference t : src.getSupportingInfo()) { tgt.addSupportingInfo(convertReference(t)); @@ -5626,8 +5642,9 @@ public class VersionConvertor_30_50 { for (org.hl7.fhir.r5.model.Reference t : src.getCareTeam()) { tgt.addCareTeam(convertReference(t)); } - for (org.hl7.fhir.r5.model.Reference t : src.getAddressesReference()) { - tgt.addAddresses(convertReference(t)); + for (CodeableReference t : src.getAddresses()) { + if (t.hasReference()) + tgt.addAddresses(convertReference(t.getReference())); } for (org.hl7.fhir.r5.model.Reference t : src.getSupportingInfo()) { tgt.addSupportingInfo(convertReference(t)); @@ -5652,10 +5669,10 @@ public class VersionConvertor_30_50 { copyElement(src, tgt); for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getOutcomeCodeableConcept()) { - tgt.addOutcomeCodeableConcept(convertCodeableConcept(t)); + tgt.addOutcome(convertCodeableConceptToCodableReference(t)); } for (org.hl7.fhir.dstu3.model.Reference t : src.getOutcomeReference()) { - tgt.addOutcomeReference(convertReference(t)); + tgt.addOutcome(convertReferenceToCodableReference(t)); } for (org.hl7.fhir.dstu3.model.Annotation t : src.getProgress()) { tgt.addProgress(convertAnnotation(t)); @@ -5676,11 +5693,13 @@ public class VersionConvertor_30_50 { org.hl7.fhir.dstu3.model.CarePlan.CarePlanActivityComponent tgt = new org.hl7.fhir.dstu3.model.CarePlan.CarePlanActivityComponent(); copyElement(src, tgt); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getOutcomeCodeableConcept()) { - tgt.addOutcomeCodeableConcept(convertCodeableConcept(t)); + for (CodeableReference t : src.getOutcome()) { + if (t.hasConcept()) + tgt.addOutcomeCodeableConcept(convertCodeableConcept(t.getConcept())); } - for (org.hl7.fhir.r5.model.Reference t : src.getOutcomeReference()) { - tgt.addOutcomeReference(convertReference(t)); + for (CodeableReference t : src.getOutcome()) { + if (t.hasReference()) + tgt.addOutcomeReference(convertReference(t.getReference())); } for (org.hl7.fhir.r5.model.Annotation t : src.getProgress()) { tgt.addProgress(convertAnnotation(t)); @@ -5713,10 +5732,10 @@ public class VersionConvertor_30_50 { tgt.setCode(convertCodeableConcept(src.getCode())); } for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getReasonCode()) { - tgt.addReasonCode(convertCodeableConcept(t)); + tgt.addReason(convertCodeableConceptToCodableReference(t)); } for (org.hl7.fhir.dstu3.model.Reference t : src.getReasonReference()) { - tgt.addReasonReference(convertReference(t)); + tgt.addReason(convertReferenceToCodableReference(t)); } for (org.hl7.fhir.dstu3.model.Reference t : src.getGoal()) { tgt.addGoal(convertReference(t)); @@ -5776,11 +5795,13 @@ public class VersionConvertor_30_50 { if (src.hasCode()) { tgt.setCode(convertCodeableConcept(src.getCode())); } - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReasonCode()) { - tgt.addReasonCode(convertCodeableConcept(t)); + for (CodeableReference t : src.getReason()) { + if (t.hasConcept()) + tgt.addReasonCode(convertCodeableConcept(t.getConcept())); } - for (org.hl7.fhir.r5.model.Reference t : src.getReasonReference()) { - tgt.addReasonReference(convertReference(t)); + for (CodeableReference t : src.getReason()) { + if (t.hasReference()) + tgt.addReasonReference(convertReference(t.getReference())); } for (org.hl7.fhir.r5.model.Reference t : src.getGoal()) { tgt.addGoal(convertReference(t)); @@ -5967,9 +5988,9 @@ public class VersionConvertor_30_50 { for (org.hl7.fhir.dstu3.model.CareTeam.CareTeamParticipantComponent t : src.getParticipant()) tgt.addParticipant(convertCareTeamParticipantComponent(t)); for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); + tgt.addReason(convertCodeableConceptToCodableReference(t)); for (org.hl7.fhir.dstu3.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + tgt.addReason(convertReferenceToCodableReference(t)); for (org.hl7.fhir.dstu3.model.Reference t : src.getManagingOrganization()) tgt.addManagingOrganization(convertReference(t)); for (org.hl7.fhir.dstu3.model.Annotation t : src.getNote()) @@ -5996,10 +6017,12 @@ public class VersionConvertor_30_50 { tgt.setPeriod(convertPeriod(src.getPeriod())); for (org.hl7.fhir.r5.model.CareTeam.CareTeamParticipantComponent t : src.getParticipant()) tgt.addParticipant(convertCareTeamParticipantComponent(t)); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); - for (org.hl7.fhir.r5.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + for (CodeableReference t : src.getReason()) + if (t.hasConcept()) + tgt.addReasonCode(convertCodeableConcept(t.getConcept())); + for (CodeableReference t : src.getReason()) + if (t.hasReference()) + tgt.addReasonReference(convertReference(t.getReference())); for (org.hl7.fhir.r5.model.Reference t : src.getManagingOrganization()) tgt.addManagingOrganization(convertReference(t)); for (org.hl7.fhir.r5.model.Annotation t : src.getNote()) @@ -6847,9 +6870,9 @@ public class VersionConvertor_30_50 { org.hl7.fhir.r5.model.ClinicalImpression.ClinicalImpressionFindingComponent tgt = new org.hl7.fhir.r5.model.ClinicalImpression.ClinicalImpressionFindingComponent(); copyElement(src, tgt); if (src.hasItemCodeableConcept()) - tgt.setItemCodeableConcept(convertCodeableConcept(src.getItemCodeableConcept())); + tgt.setItem(convertCodeableConceptToCodableReference(src.getItemCodeableConcept())); if (src.hasItemReference()) - tgt.setItemReference(convertReference(src.getItemReference())); + tgt.setItem(convertReferenceToCodableReference(src.getItemReference())); if (src.hasBasis()) tgt.setBasis(src.getBasis()); return tgt; @@ -6860,10 +6883,10 @@ public class VersionConvertor_30_50 { return null; org.hl7.fhir.dstu3.model.ClinicalImpression.ClinicalImpressionFindingComponent tgt = new org.hl7.fhir.dstu3.model.ClinicalImpression.ClinicalImpressionFindingComponent(); copyElement(src, tgt); - if (src.hasItemCodeableConcept()) - tgt.setItem(convertType(src.getItemCodeableConcept())); - else if (src.hasItemReference()) - tgt.setItem(convertType(src.getItemReference())); + if (src.hasItem() && src.getItem().hasConcept()) + tgt.setItem(convertType(src.getItem().getConcept())); + else if (src.hasItem() && src.getItem().hasReference()) + tgt.setItem(convertType(src.getItem().getReference())); if (src.hasBasis()) tgt.setBasis(src.getBasis()); return tgt; @@ -7287,9 +7310,9 @@ public class VersionConvertor_30_50 { if (src.hasSender()) tgt.setSender(convertReference(src.getSender())); for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); + tgt.addReason(convertCodeableConceptToCodableReference(t)); for (org.hl7.fhir.dstu3.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + tgt.addReason(convertReferenceToCodableReference(t)); for (org.hl7.fhir.dstu3.model.Communication.CommunicationPayloadComponent t : src.getPayload()) tgt.addPayload(convertCommunicationPayloadComponent(t)); for (org.hl7.fhir.dstu3.model.Annotation t : src.getNote()) @@ -7333,10 +7356,12 @@ public class VersionConvertor_30_50 { tgt.setReceived(src.getReceived()); if (src.hasSender()) tgt.setSender(convertReference(src.getSender())); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); - for (org.hl7.fhir.r5.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + for (CodeableReference t : src.getReason()) + if (t.hasConcept()) + tgt.addReasonCode(convertCodeableConcept(t.getConcept())); + for (CodeableReference t : src.getReason()) + if (t.hasReference()) + tgt.addReasonReference(convertReference(t.getReference())); for (org.hl7.fhir.r5.model.Communication.CommunicationPayloadComponent t : src.getPayload()) tgt.addPayload(convertCommunicationPayloadComponent(t)); for (org.hl7.fhir.r5.model.Annotation t : src.getNote()) @@ -10122,7 +10147,7 @@ public class VersionConvertor_30_50 { if (src.hasDevice()) tgt.setDevice(convertReference(src.getDevice())); for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getIndication()) - tgt.addReasonCode(convertCodeableConcept(t)); + tgt.addReason(convertCodeableConceptToCodableReference(t)); if (src.hasBodySite()) tgt.setBodySite(convertCodeableConcept(src.getBodySite())); for (org.hl7.fhir.dstu3.model.Annotation t : src.getNote()) @@ -10149,8 +10174,9 @@ public class VersionConvertor_30_50 { tgt.setSource(convertReference(src.getSource())); if (src.hasDevice()) tgt.setDevice(convertReference(src.getDevice())); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReasonCode()) - tgt.addIndication(convertCodeableConcept(t)); + for (CodeableReference t : src.getReason()) + if (t.hasConcept()) + tgt.addIndication(convertCodeableConcept(t.getConcept())); if (src.hasBodySite()) tgt.setBodySite(convertCodeableConcept(src.getBodySite())); for (org.hl7.fhir.r5.model.Annotation t : src.getNote()) @@ -10760,7 +10786,7 @@ public class VersionConvertor_30_50 { if (src.hasLength()) tgt.setLength(convertDuration(src.getLength())); for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getReason()) - tgt.addReasonCode(convertCodeableConcept(t)); + tgt.addReason(convertCodeableConceptToCodableReference(t)); for (org.hl7.fhir.dstu3.model.Encounter.DiagnosisComponent t : src.getDiagnosis()) tgt.addDiagnosis(convertDiagnosisComponent(t)); for (org.hl7.fhir.dstu3.model.Reference t : src.getAccount()) @@ -10809,8 +10835,9 @@ public class VersionConvertor_30_50 { tgt.setPeriod(convertPeriod(src.getPeriod())); if (src.hasLength()) tgt.setLength(convertDuration(src.getLength())); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReasonCode()) - tgt.addReason(convertCodeableConcept(t)); + for (CodeableReference t : src.getReason()) + if (t.hasConcept()) + tgt.addReason(convertCodeableConcept(t.getConcept())); for (org.hl7.fhir.r5.model.Encounter.DiagnosisComponent t : src.getDiagnosis()) tgt.addDiagnosis(convertDiagnosisComponent(t)); for (org.hl7.fhir.r5.model.Reference t : src.getAccount()) @@ -11437,9 +11464,9 @@ public class VersionConvertor_30_50 { if (src.hasDeceased()) tgt.setDeceased(convertType(src.getDeceased())); for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); + tgt.addReason(convertCodeableConceptToCodableReference(t)); for (org.hl7.fhir.dstu3.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + tgt.addReason(convertReferenceToCodableReference(t)); for (org.hl7.fhir.dstu3.model.Annotation t : src.getNote()) tgt.addNote(convertAnnotation(t)); for (org.hl7.fhir.dstu3.model.FamilyMemberHistory.FamilyMemberHistoryConditionComponent t : src.getCondition()) @@ -11478,10 +11505,12 @@ public class VersionConvertor_30_50 { tgt.setEstimatedAge(src.getEstimatedAge()); if (src.hasDeceased()) tgt.setDeceased(convertType(src.getDeceased())); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); - for (org.hl7.fhir.r5.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + for (CodeableReference t : src.getReason()) + if (t.hasConcept()) + tgt.addReasonCode(convertCodeableConcept(t.getConcept())); + for (CodeableReference t : src.getReason()) + if (t.hasReference()) + tgt.addReasonReference(convertReference(t.getReference())); for (org.hl7.fhir.r5.model.Annotation t : src.getNote()) tgt.addNote(convertAnnotation(t)); for (org.hl7.fhir.r5.model.FamilyMemberHistory.FamilyMemberHistoryConditionComponent t : src.getCondition()) @@ -11671,9 +11700,9 @@ public class VersionConvertor_30_50 { for (org.hl7.fhir.dstu3.model.Annotation t : src.getNote()) tgt.addNote(convertAnnotation(t)); for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getOutcomeCode()) - tgt.addOutcomeCode(convertCodeableConcept(t)); + tgt.addOutcome(convertCodeableConceptToCodableReference(t)); for (org.hl7.fhir.dstu3.model.Reference t : src.getOutcomeReference()) - tgt.addOutcomeReference(convertReference(t)); + tgt.addOutcome(convertReferenceToCodableReference(t)); return tgt; } @@ -11708,10 +11737,12 @@ public class VersionConvertor_30_50 { tgt.addAddresses(convertReference(t)); for (org.hl7.fhir.r5.model.Annotation t : src.getNote()) tgt.addNote(convertAnnotation(t)); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getOutcomeCode()) - tgt.addOutcomeCode(convertCodeableConcept(t)); - for (org.hl7.fhir.r5.model.Reference t : src.getOutcomeReference()) - tgt.addOutcomeReference(convertReference(t)); + for (CodeableReference t : src.getOutcome()) + if (t.hasConcept()) + tgt.addOutcomeCode(convertCodeableConcept(t.getConcept())); + for (CodeableReference t : src.getOutcome()) + if (t.hasReference()) + tgt.addOutcomeReference(convertReference(t.getReference())); return tgt; } @@ -12433,7 +12464,7 @@ public class VersionConvertor_30_50 { tgt.addProcedure().setValue(convertCodeableConcept(t)); } if (src.hasReason()) { - tgt.addReasonCode(convertCodeableConcept(src.getReason())); + tgt.addReason(convertCodeableConceptToCodableReference(src.getReason())); } if (src.hasDescription()) { tgt.setDescription(src.getDescription()); @@ -12515,9 +12546,9 @@ public class VersionConvertor_30_50 { } } // location was added in R4 and does not exist in DSTU3 - List reasonCodes = src.getReasonCode(); + List reasonCodes = src.getReason(); if (reasonCodes.size() > 0) { - tgt.setReason(convertCodeableConcept(reasonCodes.get(0))); + tgt.setReason(convertCodeableConcept(reasonCodes.get(0).getConcept())); if (reasonCodes.size() > 1) { // TODO print a warning that only one reason could be converted @@ -12711,7 +12742,7 @@ public class VersionConvertor_30_50 { for (org.hl7.fhir.dstu3.model.Annotation t : src.getNote()) tgt.addNote(convertAnnotation(t)); for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getExplanation().getReason()) - tgt.addReasonCode(convertCodeableConcept(t)); + tgt.addReason(convertCodeableConceptToCodableReference(t)); // for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getExplanation().getReasonNotGiven()) // tgt.addReason(convertCodeableConcept(t)); return tgt; @@ -12756,8 +12787,9 @@ public class VersionConvertor_30_50 { tgt.addPractitioner(convertImmunizationPractitionerComponent(t)); for (org.hl7.fhir.r5.model.Annotation t : src.getNote()) tgt.addNote(convertAnnotation(t)); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReasonCode()) - tgt.getExplanation().addReason(convertCodeableConcept(t)); + for (CodeableReference t : src.getReason()) + if (t.hasConcept()) + tgt.getExplanation().addReason(convertCodeableConcept(t.getConcept())); return tgt; } @@ -13737,9 +13769,9 @@ public class VersionConvertor_30_50 { // for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getReasonNotGiven()) // tgt.addReasonNotGiven(convertCodeableConcept(t)); for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); + tgt.addReason(convertCodeableConceptToCodableReference(t)); for (org.hl7.fhir.dstu3.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + tgt.addReason(convertReferenceToCodableReference(t)); if (src.hasPrescription()) tgt.setRequest(convertReference(src.getPrescription())); for (org.hl7.fhir.dstu3.model.Reference t : src.getDevice()) @@ -13784,10 +13816,12 @@ public class VersionConvertor_30_50 { // tgt.setNotGiven(src.getNotGiven()); // for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReasonNotGiven()) // tgt.addReasonNotGiven(convertCodeableConcept(t)); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); - for (org.hl7.fhir.r5.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + for (CodeableReference t : src.getReason()) + if (t.hasConcept()) + tgt.addReasonCode(convertCodeableConcept(t.getConcept())); + for (CodeableReference t : src.getReason()) + if (t.hasReference()) + tgt.addReasonReference(convertReference(t.getReference())); if (src.hasRequest()) tgt.setPrescription(convertReference(src.getRequest())); for (org.hl7.fhir.r5.model.Reference t : src.getDevice()) @@ -14319,7 +14353,7 @@ public class VersionConvertor_30_50 { if (src.hasExpectedSupplyDuration()) tgt.setExpectedSupplyDuration(convertDuration(src.getExpectedSupplyDuration())); if (src.hasPerformer()) - tgt.setPerformer(convertReference(src.getPerformer())); + tgt.setDispenser(convertReference(src.getPerformer())); return tgt; } @@ -14336,8 +14370,8 @@ public class VersionConvertor_30_50 { tgt.setQuantity(convertSimpleQuantity(src.getQuantity())); if (src.hasExpectedSupplyDuration()) tgt.setExpectedSupplyDuration(convertDuration(src.getExpectedSupplyDuration())); - if (src.hasPerformer()) - tgt.setPerformer(convertReference(src.getPerformer())); + if (src.hasDispenser()) + tgt.setPerformer(convertReference(src.getDispenser())); return tgt; } @@ -14399,9 +14433,9 @@ public class VersionConvertor_30_50 { // for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getReasonNotTaken()) // tgt.addReasonNotTaken(convertCodeableConcept(t)); for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); + tgt.addReason(convertCodeableConceptToCodableReference(t)); for (org.hl7.fhir.dstu3.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + tgt.addReason(convertReferenceToCodableReference(t)); for (org.hl7.fhir.dstu3.model.Annotation t : src.getNote()) tgt.addNote(convertAnnotation(t)); for (org.hl7.fhir.dstu3.model.Dosage t : src.getDosage()) @@ -14442,10 +14476,12 @@ public class VersionConvertor_30_50 { // tgt.setTaken(convertMedicationStatementTaken(src.getExtensionByUrl(VersionConvertorConstants.MODIFIER_TAKEN))); // for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReasonNotTaken()) // tgt.addReasonNotTaken(convertCodeableConcept(t)); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); - for (org.hl7.fhir.r5.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + for (CodeableReference t : src.getReason()) + if (t.hasConcept()) + tgt.addReasonCode(convertCodeableConcept(t.getConcept())); + for (CodeableReference t : src.getReason()) + if (t.hasReference()) + tgt.addReasonReference(convertReference(t.getReference())); for (org.hl7.fhir.r5.model.Annotation t : src.getNote()) tgt.addNote(convertAnnotation(t)); for (org.hl7.fhir.r5.model.Dosage t : src.getDosage()) @@ -17426,11 +17462,10 @@ public class VersionConvertor_30_50 { if (src.hasPerformer()) tgt.setPerformer(convertReference(src.getPerformer())); if (src.hasReason()) { - org.hl7.fhir.r5.model.DataType t = convertType(src.getReason()); - if (t instanceof org.hl7.fhir.r5.model.CodeableConcept) - tgt.addReasonCode((org.hl7.fhir.r5.model.CodeableConcept) t); - else - tgt.addReasonReference((org.hl7.fhir.r5.model.Reference) t); + if (src.getReason() instanceof org.hl7.fhir.dstu3.model.CodeableConcept) + tgt.addReason(convertCodeableConceptToCodableReference((org.hl7.fhir.dstu3.model.CodeableConcept) src.getReason())); + else if (src.getReason() instanceof org.hl7.fhir.dstu3.model.Reference) + tgt.addReason(convertReferenceToCodableReference((org.hl7.fhir.dstu3.model.Reference) src.getReason())); } for (org.hl7.fhir.dstu3.model.Reference t : src.getBasis()) tgt.addBasis(convertReference(t)); @@ -17470,10 +17505,10 @@ public class VersionConvertor_30_50 { tgt.setCondition(convertReference(src.getCondition())); if (src.hasPerformer()) tgt.setPerformer(convertReference(src.getPerformer())); - if (src.hasReasonCode()) - tgt.setReason(convertType(src.getReasonCodeFirstRep())); - if (src.hasReasonReference()) - tgt.setReason(convertType(src.getReasonReferenceFirstRep())); + if (src.hasReason() && src.getReasonFirstRep().hasConcept()) + tgt.setReason(convertType(src.getReasonFirstRep().getConcept())); + if (src.hasReason() && src.getReasonFirstRep().hasReference()) + tgt.setReason(convertType(src.getReasonFirstRep().getReference())); for (org.hl7.fhir.r5.model.Reference t : src.getBasis()) tgt.addBasis(convertReference(t)); for (org.hl7.fhir.r5.model.RiskAssessment.RiskAssessmentPredictionComponent t : src.getPrediction()) 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 76f00c092..f759a07b7 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 @@ -29,6 +29,7 @@ package org.hl7.fhir.convertors; import org.hl7.fhir.convertors.conv40_50.*; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r4.model.CodeType; +import org.hl7.fhir.r5.model.CodeableReference; import org.hl7.fhir.r5.model.Enumeration; import org.hl7.fhir.r5.model.Enumerations.ResourceTypeEnum; import org.hl7.fhir.r5.model.Enumerations.ResourceTypeEnumEnumFactory; @@ -3809,4 +3810,19 @@ public class VersionConvertor_40_50 { protected static org.hl7.fhir.r4.model.CodeType convertResourceEnum(org.hl7.fhir.r5.model.CodeType src) { return convertCode(src); } + + protected static CodeableReference convertReferenceToCodeableReference(org.hl7.fhir.r4.model.Reference src) { + CodeableReference tgt = new CodeableReference(); + tgt.setReference(convertReference(src)); + return tgt; + } + + protected static CodeableReference convertCodeableConceptToCodeableReference(org.hl7.fhir.r4.model.CodeableConcept src) { + CodeableReference tgt = new CodeableReference(); + tgt.setConcept(convertCodeableConcept(src)); + return tgt; + } + + + } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Appointment.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Appointment.java index f7bb4bfec..191d2be0a 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Appointment.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Appointment.java @@ -22,7 +22,7 @@ package org.hl7.fhir.convertors.conv40_50; import org.hl7.fhir.exceptions.FHIRException; - +import org.hl7.fhir.r5.model.CodeableReference; import org.hl7.fhir.convertors.VersionConvertor_40_50; @@ -80,9 +80,9 @@ public class Appointment extends VersionConvertor_40_50 { if (src.hasAppointmentType()) tgt.setAppointmentType(convertCodeableConcept(src.getAppointmentType())); for (org.hl7.fhir.r4.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); + tgt.addReason(convertCodeableConceptToCodeableReference(t)); for (org.hl7.fhir.r4.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + tgt.addReason(convertReferenceToCodeableReference(t)); if (src.hasPriority()) tgt.setPriorityElement(convertUnsignedInt(src.getPriorityElement())); if (src.hasDescription()) @@ -131,10 +131,12 @@ public class Appointment extends VersionConvertor_40_50 { tgt.addSpecialty(convertCodeableConcept(t)); if (src.hasAppointmentType()) tgt.setAppointmentType(convertCodeableConcept(src.getAppointmentType())); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); - for (org.hl7.fhir.r5.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + for (CodeableReference t : src.getReason()) + if (t.hasConcept()) + tgt.addReasonCode(convertCodeableConcept(t.getConcept())); + for (CodeableReference t : src.getReason()) + if (t.hasReference()) + tgt.addReasonReference(convertReference(t.getReference())); if (src.hasPriority()) tgt.setPriorityElement(convertUnsignedInt(src.getPriorityElement())); if (src.hasDescription()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CarePlan.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CarePlan.java index 85155fa14..fc395ae44 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CarePlan.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CarePlan.java @@ -22,7 +22,7 @@ package org.hl7.fhir.convertors.conv40_50; import org.hl7.fhir.exceptions.FHIRException; - +import org.hl7.fhir.r5.model.CodeableReference; import org.hl7.fhir.convertors.VersionConvertor_40_50; @@ -102,7 +102,7 @@ public class CarePlan extends VersionConvertor_40_50 { for (org.hl7.fhir.r4.model.Reference t : src.getCareTeam()) tgt.addCareTeam(convertReference(t)); for (org.hl7.fhir.r4.model.Reference t : src.getAddresses()) - tgt.addAddressesReference(convertReference(t)); + tgt.addAddresses(convertReferenceToCodeableReference(t)); for (org.hl7.fhir.r4.model.Reference t : src.getSupportingInfo()) tgt.addSupportingInfo(convertReference(t)); for (org.hl7.fhir.r4.model.Reference t : src.getGoal()) @@ -155,8 +155,9 @@ public class CarePlan extends VersionConvertor_40_50 { tgt.addContributor(convertReference(t)); for (org.hl7.fhir.r5.model.Reference t : src.getCareTeam()) tgt.addCareTeam(convertReference(t)); - for (org.hl7.fhir.r5.model.Reference t : src.getAddressesReference()) - tgt.addAddresses(convertReference(t)); + for (CodeableReference t : src.getAddresses()) + if (t.hasReference()) + tgt.addAddresses(convertReference(t.getReference())); for (org.hl7.fhir.r5.model.Reference t : src.getSupportingInfo()) tgt.addSupportingInfo(convertReference(t)); for (org.hl7.fhir.r5.model.Reference t : src.getGoal()) @@ -228,9 +229,9 @@ public class CarePlan extends VersionConvertor_40_50 { org.hl7.fhir.r5.model.CarePlan.CarePlanActivityComponent tgt = new org.hl7.fhir.r5.model.CarePlan.CarePlanActivityComponent(); copyElement(src, tgt); for (org.hl7.fhir.r4.model.CodeableConcept t : src.getOutcomeCodeableConcept()) - tgt.addOutcomeCodeableConcept(convertCodeableConcept(t)); + tgt.addOutcome(convertCodeableConceptToCodeableReference(t)); for (org.hl7.fhir.r4.model.Reference t : src.getOutcomeReference()) - tgt.addOutcomeReference(convertReference(t)); + tgt.addOutcome(convertReferenceToCodeableReference(t)); for (org.hl7.fhir.r4.model.Annotation t : src.getProgress()) tgt.addProgress(convertAnnotation(t)); if (src.hasReference()) @@ -245,10 +246,12 @@ public class CarePlan extends VersionConvertor_40_50 { return null; org.hl7.fhir.r4.model.CarePlan.CarePlanActivityComponent tgt = new org.hl7.fhir.r4.model.CarePlan.CarePlanActivityComponent(); copyElement(src, tgt); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getOutcomeCodeableConcept()) - tgt.addOutcomeCodeableConcept(convertCodeableConcept(t)); - for (org.hl7.fhir.r5.model.Reference t : src.getOutcomeReference()) - tgt.addOutcomeReference(convertReference(t)); + for (CodeableReference t : src.getOutcome()) + if (t.hasConcept()) + tgt.addOutcomeCodeableConcept(convertCodeableConcept(t.getConcept())); + for (CodeableReference t : src.getOutcome()) + if (t.hasReference()) + tgt.addOutcomeReference(convertReference(t.getReference())); for (org.hl7.fhir.r5.model.Annotation t : src.getProgress()) tgt.addProgress(convertAnnotation(t)); if (src.hasReference()) @@ -272,9 +275,9 @@ public class CarePlan extends VersionConvertor_40_50 { if (src.hasCode()) tgt.setCode(convertCodeableConcept(src.getCode())); for (org.hl7.fhir.r4.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); + tgt.addReason(convertCodeableConceptToCodeableReference(t)); for (org.hl7.fhir.r4.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + tgt.addReason(convertReferenceToCodeableReference(t)); for (org.hl7.fhir.r4.model.Reference t : src.getGoal()) tgt.addGoal(convertReference(t)); if (src.hasStatus()) @@ -313,10 +316,12 @@ public class CarePlan extends VersionConvertor_40_50 { tgt.getInstantiatesUri().add(convertUri(t)); if (src.hasCode()) tgt.setCode(convertCodeableConcept(src.getCode())); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); - for (org.hl7.fhir.r5.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + for (CodeableReference t : src.getReason()) + if (t.hasConcept()) + tgt.addReasonCode(convertCodeableConcept(t.getConcept())); + for (CodeableReference t : src.getReason()) + if (t.hasReference()) + tgt.addReasonReference(convertReference(t.getReference())); for (org.hl7.fhir.r5.model.Reference t : src.getGoal()) tgt.addGoal(convertReference(t)); if (src.hasStatus()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CareTeam.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CareTeam.java index beaf71e3b..ff7ee5431 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CareTeam.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CareTeam.java @@ -22,7 +22,7 @@ package org.hl7.fhir.convertors.conv40_50; import org.hl7.fhir.exceptions.FHIRException; - +import org.hl7.fhir.r5.model.CodeableReference; import org.hl7.fhir.convertors.VersionConvertor_40_50; @@ -80,9 +80,9 @@ public class CareTeam extends VersionConvertor_40_50 { for (org.hl7.fhir.r4.model.CareTeam.CareTeamParticipantComponent t : src.getParticipant()) tgt.addParticipant(convertCareTeamParticipantComponent(t)); for (org.hl7.fhir.r4.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); + tgt.addReason(convertCodeableConceptToCodeableReference(t)); for (org.hl7.fhir.r4.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + tgt.addReason(convertReferenceToCodeableReference(t)); for (org.hl7.fhir.r4.model.Reference t : src.getManagingOrganization()) tgt.addManagingOrganization(convertReference(t)); for (org.hl7.fhir.r4.model.ContactPoint t : src.getTelecom()) @@ -111,10 +111,12 @@ public class CareTeam extends VersionConvertor_40_50 { tgt.setPeriod(convertPeriod(src.getPeriod())); for (org.hl7.fhir.r5.model.CareTeam.CareTeamParticipantComponent t : src.getParticipant()) tgt.addParticipant(convertCareTeamParticipantComponent(t)); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); - for (org.hl7.fhir.r5.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + for (CodeableReference t : src.getReason()) + if (t.hasConcept()) + tgt.addReasonCode(convertCodeableConcept(t.getConcept())); + for (CodeableReference t : src.getReason()) + if (t.hasReference()) + tgt.addReasonReference(convertReference(t.getReference())); for (org.hl7.fhir.r5.model.Reference t : src.getManagingOrganization()) tgt.addManagingOrganization(convertReference(t)); for (org.hl7.fhir.r5.model.ContactPoint t : src.getTelecom()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ClinicalImpression.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ClinicalImpression.java index ba829b4f9..8db80de5c 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ClinicalImpression.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ClinicalImpression.java @@ -180,9 +180,9 @@ public class ClinicalImpression extends VersionConvertor_40_50 { org.hl7.fhir.r5.model.ClinicalImpression.ClinicalImpressionFindingComponent tgt = new org.hl7.fhir.r5.model.ClinicalImpression.ClinicalImpressionFindingComponent(); copyElement(src, tgt); if (src.hasItemCodeableConcept()) - tgt.setItemCodeableConcept(convertCodeableConcept(src.getItemCodeableConcept())); + tgt.setItem(convertCodeableConceptToCodeableReference(src.getItemCodeableConcept())); if (src.hasItemReference()) - tgt.setItemReference(convertReference(src.getItemReference())); + tgt.setItem(convertReferenceToCodeableReference(src.getItemReference())); if (src.hasBasis()) tgt.setBasisElement(convertString(src.getBasisElement())); return tgt; @@ -193,10 +193,10 @@ public class ClinicalImpression extends VersionConvertor_40_50 { return null; org.hl7.fhir.r4.model.ClinicalImpression.ClinicalImpressionFindingComponent tgt = new org.hl7.fhir.r4.model.ClinicalImpression.ClinicalImpressionFindingComponent(); copyElement(src, tgt); - if (src.hasItemCodeableConcept()) - tgt.setItemCodeableConcept(convertCodeableConcept(src.getItemCodeableConcept())); - if (src.hasItemReference()) - tgt.setItemReference(convertReference(src.getItemReference())); + if (src.hasItem() && src.getItem().hasConcept()) + tgt.setItemCodeableConcept(convertCodeableConcept(src.getItem().getConcept())); + if (src.hasItem() && src.getItem().hasReference()) + tgt.setItemReference(convertReference(src.getItem().getReference())); if (src.hasBasis()) tgt.setBasisElement(convertString(src.getBasisElement())); return tgt; diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Communication.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Communication.java index c64fe8b1c..af76c7757 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Communication.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Communication.java @@ -22,7 +22,7 @@ package org.hl7.fhir.convertors.conv40_50; import org.hl7.fhir.exceptions.FHIRException; - +import org.hl7.fhir.r5.model.CodeableReference; import org.hl7.fhir.convertors.VersionConvertor_40_50; @@ -104,9 +104,9 @@ public class Communication extends VersionConvertor_40_50 { if (src.hasSender()) tgt.setSender(convertReference(src.getSender())); for (org.hl7.fhir.r4.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); + tgt.addReason(convertCodeableConceptToCodeableReference(t)); for (org.hl7.fhir.r4.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + tgt.addReason(convertReferenceToCodeableReference(t)); for (org.hl7.fhir.r4.model.Communication.CommunicationPayloadComponent t : src.getPayload()) tgt.addPayload(convertCommunicationPayloadComponent(t)); for (org.hl7.fhir.r4.model.Annotation t : src.getNote()) @@ -157,10 +157,12 @@ public class Communication extends VersionConvertor_40_50 { tgt.addRecipient(convertReference(t)); if (src.hasSender()) tgt.setSender(convertReference(src.getSender())); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); - for (org.hl7.fhir.r5.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + for (CodeableReference t : src.getReason()) + if (t.hasConcept()) + tgt.addReasonCode(convertCodeableConcept(t.getConcept())); + for (CodeableReference t : src.getReason()) + if (t.hasReference()) + tgt.addReasonReference(convertReference(t.getReference())); for (org.hl7.fhir.r5.model.Communication.CommunicationPayloadComponent t : src.getPayload()) tgt.addPayload(convertCommunicationPayloadComponent(t)); for (org.hl7.fhir.r5.model.Annotation t : src.getNote()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CommunicationRequest.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CommunicationRequest.java index d976391f5..97532d386 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CommunicationRequest.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CommunicationRequest.java @@ -22,7 +22,7 @@ package org.hl7.fhir.convertors.conv40_50; import org.hl7.fhir.exceptions.FHIRException; - +import org.hl7.fhir.r5.model.CodeableReference; import org.hl7.fhir.convertors.VersionConvertor_40_50; @@ -104,9 +104,9 @@ public class CommunicationRequest extends VersionConvertor_40_50 { if (src.hasSender()) tgt.addInformationProvider(convertReference(src.getSender())); for (org.hl7.fhir.r4.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); + tgt.addReason(convertCodeableConceptToCodeableReference(t)); for (org.hl7.fhir.r4.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + tgt.addReason(convertReferenceToCodeableReference(t)); for (org.hl7.fhir.r4.model.Annotation t : src.getNote()) tgt.addNote(convertAnnotation(t)); return tgt; @@ -155,10 +155,12 @@ public class CommunicationRequest extends VersionConvertor_40_50 { tgt.addRecipient(convertReference(t)); if (src.hasInformationProvider()) tgt.setSender(convertReference(src.getInformationProviderFirstRep())); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); - for (org.hl7.fhir.r5.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + for (CodeableReference t : src.getReason()) + if (t.hasConcept()) + tgt.addReasonCode(convertCodeableConcept(t.getConcept())); + for (CodeableReference t : src.getReason()) + if (t.hasReference()) + tgt.addReasonReference(convertReference(t.getReference())); for (org.hl7.fhir.r5.model.Annotation t : src.getNote()) tgt.addNote(convertAnnotation(t)); return tgt; diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Contract.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Contract.java index ebcd89aae..1341b04e1 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Contract.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Contract.java @@ -22,7 +22,8 @@ package org.hl7.fhir.convertors.conv40_50; import org.hl7.fhir.exceptions.FHIRException; - +import org.hl7.fhir.r4.model.CodeableConcept; +import org.hl7.fhir.r5.model.CodeableReference; import org.hl7.fhir.convertors.VersionConvertor_40_50; @@ -748,11 +749,9 @@ public class Contract extends VersionConvertor_40_50 { for (org.hl7.fhir.r4.model.StringType t : src.getPerformerLinkId()) tgt.getPerformerLinkId().add(convertString(t)); for (org.hl7.fhir.r4.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); + tgt.addReason(convertCodeableConceptToCodeableReference(t)); for (org.hl7.fhir.r4.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); - for (org.hl7.fhir.r4.model.StringType t : src.getReason()) - tgt.getReason().add(convertString(t)); + tgt.addReason(convertReferenceToCodeableReference(t)); for (org.hl7.fhir.r4.model.StringType t : src.getReasonLinkId()) tgt.getReasonLinkId().add(convertString(t)); for (org.hl7.fhir.r4.model.Annotation t : src.getNote()) @@ -797,11 +796,13 @@ public class Contract extends VersionConvertor_40_50 { tgt.setPerformer(convertReference(src.getPerformer())); for (org.hl7.fhir.r5.model.StringType t : src.getPerformerLinkId()) tgt.getPerformerLinkId().add(convertString(t)); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); - for (org.hl7.fhir.r5.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); - for (org.hl7.fhir.r5.model.StringType t : src.getReason()) + for (CodeableReference t : src.getReason()) + if (t.hasConcept()) + tgt.addReasonCode(convertCodeableConcept(t.getConcept())); + for (CodeableReference t : src.getReason()) + if (t.hasReference()) + tgt.addReasonReference(convertReference(t.getReference())); + for (org.hl7.fhir.r5.model.StringType t : src.getReasonLinkId()) tgt.getReason().add(convertString(t)); for (org.hl7.fhir.r5.model.StringType t : src.getReasonLinkId()) tgt.getReasonLinkId().add(convertString(t)); diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceRequest.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceRequest.java index fc22250b8..25506385c 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceRequest.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceRequest.java @@ -22,7 +22,7 @@ package org.hl7.fhir.convertors.conv40_50; import org.hl7.fhir.exceptions.FHIRException; - +import org.hl7.fhir.r5.model.CodeableReference; import org.hl7.fhir.convertors.VersionConvertor_40_50; @@ -102,9 +102,9 @@ public class DeviceRequest extends VersionConvertor_40_50 { if (src.hasPerformer()) tgt.setPerformer(convertReference(src.getPerformer())); for (org.hl7.fhir.r4.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); + tgt.addReason(convertCodeableConceptToCodeableReference(t)); for (org.hl7.fhir.r4.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + tgt.addReason(convertReferenceToCodeableReference(t)); for (org.hl7.fhir.r4.model.Reference t : src.getInsurance()) tgt.addInsurance(convertReference(t)); for (org.hl7.fhir.r4.model.Reference t : src.getSupportingInfo()) @@ -157,10 +157,12 @@ public class DeviceRequest extends VersionConvertor_40_50 { tgt.setPerformerType(convertCodeableConcept(src.getPerformerType())); if (src.hasPerformer()) tgt.setPerformer(convertReference(src.getPerformer())); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); - for (org.hl7.fhir.r5.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + for (CodeableReference t : src.getReason()) + if (t.hasConcept()) + tgt.addReasonCode(convertCodeableConcept(t.getConcept())); + for (CodeableReference t : src.getReason()) + if (t.hasReference()) + tgt.addReasonReference(convertReference(t.getReference())); for (org.hl7.fhir.r5.model.Reference t : src.getInsurance()) tgt.addInsurance(convertReference(t)); for (org.hl7.fhir.r5.model.Reference t : src.getSupportingInfo()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceUseStatement.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceUseStatement.java index 4c3f531b6..49e4c52b4 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceUseStatement.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceUseStatement.java @@ -22,7 +22,7 @@ package org.hl7.fhir.convertors.conv40_50; import org.hl7.fhir.exceptions.FHIRException; - +import org.hl7.fhir.r5.model.CodeableReference; import org.hl7.fhir.convertors.VersionConvertor_40_50; @@ -84,9 +84,9 @@ public class DeviceUseStatement extends VersionConvertor_40_50 { if (src.hasDevice()) tgt.setDevice(convertReference(src.getDevice())); for (org.hl7.fhir.r4.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); + tgt.addReason(convertCodeableConceptToCodeableReference(t)); for (org.hl7.fhir.r4.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + tgt.addReason(convertReferenceToCodeableReference(t)); if (src.hasBodySite()) tgt.setBodySite(convertCodeableConcept(src.getBodySite())); for (org.hl7.fhir.r4.model.Annotation t : src.getNote()) @@ -117,10 +117,12 @@ public class DeviceUseStatement extends VersionConvertor_40_50 { tgt.setSource(convertReference(src.getSource())); if (src.hasDevice()) tgt.setDevice(convertReference(src.getDevice())); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); - for (org.hl7.fhir.r5.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + for (CodeableReference t : src.getReason()) + if (t.hasConcept()) + tgt.addReasonCode(convertCodeableConcept(t.getConcept())); + for (CodeableReference t : src.getReason()) + if (t.hasReference()) + tgt.addReasonReference(convertReference(t.getReference())); if (src.hasBodySite()) tgt.setBodySite(convertCodeableConcept(src.getBodySite())); for (org.hl7.fhir.r5.model.Annotation t : src.getNote()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Encounter.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Encounter.java index 64c61913e..4ccd2d15b 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Encounter.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Encounter.java @@ -22,7 +22,7 @@ package org.hl7.fhir.convertors.conv40_50; import org.hl7.fhir.exceptions.FHIRException; - +import org.hl7.fhir.r5.model.CodeableReference; import org.hl7.fhir.convertors.VersionConvertor_40_50; @@ -96,9 +96,9 @@ public class Encounter extends VersionConvertor_40_50 { if (src.hasLength()) tgt.setLength(convertDuration(src.getLength())); for (org.hl7.fhir.r4.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); + tgt.addReason(convertCodeableConceptToCodeableReference(t)); for (org.hl7.fhir.r4.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + tgt.addReason(convertReferenceToCodeableReference(t)); for (org.hl7.fhir.r4.model.Encounter.DiagnosisComponent t : src.getDiagnosis()) tgt.addDiagnosis(convertDiagnosisComponent(t)); for (org.hl7.fhir.r4.model.Reference t : src.getAccount()) @@ -149,10 +149,12 @@ public class Encounter extends VersionConvertor_40_50 { tgt.setPeriod(convertPeriod(src.getPeriod())); if (src.hasLength()) tgt.setLength(convertDuration(src.getLength())); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); - for (org.hl7.fhir.r5.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + for (CodeableReference t : src.getReason()) + if (t.hasConcept()) + tgt.addReasonCode(convertCodeableConcept(t.getConcept())); + for (CodeableReference t : src.getReason()) + if (t.hasReference()) + tgt.addReasonReference(convertReference(t.getReference())); for (org.hl7.fhir.r5.model.Encounter.DiagnosisComponent t : src.getDiagnosis()) tgt.addDiagnosis(convertDiagnosisComponent(t)); for (org.hl7.fhir.r5.model.Reference t : src.getAccount()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/FamilyMemberHistory.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/FamilyMemberHistory.java index d534dc18b..16d9a4c8a 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/FamilyMemberHistory.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/FamilyMemberHistory.java @@ -22,7 +22,7 @@ package org.hl7.fhir.convertors.conv40_50; import org.hl7.fhir.exceptions.FHIRException; - +import org.hl7.fhir.r5.model.CodeableReference; import org.hl7.fhir.convertors.VersionConvertor_40_50; @@ -94,9 +94,9 @@ public class FamilyMemberHistory extends VersionConvertor_40_50 { if (src.hasDeceased()) tgt.setDeceased(convertType(src.getDeceased())); for (org.hl7.fhir.r4.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); + tgt.addReason(convertCodeableConceptToCodeableReference(t)); for (org.hl7.fhir.r4.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + tgt.addReason(convertReferenceToCodeableReference(t)); for (org.hl7.fhir.r4.model.Annotation t : src.getNote()) tgt.addNote(convertAnnotation(t)); for (org.hl7.fhir.r4.model.FamilyMemberHistory.FamilyMemberHistoryConditionComponent t : src.getCondition()) @@ -137,10 +137,12 @@ public class FamilyMemberHistory extends VersionConvertor_40_50 { tgt.setEstimatedAgeElement(convertBoolean(src.getEstimatedAgeElement())); if (src.hasDeceased()) tgt.setDeceased(convertType(src.getDeceased())); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); - for (org.hl7.fhir.r5.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + for (CodeableReference t : src.getReason()) + if (t.hasConcept()) + tgt.addReasonCode(convertCodeableConcept(t.getConcept())); + for (CodeableReference t : src.getReason()) + if (t.hasReference()) + tgt.addReasonReference(convertReference(t.getReference())); for (org.hl7.fhir.r5.model.Annotation t : src.getNote()) tgt.addNote(convertAnnotation(t)); for (org.hl7.fhir.r5.model.FamilyMemberHistory.FamilyMemberHistoryConditionComponent t : src.getCondition()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Goal.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Goal.java index 57e6f08e5..8d5d10473 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Goal.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Goal.java @@ -22,7 +22,7 @@ package org.hl7.fhir.convertors.conv40_50; import org.hl7.fhir.exceptions.FHIRException; - +import org.hl7.fhir.r5.model.CodeableReference; import org.hl7.fhir.convertors.VersionConvertor_40_50; @@ -94,9 +94,9 @@ public class Goal extends VersionConvertor_40_50 { for (org.hl7.fhir.r4.model.Annotation t : src.getNote()) tgt.addNote(convertAnnotation(t)); for (org.hl7.fhir.r4.model.CodeableConcept t : src.getOutcomeCode()) - tgt.addOutcomeCode(convertCodeableConcept(t)); + tgt.addOutcome(convertCodeableConceptToCodeableReference(t)); for (org.hl7.fhir.r4.model.Reference t : src.getOutcomeReference()) - tgt.addOutcomeReference(convertReference(t)); + tgt.addOutcome(convertReferenceToCodeableReference(t)); return tgt; } @@ -133,10 +133,12 @@ public class Goal extends VersionConvertor_40_50 { tgt.addAddresses(convertReference(t)); for (org.hl7.fhir.r5.model.Annotation t : src.getNote()) tgt.addNote(convertAnnotation(t)); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getOutcomeCode()) - tgt.addOutcomeCode(convertCodeableConcept(t)); - for (org.hl7.fhir.r5.model.Reference t : src.getOutcomeReference()) - tgt.addOutcomeReference(convertReference(t)); + for (CodeableReference t : src.getOutcome()) + if (t.hasConcept()) + tgt.addOutcomeCode(convertCodeableConcept(t.getConcept())); + for (CodeableReference t : src.getOutcome()) + if (t.hasReference()) + tgt.addOutcomeReference(convertReference(t.getReference())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/GuidanceResponse.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/GuidanceResponse.java index 407f2dae5..fafc4a37b 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/GuidanceResponse.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/GuidanceResponse.java @@ -22,7 +22,7 @@ package org.hl7.fhir.convertors.conv40_50; import org.hl7.fhir.exceptions.FHIRException; - +import org.hl7.fhir.r5.model.CodeableReference; import org.hl7.fhir.convertors.VersionConvertor_40_50; @@ -82,9 +82,9 @@ public class GuidanceResponse extends VersionConvertor_40_50 { if (src.hasPerformer()) tgt.setPerformer(convertReference(src.getPerformer())); for (org.hl7.fhir.r4.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); + tgt.addReason(convertCodeableConceptToCodeableReference(t)); for (org.hl7.fhir.r4.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + tgt.addReason(convertReferenceToCodeableReference(t)); for (org.hl7.fhir.r4.model.Annotation t : src.getNote()) tgt.addNote(convertAnnotation(t)); for (org.hl7.fhir.r4.model.Reference t : src.getEvaluationMessage()) @@ -119,10 +119,12 @@ public class GuidanceResponse extends VersionConvertor_40_50 { tgt.setOccurrenceDateTimeElement(convertDateTime(src.getOccurrenceDateTimeElement())); if (src.hasPerformer()) tgt.setPerformer(convertReference(src.getPerformer())); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); - for (org.hl7.fhir.r5.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + for (CodeableReference t : src.getReason()) + if (t.hasConcept()) + tgt.addReasonCode(convertCodeableConcept(t.getConcept())); + for (CodeableReference t : src.getReason()) + if (t.hasReference()) + tgt.addReasonReference(convertReference(t.getReference())); for (org.hl7.fhir.r5.model.Annotation t : src.getNote()) tgt.addNote(convertAnnotation(t)); for (org.hl7.fhir.r5.model.Reference t : src.getEvaluationMessage()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ImagingStudy.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ImagingStudy.java index f84b7b0f4..7bb2fcaf5 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ImagingStudy.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ImagingStudy.java @@ -22,6 +22,7 @@ package org.hl7.fhir.convertors.conv40_50; import org.hl7.fhir.exceptions.FHIRException; +import org.hl7.fhir.r5.model.CodeableReference; import org.hl7.fhir.r5.model.ImagingStudy.ImagingStudyProcedureComponent; import org.hl7.fhir.convertors.VersionConvertor_40_50; @@ -96,9 +97,9 @@ public class ImagingStudy extends VersionConvertor_40_50 { if (src.hasLocation()) tgt.setLocation(convertReference(src.getLocation())); for (org.hl7.fhir.r4.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); + tgt.addReason(convertCodeableConceptToCodeableReference(t)); for (org.hl7.fhir.r4.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + tgt.addReason(convertReferenceToCodeableReference(t)); for (org.hl7.fhir.r4.model.Annotation t : src.getNote()) tgt.addNote(convertAnnotation(t)); if (src.hasDescription()) @@ -146,10 +147,12 @@ public class ImagingStudy extends VersionConvertor_40_50 { } if (src.hasLocation()) tgt.setLocation(convertReference(src.getLocation())); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); - for (org.hl7.fhir.r5.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + for (CodeableReference t : src.getReason()) + if (t.hasConcept()) + tgt.addReasonCode(convertCodeableConcept(t.getConcept())); + for (CodeableReference t : src.getReason()) + if (t.hasReference()) + tgt.addReasonReference(convertReference(t.getReference())); for (org.hl7.fhir.r5.model.Annotation t : src.getNote()) tgt.addNote(convertAnnotation(t)); if (src.hasDescription()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Immunization.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Immunization.java index 050283e38..a2e4f2a0e 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Immunization.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Immunization.java @@ -22,7 +22,7 @@ package org.hl7.fhir.convertors.conv40_50; import org.hl7.fhir.exceptions.FHIRException; - +import org.hl7.fhir.r5.model.CodeableReference; import org.hl7.fhir.convertors.VersionConvertor_40_50; @@ -104,9 +104,9 @@ public class Immunization extends VersionConvertor_40_50 { for (org.hl7.fhir.r4.model.Annotation t : src.getNote()) tgt.addNote(convertAnnotation(t)); for (org.hl7.fhir.r4.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); + tgt.addReason(convertCodeableConceptToCodeableReference(t)); for (org.hl7.fhir.r4.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + tgt.addReason(convertReferenceToCodeableReference(t)); if (src.hasIsSubpotent()) tgt.setIsSubpotentElement(convertBoolean(src.getIsSubpotentElement())); for (org.hl7.fhir.r4.model.CodeableConcept t : src.getSubpotentReason()) @@ -167,10 +167,12 @@ public class Immunization extends VersionConvertor_40_50 { tgt.addPerformer(convertImmunizationPerformerComponent(t)); for (org.hl7.fhir.r5.model.Annotation t : src.getNote()) tgt.addNote(convertAnnotation(t)); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); - for (org.hl7.fhir.r5.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + for (CodeableReference t : src.getReason()) + if (t.hasConcept()) + tgt.addReasonCode(convertCodeableConcept(t.getConcept())); + for (CodeableReference t : src.getReason()) + if (t.hasReference()) + tgt.addReasonReference(convertReference(t.getReference())); if (src.hasIsSubpotent()) tgt.setIsSubpotentElement(convertBoolean(src.getIsSubpotentElement())); for (org.hl7.fhir.r5.model.CodeableConcept t : src.getSubpotentReason()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationAdministration.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationAdministration.java index 48c199c05..5ac2236f0 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationAdministration.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationAdministration.java @@ -23,6 +23,7 @@ package org.hl7.fhir.convertors.conv40_50; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r4.model.CodeType; +import org.hl7.fhir.r5.model.CodeableReference; import org.hl7.fhir.r5.model.Enumeration; import org.hl7.fhir.r5.model.MedicationAdministration.MedicationAdministrationStatusCodes; import org.hl7.fhir.r5.model.MedicationDispense.MedicationDispenseStatusCodes; @@ -93,9 +94,9 @@ public class MedicationAdministration extends VersionConvertor_40_50 { for (org.hl7.fhir.r4.model.MedicationAdministration.MedicationAdministrationPerformerComponent t : src.getPerformer()) tgt.addPerformer(convertMedicationAdministrationPerformerComponent(t)); for (org.hl7.fhir.r4.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); + tgt.addReason(convertCodeableConceptToCodeableReference(t)); for (org.hl7.fhir.r4.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + tgt.addReason(convertReferenceToCodeableReference(t)); if (src.hasRequest()) tgt.setRequest(convertReference(src.getRequest())); for (org.hl7.fhir.r4.model.Reference t : src.getDevice()) @@ -138,10 +139,12 @@ public class MedicationAdministration extends VersionConvertor_40_50 { tgt.setEffective(convertType(src.getOccurence())); for (org.hl7.fhir.r5.model.MedicationAdministration.MedicationAdministrationPerformerComponent t : src.getPerformer()) tgt.addPerformer(convertMedicationAdministrationPerformerComponent(t)); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); - for (org.hl7.fhir.r5.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + for (CodeableReference t : src.getReason()) + if (t.hasConcept()) + tgt.addReasonCode(convertCodeableConcept(t.getConcept())); + for (CodeableReference t : src.getReason()) + if (t.hasReference()) + tgt.addReasonReference(convertReference(t.getReference())); if (src.hasRequest()) tgt.setRequest(convertReference(src.getRequest())); for (org.hl7.fhir.r5.model.Reference t : src.getDevice()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationKnowledge.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationKnowledge.java index 93610a36a..fd7419979 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationKnowledge.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationKnowledge.java @@ -255,8 +255,8 @@ public class MedicationKnowledge extends VersionConvertor_40_50 { tgt.setItem(convertType(src.getItem())); if (src.hasIsActive()) tgt.setIsActiveElement(convertBoolean(src.getIsActiveElement())); - if (src.hasStrength()) - tgt.setStrength(convertRatio(src.getStrength())); + if (src.hasStrengthRatio()) + tgt.setStrength(convertRatio(src.getStrengthRatio())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationRequest.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationRequest.java index 9867b7168..25e9eafba 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationRequest.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationRequest.java @@ -316,7 +316,7 @@ public class MedicationRequest extends VersionConvertor_40_50 { if (src.hasExpectedSupplyDuration()) tgt.setExpectedSupplyDuration(convertDuration(src.getExpectedSupplyDuration())); if (src.hasPerformer()) - tgt.setPerformer(convertReference(src.getPerformer())); + tgt.setDispenser(convertReference(src.getPerformer())); return tgt; } @@ -337,8 +337,8 @@ public class MedicationRequest extends VersionConvertor_40_50 { tgt.setQuantity(convertSimpleQuantity(src.getQuantity())); if (src.hasExpectedSupplyDuration()) tgt.setExpectedSupplyDuration(convertDuration(src.getExpectedSupplyDuration())); - if (src.hasPerformer()) - tgt.setPerformer(convertReference(src.getPerformer())); + if (src.hasDispenser()) + tgt.setPerformer(convertReference(src.getDispenser())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationStatement.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationStatement.java index 6bb3ffd1c..f8af93e12 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationStatement.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationStatement.java @@ -22,7 +22,7 @@ package org.hl7.fhir.convertors.conv40_50; import org.hl7.fhir.exceptions.FHIRException; - +import org.hl7.fhir.r5.model.CodeableReference; import org.hl7.fhir.convertors.VersionConvertor_40_50; @@ -92,9 +92,9 @@ public class MedicationStatement extends VersionConvertor_40_50 { for (org.hl7.fhir.r4.model.Reference t : src.getDerivedFrom()) tgt.addDerivedFrom(convertReference(t)); for (org.hl7.fhir.r4.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); + tgt.addReason(convertCodeableConceptToCodeableReference(t)); for (org.hl7.fhir.r4.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + tgt.addReason(convertReferenceToCodeableReference(t)); for (org.hl7.fhir.r4.model.Annotation t : src.getNote()) tgt.addNote(convertAnnotation(t)); for (org.hl7.fhir.r4.model.Dosage t : src.getDosage()) @@ -133,10 +133,12 @@ public class MedicationStatement extends VersionConvertor_40_50 { tgt.setInformationSource(convertReference(src.getInformationSource())); for (org.hl7.fhir.r5.model.Reference t : src.getDerivedFrom()) tgt.addDerivedFrom(convertReference(t)); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); - for (org.hl7.fhir.r5.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + for (CodeableReference t : src.getReason()) + if (t.hasConcept()) + tgt.addReasonCode(convertCodeableConcept(t.getConcept())); + for (CodeableReference t : src.getReason()) + if (t.hasReference()) + tgt.addReasonReference(convertReference(t.getReference())); for (org.hl7.fhir.r5.model.Annotation t : src.getNote()) tgt.addNote(convertAnnotation(t)); for (org.hl7.fhir.r5.model.Dosage t : src.getDosage()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Procedure.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Procedure.java index 150649fb5..2806a715b 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Procedure.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Procedure.java @@ -22,7 +22,7 @@ package org.hl7.fhir.convertors.conv40_50; import org.hl7.fhir.exceptions.FHIRException; - +import org.hl7.fhir.r5.model.CodeableReference; import org.hl7.fhir.convertors.VersionConvertor_40_50; @@ -98,9 +98,9 @@ public class Procedure extends VersionConvertor_40_50 { if (src.hasLocation()) tgt.setLocation(convertReference(src.getLocation())); for (org.hl7.fhir.r4.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); + tgt.addReason(convertCodeableConceptToCodeableReference(t)); for (org.hl7.fhir.r4.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + tgt.addReason(convertReferenceToCodeableReference(t)); for (org.hl7.fhir.r4.model.CodeableConcept t : src.getBodySite()) tgt.addBodySite(convertCodeableConcept(t)); if (src.hasOutcome()) @@ -118,9 +118,9 @@ public class Procedure extends VersionConvertor_40_50 { for (org.hl7.fhir.r4.model.Procedure.ProcedureFocalDeviceComponent t : src.getFocalDevice()) tgt.addFocalDevice(convertProcedureFocalDeviceComponent(t)); for (org.hl7.fhir.r4.model.Reference t : src.getUsedReference()) - tgt.addUsedReference(convertReference(t)); + tgt.addUsed(convertReferenceToCodeableReference(t)); for (org.hl7.fhir.r4.model.CodeableConcept t : src.getUsedCode()) - tgt.addUsedCode(convertCodeableConcept(t)); + tgt.addUsed(convertCodeableConceptToCodeableReference(t)); return tgt; } @@ -161,10 +161,12 @@ public class Procedure extends VersionConvertor_40_50 { tgt.addPerformer(convertProcedurePerformerComponent(t)); if (src.hasLocation()) tgt.setLocation(convertReference(src.getLocation())); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); - for (org.hl7.fhir.r5.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + for (CodeableReference t : src.getReason()) + if (t.hasConcept()) + tgt.addReasonCode(convertCodeableConcept(t.getConcept())); + for (CodeableReference t : src.getReason()) + if (t.hasReference()) + tgt.addReasonReference(convertReference(t.getReference())); for (org.hl7.fhir.r5.model.CodeableConcept t : src.getBodySite()) tgt.addBodySite(convertCodeableConcept(t)); if (src.hasOutcome()) @@ -181,10 +183,12 @@ public class Procedure extends VersionConvertor_40_50 { tgt.addNote(convertAnnotation(t)); for (org.hl7.fhir.r5.model.Procedure.ProcedureFocalDeviceComponent t : src.getFocalDevice()) tgt.addFocalDevice(convertProcedureFocalDeviceComponent(t)); - for (org.hl7.fhir.r5.model.Reference t : src.getUsedReference()) - tgt.addUsedReference(convertReference(t)); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getUsedCode()) - tgt.addUsedCode(convertCodeableConcept(t)); + for (CodeableReference t : src.getUsed()) + if (t.hasReference()) + tgt.addUsedReference(convertReference(t.getReference())); + for (CodeableReference t : src.getUsed()) + if (t.hasConcept()) + tgt.addUsedCode(convertCodeableConcept(t.getConcept())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/RequestGroup.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/RequestGroup.java index 69a6a3ee4..ca711698e 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/RequestGroup.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/RequestGroup.java @@ -22,7 +22,7 @@ package org.hl7.fhir.convertors.conv40_50; import org.hl7.fhir.exceptions.FHIRException; - +import org.hl7.fhir.r5.model.CodeableReference; import org.hl7.fhir.convertors.VersionConvertor_40_50; @@ -94,9 +94,9 @@ public class RequestGroup extends VersionConvertor_40_50 { if (src.hasAuthor()) tgt.setAuthor(convertReference(src.getAuthor())); for (org.hl7.fhir.r4.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); + tgt.addReason(convertCodeableConceptToCodeableReference(t)); for (org.hl7.fhir.r4.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + tgt.addReason(convertReferenceToCodeableReference(t)); for (org.hl7.fhir.r4.model.Annotation t : src.getNote()) tgt.addNote(convertAnnotation(t)); for (org.hl7.fhir.r4.model.RequestGroup.RequestGroupActionComponent t : src.getAction()) @@ -137,10 +137,12 @@ public class RequestGroup extends VersionConvertor_40_50 { tgt.setAuthoredOnElement(convertDateTime(src.getAuthoredOnElement())); if (src.hasAuthor()) tgt.setAuthor(convertReference(src.getAuthor())); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); - for (org.hl7.fhir.r5.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + for (CodeableReference t : src.getReason()) + if (t.hasConcept()) + tgt.addReasonCode(convertCodeableConcept(t.getConcept())); + for (CodeableReference t : src.getReason()) + if (t.hasReference()) + tgt.addReasonReference(convertReference(t.getReference())); for (org.hl7.fhir.r5.model.Annotation t : src.getNote()) tgt.addNote(convertAnnotation(t)); for (org.hl7.fhir.r5.model.RequestGroup.RequestGroupActionComponent t : src.getAction()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/RiskAssessment.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/RiskAssessment.java index d713b7749..42af75379 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/RiskAssessment.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/RiskAssessment.java @@ -22,7 +22,7 @@ package org.hl7.fhir.convertors.conv40_50; import org.hl7.fhir.exceptions.FHIRException; - +import org.hl7.fhir.r5.model.CodeableReference; import org.hl7.fhir.convertors.VersionConvertor_40_50; @@ -88,9 +88,9 @@ public class RiskAssessment extends VersionConvertor_40_50 { if (src.hasPerformer()) tgt.setPerformer(convertReference(src.getPerformer())); for (org.hl7.fhir.r4.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); + tgt.addReason(convertCodeableConceptToCodeableReference(t)); for (org.hl7.fhir.r4.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + tgt.addReason(convertReferenceToCodeableReference(t)); for (org.hl7.fhir.r4.model.Reference t : src.getBasis()) tgt.addBasis(convertReference(t)); for (org.hl7.fhir.r4.model.RiskAssessment.RiskAssessmentPredictionComponent t : src.getPrediction()) @@ -129,10 +129,12 @@ public class RiskAssessment extends VersionConvertor_40_50 { tgt.setCondition(convertReference(src.getCondition())); if (src.hasPerformer()) tgt.setPerformer(convertReference(src.getPerformer())); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); - for (org.hl7.fhir.r5.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + for (CodeableReference t : src.getReason()) + if (t.hasConcept()) + tgt.addReasonCode(convertCodeableConcept(t.getConcept())); + for (CodeableReference t : src.getReason()) + if (t.hasReference()) + tgt.addReasonReference(convertReference(t.getReference())); for (org.hl7.fhir.r5.model.Reference t : src.getBasis()) tgt.addBasis(convertReference(t)); for (org.hl7.fhir.r5.model.RiskAssessment.RiskAssessmentPredictionComponent t : src.getPrediction()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ServiceRequest.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ServiceRequest.java index a9f60f425..30c71e90c 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ServiceRequest.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ServiceRequest.java @@ -22,7 +22,7 @@ package org.hl7.fhir.convertors.conv40_50; import org.hl7.fhir.exceptions.FHIRException; - +import org.hl7.fhir.r5.model.CodeableReference; import org.hl7.fhir.convertors.VersionConvertor_40_50; @@ -110,13 +110,13 @@ public class ServiceRequest extends VersionConvertor_40_50 { for (org.hl7.fhir.r4.model.Reference t : src.getPerformer()) tgt.addPerformer(convertReference(t)); for (org.hl7.fhir.r4.model.CodeableConcept t : src.getLocationCode()) - tgt.addLocationCode(convertCodeableConcept(t)); + tgt.addLocation(convertCodeableConceptToCodeableReference(t)); for (org.hl7.fhir.r4.model.Reference t : src.getLocationReference()) - tgt.addLocationReference(convertReference(t)); + tgt.addLocation(convertReferenceToCodeableReference(t)); for (org.hl7.fhir.r4.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); + tgt.addReason(convertCodeableConceptToCodeableReference(t)); for (org.hl7.fhir.r4.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + tgt.addReason(convertReferenceToCodeableReference(t)); for (org.hl7.fhir.r4.model.Reference t : src.getInsurance()) tgt.addInsurance(convertReference(t)); for (org.hl7.fhir.r4.model.Reference t : src.getSupportingInfo()) @@ -183,14 +183,18 @@ public class ServiceRequest extends VersionConvertor_40_50 { tgt.setPerformerType(convertCodeableConcept(src.getPerformerType())); for (org.hl7.fhir.r5.model.Reference t : src.getPerformer()) tgt.addPerformer(convertReference(t)); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getLocationCode()) - tgt.addLocationCode(convertCodeableConcept(t)); - for (org.hl7.fhir.r5.model.Reference t : src.getLocationReference()) - tgt.addLocationReference(convertReference(t)); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); - for (org.hl7.fhir.r5.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + for (CodeableReference t : src.getLocation()) + if (t.hasConcept()) + tgt.addLocationCode(convertCodeableConcept(t.getConcept())); + for (CodeableReference t : src.getLocation()) + if (t.hasReference()) + tgt.addLocationReference(convertReference(t.getReference())); + for (CodeableReference t : src.getReason()) + if (t.hasConcept()) + tgt.addReasonCode(convertCodeableConcept(t.getConcept())); + for (CodeableReference t : src.getReason()) + if (t.hasReference()) + tgt.addReasonReference(convertReference(t.getReference())); for (org.hl7.fhir.r5.model.Reference t : src.getInsurance()) tgt.addInsurance(convertReference(t)); for (org.hl7.fhir.r5.model.Reference t : src.getSupportingInfo()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SupplyRequest.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SupplyRequest.java index e5271d526..daff6282b 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SupplyRequest.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SupplyRequest.java @@ -22,7 +22,7 @@ package org.hl7.fhir.convertors.conv40_50; import org.hl7.fhir.exceptions.FHIRException; - +import org.hl7.fhir.r5.model.CodeableReference; import org.hl7.fhir.convertors.VersionConvertor_40_50; @@ -88,9 +88,9 @@ public class SupplyRequest extends VersionConvertor_40_50 { for (org.hl7.fhir.r4.model.Reference t : src.getSupplier()) tgt.addSupplier(convertReference(t)); for (org.hl7.fhir.r4.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); + tgt.addReason(convertCodeableConceptToCodeableReference(t)); for (org.hl7.fhir.r4.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + tgt.addReason(convertReferenceToCodeableReference(t)); if (src.hasDeliverFrom()) tgt.setDeliverFrom(convertReference(src.getDeliverFrom())); if (src.hasDeliverTo()) @@ -125,10 +125,12 @@ public class SupplyRequest extends VersionConvertor_40_50 { tgt.setRequester(convertReference(src.getRequester())); for (org.hl7.fhir.r5.model.Reference t : src.getSupplier()) tgt.addSupplier(convertReference(t)); - for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReasonCode()) - tgt.addReasonCode(convertCodeableConcept(t)); - for (org.hl7.fhir.r5.model.Reference t : src.getReasonReference()) - tgt.addReasonReference(convertReference(t)); + for (CodeableReference t : src.getReason()) + if (t.hasConcept()) + tgt.addReasonCode(convertCodeableConcept(t.getConcept())); + for (CodeableReference t : src.getReason()) + if (t.hasReference()) + tgt.addReasonReference(convertReference(t.getReference())); if (src.hasDeliverFrom()) tgt.setDeliverFrom(convertReference(src.getDeliverFrom())); if (src.hasDeliverTo()) diff --git a/org.hl7.fhir.core.generator/configuration/Constants.java b/org.hl7.fhir.core.generator/configuration/Constants.java new file mode 100644 index 000000000..38de2ad58 --- /dev/null +++ b/org.hl7.fhir.core.generator/configuration/Constants.java @@ -0,0 +1,18 @@ +package org.hl7.fhir.r5.model; + +// generated + +{{license}} + +{{startMark}} + +public class Constants { + + public final static String LOCAL_REF_REGEX = "({{rt}})\\\\/[A-Za-z0-9\\\\-\\\\.]{1,64}\"; + public final static String NS_SYSTEM_TYPE = "http://hl7.org/fhirpath/System."; + + public final static String VERSION = "{{version}}"; + public final static String VERSION_MM = "{{version-mm}}"; + public final static String DATE = "{{date}}"; + public final static String URI_REGEX = "((http|https)://([A-Za-z0-9\\\\\\.\\:\\%\\$]*\\/)*)?({{rt}})\\/[A-Za-z0-9\\-\\.]{1,64}(\\/_history\\/[A-Za-z0-9\\-\\.]{1,64})?"; +} diff --git a/org.hl7.fhir.core.generator/configuration/FHIRVersion.java b/org.hl7.fhir.core.generator/configuration/FHIRVersion.java index f3a1477e5..e8eb76f2c 100644 --- a/org.hl7.fhir.core.generator/configuration/FHIRVersion.java +++ b/org.hl7.fhir.core.generator/configuration/FHIRVersion.java @@ -51,7 +51,7 @@ return true; if ("4.0.0".equals(codeString)) return true; - if ("4.1.0".equals(codeString)) + if ("4.2.0".equals(codeString)) return true; return false; } diff --git a/org.hl7.fhir.core.generator/configuration/XmlParser.java b/org.hl7.fhir.core.generator/configuration/XmlParser.java index 8895e2259..16d159b96 100644 --- a/org.hl7.fhir.core.generator/configuration/XmlParser.java +++ b/org.hl7.fhir.core.generator/configuration/XmlParser.java @@ -1,6 +1,5 @@ package org.hl7.fhir.r5.formats; - // generated {{license}} diff --git a/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/codegen/Configuration.java b/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/codegen/Configuration.java index 5ed9c818b..0f30ad85f 100644 --- a/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/codegen/Configuration.java +++ b/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/codegen/Configuration.java @@ -3,9 +3,11 @@ package org.hl7.fhir.core.generator.codegen; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Locale; import java.util.Map; import org.hl7.fhir.utilities.IniFile; @@ -13,7 +15,9 @@ import org.hl7.fhir.utilities.TextFile; import org.hl7.fhir.utilities.Utilities; public class Configuration { - + public static final SimpleDateFormat DATE_FORMAT() { + return new SimpleDateFormat("EEE, MMM d, yyyy HH:mmZ", new Locale("en", "US")); + } private String license; private IniFile ini; private Map adornments = new HashMap<>(); diff --git a/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/codegen/JavaBaseGenerator.java b/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/codegen/JavaBaseGenerator.java index dcfcae1bc..24031afc9 100644 --- a/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/codegen/JavaBaseGenerator.java +++ b/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/codegen/JavaBaseGenerator.java @@ -73,8 +73,8 @@ public class JavaBaseGenerator extends OutputStreamWriter { } public String startVMarkValue() { - // return "// Generated on "+Config.DATE_FORMAT().format(genDate)+" for FHIR v"+version+"\r\n\r\n"; - return "// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0\r\n\r\n"; + return "// Generated on "+config.DATE_FORMAT().format(genDate)+" for FHIR v"+version+"\r\n\r\n"; +// return "// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0\r\n\r\n"; } diff --git a/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/codegen/JavaConstantsGenerator.java b/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/codegen/JavaConstantsGenerator.java new file mode 100644 index 000000000..e2fad65c5 --- /dev/null +++ b/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/codegen/JavaConstantsGenerator.java @@ -0,0 +1,45 @@ +package org.hl7.fhir.core.generator.codegen; + +import java.io.OutputStream; +import java.io.UnsupportedEncodingException; +import java.util.Date; + +import org.hl7.fhir.core.generator.engine.Definitions; +import org.hl7.fhir.r5.model.StructureDefinition; +import org.hl7.fhir.r5.model.StructureDefinition.StructureDefinitionKind; +import org.hl7.fhir.r5.model.StructureDefinition.TypeDerivationRule; +import org.hl7.fhir.utilities.VersionUtilities; + +public class JavaConstantsGenerator extends JavaBaseGenerator { + + + public JavaConstantsGenerator(OutputStream out, Definitions definitions, Configuration configuration, Date genDate, String version) throws UnsupportedEncodingException { + super(out, definitions, configuration, version, genDate); + } + + public void generate() throws Exception { + StringBuilder rt = new StringBuilder(); + boolean first = true; + for (StructureDefinition sd : definitions.getStructures().getSortedList()) { + if (sd.getKind() == StructureDefinitionKind.RESOURCE && sd.getDerivation()==TypeDerivationRule.SPECIALIZATION && !sd.getAbstract()) { + if (first) first = false; else rt.append("|"); + rt.append(sd.getType()); + version = sd.getVersion(); + } + } + + String template = config.getAdornments().get("Constants"); + template = template.replace("{{license}}", config.getLicense()); + template = template.replace("{{startMark}}", startVMarkValue()); + + template = template.replace("{{rt}}", rt.toString()); + template = template.replace("{{version}}", version); + template = template.replace("{{version-mm}}", VersionUtilities.getMajMin(version)); + template = template.replace("{{date}}", config.DATE_FORMAT().format(genDate)); + + write(template); + flush(); + close(); + } + +} diff --git a/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/engine/JavaCoreGenerator.java b/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/engine/JavaCoreGenerator.java index b866cc081..6c5bdfc7e 100644 --- a/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/engine/JavaCoreGenerator.java +++ b/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/engine/JavaCoreGenerator.java @@ -12,6 +12,7 @@ import java.util.Map; import org.hl7.fhir.core.generator.analysis.Analyser; import org.hl7.fhir.core.generator.analysis.Analysis; import org.hl7.fhir.core.generator.codegen.Configuration; +import org.hl7.fhir.core.generator.codegen.JavaConstantsGenerator; import org.hl7.fhir.core.generator.codegen.JavaEnumerationsGenerator; import org.hl7.fhir.core.generator.codegen.JavaFactoryGenerator; import org.hl7.fhir.core.generator.codegen.JavaParserJsonGenerator; @@ -78,6 +79,10 @@ public class JavaCoreGenerator { updateExpansions(master, expansions); System.out.println("Generate Model"); + System.out.println(" .. Constants"); + JavaConstantsGenerator cgen = new JavaConstantsGenerator(new FileOutputStream(Utilities.path(dest, "src", "org", "hl7", "fhir", "r5", "model", "Constants.java")), master, config, date, npm.version()); + cgen.generate(); + cgen.close(); System.out.println(" .. Enumerations"); JavaEnumerationsGenerator egen = new JavaEnumerationsGenerator(new FileOutputStream(Utilities.path(dest, "src", "org", "hl7", "fhir", "r5", "model", "Enumerations.java")), master, config, date, npm.version()); egen.generate(); diff --git a/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/loader/DefinitionsLoader.java b/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/loader/DefinitionsLoader.java index f202f1f38..a9f4b15d8 100644 --- a/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/loader/DefinitionsLoader.java +++ b/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/loader/DefinitionsLoader.java @@ -3,12 +3,14 @@ package org.hl7.fhir.core.generator.loader; import java.io.IOException; import org.hl7.fhir.core.generator.engine.Definitions; +import org.hl7.fhir.exceptions.FHIRFormatError; import org.hl7.fhir.r5.formats.JsonParser; import org.hl7.fhir.r5.model.CapabilityStatement; import org.hl7.fhir.r5.model.CodeSystem; import org.hl7.fhir.r5.model.CompartmentDefinition; import org.hl7.fhir.r5.model.ConceptMap; import org.hl7.fhir.r5.model.OperationDefinition; +import org.hl7.fhir.r5.model.Resource; import org.hl7.fhir.r5.model.SearchParameter; import org.hl7.fhir.r5.model.StructureDefinition; import org.hl7.fhir.r5.model.ValueSet; @@ -22,29 +24,37 @@ public class DefinitionsLoader { Definitions res = new Definitions(); for (String t : npm.listResources("CodeSystem")) { - res.getCodeSystems().see((CodeSystem) new JsonParser().parse(npm.loadResource(t))); + res.getCodeSystems().see((CodeSystem) load(npm, t)); } for (String t : npm.listResources("ValueSet")) { - res.getValuesets().see((ValueSet) new JsonParser().parse(npm.loadResource(t))); + res.getValuesets().see((ValueSet) load(npm, t)); } for (String t : npm.listResources("ConceptMap")) { - res.getConceptMaps().see((ConceptMap) new JsonParser().parse(npm.loadResource(t))); + res.getConceptMaps().see((ConceptMap) load(npm, t)); } for (String t : npm.listResources("CapabilityStatement")) { - res.getStatements().see((CapabilityStatement) new JsonParser().parse(npm.loadResource(t))); + res.getStatements().see((CapabilityStatement) load(npm, t)); } for (String t : npm.listResources("StructureDefinition")) { - res.getStructures().see((StructureDefinition) new JsonParser().parse(npm.loadResource(t))); + res.getStructures().see((StructureDefinition) load(npm, t)); } for (String t : npm.listResources("OperationDefinition")) { - res.getOperations().see((OperationDefinition) new JsonParser().parse(npm.loadResource(t))); + res.getOperations().see((OperationDefinition) load(npm, t)); } for (String t : npm.listResources("SearchParameter")) { - res.getSearchParams().see((SearchParameter) new JsonParser().parse(npm.loadResource(t))); + res.getSearchParams().see((SearchParameter) load(npm, t)); } for (String t : npm.listResources("CompartmentDefinition")) { - res.getCompartments().see((CompartmentDefinition) new JsonParser().parse(npm.loadResource(t))); + res.getCompartments().see((CompartmentDefinition) load(npm, t)); } return res; } + + public static Resource load(NpmPackage npm, String t) { + try { + return new JsonParser().parse(npm.loadResource(t)); + } catch (Exception e) { + throw new Error("Error reading "+t+": "+e.getMessage(), e); + } + } } 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 44a174512..c8b807134 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 @@ -50,7 +50,7 @@ package org.hl7.fhir.r5.formats; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent @@ -3136,16 +3136,10 @@ public class JsonParser extends JsonParserBase { }; if (json.has("appointmentType")) res.setAppointmentType(parseCodeableConcept(json.getAsJsonObject("appointmentType"))); - if (json.has("reasonCode")) { - JsonArray array = json.getAsJsonArray("reasonCode"); + if (json.has("reason")) { + JsonArray array = json.getAsJsonArray("reason"); for (int i = 0; i < array.size(); i++) { - res.getReasonCode().add(parseCodeableConcept(array.get(i).getAsJsonObject())); - } - }; - if (json.has("reasonReference")) { - JsonArray array = json.getAsJsonArray("reasonReference"); - for (int i = 0; i < array.size(); i++) { - res.getReasonReference().add(parseReference(array.get(i).getAsJsonObject())); + res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject())); } }; if (json.has("priority")) @@ -5076,16 +5070,10 @@ public class JsonParser extends JsonParserBase { res.getCareTeam().add(parseReference(array.get(i).getAsJsonObject())); } }; - if (json.has("addressesCode")) { - JsonArray array = json.getAsJsonArray("addressesCode"); + if (json.has("addresses")) { + JsonArray array = json.getAsJsonArray("addresses"); for (int i = 0; i < array.size(); i++) { - res.getAddressesCode().add(parseCodeableConcept(array.get(i).getAsJsonObject())); - } - }; - if (json.has("addressesReference")) { - JsonArray array = json.getAsJsonArray("addressesReference"); - for (int i = 0; i < array.size(); i++) { - res.getAddressesReference().add(parseReference(array.get(i).getAsJsonObject())); + res.getAddresses().add(parseCodeableReference(array.get(i).getAsJsonObject())); } }; if (json.has("supportingInfo")) { @@ -5122,16 +5110,10 @@ public class JsonParser extends JsonParserBase { protected void parseCarePlanActivityComponentProperties(JsonObject json, CarePlan.CarePlanActivityComponent res) throws IOException, FHIRFormatError { parseBackboneElementProperties(json, res); - if (json.has("outcomeCodeableConcept")) { - JsonArray array = json.getAsJsonArray("outcomeCodeableConcept"); + if (json.has("outcome")) { + JsonArray array = json.getAsJsonArray("outcome"); for (int i = 0; i < array.size(); i++) { - res.getOutcomeCodeableConcept().add(parseCodeableConcept(array.get(i).getAsJsonObject())); - } - }; - if (json.has("outcomeReference")) { - JsonArray array = json.getAsJsonArray("outcomeReference"); - for (int i = 0; i < array.size(); i++) { - res.getOutcomeReference().add(parseReference(array.get(i).getAsJsonObject())); + res.getOutcome().add(parseCodeableReference(array.get(i).getAsJsonObject())); } }; if (json.has("progress")) { @@ -5198,16 +5180,10 @@ public class JsonParser extends JsonParserBase { }; if (json.has("code")) res.setCode(parseCodeableConcept(json.getAsJsonObject("code"))); - if (json.has("reasonCode")) { - JsonArray array = json.getAsJsonArray("reasonCode"); + if (json.has("reason")) { + JsonArray array = json.getAsJsonArray("reason"); for (int i = 0; i < array.size(); i++) { - res.getReasonCode().add(parseCodeableConcept(array.get(i).getAsJsonObject())); - } - }; - if (json.has("reasonReference")) { - JsonArray array = json.getAsJsonArray("reasonReference"); - for (int i = 0; i < array.size(); i++) { - res.getReasonReference().add(parseReference(array.get(i).getAsJsonObject())); + res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject())); } }; if (json.has("goal")) { @@ -5291,16 +5267,10 @@ public class JsonParser extends JsonParserBase { res.getParticipant().add(parseCareTeamParticipantComponent(array.get(i).getAsJsonObject())); } }; - if (json.has("reasonCode")) { - JsonArray array = json.getAsJsonArray("reasonCode"); + if (json.has("reason")) { + JsonArray array = json.getAsJsonArray("reason"); for (int i = 0; i < array.size(); i++) { - res.getReasonCode().add(parseCodeableConcept(array.get(i).getAsJsonObject())); - } - }; - if (json.has("reasonReference")) { - JsonArray array = json.getAsJsonArray("reasonReference"); - for (int i = 0; i < array.size(); i++) { - res.getReasonReference().add(parseReference(array.get(i).getAsJsonObject())); + res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject())); } }; if (json.has("managingOrganization")) { @@ -7106,10 +7076,8 @@ public class JsonParser extends JsonParserBase { protected void parseClinicalImpressionFindingComponentProperties(JsonObject json, ClinicalImpression.ClinicalImpressionFindingComponent res) throws IOException, FHIRFormatError { parseBackboneElementProperties(json, res); - if (json.has("itemCodeableConcept")) - res.setItemCodeableConcept(parseCodeableConcept(json.getAsJsonObject("itemCodeableConcept"))); - if (json.has("itemReference")) - res.setItemReference(parseReference(json.getAsJsonObject("itemReference"))); + if (json.has("item")) + res.setItem(parseCodeableReference(json.getAsJsonObject("item"))); if (json.has("basis")) res.setBasisElement(parseString(json.get("basis").getAsString())); if (json.has("_basis")) @@ -7690,16 +7658,10 @@ public class JsonParser extends JsonParserBase { }; if (json.has("sender")) res.setSender(parseReference(json.getAsJsonObject("sender"))); - if (json.has("reasonCode")) { - JsonArray array = json.getAsJsonArray("reasonCode"); + if (json.has("reason")) { + JsonArray array = json.getAsJsonArray("reason"); for (int i = 0; i < array.size(); i++) { - res.getReasonCode().add(parseCodeableConcept(array.get(i).getAsJsonObject())); - } - }; - if (json.has("reasonReference")) { - JsonArray array = json.getAsJsonArray("reasonReference"); - for (int i = 0; i < array.size(); i++) { - res.getReasonReference().add(parseReference(array.get(i).getAsJsonObject())); + res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject())); } }; if (json.has("payload")) { @@ -7820,16 +7782,10 @@ public class JsonParser extends JsonParserBase { res.getInformationProvider().add(parseReference(array.get(i).getAsJsonObject())); } }; - if (json.has("reasonCode")) { - JsonArray array = json.getAsJsonArray("reasonCode"); + if (json.has("reason")) { + JsonArray array = json.getAsJsonArray("reason"); for (int i = 0; i < array.size(); i++) { - res.getReasonCode().add(parseCodeableConcept(array.get(i).getAsJsonObject())); - } - }; - if (json.has("reasonReference")) { - JsonArray array = json.getAsJsonArray("reasonReference"); - for (int i = 0; i < array.size(); i++) { - res.getReasonReference().add(parseReference(array.get(i).getAsJsonObject())); + res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject())); } }; if (json.has("note")) { @@ -9688,35 +9644,10 @@ public class JsonParser extends JsonParserBase { parseElementProperties(array.get(i).getAsJsonObject(), res.getPerformerLinkId().get(i)); } }; - if (json.has("reasonCode")) { - JsonArray array = json.getAsJsonArray("reasonCode"); - for (int i = 0; i < array.size(); i++) { - res.getReasonCode().add(parseCodeableConcept(array.get(i).getAsJsonObject())); - } - }; - if (json.has("reasonReference")) { - JsonArray array = json.getAsJsonArray("reasonReference"); - for (int i = 0; i < array.size(); i++) { - res.getReasonReference().add(parseReference(array.get(i).getAsJsonObject())); - } - }; if (json.has("reason")) { JsonArray array = json.getAsJsonArray("reason"); for (int i = 0; i < array.size(); i++) { - if (array.get(i).isJsonNull()) { - res.getReason().add(new StringType()); - } else {; - res.getReason().add(parseString(array.get(i).getAsString())); - } - } - }; - if (json.has("_reason")) { - JsonArray array = json.getAsJsonArray("_reason"); - for (int i = 0; i < array.size(); i++) { - if (i == res.getReason().size()) - res.getReason().add(parseString(null)); - if (array.get(i) instanceof JsonObject) - parseElementProperties(array.get(i).getAsJsonObject(), res.getReason().get(i)); + res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject())); } }; if (json.has("reasonLinkId")) { @@ -11100,16 +11031,10 @@ public class JsonParser extends JsonParserBase { res.setPerformerType(parseCodeableConcept(json.getAsJsonObject("performerType"))); if (json.has("performer")) res.setPerformer(parseReference(json.getAsJsonObject("performer"))); - if (json.has("reasonCode")) { - JsonArray array = json.getAsJsonArray("reasonCode"); + if (json.has("reason")) { + JsonArray array = json.getAsJsonArray("reason"); for (int i = 0; i < array.size(); i++) { - res.getReasonCode().add(parseCodeableConcept(array.get(i).getAsJsonObject())); - } - }; - if (json.has("reasonReference")) { - JsonArray array = json.getAsJsonArray("reasonReference"); - for (int i = 0; i < array.size(); i++) { - res.getReasonReference().add(parseReference(array.get(i).getAsJsonObject())); + res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject())); } }; if (json.has("insurance")) { @@ -11196,16 +11121,10 @@ public class JsonParser extends JsonParserBase { res.setSource(parseReference(json.getAsJsonObject("source"))); if (json.has("device")) res.setDevice(parseReference(json.getAsJsonObject("device"))); - if (json.has("reasonCode")) { - JsonArray array = json.getAsJsonArray("reasonCode"); + if (json.has("reason")) { + JsonArray array = json.getAsJsonArray("reason"); for (int i = 0; i < array.size(); i++) { - res.getReasonCode().add(parseCodeableConcept(array.get(i).getAsJsonObject())); - } - }; - if (json.has("reasonReference")) { - JsonArray array = json.getAsJsonArray("reasonReference"); - for (int i = 0; i < array.size(); i++) { - res.getReasonReference().add(parseReference(array.get(i).getAsJsonObject())); + res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject())); } }; if (json.has("bodySite")) @@ -11627,16 +11546,10 @@ public class JsonParser extends JsonParserBase { res.setPeriod(parsePeriod(json.getAsJsonObject("period"))); if (json.has("length")) res.setLength(parseDuration(json.getAsJsonObject("length"))); - if (json.has("reasonCode")) { - JsonArray array = json.getAsJsonArray("reasonCode"); + if (json.has("reason")) { + JsonArray array = json.getAsJsonArray("reason"); for (int i = 0; i < array.size(); i++) { - res.getReasonCode().add(parseCodeableConcept(array.get(i).getAsJsonObject())); - } - }; - if (json.has("reasonReference")) { - JsonArray array = json.getAsJsonArray("reasonReference"); - for (int i = 0; i < array.size(); i++) { - res.getReasonReference().add(parseReference(array.get(i).getAsJsonObject())); + res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject())); } }; if (json.has("diagnosis")) { @@ -14113,16 +14026,10 @@ public class JsonParser extends JsonParserBase { DataType deceased = parseType("deceased", json); if (deceased != null) res.setDeceased(deceased); - if (json.has("reasonCode")) { - JsonArray array = json.getAsJsonArray("reasonCode"); + if (json.has("reason")) { + JsonArray array = json.getAsJsonArray("reason"); for (int i = 0; i < array.size(); i++) { - res.getReasonCode().add(parseCodeableConcept(array.get(i).getAsJsonObject())); - } - }; - if (json.has("reasonReference")) { - JsonArray array = json.getAsJsonArray("reasonReference"); - for (int i = 0; i < array.size(); i++) { - res.getReasonReference().add(parseReference(array.get(i).getAsJsonObject())); + res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject())); } }; if (json.has("note")) { @@ -14302,16 +14209,10 @@ public class JsonParser extends JsonParserBase { res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject())); } }; - if (json.has("outcomeCode")) { - JsonArray array = json.getAsJsonArray("outcomeCode"); + if (json.has("outcome")) { + JsonArray array = json.getAsJsonArray("outcome"); for (int i = 0; i < array.size(); i++) { - res.getOutcomeCode().add(parseCodeableConcept(array.get(i).getAsJsonObject())); - } - }; - if (json.has("outcomeReference")) { - JsonArray array = json.getAsJsonArray("outcomeReference"); - for (int i = 0; i < array.size(); i++) { - res.getOutcomeReference().add(parseReference(array.get(i).getAsJsonObject())); + res.getOutcome().add(parseCodeableReference(array.get(i).getAsJsonObject())); } }; } @@ -14636,16 +14537,10 @@ public class JsonParser extends JsonParserBase { parseElementProperties(json.getAsJsonObject("_occurrenceDateTime"), res.getOccurrenceDateTimeElement()); if (json.has("performer")) res.setPerformer(parseReference(json.getAsJsonObject("performer"))); - if (json.has("reasonCode")) { - JsonArray array = json.getAsJsonArray("reasonCode"); + if (json.has("reason")) { + JsonArray array = json.getAsJsonArray("reason"); for (int i = 0; i < array.size(); i++) { - res.getReasonCode().add(parseCodeableConcept(array.get(i).getAsJsonObject())); - } - }; - if (json.has("reasonReference")) { - JsonArray array = json.getAsJsonArray("reasonReference"); - for (int i = 0; i < array.size(); i++) { - res.getReasonReference().add(parseReference(array.get(i).getAsJsonObject())); + res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject())); } }; if (json.has("note")) { @@ -14947,16 +14842,10 @@ public class JsonParser extends JsonParserBase { }; if (json.has("location")) res.setLocation(parseReference(json.getAsJsonObject("location"))); - if (json.has("reasonCode")) { - JsonArray array = json.getAsJsonArray("reasonCode"); + if (json.has("reason")) { + JsonArray array = json.getAsJsonArray("reason"); for (int i = 0; i < array.size(); i++) { - res.getReasonCode().add(parseCodeableConcept(array.get(i).getAsJsonObject())); - } - }; - if (json.has("reasonReference")) { - JsonArray array = json.getAsJsonArray("reasonReference"); - for (int i = 0; i < array.size(); i++) { - res.getReasonReference().add(parseReference(array.get(i).getAsJsonObject())); + res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject())); } }; if (json.has("note")) { @@ -15158,16 +15047,10 @@ public class JsonParser extends JsonParserBase { res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject())); } }; - if (json.has("reasonCode")) { - JsonArray array = json.getAsJsonArray("reasonCode"); + if (json.has("reason")) { + JsonArray array = json.getAsJsonArray("reason"); for (int i = 0; i < array.size(); i++) { - res.getReasonCode().add(parseCodeableConcept(array.get(i).getAsJsonObject())); - } - }; - if (json.has("reasonReference")) { - JsonArray array = json.getAsJsonArray("reasonReference"); - for (int i = 0; i < array.size(); i++) { - res.getReasonReference().add(parseReference(array.get(i).getAsJsonObject())); + res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject())); } }; if (json.has("isSubpotent")) @@ -17628,16 +17511,10 @@ public class JsonParser extends JsonParserBase { res.getPerformer().add(parseMedicationAdministrationPerformerComponent(array.get(i).getAsJsonObject())); } }; - if (json.has("reasonCode")) { - JsonArray array = json.getAsJsonArray("reasonCode"); + if (json.has("reason")) { + JsonArray array = json.getAsJsonArray("reason"); for (int i = 0; i < array.size(); i++) { - res.getReasonCode().add(parseCodeableConcept(array.get(i).getAsJsonObject())); - } - }; - if (json.has("reasonReference")) { - JsonArray array = json.getAsJsonArray("reasonReference"); - for (int i = 0; i < array.size(); i++) { - res.getReasonReference().add(parseReference(array.get(i).getAsJsonObject())); + res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject())); } }; if (json.has("request")) @@ -17797,6 +17674,10 @@ public class JsonParser extends JsonParserBase { res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject())); } }; + if (json.has("renderedDosageInstruction")) + res.setRenderedDosageInstructionElement(parseString(json.get("renderedDosageInstruction").getAsString())); + if (json.has("_renderedDosageInstruction")) + parseElementProperties(json.getAsJsonObject("_renderedDosageInstruction"), res.getRenderedDosageInstructionElement()); if (json.has("dosageInstruction")) { JsonArray array = json.getAsJsonArray("dosageInstruction"); for (int i = 0; i < array.size(); i++) { @@ -18047,8 +17928,9 @@ public class JsonParser extends JsonParserBase { res.setIsActiveElement(parseBoolean(json.get("isActive").getAsBoolean())); if (json.has("_isActive")) parseElementProperties(json.getAsJsonObject("_isActive"), res.getIsActiveElement()); - if (json.has("strength")) - res.setStrength(parseRatio(json.getAsJsonObject("strength"))); + DataType strength = parseType("strength", json); + if (strength != null) + res.setStrength(strength); } protected MedicationKnowledge.MedicationKnowledgeCostComponent parseMedicationKnowledgeCostComponent(JsonObject json) throws IOException, FHIRFormatError { @@ -18423,6 +18305,10 @@ public class JsonParser extends JsonParserBase { res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject())); } }; + if (json.has("renderedDosageInstruction")) + res.setRenderedDosageInstructionElement(parseString(json.get("renderedDosageInstruction").getAsString())); + if (json.has("_renderedDosageInstruction")) + parseElementProperties(json.getAsJsonObject("_renderedDosageInstruction"), res.getRenderedDosageInstructionElement()); if (json.has("dosageInstruction")) { JsonArray array = json.getAsJsonArray("dosageInstruction"); for (int i = 0; i < array.size(); i++) { @@ -18471,8 +18357,8 @@ public class JsonParser extends JsonParserBase { res.setQuantity(parseQuantity(json.getAsJsonObject("quantity"))); if (json.has("expectedSupplyDuration")) res.setExpectedSupplyDuration(parseDuration(json.getAsJsonObject("expectedSupplyDuration"))); - if (json.has("performer")) - res.setPerformer(parseReference(json.getAsJsonObject("performer"))); + if (json.has("dispenser")) + res.setDispenser(parseReference(json.getAsJsonObject("dispenser"))); } protected MedicationRequest.MedicationRequestDispenseRequestInitialFillComponent parseMedicationRequestDispenseRequestInitialFillComponent(JsonObject json) throws IOException, FHIRFormatError { @@ -18568,16 +18454,10 @@ public class JsonParser extends JsonParserBase { res.getDerivedFrom().add(parseReference(array.get(i).getAsJsonObject())); } }; - if (json.has("reasonCode")) { - JsonArray array = json.getAsJsonArray("reasonCode"); + if (json.has("reason")) { + JsonArray array = json.getAsJsonArray("reason"); for (int i = 0; i < array.size(); i++) { - res.getReasonCode().add(parseCodeableConcept(array.get(i).getAsJsonObject())); - } - }; - if (json.has("reasonReference")) { - JsonArray array = json.getAsJsonArray("reasonReference"); - for (int i = 0; i < array.size(); i++) { - res.getReasonReference().add(parseReference(array.get(i).getAsJsonObject())); + res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject())); } }; if (json.has("note")) { @@ -18586,6 +18466,10 @@ public class JsonParser extends JsonParserBase { res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject())); } }; + if (json.has("renderedDosageInstruction")) + res.setRenderedDosageInstructionElement(parseString(json.get("renderedDosageInstruction").getAsString())); + if (json.has("_renderedDosageInstruction")) + parseElementProperties(json.getAsJsonObject("_renderedDosageInstruction"), res.getRenderedDosageInstructionElement()); if (json.has("dosage")) { JsonArray array = json.getAsJsonArray("dosage"); for (int i = 0; i < array.size(); i++) { @@ -18616,8 +18500,14 @@ public class JsonParser extends JsonParserBase { res.setType(parseCodeableConcept(json.getAsJsonObject("type"))); if (json.has("domain")) res.setDomain(parseCoding(json.getAsJsonObject("domain"))); + if (json.has("version")) + res.setVersionElement(parseString(json.get("version").getAsString())); + if (json.has("_version")) + parseElementProperties(json.getAsJsonObject("_version"), res.getVersionElement()); + if (json.has("status")) + res.setStatus(parseCoding(json.getAsJsonObject("status"))); if (json.has("description")) - res.setDescriptionElement(parseString(json.get("description").getAsString())); + res.setDescriptionElement(parseMarkdown(json.get("description").getAsString())); if (json.has("_description")) parseElementProperties(json.getAsJsonObject("_description"), res.getDescriptionElement()); if (json.has("combinedPharmaceuticalDoseForm")) @@ -18809,22 +18699,21 @@ public class JsonParser extends JsonParserBase { protected void parseMedicinalProductDefinitionManufacturingBusinessOperationComponentProperties(JsonObject json, MedicinalProductDefinition.MedicinalProductDefinitionManufacturingBusinessOperationComponent res) throws IOException, FHIRFormatError { parseBackboneElementProperties(json, res); - if (json.has("operationType")) - res.setOperationType(parseCodeableConcept(json.getAsJsonObject("operationType"))); - if (json.has("authorisationReferenceNumber")) - res.setAuthorisationReferenceNumber(parseIdentifier(json.getAsJsonObject("authorisationReferenceNumber"))); + DataType type = parseType("type", json); + if (type != null) + res.setType(type); if (json.has("effectiveDate")) res.setEffectiveDate(parsePeriod(json.getAsJsonObject("effectiveDate"))); - if (json.has("confidentialityIndicator")) - res.setConfidentialityIndicator(parseCodeableConcept(json.getAsJsonObject("confidentialityIndicator"))); if (json.has("manufacturer")) { JsonArray array = json.getAsJsonArray("manufacturer"); for (int i = 0; i < array.size(); i++) { res.getManufacturer().add(parseReference(array.get(i).getAsJsonObject())); } }; - if (json.has("regulator")) - res.setRegulator(parseReference(json.getAsJsonObject("regulator"))); + if (json.has("authorization")) + res.setAuthorization(parseReference(json.getAsJsonObject("authorization"))); + if (json.has("confidentialityIndicator")) + res.setConfidentialityIndicator(parseCodeableConcept(json.getAsJsonObject("confidentialityIndicator"))); } protected MessageDefinition parseMessageDefinition(JsonObject json) throws IOException, FHIRFormatError { @@ -19771,13 +19660,7 @@ public class JsonParser extends JsonParserBase { if (json.has("reasonCode")) { JsonArray array = json.getAsJsonArray("reasonCode"); for (int i = 0; i < array.size(); i++) { - res.getReasonCode().add(parseCodeableConcept(array.get(i).getAsJsonObject())); - } - }; - if (json.has("reasonReference")) { - JsonArray array = json.getAsJsonArray("reasonReference"); - for (int i = 0; i < array.size(); i++) { - res.getReasonReference().add(parseReference(array.get(i).getAsJsonObject())); + res.getReasonCode().add(parseCodeableReference(array.get(i).getAsJsonObject())); } }; if (json.has("note")) { @@ -22440,16 +22323,10 @@ public class JsonParser extends JsonParserBase { }; if (json.has("location")) res.setLocation(parseReference(json.getAsJsonObject("location"))); - if (json.has("reasonCode")) { - JsonArray array = json.getAsJsonArray("reasonCode"); + if (json.has("reason")) { + JsonArray array = json.getAsJsonArray("reason"); for (int i = 0; i < array.size(); i++) { - res.getReasonCode().add(parseCodeableConcept(array.get(i).getAsJsonObject())); - } - }; - if (json.has("reasonReference")) { - JsonArray array = json.getAsJsonArray("reasonReference"); - for (int i = 0; i < array.size(); i++) { - res.getReasonReference().add(parseReference(array.get(i).getAsJsonObject())); + res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject())); } }; if (json.has("bodySite")) { @@ -22496,16 +22373,10 @@ public class JsonParser extends JsonParserBase { res.getFocalDevice().add(parseProcedureFocalDeviceComponent(array.get(i).getAsJsonObject())); } }; - if (json.has("usedReference")) { - JsonArray array = json.getAsJsonArray("usedReference"); + if (json.has("used")) { + JsonArray array = json.getAsJsonArray("used"); for (int i = 0; i < array.size(); i++) { - res.getUsedReference().add(parseReference(array.get(i).getAsJsonObject())); - } - }; - if (json.has("usedCode")) { - JsonArray array = json.getAsJsonArray("usedCode"); - for (int i = 0; i < array.size(); i++) { - res.getUsedCode().add(parseCodeableConcept(array.get(i).getAsJsonObject())); + res.getUsed().add(parseCodeableReference(array.get(i).getAsJsonObject())); } }; } @@ -23306,16 +23177,10 @@ public class JsonParser extends JsonParserBase { parseElementProperties(json.getAsJsonObject("_authoredOn"), res.getAuthoredOnElement()); if (json.has("author")) res.setAuthor(parseReference(json.getAsJsonObject("author"))); - if (json.has("reasonCode")) { - JsonArray array = json.getAsJsonArray("reasonCode"); + if (json.has("reason")) { + JsonArray array = json.getAsJsonArray("reason"); for (int i = 0; i < array.size(); i++) { - res.getReasonCode().add(parseCodeableConcept(array.get(i).getAsJsonObject())); - } - }; - if (json.has("reasonReference")) { - JsonArray array = json.getAsJsonArray("reasonReference"); - for (int i = 0; i < array.size(); i++) { - res.getReasonReference().add(parseReference(array.get(i).getAsJsonObject())); + res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject())); } }; if (json.has("note")) { @@ -23723,16 +23588,10 @@ public class JsonParser extends JsonParserBase { res.setCondition(parseReference(json.getAsJsonObject("condition"))); if (json.has("performer")) res.setPerformer(parseReference(json.getAsJsonObject("performer"))); - if (json.has("reasonCode")) { - JsonArray array = json.getAsJsonArray("reasonCode"); + if (json.has("reason")) { + JsonArray array = json.getAsJsonArray("reason"); for (int i = 0; i < array.size(); i++) { - res.getReasonCode().add(parseCodeableConcept(array.get(i).getAsJsonObject())); - } - }; - if (json.has("reasonReference")) { - JsonArray array = json.getAsJsonArray("reasonReference"); - for (int i = 0; i < array.size(); i++) { - res.getReasonReference().add(parseReference(array.get(i).getAsJsonObject())); + res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject())); } }; if (json.has("basis")) { @@ -24175,28 +24034,16 @@ public class JsonParser extends JsonParserBase { res.getPerformer().add(parseReference(array.get(i).getAsJsonObject())); } }; - if (json.has("locationCode")) { - JsonArray array = json.getAsJsonArray("locationCode"); + if (json.has("location")) { + JsonArray array = json.getAsJsonArray("location"); for (int i = 0; i < array.size(); i++) { - res.getLocationCode().add(parseCodeableConcept(array.get(i).getAsJsonObject())); + res.getLocation().add(parseCodeableReference(array.get(i).getAsJsonObject())); } }; - if (json.has("locationReference")) { - JsonArray array = json.getAsJsonArray("locationReference"); + if (json.has("reason")) { + JsonArray array = json.getAsJsonArray("reason"); for (int i = 0; i < array.size(); i++) { - res.getLocationReference().add(parseReference(array.get(i).getAsJsonObject())); - } - }; - if (json.has("reasonCode")) { - JsonArray array = json.getAsJsonArray("reasonCode"); - for (int i = 0; i < array.size(); i++) { - res.getReasonCode().add(parseCodeableConcept(array.get(i).getAsJsonObject())); - } - }; - if (json.has("reasonReference")) { - JsonArray array = json.getAsJsonArray("reasonReference"); - for (int i = 0; i < array.size(); i++) { - res.getReasonReference().add(parseReference(array.get(i).getAsJsonObject())); + res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject())); } }; if (json.has("insurance")) { @@ -25552,6 +25399,10 @@ public class JsonParser extends JsonParserBase { parseDomainResourceProperties(json, res); if (json.has("identifier")) res.setIdentifier(parseIdentifier(json.getAsJsonObject("identifier"))); + if (json.has("version")) + res.setVersionElement(parseString(json.get("version").getAsString())); + if (json.has("_version")) + parseElementProperties(json.getAsJsonObject("_version"), res.getVersionElement()); if (json.has("status")) res.setStatus(parseCodeableConcept(json.getAsJsonObject("status"))); if (json.has("category")) @@ -26774,16 +26625,10 @@ public class JsonParser extends JsonParserBase { res.getSupplier().add(parseReference(array.get(i).getAsJsonObject())); } }; - if (json.has("reasonCode")) { - JsonArray array = json.getAsJsonArray("reasonCode"); + if (json.has("reason")) { + JsonArray array = json.getAsJsonArray("reason"); for (int i = 0; i < array.size(); i++) { - res.getReasonCode().add(parseCodeableConcept(array.get(i).getAsJsonObject())); - } - }; - if (json.has("reasonReference")) { - JsonArray array = json.getAsJsonArray("reasonReference"); - for (int i = 0; i < array.size(); i++) { - res.getReasonReference().add(parseReference(array.get(i).getAsJsonObject())); + res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject())); } }; if (json.has("deliverFrom")) @@ -33759,16 +33604,10 @@ public class JsonParser extends JsonParserBase { if (element.hasAppointmentType()) { composeCodeableConcept("appointmentType", element.getAppointmentType()); } - if (element.hasReasonCode()) { - openArray("reasonCode"); - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept(null, e); - closeArray(); - }; - if (element.hasReasonReference()) { - openArray("reasonReference"); - for (Reference e : element.getReasonReference()) - composeReference(null, e); + if (element.hasReason()) { + openArray("reason"); + for (CodeableReference e : element.getReason()) + composeCodeableReference(null, e); closeArray(); }; if (element.hasPriorityElement()) { @@ -35696,16 +35535,10 @@ public class JsonParser extends JsonParserBase { composeReference(null, e); closeArray(); }; - if (element.hasAddressesCode()) { - openArray("addressesCode"); - for (CodeableConcept e : element.getAddressesCode()) - composeCodeableConcept(null, e); - closeArray(); - }; - if (element.hasAddressesReference()) { - openArray("addressesReference"); - for (Reference e : element.getAddressesReference()) - composeReference(null, e); + if (element.hasAddresses()) { + openArray("addresses"); + for (CodeableReference e : element.getAddresses()) + composeCodeableReference(null, e); closeArray(); }; if (element.hasSupportingInfo()) { @@ -35744,16 +35577,10 @@ public class JsonParser extends JsonParserBase { protected void composeCarePlanActivityComponentProperties(CarePlan.CarePlanActivityComponent element) throws IOException { composeBackboneElementProperties(element); - if (element.hasOutcomeCodeableConcept()) { - openArray("outcomeCodeableConcept"); - for (CodeableConcept e : element.getOutcomeCodeableConcept()) - composeCodeableConcept(null, e); - closeArray(); - }; - if (element.hasOutcomeReference()) { - openArray("outcomeReference"); - for (Reference e : element.getOutcomeReference()) - composeReference(null, e); + if (element.hasOutcome()) { + openArray("outcome"); + for (CodeableReference e : element.getOutcome()) + composeCodeableReference(null, e); closeArray(); }; if (element.hasProgress()) { @@ -35811,16 +35638,10 @@ public class JsonParser extends JsonParserBase { if (element.hasCode()) { composeCodeableConcept("code", element.getCode()); } - if (element.hasReasonCode()) { - openArray("reasonCode"); - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept(null, e); - closeArray(); - }; - if (element.hasReasonReference()) { - openArray("reasonReference"); - for (Reference e : element.getReasonReference()) - composeReference(null, e); + if (element.hasReason()) { + openArray("reason"); + for (CodeableReference e : element.getReason()) + composeCodeableReference(null, e); closeArray(); }; if (element.hasGoal()) { @@ -35911,16 +35732,10 @@ public class JsonParser extends JsonParserBase { composeCareTeamParticipantComponent(null, e); closeArray(); }; - if (element.hasReasonCode()) { - openArray("reasonCode"); - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept(null, e); - closeArray(); - }; - if (element.hasReasonReference()) { - openArray("reasonReference"); - for (Reference e : element.getReasonReference()) - composeReference(null, e); + if (element.hasReason()) { + openArray("reason"); + for (CodeableReference e : element.getReason()) + composeCodeableReference(null, e); closeArray(); }; if (element.hasManagingOrganization()) { @@ -37771,11 +37586,8 @@ public class JsonParser extends JsonParserBase { protected void composeClinicalImpressionFindingComponentProperties(ClinicalImpression.ClinicalImpressionFindingComponent element) throws IOException { composeBackboneElementProperties(element); - if (element.hasItemCodeableConcept()) { - composeCodeableConcept("itemCodeableConcept", element.getItemCodeableConcept()); - } - if (element.hasItemReference()) { - composeReference("itemReference", element.getItemReference()); + if (element.hasItem()) { + composeCodeableReference("item", element.getItem()); } if (element.hasBasisElement()) { composeStringCore("basis", element.getBasisElement(), false); @@ -38386,16 +38198,10 @@ public class JsonParser extends JsonParserBase { if (element.hasSender()) { composeReference("sender", element.getSender()); } - if (element.hasReasonCode()) { - openArray("reasonCode"); - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept(null, e); - closeArray(); - }; - if (element.hasReasonReference()) { - openArray("reasonReference"); - for (Reference e : element.getReasonReference()) - composeReference(null, e); + if (element.hasReason()) { + openArray("reason"); + for (CodeableReference e : element.getReason()) + composeCodeableReference(null, e); closeArray(); }; if (element.hasPayload()) { @@ -38524,16 +38330,10 @@ public class JsonParser extends JsonParserBase { composeReference(null, e); closeArray(); }; - if (element.hasReasonCode()) { - openArray("reasonCode"); - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept(null, e); - closeArray(); - }; - if (element.hasReasonReference()) { - openArray("reasonReference"); - for (Reference e : element.getReasonReference()) - composeReference(null, e); + if (element.hasReason()) { + openArray("reason"); + for (CodeableReference e : element.getReason()) + composeCodeableReference(null, e); closeArray(); }; if (element.hasNote()) { @@ -40445,29 +40245,11 @@ public class JsonParser extends JsonParserBase { closeArray(); } }; - if (element.hasReasonCode()) { - openArray("reasonCode"); - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept(null, e); - closeArray(); - }; - if (element.hasReasonReference()) { - openArray("reasonReference"); - for (Reference e : element.getReasonReference()) - composeReference(null, e); - closeArray(); - }; if (element.hasReason()) { openArray("reason"); - for (StringType e : element.getReason()) - composeStringCore(null, e, true); + for (CodeableReference e : element.getReason()) + composeCodeableReference(null, e); closeArray(); - if (anyHasExtras(element.getReason())) { - openArray("_reason"); - for (StringType e : element.getReason()) - composeStringExtras(null, e, true); - closeArray(); - } }; if (element.hasReasonLinkId()) { openArray("reasonLinkId"); @@ -41939,16 +41721,10 @@ public class JsonParser extends JsonParserBase { if (element.hasPerformer()) { composeReference("performer", element.getPerformer()); } - if (element.hasReasonCode()) { - openArray("reasonCode"); - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept(null, e); - closeArray(); - }; - if (element.hasReasonReference()) { - openArray("reasonReference"); - for (Reference e : element.getReasonReference()) - composeReference(null, e); + if (element.hasReason()) { + openArray("reason"); + for (CodeableReference e : element.getReason()) + composeCodeableReference(null, e); closeArray(); }; if (element.hasInsurance()) { @@ -42042,16 +41818,10 @@ public class JsonParser extends JsonParserBase { if (element.hasDevice()) { composeReference("device", element.getDevice()); } - if (element.hasReasonCode()) { - openArray("reasonCode"); - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept(null, e); - closeArray(); - }; - if (element.hasReasonReference()) { - openArray("reasonReference"); - for (Reference e : element.getReasonReference()) - composeReference(null, e); + if (element.hasReason()) { + openArray("reason"); + for (CodeableReference e : element.getReason()) + composeCodeableReference(null, e); closeArray(); }; if (element.hasBodySite()) { @@ -42517,16 +42287,10 @@ public class JsonParser extends JsonParserBase { if (element.hasLength()) { composeDuration("length", element.getLength()); } - if (element.hasReasonCode()) { - openArray("reasonCode"); - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept(null, e); - closeArray(); - }; - if (element.hasReasonReference()) { - openArray("reasonReference"); - for (Reference e : element.getReasonReference()) - composeReference(null, e); + if (element.hasReason()) { + openArray("reason"); + for (CodeableReference e : element.getReason()) + composeCodeableReference(null, e); closeArray(); }; if (element.hasDiagnosis()) { @@ -45093,16 +44857,10 @@ public class JsonParser extends JsonParserBase { if (element.hasDeceased()) { composeType("deceased", element.getDeceased()); } - if (element.hasReasonCode()) { - openArray("reasonCode"); - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept(null, e); - closeArray(); - }; - if (element.hasReasonReference()) { - openArray("reasonReference"); - for (Reference e : element.getReasonReference()) - composeReference(null, e); + if (element.hasReason()) { + openArray("reason"); + for (CodeableReference e : element.getReason()) + composeCodeableReference(null, e); closeArray(); }; if (element.hasNote()) { @@ -45302,16 +45060,10 @@ public class JsonParser extends JsonParserBase { composeAnnotation(null, e); closeArray(); }; - if (element.hasOutcomeCode()) { - openArray("outcomeCode"); - for (CodeableConcept e : element.getOutcomeCode()) - composeCodeableConcept(null, e); - closeArray(); - }; - if (element.hasOutcomeReference()) { - openArray("outcomeReference"); - for (Reference e : element.getOutcomeReference()) - composeReference(null, e); + if (element.hasOutcome()) { + openArray("outcome"); + for (CodeableReference e : element.getOutcome()) + composeCodeableReference(null, e); closeArray(); }; } @@ -45662,16 +45414,10 @@ public class JsonParser extends JsonParserBase { if (element.hasPerformer()) { composeReference("performer", element.getPerformer()); } - if (element.hasReasonCode()) { - openArray("reasonCode"); - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept(null, e); - closeArray(); - }; - if (element.hasReasonReference()) { - openArray("reasonReference"); - for (Reference e : element.getReasonReference()) - composeReference(null, e); + if (element.hasReason()) { + openArray("reason"); + for (CodeableReference e : element.getReason()) + composeCodeableReference(null, e); closeArray(); }; if (element.hasNote()) { @@ -45984,16 +45730,10 @@ public class JsonParser extends JsonParserBase { if (element.hasLocation()) { composeReference("location", element.getLocation()); } - if (element.hasReasonCode()) { - openArray("reasonCode"); - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept(null, e); - closeArray(); - }; - if (element.hasReasonReference()) { - openArray("reasonReference"); - for (Reference e : element.getReasonReference()) - composeReference(null, e); + if (element.hasReason()) { + openArray("reason"); + for (CodeableReference e : element.getReason()) + composeCodeableReference(null, e); closeArray(); }; if (element.hasNote()) { @@ -46219,16 +45959,10 @@ public class JsonParser extends JsonParserBase { composeAnnotation(null, e); closeArray(); }; - if (element.hasReasonCode()) { - openArray("reasonCode"); - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept(null, e); - closeArray(); - }; - if (element.hasReasonReference()) { - openArray("reasonReference"); - for (Reference e : element.getReasonReference()) - composeReference(null, e); + if (element.hasReason()) { + openArray("reason"); + for (CodeableReference e : element.getReason()) + composeCodeableReference(null, e); closeArray(); }; if (element.hasIsSubpotentElement()) { @@ -48836,16 +48570,10 @@ public class JsonParser extends JsonParserBase { composeMedicationAdministrationPerformerComponent(null, e); closeArray(); }; - if (element.hasReasonCode()) { - openArray("reasonCode"); - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept(null, e); - closeArray(); - }; - if (element.hasReasonReference()) { - openArray("reasonReference"); - for (Reference e : element.getReasonReference()) - composeReference(null, e); + if (element.hasReason()) { + openArray("reason"); + for (CodeableReference e : element.getReason()) + composeCodeableReference(null, e); closeArray(); }; if (element.hasRequest()) { @@ -49025,6 +48753,10 @@ public class JsonParser extends JsonParserBase { composeAnnotation(null, e); closeArray(); }; + if (element.hasRenderedDosageInstructionElement()) { + composeStringCore("renderedDosageInstruction", element.getRenderedDosageInstructionElement(), false); + composeStringExtras("renderedDosageInstruction", element.getRenderedDosageInstructionElement(), false); + } if (element.hasDosageInstruction()) { openArray("dosageInstruction"); for (Dosage e : element.getDosageInstruction()) @@ -49293,7 +49025,7 @@ public class JsonParser extends JsonParserBase { composeBooleanExtras("isActive", element.getIsActiveElement(), false); } if (element.hasStrength()) { - composeRatio("strength", element.getStrength()); + composeType("strength", element.getStrength()); } } @@ -49699,6 +49431,10 @@ public class JsonParser extends JsonParserBase { composeAnnotation(null, e); closeArray(); }; + if (element.hasRenderedDosageInstructionElement()) { + composeStringCore("renderedDosageInstruction", element.getRenderedDosageInstructionElement(), false); + composeStringExtras("renderedDosageInstruction", element.getRenderedDosageInstructionElement(), false); + } if (element.hasDosageInstruction()) { openArray("dosageInstruction"); for (Dosage e : element.getDosageInstruction()) @@ -49757,8 +49493,8 @@ public class JsonParser extends JsonParserBase { if (element.hasExpectedSupplyDuration()) { composeDuration("expectedSupplyDuration", element.getExpectedSupplyDuration()); } - if (element.hasPerformer()) { - composeReference("performer", element.getPerformer()); + if (element.hasDispenser()) { + composeReference("dispenser", element.getDispenser()); } } @@ -49866,16 +49602,10 @@ public class JsonParser extends JsonParserBase { composeReference(null, e); closeArray(); }; - if (element.hasReasonCode()) { - openArray("reasonCode"); - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept(null, e); - closeArray(); - }; - if (element.hasReasonReference()) { - openArray("reasonReference"); - for (Reference e : element.getReasonReference()) - composeReference(null, e); + if (element.hasReason()) { + openArray("reason"); + for (CodeableReference e : element.getReason()) + composeCodeableReference(null, e); closeArray(); }; if (element.hasNote()) { @@ -49884,6 +49614,10 @@ public class JsonParser extends JsonParserBase { composeAnnotation(null, e); closeArray(); }; + if (element.hasRenderedDosageInstructionElement()) { + composeStringCore("renderedDosageInstruction", element.getRenderedDosageInstructionElement(), false); + composeStringExtras("renderedDosageInstruction", element.getRenderedDosageInstructionElement(), false); + } if (element.hasDosage()) { openArray("dosage"); for (Dosage e : element.getDosage()) @@ -49917,9 +49651,16 @@ public class JsonParser extends JsonParserBase { if (element.hasDomain()) { composeCoding("domain", element.getDomain()); } + if (element.hasVersionElement()) { + composeStringCore("version", element.getVersionElement(), false); + composeStringExtras("version", element.getVersionElement(), false); + } + if (element.hasStatus()) { + composeCoding("status", element.getStatus()); + } 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.hasCombinedPharmaceuticalDoseForm()) { composeCodeableConcept("combinedPharmaceuticalDoseForm", element.getCombinedPharmaceuticalDoseForm()); @@ -50134,26 +49875,23 @@ public class JsonParser extends JsonParserBase { protected void composeMedicinalProductDefinitionManufacturingBusinessOperationComponentProperties(MedicinalProductDefinition.MedicinalProductDefinitionManufacturingBusinessOperationComponent element) throws IOException { composeBackboneElementProperties(element); - if (element.hasOperationType()) { - composeCodeableConcept("operationType", element.getOperationType()); - } - if (element.hasAuthorisationReferenceNumber()) { - composeIdentifier("authorisationReferenceNumber", element.getAuthorisationReferenceNumber()); + if (element.hasType()) { + composeType("type", element.getType()); } if (element.hasEffectiveDate()) { composePeriod("effectiveDate", element.getEffectiveDate()); } - if (element.hasConfidentialityIndicator()) { - composeCodeableConcept("confidentialityIndicator", element.getConfidentialityIndicator()); - } if (element.hasManufacturer()) { openArray("manufacturer"); for (Reference e : element.getManufacturer()) composeReference(null, e); closeArray(); }; - if (element.hasRegulator()) { - composeReference("regulator", element.getRegulator()); + if (element.hasAuthorization()) { + composeReference("authorization", element.getAuthorization()); + } + if (element.hasConfidentialityIndicator()) { + composeCodeableConcept("confidentialityIndicator", element.getConfidentialityIndicator()); } } @@ -51096,14 +50834,8 @@ public class JsonParser extends JsonParserBase { }; if (element.hasReasonCode()) { openArray("reasonCode"); - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept(null, e); - closeArray(); - }; - if (element.hasReasonReference()) { - openArray("reasonReference"); - for (Reference e : element.getReasonReference()) - composeReference(null, e); + for (CodeableReference e : element.getReasonCode()) + composeCodeableReference(null, e); closeArray(); }; if (element.hasNote()) { @@ -53878,16 +53610,10 @@ public class JsonParser extends JsonParserBase { if (element.hasLocation()) { composeReference("location", element.getLocation()); } - if (element.hasReasonCode()) { - openArray("reasonCode"); - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept(null, e); - closeArray(); - }; - if (element.hasReasonReference()) { - openArray("reasonReference"); - for (Reference e : element.getReasonReference()) - composeReference(null, e); + if (element.hasReason()) { + openArray("reason"); + for (CodeableReference e : element.getReason()) + composeCodeableReference(null, e); closeArray(); }; if (element.hasBodySite()) { @@ -53935,16 +53661,10 @@ public class JsonParser extends JsonParserBase { composeProcedureFocalDeviceComponent(null, e); closeArray(); }; - if (element.hasUsedReference()) { - openArray("usedReference"); - for (Reference e : element.getUsedReference()) - composeReference(null, e); - closeArray(); - }; - if (element.hasUsedCode()) { - openArray("usedCode"); - for (CodeableConcept e : element.getUsedCode()) - composeCodeableConcept(null, e); + if (element.hasUsed()) { + openArray("used"); + for (CodeableReference e : element.getUsed()) + composeCodeableReference(null, e); closeArray(); }; } @@ -54778,16 +54498,10 @@ public class JsonParser extends JsonParserBase { if (element.hasAuthor()) { composeReference("author", element.getAuthor()); } - if (element.hasReasonCode()) { - openArray("reasonCode"); - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept(null, e); - closeArray(); - }; - if (element.hasReasonReference()) { - openArray("reasonReference"); - for (Reference e : element.getReasonReference()) - composeReference(null, e); + if (element.hasReason()) { + openArray("reason"); + for (CodeableReference e : element.getReason()) + composeCodeableReference(null, e); closeArray(); }; if (element.hasNote()) { @@ -55237,16 +54951,10 @@ public class JsonParser extends JsonParserBase { if (element.hasPerformer()) { composeReference("performer", element.getPerformer()); } - if (element.hasReasonCode()) { - openArray("reasonCode"); - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept(null, e); - closeArray(); - }; - if (element.hasReasonReference()) { - openArray("reasonReference"); - for (Reference e : element.getReasonReference()) - composeReference(null, e); + if (element.hasReason()) { + openArray("reason"); + for (CodeableReference e : element.getReason()) + composeCodeableReference(null, e); closeArray(); }; if (element.hasBasis()) { @@ -55656,28 +55364,16 @@ public class JsonParser extends JsonParserBase { composeReference(null, e); closeArray(); }; - if (element.hasLocationCode()) { - openArray("locationCode"); - for (CodeableConcept e : element.getLocationCode()) - composeCodeableConcept(null, e); + if (element.hasLocation()) { + openArray("location"); + for (CodeableReference e : element.getLocation()) + composeCodeableReference(null, e); closeArray(); }; - if (element.hasLocationReference()) { - openArray("locationReference"); - for (Reference e : element.getLocationReference()) - composeReference(null, e); - closeArray(); - }; - if (element.hasReasonCode()) { - openArray("reasonCode"); - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept(null, e); - closeArray(); - }; - if (element.hasReasonReference()) { - openArray("reasonReference"); - for (Reference e : element.getReasonReference()) - composeReference(null, e); + if (element.hasReason()) { + openArray("reason"); + for (CodeableReference e : element.getReason()) + composeCodeableReference(null, e); closeArray(); }; if (element.hasInsurance()) { @@ -57080,6 +56776,10 @@ public class JsonParser extends JsonParserBase { if (element.hasIdentifier()) { composeIdentifier("identifier", element.getIdentifier()); } + if (element.hasVersionElement()) { + composeStringCore("version", element.getVersionElement(), false); + composeStringExtras("version", element.getVersionElement(), false); + } if (element.hasStatus()) { composeCodeableConcept("status", element.getStatus()); } @@ -58448,16 +58148,10 @@ public class JsonParser extends JsonParserBase { composeReference(null, e); closeArray(); }; - if (element.hasReasonCode()) { - openArray("reasonCode"); - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept(null, e); - closeArray(); - }; - if (element.hasReasonReference()) { - openArray("reasonReference"); - for (Reference e : element.getReasonReference()) - composeReference(null, e); + if (element.hasReason()) { + openArray("reason"); + for (CodeableReference e : element.getReason()) + composeCodeableReference(null, e); closeArray(); }; if (element.hasDeliverFrom()) { 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 5a2f16667..f3b4a76e9 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 @@ -51,7 +51,7 @@ package org.hl7.fhir.r5.formats; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent @@ -2718,11 +2718,8 @@ public class RdfParser extends RdfParserBase { if (element.hasAppointmentType()) { composeCodeableConcept(t, "Appointment", "appointmentType", element.getAppointmentType(), -1); } - for (int i = 0; i < element.getReasonCode().size(); i++) { - composeCodeableConcept(t, "Appointment", "reasonCode", element.getReasonCode().get(i), i); - } - for (int i = 0; i < element.getReasonReference().size(); i++) { - composeReference(t, "Appointment", "reasonReference", element.getReasonReference().get(i), i); + for (int i = 0; i < element.getReason().size(); i++) { + composeCodeableReference(t, "Appointment", "reason", element.getReason().get(i), i); } if (element.hasPriorityElement()) { composeUnsignedInt(t, "Appointment", "priority", element.getPriorityElement(), -1); @@ -4137,11 +4134,8 @@ public class RdfParser extends RdfParserBase { for (int i = 0; i < element.getCareTeam().size(); i++) { composeReference(t, "CarePlan", "careTeam", element.getCareTeam().get(i), i); } - for (int i = 0; i < element.getAddressesCode().size(); i++) { - composeCodeableConcept(t, "CarePlan", "addressesCode", element.getAddressesCode().get(i), i); - } - for (int i = 0; i < element.getAddressesReference().size(); i++) { - composeReference(t, "CarePlan", "addressesReference", element.getAddressesReference().get(i), i); + for (int i = 0; i < element.getAddresses().size(); i++) { + composeCodeableReference(t, "CarePlan", "addresses", element.getAddresses().get(i), i); } for (int i = 0; i < element.getSupportingInfo().size(); i++) { composeReference(t, "CarePlan", "supportingInfo", element.getSupportingInfo().get(i), i); @@ -4167,11 +4161,8 @@ public class RdfParser extends RdfParserBase { t = parent.predicate("fhir:"+parentType+'.'+name); } composeBackboneElement(t, "activity", name, element, index); - for (int i = 0; i < element.getOutcomeCodeableConcept().size(); i++) { - composeCodeableConcept(t, "CarePlanActivityComponent", "outcomeCodeableConcept", element.getOutcomeCodeableConcept().get(i), i); - } - for (int i = 0; i < element.getOutcomeReference().size(); i++) { - composeReference(t, "CarePlanActivityComponent", "outcomeReference", element.getOutcomeReference().get(i), i); + for (int i = 0; i < element.getOutcome().size(); i++) { + composeCodeableReference(t, "CarePlanActivityComponent", "outcome", element.getOutcome().get(i), i); } for (int i = 0; i < element.getProgress().size(); i++) { composeAnnotation(t, "CarePlanActivityComponent", "progress", element.getProgress().get(i), i); @@ -4206,11 +4197,8 @@ public class RdfParser extends RdfParserBase { if (element.hasCode()) { composeCodeableConcept(t, "CarePlanActivityDetailComponent", "code", element.getCode(), -1); } - for (int i = 0; i < element.getReasonCode().size(); i++) { - composeCodeableConcept(t, "CarePlanActivityDetailComponent", "reasonCode", element.getReasonCode().get(i), i); - } - for (int i = 0; i < element.getReasonReference().size(); i++) { - composeReference(t, "CarePlanActivityDetailComponent", "reasonReference", element.getReasonReference().get(i), i); + for (int i = 0; i < element.getReason().size(); i++) { + composeCodeableReference(t, "CarePlanActivityDetailComponent", "reason", element.getReason().get(i), i); } for (int i = 0; i < element.getGoal().size(); i++) { composeReference(t, "CarePlanActivityDetailComponent", "goal", element.getGoal().get(i), i); @@ -4281,11 +4269,8 @@ public class RdfParser extends RdfParserBase { for (int i = 0; i < element.getParticipant().size(); i++) { composeCareTeamParticipantComponent(t, "CareTeam", "participant", element.getParticipant().get(i), i); } - for (int i = 0; i < element.getReasonCode().size(); i++) { - composeCodeableConcept(t, "CareTeam", "reasonCode", element.getReasonCode().get(i), i); - } - for (int i = 0; i < element.getReasonReference().size(); i++) { - composeReference(t, "CareTeam", "reasonReference", element.getReasonReference().get(i), i); + for (int i = 0; i < element.getReason().size(); i++) { + composeCodeableReference(t, "CareTeam", "reason", element.getReason().get(i), i); } for (int i = 0; i < element.getManagingOrganization().size(); i++) { composeReference(t, "CareTeam", "managingOrganization", element.getManagingOrganization().get(i), i); @@ -5643,11 +5628,8 @@ public class RdfParser extends RdfParserBase { t = parent.predicate("fhir:"+parentType+'.'+name); } composeBackboneElement(t, "finding", name, element, index); - if (element.hasItemCodeableConcept()) { - composeCodeableConcept(t, "ClinicalImpressionFindingComponent", "itemCodeableConcept", element.getItemCodeableConcept(), -1); - } - if (element.hasItemReference()) { - composeReference(t, "ClinicalImpressionFindingComponent", "itemReference", element.getItemReference(), -1); + if (element.hasItem()) { + composeCodeableReference(t, "ClinicalImpressionFindingComponent", "item", element.getItem(), -1); } if (element.hasBasisElement()) { composeString(t, "ClinicalImpressionFindingComponent", "basis", element.getBasisElement(), -1); @@ -6111,11 +6093,8 @@ public class RdfParser extends RdfParserBase { if (element.hasSender()) { composeReference(t, "Communication", "sender", element.getSender(), -1); } - for (int i = 0; i < element.getReasonCode().size(); i++) { - composeCodeableConcept(t, "Communication", "reasonCode", element.getReasonCode().get(i), i); - } - for (int i = 0; i < element.getReasonReference().size(); i++) { - composeReference(t, "Communication", "reasonReference", element.getReasonReference().get(i), i); + for (int i = 0; i < element.getReason().size(); i++) { + composeCodeableReference(t, "Communication", "reason", element.getReason().get(i), i); } for (int i = 0; i < element.getPayload().size(); i++) { composeCommunicationPayloadComponent(t, "Communication", "payload", element.getPayload().get(i), i); @@ -6207,11 +6186,8 @@ public class RdfParser extends RdfParserBase { for (int i = 0; i < element.getInformationProvider().size(); i++) { composeReference(t, "CommunicationRequest", "informationProvider", element.getInformationProvider().get(i), i); } - for (int i = 0; i < element.getReasonCode().size(); i++) { - composeCodeableConcept(t, "CommunicationRequest", "reasonCode", element.getReasonCode().get(i), i); - } - for (int i = 0; i < element.getReasonReference().size(); i++) { - composeReference(t, "CommunicationRequest", "reasonReference", element.getReasonReference().get(i), i); + for (int i = 0; i < element.getReason().size(); i++) { + composeCodeableReference(t, "CommunicationRequest", "reason", element.getReason().get(i), i); } for (int i = 0; i < element.getNote().size(); i++) { composeAnnotation(t, "CommunicationRequest", "note", element.getNote().get(i), i); @@ -7611,14 +7587,8 @@ public class RdfParser extends RdfParserBase { for (int i = 0; i < element.getPerformerLinkId().size(); i++) { composeString(t, "ActionComponent", "performerLinkId", element.getPerformerLinkId().get(i), i); } - for (int i = 0; i < element.getReasonCode().size(); i++) { - composeCodeableConcept(t, "ActionComponent", "reasonCode", element.getReasonCode().get(i), i); - } - for (int i = 0; i < element.getReasonReference().size(); i++) { - composeReference(t, "ActionComponent", "reasonReference", element.getReasonReference().get(i), i); - } for (int i = 0; i < element.getReason().size(); i++) { - composeString(t, "ActionComponent", "reason", element.getReason().get(i), i); + composeCodeableReference(t, "ActionComponent", "reason", element.getReason().get(i), i); } for (int i = 0; i < element.getReasonLinkId().size(); i++) { composeString(t, "ActionComponent", "reasonLinkId", element.getReasonLinkId().get(i), i); @@ -8769,11 +8739,8 @@ public class RdfParser extends RdfParserBase { if (element.hasPerformer()) { composeReference(t, "DeviceRequest", "performer", element.getPerformer(), -1); } - for (int i = 0; i < element.getReasonCode().size(); i++) { - composeCodeableConcept(t, "DeviceRequest", "reasonCode", element.getReasonCode().get(i), i); - } - for (int i = 0; i < element.getReasonReference().size(); i++) { - composeReference(t, "DeviceRequest", "reasonReference", element.getReasonReference().get(i), i); + for (int i = 0; i < element.getReason().size(); i++) { + composeCodeableReference(t, "DeviceRequest", "reason", element.getReason().get(i), i); } for (int i = 0; i < element.getInsurance().size(); i++) { composeReference(t, "DeviceRequest", "insurance", element.getInsurance().get(i), i); @@ -8844,11 +8811,8 @@ public class RdfParser extends RdfParserBase { if (element.hasDevice()) { composeReference(t, "DeviceUseStatement", "device", element.getDevice(), -1); } - for (int i = 0; i < element.getReasonCode().size(); i++) { - composeCodeableConcept(t, "DeviceUseStatement", "reasonCode", element.getReasonCode().get(i), i); - } - for (int i = 0; i < element.getReasonReference().size(); i++) { - composeReference(t, "DeviceUseStatement", "reasonReference", element.getReasonReference().get(i), i); + for (int i = 0; i < element.getReason().size(); i++) { + composeCodeableReference(t, "DeviceUseStatement", "reason", element.getReason().get(i), i); } if (element.hasBodySite()) { composeCodeableConcept(t, "DeviceUseStatement", "bodySite", element.getBodySite(), -1); @@ -9198,11 +9162,8 @@ public class RdfParser extends RdfParserBase { if (element.hasLength()) { composeDuration(t, "Encounter", "length", element.getLength(), -1); } - for (int i = 0; i < element.getReasonCode().size(); i++) { - composeCodeableConcept(t, "Encounter", "reasonCode", element.getReasonCode().get(i), i); - } - for (int i = 0; i < element.getReasonReference().size(); i++) { - composeReference(t, "Encounter", "reasonReference", element.getReasonReference().get(i), i); + for (int i = 0; i < element.getReason().size(); i++) { + composeCodeableReference(t, "Encounter", "reason", element.getReason().get(i), i); } for (int i = 0; i < element.getDiagnosis().size(); i++) { composeEncounterDiagnosisComponent(t, "Encounter", "diagnosis", element.getDiagnosis().get(i), i); @@ -11109,11 +11070,8 @@ public class RdfParser extends RdfParserBase { if (element.hasDeceased()) { composeType(t, "FamilyMemberHistory", "deceased", element.getDeceased(), -1); } - for (int i = 0; i < element.getReasonCode().size(); i++) { - composeCodeableConcept(t, "FamilyMemberHistory", "reasonCode", element.getReasonCode().get(i), i); - } - for (int i = 0; i < element.getReasonReference().size(); i++) { - composeReference(t, "FamilyMemberHistory", "reasonReference", element.getReasonReference().get(i), i); + for (int i = 0; i < element.getReason().size(); i++) { + composeCodeableReference(t, "FamilyMemberHistory", "reason", element.getReason().get(i), i); } for (int i = 0; i < element.getNote().size(); i++) { composeAnnotation(t, "FamilyMemberHistory", "note", element.getNote().get(i), i); @@ -11271,11 +11229,8 @@ public class RdfParser extends RdfParserBase { for (int i = 0; i < element.getNote().size(); i++) { composeAnnotation(t, "Goal", "note", element.getNote().get(i), i); } - for (int i = 0; i < element.getOutcomeCode().size(); i++) { - composeCodeableConcept(t, "Goal", "outcomeCode", element.getOutcomeCode().get(i), i); - } - for (int i = 0; i < element.getOutcomeReference().size(); i++) { - composeReference(t, "Goal", "outcomeReference", element.getOutcomeReference().get(i), i); + for (int i = 0; i < element.getOutcome().size(); i++) { + composeCodeableReference(t, "Goal", "outcome", element.getOutcome().get(i), i); } } @@ -11562,11 +11517,8 @@ public class RdfParser extends RdfParserBase { if (element.hasPerformer()) { composeReference(t, "GuidanceResponse", "performer", element.getPerformer(), -1); } - for (int i = 0; i < element.getReasonCode().size(); i++) { - composeCodeableConcept(t, "GuidanceResponse", "reasonCode", element.getReasonCode().get(i), i); - } - for (int i = 0; i < element.getReasonReference().size(); i++) { - composeReference(t, "GuidanceResponse", "reasonReference", element.getReasonReference().get(i), i); + for (int i = 0; i < element.getReason().size(); i++) { + composeCodeableReference(t, "GuidanceResponse", "reason", element.getReason().get(i), i); } for (int i = 0; i < element.getNote().size(); i++) { composeAnnotation(t, "GuidanceResponse", "note", element.getNote().get(i), i); @@ -11781,11 +11733,8 @@ public class RdfParser extends RdfParserBase { if (element.hasLocation()) { composeReference(t, "ImagingStudy", "location", element.getLocation(), -1); } - for (int i = 0; i < element.getReasonCode().size(); i++) { - composeCodeableConcept(t, "ImagingStudy", "reasonCode", element.getReasonCode().get(i), i); - } - for (int i = 0; i < element.getReasonReference().size(); i++) { - composeReference(t, "ImagingStudy", "reasonReference", element.getReasonReference().get(i), i); + for (int i = 0; i < element.getReason().size(); i++) { + composeCodeableReference(t, "ImagingStudy", "reason", element.getReason().get(i), i); } for (int i = 0; i < element.getNote().size(); i++) { composeAnnotation(t, "ImagingStudy", "note", element.getNote().get(i), i); @@ -11970,11 +11919,8 @@ public class RdfParser extends RdfParserBase { for (int i = 0; i < element.getNote().size(); i++) { composeAnnotation(t, "Immunization", "note", element.getNote().get(i), i); } - for (int i = 0; i < element.getReasonCode().size(); i++) { - composeCodeableConcept(t, "Immunization", "reasonCode", element.getReasonCode().get(i), i); - } - for (int i = 0; i < element.getReasonReference().size(); i++) { - composeReference(t, "Immunization", "reasonReference", element.getReasonReference().get(i), i); + for (int i = 0; i < element.getReason().size(); i++) { + composeCodeableReference(t, "Immunization", "reason", element.getReason().get(i), i); } if (element.hasIsSubpotentElement()) { composeBoolean(t, "Immunization", "isSubpotent", element.getIsSubpotentElement(), -1); @@ -13983,11 +13929,8 @@ public class RdfParser extends RdfParserBase { for (int i = 0; i < element.getPerformer().size(); i++) { composeMedicationAdministrationPerformerComponent(t, "MedicationAdministration", "performer", element.getPerformer().get(i), i); } - for (int i = 0; i < element.getReasonCode().size(); i++) { - composeCodeableConcept(t, "MedicationAdministration", "reasonCode", element.getReasonCode().get(i), i); - } - for (int i = 0; i < element.getReasonReference().size(); i++) { - composeReference(t, "MedicationAdministration", "reasonReference", element.getReasonReference().get(i), i); + for (int i = 0; i < element.getReason().size(); i++) { + composeCodeableReference(t, "MedicationAdministration", "reason", element.getReason().get(i), i); } if (element.hasRequest()) { composeReference(t, "MedicationAdministration", "request", element.getRequest(), -1); @@ -14127,6 +14070,9 @@ public class RdfParser extends RdfParserBase { for (int i = 0; i < element.getNote().size(); i++) { composeAnnotation(t, "MedicationDispense", "note", element.getNote().get(i), i); } + if (element.hasRenderedDosageInstructionElement()) { + composeString(t, "MedicationDispense", "renderedDosageInstruction", element.getRenderedDosageInstructionElement(), -1); + } for (int i = 0; i < element.getDosageInstruction().size(); i++) { composeDosage(t, "MedicationDispense", "dosageInstruction", element.getDosageInstruction().get(i), i); } @@ -14320,7 +14266,7 @@ public class RdfParser extends RdfParserBase { composeBoolean(t, "MedicationKnowledgeIngredientComponent", "isActive", element.getIsActiveElement(), -1); } if (element.hasStrength()) { - composeRatio(t, "MedicationKnowledgeIngredientComponent", "strength", element.getStrength(), -1); + composeType(t, "MedicationKnowledgeIngredientComponent", "strength", element.getStrength(), -1); } } @@ -14649,6 +14595,9 @@ public class RdfParser extends RdfParserBase { for (int i = 0; i < element.getNote().size(); i++) { composeAnnotation(t, "MedicationRequest", "note", element.getNote().get(i), i); } + if (element.hasRenderedDosageInstructionElement()) { + composeString(t, "MedicationRequest", "renderedDosageInstruction", element.getRenderedDosageInstructionElement(), -1); + } for (int i = 0; i < element.getDosageInstruction().size(); i++) { composeDosage(t, "MedicationRequest", "dosageInstruction", element.getDosageInstruction().get(i), i); } @@ -14697,8 +14646,8 @@ public class RdfParser extends RdfParserBase { if (element.hasExpectedSupplyDuration()) { composeDuration(t, "MedicationRequestDispenseRequestComponent", "expectedSupplyDuration", element.getExpectedSupplyDuration(), -1); } - if (element.hasPerformer()) { - composeReference(t, "MedicationRequestDispenseRequestComponent", "performer", element.getPerformer(), -1); + if (element.hasDispenser()) { + composeReference(t, "MedicationRequestDispenseRequestComponent", "dispenser", element.getDispenser(), -1); } } @@ -14787,15 +14736,15 @@ public class RdfParser extends RdfParserBase { for (int i = 0; i < element.getDerivedFrom().size(); i++) { composeReference(t, "MedicationUsage", "derivedFrom", element.getDerivedFrom().get(i), i); } - for (int i = 0; i < element.getReasonCode().size(); i++) { - composeCodeableConcept(t, "MedicationUsage", "reasonCode", element.getReasonCode().get(i), i); - } - for (int i = 0; i < element.getReasonReference().size(); i++) { - composeReference(t, "MedicationUsage", "reasonReference", element.getReasonReference().get(i), i); + for (int i = 0; i < element.getReason().size(); i++) { + composeCodeableReference(t, "MedicationUsage", "reason", element.getReason().get(i), i); } for (int i = 0; i < element.getNote().size(); i++) { composeAnnotation(t, "MedicationUsage", "note", element.getNote().get(i), i); } + if (element.hasRenderedDosageInstructionElement()) { + composeString(t, "MedicationUsage", "renderedDosageInstruction", element.getRenderedDosageInstructionElement(), -1); + } for (int i = 0; i < element.getDosage().size(); i++) { composeDosage(t, "MedicationUsage", "dosage", element.getDosage().get(i), i); } @@ -14823,8 +14772,14 @@ public class RdfParser extends RdfParserBase { if (element.hasDomain()) { composeCoding(t, "MedicinalProductDefinition", "domain", element.getDomain(), -1); } + if (element.hasVersionElement()) { + composeString(t, "MedicinalProductDefinition", "version", element.getVersionElement(), -1); + } + if (element.hasStatus()) { + composeCoding(t, "MedicinalProductDefinition", "status", element.getStatus(), -1); + } if (element.hasDescriptionElement()) { - composeString(t, "MedicinalProductDefinition", "description", element.getDescriptionElement(), -1); + composeMarkdown(t, "MedicinalProductDefinition", "description", element.getDescriptionElement(), -1); } if (element.hasCombinedPharmaceuticalDoseForm()) { composeCodeableConcept(t, "MedicinalProductDefinition", "combinedPharmaceuticalDoseForm", element.getCombinedPharmaceuticalDoseForm(), -1); @@ -14991,23 +14946,20 @@ public class RdfParser extends RdfParserBase { t = parent.predicate("fhir:"+parentType+'.'+name); } composeBackboneElement(t, "manufacturingBusinessOperation", name, element, index); - if (element.hasOperationType()) { - composeCodeableConcept(t, "MedicinalProductDefinitionManufacturingBusinessOperationComponent", "operationType", element.getOperationType(), -1); - } - if (element.hasAuthorisationReferenceNumber()) { - composeIdentifier(t, "MedicinalProductDefinitionManufacturingBusinessOperationComponent", "authorisationReferenceNumber", element.getAuthorisationReferenceNumber(), -1); + if (element.hasType()) { + composeType(t, "MedicinalProductDefinitionManufacturingBusinessOperationComponent", "type", element.getType(), -1); } if (element.hasEffectiveDate()) { composePeriod(t, "MedicinalProductDefinitionManufacturingBusinessOperationComponent", "effectiveDate", element.getEffectiveDate(), -1); } - if (element.hasConfidentialityIndicator()) { - composeCodeableConcept(t, "MedicinalProductDefinitionManufacturingBusinessOperationComponent", "confidentialityIndicator", element.getConfidentialityIndicator(), -1); - } for (int i = 0; i < element.getManufacturer().size(); i++) { composeReference(t, "MedicinalProductDefinitionManufacturingBusinessOperationComponent", "manufacturer", element.getManufacturer().get(i), i); } - if (element.hasRegulator()) { - composeReference(t, "MedicinalProductDefinitionManufacturingBusinessOperationComponent", "regulator", element.getRegulator(), -1); + if (element.hasAuthorization()) { + composeReference(t, "MedicinalProductDefinitionManufacturingBusinessOperationComponent", "authorization", element.getAuthorization(), -1); + } + if (element.hasConfidentialityIndicator()) { + composeCodeableConcept(t, "MedicinalProductDefinitionManufacturingBusinessOperationComponent", "confidentialityIndicator", element.getConfidentialityIndicator(), -1); } } @@ -15703,10 +15655,7 @@ public class RdfParser extends RdfParserBase { composeReference(t, "NutritionIntake", "derivedFrom", element.getDerivedFrom().get(i), i); } for (int i = 0; i < element.getReasonCode().size(); i++) { - composeCodeableConcept(t, "NutritionIntake", "reasonCode", element.getReasonCode().get(i), i); - } - for (int i = 0; i < element.getReasonReference().size(); i++) { - composeReference(t, "NutritionIntake", "reasonReference", element.getReasonReference().get(i), i); + composeCodeableReference(t, "NutritionIntake", "reasonCode", element.getReasonCode().get(i), i); } for (int i = 0; i < element.getNote().size(); i++) { composeAnnotation(t, "NutritionIntake", "note", element.getNote().get(i), i); @@ -17760,11 +17709,8 @@ public class RdfParser extends RdfParserBase { if (element.hasLocation()) { composeReference(t, "Procedure", "location", element.getLocation(), -1); } - for (int i = 0; i < element.getReasonCode().size(); i++) { - composeCodeableConcept(t, "Procedure", "reasonCode", element.getReasonCode().get(i), i); - } - for (int i = 0; i < element.getReasonReference().size(); i++) { - composeReference(t, "Procedure", "reasonReference", element.getReasonReference().get(i), i); + for (int i = 0; i < element.getReason().size(); i++) { + composeCodeableReference(t, "Procedure", "reason", element.getReason().get(i), i); } for (int i = 0; i < element.getBodySite().size(); i++) { composeCodeableConcept(t, "Procedure", "bodySite", element.getBodySite().get(i), i); @@ -17790,11 +17736,8 @@ public class RdfParser extends RdfParserBase { for (int i = 0; i < element.getFocalDevice().size(); i++) { composeProcedureFocalDeviceComponent(t, "Procedure", "focalDevice", element.getFocalDevice().get(i), i); } - for (int i = 0; i < element.getUsedReference().size(); i++) { - composeReference(t, "Procedure", "usedReference", element.getUsedReference().get(i), i); - } - for (int i = 0; i < element.getUsedCode().size(); i++) { - composeCodeableConcept(t, "Procedure", "usedCode", element.getUsedCode().get(i), i); + for (int i = 0; i < element.getUsed().size(); i++) { + composeCodeableReference(t, "Procedure", "used", element.getUsed().get(i), i); } } @@ -18423,11 +18366,8 @@ public class RdfParser extends RdfParserBase { if (element.hasAuthor()) { composeReference(t, "RequestGroup", "author", element.getAuthor(), -1); } - for (int i = 0; i < element.getReasonCode().size(); i++) { - composeCodeableConcept(t, "RequestGroup", "reasonCode", element.getReasonCode().get(i), i); - } - for (int i = 0; i < element.getReasonReference().size(); i++) { - composeReference(t, "RequestGroup", "reasonReference", element.getReasonReference().get(i), i); + for (int i = 0; i < element.getReason().size(); i++) { + composeCodeableReference(t, "RequestGroup", "reason", element.getReason().get(i), i); } for (int i = 0; i < element.getNote().size(); i++) { composeAnnotation(t, "RequestGroup", "note", element.getNote().get(i), i); @@ -18777,11 +18717,8 @@ public class RdfParser extends RdfParserBase { if (element.hasPerformer()) { composeReference(t, "RiskAssessment", "performer", element.getPerformer(), -1); } - for (int i = 0; i < element.getReasonCode().size(); i++) { - composeCodeableConcept(t, "RiskAssessment", "reasonCode", element.getReasonCode().get(i), i); - } - for (int i = 0; i < element.getReasonReference().size(); i++) { - composeReference(t, "RiskAssessment", "reasonReference", element.getReasonReference().get(i), i); + for (int i = 0; i < element.getReason().size(); i++) { + composeCodeableReference(t, "RiskAssessment", "reason", element.getReason().get(i), i); } for (int i = 0; i < element.getBasis().size(); i++) { composeReference(t, "RiskAssessment", "basis", element.getBasis().get(i), i); @@ -19047,17 +18984,11 @@ public class RdfParser extends RdfParserBase { for (int i = 0; i < element.getPerformer().size(); i++) { composeReference(t, "ServiceRequest", "performer", element.getPerformer().get(i), i); } - for (int i = 0; i < element.getLocationCode().size(); i++) { - composeCodeableConcept(t, "ServiceRequest", "locationCode", element.getLocationCode().get(i), i); + for (int i = 0; i < element.getLocation().size(); i++) { + composeCodeableReference(t, "ServiceRequest", "location", element.getLocation().get(i), i); } - for (int i = 0; i < element.getLocationReference().size(); i++) { - composeReference(t, "ServiceRequest", "locationReference", element.getLocationReference().get(i), i); - } - for (int i = 0; i < element.getReasonCode().size(); i++) { - composeCodeableConcept(t, "ServiceRequest", "reasonCode", element.getReasonCode().get(i), i); - } - for (int i = 0; i < element.getReasonReference().size(); i++) { - composeReference(t, "ServiceRequest", "reasonReference", element.getReasonReference().get(i), i); + for (int i = 0; i < element.getReason().size(); i++) { + composeCodeableReference(t, "ServiceRequest", "reason", element.getReason().get(i), i); } for (int i = 0; i < element.getInsurance().size(); i++) { composeReference(t, "ServiceRequest", "insurance", element.getInsurance().get(i), i); @@ -20118,6 +20049,9 @@ public class RdfParser extends RdfParserBase { if (element.hasIdentifier()) { composeIdentifier(t, "SubstanceDefinition", "identifier", element.getIdentifier(), -1); } + if (element.hasVersionElement()) { + composeString(t, "SubstanceDefinition", "version", element.getVersionElement(), -1); + } if (element.hasStatus()) { composeCodeableConcept(t, "SubstanceDefinition", "status", element.getStatus(), -1); } @@ -21240,11 +21174,8 @@ public class RdfParser extends RdfParserBase { for (int i = 0; i < element.getSupplier().size(); i++) { composeReference(t, "SupplyRequest", "supplier", element.getSupplier().get(i), i); } - for (int i = 0; i < element.getReasonCode().size(); i++) { - composeCodeableConcept(t, "SupplyRequest", "reasonCode", element.getReasonCode().get(i), i); - } - for (int i = 0; i < element.getReasonReference().size(); i++) { - composeReference(t, "SupplyRequest", "reasonReference", element.getReasonReference().get(i), i); + for (int i = 0; i < element.getReason().size(); i++) { + composeCodeableReference(t, "SupplyRequest", "reason", element.getReason().get(i), i); } if (element.hasDeliverFrom()) { composeReference(t, "SupplyRequest", "deliverFrom", element.getDeliverFrom(), -1); 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 b54302d78..a76075140 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,6 +1,5 @@ package org.hl7.fhir.r5.formats; - // generated /* @@ -51,7 +50,7 @@ package org.hl7.fhir.r5.formats; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent @@ -3183,10 +3182,8 @@ public class XmlParser extends XmlParserBase { res.getSpecialty().add(parseCodeableConcept(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("appointmentType")) { res.setAppointmentType(parseCodeableConcept(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonCode")) { - res.getReasonCode().add(parseCodeableConcept(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonReference")) { - res.getReasonReference().add(parseReference(xpp)); + } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reason")) { + res.getReason().add(parseCodeableReference(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("priority")) { res.setPriorityElement(parseUnsignedInt(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("description")) { @@ -4773,10 +4770,8 @@ public class XmlParser extends XmlParserBase { res.getContributor().add(parseReference(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("careTeam")) { res.getCareTeam().add(parseReference(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("addressesCode")) { - res.getAddressesCode().add(parseCodeableConcept(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("addressesReference")) { - res.getAddressesReference().add(parseReference(xpp)); + } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("addresses")) { + res.getAddresses().add(parseCodeableReference(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("supportingInfo")) { res.getSupportingInfo().add(parseReference(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("goal")) { @@ -4807,10 +4802,8 @@ public class XmlParser extends XmlParserBase { } protected boolean parseCarePlanActivityComponentContent(int eventType, XmlPullParser xpp, CarePlan.CarePlanActivityComponent res) throws XmlPullParserException, IOException, FHIRFormatError { - if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("outcomeCodeableConcept")) { - res.getOutcomeCodeableConcept().add(parseCodeableConcept(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("outcomeReference")) { - res.getOutcomeReference().add(parseReference(xpp)); + if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("outcome")) { + res.getOutcome().add(parseCodeableReference(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("progress")) { res.getProgress().add(parseAnnotation(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reference")) { @@ -4847,10 +4840,8 @@ public class XmlParser extends XmlParserBase { res.getInstantiatesUri().add(parseUri(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("code")) { res.setCode(parseCodeableConcept(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonCode")) { - res.getReasonCode().add(parseCodeableConcept(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonReference")) { - res.getReasonReference().add(parseReference(xpp)); + } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reason")) { + res.getReason().add(parseCodeableReference(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("goal")) { res.getGoal().add(parseReference(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("status")) { @@ -4911,10 +4902,8 @@ public class XmlParser extends XmlParserBase { res.setPeriod(parsePeriod(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("participant")) { res.getParticipant().add(parseCareTeamParticipantComponent(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonCode")) { - res.getReasonCode().add(parseCodeableConcept(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonReference")) { - res.getReasonReference().add(parseReference(xpp)); + } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reason")) { + res.getReason().add(parseCodeableReference(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("managingOrganization")) { res.getManagingOrganization().add(parseReference(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("telecom")) { @@ -6323,10 +6312,8 @@ public class XmlParser extends XmlParserBase { } protected boolean parseClinicalImpressionFindingComponentContent(int eventType, XmlPullParser xpp, ClinicalImpression.ClinicalImpressionFindingComponent res) throws XmlPullParserException, IOException, FHIRFormatError { - if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("itemCodeableConcept")) { - res.setItemCodeableConcept(parseCodeableConcept(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("itemReference")) { - res.setItemReference(parseReference(xpp)); + if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("item")) { + res.setItem(parseCodeableReference(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("basis")) { res.setBasisElement(parseString(xpp)); } else if (!parseBackboneElementContent(eventType, xpp, res)){ @@ -6831,10 +6818,8 @@ public class XmlParser extends XmlParserBase { res.getRecipient().add(parseReference(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("sender")) { res.setSender(parseReference(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonCode")) { - res.getReasonCode().add(parseCodeableConcept(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonReference")) { - res.getReasonReference().add(parseReference(xpp)); + } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reason")) { + res.getReason().add(parseCodeableReference(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("payload")) { res.getPayload().add(parseCommunicationPayloadComponent(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("note")) { @@ -6923,10 +6908,8 @@ public class XmlParser extends XmlParserBase { res.getRecipient().add(parseReference(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("informationProvider")) { res.getInformationProvider().add(parseReference(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonCode")) { - res.getReasonCode().add(parseCodeableConcept(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonReference")) { - res.getReasonReference().add(parseReference(xpp)); + } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reason")) { + res.getReason().add(parseCodeableReference(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("note")) { res.getNote().add(parseAnnotation(xpp)); } else if (!parseDomainResourceContent(eventType, xpp, res)){ @@ -8419,12 +8402,8 @@ public class XmlParser extends XmlParserBase { res.setPerformer(parseReference(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("performerLinkId")) { res.getPerformerLinkId().add(parseString(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonCode")) { - res.getReasonCode().add(parseCodeableConcept(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonReference")) { - res.getReasonReference().add(parseReference(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reason")) { - res.getReason().add(parseString(xpp)); + res.getReason().add(parseCodeableReference(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonLinkId")) { res.getReasonLinkId().add(parseString(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("note")) { @@ -9723,10 +9702,8 @@ public class XmlParser extends XmlParserBase { res.setPerformerType(parseCodeableConcept(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("performer")) { res.setPerformer(parseReference(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonCode")) { - res.getReasonCode().add(parseCodeableConcept(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonReference")) { - res.getReasonReference().add(parseReference(xpp)); + } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reason")) { + res.getReason().add(parseCodeableReference(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("insurance")) { res.getInsurance().add(parseReference(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("supportingInfo")) { @@ -9801,10 +9778,8 @@ public class XmlParser extends XmlParserBase { res.setSource(parseReference(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("device")) { res.setDevice(parseReference(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonCode")) { - res.getReasonCode().add(parseCodeableConcept(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonReference")) { - res.getReasonReference().add(parseReference(xpp)); + } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reason")) { + res.getReason().add(parseCodeableReference(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("bodySite")) { res.setBodySite(parseCodeableConcept(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("note")) { @@ -10163,10 +10138,8 @@ public class XmlParser extends XmlParserBase { res.setPeriod(parsePeriod(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("length")) { res.setLength(parseDuration(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonCode")) { - res.getReasonCode().add(parseCodeableConcept(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonReference")) { - res.getReasonReference().add(parseReference(xpp)); + } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reason")) { + res.getReason().add(parseCodeableReference(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("diagnosis")) { res.getDiagnosis().add(parseEncounterDiagnosisComponent(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("account")) { @@ -12151,10 +12124,8 @@ public class XmlParser extends XmlParserBase { res.setEstimatedAgeElement(parseBoolean(xpp)); } else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "deceased")) { res.setDeceased(parseType("deceased", xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonCode")) { - res.getReasonCode().add(parseCodeableConcept(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonReference")) { - res.getReasonReference().add(parseReference(xpp)); + } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reason")) { + res.getReason().add(parseCodeableReference(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("condition")) { @@ -12315,10 +12286,8 @@ public class XmlParser extends XmlParserBase { res.getAddresses().add(parseReference(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("outcomeCode")) { - res.getOutcomeCode().add(parseCodeableConcept(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("outcomeReference")) { - res.getOutcomeReference().add(parseReference(xpp)); + } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("outcome")) { + res.getOutcome().add(parseCodeableReference(xpp)); } else if (!parseDomainResourceContent(eventType, xpp, res)){ return false; } @@ -12635,10 +12604,8 @@ public class XmlParser extends XmlParserBase { res.setOccurrenceDateTimeElement(parseDateTime(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("performer")) { res.setPerformer(parseReference(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonCode")) { - res.getReasonCode().add(parseCodeableConcept(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonReference")) { - res.getReasonReference().add(parseReference(xpp)); + } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reason")) { + res.getReason().add(parseCodeableReference(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("evaluationMessage")) { @@ -12851,10 +12818,8 @@ public class XmlParser extends XmlParserBase { res.getProcedure().add(parseImagingStudyProcedureComponent(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("location")) { res.setLocation(parseReference(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonCode")) { - res.getReasonCode().add(parseCodeableConcept(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonReference")) { - res.getReasonReference().add(parseReference(xpp)); + } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reason")) { + res.getReason().add(parseCodeableReference(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("description")) { @@ -13047,10 +13012,8 @@ public class XmlParser extends XmlParserBase { res.getPerformer().add(parseImmunizationPerformerComponent(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("reasonCode")) { - res.getReasonCode().add(parseCodeableConcept(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonReference")) { - res.getReasonReference().add(parseReference(xpp)); + } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reason")) { + res.getReason().add(parseCodeableReference(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("isSubpotent")) { res.setIsSubpotentElement(parseBoolean(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("subpotentReason")) { @@ -15313,10 +15276,8 @@ public class XmlParser extends XmlParserBase { res.setRecordedElement(parseDateTime(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("performer")) { res.getPerformer().add(parseMedicationAdministrationPerformerComponent(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonCode")) { - res.getReasonCode().add(parseCodeableConcept(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonReference")) { - res.getReasonReference().add(parseReference(xpp)); + } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reason")) { + res.getReason().add(parseCodeableReference(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("request")) { res.setRequest(parseReference(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("device")) { @@ -15451,6 +15412,8 @@ public class XmlParser extends XmlParserBase { res.getReceiver().add(parseReference(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("renderedDosageInstruction")) { + res.setRenderedDosageInstructionElement(parseString(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("dosageInstruction")) { res.getDosageInstruction().add(parseDosage(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("substitution")) { @@ -15663,8 +15626,8 @@ public class XmlParser extends XmlParserBase { res.setItem(parseType("item", xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("isActive")) { res.setIsActiveElement(parseBoolean(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("strength")) { - res.setStrength(parseRatio(xpp)); + } else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "strength")) { + res.setStrength(parseType("strength", xpp)); } else if (!parseBackboneElementContent(eventType, xpp, res)){ return false; } @@ -16065,6 +16028,8 @@ public class XmlParser extends XmlParserBase { res.getInsurance().add(parseReference(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("renderedDosageInstruction")) { + res.setRenderedDosageInstructionElement(parseString(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("dosageInstruction")) { res.getDosageInstruction().add(parseDosage(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("dispenseRequest")) { @@ -16111,8 +16076,8 @@ public class XmlParser extends XmlParserBase { res.setQuantity(parseQuantity(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("expectedSupplyDuration")) { res.setExpectedSupplyDuration(parseDuration(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("performer")) { - res.setPerformer(parseReference(xpp)); + } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("dispenser")) { + res.setDispenser(parseReference(xpp)); } else if (!parseBackboneElementContent(eventType, xpp, res)){ return false; } @@ -16213,12 +16178,12 @@ public class XmlParser extends XmlParserBase { res.setInformationSource(parseReference(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("derivedFrom")) { res.getDerivedFrom().add(parseReference(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonCode")) { - res.getReasonCode().add(parseCodeableConcept(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonReference")) { - res.getReasonReference().add(parseReference(xpp)); + } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reason")) { + res.getReason().add(parseCodeableReference(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("renderedDosageInstruction")) { + res.setRenderedDosageInstructionElement(parseString(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("dosage")) { res.getDosage().add(parseDosage(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("takenAsOrdered")) { @@ -16251,8 +16216,12 @@ public class XmlParser extends XmlParserBase { res.setType(parseCodeableConcept(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("domain")) { res.setDomain(parseCoding(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.setStatus(parseCoding(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("combinedPharmaceuticalDoseForm")) { res.setCombinedPharmaceuticalDoseForm(parseCodeableConcept(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("indication")) { @@ -16447,18 +16416,16 @@ public class XmlParser extends XmlParserBase { } protected boolean parseMedicinalProductDefinitionManufacturingBusinessOperationComponentContent(int eventType, XmlPullParser xpp, MedicinalProductDefinition.MedicinalProductDefinitionManufacturingBusinessOperationComponent res) throws XmlPullParserException, IOException, FHIRFormatError { - if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("operationType")) { - res.setOperationType(parseCodeableConcept(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("authorisationReferenceNumber")) { - res.setAuthorisationReferenceNumber(parseIdentifier(xpp)); + if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "type")) { + res.setType(parseType("type", xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("effectiveDate")) { res.setEffectiveDate(parsePeriod(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("confidentialityIndicator")) { - res.setConfidentialityIndicator(parseCodeableConcept(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("regulator")) { - res.setRegulator(parseReference(xpp)); + } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("authorization")) { + res.setAuthorization(parseReference(xpp)); + } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("confidentialityIndicator")) { + res.setConfidentialityIndicator(parseCodeableConcept(xpp)); } else if (!parseBackboneElementContent(eventType, xpp, res)){ return false; } @@ -17188,9 +17155,7 @@ public class XmlParser extends XmlParserBase { } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("derivedFrom")) { res.getDerivedFrom().add(parseReference(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonCode")) { - res.getReasonCode().add(parseCodeableConcept(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonReference")) { - res.getReasonReference().add(parseReference(xpp)); + res.getReasonCode().add(parseCodeableReference(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("note")) { res.getNote().add(parseAnnotation(xpp)); } else if (!parseDomainResourceContent(eventType, xpp, res)){ @@ -19357,10 +19322,8 @@ public class XmlParser extends XmlParserBase { res.getPerformer().add(parseProcedurePerformerComponent(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("location")) { res.setLocation(parseReference(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonCode")) { - res.getReasonCode().add(parseCodeableConcept(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonReference")) { - res.getReasonReference().add(parseReference(xpp)); + } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reason")) { + res.getReason().add(parseCodeableReference(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("bodySite")) { res.getBodySite().add(parseCodeableConcept(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("outcome")) { @@ -19377,10 +19340,8 @@ public class XmlParser extends XmlParserBase { res.getNote().add(parseAnnotation(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("focalDevice")) { res.getFocalDevice().add(parseProcedureFocalDeviceComponent(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("usedReference")) { - res.getUsedReference().add(parseReference(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("usedCode")) { - res.getUsedCode().add(parseCodeableConcept(xpp)); + } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("used")) { + res.getUsed().add(parseCodeableReference(xpp)); } else if (!parseDomainResourceContent(eventType, xpp, res)){ return false; } @@ -20065,10 +20026,8 @@ public class XmlParser extends XmlParserBase { res.setAuthoredOnElement(parseDateTime(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("author")) { res.setAuthor(parseReference(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonCode")) { - res.getReasonCode().add(parseCodeableConcept(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonReference")) { - res.getReasonReference().add(parseReference(xpp)); + } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reason")) { + res.getReason().add(parseCodeableReference(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("action")) { @@ -20427,10 +20386,8 @@ public class XmlParser extends XmlParserBase { res.setCondition(parseReference(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("performer")) { res.setPerformer(parseReference(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonCode")) { - res.getReasonCode().add(parseCodeableConcept(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonReference")) { - res.getReasonReference().add(parseReference(xpp)); + } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reason")) { + res.getReason().add(parseCodeableReference(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("basis")) { res.getBasis().add(parseReference(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("prediction")) { @@ -20677,14 +20634,10 @@ public class XmlParser extends XmlParserBase { res.setPerformerType(parseCodeableConcept(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("locationCode")) { - res.getLocationCode().add(parseCodeableConcept(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("locationReference")) { - res.getLocationReference().add(parseReference(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonCode")) { - res.getReasonCode().add(parseCodeableConcept(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonReference")) { - res.getReasonReference().add(parseReference(xpp)); + } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("location")) { + res.getLocation().add(parseCodeableReference(xpp)); + } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reason")) { + res.getReason().add(parseCodeableReference(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("insurance")) { res.getInsurance().add(parseReference(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("supportingInfo")) { @@ -21839,6 +21792,8 @@ public class XmlParser extends XmlParserBase { protected boolean parseSubstanceDefinitionContent(int eventType, XmlPullParser xpp, SubstanceDefinition 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("version")) { + res.setVersionElement(parseString(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("status")) { res.setStatus(parseCodeableConcept(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("category")) { @@ -23119,10 +23074,8 @@ public class XmlParser extends XmlParserBase { res.setRequester(parseReference(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("supplier")) { res.getSupplier().add(parseReference(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonCode")) { - res.getReasonCode().add(parseCodeableConcept(xpp)); - } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonReference")) { - res.getReasonReference().add(parseReference(xpp)); + } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reason")) { + res.getReason().add(parseCodeableReference(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("deliverFrom")) { res.setDeliverFrom(parseReference(xpp)); } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("deliverTo")) { @@ -29604,13 +29557,9 @@ public class XmlParser extends XmlParserBase { if (element.hasAppointmentType()) { composeCodeableConcept("appointmentType", element.getAppointmentType()); } - if (element.hasReasonCode()) { - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept("reasonCode", e); - } - if (element.hasReasonReference()) { - for (Reference e : element.getReasonReference()) - composeReference("reasonReference", e); + if (element.hasReason()) { + for (CodeableReference e : element.getReason()) + composeCodeableReference("reason", e); } if (element.hasPriorityElement()) { composeUnsignedInt("priority", element.getPriorityElement()); @@ -31165,13 +31114,9 @@ public class XmlParser extends XmlParserBase { for (Reference e : element.getCareTeam()) composeReference("careTeam", e); } - if (element.hasAddressesCode()) { - for (CodeableConcept e : element.getAddressesCode()) - composeCodeableConcept("addressesCode", e); - } - if (element.hasAddressesReference()) { - for (Reference e : element.getAddressesReference()) - composeReference("addressesReference", e); + if (element.hasAddresses()) { + for (CodeableReference e : element.getAddresses()) + composeCodeableReference("addresses", e); } if (element.hasSupportingInfo()) { for (Reference e : element.getSupportingInfo()) @@ -31203,13 +31148,9 @@ public class XmlParser extends XmlParserBase { protected void composeCarePlanActivityComponentElements(CarePlan.CarePlanActivityComponent element) throws IOException { composeBackboneElementElements(element); - if (element.hasOutcomeCodeableConcept()) { - for (CodeableConcept e : element.getOutcomeCodeableConcept()) - composeCodeableConcept("outcomeCodeableConcept", e); - } - if (element.hasOutcomeReference()) { - for (Reference e : element.getOutcomeReference()) - composeReference("outcomeReference", e); + if (element.hasOutcome()) { + for (CodeableReference e : element.getOutcome()) + composeCodeableReference("outcome", e); } if (element.hasProgress()) { for (Annotation e : element.getProgress()) @@ -31248,13 +31189,9 @@ public class XmlParser extends XmlParserBase { if (element.hasCode()) { composeCodeableConcept("code", element.getCode()); } - if (element.hasReasonCode()) { - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept("reasonCode", e); - } - if (element.hasReasonReference()) { - for (Reference e : element.getReasonReference()) - composeReference("reasonReference", e); + if (element.hasReason()) { + for (CodeableReference e : element.getReason()) + composeCodeableReference("reason", e); } if (element.hasGoal()) { for (Reference e : element.getGoal()) @@ -31327,13 +31264,9 @@ public class XmlParser extends XmlParserBase { for (CareTeam.CareTeamParticipantComponent e : element.getParticipant()) composeCareTeamParticipantComponent("participant", e); } - if (element.hasReasonCode()) { - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept("reasonCode", e); - } - if (element.hasReasonReference()) { - for (Reference e : element.getReasonReference()) - composeReference("reasonReference", e); + if (element.hasReason()) { + for (CodeableReference e : element.getReason()) + composeCodeableReference("reason", e); } if (element.hasManagingOrganization()) { for (Reference e : element.getManagingOrganization()) @@ -32838,11 +32771,8 @@ public class XmlParser extends XmlParserBase { protected void composeClinicalImpressionFindingComponentElements(ClinicalImpression.ClinicalImpressionFindingComponent element) throws IOException { composeBackboneElementElements(element); - if (element.hasItemCodeableConcept()) { - composeCodeableConcept("itemCodeableConcept", element.getItemCodeableConcept()); - } - if (element.hasItemReference()) { - composeReference("itemReference", element.getItemReference()); + if (element.hasItem()) { + composeCodeableReference("item", element.getItem()); } if (element.hasBasisElement()) { composeString("basis", element.getBasisElement()); @@ -33354,13 +33284,9 @@ public class XmlParser extends XmlParserBase { if (element.hasSender()) { composeReference("sender", element.getSender()); } - if (element.hasReasonCode()) { - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept("reasonCode", e); - } - if (element.hasReasonReference()) { - for (Reference e : element.getReasonReference()) - composeReference("reasonReference", e); + if (element.hasReason()) { + for (CodeableReference e : element.getReason()) + composeCodeableReference("reason", e); } if (element.hasPayload()) { for (Communication.CommunicationPayloadComponent e : element.getPayload()) @@ -33463,13 +33389,9 @@ public class XmlParser extends XmlParserBase { for (Reference e : element.getInformationProvider()) composeReference("informationProvider", e); } - if (element.hasReasonCode()) { - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept("reasonCode", e); - } - if (element.hasReasonReference()) { - for (Reference e : element.getReasonReference()) - composeReference("reasonReference", e); + if (element.hasReason()) { + for (CodeableReference e : element.getReason()) + composeCodeableReference("reason", e); } if (element.hasNote()) { for (Annotation e : element.getNote()) @@ -35028,17 +34950,9 @@ public class XmlParser extends XmlParserBase { for (StringType e : element.getPerformerLinkId()) composeString("performerLinkId", e); } - if (element.hasReasonCode()) { - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept("reasonCode", e); - } - if (element.hasReasonReference()) { - for (Reference e : element.getReasonReference()) - composeReference("reasonReference", e); - } if (element.hasReason()) { - for (StringType e : element.getReason()) - composeString("reason", e); + for (CodeableReference e : element.getReason()) + composeCodeableReference("reason", e); } if (element.hasReasonLinkId()) { for (StringType e : element.getReasonLinkId()) @@ -36302,13 +36216,9 @@ public class XmlParser extends XmlParserBase { if (element.hasPerformer()) { composeReference("performer", element.getPerformer()); } - if (element.hasReasonCode()) { - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept("reasonCode", e); - } - if (element.hasReasonReference()) { - for (Reference e : element.getReasonReference()) - composeReference("reasonReference", e); + if (element.hasReason()) { + for (CodeableReference e : element.getReason()) + composeCodeableReference("reason", e); } if (element.hasInsurance()) { for (Reference e : element.getInsurance()) @@ -36387,13 +36297,9 @@ public class XmlParser extends XmlParserBase { if (element.hasDevice()) { composeReference("device", element.getDevice()); } - if (element.hasReasonCode()) { - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept("reasonCode", e); - } - if (element.hasReasonReference()) { - for (Reference e : element.getReasonReference()) - composeReference("reasonReference", e); + if (element.hasReason()) { + for (CodeableReference e : element.getReason()) + composeCodeableReference("reason", e); } if (element.hasBodySite()) { composeCodeableConcept("bodySite", element.getBodySite()); @@ -36789,13 +36695,9 @@ public class XmlParser extends XmlParserBase { if (element.hasLength()) { composeDuration("length", element.getLength()); } - if (element.hasReasonCode()) { - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept("reasonCode", e); - } - if (element.hasReasonReference()) { - for (Reference e : element.getReasonReference()) - composeReference("reasonReference", e); + if (element.hasReason()) { + for (CodeableReference e : element.getReason()) + composeCodeableReference("reason", e); } if (element.hasDiagnosis()) { for (Encounter.DiagnosisComponent e : element.getDiagnosis()) @@ -38904,13 +38806,9 @@ public class XmlParser extends XmlParserBase { } if (element.hasDeceased()) { composeType("deceased", element.getDeceased()); - } if (element.hasReasonCode()) { - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept("reasonCode", e); - } - if (element.hasReasonReference()) { - for (Reference e : element.getReasonReference()) - composeReference("reasonReference", e); + } if (element.hasReason()) { + for (CodeableReference e : element.getReason()) + composeCodeableReference("reason", e); } if (element.hasNote()) { for (Annotation e : element.getNote()) @@ -39083,13 +38981,9 @@ public class XmlParser extends XmlParserBase { for (Annotation e : element.getNote()) composeAnnotation("note", e); } - if (element.hasOutcomeCode()) { - for (CodeableConcept e : element.getOutcomeCode()) - composeCodeableConcept("outcomeCode", e); - } - if (element.hasOutcomeReference()) { - for (Reference e : element.getOutcomeReference()) - composeReference("outcomeReference", e); + if (element.hasOutcome()) { + for (CodeableReference e : element.getOutcome()) + composeCodeableReference("outcome", e); } } @@ -39395,13 +39289,9 @@ public class XmlParser extends XmlParserBase { if (element.hasPerformer()) { composeReference("performer", element.getPerformer()); } - if (element.hasReasonCode()) { - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept("reasonCode", e); - } - if (element.hasReasonReference()) { - for (Reference e : element.getReasonReference()) - composeReference("reasonReference", e); + if (element.hasReason()) { + for (CodeableReference e : element.getReason()) + composeCodeableReference("reason", e); } if (element.hasNote()) { for (Annotation e : element.getNote()) @@ -39650,13 +39540,9 @@ public class XmlParser extends XmlParserBase { if (element.hasLocation()) { composeReference("location", element.getLocation()); } - if (element.hasReasonCode()) { - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept("reasonCode", e); - } - if (element.hasReasonReference()) { - for (Reference e : element.getReasonReference()) - composeReference("reasonReference", e); + if (element.hasReason()) { + for (CodeableReference e : element.getReason()) + composeCodeableReference("reason", e); } if (element.hasNote()) { for (Annotation e : element.getNote()) @@ -39856,13 +39742,9 @@ public class XmlParser extends XmlParserBase { for (Annotation e : element.getNote()) composeAnnotation("note", e); } - if (element.hasReasonCode()) { - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept("reasonCode", e); - } - if (element.hasReasonReference()) { - for (Reference e : element.getReasonReference()) - composeReference("reasonReference", e); + if (element.hasReason()) { + for (CodeableReference e : element.getReason()) + composeCodeableReference("reason", e); } if (element.hasIsSubpotentElement()) { composeBoolean("isSubpotent", element.getIsSubpotentElement()); @@ -42097,13 +41979,9 @@ public class XmlParser extends XmlParserBase { for (MedicationAdministration.MedicationAdministrationPerformerComponent e : element.getPerformer()) composeMedicationAdministrationPerformerComponent("performer", e); } - if (element.hasReasonCode()) { - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept("reasonCode", e); - } - if (element.hasReasonReference()) { - for (Reference e : element.getReasonReference()) - composeReference("reasonReference", e); + if (element.hasReason()) { + for (CodeableReference e : element.getReason()) + composeCodeableReference("reason", e); } if (element.hasRequest()) { composeReference("request", element.getRequest()); @@ -42257,6 +42135,9 @@ public class XmlParser extends XmlParserBase { for (Annotation e : element.getNote()) composeAnnotation("note", e); } + if (element.hasRenderedDosageInstructionElement()) { + composeString("renderedDosageInstruction", element.getRenderedDosageInstructionElement()); + } if (element.hasDosageInstruction()) { for (Dosage e : element.getDosageInstruction()) composeDosage("dosageInstruction", e); @@ -42482,9 +42363,8 @@ public class XmlParser extends XmlParserBase { composeBoolean("isActive", element.getIsActiveElement()); } if (element.hasStrength()) { - composeRatio("strength", element.getStrength()); - } - } + composeType("strength", element.getStrength()); + } } protected void composeMedicationKnowledgeCostComponent(String name, MedicationKnowledge.MedicationKnowledgeCostComponent element) throws IOException { if (element != null) { @@ -42846,6 +42726,9 @@ public class XmlParser extends XmlParserBase { for (Annotation e : element.getNote()) composeAnnotation("note", e); } + if (element.hasRenderedDosageInstructionElement()) { + composeString("renderedDosageInstruction", element.getRenderedDosageInstructionElement()); + } if (element.hasDosageInstruction()) { for (Dosage e : element.getDosageInstruction()) composeDosage("dosageInstruction", e); @@ -42899,8 +42782,8 @@ public class XmlParser extends XmlParserBase { if (element.hasExpectedSupplyDuration()) { composeDuration("expectedSupplyDuration", element.getExpectedSupplyDuration()); } - if (element.hasPerformer()) { - composeReference("performer", element.getPerformer()); + if (element.hasDispenser()) { + composeReference("dispenser", element.getDispenser()); } } @@ -42997,18 +42880,17 @@ public class XmlParser extends XmlParserBase { for (Reference e : element.getDerivedFrom()) composeReference("derivedFrom", e); } - if (element.hasReasonCode()) { - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept("reasonCode", e); - } - if (element.hasReasonReference()) { - for (Reference e : element.getReasonReference()) - composeReference("reasonReference", e); + if (element.hasReason()) { + for (CodeableReference e : element.getReason()) + composeCodeableReference("reason", e); } if (element.hasNote()) { for (Annotation e : element.getNote()) composeAnnotation("note", e); } + if (element.hasRenderedDosageInstructionElement()) { + composeString("renderedDosageInstruction", element.getRenderedDosageInstructionElement()); + } if (element.hasDosage()) { for (Dosage e : element.getDosage()) composeDosage("dosage", e); @@ -43040,8 +42922,14 @@ public class XmlParser extends XmlParserBase { if (element.hasDomain()) { composeCoding("domain", element.getDomain()); } + if (element.hasVersionElement()) { + composeString("version", element.getVersionElement()); + } + if (element.hasStatus()) { + composeCoding("status", element.getStatus()); + } if (element.hasDescriptionElement()) { - composeString("description", element.getDescriptionElement()); + composeMarkdown("description", element.getDescriptionElement()); } if (element.hasCombinedPharmaceuticalDoseForm()) { composeCodeableConcept("combinedPharmaceuticalDoseForm", element.getCombinedPharmaceuticalDoseForm()); @@ -43234,24 +43122,20 @@ public class XmlParser extends XmlParserBase { protected void composeMedicinalProductDefinitionManufacturingBusinessOperationComponentElements(MedicinalProductDefinition.MedicinalProductDefinitionManufacturingBusinessOperationComponent element) throws IOException { composeBackboneElementElements(element); - if (element.hasOperationType()) { - composeCodeableConcept("operationType", element.getOperationType()); - } - if (element.hasAuthorisationReferenceNumber()) { - composeIdentifier("authorisationReferenceNumber", element.getAuthorisationReferenceNumber()); - } - if (element.hasEffectiveDate()) { + if (element.hasType()) { + composeType("type", element.getType()); + } if (element.hasEffectiveDate()) { composePeriod("effectiveDate", element.getEffectiveDate()); } - if (element.hasConfidentialityIndicator()) { - composeCodeableConcept("confidentialityIndicator", element.getConfidentialityIndicator()); - } if (element.hasManufacturer()) { for (Reference e : element.getManufacturer()) composeReference("manufacturer", e); } - if (element.hasRegulator()) { - composeReference("regulator", element.getRegulator()); + if (element.hasAuthorization()) { + composeReference("authorization", element.getAuthorization()); + } + if (element.hasConfidentialityIndicator()) { + composeCodeableConcept("confidentialityIndicator", element.getConfidentialityIndicator()); } } @@ -44005,12 +43889,8 @@ public class XmlParser extends XmlParserBase { composeReference("derivedFrom", e); } if (element.hasReasonCode()) { - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept("reasonCode", e); - } - if (element.hasReasonReference()) { - for (Reference e : element.getReasonReference()) - composeReference("reasonReference", e); + for (CodeableReference e : element.getReasonCode()) + composeCodeableReference("reasonCode", e); } if (element.hasNote()) { for (Annotation e : element.getNote()) @@ -46288,13 +46168,9 @@ public class XmlParser extends XmlParserBase { if (element.hasLocation()) { composeReference("location", element.getLocation()); } - if (element.hasReasonCode()) { - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept("reasonCode", e); - } - if (element.hasReasonReference()) { - for (Reference e : element.getReasonReference()) - composeReference("reasonReference", e); + if (element.hasReason()) { + for (CodeableReference e : element.getReason()) + composeCodeableReference("reason", e); } if (element.hasBodySite()) { for (CodeableConcept e : element.getBodySite()) @@ -46327,13 +46203,9 @@ public class XmlParser extends XmlParserBase { for (Procedure.ProcedureFocalDeviceComponent e : element.getFocalDevice()) composeProcedureFocalDeviceComponent("focalDevice", e); } - if (element.hasUsedReference()) { - for (Reference e : element.getUsedReference()) - composeReference("usedReference", e); - } - if (element.hasUsedCode()) { - for (CodeableConcept e : element.getUsedCode()) - composeCodeableConcept("usedCode", e); + if (element.hasUsed()) { + for (CodeableReference e : element.getUsed()) + composeCodeableReference("used", e); } } @@ -47028,13 +46900,9 @@ public class XmlParser extends XmlParserBase { if (element.hasAuthor()) { composeReference("author", element.getAuthor()); } - if (element.hasReasonCode()) { - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept("reasonCode", e); - } - if (element.hasReasonReference()) { - for (Reference e : element.getReasonReference()) - composeReference("reasonReference", e); + if (element.hasReason()) { + for (CodeableReference e : element.getReason()) + composeCodeableReference("reason", e); } if (element.hasNote()) { for (Annotation e : element.getNote()) @@ -47414,13 +47282,9 @@ public class XmlParser extends XmlParserBase { if (element.hasPerformer()) { composeReference("performer", element.getPerformer()); } - if (element.hasReasonCode()) { - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept("reasonCode", e); - } - if (element.hasReasonReference()) { - for (Reference e : element.getReasonReference()) - composeReference("reasonReference", e); + if (element.hasReason()) { + for (CodeableReference e : element.getReason()) + composeCodeableReference("reason", e); } if (element.hasBasis()) { for (Reference e : element.getBasis()) @@ -47708,21 +47572,13 @@ public class XmlParser extends XmlParserBase { for (Reference e : element.getPerformer()) composeReference("performer", e); } - if (element.hasLocationCode()) { - for (CodeableConcept e : element.getLocationCode()) - composeCodeableConcept("locationCode", e); + if (element.hasLocation()) { + for (CodeableReference e : element.getLocation()) + composeCodeableReference("location", e); } - if (element.hasLocationReference()) { - for (Reference e : element.getLocationReference()) - composeReference("locationReference", e); - } - if (element.hasReasonCode()) { - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept("reasonCode", e); - } - if (element.hasReasonReference()) { - for (Reference e : element.getReasonReference()) - composeReference("reasonReference", e); + if (element.hasReason()) { + for (CodeableReference e : element.getReason()) + composeCodeableReference("reason", e); } if (element.hasInsurance()) { for (Reference e : element.getInsurance()) @@ -48882,6 +48738,9 @@ public class XmlParser extends XmlParserBase { if (element.hasIdentifier()) { composeIdentifier("identifier", element.getIdentifier()); } + if (element.hasVersionElement()) { + composeString("version", element.getVersionElement()); + } if (element.hasStatus()) { composeCodeableConcept("status", element.getStatus()); } @@ -50128,13 +49987,9 @@ public class XmlParser extends XmlParserBase { for (Reference e : element.getSupplier()) composeReference("supplier", e); } - if (element.hasReasonCode()) { - for (CodeableConcept e : element.getReasonCode()) - composeCodeableConcept("reasonCode", e); - } - if (element.hasReasonReference()) { - for (Reference e : element.getReasonReference()) - composeReference("reasonReference", e); + if (element.hasReason()) { + for (CodeableReference e : element.getReason()) + composeCodeableReference("reason", e); } if (element.hasDeliverFrom()) { composeReference("deliverFrom", element.getDeliverFrom()); 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 47648336a..0bc33ab29 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 246e3edde..b8670908d 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 285f2154a..e8404c46d 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 60d5e1631..afe465e65 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 834ff8a42..b93dfb37d 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 a10946a97..1a3c18949 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 780902d53..e6fbb3dc3 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 6b46253b1..e0f020ac2 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 2fa087ad2..f82eb6190 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; @@ -889,101 +889,94 @@ public class Appointment extends DomainResource { protected CodeableConcept appointmentType; /** - * The coded reason that this appointment is being scheduled. This is more clinical than administrative. + * The reason that this appointment is being scheduled. This is more clinical than administrative. This can be coded, or as specified using information from another resource. When the patient arrives and the encounter begins it may be used as the admission diagnosis. The indication will typically be a Condition (with other resources referenced in the evidence.detail), or a Procedure. */ - @Child(name = "reasonCode", type = {CodeableConcept.class}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Coded reason this appointment is scheduled", formalDefinition="The coded reason that this appointment is being scheduled. This is more clinical than administrative." ) + @Child(name = "reason", type = {CodeableReference.class}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="Reason this appointment is scheduled", formalDefinition="The reason that this appointment is being scheduled. This is more clinical than administrative. This can be coded, or as specified using information from another resource. When the patient arrives and the encounter begins it may be used as the admission diagnosis. The indication will typically be a Condition (with other resources referenced in the evidence.detail), or a Procedure." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/encounter-reason") - protected List reasonCode; - - /** - * Reason the appointment has been scheduled to take place, as specified using information from another resource. When the patient arrives and the encounter begins it may be used as the admission diagnosis. The indication will typically be a Condition (with other resources referenced in the evidence.detail), or a Procedure. - */ - @Child(name = "reasonReference", type = {Condition.class, Procedure.class, Observation.class, ImmunizationRecommendation.class}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Reason the appointment is to take place (resource)", formalDefinition="Reason the appointment has been scheduled to take place, as specified using information from another resource. When the patient arrives and the encounter begins it may be used as the admission diagnosis. The indication will typically be a Condition (with other resources referenced in the evidence.detail), or a Procedure." ) - protected List reasonReference; + protected List reason; /** * The priority of the appointment. Can be used to make informed decisions if needing to re-prioritize appointments. (The iCal Standard specifies 0 as undefined, 1 as highest, 9 as lowest priority). */ - @Child(name = "priority", type = {UnsignedIntType.class}, order=9, min=0, max=1, modifier=false, summary=false) + @Child(name = "priority", type = {UnsignedIntType.class}, order=8, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Used to make informed decisions if needing to re-prioritize", formalDefinition="The priority of the appointment. Can be used to make informed decisions if needing to re-prioritize appointments. (The iCal Standard specifies 0 as undefined, 1 as highest, 9 as lowest priority)." ) protected UnsignedIntType priority; /** * The brief description of the appointment as would be shown on a subject line in a meeting request, or appointment list. Detailed or expanded information should be put in the comment field. */ - @Child(name = "description", type = {StringType.class}, order=10, min=0, max=1, modifier=false, summary=false) + @Child(name = "description", type = {StringType.class}, order=9, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Shown on a subject line in a meeting request, or appointment list", formalDefinition="The brief description of the appointment as would be shown on a subject line in a meeting request, or appointment list. Detailed or expanded information should be put in the comment field." ) protected StringType description; /** * Additional information to support the appointment provided when making the appointment. */ - @Child(name = "supportingInformation", type = {Reference.class}, order=11, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "supportingInformation", type = {Reference.class}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Additional information to support the appointment", formalDefinition="Additional information to support the appointment provided when making the appointment." ) protected List supportingInformation; /** * Date/Time that the appointment is to take place. */ - @Child(name = "start", type = {InstantType.class}, order=12, min=0, max=1, modifier=false, summary=true) + @Child(name = "start", type = {InstantType.class}, order=11, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="When appointment is to take place", formalDefinition="Date/Time that the appointment is to take place." ) protected InstantType start; /** * Date/Time that the appointment is to conclude. */ - @Child(name = "end", type = {InstantType.class}, order=13, min=0, max=1, modifier=false, summary=true) + @Child(name = "end", type = {InstantType.class}, order=12, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="When appointment is to conclude", formalDefinition="Date/Time that the appointment is to conclude." ) protected InstantType end; /** * Number of minutes that the appointment is to take. This can be less than the duration between the start and end times. For example, where the actual time of appointment is only an estimate or if a 30 minute appointment is being requested, but any time would work. Also, if there is, for example, a planned 15 minute break in the middle of a long appointment, the duration may be 15 minutes less than the difference between the start and end. */ - @Child(name = "minutesDuration", type = {PositiveIntType.class}, order=14, min=0, max=1, modifier=false, summary=false) + @Child(name = "minutesDuration", type = {PositiveIntType.class}, order=13, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Can be less than start/end (e.g. estimate)", formalDefinition="Number of minutes that the appointment is to take. This can be less than the duration between the start and end times. For example, where the actual time of appointment is only an estimate or if a 30 minute appointment is being requested, but any time would work. Also, if there is, for example, a planned 15 minute break in the middle of a long appointment, the duration may be 15 minutes less than the difference between the start and end." ) protected PositiveIntType minutesDuration; /** * The slots from the participants' schedules that will be filled by the appointment. */ - @Child(name = "slot", type = {Slot.class}, order=15, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "slot", type = {Slot.class}, order=14, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="The slots that this appointment is filling", formalDefinition="The slots from the participants' schedules that will be filled by the appointment." ) protected List slot; /** * The date that this appointment was initially created. This could be different to the meta.lastModified value on the initial entry, as this could have been before the resource was created on the FHIR server, and should remain unchanged over the lifespan of the appointment. */ - @Child(name = "created", type = {DateTimeType.class}, order=16, min=0, max=1, modifier=false, summary=false) + @Child(name = "created", type = {DateTimeType.class}, order=15, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="The date that this appointment was initially created", formalDefinition="The date that this appointment was initially created. This could be different to the meta.lastModified value on the initial entry, as this could have been before the resource was created on the FHIR server, and should remain unchanged over the lifespan of the appointment." ) protected DateTimeType created; /** * Additional comments about the appointment. */ - @Child(name = "comment", type = {StringType.class}, order=17, min=0, max=1, modifier=false, summary=false) + @Child(name = "comment", type = {StringType.class}, order=16, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Additional comments", formalDefinition="Additional comments about the appointment." ) protected StringType comment; /** * While Appointment.comment contains information for internal use, Appointment.patientInstructions is used to capture patient facing information about the Appointment (e.g. please bring your referral or fast from 8pm night before). */ - @Child(name = "patientInstruction", type = {StringType.class}, order=18, min=0, max=1, modifier=false, summary=false) + @Child(name = "patientInstruction", type = {StringType.class}, order=17, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Detailed information and instructions for the patient", formalDefinition="While Appointment.comment contains information for internal use, Appointment.patientInstructions is used to capture patient facing information about the Appointment (e.g. please bring your referral or fast from 8pm night before)." ) protected StringType patientInstruction; /** * The service request this appointment is allocated to assess (e.g. incoming referral or procedure request). */ - @Child(name = "basedOn", type = {ServiceRequest.class}, order=19, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "basedOn", type = {ServiceRequest.class}, order=18, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="The service request this appointment is allocated to assess", formalDefinition="The service request this appointment is allocated to assess (e.g. incoming referral or procedure request)." ) protected List basedOn; /** * List of participants involved in the appointment. */ - @Child(name = "participant", type = {}, order=20, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "participant", type = {}, order=19, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Participants involved in appointment", formalDefinition="List of participants involved in the appointment." ) protected List participant; @@ -992,11 +985,11 @@ public class Appointment extends DomainResource { The duration (usually in minutes) could also be provided to indicate the length of the appointment to fill and populate the start/end times for the actual allocated time. However, in other situations the duration may be calculated by the scheduling system. */ - @Child(name = "requestedPeriod", type = {Period.class}, order=21, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "requestedPeriod", type = {Period.class}, order=20, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Potential date/time interval(s) requested to allocate the appointment within", formalDefinition="A set of date ranges (potentially including times) that the appointment is preferred to be scheduled within.\n\nThe duration (usually in minutes) could also be provided to indicate the length of the appointment to fill and populate the start/end times for the actual allocated time. However, in other situations the duration may be calculated by the scheduling system." ) protected List requestedPeriod; - private static final long serialVersionUID = 267666863L; + private static final long serialVersionUID = 1849497415L; /** * Constructor @@ -1320,109 +1313,56 @@ The duration (usually in minutes) could also be provided to indicate the length } /** - * @return {@link #reasonCode} (The coded reason that this appointment is being scheduled. This is more clinical than administrative.) + * @return {@link #reason} (The reason that this appointment is being scheduled. This is more clinical than administrative. This can be coded, or as specified using information from another resource. When the patient arrives and the encounter begins it may be used as the admission diagnosis. The indication will typically be a Condition (with other resources referenced in the evidence.detail), or a Procedure.) */ - public List getReasonCode() { - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - return this.reasonCode; + public List getReason() { + if (this.reason == null) + this.reason = new ArrayList(); + return this.reason; } /** * @return Returns a reference to this for easy method chaining */ - public Appointment setReasonCode(List theReasonCode) { - this.reasonCode = theReasonCode; + public Appointment setReason(List theReason) { + this.reason = theReason; return this; } - public boolean hasReasonCode() { - if (this.reasonCode == null) + public boolean hasReason() { + if (this.reason == null) return false; - for (CodeableConcept item : this.reasonCode) + for (CodeableReference item : this.reason) if (!item.isEmpty()) return true; return false; } - public CodeableConcept addReasonCode() { //3 - CodeableConcept t = new CodeableConcept(); - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); + public CodeableReference addReason() { //3 + CodeableReference t = new CodeableReference(); + if (this.reason == null) + this.reason = new ArrayList(); + this.reason.add(t); return t; } - public Appointment addReasonCode(CodeableConcept t) { //3 + public Appointment addReason(CodeableReference t) { //3 if (t == null) return this; - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); + if (this.reason == null) + this.reason = new ArrayList(); + this.reason.add(t); return this; } /** - * @return The first repetition of repeating field {@link #reasonCode}, creating it if it does not already exist {3} + * @return The first repetition of repeating field {@link #reason}, creating it if it does not already exist {3} */ - public CodeableConcept getReasonCodeFirstRep() { - if (getReasonCode().isEmpty()) { - addReasonCode(); + public CodeableReference getReasonFirstRep() { + if (getReason().isEmpty()) { + addReason(); } - return getReasonCode().get(0); - } - - /** - * @return {@link #reasonReference} (Reason the appointment has been scheduled to take place, as specified using information from another resource. When the patient arrives and the encounter begins it may be used as the admission diagnosis. The indication will typically be a Condition (with other resources referenced in the evidence.detail), or a Procedure.) - */ - public List getReasonReference() { - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - return this.reasonReference; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public Appointment setReasonReference(List theReasonReference) { - this.reasonReference = theReasonReference; - return this; - } - - public boolean hasReasonReference() { - if (this.reasonReference == null) - return false; - for (Reference item : this.reasonReference) - if (!item.isEmpty()) - return true; - return false; - } - - public Reference addReasonReference() { //3 - Reference t = new Reference(); - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return t; - } - - public Appointment addReasonReference(Reference t) { //3 - if (t == null) - return this; - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #reasonReference}, creating it if it does not already exist {3} - */ - public Reference getReasonReferenceFirstRep() { - if (getReasonReference().isEmpty()) { - addReasonReference(); - } - return getReasonReference().get(0); + return getReason().get(0); } /** @@ -2085,8 +2025,7 @@ The duration (usually in minutes) could also be provided to indicate the length children.add(new Property("serviceType", "CodeableConcept", "The specific service that is to be performed during this appointment.", 0, java.lang.Integer.MAX_VALUE, serviceType)); children.add(new Property("specialty", "CodeableConcept", "The specialty of a practitioner that would be required to perform the service requested in this appointment.", 0, java.lang.Integer.MAX_VALUE, specialty)); children.add(new Property("appointmentType", "CodeableConcept", "The style of appointment or patient that has been booked in the slot (not service type).", 0, 1, appointmentType)); - children.add(new Property("reasonCode", "CodeableConcept", "The coded reason that this appointment is being scheduled. This is more clinical than administrative.", 0, java.lang.Integer.MAX_VALUE, reasonCode)); - children.add(new Property("reasonReference", "Reference(Condition|Procedure|Observation|ImmunizationRecommendation)", "Reason the appointment has been scheduled to take place, as specified using information from another resource. When the patient arrives and the encounter begins it may be used as the admission diagnosis. The indication will typically be a Condition (with other resources referenced in the evidence.detail), or a Procedure.", 0, java.lang.Integer.MAX_VALUE, reasonReference)); + children.add(new Property("reason", "CodeableReference(Condition|Procedure|Observation|ImmunizationRecommendation)", "The reason that this appointment is being scheduled. This is more clinical than administrative. This can be coded, or as specified using information from another resource. When the patient arrives and the encounter begins it may be used as the admission diagnosis. The indication will typically be a Condition (with other resources referenced in the evidence.detail), or a Procedure.", 0, java.lang.Integer.MAX_VALUE, reason)); children.add(new Property("priority", "unsignedInt", "The priority of the appointment. Can be used to make informed decisions if needing to re-prioritize appointments. (The iCal Standard specifies 0 as undefined, 1 as highest, 9 as lowest priority).", 0, 1, priority)); children.add(new Property("description", "string", "The brief description of the appointment as would be shown on a subject line in a meeting request, or appointment list. Detailed or expanded information should be put in the comment field.", 0, 1, description)); children.add(new Property("supportingInformation", "Reference(Any)", "Additional information to support the appointment provided when making the appointment.", 0, java.lang.Integer.MAX_VALUE, supportingInformation)); @@ -2112,8 +2051,7 @@ The duration (usually in minutes) could also be provided to indicate the length case -1928370289: /*serviceType*/ return new Property("serviceType", "CodeableConcept", "The specific service that is to be performed during this appointment.", 0, java.lang.Integer.MAX_VALUE, serviceType); case -1694759682: /*specialty*/ return new Property("specialty", "CodeableConcept", "The specialty of a practitioner that would be required to perform the service requested in this appointment.", 0, java.lang.Integer.MAX_VALUE, specialty); case -1596426375: /*appointmentType*/ return new Property("appointmentType", "CodeableConcept", "The style of appointment or patient that has been booked in the slot (not service type).", 0, 1, appointmentType); - case 722137681: /*reasonCode*/ return new Property("reasonCode", "CodeableConcept", "The coded reason that this appointment is being scheduled. This is more clinical than administrative.", 0, java.lang.Integer.MAX_VALUE, reasonCode); - case -1146218137: /*reasonReference*/ return new Property("reasonReference", "Reference(Condition|Procedure|Observation|ImmunizationRecommendation)", "Reason the appointment has been scheduled to take place, as specified using information from another resource. When the patient arrives and the encounter begins it may be used as the admission diagnosis. The indication will typically be a Condition (with other resources referenced in the evidence.detail), or a Procedure.", 0, java.lang.Integer.MAX_VALUE, reasonReference); + case -934964668: /*reason*/ return new Property("reason", "CodeableReference(Condition|Procedure|Observation|ImmunizationRecommendation)", "The reason that this appointment is being scheduled. This is more clinical than administrative. This can be coded, or as specified using information from another resource. When the patient arrives and the encounter begins it may be used as the admission diagnosis. The indication will typically be a Condition (with other resources referenced in the evidence.detail), or a Procedure.", 0, java.lang.Integer.MAX_VALUE, reason); case -1165461084: /*priority*/ return new Property("priority", "unsignedInt", "The priority of the appointment. Can be used to make informed decisions if needing to re-prioritize appointments. (The iCal Standard specifies 0 as undefined, 1 as highest, 9 as lowest priority).", 0, 1, priority); case -1724546052: /*description*/ return new Property("description", "string", "The brief description of the appointment as would be shown on a subject line in a meeting request, or appointment list. Detailed or expanded information should be put in the comment field.", 0, 1, description); case -1248768647: /*supportingInformation*/ return new Property("supportingInformation", "Reference(Any)", "Additional information to support the appointment provided when making the appointment.", 0, java.lang.Integer.MAX_VALUE, supportingInformation); @@ -2142,8 +2080,7 @@ The duration (usually in minutes) could also be provided to indicate the length case -1928370289: /*serviceType*/ return this.serviceType == null ? new Base[0] : this.serviceType.toArray(new Base[this.serviceType.size()]); // CodeableConcept case -1694759682: /*specialty*/ return this.specialty == null ? new Base[0] : this.specialty.toArray(new Base[this.specialty.size()]); // CodeableConcept case -1596426375: /*appointmentType*/ return this.appointmentType == null ? new Base[0] : new Base[] {this.appointmentType}; // CodeableConcept - case 722137681: /*reasonCode*/ return this.reasonCode == null ? new Base[0] : this.reasonCode.toArray(new Base[this.reasonCode.size()]); // CodeableConcept - case -1146218137: /*reasonReference*/ return this.reasonReference == null ? new Base[0] : this.reasonReference.toArray(new Base[this.reasonReference.size()]); // Reference + case -934964668: /*reason*/ return this.reason == null ? new Base[0] : this.reason.toArray(new Base[this.reason.size()]); // CodeableReference case -1165461084: /*priority*/ return this.priority == null ? new Base[0] : new Base[] {this.priority}; // UnsignedIntType case -1724546052: /*description*/ return this.description == null ? new Base[0] : new Base[] {this.description}; // StringType case -1248768647: /*supportingInformation*/ return this.supportingInformation == null ? new Base[0] : this.supportingInformation.toArray(new Base[this.supportingInformation.size()]); // Reference @@ -2187,11 +2124,8 @@ The duration (usually in minutes) could also be provided to indicate the length case -1596426375: // appointmentType this.appointmentType = TypeConvertor.castToCodeableConcept(value); // CodeableConcept return value; - case 722137681: // reasonCode - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept - return value; - case -1146218137: // reasonReference - this.getReasonReference().add(TypeConvertor.castToReference(value)); // Reference + case -934964668: // reason + this.getReason().add(TypeConvertor.castToCodeableReference(value)); // CodeableReference return value; case -1165461084: // priority this.priority = TypeConvertor.castToUnsignedInt(value); // UnsignedIntType @@ -2254,10 +2188,8 @@ The duration (usually in minutes) could also be provided to indicate the length this.getSpecialty().add(TypeConvertor.castToCodeableConcept(value)); } else if (name.equals("appointmentType")) { this.appointmentType = TypeConvertor.castToCodeableConcept(value); // CodeableConcept - } else if (name.equals("reasonCode")) { - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); - } else if (name.equals("reasonReference")) { - this.getReasonReference().add(TypeConvertor.castToReference(value)); + } else if (name.equals("reason")) { + this.getReason().add(TypeConvertor.castToCodeableReference(value)); } else if (name.equals("priority")) { this.priority = TypeConvertor.castToUnsignedInt(value); // UnsignedIntType } else if (name.equals("description")) { @@ -2299,8 +2231,7 @@ The duration (usually in minutes) could also be provided to indicate the length case -1928370289: return addServiceType(); case -1694759682: return addSpecialty(); case -1596426375: return getAppointmentType(); - case 722137681: return addReasonCode(); - case -1146218137: return addReasonReference(); + case -934964668: return addReason(); case -1165461084: return getPriorityElement(); case -1724546052: return getDescriptionElement(); case -1248768647: return addSupportingInformation(); @@ -2329,8 +2260,7 @@ The duration (usually in minutes) could also be provided to indicate the length case -1928370289: /*serviceType*/ return new String[] {"CodeableConcept"}; case -1694759682: /*specialty*/ return new String[] {"CodeableConcept"}; case -1596426375: /*appointmentType*/ return new String[] {"CodeableConcept"}; - case 722137681: /*reasonCode*/ return new String[] {"CodeableConcept"}; - case -1146218137: /*reasonReference*/ return new String[] {"Reference"}; + case -934964668: /*reason*/ return new String[] {"CodeableReference"}; case -1165461084: /*priority*/ return new String[] {"unsignedInt"}; case -1724546052: /*description*/ return new String[] {"string"}; case -1248768647: /*supportingInformation*/ return new String[] {"Reference"}; @@ -2374,11 +2304,8 @@ The duration (usually in minutes) could also be provided to indicate the length this.appointmentType = new CodeableConcept(); return this.appointmentType; } - else if (name.equals("reasonCode")) { - return addReasonCode(); - } - else if (name.equals("reasonReference")) { - return addReasonReference(); + else if (name.equals("reason")) { + return addReason(); } else if (name.equals("priority")) { throw new FHIRException("Cannot call addChild on a primitive type Appointment.priority"); @@ -2459,15 +2386,10 @@ The duration (usually in minutes) could also be provided to indicate the length dst.specialty.add(i.copy()); }; dst.appointmentType = appointmentType == null ? null : appointmentType.copy(); - if (reasonCode != null) { - dst.reasonCode = new ArrayList(); - for (CodeableConcept i : reasonCode) - dst.reasonCode.add(i.copy()); - }; - if (reasonReference != null) { - dst.reasonReference = new ArrayList(); - for (Reference i : reasonReference) - dst.reasonReference.add(i.copy()); + if (reason != null) { + dst.reason = new ArrayList(); + for (CodeableReference i : reason) + dst.reason.add(i.copy()); }; dst.priority = priority == null ? null : priority.copy(); dst.description = description == null ? null : description.copy(); @@ -2518,12 +2440,11 @@ The duration (usually in minutes) could also be provided to indicate the length return compareDeep(identifier, o.identifier, true) && compareDeep(status, o.status, true) && compareDeep(cancelationReason, o.cancelationReason, true) && compareDeep(serviceCategory, o.serviceCategory, true) && compareDeep(serviceType, o.serviceType, true) && compareDeep(specialty, o.specialty, true) && compareDeep(appointmentType, o.appointmentType, true) - && compareDeep(reasonCode, o.reasonCode, true) && compareDeep(reasonReference, o.reasonReference, true) - && compareDeep(priority, o.priority, true) && compareDeep(description, o.description, true) && compareDeep(supportingInformation, o.supportingInformation, true) - && compareDeep(start, o.start, true) && compareDeep(end, o.end, true) && compareDeep(minutesDuration, o.minutesDuration, true) - && compareDeep(slot, o.slot, true) && compareDeep(created, o.created, true) && compareDeep(comment, o.comment, true) - && compareDeep(patientInstruction, o.patientInstruction, true) && compareDeep(basedOn, o.basedOn, true) - && compareDeep(participant, o.participant, true) && compareDeep(requestedPeriod, o.requestedPeriod, true) + && compareDeep(reason, o.reason, true) && compareDeep(priority, o.priority, true) && compareDeep(description, o.description, true) + && compareDeep(supportingInformation, o.supportingInformation, true) && compareDeep(start, o.start, true) + && compareDeep(end, o.end, true) && compareDeep(minutesDuration, o.minutesDuration, true) && compareDeep(slot, o.slot, true) + && compareDeep(created, o.created, true) && compareDeep(comment, o.comment, true) && compareDeep(patientInstruction, o.patientInstruction, true) + && compareDeep(basedOn, o.basedOn, true) && compareDeep(participant, o.participant, true) && compareDeep(requestedPeriod, o.requestedPeriod, true) ; } @@ -2542,9 +2463,9 @@ The duration (usually in minutes) could also be provided to indicate the length public boolean isEmpty() { return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, status, cancelationReason - , serviceCategory, serviceType, specialty, appointmentType, reasonCode, reasonReference - , priority, description, supportingInformation, start, end, minutesDuration, slot - , created, comment, patientInstruction, basedOn, participant, requestedPeriod); + , serviceCategory, serviceType, specialty, appointmentType, reason, priority, description + , supportingInformation, start, end, minutesDuration, slot, created, comment, patientInstruction + , basedOn, participant, requestedPeriod); } @Override @@ -2765,19 +2686,19 @@ The duration (usually in minutes) could also be provided to indicate the length /** * Search parameter: reason-code *

- * Description: Coded reason this appointment is scheduled
+ * Description: Reference to a concept (by class)
* Type: token
- * Path: Appointment.reasonCode
+ * Path: Appointment.reason.concept
*

*/ - @SearchParamDefinition(name="reason-code", path="Appointment.reasonCode", description="Coded reason this appointment is scheduled", type="token" ) + @SearchParamDefinition(name="reason-code", path="Appointment.reason.concept", description="Reference to a concept (by class)", type="token" ) public static final String SP_REASON_CODE = "reason-code"; /** * Fluent Client search parameter constant for reason-code *

- * Description: Coded reason this appointment is scheduled
+ * Description: Reference to a concept (by class)
* Type: token
- * Path: Appointment.reasonCode
+ * Path: Appointment.reason.concept
*

*/ public static final ca.uhn.fhir.rest.gclient.TokenClientParam REASON_CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_REASON_CODE); @@ -2785,19 +2706,19 @@ The duration (usually in minutes) could also be provided to indicate the length /** * Search parameter: reason-reference *

- * Description: Reason the appointment is to take place (resource)
+ * Description: Reference to a resource (by instance)
* Type: reference
- * Path: Appointment.reasonReference
+ * Path: Appointment.reason.reference
*

*/ - @SearchParamDefinition(name="reason-reference", path="Appointment.reasonReference", description="Reason the appointment is to take place (resource)", type="reference", target={Condition.class, ImmunizationRecommendation.class, Observation.class, Procedure.class } ) + @SearchParamDefinition(name="reason-reference", path="Appointment.reason.reference", description="Reference to a resource (by instance)", type="reference" ) public static final String SP_REASON_REFERENCE = "reason-reference"; /** * Fluent Client search parameter constant for reason-reference *

- * Description: Reason the appointment is to take place (resource)
+ * Description: Reference to a resource (by instance)
* Type: reference
- * Path: Appointment.reasonReference
+ * Path: Appointment.reason.reference
*

*/ public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam REASON_REFERENCE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_REASON_REFERENCE); 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 08e0d9524..4da09bbbb 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 c3f65afd9..3d074c2e5 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 6128162ef..fad5a3d6b 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 ecfcf7c72..e1358639b 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 68fc5a8c4..a8d557f71 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 6c12023ca..14c625004 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 1a95420aa..424f11dff 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 8ffd1ba32..410338858 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 d14209e29..e9c9f8f05 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 b0b8f6ddf..0979f9a58 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 db4e3f30a..9adf51299 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 825a9baa6..4b4a74410 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 2c4180123..efc0d4f52 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 d37d8376e..e033926cd 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; @@ -608,42 +608,35 @@ public class CarePlan extends DomainResource { @Block() public static class CarePlanActivityComponent extends BackboneElement implements IBaseBackboneElement { /** - * Identifies the outcome at the point when the status of the activity is assessed. For example, the outcome of an education activity could be patient understands (or not). + * Identifies the outcome at the point when the status of the activity is assessed. For example, the outcome of an education activity could be patient understands (or not). The reference to an "event" resource, such as Procedure or Encounter or Observation, is the result/outcome of the activity itself. The activity can be conveyed using CarePlan.activity.detail OR using the CarePlan.activity.reference (a reference to a “request” resource). */ - @Child(name = "outcomeCodeableConcept", type = {CodeableConcept.class}, order=1, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Results of the activity", formalDefinition="Identifies the outcome at the point when the status of the activity is assessed. For example, the outcome of an education activity could be patient understands (or not)." ) + @Child(name = "outcome", type = {CodeableReference.class}, order=1, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="Results of the activity (concept, or Appointment, Encounter, Procedure, etc)", formalDefinition="Identifies the outcome at the point when the status of the activity is assessed. For example, the outcome of an education activity could be patient understands (or not). The reference to an \"event\" resource, such as Procedure or Encounter or Observation, is the result/outcome of the activity itself. The activity can be conveyed using CarePlan.activity.detail OR using the CarePlan.activity.reference (a reference to a “request” resource)." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/care-plan-activity-outcome") - protected List outcomeCodeableConcept; - - /** - * Details of the outcome or action resulting from the activity. The reference to an "event" resource, such as Procedure or Encounter or Observation, is the result/outcome of the activity itself. The activity can be conveyed using CarePlan.activity.detail OR using the CarePlan.activity.reference (a reference to a “request” resource). - */ - @Child(name = "outcomeReference", type = {Reference.class}, order=2, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Appointment, Encounter, Procedure, etc.", formalDefinition="Details of the outcome or action resulting from the activity. The reference to an \"event\" resource, such as Procedure or Encounter or Observation, is the result/outcome of the activity itself. The activity can be conveyed using CarePlan.activity.detail OR using the CarePlan.activity.reference (a reference to a “request” resource)." ) - protected List outcomeReference; + protected List outcome; /** * Notes about the adherence/status/progress of the activity. */ - @Child(name = "progress", type = {Annotation.class}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "progress", type = {Annotation.class}, order=2, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Comments about the activity status/progress", formalDefinition="Notes about the adherence/status/progress of the activity." ) protected List progress; /** * The details of the proposed activity represented in a specific resource. */ - @Child(name = "reference", type = {Appointment.class, CommunicationRequest.class, DeviceRequest.class, MedicationRequest.class, NutritionOrder.class, Task.class, ServiceRequest.class, VisionPrescription.class, RequestGroup.class, ImmunizationRecommendation.class}, order=4, min=0, max=1, modifier=false, summary=false) + @Child(name = "reference", type = {Appointment.class, CommunicationRequest.class, DeviceRequest.class, MedicationRequest.class, NutritionOrder.class, Task.class, ServiceRequest.class, VisionPrescription.class, RequestGroup.class, ImmunizationRecommendation.class}, order=3, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Activity details defined in specific resource", formalDefinition="The details of the proposed activity represented in a specific resource." ) protected Reference reference; /** * A simple summary of a planned activity suitable for a general care plan system (e.g. form driven) that doesn't know about specific resources such as procedure etc. */ - @Child(name = "detail", type = {}, order=5, min=0, max=1, modifier=false, summary=false) + @Child(name = "detail", type = {}, order=4, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="In-line definition of activity", formalDefinition="A simple summary of a planned activity suitable for a general care plan system (e.g. form driven) that doesn't know about specific resources such as procedure etc." ) protected CarePlanActivityDetailComponent detail; - private static final long serialVersionUID = -1499292662L; + private static final long serialVersionUID = -673901898L; /** * Constructor @@ -653,109 +646,56 @@ public class CarePlan extends DomainResource { } /** - * @return {@link #outcomeCodeableConcept} (Identifies the outcome at the point when the status of the activity is assessed. For example, the outcome of an education activity could be patient understands (or not).) + * @return {@link #outcome} (Identifies the outcome at the point when the status of the activity is assessed. For example, the outcome of an education activity could be patient understands (or not). The reference to an "event" resource, such as Procedure or Encounter or Observation, is the result/outcome of the activity itself. The activity can be conveyed using CarePlan.activity.detail OR using the CarePlan.activity.reference (a reference to a “request” resource).) */ - public List getOutcomeCodeableConcept() { - if (this.outcomeCodeableConcept == null) - this.outcomeCodeableConcept = new ArrayList(); - return this.outcomeCodeableConcept; + public List getOutcome() { + if (this.outcome == null) + this.outcome = new ArrayList(); + return this.outcome; } /** * @return Returns a reference to this for easy method chaining */ - public CarePlanActivityComponent setOutcomeCodeableConcept(List theOutcomeCodeableConcept) { - this.outcomeCodeableConcept = theOutcomeCodeableConcept; + public CarePlanActivityComponent setOutcome(List theOutcome) { + this.outcome = theOutcome; return this; } - public boolean hasOutcomeCodeableConcept() { - if (this.outcomeCodeableConcept == null) + public boolean hasOutcome() { + if (this.outcome == null) return false; - for (CodeableConcept item : this.outcomeCodeableConcept) + for (CodeableReference item : this.outcome) if (!item.isEmpty()) return true; return false; } - public CodeableConcept addOutcomeCodeableConcept() { //3 - CodeableConcept t = new CodeableConcept(); - if (this.outcomeCodeableConcept == null) - this.outcomeCodeableConcept = new ArrayList(); - this.outcomeCodeableConcept.add(t); + public CodeableReference addOutcome() { //3 + CodeableReference t = new CodeableReference(); + if (this.outcome == null) + this.outcome = new ArrayList(); + this.outcome.add(t); return t; } - public CarePlanActivityComponent addOutcomeCodeableConcept(CodeableConcept t) { //3 + public CarePlanActivityComponent addOutcome(CodeableReference t) { //3 if (t == null) return this; - if (this.outcomeCodeableConcept == null) - this.outcomeCodeableConcept = new ArrayList(); - this.outcomeCodeableConcept.add(t); + if (this.outcome == null) + this.outcome = new ArrayList(); + this.outcome.add(t); return this; } /** - * @return The first repetition of repeating field {@link #outcomeCodeableConcept}, creating it if it does not already exist {3} + * @return The first repetition of repeating field {@link #outcome}, creating it if it does not already exist {3} */ - public CodeableConcept getOutcomeCodeableConceptFirstRep() { - if (getOutcomeCodeableConcept().isEmpty()) { - addOutcomeCodeableConcept(); + public CodeableReference getOutcomeFirstRep() { + if (getOutcome().isEmpty()) { + addOutcome(); } - return getOutcomeCodeableConcept().get(0); - } - - /** - * @return {@link #outcomeReference} (Details of the outcome or action resulting from the activity. The reference to an "event" resource, such as Procedure or Encounter or Observation, is the result/outcome of the activity itself. The activity can be conveyed using CarePlan.activity.detail OR using the CarePlan.activity.reference (a reference to a “request” resource).) - */ - public List getOutcomeReference() { - if (this.outcomeReference == null) - this.outcomeReference = new ArrayList(); - return this.outcomeReference; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public CarePlanActivityComponent setOutcomeReference(List theOutcomeReference) { - this.outcomeReference = theOutcomeReference; - return this; - } - - public boolean hasOutcomeReference() { - if (this.outcomeReference == null) - return false; - for (Reference item : this.outcomeReference) - if (!item.isEmpty()) - return true; - return false; - } - - public Reference addOutcomeReference() { //3 - Reference t = new Reference(); - if (this.outcomeReference == null) - this.outcomeReference = new ArrayList(); - this.outcomeReference.add(t); - return t; - } - - public CarePlanActivityComponent addOutcomeReference(Reference t) { //3 - if (t == null) - return this; - if (this.outcomeReference == null) - this.outcomeReference = new ArrayList(); - this.outcomeReference.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #outcomeReference}, creating it if it does not already exist {3} - */ - public Reference getOutcomeReferenceFirstRep() { - if (getOutcomeReference().isEmpty()) { - addOutcomeReference(); - } - return getOutcomeReference().get(0); + return getOutcome().get(0); } /** @@ -861,8 +801,7 @@ public class CarePlan extends DomainResource { protected void listChildren(List children) { super.listChildren(children); - children.add(new Property("outcomeCodeableConcept", "CodeableConcept", "Identifies the outcome at the point when the status of the activity is assessed. For example, the outcome of an education activity could be patient understands (or not).", 0, java.lang.Integer.MAX_VALUE, outcomeCodeableConcept)); - children.add(new Property("outcomeReference", "Reference(Any)", "Details of the outcome or action resulting from the activity. The reference to an \"event\" resource, such as Procedure or Encounter or Observation, is the result/outcome of the activity itself. The activity can be conveyed using CarePlan.activity.detail OR using the CarePlan.activity.reference (a reference to a “request” resource).", 0, java.lang.Integer.MAX_VALUE, outcomeReference)); + children.add(new Property("outcome", "CodeableReference(Any)", "Identifies the outcome at the point when the status of the activity is assessed. For example, the outcome of an education activity could be patient understands (or not). The reference to an \"event\" resource, such as Procedure or Encounter or Observation, is the result/outcome of the activity itself. The activity can be conveyed using CarePlan.activity.detail OR using the CarePlan.activity.reference (a reference to a “request” resource).", 0, java.lang.Integer.MAX_VALUE, outcome)); children.add(new Property("progress", "Annotation", "Notes about the adherence/status/progress of the activity.", 0, java.lang.Integer.MAX_VALUE, progress)); children.add(new Property("reference", "Reference(Appointment|CommunicationRequest|DeviceRequest|MedicationRequest|NutritionOrder|Task|ServiceRequest|VisionPrescription|RequestGroup|ImmunizationRecommendation)", "The details of the proposed activity represented in a specific resource.", 0, 1, reference)); children.add(new Property("detail", "", "A simple summary of a planned activity suitable for a general care plan system (e.g. form driven) that doesn't know about specific resources such as procedure etc.", 0, 1, detail)); @@ -871,8 +810,7 @@ public class CarePlan extends DomainResource { @Override public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { switch (_hash) { - case -511913489: /*outcomeCodeableConcept*/ return new Property("outcomeCodeableConcept", "CodeableConcept", "Identifies the outcome at the point when the status of the activity is assessed. For example, the outcome of an education activity could be patient understands (or not).", 0, java.lang.Integer.MAX_VALUE, outcomeCodeableConcept); - case -782273511: /*outcomeReference*/ return new Property("outcomeReference", "Reference(Any)", "Details of the outcome or action resulting from the activity. The reference to an \"event\" resource, such as Procedure or Encounter or Observation, is the result/outcome of the activity itself. The activity can be conveyed using CarePlan.activity.detail OR using the CarePlan.activity.reference (a reference to a “request” resource).", 0, java.lang.Integer.MAX_VALUE, outcomeReference); + case -1106507950: /*outcome*/ return new Property("outcome", "CodeableReference(Any)", "Identifies the outcome at the point when the status of the activity is assessed. For example, the outcome of an education activity could be patient understands (or not). The reference to an \"event\" resource, such as Procedure or Encounter or Observation, is the result/outcome of the activity itself. The activity can be conveyed using CarePlan.activity.detail OR using the CarePlan.activity.reference (a reference to a “request” resource).", 0, java.lang.Integer.MAX_VALUE, outcome); case -1001078227: /*progress*/ return new Property("progress", "Annotation", "Notes about the adherence/status/progress of the activity.", 0, java.lang.Integer.MAX_VALUE, progress); case -925155509: /*reference*/ return new Property("reference", "Reference(Appointment|CommunicationRequest|DeviceRequest|MedicationRequest|NutritionOrder|Task|ServiceRequest|VisionPrescription|RequestGroup|ImmunizationRecommendation)", "The details of the proposed activity represented in a specific resource.", 0, 1, reference); case -1335224239: /*detail*/ return new Property("detail", "", "A simple summary of a planned activity suitable for a general care plan system (e.g. form driven) that doesn't know about specific resources such as procedure etc.", 0, 1, detail); @@ -884,8 +822,7 @@ public class CarePlan extends DomainResource { @Override public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException { switch (hash) { - case -511913489: /*outcomeCodeableConcept*/ return this.outcomeCodeableConcept == null ? new Base[0] : this.outcomeCodeableConcept.toArray(new Base[this.outcomeCodeableConcept.size()]); // CodeableConcept - case -782273511: /*outcomeReference*/ return this.outcomeReference == null ? new Base[0] : this.outcomeReference.toArray(new Base[this.outcomeReference.size()]); // Reference + case -1106507950: /*outcome*/ return this.outcome == null ? new Base[0] : this.outcome.toArray(new Base[this.outcome.size()]); // CodeableReference case -1001078227: /*progress*/ return this.progress == null ? new Base[0] : this.progress.toArray(new Base[this.progress.size()]); // Annotation case -925155509: /*reference*/ return this.reference == null ? new Base[0] : new Base[] {this.reference}; // Reference case -1335224239: /*detail*/ return this.detail == null ? new Base[0] : new Base[] {this.detail}; // CarePlanActivityDetailComponent @@ -897,11 +834,8 @@ public class CarePlan extends DomainResource { @Override public Base setProperty(int hash, String name, Base value) throws FHIRException { switch (hash) { - case -511913489: // outcomeCodeableConcept - this.getOutcomeCodeableConcept().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept - return value; - case -782273511: // outcomeReference - this.getOutcomeReference().add(TypeConvertor.castToReference(value)); // Reference + case -1106507950: // outcome + this.getOutcome().add(TypeConvertor.castToCodeableReference(value)); // CodeableReference return value; case -1001078227: // progress this.getProgress().add(TypeConvertor.castToAnnotation(value)); // Annotation @@ -919,10 +853,8 @@ public class CarePlan extends DomainResource { @Override public Base setProperty(String name, Base value) throws FHIRException { - if (name.equals("outcomeCodeableConcept")) { - this.getOutcomeCodeableConcept().add(TypeConvertor.castToCodeableConcept(value)); - } else if (name.equals("outcomeReference")) { - this.getOutcomeReference().add(TypeConvertor.castToReference(value)); + if (name.equals("outcome")) { + this.getOutcome().add(TypeConvertor.castToCodeableReference(value)); } else if (name.equals("progress")) { this.getProgress().add(TypeConvertor.castToAnnotation(value)); } else if (name.equals("reference")) { @@ -937,8 +869,7 @@ public class CarePlan extends DomainResource { @Override public Base makeProperty(int hash, String name) throws FHIRException { switch (hash) { - case -511913489: return addOutcomeCodeableConcept(); - case -782273511: return addOutcomeReference(); + case -1106507950: return addOutcome(); case -1001078227: return addProgress(); case -925155509: return getReference(); case -1335224239: return getDetail(); @@ -950,8 +881,7 @@ public class CarePlan extends DomainResource { @Override public String[] getTypesForProperty(int hash, String name) throws FHIRException { switch (hash) { - case -511913489: /*outcomeCodeableConcept*/ return new String[] {"CodeableConcept"}; - case -782273511: /*outcomeReference*/ return new String[] {"Reference"}; + case -1106507950: /*outcome*/ return new String[] {"CodeableReference"}; case -1001078227: /*progress*/ return new String[] {"Annotation"}; case -925155509: /*reference*/ return new String[] {"Reference"}; case -1335224239: /*detail*/ return new String[] {}; @@ -962,11 +892,8 @@ public class CarePlan extends DomainResource { @Override public Base addChild(String name) throws FHIRException { - if (name.equals("outcomeCodeableConcept")) { - return addOutcomeCodeableConcept(); - } - else if (name.equals("outcomeReference")) { - return addOutcomeReference(); + if (name.equals("outcome")) { + return addOutcome(); } else if (name.equals("progress")) { return addProgress(); @@ -991,15 +918,10 @@ public class CarePlan extends DomainResource { public void copyValues(CarePlanActivityComponent dst) { super.copyValues(dst); - if (outcomeCodeableConcept != null) { - dst.outcomeCodeableConcept = new ArrayList(); - for (CodeableConcept i : outcomeCodeableConcept) - dst.outcomeCodeableConcept.add(i.copy()); - }; - if (outcomeReference != null) { - dst.outcomeReference = new ArrayList(); - for (Reference i : outcomeReference) - dst.outcomeReference.add(i.copy()); + if (outcome != null) { + dst.outcome = new ArrayList(); + for (CodeableReference i : outcome) + dst.outcome.add(i.copy()); }; if (progress != null) { dst.progress = new ArrayList(); @@ -1017,9 +939,8 @@ public class CarePlan extends DomainResource { if (!(other_ instanceof CarePlanActivityComponent)) return false; CarePlanActivityComponent o = (CarePlanActivityComponent) other_; - return compareDeep(outcomeCodeableConcept, o.outcomeCodeableConcept, true) && compareDeep(outcomeReference, o.outcomeReference, true) - && compareDeep(progress, o.progress, true) && compareDeep(reference, o.reference, true) && compareDeep(detail, o.detail, true) - ; + return compareDeep(outcome, o.outcome, true) && compareDeep(progress, o.progress, true) && compareDeep(reference, o.reference, true) + && compareDeep(detail, o.detail, true); } @Override @@ -1033,8 +954,8 @@ public class CarePlan extends DomainResource { } public boolean isEmpty() { - return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(outcomeCodeableConcept, outcomeReference - , progress, reference, detail); + return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(outcome, progress, reference + , detail); } public String fhirType() { @@ -1077,31 +998,24 @@ public class CarePlan extends DomainResource { protected CodeableConcept code; /** - * Provides the rationale that drove the inclusion of this particular activity as part of the plan or the reason why the activity was prohibited. + * Provides the rationale that drove the inclusion of this particular activity as part of the plan or the reason why the activity was prohibited - either a coded concept, or another resource, such as the health condition(s), whose existence justifies this request and drove the inclusion of this particular activity as part of the plan. */ - @Child(name = "reasonCode", type = {CodeableConcept.class}, order=5, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Why activity should be done or why activity was prohibited", formalDefinition="Provides the rationale that drove the inclusion of this particular activity as part of the plan or the reason why the activity was prohibited." ) + @Child(name = "reason", type = {CodeableReference.class}, order=5, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="Why activity should be done or why activity was prohibited", formalDefinition="Provides the rationale that drove the inclusion of this particular activity as part of the plan or the reason why the activity was prohibited - either a coded concept, or another resource, such as the health condition(s), whose existence justifies this request and drove the inclusion of this particular activity as part of the plan." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/clinical-findings") - protected List reasonCode; - - /** - * Indicates another resource, such as the health condition(s), whose existence justifies this request and drove the inclusion of this particular activity as part of the plan. - */ - @Child(name = "reasonReference", type = {Condition.class, Observation.class, DiagnosticReport.class, DocumentReference.class}, order=6, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Why activity is needed", formalDefinition="Indicates another resource, such as the health condition(s), whose existence justifies this request and drove the inclusion of this particular activity as part of the plan." ) - protected List reasonReference; + protected List reason; /** * Internal reference that identifies the goals that this activity is intended to contribute towards meeting. */ - @Child(name = "goal", type = {Goal.class}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "goal", type = {Goal.class}, order=6, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Goals this activity relates to", formalDefinition="Internal reference that identifies the goals that this activity is intended to contribute towards meeting." ) protected List goal; /** * Identifies what progress is being made for the specific activity. */ - @Child(name = "status", type = {CodeType.class}, order=8, min=1, max=1, modifier=true, summary=false) + @Child(name = "status", type = {CodeType.class}, order=7, min=1, max=1, modifier=true, summary=false) @Description(shortDefinition="not-started | scheduled | in-progress | on-hold | completed | cancelled | stopped | unknown | entered-in-error", formalDefinition="Identifies what progress is being made for the specific activity." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/care-plan-activity-status") protected Enumeration status; @@ -1109,7 +1023,7 @@ public class CarePlan extends DomainResource { /** * Provides reason why the activity isn't yet started, is on hold, was cancelled, etc. */ - @Child(name = "statusReason", type = {CodeableConcept.class}, order=9, min=0, max=1, modifier=false, summary=false) + @Child(name = "statusReason", type = {CodeableConcept.class}, order=8, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Reason for current status", formalDefinition="Provides reason why the activity isn't yet started, is on hold, was cancelled, etc." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/care-plan-activity-status-reason") protected CodeableConcept statusReason; @@ -1117,42 +1031,42 @@ public class CarePlan extends DomainResource { /** * If true, indicates that the described activity is one that must NOT be engaged in when following the plan. If false, or missing, indicates that the described activity is one that should be engaged in when following the plan. */ - @Child(name = "doNotPerform", type = {BooleanType.class}, order=10, min=0, max=1, modifier=true, summary=false) + @Child(name = "doNotPerform", type = {BooleanType.class}, order=9, min=0, max=1, modifier=true, summary=false) @Description(shortDefinition="If true, activity is prohibiting action", formalDefinition="If true, indicates that the described activity is one that must NOT be engaged in when following the plan. If false, or missing, indicates that the described activity is one that should be engaged in when following the plan." ) protected BooleanType doNotPerform; /** * The period, timing or frequency upon which the described activity is to occur. */ - @Child(name = "scheduled", type = {Timing.class, Period.class, StringType.class}, order=11, min=0, max=1, modifier=false, summary=false) + @Child(name = "scheduled", type = {Timing.class, Period.class, StringType.class}, order=10, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="When activity is to occur", formalDefinition="The period, timing or frequency upon which the described activity is to occur." ) protected DataType scheduled; /** * Identifies the facility where the activity will occur; e.g. home, hospital, specific clinic, etc. */ - @Child(name = "location", type = {Location.class}, order=12, min=0, max=1, modifier=false, summary=false) + @Child(name = "location", type = {Location.class}, order=11, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Where it should happen", formalDefinition="Identifies the facility where the activity will occur; e.g. home, hospital, specific clinic, etc." ) protected Reference location; /** * 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. */ - @Child(name = "reported", type = {BooleanType.class, Patient.class, RelatedPerson.class, Practitioner.class, PractitionerRole.class, Organization.class}, order=13, min=0, max=1, modifier=false, summary=false) + @Child(name = "reported", type = {BooleanType.class, Patient.class, RelatedPerson.class, Practitioner.class, PractitionerRole.class, Organization.class}, order=12, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Reported rather than primary record", formalDefinition="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." ) protected DataType reported; /** * Identifies who's expected to be involved in the activity. */ - @Child(name = "performer", type = {Practitioner.class, PractitionerRole.class, Organization.class, RelatedPerson.class, Patient.class, CareTeam.class, HealthcareService.class, Device.class}, order=14, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "performer", type = {Practitioner.class, PractitionerRole.class, Organization.class, RelatedPerson.class, Patient.class, CareTeam.class, HealthcareService.class, Device.class}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Who will be responsible?", formalDefinition="Identifies who's expected to be involved in the activity." ) protected List performer; /** * Identifies the food, drug or other product to be consumed or supplied in the activity. */ - @Child(name = "product", type = {CodeableConcept.class, Medication.class, Substance.class}, order=15, min=0, max=1, modifier=false, summary=false) + @Child(name = "product", type = {CodeableConcept.class, Medication.class, Substance.class}, order=14, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="What is to be administered/supplied", formalDefinition="Identifies the food, drug or other product to be consumed or supplied in the activity." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/medication-codes") protected DataType product; @@ -1160,25 +1074,25 @@ public class CarePlan extends DomainResource { /** * Identifies the quantity expected to be consumed in a given day. */ - @Child(name = "dailyAmount", type = {Quantity.class}, order=16, min=0, max=1, modifier=false, summary=false) + @Child(name = "dailyAmount", type = {Quantity.class}, order=15, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="How to consume/day?", formalDefinition="Identifies the quantity expected to be consumed in a given day." ) protected Quantity dailyAmount; /** * Identifies the quantity expected to be supplied, administered or consumed by the subject. */ - @Child(name = "quantity", type = {Quantity.class}, order=17, min=0, max=1, modifier=false, summary=false) + @Child(name = "quantity", type = {Quantity.class}, order=16, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="How much to administer/supply/consume", formalDefinition="Identifies the quantity expected to be supplied, administered or consumed by the subject." ) protected Quantity quantity; /** * This provides a textual description of constraints on the intended activity occurrence, including relation to other activities. It may also include objectives, pre-conditions and end-conditions. Finally, it may convey specifics about the activity such as body site, method, route, etc. */ - @Child(name = "description", type = {StringType.class}, order=18, min=0, max=1, modifier=false, summary=false) + @Child(name = "description", type = {StringType.class}, order=17, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Extra info describing activity to perform", formalDefinition="This provides a textual description of constraints on the intended activity occurrence, including relation to other activities. It may also include objectives, pre-conditions and end-conditions. Finally, it may convey specifics about the activity such as body site, method, route, etc." ) protected StringType description; - private static final long serialVersionUID = -1305560659L; + private static final long serialVersionUID = 24430165L; /** * Constructor @@ -1391,109 +1305,56 @@ public class CarePlan extends DomainResource { } /** - * @return {@link #reasonCode} (Provides the rationale that drove the inclusion of this particular activity as part of the plan or the reason why the activity was prohibited.) + * @return {@link #reason} (Provides the rationale that drove the inclusion of this particular activity as part of the plan or the reason why the activity was prohibited - either a coded concept, or another resource, such as the health condition(s), whose existence justifies this request and drove the inclusion of this particular activity as part of the plan.) */ - public List getReasonCode() { - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - return this.reasonCode; + public List getReason() { + if (this.reason == null) + this.reason = new ArrayList(); + return this.reason; } /** * @return Returns a reference to this for easy method chaining */ - public CarePlanActivityDetailComponent setReasonCode(List theReasonCode) { - this.reasonCode = theReasonCode; + public CarePlanActivityDetailComponent setReason(List theReason) { + this.reason = theReason; return this; } - public boolean hasReasonCode() { - if (this.reasonCode == null) + public boolean hasReason() { + if (this.reason == null) return false; - for (CodeableConcept item : this.reasonCode) + for (CodeableReference item : this.reason) if (!item.isEmpty()) return true; return false; } - public CodeableConcept addReasonCode() { //3 - CodeableConcept t = new CodeableConcept(); - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); + public CodeableReference addReason() { //3 + CodeableReference t = new CodeableReference(); + if (this.reason == null) + this.reason = new ArrayList(); + this.reason.add(t); return t; } - public CarePlanActivityDetailComponent addReasonCode(CodeableConcept t) { //3 + public CarePlanActivityDetailComponent addReason(CodeableReference t) { //3 if (t == null) return this; - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); + if (this.reason == null) + this.reason = new ArrayList(); + this.reason.add(t); return this; } /** - * @return The first repetition of repeating field {@link #reasonCode}, creating it if it does not already exist {3} + * @return The first repetition of repeating field {@link #reason}, creating it if it does not already exist {3} */ - public CodeableConcept getReasonCodeFirstRep() { - if (getReasonCode().isEmpty()) { - addReasonCode(); + public CodeableReference getReasonFirstRep() { + if (getReason().isEmpty()) { + addReason(); } - return getReasonCode().get(0); - } - - /** - * @return {@link #reasonReference} (Indicates another resource, such as the health condition(s), whose existence justifies this request and drove the inclusion of this particular activity as part of the plan.) - */ - public List getReasonReference() { - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - return this.reasonReference; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public CarePlanActivityDetailComponent setReasonReference(List theReasonReference) { - this.reasonReference = theReasonReference; - return this; - } - - public boolean hasReasonReference() { - if (this.reasonReference == null) - return false; - for (Reference item : this.reasonReference) - if (!item.isEmpty()) - return true; - return false; - } - - public Reference addReasonReference() { //3 - Reference t = new Reference(); - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return t; - } - - public CarePlanActivityDetailComponent addReasonReference(Reference t) { //3 - if (t == null) - return this; - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #reasonReference}, creating it if it does not already exist {3} - */ - public Reference getReasonReferenceFirstRep() { - if (getReasonReference().isEmpty()) { - addReasonReference(); - } - return getReasonReference().get(0); + return getReason().get(0); } /** @@ -2011,8 +1872,7 @@ public class CarePlan extends DomainResource { children.add(new Property("instantiatesCanonical", "canonical(PlanDefinition|ActivityDefinition|Questionnaire|Measure|OperationDefinition)", "The URL pointing to a FHIR-defined protocol, guideline, questionnaire or other definition that is adhered to in whole or in part by this CarePlan activity.", 0, java.lang.Integer.MAX_VALUE, instantiatesCanonical)); children.add(new Property("instantiatesUri", "uri", "The URL pointing to an externally maintained protocol, guideline, questionnaire or other definition that is adhered to in whole or in part by this CarePlan activity.", 0, java.lang.Integer.MAX_VALUE, instantiatesUri)); children.add(new Property("code", "CodeableConcept", "Detailed description of the type of planned activity; e.g. what lab test, what procedure, what kind of encounter.", 0, 1, code)); - children.add(new Property("reasonCode", "CodeableConcept", "Provides the rationale that drove the inclusion of this particular activity as part of the plan or the reason why the activity was prohibited.", 0, java.lang.Integer.MAX_VALUE, reasonCode)); - children.add(new Property("reasonReference", "Reference(Condition|Observation|DiagnosticReport|DocumentReference)", "Indicates another resource, such as the health condition(s), whose existence justifies this request and drove the inclusion of this particular activity as part of the plan.", 0, java.lang.Integer.MAX_VALUE, reasonReference)); + children.add(new Property("reason", "CodeableReference(Condition|Observation|DiagnosticReport|DocumentReference)", "Provides the rationale that drove the inclusion of this particular activity as part of the plan or the reason why the activity was prohibited - either a coded concept, or another resource, such as the health condition(s), whose existence justifies this request and drove the inclusion of this particular activity as part of the plan.", 0, java.lang.Integer.MAX_VALUE, reason)); children.add(new Property("goal", "Reference(Goal)", "Internal reference that identifies the goals that this activity is intended to contribute towards meeting.", 0, java.lang.Integer.MAX_VALUE, goal)); children.add(new Property("status", "code", "Identifies what progress is being made for the specific activity.", 0, 1, status)); children.add(new Property("statusReason", "CodeableConcept", "Provides reason why the activity isn't yet started, is on hold, was cancelled, etc.", 0, 1, statusReason)); @@ -2034,8 +1894,7 @@ public class CarePlan extends DomainResource { case 8911915: /*instantiatesCanonical*/ return new Property("instantiatesCanonical", "canonical(PlanDefinition|ActivityDefinition|Questionnaire|Measure|OperationDefinition)", "The URL pointing to a FHIR-defined protocol, guideline, questionnaire or other definition that is adhered to in whole or in part by this CarePlan activity.", 0, java.lang.Integer.MAX_VALUE, instantiatesCanonical); case -1926393373: /*instantiatesUri*/ return new Property("instantiatesUri", "uri", "The URL pointing to an externally maintained protocol, guideline, questionnaire or other definition that is adhered to in whole or in part by this CarePlan activity.", 0, java.lang.Integer.MAX_VALUE, instantiatesUri); case 3059181: /*code*/ return new Property("code", "CodeableConcept", "Detailed description of the type of planned activity; e.g. what lab test, what procedure, what kind of encounter.", 0, 1, code); - case 722137681: /*reasonCode*/ return new Property("reasonCode", "CodeableConcept", "Provides the rationale that drove the inclusion of this particular activity as part of the plan or the reason why the activity was prohibited.", 0, java.lang.Integer.MAX_VALUE, reasonCode); - case -1146218137: /*reasonReference*/ return new Property("reasonReference", "Reference(Condition|Observation|DiagnosticReport|DocumentReference)", "Indicates another resource, such as the health condition(s), whose existence justifies this request and drove the inclusion of this particular activity as part of the plan.", 0, java.lang.Integer.MAX_VALUE, reasonReference); + case -934964668: /*reason*/ return new Property("reason", "CodeableReference(Condition|Observation|DiagnosticReport|DocumentReference)", "Provides the rationale that drove the inclusion of this particular activity as part of the plan or the reason why the activity was prohibited - either a coded concept, or another resource, such as the health condition(s), whose existence justifies this request and drove the inclusion of this particular activity as part of the plan.", 0, java.lang.Integer.MAX_VALUE, reason); case 3178259: /*goal*/ return new Property("goal", "Reference(Goal)", "Internal reference that identifies the goals that this activity is intended to contribute towards meeting.", 0, java.lang.Integer.MAX_VALUE, goal); case -892481550: /*status*/ return new Property("status", "code", "Identifies what progress is being made for the specific activity.", 0, 1, status); case 2051346646: /*statusReason*/ return new Property("statusReason", "CodeableConcept", "Provides reason why the activity isn't yet started, is on hold, was cancelled, etc.", 0, 1, statusReason); @@ -2070,8 +1929,7 @@ public class CarePlan extends DomainResource { 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 3059181: /*code*/ return this.code == null ? new Base[0] : new Base[] {this.code}; // CodeableConcept - case 722137681: /*reasonCode*/ return this.reasonCode == null ? new Base[0] : this.reasonCode.toArray(new Base[this.reasonCode.size()]); // CodeableConcept - case -1146218137: /*reasonReference*/ return this.reasonReference == null ? new Base[0] : this.reasonReference.toArray(new Base[this.reasonReference.size()]); // Reference + case -934964668: /*reason*/ return this.reason == null ? new Base[0] : this.reason.toArray(new Base[this.reason.size()]); // CodeableReference case 3178259: /*goal*/ return this.goal == null ? new Base[0] : this.goal.toArray(new Base[this.goal.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 @@ -2105,11 +1963,8 @@ public class CarePlan extends DomainResource { case 3059181: // code this.code = TypeConvertor.castToCodeableConcept(value); // CodeableConcept return value; - case 722137681: // reasonCode - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept - return value; - case -1146218137: // reasonReference - this.getReasonReference().add(TypeConvertor.castToReference(value)); // Reference + case -934964668: // reason + this.getReason().add(TypeConvertor.castToCodeableReference(value)); // CodeableReference return value; case 3178259: // goal this.getGoal().add(TypeConvertor.castToReference(value)); // Reference @@ -2164,10 +2019,8 @@ public class CarePlan extends DomainResource { this.getInstantiatesUri().add(TypeConvertor.castToUri(value)); } else if (name.equals("code")) { this.code = TypeConvertor.castToCodeableConcept(value); // CodeableConcept - } else if (name.equals("reasonCode")) { - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); - } else if (name.equals("reasonReference")) { - this.getReasonReference().add(TypeConvertor.castToReference(value)); + } else if (name.equals("reason")) { + this.getReason().add(TypeConvertor.castToCodeableReference(value)); } else if (name.equals("goal")) { this.getGoal().add(TypeConvertor.castToReference(value)); } else if (name.equals("status")) { @@ -2205,8 +2058,7 @@ public class CarePlan extends DomainResource { case 8911915: return addInstantiatesCanonicalElement(); case -1926393373: return addInstantiatesUriElement(); case 3059181: return getCode(); - case 722137681: return addReasonCode(); - case -1146218137: return addReasonReference(); + case -934964668: return addReason(); case 3178259: return addGoal(); case -892481550: return getStatusElement(); case 2051346646: return getStatusReason(); @@ -2234,8 +2086,7 @@ public class CarePlan extends DomainResource { case 8911915: /*instantiatesCanonical*/ return new String[] {"canonical"}; case -1926393373: /*instantiatesUri*/ return new String[] {"uri"}; case 3059181: /*code*/ return new String[] {"CodeableConcept"}; - case 722137681: /*reasonCode*/ return new String[] {"CodeableConcept"}; - case -1146218137: /*reasonReference*/ return new String[] {"Reference"}; + case -934964668: /*reason*/ return new String[] {"CodeableReference"}; case 3178259: /*goal*/ return new String[] {"Reference"}; case -892481550: /*status*/ return new String[] {"code"}; case 2051346646: /*statusReason*/ return new String[] {"CodeableConcept"}; @@ -2268,11 +2119,8 @@ public class CarePlan extends DomainResource { this.code = new CodeableConcept(); return this.code; } - else if (name.equals("reasonCode")) { - return addReasonCode(); - } - else if (name.equals("reasonReference")) { - return addReasonReference(); + else if (name.equals("reason")) { + return addReason(); } else if (name.equals("goal")) { return addGoal(); @@ -2357,15 +2205,10 @@ public class CarePlan extends DomainResource { dst.instantiatesUri.add(i.copy()); }; dst.code = code == null ? null : code.copy(); - if (reasonCode != null) { - dst.reasonCode = new ArrayList(); - for (CodeableConcept i : reasonCode) - dst.reasonCode.add(i.copy()); - }; - if (reasonReference != null) { - dst.reasonReference = new ArrayList(); - for (Reference i : reasonReference) - dst.reasonReference.add(i.copy()); + if (reason != null) { + dst.reason = new ArrayList(); + for (CodeableReference i : reason) + dst.reason.add(i.copy()); }; if (goal != null) { dst.goal = new ArrayList(); @@ -2397,12 +2240,12 @@ public class CarePlan extends DomainResource { return false; CarePlanActivityDetailComponent o = (CarePlanActivityDetailComponent) other_; return compareDeep(kind, o.kind, true) && compareDeep(instantiatesCanonical, o.instantiatesCanonical, true) - && compareDeep(instantiatesUri, o.instantiatesUri, true) && compareDeep(code, o.code, true) && compareDeep(reasonCode, o.reasonCode, true) - && compareDeep(reasonReference, o.reasonReference, true) && compareDeep(goal, o.goal, true) && compareDeep(status, o.status, true) - && compareDeep(statusReason, o.statusReason, true) && compareDeep(doNotPerform, o.doNotPerform, true) - && compareDeep(scheduled, o.scheduled, true) && compareDeep(location, o.location, true) && compareDeep(reported, o.reported, true) - && compareDeep(performer, o.performer, true) && compareDeep(product, o.product, true) && compareDeep(dailyAmount, o.dailyAmount, true) - && compareDeep(quantity, o.quantity, true) && compareDeep(description, o.description, true); + && compareDeep(instantiatesUri, o.instantiatesUri, true) && compareDeep(code, o.code, true) && compareDeep(reason, o.reason, true) + && compareDeep(goal, o.goal, true) && compareDeep(status, o.status, true) && compareDeep(statusReason, o.statusReason, true) + && compareDeep(doNotPerform, o.doNotPerform, true) && compareDeep(scheduled, o.scheduled, true) + && compareDeep(location, o.location, true) && compareDeep(reported, o.reported, true) && compareDeep(performer, o.performer, true) + && compareDeep(product, o.product, true) && compareDeep(dailyAmount, o.dailyAmount, true) && compareDeep(quantity, o.quantity, true) + && compareDeep(description, o.description, true); } @Override @@ -2420,9 +2263,8 @@ public class CarePlan extends DomainResource { public boolean isEmpty() { return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(kind, instantiatesCanonical - , instantiatesUri, code, reasonCode, reasonReference, goal, status, statusReason - , doNotPerform, scheduled, location, reported, performer, product, dailyAmount - , quantity, description); + , instantiatesUri, code, reason, goal, status, statusReason, doNotPerform, scheduled + , location, reported, performer, product, dailyAmount, quantity, description); } public String fhirType() { @@ -2564,47 +2406,40 @@ public class CarePlan extends DomainResource { /** * Identifies the conditions/problems/concerns/diagnoses/etc. whose management and/or mitigation are handled by this plan. */ - @Child(name = "addressesCode", type = {CodeableConcept.class}, order=18, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "addresses", type = {CodeableReference.class}, order=18, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Health issues this plan addresses", formalDefinition="Identifies the conditions/problems/concerns/diagnoses/etc. whose management and/or mitigation are handled by this plan." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/clinical-findings") - protected List addressesCode; - - /** - * Identifies the conditions/problems/concerns/diagnoses/etc. whose management and/or mitigation are handled by this plan. - */ - @Child(name = "addressesReference", type = {Condition.class}, order=19, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Health issues this plan addresses", formalDefinition="Identifies the conditions/problems/concerns/diagnoses/etc. whose management and/or mitigation are handled by this plan." ) - protected List addressesReference; + protected List addresses; /** * Identifies portions of the patient's record that specifically influenced the formation of the plan. These might include comorbidities, recent procedures, limitations, recent assessments, etc. */ - @Child(name = "supportingInfo", type = {Reference.class}, order=20, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "supportingInfo", type = {Reference.class}, order=19, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Information considered as part of plan", formalDefinition="Identifies portions of the patient's record that specifically influenced the formation of the plan. These might include comorbidities, recent procedures, limitations, recent assessments, etc." ) protected List supportingInfo; /** * Describes the intended objective(s) of carrying out the care plan. */ - @Child(name = "goal", type = {Goal.class}, order=21, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "goal", type = {Goal.class}, order=20, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Desired outcome of plan", formalDefinition="Describes the intended objective(s) of carrying out the care plan." ) protected List goal; /** * Identifies an action that has occurred or is a planned action to occur as part of the plan. For example, a medication to be used, lab tests to perform, self-monitoring that has occurred, education etc. */ - @Child(name = "activity", type = {}, order=22, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "activity", type = {}, order=21, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Action to occur or has occurred as part of plan", formalDefinition="Identifies an action that has occurred or is a planned action to occur as part of the plan. For example, a medication to be used, lab tests to perform, self-monitoring that has occurred, education etc." ) protected List activity; /** * General notes about the care plan not covered elsewhere. */ - @Child(name = "note", type = {Annotation.class}, order=23, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "note", type = {Annotation.class}, order=22, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Comments about the plan", formalDefinition="General notes about the care plan not covered elsewhere." ) protected List note; - private static final long serialVersionUID = 1881784815L; + private static final long serialVersionUID = 1467908871L; /** * Constructor @@ -3450,109 +3285,56 @@ public class CarePlan extends DomainResource { } /** - * @return {@link #addressesCode} (Identifies the conditions/problems/concerns/diagnoses/etc. whose management and/or mitigation are handled by this plan.) + * @return {@link #addresses} (Identifies the conditions/problems/concerns/diagnoses/etc. whose management and/or mitigation are handled by this plan.) */ - public List getAddressesCode() { - if (this.addressesCode == null) - this.addressesCode = new ArrayList(); - return this.addressesCode; + public List getAddresses() { + if (this.addresses == null) + this.addresses = new ArrayList(); + return this.addresses; } /** * @return Returns a reference to this for easy method chaining */ - public CarePlan setAddressesCode(List theAddressesCode) { - this.addressesCode = theAddressesCode; + public CarePlan setAddresses(List theAddresses) { + this.addresses = theAddresses; return this; } - public boolean hasAddressesCode() { - if (this.addressesCode == null) + public boolean hasAddresses() { + if (this.addresses == null) return false; - for (CodeableConcept item : this.addressesCode) + for (CodeableReference item : this.addresses) if (!item.isEmpty()) return true; return false; } - public CodeableConcept addAddressesCode() { //3 - CodeableConcept t = new CodeableConcept(); - if (this.addressesCode == null) - this.addressesCode = new ArrayList(); - this.addressesCode.add(t); + public CodeableReference addAddresses() { //3 + CodeableReference t = new CodeableReference(); + if (this.addresses == null) + this.addresses = new ArrayList(); + this.addresses.add(t); return t; } - public CarePlan addAddressesCode(CodeableConcept t) { //3 + public CarePlan addAddresses(CodeableReference t) { //3 if (t == null) return this; - if (this.addressesCode == null) - this.addressesCode = new ArrayList(); - this.addressesCode.add(t); + if (this.addresses == null) + this.addresses = new ArrayList(); + this.addresses.add(t); return this; } /** - * @return The first repetition of repeating field {@link #addressesCode}, creating it if it does not already exist {3} + * @return The first repetition of repeating field {@link #addresses}, creating it if it does not already exist {3} */ - public CodeableConcept getAddressesCodeFirstRep() { - if (getAddressesCode().isEmpty()) { - addAddressesCode(); + public CodeableReference getAddressesFirstRep() { + if (getAddresses().isEmpty()) { + addAddresses(); } - return getAddressesCode().get(0); - } - - /** - * @return {@link #addressesReference} (Identifies the conditions/problems/concerns/diagnoses/etc. whose management and/or mitigation are handled by this plan.) - */ - public List getAddressesReference() { - if (this.addressesReference == null) - this.addressesReference = new ArrayList(); - return this.addressesReference; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public CarePlan setAddressesReference(List theAddressesReference) { - this.addressesReference = theAddressesReference; - return this; - } - - public boolean hasAddressesReference() { - if (this.addressesReference == null) - return false; - for (Reference item : this.addressesReference) - if (!item.isEmpty()) - return true; - return false; - } - - public Reference addAddressesReference() { //3 - Reference t = new Reference(); - if (this.addressesReference == null) - this.addressesReference = new ArrayList(); - this.addressesReference.add(t); - return t; - } - - public CarePlan addAddressesReference(Reference t) { //3 - if (t == null) - return this; - if (this.addressesReference == null) - this.addressesReference = new ArrayList(); - this.addressesReference.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #addressesReference}, creating it if it does not already exist {3} - */ - public Reference getAddressesReferenceFirstRep() { - if (getAddressesReference().isEmpty()) { - addAddressesReference(); - } - return getAddressesReference().get(0); + return getAddresses().get(0); } /** @@ -3787,8 +3569,7 @@ public class CarePlan extends DomainResource { children.add(new Property("author", "Reference(Patient|Practitioner|PractitionerRole|Device|RelatedPerson|Organization|CareTeam)", "When populated, the author is responsible for the care plan. The care plan is attributed to the author.", 0, 1, author)); children.add(new Property("contributor", "Reference(Patient|Practitioner|PractitionerRole|Device|RelatedPerson|Organization|CareTeam)", "Identifies the individual(s) or organization who provided the contents of the care plan.", 0, java.lang.Integer.MAX_VALUE, contributor)); children.add(new Property("careTeam", "Reference(CareTeam)", "Identifies all people and organizations who are expected to be involved in the care envisioned by this plan.", 0, java.lang.Integer.MAX_VALUE, careTeam)); - children.add(new Property("addressesCode", "CodeableConcept", "Identifies the conditions/problems/concerns/diagnoses/etc. whose management and/or mitigation are handled by this plan.", 0, java.lang.Integer.MAX_VALUE, addressesCode)); - children.add(new Property("addressesReference", "Reference(Condition)", "Identifies the conditions/problems/concerns/diagnoses/etc. whose management and/or mitigation are handled by this plan.", 0, java.lang.Integer.MAX_VALUE, addressesReference)); + children.add(new Property("addresses", "CodeableReference(Condition)", "Identifies the conditions/problems/concerns/diagnoses/etc. whose management and/or mitigation are handled by this plan.", 0, java.lang.Integer.MAX_VALUE, addresses)); children.add(new Property("supportingInfo", "Reference(Any)", "Identifies portions of the patient's record that specifically influenced the formation of the plan. These might include comorbidities, recent procedures, limitations, recent assessments, etc.", 0, java.lang.Integer.MAX_VALUE, supportingInfo)); children.add(new Property("goal", "Reference(Goal)", "Describes the intended objective(s) of carrying out the care plan.", 0, java.lang.Integer.MAX_VALUE, goal)); children.add(new Property("activity", "", "Identifies an action that has occurred or is a planned action to occur as part of the plan. For example, a medication to be used, lab tests to perform, self-monitoring that has occurred, education etc.", 0, java.lang.Integer.MAX_VALUE, activity)); @@ -3816,8 +3597,7 @@ public class CarePlan extends DomainResource { case -1406328437: /*author*/ return new Property("author", "Reference(Patient|Practitioner|PractitionerRole|Device|RelatedPerson|Organization|CareTeam)", "When populated, the author is responsible for the care plan. The care plan is attributed to the author.", 0, 1, author); case -1895276325: /*contributor*/ return new Property("contributor", "Reference(Patient|Practitioner|PractitionerRole|Device|RelatedPerson|Organization|CareTeam)", "Identifies the individual(s) or organization who provided the contents of the care plan.", 0, java.lang.Integer.MAX_VALUE, contributor); case -7323378: /*careTeam*/ return new Property("careTeam", "Reference(CareTeam)", "Identifies all people and organizations who are expected to be involved in the care envisioned by this plan.", 0, java.lang.Integer.MAX_VALUE, careTeam); - case -227148625: /*addressesCode*/ return new Property("addressesCode", "CodeableConcept", "Identifies the conditions/problems/concerns/diagnoses/etc. whose management and/or mitigation are handled by this plan.", 0, java.lang.Integer.MAX_VALUE, addressesCode); - case -1878992439: /*addressesReference*/ return new Property("addressesReference", "Reference(Condition)", "Identifies the conditions/problems/concerns/diagnoses/etc. whose management and/or mitigation are handled by this plan.", 0, java.lang.Integer.MAX_VALUE, addressesReference); + case 874544034: /*addresses*/ return new Property("addresses", "CodeableReference(Condition)", "Identifies the conditions/problems/concerns/diagnoses/etc. whose management and/or mitigation are handled by this plan.", 0, java.lang.Integer.MAX_VALUE, addresses); case 1922406657: /*supportingInfo*/ return new Property("supportingInfo", "Reference(Any)", "Identifies portions of the patient's record that specifically influenced the formation of the plan. These might include comorbidities, recent procedures, limitations, recent assessments, etc.", 0, java.lang.Integer.MAX_VALUE, supportingInfo); case 3178259: /*goal*/ return new Property("goal", "Reference(Goal)", "Describes the intended objective(s) of carrying out the care plan.", 0, java.lang.Integer.MAX_VALUE, goal); case -1655966961: /*activity*/ return new Property("activity", "", "Identifies an action that has occurred or is a planned action to occur as part of the plan. For example, a medication to be used, lab tests to perform, self-monitoring that has occurred, education etc.", 0, java.lang.Integer.MAX_VALUE, activity); @@ -3848,8 +3628,7 @@ public class CarePlan extends DomainResource { case -1406328437: /*author*/ return this.author == null ? new Base[0] : new Base[] {this.author}; // Reference case -1895276325: /*contributor*/ return this.contributor == null ? new Base[0] : this.contributor.toArray(new Base[this.contributor.size()]); // Reference case -7323378: /*careTeam*/ return this.careTeam == null ? new Base[0] : this.careTeam.toArray(new Base[this.careTeam.size()]); // Reference - case -227148625: /*addressesCode*/ return this.addressesCode == null ? new Base[0] : this.addressesCode.toArray(new Base[this.addressesCode.size()]); // CodeableConcept - case -1878992439: /*addressesReference*/ return this.addressesReference == null ? new Base[0] : this.addressesReference.toArray(new Base[this.addressesReference.size()]); // Reference + case 874544034: /*addresses*/ return this.addresses == null ? new Base[0] : this.addresses.toArray(new Base[this.addresses.size()]); // CodeableReference case 1922406657: /*supportingInfo*/ return this.supportingInfo == null ? new Base[0] : this.supportingInfo.toArray(new Base[this.supportingInfo.size()]); // Reference case 3178259: /*goal*/ return this.goal == null ? new Base[0] : this.goal.toArray(new Base[this.goal.size()]); // Reference case -1655966961: /*activity*/ return this.activity == null ? new Base[0] : this.activity.toArray(new Base[this.activity.size()]); // CarePlanActivityComponent @@ -3918,11 +3697,8 @@ public class CarePlan extends DomainResource { case -7323378: // careTeam this.getCareTeam().add(TypeConvertor.castToReference(value)); // Reference return value; - case -227148625: // addressesCode - this.getAddressesCode().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept - return value; - case -1878992439: // addressesReference - this.getAddressesReference().add(TypeConvertor.castToReference(value)); // Reference + case 874544034: // addresses + this.getAddresses().add(TypeConvertor.castToCodeableReference(value)); // CodeableReference return value; case 1922406657: // supportingInfo this.getSupportingInfo().add(TypeConvertor.castToReference(value)); // Reference @@ -3981,10 +3757,8 @@ public class CarePlan extends DomainResource { this.getContributor().add(TypeConvertor.castToReference(value)); } else if (name.equals("careTeam")) { this.getCareTeam().add(TypeConvertor.castToReference(value)); - } else if (name.equals("addressesCode")) { - this.getAddressesCode().add(TypeConvertor.castToCodeableConcept(value)); - } else if (name.equals("addressesReference")) { - this.getAddressesReference().add(TypeConvertor.castToReference(value)); + } else if (name.equals("addresses")) { + this.getAddresses().add(TypeConvertor.castToCodeableReference(value)); } else if (name.equals("supportingInfo")) { this.getSupportingInfo().add(TypeConvertor.castToReference(value)); } else if (name.equals("goal")) { @@ -4019,8 +3793,7 @@ public class CarePlan extends DomainResource { case -1406328437: return getAuthor(); case -1895276325: return addContributor(); case -7323378: return addCareTeam(); - case -227148625: return addAddressesCode(); - case -1878992439: return addAddressesReference(); + case 874544034: return addAddresses(); case 1922406657: return addSupportingInfo(); case 3178259: return addGoal(); case -1655966961: return addActivity(); @@ -4051,8 +3824,7 @@ public class CarePlan extends DomainResource { case -1406328437: /*author*/ return new String[] {"Reference"}; case -1895276325: /*contributor*/ return new String[] {"Reference"}; case -7323378: /*careTeam*/ return new String[] {"Reference"}; - case -227148625: /*addressesCode*/ return new String[] {"CodeableConcept"}; - case -1878992439: /*addressesReference*/ return new String[] {"Reference"}; + case 874544034: /*addresses*/ return new String[] {"CodeableReference"}; case 1922406657: /*supportingInfo*/ return new String[] {"Reference"}; case 3178259: /*goal*/ return new String[] {"Reference"}; case -1655966961: /*activity*/ return new String[] {}; @@ -4122,11 +3894,8 @@ public class CarePlan extends DomainResource { else if (name.equals("careTeam")) { return addCareTeam(); } - else if (name.equals("addressesCode")) { - return addAddressesCode(); - } - else if (name.equals("addressesReference")) { - return addAddressesReference(); + else if (name.equals("addresses")) { + return addAddresses(); } else if (name.equals("supportingInfo")) { return addSupportingInfo(); @@ -4211,15 +3980,10 @@ public class CarePlan extends DomainResource { for (Reference i : careTeam) dst.careTeam.add(i.copy()); }; - if (addressesCode != null) { - dst.addressesCode = new ArrayList(); - for (CodeableConcept i : addressesCode) - dst.addressesCode.add(i.copy()); - }; - if (addressesReference != null) { - dst.addressesReference = new ArrayList(); - for (Reference i : addressesReference) - dst.addressesReference.add(i.copy()); + if (addresses != null) { + dst.addresses = new ArrayList(); + for (CodeableReference i : addresses) + dst.addresses.add(i.copy()); }; if (supportingInfo != null) { dst.supportingInfo = new ArrayList(); @@ -4260,10 +4024,9 @@ public class CarePlan extends DomainResource { && compareDeep(intent, o.intent, true) && compareDeep(category, o.category, true) && compareDeep(title, o.title, true) && compareDeep(description, o.description, true) && compareDeep(subject, o.subject, true) && compareDeep(encounter, o.encounter, true) && compareDeep(period, o.period, true) && compareDeep(created, o.created, true) && compareDeep(author, o.author, true) - && compareDeep(contributor, o.contributor, true) && compareDeep(careTeam, o.careTeam, true) && compareDeep(addressesCode, o.addressesCode, true) - && compareDeep(addressesReference, o.addressesReference, true) && compareDeep(supportingInfo, o.supportingInfo, true) - && compareDeep(goal, o.goal, true) && compareDeep(activity, o.activity, true) && compareDeep(note, o.note, true) - ; + && compareDeep(contributor, o.contributor, true) && compareDeep(careTeam, o.careTeam, true) && compareDeep(addresses, o.addresses, true) + && compareDeep(supportingInfo, o.supportingInfo, true) && compareDeep(goal, o.goal, true) && compareDeep(activity, o.activity, true) + && compareDeep(note, o.note, true); } @Override @@ -4282,7 +4045,7 @@ public class CarePlan extends DomainResource { return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, instantiatesCanonical , instantiatesUri, basedOn, replaces, partOf, status, intent, category, title , description, subject, encounter, period, created, author, contributor, careTeam - , addressesCode, addressesReference, supportingInfo, goal, activity, note); + , addresses, supportingInfo, goal, activity, note); } @Override @@ -4431,19 +4194,19 @@ public class CarePlan extends DomainResource { /** * Search parameter: condition *

- * Description: Health issues this plan addresses
+ * Description: Reference to a resource (by instance)
* Type: reference
- * Path: CarePlan.addressesReference
+ * Path: CarePlan.addresses.reference
*

*/ - @SearchParamDefinition(name="condition", path="CarePlan.addressesReference", description="Health issues this plan addresses", type="reference", target={Condition.class } ) + @SearchParamDefinition(name="condition", path="CarePlan.addresses.reference", description="Reference to a resource (by instance)", type="reference" ) public static final String SP_CONDITION = "condition"; /** * Fluent Client search parameter constant for condition *

- * Description: Health issues this plan addresses
+ * Description: Reference to a resource (by instance)
* Type: reference
- * Path: CarePlan.addressesReference
+ * Path: CarePlan.addresses.reference
*

*/ public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam CONDITION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_CONDITION); 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 754247124..9eb2cb0c2 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; @@ -598,40 +598,33 @@ public class CareTeam extends DomainResource { /** * Describes why the care team exists. */ - @Child(name = "reasonCode", type = {CodeableConcept.class}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "reason", type = {CodeableReference.class}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Why the care team exists", formalDefinition="Describes why the care team exists." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/clinical-findings") - protected List reasonCode; - - /** - * Condition(s) that this care team addresses. - */ - @Child(name = "reasonReference", type = {Condition.class}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Why the care team exists", formalDefinition="Condition(s) that this care team addresses." ) - protected List reasonReference; + protected List reason; /** * The organization responsible for the care team. */ - @Child(name = "managingOrganization", type = {Organization.class}, order=9, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "managingOrganization", type = {Organization.class}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Organization responsible for the care team", formalDefinition="The organization responsible for the care team." ) protected List managingOrganization; /** * A central contact detail for the care team (that applies to all members). */ - @Child(name = "telecom", type = {ContactPoint.class}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "telecom", type = {ContactPoint.class}, order=9, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="A contact detail for the care team (that applies to all members)", formalDefinition="A central contact detail for the care team (that applies to all members)." ) protected List telecom; /** * Comments made about the CareTeam. */ - @Child(name = "note", type = {Annotation.class}, order=11, 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="Comments made about the CareTeam", formalDefinition="Comments made about the CareTeam." ) protected List note; - private static final long serialVersionUID = -1665007774L; + private static final long serialVersionUID = 1147350970L; /** * Constructor @@ -946,109 +939,56 @@ public class CareTeam extends DomainResource { } /** - * @return {@link #reasonCode} (Describes why the care team exists.) + * @return {@link #reason} (Describes why the care team exists.) */ - public List getReasonCode() { - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - return this.reasonCode; + public List getReason() { + if (this.reason == null) + this.reason = new ArrayList(); + return this.reason; } /** * @return Returns a reference to this for easy method chaining */ - public CareTeam setReasonCode(List theReasonCode) { - this.reasonCode = theReasonCode; + public CareTeam setReason(List theReason) { + this.reason = theReason; return this; } - public boolean hasReasonCode() { - if (this.reasonCode == null) + public boolean hasReason() { + if (this.reason == null) return false; - for (CodeableConcept item : this.reasonCode) + for (CodeableReference item : this.reason) if (!item.isEmpty()) return true; return false; } - public CodeableConcept addReasonCode() { //3 - CodeableConcept t = new CodeableConcept(); - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); + public CodeableReference addReason() { //3 + CodeableReference t = new CodeableReference(); + if (this.reason == null) + this.reason = new ArrayList(); + this.reason.add(t); return t; } - public CareTeam addReasonCode(CodeableConcept t) { //3 + public CareTeam addReason(CodeableReference t) { //3 if (t == null) return this; - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); + if (this.reason == null) + this.reason = new ArrayList(); + this.reason.add(t); return this; } /** - * @return The first repetition of repeating field {@link #reasonCode}, creating it if it does not already exist {3} + * @return The first repetition of repeating field {@link #reason}, creating it if it does not already exist {3} */ - public CodeableConcept getReasonCodeFirstRep() { - if (getReasonCode().isEmpty()) { - addReasonCode(); + public CodeableReference getReasonFirstRep() { + if (getReason().isEmpty()) { + addReason(); } - return getReasonCode().get(0); - } - - /** - * @return {@link #reasonReference} (Condition(s) that this care team addresses.) - */ - public List getReasonReference() { - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - return this.reasonReference; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public CareTeam setReasonReference(List theReasonReference) { - this.reasonReference = theReasonReference; - return this; - } - - public boolean hasReasonReference() { - if (this.reasonReference == null) - return false; - for (Reference item : this.reasonReference) - if (!item.isEmpty()) - return true; - return false; - } - - public Reference addReasonReference() { //3 - Reference t = new Reference(); - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return t; - } - - public CareTeam addReasonReference(Reference t) { //3 - if (t == null) - return this; - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #reasonReference}, creating it if it does not already exist {3} - */ - public Reference getReasonReferenceFirstRep() { - if (getReasonReference().isEmpty()) { - addReasonReference(); - } - return getReasonReference().get(0); + return getReason().get(0); } /** @@ -1219,8 +1159,7 @@ public class CareTeam extends DomainResource { children.add(new Property("subject", "Reference(Patient|Group)", "Identifies the patient or group whose intended care is handled by the team.", 0, 1, subject)); children.add(new Property("period", "Period", "Indicates when the team did (or is intended to) come into effect and end.", 0, 1, period)); children.add(new Property("participant", "", "Identifies all people and organizations who are expected to be involved in the care team.", 0, java.lang.Integer.MAX_VALUE, participant)); - children.add(new Property("reasonCode", "CodeableConcept", "Describes why the care team exists.", 0, java.lang.Integer.MAX_VALUE, reasonCode)); - children.add(new Property("reasonReference", "Reference(Condition)", "Condition(s) that this care team addresses.", 0, java.lang.Integer.MAX_VALUE, reasonReference)); + children.add(new Property("reason", "CodeableReference(Condition)", "Describes why the care team exists.", 0, java.lang.Integer.MAX_VALUE, reason)); children.add(new Property("managingOrganization", "Reference(Organization)", "The organization responsible for the care team.", 0, java.lang.Integer.MAX_VALUE, managingOrganization)); children.add(new Property("telecom", "ContactPoint", "A central contact detail for the care team (that applies to all members).", 0, java.lang.Integer.MAX_VALUE, telecom)); children.add(new Property("note", "Annotation", "Comments made about the CareTeam.", 0, java.lang.Integer.MAX_VALUE, note)); @@ -1236,8 +1175,7 @@ public class CareTeam extends DomainResource { case -1867885268: /*subject*/ return new Property("subject", "Reference(Patient|Group)", "Identifies the patient or group whose intended care is handled by the team.", 0, 1, subject); case -991726143: /*period*/ return new Property("period", "Period", "Indicates when the team did (or is intended to) come into effect and end.", 0, 1, period); case 767422259: /*participant*/ return new Property("participant", "", "Identifies all people and organizations who are expected to be involved in the care team.", 0, java.lang.Integer.MAX_VALUE, participant); - case 722137681: /*reasonCode*/ return new Property("reasonCode", "CodeableConcept", "Describes why the care team exists.", 0, java.lang.Integer.MAX_VALUE, reasonCode); - case -1146218137: /*reasonReference*/ return new Property("reasonReference", "Reference(Condition)", "Condition(s) that this care team addresses.", 0, java.lang.Integer.MAX_VALUE, reasonReference); + case -934964668: /*reason*/ return new Property("reason", "CodeableReference(Condition)", "Describes why the care team exists.", 0, java.lang.Integer.MAX_VALUE, reason); case -2058947787: /*managingOrganization*/ return new Property("managingOrganization", "Reference(Organization)", "The organization responsible for the care team.", 0, java.lang.Integer.MAX_VALUE, managingOrganization); case -1429363305: /*telecom*/ return new Property("telecom", "ContactPoint", "A central contact detail for the care team (that applies to all members).", 0, java.lang.Integer.MAX_VALUE, telecom); case 3387378: /*note*/ return new Property("note", "Annotation", "Comments made about the CareTeam.", 0, java.lang.Integer.MAX_VALUE, note); @@ -1256,8 +1194,7 @@ public class CareTeam extends DomainResource { case -1867885268: /*subject*/ return this.subject == null ? new Base[0] : new Base[] {this.subject}; // Reference case -991726143: /*period*/ return this.period == null ? new Base[0] : new Base[] {this.period}; // Period case 767422259: /*participant*/ return this.participant == null ? new Base[0] : this.participant.toArray(new Base[this.participant.size()]); // CareTeamParticipantComponent - case 722137681: /*reasonCode*/ return this.reasonCode == null ? new Base[0] : this.reasonCode.toArray(new Base[this.reasonCode.size()]); // CodeableConcept - case -1146218137: /*reasonReference*/ return this.reasonReference == null ? new Base[0] : this.reasonReference.toArray(new Base[this.reasonReference.size()]); // Reference + case -934964668: /*reason*/ return this.reason == null ? new Base[0] : this.reason.toArray(new Base[this.reason.size()]); // CodeableReference case -2058947787: /*managingOrganization*/ return this.managingOrganization == null ? new Base[0] : this.managingOrganization.toArray(new Base[this.managingOrganization.size()]); // Reference case -1429363305: /*telecom*/ return this.telecom == null ? new Base[0] : this.telecom.toArray(new Base[this.telecom.size()]); // ContactPoint case 3387378: /*note*/ return this.note == null ? new Base[0] : this.note.toArray(new Base[this.note.size()]); // Annotation @@ -1291,11 +1228,8 @@ public class CareTeam extends DomainResource { case 767422259: // participant this.getParticipant().add((CareTeamParticipantComponent) value); // CareTeamParticipantComponent return value; - case 722137681: // reasonCode - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept - return value; - case -1146218137: // reasonReference - this.getReasonReference().add(TypeConvertor.castToReference(value)); // Reference + case -934964668: // reason + this.getReason().add(TypeConvertor.castToCodeableReference(value)); // CodeableReference return value; case -2058947787: // managingOrganization this.getManagingOrganization().add(TypeConvertor.castToReference(value)); // Reference @@ -1328,10 +1262,8 @@ public class CareTeam extends DomainResource { this.period = TypeConvertor.castToPeriod(value); // Period } else if (name.equals("participant")) { this.getParticipant().add((CareTeamParticipantComponent) value); - } else if (name.equals("reasonCode")) { - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); - } else if (name.equals("reasonReference")) { - this.getReasonReference().add(TypeConvertor.castToReference(value)); + } else if (name.equals("reason")) { + this.getReason().add(TypeConvertor.castToCodeableReference(value)); } else if (name.equals("managingOrganization")) { this.getManagingOrganization().add(TypeConvertor.castToReference(value)); } else if (name.equals("telecom")) { @@ -1353,8 +1285,7 @@ public class CareTeam extends DomainResource { case -1867885268: return getSubject(); case -991726143: return getPeriod(); case 767422259: return addParticipant(); - case 722137681: return addReasonCode(); - case -1146218137: return addReasonReference(); + case -934964668: return addReason(); case -2058947787: return addManagingOrganization(); case -1429363305: return addTelecom(); case 3387378: return addNote(); @@ -1373,8 +1304,7 @@ public class CareTeam extends DomainResource { case -1867885268: /*subject*/ return new String[] {"Reference"}; case -991726143: /*period*/ return new String[] {"Period"}; case 767422259: /*participant*/ return new String[] {}; - case 722137681: /*reasonCode*/ return new String[] {"CodeableConcept"}; - case -1146218137: /*reasonReference*/ return new String[] {"Reference"}; + case -934964668: /*reason*/ return new String[] {"CodeableReference"}; case -2058947787: /*managingOrganization*/ return new String[] {"Reference"}; case -1429363305: /*telecom*/ return new String[] {"ContactPoint"}; case 3387378: /*note*/ return new String[] {"Annotation"}; @@ -1408,11 +1338,8 @@ public class CareTeam extends DomainResource { else if (name.equals("participant")) { return addParticipant(); } - else if (name.equals("reasonCode")) { - return addReasonCode(); - } - else if (name.equals("reasonReference")) { - return addReasonReference(); + else if (name.equals("reason")) { + return addReason(); } else if (name.equals("managingOrganization")) { return addManagingOrganization(); @@ -1459,15 +1386,10 @@ public class CareTeam extends DomainResource { for (CareTeamParticipantComponent i : participant) dst.participant.add(i.copy()); }; - if (reasonCode != null) { - dst.reasonCode = new ArrayList(); - for (CodeableConcept i : reasonCode) - dst.reasonCode.add(i.copy()); - }; - if (reasonReference != null) { - dst.reasonReference = new ArrayList(); - for (Reference i : reasonReference) - dst.reasonReference.add(i.copy()); + if (reason != null) { + dst.reason = new ArrayList(); + for (CodeableReference i : reason) + dst.reason.add(i.copy()); }; if (managingOrganization != null) { dst.managingOrganization = new ArrayList(); @@ -1499,8 +1421,7 @@ public class CareTeam extends DomainResource { CareTeam o = (CareTeam) other_; return compareDeep(identifier, o.identifier, true) && compareDeep(status, o.status, true) && compareDeep(category, o.category, true) && compareDeep(name, o.name, true) && compareDeep(subject, o.subject, true) && compareDeep(period, o.period, true) - && compareDeep(participant, o.participant, true) && compareDeep(reasonCode, o.reasonCode, true) - && compareDeep(reasonReference, o.reasonReference, true) && compareDeep(managingOrganization, o.managingOrganization, true) + && compareDeep(participant, o.participant, true) && compareDeep(reason, o.reason, true) && compareDeep(managingOrganization, o.managingOrganization, true) && compareDeep(telecom, o.telecom, true) && compareDeep(note, o.note, true); } @@ -1516,8 +1437,8 @@ public class CareTeam extends DomainResource { public boolean isEmpty() { return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, status, category - , name, subject, period, participant, reasonCode, reasonReference, managingOrganization - , telecom, note); + , name, subject, period, participant, reason, managingOrganization, telecom, note + ); } @Override 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 3070ba86f..b88b502b8 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 1f8db7a0c..f8dc21bb9 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 0a2fbe2ee..6c87371e8 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 a19531e44..43e66f89c 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 453580bfa..3fe5558c9 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 1b1bc79f1..e4e8702c3 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; @@ -76,28 +76,21 @@ public class ClinicalImpression extends DomainResource { @Block() public static class ClinicalImpressionFindingComponent extends BackboneElement implements IBaseBackboneElement { /** - * Specific text or code for finding or diagnosis, which may include ruled-out or resolved conditions. + * Specific text, code or reference for finding or diagnosis, which may include ruled-out or resolved conditions. */ - @Child(name = "itemCodeableConcept", type = {CodeableConcept.class}, order=1, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="What was found", formalDefinition="Specific text or code for finding or diagnosis, which may include ruled-out or resolved conditions." ) + @Child(name = "item", type = {CodeableReference.class}, order=1, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="What was found", formalDefinition="Specific text, code or reference for finding or diagnosis, which may include ruled-out or resolved conditions." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/condition-code") - protected CodeableConcept itemCodeableConcept; - - /** - * Specific reference for finding or diagnosis, which may include ruled-out or resolved conditions. - */ - @Child(name = "itemReference", type = {Condition.class, Observation.class, DocumentReference.class}, order=2, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="What was found", formalDefinition="Specific reference for finding or diagnosis, which may include ruled-out or resolved conditions." ) - protected Reference itemReference; + protected CodeableReference item; /** * Which investigations support finding or diagnosis. */ - @Child(name = "basis", type = {StringType.class}, order=3, min=0, max=1, modifier=false, summary=false) + @Child(name = "basis", type = {StringType.class}, order=2, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Which investigations support finding", formalDefinition="Which investigations support finding or diagnosis." ) protected StringType basis; - private static final long serialVersionUID = -101631301L; + private static final long serialVersionUID = -1363589306L; /** * Constructor @@ -107,50 +100,26 @@ public class ClinicalImpression extends DomainResource { } /** - * @return {@link #itemCodeableConcept} (Specific text or code for finding or diagnosis, which may include ruled-out or resolved conditions.) + * @return {@link #item} (Specific text, code or reference for finding or diagnosis, which may include ruled-out or resolved conditions.) */ - public CodeableConcept getItemCodeableConcept() { - if (this.itemCodeableConcept == null) + public CodeableReference getItem() { + if (this.item == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create ClinicalImpressionFindingComponent.itemCodeableConcept"); + throw new Error("Attempt to auto-create ClinicalImpressionFindingComponent.item"); else if (Configuration.doAutoCreate()) - this.itemCodeableConcept = new CodeableConcept(); // cc - return this.itemCodeableConcept; + this.item = new CodeableReference(); // cc + return this.item; } - public boolean hasItemCodeableConcept() { - return this.itemCodeableConcept != null && !this.itemCodeableConcept.isEmpty(); + public boolean hasItem() { + return this.item != null && !this.item.isEmpty(); } /** - * @param value {@link #itemCodeableConcept} (Specific text or code for finding or diagnosis, which may include ruled-out or resolved conditions.) + * @param value {@link #item} (Specific text, code or reference for finding or diagnosis, which may include ruled-out or resolved conditions.) */ - public ClinicalImpressionFindingComponent setItemCodeableConcept(CodeableConcept value) { - this.itemCodeableConcept = value; - return this; - } - - /** - * @return {@link #itemReference} (Specific reference for finding or diagnosis, which may include ruled-out or resolved conditions.) - */ - public Reference getItemReference() { - if (this.itemReference == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create ClinicalImpressionFindingComponent.itemReference"); - else if (Configuration.doAutoCreate()) - this.itemReference = new Reference(); // cc - return this.itemReference; - } - - public boolean hasItemReference() { - return this.itemReference != null && !this.itemReference.isEmpty(); - } - - /** - * @param value {@link #itemReference} (Specific reference for finding or diagnosis, which may include ruled-out or resolved conditions.) - */ - public ClinicalImpressionFindingComponent setItemReference(Reference value) { - this.itemReference = value; + public ClinicalImpressionFindingComponent setItem(CodeableReference value) { + this.item = value; return this; } @@ -205,16 +174,14 @@ public class ClinicalImpression extends DomainResource { protected void listChildren(List children) { super.listChildren(children); - children.add(new Property("itemCodeableConcept", "CodeableConcept", "Specific text or code for finding or diagnosis, which may include ruled-out or resolved conditions.", 0, 1, itemCodeableConcept)); - children.add(new Property("itemReference", "Reference(Condition|Observation|DocumentReference)", "Specific reference for finding or diagnosis, which may include ruled-out or resolved conditions.", 0, 1, itemReference)); + children.add(new Property("item", "CodeableReference(Condition|Observation|DocumentReference)", "Specific text, code or reference for finding or diagnosis, which may include ruled-out or resolved conditions.", 0, 1, item)); children.add(new Property("basis", "string", "Which investigations support finding or diagnosis.", 0, 1, basis)); } @Override public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { switch (_hash) { - case 106644494: /*itemCodeableConcept*/ return new Property("itemCodeableConcept", "CodeableConcept", "Specific text or code for finding or diagnosis, which may include ruled-out or resolved conditions.", 0, 1, itemCodeableConcept); - case 1376364920: /*itemReference*/ return new Property("itemReference", "Reference(Condition|Observation|DocumentReference)", "Specific reference for finding or diagnosis, which may include ruled-out or resolved conditions.", 0, 1, itemReference); + case 3242771: /*item*/ return new Property("item", "CodeableReference(Condition|Observation|DocumentReference)", "Specific text, code or reference for finding or diagnosis, which may include ruled-out or resolved conditions.", 0, 1, item); case 93508670: /*basis*/ return new Property("basis", "string", "Which investigations support finding or diagnosis.", 0, 1, basis); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -224,8 +191,7 @@ public class ClinicalImpression extends DomainResource { @Override public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException { switch (hash) { - case 106644494: /*itemCodeableConcept*/ return this.itemCodeableConcept == null ? new Base[0] : new Base[] {this.itemCodeableConcept}; // CodeableConcept - case 1376364920: /*itemReference*/ return this.itemReference == null ? new Base[0] : new Base[] {this.itemReference}; // Reference + case 3242771: /*item*/ return this.item == null ? new Base[0] : new Base[] {this.item}; // CodeableReference case 93508670: /*basis*/ return this.basis == null ? new Base[0] : new Base[] {this.basis}; // StringType default: return super.getProperty(hash, name, checkValid); } @@ -235,11 +201,8 @@ public class ClinicalImpression extends DomainResource { @Override public Base setProperty(int hash, String name, Base value) throws FHIRException { switch (hash) { - case 106644494: // itemCodeableConcept - this.itemCodeableConcept = TypeConvertor.castToCodeableConcept(value); // CodeableConcept - return value; - case 1376364920: // itemReference - this.itemReference = TypeConvertor.castToReference(value); // Reference + case 3242771: // item + this.item = TypeConvertor.castToCodeableReference(value); // CodeableReference return value; case 93508670: // basis this.basis = TypeConvertor.castToString(value); // StringType @@ -251,10 +214,8 @@ public class ClinicalImpression extends DomainResource { @Override public Base setProperty(String name, Base value) throws FHIRException { - if (name.equals("itemCodeableConcept")) { - this.itemCodeableConcept = TypeConvertor.castToCodeableConcept(value); // CodeableConcept - } else if (name.equals("itemReference")) { - this.itemReference = TypeConvertor.castToReference(value); // Reference + if (name.equals("item")) { + this.item = TypeConvertor.castToCodeableReference(value); // CodeableReference } else if (name.equals("basis")) { this.basis = TypeConvertor.castToString(value); // StringType } else @@ -265,8 +226,7 @@ public class ClinicalImpression extends DomainResource { @Override public Base makeProperty(int hash, String name) throws FHIRException { switch (hash) { - case 106644494: return getItemCodeableConcept(); - case 1376364920: return getItemReference(); + case 3242771: return getItem(); case 93508670: return getBasisElement(); default: return super.makeProperty(hash, name); } @@ -276,8 +236,7 @@ public class ClinicalImpression extends DomainResource { @Override public String[] getTypesForProperty(int hash, String name) throws FHIRException { switch (hash) { - case 106644494: /*itemCodeableConcept*/ return new String[] {"CodeableConcept"}; - case 1376364920: /*itemReference*/ return new String[] {"Reference"}; + case 3242771: /*item*/ return new String[] {"CodeableReference"}; case 93508670: /*basis*/ return new String[] {"string"}; default: return super.getTypesForProperty(hash, name); } @@ -286,13 +245,9 @@ public class ClinicalImpression extends DomainResource { @Override public Base addChild(String name) throws FHIRException { - if (name.equals("itemCodeableConcept")) { - this.itemCodeableConcept = new CodeableConcept(); - return this.itemCodeableConcept; - } - else if (name.equals("itemReference")) { - this.itemReference = new Reference(); - return this.itemReference; + if (name.equals("item")) { + this.item = new CodeableReference(); + return this.item; } else if (name.equals("basis")) { throw new FHIRException("Cannot call addChild on a primitive type ClinicalImpression.finding.basis"); @@ -309,8 +264,7 @@ public class ClinicalImpression extends DomainResource { public void copyValues(ClinicalImpressionFindingComponent dst) { super.copyValues(dst); - dst.itemCodeableConcept = itemCodeableConcept == null ? null : itemCodeableConcept.copy(); - dst.itemReference = itemReference == null ? null : itemReference.copy(); + dst.item = item == null ? null : item.copy(); dst.basis = basis == null ? null : basis.copy(); } @@ -321,8 +275,7 @@ public class ClinicalImpression extends DomainResource { if (!(other_ instanceof ClinicalImpressionFindingComponent)) return false; ClinicalImpressionFindingComponent o = (ClinicalImpressionFindingComponent) other_; - return compareDeep(itemCodeableConcept, o.itemCodeableConcept, true) && compareDeep(itemReference, o.itemReference, true) - && compareDeep(basis, o.basis, true); + return compareDeep(item, o.item, true) && compareDeep(basis, o.basis, true); } @Override @@ -336,8 +289,7 @@ public class ClinicalImpression extends DomainResource { } public boolean isEmpty() { - return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(itemCodeableConcept, itemReference - , basis); + return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(item, basis); } public String fhirType() { @@ -1733,19 +1685,19 @@ public class ClinicalImpression extends DomainResource { /** * Search parameter: finding-code *

- * Description: What was found
+ * Description: Reference to a concept (by class)
* Type: token
- * Path: ClinicalImpression.finding.itemCodeableConcept
+ * Path: ClinicalImpression.finding.item.concept
*

*/ - @SearchParamDefinition(name="finding-code", path="ClinicalImpression.finding.itemCodeableConcept", description="What was found", type="token" ) + @SearchParamDefinition(name="finding-code", path="ClinicalImpression.finding.item.concept", description="Reference to a concept (by class)", type="token" ) public static final String SP_FINDING_CODE = "finding-code"; /** * Fluent Client search parameter constant for finding-code *

- * Description: What was found
+ * Description: Reference to a concept (by class)
* Type: token
- * Path: ClinicalImpression.finding.itemCodeableConcept
+ * Path: ClinicalImpression.finding.item.concept
*

*/ public static final ca.uhn.fhir.rest.gclient.TokenClientParam FINDING_CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_FINDING_CODE); @@ -1753,19 +1705,19 @@ public class ClinicalImpression extends DomainResource { /** * Search parameter: finding-ref *

- * Description: What was found
+ * Description: Reference to a resource (by instance)
* Type: reference
- * Path: ClinicalImpression.finding.itemReference
+ * Path: ClinicalImpression.finding.item.reference
*

*/ - @SearchParamDefinition(name="finding-ref", path="ClinicalImpression.finding.itemReference", description="What was found", type="reference", target={Condition.class, DocumentReference.class, Observation.class } ) + @SearchParamDefinition(name="finding-ref", path="ClinicalImpression.finding.item.reference", description="Reference to a resource (by instance)", type="reference" ) public static final String SP_FINDING_REF = "finding-ref"; /** * Fluent Client search parameter constant for finding-ref *

- * Description: What was found
+ * Description: Reference to a resource (by instance)
* Type: reference
- * Path: ClinicalImpression.finding.itemReference
+ * Path: ClinicalImpression.finding.item.reference
*

*/ public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam FINDING_REF = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_FINDING_REF); 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 d92a8b808..8c3cf138a 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 89ab23fd9..aa3f2ac6f 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 8c9f2bae1..7a2eb41fd 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 7fcf5a4a1..02074b7de 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 69733a2cf..0d1e8eef7 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 1ca8bda37..9e478b02a 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; @@ -433,33 +433,26 @@ public class Communication extends DomainResource { /** * The reason or justification for the communication. */ - @Child(name = "reasonCode", type = {CodeableConcept.class}, order=19, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "reason", type = {CodeableReference.class}, order=19, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Indication for message", formalDefinition="The reason or justification for the communication." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/clinical-findings") - protected List reasonCode; - - /** - * Indicates another resource whose existence justifies this communication. - */ - @Child(name = "reasonReference", type = {Reference.class}, order=20, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Why was communication done?", formalDefinition="Indicates another resource whose existence justifies this communication." ) - protected List reasonReference; + protected List reason; /** * Text, attachment(s), or resource(s) that was communicated to the recipient. */ - @Child(name = "payload", type = {}, order=21, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "payload", type = {}, order=20, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Message payload", formalDefinition="Text, attachment(s), or resource(s) that was communicated to the recipient." ) protected List payload; /** * Additional notes or commentary about the communication by the sender, receiver or other interested parties. */ - @Child(name = "note", type = {Annotation.class}, order=22, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "note", type = {Annotation.class}, order=21, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Comments made about the communication", formalDefinition="Additional notes or commentary about the communication by the sender, receiver or other interested parties." ) protected List note; - private static final long serialVersionUID = -371265623L; + private static final long serialVersionUID = 1848181185L; /** * Constructor @@ -1335,109 +1328,56 @@ public class Communication extends DomainResource { } /** - * @return {@link #reasonCode} (The reason or justification for the communication.) + * @return {@link #reason} (The reason or justification for the communication.) */ - public List getReasonCode() { - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - return this.reasonCode; + public List getReason() { + if (this.reason == null) + this.reason = new ArrayList(); + return this.reason; } /** * @return Returns a reference to this for easy method chaining */ - public Communication setReasonCode(List theReasonCode) { - this.reasonCode = theReasonCode; + public Communication setReason(List theReason) { + this.reason = theReason; return this; } - public boolean hasReasonCode() { - if (this.reasonCode == null) + public boolean hasReason() { + if (this.reason == null) return false; - for (CodeableConcept item : this.reasonCode) + for (CodeableReference item : this.reason) if (!item.isEmpty()) return true; return false; } - public CodeableConcept addReasonCode() { //3 - CodeableConcept t = new CodeableConcept(); - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); + public CodeableReference addReason() { //3 + CodeableReference t = new CodeableReference(); + if (this.reason == null) + this.reason = new ArrayList(); + this.reason.add(t); return t; } - public Communication addReasonCode(CodeableConcept t) { //3 + public Communication addReason(CodeableReference t) { //3 if (t == null) return this; - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); + if (this.reason == null) + this.reason = new ArrayList(); + this.reason.add(t); return this; } /** - * @return The first repetition of repeating field {@link #reasonCode}, creating it if it does not already exist {3} + * @return The first repetition of repeating field {@link #reason}, creating it if it does not already exist {3} */ - public CodeableConcept getReasonCodeFirstRep() { - if (getReasonCode().isEmpty()) { - addReasonCode(); + public CodeableReference getReasonFirstRep() { + if (getReason().isEmpty()) { + addReason(); } - return getReasonCode().get(0); - } - - /** - * @return {@link #reasonReference} (Indicates another resource whose existence justifies this communication.) - */ - public List getReasonReference() { - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - return this.reasonReference; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public Communication setReasonReference(List theReasonReference) { - this.reasonReference = theReasonReference; - return this; - } - - public boolean hasReasonReference() { - if (this.reasonReference == null) - return false; - for (Reference item : this.reasonReference) - if (!item.isEmpty()) - return true; - return false; - } - - public Reference addReasonReference() { //3 - Reference t = new Reference(); - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return t; - } - - public Communication addReasonReference(Reference t) { //3 - if (t == null) - return this; - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #reasonReference}, creating it if it does not already exist {3} - */ - public Reference getReasonReferenceFirstRep() { - if (getReasonReference().isEmpty()) { - addReasonReference(); - } - return getReasonReference().get(0); + return getReason().get(0); } /** @@ -1567,8 +1507,7 @@ public class Communication extends DomainResource { children.add(new Property("received", "dateTime", "The time when this communication arrived at the destination.", 0, 1, received)); children.add(new Property("recipient", "Reference(CareTeam|Device|Group|HealthcareService|Location|Organization|Patient|Practitioner|PractitionerRole|RelatedPerson|Endpoint)", "The entity (e.g. person, organization, clinical information system, care team or device) which is the target of the communication.", 0, java.lang.Integer.MAX_VALUE, recipient)); children.add(new Property("sender", "Reference(Device|Organization|Patient|Practitioner|PractitionerRole|RelatedPerson|HealthcareService|Endpoint)", "The entity (e.g. person, organization, clinical information system, or device) which is the source of the communication.", 0, 1, sender)); - children.add(new Property("reasonCode", "CodeableConcept", "The reason or justification for the communication.", 0, java.lang.Integer.MAX_VALUE, reasonCode)); - children.add(new Property("reasonReference", "Reference(Any)", "Indicates another resource whose existence justifies this communication.", 0, java.lang.Integer.MAX_VALUE, reasonReference)); + children.add(new Property("reason", "CodeableReference(Any)", "The reason or justification for the communication.", 0, java.lang.Integer.MAX_VALUE, reason)); children.add(new Property("payload", "", "Text, attachment(s), or resource(s) that was communicated to the recipient.", 0, java.lang.Integer.MAX_VALUE, payload)); children.add(new Property("note", "Annotation", "Additional notes or commentary about the communication by the sender, receiver or other interested parties.", 0, java.lang.Integer.MAX_VALUE, note)); } @@ -1595,8 +1534,7 @@ public class Communication extends DomainResource { case -808719903: /*received*/ return new Property("received", "dateTime", "The time when this communication arrived at the destination.", 0, 1, received); case 820081177: /*recipient*/ return new Property("recipient", "Reference(CareTeam|Device|Group|HealthcareService|Location|Organization|Patient|Practitioner|PractitionerRole|RelatedPerson|Endpoint)", "The entity (e.g. person, organization, clinical information system, care team or device) which is the target of the communication.", 0, java.lang.Integer.MAX_VALUE, recipient); case -905962955: /*sender*/ return new Property("sender", "Reference(Device|Organization|Patient|Practitioner|PractitionerRole|RelatedPerson|HealthcareService|Endpoint)", "The entity (e.g. person, organization, clinical information system, or device) which is the source of the communication.", 0, 1, sender); - case 722137681: /*reasonCode*/ return new Property("reasonCode", "CodeableConcept", "The reason or justification for the communication.", 0, java.lang.Integer.MAX_VALUE, reasonCode); - case -1146218137: /*reasonReference*/ return new Property("reasonReference", "Reference(Any)", "Indicates another resource whose existence justifies this communication.", 0, java.lang.Integer.MAX_VALUE, reasonReference); + case -934964668: /*reason*/ return new Property("reason", "CodeableReference(Any)", "The reason or justification for the communication.", 0, java.lang.Integer.MAX_VALUE, reason); case -786701938: /*payload*/ return new Property("payload", "", "Text, attachment(s), or resource(s) that was communicated to the recipient.", 0, java.lang.Integer.MAX_VALUE, payload); case 3387378: /*note*/ return new Property("note", "Annotation", "Additional notes or commentary about the communication by the sender, receiver or other interested parties.", 0, java.lang.Integer.MAX_VALUE, note); default: return super.getNamedProperty(_hash, _name, _checkValid); @@ -1626,8 +1564,7 @@ public class Communication extends DomainResource { case -808719903: /*received*/ return this.received == null ? new Base[0] : new Base[] {this.received}; // DateTimeType case 820081177: /*recipient*/ return this.recipient == null ? new Base[0] : this.recipient.toArray(new Base[this.recipient.size()]); // Reference case -905962955: /*sender*/ return this.sender == null ? new Base[0] : new Base[] {this.sender}; // Reference - case 722137681: /*reasonCode*/ return this.reasonCode == null ? new Base[0] : this.reasonCode.toArray(new Base[this.reasonCode.size()]); // CodeableConcept - case -1146218137: /*reasonReference*/ return this.reasonReference == null ? new Base[0] : this.reasonReference.toArray(new Base[this.reasonReference.size()]); // Reference + case -934964668: /*reason*/ return this.reason == null ? new Base[0] : this.reason.toArray(new Base[this.reason.size()]); // CodeableReference case -786701938: /*payload*/ return this.payload == null ? new Base[0] : this.payload.toArray(new Base[this.payload.size()]); // CommunicationPayloadComponent 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); @@ -1697,11 +1634,8 @@ public class Communication extends DomainResource { case -905962955: // sender this.sender = TypeConvertor.castToReference(value); // Reference return value; - case 722137681: // reasonCode - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept - return value; - case -1146218137: // reasonReference - this.getReasonReference().add(TypeConvertor.castToReference(value)); // Reference + case -934964668: // reason + this.getReason().add(TypeConvertor.castToCodeableReference(value)); // CodeableReference return value; case -786701938: // payload this.getPayload().add((CommunicationPayloadComponent) value); // CommunicationPayloadComponent @@ -1756,10 +1690,8 @@ public class Communication extends DomainResource { this.getRecipient().add(TypeConvertor.castToReference(value)); } else if (name.equals("sender")) { this.sender = TypeConvertor.castToReference(value); // Reference - } else if (name.equals("reasonCode")) { - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); - } else if (name.equals("reasonReference")) { - this.getReasonReference().add(TypeConvertor.castToReference(value)); + } else if (name.equals("reason")) { + this.getReason().add(TypeConvertor.castToCodeableReference(value)); } else if (name.equals("payload")) { this.getPayload().add((CommunicationPayloadComponent) value); } else if (name.equals("note")) { @@ -1791,8 +1723,7 @@ public class Communication extends DomainResource { case -808719903: return getReceivedElement(); case 820081177: return addRecipient(); case -905962955: return getSender(); - case 722137681: return addReasonCode(); - case -1146218137: return addReasonReference(); + case -934964668: return addReason(); case -786701938: return addPayload(); case 3387378: return addNote(); default: return super.makeProperty(hash, name); @@ -1822,8 +1753,7 @@ public class Communication extends DomainResource { case -808719903: /*received*/ return new String[] {"dateTime"}; case 820081177: /*recipient*/ return new String[] {"Reference"}; case -905962955: /*sender*/ return new String[] {"Reference"}; - case 722137681: /*reasonCode*/ return new String[] {"CodeableConcept"}; - case -1146218137: /*reasonReference*/ return new String[] {"Reference"}; + case -934964668: /*reason*/ return new String[] {"CodeableReference"}; case -786701938: /*payload*/ return new String[] {}; case 3387378: /*note*/ return new String[] {"Annotation"}; default: return super.getTypesForProperty(hash, name); @@ -1895,11 +1825,8 @@ public class Communication extends DomainResource { this.sender = new Reference(); return this.sender; } - else if (name.equals("reasonCode")) { - return addReasonCode(); - } - else if (name.equals("reasonReference")) { - return addReasonReference(); + else if (name.equals("reason")) { + return addReason(); } else if (name.equals("payload")) { return addPayload(); @@ -1983,15 +1910,10 @@ public class Communication extends DomainResource { dst.recipient.add(i.copy()); }; dst.sender = sender == null ? null : sender.copy(); - if (reasonCode != null) { - dst.reasonCode = new ArrayList(); - for (CodeableConcept i : reasonCode) - dst.reasonCode.add(i.copy()); - }; - if (reasonReference != null) { - dst.reasonReference = new ArrayList(); - for (Reference i : reasonReference) - dst.reasonReference.add(i.copy()); + if (reason != null) { + dst.reason = new ArrayList(); + for (CodeableReference i : reason) + dst.reason.add(i.copy()); }; if (payload != null) { dst.payload = new ArrayList(); @@ -2023,8 +1945,8 @@ public class Communication extends DomainResource { && compareDeep(medium, o.medium, true) && compareDeep(subject, o.subject, true) && compareDeep(topic, o.topic, true) && compareDeep(about, o.about, true) && compareDeep(encounter, o.encounter, true) && compareDeep(sent, o.sent, true) && compareDeep(received, o.received, true) && compareDeep(recipient, o.recipient, true) && compareDeep(sender, o.sender, true) - && compareDeep(reasonCode, o.reasonCode, true) && compareDeep(reasonReference, o.reasonReference, true) - && compareDeep(payload, o.payload, true) && compareDeep(note, o.note, true); + && compareDeep(reason, o.reason, true) && compareDeep(payload, o.payload, true) && compareDeep(note, o.note, true) + ; } @Override @@ -2043,7 +1965,7 @@ public class Communication extends DomainResource { return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, instantiatesCanonical , instantiatesUri, basedOn, partOf, inResponseTo, status, statusReason, category , priority, medium, subject, topic, about, encounter, sent, received, recipient - , sender, reasonCode, reasonReference, payload, note); + , sender, reason, payload, note); } @Override 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 672fb538b..3bcd0c4ef 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; @@ -432,26 +432,19 @@ public class CommunicationRequest extends DomainResource { /** * Describes why the request is being made in coded or textual form. */ - @Child(name = "reasonCode", type = {CodeableConcept.class}, order=19, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "reason", type = {CodeableReference.class}, order=19, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Why is communication needed?", formalDefinition="Describes why the request is being made in coded or textual form." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://terminology.hl7.org/ValueSet/v3-ActReason") - protected List reasonCode; - - /** - * Indicates another resource whose existence justifies this request. - */ - @Child(name = "reasonReference", type = {Reference.class}, order=20, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Why is communication needed?", formalDefinition="Indicates another resource whose existence justifies this request." ) - protected List reasonReference; + protected List reason; /** * Comments made about the request by the requester, sender, recipient, subject or other participants. */ - @Child(name = "note", type = {Annotation.class}, order=21, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "note", type = {Annotation.class}, order=20, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Comments made about communication request", formalDefinition="Comments made about the request by the requester, sender, recipient, subject or other participants." ) protected List note; - private static final long serialVersionUID = -914137345L; + private static final long serialVersionUID = 239948247L; /** * Constructor @@ -1305,109 +1298,56 @@ public class CommunicationRequest extends DomainResource { } /** - * @return {@link #reasonCode} (Describes why the request is being made in coded or textual form.) + * @return {@link #reason} (Describes why the request is being made in coded or textual form.) */ - public List getReasonCode() { - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - return this.reasonCode; + public List getReason() { + if (this.reason == null) + this.reason = new ArrayList(); + return this.reason; } /** * @return Returns a reference to this for easy method chaining */ - public CommunicationRequest setReasonCode(List theReasonCode) { - this.reasonCode = theReasonCode; + public CommunicationRequest setReason(List theReason) { + this.reason = theReason; return this; } - public boolean hasReasonCode() { - if (this.reasonCode == null) + public boolean hasReason() { + if (this.reason == null) return false; - for (CodeableConcept item : this.reasonCode) + for (CodeableReference item : this.reason) if (!item.isEmpty()) return true; return false; } - public CodeableConcept addReasonCode() { //3 - CodeableConcept t = new CodeableConcept(); - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); + public CodeableReference addReason() { //3 + CodeableReference t = new CodeableReference(); + if (this.reason == null) + this.reason = new ArrayList(); + this.reason.add(t); return t; } - public CommunicationRequest addReasonCode(CodeableConcept t) { //3 + public CommunicationRequest addReason(CodeableReference t) { //3 if (t == null) return this; - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); + if (this.reason == null) + this.reason = new ArrayList(); + this.reason.add(t); return this; } /** - * @return The first repetition of repeating field {@link #reasonCode}, creating it if it does not already exist {3} + * @return The first repetition of repeating field {@link #reason}, creating it if it does not already exist {3} */ - public CodeableConcept getReasonCodeFirstRep() { - if (getReasonCode().isEmpty()) { - addReasonCode(); + public CodeableReference getReasonFirstRep() { + if (getReason().isEmpty()) { + addReason(); } - return getReasonCode().get(0); - } - - /** - * @return {@link #reasonReference} (Indicates another resource whose existence justifies this request.) - */ - public List getReasonReference() { - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - return this.reasonReference; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public CommunicationRequest setReasonReference(List theReasonReference) { - this.reasonReference = theReasonReference; - return this; - } - - public boolean hasReasonReference() { - if (this.reasonReference == null) - return false; - for (Reference item : this.reasonReference) - if (!item.isEmpty()) - return true; - return false; - } - - public Reference addReasonReference() { //3 - Reference t = new Reference(); - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return t; - } - - public CommunicationRequest addReasonReference(Reference t) { //3 - if (t == null) - return this; - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #reasonReference}, creating it if it does not already exist {3} - */ - public Reference getReasonReferenceFirstRep() { - if (getReasonReference().isEmpty()) { - addReasonReference(); - } - return getReasonReference().get(0); + return getReason().get(0); } /** @@ -1484,8 +1424,7 @@ public class CommunicationRequest extends DomainResource { children.add(new Property("requester", "Reference(Practitioner|PractitionerRole|Organization|Patient|RelatedPerson|Device)", "The device, individual, or organization who asks for the information to be shared.", 0, 1, requester)); children.add(new Property("recipient", "Reference(Device|Organization|Patient|Practitioner|PractitionerRole|RelatedPerson|Group|CareTeam|HealthcareService|Endpoint)", "The entity (e.g. person, organization, clinical information system, device, group, or care team) which is the intended target of the communication.", 0, java.lang.Integer.MAX_VALUE, recipient)); children.add(new Property("informationProvider", "Reference(Device|Organization|Patient|Practitioner|PractitionerRole|RelatedPerson|HealthcareService|Endpoint)", "The entity (e.g. person, organization, clinical information system, or device) which is to be the source of the communication.", 0, java.lang.Integer.MAX_VALUE, informationProvider)); - children.add(new Property("reasonCode", "CodeableConcept", "Describes why the request is being made in coded or textual form.", 0, java.lang.Integer.MAX_VALUE, reasonCode)); - children.add(new Property("reasonReference", "Reference(Any)", "Indicates another resource whose existence justifies this request.", 0, java.lang.Integer.MAX_VALUE, reasonReference)); + children.add(new Property("reason", "CodeableReference(Any)", "Describes why the request is being made in coded or textual form.", 0, java.lang.Integer.MAX_VALUE, reason)); children.add(new Property("note", "Annotation", "Comments made about the request by the requester, sender, recipient, subject or other participants.", 0, java.lang.Integer.MAX_VALUE, note)); } @@ -1514,8 +1453,7 @@ public class CommunicationRequest extends DomainResource { case 693933948: /*requester*/ return new Property("requester", "Reference(Practitioner|PractitionerRole|Organization|Patient|RelatedPerson|Device)", "The device, individual, or organization who asks for the information to be shared.", 0, 1, requester); case 820081177: /*recipient*/ return new Property("recipient", "Reference(Device|Organization|Patient|Practitioner|PractitionerRole|RelatedPerson|Group|CareTeam|HealthcareService|Endpoint)", "The entity (e.g. person, organization, clinical information system, device, group, or care team) which is the intended target of the communication.", 0, java.lang.Integer.MAX_VALUE, recipient); case 1255338813: /*informationProvider*/ return new Property("informationProvider", "Reference(Device|Organization|Patient|Practitioner|PractitionerRole|RelatedPerson|HealthcareService|Endpoint)", "The entity (e.g. person, organization, clinical information system, or device) which is to be the source of the communication.", 0, java.lang.Integer.MAX_VALUE, informationProvider); - case 722137681: /*reasonCode*/ return new Property("reasonCode", "CodeableConcept", "Describes why the request is being made in coded or textual form.", 0, java.lang.Integer.MAX_VALUE, reasonCode); - case -1146218137: /*reasonReference*/ return new Property("reasonReference", "Reference(Any)", "Indicates another resource whose existence justifies this request.", 0, java.lang.Integer.MAX_VALUE, reasonReference); + case -934964668: /*reason*/ return new Property("reason", "CodeableReference(Any)", "Describes why the request is being made in coded or textual form.", 0, java.lang.Integer.MAX_VALUE, reason); case 3387378: /*note*/ return new Property("note", "Annotation", "Comments made about the request by the requester, sender, recipient, subject or other participants.", 0, java.lang.Integer.MAX_VALUE, note); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -1544,8 +1482,7 @@ public class CommunicationRequest extends DomainResource { case 693933948: /*requester*/ return this.requester == null ? new Base[0] : new Base[] {this.requester}; // Reference case 820081177: /*recipient*/ return this.recipient == null ? new Base[0] : this.recipient.toArray(new Base[this.recipient.size()]); // Reference case 1255338813: /*informationProvider*/ return this.informationProvider == null ? new Base[0] : this.informationProvider.toArray(new Base[this.informationProvider.size()]); // Reference - case 722137681: /*reasonCode*/ return this.reasonCode == null ? new Base[0] : this.reasonCode.toArray(new Base[this.reasonCode.size()]); // CodeableConcept - case -1146218137: /*reasonReference*/ return this.reasonReference == null ? new Base[0] : this.reasonReference.toArray(new Base[this.reasonReference.size()]); // Reference + case -934964668: /*reason*/ return this.reason == null ? new Base[0] : this.reason.toArray(new Base[this.reason.size()]); // CodeableReference 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); } @@ -1614,11 +1551,8 @@ public class CommunicationRequest extends DomainResource { case 1255338813: // informationProvider this.getInformationProvider().add(TypeConvertor.castToReference(value)); // Reference return value; - case 722137681: // reasonCode - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept - return value; - case -1146218137: // reasonReference - this.getReasonReference().add(TypeConvertor.castToReference(value)); // Reference + case -934964668: // reason + this.getReason().add(TypeConvertor.castToCodeableReference(value)); // CodeableReference return value; case 3387378: // note this.getNote().add(TypeConvertor.castToAnnotation(value)); // Annotation @@ -1670,10 +1604,8 @@ public class CommunicationRequest extends DomainResource { this.getRecipient().add(TypeConvertor.castToReference(value)); } else if (name.equals("informationProvider")) { this.getInformationProvider().add(TypeConvertor.castToReference(value)); - } else if (name.equals("reasonCode")) { - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); - } else if (name.equals("reasonReference")) { - this.getReasonReference().add(TypeConvertor.castToReference(value)); + } else if (name.equals("reason")) { + this.getReason().add(TypeConvertor.castToCodeableReference(value)); } else if (name.equals("note")) { this.getNote().add(TypeConvertor.castToAnnotation(value)); } else @@ -1704,8 +1636,7 @@ public class CommunicationRequest extends DomainResource { case 693933948: return getRequester(); case 820081177: return addRecipient(); case 1255338813: return addInformationProvider(); - case 722137681: return addReasonCode(); - case -1146218137: return addReasonReference(); + case -934964668: return addReason(); case 3387378: return addNote(); default: return super.makeProperty(hash, name); } @@ -1734,8 +1665,7 @@ public class CommunicationRequest extends DomainResource { case 693933948: /*requester*/ return new String[] {"Reference"}; case 820081177: /*recipient*/ return new String[] {"Reference"}; case 1255338813: /*informationProvider*/ return new String[] {"Reference"}; - case 722137681: /*reasonCode*/ return new String[] {"CodeableConcept"}; - case -1146218137: /*reasonReference*/ return new String[] {"Reference"}; + case -934964668: /*reason*/ return new String[] {"CodeableReference"}; case 3387378: /*note*/ return new String[] {"Annotation"}; default: return super.getTypesForProperty(hash, name); } @@ -1811,11 +1741,8 @@ public class CommunicationRequest extends DomainResource { else if (name.equals("informationProvider")) { return addInformationProvider(); } - else if (name.equals("reasonCode")) { - return addReasonCode(); - } - else if (name.equals("reasonReference")) { - return addReasonReference(); + else if (name.equals("reason")) { + return addReason(); } else if (name.equals("note")) { return addNote(); @@ -1892,15 +1819,10 @@ public class CommunicationRequest extends DomainResource { for (Reference i : informationProvider) dst.informationProvider.add(i.copy()); }; - if (reasonCode != null) { - dst.reasonCode = new ArrayList(); - for (CodeableConcept i : reasonCode) - dst.reasonCode.add(i.copy()); - }; - if (reasonReference != null) { - dst.reasonReference = new ArrayList(); - for (Reference i : reasonReference) - dst.reasonReference.add(i.copy()); + if (reason != null) { + dst.reason = new ArrayList(); + for (CodeableReference i : reason) + dst.reason.add(i.copy()); }; if (note != null) { dst.note = new ArrayList(); @@ -1927,8 +1849,7 @@ public class CommunicationRequest extends DomainResource { && compareDeep(about, o.about, true) && compareDeep(encounter, o.encounter, true) && compareDeep(payload, o.payload, true) && compareDeep(occurrence, o.occurrence, true) && compareDeep(authoredOn, o.authoredOn, true) && compareDeep(requester, o.requester, true) && compareDeep(recipient, o.recipient, true) && compareDeep(informationProvider, o.informationProvider, true) - && compareDeep(reasonCode, o.reasonCode, true) && compareDeep(reasonReference, o.reasonReference, true) - && compareDeep(note, o.note, true); + && compareDeep(reason, o.reason, true) && compareDeep(note, o.note, true); } @Override @@ -1946,7 +1867,7 @@ public class CommunicationRequest extends DomainResource { return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, basedOn, replaces , groupIdentifier, status, statusReason, category, priority, doNotPerform, medium , subject, about, encounter, payload, occurrence, authoredOn, requester, recipient - , informationProvider, reasonCode, reasonReference, note); + , informationProvider, reason, note); } @Override 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 36c4bf9cc..754c91ea6 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 bcf725e35..8507bcd29 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 0b200581f..e0705f62d 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 e443c1b43..514f9707e 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 520065530..04f19df61 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 b2724fdaf..ad4560c0c 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 4fc71032a..8f605e771 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 @@ -1,19 +1,21 @@ package org.hl7.fhir.r5.model; +// generated + /* * #%L * org.hl7.fhir.r5 * %% * Copyright (C) 2014 - 2019 Health Level 7 * %% - * Licensed under the Apache License, Version 2.0 (the "License"); + * 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, + * 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. @@ -24,42 +26,41 @@ 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, + 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 + * 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 + * 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 + 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, Oct 17, 2019 19:56+1100 for FHIR v4.1.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR v4.2.0 + public class Constants { - public final static String LOCAL_REF_REGEX = "(Account|ActivityDefinition|AdverseEvent|AllergyIntolerance|Appointment|AppointmentResponse|AuditEvent|Basic|Binary|BiologicallyDerivedProduct|BodyStructure|Bundle|CapabilityStatement|CarePlan|CareTeam|CatalogEntry|ChargeItem|ChargeItemDefinition|Claim|ClaimResponse|ClinicalImpression|CodeSystem|Communication|CommunicationRequest|CompartmentDefinition|Composition|ConceptMap|Condition|Consent|Contract|Coverage|CoverageEligibilityRequest|CoverageEligibilityResponse|DetectedIssue|Device|DeviceDefinition|DeviceMetric|DeviceRequest|DeviceUseStatement|DiagnosticReport|DocumentManifest|DocumentReference|EffectEvidenceSynthesis|Encounter|Endpoint|EnrollmentRequest|EnrollmentResponse|EpisodeOfCare|EventDefinition|Evidence|EvidenceVariable|ExampleScenario|ExplanationOfBenefit|FamilyMemberHistory|Flag|Goal|GraphDefinition|Group|GuidanceResponse|HealthcareService|ImagingStudy|Immunization|ImmunizationEvaluation|ImmunizationRecommendation|ImplementationGuide|InsurancePlan|Invoice|Library|Linkage|List|Location|Measure|MeasureReport|Media|Medication|MedicationAdministration|MedicationDispense|MedicationKnowledge|MedicationRequest|MedicationStatement|MedicinalProduct|MedicinalProductAuthorization|MedicinalProductContraindication|MedicinalProductIndication|MedicinalProductIngredient|MedicinalProductInteraction|MedicinalProductManufactured|MedicinalProductPackaged|MedicinalProductPharmaceutical|MedicinalProductUndesirableEffect|MessageDefinition|MessageHeader|MolecularSequence|NamingSystem|NutritionOrder|Observation|ObservationDefinition|OperationDefinition|OperationOutcome|Organization|OrganizationAffiliation|Patient|PaymentNotice|PaymentReconciliation|Person|PlanDefinition|Practitioner|PractitionerRole|Procedure|Provenance|Questionnaire|QuestionnaireResponse|RelatedPerson|RequestGroup|ResearchDefinition|ResearchElementDefinition|ResearchStudy|ResearchSubject|RiskAssessment|RiskEvidenceSynthesis|Schedule|SearchParameter|ServiceRequest|Slot|Specimen|SpecimenDefinition|StructureDefinition|StructureMap|Subscription|Substance|SubstanceNucleicAcid|SubstancePolymer|SubstanceProtein|SubstanceReferenceInformation|SubstanceSourceMaterial|SubstanceSpecification|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|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|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|Observation|ObservationDefinition|OperationDefinition|OperationOutcome|Organization|OrganizationAffiliation|PackagedProductDefinition|Parameters|Patient|PaymentNotice|PaymentReconciliation|Person|PlanDefinition|Practitioner|PractitionerRole|Procedure|Provenance|Questionnaire|QuestionnaireResponse|RegulatedAuthorization|RelatedPerson|RequestGroup|ResearchStudy|ResearchSubject|RiskAssessment|Schedule|SearchParameter|ServiceRequest|Slot|Specimen|SpecimenDefinition|StructureDefinition|StructureMap|Subscription|Substance|SubstanceDefinition|SubstanceNucleicAcid|SubstancePolymer|SubstanceProtein|SubstanceReferenceInformation|SubstanceSourceMaterial|SupplyDelivery|SupplyRequest|Task|TerminologyCapabilities|TestReport|TestScript|Topic|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.1.0"; - public final static String VERSION_MM = "4.1"; - public final static String BUILD_ID = "2ce21320c7"; - public final static String DATE = "Thu Oct 17 19:56:09 AEDT 2019"; - 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|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|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|Observation|ObservationDefinition|OperationDefinition|OperationOutcome|Organization|OrganizationAffiliation|PackagedProductDefinition|Patient|PaymentNotice|PaymentReconciliation|Person|PlanDefinition|Practitioner|PractitionerRole|Procedure|Provenance|Questionnaire|QuestionnaireResponse|RegulatedAuthorization|RelatedPerson|RequestGroup|ResearchStudy|ResearchSubject|RiskAssessment|Schedule|SearchParameter|ServiceRequest|Slot|Specimen|SpecimenDefinition|StructureDefinition|StructureMap|Subscription|Substance|SubstanceDefinition|SubstanceNucleicAcid|SubstancePolymer|SubstanceProtein|SubstanceReferenceInformation|SubstanceSourceMaterial|SupplyDelivery|SupplyRequest|Task|TerminologyCapabilities|TestReport|TestScript|Topic|ValueSet|VerificationResult|VisionPrescription)\\/[A-Za-z0-9\\-\\.]{1,64}(\\/_history\\/[A-Za-z0-9\\-\\.]{1,64})?"; + public final static String VERSION = "4.2.0"; + public final static String VERSION_MM = "4.2"; + public final static String DATE = "Tue, Dec 31, 2019 12:12+1100"; + 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|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|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|Observation|ObservationDefinition|OperationDefinition|OperationOutcome|Organization|OrganizationAffiliation|PackagedProductDefinition|Parameters|Patient|PaymentNotice|PaymentReconciliation|Person|PlanDefinition|Practitioner|PractitionerRole|Procedure|Provenance|Questionnaire|QuestionnaireResponse|RegulatedAuthorization|RelatedPerson|RequestGroup|ResearchStudy|ResearchSubject|RiskAssessment|Schedule|SearchParameter|ServiceRequest|Slot|Specimen|SpecimenDefinition|StructureDefinition|StructureMap|Subscription|Substance|SubstanceDefinition|SubstanceNucleicAcid|SubstancePolymer|SubstanceProtein|SubstanceReferenceInformation|SubstanceSourceMaterial|SupplyDelivery|SupplyRequest|Task|TerminologyCapabilities|TestReport|TestScript|Topic|ValueSet|VerificationResult|VisionPrescription)\\/[A-Za-z0-9\\-\\.]{1,64}(\\/_history\\/[A-Za-z0-9\\-\\.]{1,64})?"; } 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 9a7c983bf..eafeabdba 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 9f71b05d1..4b20b0219 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 190aaa298..9b159bf15 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; @@ -6572,49 +6572,35 @@ public class Contract extends DomainResource { protected List performerLinkId; /** - * Rationale for the action to be performed or not performed. Describes why the action is permitted or prohibited. + * Rationale for the action to be performed or not performed. Describes why the action is permitted or prohibited. Either a coded concept, or another resource whose existence justifies permitting or not permitting this action. */ - @Child(name = "reasonCode", type = {CodeableConcept.class}, order=16, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Why is action (not) needed?", formalDefinition="Rationale for the action to be performed or not performed. Describes why the action is permitted or prohibited." ) + @Child(name = "reason", type = {CodeableReference.class}, order=16, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="Why is action (not) needed?", formalDefinition="Rationale for the action to be performed or not performed. Describes why the action is permitted or prohibited. Either a coded concept, or another resource whose existence justifies permitting or not permitting this action." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://terminology.hl7.org/ValueSet/v3-PurposeOfUse") - protected List reasonCode; - - /** - * Indicates another resource whose existence justifies permitting or not permitting this action. - */ - @Child(name = "reasonReference", type = {Condition.class, Observation.class, DiagnosticReport.class, DocumentReference.class, Questionnaire.class, QuestionnaireResponse.class}, order=17, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Why is action (not) needed?", formalDefinition="Indicates another resource whose existence justifies permitting or not permitting this action." ) - protected List reasonReference; - - /** - * Describes why the action is to be performed or not performed in textual form. - */ - @Child(name = "reason", type = {StringType.class}, order=18, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Why action is to be performed", formalDefinition="Describes why the action is to be performed or not performed in textual form." ) - protected List reason; + protected List reason; /** * Id [identifier??] of the clause or question text related to the reason type or reference of this action in the referenced form or QuestionnaireResponse. */ - @Child(name = "reasonLinkId", type = {StringType.class}, order=19, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "reasonLinkId", type = {StringType.class}, order=17, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Pointer to specific item", formalDefinition="Id [identifier??] of the clause or question text related to the reason type or reference of this action in the referenced form or QuestionnaireResponse." ) protected List reasonLinkId; /** * Comments made about the term action made by the requester, performer, subject or other participants. */ - @Child(name = "note", type = {Annotation.class}, order=20, 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="Comments about the action", formalDefinition="Comments made about the term action made by the requester, performer, subject or other participants." ) protected List note; /** * Security labels that protects the action. */ - @Child(name = "securityLabelNumber", type = {UnsignedIntType.class}, order=21, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "securityLabelNumber", type = {UnsignedIntType.class}, order=19, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Action restriction numbers", formalDefinition="Security labels that protects the action." ) protected List securityLabelNumber; - private static final long serialVersionUID = -701731764L; + private static final long serialVersionUID = 337159017L; /** * Constructor @@ -7292,124 +7278,18 @@ public class Contract extends DomainResource { } /** - * @return {@link #reasonCode} (Rationale for the action to be performed or not performed. Describes why the action is permitted or prohibited.) + * @return {@link #reason} (Rationale for the action to be performed or not performed. Describes why the action is permitted or prohibited. Either a coded concept, or another resource whose existence justifies permitting or not permitting this action.) */ - public List getReasonCode() { - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - return this.reasonCode; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public ActionComponent setReasonCode(List theReasonCode) { - this.reasonCode = theReasonCode; - return this; - } - - public boolean hasReasonCode() { - if (this.reasonCode == null) - return false; - for (CodeableConcept item : this.reasonCode) - if (!item.isEmpty()) - return true; - return false; - } - - public CodeableConcept addReasonCode() { //3 - CodeableConcept t = new CodeableConcept(); - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); - return t; - } - - public ActionComponent addReasonCode(CodeableConcept t) { //3 - if (t == null) - return this; - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #reasonCode}, creating it if it does not already exist {3} - */ - public CodeableConcept getReasonCodeFirstRep() { - if (getReasonCode().isEmpty()) { - addReasonCode(); - } - return getReasonCode().get(0); - } - - /** - * @return {@link #reasonReference} (Indicates another resource whose existence justifies permitting or not permitting this action.) - */ - public List getReasonReference() { - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - return this.reasonReference; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public ActionComponent setReasonReference(List theReasonReference) { - this.reasonReference = theReasonReference; - return this; - } - - public boolean hasReasonReference() { - if (this.reasonReference == null) - return false; - for (Reference item : this.reasonReference) - if (!item.isEmpty()) - return true; - return false; - } - - public Reference addReasonReference() { //3 - Reference t = new Reference(); - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return t; - } - - public ActionComponent addReasonReference(Reference t) { //3 - if (t == null) - return this; - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #reasonReference}, creating it if it does not already exist {3} - */ - public Reference getReasonReferenceFirstRep() { - if (getReasonReference().isEmpty()) { - addReasonReference(); - } - return getReasonReference().get(0); - } - - /** - * @return {@link #reason} (Describes why the action is to be performed or not performed in textual form.) - */ - public List getReason() { + public List getReason() { if (this.reason == null) - this.reason = new ArrayList(); + this.reason = new ArrayList(); return this.reason; } /** * @return Returns a reference to this for easy method chaining */ - public ActionComponent setReason(List theReason) { + public ActionComponent setReason(List theReason) { this.reason = theReason; return this; } @@ -7417,45 +7297,37 @@ public class Contract extends DomainResource { public boolean hasReason() { if (this.reason == null) return false; - for (StringType item : this.reason) + for (CodeableReference item : this.reason) if (!item.isEmpty()) return true; return false; } - /** - * @return {@link #reason} (Describes why the action is to be performed or not performed in textual form.) - */ - public StringType addReasonElement() {//2 - StringType t = new StringType(); + public CodeableReference addReason() { //3 + CodeableReference t = new CodeableReference(); if (this.reason == null) - this.reason = new ArrayList(); + this.reason = new ArrayList(); this.reason.add(t); return t; } - /** - * @param value {@link #reason} (Describes why the action is to be performed or not performed in textual form.) - */ - public ActionComponent addReason(String value) { //1 - StringType t = new StringType(); - t.setValue(value); + public ActionComponent addReason(CodeableReference t) { //3 + if (t == null) + return this; if (this.reason == null) - this.reason = new ArrayList(); + this.reason = new ArrayList(); this.reason.add(t); return this; } /** - * @param value {@link #reason} (Describes why the action is to be performed or not performed in textual form.) + * @return The first repetition of repeating field {@link #reason}, creating it if it does not already exist {3} */ - public boolean hasReason(String value) { - if (this.reason == null) - return false; - for (StringType v : this.reason) - if (v.getValue().equals(value)) // string - return true; - return false; + public CodeableReference getReasonFirstRep() { + if (getReason().isEmpty()) { + addReason(); + } + return getReason().get(0); } /** @@ -7650,9 +7522,7 @@ public class Contract extends DomainResource { children.add(new Property("performerRole", "CodeableConcept", "The type of role or competency of an individual desired or required to perform or not perform the action.", 0, 1, performerRole)); children.add(new Property("performer", "Reference(RelatedPerson|Patient|Practitioner|PractitionerRole|CareTeam|Device|Substance|Organization|Location)", "Indicates who or what is being asked to perform (or not perform) the ction.", 0, 1, performer)); children.add(new Property("performerLinkId", "string", "Id [identifier??] of the clause or question text related to the reason type or reference of this action in the referenced form or QuestionnaireResponse.", 0, java.lang.Integer.MAX_VALUE, performerLinkId)); - children.add(new Property("reasonCode", "CodeableConcept", "Rationale for the action to be performed or not performed. Describes why the action is permitted or prohibited.", 0, java.lang.Integer.MAX_VALUE, reasonCode)); - children.add(new Property("reasonReference", "Reference(Condition|Observation|DiagnosticReport|DocumentReference|Questionnaire|QuestionnaireResponse)", "Indicates another resource whose existence justifies permitting or not permitting this action.", 0, java.lang.Integer.MAX_VALUE, reasonReference)); - children.add(new Property("reason", "string", "Describes why the action is to be performed or not performed in textual form.", 0, java.lang.Integer.MAX_VALUE, reason)); + children.add(new Property("reason", "CodeableReference(Condition|Observation|DiagnosticReport|DocumentReference|Questionnaire|QuestionnaireResponse)", "Rationale for the action to be performed or not performed. Describes why the action is permitted or prohibited. Either a coded concept, or another resource whose existence justifies permitting or not permitting this action.", 0, java.lang.Integer.MAX_VALUE, reason)); children.add(new Property("reasonLinkId", "string", "Id [identifier??] of the clause or question text related to the reason type or reference of this action in the referenced form or QuestionnaireResponse.", 0, java.lang.Integer.MAX_VALUE, reasonLinkId)); children.add(new Property("note", "Annotation", "Comments made about the term action made by the requester, performer, subject or other participants.", 0, java.lang.Integer.MAX_VALUE, note)); children.add(new Property("securityLabelNumber", "unsignedInt", "Security labels that protects the action.", 0, java.lang.Integer.MAX_VALUE, securityLabelNumber)); @@ -7680,9 +7550,7 @@ public class Contract extends DomainResource { case -901513884: /*performerRole*/ return new Property("performerRole", "CodeableConcept", "The type of role or competency of an individual desired or required to perform or not perform the action.", 0, 1, performerRole); case 481140686: /*performer*/ return new Property("performer", "Reference(RelatedPerson|Patient|Practitioner|PractitionerRole|CareTeam|Device|Substance|Organization|Location)", "Indicates who or what is being asked to perform (or not perform) the ction.", 0, 1, performer); case 1051302947: /*performerLinkId*/ return new Property("performerLinkId", "string", "Id [identifier??] of the clause or question text related to the reason type or reference of this action in the referenced form or QuestionnaireResponse.", 0, java.lang.Integer.MAX_VALUE, performerLinkId); - case 722137681: /*reasonCode*/ return new Property("reasonCode", "CodeableConcept", "Rationale for the action to be performed or not performed. Describes why the action is permitted or prohibited.", 0, java.lang.Integer.MAX_VALUE, reasonCode); - case -1146218137: /*reasonReference*/ return new Property("reasonReference", "Reference(Condition|Observation|DiagnosticReport|DocumentReference|Questionnaire|QuestionnaireResponse)", "Indicates another resource whose existence justifies permitting or not permitting this action.", 0, java.lang.Integer.MAX_VALUE, reasonReference); - case -934964668: /*reason*/ return new Property("reason", "string", "Describes why the action is to be performed or not performed in textual form.", 0, java.lang.Integer.MAX_VALUE, reason); + case -934964668: /*reason*/ return new Property("reason", "CodeableReference(Condition|Observation|DiagnosticReport|DocumentReference|Questionnaire|QuestionnaireResponse)", "Rationale for the action to be performed or not performed. Describes why the action is permitted or prohibited. Either a coded concept, or another resource whose existence justifies permitting or not permitting this action.", 0, java.lang.Integer.MAX_VALUE, reason); case -1557963239: /*reasonLinkId*/ return new Property("reasonLinkId", "string", "Id [identifier??] of the clause or question text related to the reason type or reference of this action in the referenced form or QuestionnaireResponse.", 0, java.lang.Integer.MAX_VALUE, reasonLinkId); case 3387378: /*note*/ return new Property("note", "Annotation", "Comments made about the term action made by the requester, performer, subject or other participants.", 0, java.lang.Integer.MAX_VALUE, note); case -149460995: /*securityLabelNumber*/ return new Property("securityLabelNumber", "unsignedInt", "Security labels that protects the action.", 0, java.lang.Integer.MAX_VALUE, securityLabelNumber); @@ -7709,9 +7577,7 @@ public class Contract extends DomainResource { case -901513884: /*performerRole*/ return this.performerRole == null ? new Base[0] : new Base[] {this.performerRole}; // CodeableConcept case 481140686: /*performer*/ return this.performer == null ? new Base[0] : new Base[] {this.performer}; // Reference case 1051302947: /*performerLinkId*/ return this.performerLinkId == null ? new Base[0] : this.performerLinkId.toArray(new Base[this.performerLinkId.size()]); // StringType - case 722137681: /*reasonCode*/ return this.reasonCode == null ? new Base[0] : this.reasonCode.toArray(new Base[this.reasonCode.size()]); // CodeableConcept - case -1146218137: /*reasonReference*/ return this.reasonReference == null ? new Base[0] : this.reasonReference.toArray(new Base[this.reasonReference.size()]); // Reference - case -934964668: /*reason*/ return this.reason == null ? new Base[0] : this.reason.toArray(new Base[this.reason.size()]); // StringType + case -934964668: /*reason*/ return this.reason == null ? new Base[0] : this.reason.toArray(new Base[this.reason.size()]); // CodeableReference case -1557963239: /*reasonLinkId*/ return this.reasonLinkId == null ? new Base[0] : this.reasonLinkId.toArray(new Base[this.reasonLinkId.size()]); // StringType case 3387378: /*note*/ return this.note == null ? new Base[0] : this.note.toArray(new Base[this.note.size()]); // Annotation case -149460995: /*securityLabelNumber*/ return this.securityLabelNumber == null ? new Base[0] : this.securityLabelNumber.toArray(new Base[this.securityLabelNumber.size()]); // UnsignedIntType @@ -7768,14 +7634,8 @@ public class Contract extends DomainResource { case 1051302947: // performerLinkId this.getPerformerLinkId().add(TypeConvertor.castToString(value)); // StringType return value; - case 722137681: // reasonCode - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept - return value; - case -1146218137: // reasonReference - this.getReasonReference().add(TypeConvertor.castToReference(value)); // Reference - return value; case -934964668: // reason - this.getReason().add(TypeConvertor.castToString(value)); // StringType + this.getReason().add(TypeConvertor.castToCodeableReference(value)); // CodeableReference return value; case -1557963239: // reasonLinkId this.getReasonLinkId().add(TypeConvertor.castToString(value)); // StringType @@ -7823,12 +7683,8 @@ public class Contract extends DomainResource { this.performer = TypeConvertor.castToReference(value); // Reference } else if (name.equals("performerLinkId")) { this.getPerformerLinkId().add(TypeConvertor.castToString(value)); - } else if (name.equals("reasonCode")) { - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); - } else if (name.equals("reasonReference")) { - this.getReasonReference().add(TypeConvertor.castToReference(value)); } else if (name.equals("reason")) { - this.getReason().add(TypeConvertor.castToString(value)); + this.getReason().add(TypeConvertor.castToCodeableReference(value)); } else if (name.equals("reasonLinkId")) { this.getReasonLinkId().add(TypeConvertor.castToString(value)); } else if (name.equals("note")) { @@ -7859,9 +7715,7 @@ public class Contract extends DomainResource { case -901513884: return getPerformerRole(); case 481140686: return getPerformer(); case 1051302947: return addPerformerLinkIdElement(); - case 722137681: return addReasonCode(); - case -1146218137: return addReasonReference(); - case -934964668: return addReasonElement(); + case -934964668: return addReason(); case -1557963239: return addReasonLinkIdElement(); case 3387378: return addNote(); case -149460995: return addSecurityLabelNumberElement(); @@ -7888,9 +7742,7 @@ public class Contract extends DomainResource { case -901513884: /*performerRole*/ return new String[] {"CodeableConcept"}; case 481140686: /*performer*/ return new String[] {"Reference"}; case 1051302947: /*performerLinkId*/ return new String[] {"string"}; - case 722137681: /*reasonCode*/ return new String[] {"CodeableConcept"}; - case -1146218137: /*reasonReference*/ return new String[] {"Reference"}; - case -934964668: /*reason*/ return new String[] {"string"}; + case -934964668: /*reason*/ return new String[] {"CodeableReference"}; case -1557963239: /*reasonLinkId*/ return new String[] {"string"}; case 3387378: /*note*/ return new String[] {"Annotation"}; case -149460995: /*securityLabelNumber*/ return new String[] {"unsignedInt"}; @@ -7961,14 +7813,8 @@ public class Contract extends DomainResource { else if (name.equals("performerLinkId")) { throw new FHIRException("Cannot call addChild on a primitive type Contract.term.action.performerLinkId"); } - else if (name.equals("reasonCode")) { - return addReasonCode(); - } - else if (name.equals("reasonReference")) { - return addReasonReference(); - } else if (name.equals("reason")) { - throw new FHIRException("Cannot call addChild on a primitive type Contract.term.action.reason"); + return addReason(); } else if (name.equals("reasonLinkId")) { throw new FHIRException("Cannot call addChild on a primitive type Contract.term.action.reasonLinkId"); @@ -8034,19 +7880,9 @@ public class Contract extends DomainResource { for (StringType i : performerLinkId) dst.performerLinkId.add(i.copy()); }; - if (reasonCode != null) { - dst.reasonCode = new ArrayList(); - for (CodeableConcept i : reasonCode) - dst.reasonCode.add(i.copy()); - }; - if (reasonReference != null) { - dst.reasonReference = new ArrayList(); - for (Reference i : reasonReference) - dst.reasonReference.add(i.copy()); - }; if (reason != null) { - dst.reason = new ArrayList(); - for (StringType i : reason) + dst.reason = new ArrayList(); + for (CodeableReference i : reason) dst.reason.add(i.copy()); }; if (reasonLinkId != null) { @@ -8079,7 +7915,6 @@ public class Contract extends DomainResource { && compareDeep(requester, o.requester, true) && compareDeep(requesterLinkId, o.requesterLinkId, true) && compareDeep(performerType, o.performerType, true) && compareDeep(performerRole, o.performerRole, true) && compareDeep(performer, o.performer, true) && compareDeep(performerLinkId, o.performerLinkId, true) - && compareDeep(reasonCode, o.reasonCode, true) && compareDeep(reasonReference, o.reasonReference, true) && compareDeep(reason, o.reason, true) && compareDeep(reasonLinkId, o.reasonLinkId, true) && compareDeep(note, o.note, true) && compareDeep(securityLabelNumber, o.securityLabelNumber, true); } @@ -8093,15 +7928,15 @@ public class Contract extends DomainResource { ActionComponent o = (ActionComponent) other_; return compareValues(doNotPerform, o.doNotPerform, true) && compareValues(linkId, o.linkId, true) && compareValues(contextLinkId, o.contextLinkId, true) && compareValues(requesterLinkId, o.requesterLinkId, true) && compareValues(performerLinkId, o.performerLinkId, true) - && compareValues(reason, o.reason, true) && compareValues(reasonLinkId, o.reasonLinkId, true) && compareValues(securityLabelNumber, o.securityLabelNumber, true) + && compareValues(reasonLinkId, o.reasonLinkId, true) && compareValues(securityLabelNumber, o.securityLabelNumber, true) ; } public boolean isEmpty() { return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(doNotPerform, type, subject , intent, linkId, status, context, contextLinkId, occurrence, requester, requesterLinkId - , performerType, performerRole, performer, performerLinkId, reasonCode, reasonReference - , reason, reasonLinkId, note, securityLabelNumber); + , performerType, performerRole, performer, performerLinkId, reason, reasonLinkId + , note, securityLabelNumber); } public String fhirType() { 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 30731d40b..982678a59 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 00784e4e6..01dee6c10 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 6668fefa7..3c50aa7f6 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 7b6d8d50f..7137436fc 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 b8544d5d9..cb7780bd8 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 9bb14267a..6d9eb2875 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 cb5e44f29..8e5643c02 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 659d74ebb..1a67154c9 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 dda6acf7f..bf3945a34 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 a667c3a1c..3d3ef795a 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 47134cc74..817cd0321 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 e7303ef1f..a0ac5cc51 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; @@ -483,47 +483,40 @@ public class DeviceRequest extends DomainResource { /** * Reason or justification for the use of this device. */ - @Child(name = "reasonCode", type = {CodeableConcept.class}, order=18, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Coded Reason for request", formalDefinition="Reason or justification for the use of this device." ) + @Child(name = "reason", type = {CodeableReference.class}, order=18, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="Coded/Linked Reason for request", formalDefinition="Reason or justification for the use of this device." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/condition-code") - protected List reasonCode; - - /** - * Reason or justification for the use of this device. - */ - @Child(name = "reasonReference", type = {Condition.class, Observation.class, DiagnosticReport.class, DocumentReference.class}, order=19, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Linked Reason for request", formalDefinition="Reason or justification for the use of this device." ) - protected List reasonReference; + protected List reason; /** * Insurance plans, coverage extensions, pre-authorizations and/or pre-determinations that may be required for delivering the requested service. */ - @Child(name = "insurance", type = {Coverage.class, ClaimResponse.class}, order=20, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "insurance", type = {Coverage.class, ClaimResponse.class}, order=19, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Associated insurance coverage", formalDefinition="Insurance plans, coverage extensions, pre-authorizations and/or pre-determinations that may be required for delivering the requested service." ) protected List insurance; /** * Additional clinical information about the patient that may influence the request fulfilment. For example, this may include where on the subject's body the device will be used (i.e. the target site). */ - @Child(name = "supportingInfo", type = {Reference.class}, order=21, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "supportingInfo", type = {Reference.class}, order=20, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Additional clinical information", formalDefinition="Additional clinical information about the patient that may influence the request fulfilment. For example, this may include where on the subject's body the device will be used (i.e. the target site)." ) protected List supportingInfo; /** * Details about this request that were not represented at all or sufficiently in one of the attributes provided in a class. These may include for example a comment, an instruction, or a note associated with the statement. */ - @Child(name = "note", type = {Annotation.class}, order=22, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "note", type = {Annotation.class}, order=21, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Notes or comments", formalDefinition="Details about this request that were not represented at all or sufficiently in one of the attributes provided in a class. These may include for example a comment, an instruction, or a note associated with the statement." ) protected List note; /** * Key events in the history of the request. */ - @Child(name = "relevantHistory", type = {Provenance.class}, order=23, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "relevantHistory", type = {Provenance.class}, order=22, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Request provenance", formalDefinition="Key events in the history of the request." ) protected List relevantHistory; - private static final long serialVersionUID = 1859846276L; + private static final long serialVersionUID = -1895022932L; /** * Constructor @@ -1330,109 +1323,56 @@ public class DeviceRequest extends DomainResource { } /** - * @return {@link #reasonCode} (Reason or justification for the use of this device.) + * @return {@link #reason} (Reason or justification for the use of this device.) */ - public List getReasonCode() { - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - return this.reasonCode; + public List getReason() { + if (this.reason == null) + this.reason = new ArrayList(); + return this.reason; } /** * @return Returns a reference to this for easy method chaining */ - public DeviceRequest setReasonCode(List theReasonCode) { - this.reasonCode = theReasonCode; + public DeviceRequest setReason(List theReason) { + this.reason = theReason; return this; } - public boolean hasReasonCode() { - if (this.reasonCode == null) + public boolean hasReason() { + if (this.reason == null) return false; - for (CodeableConcept item : this.reasonCode) + for (CodeableReference item : this.reason) if (!item.isEmpty()) return true; return false; } - public CodeableConcept addReasonCode() { //3 - CodeableConcept t = new CodeableConcept(); - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); + public CodeableReference addReason() { //3 + CodeableReference t = new CodeableReference(); + if (this.reason == null) + this.reason = new ArrayList(); + this.reason.add(t); return t; } - public DeviceRequest addReasonCode(CodeableConcept t) { //3 + public DeviceRequest addReason(CodeableReference t) { //3 if (t == null) return this; - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); + if (this.reason == null) + this.reason = new ArrayList(); + this.reason.add(t); return this; } /** - * @return The first repetition of repeating field {@link #reasonCode}, creating it if it does not already exist {3} + * @return The first repetition of repeating field {@link #reason}, creating it if it does not already exist {3} */ - public CodeableConcept getReasonCodeFirstRep() { - if (getReasonCode().isEmpty()) { - addReasonCode(); + public CodeableReference getReasonFirstRep() { + if (getReason().isEmpty()) { + addReason(); } - return getReasonCode().get(0); - } - - /** - * @return {@link #reasonReference} (Reason or justification for the use of this device.) - */ - public List getReasonReference() { - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - return this.reasonReference; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public DeviceRequest setReasonReference(List theReasonReference) { - this.reasonReference = theReasonReference; - return this; - } - - public boolean hasReasonReference() { - if (this.reasonReference == null) - return false; - for (Reference item : this.reasonReference) - if (!item.isEmpty()) - return true; - return false; - } - - public Reference addReasonReference() { //3 - Reference t = new Reference(); - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return t; - } - - public DeviceRequest addReasonReference(Reference t) { //3 - if (t == null) - return this; - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #reasonReference}, creating it if it does not already exist {3} - */ - public Reference getReasonReferenceFirstRep() { - if (getReasonReference().isEmpty()) { - addReasonReference(); - } - return getReasonReference().get(0); + return getReason().get(0); } /** @@ -1667,8 +1607,7 @@ public class DeviceRequest extends DomainResource { children.add(new Property("requester", "Reference(Device|Practitioner|PractitionerRole|Organization)", "The individual who initiated the request and has responsibility for its activation.", 0, 1, requester)); children.add(new Property("performerType", "CodeableConcept", "Desired type of performer for doing the diagnostic testing.", 0, 1, performerType)); children.add(new Property("performer", "Reference(Practitioner|PractitionerRole|Organization|CareTeam|HealthcareService|Patient|Device|RelatedPerson)", "The desired performer for doing the diagnostic testing.", 0, 1, performer)); - children.add(new Property("reasonCode", "CodeableConcept", "Reason or justification for the use of this device.", 0, java.lang.Integer.MAX_VALUE, reasonCode)); - children.add(new Property("reasonReference", "Reference(Condition|Observation|DiagnosticReport|DocumentReference)", "Reason or justification for the use of this device.", 0, java.lang.Integer.MAX_VALUE, reasonReference)); + children.add(new Property("reason", "CodeableReference(Condition|Observation|DiagnosticReport|DocumentReference)", "Reason or justification for the use of this device.", 0, java.lang.Integer.MAX_VALUE, reason)); children.add(new Property("insurance", "Reference(Coverage|ClaimResponse)", "Insurance plans, coverage extensions, pre-authorizations and/or pre-determinations that may be required for delivering the requested service.", 0, java.lang.Integer.MAX_VALUE, insurance)); children.add(new Property("supportingInfo", "Reference(Any)", "Additional clinical information about the patient that may influence the request fulfilment. For example, this may include where on the subject's body the device will be used (i.e. the target site).", 0, java.lang.Integer.MAX_VALUE, supportingInfo)); children.add(new Property("note", "Annotation", "Details about this request that were not represented at all or sufficiently in one of the attributes provided in a class. These may include for example a comment, an instruction, or a note associated with the statement.", 0, java.lang.Integer.MAX_VALUE, note)); @@ -1703,8 +1642,7 @@ public class DeviceRequest extends DomainResource { case 693933948: /*requester*/ return new Property("requester", "Reference(Device|Practitioner|PractitionerRole|Organization)", "The individual who initiated the request and has responsibility for its activation.", 0, 1, requester); case -901444568: /*performerType*/ return new Property("performerType", "CodeableConcept", "Desired type of performer for doing the diagnostic testing.", 0, 1, performerType); case 481140686: /*performer*/ return new Property("performer", "Reference(Practitioner|PractitionerRole|Organization|CareTeam|HealthcareService|Patient|Device|RelatedPerson)", "The desired performer for doing the diagnostic testing.", 0, 1, performer); - case 722137681: /*reasonCode*/ return new Property("reasonCode", "CodeableConcept", "Reason or justification for the use of this device.", 0, java.lang.Integer.MAX_VALUE, reasonCode); - case -1146218137: /*reasonReference*/ return new Property("reasonReference", "Reference(Condition|Observation|DiagnosticReport|DocumentReference)", "Reason or justification for the use of this device.", 0, java.lang.Integer.MAX_VALUE, reasonReference); + case -934964668: /*reason*/ return new Property("reason", "CodeableReference(Condition|Observation|DiagnosticReport|DocumentReference)", "Reason or justification for the use of this device.", 0, java.lang.Integer.MAX_VALUE, reason); case 73049818: /*insurance*/ return new Property("insurance", "Reference(Coverage|ClaimResponse)", "Insurance plans, coverage extensions, pre-authorizations and/or pre-determinations that may be required for delivering the requested service.", 0, java.lang.Integer.MAX_VALUE, insurance); case 1922406657: /*supportingInfo*/ return new Property("supportingInfo", "Reference(Any)", "Additional clinical information about the patient that may influence the request fulfilment. For example, this may include where on the subject's body the device will be used (i.e. the target site).", 0, java.lang.Integer.MAX_VALUE, supportingInfo); case 3387378: /*note*/ return new Property("note", "Annotation", "Details about this request that were not represented at all or sufficiently in one of the attributes provided in a class. These may include for example a comment, an instruction, or a note associated with the statement.", 0, java.lang.Integer.MAX_VALUE, note); @@ -1735,8 +1673,7 @@ public class DeviceRequest extends DomainResource { case 693933948: /*requester*/ return this.requester == null ? new Base[0] : new Base[] {this.requester}; // Reference case -901444568: /*performerType*/ return this.performerType == null ? new Base[0] : new Base[] {this.performerType}; // CodeableConcept case 481140686: /*performer*/ return this.performer == null ? new Base[0] : new Base[] {this.performer}; // Reference - case 722137681: /*reasonCode*/ return this.reasonCode == null ? new Base[0] : this.reasonCode.toArray(new Base[this.reasonCode.size()]); // CodeableConcept - case -1146218137: /*reasonReference*/ return this.reasonReference == null ? new Base[0] : this.reasonReference.toArray(new Base[this.reasonReference.size()]); // Reference + case -934964668: /*reason*/ return this.reason == null ? new Base[0] : this.reason.toArray(new Base[this.reason.size()]); // CodeableReference case 73049818: /*insurance*/ return this.insurance == null ? new Base[0] : this.insurance.toArray(new Base[this.insurance.size()]); // Reference case 1922406657: /*supportingInfo*/ return this.supportingInfo == null ? new Base[0] : this.supportingInfo.toArray(new Base[this.supportingInfo.size()]); // Reference case 3387378: /*note*/ return this.note == null ? new Base[0] : this.note.toArray(new Base[this.note.size()]); // Annotation @@ -1806,11 +1743,8 @@ public class DeviceRequest extends DomainResource { case 481140686: // performer this.performer = TypeConvertor.castToReference(value); // Reference return value; - case 722137681: // reasonCode - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept - return value; - case -1146218137: // reasonReference - this.getReasonReference().add(TypeConvertor.castToReference(value)); // Reference + case -934964668: // reason + this.getReason().add(TypeConvertor.castToCodeableReference(value)); // CodeableReference return value; case 73049818: // insurance this.getInsurance().add(TypeConvertor.castToReference(value)); // Reference @@ -1870,10 +1804,8 @@ public class DeviceRequest extends DomainResource { this.performerType = TypeConvertor.castToCodeableConcept(value); // CodeableConcept } else if (name.equals("performer")) { this.performer = TypeConvertor.castToReference(value); // Reference - } else if (name.equals("reasonCode")) { - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); - } else if (name.equals("reasonReference")) { - this.getReasonReference().add(TypeConvertor.castToReference(value)); + } else if (name.equals("reason")) { + this.getReason().add(TypeConvertor.castToCodeableReference(value)); } else if (name.equals("insurance")) { this.getInsurance().add(TypeConvertor.castToReference(value)); } else if (name.equals("supportingInfo")) { @@ -1910,8 +1842,7 @@ public class DeviceRequest extends DomainResource { case 693933948: return getRequester(); case -901444568: return getPerformerType(); case 481140686: return getPerformer(); - case 722137681: return addReasonCode(); - case -1146218137: return addReasonReference(); + case -934964668: return addReason(); case 73049818: return addInsurance(); case 1922406657: return addSupportingInfo(); case 3387378: return addNote(); @@ -1942,8 +1873,7 @@ public class DeviceRequest extends DomainResource { case 693933948: /*requester*/ return new String[] {"Reference"}; case -901444568: /*performerType*/ return new String[] {"CodeableConcept"}; case 481140686: /*performer*/ return new String[] {"Reference"}; - case 722137681: /*reasonCode*/ return new String[] {"CodeableConcept"}; - case -1146218137: /*reasonReference*/ return new String[] {"Reference"}; + case -934964668: /*reason*/ return new String[] {"CodeableReference"}; case 73049818: /*insurance*/ return new String[] {"Reference"}; case 1922406657: /*supportingInfo*/ return new String[] {"Reference"}; case 3387378: /*note*/ return new String[] {"Annotation"}; @@ -2029,11 +1959,8 @@ public class DeviceRequest extends DomainResource { this.performer = new Reference(); return this.performer; } - else if (name.equals("reasonCode")) { - return addReasonCode(); - } - else if (name.equals("reasonReference")) { - return addReasonReference(); + else if (name.equals("reason")) { + return addReason(); } else if (name.equals("insurance")) { return addInsurance(); @@ -2106,15 +2033,10 @@ public class DeviceRequest extends DomainResource { dst.requester = requester == null ? null : requester.copy(); dst.performerType = performerType == null ? null : performerType.copy(); dst.performer = performer == null ? null : performer.copy(); - if (reasonCode != null) { - dst.reasonCode = new ArrayList(); - for (CodeableConcept i : reasonCode) - dst.reasonCode.add(i.copy()); - }; - if (reasonReference != null) { - dst.reasonReference = new ArrayList(); - for (Reference i : reasonReference) - dst.reasonReference.add(i.copy()); + if (reason != null) { + dst.reason = new ArrayList(); + for (CodeableReference i : reason) + dst.reason.add(i.copy()); }; if (insurance != null) { dst.insurance = new ArrayList(); @@ -2156,9 +2078,9 @@ public class DeviceRequest extends DomainResource { && compareDeep(code, o.code, true) && compareDeep(parameter, o.parameter, true) && compareDeep(subject, o.subject, true) && compareDeep(encounter, o.encounter, true) && compareDeep(occurrence, o.occurrence, true) && compareDeep(authoredOn, o.authoredOn, true) && compareDeep(requester, o.requester, true) && compareDeep(performerType, o.performerType, true) - && compareDeep(performer, o.performer, true) && compareDeep(reasonCode, o.reasonCode, true) && compareDeep(reasonReference, o.reasonReference, true) - && compareDeep(insurance, o.insurance, true) && compareDeep(supportingInfo, o.supportingInfo, true) - && compareDeep(note, o.note, true) && compareDeep(relevantHistory, o.relevantHistory, true); + && compareDeep(performer, o.performer, true) && compareDeep(reason, o.reason, true) && compareDeep(insurance, o.insurance, true) + && compareDeep(supportingInfo, o.supportingInfo, true) && compareDeep(note, o.note, true) && compareDeep(relevantHistory, o.relevantHistory, true) + ; } @Override @@ -2177,8 +2099,7 @@ public class DeviceRequest extends DomainResource { return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, instantiatesCanonical , instantiatesUri, basedOn, priorRequest, groupIdentifier, status, intent, priority , code, parameter, subject, encounter, occurrence, authoredOn, requester, performerType - , performer, reasonCode, reasonReference, insurance, supportingInfo, note, relevantHistory - ); + , performer, reason, insurance, supportingInfo, note, relevantHistory); } @Override 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 e73b4c911..b5951a10f 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; @@ -294,23 +294,16 @@ public class DeviceUseStatement extends DomainResource { protected Reference device; /** - * Reason or justification for the use of the device. + * Reason or justification for the use of the device. A coded concept, or another resource whose existence justifies this DeviceUseStatement. */ - @Child(name = "reasonCode", type = {CodeableConcept.class}, order=9, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Why device was used", formalDefinition="Reason or justification for the use of the device." ) - protected List reasonCode; - - /** - * Indicates another resource whose existence justifies this DeviceUseStatement. - */ - @Child(name = "reasonReference", type = {Condition.class, Observation.class, DiagnosticReport.class, DocumentReference.class}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Why was DeviceUseStatement performed?", formalDefinition="Indicates another resource whose existence justifies this DeviceUseStatement." ) - protected List reasonReference; + @Child(name = "reason", type = {CodeableReference.class}, order=9, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="Why device was used", formalDefinition="Reason or justification for the use of the device. A coded concept, or another resource whose existence justifies this DeviceUseStatement." ) + protected List reason; /** * Indicates the anotomic location on the subject's body where the device was used ( i.e. the target). */ - @Child(name = "bodySite", type = {CodeableConcept.class}, order=11, min=0, max=1, modifier=false, summary=true) + @Child(name = "bodySite", type = {CodeableConcept.class}, order=10, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Target body site", formalDefinition="Indicates the anotomic location on the subject's body where the device was used ( i.e. the target)." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/body-site") protected CodeableConcept bodySite; @@ -318,11 +311,11 @@ public class DeviceUseStatement extends DomainResource { /** * Details about the device statement that were not represented at all or sufficiently in one of the attributes provided in a class. These may include for example a comment, an instruction, or a note associated with the statement. */ - @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=11, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Addition details (comments, instructions)", formalDefinition="Details about the device statement that were not represented at all or sufficiently in one of the attributes provided in a class. These may include for example a comment, an instruction, or a note associated with the statement." ) protected List note; - private static final long serialVersionUID = 2139955761L; + private static final long serialVersionUID = 2097046105L; /** * Constructor @@ -733,109 +726,56 @@ public class DeviceUseStatement extends DomainResource { } /** - * @return {@link #reasonCode} (Reason or justification for the use of the device.) + * @return {@link #reason} (Reason or justification for the use of the device. A coded concept, or another resource whose existence justifies this DeviceUseStatement.) */ - public List getReasonCode() { - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - return this.reasonCode; + public List getReason() { + if (this.reason == null) + this.reason = new ArrayList(); + return this.reason; } /** * @return Returns a reference to this for easy method chaining */ - public DeviceUseStatement setReasonCode(List theReasonCode) { - this.reasonCode = theReasonCode; + public DeviceUseStatement setReason(List theReason) { + this.reason = theReason; return this; } - public boolean hasReasonCode() { - if (this.reasonCode == null) + public boolean hasReason() { + if (this.reason == null) return false; - for (CodeableConcept item : this.reasonCode) + for (CodeableReference item : this.reason) if (!item.isEmpty()) return true; return false; } - public CodeableConcept addReasonCode() { //3 - CodeableConcept t = new CodeableConcept(); - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); + public CodeableReference addReason() { //3 + CodeableReference t = new CodeableReference(); + if (this.reason == null) + this.reason = new ArrayList(); + this.reason.add(t); return t; } - public DeviceUseStatement addReasonCode(CodeableConcept t) { //3 + public DeviceUseStatement addReason(CodeableReference t) { //3 if (t == null) return this; - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); + if (this.reason == null) + this.reason = new ArrayList(); + this.reason.add(t); return this; } /** - * @return The first repetition of repeating field {@link #reasonCode}, creating it if it does not already exist {3} + * @return The first repetition of repeating field {@link #reason}, creating it if it does not already exist {3} */ - public CodeableConcept getReasonCodeFirstRep() { - if (getReasonCode().isEmpty()) { - addReasonCode(); + public CodeableReference getReasonFirstRep() { + if (getReason().isEmpty()) { + addReason(); } - return getReasonCode().get(0); - } - - /** - * @return {@link #reasonReference} (Indicates another resource whose existence justifies this DeviceUseStatement.) - */ - public List getReasonReference() { - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - return this.reasonReference; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public DeviceUseStatement setReasonReference(List theReasonReference) { - this.reasonReference = theReasonReference; - return this; - } - - public boolean hasReasonReference() { - if (this.reasonReference == null) - return false; - for (Reference item : this.reasonReference) - if (!item.isEmpty()) - return true; - return false; - } - - public Reference addReasonReference() { //3 - Reference t = new Reference(); - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return t; - } - - public DeviceUseStatement addReasonReference(Reference t) { //3 - if (t == null) - return this; - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #reasonReference}, creating it if it does not already exist {3} - */ - public Reference getReasonReferenceFirstRep() { - if (getReasonReference().isEmpty()) { - addReasonReference(); - } - return getReasonReference().get(0); + return getReason().get(0); } /** @@ -926,8 +866,7 @@ public class DeviceUseStatement extends DomainResource { children.add(new Property("recordedOn", "dateTime", "The time at which the statement was made/recorded.", 0, 1, recordedOn)); children.add(new Property("source", "Reference(Patient|Practitioner|PractitionerRole|RelatedPerson)", "Who reported the device was being used by the patient.", 0, 1, source)); children.add(new Property("device", "Reference(Device)", "The details of the device used.", 0, 1, device)); - children.add(new Property("reasonCode", "CodeableConcept", "Reason or justification for the use of the device.", 0, java.lang.Integer.MAX_VALUE, reasonCode)); - children.add(new Property("reasonReference", "Reference(Condition|Observation|DiagnosticReport|DocumentReference)", "Indicates another resource whose existence justifies this DeviceUseStatement.", 0, java.lang.Integer.MAX_VALUE, reasonReference)); + children.add(new Property("reason", "CodeableReference(Condition|Observation|DiagnosticReport|DocumentReference)", "Reason or justification for the use of the device. A coded concept, or another resource whose existence justifies this DeviceUseStatement.", 0, java.lang.Integer.MAX_VALUE, reason)); children.add(new Property("bodySite", "CodeableConcept", "Indicates the anotomic location on the subject's body where the device was used ( i.e. the target).", 0, 1, bodySite)); children.add(new Property("note", "Annotation", "Details about the device statement that were not represented at all or sufficiently in one of the attributes provided in a class. These may include for example a comment, an instruction, or a note associated with the statement.", 0, java.lang.Integer.MAX_VALUE, note)); } @@ -948,8 +887,7 @@ public class DeviceUseStatement extends DomainResource { case 735397551: /*recordedOn*/ return new Property("recordedOn", "dateTime", "The time at which the statement was made/recorded.", 0, 1, recordedOn); case -896505829: /*source*/ return new Property("source", "Reference(Patient|Practitioner|PractitionerRole|RelatedPerson)", "Who reported the device was being used by the patient.", 0, 1, source); case -1335157162: /*device*/ return new Property("device", "Reference(Device)", "The details of the device used.", 0, 1, device); - case 722137681: /*reasonCode*/ return new Property("reasonCode", "CodeableConcept", "Reason or justification for the use of the device.", 0, java.lang.Integer.MAX_VALUE, reasonCode); - case -1146218137: /*reasonReference*/ return new Property("reasonReference", "Reference(Condition|Observation|DiagnosticReport|DocumentReference)", "Indicates another resource whose existence justifies this DeviceUseStatement.", 0, java.lang.Integer.MAX_VALUE, reasonReference); + case -934964668: /*reason*/ return new Property("reason", "CodeableReference(Condition|Observation|DiagnosticReport|DocumentReference)", "Reason or justification for the use of the device. A coded concept, or another resource whose existence justifies this DeviceUseStatement.", 0, java.lang.Integer.MAX_VALUE, reason); case 1702620169: /*bodySite*/ return new Property("bodySite", "CodeableConcept", "Indicates the anotomic location on the subject's body where the device was used ( i.e. the target).", 0, 1, bodySite); case 3387378: /*note*/ return new Property("note", "Annotation", "Details about the device statement that were not represented at all or sufficiently in one of the attributes provided in a class. These may include for example a comment, an instruction, or a note associated with the statement.", 0, java.lang.Integer.MAX_VALUE, note); default: return super.getNamedProperty(_hash, _name, _checkValid); @@ -969,8 +907,7 @@ public class DeviceUseStatement extends DomainResource { case 735397551: /*recordedOn*/ return this.recordedOn == null ? new Base[0] : new Base[] {this.recordedOn}; // DateTimeType case -896505829: /*source*/ return this.source == null ? new Base[0] : new Base[] {this.source}; // Reference case -1335157162: /*device*/ return this.device == null ? new Base[0] : new Base[] {this.device}; // Reference - case 722137681: /*reasonCode*/ return this.reasonCode == null ? new Base[0] : this.reasonCode.toArray(new Base[this.reasonCode.size()]); // CodeableConcept - case -1146218137: /*reasonReference*/ return this.reasonReference == null ? new Base[0] : this.reasonReference.toArray(new Base[this.reasonReference.size()]); // Reference + case -934964668: /*reason*/ return this.reason == null ? new Base[0] : this.reason.toArray(new Base[this.reason.size()]); // CodeableReference case 1702620169: /*bodySite*/ return this.bodySite == null ? new Base[0] : new Base[] {this.bodySite}; // CodeableConcept 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); @@ -1009,11 +946,8 @@ public class DeviceUseStatement extends DomainResource { case -1335157162: // device this.device = TypeConvertor.castToReference(value); // Reference return value; - case 722137681: // reasonCode - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept - return value; - case -1146218137: // reasonReference - this.getReasonReference().add(TypeConvertor.castToReference(value)); // Reference + case -934964668: // reason + this.getReason().add(TypeConvertor.castToCodeableReference(value)); // CodeableReference return value; case 1702620169: // bodySite this.bodySite = TypeConvertor.castToCodeableConcept(value); // CodeableConcept @@ -1047,10 +981,8 @@ public class DeviceUseStatement extends DomainResource { this.source = TypeConvertor.castToReference(value); // Reference } else if (name.equals("device")) { this.device = TypeConvertor.castToReference(value); // Reference - } else if (name.equals("reasonCode")) { - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); - } else if (name.equals("reasonReference")) { - this.getReasonReference().add(TypeConvertor.castToReference(value)); + } else if (name.equals("reason")) { + this.getReason().add(TypeConvertor.castToCodeableReference(value)); } else if (name.equals("bodySite")) { this.bodySite = TypeConvertor.castToCodeableConcept(value); // CodeableConcept } else if (name.equals("note")) { @@ -1073,8 +1005,7 @@ public class DeviceUseStatement extends DomainResource { case 735397551: return getRecordedOnElement(); case -896505829: return getSource(); case -1335157162: return getDevice(); - case 722137681: return addReasonCode(); - case -1146218137: return addReasonReference(); + case -934964668: return addReason(); case 1702620169: return getBodySite(); case 3387378: return addNote(); default: return super.makeProperty(hash, name); @@ -1094,8 +1025,7 @@ public class DeviceUseStatement extends DomainResource { case 735397551: /*recordedOn*/ return new String[] {"dateTime"}; case -896505829: /*source*/ return new String[] {"Reference"}; case -1335157162: /*device*/ return new String[] {"Reference"}; - case 722137681: /*reasonCode*/ return new String[] {"CodeableConcept"}; - case -1146218137: /*reasonReference*/ return new String[] {"Reference"}; + case -934964668: /*reason*/ return new String[] {"CodeableReference"}; case 1702620169: /*bodySite*/ return new String[] {"CodeableConcept"}; case 3387378: /*note*/ return new String[] {"Annotation"}; default: return super.getTypesForProperty(hash, name); @@ -1144,11 +1074,8 @@ public class DeviceUseStatement extends DomainResource { this.device = new Reference(); return this.device; } - else if (name.equals("reasonCode")) { - return addReasonCode(); - } - else if (name.equals("reasonReference")) { - return addReasonReference(); + else if (name.equals("reason")) { + return addReason(); } else if (name.equals("bodySite")) { this.bodySite = new CodeableConcept(); @@ -1195,15 +1122,10 @@ public class DeviceUseStatement extends DomainResource { dst.recordedOn = recordedOn == null ? null : recordedOn.copy(); dst.source = source == null ? null : source.copy(); dst.device = device == null ? null : device.copy(); - if (reasonCode != null) { - dst.reasonCode = new ArrayList(); - for (CodeableConcept i : reasonCode) - dst.reasonCode.add(i.copy()); - }; - if (reasonReference != null) { - dst.reasonReference = new ArrayList(); - for (Reference i : reasonReference) - dst.reasonReference.add(i.copy()); + if (reason != null) { + dst.reason = new ArrayList(); + for (CodeableReference i : reason) + dst.reason.add(i.copy()); }; dst.bodySite = bodySite == null ? null : bodySite.copy(); if (note != null) { @@ -1227,8 +1149,8 @@ public class DeviceUseStatement extends DomainResource { return compareDeep(identifier, o.identifier, true) && compareDeep(basedOn, o.basedOn, true) && compareDeep(status, o.status, true) && compareDeep(subject, o.subject, true) && compareDeep(derivedFrom, o.derivedFrom, true) && compareDeep(timing, o.timing, true) && compareDeep(recordedOn, o.recordedOn, true) && compareDeep(source, o.source, true) && compareDeep(device, o.device, true) - && compareDeep(reasonCode, o.reasonCode, true) && compareDeep(reasonReference, o.reasonReference, true) - && compareDeep(bodySite, o.bodySite, true) && compareDeep(note, o.note, true); + && compareDeep(reason, o.reason, true) && compareDeep(bodySite, o.bodySite, true) && compareDeep(note, o.note, true) + ; } @Override @@ -1243,8 +1165,8 @@ public class DeviceUseStatement extends DomainResource { public boolean isEmpty() { return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, basedOn, status - , subject, derivedFrom, timing, recordedOn, source, device, reasonCode, reasonReference - , bodySite, note); + , subject, derivedFrom, timing, recordedOn, source, device, reason, bodySite + , note); } @Override 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 887013dfb..0c1eb54bb 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 009dfc250..0a7b91d9b 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 5909dc459..fbd9b4207 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 26a4b3090..dc28d99ca 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 4c8fd93f0..19988524c 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 2b975c833..da8ba526f 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 7646edd0d..81c1fe0c8 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 a9860d79c..5ea6becc4 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 4705d3d37..7d49db285 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; @@ -11321,7 +11321,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper self.setMin(getMin()); self.setMax(getMax()); } - + public String typeSummary() { CommaSeparatedStringBuilder b = new CommaSeparatedStringBuilder(); @@ -11332,6 +11332,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper return b.toString(); } + public TypeRefComponent getType(String code) { for (TypeRefComponent tr : getType()) if (tr.getCode().equals(code)) @@ -11403,6 +11404,8 @@ When pattern[x] is used to constrain a complex object, it means that each proper } + + // end addition } 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 97e30b947..c01f56a59 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; @@ -2453,63 +2453,56 @@ public class Encounter extends DomainResource { protected Duration length; /** - * Reason the encounter takes place, expressed as a code. For admissions, this can be used for a coded admission diagnosis. + * Reason the encounter takes place, expressed as a code or a reference to another resource. For admissions, this can be used for a coded admission diagnosis. */ - @Child(name = "reasonCode", type = {CodeableConcept.class}, order=16, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Coded reason the encounter takes place", formalDefinition="Reason the encounter takes place, expressed as a code. For admissions, this can be used for a coded admission diagnosis." ) + @Child(name = "reason", type = {CodeableReference.class}, order=16, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="Reason the encounter takes place (core or reference)", formalDefinition="Reason the encounter takes place, expressed as a code or a reference to another resource. For admissions, this can be used for a coded admission diagnosis." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/encounter-reason") - protected List reasonCode; - - /** - * Reason the encounter takes place, expressed as a code. For admissions, this can be used for a coded admission diagnosis. - */ - @Child(name = "reasonReference", type = {Condition.class, Procedure.class, Observation.class, ImmunizationRecommendation.class}, order=17, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Reason the encounter takes place (reference)", formalDefinition="Reason the encounter takes place, expressed as a code. For admissions, this can be used for a coded admission diagnosis." ) - protected List reasonReference; + protected List reason; /** * The list of diagnosis relevant to this encounter. */ - @Child(name = "diagnosis", type = {}, order=18, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "diagnosis", type = {}, order=17, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="The list of diagnosis relevant to this encounter", formalDefinition="The list of diagnosis relevant to this encounter." ) protected List diagnosis; /** * The set of accounts that may be used for billing for this Encounter. */ - @Child(name = "account", type = {Account.class}, order=19, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "account", type = {Account.class}, order=18, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="The set of accounts that may be used for billing for this Encounter", formalDefinition="The set of accounts that may be used for billing for this Encounter." ) protected List account; /** * Details about the admission to a healthcare service. */ - @Child(name = "hospitalization", type = {}, order=20, min=0, max=1, modifier=false, summary=false) + @Child(name = "hospitalization", type = {}, order=19, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Details about the admission to a healthcare service", formalDefinition="Details about the admission to a healthcare service." ) protected EncounterHospitalizationComponent hospitalization; /** * List of locations where the patient has been during this encounter. */ - @Child(name = "location", type = {}, order=21, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "location", type = {}, order=20, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="List of locations where the patient has been", formalDefinition="List of locations where the patient has been during this encounter." ) protected List location; /** * The organization that is primarily responsible for this Encounter's services. This MAY be the same as the organization on the Patient record, however it could be different, such as if the actor performing the services was from an external organization (which may be billed seperately) for an external consultation. Refer to the example bundle showing an abbreviated set of Encounters for a colonoscopy. */ - @Child(name = "serviceProvider", type = {Organization.class}, order=22, min=0, max=1, modifier=false, summary=false) + @Child(name = "serviceProvider", type = {Organization.class}, order=21, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="The organization (facility) responsible for this encounter", formalDefinition="The organization that is primarily responsible for this Encounter's services. This MAY be the same as the organization on the Patient record, however it could be different, such as if the actor performing the services was from an external organization (which may be billed seperately) for an external consultation. Refer to the example bundle showing an abbreviated set of Encounters for a colonoscopy." ) protected Reference serviceProvider; /** * Another Encounter of which this encounter is a part of (administratively or in time). */ - @Child(name = "partOf", type = {Encounter.class}, order=23, min=0, max=1, modifier=false, summary=false) + @Child(name = "partOf", type = {Encounter.class}, order=22, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Another Encounter this encounter is part of", formalDefinition="Another Encounter of which this encounter is a part of (administratively or in time)." ) protected Reference partOf; - private static final long serialVersionUID = 706203329L; + private static final long serialVersionUID = 62426777L; /** * Constructor @@ -3165,109 +3158,56 @@ public class Encounter extends DomainResource { } /** - * @return {@link #reasonCode} (Reason the encounter takes place, expressed as a code. For admissions, this can be used for a coded admission diagnosis.) + * @return {@link #reason} (Reason the encounter takes place, expressed as a code or a reference to another resource. For admissions, this can be used for a coded admission diagnosis.) */ - public List getReasonCode() { - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - return this.reasonCode; + public List getReason() { + if (this.reason == null) + this.reason = new ArrayList(); + return this.reason; } /** * @return Returns a reference to this for easy method chaining */ - public Encounter setReasonCode(List theReasonCode) { - this.reasonCode = theReasonCode; + public Encounter setReason(List theReason) { + this.reason = theReason; return this; } - public boolean hasReasonCode() { - if (this.reasonCode == null) + public boolean hasReason() { + if (this.reason == null) return false; - for (CodeableConcept item : this.reasonCode) + for (CodeableReference item : this.reason) if (!item.isEmpty()) return true; return false; } - public CodeableConcept addReasonCode() { //3 - CodeableConcept t = new CodeableConcept(); - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); + public CodeableReference addReason() { //3 + CodeableReference t = new CodeableReference(); + if (this.reason == null) + this.reason = new ArrayList(); + this.reason.add(t); return t; } - public Encounter addReasonCode(CodeableConcept t) { //3 + public Encounter addReason(CodeableReference t) { //3 if (t == null) return this; - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); + if (this.reason == null) + this.reason = new ArrayList(); + this.reason.add(t); return this; } /** - * @return The first repetition of repeating field {@link #reasonCode}, creating it if it does not already exist {3} + * @return The first repetition of repeating field {@link #reason}, creating it if it does not already exist {3} */ - public CodeableConcept getReasonCodeFirstRep() { - if (getReasonCode().isEmpty()) { - addReasonCode(); + public CodeableReference getReasonFirstRep() { + if (getReason().isEmpty()) { + addReason(); } - return getReasonCode().get(0); - } - - /** - * @return {@link #reasonReference} (Reason the encounter takes place, expressed as a code. For admissions, this can be used for a coded admission diagnosis.) - */ - public List getReasonReference() { - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - return this.reasonReference; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public Encounter setReasonReference(List theReasonReference) { - this.reasonReference = theReasonReference; - return this; - } - - public boolean hasReasonReference() { - if (this.reasonReference == null) - return false; - for (Reference item : this.reasonReference) - if (!item.isEmpty()) - return true; - return false; - } - - public Reference addReasonReference() { //3 - Reference t = new Reference(); - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return t; - } - - public Encounter addReasonReference(Reference t) { //3 - if (t == null) - return this; - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #reasonReference}, creating it if it does not already exist {3} - */ - public Reference getReasonReferenceFirstRep() { - if (getReasonReference().isEmpty()) { - addReasonReference(); - } - return getReasonReference().get(0); + return getReason().get(0); } /** @@ -3519,8 +3459,7 @@ public class Encounter extends DomainResource { children.add(new Property("appointment", "Reference(Appointment)", "The appointment that scheduled this encounter.", 0, java.lang.Integer.MAX_VALUE, appointment)); children.add(new Property("period", "Period", "The start and end time of the encounter.", 0, 1, period)); children.add(new Property("length", "Duration", "Quantity of time the encounter lasted. This excludes the time during leaves of absence.", 0, 1, length)); - children.add(new Property("reasonCode", "CodeableConcept", "Reason the encounter takes place, expressed as a code. For admissions, this can be used for a coded admission diagnosis.", 0, java.lang.Integer.MAX_VALUE, reasonCode)); - children.add(new Property("reasonReference", "Reference(Condition|Procedure|Observation|ImmunizationRecommendation)", "Reason the encounter takes place, expressed as a code. For admissions, this can be used for a coded admission diagnosis.", 0, java.lang.Integer.MAX_VALUE, reasonReference)); + children.add(new Property("reason", "CodeableReference(Condition|Procedure|Observation|ImmunizationRecommendation)", "Reason the encounter takes place, expressed as a code or a reference to another resource. For admissions, this can be used for a coded admission diagnosis.", 0, java.lang.Integer.MAX_VALUE, reason)); children.add(new Property("diagnosis", "", "The list of diagnosis relevant to this encounter.", 0, java.lang.Integer.MAX_VALUE, diagnosis)); children.add(new Property("account", "Reference(Account)", "The set of accounts that may be used for billing for this Encounter.", 0, java.lang.Integer.MAX_VALUE, account)); children.add(new Property("hospitalization", "", "Details about the admission to a healthcare service.", 0, 1, hospitalization)); @@ -3548,8 +3487,7 @@ public class Encounter extends DomainResource { case -1474995297: /*appointment*/ return new Property("appointment", "Reference(Appointment)", "The appointment that scheduled this encounter.", 0, java.lang.Integer.MAX_VALUE, appointment); case -991726143: /*period*/ return new Property("period", "Period", "The start and end time of the encounter.", 0, 1, period); case -1106363674: /*length*/ return new Property("length", "Duration", "Quantity of time the encounter lasted. This excludes the time during leaves of absence.", 0, 1, length); - case 722137681: /*reasonCode*/ return new Property("reasonCode", "CodeableConcept", "Reason the encounter takes place, expressed as a code. For admissions, this can be used for a coded admission diagnosis.", 0, java.lang.Integer.MAX_VALUE, reasonCode); - case -1146218137: /*reasonReference*/ return new Property("reasonReference", "Reference(Condition|Procedure|Observation|ImmunizationRecommendation)", "Reason the encounter takes place, expressed as a code. For admissions, this can be used for a coded admission diagnosis.", 0, java.lang.Integer.MAX_VALUE, reasonReference); + case -934964668: /*reason*/ return new Property("reason", "CodeableReference(Condition|Procedure|Observation|ImmunizationRecommendation)", "Reason the encounter takes place, expressed as a code or a reference to another resource. For admissions, this can be used for a coded admission diagnosis.", 0, java.lang.Integer.MAX_VALUE, reason); case 1196993265: /*diagnosis*/ return new Property("diagnosis", "", "The list of diagnosis relevant to this encounter.", 0, java.lang.Integer.MAX_VALUE, diagnosis); case -1177318867: /*account*/ return new Property("account", "Reference(Account)", "The set of accounts that may be used for billing for this Encounter.", 0, java.lang.Integer.MAX_VALUE, account); case 1057894634: /*hospitalization*/ return new Property("hospitalization", "", "Details about the admission to a healthcare service.", 0, 1, hospitalization); @@ -3580,8 +3518,7 @@ public class Encounter extends DomainResource { case -1474995297: /*appointment*/ return this.appointment == null ? new Base[0] : this.appointment.toArray(new Base[this.appointment.size()]); // Reference case -991726143: /*period*/ return this.period == null ? new Base[0] : new Base[] {this.period}; // Period case -1106363674: /*length*/ return this.length == null ? new Base[0] : new Base[] {this.length}; // Duration - case 722137681: /*reasonCode*/ return this.reasonCode == null ? new Base[0] : this.reasonCode.toArray(new Base[this.reasonCode.size()]); // CodeableConcept - case -1146218137: /*reasonReference*/ return this.reasonReference == null ? new Base[0] : this.reasonReference.toArray(new Base[this.reasonReference.size()]); // Reference + case -934964668: /*reason*/ return this.reason == null ? new Base[0] : this.reason.toArray(new Base[this.reason.size()]); // CodeableReference case 1196993265: /*diagnosis*/ return this.diagnosis == null ? new Base[0] : this.diagnosis.toArray(new Base[this.diagnosis.size()]); // DiagnosisComponent case -1177318867: /*account*/ return this.account == null ? new Base[0] : this.account.toArray(new Base[this.account.size()]); // Reference case 1057894634: /*hospitalization*/ return this.hospitalization == null ? new Base[0] : new Base[] {this.hospitalization}; // EncounterHospitalizationComponent @@ -3645,11 +3582,8 @@ public class Encounter extends DomainResource { case -1106363674: // length this.length = TypeConvertor.castToDuration(value); // Duration return value; - case 722137681: // reasonCode - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept - return value; - case -1146218137: // reasonReference - this.getReasonReference().add(TypeConvertor.castToReference(value)); // Reference + case -934964668: // reason + this.getReason().add(TypeConvertor.castToCodeableReference(value)); // CodeableReference return value; case 1196993265: // diagnosis this.getDiagnosis().add((DiagnosisComponent) value); // DiagnosisComponent @@ -3709,10 +3643,8 @@ public class Encounter extends DomainResource { this.period = TypeConvertor.castToPeriod(value); // Period } else if (name.equals("length")) { this.length = TypeConvertor.castToDuration(value); // Duration - } else if (name.equals("reasonCode")) { - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); - } else if (name.equals("reasonReference")) { - this.getReasonReference().add(TypeConvertor.castToReference(value)); + } else if (name.equals("reason")) { + this.getReason().add(TypeConvertor.castToCodeableReference(value)); } else if (name.equals("diagnosis")) { this.getDiagnosis().add((DiagnosisComponent) value); } else if (name.equals("account")) { @@ -3749,8 +3681,7 @@ public class Encounter extends DomainResource { case -1474995297: return addAppointment(); case -991726143: return getPeriod(); case -1106363674: return getLength(); - case 722137681: return addReasonCode(); - case -1146218137: return addReasonReference(); + case -934964668: return addReason(); case 1196993265: return addDiagnosis(); case -1177318867: return addAccount(); case 1057894634: return getHospitalization(); @@ -3781,8 +3712,7 @@ public class Encounter extends DomainResource { case -1474995297: /*appointment*/ return new String[] {"Reference"}; case -991726143: /*period*/ return new String[] {"Period"}; case -1106363674: /*length*/ return new String[] {"Duration"}; - case 722137681: /*reasonCode*/ return new String[] {"CodeableConcept"}; - case -1146218137: /*reasonReference*/ return new String[] {"Reference"}; + case -934964668: /*reason*/ return new String[] {"CodeableReference"}; case 1196993265: /*diagnosis*/ return new String[] {}; case -1177318867: /*account*/ return new String[] {"Reference"}; case 1057894634: /*hospitalization*/ return new String[] {}; @@ -3851,11 +3781,8 @@ public class Encounter extends DomainResource { this.length = new Duration(); return this.length; } - else if (name.equals("reasonCode")) { - return addReasonCode(); - } - else if (name.equals("reasonReference")) { - return addReasonReference(); + else if (name.equals("reason")) { + return addReason(); } else if (name.equals("diagnosis")) { return addDiagnosis(); @@ -3943,15 +3870,10 @@ public class Encounter extends DomainResource { }; dst.period = period == null ? null : period.copy(); dst.length = length == null ? null : length.copy(); - if (reasonCode != null) { - dst.reasonCode = new ArrayList(); - for (CodeableConcept i : reasonCode) - dst.reasonCode.add(i.copy()); - }; - if (reasonReference != null) { - dst.reasonReference = new ArrayList(); - for (Reference i : reasonReference) - dst.reasonReference.add(i.copy()); + if (reason != null) { + dst.reason = new ArrayList(); + for (CodeableReference i : reason) + dst.reason.add(i.copy()); }; if (diagnosis != null) { dst.diagnosis = new ArrayList(); @@ -3989,9 +3911,8 @@ public class Encounter extends DomainResource { && compareDeep(serviceType, o.serviceType, true) && compareDeep(priority, o.priority, true) && compareDeep(subject, o.subject, true) && compareDeep(subjectStatus, o.subjectStatus, true) && compareDeep(episodeOfCare, o.episodeOfCare, true) && compareDeep(basedOn, o.basedOn, true) && compareDeep(participant, o.participant, true) && compareDeep(appointment, o.appointment, true) - && compareDeep(period, o.period, true) && compareDeep(length, o.length, true) && compareDeep(reasonCode, o.reasonCode, true) - && compareDeep(reasonReference, o.reasonReference, true) && compareDeep(diagnosis, o.diagnosis, true) - && compareDeep(account, o.account, true) && compareDeep(hospitalization, o.hospitalization, true) + && compareDeep(period, o.period, true) && compareDeep(length, o.length, true) && compareDeep(reason, o.reason, true) + && compareDeep(diagnosis, o.diagnosis, true) && compareDeep(account, o.account, true) && compareDeep(hospitalization, o.hospitalization, true) && compareDeep(location, o.location, true) && compareDeep(serviceProvider, o.serviceProvider, true) && compareDeep(partOf, o.partOf, true); } @@ -4009,8 +3930,8 @@ public class Encounter extends DomainResource { public boolean isEmpty() { return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, status, statusHistory , class_, classHistory, type, serviceType, priority, subject, subjectStatus, episodeOfCare - , basedOn, participant, appointment, period, length, reasonCode, reasonReference - , diagnosis, account, hospitalization, location, serviceProvider, partOf); + , basedOn, participant, appointment, period, length, reason, diagnosis, account + , hospitalization, location, serviceProvider, partOf); } @Override @@ -4335,19 +4256,19 @@ public class Encounter extends DomainResource { /** * Search parameter: reason-code *

- * Description: Coded reason the encounter takes place
+ * Description: Reference to a concept (by class)
* Type: token
- * Path: Encounter.reasonCode
+ * Path: Encounter.reason.concept
*

*/ - @SearchParamDefinition(name="reason-code", path="Encounter.reasonCode", description="Coded reason the encounter takes place", type="token" ) + @SearchParamDefinition(name="reason-code", path="Encounter.reason.concept", description="Reference to a concept (by class)", type="token" ) public static final String SP_REASON_CODE = "reason-code"; /** * Fluent Client search parameter constant for reason-code *

- * Description: Coded reason the encounter takes place
+ * Description: Reference to a concept (by class)
* Type: token
- * Path: Encounter.reasonCode
+ * Path: Encounter.reason.concept
*

*/ public static final ca.uhn.fhir.rest.gclient.TokenClientParam REASON_CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_REASON_CODE); @@ -4355,19 +4276,19 @@ public class Encounter extends DomainResource { /** * Search parameter: reason-reference *

- * Description: Reason the encounter takes place (reference)
+ * Description: Reference to a resource (by instance)
* Type: reference
- * Path: Encounter.reasonReference
+ * Path: Encounter.reason.reference
*

*/ - @SearchParamDefinition(name="reason-reference", path="Encounter.reasonReference", description="Reason the encounter takes place (reference)", type="reference", target={Condition.class, ImmunizationRecommendation.class, Observation.class, Procedure.class } ) + @SearchParamDefinition(name="reason-reference", path="Encounter.reason.reference", description="Reference to a resource (by instance)", type="reference" ) public static final String SP_REASON_REFERENCE = "reason-reference"; /** * Fluent Client search parameter constant for reason-reference *

- * Description: Reason the encounter takes place (reference)
+ * Description: Reference to a resource (by instance)
* Type: reference
- * Path: Encounter.reasonReference
+ * Path: Encounter.reason.reference
*

*/ public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam REASON_REFERENCE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_REASON_REFERENCE); 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 bf603e1f0..7cfea7f68 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 8034a3fb7..9f4c77dda 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 793ef4d81..eac2023cb 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 92a1479fd..4882acfd1 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import org.hl7.fhir.instance.model.api.*; @@ -6287,13 +6287,13 @@ The primary difference between a medicationusage and a medicationadministration */ _4_0_0, /** - * FHIR Release 4 (Normative + STU) - Technical Correction #1 + * FHIR Release 4 (Normative + STU) with 1 technical errata. */ _4_0_1, /** - * Current build after R4. + * R5 Preview #1. */ - _4_1_0, + _4_2_0, /** * added to help the parsers */ @@ -6347,8 +6347,8 @@ The primary difference between a medicationusage and a medicationadministration return _4_0_0; if ("4.0.1".equals(codeString)) return _4_0_1; - if ("4.1.0".equals(codeString)) - return _4_1_0; + if ("4.2.0".equals(codeString)) + return _4_2_0; throw new FHIRException("Unknown FHIRVersion code '"+codeString+"'"); } public String toCode() { @@ -6376,7 +6376,7 @@ The primary difference between a medicationusage and a medicationadministration case _3_5_0: return "3.5.0"; case _4_0_0: return "4.0.0"; case _4_0_1: return "4.0.1"; - case _4_1_0: return "4.1.0"; + case _4_2_0: return "4.2.0"; default: return "?"; } } @@ -6405,7 +6405,7 @@ The primary difference between a medicationusage and a medicationadministration case _3_5_0: return "http://hl7.org/fhir/FHIR-version"; case _4_0_0: return "http://hl7.org/fhir/FHIR-version"; case _4_0_1: return "http://hl7.org/fhir/FHIR-version"; - case _4_1_0: return "http://hl7.org/fhir/FHIR-version"; + case _4_2_0: return "http://hl7.org/fhir/FHIR-version"; default: return "?"; } } @@ -6433,8 +6433,8 @@ The primary difference between a medicationusage and a medicationadministration case _3_3_0: return "R4 Ballot #1."; case _3_5_0: return "R4 Ballot #2."; case _4_0_0: return "FHIR Release 4 (Normative + STU)."; - case _4_0_1: return "FHIR Release 4 (Normative + STU) - Technical Correction #1"; - case _4_1_0: return "Current build after R4."; + case _4_0_1: return "FHIR Release 4 (Normative + STU) with 1 technical errata."; + case _4_2_0: return "R5 Preview #1."; default: return "?"; } } @@ -6463,7 +6463,7 @@ The primary difference between a medicationusage and a medicationadministration case _3_5_0: return "3.5.0"; case _4_0_0: return "4.0.0"; case _4_0_1: return "4.0.1"; - case _4_1_0: return "4.1.0"; + case _4_2_0: return "4.2.0"; default: return "?"; } } @@ -6521,7 +6521,7 @@ The primary difference between a medicationusage and a medicationadministration return true; if ("4.0.0".equals(codeString)) return true; - if ("4.1.0".equals(codeString)) + if ("4.2.0".equals(codeString)) return true; return false; } @@ -6585,8 +6585,8 @@ The primary difference between a medicationusage and a medicationadministration return FHIRVersion._4_0_0; if ("4.0.1".equals(codeString)) return FHIRVersion._4_0_1; - if ("4.1.0".equals(codeString)) - return FHIRVersion._4_1_0; + if ("4.2.0".equals(codeString)) + return FHIRVersion._4_2_0; throw new IllegalArgumentException("Unknown FHIRVersion code '"+codeString+"'"); } public Enumeration fromType(Base code) throws FHIRException { @@ -6643,8 +6643,8 @@ The primary difference between a medicationusage and a medicationadministration return new Enumeration(this, FHIRVersion._4_0_0); if ("4.0.1".equals(codeString)) return new Enumeration(this, FHIRVersion._4_0_1); - if ("4.1.0".equals(codeString)) - return new Enumeration(this, FHIRVersion._4_1_0); + if ("4.2.0".equals(codeString)) + return new Enumeration(this, FHIRVersion._4_2_0); throw new FHIRException("Unknown FHIRVersion code '"+codeString+"'"); } public String toCode(FHIRVersion code) { @@ -6694,8 +6694,8 @@ The primary difference between a medicationusage and a medicationadministration return "4.0.0"; if (code == FHIRVersion._4_0_1) return "4.0.1"; - if (code == FHIRVersion._4_1_0) - return "4.1.0"; + if (code == FHIRVersion._4_2_0) + return "4.2.0"; return "?"; } public String toSystem(FHIRVersion code) { 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 51bd8ea64..a684fc5f6 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 6731e6253..e3864ea36 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 985bf2b42..079e34180 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 1595d1365..2a5316eb7 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 611866527..f053522a0 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 17a611ee0..722ee9b48 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 fd6f6880a..92f385546 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 19f2c20ac..55f0f204a 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/FamilyMemberHistory.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/FamilyMemberHistory.java index d157b5cd4..1e58102bb 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/FamilyMemberHistory.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/FamilyMemberHistory.java @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; @@ -1276,42 +1276,35 @@ public class FamilyMemberHistory extends DomainResource { protected DataType deceased; /** - * Describes why the family member history occurred in coded or textual form. + * Describes why the family member history occurred in coded or textual form, or Indicates a Condition, Observation, AllergyIntolerance, or QuestionnaireResponse that justifies this family member history event. */ - @Child(name = "reasonCode", type = {CodeableConcept.class}, order=14, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Why was family member history performed?", formalDefinition="Describes why the family member history occurred in coded or textual form." ) + @Child(name = "reason", type = {CodeableReference.class}, order=14, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="Why was family member history performed?", formalDefinition="Describes why the family member history occurred in coded or textual form, or Indicates a Condition, Observation, AllergyIntolerance, or QuestionnaireResponse that justifies this family member history event." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/clinical-findings") - protected List reasonCode; - - /** - * Indicates a Condition, Observation, AllergyIntolerance, or QuestionnaireResponse that justifies this family member history event. - */ - @Child(name = "reasonReference", type = {Condition.class, Observation.class, AllergyIntolerance.class, QuestionnaireResponse.class, DiagnosticReport.class, DocumentReference.class}, order=15, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Why was family member history performed?", formalDefinition="Indicates a Condition, Observation, AllergyIntolerance, or QuestionnaireResponse that justifies this family member history event." ) - protected List reasonReference; + protected List reason; /** * This property allows a non condition-specific note to the made about the related person. Ideally, the note would be in the condition property, but this is not always possible. */ - @Child(name = "note", type = {Annotation.class}, order=16, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "note", type = {Annotation.class}, order=15, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="General note about related person", formalDefinition="This property allows a non condition-specific note to the made about the related person. Ideally, the note would be in the condition property, but this is not always possible." ) protected List note; /** * The significant Conditions (or condition) that the family member had. This is a repeating section to allow a system to represent more than one condition per resource, though there is nothing stopping multiple resources - one per condition. */ - @Child(name = "condition", type = {}, order=17, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "condition", type = {}, order=16, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Condition that the related person had", formalDefinition="The significant Conditions (or condition) that the family member had. This is a repeating section to allow a system to represent more than one condition per resource, though there is nothing stopping multiple resources - one per condition." ) protected List condition; /** * The significant Procedures (or procedure) that the family member had. This is a repeating section to allow a system to represent more than one procedure per resource, though there is nothing stopping multiple resources - one per procedure. */ - @Child(name = "procedure", type = {}, order=18, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "procedure", type = {}, order=17, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Procedures that the related person had", formalDefinition="The significant Procedures (or procedure) that the family member had. This is a repeating section to allow a system to represent more than one procedure per resource, though there is nothing stopping multiple resources - one per procedure." ) protected List procedure; - private static final long serialVersionUID = 809950544L; + private static final long serialVersionUID = -1281000216L; /** * Constructor @@ -2018,109 +2011,56 @@ public class FamilyMemberHistory extends DomainResource { } /** - * @return {@link #reasonCode} (Describes why the family member history occurred in coded or textual form.) + * @return {@link #reason} (Describes why the family member history occurred in coded or textual form, or Indicates a Condition, Observation, AllergyIntolerance, or QuestionnaireResponse that justifies this family member history event.) */ - public List getReasonCode() { - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - return this.reasonCode; + public List getReason() { + if (this.reason == null) + this.reason = new ArrayList(); + return this.reason; } /** * @return Returns a reference to this for easy method chaining */ - public FamilyMemberHistory setReasonCode(List theReasonCode) { - this.reasonCode = theReasonCode; + public FamilyMemberHistory setReason(List theReason) { + this.reason = theReason; return this; } - public boolean hasReasonCode() { - if (this.reasonCode == null) + public boolean hasReason() { + if (this.reason == null) return false; - for (CodeableConcept item : this.reasonCode) + for (CodeableReference item : this.reason) if (!item.isEmpty()) return true; return false; } - public CodeableConcept addReasonCode() { //3 - CodeableConcept t = new CodeableConcept(); - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); + public CodeableReference addReason() { //3 + CodeableReference t = new CodeableReference(); + if (this.reason == null) + this.reason = new ArrayList(); + this.reason.add(t); return t; } - public FamilyMemberHistory addReasonCode(CodeableConcept t) { //3 + public FamilyMemberHistory addReason(CodeableReference t) { //3 if (t == null) return this; - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); + if (this.reason == null) + this.reason = new ArrayList(); + this.reason.add(t); return this; } /** - * @return The first repetition of repeating field {@link #reasonCode}, creating it if it does not already exist {3} + * @return The first repetition of repeating field {@link #reason}, creating it if it does not already exist {3} */ - public CodeableConcept getReasonCodeFirstRep() { - if (getReasonCode().isEmpty()) { - addReasonCode(); + public CodeableReference getReasonFirstRep() { + if (getReason().isEmpty()) { + addReason(); } - return getReasonCode().get(0); - } - - /** - * @return {@link #reasonReference} (Indicates a Condition, Observation, AllergyIntolerance, or QuestionnaireResponse that justifies this family member history event.) - */ - public List getReasonReference() { - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - return this.reasonReference; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public FamilyMemberHistory setReasonReference(List theReasonReference) { - this.reasonReference = theReasonReference; - return this; - } - - public boolean hasReasonReference() { - if (this.reasonReference == null) - return false; - for (Reference item : this.reasonReference) - if (!item.isEmpty()) - return true; - return false; - } - - public Reference addReasonReference() { //3 - Reference t = new Reference(); - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return t; - } - - public FamilyMemberHistory addReasonReference(Reference t) { //3 - if (t == null) - return this; - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #reasonReference}, creating it if it does not already exist {3} - */ - public Reference getReasonReferenceFirstRep() { - if (getReasonReference().isEmpty()) { - addReasonReference(); - } - return getReasonReference().get(0); + return getReason().get(0); } /** @@ -2298,8 +2238,7 @@ public class FamilyMemberHistory extends DomainResource { children.add(new Property("age[x]", "Age|Range|string", "The age of the relative at the time the family member history is recorded.", 0, 1, age)); children.add(new Property("estimatedAge", "boolean", "If true, indicates that the age value specified is an estimated value.", 0, 1, estimatedAge)); children.add(new Property("deceased[x]", "boolean|Age|Range|date|string", "Deceased flag or the actual or approximate age of the relative at the time of death for the family member history record.", 0, 1, deceased)); - children.add(new Property("reasonCode", "CodeableConcept", "Describes why the family member history occurred in coded or textual form.", 0, java.lang.Integer.MAX_VALUE, reasonCode)); - children.add(new Property("reasonReference", "Reference(Condition|Observation|AllergyIntolerance|QuestionnaireResponse|DiagnosticReport|DocumentReference)", "Indicates a Condition, Observation, AllergyIntolerance, or QuestionnaireResponse that justifies this family member history event.", 0, java.lang.Integer.MAX_VALUE, reasonReference)); + children.add(new Property("reason", "CodeableReference(Condition|Observation|AllergyIntolerance|QuestionnaireResponse|DiagnosticReport|DocumentReference)", "Describes why the family member history occurred in coded or textual form, or Indicates a Condition, Observation, AllergyIntolerance, or QuestionnaireResponse that justifies this family member history event.", 0, java.lang.Integer.MAX_VALUE, reason)); children.add(new Property("note", "Annotation", "This property allows a non condition-specific note to the made about the related person. Ideally, the note would be in the condition property, but this is not always possible.", 0, java.lang.Integer.MAX_VALUE, note)); children.add(new Property("condition", "", "The significant Conditions (or condition) that the family member had. This is a repeating section to allow a system to represent more than one condition per resource, though there is nothing stopping multiple resources - one per condition.", 0, java.lang.Integer.MAX_VALUE, condition)); children.add(new Property("procedure", "", "The significant Procedures (or procedure) that the family member had. This is a repeating section to allow a system to represent more than one procedure per resource, though there is nothing stopping multiple resources - one per procedure.", 0, java.lang.Integer.MAX_VALUE, procedure)); @@ -2336,8 +2275,7 @@ public class FamilyMemberHistory extends DomainResource { case -1880094167: /*deceasedRange*/ return new Property("deceased[x]", "Range", "Deceased flag or the actual or approximate age of the relative at the time of death for the family member history record.", 0, 1, deceased); case -2000727742: /*deceasedDate*/ return new Property("deceased[x]", "date", "Deceased flag or the actual or approximate age of the relative at the time of death for the family member history record.", 0, 1, deceased); case 1892920485: /*deceasedString*/ return new Property("deceased[x]", "string", "Deceased flag or the actual or approximate age of the relative at the time of death for the family member history record.", 0, 1, deceased); - case 722137681: /*reasonCode*/ return new Property("reasonCode", "CodeableConcept", "Describes why the family member history occurred in coded or textual form.", 0, java.lang.Integer.MAX_VALUE, reasonCode); - case -1146218137: /*reasonReference*/ return new Property("reasonReference", "Reference(Condition|Observation|AllergyIntolerance|QuestionnaireResponse|DiagnosticReport|DocumentReference)", "Indicates a Condition, Observation, AllergyIntolerance, or QuestionnaireResponse that justifies this family member history event.", 0, java.lang.Integer.MAX_VALUE, reasonReference); + case -934964668: /*reason*/ return new Property("reason", "CodeableReference(Condition|Observation|AllergyIntolerance|QuestionnaireResponse|DiagnosticReport|DocumentReference)", "Describes why the family member history occurred in coded or textual form, or Indicates a Condition, Observation, AllergyIntolerance, or QuestionnaireResponse that justifies this family member history event.", 0, java.lang.Integer.MAX_VALUE, reason); case 3387378: /*note*/ return new Property("note", "Annotation", "This property allows a non condition-specific note to the made about the related person. Ideally, the note would be in the condition property, but this is not always possible.", 0, java.lang.Integer.MAX_VALUE, note); case -861311717: /*condition*/ return new Property("condition", "", "The significant Conditions (or condition) that the family member had. This is a repeating section to allow a system to represent more than one condition per resource, though there is nothing stopping multiple resources - one per condition.", 0, java.lang.Integer.MAX_VALUE, condition); case -1095204141: /*procedure*/ return new Property("procedure", "", "The significant Procedures (or procedure) that the family member had. This is a repeating section to allow a system to represent more than one procedure per resource, though there is nothing stopping multiple resources - one per procedure.", 0, java.lang.Integer.MAX_VALUE, procedure); @@ -2363,8 +2301,7 @@ public class FamilyMemberHistory extends DomainResource { case 96511: /*age*/ return this.age == null ? new Base[0] : new Base[] {this.age}; // DataType case 2130167587: /*estimatedAge*/ return this.estimatedAge == null ? new Base[0] : new Base[] {this.estimatedAge}; // BooleanType case 561497972: /*deceased*/ return this.deceased == null ? new Base[0] : new Base[] {this.deceased}; // DataType - case 722137681: /*reasonCode*/ return this.reasonCode == null ? new Base[0] : this.reasonCode.toArray(new Base[this.reasonCode.size()]); // CodeableConcept - case -1146218137: /*reasonReference*/ return this.reasonReference == null ? new Base[0] : this.reasonReference.toArray(new Base[this.reasonReference.size()]); // Reference + case -934964668: /*reason*/ return this.reason == null ? new Base[0] : this.reason.toArray(new Base[this.reason.size()]); // CodeableReference case 3387378: /*note*/ return this.note == null ? new Base[0] : this.note.toArray(new Base[this.note.size()]); // Annotation case -861311717: /*condition*/ return this.condition == null ? new Base[0] : this.condition.toArray(new Base[this.condition.size()]); // FamilyMemberHistoryConditionComponent case -1095204141: /*procedure*/ return this.procedure == null ? new Base[0] : this.procedure.toArray(new Base[this.procedure.size()]); // FamilyMemberHistoryProcedureComponent @@ -2419,11 +2356,8 @@ public class FamilyMemberHistory extends DomainResource { case 561497972: // deceased this.deceased = TypeConvertor.castToType(value); // DataType return value; - case 722137681: // reasonCode - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept - return value; - case -1146218137: // reasonReference - this.getReasonReference().add(TypeConvertor.castToReference(value)); // Reference + case -934964668: // reason + this.getReason().add(TypeConvertor.castToCodeableReference(value)); // CodeableReference return value; case 3387378: // note this.getNote().add(TypeConvertor.castToAnnotation(value)); // Annotation @@ -2470,10 +2404,8 @@ public class FamilyMemberHistory extends DomainResource { this.estimatedAge = TypeConvertor.castToBoolean(value); // BooleanType } else if (name.equals("deceased[x]")) { this.deceased = TypeConvertor.castToType(value); // DataType - } else if (name.equals("reasonCode")) { - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); - } else if (name.equals("reasonReference")) { - this.getReasonReference().add(TypeConvertor.castToReference(value)); + } else if (name.equals("reason")) { + this.getReason().add(TypeConvertor.castToCodeableReference(value)); } else if (name.equals("note")) { this.getNote().add(TypeConvertor.castToAnnotation(value)); } else if (name.equals("condition")) { @@ -2505,8 +2437,7 @@ public class FamilyMemberHistory extends DomainResource { case 2130167587: return getEstimatedAgeElement(); case -1311442804: return getDeceased(); case 561497972: return getDeceased(); - case 722137681: return addReasonCode(); - case -1146218137: return addReasonReference(); + case -934964668: return addReason(); case 3387378: return addNote(); case -861311717: return addCondition(); case -1095204141: return addProcedure(); @@ -2532,8 +2463,7 @@ public class FamilyMemberHistory extends DomainResource { case 96511: /*age*/ return new String[] {"Age", "Range", "string"}; case 2130167587: /*estimatedAge*/ return new String[] {"boolean"}; case 561497972: /*deceased*/ return new String[] {"boolean", "Age", "Range", "date", "string"}; - case 722137681: /*reasonCode*/ return new String[] {"CodeableConcept"}; - case -1146218137: /*reasonReference*/ return new String[] {"Reference"}; + case -934964668: /*reason*/ return new String[] {"CodeableReference"}; case 3387378: /*note*/ return new String[] {"Annotation"}; case -861311717: /*condition*/ return new String[] {}; case -1095204141: /*procedure*/ return new String[] {}; @@ -2625,11 +2555,8 @@ public class FamilyMemberHistory extends DomainResource { this.deceased = new StringType(); return this.deceased; } - else if (name.equals("reasonCode")) { - return addReasonCode(); - } - else if (name.equals("reasonReference")) { - return addReasonReference(); + else if (name.equals("reason")) { + return addReason(); } else if (name.equals("note")) { return addNote(); @@ -2683,15 +2610,10 @@ public class FamilyMemberHistory extends DomainResource { dst.age = age == null ? null : age.copy(); dst.estimatedAge = estimatedAge == null ? null : estimatedAge.copy(); dst.deceased = deceased == null ? null : deceased.copy(); - if (reasonCode != null) { - dst.reasonCode = new ArrayList(); - for (CodeableConcept i : reasonCode) - dst.reasonCode.add(i.copy()); - }; - if (reasonReference != null) { - dst.reasonReference = new ArrayList(); - for (Reference i : reasonReference) - dst.reasonReference.add(i.copy()); + if (reason != null) { + dst.reason = new ArrayList(); + for (CodeableReference i : reason) + dst.reason.add(i.copy()); }; if (note != null) { dst.note = new ArrayList(); @@ -2726,9 +2648,9 @@ public class FamilyMemberHistory extends DomainResource { && compareDeep(dataAbsentReason, o.dataAbsentReason, true) && compareDeep(patient, o.patient, true) && compareDeep(date, o.date, true) && compareDeep(name, o.name, true) && compareDeep(relationship, o.relationship, true) && compareDeep(sex, o.sex, true) && compareDeep(born, o.born, true) && compareDeep(age, o.age, true) - && compareDeep(estimatedAge, o.estimatedAge, true) && compareDeep(deceased, o.deceased, true) && compareDeep(reasonCode, o.reasonCode, true) - && compareDeep(reasonReference, o.reasonReference, true) && compareDeep(note, o.note, true) && compareDeep(condition, o.condition, true) - && compareDeep(procedure, o.procedure, true); + && compareDeep(estimatedAge, o.estimatedAge, true) && compareDeep(deceased, o.deceased, true) && compareDeep(reason, o.reason, true) + && compareDeep(note, o.note, true) && compareDeep(condition, o.condition, true) && compareDeep(procedure, o.procedure, true) + ; } @Override @@ -2746,8 +2668,8 @@ public class FamilyMemberHistory extends DomainResource { public boolean isEmpty() { return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, instantiatesCanonical , instantiatesUri, status, dataAbsentReason, patient, date, name, relationship - , sex, born, age, estimatedAge, deceased, reasonCode, reasonReference, note - , condition, procedure); + , sex, born, age, estimatedAge, deceased, reason, note, condition, procedure + ); } @Override 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 c40afc9d4..89593fb0b 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 ef910f18f..0879625fc 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; @@ -810,19 +810,12 @@ public class Goal extends DomainResource { /** * Identifies the change (or lack of change) at the point when the status of the goal is assessed. */ - @Child(name = "outcomeCode", type = {CodeableConcept.class}, order=15, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "outcome", type = {CodeableReference.class}, order=15, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="What result was achieved regarding the goal?", formalDefinition="Identifies the change (or lack of change) at the point when the status of the goal is assessed." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/clinical-findings") - protected List outcomeCode; + protected List outcome; - /** - * Details of what's changed (or not changed). - */ - @Child(name = "outcomeReference", type = {Observation.class}, order=16, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Observation that resulted from goal", formalDefinition="Details of what's changed (or not changed)." ) - protected List outcomeReference; - - private static final long serialVersionUID = -1595942993L; + private static final long serialVersionUID = -1181155521L; /** * Constructor @@ -1466,109 +1459,56 @@ public class Goal extends DomainResource { } /** - * @return {@link #outcomeCode} (Identifies the change (or lack of change) at the point when the status of the goal is assessed.) + * @return {@link #outcome} (Identifies the change (or lack of change) at the point when the status of the goal is assessed.) */ - public List getOutcomeCode() { - if (this.outcomeCode == null) - this.outcomeCode = new ArrayList(); - return this.outcomeCode; + public List getOutcome() { + if (this.outcome == null) + this.outcome = new ArrayList(); + return this.outcome; } /** * @return Returns a reference to this for easy method chaining */ - public Goal setOutcomeCode(List theOutcomeCode) { - this.outcomeCode = theOutcomeCode; + public Goal setOutcome(List theOutcome) { + this.outcome = theOutcome; return this; } - public boolean hasOutcomeCode() { - if (this.outcomeCode == null) + public boolean hasOutcome() { + if (this.outcome == null) return false; - for (CodeableConcept item : this.outcomeCode) + for (CodeableReference item : this.outcome) if (!item.isEmpty()) return true; return false; } - public CodeableConcept addOutcomeCode() { //3 - CodeableConcept t = new CodeableConcept(); - if (this.outcomeCode == null) - this.outcomeCode = new ArrayList(); - this.outcomeCode.add(t); + public CodeableReference addOutcome() { //3 + CodeableReference t = new CodeableReference(); + if (this.outcome == null) + this.outcome = new ArrayList(); + this.outcome.add(t); return t; } - public Goal addOutcomeCode(CodeableConcept t) { //3 + public Goal addOutcome(CodeableReference t) { //3 if (t == null) return this; - if (this.outcomeCode == null) - this.outcomeCode = new ArrayList(); - this.outcomeCode.add(t); + if (this.outcome == null) + this.outcome = new ArrayList(); + this.outcome.add(t); return this; } /** - * @return The first repetition of repeating field {@link #outcomeCode}, creating it if it does not already exist {3} + * @return The first repetition of repeating field {@link #outcome}, creating it if it does not already exist {3} */ - public CodeableConcept getOutcomeCodeFirstRep() { - if (getOutcomeCode().isEmpty()) { - addOutcomeCode(); + public CodeableReference getOutcomeFirstRep() { + if (getOutcome().isEmpty()) { + addOutcome(); } - return getOutcomeCode().get(0); - } - - /** - * @return {@link #outcomeReference} (Details of what's changed (or not changed).) - */ - public List getOutcomeReference() { - if (this.outcomeReference == null) - this.outcomeReference = new ArrayList(); - return this.outcomeReference; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public Goal setOutcomeReference(List theOutcomeReference) { - this.outcomeReference = theOutcomeReference; - return this; - } - - public boolean hasOutcomeReference() { - if (this.outcomeReference == null) - return false; - for (Reference item : this.outcomeReference) - if (!item.isEmpty()) - return true; - return false; - } - - public Reference addOutcomeReference() { //3 - Reference t = new Reference(); - if (this.outcomeReference == null) - this.outcomeReference = new ArrayList(); - this.outcomeReference.add(t); - return t; - } - - public Goal addOutcomeReference(Reference t) { //3 - if (t == null) - return this; - if (this.outcomeReference == null) - this.outcomeReference = new ArrayList(); - this.outcomeReference.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #outcomeReference}, creating it if it does not already exist {3} - */ - public Reference getOutcomeReferenceFirstRep() { - if (getOutcomeReference().isEmpty()) { - addOutcomeReference(); - } - return getOutcomeReference().get(0); + return getOutcome().get(0); } protected void listChildren(List children) { @@ -1588,8 +1528,7 @@ public class Goal extends DomainResource { children.add(new Property("expressedBy", "Reference(Patient|Practitioner|PractitionerRole|RelatedPerson)", "Indicates whose goal this is - patient goal, practitioner goal, etc.", 0, 1, expressedBy)); children.add(new Property("addresses", "Reference(Condition|Observation|MedicationUsage|MedicationRequest|NutritionOrder|ServiceRequest|RiskAssessment)", "The identified conditions and other health record elements that are intended to be addressed by the goal.", 0, java.lang.Integer.MAX_VALUE, addresses)); children.add(new Property("note", "Annotation", "Any comments related to the goal.", 0, java.lang.Integer.MAX_VALUE, note)); - children.add(new Property("outcomeCode", "CodeableConcept", "Identifies the change (or lack of change) at the point when the status of the goal is assessed.", 0, java.lang.Integer.MAX_VALUE, outcomeCode)); - children.add(new Property("outcomeReference", "Reference(Observation)", "Details of what's changed (or not changed).", 0, java.lang.Integer.MAX_VALUE, outcomeReference)); + children.add(new Property("outcome", "CodeableReference(Observation)", "Identifies the change (or lack of change) at the point when the status of the goal is assessed.", 0, java.lang.Integer.MAX_VALUE, outcome)); } @Override @@ -1613,8 +1552,7 @@ public class Goal extends DomainResource { case 175423686: /*expressedBy*/ return new Property("expressedBy", "Reference(Patient|Practitioner|PractitionerRole|RelatedPerson)", "Indicates whose goal this is - patient goal, practitioner goal, etc.", 0, 1, expressedBy); case 874544034: /*addresses*/ return new Property("addresses", "Reference(Condition|Observation|MedicationUsage|MedicationRequest|NutritionOrder|ServiceRequest|RiskAssessment)", "The identified conditions and other health record elements that are intended to be addressed by the goal.", 0, java.lang.Integer.MAX_VALUE, addresses); case 3387378: /*note*/ return new Property("note", "Annotation", "Any comments related to the goal.", 0, java.lang.Integer.MAX_VALUE, note); - case 1062482015: /*outcomeCode*/ return new Property("outcomeCode", "CodeableConcept", "Identifies the change (or lack of change) at the point when the status of the goal is assessed.", 0, java.lang.Integer.MAX_VALUE, outcomeCode); - case -782273511: /*outcomeReference*/ return new Property("outcomeReference", "Reference(Observation)", "Details of what's changed (or not changed).", 0, java.lang.Integer.MAX_VALUE, outcomeReference); + case -1106507950: /*outcome*/ return new Property("outcome", "CodeableReference(Observation)", "Identifies the change (or lack of change) at the point when the status of the goal is assessed.", 0, java.lang.Integer.MAX_VALUE, outcome); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -1638,8 +1576,7 @@ public class Goal extends DomainResource { case 175423686: /*expressedBy*/ return this.expressedBy == null ? new Base[0] : new Base[] {this.expressedBy}; // Reference case 874544034: /*addresses*/ return this.addresses == null ? new Base[0] : this.addresses.toArray(new Base[this.addresses.size()]); // Reference case 3387378: /*note*/ return this.note == null ? new Base[0] : this.note.toArray(new Base[this.note.size()]); // Annotation - case 1062482015: /*outcomeCode*/ return this.outcomeCode == null ? new Base[0] : this.outcomeCode.toArray(new Base[this.outcomeCode.size()]); // CodeableConcept - case -782273511: /*outcomeReference*/ return this.outcomeReference == null ? new Base[0] : this.outcomeReference.toArray(new Base[this.outcomeReference.size()]); // Reference + case -1106507950: /*outcome*/ return this.outcome == null ? new Base[0] : this.outcome.toArray(new Base[this.outcome.size()]); // CodeableReference default: return super.getProperty(hash, name, checkValid); } @@ -1694,11 +1631,8 @@ public class Goal extends DomainResource { case 3387378: // note this.getNote().add(TypeConvertor.castToAnnotation(value)); // Annotation return value; - case 1062482015: // outcomeCode - this.getOutcomeCode().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept - return value; - case -782273511: // outcomeReference - this.getOutcomeReference().add(TypeConvertor.castToReference(value)); // Reference + case -1106507950: // outcome + this.getOutcome().add(TypeConvertor.castToCodeableReference(value)); // CodeableReference return value; default: return super.setProperty(hash, name, value); } @@ -1738,10 +1672,8 @@ public class Goal extends DomainResource { this.getAddresses().add(TypeConvertor.castToReference(value)); } else if (name.equals("note")) { this.getNote().add(TypeConvertor.castToAnnotation(value)); - } else if (name.equals("outcomeCode")) { - this.getOutcomeCode().add(TypeConvertor.castToCodeableConcept(value)); - } else if (name.equals("outcomeReference")) { - this.getOutcomeReference().add(TypeConvertor.castToReference(value)); + } else if (name.equals("outcome")) { + this.getOutcome().add(TypeConvertor.castToCodeableReference(value)); } else return super.setProperty(name, value); return value; @@ -1766,8 +1698,7 @@ public class Goal extends DomainResource { case 175423686: return getExpressedBy(); case 874544034: return addAddresses(); case 3387378: return addNote(); - case 1062482015: return addOutcomeCode(); - case -782273511: return addOutcomeReference(); + case -1106507950: return addOutcome(); default: return super.makeProperty(hash, name); } @@ -1791,8 +1722,7 @@ public class Goal extends DomainResource { case 175423686: /*expressedBy*/ return new String[] {"Reference"}; case 874544034: /*addresses*/ return new String[] {"Reference"}; case 3387378: /*note*/ return new String[] {"Annotation"}; - case 1062482015: /*outcomeCode*/ return new String[] {"CodeableConcept"}; - case -782273511: /*outcomeReference*/ return new String[] {"Reference"}; + case -1106507950: /*outcome*/ return new String[] {"CodeableReference"}; default: return super.getTypesForProperty(hash, name); } @@ -1855,11 +1785,8 @@ public class Goal extends DomainResource { else if (name.equals("note")) { return addNote(); } - else if (name.equals("outcomeCode")) { - return addOutcomeCode(); - } - else if (name.equals("outcomeReference")) { - return addOutcomeReference(); + else if (name.equals("outcome")) { + return addOutcome(); } else return super.addChild(name); @@ -1913,15 +1840,10 @@ public class Goal extends DomainResource { for (Annotation i : note) dst.note.add(i.copy()); }; - if (outcomeCode != null) { - dst.outcomeCode = new ArrayList(); - for (CodeableConcept i : outcomeCode) - dst.outcomeCode.add(i.copy()); - }; - if (outcomeReference != null) { - dst.outcomeReference = new ArrayList(); - for (Reference i : outcomeReference) - dst.outcomeReference.add(i.copy()); + if (outcome != null) { + dst.outcome = new ArrayList(); + for (CodeableReference i : outcome) + dst.outcome.add(i.copy()); }; } @@ -1942,8 +1864,7 @@ public class Goal extends DomainResource { && compareDeep(subject, o.subject, true) && compareDeep(start, o.start, true) && compareDeep(target, o.target, true) && compareDeep(statusDate, o.statusDate, true) && compareDeep(statusReason, o.statusReason, true) && compareDeep(expressedBy, o.expressedBy, true) && compareDeep(addresses, o.addresses, true) && compareDeep(note, o.note, true) - && compareDeep(outcomeCode, o.outcomeCode, true) && compareDeep(outcomeReference, o.outcomeReference, true) - ; + && compareDeep(outcome, o.outcome, true); } @Override @@ -1961,8 +1882,7 @@ public class Goal extends DomainResource { public boolean isEmpty() { return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, lifecycleStatus , achievementStatus, category, continuous, priority, description, subject, start - , target, statusDate, statusReason, expressedBy, addresses, note, outcomeCode - , outcomeReference); + , target, statusDate, statusReason, expressedBy, addresses, note, outcome); } @Override 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 8cd5904f6..f33708e8a 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 276e2e08f..c42d00cc8 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 c11d57110..18d6b01ba 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; @@ -287,55 +287,48 @@ public class GuidanceResponse extends DomainResource { protected Reference performer; /** - * Describes the reason for the guidance response in coded or textual form. + * Describes the reason for the guidance response in coded or textual form, or Indicates the reason the request was initiated. This is typically provided as a parameter to the evaluation and echoed by the service, although for some use cases, such as subscription- or event-based scenarios, it may provide an indication of the cause for the response. */ - @Child(name = "reasonCode", type = {CodeableConcept.class}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Why guidance is needed", formalDefinition="Describes the reason for the guidance response in coded or textual form." ) - protected List reasonCode; - - /** - * Indicates the reason the request was initiated. This is typically provided as a parameter to the evaluation and echoed by the service, although for some use cases, such as subscription- or event-based scenarios, it may provide an indication of the cause for the response. - */ - @Child(name = "reasonReference", type = {Condition.class, Observation.class, DiagnosticReport.class, DocumentReference.class}, order=9, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Why guidance is needed", formalDefinition="Indicates the reason the request was initiated. This is typically provided as a parameter to the evaluation and echoed by the service, although for some use cases, such as subscription- or event-based scenarios, it may provide an indication of the cause for the response." ) - protected List reasonReference; + @Child(name = "reason", type = {CodeableReference.class}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="Why guidance is needed", formalDefinition="Describes the reason for the guidance response in coded or textual form, or Indicates the reason the request was initiated. This is typically provided as a parameter to the evaluation and echoed by the service, although for some use cases, such as subscription- or event-based scenarios, it may provide an indication of the cause for the response." ) + protected List reason; /** * Provides a mechanism to communicate additional information about the response. */ - @Child(name = "note", type = {Annotation.class}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "note", type = {Annotation.class}, order=9, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Additional notes about the response", formalDefinition="Provides a mechanism to communicate additional information about the response." ) protected List note; /** * Messages resulting from the evaluation of the artifact or artifacts. As part of evaluating the request, the engine may produce informational or warning messages. These messages will be provided by this element. */ - @Child(name = "evaluationMessage", type = {OperationOutcome.class}, order=11, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "evaluationMessage", type = {OperationOutcome.class}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Messages resulting from the evaluation of the artifact or artifacts", formalDefinition="Messages resulting from the evaluation of the artifact or artifacts. As part of evaluating the request, the engine may produce informational or warning messages. These messages will be provided by this element." ) protected List evaluationMessage; /** * The output parameters of the evaluation, if any. Many modules will result in the return of specific resources such as procedure or communication requests that are returned as part of the operation result. However, modules may define specific outputs that would be returned as the result of the evaluation, and these would be returned in this element. */ - @Child(name = "outputParameters", type = {Parameters.class}, order=12, min=0, max=1, modifier=false, summary=false) + @Child(name = "outputParameters", type = {Parameters.class}, order=11, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="The output parameters of the evaluation, if any", formalDefinition="The output parameters of the evaluation, if any. Many modules will result in the return of specific resources such as procedure or communication requests that are returned as part of the operation result. However, modules may define specific outputs that would be returned as the result of the evaluation, and these would be returned in this element." ) protected Reference outputParameters; /** * The actions, if any, produced by the evaluation of the artifact. */ - @Child(name = "result", type = {CarePlan.class, RequestGroup.class}, order=13, min=0, max=1, modifier=false, summary=false) + @Child(name = "result", type = {CarePlan.class, RequestGroup.class}, order=12, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Proposed actions, if any", formalDefinition="The actions, if any, produced by the evaluation of the artifact." ) protected Reference result; /** * If the evaluation could not be completed due to lack of information, or additional information would potentially result in a more accurate response, this element will a description of the data required in order to proceed with the evaluation. A subsequent request to the service should include this data. */ - @Child(name = "dataRequirement", type = {DataRequirement.class}, order=14, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "dataRequirement", type = {DataRequirement.class}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Additional required data", formalDefinition="If the evaluation could not be completed due to lack of information, or additional information would potentially result in a more accurate response, this element will a description of the data required in order to proceed with the evaluation. A subsequent request to the service should include this data." ) protected List dataRequirement; - private static final long serialVersionUID = -1656211969L; + private static final long serialVersionUID = -1204912553L; /** * Constructor @@ -663,109 +656,56 @@ public class GuidanceResponse extends DomainResource { } /** - * @return {@link #reasonCode} (Describes the reason for the guidance response in coded or textual form.) + * @return {@link #reason} (Describes the reason for the guidance response in coded or textual form, or Indicates the reason the request was initiated. This is typically provided as a parameter to the evaluation and echoed by the service, although for some use cases, such as subscription- or event-based scenarios, it may provide an indication of the cause for the response.) */ - public List getReasonCode() { - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - return this.reasonCode; + public List getReason() { + if (this.reason == null) + this.reason = new ArrayList(); + return this.reason; } /** * @return Returns a reference to this for easy method chaining */ - public GuidanceResponse setReasonCode(List theReasonCode) { - this.reasonCode = theReasonCode; + public GuidanceResponse setReason(List theReason) { + this.reason = theReason; return this; } - public boolean hasReasonCode() { - if (this.reasonCode == null) + public boolean hasReason() { + if (this.reason == null) return false; - for (CodeableConcept item : this.reasonCode) + for (CodeableReference item : this.reason) if (!item.isEmpty()) return true; return false; } - public CodeableConcept addReasonCode() { //3 - CodeableConcept t = new CodeableConcept(); - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); + public CodeableReference addReason() { //3 + CodeableReference t = new CodeableReference(); + if (this.reason == null) + this.reason = new ArrayList(); + this.reason.add(t); return t; } - public GuidanceResponse addReasonCode(CodeableConcept t) { //3 + public GuidanceResponse addReason(CodeableReference t) { //3 if (t == null) return this; - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); + if (this.reason == null) + this.reason = new ArrayList(); + this.reason.add(t); return this; } /** - * @return The first repetition of repeating field {@link #reasonCode}, creating it if it does not already exist {3} + * @return The first repetition of repeating field {@link #reason}, creating it if it does not already exist {3} */ - public CodeableConcept getReasonCodeFirstRep() { - if (getReasonCode().isEmpty()) { - addReasonCode(); + public CodeableReference getReasonFirstRep() { + if (getReason().isEmpty()) { + addReason(); } - return getReasonCode().get(0); - } - - /** - * @return {@link #reasonReference} (Indicates the reason the request was initiated. This is typically provided as a parameter to the evaluation and echoed by the service, although for some use cases, such as subscription- or event-based scenarios, it may provide an indication of the cause for the response.) - */ - public List getReasonReference() { - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - return this.reasonReference; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public GuidanceResponse setReasonReference(List theReasonReference) { - this.reasonReference = theReasonReference; - return this; - } - - public boolean hasReasonReference() { - if (this.reasonReference == null) - return false; - for (Reference item : this.reasonReference) - if (!item.isEmpty()) - return true; - return false; - } - - public Reference addReasonReference() { //3 - Reference t = new Reference(); - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return t; - } - - public GuidanceResponse addReasonReference(Reference t) { //3 - if (t == null) - return this; - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #reasonReference}, creating it if it does not already exist {3} - */ - public Reference getReasonReferenceFirstRep() { - if (getReasonReference().isEmpty()) { - addReasonReference(); - } - return getReasonReference().get(0); + return getReason().get(0); } /** @@ -985,8 +925,7 @@ public class GuidanceResponse extends DomainResource { children.add(new Property("encounter", "Reference(Encounter)", "The encounter during which this response was created or to which the creation of this record is tightly associated.", 0, 1, encounter)); children.add(new Property("occurrenceDateTime", "dateTime", "Indicates when the guidance response was processed.", 0, 1, occurrenceDateTime)); children.add(new Property("performer", "Reference(Device)", "Provides a reference to the device that performed the guidance.", 0, 1, performer)); - children.add(new Property("reasonCode", "CodeableConcept", "Describes the reason for the guidance response in coded or textual form.", 0, java.lang.Integer.MAX_VALUE, reasonCode)); - children.add(new Property("reasonReference", "Reference(Condition|Observation|DiagnosticReport|DocumentReference)", "Indicates the reason the request was initiated. This is typically provided as a parameter to the evaluation and echoed by the service, although for some use cases, such as subscription- or event-based scenarios, it may provide an indication of the cause for the response.", 0, java.lang.Integer.MAX_VALUE, reasonReference)); + children.add(new Property("reason", "CodeableReference(Condition|Observation|DiagnosticReport|DocumentReference)", "Describes the reason for the guidance response in coded or textual form, or Indicates the reason the request was initiated. This is typically provided as a parameter to the evaluation and echoed by the service, although for some use cases, such as subscription- or event-based scenarios, it may provide an indication of the cause for the response.", 0, java.lang.Integer.MAX_VALUE, reason)); children.add(new Property("note", "Annotation", "Provides a mechanism to communicate additional information about the response.", 0, java.lang.Integer.MAX_VALUE, note)); children.add(new Property("evaluationMessage", "Reference(OperationOutcome)", "Messages resulting from the evaluation of the artifact or artifacts. As part of evaluating the request, the engine may produce informational or warning messages. These messages will be provided by this element.", 0, java.lang.Integer.MAX_VALUE, evaluationMessage)); children.add(new Property("outputParameters", "Reference(Parameters)", "The output parameters of the evaluation, if any. Many modules will result in the return of specific resources such as procedure or communication requests that are returned as part of the operation result. However, modules may define specific outputs that would be returned as the result of the evaluation, and these would be returned in this element.", 0, 1, outputParameters)); @@ -1009,8 +948,7 @@ public class GuidanceResponse extends DomainResource { case 1524132147: /*encounter*/ return new Property("encounter", "Reference(Encounter)", "The encounter during which this response was created or to which the creation of this record is tightly associated.", 0, 1, encounter); case -298443636: /*occurrenceDateTime*/ return new Property("occurrenceDateTime", "dateTime", "Indicates when the guidance response was processed.", 0, 1, occurrenceDateTime); case 481140686: /*performer*/ return new Property("performer", "Reference(Device)", "Provides a reference to the device that performed the guidance.", 0, 1, performer); - case 722137681: /*reasonCode*/ return new Property("reasonCode", "CodeableConcept", "Describes the reason for the guidance response in coded or textual form.", 0, java.lang.Integer.MAX_VALUE, reasonCode); - case -1146218137: /*reasonReference*/ return new Property("reasonReference", "Reference(Condition|Observation|DiagnosticReport|DocumentReference)", "Indicates the reason the request was initiated. This is typically provided as a parameter to the evaluation and echoed by the service, although for some use cases, such as subscription- or event-based scenarios, it may provide an indication of the cause for the response.", 0, java.lang.Integer.MAX_VALUE, reasonReference); + case -934964668: /*reason*/ return new Property("reason", "CodeableReference(Condition|Observation|DiagnosticReport|DocumentReference)", "Describes the reason for the guidance response in coded or textual form, or Indicates the reason the request was initiated. This is typically provided as a parameter to the evaluation and echoed by the service, although for some use cases, such as subscription- or event-based scenarios, it may provide an indication of the cause for the response.", 0, java.lang.Integer.MAX_VALUE, reason); case 3387378: /*note*/ return new Property("note", "Annotation", "Provides a mechanism to communicate additional information about the response.", 0, java.lang.Integer.MAX_VALUE, note); case 1081619755: /*evaluationMessage*/ return new Property("evaluationMessage", "Reference(OperationOutcome)", "Messages resulting from the evaluation of the artifact or artifacts. As part of evaluating the request, the engine may produce informational or warning messages. These messages will be provided by this element.", 0, java.lang.Integer.MAX_VALUE, evaluationMessage); case 525609419: /*outputParameters*/ return new Property("outputParameters", "Reference(Parameters)", "The output parameters of the evaluation, if any. Many modules will result in the return of specific resources such as procedure or communication requests that are returned as part of the operation result. However, modules may define specific outputs that would be returned as the result of the evaluation, and these would be returned in this element.", 0, 1, outputParameters); @@ -1032,8 +970,7 @@ public class GuidanceResponse extends DomainResource { case 1524132147: /*encounter*/ return this.encounter == null ? new Base[0] : new Base[] {this.encounter}; // Reference case -298443636: /*occurrenceDateTime*/ return this.occurrenceDateTime == null ? new Base[0] : new Base[] {this.occurrenceDateTime}; // DateTimeType case 481140686: /*performer*/ return this.performer == null ? new Base[0] : new Base[] {this.performer}; // Reference - case 722137681: /*reasonCode*/ return this.reasonCode == null ? new Base[0] : this.reasonCode.toArray(new Base[this.reasonCode.size()]); // CodeableConcept - case -1146218137: /*reasonReference*/ return this.reasonReference == null ? new Base[0] : this.reasonReference.toArray(new Base[this.reasonReference.size()]); // Reference + case -934964668: /*reason*/ return this.reason == null ? new Base[0] : this.reason.toArray(new Base[this.reason.size()]); // CodeableReference case 3387378: /*note*/ return this.note == null ? new Base[0] : this.note.toArray(new Base[this.note.size()]); // Annotation case 1081619755: /*evaluationMessage*/ return this.evaluationMessage == null ? new Base[0] : this.evaluationMessage.toArray(new Base[this.evaluationMessage.size()]); // Reference case 525609419: /*outputParameters*/ return this.outputParameters == null ? new Base[0] : new Base[] {this.outputParameters}; // Reference @@ -1072,11 +1009,8 @@ public class GuidanceResponse extends DomainResource { case 481140686: // performer this.performer = TypeConvertor.castToReference(value); // Reference return value; - case 722137681: // reasonCode - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept - return value; - case -1146218137: // reasonReference - this.getReasonReference().add(TypeConvertor.castToReference(value)); // Reference + case -934964668: // reason + this.getReason().add(TypeConvertor.castToCodeableReference(value)); // CodeableReference return value; case 3387378: // note this.getNote().add(TypeConvertor.castToAnnotation(value)); // Annotation @@ -1117,10 +1051,8 @@ public class GuidanceResponse extends DomainResource { this.occurrenceDateTime = TypeConvertor.castToDateTime(value); // DateTimeType } else if (name.equals("performer")) { this.performer = TypeConvertor.castToReference(value); // Reference - } else if (name.equals("reasonCode")) { - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); - } else if (name.equals("reasonReference")) { - this.getReasonReference().add(TypeConvertor.castToReference(value)); + } else if (name.equals("reason")) { + this.getReason().add(TypeConvertor.castToCodeableReference(value)); } else if (name.equals("note")) { this.getNote().add(TypeConvertor.castToAnnotation(value)); } else if (name.equals("evaluationMessage")) { @@ -1148,8 +1080,7 @@ public class GuidanceResponse extends DomainResource { case 1524132147: return getEncounter(); case -298443636: return getOccurrenceDateTimeElement(); case 481140686: return getPerformer(); - case 722137681: return addReasonCode(); - case -1146218137: return addReasonReference(); + case -934964668: return addReason(); case 3387378: return addNote(); case 1081619755: return addEvaluationMessage(); case 525609419: return getOutputParameters(); @@ -1171,8 +1102,7 @@ public class GuidanceResponse extends DomainResource { case 1524132147: /*encounter*/ return new String[] {"Reference"}; case -298443636: /*occurrenceDateTime*/ return new String[] {"dateTime"}; case 481140686: /*performer*/ return new String[] {"Reference"}; - case 722137681: /*reasonCode*/ return new String[] {"CodeableConcept"}; - case -1146218137: /*reasonReference*/ return new String[] {"Reference"}; + case -934964668: /*reason*/ return new String[] {"CodeableReference"}; case 3387378: /*note*/ return new String[] {"Annotation"}; case 1081619755: /*evaluationMessage*/ return new String[] {"Reference"}; case 525609419: /*outputParameters*/ return new String[] {"Reference"}; @@ -1222,11 +1152,8 @@ public class GuidanceResponse extends DomainResource { this.performer = new Reference(); return this.performer; } - else if (name.equals("reasonCode")) { - return addReasonCode(); - } - else if (name.equals("reasonReference")) { - return addReasonReference(); + else if (name.equals("reason")) { + return addReason(); } else if (name.equals("note")) { return addNote(); @@ -1274,15 +1201,10 @@ public class GuidanceResponse extends DomainResource { dst.encounter = encounter == null ? null : encounter.copy(); dst.occurrenceDateTime = occurrenceDateTime == null ? null : occurrenceDateTime.copy(); dst.performer = performer == null ? null : performer.copy(); - if (reasonCode != null) { - dst.reasonCode = new ArrayList(); - for (CodeableConcept i : reasonCode) - dst.reasonCode.add(i.copy()); - }; - if (reasonReference != null) { - dst.reasonReference = new ArrayList(); - for (Reference i : reasonReference) - dst.reasonReference.add(i.copy()); + if (reason != null) { + dst.reason = new ArrayList(); + for (CodeableReference i : reason) + dst.reason.add(i.copy()); }; if (note != null) { dst.note = new ArrayList(); @@ -1317,10 +1239,10 @@ public class GuidanceResponse extends DomainResource { return compareDeep(requestIdentifier, o.requestIdentifier, true) && compareDeep(identifier, o.identifier, true) && compareDeep(module, o.module, true) && compareDeep(status, o.status, true) && compareDeep(subject, o.subject, true) && compareDeep(encounter, o.encounter, true) && compareDeep(occurrenceDateTime, o.occurrenceDateTime, true) - && compareDeep(performer, o.performer, true) && compareDeep(reasonCode, o.reasonCode, true) && compareDeep(reasonReference, o.reasonReference, true) - && compareDeep(note, o.note, true) && compareDeep(evaluationMessage, o.evaluationMessage, true) - && compareDeep(outputParameters, o.outputParameters, true) && compareDeep(result, o.result, true) - && compareDeep(dataRequirement, o.dataRequirement, true); + && compareDeep(performer, o.performer, true) && compareDeep(reason, o.reason, true) && compareDeep(note, o.note, true) + && compareDeep(evaluationMessage, o.evaluationMessage, true) && compareDeep(outputParameters, o.outputParameters, true) + && compareDeep(result, o.result, true) && compareDeep(dataRequirement, o.dataRequirement, true) + ; } @Override @@ -1336,9 +1258,8 @@ public class GuidanceResponse extends DomainResource { public boolean isEmpty() { return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(requestIdentifier, identifier - , module, status, subject, encounter, occurrenceDateTime, performer, reasonCode - , reasonReference, note, evaluationMessage, outputParameters, result, dataRequirement - ); + , module, status, subject, encounter, occurrenceDateTime, performer, reason, note + , evaluationMessage, outputParameters, result, dataRequirement); } @Override 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 82f10b9c1..dd2e4196c 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 87e094341..5fce0d560 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 de5205afb..577cdfcf3 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 63790b6f0..590b072e8 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; @@ -2010,42 +2010,35 @@ public class ImagingStudy extends DomainResource { protected Reference location; /** - * Description of clinical condition indicating why the ImagingStudy was requested. + * Description of clinical condition indicating why the ImagingStudy was requested, and/or Indicates another resource whose existence justifies this Study. */ - @Child(name = "reasonCode", type = {CodeableConcept.class}, order=14, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Why the study was requested", formalDefinition="Description of clinical condition indicating why the ImagingStudy was requested." ) + @Child(name = "reason", type = {CodeableReference.class}, order=14, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="Why the study was requested / performed", formalDefinition="Description of clinical condition indicating why the ImagingStudy was requested, and/or Indicates another resource whose existence justifies this Study." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/procedure-reason") - protected List reasonCode; - - /** - * Indicates another resource whose existence justifies this Study. - */ - @Child(name = "reasonReference", type = {Condition.class, Observation.class, DiagnosticReport.class, DocumentReference.class}, order=15, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Why was study performed", formalDefinition="Indicates another resource whose existence justifies this Study." ) - protected List reasonReference; + protected List reason; /** * Per the recommended DICOM mapping, this element is derived from the Study Description attribute (0008,1030). Observations or findings about the imaging study should be recorded in another resource, e.g. Observation, and not in this element. */ - @Child(name = "note", type = {Annotation.class}, order=16, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "note", type = {Annotation.class}, order=15, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="User-defined comments", formalDefinition="Per the recommended DICOM mapping, this element is derived from the Study Description attribute (0008,1030). Observations or findings about the imaging study should be recorded in another resource, e.g. Observation, and not in this element." ) protected List note; /** * The Imaging Manager description of the study. Institution-generated description or classification of the Study (component) performed. */ - @Child(name = "description", type = {StringType.class}, order=17, min=0, max=1, modifier=false, summary=true) + @Child(name = "description", type = {StringType.class}, order=16, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Institution-generated description", formalDefinition="The Imaging Manager description of the study. Institution-generated description or classification of the Study (component) performed." ) protected StringType description; /** * Each study has one or more series of images or other content. */ - @Child(name = "series", type = {}, order=18, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "series", type = {}, order=17, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Each study has one or more series of instances", formalDefinition="Each study has one or more series of images or other content." ) protected List series; - private static final long serialVersionUID = -1858427615L; + private static final long serialVersionUID = -564369223L; /** * Constructor @@ -2662,109 +2655,56 @@ public class ImagingStudy extends DomainResource { } /** - * @return {@link #reasonCode} (Description of clinical condition indicating why the ImagingStudy was requested.) + * @return {@link #reason} (Description of clinical condition indicating why the ImagingStudy was requested, and/or Indicates another resource whose existence justifies this Study.) */ - public List getReasonCode() { - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - return this.reasonCode; + public List getReason() { + if (this.reason == null) + this.reason = new ArrayList(); + return this.reason; } /** * @return Returns a reference to this for easy method chaining */ - public ImagingStudy setReasonCode(List theReasonCode) { - this.reasonCode = theReasonCode; + public ImagingStudy setReason(List theReason) { + this.reason = theReason; return this; } - public boolean hasReasonCode() { - if (this.reasonCode == null) + public boolean hasReason() { + if (this.reason == null) return false; - for (CodeableConcept item : this.reasonCode) + for (CodeableReference item : this.reason) if (!item.isEmpty()) return true; return false; } - public CodeableConcept addReasonCode() { //3 - CodeableConcept t = new CodeableConcept(); - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); + public CodeableReference addReason() { //3 + CodeableReference t = new CodeableReference(); + if (this.reason == null) + this.reason = new ArrayList(); + this.reason.add(t); return t; } - public ImagingStudy addReasonCode(CodeableConcept t) { //3 + public ImagingStudy addReason(CodeableReference t) { //3 if (t == null) return this; - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); + if (this.reason == null) + this.reason = new ArrayList(); + this.reason.add(t); return this; } /** - * @return The first repetition of repeating field {@link #reasonCode}, creating it if it does not already exist {3} + * @return The first repetition of repeating field {@link #reason}, creating it if it does not already exist {3} */ - public CodeableConcept getReasonCodeFirstRep() { - if (getReasonCode().isEmpty()) { - addReasonCode(); + public CodeableReference getReasonFirstRep() { + if (getReason().isEmpty()) { + addReason(); } - return getReasonCode().get(0); - } - - /** - * @return {@link #reasonReference} (Indicates another resource whose existence justifies this Study.) - */ - public List getReasonReference() { - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - return this.reasonReference; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public ImagingStudy setReasonReference(List theReasonReference) { - this.reasonReference = theReasonReference; - return this; - } - - public boolean hasReasonReference() { - if (this.reasonReference == null) - return false; - for (Reference item : this.reasonReference) - if (!item.isEmpty()) - return true; - return false; - } - - public Reference addReasonReference() { //3 - Reference t = new Reference(); - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return t; - } - - public ImagingStudy addReasonReference(Reference t) { //3 - if (t == null) - return this; - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #reasonReference}, creating it if it does not already exist {3} - */ - public Reference getReasonReferenceFirstRep() { - if (getReasonReference().isEmpty()) { - addReasonReference(); - } - return getReasonReference().get(0); + return getReason().get(0); } /** @@ -2938,8 +2878,7 @@ public class ImagingStudy extends DomainResource { children.add(new Property("numberOfInstances", "unsignedInt", "Number of SOP Instances in Study. This value given may be larger than the number of instance elements this resource contains due to resource availability, security, or other factors. This element should be present if any instance elements are present.", 0, 1, numberOfInstances)); children.add(new Property("procedure", "", "The procedure or code from which this ImagingStudy was part of.", 0, java.lang.Integer.MAX_VALUE, procedure)); children.add(new Property("location", "Reference(Location)", "The principal physical location where the ImagingStudy was performed.", 0, 1, location)); - children.add(new Property("reasonCode", "CodeableConcept", "Description of clinical condition indicating why the ImagingStudy was requested.", 0, java.lang.Integer.MAX_VALUE, reasonCode)); - children.add(new Property("reasonReference", "Reference(Condition|Observation|DiagnosticReport|DocumentReference)", "Indicates another resource whose existence justifies this Study.", 0, java.lang.Integer.MAX_VALUE, reasonReference)); + children.add(new Property("reason", "CodeableReference(Condition|Observation|DiagnosticReport|DocumentReference)", "Description of clinical condition indicating why the ImagingStudy was requested, and/or Indicates another resource whose existence justifies this Study.", 0, java.lang.Integer.MAX_VALUE, reason)); children.add(new Property("note", "Annotation", "Per the recommended DICOM mapping, this element is derived from the Study Description attribute (0008,1030). Observations or findings about the imaging study should be recorded in another resource, e.g. Observation, and not in this element.", 0, java.lang.Integer.MAX_VALUE, note)); children.add(new Property("description", "string", "The Imaging Manager description of the study. Institution-generated description or classification of the Study (component) performed.", 0, 1, description)); children.add(new Property("series", "", "Each study has one or more series of images or other content.", 0, java.lang.Integer.MAX_VALUE, series)); @@ -2962,8 +2901,7 @@ public class ImagingStudy extends DomainResource { case -1043544226: /*numberOfInstances*/ return new Property("numberOfInstances", "unsignedInt", "Number of SOP Instances in Study. This value given may be larger than the number of instance elements this resource contains due to resource availability, security, or other factors. This element should be present if any instance elements are present.", 0, 1, numberOfInstances); case -1095204141: /*procedure*/ return new Property("procedure", "", "The procedure or code from which this ImagingStudy was part of.", 0, java.lang.Integer.MAX_VALUE, procedure); case 1901043637: /*location*/ return new Property("location", "Reference(Location)", "The principal physical location where the ImagingStudy was performed.", 0, 1, location); - case 722137681: /*reasonCode*/ return new Property("reasonCode", "CodeableConcept", "Description of clinical condition indicating why the ImagingStudy was requested.", 0, java.lang.Integer.MAX_VALUE, reasonCode); - case -1146218137: /*reasonReference*/ return new Property("reasonReference", "Reference(Condition|Observation|DiagnosticReport|DocumentReference)", "Indicates another resource whose existence justifies this Study.", 0, java.lang.Integer.MAX_VALUE, reasonReference); + case -934964668: /*reason*/ return new Property("reason", "CodeableReference(Condition|Observation|DiagnosticReport|DocumentReference)", "Description of clinical condition indicating why the ImagingStudy was requested, and/or Indicates another resource whose existence justifies this Study.", 0, java.lang.Integer.MAX_VALUE, reason); case 3387378: /*note*/ return new Property("note", "Annotation", "Per the recommended DICOM mapping, this element is derived from the Study Description attribute (0008,1030). Observations or findings about the imaging study should be recorded in another resource, e.g. Observation, and not in this element.", 0, java.lang.Integer.MAX_VALUE, note); case -1724546052: /*description*/ return new Property("description", "string", "The Imaging Manager description of the study. Institution-generated description or classification of the Study (component) performed.", 0, 1, description); case -905838985: /*series*/ return new Property("series", "", "Each study has one or more series of images or other content.", 0, java.lang.Integer.MAX_VALUE, series); @@ -2989,8 +2927,7 @@ public class ImagingStudy extends DomainResource { case -1043544226: /*numberOfInstances*/ return this.numberOfInstances == null ? new Base[0] : new Base[] {this.numberOfInstances}; // UnsignedIntType case -1095204141: /*procedure*/ return this.procedure == null ? new Base[0] : this.procedure.toArray(new Base[this.procedure.size()]); // ImagingStudyProcedureComponent case 1901043637: /*location*/ return this.location == null ? new Base[0] : new Base[] {this.location}; // Reference - case 722137681: /*reasonCode*/ return this.reasonCode == null ? new Base[0] : this.reasonCode.toArray(new Base[this.reasonCode.size()]); // CodeableConcept - case -1146218137: /*reasonReference*/ return this.reasonReference == null ? new Base[0] : this.reasonReference.toArray(new Base[this.reasonReference.size()]); // Reference + case -934964668: /*reason*/ return this.reason == null ? new Base[0] : this.reason.toArray(new Base[this.reason.size()]); // CodeableReference case 3387378: /*note*/ return this.note == null ? new Base[0] : this.note.toArray(new Base[this.note.size()]); // Annotation case -1724546052: /*description*/ return this.description == null ? new Base[0] : new Base[] {this.description}; // StringType case -905838985: /*series*/ return this.series == null ? new Base[0] : this.series.toArray(new Base[this.series.size()]); // ImagingStudySeriesComponent @@ -3045,11 +2982,8 @@ public class ImagingStudy extends DomainResource { case 1901043637: // location this.location = TypeConvertor.castToReference(value); // Reference return value; - case 722137681: // reasonCode - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept - return value; - case -1146218137: // reasonReference - this.getReasonReference().add(TypeConvertor.castToReference(value)); // Reference + case -934964668: // reason + this.getReason().add(TypeConvertor.castToCodeableReference(value)); // CodeableReference return value; case 3387378: // note this.getNote().add(TypeConvertor.castToAnnotation(value)); // Annotation @@ -3096,10 +3030,8 @@ public class ImagingStudy extends DomainResource { this.getProcedure().add((ImagingStudyProcedureComponent) value); } else if (name.equals("location")) { this.location = TypeConvertor.castToReference(value); // Reference - } else if (name.equals("reasonCode")) { - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); - } else if (name.equals("reasonReference")) { - this.getReasonReference().add(TypeConvertor.castToReference(value)); + } else if (name.equals("reason")) { + this.getReason().add(TypeConvertor.castToCodeableReference(value)); } else if (name.equals("note")) { this.getNote().add(TypeConvertor.castToAnnotation(value)); } else if (name.equals("description")) { @@ -3128,8 +3060,7 @@ public class ImagingStudy extends DomainResource { case -1043544226: return getNumberOfInstancesElement(); case -1095204141: return addProcedure(); case 1901043637: return getLocation(); - case 722137681: return addReasonCode(); - case -1146218137: return addReasonReference(); + case -934964668: return addReason(); case 3387378: return addNote(); case -1724546052: return getDescriptionElement(); case -905838985: return addSeries(); @@ -3155,8 +3086,7 @@ public class ImagingStudy extends DomainResource { case -1043544226: /*numberOfInstances*/ return new String[] {"unsignedInt"}; case -1095204141: /*procedure*/ return new String[] {}; case 1901043637: /*location*/ return new String[] {"Reference"}; - case 722137681: /*reasonCode*/ return new String[] {"CodeableConcept"}; - case -1146218137: /*reasonReference*/ return new String[] {"Reference"}; + case -934964668: /*reason*/ return new String[] {"CodeableReference"}; case 3387378: /*note*/ return new String[] {"Annotation"}; case -1724546052: /*description*/ return new String[] {"string"}; case -905838985: /*series*/ return new String[] {}; @@ -3213,11 +3143,8 @@ public class ImagingStudy extends DomainResource { this.location = new Reference(); return this.location; } - else if (name.equals("reasonCode")) { - return addReasonCode(); - } - else if (name.equals("reasonReference")) { - return addReasonReference(); + else if (name.equals("reason")) { + return addReason(); } else if (name.equals("note")) { return addNote(); @@ -3283,15 +3210,10 @@ public class ImagingStudy extends DomainResource { dst.procedure.add(i.copy()); }; dst.location = location == null ? null : location.copy(); - if (reasonCode != null) { - dst.reasonCode = new ArrayList(); - for (CodeableConcept i : reasonCode) - dst.reasonCode.add(i.copy()); - }; - if (reasonReference != null) { - dst.reasonReference = new ArrayList(); - for (Reference i : reasonReference) - dst.reasonReference.add(i.copy()); + if (reason != null) { + dst.reason = new ArrayList(); + for (CodeableReference i : reason) + dst.reason.add(i.copy()); }; if (note != null) { dst.note = new ArrayList(); @@ -3322,9 +3244,8 @@ public class ImagingStudy extends DomainResource { && compareDeep(basedOn, o.basedOn, true) && compareDeep(referrer, o.referrer, true) && compareDeep(interpreter, o.interpreter, true) && compareDeep(endpoint, o.endpoint, true) && compareDeep(numberOfSeries, o.numberOfSeries, true) && compareDeep(numberOfInstances, o.numberOfInstances, true) && compareDeep(procedure, o.procedure, true) - && compareDeep(location, o.location, true) && compareDeep(reasonCode, o.reasonCode, true) && compareDeep(reasonReference, o.reasonReference, true) - && compareDeep(note, o.note, true) && compareDeep(description, o.description, true) && compareDeep(series, o.series, true) - ; + && compareDeep(location, o.location, true) && compareDeep(reason, o.reason, true) && compareDeep(note, o.note, true) + && compareDeep(description, o.description, true) && compareDeep(series, o.series, true); } @Override @@ -3342,8 +3263,7 @@ public class ImagingStudy extends DomainResource { public boolean isEmpty() { return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, status, modality , subject, encounter, started, basedOn, referrer, interpreter, endpoint, numberOfSeries - , numberOfInstances, procedure, location, reasonCode, reasonReference, note, description - , series); + , numberOfInstances, procedure, location, reason, note, description, series); } @Override @@ -3566,17 +3486,17 @@ public class ImagingStudy extends DomainResource { *

* Description: The reason for the study
* Type: token
- * Path: ImagingStudy.reasonCode
+ * Path: null
*

*/ - @SearchParamDefinition(name="reason", path="ImagingStudy.reasonCode", description="The reason for the study", type="token" ) + @SearchParamDefinition(name="reason", path="", description="The reason for the study", type="token" ) public static final String SP_REASON = "reason"; /** * Fluent Client search parameter constant for reason *

* Description: The reason for the study
* Type: token
- * Path: ImagingStudy.reasonCode
+ * Path: null
*

*/ public static final ca.uhn.fhir.rest.gclient.TokenClientParam REASON = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_REASON); 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 06314076b..aa4e12811 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; @@ -1694,31 +1694,24 @@ public class Immunization extends DomainResource { protected List note; /** - * Describes why the immunization occurred in coded or textual form. + * 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 = "reasonCode", type = {CodeableConcept.class}, order=19, 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." ) + @Child(name = "reason", type = {CodeableReference.class}, order=19, 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 reasonCode; - - /** - * Indicates another resource (Condition, Observation or DiagnosticReport) whose existence justifies this immunization. - */ - @Child(name = "reasonReference", type = {Condition.class, Observation.class, DiagnosticReport.class}, order=20, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Why immunization occurred", formalDefinition="Indicates another resource (Condition, Observation or DiagnosticReport) whose existence justifies this immunization." ) - protected List reasonReference; + protected List reason; /** * 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=21, min=0, max=1, modifier=true, summary=true) + @Child(name = "isSubpotent", type = {BooleanType.class}, order=20, 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=22, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "subpotentReason", type = {CodeableConcept.class}, order=21, 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; @@ -1726,14 +1719,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=23, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "education", type = {}, order=22, 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=24, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "programEligibility", type = {CodeableConcept.class}, order=23, 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; @@ -1741,7 +1734,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=25, min=0, max=1, modifier=false, summary=false) + @Child(name = "fundingSource", type = {CodeableConcept.class}, order=24, 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; @@ -1749,18 +1742,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=26, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "reaction", type = {}, order=25, 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=27, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "protocolApplied", type = {}, order=26, 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 = -1668213637L; + private static final long serialVersionUID = -1125457837L; /** * Constructor @@ -2495,109 +2488,56 @@ public class Immunization extends DomainResource { } /** - * @return {@link #reasonCode} (Describes why the immunization occurred in coded or textual form.) + * @return {@link #reason} (Describes why the immunization occurred in coded or textual form, or Indicates another resource (Condition, Observation or DiagnosticReport) whose existence justifies this immunization.) */ - public List getReasonCode() { - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - return this.reasonCode; + public List getReason() { + if (this.reason == null) + this.reason = new ArrayList(); + return this.reason; } /** * @return Returns a reference to this for easy method chaining */ - public Immunization setReasonCode(List theReasonCode) { - this.reasonCode = theReasonCode; + public Immunization setReason(List theReason) { + this.reason = theReason; return this; } - public boolean hasReasonCode() { - if (this.reasonCode == null) + public boolean hasReason() { + if (this.reason == null) return false; - for (CodeableConcept item : this.reasonCode) + for (CodeableReference item : this.reason) if (!item.isEmpty()) return true; return false; } - public CodeableConcept addReasonCode() { //3 - CodeableConcept t = new CodeableConcept(); - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); + public CodeableReference addReason() { //3 + CodeableReference t = new CodeableReference(); + if (this.reason == null) + this.reason = new ArrayList(); + this.reason.add(t); return t; } - public Immunization addReasonCode(CodeableConcept t) { //3 + public Immunization addReason(CodeableReference t) { //3 if (t == null) return this; - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); + if (this.reason == null) + this.reason = new ArrayList(); + this.reason.add(t); return this; } /** - * @return The first repetition of repeating field {@link #reasonCode}, creating it if it does not already exist {3} + * @return The first repetition of repeating field {@link #reason}, creating it if it does not already exist {3} */ - public CodeableConcept getReasonCodeFirstRep() { - if (getReasonCode().isEmpty()) { - addReasonCode(); + public CodeableReference getReasonFirstRep() { + if (getReason().isEmpty()) { + addReason(); } - return getReasonCode().get(0); - } - - /** - * @return {@link #reasonReference} (Indicates another resource (Condition, Observation or DiagnosticReport) whose existence justifies this immunization.) - */ - public List getReasonReference() { - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - return this.reasonReference; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public Immunization setReasonReference(List theReasonReference) { - this.reasonReference = theReasonReference; - return this; - } - - public boolean hasReasonReference() { - if (this.reasonReference == null) - return false; - for (Reference item : this.reasonReference) - if (!item.isEmpty()) - return true; - return false; - } - - public Reference addReasonReference() { //3 - Reference t = new Reference(); - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return t; - } - - public Immunization addReasonReference(Reference t) { //3 - if (t == null) - return this; - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #reasonReference}, creating it if it does not already exist {3} - */ - public Reference getReasonReferenceFirstRep() { - if (getReasonReference().isEmpty()) { - addReasonReference(); - } - return getReasonReference().get(0); + return getReason().get(0); } /** @@ -2955,8 +2895,7 @@ public class Immunization extends DomainResource { children.add(new Property("doseQuantity", "Quantity", "The quantity of vaccine product that was administered.", 0, 1, doseQuantity)); children.add(new Property("performer", "", "Indicates who performed the immunization event.", 0, java.lang.Integer.MAX_VALUE, performer)); children.add(new Property("note", "Annotation", "Extra information about the immunization that is not conveyed by the other attributes.", 0, java.lang.Integer.MAX_VALUE, note)); - children.add(new Property("reasonCode", "CodeableConcept", "Describes why the immunization occurred in coded or textual form.", 0, java.lang.Integer.MAX_VALUE, reasonCode)); - children.add(new Property("reasonReference", "Reference(Condition|Observation|DiagnosticReport)", "Indicates another resource (Condition, Observation or DiagnosticReport) whose existence justifies this immunization.", 0, java.lang.Integer.MAX_VALUE, reasonReference)); + children.add(new Property("reason", "CodeableReference(Condition|Observation|DiagnosticReport)", "Describes why the immunization occurred in coded or textual form, or Indicates another resource (Condition, Observation or DiagnosticReport) whose existence justifies this immunization.", 0, java.lang.Integer.MAX_VALUE, reason)); children.add(new Property("isSubpotent", "boolean", "Indication if a dose is considered to be subpotent. By default, a dose should be considered to be potent.", 0, 1, isSubpotent)); children.add(new Property("subpotentReason", "CodeableConcept", "Reason why a dose is considered to be subpotent.", 0, java.lang.Integer.MAX_VALUE, subpotentReason)); children.add(new Property("education", "", "Educational material presented to the patient (or guardian) at the time of vaccine administration.", 0, java.lang.Integer.MAX_VALUE, education)); @@ -2994,8 +2933,7 @@ public class Immunization extends DomainResource { case -2083618872: /*doseQuantity*/ return new Property("doseQuantity", "Quantity", "The quantity of vaccine product that was administered.", 0, 1, doseQuantity); case 481140686: /*performer*/ return new Property("performer", "", "Indicates who performed the immunization event.", 0, java.lang.Integer.MAX_VALUE, performer); case 3387378: /*note*/ return new Property("note", "Annotation", "Extra information about the immunization that is not conveyed by the other attributes.", 0, java.lang.Integer.MAX_VALUE, note); - case 722137681: /*reasonCode*/ return new Property("reasonCode", "CodeableConcept", "Describes why the immunization occurred in coded or textual form.", 0, java.lang.Integer.MAX_VALUE, reasonCode); - case -1146218137: /*reasonReference*/ return new Property("reasonReference", "Reference(Condition|Observation|DiagnosticReport)", "Indicates another resource (Condition, Observation or DiagnosticReport) whose existence justifies this immunization.", 0, java.lang.Integer.MAX_VALUE, reasonReference); + case -934964668: /*reason*/ return new Property("reason", "CodeableReference(Condition|Observation|DiagnosticReport)", "Describes why the immunization occurred in coded or textual form, or Indicates another resource (Condition, Observation or DiagnosticReport) whose existence justifies this immunization.", 0, java.lang.Integer.MAX_VALUE, reason); case 1618512556: /*isSubpotent*/ return new Property("isSubpotent", "boolean", "Indication if a dose is considered to be subpotent. By default, a dose should be considered to be potent.", 0, 1, isSubpotent); case 805168794: /*subpotentReason*/ return new Property("subpotentReason", "CodeableConcept", "Reason why a dose is considered to be subpotent.", 0, java.lang.Integer.MAX_VALUE, subpotentReason); case -290756696: /*education*/ return new Property("education", "", "Educational material presented to the patient (or guardian) at the time of vaccine administration.", 0, java.lang.Integer.MAX_VALUE, education); @@ -3030,8 +2968,7 @@ public class Immunization extends DomainResource { case -2083618872: /*doseQuantity*/ return this.doseQuantity == null ? new Base[0] : new Base[] {this.doseQuantity}; // Quantity case 481140686: /*performer*/ return this.performer == null ? new Base[0] : this.performer.toArray(new Base[this.performer.size()]); // ImmunizationPerformerComponent case 3387378: /*note*/ return this.note == null ? new Base[0] : this.note.toArray(new Base[this.note.size()]); // Annotation - case 722137681: /*reasonCode*/ return this.reasonCode == null ? new Base[0] : this.reasonCode.toArray(new Base[this.reasonCode.size()]); // CodeableConcept - case -1146218137: /*reasonReference*/ return this.reasonReference == null ? new Base[0] : this.reasonReference.toArray(new Base[this.reasonReference.size()]); // Reference + case -934964668: /*reason*/ return this.reason == null ? new Base[0] : this.reason.toArray(new Base[this.reason.size()]); // CodeableReference case 1618512556: /*isSubpotent*/ return this.isSubpotent == null ? new Base[0] : new Base[] {this.isSubpotent}; // BooleanType case 805168794: /*subpotentReason*/ return this.subpotentReason == null ? new Base[0] : this.subpotentReason.toArray(new Base[this.subpotentReason.size()]); // CodeableConcept case -290756696: /*education*/ return this.education == null ? new Base[0] : this.education.toArray(new Base[this.education.size()]); // ImmunizationEducationComponent @@ -3105,11 +3042,8 @@ public class Immunization extends DomainResource { case 3387378: // note this.getNote().add(TypeConvertor.castToAnnotation(value)); // Annotation return value; - case 722137681: // reasonCode - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept - return value; - case -1146218137: // reasonReference - this.getReasonReference().add(TypeConvertor.castToReference(value)); // Reference + case -934964668: // reason + this.getReason().add(TypeConvertor.castToCodeableReference(value)); // CodeableReference return value; case 1618512556: // isSubpotent this.isSubpotent = TypeConvertor.castToBoolean(value); // BooleanType @@ -3178,10 +3112,8 @@ public class Immunization extends DomainResource { this.getPerformer().add((ImmunizationPerformerComponent) value); } else if (name.equals("note")) { this.getNote().add(TypeConvertor.castToAnnotation(value)); - } else if (name.equals("reasonCode")) { - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); - } else if (name.equals("reasonReference")) { - this.getReasonReference().add(TypeConvertor.castToReference(value)); + } else if (name.equals("reason")) { + this.getReason().add(TypeConvertor.castToCodeableReference(value)); } else if (name.equals("isSubpotent")) { this.isSubpotent = TypeConvertor.castToBoolean(value); // BooleanType } else if (name.equals("subpotentReason")) { @@ -3225,8 +3157,7 @@ public class Immunization extends DomainResource { case -2083618872: return getDoseQuantity(); case 481140686: return addPerformer(); case 3387378: return addNote(); - case 722137681: return addReasonCode(); - case -1146218137: return addReasonReference(); + case -934964668: return addReason(); case 1618512556: return getIsSubpotentElement(); case 805168794: return addSubpotentReason(); case -290756696: return addEducation(); @@ -3261,8 +3192,7 @@ public class Immunization extends DomainResource { case -2083618872: /*doseQuantity*/ return new String[] {"Quantity"}; case 481140686: /*performer*/ return new String[] {}; case 3387378: /*note*/ return new String[] {"Annotation"}; - case 722137681: /*reasonCode*/ return new String[] {"CodeableConcept"}; - case -1146218137: /*reasonReference*/ return new String[] {"Reference"}; + case -934964668: /*reason*/ return new String[] {"CodeableReference"}; case 1618512556: /*isSubpotent*/ return new String[] {"boolean"}; case 805168794: /*subpotentReason*/ return new String[] {"CodeableConcept"}; case -290756696: /*education*/ return new String[] {}; @@ -3353,11 +3283,8 @@ public class Immunization extends DomainResource { else if (name.equals("note")) { return addNote(); } - else if (name.equals("reasonCode")) { - return addReasonCode(); - } - else if (name.equals("reasonReference")) { - return addReasonReference(); + else if (name.equals("reason")) { + return addReason(); } else if (name.equals("isSubpotent")) { throw new FHIRException("Cannot call addChild on a primitive type Immunization.isSubpotent"); @@ -3429,15 +3356,10 @@ public class Immunization extends DomainResource { for (Annotation i : note) dst.note.add(i.copy()); }; - if (reasonCode != null) { - dst.reasonCode = new ArrayList(); - for (CodeableConcept i : reasonCode) - dst.reasonCode.add(i.copy()); - }; - if (reasonReference != null) { - dst.reasonReference = new ArrayList(); - for (Reference i : reasonReference) - dst.reasonReference.add(i.copy()); + if (reason != null) { + dst.reason = new ArrayList(); + for (CodeableReference i : reason) + dst.reason.add(i.copy()); }; dst.isSubpotent = isSubpotent == null ? null : isSubpotent.copy(); if (subpotentReason != null) { @@ -3486,11 +3408,11 @@ public class Immunization extends DomainResource { && 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(doseQuantity, o.doseQuantity, true) && compareDeep(performer, o.performer, true) - && compareDeep(note, o.note, true) && compareDeep(reasonCode, o.reasonCode, true) && compareDeep(reasonReference, o.reasonReference, true) - && compareDeep(isSubpotent, o.isSubpotent, true) && compareDeep(subpotentReason, o.subpotentReason, true) - && compareDeep(education, o.education, true) && compareDeep(programEligibility, o.programEligibility, true) - && compareDeep(fundingSource, o.fundingSource, true) && compareDeep(reaction, o.reaction, true) - && compareDeep(protocolApplied, o.protocolApplied, 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) + && compareDeep(programEligibility, o.programEligibility, true) && compareDeep(fundingSource, o.fundingSource, true) + && compareDeep(reaction, o.reaction, true) && compareDeep(protocolApplied, o.protocolApplied, true) + ; } @Override @@ -3509,8 +3431,8 @@ public class Immunization extends DomainResource { 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, reasonCode, reasonReference, isSubpotent, subpotentReason, education - , programEligibility, fundingSource, reaction, protocolApplied); + , performer, note, reason, isSubpotent, subpotentReason, education, programEligibility + , fundingSource, reaction, protocolApplied); } @Override @@ -3667,17 +3589,17 @@ public class Immunization extends DomainResource { *

* Description: Reason why the vaccine was administered
* Type: token
- * Path: Immunization.reasonCode
+ * Path: Immunization.reason.concept
*

*/ - @SearchParamDefinition(name="reason-code", path="Immunization.reasonCode", description="Reason why the vaccine was administered", type="token" ) + @SearchParamDefinition(name="reason-code", path="Immunization.reason.concept", description="Reason why the vaccine was administered", type="token" ) public static final String SP_REASON_CODE = "reason-code"; /** * Fluent Client search parameter constant for reason-code *

* Description: Reason why the vaccine was administered
* Type: token
- * Path: Immunization.reasonCode
+ * Path: Immunization.reason.concept
*

*/ public static final ca.uhn.fhir.rest.gclient.TokenClientParam REASON_CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_REASON_CODE); @@ -3685,19 +3607,19 @@ public class Immunization extends DomainResource { /** * Search parameter: reason-reference *

- * Description: Why immunization occurred
+ * Description: Reference to a resource (by instance)
* Type: reference
- * Path: Immunization.reasonReference
+ * Path: Immunization.reason.reference
*

*/ - @SearchParamDefinition(name="reason-reference", path="Immunization.reasonReference", description="Why immunization occurred", type="reference", target={Condition.class, DiagnosticReport.class, Observation.class } ) + @SearchParamDefinition(name="reason-reference", path="Immunization.reason.reference", description="Reference to a resource (by instance)", type="reference" ) public static final String SP_REASON_REFERENCE = "reason-reference"; /** * Fluent Client search parameter constant for reason-reference *

- * Description: Why immunization occurred
+ * Description: Reference to a resource (by instance)
* Type: reference
- * Path: Immunization.reasonReference
+ * Path: Immunization.reason.reference
*

*/ public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam REASON_REFERENCE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_REASON_REFERENCE); 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 fb3fa4ee9..a207558c2 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 ec67c5047..e6dcb4802 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 9630b10d6..eed773beb 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; @@ -6394,10 +6394,10 @@ public class ImplementationGuide extends CanonicalResource { protected ImplementationGuideDefinitionPageComponent page; /** - * Defines how IG is built by tools. + * A set of parameters that defines how the implementation guide is built. The parameters are defined by the relevant tools that build the implementation guides. */ @Child(name = "parameter", type = {}, order=4, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Defines how IG is built by tools", formalDefinition="Defines how IG is built by tools." ) + @Description(shortDefinition="Defines how IG is built by tools", formalDefinition="A set of parameters that defines how the implementation guide is built. The parameters are defined by the relevant tools that build the implementation guides." ) protected List parameter; /** @@ -6555,7 +6555,7 @@ public class ImplementationGuide extends CanonicalResource { } /** - * @return {@link #parameter} (Defines how IG is built by tools.) + * @return {@link #parameter} (A set of parameters that defines how the implementation guide is built. The parameters are defined by the relevant tools that build the implementation guides.) */ public List getParameter() { if (this.parameter == null) @@ -6665,7 +6665,7 @@ public class ImplementationGuide extends CanonicalResource { children.add(new Property("grouping", "", "A logical group of resources. Logical groups can be used when building pages.", 0, java.lang.Integer.MAX_VALUE, grouping)); children.add(new Property("resource", "", "A resource that is part of the implementation guide. Conformance resources (value set, structure definition, capability statements etc.) are obvious candidates for inclusion, but any kind of resource can be included as an example resource.", 0, java.lang.Integer.MAX_VALUE, resource)); children.add(new Property("page", "", "A page / section in the implementation guide. The root page is the implementation guide home page.", 0, 1, page)); - children.add(new Property("parameter", "", "Defines how IG is built by tools.", 0, java.lang.Integer.MAX_VALUE, parameter)); + children.add(new Property("parameter", "", "A set of parameters that defines how the implementation guide is built. The parameters are defined by the relevant tools that build the implementation guides.", 0, java.lang.Integer.MAX_VALUE, parameter)); children.add(new Property("template", "", "A template for building resources.", 0, java.lang.Integer.MAX_VALUE, template)); } @@ -6675,7 +6675,7 @@ public class ImplementationGuide extends CanonicalResource { case 506371331: /*grouping*/ return new Property("grouping", "", "A logical group of resources. Logical groups can be used when building pages.", 0, java.lang.Integer.MAX_VALUE, grouping); case -341064690: /*resource*/ return new Property("resource", "", "A resource that is part of the implementation guide. Conformance resources (value set, structure definition, capability statements etc.) are obvious candidates for inclusion, but any kind of resource can be included as an example resource.", 0, java.lang.Integer.MAX_VALUE, resource); case 3433103: /*page*/ return new Property("page", "", "A page / section in the implementation guide. The root page is the implementation guide home page.", 0, 1, page); - case 1954460585: /*parameter*/ return new Property("parameter", "", "Defines how IG is built by tools.", 0, java.lang.Integer.MAX_VALUE, parameter); + case 1954460585: /*parameter*/ return new Property("parameter", "", "A set of parameters that defines how the implementation guide is built. The parameters are defined by the relevant tools that build the implementation guides.", 0, java.lang.Integer.MAX_VALUE, parameter); case -1321546630: /*template*/ return new Property("template", "", "A template for building resources.", 0, java.lang.Integer.MAX_VALUE, template); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -8070,10 +8070,10 @@ public class ImplementationGuide extends CanonicalResource { @Block() public static class ImplementationGuideDefinitionParameterComponent extends BackboneElement implements IBaseBackboneElement { /** - * apply | path-resource | path-pages | path-tx-cache | expansion-parameter | rule-broken-links | generate-xml | generate-json | generate-turtle | html-template. + * Code that identifies parameter. */ @Child(name = "code", type = {StringType.class}, order=1, min=1, max=1, modifier=false, summary=false) - @Description(shortDefinition="apply | path-resource | path-pages | path-tx-cache | expansion-parameter | rule-broken-links | generate-xml | generate-json | generate-turtle | html-template", formalDefinition="apply | path-resource | path-pages | path-tx-cache | expansion-parameter | rule-broken-links | generate-xml | generate-json | generate-turtle | html-template." ) + @Description(shortDefinition="Code that identifies parameter", formalDefinition="Code that identifies parameter." ) protected StringType code; /** @@ -8102,7 +8102,7 @@ public class ImplementationGuide extends CanonicalResource { } /** - * @return {@link #code} (apply | path-resource | path-pages | path-tx-cache | expansion-parameter | rule-broken-links | generate-xml | generate-json | generate-turtle | html-template.). This is the underlying object with id, value and extensions. The accessor "getCode" gives direct access to the value + * @return {@link #code} (Code that identifies parameter.). This is the underlying object with id, value and extensions. The accessor "getCode" gives direct access to the value */ public StringType getCodeElement() { if (this.code == null) @@ -8122,7 +8122,7 @@ public class ImplementationGuide extends CanonicalResource { } /** - * @param value {@link #code} (apply | path-resource | path-pages | path-tx-cache | expansion-parameter | rule-broken-links | generate-xml | generate-json | generate-turtle | html-template.). This is the underlying object with id, value and extensions. The accessor "getCode" gives direct access to the value + * @param value {@link #code} (Code that identifies parameter.). This is the underlying object with id, value and extensions. The accessor "getCode" gives direct access to the value */ public ImplementationGuideDefinitionParameterComponent setCodeElement(StringType value) { this.code = value; @@ -8130,14 +8130,14 @@ public class ImplementationGuide extends CanonicalResource { } /** - * @return apply | path-resource | path-pages | path-tx-cache | expansion-parameter | rule-broken-links | generate-xml | generate-json | generate-turtle | html-template. + * @return Code that identifies parameter. */ public String getCode() { return this.code == null ? null : this.code.getValue(); } /** - * @param value apply | path-resource | path-pages | path-tx-cache | expansion-parameter | rule-broken-links | generate-xml | generate-json | generate-turtle | html-template. + * @param value Code that identifies parameter. */ public ImplementationGuideDefinitionParameterComponent setCode(String value) { if (this.code == null) @@ -8193,14 +8193,14 @@ public class ImplementationGuide extends CanonicalResource { protected void listChildren(List children) { super.listChildren(children); - children.add(new Property("code", "string", "apply | path-resource | path-pages | path-tx-cache | expansion-parameter | rule-broken-links | generate-xml | generate-json | generate-turtle | html-template.", 0, 1, code)); + children.add(new Property("code", "string", "Code that identifies parameter.", 0, 1, code)); children.add(new Property("value", "string", "Value for named type.", 0, 1, value)); } @Override public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { switch (_hash) { - case 3059181: /*code*/ return new Property("code", "string", "apply | path-resource | path-pages | path-tx-cache | expansion-parameter | rule-broken-links | generate-xml | generate-json | generate-turtle | html-template.", 0, 1, code); + case 3059181: /*code*/ return new Property("code", "string", "Code that identifies parameter.", 0, 1, code); case 111972721: /*value*/ return new Property("value", "string", "Value for named type.", 0, 1, value); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -9927,10 +9927,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.1.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.2.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.1.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.2.0. for this version." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/FHIR-version") protected List> fhirVersion; @@ -10711,7 +10711,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.1.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.2.0. for this version.) */ public List> getFhirVersion() { if (this.fhirVersion == null) @@ -10737,7 +10737,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.1.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.2.0. for this version.) */ public Enumeration addFhirVersionElement() {//2 Enumeration t = new Enumeration(new FHIRVersionEnumFactory()); @@ -10748,7 +10748,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.1.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.2.0. for this version.) */ public ImplementationGuide addFhirVersion(FHIRVersion value) { //1 Enumeration t = new Enumeration(new FHIRVersionEnumFactory()); @@ -10760,7 +10760,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.1.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.2.0. for this version.) */ public boolean hasFhirVersion(FHIRVersion value) { if (this.fhirVersion == null) @@ -11013,7 +11013,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.1.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.2.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)); @@ -11038,7 +11038,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.1.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.2.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); 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 6788130e8..389f60d97 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 d3bf8c044..d4b29df40 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 15d2b3d57..21f926cd3 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 b64a92b36..89e1d124a 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 279f13d94..5c72c753b 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 0591d858b..931ff74af 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 d5c4097c6..265fe2eff 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 8d07e76d1..e878ffd5f 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 83533f99f..c7b422c61 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 3ccd0947e..d3f4bb28a 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 e997cb07d..605619ba4 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 33f26e395..ef89928f0 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; @@ -198,10 +198,10 @@ public class Medication extends DomainResource { protected BooleanType isActive; /** - * Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet. + * Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet but can also be expressed a quantity when the denominator is assumed to be 1 tablet. */ - @Child(name = "strength", type = {Ratio.class, CodeableConcept.class}, order=3, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Quantity of ingredient present", formalDefinition="Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet." ) + @Child(name = "strength", type = {Ratio.class, CodeableConcept.class, Quantity.class}, order=3, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="Quantity of ingredient present", formalDefinition="Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet but can also be expressed a quantity when the denominator is assumed to be 1 tablet." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/medication-ingredientstrength") protected DataType strength; @@ -319,14 +319,14 @@ public class Medication extends DomainResource { } /** - * @return {@link #strength} (Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet.) + * @return {@link #strength} (Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet but can also be expressed a quantity when the denominator is assumed to be 1 tablet.) */ public DataType getStrength() { return this.strength; } /** - * @return {@link #strength} (Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet.) + * @return {@link #strength} (Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet but can also be expressed a quantity when the denominator is assumed to be 1 tablet.) */ public Ratio getStrengthRatio() throws FHIRException { if (this.strength == null) @@ -341,7 +341,7 @@ public class Medication extends DomainResource { } /** - * @return {@link #strength} (Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet.) + * @return {@link #strength} (Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet but can also be expressed a quantity when the denominator is assumed to be 1 tablet.) */ public CodeableConcept getStrengthCodeableConcept() throws FHIRException { if (this.strength == null) @@ -355,15 +355,30 @@ public class Medication extends DomainResource { return this != null && this.strength instanceof CodeableConcept; } + /** + * @return {@link #strength} (Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet but can also be expressed a quantity when the denominator is assumed to be 1 tablet.) + */ + public Quantity getStrengthQuantity() throws FHIRException { + if (this.strength == null) + this.strength = new Quantity(); + if (!(this.strength instanceof Quantity)) + throw new FHIRException("Type mismatch: the type Quantity was expected, but "+this.strength.getClass().getName()+" was encountered"); + return (Quantity) this.strength; + } + + public boolean hasStrengthQuantity() { + return this != null && this.strength instanceof Quantity; + } + public boolean hasStrength() { return this.strength != null && !this.strength.isEmpty(); } /** - * @param value {@link #strength} (Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet.) + * @param value {@link #strength} (Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet but can also be expressed a quantity when the denominator is assumed to be 1 tablet.) */ public MedicationIngredientComponent setStrength(DataType value) { - if (value != null && !(value instanceof Ratio || value instanceof CodeableConcept)) + if (value != null && !(value instanceof Ratio || value instanceof CodeableConcept || value instanceof Quantity)) throw new Error("Not the right type for Medication.ingredient.strength[x]: "+value.fhirType()); this.strength = value; return this; @@ -373,7 +388,7 @@ public class Medication extends DomainResource { super.listChildren(children); children.add(new Property("item[x]", "CodeableConcept|Reference(Substance|Medication)", "The ingredient (substance or medication) that the ingredient.strength relates to. This is represented as a concept from a code system or described in another resource (Substance or Medication).", 0, 1, item)); children.add(new Property("isActive", "boolean", "Indication of whether this ingredient affects the therapeutic action of the drug.", 0, 1, isActive)); - children.add(new Property("strength[x]", "Ratio|CodeableConcept", "Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet.", 0, 1, strength)); + children.add(new Property("strength[x]", "Ratio|CodeableConcept|Quantity", "Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet but can also be expressed a quantity when the denominator is assumed to be 1 tablet.", 0, 1, strength)); } @Override @@ -384,10 +399,11 @@ public class Medication extends DomainResource { case 106644494: /*itemCodeableConcept*/ return new Property("item[x]", "CodeableConcept", "The ingredient (substance or medication) that the ingredient.strength relates to. This is represented as a concept from a code system or described in another resource (Substance or Medication).", 0, 1, item); case 1376364920: /*itemReference*/ return new Property("item[x]", "Reference(Substance|Medication)", "The ingredient (substance or medication) that the ingredient.strength relates to. This is represented as a concept from a code system or described in another resource (Substance or Medication).", 0, 1, item); case -748916528: /*isActive*/ return new Property("isActive", "boolean", "Indication of whether this ingredient affects the therapeutic action of the drug.", 0, 1, isActive); - case 127377567: /*strength[x]*/ return new Property("strength[x]", "Ratio|CodeableConcept", "Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet.", 0, 1, strength); - case 1791316033: /*strength*/ return new Property("strength[x]", "Ratio|CodeableConcept", "Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet.", 0, 1, strength); - case 2141786186: /*strengthRatio*/ return new Property("strength[x]", "Ratio", "Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet.", 0, 1, strength); - case -1455903456: /*strengthCodeableConcept*/ return new Property("strength[x]", "CodeableConcept", "Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet.", 0, 1, strength); + case 127377567: /*strength[x]*/ return new Property("strength[x]", "Ratio|CodeableConcept|Quantity", "Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet but can also be expressed a quantity when the denominator is assumed to be 1 tablet.", 0, 1, strength); + case 1791316033: /*strength*/ return new Property("strength[x]", "Ratio|CodeableConcept|Quantity", "Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet but can also be expressed a quantity when the denominator is assumed to be 1 tablet.", 0, 1, strength); + case 2141786186: /*strengthRatio*/ return new Property("strength[x]", "Ratio", "Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet but can also be expressed a quantity when the denominator is assumed to be 1 tablet.", 0, 1, strength); + case -1455903456: /*strengthCodeableConcept*/ return new Property("strength[x]", "CodeableConcept", "Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet but can also be expressed a quantity when the denominator is assumed to be 1 tablet.", 0, 1, strength); + case -1793570836: /*strengthQuantity*/ return new Property("strength[x]", "Quantity", "Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet but can also be expressed a quantity when the denominator is assumed to be 1 tablet.", 0, 1, strength); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -452,7 +468,7 @@ public class Medication extends DomainResource { switch (hash) { case 3242771: /*item*/ return new String[] {"CodeableConcept", "Reference"}; case -748916528: /*isActive*/ return new String[] {"boolean"}; - case 1791316033: /*strength*/ return new String[] {"Ratio", "CodeableConcept"}; + case 1791316033: /*strength*/ return new String[] {"Ratio", "CodeableConcept", "Quantity"}; default: return super.getTypesForProperty(hash, name); } @@ -479,6 +495,10 @@ public class Medication extends DomainResource { this.strength = new CodeableConcept(); return this.strength; } + else if (name.equals("strengthQuantity")) { + this.strength = new Quantity(); + return this.strength; + } else return super.addChild(name); } 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 34c54870a..7d5c52867 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; @@ -987,10 +987,10 @@ public class MedicationAdministration extends DomainResource { protected Reference encounter; /** - * Additional information (for example, patient height and weight) that supports the administration of the medication. + * Additional information (for example, patient height and weight) that supports the administration of the medication. This attribute can be used to provide documentation of specific characteristics of the patient present at the time of administration. For example, if the dose says "give "x" if the heartrate exceeds "y"", then the heart rate can be included using this attribute. */ @Child(name = "supportingInformation", type = {Reference.class}, order=11, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Additional information to support administration", formalDefinition="Additional information (for example, patient height and weight) that supports the administration of the medication." ) + @Description(shortDefinition="Additional information to support administration", formalDefinition="Additional information (for example, patient height and weight) that supports the administration of the medication. This attribute can be used to provide documentation of specific characteristics of the patient present at the time of administration. For example, if the dose says \"give \"x\" if the heartrate exceeds \"y\"\", then the heart rate can be included using this attribute." ) protected List supportingInformation; /** @@ -1015,56 +1015,49 @@ public class MedicationAdministration extends DomainResource { protected List performer; /** - * A code indicating why the medication was given. + * A code, Condition or observation that supports why the medication was administered. */ - @Child(name = "reasonCode", type = {CodeableConcept.class}, order=15, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Reason administration performed", formalDefinition="A code indicating why the medication was given." ) + @Child(name = "reason", type = {CodeableReference.class}, order=15, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="Concept, condition or observation that supports why the medication was administered", formalDefinition="A code, Condition or observation that supports why the medication was administered." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/reason-medication-given-codes") - protected List reasonCode; - - /** - * Condition or observation that supports why the medication was administered. - */ - @Child(name = "reasonReference", type = {Condition.class, Observation.class, DiagnosticReport.class}, order=16, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Condition or observation that supports why the medication was administered", formalDefinition="Condition or observation that supports why the medication was administered." ) - protected List reasonReference; + protected List reason; /** * The original request, instruction or authority to perform the administration. */ - @Child(name = "request", type = {MedicationRequest.class}, order=17, min=0, max=1, modifier=false, summary=false) + @Child(name = "request", type = {MedicationRequest.class}, order=16, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Request administration performed against", formalDefinition="The original request, instruction or authority to perform the administration." ) protected Reference request; /** * The device used in administering the medication to the patient. For example, a particular infusion pump. */ - @Child(name = "device", type = {Device.class}, order=18, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "device", type = {Device.class}, order=17, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Device used to administer", formalDefinition="The device used in administering the medication to the patient. For example, a particular infusion pump." ) protected List device; /** * Extra information about the medication administration that is not conveyed by the other attributes. */ - @Child(name = "note", type = {Annotation.class}, order=19, 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="Information about the administration", formalDefinition="Extra information about the medication administration that is not conveyed by the other attributes." ) protected List note; /** * Describes the medication dosage information details e.g. dose, rate, site, route, etc. */ - @Child(name = "dosage", type = {}, order=20, min=0, max=1, modifier=false, summary=false) + @Child(name = "dosage", type = {}, order=19, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Details of how medication was taken", formalDefinition="Describes the medication dosage information details e.g. dose, rate, site, route, etc." ) protected MedicationAdministrationDosageComponent dosage; /** * A summary of the events of interest that have occurred, such as when the administration was verified. */ - @Child(name = "eventHistory", type = {Provenance.class}, order=21, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "eventHistory", type = {Provenance.class}, order=20, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="A list of events of interest in the lifecycle", formalDefinition="A summary of the events of interest that have occurred, such as when the administration was verified." ) protected List eventHistory; - private static final long serialVersionUID = -1672509843L; + private static final long serialVersionUID = -854071403L; /** * Constructor @@ -1616,7 +1609,7 @@ public class MedicationAdministration extends DomainResource { } /** - * @return {@link #supportingInformation} (Additional information (for example, patient height and weight) that supports the administration of the medication.) + * @return {@link #supportingInformation} (Additional information (for example, patient height and weight) that supports the administration of the medication. This attribute can be used to provide documentation of specific characteristics of the patient present at the time of administration. For example, if the dose says "give "x" if the heartrate exceeds "y"", then the heart rate can be included using this attribute.) */ public List getSupportingInformation() { if (this.supportingInformation == null) @@ -1822,109 +1815,56 @@ public class MedicationAdministration extends DomainResource { } /** - * @return {@link #reasonCode} (A code indicating why the medication was given.) + * @return {@link #reason} (A code, Condition or observation that supports why the medication was administered.) */ - public List getReasonCode() { - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - return this.reasonCode; + public List getReason() { + if (this.reason == null) + this.reason = new ArrayList(); + return this.reason; } /** * @return Returns a reference to this for easy method chaining */ - public MedicationAdministration setReasonCode(List theReasonCode) { - this.reasonCode = theReasonCode; + public MedicationAdministration setReason(List theReason) { + this.reason = theReason; return this; } - public boolean hasReasonCode() { - if (this.reasonCode == null) + public boolean hasReason() { + if (this.reason == null) return false; - for (CodeableConcept item : this.reasonCode) + for (CodeableReference item : this.reason) if (!item.isEmpty()) return true; return false; } - public CodeableConcept addReasonCode() { //3 - CodeableConcept t = new CodeableConcept(); - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); + public CodeableReference addReason() { //3 + CodeableReference t = new CodeableReference(); + if (this.reason == null) + this.reason = new ArrayList(); + this.reason.add(t); return t; } - public MedicationAdministration addReasonCode(CodeableConcept t) { //3 + public MedicationAdministration addReason(CodeableReference t) { //3 if (t == null) return this; - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); + if (this.reason == null) + this.reason = new ArrayList(); + this.reason.add(t); return this; } /** - * @return The first repetition of repeating field {@link #reasonCode}, creating it if it does not already exist {3} + * @return The first repetition of repeating field {@link #reason}, creating it if it does not already exist {3} */ - public CodeableConcept getReasonCodeFirstRep() { - if (getReasonCode().isEmpty()) { - addReasonCode(); + public CodeableReference getReasonFirstRep() { + if (getReason().isEmpty()) { + addReason(); } - return getReasonCode().get(0); - } - - /** - * @return {@link #reasonReference} (Condition or observation that supports why the medication was administered.) - */ - public List getReasonReference() { - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - return this.reasonReference; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public MedicationAdministration setReasonReference(List theReasonReference) { - this.reasonReference = theReasonReference; - return this; - } - - public boolean hasReasonReference() { - if (this.reasonReference == null) - return false; - for (Reference item : this.reasonReference) - if (!item.isEmpty()) - return true; - return false; - } - - public Reference addReasonReference() { //3 - Reference t = new Reference(); - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return t; - } - - public MedicationAdministration addReasonReference(Reference t) { //3 - if (t == null) - return this; - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #reasonReference}, creating it if it does not already exist {3} - */ - public Reference getReasonReferenceFirstRep() { - if (getReasonReference().isEmpty()) { - addReasonReference(); - } - return getReasonReference().get(0); + return getReason().get(0); } /** @@ -2147,12 +2087,11 @@ public class MedicationAdministration extends DomainResource { children.add(new Property("medication[x]", "CodeableConcept|Reference(Medication)", "Identifies the medication that was administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications.", 0, 1, medication)); children.add(new Property("subject", "Reference(Patient|Group)", "The person or animal or group receiving the medication.", 0, 1, subject)); children.add(new Property("encounter", "Reference(Encounter)", "The visit, admission, or other contact between patient and health care provider during which the medication administration was performed.", 0, 1, encounter)); - children.add(new Property("supportingInformation", "Reference(Any)", "Additional information (for example, patient height and weight) that supports the administration of the medication.", 0, java.lang.Integer.MAX_VALUE, supportingInformation)); + children.add(new Property("supportingInformation", "Reference(Any)", "Additional information (for example, patient height and weight) that supports the administration of the medication. This attribute can be used to provide documentation of specific characteristics of the patient present at the time of administration. For example, if the dose says \"give \"x\" if the heartrate exceeds \"y\"\", then the heart rate can be included using this attribute.", 0, java.lang.Integer.MAX_VALUE, supportingInformation)); children.add(new Property("occurence[x]", "dateTime|Period", "A specific date/time or interval of time during which the administration took place (or did not take place). For many administrations, such as swallowing a tablet the use of dateTime is more appropriate.", 0, 1, occurence)); children.add(new Property("recorded", "dateTime", "The date the occurrence of the MedicationAdministration was first captured in the record - potentially significantly after the occurrence of the event.", 0, 1, recorded)); children.add(new Property("performer", "", "Indicates who or what performed the medication administration and how they were involved.", 0, java.lang.Integer.MAX_VALUE, performer)); - children.add(new Property("reasonCode", "CodeableConcept", "A code indicating why the medication was given.", 0, java.lang.Integer.MAX_VALUE, reasonCode)); - children.add(new Property("reasonReference", "Reference(Condition|Observation|DiagnosticReport)", "Condition or observation that supports why the medication was administered.", 0, java.lang.Integer.MAX_VALUE, reasonReference)); + children.add(new Property("reason", "CodeableReference(Condition|Observation|DiagnosticReport)", "A code, Condition or observation that supports why the medication was administered.", 0, java.lang.Integer.MAX_VALUE, reason)); children.add(new Property("request", "Reference(MedicationRequest)", "The original request, instruction or authority to perform the administration.", 0, 1, request)); children.add(new Property("device", "Reference(Device)", "The device used in administering the medication to the patient. For example, a particular infusion pump.", 0, java.lang.Integer.MAX_VALUE, device)); children.add(new Property("note", "Annotation", "Extra information about the medication administration that is not conveyed by the other attributes.", 0, java.lang.Integer.MAX_VALUE, note)); @@ -2177,15 +2116,14 @@ public class MedicationAdministration extends DomainResource { case 2104315196: /*medicationReference*/ return new Property("medication[x]", "Reference(Medication)", "Identifies the medication that was administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications.", 0, 1, medication); case -1867885268: /*subject*/ return new Property("subject", "Reference(Patient|Group)", "The person or animal or group receiving the medication.", 0, 1, subject); case 1524132147: /*encounter*/ return new Property("encounter", "Reference(Encounter)", "The visit, admission, or other contact between patient and health care provider during which the medication administration was performed.", 0, 1, encounter); - case -1248768647: /*supportingInformation*/ return new Property("supportingInformation", "Reference(Any)", "Additional information (for example, patient height and weight) that supports the administration of the medication.", 0, java.lang.Integer.MAX_VALUE, supportingInformation); + case -1248768647: /*supportingInformation*/ return new Property("supportingInformation", "Reference(Any)", "Additional information (for example, patient height and weight) that supports the administration of the medication. This attribute can be used to provide documentation of specific characteristics of the patient present at the time of administration. For example, if the dose says \"give \"x\" if the heartrate exceeds \"y\"\", then the heart rate can be included using this attribute.", 0, java.lang.Integer.MAX_VALUE, supportingInformation); case 144188521: /*occurence[x]*/ return new Property("occurence[x]", "dateTime|Period", "A specific date/time or interval of time during which the administration took place (or did not take place). For many administrations, such as swallowing a tablet the use of dateTime is more appropriate.", 0, 1, occurence); case -1192857417: /*occurence*/ return new Property("occurence[x]", "dateTime|Period", "A specific date/time or interval of time during which the administration took place (or did not take place). For many administrations, such as swallowing a tablet the use of dateTime is more appropriate.", 0, 1, occurence); case -820552334: /*occurenceDateTime*/ return new Property("occurence[x]", "dateTime", "A specific date/time or interval of time during which the administration took place (or did not take place). For many administrations, such as swallowing a tablet the use of dateTime is more appropriate.", 0, 1, occurence); case 221195608: /*occurencePeriod*/ return new Property("occurence[x]", "Period", "A specific date/time or interval of time during which the administration took place (or did not take place). For many administrations, such as swallowing a tablet the use of dateTime is more appropriate.", 0, 1, occurence); case -799233872: /*recorded*/ return new Property("recorded", "dateTime", "The date the occurrence of the MedicationAdministration was first captured in the record - potentially significantly after the occurrence of the event.", 0, 1, recorded); case 481140686: /*performer*/ return new Property("performer", "", "Indicates who or what performed the medication administration and how they were involved.", 0, java.lang.Integer.MAX_VALUE, performer); - case 722137681: /*reasonCode*/ return new Property("reasonCode", "CodeableConcept", "A code indicating why the medication was given.", 0, java.lang.Integer.MAX_VALUE, reasonCode); - case -1146218137: /*reasonReference*/ return new Property("reasonReference", "Reference(Condition|Observation|DiagnosticReport)", "Condition or observation that supports why the medication was administered.", 0, java.lang.Integer.MAX_VALUE, reasonReference); + case -934964668: /*reason*/ return new Property("reason", "CodeableReference(Condition|Observation|DiagnosticReport)", "A code, Condition or observation that supports why the medication was administered.", 0, java.lang.Integer.MAX_VALUE, reason); case 1095692943: /*request*/ return new Property("request", "Reference(MedicationRequest)", "The original request, instruction or authority to perform the administration.", 0, 1, request); case -1335157162: /*device*/ return new Property("device", "Reference(Device)", "The device used in administering the medication to the patient. For example, a particular infusion pump.", 0, java.lang.Integer.MAX_VALUE, device); case 3387378: /*note*/ return new Property("note", "Annotation", "Extra information about the medication administration that is not conveyed by the other attributes.", 0, java.lang.Integer.MAX_VALUE, note); @@ -2214,8 +2152,7 @@ public class MedicationAdministration extends DomainResource { case -1192857417: /*occurence*/ return this.occurence == null ? new Base[0] : new Base[] {this.occurence}; // DataType case -799233872: /*recorded*/ return this.recorded == null ? new Base[0] : new Base[] {this.recorded}; // DateTimeType case 481140686: /*performer*/ return this.performer == null ? new Base[0] : this.performer.toArray(new Base[this.performer.size()]); // MedicationAdministrationPerformerComponent - case 722137681: /*reasonCode*/ return this.reasonCode == null ? new Base[0] : this.reasonCode.toArray(new Base[this.reasonCode.size()]); // CodeableConcept - case -1146218137: /*reasonReference*/ return this.reasonReference == null ? new Base[0] : this.reasonReference.toArray(new Base[this.reasonReference.size()]); // Reference + case -934964668: /*reason*/ return this.reason == null ? new Base[0] : this.reason.toArray(new Base[this.reason.size()]); // CodeableReference case 1095692943: /*request*/ return this.request == null ? new Base[0] : new Base[] {this.request}; // Reference case -1335157162: /*device*/ return this.device == null ? new Base[0] : this.device.toArray(new Base[this.device.size()]); // Reference case 3387378: /*note*/ return this.note == null ? new Base[0] : this.note.toArray(new Base[this.note.size()]); // Annotation @@ -2275,11 +2212,8 @@ public class MedicationAdministration extends DomainResource { case 481140686: // performer this.getPerformer().add((MedicationAdministrationPerformerComponent) value); // MedicationAdministrationPerformerComponent return value; - case 722137681: // reasonCode - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept - return value; - case -1146218137: // reasonReference - this.getReasonReference().add(TypeConvertor.castToReference(value)); // Reference + case -934964668: // reason + this.getReason().add(TypeConvertor.castToCodeableReference(value)); // CodeableReference return value; case 1095692943: // request this.request = TypeConvertor.castToReference(value); // Reference @@ -2334,10 +2268,8 @@ public class MedicationAdministration extends DomainResource { this.recorded = TypeConvertor.castToDateTime(value); // DateTimeType } else if (name.equals("performer")) { this.getPerformer().add((MedicationAdministrationPerformerComponent) value); - } else if (name.equals("reasonCode")) { - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); - } else if (name.equals("reasonReference")) { - this.getReasonReference().add(TypeConvertor.castToReference(value)); + } else if (name.equals("reason")) { + this.getReason().add(TypeConvertor.castToCodeableReference(value)); } else if (name.equals("request")) { this.request = TypeConvertor.castToReference(value); // Reference } else if (name.equals("device")) { @@ -2373,8 +2305,7 @@ public class MedicationAdministration extends DomainResource { case -1192857417: return getOccurence(); case -799233872: return getRecordedElement(); case 481140686: return addPerformer(); - case 722137681: return addReasonCode(); - case -1146218137: return addReasonReference(); + case -934964668: return addReason(); case 1095692943: return getRequest(); case -1335157162: return addDevice(); case 3387378: return addNote(); @@ -2403,8 +2334,7 @@ public class MedicationAdministration extends DomainResource { case -1192857417: /*occurence*/ return new String[] {"dateTime", "Period"}; case -799233872: /*recorded*/ return new String[] {"dateTime"}; case 481140686: /*performer*/ return new String[] {}; - case 722137681: /*reasonCode*/ return new String[] {"CodeableConcept"}; - case -1146218137: /*reasonReference*/ return new String[] {"Reference"}; + case -934964668: /*reason*/ return new String[] {"CodeableReference"}; case 1095692943: /*request*/ return new String[] {"Reference"}; case -1335157162: /*device*/ return new String[] {"Reference"}; case 3387378: /*note*/ return new String[] {"Annotation"}; @@ -2474,11 +2404,8 @@ public class MedicationAdministration extends DomainResource { else if (name.equals("performer")) { return addPerformer(); } - else if (name.equals("reasonCode")) { - return addReasonCode(); - } - else if (name.equals("reasonReference")) { - return addReasonReference(); + else if (name.equals("reason")) { + return addReason(); } else if (name.equals("request")) { this.request = new Reference(); @@ -2565,15 +2492,10 @@ public class MedicationAdministration extends DomainResource { for (MedicationAdministrationPerformerComponent i : performer) dst.performer.add(i.copy()); }; - if (reasonCode != null) { - dst.reasonCode = new ArrayList(); - for (CodeableConcept i : reasonCode) - dst.reasonCode.add(i.copy()); - }; - if (reasonReference != null) { - dst.reasonReference = new ArrayList(); - for (Reference i : reasonReference) - dst.reasonReference.add(i.copy()); + if (reason != null) { + dst.reason = new ArrayList(); + for (CodeableReference i : reason) + dst.reason.add(i.copy()); }; dst.request = request == null ? null : request.copy(); if (device != null) { @@ -2611,9 +2533,9 @@ public class MedicationAdministration extends DomainResource { && compareDeep(category, o.category, true) && compareDeep(medication, o.medication, true) && compareDeep(subject, o.subject, true) && compareDeep(encounter, o.encounter, true) && compareDeep(supportingInformation, o.supportingInformation, true) && compareDeep(occurence, o.occurence, true) && compareDeep(recorded, o.recorded, true) && compareDeep(performer, o.performer, true) - && compareDeep(reasonCode, o.reasonCode, true) && compareDeep(reasonReference, o.reasonReference, true) - && compareDeep(request, o.request, true) && compareDeep(device, o.device, true) && compareDeep(note, o.note, true) - && compareDeep(dosage, o.dosage, true) && compareDeep(eventHistory, o.eventHistory, true); + && compareDeep(reason, o.reason, true) && compareDeep(request, o.request, true) && compareDeep(device, o.device, true) + && compareDeep(note, o.note, true) && compareDeep(dosage, o.dosage, true) && compareDeep(eventHistory, o.eventHistory, true) + ; } @Override @@ -2630,8 +2552,8 @@ public class MedicationAdministration extends DomainResource { public boolean isEmpty() { return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, instantiatesCanonical , instantiatesUri, basedOn, partOf, status, statusReason, category, medication - , subject, encounter, supportingInformation, occurence, recorded, performer, reasonCode - , reasonReference, request, device, note, dosage, eventHistory); + , subject, encounter, supportingInformation, occurence, recorded, performer, reason + , request, device, note, dosage, eventHistory); } @Override @@ -2696,17 +2618,17 @@ public class MedicationAdministration extends DomainResource { *

* Description: Reasons for administering the medication
* Type: token
- * Path: MedicationAdministration.reasonCode
+ * Path: null
*

*/ - @SearchParamDefinition(name="reason-given", path="MedicationAdministration.reasonCode", description="Reasons for administering the medication", type="token" ) + @SearchParamDefinition(name="reason-given", path="", description="Reasons for administering the medication", type="token" ) public static final String SP_REASON_GIVEN = "reason-given"; /** * Fluent Client search parameter constant for reason-given *

* Description: Reasons for administering the medication
* Type: token
- * Path: MedicationAdministration.reasonCode
+ * Path: null
*

*/ public static final ca.uhn.fhir.rest.gclient.TokenClientParam REASON_GIVEN = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_REASON_GIVEN); 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 d30434ae6..e40ee884f 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; @@ -912,10 +912,10 @@ public class MedicationDispense extends DomainResource { protected Reference encounter; /** - * Additional information that supports the medication being dispensed. + * Additional information that supports the medication being dispensed. For example, there may be requirements that a specific lab test has been completed prior to dispensing or the patient's weight at the time of dispensing is documented. */ @Child(name = "supportingInformation", type = {Reference.class}, order=9, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Information that supports the dispensing of the medication", formalDefinition="Additional information that supports the medication being dispensed." ) + @Description(shortDefinition="Information that supports the dispensing of the medication", formalDefinition="Additional information that supports the medication being dispensed. For example, there may be requirements that a specific lab test has been completed prior to dispensing or the patient's weight at the time of dispensing is documented." ) protected List supportingInformation; /** @@ -996,35 +996,42 @@ public class MedicationDispense extends DomainResource { @Description(shortDefinition="Information about the dispense", formalDefinition="Extra information about the dispense that could not be conveyed in the other attributes." ) protected List note; + /** + * The full representation of the dose of the medication included in all dosage instructions. To be used when multiple dosage instructions are included to represent complex dosing such as increasing or tapering doses. + */ + @Child(name = "renderedDosageInstruction", type = {StringType.class}, order=21, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="Full representation of the dosage instructions", formalDefinition="The full representation of the dose of the medication included in all dosage instructions. To be used when multiple dosage instructions are included to represent complex dosing such as increasing or tapering doses." ) + protected StringType renderedDosageInstruction; + /** * Indicates how the medication is to be used by the patient. */ - @Child(name = "dosageInstruction", type = {Dosage.class}, order=21, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "dosageInstruction", type = {Dosage.class}, order=22, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="How the medication is to be used by the patient or administered by the caregiver", formalDefinition="Indicates how the medication is to be used by the patient." ) protected List dosageInstruction; /** * Indicates whether or not substitution was made as part of the dispense. In some cases, substitution will be expected but does not happen, in other cases substitution is not expected but does happen. This block explains what substitution did or did not happen and why. If nothing is specified, substitution was not done. */ - @Child(name = "substitution", type = {}, order=22, min=0, max=1, modifier=false, summary=false) + @Child(name = "substitution", type = {}, order=23, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Whether a substitution was performed on the dispense", formalDefinition="Indicates whether or not substitution was made as part of the dispense. In some cases, substitution will be expected but does not happen, in other cases substitution is not expected but does happen. This block explains what substitution did or did not happen and why. If nothing is specified, substitution was not done." ) protected MedicationDispenseSubstitutionComponent substitution; /** * 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, duplicate therapy, dosage alert etc. */ - @Child(name = "detectedIssue", type = {DetectedIssue.class}, order=23, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "detectedIssue", type = {DetectedIssue.class}, order=24, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Clinical issue with action", formalDefinition="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, duplicate therapy, dosage alert etc." ) protected List detectedIssue; /** * A summary of the events of interest that have occurred, such as when the dispense was verified. */ - @Child(name = "eventHistory", type = {Provenance.class}, order=24, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "eventHistory", type = {Provenance.class}, order=25, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="A list of relevant lifecycle events", formalDefinition="A summary of the events of interest that have occurred, such as when the dispense was verified." ) protected List eventHistory; - private static final long serialVersionUID = 1788928955L; + private static final long serialVersionUID = -1013413036L; /** * Constructor @@ -1450,7 +1457,7 @@ public class MedicationDispense extends DomainResource { } /** - * @return {@link #supportingInformation} (Additional information that supports the medication being dispensed.) + * @return {@link #supportingInformation} (Additional information that supports the medication being dispensed. For example, there may be requirements that a specific lab test has been completed prior to dispensing or the patient's weight at the time of dispensing is documented.) */ public List getSupportingInformation() { if (this.supportingInformation == null) @@ -1932,6 +1939,55 @@ public class MedicationDispense extends DomainResource { return getNote().get(0); } + /** + * @return {@link #renderedDosageInstruction} (The full representation of the dose of the medication included in all dosage instructions. To be used when multiple dosage instructions are included to represent complex dosing such as increasing or tapering doses.). This is the underlying object with id, value and extensions. The accessor "getRenderedDosageInstruction" gives direct access to the value + */ + public StringType getRenderedDosageInstructionElement() { + if (this.renderedDosageInstruction == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create MedicationDispense.renderedDosageInstruction"); + else if (Configuration.doAutoCreate()) + this.renderedDosageInstruction = new StringType(); // bb + return this.renderedDosageInstruction; + } + + public boolean hasRenderedDosageInstructionElement() { + return this.renderedDosageInstruction != null && !this.renderedDosageInstruction.isEmpty(); + } + + public boolean hasRenderedDosageInstruction() { + return this.renderedDosageInstruction != null && !this.renderedDosageInstruction.isEmpty(); + } + + /** + * @param value {@link #renderedDosageInstruction} (The full representation of the dose of the medication included in all dosage instructions. To be used when multiple dosage instructions are included to represent complex dosing such as increasing or tapering doses.). This is the underlying object with id, value and extensions. The accessor "getRenderedDosageInstruction" gives direct access to the value + */ + public MedicationDispense setRenderedDosageInstructionElement(StringType value) { + this.renderedDosageInstruction = value; + return this; + } + + /** + * @return The full representation of the dose of the medication included in all dosage instructions. To be used when multiple dosage instructions are included to represent complex dosing such as increasing or tapering doses. + */ + public String getRenderedDosageInstruction() { + return this.renderedDosageInstruction == null ? null : this.renderedDosageInstruction.getValue(); + } + + /** + * @param value The full representation of the dose of the medication included in all dosage instructions. To be used when multiple dosage instructions are included to represent complex dosing such as increasing or tapering doses. + */ + public MedicationDispense setRenderedDosageInstruction(String value) { + if (Utilities.noString(value)) + this.renderedDosageInstruction = null; + else { + if (this.renderedDosageInstruction == null) + this.renderedDosageInstruction = new StringType(); + this.renderedDosageInstruction.setValue(value); + } + return this; + } + /** * @return {@link #dosageInstruction} (Indicates how the medication is to be used by the patient.) */ @@ -2126,7 +2182,7 @@ public class MedicationDispense extends DomainResource { children.add(new Property("medication[x]", "CodeableConcept|Reference(Medication)", "Identifies the medication being administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications.", 0, 1, medication)); children.add(new Property("subject", "Reference(Patient|Group)", "A link to a resource representing the person or the group to whom the medication will be given.", 0, 1, subject)); children.add(new Property("encounter", "Reference(Encounter)", "The encounter that establishes the context for this event.", 0, 1, encounter)); - children.add(new Property("supportingInformation", "Reference(Any)", "Additional information that supports the medication being dispensed.", 0, java.lang.Integer.MAX_VALUE, supportingInformation)); + children.add(new Property("supportingInformation", "Reference(Any)", "Additional information that supports the medication being dispensed. For example, there may be requirements that a specific lab test has been completed prior to dispensing or the patient's weight at the time of dispensing is documented.", 0, java.lang.Integer.MAX_VALUE, supportingInformation)); children.add(new Property("performer", "", "Indicates who or what performed the event.", 0, java.lang.Integer.MAX_VALUE, performer)); children.add(new Property("location", "Reference(Location)", "The principal physical location where the dispense was performed.", 0, 1, location)); children.add(new Property("authorizingPrescription", "Reference(MedicationRequest)", "Indicates the medication order that is being dispensed against.", 0, java.lang.Integer.MAX_VALUE, authorizingPrescription)); @@ -2138,6 +2194,7 @@ public class MedicationDispense extends DomainResource { children.add(new Property("destination", "Reference(Location)", "Identification of the facility/location where the medication was shipped to, as part of the dispense event.", 0, 1, destination)); children.add(new Property("receiver", "Reference(Patient|Practitioner|RelatedPerson|Location|PractitionerRole)", "Identifies the person who picked up the medication or the location of where the medication was delivered. This will usually be a patient or their caregiver, but some cases exist where it can be a healthcare professional or a location.", 0, java.lang.Integer.MAX_VALUE, receiver)); children.add(new Property("note", "Annotation", "Extra information about the dispense that could not be conveyed in the other attributes.", 0, java.lang.Integer.MAX_VALUE, note)); + children.add(new Property("renderedDosageInstruction", "string", "The full representation of the dose of the medication included in all dosage instructions. To be used when multiple dosage instructions are included to represent complex dosing such as increasing or tapering doses.", 0, 1, renderedDosageInstruction)); children.add(new Property("dosageInstruction", "Dosage", "Indicates how the medication is to be used by the patient.", 0, java.lang.Integer.MAX_VALUE, dosageInstruction)); children.add(new Property("substitution", "", "Indicates whether or not substitution was made as part of the dispense. In some cases, substitution will be expected but does not happen, in other cases substitution is not expected but does happen. This block explains what substitution did or did not happen and why. If nothing is specified, substitution was not done.", 0, 1, substitution)); children.add(new Property("detectedIssue", "Reference(DetectedIssue)", "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, duplicate therapy, dosage alert etc.", 0, java.lang.Integer.MAX_VALUE, detectedIssue)); @@ -2162,7 +2219,7 @@ public class MedicationDispense extends DomainResource { case 2104315196: /*medicationReference*/ return new Property("medication[x]", "Reference(Medication)", "Identifies the medication being administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications.", 0, 1, medication); case -1867885268: /*subject*/ return new Property("subject", "Reference(Patient|Group)", "A link to a resource representing the person or the group to whom the medication will be given.", 0, 1, subject); case 1524132147: /*encounter*/ return new Property("encounter", "Reference(Encounter)", "The encounter that establishes the context for this event.", 0, 1, encounter); - case -1248768647: /*supportingInformation*/ return new Property("supportingInformation", "Reference(Any)", "Additional information that supports the medication being dispensed.", 0, java.lang.Integer.MAX_VALUE, supportingInformation); + case -1248768647: /*supportingInformation*/ return new Property("supportingInformation", "Reference(Any)", "Additional information that supports the medication being dispensed. For example, there may be requirements that a specific lab test has been completed prior to dispensing or the patient's weight at the time of dispensing is documented.", 0, java.lang.Integer.MAX_VALUE, supportingInformation); case 481140686: /*performer*/ return new Property("performer", "", "Indicates who or what performed the event.", 0, java.lang.Integer.MAX_VALUE, performer); case 1901043637: /*location*/ return new Property("location", "Reference(Location)", "The principal physical location where the dispense was performed.", 0, 1, location); case -1237557856: /*authorizingPrescription*/ return new Property("authorizingPrescription", "Reference(MedicationRequest)", "Indicates the medication order that is being dispensed against.", 0, java.lang.Integer.MAX_VALUE, authorizingPrescription); @@ -2174,6 +2231,7 @@ public class MedicationDispense extends DomainResource { case -1429847026: /*destination*/ return new Property("destination", "Reference(Location)", "Identification of the facility/location where the medication was shipped to, as part of the dispense event.", 0, 1, destination); case -808719889: /*receiver*/ return new Property("receiver", "Reference(Patient|Practitioner|RelatedPerson|Location|PractitionerRole)", "Identifies the person who picked up the medication or the location of where the medication was delivered. This will usually be a patient or their caregiver, but some cases exist where it can be a healthcare professional or a location.", 0, java.lang.Integer.MAX_VALUE, receiver); case 3387378: /*note*/ return new Property("note", "Annotation", "Extra information about the dispense that could not be conveyed in the other attributes.", 0, java.lang.Integer.MAX_VALUE, note); + case 1718902050: /*renderedDosageInstruction*/ return new Property("renderedDosageInstruction", "string", "The full representation of the dose of the medication included in all dosage instructions. To be used when multiple dosage instructions are included to represent complex dosing such as increasing or tapering doses.", 0, 1, renderedDosageInstruction); case -1201373865: /*dosageInstruction*/ return new Property("dosageInstruction", "Dosage", "Indicates how the medication is to be used by the patient.", 0, java.lang.Integer.MAX_VALUE, dosageInstruction); case 826147581: /*substitution*/ return new Property("substitution", "", "Indicates whether or not substitution was made as part of the dispense. In some cases, substitution will be expected but does not happen, in other cases substitution is not expected but does happen. This block explains what substitution did or did not happen and why. If nothing is specified, substitution was not done.", 0, 1, substitution); case 51602295: /*detectedIssue*/ return new Property("detectedIssue", "Reference(DetectedIssue)", "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, duplicate therapy, dosage alert etc.", 0, java.lang.Integer.MAX_VALUE, detectedIssue); @@ -2207,6 +2265,7 @@ public class MedicationDispense extends DomainResource { case -1429847026: /*destination*/ return this.destination == null ? new Base[0] : new Base[] {this.destination}; // Reference case -808719889: /*receiver*/ return this.receiver == null ? new Base[0] : this.receiver.toArray(new Base[this.receiver.size()]); // Reference case 3387378: /*note*/ return this.note == null ? new Base[0] : this.note.toArray(new Base[this.note.size()]); // Annotation + case 1718902050: /*renderedDosageInstruction*/ return this.renderedDosageInstruction == null ? new Base[0] : new Base[] {this.renderedDosageInstruction}; // StringType case -1201373865: /*dosageInstruction*/ return this.dosageInstruction == null ? new Base[0] : this.dosageInstruction.toArray(new Base[this.dosageInstruction.size()]); // Dosage case 826147581: /*substitution*/ return this.substitution == null ? new Base[0] : new Base[] {this.substitution}; // MedicationDispenseSubstitutionComponent case 51602295: /*detectedIssue*/ return this.detectedIssue == null ? new Base[0] : this.detectedIssue.toArray(new Base[this.detectedIssue.size()]); // Reference @@ -2283,6 +2342,9 @@ public class MedicationDispense extends DomainResource { case 3387378: // note this.getNote().add(TypeConvertor.castToAnnotation(value)); // Annotation return value; + case 1718902050: // renderedDosageInstruction + this.renderedDosageInstruction = TypeConvertor.castToString(value); // StringType + return value; case -1201373865: // dosageInstruction this.getDosageInstruction().add(TypeConvertor.castToDosage(value)); // Dosage return value; @@ -2345,6 +2407,8 @@ public class MedicationDispense extends DomainResource { this.getReceiver().add(TypeConvertor.castToReference(value)); } else if (name.equals("note")) { this.getNote().add(TypeConvertor.castToAnnotation(value)); + } else if (name.equals("renderedDosageInstruction")) { + this.renderedDosageInstruction = TypeConvertor.castToString(value); // StringType } else if (name.equals("dosageInstruction")) { this.getDosageInstruction().add(TypeConvertor.castToDosage(value)); } else if (name.equals("substitution")) { @@ -2384,6 +2448,7 @@ public class MedicationDispense extends DomainResource { case -1429847026: return getDestination(); case -808719889: return addReceiver(); case 3387378: return addNote(); + case 1718902050: return getRenderedDosageInstructionElement(); case -1201373865: return addDosageInstruction(); case 826147581: return getSubstitution(); case 51602295: return addDetectedIssue(); @@ -2417,6 +2482,7 @@ public class MedicationDispense extends DomainResource { case -1429847026: /*destination*/ return new String[] {"Reference"}; case -808719889: /*receiver*/ return new String[] {"Reference"}; case 3387378: /*note*/ return new String[] {"Annotation"}; + case 1718902050: /*renderedDosageInstruction*/ return new String[] {"string"}; case -1201373865: /*dosageInstruction*/ return new String[] {"Dosage"}; case 826147581: /*substitution*/ return new String[] {}; case 51602295: /*detectedIssue*/ return new String[] {"Reference"}; @@ -2508,6 +2574,9 @@ public class MedicationDispense extends DomainResource { else if (name.equals("note")) { return addNote(); } + else if (name.equals("renderedDosageInstruction")) { + throw new FHIRException("Cannot call addChild on a primitive type MedicationDispense.renderedDosageInstruction"); + } else if (name.equals("dosageInstruction")) { return addDosageInstruction(); } @@ -2595,6 +2664,7 @@ public class MedicationDispense extends DomainResource { for (Annotation i : note) dst.note.add(i.copy()); }; + dst.renderedDosageInstruction = renderedDosageInstruction == null ? null : renderedDosageInstruction.copy(); if (dosageInstruction != null) { dst.dosageInstruction = new ArrayList(); for (Dosage i : dosageInstruction) @@ -2632,9 +2702,9 @@ public class MedicationDispense extends DomainResource { && compareDeep(type, o.type, true) && compareDeep(quantity, o.quantity, true) && compareDeep(daysSupply, o.daysSupply, true) && compareDeep(whenPrepared, o.whenPrepared, true) && compareDeep(whenHandedOver, o.whenHandedOver, true) && compareDeep(destination, o.destination, true) && compareDeep(receiver, o.receiver, true) && compareDeep(note, o.note, true) - && compareDeep(dosageInstruction, o.dosageInstruction, true) && compareDeep(substitution, o.substitution, true) - && compareDeep(detectedIssue, o.detectedIssue, true) && compareDeep(eventHistory, o.eventHistory, true) - ; + && compareDeep(renderedDosageInstruction, o.renderedDosageInstruction, true) && compareDeep(dosageInstruction, o.dosageInstruction, true) + && compareDeep(substitution, o.substitution, true) && compareDeep(detectedIssue, o.detectedIssue, true) + && compareDeep(eventHistory, o.eventHistory, true); } @Override @@ -2645,15 +2715,15 @@ public class MedicationDispense extends DomainResource { return false; MedicationDispense o = (MedicationDispense) other_; return compareValues(status, o.status, true) && compareValues(whenPrepared, o.whenPrepared, true) && compareValues(whenHandedOver, o.whenHandedOver, true) - ; + && compareValues(renderedDosageInstruction, o.renderedDosageInstruction, true); } public boolean isEmpty() { return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, basedOn, partOf , status, statusReason, category, medication, subject, encounter, supportingInformation , performer, location, authorizingPrescription, type, quantity, daysSupply, whenPrepared - , whenHandedOver, destination, receiver, note, dosageInstruction, substitution, detectedIssue - , eventHistory); + , whenHandedOver, destination, receiver, note, renderedDosageInstruction, dosageInstruction + , substitution, detectedIssue, eventHistory); } @Override 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 8bb1ea8dd..4616b1ec6 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; @@ -641,13 +641,14 @@ public class MedicationKnowledge extends DomainResource { protected BooleanType isActive; /** - * Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet. + * Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet but can also be expressed a quantity when the denominator is assumed to be 1 tablet. */ - @Child(name = "strength", type = {Ratio.class}, order=3, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Quantity of ingredient present", formalDefinition="Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet." ) - protected Ratio strength; + @Child(name = "strength", type = {Ratio.class, CodeableConcept.class, Quantity.class}, order=3, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="Quantity of ingredient present", formalDefinition="Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet but can also be expressed a quantity when the denominator is assumed to be 1 tablet." ) + @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/medication-ingredientstrength") + protected DataType strength; - private static final long serialVersionUID = -744144813L; + private static final long serialVersionUID = 1297277898L; /** * Constructor @@ -761,25 +762,67 @@ public class MedicationKnowledge extends DomainResource { } /** - * @return {@link #strength} (Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet.) + * @return {@link #strength} (Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet but can also be expressed a quantity when the denominator is assumed to be 1 tablet.) */ - public Ratio getStrength() { - if (this.strength == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicationKnowledgeIngredientComponent.strength"); - else if (Configuration.doAutoCreate()) - this.strength = new Ratio(); // cc + public DataType getStrength() { return this.strength; } + /** + * @return {@link #strength} (Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet but can also be expressed a quantity when the denominator is assumed to be 1 tablet.) + */ + public Ratio getStrengthRatio() throws FHIRException { + if (this.strength == null) + this.strength = new Ratio(); + if (!(this.strength instanceof Ratio)) + throw new FHIRException("Type mismatch: the type Ratio was expected, but "+this.strength.getClass().getName()+" was encountered"); + return (Ratio) this.strength; + } + + public boolean hasStrengthRatio() { + return this != null && this.strength instanceof Ratio; + } + + /** + * @return {@link #strength} (Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet but can also be expressed a quantity when the denominator is assumed to be 1 tablet.) + */ + public CodeableConcept getStrengthCodeableConcept() throws FHIRException { + if (this.strength == null) + this.strength = new CodeableConcept(); + if (!(this.strength instanceof CodeableConcept)) + throw new FHIRException("Type mismatch: the type CodeableConcept was expected, but "+this.strength.getClass().getName()+" was encountered"); + return (CodeableConcept) this.strength; + } + + public boolean hasStrengthCodeableConcept() { + return this != null && this.strength instanceof CodeableConcept; + } + + /** + * @return {@link #strength} (Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet but can also be expressed a quantity when the denominator is assumed to be 1 tablet.) + */ + public Quantity getStrengthQuantity() throws FHIRException { + if (this.strength == null) + this.strength = new Quantity(); + if (!(this.strength instanceof Quantity)) + throw new FHIRException("Type mismatch: the type Quantity was expected, but "+this.strength.getClass().getName()+" was encountered"); + return (Quantity) this.strength; + } + + public boolean hasStrengthQuantity() { + return this != null && this.strength instanceof Quantity; + } + public boolean hasStrength() { return this.strength != null && !this.strength.isEmpty(); } /** - * @param value {@link #strength} (Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet.) + * @param value {@link #strength} (Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet but can also be expressed a quantity when the denominator is assumed to be 1 tablet.) */ - public MedicationKnowledgeIngredientComponent setStrength(Ratio value) { + public MedicationKnowledgeIngredientComponent setStrength(DataType value) { + if (value != null && !(value instanceof Ratio || value instanceof CodeableConcept || value instanceof Quantity)) + throw new Error("Not the right type for MedicationKnowledge.ingredient.strength[x]: "+value.fhirType()); this.strength = value; return this; } @@ -788,7 +831,7 @@ public class MedicationKnowledge extends DomainResource { super.listChildren(children); children.add(new Property("item[x]", "CodeableConcept|Reference(Ingredient)", "The actual ingredient - either a substance (simple ingredient) or another medication.", 0, 1, item)); children.add(new Property("isActive", "boolean", "Indication of whether this ingredient affects the therapeutic action of the drug.", 0, 1, isActive)); - children.add(new Property("strength", "Ratio", "Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet.", 0, 1, strength)); + children.add(new Property("strength[x]", "Ratio|CodeableConcept|Quantity", "Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet but can also be expressed a quantity when the denominator is assumed to be 1 tablet.", 0, 1, strength)); } @Override @@ -799,7 +842,11 @@ public class MedicationKnowledge extends DomainResource { case 106644494: /*itemCodeableConcept*/ return new Property("item[x]", "CodeableConcept", "The actual ingredient - either a substance (simple ingredient) or another medication.", 0, 1, item); case 1376364920: /*itemReference*/ return new Property("item[x]", "Reference(Ingredient)", "The actual ingredient - either a substance (simple ingredient) or another medication.", 0, 1, item); case -748916528: /*isActive*/ return new Property("isActive", "boolean", "Indication of whether this ingredient affects the therapeutic action of the drug.", 0, 1, isActive); - case 1791316033: /*strength*/ return new Property("strength", "Ratio", "Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet.", 0, 1, strength); + case 127377567: /*strength[x]*/ return new Property("strength[x]", "Ratio|CodeableConcept|Quantity", "Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet but can also be expressed a quantity when the denominator is assumed to be 1 tablet.", 0, 1, strength); + case 1791316033: /*strength*/ return new Property("strength[x]", "Ratio|CodeableConcept|Quantity", "Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet but can also be expressed a quantity when the denominator is assumed to be 1 tablet.", 0, 1, strength); + case 2141786186: /*strengthRatio*/ return new Property("strength[x]", "Ratio", "Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet but can also be expressed a quantity when the denominator is assumed to be 1 tablet.", 0, 1, strength); + case -1455903456: /*strengthCodeableConcept*/ return new Property("strength[x]", "CodeableConcept", "Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet but can also be expressed a quantity when the denominator is assumed to be 1 tablet.", 0, 1, strength); + case -1793570836: /*strengthQuantity*/ return new Property("strength[x]", "Quantity", "Specifies how many (or how much) of the items there are in this Medication. For example, 250 mg per tablet. This is expressed as a ratio where the numerator is 250mg and the denominator is 1 tablet but can also be expressed a quantity when the denominator is assumed to be 1 tablet.", 0, 1, strength); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -810,7 +857,7 @@ public class MedicationKnowledge extends DomainResource { switch (hash) { case 3242771: /*item*/ return this.item == null ? new Base[0] : new Base[] {this.item}; // DataType case -748916528: /*isActive*/ return this.isActive == null ? new Base[0] : new Base[] {this.isActive}; // BooleanType - case 1791316033: /*strength*/ return this.strength == null ? new Base[0] : new Base[] {this.strength}; // Ratio + case 1791316033: /*strength*/ return this.strength == null ? new Base[0] : new Base[] {this.strength}; // DataType default: return super.getProperty(hash, name, checkValid); } @@ -826,7 +873,7 @@ public class MedicationKnowledge extends DomainResource { this.isActive = TypeConvertor.castToBoolean(value); // BooleanType return value; case 1791316033: // strength - this.strength = TypeConvertor.castToRatio(value); // Ratio + this.strength = TypeConvertor.castToType(value); // DataType return value; default: return super.setProperty(hash, name, value); } @@ -839,8 +886,8 @@ public class MedicationKnowledge extends DomainResource { this.item = TypeConvertor.castToType(value); // DataType } else if (name.equals("isActive")) { this.isActive = TypeConvertor.castToBoolean(value); // BooleanType - } else if (name.equals("strength")) { - this.strength = TypeConvertor.castToRatio(value); // Ratio + } else if (name.equals("strength[x]")) { + this.strength = TypeConvertor.castToType(value); // DataType } else return super.setProperty(name, value); return value; @@ -852,6 +899,7 @@ public class MedicationKnowledge extends DomainResource { case 2116201613: return getItem(); case 3242771: return getItem(); case -748916528: return getIsActiveElement(); + case 127377567: return getStrength(); case 1791316033: return getStrength(); default: return super.makeProperty(hash, name); } @@ -863,7 +911,7 @@ public class MedicationKnowledge extends DomainResource { switch (hash) { case 3242771: /*item*/ return new String[] {"CodeableConcept", "Reference"}; case -748916528: /*isActive*/ return new String[] {"boolean"}; - case 1791316033: /*strength*/ return new String[] {"Ratio"}; + case 1791316033: /*strength*/ return new String[] {"Ratio", "CodeableConcept", "Quantity"}; default: return super.getTypesForProperty(hash, name); } @@ -882,10 +930,18 @@ public class MedicationKnowledge extends DomainResource { else if (name.equals("isActive")) { throw new FHIRException("Cannot call addChild on a primitive type MedicationKnowledge.ingredient.isActive"); } - else if (name.equals("strength")) { + else if (name.equals("strengthRatio")) { this.strength = new Ratio(); return this.strength; } + else if (name.equals("strengthCodeableConcept")) { + this.strength = new CodeableConcept(); + return this.strength; + } + else if (name.equals("strengthQuantity")) { + this.strength = new Quantity(); + return this.strength; + } else return super.addChild(name); } 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 9a6bf941d..10426d7c3 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; @@ -494,13 +494,13 @@ public class MedicationRequest extends DomainResource { protected Duration expectedSupplyDuration; /** - * Indicates the intended dispensing Organization specified by the prescriber. + * Indicates the intended performing Organization that will dispense the medication as specified by the prescriber. */ - @Child(name = "performer", type = {Organization.class}, order=7, min=0, max=1, modifier=false, summary=false) - @Description(shortDefinition="Intended dispenser", formalDefinition="Indicates the intended dispensing Organization specified by the prescriber." ) - protected Reference performer; + @Child(name = "dispenser", type = {Organization.class}, order=7, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="Intended performer of dispense", formalDefinition="Indicates the intended performing Organization that will dispense the medication as specified by the prescriber." ) + protected Reference dispenser; - private static final long serialVersionUID = 1688350813L; + private static final long serialVersionUID = 1118791702L; /** * Constructor @@ -675,26 +675,26 @@ public class MedicationRequest extends DomainResource { } /** - * @return {@link #performer} (Indicates the intended dispensing Organization specified by the prescriber.) + * @return {@link #dispenser} (Indicates the intended performing Organization that will dispense the medication as specified by the prescriber.) */ - public Reference getPerformer() { - if (this.performer == null) + public Reference getDispenser() { + if (this.dispenser == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicationRequestDispenseRequestComponent.performer"); + throw new Error("Attempt to auto-create MedicationRequestDispenseRequestComponent.dispenser"); else if (Configuration.doAutoCreate()) - this.performer = new Reference(); // cc - return this.performer; + this.dispenser = new Reference(); // cc + return this.dispenser; } - public boolean hasPerformer() { - return this.performer != null && !this.performer.isEmpty(); + public boolean hasDispenser() { + return this.dispenser != null && !this.dispenser.isEmpty(); } /** - * @param value {@link #performer} (Indicates the intended dispensing Organization specified by the prescriber.) + * @param value {@link #dispenser} (Indicates the intended performing Organization that will dispense the medication as specified by the prescriber.) */ - public MedicationRequestDispenseRequestComponent setPerformer(Reference value) { - this.performer = value; + public MedicationRequestDispenseRequestComponent setDispenser(Reference value) { + this.dispenser = value; return this; } @@ -706,7 +706,7 @@ public class MedicationRequest extends DomainResource { children.add(new Property("numberOfRepeatsAllowed", "unsignedInt", "An integer indicating the number of times, in addition to the original dispense, (aka refills or repeats) that the patient can receive the prescribed medication. Usage Notes: This integer does not include the original order dispense. This means that if an order indicates dispense 30 tablets plus \"3 repeats\", then the order can be dispensed a total of 4 times and the patient can receive a total of 120 tablets. A prescriber may explicitly say that zero refills are permitted after the initial dispense.", 0, 1, numberOfRepeatsAllowed)); children.add(new Property("quantity", "Quantity", "The amount that is to be dispensed for one fill.", 0, 1, quantity)); children.add(new Property("expectedSupplyDuration", "Duration", "Identifies the period time over which the supplied product is expected to be used, or the length of time the dispense is expected to last.", 0, 1, expectedSupplyDuration)); - children.add(new Property("performer", "Reference(Organization)", "Indicates the intended dispensing Organization specified by the prescriber.", 0, 1, performer)); + children.add(new Property("dispenser", "Reference(Organization)", "Indicates the intended performing Organization that will dispense the medication as specified by the prescriber.", 0, 1, dispenser)); } @Override @@ -718,7 +718,7 @@ public class MedicationRequest extends DomainResource { case -239736976: /*numberOfRepeatsAllowed*/ return new Property("numberOfRepeatsAllowed", "unsignedInt", "An integer indicating the number of times, in addition to the original dispense, (aka refills or repeats) that the patient can receive the prescribed medication. Usage Notes: This integer does not include the original order dispense. This means that if an order indicates dispense 30 tablets plus \"3 repeats\", then the order can be dispensed a total of 4 times and the patient can receive a total of 120 tablets. A prescriber may explicitly say that zero refills are permitted after the initial dispense.", 0, 1, numberOfRepeatsAllowed); case -1285004149: /*quantity*/ return new Property("quantity", "Quantity", "The amount that is to be dispensed for one fill.", 0, 1, quantity); case -1910182789: /*expectedSupplyDuration*/ return new Property("expectedSupplyDuration", "Duration", "Identifies the period time over which the supplied product is expected to be used, or the length of time the dispense is expected to last.", 0, 1, expectedSupplyDuration); - case 481140686: /*performer*/ return new Property("performer", "Reference(Organization)", "Indicates the intended dispensing Organization specified by the prescriber.", 0, 1, performer); + case 241511093: /*dispenser*/ return new Property("dispenser", "Reference(Organization)", "Indicates the intended performing Organization that will dispense the medication as specified by the prescriber.", 0, 1, dispenser); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -733,7 +733,7 @@ public class MedicationRequest extends DomainResource { case -239736976: /*numberOfRepeatsAllowed*/ return this.numberOfRepeatsAllowed == null ? new Base[0] : new Base[] {this.numberOfRepeatsAllowed}; // UnsignedIntType case -1285004149: /*quantity*/ return this.quantity == null ? new Base[0] : new Base[] {this.quantity}; // Quantity case -1910182789: /*expectedSupplyDuration*/ return this.expectedSupplyDuration == null ? new Base[0] : new Base[] {this.expectedSupplyDuration}; // Duration - case 481140686: /*performer*/ return this.performer == null ? new Base[0] : new Base[] {this.performer}; // Reference + case 241511093: /*dispenser*/ return this.dispenser == null ? new Base[0] : new Base[] {this.dispenser}; // Reference default: return super.getProperty(hash, name, checkValid); } @@ -760,8 +760,8 @@ public class MedicationRequest extends DomainResource { case -1910182789: // expectedSupplyDuration this.expectedSupplyDuration = TypeConvertor.castToDuration(value); // Duration return value; - case 481140686: // performer - this.performer = TypeConvertor.castToReference(value); // Reference + case 241511093: // dispenser + this.dispenser = TypeConvertor.castToReference(value); // Reference return value; default: return super.setProperty(hash, name, value); } @@ -782,8 +782,8 @@ public class MedicationRequest extends DomainResource { this.quantity = TypeConvertor.castToQuantity(value); // Quantity } else if (name.equals("expectedSupplyDuration")) { this.expectedSupplyDuration = TypeConvertor.castToDuration(value); // Duration - } else if (name.equals("performer")) { - this.performer = TypeConvertor.castToReference(value); // Reference + } else if (name.equals("dispenser")) { + this.dispenser = TypeConvertor.castToReference(value); // Reference } else return super.setProperty(name, value); return value; @@ -798,7 +798,7 @@ public class MedicationRequest extends DomainResource { case -239736976: return getNumberOfRepeatsAllowedElement(); case -1285004149: return getQuantity(); case -1910182789: return getExpectedSupplyDuration(); - case 481140686: return getPerformer(); + case 241511093: return getDispenser(); default: return super.makeProperty(hash, name); } @@ -813,7 +813,7 @@ public class MedicationRequest extends DomainResource { case -239736976: /*numberOfRepeatsAllowed*/ return new String[] {"unsignedInt"}; case -1285004149: /*quantity*/ return new String[] {"Quantity"}; case -1910182789: /*expectedSupplyDuration*/ return new String[] {"Duration"}; - case 481140686: /*performer*/ return new String[] {"Reference"}; + case 241511093: /*dispenser*/ return new String[] {"Reference"}; default: return super.getTypesForProperty(hash, name); } @@ -844,9 +844,9 @@ public class MedicationRequest extends DomainResource { this.expectedSupplyDuration = new Duration(); return this.expectedSupplyDuration; } - else if (name.equals("performer")) { - this.performer = new Reference(); - return this.performer; + else if (name.equals("dispenser")) { + this.dispenser = new Reference(); + return this.dispenser; } else return super.addChild(name); @@ -866,7 +866,7 @@ public class MedicationRequest extends DomainResource { dst.numberOfRepeatsAllowed = numberOfRepeatsAllowed == null ? null : numberOfRepeatsAllowed.copy(); dst.quantity = quantity == null ? null : quantity.copy(); dst.expectedSupplyDuration = expectedSupplyDuration == null ? null : expectedSupplyDuration.copy(); - dst.performer = performer == null ? null : performer.copy(); + dst.dispenser = dispenser == null ? null : dispenser.copy(); } @Override @@ -879,7 +879,7 @@ public class MedicationRequest extends DomainResource { return compareDeep(initialFill, o.initialFill, true) && compareDeep(dispenseInterval, o.dispenseInterval, true) && compareDeep(validityPeriod, o.validityPeriod, true) && compareDeep(numberOfRepeatsAllowed, o.numberOfRepeatsAllowed, true) && compareDeep(quantity, o.quantity, true) && compareDeep(expectedSupplyDuration, o.expectedSupplyDuration, true) - && compareDeep(performer, o.performer, true); + && compareDeep(dispenser, o.dispenser, true); } @Override @@ -894,7 +894,7 @@ public class MedicationRequest extends DomainResource { public boolean isEmpty() { return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(initialFill, dispenseInterval - , validityPeriod, numberOfRepeatsAllowed, quantity, expectedSupplyDuration, performer + , validityPeriod, numberOfRepeatsAllowed, quantity, expectedSupplyDuration, dispenser ); } @@ -1543,49 +1543,56 @@ public class MedicationRequest extends DomainResource { @Description(shortDefinition="Information about the prescription", formalDefinition="Extra information about the prescription that could not be conveyed by the other attributes." ) protected List note; + /** + * The full representation of the dose of the medication included in all dosage instructions. To be used when multiple dosage instructions are included to represent complex dosing such as increasing or tapering doses. + */ + @Child(name = "renderedDosageInstruction", type = {StringType.class}, order=26, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="Full representation of the dosage instructions", formalDefinition="The full representation of the dose of the medication included in all dosage instructions. To be used when multiple dosage instructions are included to represent complex dosing such as increasing or tapering doses." ) + protected StringType renderedDosageInstruction; + /** * Indicates how the medication is to be used by the patient. */ - @Child(name = "dosageInstruction", type = {Dosage.class}, order=26, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "dosageInstruction", type = {Dosage.class}, order=27, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="How the medication should be taken", formalDefinition="Indicates how the medication is to be used by the patient." ) protected List dosageInstruction; /** * Indicates the specific details for the dispense or medication supply part of a medication request (also known as a Medication Prescription or Medication Order). Note that this information is not always sent with the order. There may be in some settings (e.g. hospitals) institutional or system support for completing the dispense details in the pharmacy department. */ - @Child(name = "dispenseRequest", type = {}, order=27, min=0, max=1, modifier=false, summary=false) + @Child(name = "dispenseRequest", type = {}, order=28, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Medication supply authorization", formalDefinition="Indicates the specific details for the dispense or medication supply part of a medication request (also known as a Medication Prescription or Medication Order). Note that this information is not always sent with the order. There may be in some settings (e.g. hospitals) institutional or system support for completing the dispense details in the pharmacy department." ) protected MedicationRequestDispenseRequestComponent dispenseRequest; /** * Indicates whether or not substitution can or should be part of the dispense. In some cases, substitution must happen, in other cases substitution must not happen. This block explains the prescriber's intent. If nothing is specified substitution may be done. */ - @Child(name = "substitution", type = {}, order=28, min=0, max=1, modifier=false, summary=false) + @Child(name = "substitution", type = {}, order=29, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Any restrictions on medication substitution", formalDefinition="Indicates whether or not substitution can or should be part of the dispense. In some cases, substitution must happen, in other cases substitution must not happen. This block explains the prescriber's intent. If nothing is specified substitution may be done." ) protected MedicationRequestSubstitutionComponent substitution; /** * A link to a resource representing an earlier order related order or prescription. */ - @Child(name = "priorPrescription", type = {MedicationRequest.class}, order=29, min=0, max=1, modifier=false, summary=false) + @Child(name = "priorPrescription", type = {MedicationRequest.class}, order=30, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="An order/prescription that is being replaced", formalDefinition="A link to a resource representing an earlier order related order or prescription." ) protected Reference priorPrescription; /** * 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, duplicate therapy, dosage alert etc. */ - @Child(name = "detectedIssue", type = {DetectedIssue.class}, order=30, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "detectedIssue", type = {DetectedIssue.class}, order=31, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Clinical Issue with action", formalDefinition="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, duplicate therapy, dosage alert etc." ) protected List detectedIssue; /** * Links to Provenance records for past versions of this resource or fulfilling request or event resources that identify key state transitions or updates that are likely to be relevant to a user looking at the current version of the resource. */ - @Child(name = "eventHistory", type = {Provenance.class}, order=31, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "eventHistory", type = {Provenance.class}, order=32, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="A list of events of interest in the lifecycle", formalDefinition="Links to Provenance records for past versions of this resource or fulfilling request or event resources that identify key state transitions or updates that are likely to be relevant to a user looking at the current version of the resource." ) protected List eventHistory; - private static final long serialVersionUID = 2028552826L; + private static final long serialVersionUID = 1089528447L; /** * Constructor @@ -2667,6 +2674,55 @@ public class MedicationRequest extends DomainResource { return getNote().get(0); } + /** + * @return {@link #renderedDosageInstruction} (The full representation of the dose of the medication included in all dosage instructions. To be used when multiple dosage instructions are included to represent complex dosing such as increasing or tapering doses.). This is the underlying object with id, value and extensions. The accessor "getRenderedDosageInstruction" gives direct access to the value + */ + public StringType getRenderedDosageInstructionElement() { + if (this.renderedDosageInstruction == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create MedicationRequest.renderedDosageInstruction"); + else if (Configuration.doAutoCreate()) + this.renderedDosageInstruction = new StringType(); // bb + return this.renderedDosageInstruction; + } + + public boolean hasRenderedDosageInstructionElement() { + return this.renderedDosageInstruction != null && !this.renderedDosageInstruction.isEmpty(); + } + + public boolean hasRenderedDosageInstruction() { + return this.renderedDosageInstruction != null && !this.renderedDosageInstruction.isEmpty(); + } + + /** + * @param value {@link #renderedDosageInstruction} (The full representation of the dose of the medication included in all dosage instructions. To be used when multiple dosage instructions are included to represent complex dosing such as increasing or tapering doses.). This is the underlying object with id, value and extensions. The accessor "getRenderedDosageInstruction" gives direct access to the value + */ + public MedicationRequest setRenderedDosageInstructionElement(StringType value) { + this.renderedDosageInstruction = value; + return this; + } + + /** + * @return The full representation of the dose of the medication included in all dosage instructions. To be used when multiple dosage instructions are included to represent complex dosing such as increasing or tapering doses. + */ + public String getRenderedDosageInstruction() { + return this.renderedDosageInstruction == null ? null : this.renderedDosageInstruction.getValue(); + } + + /** + * @param value The full representation of the dose of the medication included in all dosage instructions. To be used when multiple dosage instructions are included to represent complex dosing such as increasing or tapering doses. + */ + public MedicationRequest setRenderedDosageInstruction(String value) { + if (Utilities.noString(value)) + this.renderedDosageInstruction = null; + else { + if (this.renderedDosageInstruction == null) + this.renderedDosageInstruction = new StringType(); + this.renderedDosageInstruction.setValue(value); + } + return this; + } + /** * @return {@link #dosageInstruction} (Indicates how the medication is to be used by the patient.) */ @@ -2926,6 +2982,7 @@ public class MedicationRequest extends DomainResource { children.add(new Property("courseOfTherapyType", "CodeableConcept", "The description of the overall pattern of the administration of the medication to the patient.", 0, 1, courseOfTherapyType)); children.add(new Property("insurance", "Reference(Coverage|ClaimResponse)", "Insurance plans, coverage extensions, pre-authorizations and/or pre-determinations that may be required for delivering the requested service.", 0, java.lang.Integer.MAX_VALUE, insurance)); children.add(new Property("note", "Annotation", "Extra information about the prescription that could not be conveyed by the other attributes.", 0, java.lang.Integer.MAX_VALUE, note)); + children.add(new Property("renderedDosageInstruction", "string", "The full representation of the dose of the medication included in all dosage instructions. To be used when multiple dosage instructions are included to represent complex dosing such as increasing or tapering doses.", 0, 1, renderedDosageInstruction)); children.add(new Property("dosageInstruction", "Dosage", "Indicates how the medication is to be used by the patient.", 0, java.lang.Integer.MAX_VALUE, dosageInstruction)); children.add(new Property("dispenseRequest", "", "Indicates the specific details for the dispense or medication supply part of a medication request (also known as a Medication Prescription or Medication Order). Note that this information is not always sent with the order. There may be in some settings (e.g. hospitals) institutional or system support for completing the dispense details in the pharmacy department.", 0, 1, dispenseRequest)); children.add(new Property("substitution", "", "Indicates whether or not substitution can or should be part of the dispense. In some cases, substitution must happen, in other cases substitution must not happen. This block explains the prescriber's intent. If nothing is specified substitution may be done.", 0, 1, substitution)); @@ -2966,6 +3023,7 @@ public class MedicationRequest extends DomainResource { case -447282031: /*courseOfTherapyType*/ return new Property("courseOfTherapyType", "CodeableConcept", "The description of the overall pattern of the administration of the medication to the patient.", 0, 1, courseOfTherapyType); case 73049818: /*insurance*/ return new Property("insurance", "Reference(Coverage|ClaimResponse)", "Insurance plans, coverage extensions, pre-authorizations and/or pre-determinations that may be required for delivering the requested service.", 0, java.lang.Integer.MAX_VALUE, insurance); case 3387378: /*note*/ return new Property("note", "Annotation", "Extra information about the prescription that could not be conveyed by the other attributes.", 0, java.lang.Integer.MAX_VALUE, note); + case 1718902050: /*renderedDosageInstruction*/ return new Property("renderedDosageInstruction", "string", "The full representation of the dose of the medication included in all dosage instructions. To be used when multiple dosage instructions are included to represent complex dosing such as increasing or tapering doses.", 0, 1, renderedDosageInstruction); case -1201373865: /*dosageInstruction*/ return new Property("dosageInstruction", "Dosage", "Indicates how the medication is to be used by the patient.", 0, java.lang.Integer.MAX_VALUE, dosageInstruction); case 824620658: /*dispenseRequest*/ return new Property("dispenseRequest", "", "Indicates the specific details for the dispense or medication supply part of a medication request (also known as a Medication Prescription or Medication Order). Note that this information is not always sent with the order. There may be in some settings (e.g. hospitals) institutional or system support for completing the dispense details in the pharmacy department.", 0, 1, dispenseRequest); case 826147581: /*substitution*/ return new Property("substitution", "", "Indicates whether or not substitution can or should be part of the dispense. In some cases, substitution must happen, in other cases substitution must not happen. This block explains the prescriber's intent. If nothing is specified substitution may be done.", 0, 1, substitution); @@ -3006,6 +3064,7 @@ public class MedicationRequest extends DomainResource { case -447282031: /*courseOfTherapyType*/ return this.courseOfTherapyType == null ? new Base[0] : new Base[] {this.courseOfTherapyType}; // CodeableConcept case 73049818: /*insurance*/ return this.insurance == null ? new Base[0] : this.insurance.toArray(new Base[this.insurance.size()]); // Reference case 3387378: /*note*/ return this.note == null ? new Base[0] : this.note.toArray(new Base[this.note.size()]); // Annotation + case 1718902050: /*renderedDosageInstruction*/ return this.renderedDosageInstruction == null ? new Base[0] : new Base[] {this.renderedDosageInstruction}; // StringType case -1201373865: /*dosageInstruction*/ return this.dosageInstruction == null ? new Base[0] : this.dosageInstruction.toArray(new Base[this.dosageInstruction.size()]); // Dosage case 824620658: /*dispenseRequest*/ return this.dispenseRequest == null ? new Base[0] : new Base[] {this.dispenseRequest}; // MedicationRequestDispenseRequestComponent case 826147581: /*substitution*/ return this.substitution == null ? new Base[0] : new Base[] {this.substitution}; // MedicationRequestSubstitutionComponent @@ -3101,6 +3160,9 @@ public class MedicationRequest extends DomainResource { case 3387378: // note this.getNote().add(TypeConvertor.castToAnnotation(value)); // Annotation return value; + case 1718902050: // renderedDosageInstruction + this.renderedDosageInstruction = TypeConvertor.castToString(value); // StringType + return value; case -1201373865: // dosageInstruction this.getDosageInstruction().add(TypeConvertor.castToDosage(value)); // Dosage return value; @@ -3181,6 +3243,8 @@ public class MedicationRequest extends DomainResource { this.getInsurance().add(TypeConvertor.castToReference(value)); } else if (name.equals("note")) { this.getNote().add(TypeConvertor.castToAnnotation(value)); + } else if (name.equals("renderedDosageInstruction")) { + this.renderedDosageInstruction = TypeConvertor.castToString(value); // StringType } else if (name.equals("dosageInstruction")) { this.getDosageInstruction().add(TypeConvertor.castToDosage(value)); } else if (name.equals("dispenseRequest")) { @@ -3228,6 +3292,7 @@ public class MedicationRequest extends DomainResource { case -447282031: return getCourseOfTherapyType(); case 73049818: return addInsurance(); case 3387378: return addNote(); + case 1718902050: return getRenderedDosageInstructionElement(); case -1201373865: return addDosageInstruction(); case 824620658: return getDispenseRequest(); case 826147581: return getSubstitution(); @@ -3268,6 +3333,7 @@ public class MedicationRequest extends DomainResource { case -447282031: /*courseOfTherapyType*/ return new String[] {"CodeableConcept"}; case 73049818: /*insurance*/ return new String[] {"Reference"}; case 3387378: /*note*/ return new String[] {"Annotation"}; + case 1718902050: /*renderedDosageInstruction*/ return new String[] {"string"}; case -1201373865: /*dosageInstruction*/ return new String[] {"Dosage"}; case 824620658: /*dispenseRequest*/ return new String[] {}; case 826147581: /*substitution*/ return new String[] {}; @@ -3374,6 +3440,9 @@ public class MedicationRequest extends DomainResource { else if (name.equals("note")) { return addNote(); } + else if (name.equals("renderedDosageInstruction")) { + throw new FHIRException("Cannot call addChild on a primitive type MedicationRequest.renderedDosageInstruction"); + } else if (name.equals("dosageInstruction")) { return addDosageInstruction(); } @@ -3474,6 +3543,7 @@ public class MedicationRequest extends DomainResource { for (Annotation i : note) dst.note.add(i.copy()); }; + dst.renderedDosageInstruction = renderedDosageInstruction == null ? null : renderedDosageInstruction.copy(); if (dosageInstruction != null) { dst.dosageInstruction = new ArrayList(); for (Dosage i : dosageInstruction) @@ -3514,10 +3584,11 @@ public class MedicationRequest extends DomainResource { && compareDeep(recorder, o.recorder, true) && compareDeep(reason, o.reason, true) && compareDeep(instantiatesCanonical, o.instantiatesCanonical, true) && compareDeep(instantiatesUri, o.instantiatesUri, true) && compareDeep(basedOn, o.basedOn, true) && compareDeep(groupIdentifier, o.groupIdentifier, true) && compareDeep(courseOfTherapyType, o.courseOfTherapyType, true) - && compareDeep(insurance, o.insurance, true) && compareDeep(note, o.note, true) && compareDeep(dosageInstruction, o.dosageInstruction, true) - && compareDeep(dispenseRequest, o.dispenseRequest, true) && compareDeep(substitution, o.substitution, true) - && compareDeep(priorPrescription, o.priorPrescription, true) && compareDeep(detectedIssue, o.detectedIssue, true) - && compareDeep(eventHistory, o.eventHistory, true); + && compareDeep(insurance, o.insurance, true) && compareDeep(note, o.note, true) && compareDeep(renderedDosageInstruction, o.renderedDosageInstruction, true) + && compareDeep(dosageInstruction, o.dosageInstruction, true) && compareDeep(dispenseRequest, o.dispenseRequest, true) + && compareDeep(substitution, o.substitution, true) && compareDeep(priorPrescription, o.priorPrescription, true) + && compareDeep(detectedIssue, o.detectedIssue, true) && compareDeep(eventHistory, o.eventHistory, true) + ; } @Override @@ -3530,7 +3601,7 @@ public class MedicationRequest extends DomainResource { return compareValues(status, o.status, true) && compareValues(intent, o.intent, true) && compareValues(priority, o.priority, true) && compareValues(doNotPerform, o.doNotPerform, true) && compareValues(reported, o.reported, true) && compareValues(authoredOn, o.authoredOn, true) && compareValues(instantiatesCanonical, o.instantiatesCanonical, true) && compareValues(instantiatesUri, o.instantiatesUri, true) - ; + && compareValues(renderedDosageInstruction, o.renderedDosageInstruction, true); } public boolean isEmpty() { @@ -3538,8 +3609,8 @@ public class MedicationRequest extends DomainResource { , intent, category, priority, doNotPerform, reported, informationSource, medication , subject, encounter, supportingInformation, authoredOn, requester, performer, performerType , recorder, reason, instantiatesCanonical, instantiatesUri, basedOn, groupIdentifier - , courseOfTherapyType, insurance, note, dosageInstruction, dispenseRequest, substitution - , priorPrescription, detectedIssue, eventHistory); + , courseOfTherapyType, insurance, note, renderedDosageInstruction, dosageInstruction + , dispenseRequest, substitution, priorPrescription, detectedIssue, eventHistory); } @Override @@ -3592,17 +3663,17 @@ public class MedicationRequest extends DomainResource { *

* Description: Returns prescriptions intended to be dispensed by this Organization
* Type: reference
- * Path: MedicationRequest.dispenseRequest.performer
+ * Path: MedicationRequest.dispenseRequest.dispenser
*

*/ - @SearchParamDefinition(name="intended-dispenser", path="MedicationRequest.dispenseRequest.performer", description="Returns prescriptions intended to be dispensed by this Organization", type="reference", target={Organization.class } ) + @SearchParamDefinition(name="intended-dispenser", path="MedicationRequest.dispenseRequest.dispenser", description="Returns prescriptions intended to be dispensed by this Organization", type="reference", target={Organization.class } ) public static final String SP_INTENDED_DISPENSER = "intended-dispenser"; /** * Fluent Client search parameter constant for intended-dispenser *

* Description: Returns prescriptions intended to be dispensed by this Organization
* Type: reference
- * Path: MedicationRequest.dispenseRequest.performer
+ * Path: MedicationRequest.dispenseRequest.dispenser
*

*/ public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam INTENDED_DISPENSER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_INTENDED_DISPENSER); 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 463715982..c15e90963 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; @@ -359,27 +359,27 @@ public class MedicationUsage extends DomainResource { protected List derivedFrom; /** - * A reason for why the medication is being/was taken. + * A concept, Condition or observation that supports why the medication is being/was taken. */ - @Child(name = "reasonCode", type = {CodeableConcept.class}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Reason for why the medication is being/was taken", formalDefinition="A reason for why the medication is being/was taken." ) + @Child(name = "reason", type = {CodeableReference.class}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="Reason for why the medication is being/was taken", formalDefinition="A concept, Condition or observation that supports why the medication is being/was taken." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/condition-code") - protected List reasonCode; - - /** - * Condition or observation that supports why the medication is being/was taken. - */ - @Child(name = "reasonReference", type = {Condition.class, Observation.class, DiagnosticReport.class}, order=14, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Condition or observation that supports why the medication is being/was taken", formalDefinition="Condition or observation that supports why the medication is being/was taken." ) - protected List reasonReference; + protected List reason; /** * Provides extra information about the Medication Usage that is not conveyed by the other attributes. */ - @Child(name = "note", type = {Annotation.class}, order=15, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "note", type = {Annotation.class}, order=14, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Further information about the usage", formalDefinition="Provides extra information about the Medication Usage that is not conveyed by the other attributes." ) protected List note; + /** + * The full representation of the dose of the medication included in all dosage instructions. To be used when multiple dosage instructions are included to represent complex dosing such as increasing or tapering doses. + */ + @Child(name = "renderedDosageInstruction", type = {StringType.class}, order=15, min=0, max=1, modifier=false, summary=false) + @Description(shortDefinition="Full representation of the dosage instructions", formalDefinition="The full representation of the dose of the medication included in all dosage instructions. To be used when multiple dosage instructions are included to represent complex dosing such as increasing or tapering doses." ) + protected StringType renderedDosageInstruction; + /** * Indicates how the medication is/was or should be taken by the patient. */ @@ -394,7 +394,7 @@ public class MedicationUsage extends DomainResource { @Description(shortDefinition="Indicates if the medication is being consumed or administered as prescribed", formalDefinition="Indicates if the medication is being consumed or administered as prescribed." ) protected BooleanType takenAsOrdered; - private static final long serialVersionUID = -1259122341L; + private static final long serialVersionUID = -1886428300L; /** * Constructor @@ -1000,109 +1000,56 @@ public class MedicationUsage extends DomainResource { } /** - * @return {@link #reasonCode} (A reason for why the medication is being/was taken.) + * @return {@link #reason} (A concept, Condition or observation that supports why the medication is being/was taken.) */ - public List getReasonCode() { - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - return this.reasonCode; + public List getReason() { + if (this.reason == null) + this.reason = new ArrayList(); + return this.reason; } /** * @return Returns a reference to this for easy method chaining */ - public MedicationUsage setReasonCode(List theReasonCode) { - this.reasonCode = theReasonCode; + public MedicationUsage setReason(List theReason) { + this.reason = theReason; return this; } - public boolean hasReasonCode() { - if (this.reasonCode == null) + public boolean hasReason() { + if (this.reason == null) return false; - for (CodeableConcept item : this.reasonCode) + for (CodeableReference item : this.reason) if (!item.isEmpty()) return true; return false; } - public CodeableConcept addReasonCode() { //3 - CodeableConcept t = new CodeableConcept(); - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); + public CodeableReference addReason() { //3 + CodeableReference t = new CodeableReference(); + if (this.reason == null) + this.reason = new ArrayList(); + this.reason.add(t); return t; } - public MedicationUsage addReasonCode(CodeableConcept t) { //3 + public MedicationUsage addReason(CodeableReference t) { //3 if (t == null) return this; - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); + if (this.reason == null) + this.reason = new ArrayList(); + this.reason.add(t); return this; } /** - * @return The first repetition of repeating field {@link #reasonCode}, creating it if it does not already exist {3} + * @return The first repetition of repeating field {@link #reason}, creating it if it does not already exist {3} */ - public CodeableConcept getReasonCodeFirstRep() { - if (getReasonCode().isEmpty()) { - addReasonCode(); + public CodeableReference getReasonFirstRep() { + if (getReason().isEmpty()) { + addReason(); } - return getReasonCode().get(0); - } - - /** - * @return {@link #reasonReference} (Condition or observation that supports why the medication is being/was taken.) - */ - public List getReasonReference() { - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - return this.reasonReference; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public MedicationUsage setReasonReference(List theReasonReference) { - this.reasonReference = theReasonReference; - return this; - } - - public boolean hasReasonReference() { - if (this.reasonReference == null) - return false; - for (Reference item : this.reasonReference) - if (!item.isEmpty()) - return true; - return false; - } - - public Reference addReasonReference() { //3 - Reference t = new Reference(); - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return t; - } - - public MedicationUsage addReasonReference(Reference t) { //3 - if (t == null) - return this; - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #reasonReference}, creating it if it does not already exist {3} - */ - public Reference getReasonReferenceFirstRep() { - if (getReasonReference().isEmpty()) { - addReasonReference(); - } - return getReasonReference().get(0); + return getReason().get(0); } /** @@ -1158,6 +1105,55 @@ public class MedicationUsage extends DomainResource { return getNote().get(0); } + /** + * @return {@link #renderedDosageInstruction} (The full representation of the dose of the medication included in all dosage instructions. To be used when multiple dosage instructions are included to represent complex dosing such as increasing or tapering doses.). This is the underlying object with id, value and extensions. The accessor "getRenderedDosageInstruction" gives direct access to the value + */ + public StringType getRenderedDosageInstructionElement() { + if (this.renderedDosageInstruction == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create MedicationUsage.renderedDosageInstruction"); + else if (Configuration.doAutoCreate()) + this.renderedDosageInstruction = new StringType(); // bb + return this.renderedDosageInstruction; + } + + public boolean hasRenderedDosageInstructionElement() { + return this.renderedDosageInstruction != null && !this.renderedDosageInstruction.isEmpty(); + } + + public boolean hasRenderedDosageInstruction() { + return this.renderedDosageInstruction != null && !this.renderedDosageInstruction.isEmpty(); + } + + /** + * @param value {@link #renderedDosageInstruction} (The full representation of the dose of the medication included in all dosage instructions. To be used when multiple dosage instructions are included to represent complex dosing such as increasing or tapering doses.). This is the underlying object with id, value and extensions. The accessor "getRenderedDosageInstruction" gives direct access to the value + */ + public MedicationUsage setRenderedDosageInstructionElement(StringType value) { + this.renderedDosageInstruction = value; + return this; + } + + /** + * @return The full representation of the dose of the medication included in all dosage instructions. To be used when multiple dosage instructions are included to represent complex dosing such as increasing or tapering doses. + */ + public String getRenderedDosageInstruction() { + return this.renderedDosageInstruction == null ? null : this.renderedDosageInstruction.getValue(); + } + + /** + * @param value The full representation of the dose of the medication included in all dosage instructions. To be used when multiple dosage instructions are included to represent complex dosing such as increasing or tapering doses. + */ + public MedicationUsage setRenderedDosageInstruction(String value) { + if (Utilities.noString(value)) + this.renderedDosageInstruction = null; + else { + if (this.renderedDosageInstruction == null) + this.renderedDosageInstruction = new StringType(); + this.renderedDosageInstruction.setValue(value); + } + return this; + } + /** * @return {@link #dosage} (Indicates how the medication is/was or should be taken by the patient.) */ @@ -1271,9 +1267,9 @@ public class MedicationUsage extends DomainResource { children.add(new Property("dateAsserted", "dateTime", "The date when the Medication Usage was asserted by the information source.", 0, 1, dateAsserted)); children.add(new Property("informationSource", "Reference(Patient|Practitioner|PractitionerRole|RelatedPerson|Organization)", "The person or organization that provided the information about the taking of this medication. Note: Use derivedFrom when a MedicationUsage is derived from other resources, e.g. Claim or MedicationRequest.", 0, 1, informationSource)); children.add(new Property("derivedFrom", "Reference(Any)", "Allows linking the MedicationUsage to the underlying MedicationRequest, or to other information that supports or is used to derive the MedicationUsage.", 0, java.lang.Integer.MAX_VALUE, derivedFrom)); - children.add(new Property("reasonCode", "CodeableConcept", "A reason for why the medication is being/was taken.", 0, java.lang.Integer.MAX_VALUE, reasonCode)); - children.add(new Property("reasonReference", "Reference(Condition|Observation|DiagnosticReport)", "Condition or observation that supports why the medication is being/was taken.", 0, java.lang.Integer.MAX_VALUE, reasonReference)); + children.add(new Property("reason", "CodeableReference(Condition|Observation|DiagnosticReport)", "A concept, Condition or observation that supports why the medication is being/was taken.", 0, java.lang.Integer.MAX_VALUE, reason)); children.add(new Property("note", "Annotation", "Provides extra information about the Medication Usage that is not conveyed by the other attributes.", 0, java.lang.Integer.MAX_VALUE, note)); + children.add(new Property("renderedDosageInstruction", "string", "The full representation of the dose of the medication included in all dosage instructions. To be used when multiple dosage instructions are included to represent complex dosing such as increasing or tapering doses.", 0, 1, renderedDosageInstruction)); children.add(new Property("dosage", "Dosage", "Indicates how the medication is/was or should be taken by the patient.", 0, java.lang.Integer.MAX_VALUE, dosage)); children.add(new Property("takenAsOrdered", "boolean", "Indicates if the medication is being consumed or administered as prescribed.", 0, 1, takenAsOrdered)); } @@ -1300,9 +1296,9 @@ public class MedicationUsage extends DomainResource { case -1980855245: /*dateAsserted*/ return new Property("dateAsserted", "dateTime", "The date when the Medication Usage was asserted by the information source.", 0, 1, dateAsserted); case -2123220889: /*informationSource*/ return new Property("informationSource", "Reference(Patient|Practitioner|PractitionerRole|RelatedPerson|Organization)", "The person or organization that provided the information about the taking of this medication. Note: Use derivedFrom when a MedicationUsage is derived from other resources, e.g. Claim or MedicationRequest.", 0, 1, informationSource); case 1077922663: /*derivedFrom*/ return new Property("derivedFrom", "Reference(Any)", "Allows linking the MedicationUsage to the underlying MedicationRequest, or to other information that supports or is used to derive the MedicationUsage.", 0, java.lang.Integer.MAX_VALUE, derivedFrom); - case 722137681: /*reasonCode*/ return new Property("reasonCode", "CodeableConcept", "A reason for why the medication is being/was taken.", 0, java.lang.Integer.MAX_VALUE, reasonCode); - case -1146218137: /*reasonReference*/ return new Property("reasonReference", "Reference(Condition|Observation|DiagnosticReport)", "Condition or observation that supports why the medication is being/was taken.", 0, java.lang.Integer.MAX_VALUE, reasonReference); + case -934964668: /*reason*/ return new Property("reason", "CodeableReference(Condition|Observation|DiagnosticReport)", "A concept, Condition or observation that supports why the medication is being/was taken.", 0, java.lang.Integer.MAX_VALUE, reason); case 3387378: /*note*/ return new Property("note", "Annotation", "Provides extra information about the Medication Usage that is not conveyed by the other attributes.", 0, java.lang.Integer.MAX_VALUE, note); + case 1718902050: /*renderedDosageInstruction*/ return new Property("renderedDosageInstruction", "string", "The full representation of the dose of the medication included in all dosage instructions. To be used when multiple dosage instructions are included to represent complex dosing such as increasing or tapering doses.", 0, 1, renderedDosageInstruction); case -1326018889: /*dosage*/ return new Property("dosage", "Dosage", "Indicates how the medication is/was or should be taken by the patient.", 0, java.lang.Integer.MAX_VALUE, dosage); case 268106452: /*takenAsOrdered*/ return new Property("takenAsOrdered", "boolean", "Indicates if the medication is being consumed or administered as prescribed.", 0, 1, takenAsOrdered); default: return super.getNamedProperty(_hash, _name, _checkValid); @@ -1326,9 +1322,9 @@ public class MedicationUsage extends DomainResource { case -1980855245: /*dateAsserted*/ return this.dateAsserted == null ? new Base[0] : new Base[] {this.dateAsserted}; // DateTimeType case -2123220889: /*informationSource*/ return this.informationSource == null ? new Base[0] : new Base[] {this.informationSource}; // Reference case 1077922663: /*derivedFrom*/ return this.derivedFrom == null ? new Base[0] : this.derivedFrom.toArray(new Base[this.derivedFrom.size()]); // Reference - case 722137681: /*reasonCode*/ return this.reasonCode == null ? new Base[0] : this.reasonCode.toArray(new Base[this.reasonCode.size()]); // CodeableConcept - case -1146218137: /*reasonReference*/ return this.reasonReference == null ? new Base[0] : this.reasonReference.toArray(new Base[this.reasonReference.size()]); // Reference + case -934964668: /*reason*/ return this.reason == null ? new Base[0] : this.reason.toArray(new Base[this.reason.size()]); // CodeableReference case 3387378: /*note*/ return this.note == null ? new Base[0] : this.note.toArray(new Base[this.note.size()]); // Annotation + case 1718902050: /*renderedDosageInstruction*/ return this.renderedDosageInstruction == null ? new Base[0] : new Base[] {this.renderedDosageInstruction}; // StringType case -1326018889: /*dosage*/ return this.dosage == null ? new Base[0] : this.dosage.toArray(new Base[this.dosage.size()]); // Dosage case 268106452: /*takenAsOrdered*/ return this.takenAsOrdered == null ? new Base[0] : new Base[] {this.takenAsOrdered}; // BooleanType default: return super.getProperty(hash, name, checkValid); @@ -1379,15 +1375,15 @@ public class MedicationUsage extends DomainResource { case 1077922663: // derivedFrom this.getDerivedFrom().add(TypeConvertor.castToReference(value)); // Reference return value; - case 722137681: // reasonCode - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept - return value; - case -1146218137: // reasonReference - this.getReasonReference().add(TypeConvertor.castToReference(value)); // Reference + case -934964668: // reason + this.getReason().add(TypeConvertor.castToCodeableReference(value)); // CodeableReference return value; case 3387378: // note this.getNote().add(TypeConvertor.castToAnnotation(value)); // Annotation return value; + case 1718902050: // renderedDosageInstruction + this.renderedDosageInstruction = TypeConvertor.castToString(value); // StringType + return value; case -1326018889: // dosage this.getDosage().add(TypeConvertor.castToDosage(value)); // Dosage return value; @@ -1428,12 +1424,12 @@ public class MedicationUsage extends DomainResource { this.informationSource = TypeConvertor.castToReference(value); // Reference } else if (name.equals("derivedFrom")) { this.getDerivedFrom().add(TypeConvertor.castToReference(value)); - } else if (name.equals("reasonCode")) { - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); - } else if (name.equals("reasonReference")) { - this.getReasonReference().add(TypeConvertor.castToReference(value)); + } else if (name.equals("reason")) { + this.getReason().add(TypeConvertor.castToCodeableReference(value)); } else if (name.equals("note")) { this.getNote().add(TypeConvertor.castToAnnotation(value)); + } else if (name.equals("renderedDosageInstruction")) { + this.renderedDosageInstruction = TypeConvertor.castToString(value); // StringType } else if (name.equals("dosage")) { this.getDosage().add(TypeConvertor.castToDosage(value)); } else if (name.equals("takenAsOrdered")) { @@ -1461,9 +1457,9 @@ public class MedicationUsage extends DomainResource { case -1980855245: return getDateAssertedElement(); case -2123220889: return getInformationSource(); case 1077922663: return addDerivedFrom(); - case 722137681: return addReasonCode(); - case -1146218137: return addReasonReference(); + case -934964668: return addReason(); case 3387378: return addNote(); + case 1718902050: return getRenderedDosageInstructionElement(); case -1326018889: return addDosage(); case 268106452: return getTakenAsOrderedElement(); default: return super.makeProperty(hash, name); @@ -1487,9 +1483,9 @@ public class MedicationUsage extends DomainResource { case -1980855245: /*dateAsserted*/ return new String[] {"dateTime"}; case -2123220889: /*informationSource*/ return new String[] {"Reference"}; case 1077922663: /*derivedFrom*/ return new String[] {"Reference"}; - case 722137681: /*reasonCode*/ return new String[] {"CodeableConcept"}; - case -1146218137: /*reasonReference*/ return new String[] {"Reference"}; + case -934964668: /*reason*/ return new String[] {"CodeableReference"}; case 3387378: /*note*/ return new String[] {"Annotation"}; + case 1718902050: /*renderedDosageInstruction*/ return new String[] {"string"}; case -1326018889: /*dosage*/ return new String[] {"Dosage"}; case 268106452: /*takenAsOrdered*/ return new String[] {"boolean"}; default: return super.getTypesForProperty(hash, name); @@ -1551,15 +1547,15 @@ public class MedicationUsage extends DomainResource { else if (name.equals("derivedFrom")) { return addDerivedFrom(); } - else if (name.equals("reasonCode")) { - return addReasonCode(); - } - else if (name.equals("reasonReference")) { - return addReasonReference(); + else if (name.equals("reason")) { + return addReason(); } else if (name.equals("note")) { return addNote(); } + else if (name.equals("renderedDosageInstruction")) { + throw new FHIRException("Cannot call addChild on a primitive type MedicationUsage.renderedDosageInstruction"); + } else if (name.equals("dosage")) { return addDosage(); } @@ -1620,21 +1616,17 @@ public class MedicationUsage extends DomainResource { for (Reference i : derivedFrom) dst.derivedFrom.add(i.copy()); }; - if (reasonCode != null) { - dst.reasonCode = new ArrayList(); - for (CodeableConcept i : reasonCode) - dst.reasonCode.add(i.copy()); - }; - if (reasonReference != null) { - dst.reasonReference = new ArrayList(); - for (Reference i : reasonReference) - dst.reasonReference.add(i.copy()); + if (reason != null) { + dst.reason = new ArrayList(); + for (CodeableReference i : reason) + dst.reason.add(i.copy()); }; if (note != null) { dst.note = new ArrayList(); for (Annotation i : note) dst.note.add(i.copy()); }; + dst.renderedDosageInstruction = renderedDosageInstruction == null ? null : renderedDosageInstruction.copy(); if (dosage != null) { dst.dosage = new ArrayList(); for (Dosage i : dosage) @@ -1659,9 +1651,8 @@ public class MedicationUsage extends DomainResource { && compareDeep(medication, o.medication, true) && compareDeep(subject, o.subject, true) && compareDeep(encounter, o.encounter, true) && compareDeep(effective, o.effective, true) && compareDeep(dateAsserted, o.dateAsserted, true) && compareDeep(informationSource, o.informationSource, true) && compareDeep(derivedFrom, o.derivedFrom, true) - && compareDeep(reasonCode, o.reasonCode, true) && compareDeep(reasonReference, o.reasonReference, true) - && compareDeep(note, o.note, true) && compareDeep(dosage, o.dosage, true) && compareDeep(takenAsOrdered, o.takenAsOrdered, true) - ; + && compareDeep(reason, o.reason, true) && compareDeep(note, o.note, true) && compareDeep(renderedDosageInstruction, o.renderedDosageInstruction, true) + && compareDeep(dosage, o.dosage, true) && compareDeep(takenAsOrdered, o.takenAsOrdered, true); } @Override @@ -1671,15 +1662,15 @@ public class MedicationUsage extends DomainResource { if (!(other_ instanceof MedicationUsage)) return false; MedicationUsage o = (MedicationUsage) other_; - return compareValues(status, o.status, true) && compareValues(dateAsserted, o.dateAsserted, true) && compareValues(takenAsOrdered, o.takenAsOrdered, true) - ; + return compareValues(status, o.status, true) && compareValues(dateAsserted, o.dateAsserted, true) && compareValues(renderedDosageInstruction, o.renderedDosageInstruction, true) + && compareValues(takenAsOrdered, o.takenAsOrdered, true); } public boolean isEmpty() { return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, basedOn, partOf , status, statusReason, category, medication, subject, encounter, effective, dateAsserted - , informationSource, derivedFrom, reasonCode, reasonReference, note, dosage, takenAsOrdered - ); + , informationSource, derivedFrom, reason, note, renderedDosageInstruction, dosage + , takenAsOrdered); } @Override 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 573f72b55..e067dc311 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; @@ -1404,48 +1404,41 @@ public class MedicinalProductDefinition extends DomainResource { @Block() public static class MedicinalProductDefinitionManufacturingBusinessOperationComponent extends BackboneElement implements IBaseBackboneElement { /** - * The type of manufacturing operation e.g. manufacturing itself, re-packaging. + * The type of manufacturing operation e.g. manufacturing itself, re-packaging. This may be a subtype of some other wider scope of authorized operation, referenced by the authorization attribute. */ - @Child(name = "operationType", type = {CodeableConcept.class}, order=1, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="The type of manufacturing operation e.g. manufacturing itself, re-packaging", formalDefinition="The type of manufacturing operation e.g. manufacturing itself, re-packaging." ) - protected CodeableConcept operationType; + @Child(name = "type", type = {Coding.class, ActivityDefinition.class}, order=1, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="The type of manufacturing operation e.g. manufacturing itself, re-packaging. This may be a subtype of some other wider scope of authorized operation, referenced by the authorization attribute", formalDefinition="The type of manufacturing operation e.g. manufacturing itself, re-packaging. This may be a subtype of some other wider scope of authorized operation, referenced by the authorization attribute." ) + protected DataType type; /** - * Regulatory authorization reference number. + * Date range of applicability. */ - @Child(name = "authorisationReferenceNumber", type = {Identifier.class}, order=2, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Regulatory authorization reference number", formalDefinition="Regulatory authorization reference number." ) - protected Identifier authorisationReferenceNumber; - - /** - * Regulatory authorization date. - */ - @Child(name = "effectiveDate", type = {Period.class}, order=3, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="Regulatory authorization date", formalDefinition="Regulatory authorization date." ) + @Child(name = "effectiveDate", type = {Period.class}, order=2, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="Date range of applicability", formalDefinition="Date range of applicability." ) protected Period effectiveDate; - /** - * To indicate if this proces is commercially confidential. - */ - @Child(name = "confidentialityIndicator", type = {CodeableConcept.class}, order=4, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="To indicate if this proces is commercially confidential", formalDefinition="To indicate if this proces is commercially confidential." ) - protected CodeableConcept confidentialityIndicator; - /** * The manufacturer or establishment associated with the process. */ - @Child(name = "manufacturer", type = {Organization.class}, order=5, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "manufacturer", type = {Organization.class}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="The manufacturer or establishment associated with the process", formalDefinition="The manufacturer or establishment associated with the process." ) protected List manufacturer; /** - * A regulator which oversees the operation. + * An authorization for this process, either as a logical reference, holding just an identifier, or a full refererence to a resource that captures the details. The authorization mayu possibly apply to several products or a wider scope of process of which this is a part. */ - @Child(name = "regulator", type = {Organization.class}, order=6, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="A regulator which oversees the operation", formalDefinition="A regulator which oversees the operation." ) - protected Reference regulator; + @Child(name = "authorization", type = {RegulatedAuthorization.class}, order=4, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="An authorization for this process, either as a logical reference, holding just an identifier, or a full refererence to a resource that captures the details. The authorization mayu possibly apply to several products or a wider scope of process of which this is a part", formalDefinition="An authorization for this process, either as a logical reference, holding just an identifier, or a full refererence to a resource that captures the details. The authorization mayu possibly apply to several products or a wider scope of process of which this is a part." ) + protected Reference authorization; - private static final long serialVersionUID = -268651569L; + /** + * To indicate if this proces is commercially confidential. + */ + @Child(name = "confidentialityIndicator", type = {CodeableConcept.class}, order=5, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="To indicate if this proces is commercially confidential", formalDefinition="To indicate if this proces is commercially confidential." ) + protected CodeableConcept confidentialityIndicator; + + private static final long serialVersionUID = 499207214L; /** * Constructor @@ -1455,55 +1448,58 @@ public class MedicinalProductDefinition extends DomainResource { } /** - * @return {@link #operationType} (The type of manufacturing operation e.g. manufacturing itself, re-packaging.) + * @return {@link #type} (The type of manufacturing operation e.g. manufacturing itself, re-packaging. This may be a subtype of some other wider scope of authorized operation, referenced by the authorization attribute.) */ - public CodeableConcept getOperationType() { - if (this.operationType == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicinalProductDefinitionManufacturingBusinessOperationComponent.operationType"); - else if (Configuration.doAutoCreate()) - this.operationType = new CodeableConcept(); // cc - return this.operationType; - } - - public boolean hasOperationType() { - return this.operationType != null && !this.operationType.isEmpty(); + public DataType getType() { + return this.type; } /** - * @param value {@link #operationType} (The type of manufacturing operation e.g. manufacturing itself, re-packaging.) + * @return {@link #type} (The type of manufacturing operation e.g. manufacturing itself, re-packaging. This may be a subtype of some other wider scope of authorized operation, referenced by the authorization attribute.) */ - public MedicinalProductDefinitionManufacturingBusinessOperationComponent setOperationType(CodeableConcept value) { - this.operationType = value; + public Coding getTypeCoding() throws FHIRException { + if (this.type == null) + this.type = new Coding(); + if (!(this.type instanceof Coding)) + throw new FHIRException("Type mismatch: the type Coding was expected, but "+this.type.getClass().getName()+" was encountered"); + return (Coding) this.type; + } + + public boolean hasTypeCoding() { + return this != null && this.type instanceof Coding; + } + + /** + * @return {@link #type} (The type of manufacturing operation e.g. manufacturing itself, re-packaging. This may be a subtype of some other wider scope of authorized operation, referenced by the authorization attribute.) + */ + public Reference getTypeReference() throws FHIRException { + if (this.type == null) + this.type = new Reference(); + if (!(this.type instanceof Reference)) + throw new FHIRException("Type mismatch: the type Reference was expected, but "+this.type.getClass().getName()+" was encountered"); + return (Reference) this.type; + } + + public boolean hasTypeReference() { + return this != null && this.type instanceof Reference; + } + + public boolean hasType() { + return this.type != null && !this.type.isEmpty(); + } + + /** + * @param value {@link #type} (The type of manufacturing operation e.g. manufacturing itself, re-packaging. This may be a subtype of some other wider scope of authorized operation, referenced by the authorization attribute.) + */ + public MedicinalProductDefinitionManufacturingBusinessOperationComponent setType(DataType value) { + if (value != null && !(value instanceof Coding || value instanceof Reference)) + throw new Error("Not the right type for MedicinalProductDefinition.manufacturingBusinessOperation.type[x]: "+value.fhirType()); + this.type = value; return this; } /** - * @return {@link #authorisationReferenceNumber} (Regulatory authorization reference number.) - */ - public Identifier getAuthorisationReferenceNumber() { - if (this.authorisationReferenceNumber == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicinalProductDefinitionManufacturingBusinessOperationComponent.authorisationReferenceNumber"); - else if (Configuration.doAutoCreate()) - this.authorisationReferenceNumber = new Identifier(); // cc - return this.authorisationReferenceNumber; - } - - public boolean hasAuthorisationReferenceNumber() { - return this.authorisationReferenceNumber != null && !this.authorisationReferenceNumber.isEmpty(); - } - - /** - * @param value {@link #authorisationReferenceNumber} (Regulatory authorization reference number.) - */ - public MedicinalProductDefinitionManufacturingBusinessOperationComponent setAuthorisationReferenceNumber(Identifier value) { - this.authorisationReferenceNumber = value; - return this; - } - - /** - * @return {@link #effectiveDate} (Regulatory authorization date.) + * @return {@link #effectiveDate} (Date range of applicability.) */ public Period getEffectiveDate() { if (this.effectiveDate == null) @@ -1519,37 +1515,13 @@ public class MedicinalProductDefinition extends DomainResource { } /** - * @param value {@link #effectiveDate} (Regulatory authorization date.) + * @param value {@link #effectiveDate} (Date range of applicability.) */ public MedicinalProductDefinitionManufacturingBusinessOperationComponent setEffectiveDate(Period value) { this.effectiveDate = value; return this; } - /** - * @return {@link #confidentialityIndicator} (To indicate if this proces is commercially confidential.) - */ - public CodeableConcept getConfidentialityIndicator() { - if (this.confidentialityIndicator == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicinalProductDefinitionManufacturingBusinessOperationComponent.confidentialityIndicator"); - else if (Configuration.doAutoCreate()) - this.confidentialityIndicator = new CodeableConcept(); // cc - return this.confidentialityIndicator; - } - - public boolean hasConfidentialityIndicator() { - return this.confidentialityIndicator != null && !this.confidentialityIndicator.isEmpty(); - } - - /** - * @param value {@link #confidentialityIndicator} (To indicate if this proces is commercially confidential.) - */ - public MedicinalProductDefinitionManufacturingBusinessOperationComponent setConfidentialityIndicator(CodeableConcept value) { - this.confidentialityIndicator = value; - return this; - } - /** * @return {@link #manufacturer} (The manufacturer or establishment associated with the process.) */ @@ -1604,48 +1576,73 @@ public class MedicinalProductDefinition extends DomainResource { } /** - * @return {@link #regulator} (A regulator which oversees the operation.) + * @return {@link #authorization} (An authorization for this process, either as a logical reference, holding just an identifier, or a full refererence to a resource that captures the details. The authorization mayu possibly apply to several products or a wider scope of process of which this is a part.) */ - public Reference getRegulator() { - if (this.regulator == null) + public Reference getAuthorization() { + if (this.authorization == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicinalProductDefinitionManufacturingBusinessOperationComponent.regulator"); + throw new Error("Attempt to auto-create MedicinalProductDefinitionManufacturingBusinessOperationComponent.authorization"); else if (Configuration.doAutoCreate()) - this.regulator = new Reference(); // cc - return this.regulator; + this.authorization = new Reference(); // cc + return this.authorization; } - public boolean hasRegulator() { - return this.regulator != null && !this.regulator.isEmpty(); + public boolean hasAuthorization() { + return this.authorization != null && !this.authorization.isEmpty(); } /** - * @param value {@link #regulator} (A regulator which oversees the operation.) + * @param value {@link #authorization} (An authorization for this process, either as a logical reference, holding just an identifier, or a full refererence to a resource that captures the details. The authorization mayu possibly apply to several products or a wider scope of process of which this is a part.) */ - public MedicinalProductDefinitionManufacturingBusinessOperationComponent setRegulator(Reference value) { - this.regulator = value; + public MedicinalProductDefinitionManufacturingBusinessOperationComponent setAuthorization(Reference value) { + this.authorization = value; + return this; + } + + /** + * @return {@link #confidentialityIndicator} (To indicate if this proces is commercially confidential.) + */ + public CodeableConcept getConfidentialityIndicator() { + if (this.confidentialityIndicator == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create MedicinalProductDefinitionManufacturingBusinessOperationComponent.confidentialityIndicator"); + else if (Configuration.doAutoCreate()) + this.confidentialityIndicator = new CodeableConcept(); // cc + return this.confidentialityIndicator; + } + + public boolean hasConfidentialityIndicator() { + return this.confidentialityIndicator != null && !this.confidentialityIndicator.isEmpty(); + } + + /** + * @param value {@link #confidentialityIndicator} (To indicate if this proces is commercially confidential.) + */ + public MedicinalProductDefinitionManufacturingBusinessOperationComponent setConfidentialityIndicator(CodeableConcept value) { + this.confidentialityIndicator = value; return this; } protected void listChildren(List children) { super.listChildren(children); - children.add(new Property("operationType", "CodeableConcept", "The type of manufacturing operation e.g. manufacturing itself, re-packaging.", 0, 1, operationType)); - children.add(new Property("authorisationReferenceNumber", "Identifier", "Regulatory authorization reference number.", 0, 1, authorisationReferenceNumber)); - children.add(new Property("effectiveDate", "Period", "Regulatory authorization date.", 0, 1, effectiveDate)); - children.add(new Property("confidentialityIndicator", "CodeableConcept", "To indicate if this proces is commercially confidential.", 0, 1, confidentialityIndicator)); + children.add(new Property("type[x]", "Coding|Reference(ActivityDefinition)", "The type of manufacturing operation e.g. manufacturing itself, re-packaging. This may be a subtype of some other wider scope of authorized operation, referenced by the authorization attribute.", 0, 1, type)); + children.add(new Property("effectiveDate", "Period", "Date range of applicability.", 0, 1, effectiveDate)); children.add(new Property("manufacturer", "Reference(Organization)", "The manufacturer or establishment associated with the process.", 0, java.lang.Integer.MAX_VALUE, manufacturer)); - children.add(new Property("regulator", "Reference(Organization)", "A regulator which oversees the operation.", 0, 1, regulator)); + children.add(new Property("authorization", "Reference(RegulatedAuthorization)", "An authorization for this process, either as a logical reference, holding just an identifier, or a full refererence to a resource that captures the details. The authorization mayu possibly apply to several products or a wider scope of process of which this is a part.", 0, 1, authorization)); + children.add(new Property("confidentialityIndicator", "CodeableConcept", "To indicate if this proces is commercially confidential.", 0, 1, confidentialityIndicator)); } @Override public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { switch (_hash) { - case 91999553: /*operationType*/ return new Property("operationType", "CodeableConcept", "The type of manufacturing operation e.g. manufacturing itself, re-packaging.", 0, 1, operationType); - case -1940839884: /*authorisationReferenceNumber*/ return new Property("authorisationReferenceNumber", "Identifier", "Regulatory authorization reference number.", 0, 1, authorisationReferenceNumber); - case -930389515: /*effectiveDate*/ return new Property("effectiveDate", "Period", "Regulatory authorization date.", 0, 1, effectiveDate); - case -1449404791: /*confidentialityIndicator*/ return new Property("confidentialityIndicator", "CodeableConcept", "To indicate if this proces is commercially confidential.", 0, 1, confidentialityIndicator); + case -853093626: /*type[x]*/ return new Property("type[x]", "Coding|Reference(ActivityDefinition)", "The type of manufacturing operation e.g. manufacturing itself, re-packaging. This may be a subtype of some other wider scope of authorized operation, referenced by the authorization attribute.", 0, 1, type); + case 3575610: /*type*/ return new Property("type[x]", "Coding|Reference(ActivityDefinition)", "The type of manufacturing operation e.g. manufacturing itself, re-packaging. This may be a subtype of some other wider scope of authorized operation, referenced by the authorization attribute.", 0, 1, type); + case -1885820092: /*typeCoding*/ return new Property("type[x]", "Coding", "The type of manufacturing operation e.g. manufacturing itself, re-packaging. This may be a subtype of some other wider scope of authorized operation, referenced by the authorization attribute.", 0, 1, type); + case 2074825009: /*typeReference*/ return new Property("type[x]", "Reference(ActivityDefinition)", "The type of manufacturing operation e.g. manufacturing itself, re-packaging. This may be a subtype of some other wider scope of authorized operation, referenced by the authorization attribute.", 0, 1, type); + case -930389515: /*effectiveDate*/ return new Property("effectiveDate", "Period", "Date range of applicability.", 0, 1, effectiveDate); case -1969347631: /*manufacturer*/ return new Property("manufacturer", "Reference(Organization)", "The manufacturer or establishment associated with the process.", 0, java.lang.Integer.MAX_VALUE, manufacturer); - case 414760449: /*regulator*/ return new Property("regulator", "Reference(Organization)", "A regulator which oversees the operation.", 0, 1, regulator); + case -1385570183: /*authorization*/ return new Property("authorization", "Reference(RegulatedAuthorization)", "An authorization for this process, either as a logical reference, holding just an identifier, or a full refererence to a resource that captures the details. The authorization mayu possibly apply to several products or a wider scope of process of which this is a part.", 0, 1, authorization); + case -1449404791: /*confidentialityIndicator*/ return new Property("confidentialityIndicator", "CodeableConcept", "To indicate if this proces is commercially confidential.", 0, 1, confidentialityIndicator); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -1654,12 +1651,11 @@ public class MedicinalProductDefinition extends DomainResource { @Override public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException { switch (hash) { - case 91999553: /*operationType*/ return this.operationType == null ? new Base[0] : new Base[] {this.operationType}; // CodeableConcept - case -1940839884: /*authorisationReferenceNumber*/ return this.authorisationReferenceNumber == null ? new Base[0] : new Base[] {this.authorisationReferenceNumber}; // Identifier + case 3575610: /*type*/ return this.type == null ? new Base[0] : new Base[] {this.type}; // DataType case -930389515: /*effectiveDate*/ return this.effectiveDate == null ? new Base[0] : new Base[] {this.effectiveDate}; // Period - case -1449404791: /*confidentialityIndicator*/ return this.confidentialityIndicator == null ? new Base[0] : new Base[] {this.confidentialityIndicator}; // CodeableConcept case -1969347631: /*manufacturer*/ return this.manufacturer == null ? new Base[0] : this.manufacturer.toArray(new Base[this.manufacturer.size()]); // Reference - case 414760449: /*regulator*/ return this.regulator == null ? new Base[0] : new Base[] {this.regulator}; // Reference + case -1385570183: /*authorization*/ return this.authorization == null ? new Base[0] : new Base[] {this.authorization}; // Reference + case -1449404791: /*confidentialityIndicator*/ return this.confidentialityIndicator == null ? new Base[0] : new Base[] {this.confidentialityIndicator}; // CodeableConcept default: return super.getProperty(hash, name, checkValid); } @@ -1668,23 +1664,20 @@ public class MedicinalProductDefinition extends DomainResource { @Override public Base setProperty(int hash, String name, Base value) throws FHIRException { switch (hash) { - case 91999553: // operationType - this.operationType = TypeConvertor.castToCodeableConcept(value); // CodeableConcept - return value; - case -1940839884: // authorisationReferenceNumber - this.authorisationReferenceNumber = TypeConvertor.castToIdentifier(value); // Identifier + case 3575610: // type + this.type = TypeConvertor.castToType(value); // DataType return value; case -930389515: // effectiveDate this.effectiveDate = TypeConvertor.castToPeriod(value); // Period return value; - case -1449404791: // confidentialityIndicator - this.confidentialityIndicator = TypeConvertor.castToCodeableConcept(value); // CodeableConcept - return value; case -1969347631: // manufacturer this.getManufacturer().add(TypeConvertor.castToReference(value)); // Reference return value; - case 414760449: // regulator - this.regulator = TypeConvertor.castToReference(value); // Reference + case -1385570183: // authorization + this.authorization = TypeConvertor.castToReference(value); // Reference + return value; + case -1449404791: // confidentialityIndicator + this.confidentialityIndicator = TypeConvertor.castToCodeableConcept(value); // CodeableConcept return value; default: return super.setProperty(hash, name, value); } @@ -1693,18 +1686,16 @@ public class MedicinalProductDefinition extends DomainResource { @Override public Base setProperty(String name, Base value) throws FHIRException { - if (name.equals("operationType")) { - this.operationType = TypeConvertor.castToCodeableConcept(value); // CodeableConcept - } else if (name.equals("authorisationReferenceNumber")) { - this.authorisationReferenceNumber = TypeConvertor.castToIdentifier(value); // Identifier + if (name.equals("type[x]")) { + this.type = TypeConvertor.castToType(value); // DataType } else if (name.equals("effectiveDate")) { this.effectiveDate = TypeConvertor.castToPeriod(value); // Period - } else if (name.equals("confidentialityIndicator")) { - this.confidentialityIndicator = TypeConvertor.castToCodeableConcept(value); // CodeableConcept } else if (name.equals("manufacturer")) { this.getManufacturer().add(TypeConvertor.castToReference(value)); - } else if (name.equals("regulator")) { - this.regulator = TypeConvertor.castToReference(value); // Reference + } else if (name.equals("authorization")) { + this.authorization = TypeConvertor.castToReference(value); // Reference + } else if (name.equals("confidentialityIndicator")) { + this.confidentialityIndicator = TypeConvertor.castToCodeableConcept(value); // CodeableConcept } else return super.setProperty(name, value); return value; @@ -1713,12 +1704,12 @@ public class MedicinalProductDefinition extends DomainResource { @Override public Base makeProperty(int hash, String name) throws FHIRException { switch (hash) { - case 91999553: return getOperationType(); - case -1940839884: return getAuthorisationReferenceNumber(); + case -853093626: return getType(); + case 3575610: return getType(); case -930389515: return getEffectiveDate(); - case -1449404791: return getConfidentialityIndicator(); case -1969347631: return addManufacturer(); - case 414760449: return getRegulator(); + case -1385570183: return getAuthorization(); + case -1449404791: return getConfidentialityIndicator(); default: return super.makeProperty(hash, name); } @@ -1727,12 +1718,11 @@ public class MedicinalProductDefinition extends DomainResource { @Override public String[] getTypesForProperty(int hash, String name) throws FHIRException { switch (hash) { - case 91999553: /*operationType*/ return new String[] {"CodeableConcept"}; - case -1940839884: /*authorisationReferenceNumber*/ return new String[] {"Identifier"}; + case 3575610: /*type*/ return new String[] {"Coding", "Reference"}; case -930389515: /*effectiveDate*/ return new String[] {"Period"}; - case -1449404791: /*confidentialityIndicator*/ return new String[] {"CodeableConcept"}; case -1969347631: /*manufacturer*/ return new String[] {"Reference"}; - case 414760449: /*regulator*/ return new String[] {"Reference"}; + case -1385570183: /*authorization*/ return new String[] {"Reference"}; + case -1449404791: /*confidentialityIndicator*/ return new String[] {"CodeableConcept"}; default: return super.getTypesForProperty(hash, name); } @@ -1740,28 +1730,28 @@ public class MedicinalProductDefinition extends DomainResource { @Override public Base addChild(String name) throws FHIRException { - if (name.equals("operationType")) { - this.operationType = new CodeableConcept(); - return this.operationType; + if (name.equals("typeCoding")) { + this.type = new Coding(); + return this.type; } - else if (name.equals("authorisationReferenceNumber")) { - this.authorisationReferenceNumber = new Identifier(); - return this.authorisationReferenceNumber; + else if (name.equals("typeReference")) { + this.type = new Reference(); + return this.type; } else if (name.equals("effectiveDate")) { this.effectiveDate = new Period(); return this.effectiveDate; } - else if (name.equals("confidentialityIndicator")) { - this.confidentialityIndicator = new CodeableConcept(); - return this.confidentialityIndicator; - } else if (name.equals("manufacturer")) { return addManufacturer(); } - else if (name.equals("regulator")) { - this.regulator = new Reference(); - return this.regulator; + else if (name.equals("authorization")) { + this.authorization = new Reference(); + return this.authorization; + } + else if (name.equals("confidentialityIndicator")) { + this.confidentialityIndicator = new CodeableConcept(); + return this.confidentialityIndicator; } else return super.addChild(name); @@ -1775,16 +1765,15 @@ public class MedicinalProductDefinition extends DomainResource { public void copyValues(MedicinalProductDefinitionManufacturingBusinessOperationComponent dst) { super.copyValues(dst); - dst.operationType = operationType == null ? null : operationType.copy(); - dst.authorisationReferenceNumber = authorisationReferenceNumber == null ? null : authorisationReferenceNumber.copy(); + dst.type = type == null ? null : type.copy(); dst.effectiveDate = effectiveDate == null ? null : effectiveDate.copy(); - dst.confidentialityIndicator = confidentialityIndicator == null ? null : confidentialityIndicator.copy(); if (manufacturer != null) { dst.manufacturer = new ArrayList(); for (Reference i : manufacturer) dst.manufacturer.add(i.copy()); }; - dst.regulator = regulator == null ? null : regulator.copy(); + dst.authorization = authorization == null ? null : authorization.copy(); + dst.confidentialityIndicator = confidentialityIndicator == null ? null : confidentialityIndicator.copy(); } @Override @@ -1794,9 +1783,8 @@ public class MedicinalProductDefinition extends DomainResource { if (!(other_ instanceof MedicinalProductDefinitionManufacturingBusinessOperationComponent)) return false; MedicinalProductDefinitionManufacturingBusinessOperationComponent o = (MedicinalProductDefinitionManufacturingBusinessOperationComponent) other_; - return compareDeep(operationType, o.operationType, true) && compareDeep(authorisationReferenceNumber, o.authorisationReferenceNumber, true) - && compareDeep(effectiveDate, o.effectiveDate, true) && compareDeep(confidentialityIndicator, o.confidentialityIndicator, true) - && compareDeep(manufacturer, o.manufacturer, true) && compareDeep(regulator, o.regulator, true) + return compareDeep(type, o.type, true) && compareDeep(effectiveDate, o.effectiveDate, true) && compareDeep(manufacturer, o.manufacturer, true) + && compareDeep(authorization, o.authorization, true) && compareDeep(confidentialityIndicator, o.confidentialityIndicator, true) ; } @@ -1811,8 +1799,8 @@ public class MedicinalProductDefinition extends DomainResource { } public boolean isEmpty() { - return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(operationType, authorisationReferenceNumber - , effectiveDate, confidentialityIndicator, manufacturer, regulator); + return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(type, effectiveDate, manufacturer + , authorization, confidentialityIndicator); } public String fhirType() { @@ -1843,140 +1831,155 @@ public class MedicinalProductDefinition extends DomainResource { @Description(shortDefinition="If this medicine applies to human or veterinary uses", formalDefinition="If this medicine applies to human or veterinary uses." ) protected Coding domain; + /** + * A business level identifier of the product. + */ + @Child(name = "version", type = {StringType.class}, order=3, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="A business level identifier of the product", formalDefinition="A business level identifier of the product." ) + protected StringType version; + + /** + * 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 status. + */ + @Child(name = "status", type = {Coding.class}, order=4, 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 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 status." ) + @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/publication-status") + protected Coding status; + /** * General description of this product. */ - @Child(name = "description", type = {StringType.class}, order=3, min=0, max=1, modifier=false, summary=true) + @Child(name = "description", type = {MarkdownType.class}, order=5, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="General description of this product", formalDefinition="General description of this product." ) - protected StringType description; + protected MarkdownType description; /** * The dose form for a single part product, or combined form of a multiple part product. */ - @Child(name = "combinedPharmaceuticalDoseForm", type = {CodeableConcept.class}, order=4, min=0, max=1, modifier=false, summary=true) + @Child(name = "combinedPharmaceuticalDoseForm", type = {CodeableConcept.class}, order=6, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="The dose form for a single part product, or combined form of a multiple part product", formalDefinition="The dose form for a single part product, or combined form of a multiple part product." ) protected CodeableConcept combinedPharmaceuticalDoseForm; /** * General combined description of indication(s) for this product. See also MedicinalProductDefinitionIndication. */ - @Child(name = "indication", type = {MarkdownType.class}, order=5, min=0, max=1, modifier=false, summary=true) + @Child(name = "indication", type = {MarkdownType.class}, order=7, 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." ) protected MarkdownType indication; /** * The legal status of supply of the medicinal product as classified by the regulator. */ - @Child(name = "legalStatusOfSupply", type = {CodeableConcept.class}, order=6, min=0, max=1, modifier=false, summary=true) + @Child(name = "legalStatusOfSupply", type = {CodeableConcept.class}, order=8, 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." ) protected CodeableConcept legalStatusOfSupply; /** * Whether the Medicinal Product is subject to additional monitoring for regulatory reasons. */ - @Child(name = "additionalMonitoringIndicator", type = {CodeableConcept.class}, order=7, min=0, max=1, modifier=false, summary=true) + @Child(name = "additionalMonitoringIndicator", type = {CodeableConcept.class}, order=9, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Whether the Medicinal Product is subject to additional monitoring for regulatory reasons", formalDefinition="Whether the Medicinal Product is subject to additional monitoring for regulatory reasons." ) protected CodeableConcept additionalMonitoringIndicator; /** * Whether the Medicinal Product is subject to special measures for regulatory reasons. */ - @Child(name = "specialMeasures", type = {CodeableConcept.class}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "specialMeasures", type = {CodeableConcept.class}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Whether the Medicinal Product is subject to special measures for regulatory reasons", formalDefinition="Whether the Medicinal Product is subject to special measures for regulatory reasons." ) protected List specialMeasures; /** * If authorised for use in children. */ - @Child(name = "paediatricUseIndicator", type = {CodeableConcept.class}, order=9, min=0, max=1, modifier=false, summary=true) + @Child(name = "paediatricUseIndicator", type = {CodeableConcept.class}, order=11, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="If authorised for use in children", formalDefinition="If authorised for use in children." ) protected CodeableConcept paediatricUseIndicator; /** * Allows the product to be classified by various systems. */ - @Child(name = "productClassification", type = {CodeableConcept.class}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "productClassification", type = {CodeableConcept.class}, order=12, 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; /** * Marketing status of the medicinal product, in contrast to marketing authorizaton. */ - @Child(name = "marketingStatus", type = {MarketingStatus.class}, order=11, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "marketingStatus", type = {MarketingStatus.class}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Marketing status of the medicinal product, in contrast to marketing authorizaton", formalDefinition="Marketing status of the medicinal product, in contrast to marketing authorizaton." ) protected List marketingStatus; /** * Pharmaceutical aspects of product. */ - @Child(name = "pharmaceuticalProduct", type = {AdministrableProductDefinition.class}, order=12, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "pharmaceuticalProduct", type = {AdministrableProductDefinition.class}, order=14, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Pharmaceutical aspects of product", formalDefinition="Pharmaceutical aspects of product." ) protected List pharmaceuticalProduct; /** * Package representation for the product. */ - @Child(name = "packagedMedicinalProduct", type = {PackagedProductDefinition.class}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "packagedMedicinalProduct", type = {PackagedProductDefinition.class}, order=15, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Package representation for the product", formalDefinition="Package representation for the product." ) protected List packagedMedicinalProduct; /** * 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. */ - @Child(name = "ingredient", type = {Ingredient.class}, order=14, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "ingredient", type = {Ingredient.class}, order=16, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @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; /** * Supporting documentation, typically for regulatory submission. */ - @Child(name = "attachedDocument", type = {DocumentReference.class}, order=15, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "attachedDocument", type = {DocumentReference.class}, order=17, 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=16, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "masterFile", type = {DocumentReference.class}, order=18, 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=17, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "contact", type = {}, order=19, 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=18, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "clinicalTrial", type = {ResearchStudy.class}, order=20, 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=19, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "name", type = {}, order=21, 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=20, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "crossReference", type = {}, order=22, 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=21, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "manufacturingBusinessOperation", type = {}, order=23, 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 = -1816954454L; + private static final long serialVersionUID = -1839748079L; /** * Constructor @@ -2094,15 +2097,88 @@ public class MedicinalProductDefinition extends DomainResource { return this; } + /** + * @return {@link #version} (A business level identifier of the product.). 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 MedicinalProductDefinition.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} (A business level identifier of the product.). This is the underlying object with id, value and extensions. The accessor "getVersion" gives direct access to the value + */ + public MedicinalProductDefinition setVersionElement(StringType value) { + this.version = value; + return this; + } + + /** + * @return A business level identifier of the product. + */ + public String getVersion() { + return this.version == null ? null : this.version.getValue(); + } + + /** + * @param value A business level identifier of the product. + */ + public MedicinalProductDefinition 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 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 status.) + */ + public Coding getStatus() { + if (this.status == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create MedicinalProductDefinition.status"); + else if (Configuration.doAutoCreate()) + this.status = new Coding(); // cc + return this.status; + } + + public boolean hasStatus() { + return this.status != null && !this.status.isEmpty(); + } + + /** + * @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 status.) + */ + public MedicinalProductDefinition setStatus(Coding value) { + this.status = value; + return this; + } + /** * @return {@link #description} (General description of this product.). 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 MedicinalProductDefinition.description"); else if (Configuration.doAutoCreate()) - this.description = new StringType(); // bb + this.description = new MarkdownType(); // bb return this.description; } @@ -2117,7 +2193,7 @@ public class MedicinalProductDefinition extends DomainResource { /** * @param value {@link #description} (General description of this product.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value */ - public MedicinalProductDefinition setDescriptionElement(StringType value) { + public MedicinalProductDefinition setDescriptionElement(MarkdownType value) { this.description = value; return this; } @@ -2133,11 +2209,11 @@ public class MedicinalProductDefinition extends DomainResource { * @param value General description of this product. */ public MedicinalProductDefinition 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; @@ -2982,7 +3058,9 @@ public class MedicinalProductDefinition extends DomainResource { children.add(new Property("identifier", "Identifier", "Business identifier for this product. Could be an MPID.", 0, java.lang.Integer.MAX_VALUE, identifier)); children.add(new Property("type", "CodeableConcept", "Regulatory type, e.g. Investigational or Authorized.", 0, 1, type)); children.add(new Property("domain", "Coding", "If this medicine applies to human or veterinary uses.", 0, 1, domain)); - children.add(new Property("description", "string", "General description of this product.", 0, 1, description)); + children.add(new Property("version", "string", "A business level identifier of the product.", 0, 1, version)); + children.add(new Property("status", "Coding", "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 status.", 0, 1, status)); + 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("legalStatusOfSupply", "CodeableConcept", "The legal status of supply of the medicinal product as classified by the regulator.", 0, 1, legalStatusOfSupply)); @@ -3009,7 +3087,9 @@ public class MedicinalProductDefinition extends DomainResource { case -1618432855: /*identifier*/ return new Property("identifier", "Identifier", "Business identifier for this product. Could be an MPID.", 0, java.lang.Integer.MAX_VALUE, identifier); case 3575610: /*type*/ return new Property("type", "CodeableConcept", "Regulatory type, e.g. Investigational or Authorized.", 0, 1, type); case -1326197564: /*domain*/ return new Property("domain", "Coding", "If this medicine applies to human or veterinary uses.", 0, 1, domain); - case -1724546052: /*description*/ return new Property("description", "string", "General description of this product.", 0, 1, description); + case 351608024: /*version*/ return new Property("version", "string", "A business level identifier of the product.", 0, 1, version); + case -892481550: /*status*/ return new Property("status", "Coding", "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 status.", 0, 1, status); + 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 -844874031: /*legalStatusOfSupply*/ return new Property("legalStatusOfSupply", "CodeableConcept", "The legal status of supply of the medicinal product as classified by the regulator.", 0, 1, legalStatusOfSupply); @@ -3039,7 +3119,9 @@ public class MedicinalProductDefinition extends DomainResource { case -1618432855: /*identifier*/ return this.identifier == null ? new Base[0] : this.identifier.toArray(new Base[this.identifier.size()]); // Identifier case 3575610: /*type*/ return this.type == null ? new Base[0] : new Base[] {this.type}; // CodeableConcept case -1326197564: /*domain*/ return this.domain == null ? new Base[0] : new Base[] {this.domain}; // Coding - case -1724546052: /*description*/ return this.description == null ? new Base[0] : new Base[] {this.description}; // StringType + 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}; // Coding + case -1724546052: /*description*/ return this.description == null ? new Base[0] : new Base[] {this.description}; // MarkdownType case -1992898487: /*combinedPharmaceuticalDoseForm*/ return this.combinedPharmaceuticalDoseForm == null ? new Base[0] : new Base[] {this.combinedPharmaceuticalDoseForm}; // CodeableConcept case -597168804: /*indication*/ return this.indication == null ? new Base[0] : new Base[] {this.indication}; // MarkdownType case -844874031: /*legalStatusOfSupply*/ return this.legalStatusOfSupply == null ? new Base[0] : new Base[] {this.legalStatusOfSupply}; // CodeableConcept @@ -3075,8 +3157,14 @@ public class MedicinalProductDefinition extends DomainResource { case -1326197564: // domain this.domain = TypeConvertor.castToCoding(value); // Coding return value; + case 351608024: // version + this.version = TypeConvertor.castToString(value); // StringType + return value; + case -892481550: // status + this.status = TypeConvertor.castToCoding(value); // Coding + return value; case -1724546052: // description - this.description = TypeConvertor.castToString(value); // StringType + this.description = TypeConvertor.castToMarkdown(value); // MarkdownType return value; case -1992898487: // combinedPharmaceuticalDoseForm this.combinedPharmaceuticalDoseForm = TypeConvertor.castToCodeableConcept(value); // CodeableConcept @@ -3145,8 +3233,12 @@ public class MedicinalProductDefinition extends DomainResource { this.type = TypeConvertor.castToCodeableConcept(value); // CodeableConcept } else if (name.equals("domain")) { this.domain = TypeConvertor.castToCoding(value); // Coding + } else if (name.equals("version")) { + this.version = TypeConvertor.castToString(value); // StringType + } else if (name.equals("status")) { + this.status = TypeConvertor.castToCoding(value); // Coding } else if (name.equals("description")) { - this.description = TypeConvertor.castToString(value); // StringType + this.description = TypeConvertor.castToMarkdown(value); // MarkdownType } else if (name.equals("combinedPharmaceuticalDoseForm")) { this.combinedPharmaceuticalDoseForm = TypeConvertor.castToCodeableConcept(value); // CodeableConcept } else if (name.equals("indication")) { @@ -3194,6 +3286,8 @@ public class MedicinalProductDefinition extends DomainResource { case -1618432855: return addIdentifier(); case 3575610: return getType(); case -1326197564: return getDomain(); + case 351608024: return getVersionElement(); + case -892481550: return getStatus(); case -1724546052: return getDescriptionElement(); case -1992898487: return getCombinedPharmaceuticalDoseForm(); case -597168804: return getIndicationElement(); @@ -3224,7 +3318,9 @@ public class MedicinalProductDefinition extends DomainResource { case -1618432855: /*identifier*/ return new String[] {"Identifier"}; case 3575610: /*type*/ return new String[] {"CodeableConcept"}; case -1326197564: /*domain*/ return new String[] {"Coding"}; - case -1724546052: /*description*/ return new String[] {"string"}; + case 351608024: /*version*/ return new String[] {"string"}; + case -892481550: /*status*/ return new String[] {"Coding"}; + case -1724546052: /*description*/ return new String[] {"markdown"}; case -1992898487: /*combinedPharmaceuticalDoseForm*/ return new String[] {"CodeableConcept"}; case -597168804: /*indication*/ return new String[] {"markdown"}; case -844874031: /*legalStatusOfSupply*/ return new String[] {"CodeableConcept"}; @@ -3261,6 +3357,13 @@ public class MedicinalProductDefinition extends DomainResource { this.domain = new Coding(); return this.domain; } + else if (name.equals("version")) { + throw new FHIRException("Cannot call addChild on a primitive type MedicinalProductDefinition.version"); + } + else if (name.equals("status")) { + this.status = new Coding(); + return this.status; + } else if (name.equals("description")) { throw new FHIRException("Cannot call addChild on a primitive type MedicinalProductDefinition.description"); } @@ -3346,6 +3449,8 @@ public class MedicinalProductDefinition extends DomainResource { }; dst.type = type == null ? null : type.copy(); dst.domain = domain == null ? null : domain.copy(); + dst.version = version == null ? null : version.copy(); + dst.status = status == null ? null : status.copy(); dst.description = description == null ? null : description.copy(); dst.combinedPharmaceuticalDoseForm = combinedPharmaceuticalDoseForm == null ? null : combinedPharmaceuticalDoseForm.copy(); dst.indication = indication == null ? null : indication.copy(); @@ -3431,15 +3536,15 @@ public class MedicinalProductDefinition extends DomainResource { return false; MedicinalProductDefinition o = (MedicinalProductDefinition) other_; return compareDeep(identifier, o.identifier, true) && compareDeep(type, o.type, true) && compareDeep(domain, o.domain, true) - && 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(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(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) + && compareDeep(version, o.version, true) && compareDeep(status, o.status, true) && 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(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(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) ; } @@ -3450,16 +3555,17 @@ public class MedicinalProductDefinition extends DomainResource { if (!(other_ instanceof MedicinalProductDefinition)) return false; MedicinalProductDefinition o = (MedicinalProductDefinition) other_; - return compareValues(description, o.description, true) && compareValues(indication, o.indication, true) + return compareValues(version, o.version, true) && compareValues(description, o.description, true) && compareValues(indication, o.indication, true) ; } public boolean isEmpty() { return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, type, domain - , description, combinedPharmaceuticalDoseForm, indication, legalStatusOfSupply, additionalMonitoringIndicator - , specialMeasures, paediatricUseIndicator, productClassification, marketingStatus, pharmaceuticalProduct - , packagedMedicinalProduct, ingredient, attachedDocument, masterFile, contact, clinicalTrial - , name, crossReference, manufacturingBusinessOperation); + , version, status, description, combinedPharmaceuticalDoseForm, indication, legalStatusOfSupply + , additionalMonitoringIndicator, specialMeasures, paediatricUseIndicator, productClassification + , marketingStatus, pharmaceuticalProduct, packagedMedicinalProduct, ingredient, attachedDocument + , masterFile, contact, clinicalTrial, name, crossReference, manufacturingBusinessOperation + ); } @Override 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 b00346e56..b6287236e 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 b861b566e..581b89b7d 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 4a2529f4f..d6030976d 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 07ee85cc6..df5c1f78e 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 5d8c56ece..0b13bdefa 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 d107e1059..446ace8d7 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 64bde5a5f..154264cac 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 c37a60aa2..b1fbbf949 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 e99f950d0..0dde9192d 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; @@ -1037,27 +1037,20 @@ public class NutritionIntake extends DomainResource { protected List derivedFrom; /** - * A reason for why the food or fluid is /was consumed. + * A reason, Condition or observation for why the food or fluid is /was consumed. */ - @Child(name = "reasonCode", type = {CodeableConcept.class}, order=14, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Reason for why the food or fluid is /was consumed", formalDefinition="A reason for why the food or fluid is /was consumed." ) - protected List reasonCode; - - /** - * Condition or observation that supports why the food or fluid is /was consumed. - */ - @Child(name = "reasonReference", type = {Condition.class, Observation.class, DiagnosticReport.class}, order=15, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Condition or observation that supports why the food or fluid is /was consumed", formalDefinition="Condition or observation that supports why the food or fluid is /was consumed." ) - protected List reasonReference; + @Child(name = "reasonCode", type = {CodeableReference.class}, order=14, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Description(shortDefinition="Reason for why the food or fluid is /was consumed", formalDefinition="A reason, Condition or observation for why the food or fluid is /was consumed." ) + protected List reasonCode; /** * Provides extra information about the Nutrition Intake that is not conveyed by the other attributes. */ - @Child(name = "note", type = {Annotation.class}, order=16, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "note", type = {Annotation.class}, order=15, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Further information about the consumption", formalDefinition="Provides extra information about the Nutrition Intake that is not conveyed by the other attributes." ) protected List note; - private static final long serialVersionUID = 2139832010L; + private static final long serialVersionUID = -1197329803L; /** * Constructor @@ -1718,18 +1711,18 @@ public class NutritionIntake extends DomainResource { } /** - * @return {@link #reasonCode} (A reason for why the food or fluid is /was consumed.) + * @return {@link #reasonCode} (A reason, Condition or observation for why the food or fluid is /was consumed.) */ - public List getReasonCode() { + public List getReasonCode() { if (this.reasonCode == null) - this.reasonCode = new ArrayList(); + this.reasonCode = new ArrayList(); return this.reasonCode; } /** * @return Returns a reference to this for easy method chaining */ - public NutritionIntake setReasonCode(List theReasonCode) { + public NutritionIntake setReasonCode(List theReasonCode) { this.reasonCode = theReasonCode; return this; } @@ -1737,25 +1730,25 @@ public class NutritionIntake extends DomainResource { public boolean hasReasonCode() { if (this.reasonCode == null) return false; - for (CodeableConcept item : this.reasonCode) + for (CodeableReference item : this.reasonCode) if (!item.isEmpty()) return true; return false; } - public CodeableConcept addReasonCode() { //3 - CodeableConcept t = new CodeableConcept(); + public CodeableReference addReasonCode() { //3 + CodeableReference t = new CodeableReference(); if (this.reasonCode == null) - this.reasonCode = new ArrayList(); + this.reasonCode = new ArrayList(); this.reasonCode.add(t); return t; } - public NutritionIntake addReasonCode(CodeableConcept t) { //3 + public NutritionIntake addReasonCode(CodeableReference t) { //3 if (t == null) return this; if (this.reasonCode == null) - this.reasonCode = new ArrayList(); + this.reasonCode = new ArrayList(); this.reasonCode.add(t); return this; } @@ -1763,66 +1756,13 @@ public class NutritionIntake extends DomainResource { /** * @return The first repetition of repeating field {@link #reasonCode}, creating it if it does not already exist {3} */ - public CodeableConcept getReasonCodeFirstRep() { + public CodeableReference getReasonCodeFirstRep() { if (getReasonCode().isEmpty()) { addReasonCode(); } return getReasonCode().get(0); } - /** - * @return {@link #reasonReference} (Condition or observation that supports why the food or fluid is /was consumed.) - */ - public List getReasonReference() { - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - return this.reasonReference; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public NutritionIntake setReasonReference(List theReasonReference) { - this.reasonReference = theReasonReference; - return this; - } - - public boolean hasReasonReference() { - if (this.reasonReference == null) - return false; - for (Reference item : this.reasonReference) - if (!item.isEmpty()) - return true; - return false; - } - - public Reference addReasonReference() { //3 - Reference t = new Reference(); - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return t; - } - - public NutritionIntake addReasonReference(Reference t) { //3 - if (t == null) - return this; - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #reasonReference}, creating it if it does not already exist {3} - */ - public Reference getReasonReferenceFirstRep() { - if (getReasonReference().isEmpty()) { - addReasonReference(); - } - return getReasonReference().get(0); - } - /** * @return {@link #note} (Provides extra information about the Nutrition Intake that is not conveyed by the other attributes.) */ @@ -1892,8 +1832,7 @@ public class NutritionIntake extends DomainResource { children.add(new Property("dateAsserted", "dateTime", "The date when the Nutrition Intake was asserted by the information source.", 0, 1, dateAsserted)); children.add(new Property("informationSource", "Reference(Patient|Practitioner|PractitionerRole|RelatedPerson|Organization)", "The person or organization that provided the information about the consumption of this food or fluid. Note: Use derivedFrom when a NutritionIntake is derived from other resources.", 0, 1, informationSource)); children.add(new Property("derivedFrom", "Reference(Any)", "Allows linking the NutritionIntake to the underlying NutritionOrder, or to other information, such as AllergyIntolerance, that supports or is used to derive the NutritionIntake.", 0, java.lang.Integer.MAX_VALUE, derivedFrom)); - children.add(new Property("reasonCode", "CodeableConcept", "A reason for why the food or fluid is /was consumed.", 0, java.lang.Integer.MAX_VALUE, reasonCode)); - children.add(new Property("reasonReference", "Reference(Condition|Observation|DiagnosticReport)", "Condition or observation that supports why the food or fluid is /was consumed.", 0, java.lang.Integer.MAX_VALUE, reasonReference)); + children.add(new Property("reasonCode", "CodeableReference(Condition|Observation|DiagnosticReport)", "A reason, Condition or observation for why the food or fluid is /was consumed.", 0, java.lang.Integer.MAX_VALUE, reasonCode)); children.add(new Property("note", "Annotation", "Provides extra information about the Nutrition Intake that is not conveyed by the other attributes.", 0, java.lang.Integer.MAX_VALUE, note)); } @@ -1917,8 +1856,7 @@ public class NutritionIntake extends DomainResource { case -1980855245: /*dateAsserted*/ return new Property("dateAsserted", "dateTime", "The date when the Nutrition Intake was asserted by the information source.", 0, 1, dateAsserted); case -2123220889: /*informationSource*/ return new Property("informationSource", "Reference(Patient|Practitioner|PractitionerRole|RelatedPerson|Organization)", "The person or organization that provided the information about the consumption of this food or fluid. Note: Use derivedFrom when a NutritionIntake is derived from other resources.", 0, 1, informationSource); case 1077922663: /*derivedFrom*/ return new Property("derivedFrom", "Reference(Any)", "Allows linking the NutritionIntake to the underlying NutritionOrder, or to other information, such as AllergyIntolerance, that supports or is used to derive the NutritionIntake.", 0, java.lang.Integer.MAX_VALUE, derivedFrom); - case 722137681: /*reasonCode*/ return new Property("reasonCode", "CodeableConcept", "A reason for why the food or fluid is /was consumed.", 0, java.lang.Integer.MAX_VALUE, reasonCode); - case -1146218137: /*reasonReference*/ return new Property("reasonReference", "Reference(Condition|Observation|DiagnosticReport)", "Condition or observation that supports why the food or fluid is /was consumed.", 0, java.lang.Integer.MAX_VALUE, reasonReference); + case 722137681: /*reasonCode*/ return new Property("reasonCode", "CodeableReference(Condition|Observation|DiagnosticReport)", "A reason, Condition or observation for why the food or fluid is /was consumed.", 0, java.lang.Integer.MAX_VALUE, reasonCode); case 3387378: /*note*/ return new Property("note", "Annotation", "Provides extra information about the Nutrition Intake that is not conveyed by the other attributes.", 0, java.lang.Integer.MAX_VALUE, note); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -1942,8 +1880,7 @@ public class NutritionIntake extends DomainResource { case -1980855245: /*dateAsserted*/ return this.dateAsserted == null ? new Base[0] : new Base[] {this.dateAsserted}; // DateTimeType case -2123220889: /*informationSource*/ return this.informationSource == null ? new Base[0] : new Base[] {this.informationSource}; // Reference case 1077922663: /*derivedFrom*/ return this.derivedFrom == null ? new Base[0] : this.derivedFrom.toArray(new Base[this.derivedFrom.size()]); // Reference - case 722137681: /*reasonCode*/ return this.reasonCode == null ? new Base[0] : this.reasonCode.toArray(new Base[this.reasonCode.size()]); // CodeableConcept - case -1146218137: /*reasonReference*/ return this.reasonReference == null ? new Base[0] : this.reasonReference.toArray(new Base[this.reasonReference.size()]); // Reference + case 722137681: /*reasonCode*/ return this.reasonCode == null ? new Base[0] : this.reasonCode.toArray(new Base[this.reasonCode.size()]); // CodeableReference 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); } @@ -1997,10 +1934,7 @@ public class NutritionIntake extends DomainResource { this.getDerivedFrom().add(TypeConvertor.castToReference(value)); // Reference return value; case 722137681: // reasonCode - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept - return value; - case -1146218137: // reasonReference - this.getReasonReference().add(TypeConvertor.castToReference(value)); // Reference + this.getReasonCode().add(TypeConvertor.castToCodeableReference(value)); // CodeableReference return value; case 3387378: // note this.getNote().add(TypeConvertor.castToAnnotation(value)); // Annotation @@ -2042,9 +1976,7 @@ public class NutritionIntake extends DomainResource { } else if (name.equals("derivedFrom")) { this.getDerivedFrom().add(TypeConvertor.castToReference(value)); } else if (name.equals("reasonCode")) { - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); - } else if (name.equals("reasonReference")) { - this.getReasonReference().add(TypeConvertor.castToReference(value)); + this.getReasonCode().add(TypeConvertor.castToCodeableReference(value)); } else if (name.equals("note")) { this.getNote().add(TypeConvertor.castToAnnotation(value)); } else @@ -2071,7 +2003,6 @@ public class NutritionIntake extends DomainResource { case -2123220889: return getInformationSource(); case 1077922663: return addDerivedFrom(); case 722137681: return addReasonCode(); - case -1146218137: return addReasonReference(); case 3387378: return addNote(); default: return super.makeProperty(hash, name); } @@ -2095,8 +2026,7 @@ public class NutritionIntake extends DomainResource { case -1980855245: /*dateAsserted*/ return new String[] {"dateTime"}; case -2123220889: /*informationSource*/ return new String[] {"Reference"}; case 1077922663: /*derivedFrom*/ return new String[] {"Reference"}; - case 722137681: /*reasonCode*/ return new String[] {"CodeableConcept"}; - case -1146218137: /*reasonReference*/ return new String[] {"Reference"}; + case 722137681: /*reasonCode*/ return new String[] {"CodeableReference"}; case 3387378: /*note*/ return new String[] {"Annotation"}; default: return super.getTypesForProperty(hash, name); } @@ -2158,9 +2088,6 @@ public class NutritionIntake extends DomainResource { else if (name.equals("reasonCode")) { return addReasonCode(); } - else if (name.equals("reasonReference")) { - return addReasonReference(); - } else if (name.equals("note")) { return addNote(); } @@ -2228,15 +2155,10 @@ public class NutritionIntake extends DomainResource { dst.derivedFrom.add(i.copy()); }; if (reasonCode != null) { - dst.reasonCode = new ArrayList(); - for (CodeableConcept i : reasonCode) + dst.reasonCode = new ArrayList(); + for (CodeableReference i : reasonCode) dst.reasonCode.add(i.copy()); }; - if (reasonReference != null) { - dst.reasonReference = new ArrayList(); - for (Reference i : reasonReference) - dst.reasonReference.add(i.copy()); - }; if (note != null) { dst.note = new ArrayList(); for (Annotation i : note) @@ -2261,7 +2183,7 @@ public class NutritionIntake extends DomainResource { && compareDeep(subject, o.subject, true) && compareDeep(encounter, o.encounter, true) && compareDeep(effective, o.effective, true) && compareDeep(dateAsserted, o.dateAsserted, true) && compareDeep(informationSource, o.informationSource, true) && compareDeep(derivedFrom, o.derivedFrom, true) && compareDeep(reasonCode, o.reasonCode, true) - && compareDeep(reasonReference, o.reasonReference, true) && compareDeep(note, o.note, true); + && compareDeep(note, o.note, true); } @Override @@ -2277,8 +2199,7 @@ public class NutritionIntake extends DomainResource { public boolean isEmpty() { return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, basedOn, partOf , status, statusReason, category, consumedItem, ingredientLabel, subject, encounter - , effective, dateAsserted, informationSource, derivedFrom, reasonCode, reasonReference - , note); + , effective, dateAsserted, informationSource, derivedFrom, reasonCode, note); } @Override 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 de77f13dc..12a7937e6 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 653155614..787da20c9 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 03e4b9885..b3f2e3c44 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 abf6a018a..d1ed6b78c 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 22bcf21f4..7be941300 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 fd1bfff56..7365bcdaa 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 2d42aa884..d736b0054 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 84c885153..503f18d7c 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 ba6f4c7f9..1b2b6198f 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 3bad25d53..355a3d03f 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 b89cf3d6e..6faa36d32 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 53520d53a..3f3f7d1a0 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 00211b8d0..40af82617 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 7bd386eb2..3bf5dd760 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 44d1477b1..67e800b90 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 d71326a4e..e90cdc142 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 57289ba2a..6d94f39fb 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 e5fc4c354..4103981c0 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 3112ab215..827fa79e7 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 ddc6860cc..017e7ee54 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 a8c6ee1cc..c3967a736 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; @@ -665,24 +665,17 @@ public class Procedure extends DomainResource { protected Reference location; /** - * The coded reason why the procedure was performed. This may be a coded entity of some type, or may simply be present as text. + * The coded reason or reference why the procedure was performed. This may be a coded entity of some type, or may simply be present as text, or may be a reference to one of several resources that justify the procedure. */ - @Child(name = "reasonCode", type = {CodeableConcept.class}, order=17, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Coded reason procedure performed", formalDefinition="The coded reason why the procedure was performed. This may be a coded entity of some type, or may simply be present as text." ) + @Child(name = "reason", type = {CodeableReference.class}, order=17, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Description(shortDefinition="The justification that the procedure was performed", formalDefinition="The coded reason or reference why the procedure was performed. This may be a coded entity of some type, or may simply be present as text, or may be a reference to one of several resources that justify the procedure." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/procedure-reason") - protected List reasonCode; - - /** - * The justification of why the procedure was performed. - */ - @Child(name = "reasonReference", type = {Condition.class, Observation.class, Procedure.class, DiagnosticReport.class, DocumentReference.class}, order=18, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="The justification that the procedure was performed", formalDefinition="The justification of why the procedure was performed." ) - protected List reasonReference; + protected List reason; /** * Detailed and structured anatomical location information. Multiple locations are allowed - e.g. multiple punch biopsies of a lesion. */ - @Child(name = "bodySite", type = {CodeableConcept.class}, order=19, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "bodySite", type = {CodeableConcept.class}, order=18, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Target body sites", formalDefinition="Detailed and structured anatomical location information. Multiple locations are allowed - e.g. multiple punch biopsies of a lesion." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/body-site") protected List bodySite; @@ -690,7 +683,7 @@ public class Procedure extends DomainResource { /** * The outcome of the procedure - did it resolve the reasons for the procedure being performed? */ - @Child(name = "outcome", type = {CodeableConcept.class}, order=20, min=0, max=1, modifier=false, summary=true) + @Child(name = "outcome", type = {CodeableConcept.class}, order=19, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="The result of procedure", formalDefinition="The outcome of the procedure - did it resolve the reasons for the procedure being performed?" ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/procedure-outcome") protected CodeableConcept outcome; @@ -698,14 +691,14 @@ public class Procedure extends DomainResource { /** * This could be a histology result, pathology report, surgical report, etc. */ - @Child(name = "report", type = {DiagnosticReport.class, DocumentReference.class, Composition.class}, order=21, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "report", type = {DiagnosticReport.class, DocumentReference.class, Composition.class}, order=20, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Any report resulting from the procedure", formalDefinition="This could be a histology result, pathology report, surgical report, etc." ) protected List report; /** * Any complications that occurred during the procedure, or in the immediate post-performance period. These are generally tracked separately from the notes, which will typically describe the procedure itself rather than any 'post procedure' issues. */ - @Child(name = "complication", type = {CodeableConcept.class}, order=22, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "complication", type = {CodeableConcept.class}, order=21, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Complication following the procedure", formalDefinition="Any complications that occurred during the procedure, or in the immediate post-performance period. These are generally tracked separately from the notes, which will typically describe the procedure itself rather than any 'post procedure' issues." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/condition-code") protected List complication; @@ -713,14 +706,14 @@ public class Procedure extends DomainResource { /** * Any complications that occurred during the procedure, or in the immediate post-performance period. */ - @Child(name = "complicationDetail", type = {Condition.class}, order=23, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "complicationDetail", type = {Condition.class}, order=22, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="A condition that is a result of the procedure", formalDefinition="Any complications that occurred during the procedure, or in the immediate post-performance period." ) protected List complicationDetail; /** * If the procedure required specific follow up - e.g. removal of sutures. The follow up may be represented as a simple note or could potentially be more complex, in which case the CarePlan resource can be used. */ - @Child(name = "followUp", type = {CodeableConcept.class}, order=24, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "followUp", type = {CodeableConcept.class}, order=23, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Instructions for follow up", formalDefinition="If the procedure required specific follow up - e.g. removal of sutures. The follow up may be represented as a simple note or could potentially be more complex, in which case the CarePlan resource can be used." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/procedure-followup") protected List followUp; @@ -728,33 +721,26 @@ public class Procedure extends DomainResource { /** * Any other notes and comments about the procedure. */ - @Child(name = "note", type = {Annotation.class}, order=25, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "note", type = {Annotation.class}, order=24, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Additional information about the procedure", formalDefinition="Any other notes and comments about the procedure." ) protected List note; /** * A device that is implanted, removed or otherwise manipulated (calibration, battery replacement, fitting a prosthesis, attaching a wound-vac, etc.) as a focal portion of the Procedure. */ - @Child(name = "focalDevice", type = {}, order=26, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "focalDevice", type = {}, order=25, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Manipulated, implanted, or removed device", formalDefinition="A device that is implanted, removed or otherwise manipulated (calibration, battery replacement, fitting a prosthesis, attaching a wound-vac, etc.) as a focal portion of the Procedure." ) protected List focalDevice; /** * Identifies medications, devices and any other substance used as part of the procedure. */ - @Child(name = "usedReference", type = {Device.class, Medication.class, Substance.class, BiologicallyDerivedProduct.class}, order=27, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "used", type = {CodeableReference.class}, order=26, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Items used during procedure", formalDefinition="Identifies medications, devices and any other substance used as part of the procedure." ) - protected List usedReference; - - /** - * Identifies coded items that were used as part of the procedure. - */ - @Child(name = "usedCode", type = {CodeableConcept.class}, order=28, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Coded items used during the procedure", formalDefinition="Identifies coded items that were used as part of the procedure." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/device-kind") - protected List usedCode; + protected List used; - private static final long serialVersionUID = -1653348691L; + private static final long serialVersionUID = 1060230234L; /** * Constructor @@ -1560,109 +1546,56 @@ public class Procedure extends DomainResource { } /** - * @return {@link #reasonCode} (The coded reason why the procedure was performed. This may be a coded entity of some type, or may simply be present as text.) + * @return {@link #reason} (The coded reason or reference why the procedure was performed. This may be a coded entity of some type, or may simply be present as text, or may be a reference to one of several resources that justify the procedure.) */ - public List getReasonCode() { - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - return this.reasonCode; + public List getReason() { + if (this.reason == null) + this.reason = new ArrayList(); + return this.reason; } /** * @return Returns a reference to this for easy method chaining */ - public Procedure setReasonCode(List theReasonCode) { - this.reasonCode = theReasonCode; + public Procedure setReason(List theReason) { + this.reason = theReason; return this; } - public boolean hasReasonCode() { - if (this.reasonCode == null) + public boolean hasReason() { + if (this.reason == null) return false; - for (CodeableConcept item : this.reasonCode) + for (CodeableReference item : this.reason) if (!item.isEmpty()) return true; return false; } - public CodeableConcept addReasonCode() { //3 - CodeableConcept t = new CodeableConcept(); - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); + public CodeableReference addReason() { //3 + CodeableReference t = new CodeableReference(); + if (this.reason == null) + this.reason = new ArrayList(); + this.reason.add(t); return t; } - public Procedure addReasonCode(CodeableConcept t) { //3 + public Procedure addReason(CodeableReference t) { //3 if (t == null) return this; - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); + if (this.reason == null) + this.reason = new ArrayList(); + this.reason.add(t); return this; } /** - * @return The first repetition of repeating field {@link #reasonCode}, creating it if it does not already exist {3} + * @return The first repetition of repeating field {@link #reason}, creating it if it does not already exist {3} */ - public CodeableConcept getReasonCodeFirstRep() { - if (getReasonCode().isEmpty()) { - addReasonCode(); + public CodeableReference getReasonFirstRep() { + if (getReason().isEmpty()) { + addReason(); } - return getReasonCode().get(0); - } - - /** - * @return {@link #reasonReference} (The justification of why the procedure was performed.) - */ - public List getReasonReference() { - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - return this.reasonReference; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public Procedure setReasonReference(List theReasonReference) { - this.reasonReference = theReasonReference; - return this; - } - - public boolean hasReasonReference() { - if (this.reasonReference == null) - return false; - for (Reference item : this.reasonReference) - if (!item.isEmpty()) - return true; - return false; - } - - public Reference addReasonReference() { //3 - Reference t = new Reference(); - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return t; - } - - public Procedure addReasonReference(Reference t) { //3 - if (t == null) - return this; - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #reasonReference}, creating it if it does not already exist {3} - */ - public Reference getReasonReferenceFirstRep() { - if (getReasonReference().isEmpty()) { - addReasonReference(); - } - return getReasonReference().get(0); + return getReason().get(0); } /** @@ -2061,109 +1994,56 @@ public class Procedure extends DomainResource { } /** - * @return {@link #usedReference} (Identifies medications, devices and any other substance used as part of the procedure.) + * @return {@link #used} (Identifies medications, devices and any other substance used as part of the procedure.) */ - public List getUsedReference() { - if (this.usedReference == null) - this.usedReference = new ArrayList(); - return this.usedReference; + public List getUsed() { + if (this.used == null) + this.used = new ArrayList(); + return this.used; } /** * @return Returns a reference to this for easy method chaining */ - public Procedure setUsedReference(List theUsedReference) { - this.usedReference = theUsedReference; + public Procedure setUsed(List theUsed) { + this.used = theUsed; return this; } - public boolean hasUsedReference() { - if (this.usedReference == null) + public boolean hasUsed() { + if (this.used == null) return false; - for (Reference item : this.usedReference) + for (CodeableReference item : this.used) if (!item.isEmpty()) return true; return false; } - public Reference addUsedReference() { //3 - Reference t = new Reference(); - if (this.usedReference == null) - this.usedReference = new ArrayList(); - this.usedReference.add(t); + public CodeableReference addUsed() { //3 + CodeableReference t = new CodeableReference(); + if (this.used == null) + this.used = new ArrayList(); + this.used.add(t); return t; } - public Procedure addUsedReference(Reference t) { //3 + public Procedure addUsed(CodeableReference t) { //3 if (t == null) return this; - if (this.usedReference == null) - this.usedReference = new ArrayList(); - this.usedReference.add(t); + if (this.used == null) + this.used = new ArrayList(); + this.used.add(t); return this; } /** - * @return The first repetition of repeating field {@link #usedReference}, creating it if it does not already exist {3} + * @return The first repetition of repeating field {@link #used}, creating it if it does not already exist {3} */ - public Reference getUsedReferenceFirstRep() { - if (getUsedReference().isEmpty()) { - addUsedReference(); + public CodeableReference getUsedFirstRep() { + if (getUsed().isEmpty()) { + addUsed(); } - return getUsedReference().get(0); - } - - /** - * @return {@link #usedCode} (Identifies coded items that were used as part of the procedure.) - */ - public List getUsedCode() { - if (this.usedCode == null) - this.usedCode = new ArrayList(); - return this.usedCode; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public Procedure setUsedCode(List theUsedCode) { - this.usedCode = theUsedCode; - return this; - } - - public boolean hasUsedCode() { - if (this.usedCode == null) - return false; - for (CodeableConcept item : this.usedCode) - if (!item.isEmpty()) - return true; - return false; - } - - public CodeableConcept addUsedCode() { //3 - CodeableConcept t = new CodeableConcept(); - if (this.usedCode == null) - this.usedCode = new ArrayList(); - this.usedCode.add(t); - return t; - } - - public Procedure addUsedCode(CodeableConcept t) { //3 - if (t == null) - return this; - if (this.usedCode == null) - this.usedCode = new ArrayList(); - this.usedCode.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #usedCode}, creating it if it does not already exist {3} - */ - public CodeableConcept getUsedCodeFirstRep() { - if (getUsedCode().isEmpty()) { - addUsedCode(); - } - return getUsedCode().get(0); + return getUsed().get(0); } protected void listChildren(List children) { @@ -2185,8 +2065,7 @@ public class Procedure extends DomainResource { children.add(new Property("reported[x]", "boolean|Reference(Patient|RelatedPerson|Practitioner|PractitionerRole|Organization)", "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("performer", "", "Limited to \"real\" people rather than equipment.", 0, java.lang.Integer.MAX_VALUE, performer)); children.add(new Property("location", "Reference(Location)", "The location where the procedure actually happened. E.g. a newborn at home, a tracheostomy at a restaurant.", 0, 1, location)); - children.add(new Property("reasonCode", "CodeableConcept", "The coded reason why the procedure was performed. This may be a coded entity of some type, or may simply be present as text.", 0, java.lang.Integer.MAX_VALUE, reasonCode)); - children.add(new Property("reasonReference", "Reference(Condition|Observation|Procedure|DiagnosticReport|DocumentReference)", "The justification of why the procedure was performed.", 0, java.lang.Integer.MAX_VALUE, reasonReference)); + children.add(new Property("reason", "CodeableReference(Condition|Observation|Procedure|DiagnosticReport|DocumentReference)", "The coded reason or reference why the procedure was performed. This may be a coded entity of some type, or may simply be present as text, or may be a reference to one of several resources that justify the procedure.", 0, java.lang.Integer.MAX_VALUE, reason)); children.add(new Property("bodySite", "CodeableConcept", "Detailed and structured anatomical location information. Multiple locations are allowed - e.g. multiple punch biopsies of a lesion.", 0, java.lang.Integer.MAX_VALUE, bodySite)); children.add(new Property("outcome", "CodeableConcept", "The outcome of the procedure - did it resolve the reasons for the procedure being performed?", 0, 1, outcome)); children.add(new Property("report", "Reference(DiagnosticReport|DocumentReference|Composition)", "This could be a histology result, pathology report, surgical report, etc.", 0, java.lang.Integer.MAX_VALUE, report)); @@ -2195,8 +2074,7 @@ public class Procedure extends DomainResource { children.add(new Property("followUp", "CodeableConcept", "If the procedure required specific follow up - e.g. removal of sutures. The follow up may be represented as a simple note or could potentially be more complex, in which case the CarePlan resource can be used.", 0, java.lang.Integer.MAX_VALUE, followUp)); children.add(new Property("note", "Annotation", "Any other notes and comments about the procedure.", 0, java.lang.Integer.MAX_VALUE, note)); children.add(new Property("focalDevice", "", "A device that is implanted, removed or otherwise manipulated (calibration, battery replacement, fitting a prosthesis, attaching a wound-vac, etc.) as a focal portion of the Procedure.", 0, java.lang.Integer.MAX_VALUE, focalDevice)); - children.add(new Property("usedReference", "Reference(Device|Medication|Substance|BiologicallyDerivedProduct)", "Identifies medications, devices and any other substance used as part of the procedure.", 0, java.lang.Integer.MAX_VALUE, usedReference)); - children.add(new Property("usedCode", "CodeableConcept", "Identifies coded items that were used as part of the procedure.", 0, java.lang.Integer.MAX_VALUE, usedCode)); + children.add(new Property("used", "CodeableReference(Device|Medication|Substance|BiologicallyDerivedProduct)", "Identifies medications, devices and any other substance used as part of the procedure.", 0, java.lang.Integer.MAX_VALUE, used)); } @Override @@ -2229,8 +2107,7 @@ public class Procedure extends DomainResource { case 1198143416: /*reportedReference*/ return new Property("reported[x]", "Reference(Patient|RelatedPerson|Practitioner|PractitionerRole|Organization)", "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 481140686: /*performer*/ return new Property("performer", "", "Limited to \"real\" people rather than equipment.", 0, java.lang.Integer.MAX_VALUE, performer); case 1901043637: /*location*/ return new Property("location", "Reference(Location)", "The location where the procedure actually happened. E.g. a newborn at home, a tracheostomy at a restaurant.", 0, 1, location); - case 722137681: /*reasonCode*/ return new Property("reasonCode", "CodeableConcept", "The coded reason why the procedure was performed. This may be a coded entity of some type, or may simply be present as text.", 0, java.lang.Integer.MAX_VALUE, reasonCode); - case -1146218137: /*reasonReference*/ return new Property("reasonReference", "Reference(Condition|Observation|Procedure|DiagnosticReport|DocumentReference)", "The justification of why the procedure was performed.", 0, java.lang.Integer.MAX_VALUE, reasonReference); + case -934964668: /*reason*/ return new Property("reason", "CodeableReference(Condition|Observation|Procedure|DiagnosticReport|DocumentReference)", "The coded reason or reference why the procedure was performed. This may be a coded entity of some type, or may simply be present as text, or may be a reference to one of several resources that justify the procedure.", 0, java.lang.Integer.MAX_VALUE, reason); case 1702620169: /*bodySite*/ return new Property("bodySite", "CodeableConcept", "Detailed and structured anatomical location information. Multiple locations are allowed - e.g. multiple punch biopsies of a lesion.", 0, java.lang.Integer.MAX_VALUE, bodySite); case -1106507950: /*outcome*/ return new Property("outcome", "CodeableConcept", "The outcome of the procedure - did it resolve the reasons for the procedure being performed?", 0, 1, outcome); case -934521548: /*report*/ return new Property("report", "Reference(DiagnosticReport|DocumentReference|Composition)", "This could be a histology result, pathology report, surgical report, etc.", 0, java.lang.Integer.MAX_VALUE, report); @@ -2239,8 +2116,7 @@ public class Procedure extends DomainResource { case 301801004: /*followUp*/ return new Property("followUp", "CodeableConcept", "If the procedure required specific follow up - e.g. removal of sutures. The follow up may be represented as a simple note or could potentially be more complex, in which case the CarePlan resource can be used.", 0, java.lang.Integer.MAX_VALUE, followUp); case 3387378: /*note*/ return new Property("note", "Annotation", "Any other notes and comments about the procedure.", 0, java.lang.Integer.MAX_VALUE, note); case -1129235173: /*focalDevice*/ return new Property("focalDevice", "", "A device that is implanted, removed or otherwise manipulated (calibration, battery replacement, fitting a prosthesis, attaching a wound-vac, etc.) as a focal portion of the Procedure.", 0, java.lang.Integer.MAX_VALUE, focalDevice); - case -504932338: /*usedReference*/ return new Property("usedReference", "Reference(Device|Medication|Substance|BiologicallyDerivedProduct)", "Identifies medications, devices and any other substance used as part of the procedure.", 0, java.lang.Integer.MAX_VALUE, usedReference); - case -279910582: /*usedCode*/ return new Property("usedCode", "CodeableConcept", "Identifies coded items that were used as part of the procedure.", 0, java.lang.Integer.MAX_VALUE, usedCode); + case 3599293: /*used*/ return new Property("used", "CodeableReference(Device|Medication|Substance|BiologicallyDerivedProduct)", "Identifies medications, devices and any other substance used as part of the procedure.", 0, java.lang.Integer.MAX_VALUE, used); default: return super.getNamedProperty(_hash, _name, _checkValid); } @@ -2266,8 +2142,7 @@ public class Procedure extends DomainResource { case -427039533: /*reported*/ return this.reported == null ? new Base[0] : new Base[] {this.reported}; // DataType case 481140686: /*performer*/ return this.performer == null ? new Base[0] : this.performer.toArray(new Base[this.performer.size()]); // ProcedurePerformerComponent case 1901043637: /*location*/ return this.location == null ? new Base[0] : new Base[] {this.location}; // Reference - case 722137681: /*reasonCode*/ return this.reasonCode == null ? new Base[0] : this.reasonCode.toArray(new Base[this.reasonCode.size()]); // CodeableConcept - case -1146218137: /*reasonReference*/ return this.reasonReference == null ? new Base[0] : this.reasonReference.toArray(new Base[this.reasonReference.size()]); // Reference + case -934964668: /*reason*/ return this.reason == null ? new Base[0] : this.reason.toArray(new Base[this.reason.size()]); // CodeableReference case 1702620169: /*bodySite*/ return this.bodySite == null ? new Base[0] : this.bodySite.toArray(new Base[this.bodySite.size()]); // CodeableConcept case -1106507950: /*outcome*/ return this.outcome == null ? new Base[0] : new Base[] {this.outcome}; // CodeableConcept case -934521548: /*report*/ return this.report == null ? new Base[0] : this.report.toArray(new Base[this.report.size()]); // Reference @@ -2276,8 +2151,7 @@ public class Procedure extends DomainResource { case 301801004: /*followUp*/ return this.followUp == null ? new Base[0] : this.followUp.toArray(new Base[this.followUp.size()]); // CodeableConcept case 3387378: /*note*/ return this.note == null ? new Base[0] : this.note.toArray(new Base[this.note.size()]); // Annotation case -1129235173: /*focalDevice*/ return this.focalDevice == null ? new Base[0] : this.focalDevice.toArray(new Base[this.focalDevice.size()]); // ProcedureFocalDeviceComponent - case -504932338: /*usedReference*/ return this.usedReference == null ? new Base[0] : this.usedReference.toArray(new Base[this.usedReference.size()]); // Reference - case -279910582: /*usedCode*/ return this.usedCode == null ? new Base[0] : this.usedCode.toArray(new Base[this.usedCode.size()]); // CodeableConcept + case 3599293: /*used*/ return this.used == null ? new Base[0] : this.used.toArray(new Base[this.used.size()]); // CodeableReference default: return super.getProperty(hash, name, checkValid); } @@ -2338,11 +2212,8 @@ public class Procedure extends DomainResource { case 1901043637: // location this.location = TypeConvertor.castToReference(value); // Reference return value; - case 722137681: // reasonCode - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept - return value; - case -1146218137: // reasonReference - this.getReasonReference().add(TypeConvertor.castToReference(value)); // Reference + case -934964668: // reason + this.getReason().add(TypeConvertor.castToCodeableReference(value)); // CodeableReference return value; case 1702620169: // bodySite this.getBodySite().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept @@ -2368,11 +2239,8 @@ public class Procedure extends DomainResource { case -1129235173: // focalDevice this.getFocalDevice().add((ProcedureFocalDeviceComponent) value); // ProcedureFocalDeviceComponent return value; - case -504932338: // usedReference - this.getUsedReference().add(TypeConvertor.castToReference(value)); // Reference - return value; - case -279910582: // usedCode - this.getUsedCode().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept + case 3599293: // used + this.getUsed().add(TypeConvertor.castToCodeableReference(value)); // CodeableReference return value; default: return super.setProperty(hash, name, value); } @@ -2416,10 +2284,8 @@ public class Procedure extends DomainResource { this.getPerformer().add((ProcedurePerformerComponent) value); } else if (name.equals("location")) { this.location = TypeConvertor.castToReference(value); // Reference - } else if (name.equals("reasonCode")) { - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); - } else if (name.equals("reasonReference")) { - this.getReasonReference().add(TypeConvertor.castToReference(value)); + } else if (name.equals("reason")) { + this.getReason().add(TypeConvertor.castToCodeableReference(value)); } else if (name.equals("bodySite")) { this.getBodySite().add(TypeConvertor.castToCodeableConcept(value)); } else if (name.equals("outcome")) { @@ -2436,10 +2302,8 @@ public class Procedure extends DomainResource { this.getNote().add(TypeConvertor.castToAnnotation(value)); } else if (name.equals("focalDevice")) { this.getFocalDevice().add((ProcedureFocalDeviceComponent) value); - } else if (name.equals("usedReference")) { - this.getUsedReference().add(TypeConvertor.castToReference(value)); - } else if (name.equals("usedCode")) { - this.getUsedCode().add(TypeConvertor.castToCodeableConcept(value)); + } else if (name.equals("used")) { + this.getUsed().add(TypeConvertor.castToCodeableReference(value)); } else return super.setProperty(name, value); return value; @@ -2467,8 +2331,7 @@ public class Procedure extends DomainResource { case -427039533: return getReported(); case 481140686: return addPerformer(); case 1901043637: return getLocation(); - case 722137681: return addReasonCode(); - case -1146218137: return addReasonReference(); + case -934964668: return addReason(); case 1702620169: return addBodySite(); case -1106507950: return getOutcome(); case -934521548: return addReport(); @@ -2477,8 +2340,7 @@ public class Procedure extends DomainResource { case 301801004: return addFollowUp(); case 3387378: return addNote(); case -1129235173: return addFocalDevice(); - case -504932338: return addUsedReference(); - case -279910582: return addUsedCode(); + case 3599293: return addUsed(); default: return super.makeProperty(hash, name); } @@ -2504,8 +2366,7 @@ public class Procedure extends DomainResource { case -427039533: /*reported*/ return new String[] {"boolean", "Reference"}; case 481140686: /*performer*/ return new String[] {}; case 1901043637: /*location*/ return new String[] {"Reference"}; - case 722137681: /*reasonCode*/ return new String[] {"CodeableConcept"}; - case -1146218137: /*reasonReference*/ return new String[] {"Reference"}; + case -934964668: /*reason*/ return new String[] {"CodeableReference"}; case 1702620169: /*bodySite*/ return new String[] {"CodeableConcept"}; case -1106507950: /*outcome*/ return new String[] {"CodeableConcept"}; case -934521548: /*report*/ return new String[] {"Reference"}; @@ -2514,8 +2375,7 @@ public class Procedure extends DomainResource { case 301801004: /*followUp*/ return new String[] {"CodeableConcept"}; case 3387378: /*note*/ return new String[] {"Annotation"}; case -1129235173: /*focalDevice*/ return new String[] {}; - case -504932338: /*usedReference*/ return new String[] {"Reference"}; - case -279910582: /*usedCode*/ return new String[] {"CodeableConcept"}; + case 3599293: /*used*/ return new String[] {"CodeableReference"}; default: return super.getTypesForProperty(hash, name); } @@ -2606,11 +2466,8 @@ public class Procedure extends DomainResource { this.location = new Reference(); return this.location; } - else if (name.equals("reasonCode")) { - return addReasonCode(); - } - else if (name.equals("reasonReference")) { - return addReasonReference(); + else if (name.equals("reason")) { + return addReason(); } else if (name.equals("bodySite")) { return addBodySite(); @@ -2637,11 +2494,8 @@ public class Procedure extends DomainResource { else if (name.equals("focalDevice")) { return addFocalDevice(); } - else if (name.equals("usedReference")) { - return addUsedReference(); - } - else if (name.equals("usedCode")) { - return addUsedCode(); + else if (name.equals("used")) { + return addUsed(); } else return super.addChild(name); @@ -2705,15 +2559,10 @@ public class Procedure extends DomainResource { dst.performer.add(i.copy()); }; dst.location = location == null ? null : location.copy(); - if (reasonCode != null) { - dst.reasonCode = new ArrayList(); - for (CodeableConcept i : reasonCode) - dst.reasonCode.add(i.copy()); - }; - if (reasonReference != null) { - dst.reasonReference = new ArrayList(); - for (Reference i : reasonReference) - dst.reasonReference.add(i.copy()); + if (reason != null) { + dst.reason = new ArrayList(); + for (CodeableReference i : reason) + dst.reason.add(i.copy()); }; if (bodySite != null) { dst.bodySite = new ArrayList(); @@ -2751,15 +2600,10 @@ public class Procedure extends DomainResource { for (ProcedureFocalDeviceComponent i : focalDevice) dst.focalDevice.add(i.copy()); }; - if (usedReference != null) { - dst.usedReference = new ArrayList(); - for (Reference i : usedReference) - dst.usedReference.add(i.copy()); - }; - if (usedCode != null) { - dst.usedCode = new ArrayList(); - for (CodeableConcept i : usedCode) - dst.usedCode.add(i.copy()); + if (used != null) { + dst.used = new ArrayList(); + for (CodeableReference i : used) + dst.used.add(i.copy()); }; } @@ -2780,11 +2624,10 @@ public class Procedure extends DomainResource { && compareDeep(category, o.category, true) && compareDeep(code, o.code, true) && compareDeep(subject, o.subject, true) && compareDeep(encounter, o.encounter, true) && compareDeep(occurrence, o.occurrence, true) && compareDeep(recorded, o.recorded, true) && compareDeep(recorder, o.recorder, true) && compareDeep(reported, o.reported, true) && compareDeep(performer, o.performer, true) - && compareDeep(location, o.location, true) && compareDeep(reasonCode, o.reasonCode, true) && compareDeep(reasonReference, o.reasonReference, true) - && compareDeep(bodySite, o.bodySite, true) && compareDeep(outcome, o.outcome, true) && compareDeep(report, o.report, true) - && compareDeep(complication, o.complication, true) && compareDeep(complicationDetail, o.complicationDetail, true) - && compareDeep(followUp, o.followUp, true) && compareDeep(note, o.note, true) && compareDeep(focalDevice, o.focalDevice, true) - && compareDeep(usedReference, o.usedReference, true) && compareDeep(usedCode, o.usedCode, true) + && compareDeep(location, o.location, true) && compareDeep(reason, o.reason, true) && compareDeep(bodySite, o.bodySite, true) + && compareDeep(outcome, o.outcome, true) && compareDeep(report, o.report, true) && compareDeep(complication, o.complication, true) + && compareDeep(complicationDetail, o.complicationDetail, true) && compareDeep(followUp, o.followUp, true) + && compareDeep(note, o.note, true) && compareDeep(focalDevice, o.focalDevice, true) && compareDeep(used, o.used, true) ; } @@ -2802,9 +2645,9 @@ public class Procedure extends DomainResource { public boolean isEmpty() { return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, instantiatesCanonical , instantiatesUri, basedOn, partOf, status, statusReason, category, code, subject - , encounter, occurrence, recorded, recorder, reported, performer, location, reasonCode - , reasonReference, bodySite, outcome, report, complication, complicationDetail, followUp - , note, focalDevice, usedReference, usedCode); + , encounter, occurrence, recorded, recorder, reported, performer, location, reason + , bodySite, outcome, report, complication, complicationDetail, followUp, note + , focalDevice, used); } @Override @@ -2985,19 +2828,19 @@ public class Procedure extends DomainResource { /** * Search parameter: reason-code *

- * Description: Coded reason procedure performed
+ * Description: Reference to a concept (by class)
* Type: token
- * Path: Procedure.reasonCode
+ * Path: Procedure.reason.concept
*

*/ - @SearchParamDefinition(name="reason-code", path="Procedure.reasonCode", description="Coded reason procedure performed", type="token" ) + @SearchParamDefinition(name="reason-code", path="Procedure.reason.concept", description="Reference to a concept (by class)", type="token" ) public static final String SP_REASON_CODE = "reason-code"; /** * Fluent Client search parameter constant for reason-code *

- * Description: Coded reason procedure performed
+ * Description: Reference to a concept (by class)
* Type: token
- * Path: Procedure.reasonCode
+ * Path: Procedure.reason.concept
*

*/ public static final ca.uhn.fhir.rest.gclient.TokenClientParam REASON_CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_REASON_CODE); @@ -3005,19 +2848,19 @@ public class Procedure extends DomainResource { /** * Search parameter: reason-reference *

- * Description: The justification that the procedure was performed
+ * Description: Reference to a resource (by instance)
* Type: reference
- * Path: Procedure.reasonReference
+ * Path: Procedure.reason.reference
*

*/ - @SearchParamDefinition(name="reason-reference", path="Procedure.reasonReference", description="The justification that the procedure was performed", type="reference", target={Condition.class, DiagnosticReport.class, DocumentReference.class, Observation.class, Procedure.class } ) + @SearchParamDefinition(name="reason-reference", path="Procedure.reason.reference", description="Reference to a resource (by instance)", type="reference" ) public static final String SP_REASON_REFERENCE = "reason-reference"; /** * Fluent Client search parameter constant for reason-reference *

- * Description: The justification that the procedure was performed
+ * Description: Reference to a resource (by instance)
* Type: reference
- * Path: Procedure.reasonReference
+ * Path: Procedure.reason.reference
*

*/ public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam REASON_REFERENCE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_REASON_REFERENCE); 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 c49f0a1b1..212671f92 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 d8fd04715..f76bd7f32 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 a8a4c3a6d..a7e689df7 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 3741a88eb..fd668f6e1 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 36d207fa7..dbca14fd4 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 879f2d7d1..73d1ff606 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 8dca843b5..3d76b3140 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 c3b272543..e815903d8 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 72342272a..61587b2c6 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 0eb54d6c5..6f78dcdaa 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; @@ -735,7 +735,7 @@ public class RegulatedAuthorization extends DomainResource { /** * The product that is being authorized. */ - @Child(name = "subject", type = {MedicinalProductDefinition.class, PackagedProductDefinition.class, DeviceDefinition.class, ResearchStudy.class, ActivityDefinition.class, PlanDefinition.class}, order=1, min=0, max=1, modifier=false, summary=true) + @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) @Description(shortDefinition="The product that is being authorized", formalDefinition="The product that is being authorized." ) protected Reference subject; @@ -1366,7 +1366,7 @@ public class RegulatedAuthorization extends DomainResource { protected void listChildren(List children) { super.listChildren(children); children.add(new Property("identifier", "Identifier", "Business identifier for the marketing authorization, as assigned by a regulator.", 0, java.lang.Integer.MAX_VALUE, identifier)); - children.add(new Property("subject", "Reference(MedicinalProductDefinition|PackagedProductDefinition|DeviceDefinition|ResearchStudy|ActivityDefinition|PlanDefinition)", "The product that is being authorized.", 0, 1, subject)); + children.add(new Property("subject", "Reference(MedicinalProductDefinition|PackagedProductDefinition|DeviceDefinition|ResearchStudy|ActivityDefinition|PlanDefinition|ObservationDefinition)", "The product that is being authorized.", 0, 1, subject)); children.add(new Property("type", "CodeableConcept", "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)); @@ -1385,7 +1385,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 marketing authorization, as assigned by a regulator.", 0, java.lang.Integer.MAX_VALUE, identifier); - case -1867885268: /*subject*/ return new Property("subject", "Reference(MedicinalProductDefinition|PackagedProductDefinition|DeviceDefinition|ResearchStudy|ActivityDefinition|PlanDefinition)", "The product that is being authorized.", 0, 1, subject); + case -1867885268: /*subject*/ return new Property("subject", "Reference(MedicinalProductDefinition|PackagedProductDefinition|DeviceDefinition|ResearchStudy|ActivityDefinition|PlanDefinition|ObservationDefinition)", "The product that is being authorized.", 0, 1, subject); case 3575610: /*type*/ return new Property("type", "CodeableConcept", "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); @@ -1833,7 +1833,7 @@ public class RegulatedAuthorization extends DomainResource { * Path: RegulatedAuthorization.subject
*

*/ - @SearchParamDefinition(name="subject", path="RegulatedAuthorization.subject", description="The product that is being authorized", type="reference", target={ActivityDefinition.class, DeviceDefinition.class, MedicinalProductDefinition.class, PackagedProductDefinition.class, PlanDefinition.class, ResearchStudy.class } ) + @SearchParamDefinition(name="subject", path="RegulatedAuthorization.subject", description="The product that is being authorized", type="reference", target={ActivityDefinition.class, DeviceDefinition.class, MedicinalProductDefinition.class, ObservationDefinition.class, PackagedProductDefinition.class, PlanDefinition.class, ResearchStudy.class } ) public static final String SP_SUBJECT = "subject"; /** * Fluent Client search parameter constant for subject 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 d8a929bbe..4c89dfdda 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 2e2a96ad5..d8ba4bdb4 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 0710e5fa1..f374456ea 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; @@ -2309,32 +2309,25 @@ public class RequestGroup extends DomainResource { /** * Describes the reason for the request group in coded or textual form. */ - @Child(name = "reasonCode", type = {CodeableConcept.class}, order=14, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "reason", type = {CodeableReference.class}, order=14, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Why the request group is needed", formalDefinition="Describes the reason for the request group in coded or textual form." ) - protected List reasonCode; - - /** - * Indicates another resource whose existence justifies this request group. - */ - @Child(name = "reasonReference", type = {Condition.class, Observation.class, DiagnosticReport.class, DocumentReference.class}, order=15, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Why the request group is needed", formalDefinition="Indicates another resource whose existence justifies this request group." ) - protected List reasonReference; + protected List reason; /** * Provides a mechanism to communicate additional information about the response. */ - @Child(name = "note", type = {Annotation.class}, order=16, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "note", type = {Annotation.class}, order=15, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Additional notes about the response", formalDefinition="Provides a mechanism to communicate additional information about the response." ) protected List note; /** * The actions, if any, produced by the evaluation of the artifact. */ - @Child(name = "action", type = {}, order=17, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "action", type = {}, order=16, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Proposed actions, if any", formalDefinition="The actions, if any, produced by the evaluation of the artifact." ) protected List action; - private static final long serialVersionUID = 1938026085L; + private static final long serialVersionUID = 1379590221L; /** * Constructor @@ -2942,109 +2935,56 @@ public class RequestGroup extends DomainResource { } /** - * @return {@link #reasonCode} (Describes the reason for the request group in coded or textual form.) + * @return {@link #reason} (Describes the reason for the request group in coded or textual form.) */ - public List getReasonCode() { - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - return this.reasonCode; + public List getReason() { + if (this.reason == null) + this.reason = new ArrayList(); + return this.reason; } /** * @return Returns a reference to this for easy method chaining */ - public RequestGroup setReasonCode(List theReasonCode) { - this.reasonCode = theReasonCode; + public RequestGroup setReason(List theReason) { + this.reason = theReason; return this; } - public boolean hasReasonCode() { - if (this.reasonCode == null) + public boolean hasReason() { + if (this.reason == null) return false; - for (CodeableConcept item : this.reasonCode) + for (CodeableReference item : this.reason) if (!item.isEmpty()) return true; return false; } - public CodeableConcept addReasonCode() { //3 - CodeableConcept t = new CodeableConcept(); - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); + public CodeableReference addReason() { //3 + CodeableReference t = new CodeableReference(); + if (this.reason == null) + this.reason = new ArrayList(); + this.reason.add(t); return t; } - public RequestGroup addReasonCode(CodeableConcept t) { //3 + public RequestGroup addReason(CodeableReference t) { //3 if (t == null) return this; - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); + if (this.reason == null) + this.reason = new ArrayList(); + this.reason.add(t); return this; } /** - * @return The first repetition of repeating field {@link #reasonCode}, creating it if it does not already exist {3} + * @return The first repetition of repeating field {@link #reason}, creating it if it does not already exist {3} */ - public CodeableConcept getReasonCodeFirstRep() { - if (getReasonCode().isEmpty()) { - addReasonCode(); + public CodeableReference getReasonFirstRep() { + if (getReason().isEmpty()) { + addReason(); } - return getReasonCode().get(0); - } - - /** - * @return {@link #reasonReference} (Indicates another resource whose existence justifies this request group.) - */ - public List getReasonReference() { - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - return this.reasonReference; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public RequestGroup setReasonReference(List theReasonReference) { - this.reasonReference = theReasonReference; - return this; - } - - public boolean hasReasonReference() { - if (this.reasonReference == null) - return false; - for (Reference item : this.reasonReference) - if (!item.isEmpty()) - return true; - return false; - } - - public Reference addReasonReference() { //3 - Reference t = new Reference(); - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return t; - } - - public RequestGroup addReasonReference(Reference t) { //3 - if (t == null) - return this; - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #reasonReference}, creating it if it does not already exist {3} - */ - public Reference getReasonReferenceFirstRep() { - if (getReasonReference().isEmpty()) { - addReasonReference(); - } - return getReasonReference().get(0); + return getReason().get(0); } /** @@ -3169,8 +3109,7 @@ public class RequestGroup extends DomainResource { children.add(new Property("encounter", "Reference(Encounter)", "Describes the context of the request group, if any.", 0, 1, encounter)); children.add(new Property("authoredOn", "dateTime", "Indicates when the request group was created.", 0, 1, authoredOn)); children.add(new Property("author", "Reference(Device|Practitioner|PractitionerRole)", "Provides a reference to the author of the request group.", 0, 1, author)); - children.add(new Property("reasonCode", "CodeableConcept", "Describes the reason for the request group in coded or textual form.", 0, java.lang.Integer.MAX_VALUE, reasonCode)); - children.add(new Property("reasonReference", "Reference(Condition|Observation|DiagnosticReport|DocumentReference)", "Indicates another resource whose existence justifies this request group.", 0, java.lang.Integer.MAX_VALUE, reasonReference)); + children.add(new Property("reason", "CodeableReference(Condition|Observation|DiagnosticReport|DocumentReference)", "Describes the reason for the request group in coded or textual form.", 0, java.lang.Integer.MAX_VALUE, reason)); children.add(new Property("note", "Annotation", "Provides a mechanism to communicate additional information about the response.", 0, java.lang.Integer.MAX_VALUE, note)); children.add(new Property("action", "", "The actions, if any, produced by the evaluation of the artifact.", 0, java.lang.Integer.MAX_VALUE, action)); } @@ -3192,8 +3131,7 @@ public class RequestGroup extends DomainResource { case 1524132147: /*encounter*/ return new Property("encounter", "Reference(Encounter)", "Describes the context of the request group, if any.", 0, 1, encounter); case -1500852503: /*authoredOn*/ return new Property("authoredOn", "dateTime", "Indicates when the request group was created.", 0, 1, authoredOn); case -1406328437: /*author*/ return new Property("author", "Reference(Device|Practitioner|PractitionerRole)", "Provides a reference to the author of the request group.", 0, 1, author); - case 722137681: /*reasonCode*/ return new Property("reasonCode", "CodeableConcept", "Describes the reason for the request group in coded or textual form.", 0, java.lang.Integer.MAX_VALUE, reasonCode); - case -1146218137: /*reasonReference*/ return new Property("reasonReference", "Reference(Condition|Observation|DiagnosticReport|DocumentReference)", "Indicates another resource whose existence justifies this request group.", 0, java.lang.Integer.MAX_VALUE, reasonReference); + case -934964668: /*reason*/ return new Property("reason", "CodeableReference(Condition|Observation|DiagnosticReport|DocumentReference)", "Describes the reason for the request group in coded or textual form.", 0, java.lang.Integer.MAX_VALUE, reason); case 3387378: /*note*/ return new Property("note", "Annotation", "Provides a mechanism to communicate additional information about the response.", 0, java.lang.Integer.MAX_VALUE, note); case -1422950858: /*action*/ return new Property("action", "", "The actions, if any, produced by the evaluation of the artifact.", 0, java.lang.Integer.MAX_VALUE, action); default: return super.getNamedProperty(_hash, _name, _checkValid); @@ -3218,8 +3156,7 @@ public class RequestGroup extends DomainResource { case 1524132147: /*encounter*/ return this.encounter == null ? new Base[0] : new Base[] {this.encounter}; // Reference case -1500852503: /*authoredOn*/ return this.authoredOn == null ? new Base[0] : new Base[] {this.authoredOn}; // DateTimeType case -1406328437: /*author*/ return this.author == null ? new Base[0] : new Base[] {this.author}; // Reference - case 722137681: /*reasonCode*/ return this.reasonCode == null ? new Base[0] : this.reasonCode.toArray(new Base[this.reasonCode.size()]); // CodeableConcept - case -1146218137: /*reasonReference*/ return this.reasonReference == null ? new Base[0] : this.reasonReference.toArray(new Base[this.reasonReference.size()]); // Reference + case -934964668: /*reason*/ return this.reason == null ? new Base[0] : this.reason.toArray(new Base[this.reason.size()]); // CodeableReference case 3387378: /*note*/ return this.note == null ? new Base[0] : this.note.toArray(new Base[this.note.size()]); // Annotation case -1422950858: /*action*/ return this.action == null ? new Base[0] : this.action.toArray(new Base[this.action.size()]); // RequestGroupActionComponent default: return super.getProperty(hash, name, checkValid); @@ -3275,11 +3212,8 @@ public class RequestGroup extends DomainResource { case -1406328437: // author this.author = TypeConvertor.castToReference(value); // Reference return value; - case 722137681: // reasonCode - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept - return value; - case -1146218137: // reasonReference - this.getReasonReference().add(TypeConvertor.castToReference(value)); // Reference + case -934964668: // reason + this.getReason().add(TypeConvertor.castToCodeableReference(value)); // CodeableReference return value; case 3387378: // note this.getNote().add(TypeConvertor.castToAnnotation(value)); // Annotation @@ -3325,10 +3259,8 @@ public class RequestGroup extends DomainResource { this.authoredOn = TypeConvertor.castToDateTime(value); // DateTimeType } else if (name.equals("author")) { this.author = TypeConvertor.castToReference(value); // Reference - } else if (name.equals("reasonCode")) { - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); - } else if (name.equals("reasonReference")) { - this.getReasonReference().add(TypeConvertor.castToReference(value)); + } else if (name.equals("reason")) { + this.getReason().add(TypeConvertor.castToCodeableReference(value)); } else if (name.equals("note")) { this.getNote().add(TypeConvertor.castToAnnotation(value)); } else if (name.equals("action")) { @@ -3355,8 +3287,7 @@ public class RequestGroup extends DomainResource { case 1524132147: return getEncounter(); case -1500852503: return getAuthoredOnElement(); case -1406328437: return getAuthor(); - case 722137681: return addReasonCode(); - case -1146218137: return addReasonReference(); + case -934964668: return addReason(); case 3387378: return addNote(); case -1422950858: return addAction(); default: return super.makeProperty(hash, name); @@ -3381,8 +3312,7 @@ public class RequestGroup extends DomainResource { case 1524132147: /*encounter*/ return new String[] {"Reference"}; case -1500852503: /*authoredOn*/ return new String[] {"dateTime"}; case -1406328437: /*author*/ return new String[] {"Reference"}; - case 722137681: /*reasonCode*/ return new String[] {"CodeableConcept"}; - case -1146218137: /*reasonReference*/ return new String[] {"Reference"}; + case -934964668: /*reason*/ return new String[] {"CodeableReference"}; case 3387378: /*note*/ return new String[] {"Annotation"}; case -1422950858: /*action*/ return new String[] {}; default: return super.getTypesForProperty(hash, name); @@ -3439,11 +3369,8 @@ public class RequestGroup extends DomainResource { this.author = new Reference(); return this.author; } - else if (name.equals("reasonCode")) { - return addReasonCode(); - } - else if (name.equals("reasonReference")) { - return addReasonReference(); + else if (name.equals("reason")) { + return addReason(); } else if (name.equals("note")) { return addNote(); @@ -3502,15 +3429,10 @@ public class RequestGroup extends DomainResource { dst.encounter = encounter == null ? null : encounter.copy(); dst.authoredOn = authoredOn == null ? null : authoredOn.copy(); dst.author = author == null ? null : author.copy(); - if (reasonCode != null) { - dst.reasonCode = new ArrayList(); - for (CodeableConcept i : reasonCode) - dst.reasonCode.add(i.copy()); - }; - if (reasonReference != null) { - dst.reasonReference = new ArrayList(); - for (Reference i : reasonReference) - dst.reasonReference.add(i.copy()); + if (reason != null) { + dst.reason = new ArrayList(); + for (CodeableReference i : reason) + dst.reason.add(i.copy()); }; if (note != null) { dst.note = new ArrayList(); @@ -3540,9 +3462,8 @@ public class RequestGroup extends DomainResource { && compareDeep(replaces, o.replaces, true) && compareDeep(groupIdentifier, o.groupIdentifier, true) && compareDeep(status, o.status, true) && compareDeep(intent, o.intent, true) && compareDeep(priority, o.priority, true) && compareDeep(code, o.code, true) && compareDeep(subject, o.subject, true) && compareDeep(encounter, o.encounter, true) - && compareDeep(authoredOn, o.authoredOn, true) && compareDeep(author, o.author, true) && compareDeep(reasonCode, o.reasonCode, true) - && compareDeep(reasonReference, o.reasonReference, true) && compareDeep(note, o.note, true) && compareDeep(action, o.action, true) - ; + && compareDeep(authoredOn, o.authoredOn, true) && compareDeep(author, o.author, true) && compareDeep(reason, o.reason, true) + && compareDeep(note, o.note, true) && compareDeep(action, o.action, true); } @Override @@ -3560,8 +3481,7 @@ public class RequestGroup extends DomainResource { public boolean isEmpty() { return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, instantiatesCanonical , instantiatesUri, basedOn, replaces, groupIdentifier, status, intent, priority - , code, subject, encounter, authoredOn, author, reasonCode, reasonReference, note - , action); + , code, subject, encounter, authoredOn, author, reason, note, action); } @Override 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 6a1369913..225fdff41 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 e0825666e..ecafba584 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 6c89da2c0..de85feaf3 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 265a8a6aa..60f60874d 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 @@ -48,7 +48,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent 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 a7d0298f6..be0f6bcbf 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; @@ -681,46 +681,39 @@ public class RiskAssessment extends DomainResource { /** * The reason the risk assessment was performed. */ - @Child(name = "reasonCode", type = {CodeableConcept.class}, order=11, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "reason", type = {CodeableReference.class}, order=11, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Why the assessment was necessary?", formalDefinition="The reason the risk assessment was performed." ) - protected List reasonCode; - - /** - * Resources supporting the reason the risk assessment was performed. - */ - @Child(name = "reasonReference", type = {Condition.class, Observation.class, DiagnosticReport.class, DocumentReference.class}, order=12, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="Why the assessment was necessary?", formalDefinition="Resources supporting the reason the risk assessment was performed." ) - protected List reasonReference; + protected List reason; /** * Indicates the source data considered as part of the assessment (for example, FamilyHistory, Observations, Procedures, Conditions, etc.). */ - @Child(name = "basis", type = {Reference.class}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "basis", type = {Reference.class}, order=12, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Information used in assessment", formalDefinition="Indicates the source data considered as part of the assessment (for example, FamilyHistory, Observations, Procedures, Conditions, etc.)." ) protected List basis; /** * Describes the expected outcome for the subject. */ - @Child(name = "prediction", type = {}, order=14, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "prediction", type = {}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Outcome predicted", formalDefinition="Describes the expected outcome for the subject." ) protected List prediction; /** * A description of the steps that might be taken to reduce the identified risk(s). */ - @Child(name = "mitigation", type = {StringType.class}, order=15, min=0, max=1, modifier=false, summary=false) + @Child(name = "mitigation", type = {StringType.class}, order=14, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="How to reduce risk", formalDefinition="A description of the steps that might be taken to reduce the identified risk(s)." ) protected StringType mitigation; /** * Additional comments about the risk assessment. */ - @Child(name = "note", type = {Annotation.class}, order=16, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "note", type = {Annotation.class}, order=15, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Comments on the risk assessment", formalDefinition="Additional comments about the risk assessment." ) protected List note; - private static final long serialVersionUID = 818388748L; + private static final long serialVersionUID = 1076114228L; /** * Constructor @@ -1080,109 +1073,56 @@ public class RiskAssessment extends DomainResource { } /** - * @return {@link #reasonCode} (The reason the risk assessment was performed.) + * @return {@link #reason} (The reason the risk assessment was performed.) */ - public List getReasonCode() { - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - return this.reasonCode; + public List getReason() { + if (this.reason == null) + this.reason = new ArrayList(); + return this.reason; } /** * @return Returns a reference to this for easy method chaining */ - public RiskAssessment setReasonCode(List theReasonCode) { - this.reasonCode = theReasonCode; + public RiskAssessment setReason(List theReason) { + this.reason = theReason; return this; } - public boolean hasReasonCode() { - if (this.reasonCode == null) + public boolean hasReason() { + if (this.reason == null) return false; - for (CodeableConcept item : this.reasonCode) + for (CodeableReference item : this.reason) if (!item.isEmpty()) return true; return false; } - public CodeableConcept addReasonCode() { //3 - CodeableConcept t = new CodeableConcept(); - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); + public CodeableReference addReason() { //3 + CodeableReference t = new CodeableReference(); + if (this.reason == null) + this.reason = new ArrayList(); + this.reason.add(t); return t; } - public RiskAssessment addReasonCode(CodeableConcept t) { //3 + public RiskAssessment addReason(CodeableReference t) { //3 if (t == null) return this; - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); + if (this.reason == null) + this.reason = new ArrayList(); + this.reason.add(t); return this; } /** - * @return The first repetition of repeating field {@link #reasonCode}, creating it if it does not already exist {3} + * @return The first repetition of repeating field {@link #reason}, creating it if it does not already exist {3} */ - public CodeableConcept getReasonCodeFirstRep() { - if (getReasonCode().isEmpty()) { - addReasonCode(); + public CodeableReference getReasonFirstRep() { + if (getReason().isEmpty()) { + addReason(); } - return getReasonCode().get(0); - } - - /** - * @return {@link #reasonReference} (Resources supporting the reason the risk assessment was performed.) - */ - public List getReasonReference() { - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - return this.reasonReference; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public RiskAssessment setReasonReference(List theReasonReference) { - this.reasonReference = theReasonReference; - return this; - } - - public boolean hasReasonReference() { - if (this.reasonReference == null) - return false; - for (Reference item : this.reasonReference) - if (!item.isEmpty()) - return true; - return false; - } - - public Reference addReasonReference() { //3 - Reference t = new Reference(); - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return t; - } - - public RiskAssessment addReasonReference(Reference t) { //3 - if (t == null) - return this; - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #reasonReference}, creating it if it does not already exist {3} - */ - public Reference getReasonReferenceFirstRep() { - if (getReasonReference().isEmpty()) { - addReasonReference(); - } - return getReasonReference().get(0); + return getReason().get(0); } /** @@ -1406,8 +1346,7 @@ public class RiskAssessment extends DomainResource { children.add(new Property("occurrence[x]", "dateTime|Period", "The date (and possibly time) the risk assessment was performed.", 0, 1, occurrence)); children.add(new Property("condition", "Reference(Condition)", "For assessments or prognosis specific to a particular condition, indicates the condition being assessed.", 0, 1, condition)); children.add(new Property("performer", "Reference(Practitioner|PractitionerRole|Device)", "The provider or software application that performed the assessment.", 0, 1, performer)); - children.add(new Property("reasonCode", "CodeableConcept", "The reason the risk assessment was performed.", 0, java.lang.Integer.MAX_VALUE, reasonCode)); - children.add(new Property("reasonReference", "Reference(Condition|Observation|DiagnosticReport|DocumentReference)", "Resources supporting the reason the risk assessment was performed.", 0, java.lang.Integer.MAX_VALUE, reasonReference)); + children.add(new Property("reason", "CodeableReference(Condition|Observation|DiagnosticReport|DocumentReference)", "The reason the risk assessment was performed.", 0, java.lang.Integer.MAX_VALUE, reason)); children.add(new Property("basis", "Reference(Any)", "Indicates the source data considered as part of the assessment (for example, FamilyHistory, Observations, Procedures, Conditions, etc.).", 0, java.lang.Integer.MAX_VALUE, basis)); children.add(new Property("prediction", "", "Describes the expected outcome for the subject.", 0, java.lang.Integer.MAX_VALUE, prediction)); children.add(new Property("mitigation", "string", "A description of the steps that might be taken to reduce the identified risk(s).", 0, 1, mitigation)); @@ -1431,8 +1370,7 @@ public class RiskAssessment extends DomainResource { case 1397156594: /*occurrencePeriod*/ return new Property("occurrence[x]", "Period", "The date (and possibly time) the risk assessment was performed.", 0, 1, occurrence); case -861311717: /*condition*/ return new Property("condition", "Reference(Condition)", "For assessments or prognosis specific to a particular condition, indicates the condition being assessed.", 0, 1, condition); case 481140686: /*performer*/ return new Property("performer", "Reference(Practitioner|PractitionerRole|Device)", "The provider or software application that performed the assessment.", 0, 1, performer); - case 722137681: /*reasonCode*/ return new Property("reasonCode", "CodeableConcept", "The reason the risk assessment was performed.", 0, java.lang.Integer.MAX_VALUE, reasonCode); - case -1146218137: /*reasonReference*/ return new Property("reasonReference", "Reference(Condition|Observation|DiagnosticReport|DocumentReference)", "Resources supporting the reason the risk assessment was performed.", 0, java.lang.Integer.MAX_VALUE, reasonReference); + case -934964668: /*reason*/ return new Property("reason", "CodeableReference(Condition|Observation|DiagnosticReport|DocumentReference)", "The reason the risk assessment was performed.", 0, java.lang.Integer.MAX_VALUE, reason); case 93508670: /*basis*/ return new Property("basis", "Reference(Any)", "Indicates the source data considered as part of the assessment (for example, FamilyHistory, Observations, Procedures, Conditions, etc.).", 0, java.lang.Integer.MAX_VALUE, basis); case 1161234575: /*prediction*/ return new Property("prediction", "", "Describes the expected outcome for the subject.", 0, java.lang.Integer.MAX_VALUE, prediction); case 1293793087: /*mitigation*/ return new Property("mitigation", "string", "A description of the steps that might be taken to reduce the identified risk(s).", 0, 1, mitigation); @@ -1456,8 +1394,7 @@ public class RiskAssessment extends DomainResource { case 1687874001: /*occurrence*/ return this.occurrence == null ? new Base[0] : new Base[] {this.occurrence}; // DataType case -861311717: /*condition*/ return this.condition == null ? new Base[0] : new Base[] {this.condition}; // Reference case 481140686: /*performer*/ return this.performer == null ? new Base[0] : new Base[] {this.performer}; // Reference - case 722137681: /*reasonCode*/ return this.reasonCode == null ? new Base[0] : this.reasonCode.toArray(new Base[this.reasonCode.size()]); // CodeableConcept - case -1146218137: /*reasonReference*/ return this.reasonReference == null ? new Base[0] : this.reasonReference.toArray(new Base[this.reasonReference.size()]); // Reference + case -934964668: /*reason*/ return this.reason == null ? new Base[0] : this.reason.toArray(new Base[this.reason.size()]); // CodeableReference case 93508670: /*basis*/ return this.basis == null ? new Base[0] : this.basis.toArray(new Base[this.basis.size()]); // Reference case 1161234575: /*prediction*/ return this.prediction == null ? new Base[0] : this.prediction.toArray(new Base[this.prediction.size()]); // RiskAssessmentPredictionComponent case 1293793087: /*mitigation*/ return this.mitigation == null ? new Base[0] : new Base[] {this.mitigation}; // StringType @@ -1504,11 +1441,8 @@ public class RiskAssessment extends DomainResource { case 481140686: // performer this.performer = TypeConvertor.castToReference(value); // Reference return value; - case 722137681: // reasonCode - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept - return value; - case -1146218137: // reasonReference - this.getReasonReference().add(TypeConvertor.castToReference(value)); // Reference + case -934964668: // reason + this.getReason().add(TypeConvertor.castToCodeableReference(value)); // CodeableReference return value; case 93508670: // basis this.getBasis().add(TypeConvertor.castToReference(value)); // Reference @@ -1552,10 +1486,8 @@ public class RiskAssessment extends DomainResource { this.condition = TypeConvertor.castToReference(value); // Reference } else if (name.equals("performer")) { this.performer = TypeConvertor.castToReference(value); // Reference - } else if (name.equals("reasonCode")) { - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); - } else if (name.equals("reasonReference")) { - this.getReasonReference().add(TypeConvertor.castToReference(value)); + } else if (name.equals("reason")) { + this.getReason().add(TypeConvertor.castToCodeableReference(value)); } else if (name.equals("basis")) { this.getBasis().add(TypeConvertor.castToReference(value)); } else if (name.equals("prediction")) { @@ -1584,8 +1516,7 @@ public class RiskAssessment extends DomainResource { case 1687874001: return getOccurrence(); case -861311717: return getCondition(); case 481140686: return getPerformer(); - case 722137681: return addReasonCode(); - case -1146218137: return addReasonReference(); + case -934964668: return addReason(); case 93508670: return addBasis(); case 1161234575: return addPrediction(); case 1293793087: return getMitigationElement(); @@ -1609,8 +1540,7 @@ public class RiskAssessment extends DomainResource { case 1687874001: /*occurrence*/ return new String[] {"dateTime", "Period"}; case -861311717: /*condition*/ return new String[] {"Reference"}; case 481140686: /*performer*/ return new String[] {"Reference"}; - case 722137681: /*reasonCode*/ return new String[] {"CodeableConcept"}; - case -1146218137: /*reasonReference*/ return new String[] {"Reference"}; + case -934964668: /*reason*/ return new String[] {"CodeableReference"}; case 93508670: /*basis*/ return new String[] {"Reference"}; case 1161234575: /*prediction*/ return new String[] {}; case 1293793087: /*mitigation*/ return new String[] {"string"}; @@ -1668,11 +1598,8 @@ public class RiskAssessment extends DomainResource { this.performer = new Reference(); return this.performer; } - else if (name.equals("reasonCode")) { - return addReasonCode(); - } - else if (name.equals("reasonReference")) { - return addReasonReference(); + else if (name.equals("reason")) { + return addReason(); } else if (name.equals("basis")) { return addBasis(); @@ -1718,15 +1645,10 @@ public class RiskAssessment extends DomainResource { dst.occurrence = occurrence == null ? null : occurrence.copy(); dst.condition = condition == null ? null : condition.copy(); dst.performer = performer == null ? null : performer.copy(); - if (reasonCode != null) { - dst.reasonCode = new ArrayList(); - for (CodeableConcept i : reasonCode) - dst.reasonCode.add(i.copy()); - }; - if (reasonReference != null) { - dst.reasonReference = new ArrayList(); - for (Reference i : reasonReference) - dst.reasonReference.add(i.copy()); + if (reason != null) { + dst.reason = new ArrayList(); + for (CodeableReference i : reason) + dst.reason.add(i.copy()); }; if (basis != null) { dst.basis = new ArrayList(); @@ -1760,9 +1682,9 @@ public class RiskAssessment extends DomainResource { return compareDeep(identifier, o.identifier, true) && compareDeep(basedOn, o.basedOn, true) && compareDeep(parent, o.parent, true) && compareDeep(status, o.status, true) && compareDeep(method, o.method, true) && compareDeep(code, o.code, true) && compareDeep(subject, o.subject, true) && compareDeep(encounter, o.encounter, true) && compareDeep(occurrence, o.occurrence, true) - && compareDeep(condition, o.condition, true) && compareDeep(performer, o.performer, true) && compareDeep(reasonCode, o.reasonCode, true) - && compareDeep(reasonReference, o.reasonReference, true) && compareDeep(basis, o.basis, true) && compareDeep(prediction, o.prediction, true) - && compareDeep(mitigation, o.mitigation, true) && compareDeep(note, o.note, true); + && compareDeep(condition, o.condition, true) && compareDeep(performer, o.performer, true) && compareDeep(reason, o.reason, true) + && compareDeep(basis, o.basis, true) && compareDeep(prediction, o.prediction, true) && compareDeep(mitigation, o.mitigation, true) + && compareDeep(note, o.note, true); } @Override @@ -1778,7 +1700,7 @@ public class RiskAssessment extends DomainResource { public boolean isEmpty() { return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, basedOn, parent , status, method, code, subject, encounter, occurrence, condition, performer - , reasonCode, reasonReference, basis, prediction, mitigation, note); + , reason, basis, prediction, mitigation, note); } @Override 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 657dfdcc2..a3786940a 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 6c394b12d..4f88e5316 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 75547aeb1..e3ad3edde 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 533c0cfef..cc6fa3986 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; @@ -238,58 +238,44 @@ public class ServiceRequest extends DomainResource { /** * The preferred location(s) where the procedure should actually happen in coded or free text form. E.g. at home or nursing day care center. */ - @Child(name = "locationCode", type = {CodeableConcept.class}, order=22, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "location", type = {CodeableReference.class}, order=22, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Requested location", formalDefinition="The preferred location(s) where the procedure should actually happen in coded or free text form. E.g. at home or nursing day care center." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://terminology.hl7.org/ValueSet/v3-ServiceDeliveryLocationRoleType") - protected List locationCode; - - /** - * A reference to the the preferred location(s) where the procedure should actually happen. E.g. at home or nursing day care center. - */ - @Child(name = "locationReference", type = {Location.class}, order=23, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Requested location", formalDefinition="A reference to the the preferred location(s) where the procedure should actually happen. E.g. at home or nursing day care center." ) - protected List locationReference; + protected List location; /** * An explanation or justification for why this service is being requested in coded or textual form. This is often for billing purposes. May relate to the resources referred to in `supportingInfo`. */ - @Child(name = "reasonCode", type = {CodeableConcept.class}, order=24, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "reason", type = {CodeableReference.class}, order=23, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Explanation/Justification for procedure or service", formalDefinition="An explanation or justification for why this service is being requested in coded or textual form. This is often for billing purposes. May relate to the resources referred to in `supportingInfo`." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/procedure-reason") - protected List reasonCode; - - /** - * Indicates another resource that provides a justification for why this service is being requested. May relate to the resources referred to in `supportingInfo`. - */ - @Child(name = "reasonReference", type = {Condition.class, Observation.class, DiagnosticReport.class, DocumentReference.class}, order=25, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) - @Description(shortDefinition="Explanation/Justification for service or service", formalDefinition="Indicates another resource that provides a justification for why this service is being requested. May relate to the resources referred to in `supportingInfo`." ) - protected List reasonReference; + protected List reason; /** * Insurance plans, coverage extensions, pre-authorizations and/or pre-determinations that may be needed for delivering the requested service. */ - @Child(name = "insurance", type = {Coverage.class, ClaimResponse.class}, order=26, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "insurance", type = {Coverage.class, ClaimResponse.class}, order=24, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Associated insurance coverage", formalDefinition="Insurance plans, coverage extensions, pre-authorizations and/or pre-determinations that may be needed for delivering the requested service." ) protected List insurance; /** * Additional clinical information about the patient or specimen that may influence the services or their interpretations. This information includes diagnosis, clinical findings and other observations. In laboratory ordering these are typically referred to as "ask at order entry questions (AOEs)". This includes observations explicitly requested by the producer (filler) to provide context or supporting information needed to complete the order. For example, reporting the amount of inspired oxygen for blood gas measurements. */ - @Child(name = "supportingInfo", type = {Reference.class}, order=27, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "supportingInfo", type = {Reference.class}, order=25, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Additional clinical information", formalDefinition="Additional clinical information about the patient or specimen that may influence the services or their interpretations. This information includes diagnosis, clinical findings and other observations. In laboratory ordering these are typically referred to as \"ask at order entry questions (AOEs)\". This includes observations explicitly requested by the producer (filler) to provide context or supporting information needed to complete the order. For example, reporting the amount of inspired oxygen for blood gas measurements." ) protected List supportingInfo; /** * One or more specimens that the laboratory procedure will use. */ - @Child(name = "specimen", type = {Specimen.class}, order=28, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "specimen", type = {Specimen.class}, order=26, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Procedure Samples", formalDefinition="One or more specimens that the laboratory procedure will use." ) protected List specimen; /** * Anatomic location where the procedure should be performed. This is the target site. */ - @Child(name = "bodySite", type = {CodeableConcept.class}, order=29, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "bodySite", type = {CodeableConcept.class}, order=27, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Location on Body", formalDefinition="Anatomic location where the procedure should be performed. This is the target site." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/body-site") protected List bodySite; @@ -297,25 +283,25 @@ public class ServiceRequest extends DomainResource { /** * Any other notes and comments made about the service request. For example, internal billing notes. */ - @Child(name = "note", type = {Annotation.class}, order=30, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "note", type = {Annotation.class}, order=28, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Comments", formalDefinition="Any other notes and comments made about the service request. For example, internal billing notes." ) protected List note; /** * Instructions in terms that are understood by the patient or consumer. */ - @Child(name = "patientInstruction", type = {StringType.class}, order=31, min=0, max=1, modifier=false, summary=true) + @Child(name = "patientInstruction", type = {StringType.class}, order=29, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Patient or consumer-oriented instructions", formalDefinition="Instructions in terms that are understood by the patient or consumer." ) protected StringType patientInstruction; /** * Key events in the history of the request. */ - @Child(name = "relevantHistory", type = {Provenance.class}, order=32, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "relevantHistory", type = {Provenance.class}, order=30, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Request provenance", formalDefinition="Key events in the history of the request." ) protected List relevantHistory; - private static final long serialVersionUID = -461863342L; + private static final long serialVersionUID = -578395935L; /** * Constructor @@ -1335,215 +1321,109 @@ public class ServiceRequest extends DomainResource { } /** - * @return {@link #locationCode} (The preferred location(s) where the procedure should actually happen in coded or free text form. E.g. at home or nursing day care center.) + * @return {@link #location} (The preferred location(s) where the procedure should actually happen in coded or free text form. E.g. at home or nursing day care center.) */ - public List getLocationCode() { - if (this.locationCode == null) - this.locationCode = new ArrayList(); - return this.locationCode; + public List getLocation() { + if (this.location == null) + this.location = new ArrayList(); + return this.location; } /** * @return Returns a reference to this for easy method chaining */ - public ServiceRequest setLocationCode(List theLocationCode) { - this.locationCode = theLocationCode; + public ServiceRequest setLocation(List theLocation) { + this.location = theLocation; return this; } - public boolean hasLocationCode() { - if (this.locationCode == null) + public boolean hasLocation() { + if (this.location == null) return false; - for (CodeableConcept item : this.locationCode) + for (CodeableReference item : this.location) if (!item.isEmpty()) return true; return false; } - public CodeableConcept addLocationCode() { //3 - CodeableConcept t = new CodeableConcept(); - if (this.locationCode == null) - this.locationCode = new ArrayList(); - this.locationCode.add(t); + public CodeableReference addLocation() { //3 + CodeableReference t = new CodeableReference(); + if (this.location == null) + this.location = new ArrayList(); + this.location.add(t); return t; } - public ServiceRequest addLocationCode(CodeableConcept t) { //3 + public ServiceRequest addLocation(CodeableReference t) { //3 if (t == null) return this; - if (this.locationCode == null) - this.locationCode = new ArrayList(); - this.locationCode.add(t); + if (this.location == null) + this.location = new ArrayList(); + this.location.add(t); return this; } /** - * @return The first repetition of repeating field {@link #locationCode}, creating it if it does not already exist {3} + * @return The first repetition of repeating field {@link #location}, creating it if it does not already exist {3} */ - public CodeableConcept getLocationCodeFirstRep() { - if (getLocationCode().isEmpty()) { - addLocationCode(); + public CodeableReference getLocationFirstRep() { + if (getLocation().isEmpty()) { + addLocation(); } - return getLocationCode().get(0); + return getLocation().get(0); } /** - * @return {@link #locationReference} (A reference to the the preferred location(s) where the procedure should actually happen. E.g. at home or nursing day care center.) + * @return {@link #reason} (An explanation or justification for why this service is being requested in coded or textual form. This is often for billing purposes. May relate to the resources referred to in `supportingInfo`.) */ - public List getLocationReference() { - if (this.locationReference == null) - this.locationReference = new ArrayList(); - return this.locationReference; + public List getReason() { + if (this.reason == null) + this.reason = new ArrayList(); + return this.reason; } /** * @return Returns a reference to this for easy method chaining */ - public ServiceRequest setLocationReference(List theLocationReference) { - this.locationReference = theLocationReference; + public ServiceRequest setReason(List theReason) { + this.reason = theReason; return this; } - public boolean hasLocationReference() { - if (this.locationReference == null) + public boolean hasReason() { + if (this.reason == null) return false; - for (Reference item : this.locationReference) + for (CodeableReference item : this.reason) if (!item.isEmpty()) return true; return false; } - public Reference addLocationReference() { //3 - Reference t = new Reference(); - if (this.locationReference == null) - this.locationReference = new ArrayList(); - this.locationReference.add(t); + public CodeableReference addReason() { //3 + CodeableReference t = new CodeableReference(); + if (this.reason == null) + this.reason = new ArrayList(); + this.reason.add(t); return t; } - public ServiceRequest addLocationReference(Reference t) { //3 + public ServiceRequest addReason(CodeableReference t) { //3 if (t == null) return this; - if (this.locationReference == null) - this.locationReference = new ArrayList(); - this.locationReference.add(t); + if (this.reason == null) + this.reason = new ArrayList(); + this.reason.add(t); return this; } /** - * @return The first repetition of repeating field {@link #locationReference}, creating it if it does not already exist {3} + * @return The first repetition of repeating field {@link #reason}, creating it if it does not already exist {3} */ - public Reference getLocationReferenceFirstRep() { - if (getLocationReference().isEmpty()) { - addLocationReference(); + public CodeableReference getReasonFirstRep() { + if (getReason().isEmpty()) { + addReason(); } - return getLocationReference().get(0); - } - - /** - * @return {@link #reasonCode} (An explanation or justification for why this service is being requested in coded or textual form. This is often for billing purposes. May relate to the resources referred to in `supportingInfo`.) - */ - public List getReasonCode() { - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - return this.reasonCode; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public ServiceRequest setReasonCode(List theReasonCode) { - this.reasonCode = theReasonCode; - return this; - } - - public boolean hasReasonCode() { - if (this.reasonCode == null) - return false; - for (CodeableConcept item : this.reasonCode) - if (!item.isEmpty()) - return true; - return false; - } - - public CodeableConcept addReasonCode() { //3 - CodeableConcept t = new CodeableConcept(); - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); - return t; - } - - public ServiceRequest addReasonCode(CodeableConcept t) { //3 - if (t == null) - return this; - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #reasonCode}, creating it if it does not already exist {3} - */ - public CodeableConcept getReasonCodeFirstRep() { - if (getReasonCode().isEmpty()) { - addReasonCode(); - } - return getReasonCode().get(0); - } - - /** - * @return {@link #reasonReference} (Indicates another resource that provides a justification for why this service is being requested. May relate to the resources referred to in `supportingInfo`.) - */ - public List getReasonReference() { - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - return this.reasonReference; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public ServiceRequest setReasonReference(List theReasonReference) { - this.reasonReference = theReasonReference; - return this; - } - - public boolean hasReasonReference() { - if (this.reasonReference == null) - return false; - for (Reference item : this.reasonReference) - if (!item.isEmpty()) - return true; - return false; - } - - public Reference addReasonReference() { //3 - Reference t = new Reference(); - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return t; - } - - public ServiceRequest addReasonReference(Reference t) { //3 - if (t == null) - return this; - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #reasonReference}, creating it if it does not already exist {3} - */ - public Reference getReasonReferenceFirstRep() { - if (getReasonReference().isEmpty()) { - addReasonReference(); - } - return getReasonReference().get(0); + return getReason().get(0); } /** @@ -1937,10 +1817,8 @@ public class ServiceRequest extends DomainResource { children.add(new Property("requester", "Reference(Practitioner|PractitionerRole|Organization|Patient|RelatedPerson|Device)", "The individual who initiated the request and has responsibility for its activation.", 0, 1, requester)); children.add(new Property("performerType", "CodeableConcept", "Desired type of performer for doing the requested service.", 0, 1, performerType)); children.add(new Property("performer", "Reference(Practitioner|PractitionerRole|Organization|CareTeam|HealthcareService|Patient|Device|RelatedPerson)", "The desired performer for doing the requested service. For example, the surgeon, dermatopathologist, endoscopist, etc.", 0, java.lang.Integer.MAX_VALUE, performer)); - children.add(new Property("locationCode", "CodeableConcept", "The preferred location(s) where the procedure should actually happen in coded or free text form. E.g. at home or nursing day care center.", 0, java.lang.Integer.MAX_VALUE, locationCode)); - children.add(new Property("locationReference", "Reference(Location)", "A reference to the the preferred location(s) where the procedure should actually happen. E.g. at home or nursing day care center.", 0, java.lang.Integer.MAX_VALUE, locationReference)); - children.add(new Property("reasonCode", "CodeableConcept", "An explanation or justification for why this service is being requested in coded or textual form. This is often for billing purposes. May relate to the resources referred to in `supportingInfo`.", 0, java.lang.Integer.MAX_VALUE, reasonCode)); - children.add(new Property("reasonReference", "Reference(Condition|Observation|DiagnosticReport|DocumentReference)", "Indicates another resource that provides a justification for why this service is being requested. May relate to the resources referred to in `supportingInfo`.", 0, java.lang.Integer.MAX_VALUE, reasonReference)); + children.add(new Property("location", "CodeableReference(Location)", "The preferred location(s) where the procedure should actually happen in coded or free text form. E.g. at home or nursing day care center.", 0, java.lang.Integer.MAX_VALUE, location)); + children.add(new Property("reason", "CodeableReference(Condition|Observation|DiagnosticReport|DocumentReference)", "An explanation or justification for why this service is being requested in coded or textual form. This is often for billing purposes. May relate to the resources referred to in `supportingInfo`.", 0, java.lang.Integer.MAX_VALUE, reason)); children.add(new Property("insurance", "Reference(Coverage|ClaimResponse)", "Insurance plans, coverage extensions, pre-authorizations and/or pre-determinations that may be needed for delivering the requested service.", 0, java.lang.Integer.MAX_VALUE, insurance)); children.add(new Property("supportingInfo", "Reference(Any)", "Additional clinical information about the patient or specimen that may influence the services or their interpretations. This information includes diagnosis, clinical findings and other observations. In laboratory ordering these are typically referred to as \"ask at order entry questions (AOEs)\". This includes observations explicitly requested by the producer (filler) to provide context or supporting information needed to complete the order. For example, reporting the amount of inspired oxygen for blood gas measurements.", 0, java.lang.Integer.MAX_VALUE, supportingInfo)); children.add(new Property("specimen", "Reference(Specimen)", "One or more specimens that the laboratory procedure will use.", 0, java.lang.Integer.MAX_VALUE, specimen)); @@ -1986,10 +1864,8 @@ public class ServiceRequest extends DomainResource { case 693933948: /*requester*/ return new Property("requester", "Reference(Practitioner|PractitionerRole|Organization|Patient|RelatedPerson|Device)", "The individual who initiated the request and has responsibility for its activation.", 0, 1, requester); case -901444568: /*performerType*/ return new Property("performerType", "CodeableConcept", "Desired type of performer for doing the requested service.", 0, 1, performerType); case 481140686: /*performer*/ return new Property("performer", "Reference(Practitioner|PractitionerRole|Organization|CareTeam|HealthcareService|Patient|Device|RelatedPerson)", "The desired performer for doing the requested service. For example, the surgeon, dermatopathologist, endoscopist, etc.", 0, java.lang.Integer.MAX_VALUE, performer); - case -58794174: /*locationCode*/ return new Property("locationCode", "CodeableConcept", "The preferred location(s) where the procedure should actually happen in coded or free text form. E.g. at home or nursing day care center.", 0, java.lang.Integer.MAX_VALUE, locationCode); - case 755866390: /*locationReference*/ return new Property("locationReference", "Reference(Location)", "A reference to the the preferred location(s) where the procedure should actually happen. E.g. at home or nursing day care center.", 0, java.lang.Integer.MAX_VALUE, locationReference); - case 722137681: /*reasonCode*/ return new Property("reasonCode", "CodeableConcept", "An explanation or justification for why this service is being requested in coded or textual form. This is often for billing purposes. May relate to the resources referred to in `supportingInfo`.", 0, java.lang.Integer.MAX_VALUE, reasonCode); - case -1146218137: /*reasonReference*/ return new Property("reasonReference", "Reference(Condition|Observation|DiagnosticReport|DocumentReference)", "Indicates another resource that provides a justification for why this service is being requested. May relate to the resources referred to in `supportingInfo`.", 0, java.lang.Integer.MAX_VALUE, reasonReference); + case 1901043637: /*location*/ return new Property("location", "CodeableReference(Location)", "The preferred location(s) where the procedure should actually happen in coded or free text form. E.g. at home or nursing day care center.", 0, java.lang.Integer.MAX_VALUE, location); + case -934964668: /*reason*/ return new Property("reason", "CodeableReference(Condition|Observation|DiagnosticReport|DocumentReference)", "An explanation or justification for why this service is being requested in coded or textual form. This is often for billing purposes. May relate to the resources referred to in `supportingInfo`.", 0, java.lang.Integer.MAX_VALUE, reason); case 73049818: /*insurance*/ return new Property("insurance", "Reference(Coverage|ClaimResponse)", "Insurance plans, coverage extensions, pre-authorizations and/or pre-determinations that may be needed for delivering the requested service.", 0, java.lang.Integer.MAX_VALUE, insurance); case 1922406657: /*supportingInfo*/ return new Property("supportingInfo", "Reference(Any)", "Additional clinical information about the patient or specimen that may influence the services or their interpretations. This information includes diagnosis, clinical findings and other observations. In laboratory ordering these are typically referred to as \"ask at order entry questions (AOEs)\". This includes observations explicitly requested by the producer (filler) to provide context or supporting information needed to complete the order. For example, reporting the amount of inspired oxygen for blood gas measurements.", 0, java.lang.Integer.MAX_VALUE, supportingInfo); case -2132868344: /*specimen*/ return new Property("specimen", "Reference(Specimen)", "One or more specimens that the laboratory procedure will use.", 0, java.lang.Integer.MAX_VALUE, specimen); @@ -2027,10 +1903,8 @@ public class ServiceRequest extends DomainResource { case 693933948: /*requester*/ return this.requester == null ? new Base[0] : new Base[] {this.requester}; // Reference case -901444568: /*performerType*/ return this.performerType == null ? new Base[0] : new Base[] {this.performerType}; // CodeableConcept case 481140686: /*performer*/ return this.performer == null ? new Base[0] : this.performer.toArray(new Base[this.performer.size()]); // Reference - case -58794174: /*locationCode*/ return this.locationCode == null ? new Base[0] : this.locationCode.toArray(new Base[this.locationCode.size()]); // CodeableConcept - case 755866390: /*locationReference*/ return this.locationReference == null ? new Base[0] : this.locationReference.toArray(new Base[this.locationReference.size()]); // Reference - case 722137681: /*reasonCode*/ return this.reasonCode == null ? new Base[0] : this.reasonCode.toArray(new Base[this.reasonCode.size()]); // CodeableConcept - case -1146218137: /*reasonReference*/ return this.reasonReference == null ? new Base[0] : this.reasonReference.toArray(new Base[this.reasonReference.size()]); // Reference + case 1901043637: /*location*/ return this.location == null ? new Base[0] : this.location.toArray(new Base[this.location.size()]); // CodeableReference + case -934964668: /*reason*/ return this.reason == null ? new Base[0] : this.reason.toArray(new Base[this.reason.size()]); // CodeableReference case 73049818: /*insurance*/ return this.insurance == null ? new Base[0] : this.insurance.toArray(new Base[this.insurance.size()]); // Reference case 1922406657: /*supportingInfo*/ return this.supportingInfo == null ? new Base[0] : this.supportingInfo.toArray(new Base[this.supportingInfo.size()]); // Reference case -2132868344: /*specimen*/ return this.specimen == null ? new Base[0] : this.specimen.toArray(new Base[this.specimen.size()]); // Reference @@ -2115,17 +1989,11 @@ public class ServiceRequest extends DomainResource { case 481140686: // performer this.getPerformer().add(TypeConvertor.castToReference(value)); // Reference return value; - case -58794174: // locationCode - this.getLocationCode().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept + case 1901043637: // location + this.getLocation().add(TypeConvertor.castToCodeableReference(value)); // CodeableReference return value; - case 755866390: // locationReference - this.getLocationReference().add(TypeConvertor.castToReference(value)); // Reference - return value; - case 722137681: // reasonCode - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept - return value; - case -1146218137: // reasonReference - this.getReasonReference().add(TypeConvertor.castToReference(value)); // Reference + case -934964668: // reason + this.getReason().add(TypeConvertor.castToCodeableReference(value)); // CodeableReference return value; case 73049818: // insurance this.getInsurance().add(TypeConvertor.castToReference(value)); // Reference @@ -2202,14 +2070,10 @@ public class ServiceRequest extends DomainResource { this.performerType = TypeConvertor.castToCodeableConcept(value); // CodeableConcept } else if (name.equals("performer")) { this.getPerformer().add(TypeConvertor.castToReference(value)); - } else if (name.equals("locationCode")) { - this.getLocationCode().add(TypeConvertor.castToCodeableConcept(value)); - } else if (name.equals("locationReference")) { - this.getLocationReference().add(TypeConvertor.castToReference(value)); - } else if (name.equals("reasonCode")) { - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); - } else if (name.equals("reasonReference")) { - this.getReasonReference().add(TypeConvertor.castToReference(value)); + } else if (name.equals("location")) { + this.getLocation().add(TypeConvertor.castToCodeableReference(value)); + } else if (name.equals("reason")) { + this.getReason().add(TypeConvertor.castToCodeableReference(value)); } else if (name.equals("insurance")) { this.getInsurance().add(TypeConvertor.castToReference(value)); } else if (name.equals("supportingInfo")) { @@ -2257,10 +2121,8 @@ public class ServiceRequest extends DomainResource { case 693933948: return getRequester(); case -901444568: return getPerformerType(); case 481140686: return addPerformer(); - case -58794174: return addLocationCode(); - case 755866390: return addLocationReference(); - case 722137681: return addReasonCode(); - case -1146218137: return addReasonReference(); + case 1901043637: return addLocation(); + case -934964668: return addReason(); case 73049818: return addInsurance(); case 1922406657: return addSupportingInfo(); case -2132868344: return addSpecimen(); @@ -2298,10 +2160,8 @@ public class ServiceRequest extends DomainResource { case 693933948: /*requester*/ return new String[] {"Reference"}; case -901444568: /*performerType*/ return new String[] {"CodeableConcept"}; case 481140686: /*performer*/ return new String[] {"Reference"}; - case -58794174: /*locationCode*/ return new String[] {"CodeableConcept"}; - case 755866390: /*locationReference*/ return new String[] {"Reference"}; - case 722137681: /*reasonCode*/ return new String[] {"CodeableConcept"}; - case -1146218137: /*reasonReference*/ return new String[] {"Reference"}; + case 1901043637: /*location*/ return new String[] {"CodeableReference"}; + case -934964668: /*reason*/ return new String[] {"CodeableReference"}; case 73049818: /*insurance*/ return new String[] {"Reference"}; case 1922406657: /*supportingInfo*/ return new String[] {"Reference"}; case -2132868344: /*specimen*/ return new String[] {"Reference"}; @@ -2411,17 +2271,11 @@ public class ServiceRequest extends DomainResource { else if (name.equals("performer")) { return addPerformer(); } - else if (name.equals("locationCode")) { - return addLocationCode(); + else if (name.equals("location")) { + return addLocation(); } - else if (name.equals("locationReference")) { - return addLocationReference(); - } - else if (name.equals("reasonCode")) { - return addReasonCode(); - } - else if (name.equals("reasonReference")) { - return addReasonReference(); + else if (name.equals("reason")) { + return addReason(); } else if (name.equals("insurance")) { return addInsurance(); @@ -2515,25 +2369,15 @@ public class ServiceRequest extends DomainResource { for (Reference i : performer) dst.performer.add(i.copy()); }; - if (locationCode != null) { - dst.locationCode = new ArrayList(); - for (CodeableConcept i : locationCode) - dst.locationCode.add(i.copy()); + if (location != null) { + dst.location = new ArrayList(); + for (CodeableReference i : location) + dst.location.add(i.copy()); }; - if (locationReference != null) { - dst.locationReference = new ArrayList(); - for (Reference i : locationReference) - dst.locationReference.add(i.copy()); - }; - if (reasonCode != null) { - dst.reasonCode = new ArrayList(); - for (CodeableConcept i : reasonCode) - dst.reasonCode.add(i.copy()); - }; - if (reasonReference != null) { - dst.reasonReference = new ArrayList(); - for (Reference i : reasonReference) - dst.reasonReference.add(i.copy()); + if (reason != null) { + dst.reason = new ArrayList(); + for (CodeableReference i : reason) + dst.reason.add(i.copy()); }; if (insurance != null) { dst.insurance = new ArrayList(); @@ -2587,12 +2431,11 @@ public class ServiceRequest extends DomainResource { && compareDeep(quantity, o.quantity, true) && compareDeep(subject, o.subject, true) && compareDeep(encounter, o.encounter, true) && compareDeep(occurrence, o.occurrence, true) && compareDeep(asNeeded, o.asNeeded, true) && compareDeep(authoredOn, o.authoredOn, true) && compareDeep(requester, o.requester, true) && compareDeep(performerType, o.performerType, true) - && compareDeep(performer, o.performer, true) && compareDeep(locationCode, o.locationCode, true) - && compareDeep(locationReference, o.locationReference, true) && compareDeep(reasonCode, o.reasonCode, true) - && compareDeep(reasonReference, o.reasonReference, true) && compareDeep(insurance, o.insurance, true) - && compareDeep(supportingInfo, o.supportingInfo, true) && compareDeep(specimen, o.specimen, true) - && compareDeep(bodySite, o.bodySite, true) && compareDeep(note, o.note, true) && compareDeep(patientInstruction, o.patientInstruction, true) - && compareDeep(relevantHistory, o.relevantHistory, true); + && compareDeep(performer, o.performer, true) && compareDeep(location, o.location, true) && compareDeep(reason, o.reason, true) + && compareDeep(insurance, o.insurance, true) && compareDeep(supportingInfo, o.supportingInfo, true) + && compareDeep(specimen, o.specimen, true) && compareDeep(bodySite, o.bodySite, true) && compareDeep(note, o.note, true) + && compareDeep(patientInstruction, o.patientInstruction, true) && compareDeep(relevantHistory, o.relevantHistory, true) + ; } @Override @@ -2612,9 +2455,9 @@ public class ServiceRequest extends DomainResource { return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, instantiatesCanonical , instantiatesUri, basedOn, replaces, requisition, status, intent, category, priority , doNotPerform, code, orderDetail, quantity, subject, encounter, occurrence, asNeeded - , authoredOn, requester, performerType, performer, locationCode, locationReference - , reasonCode, reasonReference, insurance, supportingInfo, specimen, bodySite, note - , patientInstruction, relevantHistory); + , authoredOn, requester, performerType, performer, location, reason, insurance + , supportingInfo, specimen, bodySite, note, patientInstruction, relevantHistory + ); } @Override 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 3874f723d..0bcebdb64 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 ad4036892..6242a63d4 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 8f6e6cfdc..442f2b49b 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 e71b3a93f..90d6b88ad 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 c93cabb29..c1bed4f1e 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 707d4239f..bfa5e507a 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; @@ -1552,10 +1552,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.1.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.2.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.1.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.2.0. for this version." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/FHIR-version") protected Enumeration fhirVersion; @@ -2443,7 +2443,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.1.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.2.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) @@ -2463,7 +2463,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.1.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.2.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; @@ -2471,14 +2471,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.1.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.2.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.1.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.2.0. for this version. */ public StructureDefinition setFhirVersion(FHIRVersion value) { if (value == null) @@ -2957,7 +2957,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.1.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.2.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_)); @@ -2989,7 +2989,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.1.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.2.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_); 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 b5118c986..407c6474f 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 b3ffbe1c4..e86a7a651 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 4f70e7f8d..f665a6be9 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 0a9982b4d..298880323 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 73983dd34..9ed3d0e2d 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; @@ -4963,147 +4963,154 @@ public class SubstanceDefinition extends DomainResource { @Description(shortDefinition="Identifier by which this substance is known", formalDefinition="Identifier by which this substance is known." ) protected Identifier identifier; + /** + * A business level identifier of the substance. + */ + @Child(name = "version", type = {StringType.class}, order=1, min=0, max=1, modifier=false, summary=true) + @Description(shortDefinition="A business level identifier of the substance", formalDefinition="A business level identifier of the substance." ) + protected StringType version; + /** * Status of substance within the catalogue e.g. approved. */ - @Child(name = "status", type = {CodeableConcept.class}, order=1, min=0, max=1, modifier=false, summary=true) + @Child(name = "status", type = {CodeableConcept.class}, order=2, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Status of substance within the catalogue e.g. approved", formalDefinition="Status of substance within the catalogue e.g. approved." ) protected CodeableConcept status; /** * High level categorization, e.g. polymer or nucleic acid, or food, chemical, biological. */ - @Child(name = "category", type = {CodeableConcept.class}, order=2, min=0, max=1, modifier=false, summary=true) + @Child(name = "category", type = {CodeableConcept.class}, order=3, min=0, max=1, modifier=false, summary=true) @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; /** * If the substance applies to only human or veterinary use. */ - @Child(name = "domain", type = {CodeableConcept.class}, order=3, min=0, max=1, modifier=false, summary=true) + @Child(name = "domain", type = {CodeableConcept.class}, order=4, 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=4, min=0, max=1, modifier=false, summary=true) + @Child(name = "description", type = {MarkdownType.class}, order=5, 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=5, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "source", type = {DocumentReference.class}, order=6, 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=6, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "note", type = {Annotation.class}, order=7, 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=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "manufacturer", type = {Organization.class}, order=8, 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=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "supplier", type = {Organization.class}, order=9, 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=9, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "moiety", type = {}, order=10, 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=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "property", type = {}, order=11, 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=11, min=0, max=1, modifier=false, summary=true) + @Child(name = "referenceInformation", type = {SubstanceReferenceInformation.class}, order=12, 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=12, min=0, max=1, modifier=false, summary=true) + @Child(name = "structure", type = {}, order=13, 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=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "code", type = {}, order=14, 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=14, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "name", type = {}, order=15, 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=15, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "molecularWeight", type = {SubstanceDefinitionStructureIsotopeMolecularWeightComponent.class}, order=16, 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=16, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) + @Child(name = "relationship", type = {}, order=17, 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=17, min=0, max=1, modifier=false, summary=true) + @Child(name = "nucleicAcid", type = {SubstanceNucleicAcid.class}, order=18, 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=18, min=0, max=1, modifier=false, summary=true) + @Child(name = "polymer", type = {SubstancePolymer.class}, order=19, 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=19, min=0, max=1, modifier=false, summary=true) + @Child(name = "protein", type = {SubstanceProtein.class}, order=20, 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=20, min=0, max=1, modifier=false, summary=true) + @Child(name = "sourceMaterial", type = {SubstanceSourceMaterial.class}, order=21, 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 = -2142973741L; + private static final long serialVersionUID = 63520388L; /** * Constructor @@ -5136,6 +5143,55 @@ public class SubstanceDefinition extends DomainResource { return this; } + /** + * @return {@link #version} (A business level identifier of the substance.). 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 SubstanceDefinition.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} (A business level identifier of the substance.). This is the underlying object with id, value and extensions. The accessor "getVersion" gives direct access to the value + */ + public SubstanceDefinition setVersionElement(StringType value) { + this.version = value; + return this; + } + + /** + * @return A business level identifier of the substance. + */ + public String getVersion() { + return this.version == null ? null : this.version.getValue(); + } + + /** + * @param value A business level identifier of the substance. + */ + public SubstanceDefinition 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} (Status of substance within the catalogue e.g. approved.) */ @@ -5934,6 +5990,7 @@ public class SubstanceDefinition extends DomainResource { protected void listChildren(List children) { super.listChildren(children); children.add(new Property("identifier", "Identifier", "Identifier by which this substance is known.", 0, 1, identifier)); + 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("domain", "CodeableConcept", "If the substance applies to only human or veterinary use.", 0, 1, domain)); @@ -5960,6 +6017,7 @@ public class SubstanceDefinition extends DomainResource { public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { switch (_hash) { case -1618432855: /*identifier*/ return new Property("identifier", "Identifier", "Identifier by which this substance is known.", 0, 1, identifier); + 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 -1326197564: /*domain*/ return new Property("domain", "CodeableConcept", "If the substance applies to only human or veterinary use.", 0, 1, domain); @@ -5989,6 +6047,7 @@ public class SubstanceDefinition 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] : new Base[] {this.identifier}; // Identifier + 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 -1326197564: /*domain*/ return this.domain == null ? new Base[0] : new Base[] {this.domain}; // CodeableConcept @@ -6020,6 +6079,9 @@ public class SubstanceDefinition extends DomainResource { case -1618432855: // identifier this.identifier = TypeConvertor.castToIdentifier(value); // Identifier return value; + case 351608024: // version + this.version = TypeConvertor.castToString(value); // StringType + return value; case -892481550: // status this.status = TypeConvertor.castToCodeableConcept(value); // CodeableConcept return value; @@ -6089,6 +6151,8 @@ public class SubstanceDefinition extends DomainResource { public Base setProperty(String name, Base value) throws FHIRException { if (name.equals("identifier")) { this.identifier = TypeConvertor.castToIdentifier(value); // Identifier + } else if (name.equals("version")) { + this.version = TypeConvertor.castToString(value); // StringType } else if (name.equals("status")) { this.status = TypeConvertor.castToCodeableConcept(value); // CodeableConcept } else if (name.equals("category")) { @@ -6138,6 +6202,7 @@ public class SubstanceDefinition extends DomainResource { public Base makeProperty(int hash, String name) throws FHIRException { switch (hash) { case -1618432855: return getIdentifier(); + case 351608024: return getVersionElement(); case -892481550: return getStatus(); case 50511102: return getCategory(); case -1326197564: return getDomain(); @@ -6167,6 +6232,7 @@ public class SubstanceDefinition extends DomainResource { public String[] getTypesForProperty(int hash, String name) throws FHIRException { switch (hash) { case -1618432855: /*identifier*/ return new String[] {"Identifier"}; + case 351608024: /*version*/ return new String[] {"string"}; case -892481550: /*status*/ return new String[] {"CodeableConcept"}; case 50511102: /*category*/ return new String[] {"CodeableConcept"}; case -1326197564: /*domain*/ return new String[] {"CodeableConcept"}; @@ -6198,6 +6264,9 @@ public class SubstanceDefinition extends DomainResource { this.identifier = new Identifier(); return this.identifier; } + else if (name.equals("version")) { + throw new FHIRException("Cannot call addChild on a primitive type SubstanceDefinition.version"); + } else if (name.equals("status")) { this.status = new CodeableConcept(); return this.status; @@ -6285,6 +6354,7 @@ public class SubstanceDefinition extends DomainResource { public void copyValues(SubstanceDefinition dst) { super.copyValues(dst); dst.identifier = identifier == null ? null : identifier.copy(); + dst.version = version == null ? null : version.copy(); dst.status = status == null ? null : status.copy(); dst.category = category == null ? null : category.copy(); dst.domain = domain == null ? null : domain.copy(); @@ -6358,14 +6428,15 @@ public class SubstanceDefinition extends DomainResource { if (!(other_ instanceof SubstanceDefinition)) return false; SubstanceDefinition o = (SubstanceDefinition) other_; - return compareDeep(identifier, o.identifier, 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); + 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) + ; } @Override @@ -6375,14 +6446,14 @@ public class SubstanceDefinition extends DomainResource { if (!(other_ instanceof SubstanceDefinition)) return false; SubstanceDefinition o = (SubstanceDefinition) other_; - return compareValues(description, o.description, true); + return compareValues(version, o.version, true) && compareValues(description, o.description, true); } public boolean isEmpty() { - return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, status, category - , domain, description, source, note, manufacturer, supplier, moiety, property - , referenceInformation, structure, code, name, molecularWeight, relationship, nucleicAcid - , polymer, protein, sourceMaterial); + 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); } @Override 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 f579b298a..a6784d42e 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 975ceca24..da4513407 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 a7b7f49f4..b8741df9a 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 d15f5999c..98916cd53 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 268347e81..161ee4373 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 86c14153d..4e3236fa6 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 da6c178e9..c21c230e9 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; @@ -605,33 +605,26 @@ public class SupplyRequest extends DomainResource { /** * The reason why the supply item was requested. */ - @Child(name = "reasonCode", type = {CodeableConcept.class}, order=11, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) + @Child(name = "reason", type = {CodeableReference.class}, order=11, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="The reason why the supply item was requested", formalDefinition="The reason why the supply item was requested." ) @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/supplyrequest-reason") - protected List reasonCode; - - /** - * The reason why the supply item was requested. - */ - @Child(name = "reasonReference", type = {Condition.class, Observation.class, DiagnosticReport.class, DocumentReference.class}, order=12, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) - @Description(shortDefinition="The reason why the supply item was requested", formalDefinition="The reason why the supply item was requested." ) - protected List reasonReference; + protected List reason; /** * Where the supply is expected to come from. */ - @Child(name = "deliverFrom", type = {Organization.class, Location.class}, order=13, min=0, max=1, modifier=false, summary=false) + @Child(name = "deliverFrom", type = {Organization.class, Location.class}, order=12, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="The origin of the supply", formalDefinition="Where the supply is expected to come from." ) protected Reference deliverFrom; /** * Where the supply is destined to go. */ - @Child(name = "deliverTo", type = {Organization.class, Location.class, Patient.class}, order=14, min=0, max=1, modifier=false, summary=false) + @Child(name = "deliverTo", type = {Organization.class, Location.class, Patient.class}, order=13, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="The destination of the supply", formalDefinition="Where the supply is destined to go." ) protected Reference deliverTo; - private static final long serialVersionUID = 2079508280L; + private static final long serialVersionUID = 1227479248L; /** * Constructor @@ -1145,109 +1138,56 @@ public class SupplyRequest extends DomainResource { } /** - * @return {@link #reasonCode} (The reason why the supply item was requested.) + * @return {@link #reason} (The reason why the supply item was requested.) */ - public List getReasonCode() { - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - return this.reasonCode; + public List getReason() { + if (this.reason == null) + this.reason = new ArrayList(); + return this.reason; } /** * @return Returns a reference to this for easy method chaining */ - public SupplyRequest setReasonCode(List theReasonCode) { - this.reasonCode = theReasonCode; + public SupplyRequest setReason(List theReason) { + this.reason = theReason; return this; } - public boolean hasReasonCode() { - if (this.reasonCode == null) + public boolean hasReason() { + if (this.reason == null) return false; - for (CodeableConcept item : this.reasonCode) + for (CodeableReference item : this.reason) if (!item.isEmpty()) return true; return false; } - public CodeableConcept addReasonCode() { //3 - CodeableConcept t = new CodeableConcept(); - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); + public CodeableReference addReason() { //3 + CodeableReference t = new CodeableReference(); + if (this.reason == null) + this.reason = new ArrayList(); + this.reason.add(t); return t; } - public SupplyRequest addReasonCode(CodeableConcept t) { //3 + public SupplyRequest addReason(CodeableReference t) { //3 if (t == null) return this; - if (this.reasonCode == null) - this.reasonCode = new ArrayList(); - this.reasonCode.add(t); + if (this.reason == null) + this.reason = new ArrayList(); + this.reason.add(t); return this; } /** - * @return The first repetition of repeating field {@link #reasonCode}, creating it if it does not already exist {3} + * @return The first repetition of repeating field {@link #reason}, creating it if it does not already exist {3} */ - public CodeableConcept getReasonCodeFirstRep() { - if (getReasonCode().isEmpty()) { - addReasonCode(); + public CodeableReference getReasonFirstRep() { + if (getReason().isEmpty()) { + addReason(); } - return getReasonCode().get(0); - } - - /** - * @return {@link #reasonReference} (The reason why the supply item was requested.) - */ - public List getReasonReference() { - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - return this.reasonReference; - } - - /** - * @return Returns a reference to this for easy method chaining - */ - public SupplyRequest setReasonReference(List theReasonReference) { - this.reasonReference = theReasonReference; - return this; - } - - public boolean hasReasonReference() { - if (this.reasonReference == null) - return false; - for (Reference item : this.reasonReference) - if (!item.isEmpty()) - return true; - return false; - } - - public Reference addReasonReference() { //3 - Reference t = new Reference(); - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return t; - } - - public SupplyRequest addReasonReference(Reference t) { //3 - if (t == null) - return this; - if (this.reasonReference == null) - this.reasonReference = new ArrayList(); - this.reasonReference.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #reasonReference}, creating it if it does not already exist {3} - */ - public Reference getReasonReferenceFirstRep() { - if (getReasonReference().isEmpty()) { - addReasonReference(); - } - return getReasonReference().get(0); + return getReason().get(0); } /** @@ -1311,8 +1251,7 @@ public class SupplyRequest extends DomainResource { children.add(new Property("authoredOn", "dateTime", "When the request was made.", 0, 1, authoredOn)); children.add(new Property("requester", "Reference(Practitioner|PractitionerRole|Organization|Patient|RelatedPerson|Device)", "The device, practitioner, etc. who initiated the request.", 0, 1, requester)); children.add(new Property("supplier", "Reference(Organization|HealthcareService)", "Who is intended to fulfill the request.", 0, java.lang.Integer.MAX_VALUE, supplier)); - children.add(new Property("reasonCode", "CodeableConcept", "The reason why the supply item was requested.", 0, java.lang.Integer.MAX_VALUE, reasonCode)); - children.add(new Property("reasonReference", "Reference(Condition|Observation|DiagnosticReport|DocumentReference)", "The reason why the supply item was requested.", 0, java.lang.Integer.MAX_VALUE, reasonReference)); + children.add(new Property("reason", "CodeableReference(Condition|Observation|DiagnosticReport|DocumentReference)", "The reason why the supply item was requested.", 0, java.lang.Integer.MAX_VALUE, reason)); children.add(new Property("deliverFrom", "Reference(Organization|Location)", "Where the supply is expected to come from.", 0, 1, deliverFrom)); children.add(new Property("deliverTo", "Reference(Organization|Location|Patient)", "Where the supply is destined to go.", 0, 1, deliverTo)); } @@ -1338,8 +1277,7 @@ public class SupplyRequest extends DomainResource { case -1500852503: /*authoredOn*/ return new Property("authoredOn", "dateTime", "When the request was made.", 0, 1, authoredOn); case 693933948: /*requester*/ return new Property("requester", "Reference(Practitioner|PractitionerRole|Organization|Patient|RelatedPerson|Device)", "The device, practitioner, etc. who initiated the request.", 0, 1, requester); case -1663305268: /*supplier*/ return new Property("supplier", "Reference(Organization|HealthcareService)", "Who is intended to fulfill the request.", 0, java.lang.Integer.MAX_VALUE, supplier); - case 722137681: /*reasonCode*/ return new Property("reasonCode", "CodeableConcept", "The reason why the supply item was requested.", 0, java.lang.Integer.MAX_VALUE, reasonCode); - case -1146218137: /*reasonReference*/ return new Property("reasonReference", "Reference(Condition|Observation|DiagnosticReport|DocumentReference)", "The reason why the supply item was requested.", 0, java.lang.Integer.MAX_VALUE, reasonReference); + case -934964668: /*reason*/ return new Property("reason", "CodeableReference(Condition|Observation|DiagnosticReport|DocumentReference)", "The reason why the supply item was requested.", 0, java.lang.Integer.MAX_VALUE, reason); case -949323153: /*deliverFrom*/ return new Property("deliverFrom", "Reference(Organization|Location)", "Where the supply is expected to come from.", 0, 1, deliverFrom); case -242327936: /*deliverTo*/ return new Property("deliverTo", "Reference(Organization|Location|Patient)", "Where the supply is destined to go.", 0, 1, deliverTo); default: return super.getNamedProperty(_hash, _name, _checkValid); @@ -1361,8 +1299,7 @@ public class SupplyRequest extends DomainResource { case -1500852503: /*authoredOn*/ return this.authoredOn == null ? new Base[0] : new Base[] {this.authoredOn}; // DateTimeType case 693933948: /*requester*/ return this.requester == null ? new Base[0] : new Base[] {this.requester}; // Reference case -1663305268: /*supplier*/ return this.supplier == null ? new Base[0] : this.supplier.toArray(new Base[this.supplier.size()]); // Reference - case 722137681: /*reasonCode*/ return this.reasonCode == null ? new Base[0] : this.reasonCode.toArray(new Base[this.reasonCode.size()]); // CodeableConcept - case -1146218137: /*reasonReference*/ return this.reasonReference == null ? new Base[0] : this.reasonReference.toArray(new Base[this.reasonReference.size()]); // Reference + case -934964668: /*reason*/ return this.reason == null ? new Base[0] : this.reason.toArray(new Base[this.reason.size()]); // CodeableReference case -949323153: /*deliverFrom*/ return this.deliverFrom == null ? new Base[0] : new Base[] {this.deliverFrom}; // Reference case -242327936: /*deliverTo*/ return this.deliverTo == null ? new Base[0] : new Base[] {this.deliverTo}; // Reference default: return super.getProperty(hash, name, checkValid); @@ -1408,11 +1345,8 @@ public class SupplyRequest extends DomainResource { case -1663305268: // supplier this.getSupplier().add(TypeConvertor.castToReference(value)); // Reference return value; - case 722137681: // reasonCode - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept - return value; - case -1146218137: // reasonReference - this.getReasonReference().add(TypeConvertor.castToReference(value)); // Reference + case -934964668: // reason + this.getReason().add(TypeConvertor.castToCodeableReference(value)); // CodeableReference return value; case -949323153: // deliverFrom this.deliverFrom = TypeConvertor.castToReference(value); // Reference @@ -1451,10 +1385,8 @@ public class SupplyRequest extends DomainResource { this.requester = TypeConvertor.castToReference(value); // Reference } else if (name.equals("supplier")) { this.getSupplier().add(TypeConvertor.castToReference(value)); - } else if (name.equals("reasonCode")) { - this.getReasonCode().add(TypeConvertor.castToCodeableConcept(value)); - } else if (name.equals("reasonReference")) { - this.getReasonReference().add(TypeConvertor.castToReference(value)); + } else if (name.equals("reason")) { + this.getReason().add(TypeConvertor.castToCodeableReference(value)); } else if (name.equals("deliverFrom")) { this.deliverFrom = TypeConvertor.castToReference(value); // Reference } else if (name.equals("deliverTo")) { @@ -1480,8 +1412,7 @@ public class SupplyRequest extends DomainResource { case -1500852503: return getAuthoredOnElement(); case 693933948: return getRequester(); case -1663305268: return addSupplier(); - case 722137681: return addReasonCode(); - case -1146218137: return addReasonReference(); + case -934964668: return addReason(); case -949323153: return getDeliverFrom(); case -242327936: return getDeliverTo(); default: return super.makeProperty(hash, name); @@ -1503,8 +1434,7 @@ public class SupplyRequest extends DomainResource { case -1500852503: /*authoredOn*/ return new String[] {"dateTime"}; case 693933948: /*requester*/ return new String[] {"Reference"}; case -1663305268: /*supplier*/ return new String[] {"Reference"}; - case 722137681: /*reasonCode*/ return new String[] {"CodeableConcept"}; - case -1146218137: /*reasonReference*/ return new String[] {"Reference"}; + case -934964668: /*reason*/ return new String[] {"CodeableReference"}; case -949323153: /*deliverFrom*/ return new String[] {"Reference"}; case -242327936: /*deliverTo*/ return new String[] {"Reference"}; default: return super.getTypesForProperty(hash, name); @@ -1564,11 +1494,8 @@ public class SupplyRequest extends DomainResource { else if (name.equals("supplier")) { return addSupplier(); } - else if (name.equals("reasonCode")) { - return addReasonCode(); - } - else if (name.equals("reasonReference")) { - return addReasonReference(); + else if (name.equals("reason")) { + return addReason(); } else if (name.equals("deliverFrom")) { this.deliverFrom = new Reference(); @@ -1618,15 +1545,10 @@ public class SupplyRequest extends DomainResource { for (Reference i : supplier) dst.supplier.add(i.copy()); }; - if (reasonCode != null) { - dst.reasonCode = new ArrayList(); - for (CodeableConcept i : reasonCode) - dst.reasonCode.add(i.copy()); - }; - if (reasonReference != null) { - dst.reasonReference = new ArrayList(); - for (Reference i : reasonReference) - dst.reasonReference.add(i.copy()); + if (reason != null) { + dst.reason = new ArrayList(); + for (CodeableReference i : reason) + dst.reason.add(i.copy()); }; dst.deliverFrom = deliverFrom == null ? null : deliverFrom.copy(); dst.deliverTo = deliverTo == null ? null : deliverTo.copy(); @@ -1646,9 +1568,8 @@ public class SupplyRequest extends DomainResource { return compareDeep(identifier, o.identifier, true) && compareDeep(status, o.status, true) && compareDeep(category, o.category, true) && compareDeep(priority, o.priority, true) && compareDeep(item, o.item, true) && compareDeep(quantity, o.quantity, true) && compareDeep(parameter, o.parameter, true) && compareDeep(occurrence, o.occurrence, true) && compareDeep(authoredOn, o.authoredOn, true) - && compareDeep(requester, o.requester, true) && compareDeep(supplier, o.supplier, true) && compareDeep(reasonCode, o.reasonCode, true) - && compareDeep(reasonReference, o.reasonReference, true) && compareDeep(deliverFrom, o.deliverFrom, true) - && compareDeep(deliverTo, o.deliverTo, true); + && compareDeep(requester, o.requester, true) && compareDeep(supplier, o.supplier, true) && compareDeep(reason, o.reason, true) + && compareDeep(deliverFrom, o.deliverFrom, true) && compareDeep(deliverTo, o.deliverTo, true); } @Override @@ -1665,7 +1586,7 @@ public class SupplyRequest extends DomainResource { public boolean isEmpty() { return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(identifier, status, category , priority, item, quantity, parameter, occurrence, authoredOn, requester, supplier - , reasonCode, reasonReference, deliverFrom, deliverTo); + , reason, deliverFrom, deliverTo); } @Override 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 c18750614..54e504c5b 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 40c0f528d..90a58fe97 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 95338cd6d..e44fefb10 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 537232521..9f8579c6e 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 632f6dd05..3d3be8a54 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Topic.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Topic.java index 194ea2ea4..4622e773b 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Topic.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Topic.java @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 e57a35b33..5202a3dab 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 e51dc4f05..e384b40ba 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 6b8bb84bc..834997a62 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 4de9cab6b..87b779783 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 c9603337c..c3fa39629 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 @@ -49,7 +49,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Thu, Dec 13, 2018 14:07+1100 for FHIR v4.0.0 +// Generated on Tue, Dec 31, 2019 12:12+1100 for FHIR vcurrent import java.util.ArrayList; import java.util.Date; 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 158fc9cb9..bd8de316f 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 @@ -23,8 +23,8 @@ package org.hl7.fhir.utilities; public class VersionUtilities { - public static final String CURRENT_VERSION = "4.1"; - public static final String CURRENT_FULL_VERSION = "4.1.0"; + public static final String CURRENT_VERSION = "4.2"; + public static final String CURRENT_FULL_VERSION = "4.2.0"; public static String packageForVersion(String v) { if (isR2Ver(v)) { diff --git a/pom.xml b/pom.xml index ac2a8d518..e94c4519e 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ 4.1.0 - 1.0.26-SNAPSHOT + 1.0.27-SNAPSHOT org.hl7.fhir.core