From 3901c429df2387bf610fda3c94f056199b6fb3a3 Mon Sep 17 00:00:00 2001 From: James Agnew Date: Thu, 20 Aug 2015 16:17:22 -0400 Subject: [PATCH] More work on InstanceValidator --- .../validation/FhirInstanceValidator.java | 43 +- .../org/hl7/fhir/instance/model/Account.java | 2 +- .../org/hl7/fhir/instance/model/Address.java | 2 +- .../java/org/hl7/fhir/instance/model/Age.java | 2 +- .../instance/model/AllergyIntolerance.java | 24 +- .../hl7/fhir/instance/model/Annotation.java | 2 +- .../hl7/fhir/instance/model/Appointment.java | 2 +- .../instance/model/AppointmentResponse.java | 2 +- .../hl7/fhir/instance/model/Attachment.java | 2 +- .../hl7/fhir/instance/model/AuditEvent.java | 2 +- .../fhir/instance/model/BackboneElement.java | 2 +- .../org/hl7/fhir/instance/model/Basic.java | 2 +- .../org/hl7/fhir/instance/model/Binary.java | 2 +- .../org/hl7/fhir/instance/model/BodySite.java | 2 +- .../org/hl7/fhir/instance/model/Bundle.java | 2 +- .../org/hl7/fhir/instance/model/CarePlan.java | 32 +- .../org/hl7/fhir/instance/model/Claim.java | 62 +- .../fhir/instance/model/ClaimResponse.java | 2 +- .../instance/model/ClinicalImpression.java | 10 +- .../fhir/instance/model/CodeableConcept.java | 2 +- .../org/hl7/fhir/instance/model/Coding.java | 2 +- .../fhir/instance/model/Communication.java | 2 +- .../instance/model/CommunicationRequest.java | 2 +- .../hl7/fhir/instance/model/Composition.java | 49 +- .../hl7/fhir/instance/model/ConceptMap.java | 2 +- .../hl7/fhir/instance/model/Condition.java | 2 +- .../hl7/fhir/instance/model/Conformance.java | 2 +- .../hl7/fhir/instance/model/Constants.java | 6 +- .../hl7/fhir/instance/model/ContactPoint.java | 2 +- .../org/hl7/fhir/instance/model/Contract.java | 30 +- .../fhir/instance/model/Contraindication.java | 2 +- .../org/hl7/fhir/instance/model/Count.java | 2 +- .../org/hl7/fhir/instance/model/Coverage.java | 2 +- .../hl7/fhir/instance/model/DataElement.java | 2 +- .../org/hl7/fhir/instance/model/Device.java | 18 +- .../fhir/instance/model/DeviceComponent.java | 2 +- .../hl7/fhir/instance/model/DeviceMetric.java | 2 +- .../fhir/instance/model/DeviceUseRequest.java | 2 +- .../instance/model/DeviceUseStatement.java | 2 +- .../fhir/instance/model/DiagnosticOrder.java | 2 +- .../fhir/instance/model/DiagnosticReport.java | 96 +- .../org/hl7/fhir/instance/model/Distance.java | 2 +- .../fhir/instance/model/DocumentManifest.java | 38 +- .../instance/model/DocumentReference.java | 209 +- .../fhir/instance/model/DomainResource.java | 2 +- .../org/hl7/fhir/instance/model/Duration.java | 2 +- .../org/hl7/fhir/instance/model/Element.java | 50 +- .../instance/model/ElementDefinition.java | 2 +- .../instance/model/EligibilityRequest.java | 2 +- .../instance/model/EligibilityResponse.java | 2 +- .../hl7/fhir/instance/model/Encounter.java | 49 +- .../instance/model/EnrollmentRequest.java | 2 +- .../instance/model/EnrollmentResponse.java | 2 +- .../hl7/fhir/instance/model/Enumerations.java | 2 +- .../fhir/instance/model/EpisodeOfCare.java | 2 +- .../instance/model/ExplanationOfBenefit.java | 2 +- .../hl7/fhir/instance/model/Extension.java | 2 +- .../instance/model/FamilyMemberHistory.java | 2 +- .../org/hl7/fhir/instance/model/Flag.java | 2 +- .../org/hl7/fhir/instance/model/Goal.java | 2 +- .../org/hl7/fhir/instance/model/Group.java | 2 +- .../instance/model/HealthcareService.java | 4 +- .../hl7/fhir/instance/model/HumanName.java | 2 +- .../hl7/fhir/instance/model/Identifier.java | 2 +- .../model/ImagingObjectSelection.java | 4 +- .../hl7/fhir/instance/model/ImagingStudy.java | 2 +- .../hl7/fhir/instance/model/Immunization.java | 16 +- .../model/ImmunizationRecommendation.java | 2 +- .../instance/model/ImplementationGuide.java | 2 +- .../org/hl7/fhir/instance/model/List_.java | 2 +- .../org/hl7/fhir/instance/model/Location.java | 2 +- .../org/hl7/fhir/instance/model/Media.java | 2 +- .../hl7/fhir/instance/model/Medication.java | 140 +- .../model/MedicationAdministration.java | 75 +- .../instance/model/MedicationDispense.java | 211 +- ...Prescription.java => MedicationOrder.java} | 699 +++-- .../instance/model/MedicationStatement.java | 100 +- .../fhir/instance/model/MessageHeader.java | 2 +- .../org/hl7/fhir/instance/model/Meta.java | 3 +- .../org/hl7/fhir/instance/model/Money.java | 2 +- .../hl7/fhir/instance/model/NamingSystem.java | 2 +- .../hl7/fhir/instance/model/Narrative.java | 2 +- .../fhir/instance/model/NutritionOrder.java | 86 +- .../hl7/fhir/instance/model/Observation.java | 28 +- .../instance/model/OperationDefinition.java | 2 +- .../fhir/instance/model/OperationOutcome.java | 2 +- .../org/hl7/fhir/instance/model/Order.java | 2 +- .../fhir/instance/model/OrderResponse.java | 2 +- .../hl7/fhir/instance/model/Organization.java | 2 +- .../hl7/fhir/instance/model/Parameters.java | 2 +- .../org/hl7/fhir/instance/model/Patient.java | 2 +- .../fhir/instance/model/PaymentNotice.java | 2 +- .../instance/model/PaymentReconciliation.java | 2 +- .../org/hl7/fhir/instance/model/Period.java | 2 +- .../org/hl7/fhir/instance/model/Person.java | 2 +- .../hl7/fhir/instance/model/Practitioner.java | 2 +- .../hl7/fhir/instance/model/Procedure.java | 6 +- .../fhir/instance/model/ProcedureRequest.java | 2 +- .../fhir/instance/model/ProcessRequest.java | 2 +- .../fhir/instance/model/ProcessResponse.java | 2 +- .../hl7/fhir/instance/model/Provenance.java | 6 +- .../org/hl7/fhir/instance/model/Quantity.java | 2 +- .../fhir/instance/model/Questionnaire.java | 6 +- .../instance/model/QuestionnaireResponse.java | 2 +- .../org/hl7/fhir/instance/model/Range.java | 28 +- .../org/hl7/fhir/instance/model/Ratio.java | 2 +- .../hl7/fhir/instance/model/Reference.java | 2 +- .../fhir/instance/model/ReferralRequest.java | 2 +- .../fhir/instance/model/RelatedPerson.java | 48 +- .../org/hl7/fhir/instance/model/Resource.java | 2 +- .../fhir/instance/model/ResourceFactory.java | 8 +- .../hl7/fhir/instance/model/ResourceType.java | 8 +- .../fhir/instance/model/RiskAssessment.java | 2 +- .../hl7/fhir/instance/model/SampledData.java | 18 +- .../org/hl7/fhir/instance/model/Schedule.java | 2 +- .../fhir/instance/model/SearchParameter.java | 2 +- .../hl7/fhir/instance/model/Signature.java | 2 +- .../fhir/instance/model/SimpleQuantity.java | 90 + .../org/hl7/fhir/instance/model/Slot.java | 2 +- .../org/hl7/fhir/instance/model/Specimen.java | 42 +- .../instance/model/StructureDefinition.java | 2 +- .../hl7/fhir/instance/model/Subscription.java | 2 +- .../hl7/fhir/instance/model/Substance.java | 132 +- .../fhir/instance/model/SupplyDelivery.java | 16 +- .../fhir/instance/model/SupplyRequest.java | 2 +- .../hl7/fhir/instance/model/TestScript.java | 2 +- .../org/hl7/fhir/instance/model/Timing.java | 2 +- .../org/hl7/fhir/instance/model/ValueSet.java | 2 +- .../instance/model/VisionPrescription.java | 16 +- .../model/valuesets/Additionalmaterials.java | 2 +- .../AdditionalmaterialsEnumFactory.java | 2 +- .../model/valuesets/Adjudication.java | 2 +- .../valuesets/AdjudicationEnumFactory.java | 2 +- .../model/valuesets/AdjudicationError.java | 2 +- .../AdjudicationErrorEnumFactory.java | 2 +- .../model/valuesets/AdjustmentReason.java | 2 +- .../AdjustmentReasonEnumFactory.java | 2 +- .../model/valuesets/AnimalBreeds.java | 2 +- .../valuesets/AnimalBreedsEnumFactory.java | 2 +- .../model/valuesets/AnimalGenderstatus.java | 6 +- .../AnimalGenderstatusEnumFactory.java | 2 +- .../model/valuesets/AnimalSpecies.java | 2 +- .../valuesets/AnimalSpeciesEnumFactory.java | 2 +- .../model/valuesets/AnzscoOccupations.java | 2 +- .../AnzscoOccupationsEnumFactory.java | 2 +- .../model/valuesets/AuditSourceType.java | 2 +- .../valuesets/AuditSourceTypeEnumFactory.java | 2 +- .../model/valuesets/BasicResourceType.java | 2 +- .../BasicResourceTypeEnumFactory.java | 2 +- .../model/valuesets/CarePlanGoalStatus.java | 2 +- .../CarePlanGoalStatusEnumFactory.java | 2 +- .../model/valuesets/ClaimException.java | 2 +- .../valuesets/ClaimExceptionEnumFactory.java | 2 +- .../model/valuesets/ClaimModifiers.java | 2 +- .../valuesets/ClaimModifiersEnumFactory.java | 2 +- .../valuesets/ClassificationOrContext.java | 2 +- .../ClassificationOrContextEnumFactory.java | 2 +- .../model/valuesets/ConditionCategory.java | 2 +- .../ConditionCategoryEnumFactory.java | 2 +- .../model/valuesets/ConditionClinical.java | 2 +- .../ConditionClinicalEnumFactory.java | 2 +- .../model/valuesets/ConditionState.java | 2 +- .../valuesets/ConditionStateEnumFactory.java | 2 +- .../valuesets/ConformanceExpectation.java | 2 +- .../ConformanceExpectationEnumFactory.java | 2 +- .../model/valuesets/ContactentityType.java | 2 +- .../ContactentityTypeEnumFactory.java | 2 +- .../model/valuesets/ContractAction.java | 2 +- .../valuesets/ContractActionEnumFactory.java | 2 +- .../model/valuesets/ContractActorrole.java | 2 +- .../ContractActorroleEnumFactory.java | 2 +- .../model/valuesets/ContractSignerType.java | 2 +- .../ContractSignerTypeEnumFactory.java | 2 +- .../model/valuesets/ContractSubtype.java | 2 +- .../valuesets/ContractSubtypeEnumFactory.java | 2 +- .../model/valuesets/ContractTermSubtype.java | 2 +- .../ContractTermSubtypeEnumFactory.java | 2 +- .../model/valuesets/ContractTermType.java | 2 +- .../ContractTermTypeEnumFactory.java | 2 +- .../model/valuesets/ContractType.java | 2 +- .../valuesets/ContractTypeEnumFactory.java | 2 +- .../model/valuesets/DeviceAction.java | 2 +- .../valuesets/DeviceActionEnumFactory.java | 2 +- .../model/valuesets/EncounterAdmitSource.java | 2 +- .../EncounterAdmitSourceEnumFactory.java | 2 +- .../model/valuesets/EncounterDiet.java | 2 +- .../valuesets/EncounterDietEnumFactory.java | 2 +- .../EncounterDischargeDisposition.java | 2 +- ...ounterDischargeDispositionEnumFactory.java | 2 +- .../model/valuesets/EncounterPriority.java | 2 +- .../EncounterPriorityEnumFactory.java | 2 +- .../EncounterSpecialArrangements.java | 2 +- ...counterSpecialArrangementsEnumFactory.java | 2 +- .../model/valuesets/EncounterType.java | 2 +- .../valuesets/EncounterTypeEnumFactory.java | 2 +- .../model/valuesets/EntformulaAdditive.java | 2 +- .../EntformulaAdditiveEnumFactory.java | 2 +- .../model/valuesets/FmConditions.java | 2 +- .../valuesets/FmConditionsEnumFactory.java | 2 +- .../fhir/instance/model/valuesets/Forms.java | 2 +- .../model/valuesets/FormsEnumFactory.java | 2 +- .../model/valuesets/Fundsreserve.java | 2 +- .../valuesets/FundsreserveEnumFactory.java | 2 +- .../model/valuesets/GoalPriority.java | 2 +- .../valuesets/GoalPriorityEnumFactory.java | 2 +- .../model/valuesets/GoalRelationshipType.java | 2 +- .../GoalRelationshipTypeEnumFactory.java | 2 +- .../fhir/instance/model/valuesets/Icd10.java | 2 +- .../model/valuesets/Icd10EnumFactory.java | 2 +- ...munizationRecommendationDateCriterion.java | 2 +- ...ecommendationDateCriterionEnumFactory.java | 2 +- .../ImmunizationRecommendationStatus.java | 2 +- ...zationRecommendationStatusEnumFactory.java | 2 +- .../model/valuesets/Intervention.java | 2 +- .../valuesets/InterventionEnumFactory.java | 2 +- .../model/valuesets/ListEmptyReason.java | 2 +- .../valuesets/ListEmptyReasonEnumFactory.java | 2 +- .../model/valuesets/ListExampleCodes.java | 2 +- .../ListExampleCodesEnumFactory.java | 2 +- .../model/valuesets/ListItemFlag.java | 2 +- .../valuesets/ListItemFlagEnumFactory.java | 2 +- .../instance/model/valuesets/ListOrder.java | 2 +- .../model/valuesets/ListOrderEnumFactory.java | 2 +- .../model/valuesets/LocationPhysicalType.java | 2 +- .../LocationPhysicalTypeEnumFactory.java | 2 +- .../valuesets/MessageReasonEncounter.java | 2 +- .../MessageReasonEncounterEnumFactory.java | 2 +- .../model/valuesets/MessageTransport.java | 2 +- .../MessageTransportEnumFactory.java | 2 +- .../model/valuesets/MissingToothReason.java | 2 +- .../MissingToothReasonEnumFactory.java | 2 +- .../model/valuesets/ObservationCategory.java | 2 +- .../ObservationCategoryEnumFactory.java | 2 +- .../model/valuesets/OperationOutcome.java | 2 +- .../OperationOutcomeEnumFactory.java | 2 +- .../valuesets/OralProsthodonticMaterial.java | 2 +- .../OralProsthodonticMaterialEnumFactory.java | 2 +- .../model/valuesets/OrganizationType.java | 2 +- .../OrganizationTypeEnumFactory.java | 2 +- .../valuesets/PatientContactRelationship.java | 2 +- ...PatientContactRelationshipEnumFactory.java | 2 +- .../instance/model/valuesets/Payeetype.java | 2 +- .../model/valuesets/PayeetypeEnumFactory.java | 2 +- .../model/valuesets/PaymentStatus.java | 2 +- .../valuesets/PaymentStatusEnumFactory.java | 2 +- .../instance/model/valuesets/PaymentType.java | 2 +- .../valuesets/PaymentTypeEnumFactory.java | 2 +- .../model/valuesets/PractitionerRole.java | 2 +- .../PractitionerRoleEnumFactory.java | 2 +- .../valuesets/PractitionerSpecialty.java | 2 +- .../PractitionerSpecialtyEnumFactory.java | 2 +- .../model/valuesets/ProcessOutcome.java | 2 +- .../valuesets/ProcessOutcomeEnumFactory.java | 2 +- .../model/valuesets/ProcessPriority.java | 2 +- .../valuesets/ProcessPriorityEnumFactory.java | 2 +- .../model/valuesets/ProvenanceAgentRole.java | 2 +- .../ProvenanceAgentRoleEnumFactory.java | 2 +- .../model/valuesets/ProvenanceAgentType.java | 2 +- .../ProvenanceAgentTypeEnumFactory.java | 2 +- .../model/valuesets/QuestionMaxOccurs.java | 2 +- .../QuestionMaxOccursEnumFactory.java | 2 +- .../valuesets/ReasonMedicationGivenCodes.java | 2 +- ...ReasonMedicationGivenCodesEnumFactory.java | 2 +- .../ReasonMedicationNotGivenCodes.java | 2 +- ...sonMedicationNotGivenCodesEnumFactory.java | 2 +- .../model/valuesets/Relationship.java | 2 +- .../valuesets/RelationshipEnumFactory.java | 2 +- .../valuesets/ResourceValidationMode.java | 2 +- .../ResourceValidationModeEnumFactory.java | 2 +- .../valuesets/RestfulSecurityService.java | 2 +- .../RestfulSecurityServiceEnumFactory.java | 2 +- .../model/valuesets/RiskProbability.java | 2 +- .../valuesets/RiskProbabilityEnumFactory.java | 2 +- .../instance/model/valuesets/Ruleset.java | 2 +- .../model/valuesets/RulesetEnumFactory.java | 2 +- .../model/valuesets/ServicePharmacy.java | 2 +- .../valuesets/ServicePharmacyEnumFactory.java | 2 +- .../model/valuesets/ServiceProduct.java | 2 +- .../valuesets/ServiceProductEnumFactory.java | 2 +- .../valuesets/ServiceProvisionConditions.java | 2 +- ...ServiceProvisionConditionsEnumFactory.java | 2 +- .../valuesets/ServiceReferralMethod.java | 2 +- .../ServiceReferralMethodEnumFactory.java | 2 +- .../model/valuesets/ServiceUscls.java | 2 +- .../valuesets/ServiceUsclsEnumFactory.java | 2 +- .../model/valuesets/SignatureType.java | 2 +- .../valuesets/SignatureTypeEnumFactory.java | 2 +- .../model/valuesets/SubscriptionTag.java | 2 +- .../valuesets/SubscriptionTagEnumFactory.java | 2 +- .../model/valuesets/SubstanceCategory.java | 130 + .../SubstanceCategoryEnumFactory.java | 79 + .../model/valuesets/SupplydeliveryType.java | 2 +- .../SupplydeliveryTypeEnumFactory.java | 2 +- .../model/valuesets/SupplyrequestKind.java | 2 +- .../SupplyrequestKindEnumFactory.java | 2 +- .../instance/model/valuesets/Surface.java | 2 +- .../model/valuesets/SurfaceEnumFactory.java | 2 +- .../fhir/instance/model/valuesets/Teeth.java | 2 +- .../model/valuesets/TeethEnumFactory.java | 2 +- .../valuesets/TestscriptOperationCodes.java | 2 +- .../TestscriptOperationCodesEnumFactory.java | 2 +- .../fhir/instance/model/valuesets/Tooth.java | 2 +- .../model/valuesets/ToothEnumFactory.java | 2 +- .../fhir/instance/model/valuesets/Udi.java | 2 +- .../model/valuesets/UdiEnumFactory.java | 2 +- .../valuesets/V3AcknowledgementCondition.java | 2 +- ...V3AcknowledgementConditionEnumFactory.java | 2 +- .../V3AcknowledgementDetailCode.java | 2 +- ...3AcknowledgementDetailCodeEnumFactory.java | 2 +- .../V3AcknowledgementDetailType.java | 2 +- ...3AcknowledgementDetailTypeEnumFactory.java | 2 +- .../valuesets/V3AcknowledgementType.java | 2 +- .../V3AcknowledgementTypeEnumFactory.java | 2 +- .../instance/model/valuesets/V3ActClass.java | 2 +- .../valuesets/V3ActClassEnumFactory.java | 2 +- .../instance/model/valuesets/V3ActCode.java | 2 +- .../model/valuesets/V3ActCodeEnumFactory.java | 2 +- .../valuesets/V3ActExposureLevelCode.java | 2 +- .../V3ActExposureLevelCodeEnumFactory.java | 2 +- .../V3ActInvoiceElementModifier.java | 2 +- ...3ActInvoiceElementModifierEnumFactory.java | 2 +- .../instance/model/valuesets/V3ActMood.java | 2 +- .../model/valuesets/V3ActMoodEnumFactory.java | 2 +- .../model/valuesets/V3ActPriority.java | 2 +- .../valuesets/V3ActPriorityEnumFactory.java | 2 +- .../instance/model/valuesets/V3ActReason.java | 2 +- .../valuesets/V3ActReasonEnumFactory.java | 2 +- .../V3ActRelationshipCheckpoint.java | 2 +- ...3ActRelationshipCheckpointEnumFactory.java | 2 +- .../valuesets/V3ActRelationshipJoin.java | 2 +- .../V3ActRelationshipJoinEnumFactory.java | 2 +- .../valuesets/V3ActRelationshipSplit.java | 2 +- .../V3ActRelationshipSplitEnumFactory.java | 2 +- .../valuesets/V3ActRelationshipSubset.java | 2 +- .../V3ActRelationshipSubsetEnumFactory.java | 2 +- .../valuesets/V3ActRelationshipType.java | 2 +- .../V3ActRelationshipTypeEnumFactory.java | 2 +- .../instance/model/valuesets/V3ActSite.java | 2 +- .../model/valuesets/V3ActSiteEnumFactory.java | 2 +- .../instance/model/valuesets/V3ActStatus.java | 2 +- .../valuesets/V3ActStatusEnumFactory.java | 2 +- .../model/valuesets/V3ActUSPrivacyLaw.java | 2 +- .../V3ActUSPrivacyLawEnumFactory.java | 2 +- .../model/valuesets/V3ActUncertainty.java | 2 +- .../V3ActUncertaintyEnumFactory.java | 2 +- .../model/valuesets/V3AddressPartType.java | 2 +- .../V3AddressPartTypeEnumFactory.java | 2 +- .../model/valuesets/V3AddressUse.java | 2 +- .../valuesets/V3AddressUseEnumFactory.java | 2 +- .../valuesets/V3AdministrativeGender.java | 2 +- .../V3AdministrativeGenderEnumFactory.java | 2 +- ...V3AmericanIndianAlaskaNativeLanguages.java | 2 +- ...ndianAlaskaNativeLanguagesEnumFactory.java | 2 +- .../instance/model/valuesets/V3Calendar.java | 2 +- .../model/valuesets/V3CalendarCycle.java | 2 +- .../valuesets/V3CalendarCycleEnumFactory.java | 2 +- .../valuesets/V3CalendarEnumFactory.java | 2 +- .../model/valuesets/V3CalendarType.java | 2 +- .../valuesets/V3CalendarTypeEnumFactory.java | 2 +- .../instance/model/valuesets/V3Charset.java | 2 +- .../model/valuesets/V3CharsetEnumFactory.java | 2 +- .../model/valuesets/V3CodingRationale.java | 2 +- .../V3CodingRationaleEnumFactory.java | 2 +- .../V3CommunicationFunctionType.java | 2 +- ...3CommunicationFunctionTypeEnumFactory.java | 2 +- .../valuesets/V3CompressionAlgorithm.java | 2 +- .../V3CompressionAlgorithmEnumFactory.java | 2 +- .../model/valuesets/V3Confidentiality.java | 2 +- .../V3ConfidentialityEnumFactory.java | 2 +- .../model/valuesets/V3ContainerCap.java | 2 +- .../valuesets/V3ContainerCapEnumFactory.java | 2 +- .../model/valuesets/V3ContainerSeparator.java | 2 +- .../V3ContainerSeparatorEnumFactory.java | 2 +- .../valuesets/V3ContentProcessingMode.java | 2 +- .../V3ContentProcessingModeEnumFactory.java | 2 +- .../model/valuesets/V3ContextControl.java | 2 +- .../V3ContextControlEnumFactory.java | 2 +- .../model/valuesets/V3DataOperation.java | 2 +- .../valuesets/V3DataOperationEnumFactory.java | 2 +- .../model/valuesets/V3DeviceAlertLevel.java | 2 +- .../V3DeviceAlertLevelEnumFactory.java | 2 +- .../model/valuesets/V3DocumentCompletion.java | 2 +- .../V3DocumentCompletionEnumFactory.java | 2 +- .../model/valuesets/V3DocumentStorage.java | 2 +- .../V3DocumentStorageEnumFactory.java | 2 +- .../model/valuesets/V3EducationLevel.java | 2 +- .../V3EducationLevelEnumFactory.java | 2 +- .../model/valuesets/V3EmployeeJobClass.java | 2 +- .../V3EmployeeJobClassEnumFactory.java | 2 +- .../valuesets/V3EncounterAdmissionSource.java | 2 +- ...V3EncounterAdmissionSourceEnumFactory.java | 2 +- .../valuesets/V3EncounterSpecialCourtesy.java | 2 +- ...V3EncounterSpecialCourtesyEnumFactory.java | 2 +- .../model/valuesets/V3EntityClass.java | 2 +- .../valuesets/V3EntityClassEnumFactory.java | 2 +- .../model/valuesets/V3EntityCode.java | 2 +- .../valuesets/V3EntityCodeEnumFactory.java | 2 +- .../model/valuesets/V3EntityDeterminer.java | 2 +- .../V3EntityDeterminerEnumFactory.java | 2 +- .../model/valuesets/V3EntityHandling.java | 2 +- .../V3EntityHandlingEnumFactory.java | 2 +- .../valuesets/V3EntityNamePartQualifier.java | 2 +- .../V3EntityNamePartQualifierEnumFactory.java | 2 +- .../V3EntityNamePartQualifierR2.java | 2 +- ...3EntityNamePartQualifierR2EnumFactory.java | 2 +- .../model/valuesets/V3EntityNamePartType.java | 2 +- .../V3EntityNamePartTypeEnumFactory.java | 2 +- .../valuesets/V3EntityNamePartTypeR2.java | 2 +- .../V3EntityNamePartTypeR2EnumFactory.java | 2 +- .../model/valuesets/V3EntityNameUse.java | 2 +- .../valuesets/V3EntityNameUseEnumFactory.java | 2 +- .../model/valuesets/V3EntityNameUseR2.java | 2 +- .../V3EntityNameUseR2EnumFactory.java | 2 +- .../model/valuesets/V3EntityRisk.java | 2 +- .../valuesets/V3EntityRiskEnumFactory.java | 2 +- .../model/valuesets/V3EntityStatus.java | 2 +- .../valuesets/V3EntityStatusEnumFactory.java | 2 +- .../valuesets/V3EquipmentAlertLevel.java | 2 +- .../V3EquipmentAlertLevelEnumFactory.java | 2 +- .../instance/model/valuesets/V3Ethnicity.java | 2 +- .../valuesets/V3EthnicityEnumFactory.java | 2 +- .../model/valuesets/V3ExposureMode.java | 2 +- .../valuesets/V3ExposureModeEnumFactory.java | 2 +- .../model/valuesets/V3GTSAbbreviation.java | 2 +- .../V3GTSAbbreviationEnumFactory.java | 2 +- .../model/valuesets/V3GenderStatus.java | 2 +- .../valuesets/V3GenderStatusEnumFactory.java | 2 +- .../model/valuesets/V3HL7UpdateMode.java | 2 +- .../valuesets/V3HL7UpdateModeEnumFactory.java | 2 +- .../instance/model/valuesets/V3Hl7Realm.java | 2 +- .../valuesets/V3Hl7RealmEnumFactory.java | 2 +- .../model/valuesets/V3Hl7V3Conformance.java | 2 +- .../V3Hl7V3ConformanceEnumFactory.java | 2 +- .../model/valuesets/V3HtmlLinkType.java | 2 +- .../valuesets/V3HtmlLinkTypeEnumFactory.java | 2 +- .../valuesets/V3IdentifierReliability.java | 2 +- .../V3IdentifierReliabilityEnumFactory.java | 2 +- .../model/valuesets/V3IdentifierScope.java | 2 +- .../V3IdentifierScopeEnumFactory.java | 2 +- .../valuesets/V3IntegrityCheckAlgorithm.java | 2 +- .../V3IntegrityCheckAlgorithmEnumFactory.java | 2 +- .../valuesets/V3LanguageAbilityMode.java | 2 +- .../V3LanguageAbilityModeEnumFactory.java | 2 +- .../V3LanguageAbilityProficiency.java | 2 +- ...LanguageAbilityProficiencyEnumFactory.java | 2 +- .../model/valuesets/V3LivingArrangement.java | 2 +- .../V3LivingArrangementEnumFactory.java | 2 +- .../model/valuesets/V3LocalMarkupIgnore.java | 2 +- .../V3LocalMarkupIgnoreEnumFactory.java | 2 +- .../valuesets/V3LocalRemoteControlState.java | 2 +- .../V3LocalRemoteControlStateEnumFactory.java | 2 +- .../V3ManagedParticipationStatus.java | 2 +- ...ManagedParticipationStatusEnumFactory.java | 2 +- .../model/valuesets/V3MapRelationship.java | 2 +- .../V3MapRelationshipEnumFactory.java | 2 +- .../model/valuesets/V3MaritalStatus.java | 2 +- .../valuesets/V3MaritalStatusEnumFactory.java | 2 +- .../valuesets/V3MessageWaitingPriority.java | 2 +- .../V3MessageWaitingPriorityEnumFactory.java | 2 +- .../model/valuesets/V3ModifyIndicator.java | 2 +- .../V3ModifyIndicatorEnumFactory.java | 2 +- .../model/valuesets/V3NullFlavor.java | 2 +- .../valuesets/V3NullFlavorEnumFactory.java | 2 +- .../V3ObservationInterpretation.java | 2 +- ...3ObservationInterpretationEnumFactory.java | 2 +- .../model/valuesets/V3ObservationMethod.java | 2 +- .../V3ObservationMethodEnumFactory.java | 2 +- .../model/valuesets/V3ObservationValue.java | 2 +- .../V3ObservationValueEnumFactory.java | 2 +- .../model/valuesets/V3OrderableDrugForm.java | 2 +- .../V3OrderableDrugFormEnumFactory.java | 2 +- .../valuesets/V3ParticipationFunction.java | 2 +- .../V3ParticipationFunctionEnumFactory.java | 2 +- .../model/valuesets/V3ParticipationMode.java | 2 +- .../V3ParticipationModeEnumFactory.java | 2 +- .../valuesets/V3ParticipationSignature.java | 2 +- .../V3ParticipationSignatureEnumFactory.java | 2 +- .../model/valuesets/V3ParticipationType.java | 2 +- .../V3ParticipationTypeEnumFactory.java | 2 +- .../model/valuesets/V3PatientImportance.java | 2 +- .../V3PatientImportanceEnumFactory.java | 2 +- .../model/valuesets/V3PaymentTerms.java | 2 +- .../valuesets/V3PaymentTermsEnumFactory.java | 2 +- .../valuesets/V3PersonDisabilityType.java | 2 +- .../V3PersonDisabilityTypeEnumFactory.java | 2 +- .../V3ProbabilityDistributionType.java | 2 +- ...robabilityDistributionTypeEnumFactory.java | 2 +- .../model/valuesets/V3ProcessingID.java | 2 +- .../valuesets/V3ProcessingIDEnumFactory.java | 2 +- .../model/valuesets/V3ProcessingMode.java | 2 +- .../V3ProcessingModeEnumFactory.java | 2 +- .../valuesets/V3QueryParameterValue.java | 2 +- .../V3QueryParameterValueEnumFactory.java | 2 +- .../model/valuesets/V3QueryPriority.java | 2 +- .../valuesets/V3QueryPriorityEnumFactory.java | 2 +- .../model/valuesets/V3QueryRequestLimit.java | 2 +- .../V3QueryRequestLimitEnumFactory.java | 2 +- .../model/valuesets/V3QueryResponse.java | 2 +- .../valuesets/V3QueryResponseEnumFactory.java | 2 +- .../model/valuesets/V3QueryStatusCode.java | 2 +- .../V3QueryStatusCodeEnumFactory.java | 2 +- .../fhir/instance/model/valuesets/V3Race.java | 2 +- .../model/valuesets/V3RaceEnumFactory.java | 2 +- .../model/valuesets/V3RelationalOperator.java | 2 +- .../V3RelationalOperatorEnumFactory.java | 2 +- .../valuesets/V3RelationshipConjunction.java | 2 +- .../V3RelationshipConjunctionEnumFactory.java | 2 +- .../valuesets/V3ReligiousAffiliation.java | 2 +- .../V3ReligiousAffiliationEnumFactory.java | 2 +- .../model/valuesets/V3ResponseLevel.java | 2 +- .../valuesets/V3ResponseLevelEnumFactory.java | 2 +- .../model/valuesets/V3ResponseModality.java | 2 +- .../V3ResponseModalityEnumFactory.java | 2 +- .../model/valuesets/V3ResponseMode.java | 2 +- .../valuesets/V3ResponseModeEnumFactory.java | 2 +- .../instance/model/valuesets/V3RoleClass.java | 2 +- .../valuesets/V3RoleClassEnumFactory.java | 2 +- .../instance/model/valuesets/V3RoleCode.java | 2 +- .../valuesets/V3RoleCodeEnumFactory.java | 2 +- .../model/valuesets/V3RoleLinkStatus.java | 2 +- .../V3RoleLinkStatusEnumFactory.java | 2 +- .../model/valuesets/V3RoleLinkType.java | 2 +- .../valuesets/V3RoleLinkTypeEnumFactory.java | 2 +- .../model/valuesets/V3RoleStatus.java | 2 +- .../valuesets/V3RoleStatusEnumFactory.java | 2 +- .../valuesets/V3RouteOfAdministration.java | 2 +- .../V3RouteOfAdministrationEnumFactory.java | 2 +- .../model/valuesets/V3Sequencing.java | 2 +- .../valuesets/V3SequencingEnumFactory.java | 2 +- .../model/valuesets/V3SetOperator.java | 2 +- .../valuesets/V3SetOperatorEnumFactory.java | 2 +- .../model/valuesets/V3SpecimenType.java | 2 +- .../valuesets/V3SpecimenTypeEnumFactory.java | 2 +- .../V3SubstanceAdminSubstitution.java | 2 +- ...SubstanceAdminSubstitutionEnumFactory.java | 2 +- .../valuesets/V3SubstitutionCondition.java | 2 +- .../V3SubstitutionConditionEnumFactory.java | 2 +- .../valuesets/V3TableCellHorizontalAlign.java | 2 +- ...V3TableCellHorizontalAlignEnumFactory.java | 2 +- .../model/valuesets/V3TableCellScope.java | 2 +- .../V3TableCellScopeEnumFactory.java | 2 +- .../valuesets/V3TableCellVerticalAlign.java | 2 +- .../V3TableCellVerticalAlignEnumFactory.java | 2 +- .../model/valuesets/V3TableFrame.java | 2 +- .../valuesets/V3TableFrameEnumFactory.java | 2 +- .../model/valuesets/V3TableRules.java | 2 +- .../valuesets/V3TableRulesEnumFactory.java | 2 +- .../model/valuesets/V3TargetAwareness.java | 2 +- .../V3TargetAwarenessEnumFactory.java | 2 +- .../V3TelecommunicationCapabilities.java | 2 +- ...ecommunicationCapabilitiesEnumFactory.java | 2 +- .../model/valuesets/V3TimingEvent.java | 2 +- .../valuesets/V3TimingEventEnumFactory.java | 2 +- .../V3TransmissionRelationshipTypeCode.java | 2 +- ...issionRelationshipTypeCodeEnumFactory.java | 2 +- .../model/valuesets/V3TribalEntityUS.java | 2 +- .../V3TribalEntityUSEnumFactory.java | 2 +- .../valuesets/V3VaccineManufacturer.java | 2 +- .../V3VaccineManufacturerEnumFactory.java | 2 +- .../VaccinationProtocolDoseStatus.java | 2 +- ...cinationProtocolDoseStatusEnumFactory.java | 2 +- .../VaccinationProtocolDoseStatusReason.java | 2 +- ...onProtocolDoseStatusReasonEnumFactory.java | 2 +- .../VaccinationProtocolDoseTarget.java | 2 +- ...cinationProtocolDoseTargetEnumFactory.java | 2 +- .../model/valuesets/VisionProduct.java | 2 +- .../valuesets/VisionProductEnumFactory.java | 2 +- .../model/valuesets/XdsRelationshipType.java | 7 +- .../XdsRelationshipTypeEnumFactory.java | 2 +- .../fhir/instance/utils/ProfileUtilities.java | 22 +- .../instance/utils/ToolingExtensions.java | 13 + .../fhir/instance/utils/WorkerContext.java | 26 +- .../instance/validation/BaseValidator.java | 1 + .../validation/InstanceValidator.java | 38 +- .../xhtml/HeirarchicalTableGenerator.java | 2 +- .../instance/model/fhirversion.properties | 2 +- .../model/profile/account.profile.xml | 11 +- .../model/profile/address.profile.xml | 7 +- .../instance/model/profile/age.profile.xml | 3 +- .../profile/allergyintolerance.profile.xml | 32 +- .../model/profile/annotation.profile.xml | 5 +- .../model/profile/appointment.profile.xml | 5 +- .../profile/appointmentresponse.profile.xml | 5 +- .../model/profile/attachment.profile.xml | 7 +- .../model/profile/auditevent.profile.xml | 5 +- .../model/profile/backboneelement.profile.xml | 5 +- .../instance/model/profile/basic.profile.xml | 8 +- .../instance/model/profile/binary.profile.xml | 8 +- .../model/profile/bodysite.profile.xml | 5 +- .../model/profile/boolean.profile.xml | 17 +- .../instance/model/profile/bundle.profile.xml | 5 +- .../model/profile/careplan.profile.xml | 19 +- .../instance/model/profile/claim.profile.xml | 113 +- .../model/profile/claimresponse.profile.xml | 155 +- .../profile/clinicalimpression.profile.xml | 17 +- .../instance/model/profile/code.profile.xml | 19 +- .../model/profile/codeableconcept.profile.xml | 7 +- .../instance/model/profile/coding.profile.xml | 7 +- .../model/profile/communication.profile.xml | 5 +- .../profile/communicationrequest.profile.xml | 5 +- .../model/profile/composition.profile.xml | 44 +- .../model/profile/conceptmap.profile.xml | 23 +- .../model/profile/condition.profile.xml | 21 +- .../model/profile/conformance.profile.xml | 17 +- .../model/profile/contactpoint.profile.xml | 7 +- .../model/profile/contract.profile.xml | 91 +- .../profile/contraindication.profile.xml | 5 +- .../instance/model/profile/count.profile.xml | 3 +- .../model/profile/coverage.profile.xml | 8 +- .../model/profile/dataelement.profile.xml | 9 +- .../instance/model/profile/date.profile.xml | 19 +- .../model/profile/datetime.profile.xml | 19 +- .../model/profile/decimal.profile.xml | 19 +- .../instance/model/profile/device.profile.xml | 14 +- .../model/profile/devicecomponent.profile.xml | 5 +- .../model/profile/devicemetric.profile.xml | 5 +- .../profile/deviceuserequest.profile.xml | 9 +- .../profile/deviceusestatement.profile.xml | 9 +- .../model/profile/diagnosticorder.profile.xml | 9 +- .../profile/diagnosticreport.profile.xml | 40 +- .../model/profile/distance.profile.xml | 3 +- .../profile/documentmanifest.profile.xml | 47 +- .../profile/documentreference.profile.xml | 112 +- .../model/profile/domainresource.profile.xml | 5 +- .../model/profile/duration.profile.xml | 3 +- .../model/profile/element.profile.xml | 13 +- .../profile/elementdefinition.profile.xml | 15 +- .../profile/eligibilityrequest.profile.xml | 5 +- .../profile/eligibilityresponse.profile.xml | 5 +- .../model/profile/encounter.profile.xml | 44 +- .../profile/enrollmentrequest.profile.xml | 5 +- .../profile/enrollmentresponse.profile.xml | 5 +- .../model/profile/episodeofcare.profile.xml | 5 +- .../profile/explanationofbenefit.profile.xml | 5 +- .../model/profile/extension.profile.xml | 7 +- .../profile/familymemberhistory.profile.xml | 29 +- .../instance/model/profile/flag.profile.xml | 5 +- .../instance/model/profile/goal.profile.xml | 5 +- .../instance/model/profile/group.profile.xml | 5 +- .../profile/healthcareservice.profile.xml | 11 +- .../model/profile/humanname.profile.xml | 7 +- .../instance/model/profile/id.profile.xml | 19 +- .../model/profile/identifier.profile.xml | 7 +- .../imagingobjectselection.profile.xml | 38 +- .../model/profile/imagingstudy.profile.xml | 21 +- .../model/profile/immunization.profile.xml | 9 +- .../immunizationrecommendation.profile.xml | 5 +- .../profile/implementationguide.profile.xml | 8 +- .../model/profile/instant.profile.xml | 17 +- .../model/profile/integer.profile.xml | 19 +- .../instance/model/profile/list.profile.xml | 5 +- .../model/profile/location.profile.xml | 5 +- .../model/profile/markdown.profile.xml | 17 +- .../instance/model/profile/media.profile.xml | 5 +- .../model/profile/medication.profile.xml | 101 +- .../medicationadministration.profile.xml | 65 +- .../profile/medicationdispense.profile.xml | 168 +- .../model/profile/medicationorder.profile.xml | 2505 +++++++++++++++++ .../medicationprescription.profile.xml | 336 +-- .../profile/medicationstatement.profile.xml | 73 +- .../model/profile/messageheader.profile.xml | 20 +- .../instance/model/profile/meta.profile.xml | 25 +- .../instance/model/profile/money.profile.xml | 11 +- .../model/profile/namingsystem.profile.xml | 5 +- .../model/profile/narrative.profile.xml | 5 +- .../model/profile/nutritionorder.profile.xml | 32 +- .../model/profile/observation.profile.xml | 20 +- .../instance/model/profile/oid.profile.xml | 19 +- .../profile/operationdefinition.profile.xml | 5 +- .../profile/operationoutcome.profile.xml | 5 +- .../instance/model/profile/order.profile.xml | 5 +- .../model/profile/orderresponse.profile.xml | 5 +- .../model/profile/organization.profile.xml | 5 +- .../model/profile/parameters.profile.xml | 5 +- .../model/profile/patient.profile.xml | 20 +- .../model/profile/paymentnotice.profile.xml | 5 +- .../profile/paymentreconciliation.profile.xml | 29 +- .../instance/model/profile/period.profile.xml | 5 +- .../instance/model/profile/person.profile.xml | 8 +- .../model/profile/positiveint.profile.xml | 19 +- .../model/profile/practitioner.profile.xml | 8 +- .../model/profile/procedure.profile.xml | 11 +- .../profile/procedurerequest.profile.xml | 5 +- .../model/profile/processrequest.profile.xml | 11 +- .../model/profile/processresponse.profile.xml | 5 +- .../model/profile/provenance.profile.xml | 9 +- .../model/profile/quantity.profile.xml | 7 +- .../model/profile/questionnaire.profile.xml | 30 +- .../profile/questionnaireresponse.profile.xml | 20 +- .../instance/model/profile/range.profile.xml | 33 +- .../instance/model/profile/ratio.profile.xml | 7 +- .../model/profile/reference.profile.xml | 5 +- .../model/profile/referralrequest.profile.xml | 5 +- .../model/profile/relatedperson.profile.xml | 14 +- .../model/profile/resource.profile.xml | 5 +- .../model/profile/riskassessment.profile.xml | 5 +- .../model/profile/sampleddata.profile.xml | 11 +- .../model/profile/schedule.profile.xml | 5 +- .../model/profile/searchparameter.profile.xml | 5 +- .../model/profile/signature.profile.xml | 7 +- .../model/profile/simplequantity.profile.xml | 274 ++ .../instance/model/profile/slot.profile.xml | 5 +- .../model/profile/specimen.profile.xml | 17 +- .../instance/model/profile/string.profile.xml | 17 +- .../profile/structuredefinition.profile.xml | 43 +- .../model/profile/subscription.profile.xml | 5 +- .../model/profile/substance.profile.xml | 121 +- .../model/profile/supplydelivery.profile.xml | 9 +- .../model/profile/supplyrequest.profile.xml | 5 +- .../model/profile/testscript.profile.xml | 5 +- .../instance/model/profile/time.profile.xml | 19 +- .../instance/model/profile/timing.profile.xml | 15 +- .../model/profile/unsignedint.profile.xml | 19 +- .../instance/model/profile/uri.profile.xml | 17 +- .../instance/model/profile/uuid.profile.xml | 19 +- .../model/profile/valueset.profile.xml | 47 +- .../profile/visionprescription.profile.xml | 9 +- .../fhir/instance/model/schema/account.sch | 32 +- .../model/schema/allergyintolerance.sch | 30 +- .../instance/model/schema/appointment.sch | 28 +- .../model/schema/appointmentresponse.sch | 26 +- .../fhir/instance/model/schema/auditevent.sch | 32 +- .../hl7/fhir/instance/model/schema/basic.sch | 26 +- .../hl7/fhir/instance/model/schema/binary.sch | 14 +- .../fhir/instance/model/schema/bodysite.sch | 26 +- .../hl7/fhir/instance/model/schema/bundle.sch | 20 +- .../fhir/instance/model/schema/careplan.sch | 75 +- .../hl7/fhir/instance/model/schema/claim.sch | 70 +- .../instance/model/schema/claimresponse.sch | 62 +- .../model/schema/clinicalimpression.sch | 34 +- .../instance/model/schema/communication.sch | 34 +- .../model/schema/communicationrequest.sch | 36 +- .../instance/model/schema/composition.sch | 42 +- .../fhir/instance/model/schema/conceptmap.sch | 32 +- .../fhir/instance/model/schema/condition.sch | 58 +- .../instance/model/schema/conformance.sch | 52 +- .../fhir/instance/model/schema/contract.sch | 84 +- .../model/schema/contraindication.sch | 30 +- .../fhir/instance/model/schema/coverage.sch | 42 +- .../instance/model/schema/dataelement.sch | 44 +- .../hl7/fhir/instance/model/schema/device.sch | 34 +- .../instance/model/schema/devicecomponent.sch | 30 +- .../instance/model/schema/devicemetric.sch | 43 +- .../model/schema/deviceuserequest.sch | 49 +- .../model/schema/deviceusestatement.sch | 49 +- .../instance/model/schema/diagnosticorder.sch | 38 +- .../model/schema/diagnosticreport.sch | 42 +- .../model/schema/documentmanifest.sch | 42 +- .../model/schema/documentreference.sch | 51 +- .../model/schema/eligibilityrequest.sch | 28 +- .../model/schema/eligibilityresponse.sch | 30 +- .../fhir/instance/model/schema/encounter.sch | 62 +- .../model/schema/enrollmentrequest.sch | 32 +- .../model/schema/enrollmentresponse.sch | 30 +- .../instance/model/schema/episodeofcare.sch | 40 +- .../model/schema/explanationofbenefit.sch | 30 +- .../model/schema/familymemberhistory.sch | 57 +- .../instance/model/schema/fhir-single.xsd | 334 ++- .../hl7/fhir/instance/model/schema/flag.sch | 30 +- .../hl7/fhir/instance/model/schema/goal.sch | 30 +- .../hl7/fhir/instance/model/schema/group.sch | 41 +- .../model/schema/healthcareservice.sch | 36 +- .../model/schema/imagingobjectselection.sch | 24 +- .../instance/model/schema/imagingstudy.sch | 38 +- .../instance/model/schema/immunization.sch | 42 +- .../schema/immunizationrecommendation.sch | 30 +- .../model/schema/implementationguide.sch | 28 +- .../hl7/fhir/instance/model/schema/list.sch | 36 +- .../fhir/instance/model/schema/location.sch | 32 +- .../hl7/fhir/instance/model/schema/media.sch | 38 +- .../fhir/instance/model/schema/medication.sch | 32 +- .../model/schema/medicationadministration.sch | 59 +- .../model/schema/medicationdispense.sch | 94 +- .../instance/model/schema/medicationorder.sch | 136 + .../model/schema/medicationstatement.sch | 78 +- .../instance/model/schema/messageheader.sch | 36 +- .../instance/model/schema/namingsystem.sch | 36 +- .../instance/model/schema/nutritionorder.sch | 103 +- .../instance/model/schema/observation.sch | 101 +- .../model/schema/operationdefinition.sch | 30 +- .../model/schema/operationoutcome.sch | 18 +- .../hl7/fhir/instance/model/schema/order.sch | 51 +- .../instance/model/schema/orderresponse.sch | 28 +- .../instance/model/schema/organization.sch | 46 +- .../fhir/instance/model/schema/patient.sch | 52 +- .../instance/model/schema/paymentnotice.sch | 32 +- .../model/schema/paymentreconciliation.sch | 44 +- .../hl7/fhir/instance/model/schema/person.sch | 36 +- .../instance/model/schema/practitioner.sch | 48 +- .../fhir/instance/model/schema/procedure.sch | 42 +- .../model/schema/procedurerequest.sch | 51 +- .../instance/model/schema/processrequest.sch | 34 +- .../instance/model/schema/processresponse.sch | 30 +- .../fhir/instance/model/schema/provenance.sch | 32 +- .../instance/model/schema/questionnaire.sch | 36 +- .../model/schema/questionnaireresponse.sch | 42 +- .../instance/model/schema/referralrequest.sch | 34 +- .../instance/model/schema/relatedperson.sch | 36 +- .../instance/model/schema/riskassessment.sch | 50 +- .../fhir/instance/model/schema/schedule.sch | 26 +- .../instance/model/schema/searchparameter.sch | 26 +- .../hl7/fhir/instance/model/schema/slot.sch | 24 +- .../fhir/instance/model/schema/specimen.sch | 48 +- .../model/schema/structuredefinition.sch | 84 +- .../instance/model/schema/subscription.sch | 22 +- .../fhir/instance/model/schema/substance.sch | 36 +- .../instance/model/schema/supplydelivery.sch | 36 +- .../instance/model/schema/supplyrequest.sch | 49 +- .../fhir/instance/model/schema/testscript.sch | 58 +- .../fhir/instance/model/schema/valueset.sch | 42 +- .../model/schema/visionprescription.sch | 32 +- .../validation/FhirInstanceValidatorTest.java | 15 + 812 files changed, 9052 insertions(+), 4856 deletions(-) rename hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/{MedicationPrescription.java => MedicationOrder.java} (68%) create mode 100644 hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SimpleQuantity.java create mode 100644 hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SubstanceCategory.java create mode 100644 hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SubstanceCategoryEnumFactory.java create mode 100644 hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medicationorder.profile.xml create mode 100644 hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/simplequantity.profile.xml create mode 100644 hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/medicationorder.sch diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/ca/uhn/fhir/validation/FhirInstanceValidator.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/ca/uhn/fhir/validation/FhirInstanceValidator.java index 296b4715aeb..80788c02082 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/ca/uhn/fhir/validation/FhirInstanceValidator.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/ca/uhn/fhir/validation/FhirInstanceValidator.java @@ -1,8 +1,10 @@ package ca.uhn.fhir.validation; +import static org.apache.commons.lang3.StringUtils.getJaroWinklerDistance; import static org.apache.commons.lang3.StringUtils.isBlank; import java.io.IOException; +import java.io.InputStream; import java.io.StringReader; import java.util.ArrayList; import java.util.Collections; @@ -72,18 +74,31 @@ public class FhirInstanceValidator extends BaseValidatorBridge implements IValid private StructureDefinition loadProfileOrReturnNull(List theMessages, FhirContext theCtx, String theResourceName) { if (isBlank(theResourceName)) { - theMessages.add(new ValidationMessage().setLevel(IssueSeverity.FATAL) - .setMessage("Could not determine resource type from request. Content appears invalid.")); + if (theMessages != null) { + theMessages.add(new ValidationMessage().setLevel(IssueSeverity.FATAL) + .setMessage("Could not determine resource type from request. Content appears invalid.")); + } return null; } String profileCpName = "/org/hl7/fhir/instance/model/profile/" + theResourceName.toLowerCase() + ".profile.xml"; String profileText; try { - profileText = IOUtils.toString(FhirInstanceValidator.class.getResourceAsStream(profileCpName), "UTF-8"); + InputStream inputStream = FhirInstanceValidator.class.getResourceAsStream(profileCpName); + if (inputStream == null) { + if (theMessages != null) { + theMessages.add(new ValidationMessage().setLevel(IssueSeverity.FATAL) + .setMessage("No profile found for resource type " + theResourceName)); + } else { + return null; + } + } + profileText = IOUtils.toString(inputStream, "UTF-8"); } catch (IOException e1) { - theMessages.add(new ValidationMessage().setLevel(IssueSeverity.FATAL) - .setMessage("No profile found for resource type " + theResourceName)); + if (theMessages != null) { + theMessages.add(new ValidationMessage().setLevel(IssueSeverity.FATAL) + .setMessage("No profile found for resource type " + theResourceName)); + } return null; } StructureDefinition profile = getHl7OrgDstu2Ctx(theCtx).newXmlParser().parseResource(StructureDefinition.class, @@ -91,8 +106,22 @@ public class FhirInstanceValidator extends BaseValidatorBridge implements IValid return profile; } - protected List validate(FhirContext theCtx, String theInput, EncodingEnum theEncoding) { - WorkerContext workerContext = new WorkerContext(); + protected List validate(final FhirContext theCtx, String theInput, EncodingEnum theEncoding) { + WorkerContext workerContext = new WorkerContext() { + @Override + public StructureDefinition getProfile(String theId) { + StructureDefinition retVal = super.getProfile(theId); + if (retVal == null) { + if (theId.startsWith("http://hl7.org/fhir/StructureDefinition/")) { + retVal = loadProfileOrReturnNull(null, getHl7OrgDstu2Ctx(theCtx), theId.substring("http://hl7.org/fhir/StructureDefinition/".length())); + if (retVal != null) { + seeProfile(theId, retVal); + } + } + } + return retVal; + }}; + org.hl7.fhir.instance.validation.InstanceValidator v; try { v = new org.hl7.fhir.instance.validation.InstanceValidator(workerContext); diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Account.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Account.java index 63ed0f3ba2f..eae7d558339 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Account.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Account.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Address.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Address.java index 6c49191b415..78bcdc1327d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Address.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Address.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Age.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Age.java index 2adbc41d45d..68dcb8e5912 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Age.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Age.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.annotations.DatatypeDef; import org.hl7.fhir.instance.model.annotations.Block; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AllergyIntolerance.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AllergyIntolerance.java index c9768ceeb02..4e296b4c14e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AllergyIntolerance.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AllergyIntolerance.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; @@ -64,7 +64,7 @@ public class AllergyIntolerance extends DomainResource { */ REFUTED, /** - * The statement was entered in error and Is not valid + * The statement was entered in error and is not valid */ ENTEREDINERROR, /** @@ -112,7 +112,7 @@ public class AllergyIntolerance extends DomainResource { case CONFIRMED: return "A high level of certainty about the propensity for a reaction to the identified Substance, which may include clinical evidence by testing or rechallenge."; case RESOLVED: return "A reaction to the identified Substance has been clinically reassessed by testing or rechallenge and considered to be resolved."; case REFUTED: return "A propensity for a reaction to the identified Substance has been disproven with a high level of clinical certainty, which may include testing or rechallenge, and is refuted."; - case ENTEREDINERROR: return "The statement was entered in error and Is not valid"; + case ENTEREDINERROR: return "The statement was entered in error and is not valid"; default: return "?"; } } @@ -331,6 +331,10 @@ public class AllergyIntolerance extends DomainResource { * Substances that are encountered in the environment */ ENVIRONMENT, + /** + * Other substances that are not covered by any other category + */ + OTHER, /** * added to help the parsers */ @@ -344,6 +348,8 @@ public class AllergyIntolerance extends DomainResource { return MEDICATION; if ("environment".equals(codeString)) return ENVIRONMENT; + if ("other".equals(codeString)) + return OTHER; throw new Exception("Unknown AllergyIntoleranceCategory code '"+codeString+"'"); } public String toCode() { @@ -351,6 +357,7 @@ public class AllergyIntolerance extends DomainResource { case FOOD: return "food"; case MEDICATION: return "medication"; case ENVIRONMENT: return "environment"; + case OTHER: return "other"; default: return "?"; } } @@ -359,6 +366,7 @@ public class AllergyIntolerance extends DomainResource { case FOOD: return "http://hl7.org/fhir/allergy-intolerance-category"; case MEDICATION: return "http://hl7.org/fhir/allergy-intolerance-category"; case ENVIRONMENT: return "http://hl7.org/fhir/allergy-intolerance-category"; + case OTHER: return "http://hl7.org/fhir/allergy-intolerance-category"; default: return "?"; } } @@ -367,6 +375,7 @@ public class AllergyIntolerance extends DomainResource { case FOOD: return "Any substance consumed to provide nutritional support for the body"; case MEDICATION: return "Substances administered to achieve a physiological effect"; case ENVIRONMENT: return "Substances that are encountered in the environment"; + case OTHER: return "Other substances that are not covered by any other category"; default: return "?"; } } @@ -375,6 +384,7 @@ public class AllergyIntolerance extends DomainResource { case FOOD: return "Food"; case MEDICATION: return "Medication"; case ENVIRONMENT: return "Environment"; + case OTHER: return "Other"; default: return "?"; } } @@ -391,6 +401,8 @@ public class AllergyIntolerance extends DomainResource { return AllergyIntoleranceCategory.MEDICATION; if ("environment".equals(codeString)) return AllergyIntoleranceCategory.ENVIRONMENT; + if ("other".equals(codeString)) + return AllergyIntoleranceCategory.OTHER; throw new IllegalArgumentException("Unknown AllergyIntoleranceCategory code '"+codeString+"'"); } public String toCode(AllergyIntoleranceCategory code) { @@ -400,6 +412,8 @@ public class AllergyIntolerance extends DomainResource { return "medication"; if (code == AllergyIntoleranceCategory.ENVIRONMENT) return "environment"; + if (code == AllergyIntoleranceCategory.OTHER) + return "other"; return "?"; } } @@ -1156,7 +1170,7 @@ public class AllergyIntolerance extends DomainResource { * Category of the identified Substance. */ @Child(name = "category", type = {CodeType.class}, order=9, min=0, max=1) - @Description(shortDefinition="food | medication | environment - Category of Substance", formalDefinition="Category of the identified Substance." ) + @Description(shortDefinition="food | medication | environment | other - Category of Substance", formalDefinition="Category of the identified Substance." ) protected Enumeration category; /** @@ -1880,7 +1894,7 @@ public class AllergyIntolerance extends DomainResource { public static final String SP_ROUTE = "route"; @SearchParamDefinition(name="patient", path="AllergyIntolerance.patient", description="Who the sensitivity is for", type="reference" ) public static final String SP_PATIENT = "patient"; - @SearchParamDefinition(name="category", path="AllergyIntolerance.category", description="food | medication | environment - Category of Substance", type="token" ) + @SearchParamDefinition(name="category", path="AllergyIntolerance.category", description="food | medication | environment | other - Category of Substance", type="token" ) public static final String SP_CATEGORY = "category"; @SearchParamDefinition(name="last-date", path="AllergyIntolerance.lastOccurence", description="Date(/time) of last known occurence of a reaction", type="date" ) public static final String SP_LASTDATE = "last-date"; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Annotation.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Annotation.java index 0677367f758..1f488d4079d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Annotation.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Annotation.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Appointment.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Appointment.java index c74d70d0388..aeaeecf75cf 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Appointment.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Appointment.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AppointmentResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AppointmentResponse.java index 3362703f9b1..3a6b15e2aec 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AppointmentResponse.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AppointmentResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Attachment.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Attachment.java index acb182dac2e..df01b13d87a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Attachment.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Attachment.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AuditEvent.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AuditEvent.java index 9af675c4992..04caf999b40 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AuditEvent.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AuditEvent.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BackboneElement.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BackboneElement.java index a81781c853b..b793fda81fe 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BackboneElement.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BackboneElement.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 06:45-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Basic.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Basic.java index 1fc706c3407..db88045af8f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Basic.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Basic.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Binary.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Binary.java index 438264d3acc..3ca72b13c67 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Binary.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Binary.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BodySite.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BodySite.java index 18eb5312a8c..c008d7e8f0d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BodySite.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BodySite.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Bundle.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Bundle.java index 2f3120f427f..be81cf9c2a6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Bundle.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Bundle.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CarePlan.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CarePlan.java index 9ac759bf484..b794013fda1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CarePlan.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CarePlan.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; @@ -568,7 +568,7 @@ public class CarePlan extends DomainResource { /** * The details of the proposed activity represented in a specific resource. */ - @Child(name = "reference", type = {Appointment.class, CommunicationRequest.class, DeviceUseRequest.class, DiagnosticOrder.class, MedicationPrescription.class, NutritionOrder.class, Order.class, ProcedureRequest.class, ProcessRequest.class, ReferralRequest.class, SupplyRequest.class, VisionPrescription.class}, order=3, min=0, max=1) + @Child(name = "reference", type = {Appointment.class, CommunicationRequest.class, DeviceUseRequest.class, DiagnosticOrder.class, MedicationOrder.class, NutritionOrder.class, Order.class, ProcedureRequest.class, ProcessRequest.class, ReferralRequest.class, SupplyRequest.class, VisionPrescription.class}, order=3, min=0, max=1) @Description(shortDefinition="Activity details defined in specific resource", formalDefinition="The details of the proposed activity represented in a specific resource." ) protected Reference reference; @@ -758,7 +758,7 @@ public class CarePlan extends DomainResource { super.listChildren(childrenList); childrenList.add(new Property("actionResulting", "Reference(Any)", "Resources that describe follow-on actions resulting from the plan, such as drug prescriptions, encounter records, appointments, etc.", 0, java.lang.Integer.MAX_VALUE, actionResulting)); childrenList.add(new Property("notes", "string", "Notes about the execution of the activity.", 0, java.lang.Integer.MAX_VALUE, notes)); - childrenList.add(new Property("reference", "Reference(Appointment|CommunicationRequest|DeviceUseRequest|DiagnosticOrder|MedicationPrescription|NutritionOrder|Order|ProcedureRequest|ProcessRequest|ReferralRequest|SupplyRequest|VisionPrescription)", "The details of the proposed activity represented in a specific resource.", 0, java.lang.Integer.MAX_VALUE, reference)); + childrenList.add(new Property("reference", "Reference(Appointment|CommunicationRequest|DeviceUseRequest|DiagnosticOrder|MedicationOrder|NutritionOrder|Order|ProcedureRequest|ProcessRequest|ReferralRequest|SupplyRequest|VisionPrescription)", "The details of the proposed activity represented in a specific resource.", 0, java.lang.Integer.MAX_VALUE, reference)); childrenList.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, java.lang.Integer.MAX_VALUE, detail)); } @@ -906,16 +906,16 @@ public class CarePlan extends DomainResource { /** * Identifies the quantity expected to be consumed in a given day. */ - @Child(name = "dailyAmount", type = {Quantity.class}, order=12, min=0, max=1) + @Child(name = "dailyAmount", type = {SimpleQuantity.class}, order=12, min=0, max=1) @Description(shortDefinition="How to consume/day?", formalDefinition="Identifies the quantity expected to be consumed in a given day." ) - protected Quantity dailyAmount; + protected SimpleQuantity dailyAmount; /** * Identifies the quantity expected to be supplied, addministered or consumed by the subject. */ - @Child(name = "quantity", type = {Quantity.class}, order=13, min=0, max=1) + @Child(name = "quantity", type = {SimpleQuantity.class}, order=13, min=0, max=1) @Description(shortDefinition="How much to administer/supply/consume", formalDefinition="Identifies the quantity expected to be supplied, addministered or consumed by the subject." ) - protected Quantity quantity; + protected SimpleQuantity 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. @@ -924,7 +924,7 @@ public class CarePlan extends DomainResource { @Description(shortDefinition="Extra info on activity occurrence", 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 note; - private static final long serialVersionUID = -1276666801L; + private static final long serialVersionUID = -369716593L; /* * Constructor @@ -1428,12 +1428,12 @@ public class CarePlan extends DomainResource { /** * @return {@link #dailyAmount} (Identifies the quantity expected to be consumed in a given day.) */ - public Quantity getDailyAmount() { + public SimpleQuantity getDailyAmount() { if (this.dailyAmount == null) if (Configuration.errorOnAutoCreate()) throw new Error("Attempt to auto-create CarePlanActivityDetailComponent.dailyAmount"); else if (Configuration.doAutoCreate()) - this.dailyAmount = new Quantity(); // cc + this.dailyAmount = new SimpleQuantity(); // cc return this.dailyAmount; } @@ -1444,7 +1444,7 @@ public class CarePlan extends DomainResource { /** * @param value {@link #dailyAmount} (Identifies the quantity expected to be consumed in a given day.) */ - public CarePlanActivityDetailComponent setDailyAmount(Quantity value) { + public CarePlanActivityDetailComponent setDailyAmount(SimpleQuantity value) { this.dailyAmount = value; return this; } @@ -1452,12 +1452,12 @@ public class CarePlan extends DomainResource { /** * @return {@link #quantity} (Identifies the quantity expected to be supplied, addministered or consumed by the subject.) */ - public Quantity getQuantity() { + public SimpleQuantity getQuantity() { if (this.quantity == null) if (Configuration.errorOnAutoCreate()) throw new Error("Attempt to auto-create CarePlanActivityDetailComponent.quantity"); else if (Configuration.doAutoCreate()) - this.quantity = new Quantity(); // cc + this.quantity = new SimpleQuantity(); // cc return this.quantity; } @@ -1468,7 +1468,7 @@ public class CarePlan extends DomainResource { /** * @param value {@link #quantity} (Identifies the quantity expected to be supplied, addministered or consumed by the subject.) */ - public CarePlanActivityDetailComponent setQuantity(Quantity value) { + public CarePlanActivityDetailComponent setQuantity(SimpleQuantity value) { this.quantity = value; return this; } @@ -1535,8 +1535,8 @@ public class CarePlan extends DomainResource { childrenList.add(new Property("location", "Reference(Location)", "Identifies the facility where the activity will occur. E.g. home, hospital, specific clinic, etc.", 0, java.lang.Integer.MAX_VALUE, location)); childrenList.add(new Property("performer", "Reference(Practitioner|Organization|RelatedPerson|Patient)", "Identifies who's expected to be involved in the activity.", 0, java.lang.Integer.MAX_VALUE, performer)); childrenList.add(new Property("product", "Reference(Medication|Substance)", "Identifies the food, drug or other product to be consumed or supplied in the activity.", 0, java.lang.Integer.MAX_VALUE, product)); - childrenList.add(new Property("dailyAmount", "Quantity", "Identifies the quantity expected to be consumed in a given day.", 0, java.lang.Integer.MAX_VALUE, dailyAmount)); - childrenList.add(new Property("quantity", "Quantity", "Identifies the quantity expected to be supplied, addministered or consumed by the subject.", 0, java.lang.Integer.MAX_VALUE, quantity)); + childrenList.add(new Property("dailyAmount", "SimpleQuantity", "Identifies the quantity expected to be consumed in a given day.", 0, java.lang.Integer.MAX_VALUE, dailyAmount)); + childrenList.add(new Property("quantity", "SimpleQuantity", "Identifies the quantity expected to be supplied, addministered or consumed by the subject.", 0, java.lang.Integer.MAX_VALUE, quantity)); childrenList.add(new Property("note", "string", "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.", 0, java.lang.Integer.MAX_VALUE, note)); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Claim.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Claim.java index 11a51ea339a..a018d85b626 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Claim.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Claim.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; @@ -1196,9 +1196,9 @@ public class Claim extends DomainResource { /** * The number of repetitions of a service or product. */ - @Child(name = "quantity", type = {Quantity.class}, order=7, min=0, max=1) + @Child(name = "quantity", type = {SimpleQuantity.class}, order=7, min=0, max=1) @Description(shortDefinition="Count of Products or Services", formalDefinition="The number of repetitions of a service or product." ) - protected Quantity quantity; + protected SimpleQuantity quantity; /** * If the item is a node then this is the fee for the product or service, otherwise this is the total of the fees for the children of the group. @@ -1270,7 +1270,7 @@ public class Claim extends DomainResource { @Description(shortDefinition="Prosthetic details", formalDefinition="The materials and placement date of prior fixed prosthesis." ) protected ProsthesisComponent prosthesis; - private static final long serialVersionUID = -311028698L; + private static final long serialVersionUID = 1295830456L; /* * Constructor @@ -1532,12 +1532,12 @@ public class Claim extends DomainResource { /** * @return {@link #quantity} (The number of repetitions of a service or product.) */ - public Quantity getQuantity() { + public SimpleQuantity getQuantity() { if (this.quantity == null) if (Configuration.errorOnAutoCreate()) throw new Error("Attempt to auto-create ItemsComponent.quantity"); else if (Configuration.doAutoCreate()) - this.quantity = new Quantity(); // cc + this.quantity = new SimpleQuantity(); // cc return this.quantity; } @@ -1548,7 +1548,7 @@ public class Claim extends DomainResource { /** * @param value {@link #quantity} (The number of repetitions of a service or product.) */ - public ItemsComponent setQuantity(Quantity value) { + public ItemsComponent setQuantity(SimpleQuantity value) { this.quantity = value; return this; } @@ -1899,7 +1899,7 @@ public class Claim extends DomainResource { childrenList.add(new Property("diagnosisLinkId", "positiveInt", "Diagnosis applicable for this service or product line.", 0, java.lang.Integer.MAX_VALUE, diagnosisLinkId)); childrenList.add(new Property("service", "Coding", "If a grouping item then 'GROUP' otherwise it is a node therefore a code to indicate the Professional Service or Product supplied.", 0, java.lang.Integer.MAX_VALUE, service)); childrenList.add(new Property("serviceDate", "date", "The date when the enclosed suite of services were performed or completed.", 0, java.lang.Integer.MAX_VALUE, serviceDate)); - childrenList.add(new Property("quantity", "Quantity", "The number of repetitions of a service or product.", 0, java.lang.Integer.MAX_VALUE, quantity)); + childrenList.add(new Property("quantity", "SimpleQuantity", "The number of repetitions of a service or product.", 0, java.lang.Integer.MAX_VALUE, quantity)); childrenList.add(new Property("unitPrice", "Money", "If the item is a node then this is the fee for the product or service, otherwise this is the total of the fees for the children of the group.", 0, java.lang.Integer.MAX_VALUE, unitPrice)); childrenList.add(new Property("factor", "decimal", "A real number that represents a multiplier used in determining the overall value of services delivered and/or goods received. The concept of a Factor allows for a discount or surcharge multiplier to be applied to a monetary amount.", 0, java.lang.Integer.MAX_VALUE, factor)); childrenList.add(new Property("points", "decimal", "An amount that expresses the weighting (based on difficulty, cost and/or resource intensiveness) associated with the good or service delivered. The concept of Points allows for assignment of point values for services and/or goods, such that a monetary amount can be assigned to each point.", 0, java.lang.Integer.MAX_VALUE, points)); @@ -2018,9 +2018,9 @@ public class Claim extends DomainResource { /** * The number of repetitions of a service or product. */ - @Child(name = "quantity", type = {Quantity.class}, order=4, min=0, max=1) + @Child(name = "quantity", type = {SimpleQuantity.class}, order=4, min=0, max=1) @Description(shortDefinition="Count of Products or Services", formalDefinition="The number of repetitions of a service or product." ) - protected Quantity quantity; + protected SimpleQuantity quantity; /** * If the item is a node then this is the fee for the product or service, otherwise this is the total of the fees for the children of the group. @@ -2064,7 +2064,7 @@ public class Claim extends DomainResource { @Description(shortDefinition="Additional items", formalDefinition="Third tier of goods and services." ) protected List subDetail; - private static final long serialVersionUID = -1641314433L; + private static final long serialVersionUID = 5768017L; /* * Constructor @@ -2179,12 +2179,12 @@ public class Claim extends DomainResource { /** * @return {@link #quantity} (The number of repetitions of a service or product.) */ - public Quantity getQuantity() { + public SimpleQuantity getQuantity() { if (this.quantity == null) if (Configuration.errorOnAutoCreate()) throw new Error("Attempt to auto-create DetailComponent.quantity"); else if (Configuration.doAutoCreate()) - this.quantity = new Quantity(); // cc + this.quantity = new SimpleQuantity(); // cc return this.quantity; } @@ -2195,7 +2195,7 @@ public class Claim extends DomainResource { /** * @param value {@link #quantity} (The number of repetitions of a service or product.) */ - public DetailComponent setQuantity(Quantity value) { + public DetailComponent setQuantity(SimpleQuantity value) { this.quantity = value; return this; } @@ -2415,7 +2415,7 @@ public class Claim extends DomainResource { childrenList.add(new Property("sequence", "positiveInt", "A service line number.", 0, java.lang.Integer.MAX_VALUE, sequence)); childrenList.add(new Property("type", "Coding", "The type of product or service.", 0, java.lang.Integer.MAX_VALUE, type)); childrenList.add(new Property("service", "Coding", "If a grouping item then 'GROUP' otherwise it is a node therefore a code to indicate the Professional Service or Product supplied.", 0, java.lang.Integer.MAX_VALUE, service)); - childrenList.add(new Property("quantity", "Quantity", "The number of repetitions of a service or product.", 0, java.lang.Integer.MAX_VALUE, quantity)); + childrenList.add(new Property("quantity", "SimpleQuantity", "The number of repetitions of a service or product.", 0, java.lang.Integer.MAX_VALUE, quantity)); childrenList.add(new Property("unitPrice", "Money", "If the item is a node then this is the fee for the product or service, otherwise this is the total of the fees for the children of the group.", 0, java.lang.Integer.MAX_VALUE, unitPrice)); childrenList.add(new Property("factor", "decimal", "A real number that represents a multiplier used in determining the overall value of services delivered and/or goods received. The concept of a Factor allows for a discount or surcharge multiplier to be applied to a monetary amount.", 0, java.lang.Integer.MAX_VALUE, factor)); childrenList.add(new Property("points", "decimal", "An amount that expresses the weighting (based on difficulty, cost and/or resource intensiveness) associated with the good or service delivered. The concept of Points allows for assignment of point values for services and/or goods, such that a monetary amount can be assigned to each point.", 0, java.lang.Integer.MAX_VALUE, points)); @@ -2503,9 +2503,9 @@ public class Claim extends DomainResource { /** * The number of repetitions of a service or product. */ - @Child(name = "quantity", type = {Quantity.class}, order=4, min=0, max=1) + @Child(name = "quantity", type = {SimpleQuantity.class}, order=4, min=0, max=1) @Description(shortDefinition="Count of Products or Services", formalDefinition="The number of repetitions of a service or product." ) - protected Quantity quantity; + protected SimpleQuantity quantity; /** * The fee for an addittional service or product or charge. @@ -2542,7 +2542,7 @@ public class Claim extends DomainResource { @Description(shortDefinition="Unique Device Identifier", formalDefinition="List of Unique Device Identifiers associated with this line item." ) protected Coding udi; - private static final long serialVersionUID = -947666334L; + private static final long serialVersionUID = 623567568L; /* * Constructor @@ -2657,12 +2657,12 @@ public class Claim extends DomainResource { /** * @return {@link #quantity} (The number of repetitions of a service or product.) */ - public Quantity getQuantity() { + public SimpleQuantity getQuantity() { if (this.quantity == null) if (Configuration.errorOnAutoCreate()) throw new Error("Attempt to auto-create SubDetailComponent.quantity"); else if (Configuration.doAutoCreate()) - this.quantity = new Quantity(); // cc + this.quantity = new SimpleQuantity(); // cc return this.quantity; } @@ -2673,7 +2673,7 @@ public class Claim extends DomainResource { /** * @param value {@link #quantity} (The number of repetitions of a service or product.) */ - public SubDetailComponent setQuantity(Quantity value) { + public SubDetailComponent setQuantity(SimpleQuantity value) { this.quantity = value; return this; } @@ -2853,7 +2853,7 @@ public class Claim extends DomainResource { childrenList.add(new Property("sequence", "positiveInt", "A service line number.", 0, java.lang.Integer.MAX_VALUE, sequence)); childrenList.add(new Property("type", "Coding", "The type of product or service.", 0, java.lang.Integer.MAX_VALUE, type)); childrenList.add(new Property("service", "Coding", "The fee for an addittional service or product or charge.", 0, java.lang.Integer.MAX_VALUE, service)); - childrenList.add(new Property("quantity", "Quantity", "The number of repetitions of a service or product.", 0, java.lang.Integer.MAX_VALUE, quantity)); + childrenList.add(new Property("quantity", "SimpleQuantity", "The number of repetitions of a service or product.", 0, java.lang.Integer.MAX_VALUE, quantity)); childrenList.add(new Property("unitPrice", "Money", "The fee for an addittional service or product or charge.", 0, java.lang.Integer.MAX_VALUE, unitPrice)); childrenList.add(new Property("factor", "decimal", "A real number that represents a multiplier used in determining the overall value of services delivered and/or goods received. The concept of a Factor allows for a discount or surcharge multiplier to be applied to a monetary amount.", 0, java.lang.Integer.MAX_VALUE, factor)); childrenList.add(new Property("points", "decimal", "An amount that expresses the weighting (based on difficulty, cost and/or resource intensiveness) associated with the good or service delivered. The concept of Points allows for assignment of point values for services and/or goods, such that a monetary amount can be assigned to each point.", 0, java.lang.Integer.MAX_VALUE, points)); @@ -3403,7 +3403,7 @@ public class Claim extends DomainResource { /** * Prescription to support the dispensing of Pharmacy or Vision products. */ - @Child(name = "prescription", type = {MedicationPrescription.class, VisionPrescription.class}, order=13, min=0, max=1) + @Child(name = "prescription", type = {MedicationOrder.class, VisionPrescription.class}, order=13, min=0, max=1) @Description(shortDefinition="Prescription", formalDefinition="Prescription to support the dispensing of Pharmacy or Vision products." ) protected Reference prescription; @@ -3415,14 +3415,14 @@ public class Claim extends DomainResource { /** * Original prescription to support the dispensing of pharmacy services, medications or products. */ - @Child(name = "originalPrescription", type = {MedicationPrescription.class}, order=14, min=0, max=1) + @Child(name = "originalPrescription", type = {MedicationOrder.class}, order=14, min=0, max=1) @Description(shortDefinition="Original Prescription", formalDefinition="Original prescription to support the dispensing of pharmacy services, medications or products." ) protected Reference originalPrescription; /** * The actual object that is the target of the reference (Original prescription to support the dispensing of pharmacy services, medications or products.) */ - protected MedicationPrescription originalPrescriptionTarget; + protected MedicationOrder originalPrescriptionTarget; /** * The party to be reimbursed for the services. @@ -3532,7 +3532,7 @@ public class Claim extends DomainResource { @Description(shortDefinition="Only if type = oral", formalDefinition="A list of teeth which would be expected but are not found due to having been previously extracted or for other reasons." ) protected List missingTeeth; - private static final long serialVersionUID = 1120349447L; + private static final long serialVersionUID = 4272227L; /* * Constructor @@ -4115,19 +4115,19 @@ public class Claim extends DomainResource { /** * @return {@link #originalPrescription} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (Original prescription to support the dispensing of pharmacy services, medications or products.) */ - public MedicationPrescription getOriginalPrescriptionTarget() { + public MedicationOrder getOriginalPrescriptionTarget() { if (this.originalPrescriptionTarget == null) if (Configuration.errorOnAutoCreate()) throw new Error("Attempt to auto-create Claim.originalPrescription"); else if (Configuration.doAutoCreate()) - this.originalPrescriptionTarget = new MedicationPrescription(); // aa + this.originalPrescriptionTarget = new MedicationOrder(); // aa return this.originalPrescriptionTarget; } /** * @param value {@link #originalPrescription} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (Original prescription to support the dispensing of pharmacy services, medications or products.) */ - public Claim setOriginalPrescriptionTarget(MedicationPrescription value) { + public Claim setOriginalPrescriptionTarget(MedicationOrder value) { this.originalPrescriptionTarget = value; return this; } @@ -4701,8 +4701,8 @@ public class Claim extends DomainResource { childrenList.add(new Property("fundsReserve", "Coding", "In the case of a Pre-Determination/Pre-Authorization the provider may request that funds in the amount of the expected Benefit be reserved ('Patient' or 'Provider') to pay for the Benefits determined on the subsequent claim(s). 'None' explicitly indicates no funds reserving is requested.", 0, java.lang.Integer.MAX_VALUE, fundsReserve)); childrenList.add(new Property("enterer", "Reference(Practitioner)", "Person who created the invoice/claim/pre-determination or pre-authorization.", 0, java.lang.Integer.MAX_VALUE, enterer)); childrenList.add(new Property("facility", "Reference(Location)", "Facility where the services were provided.", 0, java.lang.Integer.MAX_VALUE, facility)); - childrenList.add(new Property("prescription", "Reference(MedicationPrescription|VisionPrescription)", "Prescription to support the dispensing of Pharmacy or Vision products.", 0, java.lang.Integer.MAX_VALUE, prescription)); - childrenList.add(new Property("originalPrescription", "Reference(MedicationPrescription)", "Original prescription to support the dispensing of pharmacy services, medications or products.", 0, java.lang.Integer.MAX_VALUE, originalPrescription)); + childrenList.add(new Property("prescription", "Reference(MedicationOrder|VisionPrescription)", "Prescription to support the dispensing of Pharmacy or Vision products.", 0, java.lang.Integer.MAX_VALUE, prescription)); + childrenList.add(new Property("originalPrescription", "Reference(MedicationOrder)", "Original prescription to support the dispensing of pharmacy services, medications or products.", 0, java.lang.Integer.MAX_VALUE, originalPrescription)); childrenList.add(new Property("payee", "", "The party to be reimbursed for the services.", 0, java.lang.Integer.MAX_VALUE, payee)); childrenList.add(new Property("referral", "Reference(ReferralRequest)", "The referral resource which lists the date, practitioner, reason and other supporting information.", 0, java.lang.Integer.MAX_VALUE, referral)); childrenList.add(new Property("diagnosis", "", "Ordered list of patient diagnosis for which care is sought.", 0, java.lang.Integer.MAX_VALUE, diagnosis)); diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClaimResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClaimResponse.java index 9f95c01f1c9..96291c0c775 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClaimResponse.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClaimResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClinicalImpression.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClinicalImpression.java index 11704e9e268..a3da852701d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClinicalImpression.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClinicalImpression.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; @@ -710,7 +710,7 @@ public class ClinicalImpression extends DomainResource { /** * Plan of action after assessment. */ - @Child(name = "plan", type = {CarePlan.class, Appointment.class, CommunicationRequest.class, DeviceUseRequest.class, DiagnosticOrder.class, MedicationPrescription.class, NutritionOrder.class, Order.class, ProcedureRequest.class, ProcessRequest.class, ReferralRequest.class, SupplyRequest.class, VisionPrescription.class}, order=15, min=0, max=Child.MAX_UNLIMITED) + @Child(name = "plan", type = {CarePlan.class, Appointment.class, CommunicationRequest.class, DeviceUseRequest.class, DiagnosticOrder.class, MedicationOrder.class, NutritionOrder.class, Order.class, ProcedureRequest.class, ProcessRequest.class, ReferralRequest.class, SupplyRequest.class, VisionPrescription.class}, order=15, min=0, max=Child.MAX_UNLIMITED) @Description(shortDefinition="Plan of action after assessment", formalDefinition="Plan of action after assessment." ) protected List plan; /** @@ -722,7 +722,7 @@ public class ClinicalImpression extends DomainResource { /** * Actions taken during assessment. */ - @Child(name = "action", type = {ReferralRequest.class, ProcedureRequest.class, Procedure.class, MedicationPrescription.class, DiagnosticOrder.class, NutritionOrder.class, SupplyRequest.class, Appointment.class}, order=16, min=0, max=Child.MAX_UNLIMITED) + @Child(name = "action", type = {ReferralRequest.class, ProcedureRequest.class, Procedure.class, MedicationOrder.class, DiagnosticOrder.class, NutritionOrder.class, SupplyRequest.class, Appointment.class}, order=16, min=0, max=Child.MAX_UNLIMITED) @Description(shortDefinition="Actions taken during assessment", formalDefinition="Actions taken during assessment." ) protected List action; /** @@ -1540,8 +1540,8 @@ public class ClinicalImpression extends DomainResource { childrenList.add(new Property("resolved", "CodeableConcept", "Diagnoses/conditions resolved since the last assessment.", 0, java.lang.Integer.MAX_VALUE, resolved)); childrenList.add(new Property("ruledOut", "", "Diagnosis considered not possible.", 0, java.lang.Integer.MAX_VALUE, ruledOut)); childrenList.add(new Property("prognosis", "string", "Estimate of likely outcome.", 0, java.lang.Integer.MAX_VALUE, prognosis)); - childrenList.add(new Property("plan", "Reference(CarePlan|Appointment|CommunicationRequest|DeviceUseRequest|DiagnosticOrder|MedicationPrescription|NutritionOrder|Order|ProcedureRequest|ProcessRequest|ReferralRequest|SupplyRequest|VisionPrescription)", "Plan of action after assessment.", 0, java.lang.Integer.MAX_VALUE, plan)); - childrenList.add(new Property("action", "Reference(ReferralRequest|ProcedureRequest|Procedure|MedicationPrescription|DiagnosticOrder|NutritionOrder|SupplyRequest|Appointment)", "Actions taken during assessment.", 0, java.lang.Integer.MAX_VALUE, action)); + childrenList.add(new Property("plan", "Reference(CarePlan|Appointment|CommunicationRequest|DeviceUseRequest|DiagnosticOrder|MedicationOrder|NutritionOrder|Order|ProcedureRequest|ProcessRequest|ReferralRequest|SupplyRequest|VisionPrescription)", "Plan of action after assessment.", 0, java.lang.Integer.MAX_VALUE, plan)); + childrenList.add(new Property("action", "Reference(ReferralRequest|ProcedureRequest|Procedure|MedicationOrder|DiagnosticOrder|NutritionOrder|SupplyRequest|Appointment)", "Actions taken during assessment.", 0, java.lang.Integer.MAX_VALUE, action)); } public ClinicalImpression copy() { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CodeableConcept.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CodeableConcept.java index 6214489cd33..e31cb7177f5 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CodeableConcept.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CodeableConcept.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coding.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coding.java index 7f8cd29b91a..d6127528f80 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coding.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coding.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Communication.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Communication.java index a2ad0b41575..faed89a9625 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Communication.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Communication.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CommunicationRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CommunicationRequest.java index f3d14c13578..adb259104ce 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CommunicationRequest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CommunicationRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Composition.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Composition.java index 8330a18baea..cb5792def7a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Composition.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Composition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; @@ -41,7 +41,7 @@ import org.hl7.fhir.instance.model.annotations.Description; import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** - * A set of healthcare-related information that is assembled together into a single logical document that provides a single coherent statement of meaning, establishes its own context and that has clinical attestation with regard to who is making the statement. + * A set of healthcare-related information that is assembled together into a single logical document that provides a single coherent statement of meaning, establishes its own context and that has clinical attestation with regard to who is making the statement. While a Composition defines the structure, it does not actually contain the content: rather the full content of a document is contained in a Bundle, of which the Composition is the first resource contained. */ @ResourceDef(name="Composition", profile="http://hl7.org/fhir/Profile/Composition") public class Composition extends DomainResource { @@ -56,11 +56,7 @@ public class Composition extends DomainResource { */ FINAL, /** - * The composition or document has been modified subsequent to being released as "final", and is complete and verified by an authorized person. The modifications added new information to the composition or document, but did not revise existing content - */ - APPENDED, - /** - * The composition or document has been modified subsequent to being released as "final", and is complete and verified by an authorized person + * The composition content or the referenced resources have been modified (edited or added to) subsequent to being released as "final" and the composition is complete and verified by an authorized person */ AMENDED, /** @@ -78,8 +74,6 @@ public class Composition extends DomainResource { return PRELIMINARY; if ("final".equals(codeString)) return FINAL; - if ("appended".equals(codeString)) - return APPENDED; if ("amended".equals(codeString)) return AMENDED; if ("entered-in-error".equals(codeString)) @@ -90,7 +84,6 @@ public class Composition extends DomainResource { switch (this) { case PRELIMINARY: return "preliminary"; case FINAL: return "final"; - case APPENDED: return "appended"; case AMENDED: return "amended"; case ENTEREDINERROR: return "entered-in-error"; default: return "?"; @@ -100,7 +93,6 @@ public class Composition extends DomainResource { switch (this) { case PRELIMINARY: return "http://hl7.org/fhir/composition-status"; case FINAL: return "http://hl7.org/fhir/composition-status"; - case APPENDED: return "http://hl7.org/fhir/composition-status"; case AMENDED: return "http://hl7.org/fhir/composition-status"; case ENTEREDINERROR: return "http://hl7.org/fhir/composition-status"; default: return "?"; @@ -110,8 +102,7 @@ public class Composition extends DomainResource { switch (this) { case PRELIMINARY: return "This is a preliminary composition or document (also known as initial or interim). The content may be incomplete or unverified"; case FINAL: return "This version of the composition is complete and verified by an appropriate person and no further work is planned. Any subsequent updates would be on a new version of the composition."; - case APPENDED: return "The composition or document has been modified subsequent to being released as 'final', and is complete and verified by an authorized person. The modifications added new information to the composition or document, but did not revise existing content"; - case AMENDED: return "The composition or document has been modified subsequent to being released as 'final', and is complete and verified by an authorized person"; + case AMENDED: return "The composition content or the referenced resources have been modified (edited or added to) subsequent to being released as 'final' and the composition is complete and verified by an authorized person"; case ENTEREDINERROR: return "The composition or document was originally created/issued in error, and this is an amendment that marks that the entire series should not be considered as valid"; default: return "?"; } @@ -120,7 +111,6 @@ public class Composition extends DomainResource { switch (this) { case PRELIMINARY: return "Preliminary"; case FINAL: return "Final"; - case APPENDED: return "Appended ap Appended"; case AMENDED: return "Amended"; case ENTEREDINERROR: return "Entered in Error"; default: return "?"; @@ -137,8 +127,6 @@ public class Composition extends DomainResource { return CompositionStatus.PRELIMINARY; if ("final".equals(codeString)) return CompositionStatus.FINAL; - if ("appended".equals(codeString)) - return CompositionStatus.APPENDED; if ("amended".equals(codeString)) return CompositionStatus.AMENDED; if ("entered-in-error".equals(codeString)) @@ -150,8 +138,6 @@ public class Composition extends DomainResource { return "preliminary"; if (code == CompositionStatus.FINAL) return "final"; - if (code == CompositionStatus.APPENDED) - return "appended"; if (code == CompositionStatus.AMENDED) return "amended"; if (code == CompositionStatus.ENTEREDINERROR) @@ -504,13 +490,13 @@ public class Composition extends DomainResource { protected Period period; /** - * Full details for the event(s) the composition/documentation consents. + * The description and/or reference of the event(s) being documented. For example, this could be used to document such a colonoscopy or an appendectomy. */ @Child(name = "detail", type = {}, order=3, min=0, max=Child.MAX_UNLIMITED) - @Description(shortDefinition="Full details for the event(s) the composition consents", formalDefinition="Full details for the event(s) the composition/documentation consents." ) + @Description(shortDefinition="The event(s) being documented", formalDefinition="The description and/or reference of the event(s) being documented. For example, this could be used to document such a colonoscopy or an appendectomy." ) protected List detail; /** - * The actual objects that are the target of the reference (Full details for the event(s) the composition/documentation consents.) + * The actual objects that are the target of the reference (The description and/or reference of the event(s) being documented. For example, this could be used to document such a colonoscopy or an appendectomy.) */ protected List detailTarget; @@ -589,7 +575,7 @@ public class Composition extends DomainResource { } /** - * @return {@link #detail} (Full details for the event(s) the composition/documentation consents.) + * @return {@link #detail} (The description and/or reference of the event(s) being documented. For example, this could be used to document such a colonoscopy or an appendectomy.) */ public List getDetail() { if (this.detail == null) @@ -607,7 +593,7 @@ public class Composition extends DomainResource { } /** - * @return {@link #detail} (Full details for the event(s) the composition/documentation consents.) + * @return {@link #detail} (The description and/or reference of the event(s) being documented. For example, this could be used to document such a colonoscopy or an appendectomy.) */ // syntactic sugar public Reference addDetail() { //3 @@ -629,7 +615,7 @@ public class Composition extends DomainResource { } /** - * @return {@link #detail} (The actual objects that are the target of the reference. The reference library doesn't populate this, but you can use this to hold the resources if you resolvethemt. Full details for the event(s) the composition/documentation consents.) + * @return {@link #detail} (The actual objects that are the target of the reference. The reference library doesn't populate this, but you can use this to hold the resources if you resolvethemt. The description and/or reference of the event(s) being documented. For example, this could be used to document such a colonoscopy or an appendectomy.) */ public List getDetailTarget() { if (this.detailTarget == null) @@ -641,7 +627,7 @@ public class Composition extends DomainResource { super.listChildren(childrenList); childrenList.add(new Property("code", "CodeableConcept", "This list of codes represents the main clinical acts, such as a colonoscopy or an appendectomy, being documented. In some cases, the event is inherent in the typeCode, such as a 'History and Physical Report' in which the procedure being documented is necessarily a 'History and Physical' act.", 0, java.lang.Integer.MAX_VALUE, code)); childrenList.add(new Property("period", "Period", "The period of time covered by the documentation. There is no assertion that the documentation is a complete representation for this period, only that it documents events during this time.", 0, java.lang.Integer.MAX_VALUE, period)); - childrenList.add(new Property("detail", "Reference(Any)", "Full details for the event(s) the composition/documentation consents.", 0, java.lang.Integer.MAX_VALUE, detail)); + childrenList.add(new Property("detail", "Reference(Any)", "The description and/or reference of the event(s) being documented. For example, this could be used to document such a colonoscopy or an appendectomy.", 0, java.lang.Integer.MAX_VALUE, detail)); } public CompositionEventComponent copy() { @@ -1140,7 +1126,7 @@ public class Composition extends DomainResource { /** * Official human-readable label for the composition. */ - @Child(name = "title", type = {StringType.class}, order=4, min=0, max=1) + @Child(name = "title", type = {StringType.class}, order=4, min=1, max=1) @Description(shortDefinition="Human Readable name/title", formalDefinition="Official human-readable label for the composition." ) protected StringType title; @@ -1148,7 +1134,7 @@ public class Composition extends DomainResource { * The workflow/clinical status of this composition. The status is a marker for the clinical standing of the document. */ @Child(name = "status", type = {CodeType.class}, order=5, min=1, max=1) - @Description(shortDefinition="preliminary | final | appended | amended | entered-in-error", formalDefinition="The workflow/clinical status of this composition. The status is a marker for the clinical standing of the document." ) + @Description(shortDefinition="preliminary | final | amended | entered-in-error", formalDefinition="The workflow/clinical status of this composition. The status is a marker for the clinical standing of the document." ) protected Enumeration status; /** @@ -1239,10 +1225,11 @@ public class Composition extends DomainResource { /* * Constructor */ - public Composition(DateTimeType date, CodeableConcept type, Enumeration status, Reference subject) { + public Composition(DateTimeType date, CodeableConcept type, StringType title, Enumeration status, Reference subject) { super(); this.date = date; this.type = type; + this.title = title; this.status = status; this.subject = subject; } @@ -1403,13 +1390,9 @@ public class Composition extends DomainResource { * @param value Official human-readable label for the composition. */ public Composition setTitle(String value) { - if (Utilities.noString(value)) - this.title = null; - else { if (this.title == null) this.title = new StringType(); this.title.setValue(value); - } return this; } @@ -1931,7 +1914,7 @@ public class Composition extends DomainResource { public static final String SP_CONTEXT = "context"; @SearchParamDefinition(name="class", path="Composition.class", description="Categorization of Composition", type="token" ) public static final String SP_CLASS = "class"; - @SearchParamDefinition(name="status", path="Composition.status", description="preliminary | final | appended | amended | entered-in-error", type="token" ) + @SearchParamDefinition(name="status", path="Composition.status", description="preliminary | final | amended | entered-in-error", type="token" ) public static final String SP_STATUS = "status"; } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ConceptMap.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ConceptMap.java index 31f2a28dd65..657102df9d7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ConceptMap.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ConceptMap.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Condition.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Condition.java index f8500af0daf..36c11b3e58c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Condition.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Condition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Conformance.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Conformance.java index eb52a3df983..d9d6d420863 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Conformance.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Conformance.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Constants.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Constants.java index 73221dd6ca0..d8c659d3a77 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Constants.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Constants.java @@ -29,12 +29,12 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public class Constants { public final static String VERSION = "0.5.0"; - public final static String REVISION = "6166"; - public final static String DATE = "Fri Aug 07 07:14:05 EDT 2015"; + public final static String REVISION = "6313"; + public final static String DATE = "Thu Aug 13 16:43:28 EDT 2015"; } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ContactPoint.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ContactPoint.java index 86444ba93e6..146f14bd2e7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ContactPoint.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ContactPoint.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contract.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contract.java index c678382c6e0..aa503cf54f3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contract.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contract.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; @@ -235,9 +235,9 @@ public class Contract extends DomainResource { /** * Specifies the units by which the Contract Valued Item is measured or counted, and quantifies the countable or measurable Contract Valued Item instances. */ - @Child(name = "quantity", type = {Quantity.class}, order=4, min=0, max=1) + @Child(name = "quantity", type = {SimpleQuantity.class}, order=4, min=0, max=1) @Description(shortDefinition="Count of Contract Valued Items", formalDefinition="Specifies the units by which the Contract Valued Item is measured or counted, and quantifies the countable or measurable Contract Valued Item instances." ) - protected Quantity quantity; + protected SimpleQuantity quantity; /** * A Contract Valued Item unit valuation measure. @@ -267,7 +267,7 @@ public class Contract extends DomainResource { @Description(shortDefinition="Total Contract Valued Item Value", formalDefinition="Expresses the product of the Contract Valued Item unitQuantity and the unitPriceAmt. For example, the formula: unit Quantity * unit Price (Cost per Point) * factor Number * points = net Amount. Quantity, factor and points are assumed to be 1 if not supplied." ) protected Money net; - private static final long serialVersionUID = 1311183770L; + private static final long serialVersionUID = 1782449516L; /* * Constructor @@ -397,12 +397,12 @@ public class Contract extends DomainResource { /** * @return {@link #quantity} (Specifies the units by which the Contract Valued Item is measured or counted, and quantifies the countable or measurable Contract Valued Item instances.) */ - public Quantity getQuantity() { + public SimpleQuantity getQuantity() { if (this.quantity == null) if (Configuration.errorOnAutoCreate()) throw new Error("Attempt to auto-create ValuedItemComponent.quantity"); else if (Configuration.doAutoCreate()) - this.quantity = new Quantity(); // cc + this.quantity = new SimpleQuantity(); // cc return this.quantity; } @@ -413,7 +413,7 @@ public class Contract extends DomainResource { /** * @param value {@link #quantity} (Specifies the units by which the Contract Valued Item is measured or counted, and quantifies the countable or measurable Contract Valued Item instances.) */ - public ValuedItemComponent setQuantity(Quantity value) { + public ValuedItemComponent setQuantity(SimpleQuantity value) { this.quantity = value; return this; } @@ -569,7 +569,7 @@ public class Contract extends DomainResource { childrenList.add(new Property("entity[x]", "CodeableConcept|Reference(Any)", "Specific type of Contract Valued Item that may be priced.", 0, java.lang.Integer.MAX_VALUE, entity)); childrenList.add(new Property("identifier", "Identifier", "Identifies a Contract Valued Item instance.", 0, java.lang.Integer.MAX_VALUE, identifier)); childrenList.add(new Property("effectiveTime", "dateTime", "Indicates the time during which this Contract ValuedItem information is effective.", 0, java.lang.Integer.MAX_VALUE, effectiveTime)); - childrenList.add(new Property("quantity", "Quantity", "Specifies the units by which the Contract Valued Item is measured or counted, and quantifies the countable or measurable Contract Valued Item instances.", 0, java.lang.Integer.MAX_VALUE, quantity)); + childrenList.add(new Property("quantity", "SimpleQuantity", "Specifies the units by which the Contract Valued Item is measured or counted, and quantifies the countable or measurable Contract Valued Item instances.", 0, java.lang.Integer.MAX_VALUE, quantity)); childrenList.add(new Property("unitPrice", "Money", "A Contract Valued Item unit valuation measure.", 0, java.lang.Integer.MAX_VALUE, unitPrice)); childrenList.add(new Property("factor", "decimal", "A real number that represents a multiplier used in determining the overall value of the Contract Valued Item delivered. The concept of a Factor allows for a discount or surcharge multiplier to be applied to a monetary amount.", 0, java.lang.Integer.MAX_VALUE, factor)); childrenList.add(new Property("points", "decimal", "An amount that expresses the weighting (based on difficulty, cost and/or resource intensiveness) associated with the Contract Valued Item delivered. The concept of Points allows for assignment of point values for a Contract Valued Item, such that a monetary amount can be assigned to each point.", 0, java.lang.Integer.MAX_VALUE, points)); @@ -1630,9 +1630,9 @@ public class Contract extends DomainResource { /** * Specifies the units by which the Contract Provision Valued Item is measured or counted, and quantifies the countable or measurable Contract Term Valued Item instances. */ - @Child(name = "quantity", type = {Quantity.class}, order=4, min=0, max=1) + @Child(name = "quantity", type = {SimpleQuantity.class}, order=4, min=0, max=1) @Description(shortDefinition="Contract Term Valued Item Count", formalDefinition="Specifies the units by which the Contract Provision Valued Item is measured or counted, and quantifies the countable or measurable Contract Term Valued Item instances." ) - protected Quantity quantity; + protected SimpleQuantity quantity; /** * A Contract Provision Valued Item unit valuation measure. @@ -1662,7 +1662,7 @@ public class Contract extends DomainResource { @Description(shortDefinition="Total Contract Term Valued Item Value", formalDefinition="Expresses the product of the Contract Provision Valued Item unitQuantity and the unitPriceAmt. For example, the formula: unit Quantity * unit Price (Cost per Point) * factor Number * points = net Amount. Quantity, factor and points are assumed to be 1 if not supplied." ) protected Money net; - private static final long serialVersionUID = 1311183770L; + private static final long serialVersionUID = 1782449516L; /* * Constructor @@ -1792,12 +1792,12 @@ public class Contract extends DomainResource { /** * @return {@link #quantity} (Specifies the units by which the Contract Provision Valued Item is measured or counted, and quantifies the countable or measurable Contract Term Valued Item instances.) */ - public Quantity getQuantity() { + public SimpleQuantity getQuantity() { if (this.quantity == null) if (Configuration.errorOnAutoCreate()) throw new Error("Attempt to auto-create TermValuedItemComponent.quantity"); else if (Configuration.doAutoCreate()) - this.quantity = new Quantity(); // cc + this.quantity = new SimpleQuantity(); // cc return this.quantity; } @@ -1808,7 +1808,7 @@ public class Contract extends DomainResource { /** * @param value {@link #quantity} (Specifies the units by which the Contract Provision Valued Item is measured or counted, and quantifies the countable or measurable Contract Term Valued Item instances.) */ - public TermValuedItemComponent setQuantity(Quantity value) { + public TermValuedItemComponent setQuantity(SimpleQuantity value) { this.quantity = value; return this; } @@ -1964,7 +1964,7 @@ public class Contract extends DomainResource { childrenList.add(new Property("entity[x]", "CodeableConcept|Reference(Any)", "Specific type of Contract Provision Valued Item that may be priced.", 0, java.lang.Integer.MAX_VALUE, entity)); childrenList.add(new Property("identifier", "Identifier", "Identifies a Contract Provision Valued Item instance.", 0, java.lang.Integer.MAX_VALUE, identifier)); childrenList.add(new Property("effectiveTime", "dateTime", "Indicates the time during which this Contract Term ValuedItem information is effective.", 0, java.lang.Integer.MAX_VALUE, effectiveTime)); - childrenList.add(new Property("quantity", "Quantity", "Specifies the units by which the Contract Provision Valued Item is measured or counted, and quantifies the countable or measurable Contract Term Valued Item instances.", 0, java.lang.Integer.MAX_VALUE, quantity)); + childrenList.add(new Property("quantity", "SimpleQuantity", "Specifies the units by which the Contract Provision Valued Item is measured or counted, and quantifies the countable or measurable Contract Term Valued Item instances.", 0, java.lang.Integer.MAX_VALUE, quantity)); childrenList.add(new Property("unitPrice", "Money", "A Contract Provision Valued Item unit valuation measure.", 0, java.lang.Integer.MAX_VALUE, unitPrice)); childrenList.add(new Property("factor", "decimal", "A real number that represents a multiplier used in determining the overall value of the Contract Provision Valued Item delivered. The concept of a Factor allows for a discount or surcharge multiplier to be applied to a monetary amount.", 0, java.lang.Integer.MAX_VALUE, factor)); childrenList.add(new Property("points", "decimal", "An amount that expresses the weighting (based on difficulty, cost and/or resource intensiveness) associated with the Contract Provision Valued Item delivered. The concept of Points allows for assignment of point values for a Contract ProvisionValued Item, such that a monetary amount can be assigned to each point.", 0, java.lang.Integer.MAX_VALUE, points)); diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contraindication.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contraindication.java index c0d4ed689fc..e3c95ea22e2 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contraindication.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contraindication.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Count.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Count.java index c0190cb0082..3ecf9461947 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Count.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Count.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.annotations.DatatypeDef; import org.hl7.fhir.instance.model.annotations.Block; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coverage.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coverage.java index a4c63b09b78..03e3adacf7c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coverage.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coverage.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DataElement.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DataElement.java index c41b0d49118..8134066ebe9 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DataElement.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DataElement.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Device.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Device.java index d70b569632d..f6ce61a5a4d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Device.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Device.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; @@ -222,14 +222,14 @@ public class Device extends DomainResource { protected Organization ownerTarget; /** - * The resource may be found in a literal location (i.e. GPS coordinates), a logical place (i.e. "in/with the patient"), or a coded location. + * The place where the device can be found. */ @Child(name = "location", type = {Location.class}, order=12, min=0, max=1) - @Description(shortDefinition="Where the resource is found", formalDefinition="The resource may be found in a literal location (i.e. GPS coordinates), a logical place (i.e. 'in/with the patient'), or a coded location." ) + @Description(shortDefinition="Where the resource is found", formalDefinition="The place where the device can be found." ) protected Reference location; /** - * The actual object that is the target of the reference (The resource may be found in a literal location (i.e. GPS coordinates), a logical place (i.e. "in/with the patient"), or a coded location.) + * The actual object that is the target of the reference (The place where the device can be found.) */ protected Location locationTarget; @@ -817,7 +817,7 @@ public class Device extends DomainResource { } /** - * @return {@link #location} (The resource may be found in a literal location (i.e. GPS coordinates), a logical place (i.e. "in/with the patient"), or a coded location.) + * @return {@link #location} (The place where the device can be found.) */ public Reference getLocation() { if (this.location == null) @@ -833,7 +833,7 @@ public class Device extends DomainResource { } /** - * @param value {@link #location} (The resource may be found in a literal location (i.e. GPS coordinates), a logical place (i.e. "in/with the patient"), or a coded location.) + * @param value {@link #location} (The place where the device can be found.) */ public Device setLocation(Reference value) { this.location = value; @@ -841,7 +841,7 @@ public class Device extends DomainResource { } /** - * @return {@link #location} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (The resource may be found in a literal location (i.e. GPS coordinates), a logical place (i.e. "in/with the patient"), or a coded location.) + * @return {@link #location} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (The place where the device can be found.) */ public Location getLocationTarget() { if (this.locationTarget == null) @@ -853,7 +853,7 @@ public class Device extends DomainResource { } /** - * @param value {@link #location} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (The resource may be found in a literal location (i.e. GPS coordinates), a logical place (i.e. "in/with the patient"), or a coded location.) + * @param value {@link #location} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (The place where the device can be found.) */ public Device setLocationTarget(Location value) { this.locationTarget = value; @@ -1007,7 +1007,7 @@ public class Device extends DomainResource { childrenList.add(new Property("udi", "string", "United States Food and Drug Administration mandated Unique Device Identifier (UDI). Use the human readable information (the content that the user sees, which is sometimes different to the exact syntax represented in the barcode) - see http://www.fda.gov/MedicalDevices/DeviceRegulationandGuidance/UniqueDeviceIdentification/default.htm.", 0, java.lang.Integer.MAX_VALUE, udi)); childrenList.add(new Property("lotNumber", "string", "Lot number assigned by the manufacturer.", 0, java.lang.Integer.MAX_VALUE, lotNumber)); childrenList.add(new Property("owner", "Reference(Organization)", "An organization that is responsible for the provision and ongoing maintenance of the device.", 0, java.lang.Integer.MAX_VALUE, owner)); - childrenList.add(new Property("location", "Reference(Location)", "The resource may be found in a literal location (i.e. GPS coordinates), a logical place (i.e. 'in/with the patient'), or a coded location.", 0, java.lang.Integer.MAX_VALUE, location)); + childrenList.add(new Property("location", "Reference(Location)", "The place where the device can be found.", 0, java.lang.Integer.MAX_VALUE, location)); childrenList.add(new Property("patient", "Reference(Patient)", "Patient information, if the resource is affixed to a person.", 0, java.lang.Integer.MAX_VALUE, patient)); childrenList.add(new Property("contact", "ContactPoint", "Contact details for an organization or a particular human that is responsible for the device.", 0, java.lang.Integer.MAX_VALUE, contact)); childrenList.add(new Property("url", "uri", "A network address on which the device may be contacted directly.", 0, java.lang.Integer.MAX_VALUE, url)); diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceComponent.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceComponent.java index f290e16b344..812d9990083 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceComponent.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceComponent.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceMetric.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceMetric.java index 583f99b51cd..0fcbdca4dbf 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceMetric.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceMetric.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseRequest.java index 131ee721d6c..097982cf200 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseRequest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseStatement.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseStatement.java index 4710dcd4754..751412ad10d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseStatement.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseStatement.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticOrder.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticOrder.java index bc88cf28cce..f1e7ad2410e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticOrder.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticOrder.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticReport.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticReport.java index 2464eaab533..284cd1db787 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticReport.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticReport.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; @@ -439,15 +439,15 @@ public class DiagnosticReport extends DomainResource { protected Resource performerTarget; /** - * Details concerning a test requested. + * Details concerning a test or procedure requested. */ - @Child(name = "requestDetail", type = {DiagnosticOrder.class}, order=9, min=0, max=Child.MAX_UNLIMITED) - @Description(shortDefinition="What was requested", formalDefinition="Details concerning a test requested." ) - protected List requestDetail; + @Child(name = "request", type = {DiagnosticOrder.class, ProcedureRequest.class, ReferralRequest.class}, order=9, min=0, max=Child.MAX_UNLIMITED) + @Description(shortDefinition="What was requested", formalDefinition="Details concerning a test or procedure requested." ) + protected List request; /** - * The actual objects that are the target of the reference (Details concerning a test requested.) + * The actual objects that are the target of the reference (Details concerning a test or procedure requested.) */ - protected List requestDetailTarget; + protected List requestTarget; /** @@ -514,7 +514,7 @@ public class DiagnosticReport extends DomainResource { @Description(shortDefinition="Entire Report as issued", formalDefinition="Rich text representation of the entire result as issued by the diagnostic service. Multiple formats are allowed but they SHALL be semantically equivalent." ) protected List presentedForm; - private static final long serialVersionUID = 488621746L; + private static final long serialVersionUID = 920334551L; /* * Constructor @@ -882,64 +882,52 @@ public class DiagnosticReport extends DomainResource { } /** - * @return {@link #requestDetail} (Details concerning a test requested.) + * @return {@link #request} (Details concerning a test or procedure requested.) */ - public List getRequestDetail() { - if (this.requestDetail == null) - this.requestDetail = new ArrayList(); - return this.requestDetail; + public List getRequest() { + if (this.request == null) + this.request = new ArrayList(); + return this.request; } - public boolean hasRequestDetail() { - if (this.requestDetail == null) + public boolean hasRequest() { + if (this.request == null) return false; - for (Reference item : this.requestDetail) + for (Reference item : this.request) if (!item.isEmpty()) return true; return false; } /** - * @return {@link #requestDetail} (Details concerning a test requested.) + * @return {@link #request} (Details concerning a test or procedure requested.) */ // syntactic sugar - public Reference addRequestDetail() { //3 + public Reference addRequest() { //3 Reference t = new Reference(); - if (this.requestDetail == null) - this.requestDetail = new ArrayList(); - this.requestDetail.add(t); + if (this.request == null) + this.request = new ArrayList(); + this.request.add(t); return t; } // syntactic sugar - public DiagnosticReport addRequestDetail(Reference t) { //3 + public DiagnosticReport addRequest(Reference t) { //3 if (t == null) return this; - if (this.requestDetail == null) - this.requestDetail = new ArrayList(); - this.requestDetail.add(t); + if (this.request == null) + this.request = new ArrayList(); + this.request.add(t); return this; } /** - * @return {@link #requestDetail} (The actual objects that are the target of the reference. The reference library doesn't populate this, but you can use this to hold the resources if you resolvethemt. Details concerning a test requested.) + * @return {@link #request} (The actual objects that are the target of the reference. The reference library doesn't populate this, but you can use this to hold the resources if you resolvethemt. Details concerning a test or procedure requested.) */ - public List getRequestDetailTarget() { - if (this.requestDetailTarget == null) - this.requestDetailTarget = new ArrayList(); - return this.requestDetailTarget; - } - - // syntactic sugar - /** - * @return {@link #requestDetail} (Add an actual object that is the target of the reference. The reference library doesn't use these, but you can use this to hold the resources if you resolvethemt. Details concerning a test requested.) - */ - public DiagnosticOrder addRequestDetailTarget() { - DiagnosticOrder r = new DiagnosticOrder(); - if (this.requestDetailTarget == null) - this.requestDetailTarget = new ArrayList(); - this.requestDetailTarget.add(r); - return r; + public List getRequestTarget() { + if (this.requestTarget == null) + this.requestTarget = new ArrayList(); + return this.requestTarget; } /** @@ -1293,7 +1281,7 @@ public class DiagnosticReport extends DomainResource { childrenList.add(new Property("effective[x]", "dateTime|Period", "The time or time-period the observed values are related to. When the subject of the report is a patient, this is usually either the time of the procedure or of specimen collection(s), but very often the source of the date/time is not known, only the date/time itself.", 0, java.lang.Integer.MAX_VALUE, effective)); childrenList.add(new Property("issued", "instant", "The date and time that this version of the report was released from the source diagnostic service.", 0, java.lang.Integer.MAX_VALUE, issued)); childrenList.add(new Property("performer", "Reference(Practitioner|Organization)", "The diagnostic service that is responsible for issuing the report.", 0, java.lang.Integer.MAX_VALUE, performer)); - childrenList.add(new Property("requestDetail", "Reference(DiagnosticOrder)", "Details concerning a test requested.", 0, java.lang.Integer.MAX_VALUE, requestDetail)); + childrenList.add(new Property("request", "Reference(DiagnosticOrder|ProcedureRequest|ReferralRequest)", "Details concerning a test or procedure requested.", 0, java.lang.Integer.MAX_VALUE, request)); childrenList.add(new Property("specimen", "Reference(Specimen)", "Details about the specimens on which this diagnostic report is based.", 0, java.lang.Integer.MAX_VALUE, specimen)); childrenList.add(new Property("result", "Reference(Observation)", "Observations that are part of this diagnostic report. Observations can be simple name/value pairs (e.g. 'atomic' results), or they can be grouping observations that include references to other members of the group (e.g. 'panels').", 0, java.lang.Integer.MAX_VALUE, result)); childrenList.add(new Property("imagingStudy", "Reference(ImagingStudy|ImagingObjectSelection)", "One or more links to full details of any imaging performed during the diagnostic investigation. Typically, this is imaging performed by DICOM enabled modalities, but this is not required. A fully enabled PACS viewer can use this information to provide views of the source images.", 0, java.lang.Integer.MAX_VALUE, imagingStudy)); @@ -1319,10 +1307,10 @@ public class DiagnosticReport extends DomainResource { dst.effective = effective == null ? null : effective.copy(); dst.issued = issued == null ? null : issued.copy(); dst.performer = performer == null ? null : performer.copy(); - if (requestDetail != null) { - dst.requestDetail = new ArrayList(); - for (Reference i : requestDetail) - dst.requestDetail.add(i.copy()); + if (request != null) { + dst.request = new ArrayList(); + for (Reference i : request) + dst.request.add(i.copy()); }; if (specimen != null) { dst.specimen = new ArrayList(); @@ -1372,10 +1360,10 @@ public class DiagnosticReport extends DomainResource { return compareDeep(identifier, o.identifier, true) && compareDeep(status, o.status, true) && compareDeep(category, o.category, true) && compareDeep(code, o.code, true) && compareDeep(subject, o.subject, true) && compareDeep(encounter, o.encounter, true) && compareDeep(effective, o.effective, true) && compareDeep(issued, o.issued, true) && compareDeep(performer, o.performer, true) - && compareDeep(requestDetail, o.requestDetail, true) && compareDeep(specimen, o.specimen, true) - && compareDeep(result, o.result, true) && compareDeep(imagingStudy, o.imagingStudy, true) && compareDeep(image, o.image, true) - && compareDeep(conclusion, o.conclusion, true) && compareDeep(codedDiagnosis, o.codedDiagnosis, true) - && compareDeep(presentedForm, o.presentedForm, true); + && compareDeep(request, o.request, true) && compareDeep(specimen, o.specimen, true) && compareDeep(result, o.result, true) + && compareDeep(imagingStudy, o.imagingStudy, true) && compareDeep(image, o.image, true) && compareDeep(conclusion, o.conclusion, true) + && compareDeep(codedDiagnosis, o.codedDiagnosis, true) && compareDeep(presentedForm, o.presentedForm, true) + ; } @Override @@ -1393,7 +1381,7 @@ public class DiagnosticReport extends DomainResource { return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (status == null || status.isEmpty()) && (category == null || category.isEmpty()) && (code == null || code.isEmpty()) && (subject == null || subject.isEmpty()) && (encounter == null || encounter.isEmpty()) && (effective == null || effective.isEmpty()) - && (issued == null || issued.isEmpty()) && (performer == null || performer.isEmpty()) && (requestDetail == null || requestDetail.isEmpty()) + && (issued == null || issued.isEmpty()) && (performer == null || performer.isEmpty()) && (request == null || request.isEmpty()) && (specimen == null || specimen.isEmpty()) && (result == null || result.isEmpty()) && (imagingStudy == null || imagingStudy.isEmpty()) && (image == null || image.isEmpty()) && (conclusion == null || conclusion.isEmpty()) && (codedDiagnosis == null || codedDiagnosis.isEmpty()) && (presentedForm == null || presentedForm.isEmpty()); @@ -1408,9 +1396,9 @@ public class DiagnosticReport extends DomainResource { public static final String SP_DATE = "date"; @SearchParamDefinition(name="identifier", path="DiagnosticReport.identifier", description="An identifier for the report", type="token" ) public static final String SP_IDENTIFIER = "identifier"; - @SearchParamDefinition(name="image", path="DiagnosticReport.image.link", description="Reference to the image source", type="reference" ) + @SearchParamDefinition(name="image", path="DiagnosticReport.image.link", description="A reference to the image source.", type="reference" ) public static final String SP_IMAGE = "image"; - @SearchParamDefinition(name="request", path="DiagnosticReport.requestDetail", description="What was requested", type="reference" ) + @SearchParamDefinition(name="request", path="DiagnosticReport.request", description="Reference to the test or procedure request.", type="reference" ) public static final String SP_REQUEST = "request"; @SearchParamDefinition(name="performer", path="DiagnosticReport.performer", description="Who was the source of the report (organization)", type="reference" ) public static final String SP_PERFORMER = "performer"; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Distance.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Distance.java index 8389bacceaf..fc445d96eac 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Distance.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Distance.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.annotations.DatatypeDef; import org.hl7.fhir.instance.model.annotations.Block; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentManifest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentManifest.java index 34aa9ee27f1..496a1ea372c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentManifest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentManifest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; @@ -50,10 +50,10 @@ public class DocumentManifest extends DomainResource { @Block() public static class DocumentManifestContentComponent extends BackboneElement implements IBaseBackboneElement { /** - * The list of DocumentReference or Media Resources, or Attachment that consist of the parts of this document manifest. Usually, these would be document references, but direct references to Media or Attachments are also allowed. + * The list of references to document content, or Attachment that consist of the parts of this document manifest. Usually, these would be document references, but direct references to Media or Attachments are also allowed. */ - @Child(name = "p", type = {Attachment.class, DocumentReference.class, Media.class}, order=1, min=1, max=1) - @Description(shortDefinition="Contents of this set of documents", formalDefinition="The list of DocumentReference or Media Resources, or Attachment that consist of the parts of this document manifest. Usually, these would be document references, but direct references to Media or Attachments are also allowed." ) + @Child(name = "p", type = {Attachment.class}, order=1, min=1, max=1) + @Description(shortDefinition="Contents of this set of documents", formalDefinition="The list of references to document content, or Attachment that consist of the parts of this document manifest. Usually, these would be document references, but direct references to Media or Attachments are also allowed." ) protected Type p; private static final long serialVersionUID = -347538500L; @@ -74,14 +74,14 @@ public class DocumentManifest extends DomainResource { } /** - * @return {@link #p} (The list of DocumentReference or Media Resources, or Attachment that consist of the parts of this document manifest. Usually, these would be document references, but direct references to Media or Attachments are also allowed.) + * @return {@link #p} (The list of references to document content, or Attachment that consist of the parts of this document manifest. Usually, these would be document references, but direct references to Media or Attachments are also allowed.) */ public Type getP() { return this.p; } /** - * @return {@link #p} (The list of DocumentReference or Media Resources, or Attachment that consist of the parts of this document manifest. Usually, these would be document references, but direct references to Media or Attachments are also allowed.) + * @return {@link #p} (The list of references to document content, or Attachment that consist of the parts of this document manifest. Usually, these would be document references, but direct references to Media or Attachments are also allowed.) */ public Attachment getPAttachment() throws Exception { if (!(this.p instanceof Attachment)) @@ -94,7 +94,7 @@ public class DocumentManifest extends DomainResource { } /** - * @return {@link #p} (The list of DocumentReference or Media Resources, or Attachment that consist of the parts of this document manifest. Usually, these would be document references, but direct references to Media or Attachments are also allowed.) + * @return {@link #p} (The list of references to document content, or Attachment that consist of the parts of this document manifest. Usually, these would be document references, but direct references to Media or Attachments are also allowed.) */ public Reference getPReference() throws Exception { if (!(this.p instanceof Reference)) @@ -111,7 +111,7 @@ public class DocumentManifest extends DomainResource { } /** - * @param value {@link #p} (The list of DocumentReference or Media Resources, or Attachment that consist of the parts of this document manifest. Usually, these would be document references, but direct references to Media or Attachments are also allowed.) + * @param value {@link #p} (The list of references to document content, or Attachment that consist of the parts of this document manifest. Usually, these would be document references, but direct references to Media or Attachments are also allowed.) */ public DocumentManifestContentComponent setP(Type value) { this.p = value; @@ -120,7 +120,7 @@ public class DocumentManifest extends DomainResource { protected void listChildren(List childrenList) { super.listChildren(childrenList); - childrenList.add(new Property("p[x]", "Attachment|Reference(DocumentReference|Media)", "The list of DocumentReference or Media Resources, or Attachment that consist of the parts of this document manifest. Usually, these would be document references, but direct references to Media or Attachments are also allowed.", 0, java.lang.Integer.MAX_VALUE, p)); + childrenList.add(new Property("p[x]", "Attachment|Reference(Any)", "The list of references to document content, or Attachment that consist of the parts of this document manifest. Usually, these would be document references, but direct references to Media or Attachments are also allowed.", 0, java.lang.Integer.MAX_VALUE, p)); } public DocumentManifestContentComponent copy() { @@ -319,7 +319,7 @@ public class DocumentManifest extends DomainResource { /** * A patient, practitioner, or organization for which this set of documents is intended. */ - @Child(name = "recipient", type = {Patient.class, Practitioner.class, Organization.class}, order=3, min=0, max=Child.MAX_UNLIMITED) + @Child(name = "recipient", type = {Patient.class, Practitioner.class, RelatedPerson.class, Organization.class}, order=3, min=0, max=Child.MAX_UNLIMITED) @Description(shortDefinition="Intended to get notified about this set of documents", formalDefinition="A patient, practitioner, or organization for which this set of documents is intended." ) protected List recipient; /** @@ -336,13 +336,13 @@ public class DocumentManifest extends DomainResource { protected CodeableConcept type; /** - * Identifies who is responsible for adding the information to the document. + * Identifies who is responsible for creating the manifest, and adding documents to it. */ @Child(name = "author", type = {Practitioner.class, Organization.class, Device.class, Patient.class, RelatedPerson.class}, order=5, min=0, max=Child.MAX_UNLIMITED) - @Description(shortDefinition="Who and/or what authored the document", formalDefinition="Identifies who is responsible for adding the information to the document." ) + @Description(shortDefinition="Who and/or what authored the manifest", formalDefinition="Identifies who is responsible for creating the manifest, and adding documents to it." ) protected List author; /** - * The actual objects that are the target of the reference (Identifies who is responsible for adding the information to the document.) + * The actual objects that are the target of the reference (Identifies who is responsible for creating the manifest, and adding documents to it.) */ protected List authorTarget; @@ -583,7 +583,7 @@ public class DocumentManifest extends DomainResource { } /** - * @return {@link #author} (Identifies who is responsible for adding the information to the document.) + * @return {@link #author} (Identifies who is responsible for creating the manifest, and adding documents to it.) */ public List getAuthor() { if (this.author == null) @@ -601,7 +601,7 @@ public class DocumentManifest extends DomainResource { } /** - * @return {@link #author} (Identifies who is responsible for adding the information to the document.) + * @return {@link #author} (Identifies who is responsible for creating the manifest, and adding documents to it.) */ // syntactic sugar public Reference addAuthor() { //3 @@ -623,7 +623,7 @@ public class DocumentManifest extends DomainResource { } /** - * @return {@link #author} (The actual objects that are the target of the reference. The reference library doesn't populate this, but you can use this to hold the resources if you resolvethemt. Identifies who is responsible for adding the information to the document.) + * @return {@link #author} (The actual objects that are the target of the reference. The reference library doesn't populate this, but you can use this to hold the resources if you resolvethemt. Identifies who is responsible for creating the manifest, and adding documents to it.) */ public List getAuthorTarget() { if (this.authorTarget == null) @@ -908,9 +908,9 @@ public class DocumentManifest extends DomainResource { childrenList.add(new Property("masterIdentifier", "Identifier", "A single identifier that uniquely identifies this manifest. Principally used to refer to the manifest in non-FHIR contexts.", 0, java.lang.Integer.MAX_VALUE, masterIdentifier)); childrenList.add(new Property("identifier", "Identifier", "Other identifiers associated with the document manifest, including version independent identifiers.", 0, java.lang.Integer.MAX_VALUE, identifier)); childrenList.add(new Property("subject", "Reference(Patient|Practitioner|Group|Device)", "Who or what the set of documents is about. The documents can be about a person, (patient or healthcare practitioner), a device (i.e. machine) or even a group of subjects (such as a document about a herd of farm animals, or a set of patients that share a common exposure). If the documents cross more than one subject, then more than one subject is allowed here (unusual use case).", 0, java.lang.Integer.MAX_VALUE, subject)); - childrenList.add(new Property("recipient", "Reference(Patient|Practitioner|Organization)", "A patient, practitioner, or organization for which this set of documents is intended.", 0, java.lang.Integer.MAX_VALUE, recipient)); + childrenList.add(new Property("recipient", "Reference(Patient|Practitioner|RelatedPerson|Organization)", "A patient, practitioner, or organization for which this set of documents is intended.", 0, java.lang.Integer.MAX_VALUE, recipient)); childrenList.add(new Property("type", "CodeableConcept", "Specifies the kind of this set of documents (e.g. Patient Summary, Discharge Summary, Prescription, etc.). The type of a set of documents may be the same as one of the documents in it - especially if there is only one - but it may be wider.", 0, java.lang.Integer.MAX_VALUE, type)); - childrenList.add(new Property("author", "Reference(Practitioner|Organization|Device|Patient|RelatedPerson)", "Identifies who is responsible for adding the information to the document.", 0, java.lang.Integer.MAX_VALUE, author)); + childrenList.add(new Property("author", "Reference(Practitioner|Organization|Device|Patient|RelatedPerson)", "Identifies who is responsible for creating the manifest, and adding documents to it.", 0, java.lang.Integer.MAX_VALUE, author)); childrenList.add(new Property("created", "dateTime", "When the document manifest was created for submission to the server (not necessarily the same thing as the actual resource last modified time, since it may be modified, replicated etc).", 0, java.lang.Integer.MAX_VALUE, created)); childrenList.add(new Property("source", "uri", "Identifies the source system, application, or software that produced the document manifest.", 0, java.lang.Integer.MAX_VALUE, source)); childrenList.add(new Property("status", "code", "The status of this document manifest.", 0, java.lang.Integer.MAX_VALUE, status)); @@ -1003,7 +1003,7 @@ public class DocumentManifest extends DomainResource { public static final String SP_IDENTIFIER = "identifier"; @SearchParamDefinition(name="subject", path="DocumentManifest.subject", description="The subject of the set of documents", type="reference" ) public static final String SP_SUBJECT = "subject"; - @SearchParamDefinition(name="author", path="DocumentManifest.author", description="Who and/or what authored the document", type="reference" ) + @SearchParamDefinition(name="author", path="DocumentManifest.author", description="Who and/or what authored the manifest", type="reference" ) public static final String SP_AUTHOR = "author"; @SearchParamDefinition(name="created", path="DocumentManifest.created", description="When this document manifest created", type="date" ) public static final String SP_CREATED = "created"; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentReference.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentReference.java index c9508468158..4d7107d0244 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentReference.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentReference.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; @@ -318,38 +318,50 @@ public class DocumentReference extends DomainResource { @Block() public static class DocumentReferenceContextComponent extends BackboneElement implements IBaseBackboneElement { + /** + * Describes the clinical encounter or type of care that the document content is associated with. + */ + @Child(name = "encounter", type = {Encounter.class}, order=1, min=0, max=1) + @Description(shortDefinition="Context of the document content", formalDefinition="Describes the clinical encounter or type of care that the document content is associated with." ) + protected Reference encounter; + + /** + * The actual object that is the target of the reference (Describes the clinical encounter or type of care that the document content is associated with.) + */ + protected Encounter encounterTarget; + /** * This list of codes represents the main clinical acts, such as a colonoscopy or an appendectomy, being documented. In some cases, the event is inherent in the typeCode, such as a "History and Physical Report" in which the procedure being documented is necessarily a "History and Physical" act. */ - @Child(name = "event", type = {CodeableConcept.class}, order=1, min=0, max=Child.MAX_UNLIMITED) + @Child(name = "event", type = {CodeableConcept.class}, order=2, min=0, max=Child.MAX_UNLIMITED) @Description(shortDefinition="Main Clinical Acts Documented", formalDefinition="This list of codes represents the main clinical acts, such as a colonoscopy or an appendectomy, being documented. In some cases, the event is inherent in the typeCode, such as a 'History and Physical Report' in which the procedure being documented is necessarily a 'History and Physical' act." ) protected List event; /** * The time period over which the service that is described by the document was provided. */ - @Child(name = "period", type = {Period.class}, order=2, min=0, max=1) + @Child(name = "period", type = {Period.class}, order=3, min=0, max=1) @Description(shortDefinition="Time of service that is being documented", formalDefinition="The time period over which the service that is described by the document was provided." ) protected Period period; /** * The kind of facility where the patient was seen. */ - @Child(name = "facilityType", type = {CodeableConcept.class}, order=3, min=0, max=1) + @Child(name = "facilityType", type = {CodeableConcept.class}, order=4, min=0, max=1) @Description(shortDefinition="Kind of facility where patient was seen", formalDefinition="The kind of facility where the patient was seen." ) protected CodeableConcept facilityType; /** * This property may convey specifics about the practice setting where the content was created, often reflecting the clinical specialty. */ - @Child(name = "practiceSetting", type = {CodeableConcept.class}, order=4, min=0, max=1) + @Child(name = "practiceSetting", type = {CodeableConcept.class}, order=5, min=0, max=1) @Description(shortDefinition="Additional details about where the content was created (e.g. clinical specialty)", formalDefinition="This property may convey specifics about the practice setting where the content was created, often reflecting the clinical specialty." ) protected CodeableConcept practiceSetting; /** * The Patient Information as known when the document was published. May be a reference to a version specific, or contained. */ - @Child(name = "sourcePatientInfo", type = {Patient.class}, order=5, min=0, max=1) + @Child(name = "sourcePatientInfo", type = {Patient.class}, order=6, min=0, max=1) @Description(shortDefinition="Source patient info", formalDefinition="The Patient Information as known when the document was published. May be a reference to a version specific, or contained." ) protected Reference sourcePatientInfo; @@ -361,11 +373,11 @@ public class DocumentReference extends DomainResource { /** * Related identifiers or resources associated with the DocumentReference. */ - @Child(name = "related", type = {}, order=6, min=0, max=Child.MAX_UNLIMITED) - @Description(shortDefinition="Related things", formalDefinition="Related identifiers or resources associated with the DocumentReference." ) + @Child(name = "related", type = {}, order=7, min=0, max=Child.MAX_UNLIMITED) + @Description(shortDefinition="Related identifiers or resources", formalDefinition="Related identifiers or resources associated with the DocumentReference." ) protected List related; - private static final long serialVersionUID = -225578230L; + private static final long serialVersionUID = 994799273L; /* * Constructor @@ -374,6 +386,50 @@ public class DocumentReference extends DomainResource { super(); } + /** + * @return {@link #encounter} (Describes the clinical encounter or type of care that the document content is associated with.) + */ + public Reference getEncounter() { + if (this.encounter == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create DocumentReferenceContextComponent.encounter"); + else if (Configuration.doAutoCreate()) + this.encounter = new Reference(); // cc + return this.encounter; + } + + public boolean hasEncounter() { + return this.encounter != null && !this.encounter.isEmpty(); + } + + /** + * @param value {@link #encounter} (Describes the clinical encounter or type of care that the document content is associated with.) + */ + public DocumentReferenceContextComponent setEncounter(Reference value) { + this.encounter = value; + return this; + } + + /** + * @return {@link #encounter} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (Describes the clinical encounter or type of care that the document content is associated with.) + */ + public Encounter getEncounterTarget() { + if (this.encounterTarget == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create DocumentReferenceContextComponent.encounter"); + else if (Configuration.doAutoCreate()) + this.encounterTarget = new Encounter(); // aa + return this.encounterTarget; + } + + /** + * @param value {@link #encounter} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (Describes the clinical encounter or type of care that the document content is associated with.) + */ + public DocumentReferenceContextComponent setEncounterTarget(Encounter value) { + this.encounterTarget = value; + return this; + } + /** * @return {@link #event} (This list of codes represents the main clinical acts, such as a colonoscopy or an appendectomy, being documented. In some cases, the event is inherent in the typeCode, such as a "History and Physical Report" in which the procedure being documented is necessarily a "History and Physical" act.) */ @@ -572,6 +628,7 @@ public class DocumentReference extends DomainResource { protected void listChildren(List childrenList) { super.listChildren(childrenList); + childrenList.add(new Property("encounter", "Reference(Encounter)", "Describes the clinical encounter or type of care that the document content is associated with.", 0, java.lang.Integer.MAX_VALUE, encounter)); childrenList.add(new Property("event", "CodeableConcept", "This list of codes represents the main clinical acts, such as a colonoscopy or an appendectomy, being documented. In some cases, the event is inherent in the typeCode, such as a 'History and Physical Report' in which the procedure being documented is necessarily a 'History and Physical' act.", 0, java.lang.Integer.MAX_VALUE, event)); childrenList.add(new Property("period", "Period", "The time period over which the service that is described by the document was provided.", 0, java.lang.Integer.MAX_VALUE, period)); childrenList.add(new Property("facilityType", "CodeableConcept", "The kind of facility where the patient was seen.", 0, java.lang.Integer.MAX_VALUE, facilityType)); @@ -583,6 +640,7 @@ public class DocumentReference extends DomainResource { public DocumentReferenceContextComponent copy() { DocumentReferenceContextComponent dst = new DocumentReferenceContextComponent(); copyValues(dst); + dst.encounter = encounter == null ? null : encounter.copy(); if (event != null) { dst.event = new ArrayList(); for (CodeableConcept i : event) @@ -607,9 +665,10 @@ public class DocumentReference extends DomainResource { if (!(other instanceof DocumentReferenceContextComponent)) return false; DocumentReferenceContextComponent o = (DocumentReferenceContextComponent) other; - return compareDeep(event, o.event, true) && compareDeep(period, o.period, true) && compareDeep(facilityType, o.facilityType, true) - && compareDeep(practiceSetting, o.practiceSetting, true) && compareDeep(sourcePatientInfo, o.sourcePatientInfo, true) - && compareDeep(related, o.related, true); + return compareDeep(encounter, o.encounter, true) && compareDeep(event, o.event, true) && compareDeep(period, o.period, true) + && compareDeep(facilityType, o.facilityType, true) && compareDeep(practiceSetting, o.practiceSetting, true) + && compareDeep(sourcePatientInfo, o.sourcePatientInfo, true) && compareDeep(related, o.related, true) + ; } @Override @@ -623,10 +682,10 @@ public class DocumentReference extends DomainResource { } public boolean isEmpty() { - return super.isEmpty() && (event == null || event.isEmpty()) && (period == null || period.isEmpty()) - && (facilityType == null || facilityType.isEmpty()) && (practiceSetting == null || practiceSetting.isEmpty()) - && (sourcePatientInfo == null || sourcePatientInfo.isEmpty()) && (related == null || related.isEmpty()) - ; + return super.isEmpty() && (encounter == null || encounter.isEmpty()) && (event == null || event.isEmpty()) + && (period == null || period.isEmpty()) && (facilityType == null || facilityType.isEmpty()) + && (practiceSetting == null || practiceSetting.isEmpty()) && (sourcePatientInfo == null || sourcePatientInfo.isEmpty()) + && (related == null || related.isEmpty()); } } @@ -808,14 +867,14 @@ public class DocumentReference extends DomainResource { /** * An identifier of the document encoding, structure, and template that the document conforms to beyond the base format indicated in the mimeType. */ - @Child(name = "format", type = {UriType.class}, order=5, min=0, max=Child.MAX_UNLIMITED) + @Child(name = "format", type = {Coding.class}, order=5, min=0, max=Child.MAX_UNLIMITED) @Description(shortDefinition="Format/content rules for the document", formalDefinition="An identifier of the document encoding, structure, and template that the document conforms to beyond the base format indicated in the mimeType." ) - protected List format; + protected List format; /** * Identifies who is responsible for adding the information to the document. */ - @Child(name = "author", type = {Practitioner.class, Organization.class, Device.class, Patient.class, RelatedPerson.class}, order=6, min=1, max=Child.MAX_UNLIMITED) + @Child(name = "author", type = {Practitioner.class, Organization.class, Device.class, Patient.class, RelatedPerson.class}, order=6, min=0, max=Child.MAX_UNLIMITED) @Description(shortDefinition="Who and/or what authored the document", formalDefinition="Identifies who is responsible for adding the information to the document." ) protected List author; /** @@ -891,11 +950,11 @@ public class DocumentReference extends DomainResource { protected StringType description; /** - * A set of Security-Tag codes specifying the level of privacy/security of the Document. + * A set of Security-Tag codes specifying the level of privacy/security of the Document. Note that DocumentReference.meta.security is the security labels of the reference to the document, while DocumentReference.securityLabel is the security labels on the document it refers to. */ - @Child(name = "confidentiality", type = {CodeableConcept.class}, order=15, min=0, max=Child.MAX_UNLIMITED) - @Description(shortDefinition="Document security-tags", formalDefinition="A set of Security-Tag codes specifying the level of privacy/security of the Document." ) - protected List confidentiality; + @Child(name = "securityLabel", type = {CodeableConcept.class}, order=15, min=0, max=Child.MAX_UNLIMITED) + @Description(shortDefinition="Document security-tags", formalDefinition="A set of Security-Tag codes specifying the level of privacy/security of the Document. Note that DocumentReference.meta.security is the security labels of the reference to the document, while DocumentReference.securityLabel is the security labels on the document it refers to." ) + protected List securityLabel; /** * The document or url to the document along with critical metadata to prove content has integrity. @@ -911,7 +970,7 @@ public class DocumentReference extends DomainResource { @Description(shortDefinition="Clinical context of document", formalDefinition="The clinical context in which the document was prepared." ) protected DocumentReferenceContextComponent context; - private static final long serialVersionUID = 1440270142L; + private static final long serialVersionUID = 2074994054L; /* * Constructor @@ -1084,16 +1143,16 @@ public class DocumentReference extends DomainResource { /** * @return {@link #format} (An identifier of the document encoding, structure, and template that the document conforms to beyond the base format indicated in the mimeType.) */ - public List getFormat() { + public List getFormat() { if (this.format == null) - this.format = new ArrayList(); + this.format = new ArrayList(); return this.format; } public boolean hasFormat() { if (this.format == null) return false; - for (UriType item : this.format) + for (Coding item : this.format) if (!item.isEmpty()) return true; return false; @@ -1103,38 +1162,24 @@ public class DocumentReference extends DomainResource { * @return {@link #format} (An identifier of the document encoding, structure, and template that the document conforms to beyond the base format indicated in the mimeType.) */ // syntactic sugar - public UriType addFormatElement() {//2 - UriType t = new UriType(); + public Coding addFormat() { //3 + Coding t = new Coding(); if (this.format == null) - this.format = new ArrayList(); + this.format = new ArrayList(); this.format.add(t); return t; } - /** - * @param value {@link #format} (An identifier of the document encoding, structure, and template that the document conforms to beyond the base format indicated in the mimeType.) - */ - public DocumentReference addFormat(String value) { //1 - UriType t = new UriType(); - t.setValue(value); + // syntactic sugar + public DocumentReference addFormat(Coding t) { //3 + if (t == null) + return this; if (this.format == null) - this.format = new ArrayList(); + this.format = new ArrayList(); this.format.add(t); return this; } - /** - * @param value {@link #format} (An identifier of the document encoding, structure, and template that the document conforms to beyond the base format indicated in the mimeType.) - */ - public boolean hasFormat(String value) { - if (this.format == null) - return false; - for (UriType v : this.format) - if (v.equals(value)) // uri - return true; - return false; - } - /** * @return {@link #author} (Identifies who is responsible for adding the information to the document.) */ @@ -1520,42 +1565,42 @@ public class DocumentReference extends DomainResource { } /** - * @return {@link #confidentiality} (A set of Security-Tag codes specifying the level of privacy/security of the Document.) + * @return {@link #securityLabel} (A set of Security-Tag codes specifying the level of privacy/security of the Document. Note that DocumentReference.meta.security is the security labels of the reference to the document, while DocumentReference.securityLabel is the security labels on the document it refers to.) */ - public List getConfidentiality() { - if (this.confidentiality == null) - this.confidentiality = new ArrayList(); - return this.confidentiality; + public List getSecurityLabel() { + if (this.securityLabel == null) + this.securityLabel = new ArrayList(); + return this.securityLabel; } - public boolean hasConfidentiality() { - if (this.confidentiality == null) + public boolean hasSecurityLabel() { + if (this.securityLabel == null) return false; - for (CodeableConcept item : this.confidentiality) + for (CodeableConcept item : this.securityLabel) if (!item.isEmpty()) return true; return false; } /** - * @return {@link #confidentiality} (A set of Security-Tag codes specifying the level of privacy/security of the Document.) + * @return {@link #securityLabel} (A set of Security-Tag codes specifying the level of privacy/security of the Document. Note that DocumentReference.meta.security is the security labels of the reference to the document, while DocumentReference.securityLabel is the security labels on the document it refers to.) */ // syntactic sugar - public CodeableConcept addConfidentiality() { //3 + public CodeableConcept addSecurityLabel() { //3 CodeableConcept t = new CodeableConcept(); - if (this.confidentiality == null) - this.confidentiality = new ArrayList(); - this.confidentiality.add(t); + if (this.securityLabel == null) + this.securityLabel = new ArrayList(); + this.securityLabel.add(t); return t; } // syntactic sugar - public DocumentReference addConfidentiality(CodeableConcept t) { //3 + public DocumentReference addSecurityLabel(CodeableConcept t) { //3 if (t == null) return this; - if (this.confidentiality == null) - this.confidentiality = new ArrayList(); - this.confidentiality.add(t); + if (this.securityLabel == null) + this.securityLabel = new ArrayList(); + this.securityLabel.add(t); return this; } @@ -1630,7 +1675,7 @@ public class DocumentReference extends DomainResource { childrenList.add(new Property("subject", "Reference(Patient|Practitioner|Group|Device)", "Who or what the document is about. The document can be about a person, (patient or healthcare practitioner), a device (I.e. machine) or even a group of subjects (such as a document about a herd of farm animals, or a set of patients that share a common exposure).", 0, java.lang.Integer.MAX_VALUE, subject)); childrenList.add(new Property("type", "CodeableConcept", "Specifies the particular kind of document. This usually equates to the purpose of making the document. It is recommended that the value Set be drawn from a coding scheme providing a fine level of granularity such as LOINC. (e.g. Patient Summary, Discharge Summary, Prescription, etc.).", 0, java.lang.Integer.MAX_VALUE, type)); childrenList.add(new Property("class", "CodeableConcept", "A categorization for the type of document - helps for indexing and searching. This may be implied by or derived from the code specified in the Composition Type.", 0, java.lang.Integer.MAX_VALUE, class_)); - childrenList.add(new Property("format", "uri", "An identifier of the document encoding, structure, and template that the document conforms to beyond the base format indicated in the mimeType.", 0, java.lang.Integer.MAX_VALUE, format)); + childrenList.add(new Property("format", "Coding", "An identifier of the document encoding, structure, and template that the document conforms to beyond the base format indicated in the mimeType.", 0, java.lang.Integer.MAX_VALUE, format)); childrenList.add(new Property("author", "Reference(Practitioner|Organization|Device|Patient|RelatedPerson)", "Identifies who is responsible for adding the information to the document.", 0, java.lang.Integer.MAX_VALUE, author)); childrenList.add(new Property("custodian", "Reference(Organization)", "Identifies the organization or group who is responsible for ongoing maintenance of and access to the document.", 0, java.lang.Integer.MAX_VALUE, custodian)); childrenList.add(new Property("authenticator", "Reference(Practitioner|Organization)", "Which person or organization authenticates that this document is valid.", 0, java.lang.Integer.MAX_VALUE, authenticator)); @@ -1640,7 +1685,7 @@ public class DocumentReference extends DomainResource { childrenList.add(new Property("docStatus", "CodeableConcept", "The status of the underlying document.", 0, java.lang.Integer.MAX_VALUE, docStatus)); childrenList.add(new Property("relatesTo", "", "Relationships that this document has with other document references that already exist.", 0, java.lang.Integer.MAX_VALUE, relatesTo)); childrenList.add(new Property("description", "string", "Human-readable description of the source document. This is sometimes known as the 'title'.", 0, java.lang.Integer.MAX_VALUE, description)); - childrenList.add(new Property("confidentiality", "CodeableConcept", "A set of Security-Tag codes specifying the level of privacy/security of the Document.", 0, java.lang.Integer.MAX_VALUE, confidentiality)); + childrenList.add(new Property("securityLabel", "CodeableConcept", "A set of Security-Tag codes specifying the level of privacy/security of the Document. Note that DocumentReference.meta.security is the security labels of the reference to the document, while DocumentReference.securityLabel is the security labels on the document it refers to.", 0, java.lang.Integer.MAX_VALUE, securityLabel)); childrenList.add(new Property("content", "Attachment", "The document or url to the document along with critical metadata to prove content has integrity.", 0, java.lang.Integer.MAX_VALUE, content)); childrenList.add(new Property("context", "", "The clinical context in which the document was prepared.", 0, java.lang.Integer.MAX_VALUE, context)); } @@ -1658,8 +1703,8 @@ public class DocumentReference extends DomainResource { dst.type = type == null ? null : type.copy(); dst.class_ = class_ == null ? null : class_.copy(); if (format != null) { - dst.format = new ArrayList(); - for (UriType i : format) + dst.format = new ArrayList(); + for (Coding i : format) dst.format.add(i.copy()); }; if (author != null) { @@ -1679,10 +1724,10 @@ public class DocumentReference extends DomainResource { dst.relatesTo.add(i.copy()); }; dst.description = description == null ? null : description.copy(); - if (confidentiality != null) { - dst.confidentiality = new ArrayList(); - for (CodeableConcept i : confidentiality) - dst.confidentiality.add(i.copy()); + if (securityLabel != null) { + dst.securityLabel = new ArrayList(); + for (CodeableConcept i : securityLabel) + dst.securityLabel.add(i.copy()); }; if (content != null) { dst.content = new ArrayList(); @@ -1709,7 +1754,7 @@ public class DocumentReference extends DomainResource { && compareDeep(format, o.format, true) && compareDeep(author, o.author, true) && compareDeep(custodian, o.custodian, true) && compareDeep(authenticator, o.authenticator, true) && compareDeep(created, o.created, true) && compareDeep(indexed, o.indexed, true) && compareDeep(status, o.status, true) && compareDeep(docStatus, o.docStatus, true) && compareDeep(relatesTo, o.relatesTo, true) - && compareDeep(description, o.description, true) && compareDeep(confidentiality, o.confidentiality, true) + && compareDeep(description, o.description, true) && compareDeep(securityLabel, o.securityLabel, true) && compareDeep(content, o.content, true) && compareDeep(context, o.context, true); } @@ -1720,8 +1765,8 @@ public class DocumentReference extends DomainResource { if (!(other instanceof DocumentReference)) return false; DocumentReference o = (DocumentReference) other; - return compareValues(format, o.format, true) && compareValues(created, o.created, true) && compareValues(indexed, o.indexed, true) - && compareValues(status, o.status, true) && compareValues(description, o.description, true); + return compareValues(created, o.created, true) && compareValues(indexed, o.indexed, true) && compareValues(status, o.status, true) + && compareValues(description, o.description, true); } public boolean isEmpty() { @@ -1731,7 +1776,7 @@ public class DocumentReference extends DomainResource { && (authenticator == null || authenticator.isEmpty()) && (created == null || created.isEmpty()) && (indexed == null || indexed.isEmpty()) && (status == null || status.isEmpty()) && (docStatus == null || docStatus.isEmpty()) && (relatesTo == null || relatesTo.isEmpty()) && (description == null || description.isEmpty()) - && (confidentiality == null || confidentiality.isEmpty()) && (content == null || content.isEmpty()) + && (securityLabel == null || securityLabel.isEmpty()) && (content == null || content.isEmpty()) && (context == null || context.isEmpty()); } @@ -1740,10 +1785,10 @@ public class DocumentReference extends DomainResource { return ResourceType.DocumentReference; } + @SearchParamDefinition(name="securitylabel", path="DocumentReference.securityLabel", description="Document security-tags", type="token" ) + public static final String SP_SECURITYLABEL = "securitylabel"; @SearchParamDefinition(name="subject", path="DocumentReference.subject", description="Who|what is the subject of the document", type="reference" ) public static final String SP_SUBJECT = "subject"; - @SearchParamDefinition(name="confidentiality", path="DocumentReference.confidentiality", description="Document security-tags", type="token" ) - public static final String SP_CONFIDENTIALITY = "confidentiality"; @SearchParamDefinition(name="description", path="DocumentReference.description", description="Human-readable description (title)", type="string" ) public static final String SP_DESCRIPTION = "description"; @SearchParamDefinition(name="language", path="DocumentReference.content.language", description="Human language of the content (BCP-47)", type="token" ) @@ -1778,10 +1823,12 @@ public class DocumentReference extends DomainResource { public static final String SP_AUTHOR = "author"; @SearchParamDefinition(name="created", path="DocumentReference.created", description="Document creation time", type="date" ) public static final String SP_CREATED = "created"; - @SearchParamDefinition(name="format", path="DocumentReference.format", description="Format/content rules for the document", type="uri" ) + @SearchParamDefinition(name="format", path="DocumentReference.format", description="Format/content rules for the document", type="token" ) public static final String SP_FORMAT = "format"; @SearchParamDefinition(name="relatedref", path="DocumentReference.context.related.ref", description="Related Resource", type="reference" ) public static final String SP_RELATEDREF = "relatedref"; + @SearchParamDefinition(name="encounter", path="DocumentReference.context.encounter", description="Context of the document content", type="reference" ) + public static final String SP_ENCOUNTER = "encounter"; @SearchParamDefinition(name="location", path="DocumentReference.content.url", description="Uri where the data can be found", type="uri" ) public static final String SP_LOCATION = "location"; @SearchParamDefinition(name="relatesto", path="DocumentReference.relatesTo.target", description="Target of the relationship", type="reference" ) diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DomainResource.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DomainResource.java index d18e90d43e7..a5e49070fee 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DomainResource.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DomainResource.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Duration.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Duration.java index f625092b441..61d60bb4a4b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Duration.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Duration.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.annotations.DatatypeDef; import org.hl7.fhir.instance.model.annotations.Block; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Element.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Element.java index 62f8404beaa..15bbb2e80c3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Element.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Element.java @@ -29,38 +29,20 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 -import org.apache.commons.lang3.Validate; +import java.util.*; + +import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.api.IBaseHasExtensions; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.model.annotations.DatatypeDef; +import org.hl7.fhir.instance.model.annotations.Block; +import org.hl7.fhir.instance.model.api.*; /** * Base definition for all elements in a resource. */ public abstract class Element extends Base implements IBaseHasExtensions { - /** - * Returns an unmodifiable list containing all extensions on this element which - * match the given URL. - * - * @param theUrl The URL. Must not be blank or null. - * @return an unmodifiable list containing all extensions on this element which - * match the given URL - */ - public List getExtensionsByUrl(String theUrl) { - Validate.notBlank(theUrl, "theUrl must not be blank or null"); - ArrayList retVal = new ArrayList(); - for (Extension next : getExtension()) { - if (theUrl.equals(next.getUrl())) { - retVal.add(next); - } - } - return Collections.unmodifiableList(retVal); - } /** * unique id for the element within a resource (for internal references). @@ -174,6 +156,24 @@ public abstract class Element extends Base implements IBaseHasExtensions { return this; } + /** + * Returns an unmodifiable list containing all extensions on this element which + * match the given URL. + * + * @param theUrl The URL. Must not be blank or null. + * @return an unmodifiable list containing all extensions on this element which + * match the given URL + */ + public List getExtensionsByUrl(String theUrl) { + org.apache.commons.lang3.Validate.notBlank(theUrl, "theUrl must not be blank or null"); + ArrayList retVal = new ArrayList(); + for (Extension next : getExtension()) { + if (theUrl.equals(next.getUrl())) { + retVal.add(next); + } + } + return java.util.Collections.unmodifiableList(retVal); + } protected void listChildren(List childrenList) { childrenList.add(new Property("id", "id", "unique id for the element within a resource (for internal references).", 0, java.lang.Integer.MAX_VALUE, id)); childrenList.add(new Property("extension", "Extension", "May be used to represent additional information that is not part of the basic definition of the element. In order to make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer is allowed to define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension.", 0, java.lang.Integer.MAX_VALUE, extension)); diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ElementDefinition.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ElementDefinition.java index db5cbeabebd..c287fb35f81 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ElementDefinition.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ElementDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityRequest.java index ae58d168b10..d6b723ca592 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityRequest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityResponse.java index 6b3a76767dc..3bf1bfd9706 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityResponse.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Encounter.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Encounter.java index 4d1a3509225..f7c78034f1a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Encounter.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Encounter.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; @@ -1639,17 +1639,13 @@ public class Encounter extends DomainResource { protected Patient patientTarget; /** - * Where a specific encounter should be classified as a part of a specific episode(s) of care this field should be used. This association can facilitate grouping of related encounters together for a specific purpose, such as govt reporting, issue tracking, association via a common problem. - -The association is recorded on the encounter as these are typically created after the episode of care, and grouped on entry rather than editing the episode of care to append another encounter to it (the episode of care could span years). + * Where a specific encounter should be classified as a part of a specific episode(s) of care this field should be used. This association can facilitate grouping of related encounters together for a specific purpose, such as govt reporting, issue tracking, association via a common problem. The association is recorded on the encounter as these are typically created after the episode of care, and grouped on entry rather than editing the episode of care to append another encounter to it (the episode of care could span years). */ @Child(name = "episodeOfCare", type = {EpisodeOfCare.class}, order=6, min=0, max=Child.MAX_UNLIMITED) - @Description(shortDefinition="Episode(s) of care that this encounter should be recorded against", formalDefinition="Where a specific encounter should be classified as a part of a specific episode(s) of care this field should be used. This association can facilitate grouping of related encounters together for a specific purpose, such as govt reporting, issue tracking, association via a common problem.\n\nThe association is recorded on the encounter as these are typically created after the episode of care, and grouped on entry rather than editing the episode of care to append another encounter to it (the episode of care could span years)." ) + @Description(shortDefinition="Episode(s) of care that this encounter should be recorded against", formalDefinition="Where a specific encounter should be classified as a part of a specific episode(s) of care this field should be used. This association can facilitate grouping of related encounters together for a specific purpose, such as govt reporting, issue tracking, association via a common problem. The association is recorded on the encounter as these are typically created after the episode of care, and grouped on entry rather than editing the episode of care to append another encounter to it (the episode of care could span years)." ) protected List episodeOfCare; /** - * The actual objects that are the target of the reference (Where a specific encounter should be classified as a part of a specific episode(s) of care this field should be used. This association can facilitate grouping of related encounters together for a specific purpose, such as govt reporting, issue tracking, association via a common problem. - -The association is recorded on the encounter as these are typically created after the episode of care, and grouped on entry rather than editing the episode of care to append another encounter to it (the episode of care could span years).) + * The actual objects that are the target of the reference (Where a specific encounter should be classified as a part of a specific episode(s) of care this field should be used. This association can facilitate grouping of related encounters together for a specific purpose, such as govt reporting, issue tracking, association via a common problem. The association is recorded on the encounter as these are typically created after the episode of care, and grouped on entry rather than editing the episode of care to append another encounter to it (the episode of care could span years).) */ protected List episodeOfCareTarget; @@ -1707,15 +1703,13 @@ The association is recorded on the encounter as these are typically created afte protected List reason; /** - * Reason the encounter takes place, as specified using information from another resource. For admissions, this is the admission diagnosis. -The indication will typically be a Condition (with other resources referenced in the evidence.detail), or a Procedure. + * Reason the encounter takes place, as specified using information from another resource. For admissions, this is the admission diagnosis. The indication will typically be a Condition (with other resources referenced in the evidence.detail), or a Procedure. */ @Child(name = "indication", type = {}, order=13, min=0, max=Child.MAX_UNLIMITED) - @Description(shortDefinition="Reason the encounter takes place (resource)", formalDefinition="Reason the encounter takes place, as specified using information from another resource. For admissions, this is the admission diagnosis.\nThe indication will typically be a Condition (with other resources referenced in the evidence.detail), or a Procedure." ) + @Description(shortDefinition="Reason the encounter takes place (resource)", formalDefinition="Reason the encounter takes place, as specified using information from another resource. For admissions, this is the admission diagnosis. The indication will typically be a Condition (with other resources referenced in the evidence.detail), or a Procedure." ) protected List indication; /** - * The actual objects that are the target of the reference (Reason the encounter takes place, as specified using information from another resource. For admissions, this is the admission diagnosis. -The indication will typically be a Condition (with other resources referenced in the evidence.detail), or a Procedure.) + * The actual objects that are the target of the reference (Reason the encounter takes place, as specified using information from another resource. For admissions, this is the admission diagnosis. The indication will typically be a Condition (with other resources referenced in the evidence.detail), or a Procedure.) */ protected List indicationTarget; @@ -2041,9 +2035,7 @@ The indication will typically be a Condition (with other resources referenced in } /** - * @return {@link #episodeOfCare} (Where a specific encounter should be classified as a part of a specific episode(s) of care this field should be used. This association can facilitate grouping of related encounters together for a specific purpose, such as govt reporting, issue tracking, association via a common problem. - -The association is recorded on the encounter as these are typically created after the episode of care, and grouped on entry rather than editing the episode of care to append another encounter to it (the episode of care could span years).) + * @return {@link #episodeOfCare} (Where a specific encounter should be classified as a part of a specific episode(s) of care this field should be used. This association can facilitate grouping of related encounters together for a specific purpose, such as govt reporting, issue tracking, association via a common problem. The association is recorded on the encounter as these are typically created after the episode of care, and grouped on entry rather than editing the episode of care to append another encounter to it (the episode of care could span years).) */ public List getEpisodeOfCare() { if (this.episodeOfCare == null) @@ -2061,9 +2053,7 @@ The association is recorded on the encounter as these are typically created afte } /** - * @return {@link #episodeOfCare} (Where a specific encounter should be classified as a part of a specific episode(s) of care this field should be used. This association can facilitate grouping of related encounters together for a specific purpose, such as govt reporting, issue tracking, association via a common problem. - -The association is recorded on the encounter as these are typically created after the episode of care, and grouped on entry rather than editing the episode of care to append another encounter to it (the episode of care could span years).) + * @return {@link #episodeOfCare} (Where a specific encounter should be classified as a part of a specific episode(s) of care this field should be used. This association can facilitate grouping of related encounters together for a specific purpose, such as govt reporting, issue tracking, association via a common problem. The association is recorded on the encounter as these are typically created after the episode of care, and grouped on entry rather than editing the episode of care to append another encounter to it (the episode of care could span years).) */ // syntactic sugar public Reference addEpisodeOfCare() { //3 @@ -2085,9 +2075,7 @@ The association is recorded on the encounter as these are typically created afte } /** - * @return {@link #episodeOfCare} (The actual objects that are the target of the reference. The reference library doesn't populate this, but you can use this to hold the resources if you resolvethemt. Where a specific encounter should be classified as a part of a specific episode(s) of care this field should be used. This association can facilitate grouping of related encounters together for a specific purpose, such as govt reporting, issue tracking, association via a common problem. - -The association is recorded on the encounter as these are typically created after the episode of care, and grouped on entry rather than editing the episode of care to append another encounter to it (the episode of care could span years).) + * @return {@link #episodeOfCare} (The actual objects that are the target of the reference. The reference library doesn't populate this, but you can use this to hold the resources if you resolvethemt. Where a specific encounter should be classified as a part of a specific episode(s) of care this field should be used. This association can facilitate grouping of related encounters together for a specific purpose, such as govt reporting, issue tracking, association via a common problem. The association is recorded on the encounter as these are typically created after the episode of care, and grouped on entry rather than editing the episode of care to append another encounter to it (the episode of care could span years).) */ public List getEpisodeOfCareTarget() { if (this.episodeOfCareTarget == null) @@ -2097,9 +2085,7 @@ The association is recorded on the encounter as these are typically created afte // syntactic sugar /** - * @return {@link #episodeOfCare} (Add an actual object that is the target of the reference. The reference library doesn't use these, but you can use this to hold the resources if you resolvethemt. Where a specific encounter should be classified as a part of a specific episode(s) of care this field should be used. This association can facilitate grouping of related encounters together for a specific purpose, such as govt reporting, issue tracking, association via a common problem. - -The association is recorded on the encounter as these are typically created after the episode of care, and grouped on entry rather than editing the episode of care to append another encounter to it (the episode of care could span years).) + * @return {@link #episodeOfCare} (Add an actual object that is the target of the reference. The reference library doesn't use these, but you can use this to hold the resources if you resolvethemt. Where a specific encounter should be classified as a part of a specific episode(s) of care this field should be used. This association can facilitate grouping of related encounters together for a specific purpose, such as govt reporting, issue tracking, association via a common problem. The association is recorded on the encounter as these are typically created after the episode of care, and grouped on entry rather than editing the episode of care to append another encounter to it (the episode of care could span years).) */ public EpisodeOfCare addEpisodeOfCareTarget() { EpisodeOfCare r = new EpisodeOfCare(); @@ -2343,8 +2329,7 @@ The association is recorded on the encounter as these are typically created afte } /** - * @return {@link #indication} (Reason the encounter takes place, as specified using information from another resource. For admissions, this is the admission diagnosis. -The indication will typically be a Condition (with other resources referenced in the evidence.detail), or a Procedure.) + * @return {@link #indication} (Reason the encounter takes place, as specified using information from another resource. For admissions, this is the admission diagnosis. The indication will typically be a Condition (with other resources referenced in the evidence.detail), or a Procedure.) */ public List getIndication() { if (this.indication == null) @@ -2362,8 +2347,7 @@ The indication will typically be a Condition (with other resources referenced in } /** - * @return {@link #indication} (Reason the encounter takes place, as specified using information from another resource. For admissions, this is the admission diagnosis. -The indication will typically be a Condition (with other resources referenced in the evidence.detail), or a Procedure.) + * @return {@link #indication} (Reason the encounter takes place, as specified using information from another resource. For admissions, this is the admission diagnosis. The indication will typically be a Condition (with other resources referenced in the evidence.detail), or a Procedure.) */ // syntactic sugar public Reference addIndication() { //3 @@ -2385,8 +2369,7 @@ The indication will typically be a Condition (with other resources referenced in } /** - * @return {@link #indication} (The actual objects that are the target of the reference. The reference library doesn't populate this, but you can use this to hold the resources if you resolvethemt. Reason the encounter takes place, as specified using information from another resource. For admissions, this is the admission diagnosis. -The indication will typically be a Condition (with other resources referenced in the evidence.detail), or a Procedure.) + * @return {@link #indication} (The actual objects that are the target of the reference. The reference library doesn't populate this, but you can use this to hold the resources if you resolvethemt. Reason the encounter takes place, as specified using information from another resource. For admissions, this is the admission diagnosis. The indication will typically be a Condition (with other resources referenced in the evidence.detail), or a Procedure.) */ public List getIndicationTarget() { if (this.indicationTarget == null) @@ -2578,14 +2561,14 @@ The indication will typically be a Condition (with other resources referenced in childrenList.add(new Property("class", "code", "inpatient | outpatient | ambulatory | emergency +.", 0, java.lang.Integer.MAX_VALUE, class_)); childrenList.add(new Property("type", "CodeableConcept", "Specific type of encounter (e.g. e-mail consultation, surgical day-care, skilled nursing, rehabilitation).", 0, java.lang.Integer.MAX_VALUE, type)); childrenList.add(new Property("patient", "Reference(Patient)", "The patient present at the encounter.", 0, java.lang.Integer.MAX_VALUE, patient)); - childrenList.add(new Property("episodeOfCare", "Reference(EpisodeOfCare)", "Where a specific encounter should be classified as a part of a specific episode(s) of care this field should be used. This association can facilitate grouping of related encounters together for a specific purpose, such as govt reporting, issue tracking, association via a common problem.\n\nThe association is recorded on the encounter as these are typically created after the episode of care, and grouped on entry rather than editing the episode of care to append another encounter to it (the episode of care could span years).", 0, java.lang.Integer.MAX_VALUE, episodeOfCare)); + childrenList.add(new Property("episodeOfCare", "Reference(EpisodeOfCare)", "Where a specific encounter should be classified as a part of a specific episode(s) of care this field should be used. This association can facilitate grouping of related encounters together for a specific purpose, such as govt reporting, issue tracking, association via a common problem. The association is recorded on the encounter as these are typically created after the episode of care, and grouped on entry rather than editing the episode of care to append another encounter to it (the episode of care could span years).", 0, java.lang.Integer.MAX_VALUE, episodeOfCare)); childrenList.add(new Property("incomingReferralRequest", "Reference(ReferralRequest)", "The referral request that this encounter satisfies (incoming referral).", 0, java.lang.Integer.MAX_VALUE, incomingReferralRequest)); childrenList.add(new Property("participant", "", "The main practitioner responsible for providing the service.", 0, java.lang.Integer.MAX_VALUE, participant)); childrenList.add(new Property("fulfills", "Reference(Appointment)", "The appointment that scheduled this encounter.", 0, java.lang.Integer.MAX_VALUE, fulfills)); childrenList.add(new Property("period", "Period", "The start and end time of the encounter.", 0, java.lang.Integer.MAX_VALUE, period)); childrenList.add(new Property("length", "Duration", "Quantity of time the encounter lasted. This excludes the time during leaves of absence.", 0, java.lang.Integer.MAX_VALUE, length)); childrenList.add(new Property("reason", "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, reason)); - childrenList.add(new Property("indication", "Reference(Any)", "Reason the encounter takes place, as specified using information from another resource. For admissions, this is the admission diagnosis.\nThe indication will typically be a Condition (with other resources referenced in the evidence.detail), or a Procedure.", 0, java.lang.Integer.MAX_VALUE, indication)); + childrenList.add(new Property("indication", "Reference(Any)", "Reason the encounter takes place, as specified using information from another resource. For admissions, this is 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, indication)); childrenList.add(new Property("priority", "CodeableConcept", "Indicates the urgency of the encounter.", 0, java.lang.Integer.MAX_VALUE, priority)); childrenList.add(new Property("hospitalization", "", "Details about an admission to a clinic.", 0, java.lang.Integer.MAX_VALUE, hospitalization)); childrenList.add(new Property("location", "", "List of locations at which the patient has been.", 0, java.lang.Integer.MAX_VALUE, location)); diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentRequest.java index 0976b75c092..a92cd101cc4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentRequest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentResponse.java index d559aaee6b3..f90395701d6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentResponse.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Enumerations.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Enumerations.java index 2e4c3ee08de..961ef4caf7f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Enumerations.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Enumerations.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.api.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EpisodeOfCare.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EpisodeOfCare.java index 494ce965ce9..e9e920797d3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EpisodeOfCare.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EpisodeOfCare.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ExplanationOfBenefit.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ExplanationOfBenefit.java index e81d15fec19..8425c4d31ed 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ExplanationOfBenefit.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ExplanationOfBenefit.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Extension.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Extension.java index 451b2d3d50b..b2af1a2c4b0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Extension.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Extension.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/FamilyMemberHistory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/FamilyMemberHistory.java index a2d130274d6..eb81ef964f1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/FamilyMemberHistory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/FamilyMemberHistory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Flag.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Flag.java index ce03edc8408..a9a33fd32c2 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Flag.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Flag.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Goal.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Goal.java index 2800ca91502..03cda672684 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Goal.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Goal.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Group.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Group.java index fd530fe876f..effa605c257 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Group.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Group.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HealthcareService.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HealthcareService.java index 028889eea0d..9022ad0ad05 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HealthcareService.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HealthcareService.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; @@ -2031,6 +2031,8 @@ public class HealthcareService extends DomainResource { return ResourceType.HealthcareService; } + @SearchParamDefinition(name="identifier", path="HealthcareService.identifier", description="External Identifiers for this item", type="token" ) + public static final String SP_IDENTIFIER = "identifier"; @SearchParamDefinition(name="servicecategory", path="HealthcareService.serviceCategory", description="Service Category of the Healthcare Service", type="token" ) public static final String SP_SERVICECATEGORY = "servicecategory"; @SearchParamDefinition(name="servicetype", path="HealthcareService.serviceType.type", description="The type of service provided by this healthcare service", type="token" ) diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HumanName.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HumanName.java index 8de8f08f4f9..57d389bfa12 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HumanName.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HumanName.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Identifier.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Identifier.java index 9fcc3d29d5e..b1751ebb7f4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Identifier.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Identifier.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingObjectSelection.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingObjectSelection.java index 2bf5d1f1489..29d270d5f0c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingObjectSelection.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingObjectSelection.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; @@ -41,7 +41,7 @@ import org.hl7.fhir.instance.model.annotations.Description; import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** - * A manifest of a set of DICOM Service-Object Pair Instances (SOP Instances). The referenced SOP Instances (images or other content) are for a single patient, and may be from one or more studies. The referenced SOP Instances have been selected for a purpose, such as quality assurance, conference, or consult. Reflecting that range of purposes, typical ImagingObjectSelection resources may include all SOP Instances in a study (perhaps for sharing through a Health Information Exchange); key images from multiple studies (for reference by a referring or treating physician); a multi-frame ultrasound instance (“cine” video clip) and a set of measurements taken from that instance (for inclusion in a teaching file); and so on. + * A manifest of a set of DICOM Service-Object Pair Instances (SOP Instances). The referenced SOP Instances (images or other content) are for a single patient, and may be from one or more studies. The referenced SOP Instances have been selected for a purpose, such as quality assurance, conference, or consult. Reflecting that range of purposes, typical ImagingObjectSelection resources may include all SOP Instances in a study (perhaps for sharing through a Health Information Exchange); key images from multiple studies (for reference by a referring or treating physician); a multi-frame ultrasound instance ("cine" video clip) and a set of measurements taken from that instance (for inclusion in a teaching file); and so on. */ @ResourceDef(name="ImagingObjectSelection", profile="http://hl7.org/fhir/Profile/ImagingObjectSelection") public class ImagingObjectSelection extends DomainResource { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingStudy.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingStudy.java index 6a2b0fe9daf..0e857ecfe68 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingStudy.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingStudy.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Immunization.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Immunization.java index 2bccb1e1b93..fd90269adec 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Immunization.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Immunization.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; @@ -1003,9 +1003,9 @@ public class Immunization extends DomainResource { /** * The quantity of vaccine product that was administered. */ - @Child(name = "doseQuantity", type = {Quantity.class}, order=15, min=0, max=1) + @Child(name = "doseQuantity", type = {SimpleQuantity.class}, order=15, min=0, max=1) @Description(shortDefinition="Amount of vaccine administered", formalDefinition="The quantity of vaccine product that was administered." ) - protected Quantity doseQuantity; + protected SimpleQuantity doseQuantity; /** * Reasons why a vaccine was or was not administered. @@ -1028,7 +1028,7 @@ public class Immunization extends DomainResource { @Description(shortDefinition="What protocol was followed", formalDefinition="Contains information about the protocol(s) under which the vaccine was administered." ) protected List vaccinationProtocol; - private static final long serialVersionUID = -1610924217L; + private static final long serialVersionUID = -224069771L; /* * Constructor @@ -1661,12 +1661,12 @@ public class Immunization extends DomainResource { /** * @return {@link #doseQuantity} (The quantity of vaccine product that was administered.) */ - public Quantity getDoseQuantity() { + public SimpleQuantity getDoseQuantity() { if (this.doseQuantity == null) if (Configuration.errorOnAutoCreate()) throw new Error("Attempt to auto-create Immunization.doseQuantity"); else if (Configuration.doAutoCreate()) - this.doseQuantity = new Quantity(); // cc + this.doseQuantity = new SimpleQuantity(); // cc return this.doseQuantity; } @@ -1677,7 +1677,7 @@ public class Immunization extends DomainResource { /** * @param value {@link #doseQuantity} (The quantity of vaccine product that was administered.) */ - public Immunization setDoseQuantity(Quantity value) { + public Immunization setDoseQuantity(SimpleQuantity value) { this.doseQuantity = value; return this; } @@ -1803,7 +1803,7 @@ public class Immunization extends DomainResource { childrenList.add(new Property("expirationDate", "date", "Date vaccine batch expires.", 0, java.lang.Integer.MAX_VALUE, expirationDate)); childrenList.add(new Property("site", "CodeableConcept", "Body site where vaccine was administered.", 0, java.lang.Integer.MAX_VALUE, site)); childrenList.add(new Property("route", "CodeableConcept", "The path by which the vaccine product is taken into the body.", 0, java.lang.Integer.MAX_VALUE, route)); - childrenList.add(new Property("doseQuantity", "Quantity", "The quantity of vaccine product that was administered.", 0, java.lang.Integer.MAX_VALUE, doseQuantity)); + childrenList.add(new Property("doseQuantity", "SimpleQuantity", "The quantity of vaccine product that was administered.", 0, java.lang.Integer.MAX_VALUE, doseQuantity)); childrenList.add(new Property("explanation", "", "Reasons why a vaccine was or was not administered.", 0, java.lang.Integer.MAX_VALUE, explanation)); childrenList.add(new Property("reaction", "", "Categorical data indicating that an adverse event is associated in time to an immunization.", 0, java.lang.Integer.MAX_VALUE, reaction)); childrenList.add(new Property("vaccinationProtocol", "", "Contains information about the protocol(s) under which the vaccine was administered.", 0, java.lang.Integer.MAX_VALUE, vaccinationProtocol)); diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImmunizationRecommendation.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImmunizationRecommendation.java index 4471dea6211..a61b5c0f000 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImmunizationRecommendation.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImmunizationRecommendation.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImplementationGuide.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImplementationGuide.java index d2eca4faf0e..af5ed8795ac 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImplementationGuide.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImplementationGuide.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/List_.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/List_.java index 48657338f4c..5598caee8fe 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/List_.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/List_.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Location.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Location.java index c3d6bb7302b..7a812179fb4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Location.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Location.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Media.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Media.java index 53fcbd4ca67..51a77c27e52 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Media.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Media.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Medication.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Medication.java index 9a5e80e4666..1a6e0fb03f4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Medication.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Medication.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; @@ -121,10 +121,10 @@ public class Medication extends DomainResource { @Block() public static class MedicationProductComponent extends BackboneElement implements IBaseBackboneElement { /** - * Describes the form of the item. Powder; tables; carton. + * Describes the form of the item. Powder; tablets; carton. */ @Child(name = "form", type = {CodeableConcept.class}, order=1, min=0, max=1) - @Description(shortDefinition="powder | tablets | carton +", formalDefinition="Describes the form of the item. Powder; tables; carton." ) + @Description(shortDefinition="powder | tablets | carton +", formalDefinition="Describes the form of the item. Powder; tablets; carton." ) protected CodeableConcept form; /** @@ -151,7 +151,7 @@ public class Medication extends DomainResource { } /** - * @return {@link #form} (Describes the form of the item. Powder; tables; carton.) + * @return {@link #form} (Describes the form of the item. Powder; tablets; carton.) */ public CodeableConcept getForm() { if (this.form == null) @@ -167,7 +167,7 @@ public class Medication extends DomainResource { } /** - * @param value {@link #form} (Describes the form of the item. Powder; tables; carton.) + * @param value {@link #form} (Describes the form of the item. Powder; tablets; carton.) */ public MedicationProductComponent setForm(CodeableConcept value) { this.form = value; @@ -256,7 +256,7 @@ public class Medication extends DomainResource { protected void listChildren(List childrenList) { super.listChildren(childrenList); - childrenList.add(new Property("form", "CodeableConcept", "Describes the form of the item. Powder; tables; carton.", 0, java.lang.Integer.MAX_VALUE, form)); + childrenList.add(new Property("form", "CodeableConcept", "Describes the form of the item. Powder; tablets; carton.", 0, java.lang.Integer.MAX_VALUE, form)); childrenList.add(new Property("ingredient", "", "Identifies a particular constituent of interest in the product.", 0, java.lang.Integer.MAX_VALUE, ingredient)); childrenList.add(new Property("batch", "", "Information about a group of medication produced or packaged from one production run.", 0, java.lang.Integer.MAX_VALUE, batch)); } @@ -765,11 +765,11 @@ public class Medication extends DomainResource { /** * The amount of the product that is in the package. */ - @Child(name = "amount", type = {Quantity.class}, order=2, min=0, max=1) + @Child(name = "amount", type = {SimpleQuantity.class}, order=2, min=0, max=1) @Description(shortDefinition="How many are in the package?", formalDefinition="The amount of the product that is in the package." ) - protected Quantity amount; + protected SimpleQuantity amount; - private static final long serialVersionUID = -1385430192L; + private static final long serialVersionUID = -1150048030L; /* * Constructor @@ -833,12 +833,12 @@ public class Medication extends DomainResource { /** * @return {@link #amount} (The amount of the product that is in the package.) */ - public Quantity getAmount() { + public SimpleQuantity getAmount() { if (this.amount == null) if (Configuration.errorOnAutoCreate()) throw new Error("Attempt to auto-create MedicationPackageContentComponent.amount"); else if (Configuration.doAutoCreate()) - this.amount = new Quantity(); // cc + this.amount = new SimpleQuantity(); // cc return this.amount; } @@ -849,7 +849,7 @@ public class Medication extends DomainResource { /** * @param value {@link #amount} (The amount of the product that is in the package.) */ - public MedicationPackageContentComponent setAmount(Quantity value) { + public MedicationPackageContentComponent setAmount(SimpleQuantity value) { this.amount = value; return this; } @@ -857,7 +857,7 @@ public class Medication extends DomainResource { protected void listChildren(List childrenList) { super.listChildren(childrenList); childrenList.add(new Property("item", "Reference(Medication)", "Identifies one of the items in the package.", 0, java.lang.Integer.MAX_VALUE, item)); - childrenList.add(new Property("amount", "Quantity", "The amount of the product that is in the package.", 0, java.lang.Integer.MAX_VALUE, amount)); + childrenList.add(new Property("amount", "SimpleQuantity", "The amount of the product that is in the package.", 0, java.lang.Integer.MAX_VALUE, amount)); } public MedicationPackageContentComponent copy() { @@ -896,30 +896,23 @@ public class Medication extends DomainResource { } /** - * The common/commercial name of the medication absent information such as strength, form, etc. E.g. Acetaminophen, Tylenol 3, etc. The fully coordinated name is communicated as the display of Medication.code. + * A code (or set of codes) that specify this medication, or a textual description if no code is available. Usage note: This could be a standard medication code such as a code from RxNorm, SNOMED CT, IDMP etc. It could also be a national or local formulary code, optionally with translations to other code systems. */ - @Child(name = "name", type = {StringType.class}, order=0, min=0, max=1) - @Description(shortDefinition="Common / Commercial name", formalDefinition="The common/commercial name of the medication absent information such as strength, form, etc. E.g. Acetaminophen, Tylenol 3, etc. The fully coordinated name is communicated as the display of Medication.code." ) - protected StringType name; - - /** - * A code (or set of codes) that identify this medication. Usage note: This could be a standard drug code such as a drug regulator code, RxNorm code, SNOMED CT code, etc. It could also be a local formulary code, optionally with translations to the standard drug codes. - */ - @Child(name = "code", type = {CodeableConcept.class}, order=1, min=0, max=1) - @Description(shortDefinition="Codes that identify this medication", formalDefinition="A code (or set of codes) that identify this medication. Usage note: This could be a standard drug code such as a drug regulator code, RxNorm code, SNOMED CT code, etc. It could also be a local formulary code, optionally with translations to the standard drug codes." ) + @Child(name = "code", type = {CodeableConcept.class}, order=0, min=0, max=1) + @Description(shortDefinition="Codes that identify this medication", formalDefinition="A code (or set of codes) that specify this medication, or a textual description if no code is available. Usage note: This could be a standard medication code such as a code from RxNorm, SNOMED CT, IDMP etc. It could also be a national or local formulary code, optionally with translations to other code systems." ) protected CodeableConcept code; /** - * Set to true if the item is attributable to a specific manufacturer (even if we don't know who that is). + * Set to true if the item is attributable to a specific manufacturer. */ - @Child(name = "isBrand", type = {BooleanType.class}, order=2, min=0, max=1) - @Description(shortDefinition="True if a brand", formalDefinition="Set to true if the item is attributable to a specific manufacturer (even if we don't know who that is)." ) + @Child(name = "isBrand", type = {BooleanType.class}, order=1, min=0, max=1) + @Description(shortDefinition="True if a brand", formalDefinition="Set to true if the item is attributable to a specific manufacturer." ) protected BooleanType isBrand; /** * Describes the details of the manufacturer. */ - @Child(name = "manufacturer", type = {Organization.class}, order=3, min=0, max=1) + @Child(name = "manufacturer", type = {Organization.class}, order=2, min=0, max=1) @Description(shortDefinition="Manufacturer of the item", formalDefinition="Describes the details of the manufacturer." ) protected Reference manufacturer; @@ -931,25 +924,25 @@ public class Medication extends DomainResource { /** * Medications are either a single administrable product or a package that contains one or more products. */ - @Child(name = "kind", type = {CodeType.class}, order=4, min=0, max=1) + @Child(name = "kind", type = {CodeType.class}, order=3, min=0, max=1) @Description(shortDefinition="product | package", formalDefinition="Medications are either a single administrable product or a package that contains one or more products." ) protected Enumeration kind; /** * Information that only applies to products (not packages). */ - @Child(name = "product", type = {}, order=5, min=0, max=1) + @Child(name = "product", type = {}, order=4, min=0, max=1) @Description(shortDefinition="Administrable medication details", formalDefinition="Information that only applies to products (not packages)." ) protected MedicationProductComponent product; /** * Information that only applies to packages (not products). */ - @Child(name = "package", type = {}, order=6, min=0, max=1) + @Child(name = "package", type = {}, order=5, min=0, max=1) @Description(shortDefinition="Details about packaged medications", formalDefinition="Information that only applies to packages (not products)." ) protected MedicationPackageComponent package_; - private static final long serialVersionUID = 385691577L; + private static final long serialVersionUID = -1593137297L; /* * Constructor @@ -959,56 +952,7 @@ public class Medication extends DomainResource { } /** - * @return {@link #name} (The common/commercial name of the medication absent information such as strength, form, etc. E.g. Acetaminophen, Tylenol 3, etc. The fully coordinated name is communicated as the display of Medication.code.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value - */ - public StringType getNameElement() { - if (this.name == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create Medication.name"); - else if (Configuration.doAutoCreate()) - this.name = new StringType(); // bb - return this.name; - } - - public boolean hasNameElement() { - return this.name != null && !this.name.isEmpty(); - } - - public boolean hasName() { - return this.name != null && !this.name.isEmpty(); - } - - /** - * @param value {@link #name} (The common/commercial name of the medication absent information such as strength, form, etc. E.g. Acetaminophen, Tylenol 3, etc. The fully coordinated name is communicated as the display of Medication.code.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value - */ - public Medication setNameElement(StringType value) { - this.name = value; - return this; - } - - /** - * @return The common/commercial name of the medication absent information such as strength, form, etc. E.g. Acetaminophen, Tylenol 3, etc. The fully coordinated name is communicated as the display of Medication.code. - */ - public String getName() { - return this.name == null ? null : this.name.getValue(); - } - - /** - * @param value The common/commercial name of the medication absent information such as strength, form, etc. E.g. Acetaminophen, Tylenol 3, etc. The fully coordinated name is communicated as the display of Medication.code. - */ - public Medication setName(String value) { - if (Utilities.noString(value)) - this.name = null; - else { - if (this.name == null) - this.name = new StringType(); - this.name.setValue(value); - } - return this; - } - - /** - * @return {@link #code} (A code (or set of codes) that identify this medication. Usage note: This could be a standard drug code such as a drug regulator code, RxNorm code, SNOMED CT code, etc. It could also be a local formulary code, optionally with translations to the standard drug codes.) + * @return {@link #code} (A code (or set of codes) that specify this medication, or a textual description if no code is available. Usage note: This could be a standard medication code such as a code from RxNorm, SNOMED CT, IDMP etc. It could also be a national or local formulary code, optionally with translations to other code systems.) */ public CodeableConcept getCode() { if (this.code == null) @@ -1024,7 +968,7 @@ public class Medication extends DomainResource { } /** - * @param value {@link #code} (A code (or set of codes) that identify this medication. Usage note: This could be a standard drug code such as a drug regulator code, RxNorm code, SNOMED CT code, etc. It could also be a local formulary code, optionally with translations to the standard drug codes.) + * @param value {@link #code} (A code (or set of codes) that specify this medication, or a textual description if no code is available. Usage note: This could be a standard medication code such as a code from RxNorm, SNOMED CT, IDMP etc. It could also be a national or local formulary code, optionally with translations to other code systems.) */ public Medication setCode(CodeableConcept value) { this.code = value; @@ -1032,7 +976,7 @@ public class Medication extends DomainResource { } /** - * @return {@link #isBrand} (Set to true if the item is attributable to a specific manufacturer (even if we don't know who that is).). This is the underlying object with id, value and extensions. The accessor "getIsBrand" gives direct access to the value + * @return {@link #isBrand} (Set to true if the item is attributable to a specific manufacturer.). This is the underlying object with id, value and extensions. The accessor "getIsBrand" gives direct access to the value */ public BooleanType getIsBrandElement() { if (this.isBrand == null) @@ -1052,7 +996,7 @@ public class Medication extends DomainResource { } /** - * @param value {@link #isBrand} (Set to true if the item is attributable to a specific manufacturer (even if we don't know who that is).). This is the underlying object with id, value and extensions. The accessor "getIsBrand" gives direct access to the value + * @param value {@link #isBrand} (Set to true if the item is attributable to a specific manufacturer.). This is the underlying object with id, value and extensions. The accessor "getIsBrand" gives direct access to the value */ public Medication setIsBrandElement(BooleanType value) { this.isBrand = value; @@ -1060,14 +1004,14 @@ public class Medication extends DomainResource { } /** - * @return Set to true if the item is attributable to a specific manufacturer (even if we don't know who that is). + * @return Set to true if the item is attributable to a specific manufacturer. */ public boolean getIsBrand() { return this.isBrand == null || this.isBrand.isEmpty() ? false : this.isBrand.getValue(); } /** - * @param value Set to true if the item is attributable to a specific manufacturer (even if we don't know who that is). + * @param value Set to true if the item is attributable to a specific manufacturer. */ public Medication setIsBrand(boolean value) { if (this.isBrand == null) @@ -1219,9 +1163,8 @@ public class Medication extends DomainResource { protected void listChildren(List childrenList) { super.listChildren(childrenList); - childrenList.add(new Property("name", "string", "The common/commercial name of the medication absent information such as strength, form, etc. E.g. Acetaminophen, Tylenol 3, etc. The fully coordinated name is communicated as the display of Medication.code.", 0, java.lang.Integer.MAX_VALUE, name)); - childrenList.add(new Property("code", "CodeableConcept", "A code (or set of codes) that identify this medication. Usage note: This could be a standard drug code such as a drug regulator code, RxNorm code, SNOMED CT code, etc. It could also be a local formulary code, optionally with translations to the standard drug codes.", 0, java.lang.Integer.MAX_VALUE, code)); - childrenList.add(new Property("isBrand", "boolean", "Set to true if the item is attributable to a specific manufacturer (even if we don't know who that is).", 0, java.lang.Integer.MAX_VALUE, isBrand)); + childrenList.add(new Property("code", "CodeableConcept", "A code (or set of codes) that specify this medication, or a textual description if no code is available. Usage note: This could be a standard medication code such as a code from RxNorm, SNOMED CT, IDMP etc. It could also be a national or local formulary code, optionally with translations to other code systems.", 0, java.lang.Integer.MAX_VALUE, code)); + childrenList.add(new Property("isBrand", "boolean", "Set to true if the item is attributable to a specific manufacturer.", 0, java.lang.Integer.MAX_VALUE, isBrand)); childrenList.add(new Property("manufacturer", "Reference(Organization)", "Describes the details of the manufacturer.", 0, java.lang.Integer.MAX_VALUE, manufacturer)); childrenList.add(new Property("kind", "code", "Medications are either a single administrable product or a package that contains one or more products.", 0, java.lang.Integer.MAX_VALUE, kind)); childrenList.add(new Property("product", "", "Information that only applies to products (not packages).", 0, java.lang.Integer.MAX_VALUE, product)); @@ -1231,7 +1174,6 @@ public class Medication extends DomainResource { public Medication copy() { Medication dst = new Medication(); copyValues(dst); - dst.name = name == null ? null : name.copy(); dst.code = code == null ? null : code.copy(); dst.isBrand = isBrand == null ? null : isBrand.copy(); dst.manufacturer = manufacturer == null ? null : manufacturer.copy(); @@ -1252,9 +1194,9 @@ public class Medication extends DomainResource { if (!(other instanceof Medication)) return false; Medication o = (Medication) other; - return compareDeep(name, o.name, true) && compareDeep(code, o.code, true) && compareDeep(isBrand, o.isBrand, true) - && compareDeep(manufacturer, o.manufacturer, true) && compareDeep(kind, o.kind, true) && compareDeep(product, o.product, true) - && compareDeep(package_, o.package_, true); + return compareDeep(code, o.code, true) && compareDeep(isBrand, o.isBrand, true) && compareDeep(manufacturer, o.manufacturer, true) + && compareDeep(kind, o.kind, true) && compareDeep(product, o.product, true) && compareDeep(package_, o.package_, true) + ; } @Override @@ -1264,15 +1206,13 @@ public class Medication extends DomainResource { if (!(other instanceof Medication)) return false; Medication o = (Medication) other; - return compareValues(name, o.name, true) && compareValues(isBrand, o.isBrand, true) && compareValues(kind, o.kind, true) - ; + return compareValues(isBrand, o.isBrand, true) && compareValues(kind, o.kind, true); } public boolean isEmpty() { - return super.isEmpty() && (name == null || name.isEmpty()) && (code == null || code.isEmpty()) - && (isBrand == null || isBrand.isEmpty()) && (manufacturer == null || manufacturer.isEmpty()) - && (kind == null || kind.isEmpty()) && (product == null || product.isEmpty()) && (package_ == null || package_.isEmpty()) - ; + return super.isEmpty() && (code == null || code.isEmpty()) && (isBrand == null || isBrand.isEmpty()) + && (manufacturer == null || manufacturer.isEmpty()) && (kind == null || kind.isEmpty()) && (product == null || product.isEmpty()) + && (package_ == null || package_.isEmpty()); } @Override @@ -1288,8 +1228,6 @@ public class Medication extends DomainResource { public static final String SP_INGREDIENT = "ingredient"; @SearchParamDefinition(name="form", path="Medication.product.form", description="powder | tablets | carton +", type="token" ) public static final String SP_FORM = "form"; - @SearchParamDefinition(name="name", path="Medication.name", description="Common / Commercial name", type="string" ) - public static final String SP_NAME = "name"; @SearchParamDefinition(name="content", path="Medication.package.content.item", description="A product in the package", type="reference" ) public static final String SP_CONTENT = "content"; @SearchParamDefinition(name="manufacturer", path="Medication.manufacturer", description="Manufacturer of the item", type="reference" ) diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationAdministration.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationAdministration.java index 6eaaab9ce63..3e3bc61ace8 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationAdministration.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationAdministration.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; @@ -193,18 +193,18 @@ public class MedicationAdministration extends DomainResource { /** * The amount of the medication given at one administration event. Use this value when the administration is essentially an instantaneous event such as a swallowing a tablet or giving an injection. */ - @Child(name = "quantity", type = {Quantity.class}, order=5, min=0, max=1) + @Child(name = "quantity", type = {SimpleQuantity.class}, order=5, min=0, max=1) @Description(shortDefinition="Amount administered in one dose", formalDefinition="The amount of the medication given at one administration event. Use this value when the administration is essentially an instantaneous event such as a swallowing a tablet or giving an injection." ) - protected Quantity quantity; + protected SimpleQuantity quantity; /** * Identifies the speed with which the medication was introduced into the patient. Typically the rate for an infusion e.g. 200ml in 2 hours. May also be expressed as a rate per unit of time such as 100ml per hour - the duration is then not specified, or is specified in the quantity. */ - @Child(name = "rate", type = {Ratio.class}, order=6, min=0, max=1) + @Child(name = "rate", type = {Ratio.class, Range.class}, order=6, min=0, max=1) @Description(shortDefinition="Dose quantity per unit of time", formalDefinition="Identifies the speed with which the medication was introduced into the patient. Typically the rate for an infusion e.g. 200ml in 2 hours. May also be expressed as a rate per unit of time such as 100ml per hour - the duration is then not specified, or is specified in the quantity." ) - protected Ratio rate; + protected Type rate; - private static final long serialVersionUID = -358534919L; + private static final long serialVersionUID = -1465497586L; /* * Constructor @@ -337,12 +337,12 @@ public class MedicationAdministration extends DomainResource { /** * @return {@link #quantity} (The amount of the medication given at one administration event. Use this value when the administration is essentially an instantaneous event such as a swallowing a tablet or giving an injection.) */ - public Quantity getQuantity() { + public SimpleQuantity getQuantity() { if (this.quantity == null) if (Configuration.errorOnAutoCreate()) throw new Error("Attempt to auto-create MedicationAdministrationDosageComponent.quantity"); else if (Configuration.doAutoCreate()) - this.quantity = new Quantity(); // cc + this.quantity = new SimpleQuantity(); // cc return this.quantity; } @@ -353,7 +353,7 @@ public class MedicationAdministration extends DomainResource { /** * @param value {@link #quantity} (The amount of the medication given at one administration event. Use this value when the administration is essentially an instantaneous event such as a swallowing a tablet or giving an injection.) */ - public MedicationAdministrationDosageComponent setQuantity(Quantity value) { + public MedicationAdministrationDosageComponent setQuantity(SimpleQuantity value) { this.quantity = value; return this; } @@ -361,15 +361,36 @@ public class MedicationAdministration extends DomainResource { /** * @return {@link #rate} (Identifies the speed with which the medication was introduced into the patient. Typically the rate for an infusion e.g. 200ml in 2 hours. May also be expressed as a rate per unit of time such as 100ml per hour - the duration is then not specified, or is specified in the quantity.) */ - public Ratio getRate() { - if (this.rate == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicationAdministrationDosageComponent.rate"); - else if (Configuration.doAutoCreate()) - this.rate = new Ratio(); // cc + public Type getRate() { return this.rate; } + /** + * @return {@link #rate} (Identifies the speed with which the medication was introduced into the patient. Typically the rate for an infusion e.g. 200ml in 2 hours. May also be expressed as a rate per unit of time such as 100ml per hour - the duration is then not specified, or is specified in the quantity.) + */ + public Ratio getRateRatio() throws Exception { + if (!(this.rate instanceof Ratio)) + throw new Exception("Type mismatch: the type Ratio was expected, but "+this.rate.getClass().getName()+" was encountered"); + return (Ratio) this.rate; + } + + public boolean hasRateRatio() throws Exception { + return this.rate instanceof Ratio; + } + + /** + * @return {@link #rate} (Identifies the speed with which the medication was introduced into the patient. Typically the rate for an infusion e.g. 200ml in 2 hours. May also be expressed as a rate per unit of time such as 100ml per hour - the duration is then not specified, or is specified in the quantity.) + */ + public Range getRateRange() throws Exception { + if (!(this.rate instanceof Range)) + throw new Exception("Type mismatch: the type Range was expected, but "+this.rate.getClass().getName()+" was encountered"); + return (Range) this.rate; + } + + public boolean hasRateRange() throws Exception { + return this.rate instanceof Range; + } + public boolean hasRate() { return this.rate != null && !this.rate.isEmpty(); } @@ -377,7 +398,7 @@ public class MedicationAdministration extends DomainResource { /** * @param value {@link #rate} (Identifies the speed with which the medication was introduced into the patient. Typically the rate for an infusion e.g. 200ml in 2 hours. May also be expressed as a rate per unit of time such as 100ml per hour - the duration is then not specified, or is specified in the quantity.) */ - public MedicationAdministrationDosageComponent setRate(Ratio value) { + public MedicationAdministrationDosageComponent setRate(Type value) { this.rate = value; return this; } @@ -388,8 +409,8 @@ public class MedicationAdministration extends DomainResource { childrenList.add(new Property("site", "CodeableConcept", "A coded specification of the anatomic site where the medication first entered the body. E.g. 'left arm'.", 0, java.lang.Integer.MAX_VALUE, site)); childrenList.add(new Property("route", "CodeableConcept", "A code specifying the route or physiological path of administration of a therapeutic agent into or onto the patient. E.g. topical, intravenous, etc.", 0, java.lang.Integer.MAX_VALUE, route)); childrenList.add(new Property("method", "CodeableConcept", "A coded value indicating the method by which the medication was introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. Terminologies used often pre-coordinate this term with the route and or form of administration.", 0, java.lang.Integer.MAX_VALUE, method)); - childrenList.add(new Property("quantity", "Quantity", "The amount of the medication given at one administration event. Use this value when the administration is essentially an instantaneous event such as a swallowing a tablet or giving an injection.", 0, java.lang.Integer.MAX_VALUE, quantity)); - childrenList.add(new Property("rate", "Ratio", "Identifies the speed with which the medication was introduced into the patient. Typically the rate for an infusion e.g. 200ml in 2 hours. May also be expressed as a rate per unit of time such as 100ml per hour - the duration is then not specified, or is specified in the quantity.", 0, java.lang.Integer.MAX_VALUE, rate)); + childrenList.add(new Property("quantity", "SimpleQuantity", "The amount of the medication given at one administration event. Use this value when the administration is essentially an instantaneous event such as a swallowing a tablet or giving an injection.", 0, java.lang.Integer.MAX_VALUE, quantity)); + childrenList.add(new Property("rate[x]", "Ratio|Range", "Identifies the speed with which the medication was introduced into the patient. Typically the rate for an infusion e.g. 200ml in 2 hours. May also be expressed as a rate per unit of time such as 100ml per hour - the duration is then not specified, or is specified in the quantity.", 0, java.lang.Integer.MAX_VALUE, rate)); } public MedicationAdministrationDosageComponent copy() { @@ -487,14 +508,14 @@ public class MedicationAdministration extends DomainResource { /** * The original request, instruction or authority to perform the administration. */ - @Child(name = "prescription", type = {MedicationPrescription.class}, order=5, min=0, max=1) + @Child(name = "prescription", type = {MedicationOrder.class}, order=5, min=0, max=1) @Description(shortDefinition="Order administration performed against", formalDefinition="The original request, instruction or authority to perform the administration." ) protected Reference prescription; /** * The actual object that is the target of the reference (The original request, instruction or authority to perform the administration.) */ - protected MedicationPrescription prescriptionTarget; + protected MedicationOrder prescriptionTarget; /** * Set this to true if the record is saying that the medication was NOT administered. @@ -557,7 +578,7 @@ public class MedicationAdministration extends DomainResource { @Description(shortDefinition="Details of how medication was taken", formalDefinition="Indicates how the medication is/was used by the patient." ) protected MedicationAdministrationDosageComponent dosage; - private static final long serialVersionUID = 1854331183L; + private static final long serialVersionUID = -320745165L; /* * Constructor @@ -821,19 +842,19 @@ public class MedicationAdministration extends DomainResource { /** * @return {@link #prescription} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (The original request, instruction or authority to perform the administration.) */ - public MedicationPrescription getPrescriptionTarget() { + public MedicationOrder getPrescriptionTarget() { if (this.prescriptionTarget == null) if (Configuration.errorOnAutoCreate()) throw new Error("Attempt to auto-create MedicationAdministration.prescription"); else if (Configuration.doAutoCreate()) - this.prescriptionTarget = new MedicationPrescription(); // aa + this.prescriptionTarget = new MedicationOrder(); // aa return this.prescriptionTarget; } /** * @param value {@link #prescription} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (The original request, instruction or authority to perform the administration.) */ - public MedicationAdministration setPrescriptionTarget(MedicationPrescription value) { + public MedicationAdministration setPrescriptionTarget(MedicationOrder value) { this.prescriptionTarget = value; return this; } @@ -1194,7 +1215,7 @@ public class MedicationAdministration extends DomainResource { childrenList.add(new Property("patient", "Reference(Patient)", "The person or animal to whom the medication was given.", 0, java.lang.Integer.MAX_VALUE, patient)); childrenList.add(new Property("practitioner", "Reference(Practitioner)", "The individual who was responsible for giving the medication to the patient.", 0, java.lang.Integer.MAX_VALUE, practitioner)); childrenList.add(new Property("encounter", "Reference(Encounter)", "The visit or admission the or other contact between patient and health care provider the medication administration was performed as part of.", 0, java.lang.Integer.MAX_VALUE, encounter)); - childrenList.add(new Property("prescription", "Reference(MedicationPrescription)", "The original request, instruction or authority to perform the administration.", 0, java.lang.Integer.MAX_VALUE, prescription)); + childrenList.add(new Property("prescription", "Reference(MedicationOrder)", "The original request, instruction or authority to perform the administration.", 0, java.lang.Integer.MAX_VALUE, prescription)); childrenList.add(new Property("wasNotGiven", "boolean", "Set this to true if the record is saying that the medication was NOT administered.", 0, java.lang.Integer.MAX_VALUE, wasNotGiven)); childrenList.add(new Property("reasonNotGiven", "CodeableConcept", "A code indicating why the administration was not performed.", 0, java.lang.Integer.MAX_VALUE, reasonNotGiven)); childrenList.add(new Property("reasonGiven", "CodeableConcept", "A code indicating why the medication was given.", 0, java.lang.Integer.MAX_VALUE, reasonGiven)); @@ -1289,6 +1310,8 @@ public class MedicationAdministration extends DomainResource { @SearchParamDefinition(name="identifier", path="MedicationAdministration.identifier", description="Return administrations with this external identity", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + @SearchParamDefinition(name="code", path="MedicationAdministration.medicationCodeableConcept", description="Return administrations of this medication code", type="token" ) + public static final String SP_CODE = "code"; @SearchParamDefinition(name="prescription", path="MedicationAdministration.prescription", description="The identity of a prescription to list administrations from", type="reference" ) public static final String SP_PRESCRIPTION = "prescription"; @SearchParamDefinition(name="effectivetime", path="MedicationAdministration.effectiveTime[x]", description="Date administration happened (or did not happen)", type="date" ) @@ -1297,7 +1320,7 @@ public class MedicationAdministration extends DomainResource { public static final String SP_PRACTITIONER = "practitioner"; @SearchParamDefinition(name="patient", path="MedicationAdministration.patient", description="The identity of a patient to list administrations for", type="reference" ) public static final String SP_PATIENT = "patient"; - @SearchParamDefinition(name="medication", path="MedicationAdministration.medicationReference", description="Return administrations of this medication", type="reference" ) + @SearchParamDefinition(name="medication", path="MedicationAdministration.medicationReference", description="Return administrations of this medication resource", type="reference" ) public static final String SP_MEDICATION = "medication"; @SearchParamDefinition(name="encounter", path="MedicationAdministration.encounter", description="Return administrations that share this encounter", type="reference" ) public static final String SP_ENCOUNTER = "encounter"; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationDispense.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationDispense.java index 82046a817bd..9551b52c6ae 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationDispense.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationDispense.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; @@ -179,9 +179,9 @@ public class MedicationDispense extends DomainResource { /** * The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013". */ - @Child(name = "schedule", type = {DateTimeType.class, Period.class, Timing.class}, order=3, min=0, max=1) + @Child(name = "timing", type = {Timing.class}, order=3, min=0, max=1) @Description(shortDefinition="When medication should be administered", formalDefinition="The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. 'Every 8 hours'; 'Three times a day'; '1/2 an hour before breakfast for 10 days from 23-Dec 2011:'; '15 Oct 2013, 17 Oct 2013 and 1 Nov 2013'." ) - protected Type schedule; + protected Timing timing; /** * If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose. If a CodeableConcept is present, it indicates the pre-condition for taking the Medication. @@ -205,27 +205,25 @@ public class MedicationDispense extends DomainResource { protected CodeableConcept route; /** - * A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. - -Terminologies used often pre-coordinate this term with the route and or form of administration. + * A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. Terminologies used often pre-coordinate this term with the route and or form of administration. */ @Child(name = "method", type = {CodeableConcept.class}, order=7, min=0, max=1) - @Description(shortDefinition="Technique for administering medication", formalDefinition="A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV.\n\nTerminologies used often pre-coordinate this term with the route and or form of administration." ) + @Description(shortDefinition="Technique for administering medication", formalDefinition="A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. Terminologies used often pre-coordinate this term with the route and or form of administration." ) protected CodeableConcept method; /** * The amount of therapeutic or other substance given at one administration event. */ - @Child(name = "dose", type = {Range.class, Quantity.class}, order=8, min=0, max=1) + @Child(name = "dose", type = {Range.class, SimpleQuantity.class}, order=8, min=0, max=1) @Description(shortDefinition="Amount of medication per dose", formalDefinition="The amount of therapeutic or other substance given at one administration event." ) protected Type dose; /** * Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours. */ - @Child(name = "rate", type = {Ratio.class}, order=9, min=0, max=1) + @Child(name = "rate", type = {Ratio.class, Range.class}, order=9, min=0, max=1) @Description(shortDefinition="Amount of medication per unit of time", formalDefinition="Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours." ) - protected Ratio rate; + protected Type rate; /** * The maximum total quantity of a therapeutic substance that may be administered to a subject over the period of time, e.g. 1000mg in 24 hours. @@ -234,7 +232,7 @@ Terminologies used often pre-coordinate this term with the route and or form of @Description(shortDefinition="Upper limit on medication per unit of time", formalDefinition="The maximum total quantity of a therapeutic substance that may be administered to a subject over the period of time, e.g. 1000mg in 24 hours." ) protected Ratio maxDosePerPeriod; - private static final long serialVersionUID = -1409331091L; + private static final long serialVersionUID = -422348215L; /* * Constructor @@ -317,60 +315,26 @@ Terminologies used often pre-coordinate this term with the route and or form of } /** - * @return {@link #schedule} (The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013".) + * @return {@link #timing} (The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013".) */ - public Type getSchedule() { - return this.schedule; + public Timing getTiming() { + if (this.timing == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create MedicationDispenseDosageInstructionComponent.timing"); + else if (Configuration.doAutoCreate()) + this.timing = new Timing(); // cc + return this.timing; + } + + public boolean hasTiming() { + return this.timing != null && !this.timing.isEmpty(); } /** - * @return {@link #schedule} (The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013".) + * @param value {@link #timing} (The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013".) */ - public DateTimeType getScheduleDateTimeType() throws Exception { - if (!(this.schedule instanceof DateTimeType)) - throw new Exception("Type mismatch: the type DateTimeType was expected, but "+this.schedule.getClass().getName()+" was encountered"); - return (DateTimeType) this.schedule; - } - - public boolean hasScheduleDateTimeType() throws Exception { - return this.schedule instanceof DateTimeType; - } - - /** - * @return {@link #schedule} (The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013".) - */ - public Period getSchedulePeriod() throws Exception { - if (!(this.schedule instanceof Period)) - throw new Exception("Type mismatch: the type Period was expected, but "+this.schedule.getClass().getName()+" was encountered"); - return (Period) this.schedule; - } - - public boolean hasSchedulePeriod() throws Exception { - return this.schedule instanceof Period; - } - - /** - * @return {@link #schedule} (The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013".) - */ - public Timing getScheduleTiming() throws Exception { - if (!(this.schedule instanceof Timing)) - throw new Exception("Type mismatch: the type Timing was expected, but "+this.schedule.getClass().getName()+" was encountered"); - return (Timing) this.schedule; - } - - public boolean hasScheduleTiming() throws Exception { - return this.schedule instanceof Timing; - } - - public boolean hasSchedule() { - return this.schedule != null && !this.schedule.isEmpty(); - } - - /** - * @param value {@link #schedule} (The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013".) - */ - public MedicationDispenseDosageInstructionComponent setSchedule(Type value) { - this.schedule = value; + public MedicationDispenseDosageInstructionComponent setTiming(Timing value) { + this.timing = value; return this; } @@ -468,9 +432,7 @@ Terminologies used often pre-coordinate this term with the route and or form of } /** - * @return {@link #method} (A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. - -Terminologies used often pre-coordinate this term with the route and or form of administration.) + * @return {@link #method} (A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. Terminologies used often pre-coordinate this term with the route and or form of administration.) */ public CodeableConcept getMethod() { if (this.method == null) @@ -486,9 +448,7 @@ Terminologies used often pre-coordinate this term with the route and or form of } /** - * @param value {@link #method} (A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. - -Terminologies used often pre-coordinate this term with the route and or form of administration.) + * @param value {@link #method} (A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. Terminologies used often pre-coordinate this term with the route and or form of administration.) */ public MedicationDispenseDosageInstructionComponent setMethod(CodeableConcept value) { this.method = value; @@ -518,14 +478,14 @@ Terminologies used often pre-coordinate this term with the route and or form of /** * @return {@link #dose} (The amount of therapeutic or other substance given at one administration event.) */ - public Quantity getDoseQuantity() throws Exception { - if (!(this.dose instanceof Quantity)) - throw new Exception("Type mismatch: the type Quantity was expected, but "+this.dose.getClass().getName()+" was encountered"); - return (Quantity) this.dose; + public SimpleQuantity getDoseSimpleQuantity() throws Exception { + if (!(this.dose instanceof SimpleQuantity)) + throw new Exception("Type mismatch: the type SimpleQuantity was expected, but "+this.dose.getClass().getName()+" was encountered"); + return (SimpleQuantity) this.dose; } - public boolean hasDoseQuantity() throws Exception { - return this.dose instanceof Quantity; + public boolean hasDoseSimpleQuantity() throws Exception { + return this.dose instanceof SimpleQuantity; } public boolean hasDose() { @@ -543,15 +503,36 @@ Terminologies used often pre-coordinate this term with the route and or form of /** * @return {@link #rate} (Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours.) */ - public Ratio getRate() { - if (this.rate == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicationDispenseDosageInstructionComponent.rate"); - else if (Configuration.doAutoCreate()) - this.rate = new Ratio(); // cc + public Type getRate() { return this.rate; } + /** + * @return {@link #rate} (Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours.) + */ + public Ratio getRateRatio() throws Exception { + if (!(this.rate instanceof Ratio)) + throw new Exception("Type mismatch: the type Ratio was expected, but "+this.rate.getClass().getName()+" was encountered"); + return (Ratio) this.rate; + } + + public boolean hasRateRatio() throws Exception { + return this.rate instanceof Ratio; + } + + /** + * @return {@link #rate} (Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours.) + */ + public Range getRateRange() throws Exception { + if (!(this.rate instanceof Range)) + throw new Exception("Type mismatch: the type Range was expected, but "+this.rate.getClass().getName()+" was encountered"); + return (Range) this.rate; + } + + public boolean hasRateRange() throws Exception { + return this.rate instanceof Range; + } + public boolean hasRate() { return this.rate != null && !this.rate.isEmpty(); } @@ -559,7 +540,7 @@ Terminologies used often pre-coordinate this term with the route and or form of /** * @param value {@link #rate} (Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours.) */ - public MedicationDispenseDosageInstructionComponent setRate(Ratio value) { + public MedicationDispenseDosageInstructionComponent setRate(Type value) { this.rate = value; return this; } @@ -592,13 +573,13 @@ Terminologies used often pre-coordinate this term with the route and or form of super.listChildren(childrenList); childrenList.add(new Property("text", "string", "Free text dosage instructions can be used for cases where the instructions are too complex to code. When coded instructions are present, the free text instructions may still be present for display to humans taking or administering the medication.", 0, java.lang.Integer.MAX_VALUE, text)); childrenList.add(new Property("additionalInstructions", "CodeableConcept", "Additional instructions such as 'Swallow with plenty of water' which may or may not be coded.", 0, java.lang.Integer.MAX_VALUE, additionalInstructions)); - childrenList.add(new Property("schedule[x]", "dateTime|Period|Timing", "The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. 'Every 8 hours'; 'Three times a day'; '1/2 an hour before breakfast for 10 days from 23-Dec 2011:'; '15 Oct 2013, 17 Oct 2013 and 1 Nov 2013'.", 0, java.lang.Integer.MAX_VALUE, schedule)); + childrenList.add(new Property("timing", "Timing", "The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. 'Every 8 hours'; 'Three times a day'; '1/2 an hour before breakfast for 10 days from 23-Dec 2011:'; '15 Oct 2013, 17 Oct 2013 and 1 Nov 2013'.", 0, java.lang.Integer.MAX_VALUE, timing)); childrenList.add(new Property("asNeeded[x]", "boolean|CodeableConcept", "If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose. If a CodeableConcept is present, it indicates the pre-condition for taking the Medication.", 0, java.lang.Integer.MAX_VALUE, asNeeded)); childrenList.add(new Property("site", "CodeableConcept", "A coded specification of the anatomic site where the medication first enters the body.", 0, java.lang.Integer.MAX_VALUE, site)); childrenList.add(new Property("route", "CodeableConcept", "A code specifying the route or physiological path of administration of a therapeutic agent into or onto a subject.", 0, java.lang.Integer.MAX_VALUE, route)); - childrenList.add(new Property("method", "CodeableConcept", "A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV.\n\nTerminologies used often pre-coordinate this term with the route and or form of administration.", 0, java.lang.Integer.MAX_VALUE, method)); - childrenList.add(new Property("dose[x]", "Range|Quantity", "The amount of therapeutic or other substance given at one administration event.", 0, java.lang.Integer.MAX_VALUE, dose)); - childrenList.add(new Property("rate", "Ratio", "Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours.", 0, java.lang.Integer.MAX_VALUE, rate)); + childrenList.add(new Property("method", "CodeableConcept", "A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. Terminologies used often pre-coordinate this term with the route and or form of administration.", 0, java.lang.Integer.MAX_VALUE, method)); + childrenList.add(new Property("dose[x]", "Range|SimpleQuantity", "The amount of therapeutic or other substance given at one administration event.", 0, java.lang.Integer.MAX_VALUE, dose)); + childrenList.add(new Property("rate[x]", "Ratio|Range", "Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours.", 0, java.lang.Integer.MAX_VALUE, rate)); childrenList.add(new Property("maxDosePerPeriod", "Ratio", "The maximum total quantity of a therapeutic substance that may be administered to a subject over the period of time, e.g. 1000mg in 24 hours.", 0, java.lang.Integer.MAX_VALUE, maxDosePerPeriod)); } @@ -607,7 +588,7 @@ Terminologies used often pre-coordinate this term with the route and or form of copyValues(dst); dst.text = text == null ? null : text.copy(); dst.additionalInstructions = additionalInstructions == null ? null : additionalInstructions.copy(); - dst.schedule = schedule == null ? null : schedule.copy(); + dst.timing = timing == null ? null : timing.copy(); dst.asNeeded = asNeeded == null ? null : asNeeded.copy(); dst.site = site == null ? null : site.copy(); dst.route = route == null ? null : route.copy(); @@ -626,7 +607,7 @@ Terminologies used often pre-coordinate this term with the route and or form of return false; MedicationDispenseDosageInstructionComponent o = (MedicationDispenseDosageInstructionComponent) other; return compareDeep(text, o.text, true) && compareDeep(additionalInstructions, o.additionalInstructions, true) - && compareDeep(schedule, o.schedule, true) && compareDeep(asNeeded, o.asNeeded, true) && compareDeep(site, o.site, true) + && compareDeep(timing, o.timing, true) && compareDeep(asNeeded, o.asNeeded, true) && compareDeep(site, o.site, true) && compareDeep(route, o.route, true) && compareDeep(method, o.method, true) && compareDeep(dose, o.dose, true) && compareDeep(rate, o.rate, true) && compareDeep(maxDosePerPeriod, o.maxDosePerPeriod, true); } @@ -643,7 +624,7 @@ Terminologies used often pre-coordinate this term with the route and or form of public boolean isEmpty() { return super.isEmpty() && (text == null || text.isEmpty()) && (additionalInstructions == null || additionalInstructions.isEmpty()) - && (schedule == null || schedule.isEmpty()) && (asNeeded == null || asNeeded.isEmpty()) && (site == null || site.isEmpty()) + && (timing == null || timing.isEmpty()) && (asNeeded == null || asNeeded.isEmpty()) && (site == null || site.isEmpty()) && (route == null || route.isEmpty()) && (method == null || method.isEmpty()) && (dose == null || dose.isEmpty()) && (rate == null || rate.isEmpty()) && (maxDosePerPeriod == null || maxDosePerPeriod.isEmpty()) ; @@ -914,13 +895,13 @@ Terminologies used often pre-coordinate this term with the route and or form of /** * Indicates the medication order that is being dispensed against. */ - @Child(name = "authorizingPrescription", type = {MedicationPrescription.class}, order=4, min=0, max=Child.MAX_UNLIMITED) + @Child(name = "authorizingPrescription", type = {MedicationOrder.class}, order=4, min=0, max=Child.MAX_UNLIMITED) @Description(shortDefinition="Medication order that authorizes the dispense", formalDefinition="Indicates the medication order that is being dispensed against." ) protected List authorizingPrescription; /** * The actual objects that are the target of the reference (Indicates the medication order that is being dispensed against.) */ - protected List authorizingPrescriptionTarget; + protected List authorizingPrescriptionTarget; /** @@ -933,16 +914,16 @@ Terminologies used often pre-coordinate this term with the route and or form of /** * The amount of medication that has been dispensed. Includes unit of measure. */ - @Child(name = "quantity", type = {Quantity.class}, order=6, min=0, max=1) + @Child(name = "quantity", type = {SimpleQuantity.class}, order=6, min=0, max=1) @Description(shortDefinition="Amount dispensed", formalDefinition="The amount of medication that has been dispensed. Includes unit of measure." ) - protected Quantity quantity; + protected SimpleQuantity quantity; /** * The amount of medication expressed as a timing amount. */ - @Child(name = "daysSupply", type = {Quantity.class}, order=7, min=0, max=1) + @Child(name = "daysSupply", type = {SimpleQuantity.class}, order=7, min=0, max=1) @Description(shortDefinition="Days Supply", formalDefinition="The amount of medication expressed as a timing amount." ) - protected Quantity daysSupply; + protected SimpleQuantity daysSupply; /** * 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. @@ -1010,7 +991,7 @@ Terminologies used often pre-coordinate this term with the route and or form of @Description(shortDefinition="Deals with substitution of one medicine for another", formalDefinition="Indicates whether or not substitution was made as part of the dispense. In some cases substitution will be expected but doesn't happen, in other cases substitution is not expected but does happen. This block explains what substitition did or did not happen and why." ) protected MedicationDispenseSubstitutionComponent substitution; - private static final long serialVersionUID = -1930133151L; + private static final long serialVersionUID = -2071218407L; /* * Constructor @@ -1231,9 +1212,9 @@ Terminologies used often pre-coordinate this term with the route and or form of /** * @return {@link #authorizingPrescription} (The actual objects that are the target of the reference. The reference library doesn't populate this, but you can use this to hold the resources if you resolvethemt. Indicates the medication order that is being dispensed against.) */ - public List getAuthorizingPrescriptionTarget() { + public List getAuthorizingPrescriptionTarget() { if (this.authorizingPrescriptionTarget == null) - this.authorizingPrescriptionTarget = new ArrayList(); + this.authorizingPrescriptionTarget = new ArrayList(); return this.authorizingPrescriptionTarget; } @@ -1241,10 +1222,10 @@ Terminologies used often pre-coordinate this term with the route and or form of /** * @return {@link #authorizingPrescription} (Add an actual object that is the target of the reference. The reference library doesn't use these, but you can use this to hold the resources if you resolvethemt. Indicates the medication order that is being dispensed against.) */ - public MedicationPrescription addAuthorizingPrescriptionTarget() { - MedicationPrescription r = new MedicationPrescription(); + public MedicationOrder addAuthorizingPrescriptionTarget() { + MedicationOrder r = new MedicationOrder(); if (this.authorizingPrescriptionTarget == null) - this.authorizingPrescriptionTarget = new ArrayList(); + this.authorizingPrescriptionTarget = new ArrayList(); this.authorizingPrescriptionTarget.add(r); return r; } @@ -1276,12 +1257,12 @@ Terminologies used often pre-coordinate this term with the route and or form of /** * @return {@link #quantity} (The amount of medication that has been dispensed. Includes unit of measure.) */ - public Quantity getQuantity() { + public SimpleQuantity getQuantity() { if (this.quantity == null) if (Configuration.errorOnAutoCreate()) throw new Error("Attempt to auto-create MedicationDispense.quantity"); else if (Configuration.doAutoCreate()) - this.quantity = new Quantity(); // cc + this.quantity = new SimpleQuantity(); // cc return this.quantity; } @@ -1292,7 +1273,7 @@ Terminologies used often pre-coordinate this term with the route and or form of /** * @param value {@link #quantity} (The amount of medication that has been dispensed. Includes unit of measure.) */ - public MedicationDispense setQuantity(Quantity value) { + public MedicationDispense setQuantity(SimpleQuantity value) { this.quantity = value; return this; } @@ -1300,12 +1281,12 @@ Terminologies used often pre-coordinate this term with the route and or form of /** * @return {@link #daysSupply} (The amount of medication expressed as a timing amount.) */ - public Quantity getDaysSupply() { + public SimpleQuantity getDaysSupply() { if (this.daysSupply == null) if (Configuration.errorOnAutoCreate()) throw new Error("Attempt to auto-create MedicationDispense.daysSupply"); else if (Configuration.doAutoCreate()) - this.daysSupply = new Quantity(); // cc + this.daysSupply = new SimpleQuantity(); // cc return this.daysSupply; } @@ -1316,7 +1297,7 @@ Terminologies used often pre-coordinate this term with the route and or form of /** * @param value {@link #daysSupply} (The amount of medication expressed as a timing amount.) */ - public MedicationDispense setDaysSupply(Quantity value) { + public MedicationDispense setDaysSupply(SimpleQuantity value) { this.daysSupply = value; return this; } @@ -1676,10 +1657,10 @@ Terminologies used often pre-coordinate this term with the route and or form of childrenList.add(new Property("status", "code", "A code specifying the state of the set of dispense events.", 0, java.lang.Integer.MAX_VALUE, status)); childrenList.add(new Property("patient", "Reference(Patient)", "A link to a resource representing the person to whom the medication will be given.", 0, java.lang.Integer.MAX_VALUE, patient)); childrenList.add(new Property("dispenser", "Reference(Practitioner)", "The individual responsible for dispensing the medication.", 0, java.lang.Integer.MAX_VALUE, dispenser)); - childrenList.add(new Property("authorizingPrescription", "Reference(MedicationPrescription)", "Indicates the medication order that is being dispensed against.", 0, java.lang.Integer.MAX_VALUE, authorizingPrescription)); + childrenList.add(new Property("authorizingPrescription", "Reference(MedicationOrder)", "Indicates the medication order that is being dispensed against.", 0, java.lang.Integer.MAX_VALUE, authorizingPrescription)); childrenList.add(new Property("type", "CodeableConcept", "Indicates the type of dispensing event that is performed. Examples include: Trial Fill, Completion of Trial, Partial Fill, Emergency Fill, Samples, etc.", 0, java.lang.Integer.MAX_VALUE, type)); - childrenList.add(new Property("quantity", "Quantity", "The amount of medication that has been dispensed. Includes unit of measure.", 0, java.lang.Integer.MAX_VALUE, quantity)); - childrenList.add(new Property("daysSupply", "Quantity", "The amount of medication expressed as a timing amount.", 0, java.lang.Integer.MAX_VALUE, daysSupply)); + childrenList.add(new Property("quantity", "SimpleQuantity", "The amount of medication that has been dispensed. Includes unit of measure.", 0, java.lang.Integer.MAX_VALUE, quantity)); + childrenList.add(new Property("daysSupply", "SimpleQuantity", "The amount of medication expressed as a timing amount.", 0, java.lang.Integer.MAX_VALUE, daysSupply)); childrenList.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, java.lang.Integer.MAX_VALUE, medication)); childrenList.add(new Property("whenPrepared", "dateTime", "The time when the dispensed product was packaged and reviewed.", 0, java.lang.Integer.MAX_VALUE, whenPrepared)); childrenList.add(new Property("whenHandedOver", "dateTime", "The time the dispensed product was provided to the patient or their representative.", 0, java.lang.Integer.MAX_VALUE, whenHandedOver)); @@ -1770,19 +1751,15 @@ Terminologies used often pre-coordinate this term with the route and or form of return ResourceType.MedicationDispense; } - @SearchParamDefinition(name="dispenser", path="MedicationDispense.dispenser", description="Return all dispenses performed by a specific indiividual", type="reference" ) - public static final String SP_DISPENSER = "dispenser"; @SearchParamDefinition(name="identifier", path="MedicationDispense.identifier", description="Return dispenses with this external identity", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + @SearchParamDefinition(name="code", path="MedicationDispense.medicationCodeableConcept", description="Returns dispenses of this medicine code", type="token" ) + public static final String SP_CODE = "code"; @SearchParamDefinition(name="receiver", path="MedicationDispense.receiver", description="Who collected the medication", type="reference" ) public static final String SP_RECEIVER = "receiver"; - @SearchParamDefinition(name="prescription", path="MedicationDispense.authorizingPrescription", description="The identity of a prescription to list dispenses from", type="reference" ) - public static final String SP_PRESCRIPTION = "prescription"; - @SearchParamDefinition(name="patient", path="MedicationDispense.patient", description="The identity of a patient to list dispenses for", type="reference" ) - public static final String SP_PATIENT = "patient"; @SearchParamDefinition(name="destination", path="MedicationDispense.destination", description="Return dispenses that should be sent to a secific destination", type="reference" ) public static final String SP_DESTINATION = "destination"; - @SearchParamDefinition(name="medication", path="MedicationDispense.medicationReference", description="Returns dispenses of this medicine", type="reference" ) + @SearchParamDefinition(name="medication", path="MedicationDispense.medicationReference", description="Returns dispenses of this medicine resource", type="reference" ) public static final String SP_MEDICATION = "medication"; @SearchParamDefinition(name="responsibleparty", path="MedicationDispense.substitution.responsibleParty", description="Return all dispenses with the specified responsible party", type="reference" ) public static final String SP_RESPONSIBLEPARTY = "responsibleparty"; @@ -1792,6 +1769,12 @@ Terminologies used often pre-coordinate this term with the route and or form of public static final String SP_WHENHANDEDOVER = "whenhandedover"; @SearchParamDefinition(name="whenprepared", path="MedicationDispense.whenPrepared", description="Date when medication prepared", type="date" ) public static final String SP_WHENPREPARED = "whenprepared"; + @SearchParamDefinition(name="dispenser", path="MedicationDispense.dispenser", description="Return all dispenses performed by a specific indiividual", type="reference" ) + public static final String SP_DISPENSER = "dispenser"; + @SearchParamDefinition(name="prescription", path="MedicationDispense.authorizingPrescription", description="The identity of a prescription to list dispenses from", type="reference" ) + public static final String SP_PRESCRIPTION = "prescription"; + @SearchParamDefinition(name="patient", path="MedicationDispense.patient", description="The identity of a patient to list dispenses for", type="reference" ) + public static final String SP_PATIENT = "patient"; @SearchParamDefinition(name="status", path="MedicationDispense.status", description="Status of the dispense", type="token" ) public static final String SP_STATUS = "status"; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationPrescription.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationOrder.java similarity index 68% rename from hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationPrescription.java rename to hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationOrder.java index 99c00a02575..b7acd77d674 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationPrescription.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationOrder.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; @@ -41,12 +41,12 @@ import org.hl7.fhir.instance.model.annotations.Description; import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** - * An order for both supply of the medication and the instructions for administration of the medicine to a patient. + * An order for both supply of the medication and the instructions for administration of the medication to a patient. */ -@ResourceDef(name="MedicationPrescription", profile="http://hl7.org/fhir/Profile/MedicationPrescription") -public class MedicationPrescription extends DomainResource { +@ResourceDef(name="MedicationOrder", profile="http://hl7.org/fhir/Profile/MedicationOrder") +public class MedicationOrder extends DomainResource { - public enum MedicationPrescriptionStatus { + public enum MedicationOrderStatus { /** * The prescription is 'actionable', but not all actions that are implied by it have occurred yet. */ @@ -79,7 +79,7 @@ public class MedicationPrescription extends DomainResource { * added to help the parsers */ NULL; - public static MedicationPrescriptionStatus fromCode(String codeString) throws Exception { + public static MedicationOrderStatus fromCode(String codeString) throws Exception { if (codeString == null || "".equals(codeString)) return null; if ("active".equals(codeString)) @@ -96,7 +96,7 @@ public class MedicationPrescription extends DomainResource { return SUPERSEDED; if ("draft".equals(codeString)) return DRAFT; - throw new Exception("Unknown MedicationPrescriptionStatus code '"+codeString+"'"); + throw new Exception("Unknown MedicationOrderStatus code '"+codeString+"'"); } public String toCode() { switch (this) { @@ -148,48 +148,48 @@ public class MedicationPrescription extends DomainResource { } } - public static class MedicationPrescriptionStatusEnumFactory implements EnumFactory { - public MedicationPrescriptionStatus fromCode(String codeString) throws IllegalArgumentException { + public static class MedicationOrderStatusEnumFactory implements EnumFactory { + public MedicationOrderStatus fromCode(String codeString) throws IllegalArgumentException { if (codeString == null || "".equals(codeString)) if (codeString == null || "".equals(codeString)) return null; if ("active".equals(codeString)) - return MedicationPrescriptionStatus.ACTIVE; + return MedicationOrderStatus.ACTIVE; if ("on-hold".equals(codeString)) - return MedicationPrescriptionStatus.ONHOLD; + return MedicationOrderStatus.ONHOLD; if ("completed".equals(codeString)) - return MedicationPrescriptionStatus.COMPLETED; + return MedicationOrderStatus.COMPLETED; if ("entered-in-error".equals(codeString)) - return MedicationPrescriptionStatus.ENTEREDINERROR; + return MedicationOrderStatus.ENTEREDINERROR; if ("stopped".equals(codeString)) - return MedicationPrescriptionStatus.STOPPED; + return MedicationOrderStatus.STOPPED; if ("superseded".equals(codeString)) - return MedicationPrescriptionStatus.SUPERSEDED; + return MedicationOrderStatus.SUPERSEDED; if ("draft".equals(codeString)) - return MedicationPrescriptionStatus.DRAFT; - throw new IllegalArgumentException("Unknown MedicationPrescriptionStatus code '"+codeString+"'"); + return MedicationOrderStatus.DRAFT; + throw new IllegalArgumentException("Unknown MedicationOrderStatus code '"+codeString+"'"); } - public String toCode(MedicationPrescriptionStatus code) { - if (code == MedicationPrescriptionStatus.ACTIVE) + public String toCode(MedicationOrderStatus code) { + if (code == MedicationOrderStatus.ACTIVE) return "active"; - if (code == MedicationPrescriptionStatus.ONHOLD) + if (code == MedicationOrderStatus.ONHOLD) return "on-hold"; - if (code == MedicationPrescriptionStatus.COMPLETED) + if (code == MedicationOrderStatus.COMPLETED) return "completed"; - if (code == MedicationPrescriptionStatus.ENTEREDINERROR) + if (code == MedicationOrderStatus.ENTEREDINERROR) return "entered-in-error"; - if (code == MedicationPrescriptionStatus.STOPPED) + if (code == MedicationOrderStatus.STOPPED) return "stopped"; - if (code == MedicationPrescriptionStatus.SUPERSEDED) + if (code == MedicationOrderStatus.SUPERSEDED) return "superseded"; - if (code == MedicationPrescriptionStatus.DRAFT) + if (code == MedicationOrderStatus.DRAFT) return "draft"; return "?"; } } @Block() - public static class MedicationPrescriptionDosageInstructionComponent extends BackboneElement implements IBaseBackboneElement { + public static class MedicationOrderDosageInstructionComponent extends BackboneElement implements IBaseBackboneElement { /** * Free text dosage instructions can be used for cases where the instructions are too complex to code. When coded instructions are present, the free text instructions may still be present for display to humans taking or administering the medication. */ @@ -207,15 +207,15 @@ public class MedicationPrescription extends DomainResource { /** * The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013". */ - @Child(name = "scheduled", type = {DateTimeType.class, Period.class, Timing.class}, order=3, min=0, max=1) + @Child(name = "timing", type = {Timing.class}, order=3, min=0, max=1) @Description(shortDefinition="When medication should be administered", formalDefinition="The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. 'Every 8 hours'; 'Three times a day'; '1/2 an hour before breakfast for 10 days from 23-Dec 2011:'; '15 Oct 2013, 17 Oct 2013 and 1 Nov 2013'." ) - protected Type scheduled; + protected Timing timing; /** * If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose. If a CodeableConcept is present, it indicates the pre-condition for taking the Medication. */ @Child(name = "asNeeded", type = {BooleanType.class, CodeableConcept.class}, order=4, min=0, max=1) - @Description(shortDefinition="Take 'as needed' f(or x)", formalDefinition="If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose. If a CodeableConcept is present, it indicates the pre-condition for taking the Medication." ) + @Description(shortDefinition="Take 'as needed' (for x)", formalDefinition="If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose. If a CodeableConcept is present, it indicates the pre-condition for taking the Medication." ) protected Type asNeeded; /** @@ -233,27 +233,25 @@ public class MedicationPrescription extends DomainResource { protected CodeableConcept route; /** - * A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. - -Terminologies used often pre-coordinate this term with the route and or form of administration. + * A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. Terminologies used often pre-coordinate this term with the route and or form of administration. */ @Child(name = "method", type = {CodeableConcept.class}, order=7, min=0, max=1) - @Description(shortDefinition="Technique for administering medication", formalDefinition="A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV.\n\nTerminologies used often pre-coordinate this term with the route and or form of administration." ) + @Description(shortDefinition="Technique for administering medication", formalDefinition="A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. Terminologies used often pre-coordinate this term with the route and or form of administration." ) protected CodeableConcept method; /** * The amount of therapeutic or other substance given at one administration event. */ - @Child(name = "dose", type = {Range.class, Quantity.class}, order=8, min=0, max=1) + @Child(name = "dose", type = {Range.class, SimpleQuantity.class}, order=8, min=0, max=1) @Description(shortDefinition="Amount of medication per dose", formalDefinition="The amount of therapeutic or other substance given at one administration event." ) protected Type dose; /** * Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours. */ - @Child(name = "rate", type = {Ratio.class}, order=9, min=0, max=1) + @Child(name = "rate", type = {Ratio.class, Range.class}, order=9, min=0, max=1) @Description(shortDefinition="Amount of medication per unit of time", formalDefinition="Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours." ) - protected Ratio rate; + protected Type rate; /** * The maximum total quantity of a therapeutic substance that may be administered to a subject over the period of time. E.g. 1000mg in 24 hours. @@ -262,12 +260,12 @@ Terminologies used often pre-coordinate this term with the route and or form of @Description(shortDefinition="Upper limit on medication per unit of time", formalDefinition="The maximum total quantity of a therapeutic substance that may be administered to a subject over the period of time. E.g. 1000mg in 24 hours." ) protected Ratio maxDosePerPeriod; - private static final long serialVersionUID = -1144367815L; + private static final long serialVersionUID = -422348215L; /* * Constructor */ - public MedicationPrescriptionDosageInstructionComponent() { + public MedicationOrderDosageInstructionComponent() { super(); } @@ -277,7 +275,7 @@ Terminologies used often pre-coordinate this term with the route and or form of public StringType getTextElement() { if (this.text == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicationPrescriptionDosageInstructionComponent.text"); + throw new Error("Attempt to auto-create MedicationOrderDosageInstructionComponent.text"); else if (Configuration.doAutoCreate()) this.text = new StringType(); // bb return this.text; @@ -294,7 +292,7 @@ Terminologies used often pre-coordinate this term with the route and or form of /** * @param value {@link #text} (Free text dosage instructions can be used for cases where the instructions are too complex to code. When coded instructions are present, the free text instructions may still be present for display to humans taking or administering the medication.). This is the underlying object with id, value and extensions. The accessor "getText" gives direct access to the value */ - public MedicationPrescriptionDosageInstructionComponent setTextElement(StringType value) { + public MedicationOrderDosageInstructionComponent setTextElement(StringType value) { this.text = value; return this; } @@ -309,7 +307,7 @@ Terminologies used often pre-coordinate this term with the route and or form of /** * @param value Free text dosage instructions can be used for cases where the instructions are too complex to code. When coded instructions are present, the free text instructions may still be present for display to humans taking or administering the medication. */ - public MedicationPrescriptionDosageInstructionComponent setText(String value) { + public MedicationOrderDosageInstructionComponent setText(String value) { if (Utilities.noString(value)) this.text = null; else { @@ -326,7 +324,7 @@ Terminologies used often pre-coordinate this term with the route and or form of public CodeableConcept getAdditionalInstructions() { if (this.additionalInstructions == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicationPrescriptionDosageInstructionComponent.additionalInstructions"); + throw new Error("Attempt to auto-create MedicationOrderDosageInstructionComponent.additionalInstructions"); else if (Configuration.doAutoCreate()) this.additionalInstructions = new CodeableConcept(); // cc return this.additionalInstructions; @@ -339,66 +337,32 @@ Terminologies used often pre-coordinate this term with the route and or form of /** * @param value {@link #additionalInstructions} (Additional instructions such as "Swallow with plenty of water" which may or may not be coded.) */ - public MedicationPrescriptionDosageInstructionComponent setAdditionalInstructions(CodeableConcept value) { + public MedicationOrderDosageInstructionComponent setAdditionalInstructions(CodeableConcept value) { this.additionalInstructions = value; return this; } /** - * @return {@link #scheduled} (The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013".) + * @return {@link #timing} (The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013".) */ - public Type getScheduled() { - return this.scheduled; + public Timing getTiming() { + if (this.timing == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create MedicationOrderDosageInstructionComponent.timing"); + else if (Configuration.doAutoCreate()) + this.timing = new Timing(); // cc + return this.timing; + } + + public boolean hasTiming() { + return this.timing != null && !this.timing.isEmpty(); } /** - * @return {@link #scheduled} (The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013".) + * @param value {@link #timing} (The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013".) */ - public DateTimeType getScheduledDateTimeType() throws Exception { - if (!(this.scheduled instanceof DateTimeType)) - throw new Exception("Type mismatch: the type DateTimeType was expected, but "+this.scheduled.getClass().getName()+" was encountered"); - return (DateTimeType) this.scheduled; - } - - public boolean hasScheduledDateTimeType() throws Exception { - return this.scheduled instanceof DateTimeType; - } - - /** - * @return {@link #scheduled} (The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013".) - */ - public Period getScheduledPeriod() throws Exception { - if (!(this.scheduled instanceof Period)) - throw new Exception("Type mismatch: the type Period was expected, but "+this.scheduled.getClass().getName()+" was encountered"); - return (Period) this.scheduled; - } - - public boolean hasScheduledPeriod() throws Exception { - return this.scheduled instanceof Period; - } - - /** - * @return {@link #scheduled} (The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013".) - */ - public Timing getScheduledTiming() throws Exception { - if (!(this.scheduled instanceof Timing)) - throw new Exception("Type mismatch: the type Timing was expected, but "+this.scheduled.getClass().getName()+" was encountered"); - return (Timing) this.scheduled; - } - - public boolean hasScheduledTiming() throws Exception { - return this.scheduled instanceof Timing; - } - - public boolean hasScheduled() { - return this.scheduled != null && !this.scheduled.isEmpty(); - } - - /** - * @param value {@link #scheduled} (The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013".) - */ - public MedicationPrescriptionDosageInstructionComponent setScheduled(Type value) { - this.scheduled = value; + public MedicationOrderDosageInstructionComponent setTiming(Timing value) { + this.timing = value; return this; } @@ -442,7 +406,7 @@ Terminologies used often pre-coordinate this term with the route and or form of /** * @param value {@link #asNeeded} (If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose. If a CodeableConcept is present, it indicates the pre-condition for taking the Medication.) */ - public MedicationPrescriptionDosageInstructionComponent setAsNeeded(Type value) { + public MedicationOrderDosageInstructionComponent setAsNeeded(Type value) { this.asNeeded = value; return this; } @@ -453,7 +417,7 @@ Terminologies used often pre-coordinate this term with the route and or form of public CodeableConcept getSite() { if (this.site == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicationPrescriptionDosageInstructionComponent.site"); + throw new Error("Attempt to auto-create MedicationOrderDosageInstructionComponent.site"); else if (Configuration.doAutoCreate()) this.site = new CodeableConcept(); // cc return this.site; @@ -466,7 +430,7 @@ Terminologies used often pre-coordinate this term with the route and or form of /** * @param value {@link #site} (A coded specification of the anatomic site where the medication first enters the body.) */ - public MedicationPrescriptionDosageInstructionComponent setSite(CodeableConcept value) { + public MedicationOrderDosageInstructionComponent setSite(CodeableConcept value) { this.site = value; return this; } @@ -477,7 +441,7 @@ Terminologies used often pre-coordinate this term with the route and or form of public CodeableConcept getRoute() { if (this.route == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicationPrescriptionDosageInstructionComponent.route"); + throw new Error("Attempt to auto-create MedicationOrderDosageInstructionComponent.route"); else if (Configuration.doAutoCreate()) this.route = new CodeableConcept(); // cc return this.route; @@ -490,20 +454,18 @@ Terminologies used often pre-coordinate this term with the route and or form of /** * @param value {@link #route} (A code specifying the route or physiological path of administration of a therapeutic agent into or onto a patient.) */ - public MedicationPrescriptionDosageInstructionComponent setRoute(CodeableConcept value) { + public MedicationOrderDosageInstructionComponent setRoute(CodeableConcept value) { this.route = value; return this; } /** - * @return {@link #method} (A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. - -Terminologies used often pre-coordinate this term with the route and or form of administration.) + * @return {@link #method} (A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. Terminologies used often pre-coordinate this term with the route and or form of administration.) */ public CodeableConcept getMethod() { if (this.method == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicationPrescriptionDosageInstructionComponent.method"); + throw new Error("Attempt to auto-create MedicationOrderDosageInstructionComponent.method"); else if (Configuration.doAutoCreate()) this.method = new CodeableConcept(); // cc return this.method; @@ -514,11 +476,9 @@ Terminologies used often pre-coordinate this term with the route and or form of } /** - * @param value {@link #method} (A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. - -Terminologies used often pre-coordinate this term with the route and or form of administration.) + * @param value {@link #method} (A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. Terminologies used often pre-coordinate this term with the route and or form of administration.) */ - public MedicationPrescriptionDosageInstructionComponent setMethod(CodeableConcept value) { + public MedicationOrderDosageInstructionComponent setMethod(CodeableConcept value) { this.method = value; return this; } @@ -546,14 +506,14 @@ Terminologies used often pre-coordinate this term with the route and or form of /** * @return {@link #dose} (The amount of therapeutic or other substance given at one administration event.) */ - public Quantity getDoseQuantity() throws Exception { - if (!(this.dose instanceof Quantity)) - throw new Exception("Type mismatch: the type Quantity was expected, but "+this.dose.getClass().getName()+" was encountered"); - return (Quantity) this.dose; + public SimpleQuantity getDoseSimpleQuantity() throws Exception { + if (!(this.dose instanceof SimpleQuantity)) + throw new Exception("Type mismatch: the type SimpleQuantity was expected, but "+this.dose.getClass().getName()+" was encountered"); + return (SimpleQuantity) this.dose; } - public boolean hasDoseQuantity() throws Exception { - return this.dose instanceof Quantity; + public boolean hasDoseSimpleQuantity() throws Exception { + return this.dose instanceof SimpleQuantity; } public boolean hasDose() { @@ -563,7 +523,7 @@ Terminologies used often pre-coordinate this term with the route and or form of /** * @param value {@link #dose} (The amount of therapeutic or other substance given at one administration event.) */ - public MedicationPrescriptionDosageInstructionComponent setDose(Type value) { + public MedicationOrderDosageInstructionComponent setDose(Type value) { this.dose = value; return this; } @@ -571,15 +531,36 @@ Terminologies used often pre-coordinate this term with the route and or form of /** * @return {@link #rate} (Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours.) */ - public Ratio getRate() { - if (this.rate == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicationPrescriptionDosageInstructionComponent.rate"); - else if (Configuration.doAutoCreate()) - this.rate = new Ratio(); // cc + public Type getRate() { return this.rate; } + /** + * @return {@link #rate} (Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours.) + */ + public Ratio getRateRatio() throws Exception { + if (!(this.rate instanceof Ratio)) + throw new Exception("Type mismatch: the type Ratio was expected, but "+this.rate.getClass().getName()+" was encountered"); + return (Ratio) this.rate; + } + + public boolean hasRateRatio() throws Exception { + return this.rate instanceof Ratio; + } + + /** + * @return {@link #rate} (Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours.) + */ + public Range getRateRange() throws Exception { + if (!(this.rate instanceof Range)) + throw new Exception("Type mismatch: the type Range was expected, but "+this.rate.getClass().getName()+" was encountered"); + return (Range) this.rate; + } + + public boolean hasRateRange() throws Exception { + return this.rate instanceof Range; + } + public boolean hasRate() { return this.rate != null && !this.rate.isEmpty(); } @@ -587,7 +568,7 @@ Terminologies used often pre-coordinate this term with the route and or form of /** * @param value {@link #rate} (Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours.) */ - public MedicationPrescriptionDosageInstructionComponent setRate(Ratio value) { + public MedicationOrderDosageInstructionComponent setRate(Type value) { this.rate = value; return this; } @@ -598,7 +579,7 @@ Terminologies used often pre-coordinate this term with the route and or form of public Ratio getMaxDosePerPeriod() { if (this.maxDosePerPeriod == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicationPrescriptionDosageInstructionComponent.maxDosePerPeriod"); + throw new Error("Attempt to auto-create MedicationOrderDosageInstructionComponent.maxDosePerPeriod"); else if (Configuration.doAutoCreate()) this.maxDosePerPeriod = new Ratio(); // cc return this.maxDosePerPeriod; @@ -611,7 +592,7 @@ Terminologies used often pre-coordinate this term with the route and or form of /** * @param value {@link #maxDosePerPeriod} (The maximum total quantity of a therapeutic substance that may be administered to a subject over the period of time. E.g. 1000mg in 24 hours.) */ - public MedicationPrescriptionDosageInstructionComponent setMaxDosePerPeriod(Ratio value) { + public MedicationOrderDosageInstructionComponent setMaxDosePerPeriod(Ratio value) { this.maxDosePerPeriod = value; return this; } @@ -620,22 +601,22 @@ Terminologies used often pre-coordinate this term with the route and or form of super.listChildren(childrenList); childrenList.add(new Property("text", "string", "Free text dosage instructions can be used for cases where the instructions are too complex to code. When coded instructions are present, the free text instructions may still be present for display to humans taking or administering the medication.", 0, java.lang.Integer.MAX_VALUE, text)); childrenList.add(new Property("additionalInstructions", "CodeableConcept", "Additional instructions such as 'Swallow with plenty of water' which may or may not be coded.", 0, java.lang.Integer.MAX_VALUE, additionalInstructions)); - childrenList.add(new Property("scheduled[x]", "dateTime|Period|Timing", "The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. 'Every 8 hours'; 'Three times a day'; '1/2 an hour before breakfast for 10 days from 23-Dec 2011:'; '15 Oct 2013, 17 Oct 2013 and 1 Nov 2013'.", 0, java.lang.Integer.MAX_VALUE, scheduled)); + childrenList.add(new Property("timing", "Timing", "The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. 'Every 8 hours'; 'Three times a day'; '1/2 an hour before breakfast for 10 days from 23-Dec 2011:'; '15 Oct 2013, 17 Oct 2013 and 1 Nov 2013'.", 0, java.lang.Integer.MAX_VALUE, timing)); childrenList.add(new Property("asNeeded[x]", "boolean|CodeableConcept", "If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose. If a CodeableConcept is present, it indicates the pre-condition for taking the Medication.", 0, java.lang.Integer.MAX_VALUE, asNeeded)); childrenList.add(new Property("site", "CodeableConcept", "A coded specification of the anatomic site where the medication first enters the body.", 0, java.lang.Integer.MAX_VALUE, site)); childrenList.add(new Property("route", "CodeableConcept", "A code specifying the route or physiological path of administration of a therapeutic agent into or onto a patient.", 0, java.lang.Integer.MAX_VALUE, route)); - childrenList.add(new Property("method", "CodeableConcept", "A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV.\n\nTerminologies used often pre-coordinate this term with the route and or form of administration.", 0, java.lang.Integer.MAX_VALUE, method)); - childrenList.add(new Property("dose[x]", "Range|Quantity", "The amount of therapeutic or other substance given at one administration event.", 0, java.lang.Integer.MAX_VALUE, dose)); - childrenList.add(new Property("rate", "Ratio", "Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours.", 0, java.lang.Integer.MAX_VALUE, rate)); + childrenList.add(new Property("method", "CodeableConcept", "A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. Terminologies used often pre-coordinate this term with the route and or form of administration.", 0, java.lang.Integer.MAX_VALUE, method)); + childrenList.add(new Property("dose[x]", "Range|SimpleQuantity", "The amount of therapeutic or other substance given at one administration event.", 0, java.lang.Integer.MAX_VALUE, dose)); + childrenList.add(new Property("rate[x]", "Ratio|Range", "Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours.", 0, java.lang.Integer.MAX_VALUE, rate)); childrenList.add(new Property("maxDosePerPeriod", "Ratio", "The maximum total quantity of a therapeutic substance that may be administered to a subject over the period of time. E.g. 1000mg in 24 hours.", 0, java.lang.Integer.MAX_VALUE, maxDosePerPeriod)); } - public MedicationPrescriptionDosageInstructionComponent copy() { - MedicationPrescriptionDosageInstructionComponent dst = new MedicationPrescriptionDosageInstructionComponent(); + public MedicationOrderDosageInstructionComponent copy() { + MedicationOrderDosageInstructionComponent dst = new MedicationOrderDosageInstructionComponent(); copyValues(dst); dst.text = text == null ? null : text.copy(); dst.additionalInstructions = additionalInstructions == null ? null : additionalInstructions.copy(); - dst.scheduled = scheduled == null ? null : scheduled.copy(); + dst.timing = timing == null ? null : timing.copy(); dst.asNeeded = asNeeded == null ? null : asNeeded.copy(); dst.site = site == null ? null : site.copy(); dst.route = route == null ? null : route.copy(); @@ -650,11 +631,11 @@ Terminologies used often pre-coordinate this term with the route and or form of public boolean equalsDeep(Base other) { if (!super.equalsDeep(other)) return false; - if (!(other instanceof MedicationPrescriptionDosageInstructionComponent)) + if (!(other instanceof MedicationOrderDosageInstructionComponent)) return false; - MedicationPrescriptionDosageInstructionComponent o = (MedicationPrescriptionDosageInstructionComponent) other; + MedicationOrderDosageInstructionComponent o = (MedicationOrderDosageInstructionComponent) other; return compareDeep(text, o.text, true) && compareDeep(additionalInstructions, o.additionalInstructions, true) - && compareDeep(scheduled, o.scheduled, true) && compareDeep(asNeeded, o.asNeeded, true) && compareDeep(site, o.site, true) + && compareDeep(timing, o.timing, true) && compareDeep(asNeeded, o.asNeeded, true) && compareDeep(site, o.site, true) && compareDeep(route, o.route, true) && compareDeep(method, o.method, true) && compareDeep(dose, o.dose, true) && compareDeep(rate, o.rate, true) && compareDeep(maxDosePerPeriod, o.maxDosePerPeriod, true); } @@ -663,24 +644,24 @@ Terminologies used often pre-coordinate this term with the route and or form of public boolean equalsShallow(Base other) { if (!super.equalsShallow(other)) return false; - if (!(other instanceof MedicationPrescriptionDosageInstructionComponent)) + if (!(other instanceof MedicationOrderDosageInstructionComponent)) return false; - MedicationPrescriptionDosageInstructionComponent o = (MedicationPrescriptionDosageInstructionComponent) other; + MedicationOrderDosageInstructionComponent o = (MedicationOrderDosageInstructionComponent) other; return compareValues(text, o.text, true); } public boolean isEmpty() { return super.isEmpty() && (text == null || text.isEmpty()) && (additionalInstructions == null || additionalInstructions.isEmpty()) - && (scheduled == null || scheduled.isEmpty()) && (asNeeded == null || asNeeded.isEmpty()) - && (site == null || site.isEmpty()) && (route == null || route.isEmpty()) && (method == null || method.isEmpty()) - && (dose == null || dose.isEmpty()) && (rate == null || rate.isEmpty()) && (maxDosePerPeriod == null || maxDosePerPeriod.isEmpty()) + && (timing == null || timing.isEmpty()) && (asNeeded == null || asNeeded.isEmpty()) && (site == null || site.isEmpty()) + && (route == null || route.isEmpty()) && (method == null || method.isEmpty()) && (dose == null || dose.isEmpty()) + && (rate == null || rate.isEmpty()) && (maxDosePerPeriod == null || maxDosePerPeriod.isEmpty()) ; } } @Block() - public static class MedicationPrescriptionDispenseComponent extends BackboneElement implements IBaseBackboneElement { + public static class MedicationOrderDispenseComponent extends BackboneElement implements IBaseBackboneElement { /** * Identifies the medication being administered. This is a link to a resource that represents the medication which may be the details of the medication or simply an attribute carrying a code that identifies the medication from a known list of medications. */ @@ -689,43 +670,39 @@ Terminologies used often pre-coordinate this term with the route and or form of protected Type medication; /** - * Design Comments: This indicates the validity period of a prescription (stale dating the Prescription) -It reflects the prescriber perspective for the validity of the prescription. Dispenses must not be made against the prescription outside of this period. The lower-bound of the Dispensing Window signifies the earliest date that the prescription can be filled for the first time. If an upper-bound is not specified then the Prescription is open-ended or will default to a stale-date based on regulations. -Rationale: Indicates when the Prescription becomes valid, and when it ceases to be a dispensable Prescription. + * Design Comments: This indicates the validity period of a prescription (stale dating the Prescription) It reflects the prescriber perspective for the validity of the prescription. Dispenses must not be made against the prescription outside of this period. The lower-bound of the Dispensing Window signifies the earliest date that the prescription can be filled for the first time. If an upper-bound is not specified then the Prescription is open-ended or will default to a stale-date based on regulations. Rationale: Indicates when the Prescription becomes valid, and when it ceases to be a dispensable Prescription. */ @Child(name = "validityPeriod", type = {Period.class}, order=2, min=0, max=1) - @Description(shortDefinition="Time period supply is authorized for", formalDefinition="Design Comments: This indicates the validity period of a prescription (stale dating the Prescription) \nIt reflects the prescriber perspective for the validity of the prescription. Dispenses must not be made against the prescription outside of this period. The lower-bound of the Dispensing Window signifies the earliest date that the prescription can be filled for the first time. If an upper-bound is not specified then the Prescription is open-ended or will default to a stale-date based on regulations. \nRationale: Indicates when the Prescription becomes valid, and when it ceases to be a dispensable Prescription." ) + @Description(shortDefinition="Time period supply is authorized for", formalDefinition="Design Comments: This indicates the validity period of a prescription (stale dating the Prescription) It reflects the prescriber perspective for the validity of the prescription. Dispenses must not be made against the prescription outside of this period. The lower-bound of the Dispensing Window signifies the earliest date that the prescription can be filled for the first time. If an upper-bound is not specified then the Prescription is open-ended or will default to a stale-date based on regulations. Rationale: Indicates when the Prescription becomes valid, and when it ceases to be a dispensable Prescription." ) protected Period validityPeriod; /** - * An integer indicating the number of repeats of the Dispense. -UsageNotes: For example, the number of times the prescribed quantity is to be supplied including the initial standard fill. + * An integer indicating the number of repeats of the Dispense. UsageNotes: For example, the number of times the prescribed quantity is to be supplied including the initial standard fill. */ @Child(name = "numberOfRepeatsAllowed", type = {PositiveIntType.class}, order=3, min=0, max=1) - @Description(shortDefinition="# of refills authorized", formalDefinition="An integer indicating the number of repeats of the Dispense. \nUsageNotes: For example, the number of times the prescribed quantity is to be supplied including the initial standard fill." ) + @Description(shortDefinition="# of refills authorized", formalDefinition="An integer indicating the number of repeats of the Dispense. UsageNotes: For example, the number of times the prescribed quantity is to be supplied including the initial standard fill." ) protected PositiveIntType numberOfRepeatsAllowed; /** * The amount that is to be dispensed for one fill. */ - @Child(name = "quantity", type = {Quantity.class}, order=4, min=0, max=1) + @Child(name = "quantity", type = {SimpleQuantity.class}, order=4, min=0, max=1) @Description(shortDefinition="Amount of medication to supply per dispense", formalDefinition="The amount that is to be dispensed for one fill." ) - protected Quantity quantity; + protected SimpleQuantity quantity; /** - * 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. -In some situations, this attribute may be used instead of quantity to identify the amount supplied by how long it is expected to last, rather than the physical quantity issued, e.g. 90 days supply of medication (based on an ordered dosage) When possible, it is always better to specify quantity, as this tends to be more precise. expectedSupplyDuration will always be an estimate that can be influenced by external factors. + * 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. In some situations, this attribute may be used instead of quantity to identify the amount supplied by how long it is expected to last, rather than the physical quantity issued, e.g. 90 days supply of medication (based on an ordered dosage) When possible, it is always better to specify quantity, as this tends to be more precise. expectedSupplyDuration will always be an estimate that can be influenced by external factors. */ @Child(name = "expectedSupplyDuration", type = {Duration.class}, order=5, min=0, max=1) - @Description(shortDefinition="Days supply per dispense", formalDefinition="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. \nIn some situations, this attribute may be used instead of quantity to identify the amount supplied by how long it is expected to last, rather than the physical quantity issued, e.g. 90 days supply of medication (based on an ordered dosage) When possible, it is always better to specify quantity, as this tends to be more precise. expectedSupplyDuration will always be an estimate that can be influenced by external factors." ) + @Description(shortDefinition="Days supply per dispense", formalDefinition="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. In some situations, this attribute may be used instead of quantity to identify the amount supplied by how long it is expected to last, rather than the physical quantity issued, e.g. 90 days supply of medication (based on an ordered dosage) When possible, it is always better to specify quantity, as this tends to be more precise. expectedSupplyDuration will always be an estimate that can be influenced by external factors." ) protected Duration expectedSupplyDuration; - private static final long serialVersionUID = 312252966L; + private static final long serialVersionUID = -1690502728L; /* * Constructor */ - public MedicationPrescriptionDispenseComponent() { + public MedicationOrderDispenseComponent() { super(); } @@ -769,20 +746,18 @@ In some situations, this attribute may be used instead of quantity to identify t /** * @param value {@link #medication} (Identifies the medication being administered. This is a link to a resource that represents the medication which may be the details of the medication or simply an attribute carrying a code that identifies the medication from a known list of medications.) */ - public MedicationPrescriptionDispenseComponent setMedication(Type value) { + public MedicationOrderDispenseComponent setMedication(Type value) { this.medication = value; return this; } /** - * @return {@link #validityPeriod} (Design Comments: This indicates the validity period of a prescription (stale dating the Prescription) -It reflects the prescriber perspective for the validity of the prescription. Dispenses must not be made against the prescription outside of this period. The lower-bound of the Dispensing Window signifies the earliest date that the prescription can be filled for the first time. If an upper-bound is not specified then the Prescription is open-ended or will default to a stale-date based on regulations. -Rationale: Indicates when the Prescription becomes valid, and when it ceases to be a dispensable Prescription.) + * @return {@link #validityPeriod} (Design Comments: This indicates the validity period of a prescription (stale dating the Prescription) It reflects the prescriber perspective for the validity of the prescription. Dispenses must not be made against the prescription outside of this period. The lower-bound of the Dispensing Window signifies the earliest date that the prescription can be filled for the first time. If an upper-bound is not specified then the Prescription is open-ended or will default to a stale-date based on regulations. Rationale: Indicates when the Prescription becomes valid, and when it ceases to be a dispensable Prescription.) */ public Period getValidityPeriod() { if (this.validityPeriod == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicationPrescriptionDispenseComponent.validityPeriod"); + throw new Error("Attempt to auto-create MedicationOrderDispenseComponent.validityPeriod"); else if (Configuration.doAutoCreate()) this.validityPeriod = new Period(); // cc return this.validityPeriod; @@ -793,23 +768,20 @@ Rationale: Indicates when the Prescription becomes valid, and when it ceases to } /** - * @param value {@link #validityPeriod} (Design Comments: This indicates the validity period of a prescription (stale dating the Prescription) -It reflects the prescriber perspective for the validity of the prescription. Dispenses must not be made against the prescription outside of this period. The lower-bound of the Dispensing Window signifies the earliest date that the prescription can be filled for the first time. If an upper-bound is not specified then the Prescription is open-ended or will default to a stale-date based on regulations. -Rationale: Indicates when the Prescription becomes valid, and when it ceases to be a dispensable Prescription.) + * @param value {@link #validityPeriod} (Design Comments: This indicates the validity period of a prescription (stale dating the Prescription) It reflects the prescriber perspective for the validity of the prescription. Dispenses must not be made against the prescription outside of this period. The lower-bound of the Dispensing Window signifies the earliest date that the prescription can be filled for the first time. If an upper-bound is not specified then the Prescription is open-ended or will default to a stale-date based on regulations. Rationale: Indicates when the Prescription becomes valid, and when it ceases to be a dispensable Prescription.) */ - public MedicationPrescriptionDispenseComponent setValidityPeriod(Period value) { + public MedicationOrderDispenseComponent setValidityPeriod(Period value) { this.validityPeriod = value; return this; } /** - * @return {@link #numberOfRepeatsAllowed} (An integer indicating the number of repeats of the Dispense. -UsageNotes: For example, the number of times the prescribed quantity is to be supplied including the initial standard fill.). This is the underlying object with id, value and extensions. The accessor "getNumberOfRepeatsAllowed" gives direct access to the value + * @return {@link #numberOfRepeatsAllowed} (An integer indicating the number of repeats of the Dispense. UsageNotes: For example, the number of times the prescribed quantity is to be supplied including the initial standard fill.). This is the underlying object with id, value and extensions. The accessor "getNumberOfRepeatsAllowed" gives direct access to the value */ public PositiveIntType getNumberOfRepeatsAllowedElement() { if (this.numberOfRepeatsAllowed == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicationPrescriptionDispenseComponent.numberOfRepeatsAllowed"); + throw new Error("Attempt to auto-create MedicationOrderDispenseComponent.numberOfRepeatsAllowed"); else if (Configuration.doAutoCreate()) this.numberOfRepeatsAllowed = new PositiveIntType(); // bb return this.numberOfRepeatsAllowed; @@ -824,27 +796,24 @@ UsageNotes: For example, the number of times the prescribed quantity is to be su } /** - * @param value {@link #numberOfRepeatsAllowed} (An integer indicating the number of repeats of the Dispense. -UsageNotes: For example, the number of times the prescribed quantity is to be supplied including the initial standard fill.). This is the underlying object with id, value and extensions. The accessor "getNumberOfRepeatsAllowed" gives direct access to the value + * @param value {@link #numberOfRepeatsAllowed} (An integer indicating the number of repeats of the Dispense. UsageNotes: For example, the number of times the prescribed quantity is to be supplied including the initial standard fill.). This is the underlying object with id, value and extensions. The accessor "getNumberOfRepeatsAllowed" gives direct access to the value */ - public MedicationPrescriptionDispenseComponent setNumberOfRepeatsAllowedElement(PositiveIntType value) { + public MedicationOrderDispenseComponent setNumberOfRepeatsAllowedElement(PositiveIntType value) { this.numberOfRepeatsAllowed = value; return this; } /** - * @return An integer indicating the number of repeats of the Dispense. -UsageNotes: For example, the number of times the prescribed quantity is to be supplied including the initial standard fill. + * @return An integer indicating the number of repeats of the Dispense. UsageNotes: For example, the number of times the prescribed quantity is to be supplied including the initial standard fill. */ public int getNumberOfRepeatsAllowed() { return this.numberOfRepeatsAllowed == null || this.numberOfRepeatsAllowed.isEmpty() ? 0 : this.numberOfRepeatsAllowed.getValue(); } /** - * @param value An integer indicating the number of repeats of the Dispense. -UsageNotes: For example, the number of times the prescribed quantity is to be supplied including the initial standard fill. + * @param value An integer indicating the number of repeats of the Dispense. UsageNotes: For example, the number of times the prescribed quantity is to be supplied including the initial standard fill. */ - public MedicationPrescriptionDispenseComponent setNumberOfRepeatsAllowed(int value) { + public MedicationOrderDispenseComponent setNumberOfRepeatsAllowed(int value) { if (this.numberOfRepeatsAllowed == null) this.numberOfRepeatsAllowed = new PositiveIntType(); this.numberOfRepeatsAllowed.setValue(value); @@ -854,12 +823,12 @@ UsageNotes: For example, the number of times the prescribed quantity is to be su /** * @return {@link #quantity} (The amount that is to be dispensed for one fill.) */ - public Quantity getQuantity() { + public SimpleQuantity getQuantity() { if (this.quantity == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicationPrescriptionDispenseComponent.quantity"); + throw new Error("Attempt to auto-create MedicationOrderDispenseComponent.quantity"); else if (Configuration.doAutoCreate()) - this.quantity = new Quantity(); // cc + this.quantity = new SimpleQuantity(); // cc return this.quantity; } @@ -870,19 +839,18 @@ UsageNotes: For example, the number of times the prescribed quantity is to be su /** * @param value {@link #quantity} (The amount that is to be dispensed for one fill.) */ - public MedicationPrescriptionDispenseComponent setQuantity(Quantity value) { + public MedicationOrderDispenseComponent setQuantity(SimpleQuantity value) { this.quantity = value; return this; } /** - * @return {@link #expectedSupplyDuration} (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. -In some situations, this attribute may be used instead of quantity to identify the amount supplied by how long it is expected to last, rather than the physical quantity issued, e.g. 90 days supply of medication (based on an ordered dosage) When possible, it is always better to specify quantity, as this tends to be more precise. expectedSupplyDuration will always be an estimate that can be influenced by external factors.) + * @return {@link #expectedSupplyDuration} (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. In some situations, this attribute may be used instead of quantity to identify the amount supplied by how long it is expected to last, rather than the physical quantity issued, e.g. 90 days supply of medication (based on an ordered dosage) When possible, it is always better to specify quantity, as this tends to be more precise. expectedSupplyDuration will always be an estimate that can be influenced by external factors.) */ public Duration getExpectedSupplyDuration() { if (this.expectedSupplyDuration == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicationPrescriptionDispenseComponent.expectedSupplyDuration"); + throw new Error("Attempt to auto-create MedicationOrderDispenseComponent.expectedSupplyDuration"); else if (Configuration.doAutoCreate()) this.expectedSupplyDuration = new Duration(); // cc return this.expectedSupplyDuration; @@ -893,10 +861,9 @@ In some situations, this attribute may be used instead of quantity to identify t } /** - * @param value {@link #expectedSupplyDuration} (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. -In some situations, this attribute may be used instead of quantity to identify the amount supplied by how long it is expected to last, rather than the physical quantity issued, e.g. 90 days supply of medication (based on an ordered dosage) When possible, it is always better to specify quantity, as this tends to be more precise. expectedSupplyDuration will always be an estimate that can be influenced by external factors.) + * @param value {@link #expectedSupplyDuration} (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. In some situations, this attribute may be used instead of quantity to identify the amount supplied by how long it is expected to last, rather than the physical quantity issued, e.g. 90 days supply of medication (based on an ordered dosage) When possible, it is always better to specify quantity, as this tends to be more precise. expectedSupplyDuration will always be an estimate that can be influenced by external factors.) */ - public MedicationPrescriptionDispenseComponent setExpectedSupplyDuration(Duration value) { + public MedicationOrderDispenseComponent setExpectedSupplyDuration(Duration value) { this.expectedSupplyDuration = value; return this; } @@ -904,14 +871,14 @@ In some situations, this attribute may be used instead of quantity to identify t protected void listChildren(List childrenList) { super.listChildren(childrenList); childrenList.add(new Property("medication[x]", "CodeableConcept|Reference(Medication)", "Identifies the medication being administered. This is a link to a resource that represents the medication which may be the details of the medication or simply an attribute carrying a code that identifies the medication from a known list of medications.", 0, java.lang.Integer.MAX_VALUE, medication)); - childrenList.add(new Property("validityPeriod", "Period", "Design Comments: This indicates the validity period of a prescription (stale dating the Prescription) \nIt reflects the prescriber perspective for the validity of the prescription. Dispenses must not be made against the prescription outside of this period. The lower-bound of the Dispensing Window signifies the earliest date that the prescription can be filled for the first time. If an upper-bound is not specified then the Prescription is open-ended or will default to a stale-date based on regulations. \nRationale: Indicates when the Prescription becomes valid, and when it ceases to be a dispensable Prescription.", 0, java.lang.Integer.MAX_VALUE, validityPeriod)); - childrenList.add(new Property("numberOfRepeatsAllowed", "positiveInt", "An integer indicating the number of repeats of the Dispense. \nUsageNotes: For example, the number of times the prescribed quantity is to be supplied including the initial standard fill.", 0, java.lang.Integer.MAX_VALUE, numberOfRepeatsAllowed)); - childrenList.add(new Property("quantity", "Quantity", "The amount that is to be dispensed for one fill.", 0, java.lang.Integer.MAX_VALUE, quantity)); - childrenList.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. \nIn some situations, this attribute may be used instead of quantity to identify the amount supplied by how long it is expected to last, rather than the physical quantity issued, e.g. 90 days supply of medication (based on an ordered dosage) When possible, it is always better to specify quantity, as this tends to be more precise. expectedSupplyDuration will always be an estimate that can be influenced by external factors.", 0, java.lang.Integer.MAX_VALUE, expectedSupplyDuration)); + childrenList.add(new Property("validityPeriod", "Period", "Design Comments: This indicates the validity period of a prescription (stale dating the Prescription) It reflects the prescriber perspective for the validity of the prescription. Dispenses must not be made against the prescription outside of this period. The lower-bound of the Dispensing Window signifies the earliest date that the prescription can be filled for the first time. If an upper-bound is not specified then the Prescription is open-ended or will default to a stale-date based on regulations. Rationale: Indicates when the Prescription becomes valid, and when it ceases to be a dispensable Prescription.", 0, java.lang.Integer.MAX_VALUE, validityPeriod)); + childrenList.add(new Property("numberOfRepeatsAllowed", "positiveInt", "An integer indicating the number of repeats of the Dispense. UsageNotes: For example, the number of times the prescribed quantity is to be supplied including the initial standard fill.", 0, java.lang.Integer.MAX_VALUE, numberOfRepeatsAllowed)); + childrenList.add(new Property("quantity", "SimpleQuantity", "The amount that is to be dispensed for one fill.", 0, java.lang.Integer.MAX_VALUE, quantity)); + childrenList.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. In some situations, this attribute may be used instead of quantity to identify the amount supplied by how long it is expected to last, rather than the physical quantity issued, e.g. 90 days supply of medication (based on an ordered dosage) When possible, it is always better to specify quantity, as this tends to be more precise. expectedSupplyDuration will always be an estimate that can be influenced by external factors.", 0, java.lang.Integer.MAX_VALUE, expectedSupplyDuration)); } - public MedicationPrescriptionDispenseComponent copy() { - MedicationPrescriptionDispenseComponent dst = new MedicationPrescriptionDispenseComponent(); + public MedicationOrderDispenseComponent copy() { + MedicationOrderDispenseComponent dst = new MedicationOrderDispenseComponent(); copyValues(dst); dst.medication = medication == null ? null : medication.copy(); dst.validityPeriod = validityPeriod == null ? null : validityPeriod.copy(); @@ -925,9 +892,9 @@ In some situations, this attribute may be used instead of quantity to identify t public boolean equalsDeep(Base other) { if (!super.equalsDeep(other)) return false; - if (!(other instanceof MedicationPrescriptionDispenseComponent)) + if (!(other instanceof MedicationOrderDispenseComponent)) return false; - MedicationPrescriptionDispenseComponent o = (MedicationPrescriptionDispenseComponent) other; + MedicationOrderDispenseComponent o = (MedicationOrderDispenseComponent) other; return compareDeep(medication, o.medication, true) && compareDeep(validityPeriod, o.validityPeriod, true) && compareDeep(numberOfRepeatsAllowed, o.numberOfRepeatsAllowed, true) && compareDeep(quantity, o.quantity, true) && compareDeep(expectedSupplyDuration, o.expectedSupplyDuration, true); @@ -937,9 +904,9 @@ In some situations, this attribute may be used instead of quantity to identify t public boolean equalsShallow(Base other) { if (!super.equalsShallow(other)) return false; - if (!(other instanceof MedicationPrescriptionDispenseComponent)) + if (!(other instanceof MedicationOrderDispenseComponent)) return false; - MedicationPrescriptionDispenseComponent o = (MedicationPrescriptionDispenseComponent) other; + MedicationOrderDispenseComponent o = (MedicationOrderDispenseComponent) other; return compareValues(numberOfRepeatsAllowed, o.numberOfRepeatsAllowed, true); } @@ -952,7 +919,7 @@ In some situations, this attribute may be used instead of quantity to identify t } @Block() - public static class MedicationPrescriptionSubstitutionComponent extends BackboneElement implements IBaseBackboneElement { + public static class MedicationOrderSubstitutionComponent extends BackboneElement implements IBaseBackboneElement { /** * A code signifying whether a different drug should be dispensed from what was prescribed. */ @@ -972,14 +939,14 @@ In some situations, this attribute may be used instead of quantity to identify t /* * Constructor */ - public MedicationPrescriptionSubstitutionComponent() { + public MedicationOrderSubstitutionComponent() { super(); } /* * Constructor */ - public MedicationPrescriptionSubstitutionComponent(CodeableConcept type) { + public MedicationOrderSubstitutionComponent(CodeableConcept type) { super(); this.type = type; } @@ -990,7 +957,7 @@ In some situations, this attribute may be used instead of quantity to identify t public CodeableConcept getType() { if (this.type == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicationPrescriptionSubstitutionComponent.type"); + throw new Error("Attempt to auto-create MedicationOrderSubstitutionComponent.type"); else if (Configuration.doAutoCreate()) this.type = new CodeableConcept(); // cc return this.type; @@ -1003,7 +970,7 @@ In some situations, this attribute may be used instead of quantity to identify t /** * @param value {@link #type} (A code signifying whether a different drug should be dispensed from what was prescribed.) */ - public MedicationPrescriptionSubstitutionComponent setType(CodeableConcept value) { + public MedicationOrderSubstitutionComponent setType(CodeableConcept value) { this.type = value; return this; } @@ -1014,7 +981,7 @@ In some situations, this attribute may be used instead of quantity to identify t public CodeableConcept getReason() { if (this.reason == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicationPrescriptionSubstitutionComponent.reason"); + throw new Error("Attempt to auto-create MedicationOrderSubstitutionComponent.reason"); else if (Configuration.doAutoCreate()) this.reason = new CodeableConcept(); // cc return this.reason; @@ -1027,7 +994,7 @@ In some situations, this attribute may be used instead of quantity to identify t /** * @param value {@link #reason} (Indicates the reason for the substitution, or why substitution must or must not be performed.) */ - public MedicationPrescriptionSubstitutionComponent setReason(CodeableConcept value) { + public MedicationOrderSubstitutionComponent setReason(CodeableConcept value) { this.reason = value; return this; } @@ -1038,8 +1005,8 @@ In some situations, this attribute may be used instead of quantity to identify t childrenList.add(new Property("reason", "CodeableConcept", "Indicates the reason for the substitution, or why substitution must or must not be performed.", 0, java.lang.Integer.MAX_VALUE, reason)); } - public MedicationPrescriptionSubstitutionComponent copy() { - MedicationPrescriptionSubstitutionComponent dst = new MedicationPrescriptionSubstitutionComponent(); + public MedicationOrderSubstitutionComponent copy() { + MedicationOrderSubstitutionComponent dst = new MedicationOrderSubstitutionComponent(); copyValues(dst); dst.type = type == null ? null : type.copy(); dst.reason = reason == null ? null : reason.copy(); @@ -1050,9 +1017,9 @@ In some situations, this attribute may be used instead of quantity to identify t public boolean equalsDeep(Base other) { if (!super.equalsDeep(other)) return false; - if (!(other instanceof MedicationPrescriptionSubstitutionComponent)) + if (!(other instanceof MedicationOrderSubstitutionComponent)) return false; - MedicationPrescriptionSubstitutionComponent o = (MedicationPrescriptionSubstitutionComponent) other; + MedicationOrderSubstitutionComponent o = (MedicationOrderSubstitutionComponent) other; return compareDeep(type, o.type, true) && compareDeep(reason, o.reason, true); } @@ -1060,9 +1027,9 @@ In some situations, this attribute may be used instead of quantity to identify t public boolean equalsShallow(Base other) { if (!super.equalsShallow(other)) return false; - if (!(other instanceof MedicationPrescriptionSubstitutionComponent)) + if (!(other instanceof MedicationOrderSubstitutionComponent)) return false; - MedicationPrescriptionSubstitutionComponent o = (MedicationPrescriptionSubstitutionComponent) other; + MedicationOrderSubstitutionComponent o = (MedicationOrderSubstitutionComponent) other; return true; } @@ -1092,12 +1059,26 @@ In some situations, this attribute may be used instead of quantity to identify t */ @Child(name = "status", type = {CodeType.class}, order=2, min=0, max=1) @Description(shortDefinition="active | on-hold | completed | entered-in-error | stopped | superseded | draft", formalDefinition="A code specifying the state of the order. Generally this will be active or completed state." ) - protected Enumeration status; + protected Enumeration status; + + /** + * The date (and perhaps time) when the prescription was stopped. + */ + @Child(name = "dateEnded", type = {DateTimeType.class}, order=3, min=0, max=1) + @Description(shortDefinition="When prescription was stopped", formalDefinition="The date (and perhaps time) when the prescription was stopped." ) + protected DateTimeType dateEnded; + + /** + * The reason why the prescription was stopped, if it was. + */ + @Child(name = "reasonEnded", type = {CodeableConcept.class}, order=4, min=0, max=1) + @Description(shortDefinition="Why prescription was stopped", formalDefinition="The reason why the prescription was stopped, if it was." ) + protected CodeableConcept reasonEnded; /** * A link to a resource representing the person to whom the medication will be given. */ - @Child(name = "patient", type = {Patient.class}, order=3, min=0, max=1) + @Child(name = "patient", type = {Patient.class}, order=5, min=0, max=1) @Description(shortDefinition="Who prescription is for", formalDefinition="A link to a resource representing the person to whom the medication will be given." ) protected Reference patient; @@ -1109,7 +1090,7 @@ In some situations, this attribute may be used instead of quantity to identify t /** * The healthcare professional responsible for authorizing the prescription. */ - @Child(name = "prescriber", type = {Practitioner.class}, order=4, min=0, max=1) + @Child(name = "prescriber", type = {Practitioner.class}, order=6, min=0, max=1) @Description(shortDefinition="Who ordered the medication(s)", formalDefinition="The healthcare professional responsible for authorizing the prescription." ) protected Reference prescriber; @@ -1121,7 +1102,7 @@ In some situations, this attribute may be used instead of quantity to identify t /** * A link to a resource that identifies the particular occurrence of contact between patient and health care provider. */ - @Child(name = "encounter", type = {Encounter.class}, order=5, min=0, max=1) + @Child(name = "encounter", type = {Encounter.class}, order=7, min=0, max=1) @Description(shortDefinition="Created during encounter / admission / stay", formalDefinition="A link to a resource that identifies the particular occurrence of contact between patient and health care provider." ) protected Reference encounter; @@ -1133,58 +1114,70 @@ In some situations, this attribute may be used instead of quantity to identify t /** * Can be the reason or the indication for writing the prescription. */ - @Child(name = "reason", type = {CodeableConcept.class, Condition.class}, order=6, min=0, max=1) + @Child(name = "reason", type = {CodeableConcept.class, Condition.class}, order=8, min=0, max=1) @Description(shortDefinition="Reason or indication for writing the prescription", formalDefinition="Can be the reason or the indication for writing the prescription." ) protected Type reason; /** * Extra information about the prescription that could not be conveyed by the other attributes. */ - @Child(name = "note", type = {StringType.class}, order=7, min=0, max=1) + @Child(name = "note", type = {StringType.class}, order=9, min=0, max=1) @Description(shortDefinition="Information about the prescription", formalDefinition="Extra information about the prescription that could not be conveyed by the other attributes." ) protected StringType note; /** * Identifies the medication being administered. This is a link to a resource that represents the medication which may be the details of the medication or simply an attribute carrying a code that identifies the medication from a known list of medications. */ - @Child(name = "medication", type = {CodeableConcept.class, Medication.class}, order=8, min=1, max=1) + @Child(name = "medication", type = {CodeableConcept.class, Medication.class}, order=10, min=1, max=1) @Description(shortDefinition="Medication to be taken", formalDefinition="Identifies the medication being administered. This is a link to a resource that represents the medication which may be the details of the medication or simply an attribute carrying a code that identifies the medication from a known list of medications." ) protected Type medication; /** * Indicates how the medication is to be used by the patient. */ - @Child(name = "dosageInstruction", type = {}, order=9, min=0, max=Child.MAX_UNLIMITED) + @Child(name = "dosageInstruction", type = {}, order=11, min=0, max=Child.MAX_UNLIMITED) @Description(shortDefinition="How medication should be taken", formalDefinition="Indicates how the medication is to be used by the patient." ) - protected List dosageInstruction; + protected List dosageInstruction; /** * Deals with details of the dispense part of the order. */ - @Child(name = "dispense", type = {}, order=10, min=0, max=1) + @Child(name = "dispense", type = {}, order=12, min=0, max=1) @Description(shortDefinition="Medication supply authorization", formalDefinition="Deals with details of the dispense part of the order." ) - protected MedicationPrescriptionDispenseComponent dispense; + protected MedicationOrderDispenseComponent dispense; /** * 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, and in others it does not matter. This block explains the prescriber's intent. If nothing is specified substitution may be done. */ - @Child(name = "substitution", type = {}, order=11, min=0, max=1) + @Child(name = "substitution", type = {}, order=13, min=0, max=1) @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, and in others it does not matter. This block explains the prescriber's intent. If nothing is specified substitution may be done." ) - protected MedicationPrescriptionSubstitutionComponent substitution; + protected MedicationOrderSubstitutionComponent substitution; - private static final long serialVersionUID = 1219917448L; + /** + * A link to a resource representing an earlier order or prescription that this order supersedes. + */ + @Child(name = "priorPrescription", type = {MedicationOrder.class}, order=14, min=0, max=1) + @Description(shortDefinition="An order/prescription that this supersedes", formalDefinition="A link to a resource representing an earlier order or prescription that this order supersedes." ) + protected Reference priorPrescription; + + /** + * The actual object that is the target of the reference (A link to a resource representing an earlier order or prescription that this order supersedes.) + */ + protected MedicationOrder priorPrescriptionTarget; + + private static final long serialVersionUID = 244755395L; /* * Constructor */ - public MedicationPrescription() { + public MedicationOrder() { super(); } /* * Constructor */ - public MedicationPrescription(Type medication) { + public MedicationOrder(Type medication) { super(); this.medication = medication; } @@ -1220,7 +1213,7 @@ In some situations, this attribute may be used instead of quantity to identify t } // syntactic sugar - public MedicationPrescription addIdentifier(Identifier t) { //3 + public MedicationOrder addIdentifier(Identifier t) { //3 if (t == null) return this; if (this.identifier == null) @@ -1235,7 +1228,7 @@ In some situations, this attribute may be used instead of quantity to identify t public DateTimeType getDateWrittenElement() { if (this.dateWritten == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicationPrescription.dateWritten"); + throw new Error("Attempt to auto-create MedicationOrder.dateWritten"); else if (Configuration.doAutoCreate()) this.dateWritten = new DateTimeType(); // bb return this.dateWritten; @@ -1252,7 +1245,7 @@ In some situations, this attribute may be used instead of quantity to identify t /** * @param value {@link #dateWritten} (The date (and perhaps time) when the prescription was written.). This is the underlying object with id, value and extensions. The accessor "getDateWritten" gives direct access to the value */ - public MedicationPrescription setDateWrittenElement(DateTimeType value) { + public MedicationOrder setDateWrittenElement(DateTimeType value) { this.dateWritten = value; return this; } @@ -1267,7 +1260,7 @@ In some situations, this attribute may be used instead of quantity to identify t /** * @param value The date (and perhaps time) when the prescription was written. */ - public MedicationPrescription setDateWritten(Date value) { + public MedicationOrder setDateWritten(Date value) { if (value == null) this.dateWritten = null; else { @@ -1281,12 +1274,12 @@ In some situations, this attribute may be used instead of quantity to identify t /** * @return {@link #status} (A code specifying the state of the order. Generally this will be active or completed state.). This is the underlying object with id, value and extensions. The accessor "getStatus" gives direct access to the value */ - public Enumeration getStatusElement() { + public Enumeration getStatusElement() { if (this.status == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicationPrescription.status"); + throw new Error("Attempt to auto-create MedicationOrder.status"); else if (Configuration.doAutoCreate()) - this.status = new Enumeration(new MedicationPrescriptionStatusEnumFactory()); // bb + this.status = new Enumeration(new MedicationOrderStatusEnumFactory()); // bb return this.status; } @@ -1301,7 +1294,7 @@ In some situations, this attribute may be used instead of quantity to identify t /** * @param value {@link #status} (A code specifying the state of the order. Generally this will be active or completed state.). This is the underlying object with id, value and extensions. The accessor "getStatus" gives direct access to the value */ - public MedicationPrescription setStatusElement(Enumeration value) { + public MedicationOrder setStatusElement(Enumeration value) { this.status = value; return this; } @@ -1309,31 +1302,104 @@ In some situations, this attribute may be used instead of quantity to identify t /** * @return A code specifying the state of the order. Generally this will be active or completed state. */ - public MedicationPrescriptionStatus getStatus() { + public MedicationOrderStatus getStatus() { return this.status == null ? null : this.status.getValue(); } /** * @param value A code specifying the state of the order. Generally this will be active or completed state. */ - public MedicationPrescription setStatus(MedicationPrescriptionStatus value) { + public MedicationOrder setStatus(MedicationOrderStatus value) { if (value == null) this.status = null; else { if (this.status == null) - this.status = new Enumeration(new MedicationPrescriptionStatusEnumFactory()); + this.status = new Enumeration(new MedicationOrderStatusEnumFactory()); this.status.setValue(value); } return this; } + /** + * @return {@link #dateEnded} (The date (and perhaps time) when the prescription was stopped.). This is the underlying object with id, value and extensions. The accessor "getDateEnded" gives direct access to the value + */ + public DateTimeType getDateEndedElement() { + if (this.dateEnded == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create MedicationOrder.dateEnded"); + else if (Configuration.doAutoCreate()) + this.dateEnded = new DateTimeType(); // bb + return this.dateEnded; + } + + public boolean hasDateEndedElement() { + return this.dateEnded != null && !this.dateEnded.isEmpty(); + } + + public boolean hasDateEnded() { + return this.dateEnded != null && !this.dateEnded.isEmpty(); + } + + /** + * @param value {@link #dateEnded} (The date (and perhaps time) when the prescription was stopped.). This is the underlying object with id, value and extensions. The accessor "getDateEnded" gives direct access to the value + */ + public MedicationOrder setDateEndedElement(DateTimeType value) { + this.dateEnded = value; + return this; + } + + /** + * @return The date (and perhaps time) when the prescription was stopped. + */ + public Date getDateEnded() { + return this.dateEnded == null ? null : this.dateEnded.getValue(); + } + + /** + * @param value The date (and perhaps time) when the prescription was stopped. + */ + public MedicationOrder setDateEnded(Date value) { + if (value == null) + this.dateEnded = null; + else { + if (this.dateEnded == null) + this.dateEnded = new DateTimeType(); + this.dateEnded.setValue(value); + } + return this; + } + + /** + * @return {@link #reasonEnded} (The reason why the prescription was stopped, if it was.) + */ + public CodeableConcept getReasonEnded() { + if (this.reasonEnded == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create MedicationOrder.reasonEnded"); + else if (Configuration.doAutoCreate()) + this.reasonEnded = new CodeableConcept(); // cc + return this.reasonEnded; + } + + public boolean hasReasonEnded() { + return this.reasonEnded != null && !this.reasonEnded.isEmpty(); + } + + /** + * @param value {@link #reasonEnded} (The reason why the prescription was stopped, if it was.) + */ + public MedicationOrder setReasonEnded(CodeableConcept value) { + this.reasonEnded = value; + return this; + } + /** * @return {@link #patient} (A link to a resource representing the person to whom the medication will be given.) */ public Reference getPatient() { if (this.patient == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicationPrescription.patient"); + throw new Error("Attempt to auto-create MedicationOrder.patient"); else if (Configuration.doAutoCreate()) this.patient = new Reference(); // cc return this.patient; @@ -1346,7 +1412,7 @@ In some situations, this attribute may be used instead of quantity to identify t /** * @param value {@link #patient} (A link to a resource representing the person to whom the medication will be given.) */ - public MedicationPrescription setPatient(Reference value) { + public MedicationOrder setPatient(Reference value) { this.patient = value; return this; } @@ -1357,7 +1423,7 @@ In some situations, this attribute may be used instead of quantity to identify t public Patient getPatientTarget() { if (this.patientTarget == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicationPrescription.patient"); + throw new Error("Attempt to auto-create MedicationOrder.patient"); else if (Configuration.doAutoCreate()) this.patientTarget = new Patient(); // aa return this.patientTarget; @@ -1366,7 +1432,7 @@ In some situations, this attribute may be used instead of quantity to identify t /** * @param value {@link #patient} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (A link to a resource representing the person to whom the medication will be given.) */ - public MedicationPrescription setPatientTarget(Patient value) { + public MedicationOrder setPatientTarget(Patient value) { this.patientTarget = value; return this; } @@ -1377,7 +1443,7 @@ In some situations, this attribute may be used instead of quantity to identify t public Reference getPrescriber() { if (this.prescriber == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicationPrescription.prescriber"); + throw new Error("Attempt to auto-create MedicationOrder.prescriber"); else if (Configuration.doAutoCreate()) this.prescriber = new Reference(); // cc return this.prescriber; @@ -1390,7 +1456,7 @@ In some situations, this attribute may be used instead of quantity to identify t /** * @param value {@link #prescriber} (The healthcare professional responsible for authorizing the prescription.) */ - public MedicationPrescription setPrescriber(Reference value) { + public MedicationOrder setPrescriber(Reference value) { this.prescriber = value; return this; } @@ -1401,7 +1467,7 @@ In some situations, this attribute may be used instead of quantity to identify t public Practitioner getPrescriberTarget() { if (this.prescriberTarget == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicationPrescription.prescriber"); + throw new Error("Attempt to auto-create MedicationOrder.prescriber"); else if (Configuration.doAutoCreate()) this.prescriberTarget = new Practitioner(); // aa return this.prescriberTarget; @@ -1410,7 +1476,7 @@ In some situations, this attribute may be used instead of quantity to identify t /** * @param value {@link #prescriber} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (The healthcare professional responsible for authorizing the prescription.) */ - public MedicationPrescription setPrescriberTarget(Practitioner value) { + public MedicationOrder setPrescriberTarget(Practitioner value) { this.prescriberTarget = value; return this; } @@ -1421,7 +1487,7 @@ In some situations, this attribute may be used instead of quantity to identify t public Reference getEncounter() { if (this.encounter == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicationPrescription.encounter"); + throw new Error("Attempt to auto-create MedicationOrder.encounter"); else if (Configuration.doAutoCreate()) this.encounter = new Reference(); // cc return this.encounter; @@ -1434,7 +1500,7 @@ In some situations, this attribute may be used instead of quantity to identify t /** * @param value {@link #encounter} (A link to a resource that identifies the particular occurrence of contact between patient and health care provider.) */ - public MedicationPrescription setEncounter(Reference value) { + public MedicationOrder setEncounter(Reference value) { this.encounter = value; return this; } @@ -1445,7 +1511,7 @@ In some situations, this attribute may be used instead of quantity to identify t public Encounter getEncounterTarget() { if (this.encounterTarget == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicationPrescription.encounter"); + throw new Error("Attempt to auto-create MedicationOrder.encounter"); else if (Configuration.doAutoCreate()) this.encounterTarget = new Encounter(); // aa return this.encounterTarget; @@ -1454,7 +1520,7 @@ In some situations, this attribute may be used instead of quantity to identify t /** * @param value {@link #encounter} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (A link to a resource that identifies the particular occurrence of contact between patient and health care provider.) */ - public MedicationPrescription setEncounterTarget(Encounter value) { + public MedicationOrder setEncounterTarget(Encounter value) { this.encounterTarget = value; return this; } @@ -1499,7 +1565,7 @@ In some situations, this attribute may be used instead of quantity to identify t /** * @param value {@link #reason} (Can be the reason or the indication for writing the prescription.) */ - public MedicationPrescription setReason(Type value) { + public MedicationOrder setReason(Type value) { this.reason = value; return this; } @@ -1510,7 +1576,7 @@ In some situations, this attribute may be used instead of quantity to identify t public StringType getNoteElement() { if (this.note == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicationPrescription.note"); + throw new Error("Attempt to auto-create MedicationOrder.note"); else if (Configuration.doAutoCreate()) this.note = new StringType(); // bb return this.note; @@ -1527,7 +1593,7 @@ In some situations, this attribute may be used instead of quantity to identify t /** * @param value {@link #note} (Extra information about the prescription that could not be conveyed by the other attributes.). This is the underlying object with id, value and extensions. The accessor "getNote" gives direct access to the value */ - public MedicationPrescription setNoteElement(StringType value) { + public MedicationOrder setNoteElement(StringType value) { this.note = value; return this; } @@ -1542,7 +1608,7 @@ In some situations, this attribute may be used instead of quantity to identify t /** * @param value Extra information about the prescription that could not be conveyed by the other attributes. */ - public MedicationPrescription setNote(String value) { + public MedicationOrder setNote(String value) { if (Utilities.noString(value)) this.note = null; else { @@ -1593,7 +1659,7 @@ In some situations, this attribute may be used instead of quantity to identify t /** * @param value {@link #medication} (Identifies the medication being administered. This is a link to a resource that represents the medication which may be the details of the medication or simply an attribute carrying a code that identifies the medication from a known list of medications.) */ - public MedicationPrescription setMedication(Type value) { + public MedicationOrder setMedication(Type value) { this.medication = value; return this; } @@ -1601,16 +1667,16 @@ In some situations, this attribute may be used instead of quantity to identify t /** * @return {@link #dosageInstruction} (Indicates how the medication is to be used by the patient.) */ - public List getDosageInstruction() { + public List getDosageInstruction() { if (this.dosageInstruction == null) - this.dosageInstruction = new ArrayList(); + this.dosageInstruction = new ArrayList(); return this.dosageInstruction; } public boolean hasDosageInstruction() { if (this.dosageInstruction == null) return false; - for (MedicationPrescriptionDosageInstructionComponent item : this.dosageInstruction) + for (MedicationOrderDosageInstructionComponent item : this.dosageInstruction) if (!item.isEmpty()) return true; return false; @@ -1620,20 +1686,20 @@ In some situations, this attribute may be used instead of quantity to identify t * @return {@link #dosageInstruction} (Indicates how the medication is to be used by the patient.) */ // syntactic sugar - public MedicationPrescriptionDosageInstructionComponent addDosageInstruction() { //3 - MedicationPrescriptionDosageInstructionComponent t = new MedicationPrescriptionDosageInstructionComponent(); + public MedicationOrderDosageInstructionComponent addDosageInstruction() { //3 + MedicationOrderDosageInstructionComponent t = new MedicationOrderDosageInstructionComponent(); if (this.dosageInstruction == null) - this.dosageInstruction = new ArrayList(); + this.dosageInstruction = new ArrayList(); this.dosageInstruction.add(t); return t; } // syntactic sugar - public MedicationPrescription addDosageInstruction(MedicationPrescriptionDosageInstructionComponent t) { //3 + public MedicationOrder addDosageInstruction(MedicationOrderDosageInstructionComponent t) { //3 if (t == null) return this; if (this.dosageInstruction == null) - this.dosageInstruction = new ArrayList(); + this.dosageInstruction = new ArrayList(); this.dosageInstruction.add(t); return this; } @@ -1641,12 +1707,12 @@ In some situations, this attribute may be used instead of quantity to identify t /** * @return {@link #dispense} (Deals with details of the dispense part of the order.) */ - public MedicationPrescriptionDispenseComponent getDispense() { + public MedicationOrderDispenseComponent getDispense() { if (this.dispense == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicationPrescription.dispense"); + throw new Error("Attempt to auto-create MedicationOrder.dispense"); else if (Configuration.doAutoCreate()) - this.dispense = new MedicationPrescriptionDispenseComponent(); // cc + this.dispense = new MedicationOrderDispenseComponent(); // cc return this.dispense; } @@ -1657,7 +1723,7 @@ In some situations, this attribute may be used instead of quantity to identify t /** * @param value {@link #dispense} (Deals with details of the dispense part of the order.) */ - public MedicationPrescription setDispense(MedicationPrescriptionDispenseComponent value) { + public MedicationOrder setDispense(MedicationOrderDispenseComponent value) { this.dispense = value; return this; } @@ -1665,12 +1731,12 @@ In some situations, this attribute may be used instead of quantity to identify t /** * @return {@link #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, and in others it does not matter. This block explains the prescriber's intent. If nothing is specified substitution may be done.) */ - public MedicationPrescriptionSubstitutionComponent getSubstitution() { + public MedicationOrderSubstitutionComponent getSubstitution() { if (this.substitution == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicationPrescription.substitution"); + throw new Error("Attempt to auto-create MedicationOrder.substitution"); else if (Configuration.doAutoCreate()) - this.substitution = new MedicationPrescriptionSubstitutionComponent(); // cc + this.substitution = new MedicationOrderSubstitutionComponent(); // cc return this.substitution; } @@ -1681,16 +1747,62 @@ In some situations, this attribute may be used instead of quantity to identify t /** * @param value {@link #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, and in others it does not matter. This block explains the prescriber's intent. If nothing is specified substitution may be done.) */ - public MedicationPrescription setSubstitution(MedicationPrescriptionSubstitutionComponent value) { + public MedicationOrder setSubstitution(MedicationOrderSubstitutionComponent value) { this.substitution = value; return this; } + /** + * @return {@link #priorPrescription} (A link to a resource representing an earlier order or prescription that this order supersedes.) + */ + public Reference getPriorPrescription() { + if (this.priorPrescription == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create MedicationOrder.priorPrescription"); + else if (Configuration.doAutoCreate()) + this.priorPrescription = new Reference(); // cc + return this.priorPrescription; + } + + public boolean hasPriorPrescription() { + return this.priorPrescription != null && !this.priorPrescription.isEmpty(); + } + + /** + * @param value {@link #priorPrescription} (A link to a resource representing an earlier order or prescription that this order supersedes.) + */ + public MedicationOrder setPriorPrescription(Reference value) { + this.priorPrescription = value; + return this; + } + + /** + * @return {@link #priorPrescription} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (A link to a resource representing an earlier order or prescription that this order supersedes.) + */ + public MedicationOrder getPriorPrescriptionTarget() { + if (this.priorPrescriptionTarget == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create MedicationOrder.priorPrescription"); + else if (Configuration.doAutoCreate()) + this.priorPrescriptionTarget = new MedicationOrder(); // aa + return this.priorPrescriptionTarget; + } + + /** + * @param value {@link #priorPrescription} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (A link to a resource representing an earlier order or prescription that this order supersedes.) + */ + public MedicationOrder setPriorPrescriptionTarget(MedicationOrder value) { + this.priorPrescriptionTarget = value; + return this; + } + protected void listChildren(List childrenList) { super.listChildren(childrenList); childrenList.add(new Property("identifier", "Identifier", "External identifier - one that would be used by another non-FHIR system - for example a re-imbursement system might issue its own id for each prescription that is created. This is particularly important where FHIR only provides part of an erntire workflow process where records have to be tracked through an entire system.", 0, java.lang.Integer.MAX_VALUE, identifier)); childrenList.add(new Property("dateWritten", "dateTime", "The date (and perhaps time) when the prescription was written.", 0, java.lang.Integer.MAX_VALUE, dateWritten)); childrenList.add(new Property("status", "code", "A code specifying the state of the order. Generally this will be active or completed state.", 0, java.lang.Integer.MAX_VALUE, status)); + childrenList.add(new Property("dateEnded", "dateTime", "The date (and perhaps time) when the prescription was stopped.", 0, java.lang.Integer.MAX_VALUE, dateEnded)); + childrenList.add(new Property("reasonEnded", "CodeableConcept", "The reason why the prescription was stopped, if it was.", 0, java.lang.Integer.MAX_VALUE, reasonEnded)); childrenList.add(new Property("patient", "Reference(Patient)", "A link to a resource representing the person to whom the medication will be given.", 0, java.lang.Integer.MAX_VALUE, patient)); childrenList.add(new Property("prescriber", "Reference(Practitioner)", "The healthcare professional responsible for authorizing the prescription.", 0, java.lang.Integer.MAX_VALUE, prescriber)); childrenList.add(new Property("encounter", "Reference(Encounter)", "A link to a resource that identifies the particular occurrence of contact between patient and health care provider.", 0, java.lang.Integer.MAX_VALUE, encounter)); @@ -1700,10 +1812,11 @@ In some situations, this attribute may be used instead of quantity to identify t childrenList.add(new Property("dosageInstruction", "", "Indicates how the medication is to be used by the patient.", 0, java.lang.Integer.MAX_VALUE, dosageInstruction)); childrenList.add(new Property("dispense", "", "Deals with details of the dispense part of the order.", 0, java.lang.Integer.MAX_VALUE, dispense)); childrenList.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, and in others it does not matter. This block explains the prescriber's intent. If nothing is specified substitution may be done.", 0, java.lang.Integer.MAX_VALUE, substitution)); + childrenList.add(new Property("priorPrescription", "Reference(MedicationOrder)", "A link to a resource representing an earlier order or prescription that this order supersedes.", 0, java.lang.Integer.MAX_VALUE, priorPrescription)); } - public MedicationPrescription copy() { - MedicationPrescription dst = new MedicationPrescription(); + public MedicationOrder copy() { + MedicationOrder dst = new MedicationOrder(); copyValues(dst); if (identifier != null) { dst.identifier = new ArrayList(); @@ -1712,6 +1825,8 @@ In some situations, this attribute may be used instead of quantity to identify t }; dst.dateWritten = dateWritten == null ? null : dateWritten.copy(); dst.status = status == null ? null : status.copy(); + dst.dateEnded = dateEnded == null ? null : dateEnded.copy(); + dst.reasonEnded = reasonEnded == null ? null : reasonEnded.copy(); dst.patient = patient == null ? null : patient.copy(); dst.prescriber = prescriber == null ? null : prescriber.copy(); dst.encounter = encounter == null ? null : encounter.copy(); @@ -1719,16 +1834,17 @@ In some situations, this attribute may be used instead of quantity to identify t dst.note = note == null ? null : note.copy(); dst.medication = medication == null ? null : medication.copy(); if (dosageInstruction != null) { - dst.dosageInstruction = new ArrayList(); - for (MedicationPrescriptionDosageInstructionComponent i : dosageInstruction) + dst.dosageInstruction = new ArrayList(); + for (MedicationOrderDosageInstructionComponent i : dosageInstruction) dst.dosageInstruction.add(i.copy()); }; dst.dispense = dispense == null ? null : dispense.copy(); dst.substitution = substitution == null ? null : substitution.copy(); + dst.priorPrescription = priorPrescription == null ? null : priorPrescription.copy(); return dst; } - protected MedicationPrescription typedCopy() { + protected MedicationOrder typedCopy() { return copy(); } @@ -1736,54 +1852,59 @@ In some situations, this attribute may be used instead of quantity to identify t public boolean equalsDeep(Base other) { if (!super.equalsDeep(other)) return false; - if (!(other instanceof MedicationPrescription)) + if (!(other instanceof MedicationOrder)) return false; - MedicationPrescription o = (MedicationPrescription) other; + MedicationOrder o = (MedicationOrder) other; return compareDeep(identifier, o.identifier, true) && compareDeep(dateWritten, o.dateWritten, true) - && compareDeep(status, o.status, true) && compareDeep(patient, o.patient, true) && compareDeep(prescriber, o.prescriber, true) - && compareDeep(encounter, o.encounter, true) && compareDeep(reason, o.reason, true) && compareDeep(note, o.note, true) - && compareDeep(medication, o.medication, true) && compareDeep(dosageInstruction, o.dosageInstruction, true) - && compareDeep(dispense, o.dispense, true) && compareDeep(substitution, o.substitution, true); + && compareDeep(status, o.status, true) && compareDeep(dateEnded, o.dateEnded, true) && compareDeep(reasonEnded, o.reasonEnded, true) + && compareDeep(patient, o.patient, true) && compareDeep(prescriber, o.prescriber, true) && compareDeep(encounter, o.encounter, true) + && compareDeep(reason, o.reason, true) && compareDeep(note, o.note, true) && compareDeep(medication, o.medication, true) + && compareDeep(dosageInstruction, o.dosageInstruction, true) && compareDeep(dispense, o.dispense, true) + && compareDeep(substitution, o.substitution, true) && compareDeep(priorPrescription, o.priorPrescription, true) + ; } @Override public boolean equalsShallow(Base other) { if (!super.equalsShallow(other)) return false; - if (!(other instanceof MedicationPrescription)) + if (!(other instanceof MedicationOrder)) return false; - MedicationPrescription o = (MedicationPrescription) other; - return compareValues(dateWritten, o.dateWritten, true) && compareValues(status, o.status, true) && compareValues(note, o.note, true) - ; + MedicationOrder o = (MedicationOrder) other; + return compareValues(dateWritten, o.dateWritten, true) && compareValues(status, o.status, true) && compareValues(dateEnded, o.dateEnded, true) + && compareValues(note, o.note, true); } public boolean isEmpty() { return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (dateWritten == null || dateWritten.isEmpty()) - && (status == null || status.isEmpty()) && (patient == null || patient.isEmpty()) && (prescriber == null || prescriber.isEmpty()) + && (status == null || status.isEmpty()) && (dateEnded == null || dateEnded.isEmpty()) && (reasonEnded == null || reasonEnded.isEmpty()) + && (patient == null || patient.isEmpty()) && (prescriber == null || prescriber.isEmpty()) && (encounter == null || encounter.isEmpty()) && (reason == null || reason.isEmpty()) && (note == null || note.isEmpty()) && (medication == null || medication.isEmpty()) && (dosageInstruction == null || dosageInstruction.isEmpty()) && (dispense == null || dispense.isEmpty()) && (substitution == null || substitution.isEmpty()) - ; + && (priorPrescription == null || priorPrescription.isEmpty()); } @Override public ResourceType getResourceType() { - return ResourceType.MedicationPrescription; + return ResourceType.MedicationOrder; } - @SearchParamDefinition(name="prescriber", path="MedicationPrescription.prescriber", description="Who ordered the medication(s)", type="reference" ) + @SearchParamDefinition(name="prescriber", path="MedicationOrder.prescriber", description="Who ordered the medication(s)", type="reference" ) public static final String SP_PRESCRIBER = "prescriber"; - @SearchParamDefinition(name="identifier", path="MedicationPrescription.identifier", description="Return prescriptions with this external identity", type="token" ) + @SearchParamDefinition(name="identifier", path="MedicationOrder.identifier", description="Return prescriptions with this external identity", type="token" ) public static final String SP_IDENTIFIER = "identifier"; - @SearchParamDefinition(name="patient", path="MedicationPrescription.patient", description="The identity of a patient to list dispenses for", type="reference" ) + @SearchParamDefinition(name="code", path="MedicationOrder.medicationCodeableConcept", description="Return administrations of this medication code", type="token" ) + public static final String SP_CODE = "code"; + @SearchParamDefinition(name="patient", path="MedicationOrder.patient", description="The identity of a patient to list dispenses for", type="reference" ) public static final String SP_PATIENT = "patient"; - @SearchParamDefinition(name="datewritten", path="MedicationPrescription.dateWritten", description="Return prescriptions written on this date", type="date" ) + @SearchParamDefinition(name="datewritten", path="MedicationOrder.dateWritten", description="Return prescriptions written on this date", type="date" ) public static final String SP_DATEWRITTEN = "datewritten"; - @SearchParamDefinition(name="medication", path="MedicationPrescription.medicationReference", description="Code for medicine or text in medicine name", type="reference" ) + @SearchParamDefinition(name="medication", path="MedicationOrder.medicationReference", description="Return administrations of this medication reference", type="reference" ) public static final String SP_MEDICATION = "medication"; - @SearchParamDefinition(name="encounter", path="MedicationPrescription.encounter", description="Return prescriptions with this encounter identity", type="reference" ) + @SearchParamDefinition(name="encounter", path="MedicationOrder.encounter", description="Return prescriptions with this encounter identity", type="reference" ) public static final String SP_ENCOUNTER = "encounter"; - @SearchParamDefinition(name="status", path="MedicationPrescription.status", description="Status of the prescription", type="token" ) + @SearchParamDefinition(name="status", path="MedicationOrder.status", description="Status of the prescription", type="token" ) public static final String SP_STATUS = "status"; } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationStatement.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationStatement.java index 4e8fa8d3ae3..40c6d4c56dd 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationStatement.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationStatement.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; @@ -144,9 +144,9 @@ public class MedicationStatement extends DomainResource { /** * The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013". */ - @Child(name = "schedule", type = {Timing.class}, order=2, min=0, max=1) + @Child(name = "timing", type = {Timing.class}, order=2, min=0, max=1) @Description(shortDefinition="When/how often was medication taken?", formalDefinition="The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. 'Every 8 hours'; 'Three times a day'; '1/2 an hour before breakfast for 10 days from 23-Dec 2011:'; '15 Oct 2013, 17 Oct 2013 and 1 Nov 2013'." ) - protected Timing schedule; + protected Timing timing; /** * If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose. If a CodeableConcept is present, it indicates the precondition for taking the Medication. @@ -179,16 +179,16 @@ public class MedicationStatement extends DomainResource { /** * The amount of therapeutic or other substance given at one administration event. */ - @Child(name = "quantity", type = {Quantity.class}, order=7, min=0, max=1) + @Child(name = "quantity", type = {SimpleQuantity.class}, order=7, min=0, max=1) @Description(shortDefinition="Amount administered in one dose", formalDefinition="The amount of therapeutic or other substance given at one administration event." ) - protected Quantity quantity; + protected SimpleQuantity quantity; /** * Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours. */ - @Child(name = "rate", type = {Ratio.class}, order=8, min=0, max=1) + @Child(name = "rate", type = {Ratio.class, Range.class}, order=8, min=0, max=1) @Description(shortDefinition="Dose quantity per unit of time", formalDefinition="Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours." ) - protected Ratio rate; + protected Type rate; /** * The maximum total quantity of a therapeutic substance that may be administered to a subject over the period of time. E.g. 1000mg in 24 hours. @@ -197,7 +197,7 @@ public class MedicationStatement extends DomainResource { @Description(shortDefinition="Maximum dose that was consumed per unit of time", formalDefinition="The maximum total quantity of a therapeutic substance that may be administered to a subject over the period of time. E.g. 1000mg in 24 hours." ) protected Ratio maxDosePerPeriod; - private static final long serialVersionUID = 1729854997L; + private static final long serialVersionUID = -2038870561L; /* * Constructor @@ -256,26 +256,26 @@ public class MedicationStatement extends DomainResource { } /** - * @return {@link #schedule} (The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013".) + * @return {@link #timing} (The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013".) */ - public Timing getSchedule() { - if (this.schedule == null) + public Timing getTiming() { + if (this.timing == null) if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicationStatementDosageComponent.schedule"); + throw new Error("Attempt to auto-create MedicationStatementDosageComponent.timing"); else if (Configuration.doAutoCreate()) - this.schedule = new Timing(); // cc - return this.schedule; + this.timing = new Timing(); // cc + return this.timing; } - public boolean hasSchedule() { - return this.schedule != null && !this.schedule.isEmpty(); + public boolean hasTiming() { + return this.timing != null && !this.timing.isEmpty(); } /** - * @param value {@link #schedule} (The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013".) + * @param value {@link #timing} (The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013".) */ - public MedicationStatementDosageComponent setSchedule(Timing value) { - this.schedule = value; + public MedicationStatementDosageComponent setTiming(Timing value) { + this.timing = value; return this; } @@ -399,12 +399,12 @@ public class MedicationStatement extends DomainResource { /** * @return {@link #quantity} (The amount of therapeutic or other substance given at one administration event.) */ - public Quantity getQuantity() { + public SimpleQuantity getQuantity() { if (this.quantity == null) if (Configuration.errorOnAutoCreate()) throw new Error("Attempt to auto-create MedicationStatementDosageComponent.quantity"); else if (Configuration.doAutoCreate()) - this.quantity = new Quantity(); // cc + this.quantity = new SimpleQuantity(); // cc return this.quantity; } @@ -415,7 +415,7 @@ public class MedicationStatement extends DomainResource { /** * @param value {@link #quantity} (The amount of therapeutic or other substance given at one administration event.) */ - public MedicationStatementDosageComponent setQuantity(Quantity value) { + public MedicationStatementDosageComponent setQuantity(SimpleQuantity value) { this.quantity = value; return this; } @@ -423,15 +423,36 @@ public class MedicationStatement extends DomainResource { /** * @return {@link #rate} (Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours.) */ - public Ratio getRate() { - if (this.rate == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create MedicationStatementDosageComponent.rate"); - else if (Configuration.doAutoCreate()) - this.rate = new Ratio(); // cc + public Type getRate() { return this.rate; } + /** + * @return {@link #rate} (Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours.) + */ + public Ratio getRateRatio() throws Exception { + if (!(this.rate instanceof Ratio)) + throw new Exception("Type mismatch: the type Ratio was expected, but "+this.rate.getClass().getName()+" was encountered"); + return (Ratio) this.rate; + } + + public boolean hasRateRatio() throws Exception { + return this.rate instanceof Ratio; + } + + /** + * @return {@link #rate} (Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours.) + */ + public Range getRateRange() throws Exception { + if (!(this.rate instanceof Range)) + throw new Exception("Type mismatch: the type Range was expected, but "+this.rate.getClass().getName()+" was encountered"); + return (Range) this.rate; + } + + public boolean hasRateRange() throws Exception { + return this.rate instanceof Range; + } + public boolean hasRate() { return this.rate != null && !this.rate.isEmpty(); } @@ -439,7 +460,7 @@ public class MedicationStatement extends DomainResource { /** * @param value {@link #rate} (Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours.) */ - public MedicationStatementDosageComponent setRate(Ratio value) { + public MedicationStatementDosageComponent setRate(Type value) { this.rate = value; return this; } @@ -471,13 +492,13 @@ public class MedicationStatement extends DomainResource { protected void listChildren(List childrenList) { super.listChildren(childrenList); childrenList.add(new Property("text", "string", "Free text dosage instructions can be used for cases where the instructions are too complex to code. When coded instructions are present, the free text instructions may still be present for display to humans taking or administering the medication.", 0, java.lang.Integer.MAX_VALUE, text)); - childrenList.add(new Property("schedule", "Timing", "The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. 'Every 8 hours'; 'Three times a day'; '1/2 an hour before breakfast for 10 days from 23-Dec 2011:'; '15 Oct 2013, 17 Oct 2013 and 1 Nov 2013'.", 0, java.lang.Integer.MAX_VALUE, schedule)); + childrenList.add(new Property("timing", "Timing", "The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. 'Every 8 hours'; 'Three times a day'; '1/2 an hour before breakfast for 10 days from 23-Dec 2011:'; '15 Oct 2013, 17 Oct 2013 and 1 Nov 2013'.", 0, java.lang.Integer.MAX_VALUE, timing)); childrenList.add(new Property("asNeeded[x]", "boolean|CodeableConcept", "If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose. If a CodeableConcept is present, it indicates the precondition for taking the Medication.", 0, java.lang.Integer.MAX_VALUE, asNeeded)); childrenList.add(new Property("site", "CodeableConcept", "A coded specification of the anatomic site where the medication first enters the body.", 0, java.lang.Integer.MAX_VALUE, site)); childrenList.add(new Property("route", "CodeableConcept", "A code specifying the route or physiological path of administration of a therapeutic agent into or onto a subject.", 0, java.lang.Integer.MAX_VALUE, route)); childrenList.add(new Property("method", "CodeableConcept", "A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. Terminologies used often pre-coordinate this term with the route and or form of administration.", 0, java.lang.Integer.MAX_VALUE, method)); - childrenList.add(new Property("quantity", "Quantity", "The amount of therapeutic or other substance given at one administration event.", 0, java.lang.Integer.MAX_VALUE, quantity)); - childrenList.add(new Property("rate", "Ratio", "Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours.", 0, java.lang.Integer.MAX_VALUE, rate)); + childrenList.add(new Property("quantity", "SimpleQuantity", "The amount of therapeutic or other substance given at one administration event.", 0, java.lang.Integer.MAX_VALUE, quantity)); + childrenList.add(new Property("rate[x]", "Ratio|Range", "Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours.", 0, java.lang.Integer.MAX_VALUE, rate)); childrenList.add(new Property("maxDosePerPeriod", "Ratio", "The maximum total quantity of a therapeutic substance that may be administered to a subject over the period of time. E.g. 1000mg in 24 hours.", 0, java.lang.Integer.MAX_VALUE, maxDosePerPeriod)); } @@ -485,7 +506,7 @@ public class MedicationStatement extends DomainResource { MedicationStatementDosageComponent dst = new MedicationStatementDosageComponent(); copyValues(dst); dst.text = text == null ? null : text.copy(); - dst.schedule = schedule == null ? null : schedule.copy(); + dst.timing = timing == null ? null : timing.copy(); dst.asNeeded = asNeeded == null ? null : asNeeded.copy(); dst.site = site == null ? null : site.copy(); dst.route = route == null ? null : route.copy(); @@ -503,7 +524,7 @@ public class MedicationStatement extends DomainResource { if (!(other instanceof MedicationStatementDosageComponent)) return false; MedicationStatementDosageComponent o = (MedicationStatementDosageComponent) other; - return compareDeep(text, o.text, true) && compareDeep(schedule, o.schedule, true) && compareDeep(asNeeded, o.asNeeded, true) + return compareDeep(text, o.text, true) && compareDeep(timing, o.timing, true) && compareDeep(asNeeded, o.asNeeded, true) && compareDeep(site, o.site, true) && compareDeep(route, o.route, true) && compareDeep(method, o.method, true) && compareDeep(quantity, o.quantity, true) && compareDeep(rate, o.rate, true) && compareDeep(maxDosePerPeriod, o.maxDosePerPeriod, true) ; @@ -520,7 +541,7 @@ public class MedicationStatement extends DomainResource { } public boolean isEmpty() { - return super.isEmpty() && (text == null || text.isEmpty()) && (schedule == null || schedule.isEmpty()) + return super.isEmpty() && (text == null || text.isEmpty()) && (timing == null || timing.isEmpty()) && (asNeeded == null || asNeeded.isEmpty()) && (site == null || site.isEmpty()) && (route == null || route.isEmpty()) && (method == null || method.isEmpty()) && (quantity == null || quantity.isEmpty()) && (rate == null || rate.isEmpty()) && (maxDosePerPeriod == null || maxDosePerPeriod.isEmpty()); @@ -538,7 +559,7 @@ public class MedicationStatement extends DomainResource { /** * The person or animal who is /was taking the medication. */ - @Child(name = "patient", type = {Patient.class}, order=1, min=0, max=1) + @Child(name = "patient", type = {Patient.class}, order=1, min=1, max=1) @Description(shortDefinition="Who was/is taking medication", formalDefinition="The person or animal who is /was taking the medication." ) protected Reference patient; @@ -634,8 +655,9 @@ public class MedicationStatement extends DomainResource { /* * Constructor */ - public MedicationStatement(Enumeration status, Type medication) { + public MedicationStatement(Reference patient, Enumeration status, Type medication) { super(); + this.patient = patient; this.status = status; this.medication = medication; } @@ -1257,9 +1279,11 @@ public class MedicationStatement extends DomainResource { @SearchParamDefinition(name="identifier", path="MedicationStatement.identifier", description="Return statements with this external identity", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + @SearchParamDefinition(name="code", path="MedicationStatement.medicationCodeableConcept", description="Return administrations of this medication code", type="token" ) + public static final String SP_CODE = "code"; @SearchParamDefinition(name="patient", path="MedicationStatement.patient", description="The identity of a patient to list statements for", type="reference" ) public static final String SP_PATIENT = "patient"; - @SearchParamDefinition(name="medication", path="MedicationStatement.medicationReference", description="Code for medicine or text in medicine name", type="reference" ) + @SearchParamDefinition(name="medication", path="MedicationStatement.medicationReference", description="Return administrations of this medication reference", type="reference" ) public static final String SP_MEDICATION = "medication"; @SearchParamDefinition(name="source", path="MedicationStatement.informationSource", description="Who the information in the statement came from", type="reference" ) public static final String SP_SOURCE = "source"; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MessageHeader.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MessageHeader.java index 0bc3a9a79a7..3d1a1cf6174 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MessageHeader.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MessageHeader.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Meta.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Meta.java index 3244be74fbd..113f547b473 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Meta.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Meta.java @@ -29,11 +29,12 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.model.Enumerations.*; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; import org.hl7.fhir.instance.model.annotations.DatatypeDef; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Money.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Money.java index 955999aa588..932f2cfd158 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Money.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Money.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.annotations.DatatypeDef; import org.hl7.fhir.instance.model.annotations.Block; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NamingSystem.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NamingSystem.java index 1d5a200228f..0596e208b9a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NamingSystem.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NamingSystem.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Narrative.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Narrative.java index e61e2b94742..facfe3e25f2 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Narrative.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Narrative.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.xhtml.XhtmlNode; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NutritionOrder.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NutritionOrder.java index bc7fa8ea10b..4f6c2b9d764 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NutritionOrder.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NutritionOrder.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; @@ -588,11 +588,11 @@ public class NutritionOrder extends DomainResource { /** * The quantity of the specified nutrient to include in diet. */ - @Child(name = "amount", type = {Quantity.class}, order=2, min=0, max=1) + @Child(name = "amount", type = {SimpleQuantity.class}, order=2, min=0, max=1) @Description(shortDefinition="Quantity of the specified nutrient", formalDefinition="The quantity of the specified nutrient to include in diet." ) - protected Quantity amount; + protected SimpleQuantity amount; - private static final long serialVersionUID = 1042462093L; + private static final long serialVersionUID = 465107295L; /* * Constructor @@ -628,12 +628,12 @@ public class NutritionOrder extends DomainResource { /** * @return {@link #amount} (The quantity of the specified nutrient to include in diet.) */ - public Quantity getAmount() { + public SimpleQuantity getAmount() { if (this.amount == null) if (Configuration.errorOnAutoCreate()) throw new Error("Attempt to auto-create NutritionOrderOralDietNutrientComponent.amount"); else if (Configuration.doAutoCreate()) - this.amount = new Quantity(); // cc + this.amount = new SimpleQuantity(); // cc return this.amount; } @@ -644,7 +644,7 @@ public class NutritionOrder extends DomainResource { /** * @param value {@link #amount} (The quantity of the specified nutrient to include in diet.) */ - public NutritionOrderOralDietNutrientComponent setAmount(Quantity value) { + public NutritionOrderOralDietNutrientComponent setAmount(SimpleQuantity value) { this.amount = value; return this; } @@ -652,7 +652,7 @@ public class NutritionOrder extends DomainResource { protected void listChildren(List childrenList) { super.listChildren(childrenList); childrenList.add(new Property("modifier", "CodeableConcept", "The nutrient that is being modified such as carbohydrate or sodium.", 0, java.lang.Integer.MAX_VALUE, modifier)); - childrenList.add(new Property("amount", "Quantity", "The quantity of the specified nutrient to include in diet.", 0, java.lang.Integer.MAX_VALUE, amount)); + childrenList.add(new Property("amount", "SimpleQuantity", "The quantity of the specified nutrient to include in diet.", 0, java.lang.Integer.MAX_VALUE, amount)); } public NutritionOrderOralDietNutrientComponent copy() { @@ -830,9 +830,9 @@ public class NutritionOrder extends DomainResource { /** * The amount of the nutritional supplement to be given. */ - @Child(name = "quantity", type = {Quantity.class}, order=4, min=0, max=1) + @Child(name = "quantity", type = {SimpleQuantity.class}, order=4, min=0, max=1) @Description(shortDefinition="Amount of the nutritional supplement", formalDefinition="The amount of the nutritional supplement to be given." ) - protected Quantity quantity; + protected SimpleQuantity quantity; /** * Free text or additional instructions or information pertaining to the oral supplement. @@ -841,7 +841,7 @@ public class NutritionOrder extends DomainResource { @Description(shortDefinition="Instructions or additional information about the oral supplement", formalDefinition="Free text or additional instructions or information pertaining to the oral supplement." ) protected StringType instruction; - private static final long serialVersionUID = -37646618L; + private static final long serialVersionUID = 297545236L; /* * Constructor @@ -966,12 +966,12 @@ public class NutritionOrder extends DomainResource { /** * @return {@link #quantity} (The amount of the nutritional supplement to be given.) */ - public Quantity getQuantity() { + public SimpleQuantity getQuantity() { if (this.quantity == null) if (Configuration.errorOnAutoCreate()) throw new Error("Attempt to auto-create NutritionOrderSupplementComponent.quantity"); else if (Configuration.doAutoCreate()) - this.quantity = new Quantity(); // cc + this.quantity = new SimpleQuantity(); // cc return this.quantity; } @@ -982,7 +982,7 @@ public class NutritionOrder extends DomainResource { /** * @param value {@link #quantity} (The amount of the nutritional supplement to be given.) */ - public NutritionOrderSupplementComponent setQuantity(Quantity value) { + public NutritionOrderSupplementComponent setQuantity(SimpleQuantity value) { this.quantity = value; return this; } @@ -1041,7 +1041,7 @@ public class NutritionOrder extends DomainResource { childrenList.add(new Property("type", "CodeableConcept", "The kind of nutritional supplement product required such as a high protein or pediatric clear liquid supplement.", 0, java.lang.Integer.MAX_VALUE, type)); childrenList.add(new Property("productName", "string", "The product or brand name of the nutritional supplement such as 'Acme Protein Shake'.", 0, java.lang.Integer.MAX_VALUE, productName)); childrenList.add(new Property("schedule", "Timing", "The time period and frequency at which the supplement(s) should be given.", 0, java.lang.Integer.MAX_VALUE, schedule)); - childrenList.add(new Property("quantity", "Quantity", "The amount of the nutritional supplement to be given.", 0, java.lang.Integer.MAX_VALUE, quantity)); + childrenList.add(new Property("quantity", "SimpleQuantity", "The amount of the nutritional supplement to be given.", 0, java.lang.Integer.MAX_VALUE, quantity)); childrenList.add(new Property("instruction", "string", "Free text or additional instructions or information pertaining to the oral supplement.", 0, java.lang.Integer.MAX_VALUE, instruction)); } @@ -1123,9 +1123,9 @@ public class NutritionOrder extends DomainResource { /** * The amount of energy (Calories) that the formula should provide per specified volume, typically per mL or fluid oz. For example, an infant may require a formula the provides 24 Calories per fluid ounce or an adult may require an enteral formula that provides 1.5 Calorie/mL. */ - @Child(name = "caloricDensity", type = {Quantity.class}, order=5, min=0, max=1) + @Child(name = "caloricDensity", type = {SimpleQuantity.class}, order=5, min=0, max=1) @Description(shortDefinition="Amount of energy per specified volume that is required", formalDefinition="The amount of energy (Calories) that the formula should provide per specified volume, typically per mL or fluid oz. For example, an infant may require a formula the provides 24 Calories per fluid ounce or an adult may require an enteral formula that provides 1.5 Calorie/mL." ) - protected Quantity caloricDensity; + protected SimpleQuantity caloricDensity; /** * The route or physiological path of administration into the patient 's gastrointestinal tract for purposes of providing the formula feeding, e.g., nasogastric tube. @@ -1144,9 +1144,9 @@ public class NutritionOrder extends DomainResource { /** * The maximum total quantity of formula that may be administered to a subject over the period of time, e.g., 1440 mL over 24 hours. */ - @Child(name = "maxVolumeToDeliver", type = {Quantity.class}, order=8, min=0, max=1) + @Child(name = "maxVolumeToDeliver", type = {SimpleQuantity.class}, order=8, min=0, max=1) @Description(shortDefinition="Upper limit on formula volume per unit of time", formalDefinition="The maximum total quantity of formula that may be administered to a subject over the period of time, e.g., 1440 mL over 24 hours." ) - protected Quantity maxVolumeToDeliver; + protected SimpleQuantity maxVolumeToDeliver; /** * Free text formula administration, feeding instructions or additional instructions or information. @@ -1155,7 +1155,7 @@ public class NutritionOrder extends DomainResource { @Description(shortDefinition="Formula feeding instructions expressed as text", formalDefinition="Free text formula administration, feeding instructions or additional instructions or information." ) protected StringType administrationInstruction; - private static final long serialVersionUID = -124511395L; + private static final long serialVersionUID = 292116061L; /* * Constructor @@ -1313,12 +1313,12 @@ public class NutritionOrder extends DomainResource { /** * @return {@link #caloricDensity} (The amount of energy (Calories) that the formula should provide per specified volume, typically per mL or fluid oz. For example, an infant may require a formula the provides 24 Calories per fluid ounce or an adult may require an enteral formula that provides 1.5 Calorie/mL.) */ - public Quantity getCaloricDensity() { + public SimpleQuantity getCaloricDensity() { if (this.caloricDensity == null) if (Configuration.errorOnAutoCreate()) throw new Error("Attempt to auto-create NutritionOrderEnteralFormulaComponent.caloricDensity"); else if (Configuration.doAutoCreate()) - this.caloricDensity = new Quantity(); // cc + this.caloricDensity = new SimpleQuantity(); // cc return this.caloricDensity; } @@ -1329,7 +1329,7 @@ public class NutritionOrder extends DomainResource { /** * @param value {@link #caloricDensity} (The amount of energy (Calories) that the formula should provide per specified volume, typically per mL or fluid oz. For example, an infant may require a formula the provides 24 Calories per fluid ounce or an adult may require an enteral formula that provides 1.5 Calorie/mL.) */ - public NutritionOrderEnteralFormulaComponent setCaloricDensity(Quantity value) { + public NutritionOrderEnteralFormulaComponent setCaloricDensity(SimpleQuantity value) { this.caloricDensity = value; return this; } @@ -1401,12 +1401,12 @@ public class NutritionOrder extends DomainResource { /** * @return {@link #maxVolumeToDeliver} (The maximum total quantity of formula that may be administered to a subject over the period of time, e.g., 1440 mL over 24 hours.) */ - public Quantity getMaxVolumeToDeliver() { + public SimpleQuantity getMaxVolumeToDeliver() { if (this.maxVolumeToDeliver == null) if (Configuration.errorOnAutoCreate()) throw new Error("Attempt to auto-create NutritionOrderEnteralFormulaComponent.maxVolumeToDeliver"); else if (Configuration.doAutoCreate()) - this.maxVolumeToDeliver = new Quantity(); // cc + this.maxVolumeToDeliver = new SimpleQuantity(); // cc return this.maxVolumeToDeliver; } @@ -1417,7 +1417,7 @@ public class NutritionOrder extends DomainResource { /** * @param value {@link #maxVolumeToDeliver} (The maximum total quantity of formula that may be administered to a subject over the period of time, e.g., 1440 mL over 24 hours.) */ - public NutritionOrderEnteralFormulaComponent setMaxVolumeToDeliver(Quantity value) { + public NutritionOrderEnteralFormulaComponent setMaxVolumeToDeliver(SimpleQuantity value) { this.maxVolumeToDeliver = value; return this; } @@ -1477,10 +1477,10 @@ public class NutritionOrder extends DomainResource { childrenList.add(new Property("baseFormulaProductName", "string", "The product or brand name of the enteral or infant formula product such as 'ACME Adult Standard Formula'.", 0, java.lang.Integer.MAX_VALUE, baseFormulaProductName)); childrenList.add(new Property("additiveType", "CodeableConcept", "Indicates the type of modular component such as protein, carbohydrate, fat or fiber to be provided in addition to or mixed with the base formula.", 0, java.lang.Integer.MAX_VALUE, additiveType)); childrenList.add(new Property("additiveProductName", "string", "The product or brand name of the type of modular component to be added to the formula.", 0, java.lang.Integer.MAX_VALUE, additiveProductName)); - childrenList.add(new Property("caloricDensity", "Quantity", "The amount of energy (Calories) that the formula should provide per specified volume, typically per mL or fluid oz. For example, an infant may require a formula the provides 24 Calories per fluid ounce or an adult may require an enteral formula that provides 1.5 Calorie/mL.", 0, java.lang.Integer.MAX_VALUE, caloricDensity)); + childrenList.add(new Property("caloricDensity", "SimpleQuantity", "The amount of energy (Calories) that the formula should provide per specified volume, typically per mL or fluid oz. For example, an infant may require a formula the provides 24 Calories per fluid ounce or an adult may require an enteral formula that provides 1.5 Calorie/mL.", 0, java.lang.Integer.MAX_VALUE, caloricDensity)); childrenList.add(new Property("routeofAdministration", "CodeableConcept", "The route or physiological path of administration into the patient 's gastrointestinal tract for purposes of providing the formula feeding, e.g., nasogastric tube.", 0, java.lang.Integer.MAX_VALUE, routeofAdministration)); childrenList.add(new Property("administration", "", "Formula administration instructions as structured data. This repeating structure allows for changing the administration rate or volume over time for both bolus and continuous feeding. An example of this would be an instruction to increase the rate of continuous feeding every 2 hours.", 0, java.lang.Integer.MAX_VALUE, administration)); - childrenList.add(new Property("maxVolumeToDeliver", "Quantity", "The maximum total quantity of formula that may be administered to a subject over the period of time, e.g., 1440 mL over 24 hours.", 0, java.lang.Integer.MAX_VALUE, maxVolumeToDeliver)); + childrenList.add(new Property("maxVolumeToDeliver", "SimpleQuantity", "The maximum total quantity of formula that may be administered to a subject over the period of time, e.g., 1440 mL over 24 hours.", 0, java.lang.Integer.MAX_VALUE, maxVolumeToDeliver)); childrenList.add(new Property("administrationInstruction", "string", "Free text formula administration, feeding instructions or additional instructions or information.", 0, java.lang.Integer.MAX_VALUE, administrationInstruction)); } @@ -1550,18 +1550,18 @@ public class NutritionOrder extends DomainResource { /** * The volume of formula to provide to the patient per the specified administration schedule. */ - @Child(name = "quantity", type = {Quantity.class}, order=2, min=0, max=1) + @Child(name = "quantity", type = {SimpleQuantity.class}, order=2, min=0, max=1) @Description(shortDefinition="The volume of formula to provide", formalDefinition="The volume of formula to provide to the patient per the specified administration schedule." ) - protected Quantity quantity; + protected SimpleQuantity quantity; /** * The rate of administration of formula via a feeding pump, e.g., 60 mL per hour, according to the specified schedule. */ - @Child(name = "rate", type = {Quantity.class, Ratio.class}, order=3, min=0, max=1) + @Child(name = "rate", type = {SimpleQuantity.class, Ratio.class}, order=3, min=0, max=1) @Description(shortDefinition="Speed with which the formula is provided per period of time", formalDefinition="The rate of administration of formula via a feeding pump, e.g., 60 mL per hour, according to the specified schedule." ) protected Type rate; - private static final long serialVersionUID = 673093291L; + private static final long serialVersionUID = 1895031997L; /* * Constructor @@ -1597,12 +1597,12 @@ public class NutritionOrder extends DomainResource { /** * @return {@link #quantity} (The volume of formula to provide to the patient per the specified administration schedule.) */ - public Quantity getQuantity() { + public SimpleQuantity getQuantity() { if (this.quantity == null) if (Configuration.errorOnAutoCreate()) throw new Error("Attempt to auto-create NutritionOrderEnteralFormulaAdministrationComponent.quantity"); else if (Configuration.doAutoCreate()) - this.quantity = new Quantity(); // cc + this.quantity = new SimpleQuantity(); // cc return this.quantity; } @@ -1613,7 +1613,7 @@ public class NutritionOrder extends DomainResource { /** * @param value {@link #quantity} (The volume of formula to provide to the patient per the specified administration schedule.) */ - public NutritionOrderEnteralFormulaAdministrationComponent setQuantity(Quantity value) { + public NutritionOrderEnteralFormulaAdministrationComponent setQuantity(SimpleQuantity value) { this.quantity = value; return this; } @@ -1628,14 +1628,14 @@ public class NutritionOrder extends DomainResource { /** * @return {@link #rate} (The rate of administration of formula via a feeding pump, e.g., 60 mL per hour, according to the specified schedule.) */ - public Quantity getRateQuantity() throws Exception { - if (!(this.rate instanceof Quantity)) - throw new Exception("Type mismatch: the type Quantity was expected, but "+this.rate.getClass().getName()+" was encountered"); - return (Quantity) this.rate; + public SimpleQuantity getRateSimpleQuantity() throws Exception { + if (!(this.rate instanceof SimpleQuantity)) + throw new Exception("Type mismatch: the type SimpleQuantity was expected, but "+this.rate.getClass().getName()+" was encountered"); + return (SimpleQuantity) this.rate; } - public boolean hasRateQuantity() throws Exception { - return this.rate instanceof Quantity; + public boolean hasRateSimpleQuantity() throws Exception { + return this.rate instanceof SimpleQuantity; } /** @@ -1666,8 +1666,8 @@ public class NutritionOrder extends DomainResource { protected void listChildren(List childrenList) { super.listChildren(childrenList); childrenList.add(new Property("schedule", "Timing", "The time period and frequency at which the enteral formula should be delivered to the patient.", 0, java.lang.Integer.MAX_VALUE, schedule)); - childrenList.add(new Property("quantity", "Quantity", "The volume of formula to provide to the patient per the specified administration schedule.", 0, java.lang.Integer.MAX_VALUE, quantity)); - childrenList.add(new Property("rate[x]", "Quantity|Ratio", "The rate of administration of formula via a feeding pump, e.g., 60 mL per hour, according to the specified schedule.", 0, java.lang.Integer.MAX_VALUE, rate)); + childrenList.add(new Property("quantity", "SimpleQuantity", "The volume of formula to provide to the patient per the specified administration schedule.", 0, java.lang.Integer.MAX_VALUE, quantity)); + childrenList.add(new Property("rate[x]", "SimpleQuantity|Ratio", "The rate of administration of formula via a feeding pump, e.g., 60 mL per hour, according to the specified schedule.", 0, java.lang.Integer.MAX_VALUE, rate)); } public NutritionOrderEnteralFormulaAdministrationComponent copy() { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Observation.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Observation.java index d53f39e4632..072aedce794 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Observation.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Observation.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; @@ -321,16 +321,16 @@ public class Observation extends DomainResource { /** * The value of the low bound of the reference range. If this element is omitted, the low bound of the reference range is assumed to be meaningless. (e.g. reference range is <2.3) If the low.comparator element is missing, it is assumed to be '>'. */ - @Child(name = "low", type = {Quantity.class}, order=1, min=0, max=1) + @Child(name = "low", type = {SimpleQuantity.class}, order=1, min=0, max=1) @Description(shortDefinition="Low Range, if relevant", formalDefinition="The value of the low bound of the reference range. If this element is omitted, the low bound of the reference range is assumed to be meaningless. (e.g. reference range is <2.3) If the low.comparator element is missing, it is assumed to be '>'." ) - protected Quantity low; + protected SimpleQuantity low; /** * The value of the high bound of the reference range. If this element is omitted, the high bound of the reference range is assumed to be meaningless. (e.g. reference range is > 5) If the low.comparator element is missing , it is assumed to be '<'. */ - @Child(name = "high", type = {Quantity.class}, order=2, min=0, max=1) + @Child(name = "high", type = {SimpleQuantity.class}, order=2, min=0, max=1) @Description(shortDefinition="High Range, if relevant", formalDefinition="The value of the high bound of the reference range. If this element is omitted, the high bound of the reference range is assumed to be meaningless. (e.g. reference range is > 5) If the low.comparator element is missing , it is assumed to be '<'." ) - protected Quantity high; + protected SimpleQuantity high; /** * Code for the meaning of the reference range. @@ -353,7 +353,7 @@ public class Observation extends DomainResource { @Description(shortDefinition="Text based reference range in an observation", formalDefinition="Text based reference range in an observation which may be used when a quantitative range is not appropriate for an observation. An example would be a reference value of 'Negative' or a list or table of 'normals'." ) protected StringType text; - private static final long serialVersionUID = 230621180L; + private static final long serialVersionUID = -238694788L; /* * Constructor @@ -365,12 +365,12 @@ public class Observation extends DomainResource { /** * @return {@link #low} (The value of the low bound of the reference range. If this element is omitted, the low bound of the reference range is assumed to be meaningless. (e.g. reference range is <2.3) If the low.comparator element is missing, it is assumed to be '>'.) */ - public Quantity getLow() { + public SimpleQuantity getLow() { if (this.low == null) if (Configuration.errorOnAutoCreate()) throw new Error("Attempt to auto-create ObservationReferenceRangeComponent.low"); else if (Configuration.doAutoCreate()) - this.low = new Quantity(); // cc + this.low = new SimpleQuantity(); // cc return this.low; } @@ -381,7 +381,7 @@ public class Observation extends DomainResource { /** * @param value {@link #low} (The value of the low bound of the reference range. If this element is omitted, the low bound of the reference range is assumed to be meaningless. (e.g. reference range is <2.3) If the low.comparator element is missing, it is assumed to be '>'.) */ - public ObservationReferenceRangeComponent setLow(Quantity value) { + public ObservationReferenceRangeComponent setLow(SimpleQuantity value) { this.low = value; return this; } @@ -389,12 +389,12 @@ public class Observation extends DomainResource { /** * @return {@link #high} (The value of the high bound of the reference range. If this element is omitted, the high bound of the reference range is assumed to be meaningless. (e.g. reference range is > 5) If the low.comparator element is missing , it is assumed to be '<'.) */ - public Quantity getHigh() { + public SimpleQuantity getHigh() { if (this.high == null) if (Configuration.errorOnAutoCreate()) throw new Error("Attempt to auto-create ObservationReferenceRangeComponent.high"); else if (Configuration.doAutoCreate()) - this.high = new Quantity(); // cc + this.high = new SimpleQuantity(); // cc return this.high; } @@ -405,7 +405,7 @@ public class Observation extends DomainResource { /** * @param value {@link #high} (The value of the high bound of the reference range. If this element is omitted, the high bound of the reference range is assumed to be meaningless. (e.g. reference range is > 5) If the low.comparator element is missing , it is assumed to be '<'.) */ - public ObservationReferenceRangeComponent setHigh(Quantity value) { + public ObservationReferenceRangeComponent setHigh(SimpleQuantity value) { this.high = value; return this; } @@ -509,8 +509,8 @@ public class Observation extends DomainResource { protected void listChildren(List childrenList) { super.listChildren(childrenList); - childrenList.add(new Property("low", "Quantity", "The value of the low bound of the reference range. If this element is omitted, the low bound of the reference range is assumed to be meaningless. (e.g. reference range is <2.3) If the low.comparator element is missing, it is assumed to be '>'.", 0, java.lang.Integer.MAX_VALUE, low)); - childrenList.add(new Property("high", "Quantity", "The value of the high bound of the reference range. If this element is omitted, the high bound of the reference range is assumed to be meaningless. (e.g. reference range is > 5) If the low.comparator element is missing , it is assumed to be '<'.", 0, java.lang.Integer.MAX_VALUE, high)); + childrenList.add(new Property("low", "SimpleQuantity", "The value of the low bound of the reference range. If this element is omitted, the low bound of the reference range is assumed to be meaningless. (e.g. reference range is <2.3) If the low.comparator element is missing, it is assumed to be '>'.", 0, java.lang.Integer.MAX_VALUE, low)); + childrenList.add(new Property("high", "SimpleQuantity", "The value of the high bound of the reference range. If this element is omitted, the high bound of the reference range is assumed to be meaningless. (e.g. reference range is > 5) If the low.comparator element is missing , it is assumed to be '<'.", 0, java.lang.Integer.MAX_VALUE, high)); childrenList.add(new Property("meaning", "CodeableConcept", "Code for the meaning of the reference range.", 0, java.lang.Integer.MAX_VALUE, meaning)); childrenList.add(new Property("age", "Range", "The age at which this reference range is applicable. This is a neonatal age (e.g. number of weeks at term) if the meaning says so.", 0, java.lang.Integer.MAX_VALUE, age)); childrenList.add(new Property("text", "string", "Text based reference range in an observation which may be used when a quantitative range is not appropriate for an observation. An example would be a reference value of 'Negative' or a list or table of 'normals'.", 0, java.lang.Integer.MAX_VALUE, text)); diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationDefinition.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationDefinition.java index 6a8cdd90347..f3f5c29257e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationDefinition.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationOutcome.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationOutcome.java index 1501b0db32c..365b7aee8d9 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationOutcome.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationOutcome.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Order.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Order.java index c2f45968c3b..45a7f2155e0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Order.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Order.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OrderResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OrderResponse.java index 570dc73e5da..5ce6c46406c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OrderResponse.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OrderResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Organization.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Organization.java index cd407d62874..3ba5cd94d4f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Organization.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Organization.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Parameters.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Parameters.java index cbf892ae102..692a664ba47 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Parameters.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Parameters.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Patient.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Patient.java index 2f0bea6e8b3..888fb946487 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Patient.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Patient.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentNotice.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentNotice.java index d935ebd29ee..f941439a1b1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentNotice.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentNotice.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentReconciliation.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentReconciliation.java index fb8e0db9649..62c176415a8 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentReconciliation.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentReconciliation.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Period.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Period.java index a6a8dcb6502..a0a1c001975 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Period.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Period.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Person.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Person.java index 1176a828433..28062f57f47 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Person.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Person.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Practitioner.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Practitioner.java index 7660a8d7c10..444125c40e9 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Practitioner.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Practitioner.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Procedure.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Procedure.java index 7b6c6d636f4..3372c2168bb 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Procedure.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Procedure.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; @@ -473,7 +473,7 @@ public class Procedure extends DomainResource { /** * The related item - e.g. a procedure. */ - @Child(name = "target", type = {AllergyIntolerance.class, CarePlan.class, Condition.class, DiagnosticReport.class, FamilyMemberHistory.class, ImagingStudy.class, Immunization.class, ImmunizationRecommendation.class, MedicationAdministration.class, MedicationDispense.class, MedicationPrescription.class, MedicationStatement.class, Observation.class, Procedure.class}, order=2, min=0, max=1) + @Child(name = "target", type = {AllergyIntolerance.class, CarePlan.class, Condition.class, DiagnosticReport.class, FamilyMemberHistory.class, ImagingStudy.class, Immunization.class, ImmunizationRecommendation.class, MedicationAdministration.class, MedicationDispense.class, MedicationOrder.class, MedicationStatement.class, Observation.class, Procedure.class}, order=2, min=0, max=1) @Description(shortDefinition="The related item - e.g. a procedure", formalDefinition="The related item - e.g. a procedure." ) protected Reference target; @@ -582,7 +582,7 @@ public class Procedure extends DomainResource { protected void listChildren(List childrenList) { super.listChildren(childrenList); childrenList.add(new Property("type", "code", "The nature of the relationship.", 0, java.lang.Integer.MAX_VALUE, type)); - childrenList.add(new Property("target", "Reference(AllergyIntolerance|CarePlan|Condition|DiagnosticReport|FamilyMemberHistory|ImagingStudy|Immunization|ImmunizationRecommendation|MedicationAdministration|MedicationDispense|MedicationPrescription|MedicationStatement|Observation|Procedure)", "The related item - e.g. a procedure.", 0, java.lang.Integer.MAX_VALUE, target)); + childrenList.add(new Property("target", "Reference(AllergyIntolerance|CarePlan|Condition|DiagnosticReport|FamilyMemberHistory|ImagingStudy|Immunization|ImmunizationRecommendation|MedicationAdministration|MedicationDispense|MedicationOrder|MedicationStatement|Observation|Procedure)", "The related item - e.g. a procedure.", 0, java.lang.Integer.MAX_VALUE, target)); } public ProcedureRelatedItemComponent copy() { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcedureRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcedureRequest.java index 4b4c3a47cff..b8d02bcf7a4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcedureRequest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcedureRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessRequest.java index 3021c4609c4..44e6a71f853 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessRequest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessResponse.java index 198412a266c..5bd347d9e38 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessResponse.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Provenance.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Provenance.java index 29b72fce4fd..31cd56e520e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Provenance.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Provenance.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; @@ -1209,7 +1209,7 @@ public class Provenance extends DomainResource { public static final String SP_SIGTYPE = "sigtype"; @SearchParamDefinition(name="agent", path="Provenance.agent.actor", description="Individual, device or organization playing role", type="reference" ) public static final String SP_AGENT = "agent"; - @SearchParamDefinition(name="entitytype", path="Provenance.entity.reference", description="Identity of entity", type="uri" ) + @SearchParamDefinition(name="entitytype", path="Provenance.entity.type", description="Entity Type", type="token" ) public static final String SP_ENTITYTYPE = "entitytype"; @SearchParamDefinition(name="patient", path="Provenance.target", description="Target Reference(s) (usually version specific)", type="reference" ) public static final String SP_PATIENT = "patient"; @@ -1221,7 +1221,7 @@ public class Provenance extends DomainResource { public static final String SP_LOCATION = "location"; @SearchParamDefinition(name="userid", path="Provenance.agent.userId", description="Authorization-system identifier for the agent", type="token" ) public static final String SP_USERID = "userid"; - @SearchParamDefinition(name="entity", path="Provenance.entity.type", description="Entity Type", type="token" ) + @SearchParamDefinition(name="entity", path="Provenance.entity.reference", description="Identity of entity", type="uri" ) public static final String SP_ENTITY = "entity"; @SearchParamDefinition(name="target", path="Provenance.target", description="Target Reference(s) (usually version specific)", type="reference" ) public static final String SP_TARGET = "target"; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Quantity.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Quantity.java index 0fd62484e15..a34c5690ea1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Quantity.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Quantity.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Questionnaire.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Questionnaire.java index e8bf483bf93..3ad659934b7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Questionnaire.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Questionnaire.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; @@ -191,7 +191,7 @@ public class Questionnaire extends DomainResource { */ REFERENCE, /** - * Answer is a combination of a numeric value and unit + * Answer is a combination of a numeric value and unit, potentially with a comparator (<, >, etc) */ QUANTITY, /** @@ -289,7 +289,7 @@ public class Questionnaire extends DomainResource { case OPENCHOICE: return "Answer is a Coding drawn from a list of options or a free-text entry."; case ATTACHMENT: return "Answer is binary content such as a image, PDF, etc."; case REFERENCE: return "Answer is a reference to another resource (practitioner, organization, etc.)"; - case QUANTITY: return "Answer is a combination of a numeric value and unit"; + case QUANTITY: return "Answer is a combination of a numeric value and unit, potentially with a comparator (<, >, etc)"; default: return "?"; } } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/QuestionnaireResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/QuestionnaireResponse.java index 50c06870f75..b6a6e7ac914 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/QuestionnaireResponse.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/QuestionnaireResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Range.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Range.java index db2b1104344..1f115176d51 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Range.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Range.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; @@ -47,18 +47,18 @@ public class Range extends Type implements ICompositeType { /** * The low limit. The boundary is inclusive. */ - @Child(name = "low", type = {Quantity.class}, order=0, min=0, max=1) + @Child(name = "low", type = {SimpleQuantity.class}, order=0, min=0, max=1) @Description(shortDefinition="Low limit", formalDefinition="The low limit. The boundary is inclusive." ) - protected Quantity low; + protected SimpleQuantity low; /** * The high limit. The boundary is inclusive. */ - @Child(name = "high", type = {Quantity.class}, order=1, min=0, max=1) + @Child(name = "high", type = {SimpleQuantity.class}, order=1, min=0, max=1) @Description(shortDefinition="High limit", formalDefinition="The high limit. The boundary is inclusive." ) - protected Quantity high; + protected SimpleQuantity high; - private static final long serialVersionUID = -474933350L; + private static final long serialVersionUID = 1699187994L; /* * Constructor @@ -70,12 +70,12 @@ public class Range extends Type implements ICompositeType { /** * @return {@link #low} (The low limit. The boundary is inclusive.) */ - public Quantity getLow() { + public SimpleQuantity getLow() { if (this.low == null) if (Configuration.errorOnAutoCreate()) throw new Error("Attempt to auto-create Range.low"); else if (Configuration.doAutoCreate()) - this.low = new Quantity(); // cc + this.low = new SimpleQuantity(); // cc return this.low; } @@ -86,7 +86,7 @@ public class Range extends Type implements ICompositeType { /** * @param value {@link #low} (The low limit. The boundary is inclusive.) */ - public Range setLow(Quantity value) { + public Range setLow(SimpleQuantity value) { this.low = value; return this; } @@ -94,12 +94,12 @@ public class Range extends Type implements ICompositeType { /** * @return {@link #high} (The high limit. The boundary is inclusive.) */ - public Quantity getHigh() { + public SimpleQuantity getHigh() { if (this.high == null) if (Configuration.errorOnAutoCreate()) throw new Error("Attempt to auto-create Range.high"); else if (Configuration.doAutoCreate()) - this.high = new Quantity(); // cc + this.high = new SimpleQuantity(); // cc return this.high; } @@ -110,15 +110,15 @@ public class Range extends Type implements ICompositeType { /** * @param value {@link #high} (The high limit. The boundary is inclusive.) */ - public Range setHigh(Quantity value) { + public Range setHigh(SimpleQuantity value) { this.high = value; return this; } protected void listChildren(List childrenList) { super.listChildren(childrenList); - childrenList.add(new Property("low", "Quantity", "The low limit. The boundary is inclusive.", 0, java.lang.Integer.MAX_VALUE, low)); - childrenList.add(new Property("high", "Quantity", "The high limit. The boundary is inclusive.", 0, java.lang.Integer.MAX_VALUE, high)); + childrenList.add(new Property("low", "SimpleQuantity", "The low limit. The boundary is inclusive.", 0, java.lang.Integer.MAX_VALUE, low)); + childrenList.add(new Property("high", "SimpleQuantity", "The high limit. The boundary is inclusive.", 0, java.lang.Integer.MAX_VALUE, high)); } public Range copy() { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Ratio.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Ratio.java index f41fbf81d18..ebc63f4ee5f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Ratio.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Ratio.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Reference.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Reference.java index 3cb911e4dd1..1a37cb7f82d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Reference.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Reference.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ReferralRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ReferralRequest.java index c7640ab8fa8..b2427a01c93 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ReferralRequest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ReferralRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RelatedPerson.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RelatedPerson.java index 415c3c26f29..491984ef3b7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RelatedPerson.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RelatedPerson.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; @@ -104,9 +104,9 @@ public class RelatedPerson extends DomainResource { /** * Address where the related person can be contacted or visited. */ - @Child(name = "address", type = {Address.class}, order=7, min=0, max=1) + @Child(name = "address", type = {Address.class}, order=7, min=0, max=Child.MAX_UNLIMITED) @Description(shortDefinition="Address where the related person can be contacted or visited", formalDefinition="Address where the related person can be contacted or visited." ) - protected Address address; + protected List
address; /** * Image of the person. @@ -122,7 +122,7 @@ public class RelatedPerson extends DomainResource { @Description(shortDefinition="Period of time that this relationship is considered valid", formalDefinition="The period of time that this relationship is considered to be valid. If there are no dates defined, then the interval is unknown." ) protected Period period; - private static final long serialVersionUID = 1434295859L; + private static final long serialVersionUID = 7777543L; /* * Constructor @@ -412,24 +412,40 @@ public class RelatedPerson extends DomainResource { /** * @return {@link #address} (Address where the related person can be contacted or visited.) */ - public Address getAddress() { + public List
getAddress() { if (this.address == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create RelatedPerson.address"); - else if (Configuration.doAutoCreate()) - this.address = new Address(); // cc + this.address = new ArrayList
(); return this.address; } public boolean hasAddress() { - return this.address != null && !this.address.isEmpty(); + if (this.address == null) + return false; + for (Address item : this.address) + if (!item.isEmpty()) + return true; + return false; } /** - * @param value {@link #address} (Address where the related person can be contacted or visited.) + * @return {@link #address} (Address where the related person can be contacted or visited.) */ - public RelatedPerson setAddress(Address value) { - this.address = value; + // syntactic sugar + public Address addAddress() { //3 + Address t = new Address(); + if (this.address == null) + this.address = new ArrayList
(); + this.address.add(t); + return t; + } + + // syntactic sugar + public RelatedPerson addAddress(Address t) { //3 + if (t == null) + return this; + if (this.address == null) + this.address = new ArrayList
(); + this.address.add(t); return this; } @@ -529,7 +545,11 @@ public class RelatedPerson extends DomainResource { }; dst.gender = gender == null ? null : gender.copy(); dst.birthDate = birthDate == null ? null : birthDate.copy(); - dst.address = address == null ? null : address.copy(); + if (address != null) { + dst.address = new ArrayList
(); + for (Address i : address) + dst.address.add(i.copy()); + }; if (photo != null) { dst.photo = new ArrayList(); for (Attachment i : photo) diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Resource.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Resource.java index b85e57290d0..3929df2887f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Resource.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Resource.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ResourceFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ResourceFactory.java index 2d8cb58bb8f..a434f60d21d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ResourceFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ResourceFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public class ResourceFactory extends Factory { @@ -62,8 +62,6 @@ public class ResourceFactory extends Factory { return new EnrollmentRequest(); if ("EpisodeOfCare".equals(name)) return new EpisodeOfCare(); - if ("MedicationPrescription".equals(name)) - return new MedicationPrescription(); if ("OperationOutcome".equals(name)) return new OperationOutcome(); if ("Medication".equals(name)) @@ -178,6 +176,8 @@ public class ResourceFactory extends Factory { return new Substance(); if ("AuditEvent".equals(name)) return new AuditEvent(); + if ("MedicationOrder".equals(name)) + return new MedicationOrder(); if ("SearchParameter".equals(name)) return new SearchParameter(); if ("PaymentReconciliation".equals(name)) @@ -259,6 +259,8 @@ public class ResourceFactory extends Factory { return new Age(); if ("Reference".equals(name)) return new Reference(); + if ("SimpleQuantity".equals(name)) + return new SimpleQuantity(); if ("Quantity".equals(name)) return new Quantity(); if ("Period".equals(name)) diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ResourceType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ResourceType.java index ba37f2c12d6..8bc80e177c0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ResourceType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ResourceType.java @@ -1,6 +1,6 @@ package org.hl7.fhir.instance.model; -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum ResourceType { Account, @@ -58,7 +58,7 @@ public enum ResourceType { Medication, MedicationAdministration, MedicationDispense, - MedicationPrescription, + MedicationOrder, MedicationStatement, MessageHeader, NamingSystem, @@ -211,8 +211,8 @@ public enum ResourceType { return "medicationadministration"; case MedicationDispense: return "medicationdispense"; - case MedicationPrescription: - return "medicationprescription"; + case MedicationOrder: + return "medicationorder"; case MedicationStatement: return "medicationstatement"; case MessageHeader: diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RiskAssessment.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RiskAssessment.java index d8b66e468d6..004515240b1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RiskAssessment.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RiskAssessment.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SampledData.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SampledData.java index 0063edc84cb..cf726ffaf82 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SampledData.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SampledData.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; @@ -49,9 +49,9 @@ public class SampledData extends Type implements ICompositeType { /** * The base quantity that a measured value of zero represents. In addition, this provides the units of the entire measurement series. */ - @Child(name = "origin", type = {Quantity.class}, order=0, min=1, max=1) + @Child(name = "origin", type = {SimpleQuantity.class}, order=0, min=1, max=1) @Description(shortDefinition="Zero value and units", formalDefinition="The base quantity that a measured value of zero represents. In addition, this provides the units of the entire measurement series." ) - protected Quantity origin; + protected SimpleQuantity origin; /** * The length of time between sampling times, measured in milliseconds. @@ -95,7 +95,7 @@ public class SampledData extends Type implements ICompositeType { @Description(shortDefinition="Decimal values with spaces, or 'E' | 'U' | 'L'", formalDefinition="A series of data points which are decimal values separated by a single space (character u20). The special values 'E' (error), 'L' (below detection limit) and 'U' (above detection limit) can also be used in place of a decimal value." ) protected StringType data; - private static final long serialVersionUID = -1984181262L; + private static final long serialVersionUID = -1763278368L; /* * Constructor @@ -107,7 +107,7 @@ public class SampledData extends Type implements ICompositeType { /* * Constructor */ - public SampledData(Quantity origin, DecimalType period, PositiveIntType dimensions, StringType data) { + public SampledData(SimpleQuantity origin, DecimalType period, PositiveIntType dimensions, StringType data) { super(); this.origin = origin; this.period = period; @@ -118,12 +118,12 @@ public class SampledData extends Type implements ICompositeType { /** * @return {@link #origin} (The base quantity that a measured value of zero represents. In addition, this provides the units of the entire measurement series.) */ - public Quantity getOrigin() { + public SimpleQuantity getOrigin() { if (this.origin == null) if (Configuration.errorOnAutoCreate()) throw new Error("Attempt to auto-create SampledData.origin"); else if (Configuration.doAutoCreate()) - this.origin = new Quantity(); // cc + this.origin = new SimpleQuantity(); // cc return this.origin; } @@ -134,7 +134,7 @@ public class SampledData extends Type implements ICompositeType { /** * @param value {@link #origin} (The base quantity that a measured value of zero represents. In addition, this provides the units of the entire measurement series.) */ - public SampledData setOrigin(Quantity value) { + public SampledData setOrigin(SimpleQuantity value) { this.origin = value; return this; } @@ -423,7 +423,7 @@ public class SampledData extends Type implements ICompositeType { protected void listChildren(List childrenList) { super.listChildren(childrenList); - childrenList.add(new Property("origin", "Quantity", "The base quantity that a measured value of zero represents. In addition, this provides the units of the entire measurement series.", 0, java.lang.Integer.MAX_VALUE, origin)); + childrenList.add(new Property("origin", "SimpleQuantity", "The base quantity that a measured value of zero represents. In addition, this provides the units of the entire measurement series.", 0, java.lang.Integer.MAX_VALUE, origin)); childrenList.add(new Property("period", "decimal", "The length of time between sampling times, measured in milliseconds.", 0, java.lang.Integer.MAX_VALUE, period)); childrenList.add(new Property("factor", "decimal", "A correction factor that is applied to the sampled data points before they are added to the origin.", 0, java.lang.Integer.MAX_VALUE, factor)); childrenList.add(new Property("lowerLimit", "decimal", "The lower limit of detection of the measured points. This is needed if any of the data points have the value 'L' (lower than detection limit).", 0, java.lang.Integer.MAX_VALUE, lowerLimit)); diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Schedule.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Schedule.java index 6b4f8e38ab8..5f536f7760c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Schedule.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Schedule.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SearchParameter.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SearchParameter.java index 2f21ae54fa0..1c6c3c2e27c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SearchParameter.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SearchParameter.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Signature.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Signature.java index 9677367c59d..5c029babf2e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Signature.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Signature.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SimpleQuantity.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SimpleQuantity.java new file mode 100644 index 00000000000..6370093950b --- /dev/null +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SimpleQuantity.java @@ -0,0 +1,90 @@ +package org.hl7.fhir.instance.model; + +/* + Copyright (c) 2011+, HL7, Inc. + All rights reserved. + + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of HL7 nor the names of its contributors may be used to + endorse or promote products derived from this software without specific + prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +*/ + +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 + +import org.hl7.fhir.instance.model.annotations.DatatypeDef; +import org.hl7.fhir.instance.model.annotations.Block; +import org.hl7.fhir.instance.model.api.*; +/** + * A measured amount (or an amount that can potentially be measured). Note that measured amounts include amounts that are not precisely quantified, including amounts involving arbitrary units and floating currencies. + */ +@DatatypeDef(name="SimpleQuantity") +public class SimpleQuantity extends Quantity { + + private static final long serialVersionUID = 1069574054L; + + public SimpleQuantity copy() { + SimpleQuantity dst = new SimpleQuantity(); + copyValues(dst); + dst.value = value == null ? null : value.copy(); + dst.comparator = comparator == null ? null : comparator.copy(); + dst.unit = unit == null ? null : unit.copy(); + dst.system = system == null ? null : system.copy(); + dst.code = code == null ? null : code.copy(); + return dst; + } + + protected SimpleQuantity typedCopy() { + return copy(); + } + + @Override + public boolean equalsDeep(Base other) { + if (!super.equalsDeep(other)) + return false; + if (!(other instanceof SimpleQuantity)) + return false; + SimpleQuantity o = (SimpleQuantity) other; + return compareDeep(value, o.value, true) && compareDeep(comparator, o.comparator, true) && compareDeep(unit, o.unit, true) + && compareDeep(system, o.system, true) && compareDeep(code, o.code, true); + } + + @Override + public boolean equalsShallow(Base other) { + if (!super.equalsShallow(other)) + return false; + if (!(other instanceof SimpleQuantity)) + return false; + SimpleQuantity o = (SimpleQuantity) other; + return compareValues(value, o.value, true) && compareValues(comparator, o.comparator, true) && compareValues(unit, o.unit, true) + && compareValues(system, o.system, true) && compareValues(code, o.code, true); + } + + public boolean isEmpty() { + return super.isEmpty() && (value == null || value.isEmpty()) && (comparator == null || comparator.isEmpty()) + && (unit == null || unit.isEmpty()) && (system == null || system.isEmpty()) && (code == null || code.isEmpty()) + ; + } + + +} + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Slot.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Slot.java index 4ac09ddf1d2..6a22614d666 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Slot.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Slot.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Specimen.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Specimen.java index 7088b959a82..0b5b5f03c36 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Specimen.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Specimen.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; @@ -77,9 +77,9 @@ public class Specimen extends DomainResource { /** * The quantity of specimen collected; for instance the volume of a blood sample, or the physical measurement of an anatomic pathology sample. */ - @Child(name = "quantity", type = {Quantity.class}, order=4, min=0, max=1) + @Child(name = "quantity", type = {SimpleQuantity.class}, order=4, min=0, max=1) @Description(shortDefinition="The quantity of specimen collected", formalDefinition="The quantity of specimen collected; for instance the volume of a blood sample, or the physical measurement of an anatomic pathology sample." ) - protected Quantity quantity; + protected SimpleQuantity quantity; /** * A coded value specifying the technique that is used to perform the procedure. @@ -95,7 +95,7 @@ public class Specimen extends DomainResource { @Description(shortDefinition="Anatomical collection site", formalDefinition="Anatomical location from which the specimen was collected (if subject is a patient). This is the target site. This element is not used for environmental specimens." ) protected CodeableConcept bodySite; - private static final long serialVersionUID = 139465743L; + private static final long serialVersionUID = -1418734687L; /* * Constructor @@ -250,12 +250,12 @@ public class Specimen extends DomainResource { /** * @return {@link #quantity} (The quantity of specimen collected; for instance the volume of a blood sample, or the physical measurement of an anatomic pathology sample.) */ - public Quantity getQuantity() { + public SimpleQuantity getQuantity() { if (this.quantity == null) if (Configuration.errorOnAutoCreate()) throw new Error("Attempt to auto-create SpecimenCollectionComponent.quantity"); else if (Configuration.doAutoCreate()) - this.quantity = new Quantity(); // cc + this.quantity = new SimpleQuantity(); // cc return this.quantity; } @@ -266,7 +266,7 @@ public class Specimen extends DomainResource { /** * @param value {@link #quantity} (The quantity of specimen collected; for instance the volume of a blood sample, or the physical measurement of an anatomic pathology sample.) */ - public SpecimenCollectionComponent setQuantity(Quantity value) { + public SpecimenCollectionComponent setQuantity(SimpleQuantity value) { this.quantity = value; return this; } @@ -324,7 +324,7 @@ public class Specimen extends DomainResource { childrenList.add(new Property("collector", "Reference(Practitioner)", "Person who collected the specimen.", 0, java.lang.Integer.MAX_VALUE, collector)); childrenList.add(new Property("comment", "string", "To communicate any details or issues encountered during the specimen collection procedure.", 0, java.lang.Integer.MAX_VALUE, comment)); childrenList.add(new Property("collected[x]", "dateTime|Period", "Time when specimen was collected from subject - the physiologically relevant time.", 0, java.lang.Integer.MAX_VALUE, collected)); - childrenList.add(new Property("quantity", "Quantity", "The quantity of specimen collected; for instance the volume of a blood sample, or the physical measurement of an anatomic pathology sample.", 0, java.lang.Integer.MAX_VALUE, quantity)); + childrenList.add(new Property("quantity", "SimpleQuantity", "The quantity of specimen collected; for instance the volume of a blood sample, or the physical measurement of an anatomic pathology sample.", 0, java.lang.Integer.MAX_VALUE, quantity)); childrenList.add(new Property("method", "CodeableConcept", "A coded value specifying the technique that is used to perform the procedure.", 0, java.lang.Integer.MAX_VALUE, method)); childrenList.add(new Property("bodySite", "CodeableConcept", "Anatomical location from which the specimen was collected (if subject is a patient). This is the target site. This element is not used for environmental specimens.", 0, java.lang.Integer.MAX_VALUE, bodySite)); } @@ -620,16 +620,16 @@ public class Specimen extends DomainResource { /** * The capacity (volume or other measure) the container may contain. */ - @Child(name = "capacity", type = {Quantity.class}, order=4, min=0, max=1) + @Child(name = "capacity", type = {SimpleQuantity.class}, order=4, min=0, max=1) @Description(shortDefinition="Container volume or size", formalDefinition="The capacity (volume or other measure) the container may contain." ) - protected Quantity capacity; + protected SimpleQuantity capacity; /** * The quantity of specimen in the container; may be volume, dimensions, or other appropriate measurements, depending on the specimen type. */ - @Child(name = "specimenQuantity", type = {Quantity.class}, order=5, min=0, max=1) + @Child(name = "specimenQuantity", type = {SimpleQuantity.class}, order=5, min=0, max=1) @Description(shortDefinition="Quantity of specimen within container", formalDefinition="The quantity of specimen in the container; may be volume, dimensions, or other appropriate measurements, depending on the specimen type." ) - protected Quantity specimenQuantity; + protected SimpleQuantity specimenQuantity; /** * Introduced substance to preserve, maintain or enhance the specimen. examples: Formalin, Citrate, EDTA. @@ -638,7 +638,7 @@ public class Specimen extends DomainResource { @Description(shortDefinition="Additive associated with container", formalDefinition="Introduced substance to preserve, maintain or enhance the specimen. examples: Formalin, Citrate, EDTA." ) protected Type additive; - private static final long serialVersionUID = -1608132325L; + private static final long serialVersionUID = 187274879L; /* * Constructor @@ -763,12 +763,12 @@ public class Specimen extends DomainResource { /** * @return {@link #capacity} (The capacity (volume or other measure) the container may contain.) */ - public Quantity getCapacity() { + public SimpleQuantity getCapacity() { if (this.capacity == null) if (Configuration.errorOnAutoCreate()) throw new Error("Attempt to auto-create SpecimenContainerComponent.capacity"); else if (Configuration.doAutoCreate()) - this.capacity = new Quantity(); // cc + this.capacity = new SimpleQuantity(); // cc return this.capacity; } @@ -779,7 +779,7 @@ public class Specimen extends DomainResource { /** * @param value {@link #capacity} (The capacity (volume or other measure) the container may contain.) */ - public SpecimenContainerComponent setCapacity(Quantity value) { + public SpecimenContainerComponent setCapacity(SimpleQuantity value) { this.capacity = value; return this; } @@ -787,12 +787,12 @@ public class Specimen extends DomainResource { /** * @return {@link #specimenQuantity} (The quantity of specimen in the container; may be volume, dimensions, or other appropriate measurements, depending on the specimen type.) */ - public Quantity getSpecimenQuantity() { + public SimpleQuantity getSpecimenQuantity() { if (this.specimenQuantity == null) if (Configuration.errorOnAutoCreate()) throw new Error("Attempt to auto-create SpecimenContainerComponent.specimenQuantity"); else if (Configuration.doAutoCreate()) - this.specimenQuantity = new Quantity(); // cc + this.specimenQuantity = new SimpleQuantity(); // cc return this.specimenQuantity; } @@ -803,7 +803,7 @@ public class Specimen extends DomainResource { /** * @param value {@link #specimenQuantity} (The quantity of specimen in the container; may be volume, dimensions, or other appropriate measurements, depending on the specimen type.) */ - public SpecimenContainerComponent setSpecimenQuantity(Quantity value) { + public SpecimenContainerComponent setSpecimenQuantity(SimpleQuantity value) { this.specimenQuantity = value; return this; } @@ -858,8 +858,8 @@ public class Specimen extends DomainResource { childrenList.add(new Property("identifier", "Identifier", "Id for container. There may be multiple; a manufacturer's bar code, lab assigned identifier, etc. The container ID may differ from the specimen id in some circumstances.", 0, java.lang.Integer.MAX_VALUE, identifier)); childrenList.add(new Property("description", "string", "Textual description of the container.", 0, java.lang.Integer.MAX_VALUE, description)); childrenList.add(new Property("type", "CodeableConcept", "The type of container associated with the specimen (e.g. slide, aliquot, etc).", 0, java.lang.Integer.MAX_VALUE, type)); - childrenList.add(new Property("capacity", "Quantity", "The capacity (volume or other measure) the container may contain.", 0, java.lang.Integer.MAX_VALUE, capacity)); - childrenList.add(new Property("specimenQuantity", "Quantity", "The quantity of specimen in the container; may be volume, dimensions, or other appropriate measurements, depending on the specimen type.", 0, java.lang.Integer.MAX_VALUE, specimenQuantity)); + childrenList.add(new Property("capacity", "SimpleQuantity", "The capacity (volume or other measure) the container may contain.", 0, java.lang.Integer.MAX_VALUE, capacity)); + childrenList.add(new Property("specimenQuantity", "SimpleQuantity", "The quantity of specimen in the container; may be volume, dimensions, or other appropriate measurements, depending on the specimen type.", 0, java.lang.Integer.MAX_VALUE, specimenQuantity)); childrenList.add(new Property("additive[x]", "CodeableConcept|Reference(Substance)", "Introduced substance to preserve, maintain or enhance the specimen. examples: Formalin, Citrate, EDTA.", 0, java.lang.Integer.MAX_VALUE, additive)); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/StructureDefinition.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/StructureDefinition.java index 1e5f79829b1..6c14b14e20a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/StructureDefinition.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/StructureDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Subscription.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Subscription.java index b7cd406e79e..80a40e29271 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Subscription.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Subscription.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Substance.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Substance.java index 73d754a13ed..8dda5946db7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Substance.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Substance.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; @@ -65,11 +65,11 @@ public class Substance extends DomainResource { /** * The amount of the substance. */ - @Child(name = "quantity", type = {Quantity.class}, order=3, min=0, max=1) + @Child(name = "quantity", type = {SimpleQuantity.class}, order=3, min=0, max=1) @Description(shortDefinition="Amount of substance in the package", formalDefinition="The amount of the substance." ) - protected Quantity quantity; + protected SimpleQuantity quantity; - private static final long serialVersionUID = -1474380480L; + private static final long serialVersionUID = -794314734L; /* * Constructor @@ -154,12 +154,12 @@ public class Substance extends DomainResource { /** * @return {@link #quantity} (The amount of the substance.) */ - public Quantity getQuantity() { + public SimpleQuantity getQuantity() { if (this.quantity == null) if (Configuration.errorOnAutoCreate()) throw new Error("Attempt to auto-create SubstanceInstanceComponent.quantity"); else if (Configuration.doAutoCreate()) - this.quantity = new Quantity(); // cc + this.quantity = new SimpleQuantity(); // cc return this.quantity; } @@ -170,7 +170,7 @@ public class Substance extends DomainResource { /** * @param value {@link #quantity} (The amount of the substance.) */ - public SubstanceInstanceComponent setQuantity(Quantity value) { + public SubstanceInstanceComponent setQuantity(SimpleQuantity value) { this.quantity = value; return this; } @@ -179,7 +179,7 @@ public class Substance extends DomainResource { super.listChildren(childrenList); childrenList.add(new Property("identifier", "Identifier", "Identifier associated with the package/container (usually a label affixed directly).", 0, java.lang.Integer.MAX_VALUE, identifier)); childrenList.add(new Property("expiry", "dateTime", "When the substance is no longer valid to use. For some substances, a single arbitrary date is used for expiry.", 0, java.lang.Integer.MAX_VALUE, expiry)); - childrenList.add(new Property("quantity", "Quantity", "The amount of the substance.", 0, java.lang.Integer.MAX_VALUE, quantity)); + childrenList.add(new Property("quantity", "SimpleQuantity", "The amount of the substance.", 0, java.lang.Integer.MAX_VALUE, quantity)); } public SubstanceInstanceComponent copy() { @@ -373,35 +373,42 @@ public class Substance extends DomainResource { @Description(shortDefinition="Unique identifier", formalDefinition="Unique identifier for the substance." ) protected List identifier; + /** + * A code that classifies the the general type of substance. This is used for searching, sorting and display purposes. + */ + @Child(name = "category", type = {CodeableConcept.class}, order=1, min=0, max=Child.MAX_UNLIMITED) + @Description(shortDefinition="What class/type of substance this is", formalDefinition="A code that classifies the the general type of substance. This is used for searching, sorting and display purposes." ) + protected List category; + /** * A code (or set of codes) that identify this substance. */ - @Child(name = "type", type = {CodeableConcept.class}, order=1, min=1, max=1) - @Description(shortDefinition="What kind of substance this is", formalDefinition="A code (or set of codes) that identify this substance." ) - protected CodeableConcept type; + @Child(name = "code", type = {CodeableConcept.class}, order=2, min=1, max=1) + @Description(shortDefinition="What substance this is", formalDefinition="A code (or set of codes) that identify this substance." ) + protected CodeableConcept code; /** * A description of the substance - its appearance, handling requirements, and other usage notes. */ - @Child(name = "description", type = {StringType.class}, order=2, min=0, max=1) + @Child(name = "description", type = {StringType.class}, order=3, min=0, max=1) @Description(shortDefinition="Textual description of the substance, comments", formalDefinition="A description of the substance - its appearance, handling requirements, and other usage notes." ) protected StringType description; /** * Substance may be used to describe a kind of substance, or a specific package/container of the substance: an instance. */ - @Child(name = "instance", type = {}, order=3, min=0, max=Child.MAX_UNLIMITED) + @Child(name = "instance", type = {}, order=4, min=0, max=Child.MAX_UNLIMITED) @Description(shortDefinition="If this describes a specific package/container of the substance", formalDefinition="Substance may be used to describe a kind of substance, or a specific package/container of the substance: an instance." ) protected List instance; /** * A substance can be composed of other substances. */ - @Child(name = "ingredient", type = {}, order=4, min=0, max=Child.MAX_UNLIMITED) + @Child(name = "ingredient", type = {}, order=5, min=0, max=Child.MAX_UNLIMITED) @Description(shortDefinition="Composition information about the substance", formalDefinition="A substance can be composed of other substances." ) protected List ingredient; - private static final long serialVersionUID = 373963428L; + private static final long serialVersionUID = -1653977206L; /* * Constructor @@ -413,9 +420,9 @@ public class Substance extends DomainResource { /* * Constructor */ - public Substance(CodeableConcept type) { + public Substance(CodeableConcept code) { super(); - this.type = type; + this.code = code; } /** @@ -459,26 +466,66 @@ public class Substance extends DomainResource { } /** - * @return {@link #type} (A code (or set of codes) that identify this substance.) + * @return {@link #category} (A code that classifies the the general type of substance. This is used for searching, sorting and display purposes.) */ - public CodeableConcept getType() { - if (this.type == null) - if (Configuration.errorOnAutoCreate()) - throw new Error("Attempt to auto-create Substance.type"); - else if (Configuration.doAutoCreate()) - this.type = new CodeableConcept(); // cc - return this.type; + public List getCategory() { + if (this.category == null) + this.category = new ArrayList(); + return this.category; } - public boolean hasType() { - return this.type != null && !this.type.isEmpty(); + public boolean hasCategory() { + if (this.category == null) + return false; + for (CodeableConcept item : this.category) + if (!item.isEmpty()) + return true; + return false; } /** - * @param value {@link #type} (A code (or set of codes) that identify this substance.) + * @return {@link #category} (A code that classifies the the general type of substance. This is used for searching, sorting and display purposes.) */ - public Substance setType(CodeableConcept value) { - this.type = value; + // syntactic sugar + public CodeableConcept addCategory() { //3 + CodeableConcept t = new CodeableConcept(); + if (this.category == null) + this.category = new ArrayList(); + this.category.add(t); + return t; + } + + // syntactic sugar + public Substance addCategory(CodeableConcept t) { //3 + if (t == null) + return this; + if (this.category == null) + this.category = new ArrayList(); + this.category.add(t); + return this; + } + + /** + * @return {@link #code} (A code (or set of codes) that identify this substance.) + */ + public CodeableConcept getCode() { + if (this.code == null) + if (Configuration.errorOnAutoCreate()) + throw new Error("Attempt to auto-create Substance.code"); + else if (Configuration.doAutoCreate()) + this.code = new CodeableConcept(); // cc + return this.code; + } + + public boolean hasCode() { + return this.code != null && !this.code.isEmpty(); + } + + /** + * @param value {@link #code} (A code (or set of codes) that identify this substance.) + */ + public Substance setCode(CodeableConcept value) { + this.code = value; return this; } @@ -614,7 +661,8 @@ public class Substance extends DomainResource { protected void listChildren(List childrenList) { super.listChildren(childrenList); childrenList.add(new Property("identifier", "Identifier", "Unique identifier for the substance.", 0, java.lang.Integer.MAX_VALUE, identifier)); - childrenList.add(new Property("type", "CodeableConcept", "A code (or set of codes) that identify this substance.", 0, java.lang.Integer.MAX_VALUE, type)); + childrenList.add(new Property("category", "CodeableConcept", "A code that classifies the the general type of substance. This is used for searching, sorting and display purposes.", 0, java.lang.Integer.MAX_VALUE, category)); + childrenList.add(new Property("code", "CodeableConcept", "A code (or set of codes) that identify this substance.", 0, java.lang.Integer.MAX_VALUE, code)); childrenList.add(new Property("description", "string", "A description of the substance - its appearance, handling requirements, and other usage notes.", 0, java.lang.Integer.MAX_VALUE, description)); childrenList.add(new Property("instance", "", "Substance may be used to describe a kind of substance, or a specific package/container of the substance: an instance.", 0, java.lang.Integer.MAX_VALUE, instance)); childrenList.add(new Property("ingredient", "", "A substance can be composed of other substances.", 0, java.lang.Integer.MAX_VALUE, ingredient)); @@ -628,7 +676,12 @@ public class Substance extends DomainResource { for (Identifier i : identifier) dst.identifier.add(i.copy()); }; - dst.type = type == null ? null : type.copy(); + if (category != null) { + dst.category = new ArrayList(); + for (CodeableConcept i : category) + dst.category.add(i.copy()); + }; + dst.code = code == null ? null : code.copy(); dst.description = description == null ? null : description.copy(); if (instance != null) { dst.instance = new ArrayList(); @@ -654,8 +707,9 @@ public class Substance extends DomainResource { if (!(other instanceof Substance)) return false; Substance o = (Substance) other; - return compareDeep(identifier, o.identifier, true) && compareDeep(type, o.type, true) && compareDeep(description, o.description, true) - && compareDeep(instance, o.instance, true) && compareDeep(ingredient, o.ingredient, true); + return compareDeep(identifier, o.identifier, true) && compareDeep(category, o.category, true) && compareDeep(code, o.code, true) + && compareDeep(description, o.description, true) && compareDeep(instance, o.instance, true) && compareDeep(ingredient, o.ingredient, true) + ; } @Override @@ -669,8 +723,8 @@ public class Substance extends DomainResource { } public boolean isEmpty() { - return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (type == null || type.isEmpty()) - && (description == null || description.isEmpty()) && (instance == null || instance.isEmpty()) + return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (category == null || category.isEmpty()) + && (code == null || code.isEmpty()) && (description == null || description.isEmpty()) && (instance == null || instance.isEmpty()) && (ingredient == null || ingredient.isEmpty()); } @@ -683,14 +737,16 @@ public class Substance extends DomainResource { public static final String SP_IDENTIFIER = "identifier"; @SearchParamDefinition(name="container-identifier", path="Substance.instance.identifier", description="Identifier of the package/container", type="token" ) public static final String SP_CONTAINERIDENTIFIER = "container-identifier"; + @SearchParamDefinition(name="code", path="Substance.code", description="The code of the substance", type="token" ) + public static final String SP_CODE = "code"; @SearchParamDefinition(name="quantity", path="Substance.instance.quantity", description="Amount of substance in the package", type="number" ) public static final String SP_QUANTITY = "quantity"; @SearchParamDefinition(name="substance", path="Substance.ingredient.substance", description="A component of the substance", type="reference" ) public static final String SP_SUBSTANCE = "substance"; @SearchParamDefinition(name="expiry", path="Substance.instance.expiry", description="Expiry date of package or container of substance", type="date" ) public static final String SP_EXPIRY = "expiry"; - @SearchParamDefinition(name="type", path="Substance.type", description="The type of the substance", type="token" ) - public static final String SP_TYPE = "type"; + @SearchParamDefinition(name="category", path="Substance.category", description="The category of the substance", type="token" ) + public static final String SP_CATEGORY = "category"; } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyDelivery.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyDelivery.java index 81fb0dc2787..c7f5290d968 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyDelivery.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyDelivery.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; @@ -168,9 +168,9 @@ public class SupplyDelivery extends DomainResource { /** * The amount of supply that has been dispensed. Includes unit of measure. */ - @Child(name = "quantity", type = {Quantity.class}, order=4, min=0, max=1) + @Child(name = "quantity", type = {SimpleQuantity.class}, order=4, min=0, max=1) @Description(shortDefinition="Amount dispensed", formalDefinition="The amount of supply that has been dispensed. Includes unit of measure." ) - protected Quantity quantity; + protected SimpleQuantity quantity; /** * Identifies the medication or substance or device being dispensed. This is either a link to a resource representing the details of the item or a simple attribute carrying a code that identifies the item from a known list. @@ -234,7 +234,7 @@ public class SupplyDelivery extends DomainResource { protected List receiverTarget; - private static final long serialVersionUID = 1938067331L; + private static final long serialVersionUID = -1520129707L; /* * Constructor @@ -387,12 +387,12 @@ public class SupplyDelivery extends DomainResource { /** * @return {@link #quantity} (The amount of supply that has been dispensed. Includes unit of measure.) */ - public Quantity getQuantity() { + public SimpleQuantity getQuantity() { if (this.quantity == null) if (Configuration.errorOnAutoCreate()) throw new Error("Attempt to auto-create SupplyDelivery.quantity"); else if (Configuration.doAutoCreate()) - this.quantity = new Quantity(); // cc + this.quantity = new SimpleQuantity(); // cc return this.quantity; } @@ -403,7 +403,7 @@ public class SupplyDelivery extends DomainResource { /** * @param value {@link #quantity} (The amount of supply that has been dispensed. Includes unit of measure.) */ - public SupplyDelivery setQuantity(Quantity value) { + public SupplyDelivery setQuantity(SimpleQuantity value) { this.quantity = value; return this; } @@ -675,7 +675,7 @@ public class SupplyDelivery extends DomainResource { childrenList.add(new Property("status", "code", "A code specifying the state of the dispense event.", 0, java.lang.Integer.MAX_VALUE, status)); childrenList.add(new Property("patient", "Reference(Patient)", "A link to a resource representing the person whom the delivered item is for.", 0, java.lang.Integer.MAX_VALUE, patient)); childrenList.add(new Property("type", "CodeableConcept", "Indicates the type of dispensing event that is performed. Examples include: Trial Fill, Completion of Trial, Partial Fill, Emergency Fill, Samples, etc.", 0, java.lang.Integer.MAX_VALUE, type)); - childrenList.add(new Property("quantity", "Quantity", "The amount of supply that has been dispensed. Includes unit of measure.", 0, java.lang.Integer.MAX_VALUE, quantity)); + childrenList.add(new Property("quantity", "SimpleQuantity", "The amount of supply that has been dispensed. Includes unit of measure.", 0, java.lang.Integer.MAX_VALUE, quantity)); childrenList.add(new Property("suppliedItem", "Reference(Medication|Substance|Device)", "Identifies the medication or substance or device being dispensed. This is either a link to a resource representing the details of the item or a simple attribute carrying a code that identifies the item from a known list.", 0, java.lang.Integer.MAX_VALUE, suppliedItem)); childrenList.add(new Property("supplier", "Reference(Practitioner)", "The individual responsible for dispensing the medication, supplier or device.", 0, java.lang.Integer.MAX_VALUE, supplier)); childrenList.add(new Property("whenPrepared", "Period", "The time the dispense event occurred.", 0, java.lang.Integer.MAX_VALUE, whenPrepared)); diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyRequest.java index 320809ac402..4d7e92cd83b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyRequest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/TestScript.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/TestScript.java index 00a874290f9..1d9395b36c1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/TestScript.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/TestScript.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Timing.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Timing.java index 30a8a2a3900..8314507a698 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Timing.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Timing.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ValueSet.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ValueSet.java index a89b56af5b5..43289fee086 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ValueSet.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ValueSet.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/VisionPrescription.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/VisionPrescription.java index 0cfecec22d8..97660d74072 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/VisionPrescription.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/VisionPrescription.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import java.util.*; @@ -301,9 +301,9 @@ public class VisionPrescription extends DomainResource { /** * The recommended maximum wear period for the lens. */ - @Child(name = "duration", type = {Quantity.class}, order=12, min=0, max=1) + @Child(name = "duration", type = {SimpleQuantity.class}, order=12, min=0, max=1) @Description(shortDefinition="Lens wear duration", formalDefinition="The recommended maximum wear period for the lens." ) - protected Quantity duration; + protected SimpleQuantity duration; /** * Special color or pattern. @@ -326,7 +326,7 @@ public class VisionPrescription extends DomainResource { @Description(shortDefinition="Notes for coatings", formalDefinition="Notes for special requirements such as coatings and lens materials." ) protected StringType notes; - private static final long serialVersionUID = -946795088L; + private static final long serialVersionUID = -1586392610L; /* * Constructor @@ -856,12 +856,12 @@ public class VisionPrescription extends DomainResource { /** * @return {@link #duration} (The recommended maximum wear period for the lens.) */ - public Quantity getDuration() { + public SimpleQuantity getDuration() { if (this.duration == null) if (Configuration.errorOnAutoCreate()) throw new Error("Attempt to auto-create VisionPrescriptionDispenseComponent.duration"); else if (Configuration.doAutoCreate()) - this.duration = new Quantity(); // cc + this.duration = new SimpleQuantity(); // cc return this.duration; } @@ -872,7 +872,7 @@ public class VisionPrescription extends DomainResource { /** * @param value {@link #duration} (The recommended maximum wear period for the lens.) */ - public VisionPrescriptionDispenseComponent setDuration(Quantity value) { + public VisionPrescriptionDispenseComponent setDuration(SimpleQuantity value) { this.duration = value; return this; } @@ -1037,7 +1037,7 @@ public class VisionPrescription extends DomainResource { childrenList.add(new Property("power", "decimal", "Contact lens power measured in diopters (0.25 units).", 0, java.lang.Integer.MAX_VALUE, power)); childrenList.add(new Property("backCurve", "decimal", "Back Curvature measured in millimeters.", 0, java.lang.Integer.MAX_VALUE, backCurve)); childrenList.add(new Property("diameter", "decimal", "Contact lens diameter measured in millimeters.", 0, java.lang.Integer.MAX_VALUE, diameter)); - childrenList.add(new Property("duration", "Quantity", "The recommended maximum wear period for the lens.", 0, java.lang.Integer.MAX_VALUE, duration)); + childrenList.add(new Property("duration", "SimpleQuantity", "The recommended maximum wear period for the lens.", 0, java.lang.Integer.MAX_VALUE, duration)); childrenList.add(new Property("color", "string", "Special color or pattern.", 0, java.lang.Integer.MAX_VALUE, color)); childrenList.add(new Property("brand", "string", "Brand recommendations or restrictions.", 0, java.lang.Integer.MAX_VALUE, brand)); childrenList.add(new Property("notes", "string", "Notes for special requirements such as coatings and lens materials.", 0, java.lang.Integer.MAX_VALUE, notes)); diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Additionalmaterials.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Additionalmaterials.java index a0d8cd3bcf1..c9f6fefa9c7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Additionalmaterials.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Additionalmaterials.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum Additionalmaterials { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdditionalmaterialsEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdditionalmaterialsEnumFactory.java index 46af32f35f5..5d4bfafb043 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdditionalmaterialsEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdditionalmaterialsEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Adjudication.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Adjudication.java index 447427913f5..f79e6e78e04 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Adjudication.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Adjudication.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum Adjudication { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjudicationEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjudicationEnumFactory.java index 8dd1e3520ff..bb374ea8415 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjudicationEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjudicationEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjudicationError.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjudicationError.java index cc59faae553..bd511e9b32e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjudicationError.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjudicationError.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum AdjudicationError { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjudicationErrorEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjudicationErrorEnumFactory.java index 7282dae1dff..6e6ac0da9b7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjudicationErrorEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjudicationErrorEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjustmentReason.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjustmentReason.java index b037efcf196..8fb565fef97 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjustmentReason.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjustmentReason.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum AdjustmentReason { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjustmentReasonEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjustmentReasonEnumFactory.java index 5427abdceb4..a1eff2f0f89 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjustmentReasonEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AdjustmentReasonEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalBreeds.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalBreeds.java index 574a1f13139..963f7acf44e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalBreeds.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalBreeds.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum AnimalBreeds { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalBreedsEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalBreedsEnumFactory.java index 6d81593d55a..54e511441ad 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalBreedsEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalBreedsEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalGenderstatus.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalGenderstatus.java index 50020b26fc2..32281eda52f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalGenderstatus.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalGenderstatus.java @@ -29,13 +29,13 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum AnimalGenderstatus { /** - * The animal has been castrated and is infertile + * The animal has been sterilized, castrated or otherwise made infertile */ NEUTERED, /** @@ -74,7 +74,7 @@ public enum AnimalGenderstatus { } public String getDefinition() { switch (this) { - case NEUTERED: return "The animal has been castrated and is infertile"; + case NEUTERED: return "The animal has been sterilized, castrated or otherwise made infertile"; case INTACT: return "The animal's reproductive organs are intact"; case UNKNOWN: return "Unable to determine whether the animal has been neutered"; default: return "?"; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalGenderstatusEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalGenderstatusEnumFactory.java index 0ddfda87493..327b0ca2264 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalGenderstatusEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalGenderstatusEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalSpecies.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalSpecies.java index 90dde1518f8..5847a5b6735 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalSpecies.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalSpecies.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum AnimalSpecies { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalSpeciesEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalSpeciesEnumFactory.java index 110d78e0f93..0a14588d940 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalSpeciesEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnimalSpeciesEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnzscoOccupations.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnzscoOccupations.java index 329ff5c2ab0..c56a1a7a6aa 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnzscoOccupations.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnzscoOccupations.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum AnzscoOccupations { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnzscoOccupationsEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnzscoOccupationsEnumFactory.java index 7a2f0e71fb0..c4c47b055b2 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnzscoOccupationsEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AnzscoOccupationsEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AuditSourceType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AuditSourceType.java index d56955f8b50..13f4eef4f3a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AuditSourceType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AuditSourceType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum AuditSourceType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AuditSourceTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AuditSourceTypeEnumFactory.java index e0cfe365fc6..16474264ebc 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AuditSourceTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/AuditSourceTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/BasicResourceType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/BasicResourceType.java index 8d87b05d072..758b26eeb23 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/BasicResourceType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/BasicResourceType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum BasicResourceType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/BasicResourceTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/BasicResourceTypeEnumFactory.java index 038d34b2823..4e0ea343605 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/BasicResourceTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/BasicResourceTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/CarePlanGoalStatus.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/CarePlanGoalStatus.java index 5774bf83e1c..3aa7a3678c6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/CarePlanGoalStatus.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/CarePlanGoalStatus.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum CarePlanGoalStatus { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/CarePlanGoalStatusEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/CarePlanGoalStatusEnumFactory.java index 858bd16e48c..29ba784b59f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/CarePlanGoalStatusEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/CarePlanGoalStatusEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClaimException.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClaimException.java index a298e81d13d..f1056ce5b1f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClaimException.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClaimException.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum ClaimException { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClaimExceptionEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClaimExceptionEnumFactory.java index a4c89bddb02..235e96d9695 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClaimExceptionEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClaimExceptionEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClaimModifiers.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClaimModifiers.java index 8be01b90a41..5ba50ebbad9 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClaimModifiers.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClaimModifiers.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum ClaimModifiers { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClaimModifiersEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClaimModifiersEnumFactory.java index c9330fdffe5..4747d11db80 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClaimModifiersEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClaimModifiersEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClassificationOrContext.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClassificationOrContext.java index df7123cf019..10f56cee37d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClassificationOrContext.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClassificationOrContext.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum ClassificationOrContext { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClassificationOrContextEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClassificationOrContextEnumFactory.java index 6df82427485..b6f7651bf05 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClassificationOrContextEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ClassificationOrContextEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionCategory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionCategory.java index 28ef943c9e6..a041e423594 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionCategory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionCategory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum ConditionCategory { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionCategoryEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionCategoryEnumFactory.java index 2e98d4f89fc..94851874142 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionCategoryEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionCategoryEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionClinical.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionClinical.java index 086849a35c2..d7c5d84cc6a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionClinical.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionClinical.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum ConditionClinical { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionClinicalEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionClinicalEnumFactory.java index cc569d7882a..df09ee67154 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionClinicalEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionClinicalEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionState.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionState.java index 3947c78e461..edc57d37880 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionState.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionState.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum ConditionState { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionStateEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionStateEnumFactory.java index dc94633680e..322c1bab2a6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionStateEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConditionStateEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConformanceExpectation.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConformanceExpectation.java index c577f274823..0b5f32e1f11 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConformanceExpectation.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConformanceExpectation.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum ConformanceExpectation { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConformanceExpectationEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConformanceExpectationEnumFactory.java index 8898c1fd8ea..4bb27f17775 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConformanceExpectationEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ConformanceExpectationEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContactentityType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContactentityType.java index d8ba1764b1d..00a1db8c0c7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContactentityType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContactentityType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum ContactentityType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContactentityTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContactentityTypeEnumFactory.java index 160b230dc7b..32fe71687ca 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContactentityTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContactentityTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractAction.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractAction.java index 85e046efa2f..7c735910cc2 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractAction.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractAction.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum ContractAction { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractActionEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractActionEnumFactory.java index 469aed28ac4..9520b130c2e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractActionEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractActionEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractActorrole.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractActorrole.java index 4c477f4949e..9238c00c213 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractActorrole.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractActorrole.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum ContractActorrole { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractActorroleEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractActorroleEnumFactory.java index c2776c74139..0a1d5f7ff75 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractActorroleEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractActorroleEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractSignerType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractSignerType.java index a52b3028eec..f2308274453 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractSignerType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractSignerType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum ContractSignerType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractSignerTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractSignerTypeEnumFactory.java index dc72e3e32a1..3230bfb86f1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractSignerTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractSignerTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractSubtype.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractSubtype.java index cf53213b424..8fb687d87a0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractSubtype.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractSubtype.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum ContractSubtype { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractSubtypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractSubtypeEnumFactory.java index 8ce0121a59b..e079dda8574 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractSubtypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractSubtypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTermSubtype.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTermSubtype.java index 28848106bd1..0608bb89e8b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTermSubtype.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTermSubtype.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum ContractTermSubtype { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTermSubtypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTermSubtypeEnumFactory.java index e55271fd958..d7a99778afb 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTermSubtypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTermSubtypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTermType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTermType.java index 19ce9e46b11..8938ec3a5c9 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTermType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTermType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum ContractTermType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTermTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTermTypeEnumFactory.java index 3b7cd19b3b4..3fac6ed83e8 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTermTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTermTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractType.java index 1ff7e4c0a6f..2386cbb506a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum ContractType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTypeEnumFactory.java index 1e6fff50b7c..d293d64b171 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ContractTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/DeviceAction.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/DeviceAction.java index 95cc868ad64..14451cd2b4b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/DeviceAction.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/DeviceAction.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum DeviceAction { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/DeviceActionEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/DeviceActionEnumFactory.java index 32bce8d7316..ad7539c7e99 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/DeviceActionEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/DeviceActionEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterAdmitSource.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterAdmitSource.java index c9416871729..34525fe6875 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterAdmitSource.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterAdmitSource.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum EncounterAdmitSource { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterAdmitSourceEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterAdmitSourceEnumFactory.java index 73f49adc5c8..2c0de62aab9 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterAdmitSourceEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterAdmitSourceEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterDiet.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterDiet.java index 83c466fd4d1..896fd749fca 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterDiet.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterDiet.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum EncounterDiet { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterDietEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterDietEnumFactory.java index 32d4c2dbff2..fe230a30d71 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterDietEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterDietEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterDischargeDisposition.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterDischargeDisposition.java index ebd17f40670..c695239780c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterDischargeDisposition.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterDischargeDisposition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum EncounterDischargeDisposition { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterDischargeDispositionEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterDischargeDispositionEnumFactory.java index e581246597b..f90d2983018 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterDischargeDispositionEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterDischargeDispositionEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterPriority.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterPriority.java index 5167f48b9ad..af37bd3a51e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterPriority.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterPriority.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum EncounterPriority { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterPriorityEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterPriorityEnumFactory.java index d5bdd09049d..16297d1e648 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterPriorityEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterPriorityEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterSpecialArrangements.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterSpecialArrangements.java index 95d6355baf0..c3099675f76 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterSpecialArrangements.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterSpecialArrangements.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum EncounterSpecialArrangements { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterSpecialArrangementsEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterSpecialArrangementsEnumFactory.java index 809e5c6f248..2081fe00739 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterSpecialArrangementsEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterSpecialArrangementsEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterType.java index 8f679a58938..02bc17d0f42 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum EncounterType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterTypeEnumFactory.java index 23c9bb2d3bf..bc1759cc42a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EncounterTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EntformulaAdditive.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EntformulaAdditive.java index 34faf0614a0..8b4e13ac492 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EntformulaAdditive.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EntformulaAdditive.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum EntformulaAdditive { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EntformulaAdditiveEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EntformulaAdditiveEnumFactory.java index dfcfe5ee3e4..08ba1da6956 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EntformulaAdditiveEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/EntformulaAdditiveEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FmConditions.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FmConditions.java index 2f3980831c6..8c17ad402eb 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FmConditions.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FmConditions.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum FmConditions { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FmConditionsEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FmConditionsEnumFactory.java index a5013df845e..0e1bf67e70e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FmConditionsEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FmConditionsEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Forms.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Forms.java index 86f4f28cc47..8506dfb1a6a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Forms.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Forms.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum Forms { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FormsEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FormsEnumFactory.java index 4b6d9fbab84..0990ae70934 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FormsEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FormsEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Fundsreserve.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Fundsreserve.java index caecf963861..623a0ed835f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Fundsreserve.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Fundsreserve.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum Fundsreserve { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FundsreserveEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FundsreserveEnumFactory.java index 197579e1489..dcc3e2d5998 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FundsreserveEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/FundsreserveEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalPriority.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalPriority.java index 22c84181c89..5e473a69a18 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalPriority.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalPriority.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum GoalPriority { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalPriorityEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalPriorityEnumFactory.java index 8bd7a5f7e22..c6c9056ff70 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalPriorityEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalPriorityEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalRelationshipType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalRelationshipType.java index fa5cbccbac7..a3e2cbb2092 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalRelationshipType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalRelationshipType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum GoalRelationshipType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalRelationshipTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalRelationshipTypeEnumFactory.java index 2d148fcf6f9..baf9d7fce37 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalRelationshipTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/GoalRelationshipTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Icd10.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Icd10.java index 6832efe759c..49593760722 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Icd10.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Icd10.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Mon, Aug 10, 2015 16:34-0400 for FHIR v0.5.0 public enum Icd10 { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Icd10EnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Icd10EnumFactory.java index 095855f3a1a..c55ae8ae8d4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Icd10EnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Icd10EnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Mon, Aug 10, 2015 16:34-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ImmunizationRecommendationDateCriterion.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ImmunizationRecommendationDateCriterion.java index ed71695e7c2..971736422f1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ImmunizationRecommendationDateCriterion.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ImmunizationRecommendationDateCriterion.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum ImmunizationRecommendationDateCriterion { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ImmunizationRecommendationDateCriterionEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ImmunizationRecommendationDateCriterionEnumFactory.java index 6ab7fc810d4..1ab9b2de782 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ImmunizationRecommendationDateCriterionEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ImmunizationRecommendationDateCriterionEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ImmunizationRecommendationStatus.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ImmunizationRecommendationStatus.java index d8479abfc99..4f1082694b8 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ImmunizationRecommendationStatus.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ImmunizationRecommendationStatus.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum ImmunizationRecommendationStatus { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ImmunizationRecommendationStatusEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ImmunizationRecommendationStatusEnumFactory.java index 72f116234aa..25db8285084 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ImmunizationRecommendationStatusEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ImmunizationRecommendationStatusEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Intervention.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Intervention.java index dd2ad8c52fc..b353726ec8c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Intervention.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Intervention.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum Intervention { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/InterventionEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/InterventionEnumFactory.java index 6c8f87ff67e..0a065298155 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/InterventionEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/InterventionEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListEmptyReason.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListEmptyReason.java index 74b6010bfa3..2e4f6a2d65a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListEmptyReason.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListEmptyReason.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum ListEmptyReason { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListEmptyReasonEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListEmptyReasonEnumFactory.java index 691625e00a9..51f74ffdef3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListEmptyReasonEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListEmptyReasonEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListExampleCodes.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListExampleCodes.java index ddcc40baced..dced9696ba3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListExampleCodes.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListExampleCodes.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum ListExampleCodes { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListExampleCodesEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListExampleCodesEnumFactory.java index 48d9ae023d0..a477106805e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListExampleCodesEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListExampleCodesEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListItemFlag.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListItemFlag.java index 22563c786d8..3686dd227cc 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListItemFlag.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListItemFlag.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum ListItemFlag { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListItemFlagEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListItemFlagEnumFactory.java index b8abc146379..7fe38680341 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListItemFlagEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListItemFlagEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListOrder.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListOrder.java index 1f185e8d14e..16d2ab699ca 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListOrder.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListOrder.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum ListOrder { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListOrderEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListOrderEnumFactory.java index be5e4b03c07..91cbc621c64 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListOrderEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ListOrderEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/LocationPhysicalType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/LocationPhysicalType.java index c9cbed84dcb..8139e92e52d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/LocationPhysicalType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/LocationPhysicalType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum LocationPhysicalType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/LocationPhysicalTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/LocationPhysicalTypeEnumFactory.java index 33aca7c0e74..d5a1b478abe 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/LocationPhysicalTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/LocationPhysicalTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MessageReasonEncounter.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MessageReasonEncounter.java index 77d45f6f2fb..e58b70883d8 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MessageReasonEncounter.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MessageReasonEncounter.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum MessageReasonEncounter { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MessageReasonEncounterEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MessageReasonEncounterEnumFactory.java index cea5a566f6d..306cace8ed5 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MessageReasonEncounterEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MessageReasonEncounterEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MessageTransport.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MessageTransport.java index f583940cfe0..cf292182796 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MessageTransport.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MessageTransport.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum MessageTransport { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MessageTransportEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MessageTransportEnumFactory.java index dbddb282c48..dd4bc0cb89f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MessageTransportEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MessageTransportEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MissingToothReason.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MissingToothReason.java index b6f8df8f2d3..ac41c1e8951 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MissingToothReason.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MissingToothReason.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum MissingToothReason { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MissingToothReasonEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MissingToothReasonEnumFactory.java index 9d0795d9d86..e1fca46e6a5 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MissingToothReasonEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/MissingToothReasonEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObservationCategory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObservationCategory.java index 266279a46bf..5500e0d03ac 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObservationCategory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObservationCategory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum ObservationCategory { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObservationCategoryEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObservationCategoryEnumFactory.java index cb12ee98ef7..ce6f9cb9573 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObservationCategoryEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ObservationCategoryEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OperationOutcome.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OperationOutcome.java index c14b2fb6ef5..b3bbccad9ac 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OperationOutcome.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OperationOutcome.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum OperationOutcome { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OperationOutcomeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OperationOutcomeEnumFactory.java index f2a54c33d91..2b7663058e6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OperationOutcomeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OperationOutcomeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OralProsthodonticMaterial.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OralProsthodonticMaterial.java index dd41139d566..67717f71788 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OralProsthodonticMaterial.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OralProsthodonticMaterial.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum OralProsthodonticMaterial { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OralProsthodonticMaterialEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OralProsthodonticMaterialEnumFactory.java index d1a380df9f2..ea09a60e66e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OralProsthodonticMaterialEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OralProsthodonticMaterialEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OrganizationType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OrganizationType.java index bd280453134..5d8ddbfcf87 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OrganizationType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OrganizationType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum OrganizationType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OrganizationTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OrganizationTypeEnumFactory.java index 99d62f6b3d0..ecc284baedf 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OrganizationTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/OrganizationTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PatientContactRelationship.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PatientContactRelationship.java index 623b9026caf..b9fadf080fb 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PatientContactRelationship.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PatientContactRelationship.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum PatientContactRelationship { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PatientContactRelationshipEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PatientContactRelationshipEnumFactory.java index 65c5fb017c2..1bdf0554f8d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PatientContactRelationshipEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PatientContactRelationshipEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Payeetype.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Payeetype.java index d208d95fef4..3e652b8fbc1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Payeetype.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Payeetype.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum Payeetype { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PayeetypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PayeetypeEnumFactory.java index 2c2688c0f58..68e23eb47fc 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PayeetypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PayeetypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PaymentStatus.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PaymentStatus.java index 2a1a110a64d..e84fe16c822 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PaymentStatus.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PaymentStatus.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum PaymentStatus { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PaymentStatusEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PaymentStatusEnumFactory.java index e7389857049..c96d4cf936e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PaymentStatusEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PaymentStatusEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PaymentType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PaymentType.java index 6737ade0df4..5b8f69cbbdf 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PaymentType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PaymentType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum PaymentType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PaymentTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PaymentTypeEnumFactory.java index 52e3e8f9c48..8172ba86453 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PaymentTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PaymentTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PractitionerRole.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PractitionerRole.java index f4492f34300..d892a4371a4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PractitionerRole.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PractitionerRole.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum PractitionerRole { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PractitionerRoleEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PractitionerRoleEnumFactory.java index 6044e5f11d6..d8a0cb417f4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PractitionerRoleEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PractitionerRoleEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PractitionerSpecialty.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PractitionerSpecialty.java index 7d982215168..3a773298d44 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PractitionerSpecialty.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PractitionerSpecialty.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum PractitionerSpecialty { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PractitionerSpecialtyEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PractitionerSpecialtyEnumFactory.java index ec7a788c2f0..69bb225ec0a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PractitionerSpecialtyEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/PractitionerSpecialtyEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcessOutcome.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcessOutcome.java index af822c39ab6..89bf4c34b15 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcessOutcome.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcessOutcome.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum ProcessOutcome { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcessOutcomeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcessOutcomeEnumFactory.java index 9f8dabbc9dc..5cbff38964e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcessOutcomeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcessOutcomeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcessPriority.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcessPriority.java index eed1f2b39f3..d70be62f014 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcessPriority.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcessPriority.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum ProcessPriority { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcessPriorityEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcessPriorityEnumFactory.java index 4d5442e7187..01a0c0af4bc 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcessPriorityEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProcessPriorityEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProvenanceAgentRole.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProvenanceAgentRole.java index 47fa94165eb..7c2709c17ec 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProvenanceAgentRole.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProvenanceAgentRole.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum ProvenanceAgentRole { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProvenanceAgentRoleEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProvenanceAgentRoleEnumFactory.java index d30b63deb46..1c61bfaf23d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProvenanceAgentRoleEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProvenanceAgentRoleEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProvenanceAgentType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProvenanceAgentType.java index 7838408537b..76ea7a3b6b4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProvenanceAgentType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProvenanceAgentType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum ProvenanceAgentType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProvenanceAgentTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProvenanceAgentTypeEnumFactory.java index a599bbd8b10..a22b7afb8db 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProvenanceAgentTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ProvenanceAgentTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/QuestionMaxOccurs.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/QuestionMaxOccurs.java index 0b913f16ee9..d9bac8b94c2 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/QuestionMaxOccurs.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/QuestionMaxOccurs.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum QuestionMaxOccurs { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/QuestionMaxOccursEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/QuestionMaxOccursEnumFactory.java index 114612883d7..f8ac6b9d724 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/QuestionMaxOccursEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/QuestionMaxOccursEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ReasonMedicationGivenCodes.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ReasonMedicationGivenCodes.java index 22ae8f94268..bf76dd631ba 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ReasonMedicationGivenCodes.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ReasonMedicationGivenCodes.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum ReasonMedicationGivenCodes { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ReasonMedicationGivenCodesEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ReasonMedicationGivenCodesEnumFactory.java index c3d1223bd0c..29068cb6600 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ReasonMedicationGivenCodesEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ReasonMedicationGivenCodesEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ReasonMedicationNotGivenCodes.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ReasonMedicationNotGivenCodes.java index 9ace000a6da..26114cc8460 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ReasonMedicationNotGivenCodes.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ReasonMedicationNotGivenCodes.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum ReasonMedicationNotGivenCodes { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ReasonMedicationNotGivenCodesEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ReasonMedicationNotGivenCodesEnumFactory.java index 5e012374b8a..16b26c36486 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ReasonMedicationNotGivenCodesEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ReasonMedicationNotGivenCodesEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Relationship.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Relationship.java index 8e81b439f95..2777fd78060 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Relationship.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Relationship.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum Relationship { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RelationshipEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RelationshipEnumFactory.java index e513e4f321c..f7dfacb4112 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RelationshipEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RelationshipEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ResourceValidationMode.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ResourceValidationMode.java index fd1cda3b0a6..53499bfeccf 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ResourceValidationMode.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ResourceValidationMode.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum ResourceValidationMode { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ResourceValidationModeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ResourceValidationModeEnumFactory.java index 2611910b742..62551bb0ca8 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ResourceValidationModeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ResourceValidationModeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RestfulSecurityService.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RestfulSecurityService.java index 1fac06ca9b3..3ca2d6f7129 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RestfulSecurityService.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RestfulSecurityService.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum RestfulSecurityService { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RestfulSecurityServiceEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RestfulSecurityServiceEnumFactory.java index eb53060b1e2..36b5ee9dd5a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RestfulSecurityServiceEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RestfulSecurityServiceEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RiskProbability.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RiskProbability.java index b429cba29b9..36fb9ad2a93 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RiskProbability.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RiskProbability.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum RiskProbability { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RiskProbabilityEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RiskProbabilityEnumFactory.java index befbd77e05e..bdce283b861 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RiskProbabilityEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RiskProbabilityEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Ruleset.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Ruleset.java index 35aa94cf307..8af77767f0e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Ruleset.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Ruleset.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum Ruleset { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RulesetEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RulesetEnumFactory.java index f6a42a53432..4e60af086de 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RulesetEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/RulesetEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServicePharmacy.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServicePharmacy.java index 2b33d1ad2fd..5c7d0e72bf5 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServicePharmacy.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServicePharmacy.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum ServicePharmacy { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServicePharmacyEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServicePharmacyEnumFactory.java index 3d0daa222c1..26db7fe4ffc 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServicePharmacyEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServicePharmacyEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceProduct.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceProduct.java index 3a2669b2983..802dab7a5eb 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceProduct.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceProduct.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum ServiceProduct { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceProductEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceProductEnumFactory.java index 69a905ae1e8..b156f05b75a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceProductEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceProductEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceProvisionConditions.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceProvisionConditions.java index 1e8f1e0762a..f5ccedafedd 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceProvisionConditions.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceProvisionConditions.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum ServiceProvisionConditions { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceProvisionConditionsEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceProvisionConditionsEnumFactory.java index 978be17d37a..1ec56b5c6a3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceProvisionConditionsEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceProvisionConditionsEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceReferralMethod.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceReferralMethod.java index a22d6bc1ef3..b06f6027d0a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceReferralMethod.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceReferralMethod.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum ServiceReferralMethod { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceReferralMethodEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceReferralMethodEnumFactory.java index cdf6752b464..e1e6d8388a2 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceReferralMethodEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceReferralMethodEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceUscls.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceUscls.java index 90c7a9bb077..24b24fb617c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceUscls.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceUscls.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum ServiceUscls { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceUsclsEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceUsclsEnumFactory.java index 833245d6d61..a86816d183d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceUsclsEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ServiceUsclsEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SignatureType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SignatureType.java index d65d18ca55c..454f4b876ff 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SignatureType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SignatureType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum SignatureType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SignatureTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SignatureTypeEnumFactory.java index 44c05134c61..3945ed2b7b2 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SignatureTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SignatureTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SubscriptionTag.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SubscriptionTag.java index 0b25877d593..32e0a79bacf 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SubscriptionTag.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SubscriptionTag.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum SubscriptionTag { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SubscriptionTagEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SubscriptionTagEnumFactory.java index 19b1c62215e..cd15acc047d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SubscriptionTagEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SubscriptionTagEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SubstanceCategory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SubstanceCategory.java new file mode 100644 index 00000000000..c23d0da592f --- /dev/null +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SubstanceCategory.java @@ -0,0 +1,130 @@ +package org.hl7.fhir.instance.model.valuesets; + +/* + Copyright (c) 2011+, HL7, Inc. + All rights reserved. + + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of HL7 nor the names of its contributors may be used to + endorse or promote products derived from this software without specific + prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +*/ + +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 + + +public enum SubstanceCategory { + + /** + * A substance that causes an allergic reaction + */ + ALLERGEN, + /** + * A substance that is produced by or extracted from a biological source + */ + BIOLOGICAL, + /** + * A substance that comes directly from a human or an animal (e.g blood, urine, feces, tears, etc.) + */ + BODY, + /** + * Any organic or inorganic substance of a particular molecular identity, including -- (i) any combination of such substances occurring in whole or in part as a result of a chemical reaction or occurring in nature and (ii) any element or uncombined radical (http://www.epa.gov/opptintr/import-export/pubs/importguide.pdf). + */ + CHEMICAL, + /** + * A food, dietary ingredient, or dietary supplement for human or animal + */ + FOOD, + /** + * A substance intended for use in the diagnosis, cure, mitigation, treatment, or prevention of disease in man or other animals (Federal Food Drug and Cosmetic Act). + */ + DRUG, + /** + * A finished product which is not normally ingested, absorbed or injected (e.g. Steel, iron, wood, plastic and paper). + */ + MATERIAL, + /** + * added to help the parsers + */ + NULL; + public static SubstanceCategory fromCode(String codeString) throws Exception { + if (codeString == null || "".equals(codeString)) + return null; + if ("allergen".equals(codeString)) + return ALLERGEN; + if ("biological".equals(codeString)) + return BIOLOGICAL; + if ("body".equals(codeString)) + return BODY; + if ("chemical".equals(codeString)) + return CHEMICAL; + if ("food".equals(codeString)) + return FOOD; + if ("drug".equals(codeString)) + return DRUG; + if ("material".equals(codeString)) + return MATERIAL; + throw new Exception("Unknown SubstanceCategory code '"+codeString+"'"); + } + public String toCode() { + switch (this) { + case ALLERGEN: return "allergen"; + case BIOLOGICAL: return "biological"; + case BODY: return "body"; + case CHEMICAL: return "chemical"; + case FOOD: return "food"; + case DRUG: return "drug"; + case MATERIAL: return "material"; + default: return "?"; + } + } + public String getSystem() { + return "http://hl7.org/fhir/substance-category"; + } + public String getDefinition() { + switch (this) { + case ALLERGEN: return "A substance that causes an allergic reaction"; + case BIOLOGICAL: return "A substance that is produced by or extracted from a biological source"; + case BODY: return "A substance that comes directly from a human or an animal (e.g blood, urine, feces, tears, etc.)"; + case CHEMICAL: return "Any organic or inorganic substance of a particular molecular identity, including -- (i) any combination of such substances occurring in whole or in part as a result of a chemical reaction or occurring in nature and (ii) any element or uncombined radical (http://www.epa.gov/opptintr/import-export/pubs/importguide.pdf)."; + case FOOD: return "A food, dietary ingredient, or dietary supplement for human or animal"; + case DRUG: return "A substance intended for use in the diagnosis, cure, mitigation, treatment, or prevention of disease in man or other animals (Federal Food Drug and Cosmetic Act)."; + case MATERIAL: return "A finished product which is not normally ingested, absorbed or injected (e.g. Steel, iron, wood, plastic and paper)."; + default: return "?"; + } + } + public String getDisplay() { + switch (this) { + case ALLERGEN: return "Allergen"; + case BIOLOGICAL: return "Biological Substance"; + case BODY: return "Body Substance"; + case CHEMICAL: return "Chemical"; + case FOOD: return "Dietary Substance"; + case DRUG: return "Drug or Medicament"; + case MATERIAL: return "Material"; + default: return "?"; + } + } + + +} + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SubstanceCategoryEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SubstanceCategoryEnumFactory.java new file mode 100644 index 00000000000..a00cdeb1db8 --- /dev/null +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SubstanceCategoryEnumFactory.java @@ -0,0 +1,79 @@ +package org.hl7.fhir.instance.model.valuesets; + +/* + Copyright (c) 2011+, HL7, Inc. + All rights reserved. + + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of HL7 nor the names of its contributors may be used to + endorse or promote products derived from this software without specific + prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +*/ + +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 + + +import org.hl7.fhir.instance.model.EnumFactory; + +public class SubstanceCategoryEnumFactory implements EnumFactory { + + public SubstanceCategory fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("allergen".equals(codeString)) + return SubstanceCategory.ALLERGEN; + if ("biological".equals(codeString)) + return SubstanceCategory.BIOLOGICAL; + if ("body".equals(codeString)) + return SubstanceCategory.BODY; + if ("chemical".equals(codeString)) + return SubstanceCategory.CHEMICAL; + if ("food".equals(codeString)) + return SubstanceCategory.FOOD; + if ("drug".equals(codeString)) + return SubstanceCategory.DRUG; + if ("material".equals(codeString)) + return SubstanceCategory.MATERIAL; + throw new IllegalArgumentException("Unknown SubstanceCategory code '"+codeString+"'"); + } + + public String toCode(SubstanceCategory code) { + if (code == SubstanceCategory.ALLERGEN) + return "allergen"; + if (code == SubstanceCategory.BIOLOGICAL) + return "biological"; + if (code == SubstanceCategory.BODY) + return "body"; + if (code == SubstanceCategory.CHEMICAL) + return "chemical"; + if (code == SubstanceCategory.FOOD) + return "food"; + if (code == SubstanceCategory.DRUG) + return "drug"; + if (code == SubstanceCategory.MATERIAL) + return "material"; + return "?"; + } + + +} + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SupplydeliveryType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SupplydeliveryType.java index 2dd7b03c4a3..5f91cbefdfd 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SupplydeliveryType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SupplydeliveryType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum SupplydeliveryType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SupplydeliveryTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SupplydeliveryTypeEnumFactory.java index b89a609fbd7..bb483cb3e0e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SupplydeliveryTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SupplydeliveryTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SupplyrequestKind.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SupplyrequestKind.java index e289f0c1702..285c70810c9 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SupplyrequestKind.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SupplyrequestKind.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum SupplyrequestKind { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SupplyrequestKindEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SupplyrequestKindEnumFactory.java index b95b53c20fa..8231a6847a0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SupplyrequestKindEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SupplyrequestKindEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Surface.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Surface.java index 377906d10a2..d83692cc130 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Surface.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Surface.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum Surface { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SurfaceEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SurfaceEnumFactory.java index f53a99131df..04538ded139 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SurfaceEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/SurfaceEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Teeth.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Teeth.java index 95d56b9ce46..7c715690800 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Teeth.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Teeth.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum Teeth { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/TeethEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/TeethEnumFactory.java index 67c1bfba999..4639cc68b3e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/TeethEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/TeethEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/TestscriptOperationCodes.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/TestscriptOperationCodes.java index 4f572bbcf99..35d372ddd9d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/TestscriptOperationCodes.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/TestscriptOperationCodes.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum TestscriptOperationCodes { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/TestscriptOperationCodesEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/TestscriptOperationCodesEnumFactory.java index 5baf223fd65..cf9ee9375da 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/TestscriptOperationCodesEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/TestscriptOperationCodesEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Tooth.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Tooth.java index 3c8d2b8e33a..5771f56a674 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Tooth.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Tooth.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum Tooth { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ToothEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ToothEnumFactory.java index a8e7bcc7e22..5057292b5a7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ToothEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/ToothEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Udi.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Udi.java index 561509304cc..0fd66db0c6c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Udi.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/Udi.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum Udi { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/UdiEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/UdiEnumFactory.java index 3187834b811..cd9b0301818 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/UdiEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/UdiEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AcknowledgementCondition.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AcknowledgementCondition.java index dc441189d3c..50cd77b1f65 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AcknowledgementCondition.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AcknowledgementCondition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3AcknowledgementCondition { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AcknowledgementConditionEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AcknowledgementConditionEnumFactory.java index 39c6e09e169..9d1f92181a6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AcknowledgementConditionEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AcknowledgementConditionEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AcknowledgementDetailCode.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AcknowledgementDetailCode.java index 86449527d88..52b66dfbea4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AcknowledgementDetailCode.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AcknowledgementDetailCode.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3AcknowledgementDetailCode { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AcknowledgementDetailCodeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AcknowledgementDetailCodeEnumFactory.java index a61724efb37..354c8679510 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AcknowledgementDetailCodeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AcknowledgementDetailCodeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AcknowledgementDetailType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AcknowledgementDetailType.java index 80ec0a11f06..ea9aa9ed20b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AcknowledgementDetailType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AcknowledgementDetailType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3AcknowledgementDetailType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AcknowledgementDetailTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AcknowledgementDetailTypeEnumFactory.java index 1f9c9d216cb..23f7d019551 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AcknowledgementDetailTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AcknowledgementDetailTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AcknowledgementType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AcknowledgementType.java index 18fceb40034..70463d9af43 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AcknowledgementType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AcknowledgementType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3AcknowledgementType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AcknowledgementTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AcknowledgementTypeEnumFactory.java index 5b095e2f715..8d99f1d86a1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AcknowledgementTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AcknowledgementTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActClass.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActClass.java index d397b493bd2..6acb3437e78 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActClass.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActClass.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3ActClass { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActClassEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActClassEnumFactory.java index 39fa3a71d66..8ff5bf99f59 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActClassEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActClassEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActCode.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActCode.java index 30b0dd74fe3..c7bcbe6f24d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActCode.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActCode.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3ActCode { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActCodeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActCodeEnumFactory.java index 491ca328b54..70e6439151b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActCodeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActCodeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActExposureLevelCode.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActExposureLevelCode.java index 9e9e36665be..03fb7399402 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActExposureLevelCode.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActExposureLevelCode.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3ActExposureLevelCode { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActExposureLevelCodeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActExposureLevelCodeEnumFactory.java index 236c3744517..a92d6b835d7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActExposureLevelCodeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActExposureLevelCodeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActInvoiceElementModifier.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActInvoiceElementModifier.java index f7cf5a9e522..eccfed5bbd8 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActInvoiceElementModifier.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActInvoiceElementModifier.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3ActInvoiceElementModifier { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActInvoiceElementModifierEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActInvoiceElementModifierEnumFactory.java index 6613ee1a082..f6e2aca3c98 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActInvoiceElementModifierEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActInvoiceElementModifierEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActMood.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActMood.java index c6a7a671798..24767846e43 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActMood.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActMood.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3ActMood { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActMoodEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActMoodEnumFactory.java index 3ec7da7c706..af49203d6a0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActMoodEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActMoodEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActPriority.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActPriority.java index 3553d3e2252..7960aeab316 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActPriority.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActPriority.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3ActPriority { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActPriorityEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActPriorityEnumFactory.java index 18503b2dedc..5048de90c98 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActPriorityEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActPriorityEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActReason.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActReason.java index 2545da37384..88aff9f92d0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActReason.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActReason.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3ActReason { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActReasonEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActReasonEnumFactory.java index 54bef0dd227..a9294dc04a0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActReasonEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActReasonEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipCheckpoint.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipCheckpoint.java index 989fab678b3..67bcee48555 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipCheckpoint.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipCheckpoint.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3ActRelationshipCheckpoint { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipCheckpointEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipCheckpointEnumFactory.java index d06fab2eae0..e5b02ccc161 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipCheckpointEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipCheckpointEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipJoin.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipJoin.java index f97681e48be..78b48412f1d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipJoin.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipJoin.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3ActRelationshipJoin { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipJoinEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipJoinEnumFactory.java index 4f5b7a14068..e84b7388d24 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipJoinEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipJoinEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipSplit.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipSplit.java index c8a92a5832e..e5376e74d9f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipSplit.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipSplit.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3ActRelationshipSplit { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipSplitEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipSplitEnumFactory.java index a10cb43bec0..3405762b2a2 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipSplitEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipSplitEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipSubset.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipSubset.java index 2cc1e9e9d90..559df4cfaac 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipSubset.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipSubset.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3ActRelationshipSubset { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipSubsetEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipSubsetEnumFactory.java index ad3fa0639b0..57e353a9416 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipSubsetEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipSubsetEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipType.java index dc8f7901373..deb816940cb 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3ActRelationshipType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipTypeEnumFactory.java index 1dfdc7ed011..688d6036c68 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActRelationshipTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActSite.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActSite.java index 359ae975892..8df429f7a31 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActSite.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActSite.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3ActSite { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActSiteEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActSiteEnumFactory.java index c1de945d69b..d0c55487f19 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActSiteEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActSiteEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActStatus.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActStatus.java index 174237c36d6..97bba6f97b4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActStatus.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActStatus.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3ActStatus { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActStatusEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActStatusEnumFactory.java index f0da863b444..e02a9a7fb91 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActStatusEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActStatusEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActUSPrivacyLaw.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActUSPrivacyLaw.java index 8caca6cce79..b7509892538 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActUSPrivacyLaw.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActUSPrivacyLaw.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3ActUSPrivacyLaw { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActUSPrivacyLawEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActUSPrivacyLawEnumFactory.java index 93f2898eb25..be8ae2d5a84 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActUSPrivacyLawEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActUSPrivacyLawEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActUncertainty.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActUncertainty.java index 2183effc6dd..c15313033b9 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActUncertainty.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActUncertainty.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3ActUncertainty { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActUncertaintyEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActUncertaintyEnumFactory.java index 4b2f60422a8..72ee4e5a19b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActUncertaintyEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ActUncertaintyEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AddressPartType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AddressPartType.java index 898eb710a90..77c46463fe6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AddressPartType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AddressPartType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3AddressPartType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AddressPartTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AddressPartTypeEnumFactory.java index 87f5746298a..55b6fb757b5 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AddressPartTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AddressPartTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AddressUse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AddressUse.java index c82f17e7b05..26796d03ca7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AddressUse.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AddressUse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3AddressUse { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AddressUseEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AddressUseEnumFactory.java index bb119cd45cc..dab2bf7c062 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AddressUseEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AddressUseEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AdministrativeGender.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AdministrativeGender.java index a56e87d5dc1..963279f2f0d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AdministrativeGender.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AdministrativeGender.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3AdministrativeGender { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AdministrativeGenderEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AdministrativeGenderEnumFactory.java index 8be28920912..78f182d5779 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AdministrativeGenderEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AdministrativeGenderEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AmericanIndianAlaskaNativeLanguages.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AmericanIndianAlaskaNativeLanguages.java index 567c2ab6223..58b14255970 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AmericanIndianAlaskaNativeLanguages.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AmericanIndianAlaskaNativeLanguages.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3AmericanIndianAlaskaNativeLanguages { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AmericanIndianAlaskaNativeLanguagesEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AmericanIndianAlaskaNativeLanguagesEnumFactory.java index 6b52fba0c84..2e89df9939a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AmericanIndianAlaskaNativeLanguagesEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3AmericanIndianAlaskaNativeLanguagesEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Calendar.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Calendar.java index 2ba54cd8db8..6bf35111687 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Calendar.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Calendar.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3Calendar { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CalendarCycle.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CalendarCycle.java index 66ec2661325..67886ba53f6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CalendarCycle.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CalendarCycle.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3CalendarCycle { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CalendarCycleEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CalendarCycleEnumFactory.java index 9aed040e5c8..aa9e7e14b46 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CalendarCycleEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CalendarCycleEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CalendarEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CalendarEnumFactory.java index 11ada1a2acf..8d53df41ae8 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CalendarEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CalendarEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CalendarType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CalendarType.java index b08df81d42a..052075e5eb7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CalendarType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CalendarType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3CalendarType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CalendarTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CalendarTypeEnumFactory.java index 3e8ec3abfe5..be298701b19 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CalendarTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CalendarTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Charset.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Charset.java index 1f8fe8dccd1..a7e7b61634c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Charset.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Charset.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3Charset { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CharsetEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CharsetEnumFactory.java index 11d452acfe7..fbf42f030ea 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CharsetEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CharsetEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CodingRationale.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CodingRationale.java index 53250d1d04d..bfd685e0d70 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CodingRationale.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CodingRationale.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3CodingRationale { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CodingRationaleEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CodingRationaleEnumFactory.java index c118853cbf9..31d79927c47 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CodingRationaleEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CodingRationaleEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CommunicationFunctionType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CommunicationFunctionType.java index 015f37a5357..e79b817eb8c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CommunicationFunctionType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CommunicationFunctionType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3CommunicationFunctionType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CommunicationFunctionTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CommunicationFunctionTypeEnumFactory.java index 7e4d99ed16e..4b81859b77d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CommunicationFunctionTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CommunicationFunctionTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CompressionAlgorithm.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CompressionAlgorithm.java index 3f31154d4b4..dd6b17a2664 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CompressionAlgorithm.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CompressionAlgorithm.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3CompressionAlgorithm { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CompressionAlgorithmEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CompressionAlgorithmEnumFactory.java index d22f21737b7..3d8635af1e2 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CompressionAlgorithmEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3CompressionAlgorithmEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Confidentiality.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Confidentiality.java index 003d4fa57a4..da627f0de1f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Confidentiality.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Confidentiality.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3Confidentiality { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ConfidentialityEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ConfidentialityEnumFactory.java index 5d992b2ff0a..1a42df2b0b3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ConfidentialityEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ConfidentialityEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ContainerCap.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ContainerCap.java index a2ee2048f8f..7546b9dbc95 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ContainerCap.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ContainerCap.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3ContainerCap { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ContainerCapEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ContainerCapEnumFactory.java index 5a591075cc7..2330e584517 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ContainerCapEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ContainerCapEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ContainerSeparator.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ContainerSeparator.java index f1ad4714c48..7ea6b6a2319 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ContainerSeparator.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ContainerSeparator.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3ContainerSeparator { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ContainerSeparatorEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ContainerSeparatorEnumFactory.java index a892ab8e107..f0ae7a1b096 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ContainerSeparatorEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ContainerSeparatorEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ContentProcessingMode.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ContentProcessingMode.java index 22764bbb6cf..34906d7e3bd 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ContentProcessingMode.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ContentProcessingMode.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3ContentProcessingMode { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ContentProcessingModeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ContentProcessingModeEnumFactory.java index 042034695cc..28a10b95bd1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ContentProcessingModeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ContentProcessingModeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ContextControl.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ContextControl.java index 8d88deaf5cc..3571e50cb5f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ContextControl.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ContextControl.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3ContextControl { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ContextControlEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ContextControlEnumFactory.java index 21f7483815d..c24de498554 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ContextControlEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ContextControlEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3DataOperation.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3DataOperation.java index 2b795f01530..364900ea415 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3DataOperation.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3DataOperation.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3DataOperation { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3DataOperationEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3DataOperationEnumFactory.java index e8bdcd548ef..768d227fd64 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3DataOperationEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3DataOperationEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3DeviceAlertLevel.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3DeviceAlertLevel.java index 27b68e2b5fa..0b0bb9b4048 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3DeviceAlertLevel.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3DeviceAlertLevel.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3DeviceAlertLevel { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3DeviceAlertLevelEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3DeviceAlertLevelEnumFactory.java index f14e6ac4250..0eb28dcfa45 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3DeviceAlertLevelEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3DeviceAlertLevelEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3DocumentCompletion.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3DocumentCompletion.java index 7dc6a489a03..483ecfb13bf 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3DocumentCompletion.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3DocumentCompletion.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3DocumentCompletion { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3DocumentCompletionEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3DocumentCompletionEnumFactory.java index 85b99c4cdb1..6eeb04f0648 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3DocumentCompletionEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3DocumentCompletionEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3DocumentStorage.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3DocumentStorage.java index 6dbdf6d8f3e..9ebf2e2b26f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3DocumentStorage.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3DocumentStorage.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3DocumentStorage { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3DocumentStorageEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3DocumentStorageEnumFactory.java index d86e45eb403..269872aae57 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3DocumentStorageEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3DocumentStorageEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EducationLevel.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EducationLevel.java index ddf24e4d25d..235c2d0a6f2 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EducationLevel.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EducationLevel.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3EducationLevel { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EducationLevelEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EducationLevelEnumFactory.java index e54b441ce14..44841b42d12 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EducationLevelEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EducationLevelEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EmployeeJobClass.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EmployeeJobClass.java index 12568a01a7c..4149523883c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EmployeeJobClass.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EmployeeJobClass.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3EmployeeJobClass { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EmployeeJobClassEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EmployeeJobClassEnumFactory.java index b505da8b368..11f54de03d7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EmployeeJobClassEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EmployeeJobClassEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EncounterAdmissionSource.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EncounterAdmissionSource.java index f851f5000ff..aaf566249b6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EncounterAdmissionSource.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EncounterAdmissionSource.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3EncounterAdmissionSource { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EncounterAdmissionSourceEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EncounterAdmissionSourceEnumFactory.java index b8077864f8a..b31541c9fe1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EncounterAdmissionSourceEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EncounterAdmissionSourceEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EncounterSpecialCourtesy.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EncounterSpecialCourtesy.java index 2d1d8c47213..01f7b223d7e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EncounterSpecialCourtesy.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EncounterSpecialCourtesy.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3EncounterSpecialCourtesy { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EncounterSpecialCourtesyEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EncounterSpecialCourtesyEnumFactory.java index d54e9217cba..576404ed12f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EncounterSpecialCourtesyEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EncounterSpecialCourtesyEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityClass.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityClass.java index 93c7707b5c8..90a0bc82328 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityClass.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityClass.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3EntityClass { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityClassEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityClassEnumFactory.java index 1fb979d68fa..e9ad02bc49a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityClassEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityClassEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityCode.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityCode.java index 2bf02e5976e..c692fc66f1d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityCode.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityCode.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3EntityCode { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityCodeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityCodeEnumFactory.java index 63520467ec0..f27cb0460a5 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityCodeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityCodeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityDeterminer.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityDeterminer.java index 8ee18076e14..e2f58096957 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityDeterminer.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityDeterminer.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3EntityDeterminer { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityDeterminerEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityDeterminerEnumFactory.java index 86525f6070f..31dcd71272c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityDeterminerEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityDeterminerEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityHandling.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityHandling.java index 738e16c2234..982e2e80711 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityHandling.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityHandling.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3EntityHandling { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityHandlingEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityHandlingEnumFactory.java index fd1d90c9cf1..adfb105f7f6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityHandlingEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityHandlingEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNamePartQualifier.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNamePartQualifier.java index 8e214727b0b..bfe24a01960 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNamePartQualifier.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNamePartQualifier.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3EntityNamePartQualifier { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNamePartQualifierEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNamePartQualifierEnumFactory.java index 47bb8b6b82f..8bfd7efa053 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNamePartQualifierEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNamePartQualifierEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNamePartQualifierR2.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNamePartQualifierR2.java index d10e6cdee7e..b3e71c71bbf 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNamePartQualifierR2.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNamePartQualifierR2.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3EntityNamePartQualifierR2 { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNamePartQualifierR2EnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNamePartQualifierR2EnumFactory.java index 31b5b07d029..56fe8978716 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNamePartQualifierR2EnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNamePartQualifierR2EnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNamePartType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNamePartType.java index a173c0b3ed7..6c9b6b8a293 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNamePartType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNamePartType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3EntityNamePartType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNamePartTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNamePartTypeEnumFactory.java index 8834c5d941e..b2907fa9ae7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNamePartTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNamePartTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNamePartTypeR2.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNamePartTypeR2.java index 5418a39af7a..730e56f5344 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNamePartTypeR2.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNamePartTypeR2.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3EntityNamePartTypeR2 { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNamePartTypeR2EnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNamePartTypeR2EnumFactory.java index 85f3310c51c..d8df07ceeb5 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNamePartTypeR2EnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNamePartTypeR2EnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNameUse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNameUse.java index b0a019ec39f..7c731974fe8 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNameUse.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNameUse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3EntityNameUse { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNameUseEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNameUseEnumFactory.java index 089859c52a6..94f01fe5b2d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNameUseEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNameUseEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNameUseR2.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNameUseR2.java index ca84003b572..169b2ace1db 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNameUseR2.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNameUseR2.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3EntityNameUseR2 { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNameUseR2EnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNameUseR2EnumFactory.java index ac03b4b42a0..be86bcc4b8f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNameUseR2EnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityNameUseR2EnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityRisk.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityRisk.java index bb075511103..ee518a37a08 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityRisk.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityRisk.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3EntityRisk { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityRiskEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityRiskEnumFactory.java index 03d4a57258e..487e61af054 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityRiskEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityRiskEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityStatus.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityStatus.java index 952b0e415c0..2908ec17f2b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityStatus.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityStatus.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3EntityStatus { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityStatusEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityStatusEnumFactory.java index 043fd61f65b..0ea74cafc75 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityStatusEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EntityStatusEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EquipmentAlertLevel.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EquipmentAlertLevel.java index aa310d1186b..06b698596d4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EquipmentAlertLevel.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EquipmentAlertLevel.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3EquipmentAlertLevel { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EquipmentAlertLevelEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EquipmentAlertLevelEnumFactory.java index 18b4547b297..88ed0d064bc 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EquipmentAlertLevelEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EquipmentAlertLevelEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Ethnicity.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Ethnicity.java index 073938ef7b8..a59ff39616b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Ethnicity.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Ethnicity.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3Ethnicity { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EthnicityEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EthnicityEnumFactory.java index a55109b941c..71c398ef1b0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EthnicityEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3EthnicityEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ExposureMode.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ExposureMode.java index cb3012d7f81..9dc1d2be334 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ExposureMode.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ExposureMode.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3ExposureMode { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ExposureModeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ExposureModeEnumFactory.java index 3e2b4bd8751..5585ac30cb3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ExposureModeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ExposureModeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3GTSAbbreviation.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3GTSAbbreviation.java index 252e21f18de..6daf4d2e6f6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3GTSAbbreviation.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3GTSAbbreviation.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3GTSAbbreviation { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3GTSAbbreviationEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3GTSAbbreviationEnumFactory.java index 1f21b883c6e..a306835bfe3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3GTSAbbreviationEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3GTSAbbreviationEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3GenderStatus.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3GenderStatus.java index 48237caef60..dab60517775 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3GenderStatus.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3GenderStatus.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3GenderStatus { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3GenderStatusEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3GenderStatusEnumFactory.java index 88aebf2e112..8920534a384 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3GenderStatusEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3GenderStatusEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3HL7UpdateMode.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3HL7UpdateMode.java index 651bfafa766..4e30702856e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3HL7UpdateMode.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3HL7UpdateMode.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3HL7UpdateMode { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3HL7UpdateModeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3HL7UpdateModeEnumFactory.java index cbb30605552..26f0ac3ba85 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3HL7UpdateModeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3HL7UpdateModeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Hl7Realm.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Hl7Realm.java index f5b10a43849..c5324891399 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Hl7Realm.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Hl7Realm.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3Hl7Realm { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Hl7RealmEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Hl7RealmEnumFactory.java index 033288eff2d..51522d20c88 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Hl7RealmEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Hl7RealmEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Hl7V3Conformance.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Hl7V3Conformance.java index 756e312db83..bd9be91819d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Hl7V3Conformance.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Hl7V3Conformance.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3Hl7V3Conformance { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Hl7V3ConformanceEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Hl7V3ConformanceEnumFactory.java index ce4f1a84428..e5eec152e2d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Hl7V3ConformanceEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Hl7V3ConformanceEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3HtmlLinkType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3HtmlLinkType.java index 9bd284578c8..e523f22beb7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3HtmlLinkType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3HtmlLinkType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3HtmlLinkType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3HtmlLinkTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3HtmlLinkTypeEnumFactory.java index f5e59f2ad60..149e53d60cb 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3HtmlLinkTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3HtmlLinkTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3IdentifierReliability.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3IdentifierReliability.java index 181bb4dda7b..f1ba5dd2d1f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3IdentifierReliability.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3IdentifierReliability.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3IdentifierReliability { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3IdentifierReliabilityEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3IdentifierReliabilityEnumFactory.java index a15b1c3763f..cd7e936751d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3IdentifierReliabilityEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3IdentifierReliabilityEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3IdentifierScope.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3IdentifierScope.java index 864e3c96168..444b9f343fd 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3IdentifierScope.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3IdentifierScope.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3IdentifierScope { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3IdentifierScopeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3IdentifierScopeEnumFactory.java index 6cf408cacf0..8afd2f2cb09 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3IdentifierScopeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3IdentifierScopeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3IntegrityCheckAlgorithm.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3IntegrityCheckAlgorithm.java index ca91cd04a62..175a87c985f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3IntegrityCheckAlgorithm.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3IntegrityCheckAlgorithm.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3IntegrityCheckAlgorithm { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3IntegrityCheckAlgorithmEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3IntegrityCheckAlgorithmEnumFactory.java index 51f5cc4dfde..35a9eff3468 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3IntegrityCheckAlgorithmEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3IntegrityCheckAlgorithmEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LanguageAbilityMode.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LanguageAbilityMode.java index d871c6816dc..a355687034c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LanguageAbilityMode.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LanguageAbilityMode.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3LanguageAbilityMode { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LanguageAbilityModeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LanguageAbilityModeEnumFactory.java index 78b69f3c44b..46b52cc28d2 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LanguageAbilityModeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LanguageAbilityModeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LanguageAbilityProficiency.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LanguageAbilityProficiency.java index b22ab01fd62..d494a41773f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LanguageAbilityProficiency.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LanguageAbilityProficiency.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3LanguageAbilityProficiency { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LanguageAbilityProficiencyEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LanguageAbilityProficiencyEnumFactory.java index 52d78999fb4..31c4df5ac98 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LanguageAbilityProficiencyEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LanguageAbilityProficiencyEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LivingArrangement.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LivingArrangement.java index 69d9c370c21..be7258b1718 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LivingArrangement.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LivingArrangement.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3LivingArrangement { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LivingArrangementEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LivingArrangementEnumFactory.java index 27ef6da00e7..de918a3f002 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LivingArrangementEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LivingArrangementEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LocalMarkupIgnore.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LocalMarkupIgnore.java index 7f5a9e15a9f..34cbcac6568 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LocalMarkupIgnore.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LocalMarkupIgnore.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3LocalMarkupIgnore { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LocalMarkupIgnoreEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LocalMarkupIgnoreEnumFactory.java index a15f140c2c7..6e5a6cbc44f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LocalMarkupIgnoreEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LocalMarkupIgnoreEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LocalRemoteControlState.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LocalRemoteControlState.java index 5463f8576e8..ad337288598 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LocalRemoteControlState.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LocalRemoteControlState.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3LocalRemoteControlState { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LocalRemoteControlStateEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LocalRemoteControlStateEnumFactory.java index e6ee3da96b4..09163bc399b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LocalRemoteControlStateEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3LocalRemoteControlStateEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ManagedParticipationStatus.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ManagedParticipationStatus.java index a10134b6164..160d8a00648 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ManagedParticipationStatus.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ManagedParticipationStatus.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3ManagedParticipationStatus { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ManagedParticipationStatusEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ManagedParticipationStatusEnumFactory.java index ee5d21da08f..dada7c9e39c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ManagedParticipationStatusEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ManagedParticipationStatusEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3MapRelationship.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3MapRelationship.java index 1f04b4c08e9..a03bae84397 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3MapRelationship.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3MapRelationship.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3MapRelationship { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3MapRelationshipEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3MapRelationshipEnumFactory.java index 1547f6507c3..b5d8453c478 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3MapRelationshipEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3MapRelationshipEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3MaritalStatus.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3MaritalStatus.java index 89d62b1a310..90f5872e030 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3MaritalStatus.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3MaritalStatus.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3MaritalStatus { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3MaritalStatusEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3MaritalStatusEnumFactory.java index dcdfa1d5674..dee524e252c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3MaritalStatusEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3MaritalStatusEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3MessageWaitingPriority.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3MessageWaitingPriority.java index fd7d8ac26f6..93aa4078d41 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3MessageWaitingPriority.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3MessageWaitingPriority.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3MessageWaitingPriority { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3MessageWaitingPriorityEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3MessageWaitingPriorityEnumFactory.java index 362a9479d03..50862419faf 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3MessageWaitingPriorityEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3MessageWaitingPriorityEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ModifyIndicator.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ModifyIndicator.java index 6581088a980..c78d5c53e00 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ModifyIndicator.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ModifyIndicator.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3ModifyIndicator { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ModifyIndicatorEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ModifyIndicatorEnumFactory.java index d9a43ec5f33..252024c5ede 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ModifyIndicatorEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ModifyIndicatorEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3NullFlavor.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3NullFlavor.java index 185db9a37a1..d6c78169f7b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3NullFlavor.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3NullFlavor.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3NullFlavor { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3NullFlavorEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3NullFlavorEnumFactory.java index d66766b5954..ad324892533 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3NullFlavorEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3NullFlavorEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ObservationInterpretation.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ObservationInterpretation.java index 23608e2415b..1299578e9de 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ObservationInterpretation.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ObservationInterpretation.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3ObservationInterpretation { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ObservationInterpretationEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ObservationInterpretationEnumFactory.java index 43f4c21ec9c..d18da5633e6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ObservationInterpretationEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ObservationInterpretationEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ObservationMethod.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ObservationMethod.java index fc57d94d268..941d007ef2a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ObservationMethod.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ObservationMethod.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3ObservationMethod { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ObservationMethodEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ObservationMethodEnumFactory.java index 0d154fb6b6f..282115386ad 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ObservationMethodEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ObservationMethodEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ObservationValue.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ObservationValue.java index 21f6f58ea3d..c9c54ee8b69 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ObservationValue.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ObservationValue.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3ObservationValue { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ObservationValueEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ObservationValueEnumFactory.java index 2bd385a8313..5c9734158fb 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ObservationValueEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ObservationValueEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3OrderableDrugForm.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3OrderableDrugForm.java index e1b63512f24..caa1018cb99 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3OrderableDrugForm.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3OrderableDrugForm.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3OrderableDrugForm { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3OrderableDrugFormEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3OrderableDrugFormEnumFactory.java index 1d861b2e578..244dca4c89f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3OrderableDrugFormEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3OrderableDrugFormEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ParticipationFunction.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ParticipationFunction.java index c6d7ccccb59..48576126fbc 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ParticipationFunction.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ParticipationFunction.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3ParticipationFunction { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ParticipationFunctionEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ParticipationFunctionEnumFactory.java index e8d1dcc886d..7c8e22b5058 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ParticipationFunctionEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ParticipationFunctionEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ParticipationMode.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ParticipationMode.java index 914c5d47978..0c33d3f8248 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ParticipationMode.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ParticipationMode.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3ParticipationMode { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ParticipationModeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ParticipationModeEnumFactory.java index b508f6abdd0..648ea90cc83 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ParticipationModeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ParticipationModeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ParticipationSignature.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ParticipationSignature.java index 54096eb339b..16b55f80c25 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ParticipationSignature.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ParticipationSignature.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3ParticipationSignature { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ParticipationSignatureEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ParticipationSignatureEnumFactory.java index 6118b2e9ae0..a8dea061f47 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ParticipationSignatureEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ParticipationSignatureEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ParticipationType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ParticipationType.java index 7645bb76102..f8021510d29 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ParticipationType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ParticipationType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3ParticipationType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ParticipationTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ParticipationTypeEnumFactory.java index 704557d8fde..ef55eaed671 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ParticipationTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ParticipationTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3PatientImportance.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3PatientImportance.java index 1dae3e710cb..a872c7d8c05 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3PatientImportance.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3PatientImportance.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3PatientImportance { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3PatientImportanceEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3PatientImportanceEnumFactory.java index 62e8717c845..5c971064794 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3PatientImportanceEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3PatientImportanceEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3PaymentTerms.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3PaymentTerms.java index f0d8094ca87..ba38ba7b420 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3PaymentTerms.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3PaymentTerms.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3PaymentTerms { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3PaymentTermsEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3PaymentTermsEnumFactory.java index b168b541cf9..5b24e3f05d0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3PaymentTermsEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3PaymentTermsEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3PersonDisabilityType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3PersonDisabilityType.java index d2814cc3b97..f143fda4d21 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3PersonDisabilityType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3PersonDisabilityType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3PersonDisabilityType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3PersonDisabilityTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3PersonDisabilityTypeEnumFactory.java index dab78d10a07..820a6076bb4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3PersonDisabilityTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3PersonDisabilityTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ProbabilityDistributionType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ProbabilityDistributionType.java index 65a43863a78..c0bdcd6edcd 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ProbabilityDistributionType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ProbabilityDistributionType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3ProbabilityDistributionType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ProbabilityDistributionTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ProbabilityDistributionTypeEnumFactory.java index 9949d658c51..b96b53850b7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ProbabilityDistributionTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ProbabilityDistributionTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ProcessingID.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ProcessingID.java index da45f977f44..d784c293748 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ProcessingID.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ProcessingID.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3ProcessingID { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ProcessingIDEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ProcessingIDEnumFactory.java index f08a35102fe..3f7bdfd2226 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ProcessingIDEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ProcessingIDEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ProcessingMode.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ProcessingMode.java index 611b694f9ea..ba82545a67b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ProcessingMode.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ProcessingMode.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3ProcessingMode { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ProcessingModeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ProcessingModeEnumFactory.java index b3755445f2a..984d32656c7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ProcessingModeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ProcessingModeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryParameterValue.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryParameterValue.java index 72df88e4cbf..4ea62468f12 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryParameterValue.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryParameterValue.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3QueryParameterValue { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryParameterValueEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryParameterValueEnumFactory.java index 92ce6935e22..5516fa068bf 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryParameterValueEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryParameterValueEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryPriority.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryPriority.java index e067cf9f676..9d3e52fc5bb 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryPriority.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryPriority.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3QueryPriority { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryPriorityEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryPriorityEnumFactory.java index bb16f2605d3..88e89ed494b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryPriorityEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryPriorityEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryRequestLimit.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryRequestLimit.java index 2bf082cee47..647f66f71b9 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryRequestLimit.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryRequestLimit.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3QueryRequestLimit { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryRequestLimitEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryRequestLimitEnumFactory.java index 7deaad64334..a09ad8b2b87 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryRequestLimitEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryRequestLimitEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryResponse.java index 1d97453b623..29360fea07d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryResponse.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3QueryResponse { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryResponseEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryResponseEnumFactory.java index 24872e7cba2..60a29e549ce 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryResponseEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryResponseEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryStatusCode.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryStatusCode.java index ac75a800d68..b113f9d3aba 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryStatusCode.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryStatusCode.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3QueryStatusCode { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryStatusCodeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryStatusCodeEnumFactory.java index 22a71a92a37..332bdf57d34 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryStatusCodeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3QueryStatusCodeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Race.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Race.java index bcfb55df467..93eac195757 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Race.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Race.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3Race { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RaceEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RaceEnumFactory.java index 82cf9cac31f..f96867d5de9 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RaceEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RaceEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RelationalOperator.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RelationalOperator.java index 8dadfb82528..b3318795dd5 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RelationalOperator.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RelationalOperator.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3RelationalOperator { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RelationalOperatorEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RelationalOperatorEnumFactory.java index 00ad50a1448..7568fda00ca 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RelationalOperatorEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RelationalOperatorEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RelationshipConjunction.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RelationshipConjunction.java index 3290119b552..7aeb36341b2 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RelationshipConjunction.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RelationshipConjunction.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3RelationshipConjunction { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RelationshipConjunctionEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RelationshipConjunctionEnumFactory.java index 5ba5077c8d4..a70e814c219 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RelationshipConjunctionEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RelationshipConjunctionEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ReligiousAffiliation.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ReligiousAffiliation.java index 4957af45af2..77a523b15d8 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ReligiousAffiliation.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ReligiousAffiliation.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3ReligiousAffiliation { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ReligiousAffiliationEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ReligiousAffiliationEnumFactory.java index e4118a40901..d775fa51333 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ReligiousAffiliationEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ReligiousAffiliationEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ResponseLevel.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ResponseLevel.java index 3599d6707d9..bf4af6eca8c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ResponseLevel.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ResponseLevel.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3ResponseLevel { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ResponseLevelEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ResponseLevelEnumFactory.java index 5cfc5462ed9..d2169f9fe82 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ResponseLevelEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ResponseLevelEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ResponseModality.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ResponseModality.java index c3d65268950..ada165ed753 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ResponseModality.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ResponseModality.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3ResponseModality { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ResponseModalityEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ResponseModalityEnumFactory.java index 2f93ab710f6..98385f7af43 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ResponseModalityEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ResponseModalityEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ResponseMode.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ResponseMode.java index df68d5dcd93..0329bbf296d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ResponseMode.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ResponseMode.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3ResponseMode { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ResponseModeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ResponseModeEnumFactory.java index 2ed7feb1c4d..f1de128aea0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ResponseModeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3ResponseModeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleClass.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleClass.java index 34888cdab77..ab14d521960 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleClass.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleClass.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3RoleClass { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleClassEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleClassEnumFactory.java index 0196a706286..f4b8c3bdc55 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleClassEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleClassEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleCode.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleCode.java index 85e7c0fbfc1..afbcf6e55d3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleCode.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleCode.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3RoleCode { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleCodeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleCodeEnumFactory.java index 51460e7f89a..c579e8836d4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleCodeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleCodeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleLinkStatus.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleLinkStatus.java index add8edb6b41..a0c65875567 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleLinkStatus.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleLinkStatus.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3RoleLinkStatus { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleLinkStatusEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleLinkStatusEnumFactory.java index e9bf1cdc1e6..ba617fb98cb 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleLinkStatusEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleLinkStatusEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleLinkType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleLinkType.java index 09b19e40eb5..8460b0fc33c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleLinkType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleLinkType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3RoleLinkType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleLinkTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleLinkTypeEnumFactory.java index 5fa3235d4ee..ff6ec91d48a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleLinkTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleLinkTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleStatus.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleStatus.java index f21f3873b69..989bd928f1d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleStatus.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleStatus.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3RoleStatus { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleStatusEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleStatusEnumFactory.java index 994e7e04eda..e6c88be13d6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleStatusEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RoleStatusEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RouteOfAdministration.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RouteOfAdministration.java index c30ce7d684f..acc2503bbb3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RouteOfAdministration.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RouteOfAdministration.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3RouteOfAdministration { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RouteOfAdministrationEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RouteOfAdministrationEnumFactory.java index c8394f0e0cf..a0bf9ed4af7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RouteOfAdministrationEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3RouteOfAdministrationEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Sequencing.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Sequencing.java index e764d0746d8..bb1c9096c6d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Sequencing.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3Sequencing.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3Sequencing { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3SequencingEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3SequencingEnumFactory.java index b85e4983352..8542deaa06e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3SequencingEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3SequencingEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3SetOperator.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3SetOperator.java index 1e75d82f69b..8ca2606cd98 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3SetOperator.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3SetOperator.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3SetOperator { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3SetOperatorEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3SetOperatorEnumFactory.java index 96498f06c31..dcf16e1f5f8 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3SetOperatorEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3SetOperatorEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3SpecimenType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3SpecimenType.java index 57de02d8099..1b8e83f8ed4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3SpecimenType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3SpecimenType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3SpecimenType { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3SpecimenTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3SpecimenTypeEnumFactory.java index ea55830872d..aef7b924221 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3SpecimenTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3SpecimenTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3SubstanceAdminSubstitution.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3SubstanceAdminSubstitution.java index 8cb3fb5f58b..06bca094a04 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3SubstanceAdminSubstitution.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3SubstanceAdminSubstitution.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3SubstanceAdminSubstitution { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3SubstanceAdminSubstitutionEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3SubstanceAdminSubstitutionEnumFactory.java index b3fb5be6780..0fba5015bea 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3SubstanceAdminSubstitutionEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3SubstanceAdminSubstitutionEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3SubstitutionCondition.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3SubstitutionCondition.java index 3219fea7161..58fa8a7bd47 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3SubstitutionCondition.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3SubstitutionCondition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3SubstitutionCondition { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3SubstitutionConditionEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3SubstitutionConditionEnumFactory.java index a155791a6d4..b46f466a692 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3SubstitutionConditionEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3SubstitutionConditionEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableCellHorizontalAlign.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableCellHorizontalAlign.java index 4fa193f57c3..0088882a2df 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableCellHorizontalAlign.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableCellHorizontalAlign.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3TableCellHorizontalAlign { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableCellHorizontalAlignEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableCellHorizontalAlignEnumFactory.java index bf052d2f2b0..b7535a9b6e6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableCellHorizontalAlignEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableCellHorizontalAlignEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableCellScope.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableCellScope.java index 24e6a3df0d9..80fc5f9c22a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableCellScope.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableCellScope.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3TableCellScope { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableCellScopeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableCellScopeEnumFactory.java index 41a616dfb26..b0404ddfe13 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableCellScopeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableCellScopeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableCellVerticalAlign.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableCellVerticalAlign.java index 096778d672b..ff3a22266f9 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableCellVerticalAlign.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableCellVerticalAlign.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3TableCellVerticalAlign { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableCellVerticalAlignEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableCellVerticalAlignEnumFactory.java index 3fb36ed5cbf..0f32e97d6e7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableCellVerticalAlignEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableCellVerticalAlignEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableFrame.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableFrame.java index 8414ac55436..b5407021bbc 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableFrame.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableFrame.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3TableFrame { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableFrameEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableFrameEnumFactory.java index 05ac7b79397..281000b122a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableFrameEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableFrameEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableRules.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableRules.java index 50b101e8376..c2e1256f19a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableRules.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableRules.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3TableRules { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableRulesEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableRulesEnumFactory.java index 19528e289d0..aca9098f1a0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableRulesEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TableRulesEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TargetAwareness.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TargetAwareness.java index 16f8ca1530d..a689d93e3f9 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TargetAwareness.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TargetAwareness.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3TargetAwareness { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TargetAwarenessEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TargetAwarenessEnumFactory.java index b493cdc3b72..4733c25ac30 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TargetAwarenessEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TargetAwarenessEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TelecommunicationCapabilities.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TelecommunicationCapabilities.java index 6553a07bcb0..99011ac8586 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TelecommunicationCapabilities.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TelecommunicationCapabilities.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3TelecommunicationCapabilities { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TelecommunicationCapabilitiesEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TelecommunicationCapabilitiesEnumFactory.java index d5fdcc47ff1..3ba9de3e3eb 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TelecommunicationCapabilitiesEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TelecommunicationCapabilitiesEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TimingEvent.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TimingEvent.java index 262e72a1b02..368eb13afe9 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TimingEvent.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TimingEvent.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3TimingEvent { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TimingEventEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TimingEventEnumFactory.java index 5a9877b54a8..0626e0a604b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TimingEventEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TimingEventEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TransmissionRelationshipTypeCode.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TransmissionRelationshipTypeCode.java index 6d82c281311..394d7aa8294 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TransmissionRelationshipTypeCode.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TransmissionRelationshipTypeCode.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3TransmissionRelationshipTypeCode { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TransmissionRelationshipTypeCodeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TransmissionRelationshipTypeCodeEnumFactory.java index e577531542d..d6b13902223 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TransmissionRelationshipTypeCodeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TransmissionRelationshipTypeCodeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TribalEntityUS.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TribalEntityUS.java index 5248aab459b..541f369f139 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TribalEntityUS.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TribalEntityUS.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3TribalEntityUS { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TribalEntityUSEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TribalEntityUSEnumFactory.java index c825241d822..908f58df669 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TribalEntityUSEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3TribalEntityUSEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3VaccineManufacturer.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3VaccineManufacturer.java index 313d830c77d..cdc4613cd15 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3VaccineManufacturer.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3VaccineManufacturer.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum V3VaccineManufacturer { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3VaccineManufacturerEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3VaccineManufacturerEnumFactory.java index b85c14d8a4b..cc8eb4f651c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3VaccineManufacturerEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/V3VaccineManufacturerEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/VaccinationProtocolDoseStatus.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/VaccinationProtocolDoseStatus.java index a83698de045..531b2f9f282 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/VaccinationProtocolDoseStatus.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/VaccinationProtocolDoseStatus.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum VaccinationProtocolDoseStatus { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/VaccinationProtocolDoseStatusEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/VaccinationProtocolDoseStatusEnumFactory.java index f146f36321a..113dbd74a4f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/VaccinationProtocolDoseStatusEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/VaccinationProtocolDoseStatusEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/VaccinationProtocolDoseStatusReason.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/VaccinationProtocolDoseStatusReason.java index 82ab96d6006..36e99d54a25 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/VaccinationProtocolDoseStatusReason.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/VaccinationProtocolDoseStatusReason.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum VaccinationProtocolDoseStatusReason { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/VaccinationProtocolDoseStatusReasonEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/VaccinationProtocolDoseStatusReasonEnumFactory.java index e06b6ecc2d5..6394b1cf987 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/VaccinationProtocolDoseStatusReasonEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/VaccinationProtocolDoseStatusReasonEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/VaccinationProtocolDoseTarget.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/VaccinationProtocolDoseTarget.java index 2ced335447f..56659bb3379 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/VaccinationProtocolDoseTarget.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/VaccinationProtocolDoseTarget.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum VaccinationProtocolDoseTarget { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/VaccinationProtocolDoseTargetEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/VaccinationProtocolDoseTargetEnumFactory.java index 310dea1bbf1..167835ab362 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/VaccinationProtocolDoseTargetEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/VaccinationProtocolDoseTargetEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/VisionProduct.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/VisionProduct.java index 12db18ac01b..75815758239 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/VisionProduct.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/VisionProduct.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum VisionProduct { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/VisionProductEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/VisionProductEnumFactory.java index 5c05f7873f4..92945150142 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/VisionProductEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/VisionProductEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/XdsRelationshipType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/XdsRelationshipType.java index 10676e8bb90..63d408cfbdb 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/XdsRelationshipType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/XdsRelationshipType.java @@ -29,14 +29,13 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 public enum XdsRelationshipType { /** - * A separate XDS Document that references a prior document, and may extend or -alter the observations in the prior document + * A separate XDS Document that references a prior document, and may extend or alter the observations in the prior document */ APND, /** @@ -89,7 +88,7 @@ alter the observations in the prior document } public String getDefinition() { switch (this) { - case APND: return "A separate XDS Document that references a prior document, and may extend or \nalter the observations in the prior document"; + case APND: return "A separate XDS Document that references a prior document, and may extend or alter the observations in the prior document"; case RPLC: return "A new version of an existing document"; case XFRM: return "A transformed document is derived by a machine translation from some other format"; case XFRMRPLC: return "Both a XFRM and a RPLC relationship"; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/XdsRelationshipTypeEnumFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/XdsRelationshipTypeEnumFactory.java index b07b7b3ac2e..773633e115d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/XdsRelationshipTypeEnumFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/valuesets/XdsRelationshipTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model.valuesets; */ -// Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 +// Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.EnumFactory; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utils/ProfileUtilities.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utils/ProfileUtilities.java index 62bf12e8498..c085c31ccee 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utils/ProfileUtilities.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utils/ProfileUtilities.java @@ -461,8 +461,6 @@ public class ProfileUtilities { private StructureDefinition getProfileForDataType(TypeRefComponent type) { - if (type.hasProfile() && !type.getCode().equals("Reference") && !type.getCode().equals("Extension")) - throw new Error("handling profiles is not supported yet"); for (StructureDefinition ae : context.getProfiles().values()) { if (ae.getName().equals(type.getCode())) { return ae; @@ -580,7 +578,7 @@ public class ProfileUtilities { List result = new ArrayList(); for (int i = start; i <= end; i++) { String statedPath = context.getElement().get(i).getPath(); - if (statedPath.equals(path) || (path.endsWith("[x]") && statedPath.length() > path.length() && statedPath.substring(0, path.length()-3).equals(path.substring(0, path.length()-3)) && !statedPath.substring(path.length()).contains("."))) { + if (statedPath.equals(path) || (path.endsWith("[x]") && statedPath.length() > path.length() - 2 && statedPath.substring(0, path.length()-3).equals(path.substring(0, path.length()-3)) && !statedPath.substring(path.length()).contains("."))) { result.add(context.getElement().get(i)); } else if (result.isEmpty()) { // System.out.println("ignoring "+statedPath+" in differential of "+profileName); @@ -1095,6 +1093,9 @@ public class ProfileUtilities { boolean hasDef = element != null; boolean ext = false; if (s.equals("extension") || s.equals("modifierExtension")) { + if (element.hasType() && element.getType().get(0).hasProfile() && extensionIsComplex(pkp, element.getType().get(0).getProfile().get(0).getValue())) + row.setIcon("icon_extension_complex.png", HeirarchicalTableGenerator.TEXT_ICON_EXTENSION_COMPLEX); + else row.setIcon("icon_extension_simple.png", HeirarchicalTableGenerator.TEXT_ICON_EXTENSION_SIMPLE); ext = true; } else if (!hasDef || element.getType().size() == 0) @@ -1200,6 +1201,14 @@ public class ProfileUtilities { + private boolean extensionIsComplex(ProfileKnowledgeProvider pkp, String value) { + StructureDefinition ext = context.getExtensionDefinitions().get(value); + if (ext == null) + return false; + return ext.getSnapshot().getElement().size() > 5; + } + + private String getRowColor(ElementDefinition element) { switch (element.getUserInt(UD_ERROR_STATUS)) { case STATUS_OK: return null; @@ -1383,7 +1392,7 @@ public class ProfileUtilities { } private boolean isDataType(String value) { - return Utilities.existsInList(value, "Identifier", "HumanName", "Address", "ContactPoint", "Timing", "Quantity", "Attachment", "Range", + return Utilities.existsInList(value, "Identifier", "HumanName", "Address", "ContactPoint", "Timing", "SimpleQuantity", "Quantity", "Attachment", "Range", "Period", "Ratio", "CodeableConcept", "Coding", "SampledData", "Age", "Distance", "Duration", "Count", "Money"); } @@ -1611,7 +1620,10 @@ public class ProfileUtilities { ccmp = new ElementDefinitionComparer(false, context.getProfiles().get("http://hl7.org/fhir/StructureDefinition/"+child.getSelf().getType().get(0).getCode()).getSnapshot().getElement(), child.getSelf().getType().get(0).getCode(), child.getSelf().getPath().length(), cmp.name, cmp.pkp); } else if (ed.getPath().endsWith("[x]") && !child.getSelf().getPath().endsWith("[x]")) { String p = child.getSelf().getPath().substring(ed.getPath().length()-3); - ccmp = new ElementDefinitionComparer(false, context.getProfiles().get("http://hl7.org/fhir/StructureDefinition/"+p).getSnapshot().getElement(), p, child.getSelf().getPath().length(), cmp.name, cmp.pkp); + StructureDefinition sd = context.getProfiles().get("http://hl7.org/fhir/StructureDefinition/"+p); + if (sd == null) + throw new Error("Unable to find profile "+p); + ccmp = new ElementDefinitionComparer(false, sd.getSnapshot().getElement(), p, child.getSelf().getPath().length(), cmp.name, cmp.pkp); } else { throw new Error("Not handled yet (sortElements: "+ed.getPath()+":"+typeCode(ed.getType())+")"); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utils/ToolingExtensions.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utils/ToolingExtensions.java index 2e12dd94a24..7f598f0053c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utils/ToolingExtensions.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utils/ToolingExtensions.java @@ -46,6 +46,7 @@ import org.hl7.fhir.instance.model.ExtensionHelper; import org.hl7.fhir.instance.model.Factory; import org.hl7.fhir.instance.model.Identifier; import org.hl7.fhir.instance.model.IntegerType; +import org.hl7.fhir.instance.model.MarkdownType; import org.hl7.fhir.instance.model.PrimitiveType; import org.hl7.fhir.instance.model.Questionnaire.GroupComponent; import org.hl7.fhir.instance.model.Questionnaire.QuestionComponent; @@ -119,6 +120,16 @@ public class ToolingExtensions { } } + public static void addStringExtension(Element e, String url, String content) throws Exception { + if (!Utilities.noString(content)) { + Extension ex = getExtension(e, url); + if (ex != null) + ex.setValue(new StringType(content)); + else + e.getExtension().add(Factory.newExtension(url, new StringType(content), true)); + } + } + public static void addIntegerExtension(DomainResource dr, String url, int value) throws Exception { Extension ex = getExtension(dr, url); if (ex != null) @@ -173,6 +184,8 @@ public class ToolingExtensions { return ((StringType) ex.getValue()).getValue(); if ((ex.getValue() instanceof UriType)) return ((UriType) ex.getValue()).getValue(); + if ((ex.getValue() instanceof MarkdownType)) + return ((MarkdownType) ex.getValue()).getValue(); return null; } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utils/WorkerContext.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utils/WorkerContext.java index b5161dfc79f..a607e05b37c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utils/WorkerContext.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utils/WorkerContext.java @@ -20,6 +20,7 @@ import org.hl7.fhir.instance.model.OperationOutcome; import org.hl7.fhir.instance.model.Parameters; import org.hl7.fhir.instance.model.Questionnaire; import org.hl7.fhir.instance.model.Resource; +import org.hl7.fhir.instance.model.SearchParameter; import org.hl7.fhir.instance.model.StructureDefinition; import org.hl7.fhir.instance.model.ValueSet; import org.hl7.fhir.instance.model.ValueSet.ConceptDefinitionComponent; @@ -57,6 +58,7 @@ public class WorkerContext implements NameResolver { private Map valueSets = new HashMap(); private Map maps = new HashMap(); private Map profiles = new HashMap(); + private Map searchParameters = new HashMap(); private Map extensionDefinitions = new HashMap(); private String version; private List resourceNames = new ArrayList(); @@ -111,6 +113,14 @@ public class WorkerContext implements NameResolver { return maps; } + public StructureDefinition getProfile(String theId) { + return profiles.get(theId); + } + + /** + * @deprecated Use {@link #getProfile(String)} instead + */ + @Deprecated public Map getProfiles() { return profiles; } @@ -145,11 +155,15 @@ public class WorkerContext implements NameResolver { } public void seeQuestionnaire(String url, Questionnaire theQuestionnaire) throws Exception { + if (questionnaires.get(theQuestionnaire.getId()) != null) + throw new Exception("duplicate extension definition: "+theQuestionnaire.getId()); questionnaires.put(theQuestionnaire.getId(), theQuestionnaire); questionnaires.put(url, theQuestionnaire); } - public void seeValueSet(String url, ValueSet vs) { + public void seeValueSet(String url, ValueSet vs) throws Exception { + if (valueSets.containsKey(vs.getUrl())) + throw new Exception("Duplicate Profile "+vs.getUrl()); valueSets.put(vs.getId(), vs); valueSets.put(url, vs); valueSets.put(vs.getUrl(), vs); @@ -158,7 +172,9 @@ public class WorkerContext implements NameResolver { } } - public void seeProfile(String url, StructureDefinition p) { + public void seeProfile(String url, StructureDefinition p) throws IllegalArgumentException { + if (profiles.containsKey(p.getUrl())) + throw new IllegalArgumentException("Duplicate Profile "+p.getUrl()); profiles.put(p.getId(), p); profiles.put(url, p); profiles.put(p.getUrl(), p); @@ -421,9 +437,13 @@ public class WorkerContext implements NameResolver { public StructureDefinition getTypeStructure(TypeRefComponent type) { if (type.hasProfile()) - return profiles.get(type.getProfile()); + return profiles.get(type.getProfile().get(0).getValue()); else return profiles.get(type.getCode()); } + public Map getSearchParameters() { + return searchParameters; + } + } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/validation/BaseValidator.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/validation/BaseValidator.java index 68d99ffba63..7d2783cf264 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/validation/BaseValidator.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/validation/BaseValidator.java @@ -33,6 +33,7 @@ import java.text.MessageFormat; import java.util.List; import org.apache.commons.lang3.StringUtils; +import org.hl7.fhir.instance.model.OperationOutcome; import org.hl7.fhir.instance.model.OperationOutcome.IssueSeverity; import org.hl7.fhir.instance.model.OperationOutcome.IssueType; import org.hl7.fhir.instance.validation.ValidationMessage.Source; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/validation/InstanceValidator.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/validation/InstanceValidator.java index e61fa98e9e5..70659966e02 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/validation/InstanceValidator.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/validation/InstanceValidator.java @@ -15,6 +15,7 @@ import org.hl7.fhir.instance.model.Coding; import org.hl7.fhir.instance.model.ContactPoint; import org.hl7.fhir.instance.model.ElementDefinition; import org.hl7.fhir.instance.model.Enumerations.BindingStrength; +import org.hl7.fhir.instance.model.Enumerations.ResourceType; import org.hl7.fhir.instance.model.ElementDefinition.ElementDefinitionBindingComponent; import org.hl7.fhir.instance.model.ElementDefinition.ElementDefinitionConstraintComponent; import org.hl7.fhir.instance.model.ElementDefinition.TypeRefComponent; @@ -213,7 +214,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat } @Override public void validate(List errors, Element element, String profile) throws Exception { - StructureDefinition p = context.getProfiles().get(profile); + StructureDefinition p = context.getProfile(profile); if (p == null) throw new Exception("StructureDefinition '"+profile+"' not found"); validateResource(errors, new DOMWrapperElement(element), p, requiresResourceId, null); @@ -230,7 +231,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat @Override public void validate(List errors, JsonObject object, String profile) throws Exception { - StructureDefinition p = context.getProfiles().get(profile); + StructureDefinition p = context.getProfile(profile); if (p == null) throw new Exception("StructureDefinition '"+profile+"' not found"); validateResource(errors, new JsonWrapperElement(object), p, requiresResourceId, null); @@ -244,7 +245,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat @Override public void validate(List errors, Document document, String profile) throws Exception { checkForProcessingInstruction(errors, document); - StructureDefinition p = context.getProfiles().get(profile); + StructureDefinition p = context.getProfile(profile); if (p == null) throw new Exception("StructureDefinition '"+profile+"' not found"); validateResource(errors, new DOMWrapperElement(document.getDocumentElement()), p, requiresResourceId, null); @@ -1007,7 +1008,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat } private StructureDefinition getProfileForType(String type) throws Exception { - return context.getProfiles().get("http://hl7.org/fhir/StructureDefinition/"+type); + return context.getProfile("http://hl7.org/fhir/StructureDefinition/"+type); } private void validateObservation(List errors, WrapperElement element, NodeStack stack) { @@ -1019,12 +1020,14 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat } private void bpCheck(List errors, IssueType invalid, int line, int col, String literalPath, boolean test, String message) { - switch (bpWarnings) { - case Error: rule(errors, invalid, line, col, literalPath, test, message); - case Warning: warning(errors, invalid, line, col, literalPath, test, message); - case Hint: hint(errors, invalid, line, col, literalPath, test, message); - default: // do nothing - } + if (bpWarnings != null) { + switch (bpWarnings) { + case Error: rule(errors, invalid, line, col, literalPath, test, message); + case Warning: warning(errors, invalid, line, col, literalPath, test, message); + case Hint: hint(errors, invalid, line, col, literalPath, test, message); + default: // do nothing + } + } } private void validateElement(List errors, StructureDefinition profile, ElementDefinition definition, StructureDefinition cprofile, ElementDefinition context, WrapperElement element, String actualType, NodeStack stack) throws Exception { @@ -1264,7 +1267,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat private ElementDefinition resolveType(String type) { String url = "http://hl7.org/fhir/StructureDefinition/"+type; - StructureDefinition sd = context.getProfiles().get(url); + StructureDefinition sd = context.getProfile(url); if (sd == null || !sd.hasSnapshot()) return null; else @@ -1419,11 +1422,14 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat } private String checkResourceType(String type) { - if (context.getProfiles().containsKey("http://hl7.org/fhir/StructureDefinition/"+type)) + try { + org.hl7.fhir.instance.model.ResourceType.valueOf(type); return type; - else + } catch (IllegalArgumentException e) { return null; + } } + private String getBaseType(StructureDefinition profile, String pr) { // if (pr.startsWith("http://hl7.org/fhir/StructureDefinition/")) { // // this just has to be a base type @@ -1448,7 +1454,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat return null; } else - return context.getProfiles().get(pr); + return context.getProfile(pr); } private StructureDefinition checkExtension(List errors, String path, WrapperElement element, ElementDefinition def, StructureDefinition profile, NodeStack stack) throws Exception { @@ -1490,7 +1496,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat } private boolean isKnownType(String code) { - return context.getProfiles().get(code.toLowerCase()) != null; + return context.getProfile(code.toLowerCase()) != null; } private ElementDefinition getElementByPath(StructureDefinition definition, String path) { @@ -1610,7 +1616,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat private void validateContains(List errors, String path, ElementDefinition child, ElementDefinition context, WrapperElement element, NodeStack stack, boolean needsId) throws Exception { WrapperElement e = element.isXml() ? element.getFirstChild() : element; String resourceName = e.getResourceType(); - StructureDefinition profile = this.context.getProfiles().get("http://hl7.org/fhir/StructureDefinition/"+resourceName); + StructureDefinition profile = this.context.getProfile("http://hl7.org/fhir/StructureDefinition/"+resourceName); if (rule(errors, IssueType.INVALID, element.line(), element.col(), stack.addToLiteralPath(resourceName), profile != null, "No profile found for contained resource of type '"+resourceName+"'")) validateResource(errors, e, profile, needsId, stack); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/xhtml/HeirarchicalTableGenerator.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/xhtml/HeirarchicalTableGenerator.java index 96cc23c1853..9e481423aa4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/xhtml/HeirarchicalTableGenerator.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/xhtml/HeirarchicalTableGenerator.java @@ -349,7 +349,7 @@ public class HeirarchicalTableGenerator { tc.setAttribute("class", "heirarchy"); if (indents != null) { tc.addTag("img").setAttribute("src", srcFor(corePrefix, "tbl_spacer.png")).setAttribute("style", "background-color: inherit").setAttribute("class", "heirarchy").setAttribute("alt", "."); - tc.setAttribute("style", "vertical-align: top; text-align : left; background-color: "+color+"; padding:0px 4px 0px 4px; white-space: nowrap; background-image: url("+checkExists(indents, hasChildren)+")"); + tc.setAttribute("style", "vertical-align: top; text-align : left; background-color: "+color+"; padding:0px 4px 0px 4px; white-space: nowrap; background-image: url("+corePrefix+checkExists(indents, hasChildren)+")"); for (int i = 0; i < indents.size()-1; i++) { if (indents.get(i)) tc.addTag("img").setAttribute("src", srcFor(corePrefix, "tbl_blank.png")).setAttribute("style", "background-color: inherit").setAttribute("class", "heirarchy").setAttribute("alt", "."); diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/fhirversion.properties b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/fhirversion.properties index d063dd8dcfc..fa4670cc091 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/fhirversion.properties +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/fhirversion.properties @@ -53,7 +53,7 @@ resource.Media=org.hl7.fhir.instance.model.Media resource.Medication=org.hl7.fhir.instance.model.Medication resource.MedicationAdministration=org.hl7.fhir.instance.model.MedicationAdministration resource.MedicationDispense=org.hl7.fhir.instance.model.MedicationDispense -resource.MedicationPrescription=org.hl7.fhir.instance.model.MedicationPrescription +resource.MedicationOrder=org.hl7.fhir.instance.model.MedicationOrder resource.MedicationStatement=org.hl7.fhir.instance.model.MedicationStatement resource.MessageHeader=org.hl7.fhir.instance.model.MessageHeader resource.NamingSystem=org.hl7.fhir.instance.model.NamingSystem diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/account.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/account.profile.xml index d8422047c14..3ae289571f1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/account.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/account.profile.xml @@ -3,7 +3,7 @@ - + @@ -278,7 +278,7 @@ - + @@ -287,6 +287,7 @@ + @@ -500,7 +501,8 @@ - + + @@ -667,7 +669,8 @@ - + + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/address.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/address.profile.xml index 6660d0d88ed..ce11e271e38 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/address.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/address.profile.xml @@ -247,8 +247,8 @@ - - + + @@ -272,12 +272,12 @@ + - @@ -615,7 +615,6 @@ - diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/age.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/age.profile.xml index 20548a02442..4df75a98929 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/age.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/age.profile.xml @@ -25,7 +25,7 @@ - + @@ -37,7 +37,6 @@ - diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/allergyintolerance.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/allergyintolerance.profile.xml index acc2941abff..49082560bf3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/allergyintolerance.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/allergyintolerance.profile.xml @@ -3,7 +3,7 @@ - + @@ -156,7 +156,7 @@ Substance, (or class) considered to be responsible for risk
- Substance Type ( + Substance Code ( Example) @@ -243,7 +243,7 @@ code - food | medication | environment - Category of Substance + food | medication | environment | other - Category of Substance
AllergyIntoleranceCategory ( Required) @@ -318,7 +318,7 @@ Specific substance considered to be responsible for event
- Substance Type ( + Substance Code ( Example) @@ -507,8 +507,9 @@ - + + @@ -521,12 +522,12 @@ + - @@ -783,7 +784,7 @@ - + @@ -867,7 +868,7 @@ - + @@ -985,7 +986,7 @@ - + @@ -1058,7 +1059,8 @@ - + + @@ -1113,7 +1115,6 @@ - @@ -1252,7 +1253,7 @@ - + @@ -1336,7 +1337,7 @@ - + @@ -1402,7 +1403,7 @@ - + @@ -1475,7 +1476,8 @@ - + + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/annotation.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/annotation.profile.xml index 8851964fd45..6b361ec6dc2 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/annotation.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/annotation.profile.xml @@ -143,8 +143,8 @@ - - + + @@ -157,6 +157,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/appointment.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/appointment.profile.xml index ff4c9cb994a..b48664481d2 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/appointment.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/appointment.profile.xml @@ -3,7 +3,7 @@ - + @@ -376,7 +376,7 @@ - + @@ -400,6 +400,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/appointmentresponse.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/appointmentresponse.profile.xml index 8d62dadc94e..bb390365b08 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/appointmentresponse.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/appointmentresponse.profile.xml @@ -3,7 +3,7 @@ - + @@ -220,7 +220,7 @@ - + @@ -244,6 +244,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/attachment.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/attachment.profile.xml index 89fd8778a5c..132728b21f7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/attachment.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/attachment.profile.xml @@ -214,8 +214,8 @@ - - + + @@ -229,12 +229,12 @@ + - @@ -447,7 +447,6 @@ - diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/auditevent.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/auditevent.profile.xml index d164a81003e..fb074a76aa5 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/auditevent.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/auditevent.profile.xml @@ -3,7 +3,7 @@ - + @@ -875,7 +875,7 @@ - + @@ -889,6 +889,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/backboneelement.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/backboneelement.profile.xml index f01e3b43c81..8addae2375f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/backboneelement.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/backboneelement.profile.xml @@ -74,8 +74,8 @@ - - + + @@ -83,6 +83,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/basic.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/basic.profile.xml index 82e253385cc..f1321373534 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/basic.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/basic.profile.xml @@ -3,7 +3,7 @@ - + @@ -167,8 +167,9 @@ - + + @@ -181,12 +182,12 @@ + - @@ -446,7 +447,6 @@ - diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/binary.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/binary.profile.xml index 0a07ef29fd5..3f781075981 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/binary.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/binary.profile.xml @@ -3,7 +3,7 @@ - + @@ -110,8 +110,9 @@ - + + @@ -124,12 +125,12 @@ + - @@ -227,7 +228,6 @@ - diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/bodysite.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/bodysite.profile.xml index 8e2e884fa71..109713df52b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/bodysite.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/bodysite.profile.xml @@ -3,7 +3,7 @@ - + @@ -180,7 +180,7 @@ - + @@ -194,6 +194,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/boolean.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/boolean.profile.xml index 25a3f54fd2d..4afcc971665 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/boolean.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/boolean.profile.xml @@ -16,10 +16,11 @@ - + + @@ -60,6 +61,10 @@ + + @@ -67,9 +72,6 @@ - - - @@ -83,6 +85,10 @@ + + @@ -90,9 +96,6 @@ - - - \ No newline at end of file diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/bundle.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/bundle.profile.xml index 0d636facc68..6aabb3fb541 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/bundle.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/bundle.profile.xml @@ -3,7 +3,7 @@ - + @@ -588,7 +588,7 @@ - + @@ -607,6 +607,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/careplan.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/careplan.profile.xml index 68898677be9..160297b46e3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/careplan.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/careplan.profile.xml @@ -3,7 +3,7 @@ - + @@ -351,7 +351,7 @@ CommunicationRequest | DeviceUseRequest | DiagnosticOrder | - MedicationPrescription | + MedicationOrder | NutritionOrder | Order | ProcedureRequest | @@ -702,7 +702,7 @@ 0..1 - Quantity + SimpleQuantity How to consume/day? @@ -722,7 +722,7 @@ 0..1 - Quantity + SimpleQuantity How much to administer/supply/consume @@ -783,7 +783,7 @@ - + @@ -797,6 +797,7 @@ + @@ -1375,7 +1376,7 @@ - + @@ -1740,6 +1741,7 @@ + @@ -1759,6 +1761,7 @@ + @@ -2164,7 +2167,7 @@ - + @@ -2477,6 +2480,7 @@ + @@ -2496,6 +2500,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/claim.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/claim.profile.xml index a231b36934b..7e9db0fdec6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/claim.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/claim.profile.xml @@ -3,7 +3,7 @@ - + @@ -319,7 +319,7 @@ 0..1 - MedicationPrescription | + MedicationOrder | VisionPrescription Prescription @@ -338,7 +338,7 @@ 0..1 - MedicationPrescription + MedicationOrder Original Prescription @@ -993,7 +993,7 @@ 0..1 - Quantity + SimpleQuantity Count of Products or Services @@ -1268,7 +1268,7 @@ 0..1 - Quantity + SimpleQuantity Count of Products or Services @@ -1484,7 +1484,7 @@ 0..1 - Quantity + SimpleQuantity Count of Products or Services @@ -1808,7 +1808,7 @@ - + @@ -1817,6 +1817,7 @@ + @@ -2148,7 +2149,7 @@ - + @@ -2164,11 +2165,14 @@ - + + + + @@ -2295,6 +2299,9 @@ + + + @@ -2416,6 +2423,9 @@ + + + @@ -2673,6 +2683,9 @@ + + + @@ -2821,6 +2834,7 @@ + @@ -2831,7 +2845,8 @@ - + + @@ -2867,7 +2882,8 @@ - + + @@ -2946,6 +2962,9 @@ + + + @@ -3060,6 +3079,7 @@ + @@ -3071,7 +3091,8 @@ - + + @@ -3107,7 +3128,8 @@ - + + @@ -3131,6 +3153,9 @@ + + + @@ -3245,6 +3270,7 @@ + @@ -3256,7 +3282,8 @@ - + + @@ -3292,7 +3319,8 @@ - + + @@ -3316,6 +3344,9 @@ + + + @@ -3437,6 +3468,9 @@ + + + @@ -3761,7 +3795,7 @@ - + @@ -3777,11 +3811,14 @@ - + + + + @@ -3856,6 +3893,9 @@ + + + @@ -3925,6 +3965,9 @@ + + + @@ -4130,6 +4173,9 @@ + + + @@ -4226,6 +4272,7 @@ + @@ -4236,7 +4283,8 @@ - + + @@ -4272,7 +4320,8 @@ - + + @@ -4351,6 +4400,9 @@ + + + @@ -4413,6 +4465,7 @@ + @@ -4424,7 +4477,8 @@ - + + @@ -4460,7 +4514,8 @@ - + + @@ -4484,6 +4539,9 @@ + + + @@ -4546,6 +4604,7 @@ + @@ -4557,7 +4616,8 @@ - + + @@ -4593,7 +4653,8 @@ - + + @@ -4617,6 +4678,9 @@ + + + @@ -4686,6 +4750,9 @@ + + + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/claimresponse.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/claimresponse.profile.xml index e3632b11b71..d985dabe0c6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/claimresponse.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/claimresponse.profile.xml @@ -3,7 +3,7 @@ - + @@ -1559,7 +1559,7 @@ - + @@ -1573,6 +1573,7 @@ + @@ -1867,6 +1868,9 @@ + + + @@ -1953,6 +1957,9 @@ + + + @@ -2037,7 +2044,8 @@ - + + @@ -2053,6 +2061,9 @@ + + + @@ -2128,6 +2139,9 @@ + + + @@ -2212,7 +2226,8 @@ - + + @@ -2228,6 +2243,9 @@ + + + @@ -2303,6 +2321,9 @@ + + + @@ -2387,7 +2408,8 @@ - + + @@ -2403,6 +2425,9 @@ + + + @@ -2498,7 +2523,8 @@ - + + @@ -2514,6 +2540,9 @@ + + + @@ -2598,7 +2627,8 @@ - + + @@ -2614,6 +2644,9 @@ + + + @@ -2698,11 +2731,15 @@ - + + + + + @@ -2787,7 +2824,8 @@ - + + @@ -2803,6 +2841,9 @@ + + + @@ -2921,7 +2962,8 @@ - + + @@ -2932,7 +2974,8 @@ - + + @@ -2943,7 +2986,8 @@ - + + @@ -2954,7 +2998,8 @@ - + + @@ -2994,7 +3039,8 @@ - + + @@ -3050,6 +3096,9 @@ + + + @@ -3154,6 +3203,9 @@ + + + @@ -3518,6 +3570,9 @@ + + + @@ -3552,6 +3607,9 @@ + + + @@ -3584,7 +3642,8 @@ - + + @@ -3600,6 +3659,9 @@ + + + @@ -3623,6 +3685,9 @@ + + + @@ -3655,7 +3720,8 @@ - + + @@ -3671,6 +3737,9 @@ + + + @@ -3694,6 +3763,9 @@ + + + @@ -3726,7 +3798,8 @@ - + + @@ -3742,6 +3815,9 @@ + + + @@ -3785,7 +3861,8 @@ - + + @@ -3801,6 +3878,9 @@ + + + @@ -3833,7 +3913,8 @@ - + + @@ -3849,6 +3930,9 @@ + + + @@ -3881,11 +3965,15 @@ - + + + + + @@ -3918,7 +4006,8 @@ - + + @@ -3934,6 +4023,9 @@ + + + @@ -4000,7 +4092,8 @@ - + + @@ -4011,7 +4104,8 @@ - + + @@ -4022,7 +4116,8 @@ - + + @@ -4033,7 +4128,8 @@ - + + @@ -4073,7 +4169,8 @@ - + + @@ -4129,6 +4226,9 @@ + + + @@ -4181,6 +4281,9 @@ + + + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/clinicalimpression.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/clinicalimpression.profile.xml index b8ce38a9bbc..95aa4820651 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/clinicalimpression.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/clinicalimpression.profile.xml @@ -3,7 +3,7 @@ - + @@ -474,7 +474,7 @@ CommunicationRequest | DeviceUseRequest | DiagnosticOrder | - MedicationPrescription | + MedicationOrder | NutritionOrder | Order | ProcedureRequest | @@ -500,7 +500,7 @@ ReferralRequest | ProcedureRequest | Procedure | - MedicationPrescription | + MedicationOrder | DiagnosticOrder | NutritionOrder | SupplyRequest | @@ -531,7 +531,7 @@ - + @@ -545,6 +545,7 @@ + @@ -1153,7 +1154,7 @@ - + @@ -1204,7 +1205,7 @@ - + @@ -1558,7 +1559,7 @@ - + @@ -1609,7 +1610,7 @@ - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/code.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/code.profile.xml index 7986a57276d..f0500abbb83 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/code.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/code.profile.xml @@ -16,9 +16,10 @@ - + + @@ -55,6 +56,11 @@ + + + @@ -67,9 +73,6 @@ - - - @@ -83,6 +86,11 @@ + + + @@ -90,9 +98,6 @@ - - - \ No newline at end of file diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/codeableconcept.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/codeableconcept.profile.xml index d611d3fa83c..6fed9eefa13 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/codeableconcept.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/codeableconcept.profile.xml @@ -94,8 +94,8 @@ - - + + @@ -114,12 +114,12 @@ + - @@ -224,7 +224,6 @@ - diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/coding.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/coding.profile.xml index a3cd5ad35c6..3b6608afd68 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/coding.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/coding.profile.xml @@ -148,8 +148,8 @@ - - + + @@ -168,12 +168,12 @@ + - @@ -349,7 +349,6 @@ - diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/communication.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/communication.profile.xml index 8336b5cd871..67fe2d80901 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/communication.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/communication.profile.xml @@ -3,7 +3,7 @@ - + @@ -366,7 +366,7 @@ - + @@ -380,6 +380,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/communicationrequest.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/communicationrequest.profile.xml index 1541965ff1d..a500af29e81 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/communicationrequest.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/communicationrequest.profile.xml @@ -3,7 +3,7 @@ - + @@ -404,7 +404,7 @@ - + @@ -418,6 +418,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/composition.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/composition.profile.xml index b3298da82bc..32c3775bffe 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/composition.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/composition.profile.xml @@ -3,7 +3,7 @@ - + @@ -35,7 +35,7 @@ . . - Composition + Composition @@ -137,7 +137,7 @@ Σ - 0..1 + 1..1 string @@ -160,7 +160,7 @@ code - preliminary | final | appended | amended | entered-in-error + preliminary | final | amended | entered-in-error
CompositionStatus ( Required) @@ -394,7 +394,7 @@ . . . - detail + detail @@ -404,7 +404,7 @@ Any - Full details for the event(s) the composition consents + The event(s) being documented @@ -633,8 +633,9 @@ - + + @@ -652,12 +653,12 @@ + - - + @@ -907,7 +908,7 @@ - + @@ -924,7 +925,7 @@ - + @@ -1329,8 +1330,8 @@ - - + + @@ -1373,6 +1374,9 @@ + + + @@ -1646,8 +1650,7 @@ - - + @@ -1779,7 +1782,7 @@ - + @@ -1796,7 +1799,7 @@ - + @@ -2097,8 +2100,8 @@ - - + + @@ -2141,6 +2144,9 @@ + + + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/conceptmap.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/conceptmap.profile.xml index 09e9948a0b8..43aa6dc811c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/conceptmap.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/conceptmap.profile.xml @@ -3,7 +3,7 @@ - + @@ -686,7 +686,7 @@ - + @@ -700,6 +700,7 @@ + @@ -1165,6 +1166,9 @@ + + + @@ -1247,6 +1251,9 @@ + + + @@ -1361,6 +1368,9 @@ + + + @@ -1754,6 +1764,9 @@ + + + @@ -1784,6 +1797,9 @@ + + + @@ -1846,6 +1862,9 @@ + + + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/condition.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/condition.profile.xml index 22faa2c3bfb..c42dd4c6d1a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/condition.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/condition.profile.xml @@ -3,7 +3,7 @@ - + @@ -288,7 +288,7 @@ . . . - . onsetAge + . onsetQuantity @@ -383,7 +383,7 @@ . . . - . abatementAge + . abatementQuantity @@ -649,7 +649,7 @@ - + @@ -668,6 +668,7 @@ + @@ -1083,7 +1084,8 @@ - + + @@ -1118,7 +1120,8 @@ - + + @@ -1702,7 +1705,8 @@ - + + @@ -1737,7 +1741,8 @@ - + + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/conformance.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/conformance.profile.xml index 03067434286..057b5649128 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/conformance.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/conformance.profile.xml @@ -3,7 +3,7 @@ - + @@ -1709,7 +1709,7 @@ - + @@ -1723,6 +1723,7 @@ + @@ -2753,6 +2754,9 @@ + + + @@ -3090,6 +3094,9 @@ + + + @@ -4272,6 +4279,9 @@ + + + @@ -4505,6 +4515,9 @@ + + + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/contactpoint.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/contactpoint.profile.xml index 6ecc245a569..bfa30ec739a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/contactpoint.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/contactpoint.profile.xml @@ -162,8 +162,8 @@ - - + + @@ -182,12 +182,12 @@ + - @@ -379,7 +379,6 @@ - diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/contract.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/contract.profile.xml index f544740400e..e80e82f8e34 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/contract.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/contract.profile.xml @@ -3,7 +3,7 @@ - + @@ -406,7 +406,7 @@ 0..1 - Quantity + SimpleQuantity Count of Contract Valued Items @@ -926,7 +926,7 @@ 0..1 - Quantity + SimpleQuantity Contract Term Valued Item Count @@ -1285,7 +1285,7 @@ - + @@ -1294,6 +1294,7 @@ + @@ -1603,6 +1604,9 @@ jurisdication"/> + + + @@ -1722,6 +1726,9 @@ jurisdication"/> + + + @@ -1840,6 +1847,7 @@ jurisdication"/> + @@ -1853,7 +1861,8 @@ jurisdication"/> - + + @@ -1895,7 +1904,8 @@ jurisdication"/> - + + @@ -1903,6 +1913,9 @@ jurisdication"/> + + + @@ -2012,6 +2025,9 @@ jurisdication"/> + + + @@ -2184,6 +2200,9 @@ jurisdication"/> + + + @@ -2313,6 +2332,9 @@ jurisdication"/> + + + @@ -2429,6 +2451,7 @@ jurisdication"/> + @@ -2442,7 +2465,8 @@ jurisdication"/> - + + @@ -2484,7 +2508,8 @@ jurisdication"/> - + + @@ -2518,6 +2543,9 @@ jurisdication"/> + + + @@ -2599,6 +2627,9 @@ jurisdication"/> + + + @@ -2680,6 +2711,9 @@ jurisdication"/> + + + @@ -2944,6 +2978,9 @@ jurisdication"/> + + + @@ -3011,6 +3048,9 @@ jurisdication"/> + + + @@ -3077,6 +3117,7 @@ jurisdication"/> + @@ -3090,7 +3131,8 @@ jurisdication"/> - + + @@ -3132,7 +3174,8 @@ jurisdication"/> - + + @@ -3140,6 +3183,9 @@ jurisdication"/> + + + @@ -3197,6 +3243,9 @@ jurisdication"/> + + + @@ -3317,6 +3366,9 @@ jurisdication"/> + + + @@ -3394,6 +3446,9 @@ jurisdication"/> + + + @@ -3458,6 +3513,7 @@ jurisdication"/> + @@ -3471,7 +3527,8 @@ jurisdication"/> - + + @@ -3513,7 +3570,8 @@ jurisdication"/> - + + @@ -3547,6 +3605,9 @@ jurisdication"/> + + + @@ -3576,6 +3637,9 @@ jurisdication"/> + + + @@ -3605,6 +3669,9 @@ jurisdication"/> + + + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/contraindication.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/contraindication.profile.xml index 4dff2aded99..1ba77533abe 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/contraindication.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/contraindication.profile.xml @@ -3,7 +3,7 @@ - + @@ -306,7 +306,7 @@ - + @@ -325,6 +325,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/count.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/count.profile.xml index 047321cf610..12e9f69b316 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/count.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/count.profile.xml @@ -25,7 +25,7 @@ - + @@ -37,7 +37,6 @@ - diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/coverage.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/coverage.profile.xml index 0af3e202eb3..72d621eaab2 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/coverage.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/coverage.profile.xml @@ -3,7 +3,7 @@ - + @@ -320,8 +320,9 @@ - + + @@ -344,12 +345,12 @@ + - @@ -751,7 +752,6 @@ - diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/dataelement.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/dataelement.profile.xml index 6244ceedf98..d623e389703 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/dataelement.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/dataelement.profile.xml @@ -3,7 +3,7 @@ - + @@ -428,7 +428,7 @@ - + @@ -438,10 +438,10 @@ - + - + @@ -475,6 +475,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/date.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/date.profile.xml index 1695335424e..628969f6cd0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/date.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/date.profile.xml @@ -16,10 +16,11 @@ - + + @@ -60,6 +61,11 @@ + + + @@ -67,9 +73,6 @@ - - - @@ -83,6 +86,11 @@ + + + @@ -90,9 +98,6 @@ - - - \ No newline at end of file diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/datetime.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/datetime.profile.xml index 7c7a303479d..b1f85ed91f0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/datetime.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/datetime.profile.xml @@ -16,10 +16,11 @@ - + + @@ -60,6 +61,11 @@ + + + @@ -67,9 +73,6 @@ - - - @@ -83,6 +86,11 @@ + + + @@ -90,9 +98,6 @@ - - - \ No newline at end of file diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/decimal.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/decimal.profile.xml index c2525bab22d..1b1dfafb5f8 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/decimal.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/decimal.profile.xml @@ -16,10 +16,11 @@ - + + @@ -61,6 +62,11 @@ + + + @@ -68,9 +74,6 @@ - - - @@ -85,6 +88,11 @@ + + + @@ -92,9 +100,6 @@ - - - \ No newline at end of file diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/device.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/device.profile.xml index 1a21ce806b5..304f155eb86 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/device.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/device.profile.xml @@ -3,7 +3,7 @@ - + @@ -254,7 +254,7 @@ . . . - location + location @@ -335,8 +335,9 @@ - + + @@ -349,12 +350,12 @@ + - @@ -693,7 +694,7 @@ - + @@ -762,7 +763,6 @@ - @@ -983,7 +983,7 @@ - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/devicecomponent.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/devicecomponent.profile.xml index ff919282f08..8cf09db7064 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/devicecomponent.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/devicecomponent.profile.xml @@ -3,7 +3,7 @@ - + @@ -315,7 +315,7 @@ - + @@ -329,6 +329,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/devicemetric.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/devicemetric.profile.xml index caf118e3068..195a0e6963e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/devicemetric.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/devicemetric.profile.xml @@ -3,7 +3,7 @@ - + @@ -339,7 +339,7 @@ The update period may be different than the measurement repetition time, if the - + @@ -353,6 +353,7 @@ The update period may be different than the measurement repetition time, if the + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/deviceuserequest.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/deviceuserequest.profile.xml index 5c3a56478ba..dccf59acd3f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/deviceuserequest.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/deviceuserequest.profile.xml @@ -3,7 +3,7 @@ - + @@ -374,7 +374,7 @@ - + @@ -384,10 +384,10 @@ - + - + @@ -406,6 +406,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/deviceusestatement.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/deviceusestatement.profile.xml index 64d7c91e5e3..d8b0709192e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/deviceusestatement.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/deviceusestatement.profile.xml @@ -3,7 +3,7 @@ - + @@ -293,7 +293,7 @@ - + @@ -303,10 +303,10 @@ - + - + @@ -325,6 +325,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/diagnosticorder.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/diagnosticorder.profile.xml index d71796ca525..34bf11b6637 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/diagnosticorder.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/diagnosticorder.profile.xml @@ -3,7 +3,7 @@ - + @@ -476,7 +476,7 @@ - + @@ -495,6 +495,7 @@ + @@ -748,6 +749,8 @@ + + @@ -1292,6 +1295,8 @@ + + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/diagnosticreport.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/diagnosticreport.profile.xml index 25b13509bcf..01090986e96 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/diagnosticreport.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/diagnosticreport.profile.xml @@ -3,7 +3,7 @@ - + @@ -260,13 +260,15 @@ . . . - requestDetail - + request + 0..* - DiagnosticOrder + DiagnosticOrder | + ProcedureRequest | + ReferralRequest What was requested @@ -448,8 +450,9 @@ - + + @@ -467,12 +470,12 @@ + - @@ -881,9 +884,9 @@ - + - + @@ -891,6 +894,14 @@ + + + + + + + + @@ -1133,7 +1144,6 @@ - @@ -1424,9 +1434,9 @@ - + - + @@ -1434,6 +1444,14 @@ + + + + + + + + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/distance.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/distance.profile.xml index 5395e31b9f9..dceb3a37db7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/distance.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/distance.profile.xml @@ -25,7 +25,7 @@ - + @@ -37,7 +37,6 @@ - diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/documentmanifest.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/documentmanifest.profile.xml index 4769c248943..60a88da2983 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/documentmanifest.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/documentmanifest.profile.xml @@ -3,7 +3,7 @@ - + @@ -120,6 +120,7 @@ Patient | Practitioner | + RelatedPerson | Organization Intended to get notified about this set of documents @@ -152,7 +153,7 @@ . . . - author + author @@ -166,7 +167,7 @@ Patient | RelatedPerson - Who and/or what authored the document + Who and/or what authored the manifest @@ -270,7 +271,7 @@ . . . - p[x] + p[x] @@ -309,8 +310,7 @@ - DocumentReference | - Media + Any @@ -393,7 +393,7 @@ - + @@ -417,6 +417,7 @@ + @@ -655,6 +656,10 @@ + + + + @@ -705,8 +710,8 @@ - - + + @@ -899,7 +904,7 @@ - + @@ -907,11 +912,7 @@ - - - - - + @@ -1127,6 +1128,10 @@ + + + + @@ -1177,8 +1182,8 @@ - - + + @@ -1319,7 +1324,7 @@ - + @@ -1327,11 +1332,7 @@ - - - - - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/documentreference.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/documentreference.profile.xml index 4169fef42ce..76a4d851df6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/documentreference.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/documentreference.profile.xml @@ -3,7 +3,7 @@ - + @@ -145,7 +145,7 @@ Categorization of document
Document Class Value Set ( - Preferred) + Example) @@ -153,7 +153,7 @@ . . - . + . format @@ -162,7 +162,7 @@ 0..* - uri + Coding Format/content rules for the document
@@ -182,7 +182,7 @@ Σ - 1..* + 0..* Practitioner | Organization | @@ -395,8 +395,8 @@ . . . - confidentiality - + securityLabel + Σ @@ -407,7 +407,7 @@ Document security-tags
- All Security Labels ( + All Security Labels ( Extensible) @@ -448,6 +448,25 @@ Clinical context of document + + + . + . + . + . + encounter + + + + Σ + + 0..1 + + Encounter + + Context of the document content + + . @@ -505,7 +524,7 @@ Kind of facility where patient was seen
Facililty Type Code Value Set ( - Preferred) + Example) @@ -528,7 +547,7 @@ Additional details about where the content was created (e.g. clinical specialty)
Practice Setting Code Value Set ( - Preferred) + Example) @@ -567,7 +586,7 @@ Element - Related things + Related identifiers or resources @@ -632,7 +651,7 @@ - + @@ -656,6 +675,7 @@ + @@ -936,7 +956,7 @@ - + @@ -966,7 +986,7 @@ - + @@ -989,7 +1009,7 @@ - + @@ -1328,9 +1348,9 @@ - + - + @@ -1340,7 +1360,7 @@ - + @@ -1437,6 +1457,22 @@ + + + + + + + + + + + + + + + + @@ -1486,7 +1522,7 @@ - + @@ -1513,7 +1549,7 @@ - + @@ -1542,7 +1578,7 @@ - + @@ -1790,7 +1826,7 @@ - + @@ -1820,7 +1856,7 @@ - + @@ -1843,7 +1879,7 @@ - + @@ -2130,9 +2166,9 @@ - + - + @@ -2142,7 +2178,7 @@ - + @@ -2187,6 +2223,22 @@ + + + + + + + + + + + + + + + + @@ -2236,7 +2288,7 @@ - + @@ -2263,7 +2315,7 @@ - + @@ -2292,7 +2344,7 @@ - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/domainresource.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/domainresource.profile.xml index f34a82f9833..53025c1b05a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/domainresource.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/domainresource.profile.xml @@ -3,7 +3,7 @@ - + @@ -144,7 +144,7 @@ - + @@ -153,6 +153,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/duration.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/duration.profile.xml index 4081fc94122..7c70d8de8d4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/duration.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/duration.profile.xml @@ -25,7 +25,7 @@ - + @@ -37,7 +37,6 @@ - diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/element.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/element.profile.xml index 03d2df48f64..eecd30fe4c1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/element.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/element.profile.xml @@ -93,15 +93,16 @@ - - + + - + + @@ -109,9 +110,6 @@ - - - @@ -163,9 +161,6 @@ - - - diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/elementdefinition.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/elementdefinition.profile.xml index 37d083f2e42..9cb4875cd23 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/elementdefinition.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/elementdefinition.profile.xml @@ -1126,8 +1126,8 @@ - - + + @@ -1150,6 +1150,7 @@ + @@ -1164,7 +1165,7 @@ - + @@ -1727,6 +1728,9 @@ + + + @@ -2433,7 +2437,7 @@ - + @@ -2897,6 +2901,9 @@ + + + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/eligibilityrequest.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/eligibilityrequest.profile.xml index 8cf45cf8357..fcae78369d3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/eligibilityrequest.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/eligibilityrequest.profile.xml @@ -3,7 +3,7 @@ - + @@ -204,7 +204,7 @@ - + @@ -218,6 +218,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/eligibilityresponse.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/eligibilityresponse.profile.xml index 29bf11e2f4a..80cd995f97d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/eligibilityresponse.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/eligibilityresponse.profile.xml @@ -3,7 +3,7 @@ - + @@ -262,7 +262,7 @@ - + @@ -276,6 +276,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/encounter.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/encounter.profile.xml index c6648bb338c..6b46a17fe72 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/encounter.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/encounter.profile.xml @@ -3,7 +3,7 @@ - + @@ -208,9 +208,7 @@ . . . - episodeOfCare + episodeOfCare @@ -394,8 +392,7 @@ The association is recorded on the encounter as these are typically created afte . . . - indication + indication @@ -774,7 +771,7 @@ The indication will typically be a Condition (with other resources referenced in - + @@ -793,6 +790,7 @@ The indication will typically be a Condition (with other resources referenced in + @@ -1159,9 +1157,7 @@ The indication will typically be a Condition (with other resources referenced in - + @@ -1360,8 +1356,7 @@ The association is recorded on the encounter as these are typically created afte - + @@ -1375,7 +1370,8 @@ The association is recorded on the encounter as these are typically created afte - + + @@ -1405,8 +1401,7 @@ The association is recorded on the encounter as these are typically created afte - + @@ -1420,8 +1415,7 @@ The association is recorded on the encounter as these are typically created afte - + @@ -2104,9 +2098,7 @@ The indication will typically be a Condition (with other resources referenced in - + @@ -2253,8 +2245,7 @@ The association is recorded on the encounter as these are typically created afte - + @@ -2268,7 +2259,8 @@ The association is recorded on the encounter as these are typically created afte - + + @@ -2298,8 +2290,7 @@ The association is recorded on the encounter as these are typically created afte - + @@ -2313,8 +2304,7 @@ The association is recorded on the encounter as these are typically created afte - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/enrollmentrequest.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/enrollmentrequest.profile.xml index 8a2c4394d49..e67de8a0871 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/enrollmentrequest.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/enrollmentrequest.profile.xml @@ -3,7 +3,7 @@ - + @@ -262,7 +262,7 @@ - + @@ -276,6 +276,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/enrollmentresponse.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/enrollmentresponse.profile.xml index 7d0fe0478a1..f4273c2c003 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/enrollmentresponse.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/enrollmentresponse.profile.xml @@ -3,7 +3,7 @@ - + @@ -262,7 +262,7 @@ - + @@ -276,6 +276,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/episodeofcare.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/episodeofcare.profile.xml index 0551fb6df6b..813f4219db8 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/episodeofcare.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/episodeofcare.profile.xml @@ -3,7 +3,7 @@ - + @@ -352,7 +352,7 @@ - + @@ -366,6 +366,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/explanationofbenefit.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/explanationofbenefit.profile.xml index a36141c7fea..27e053e5eb1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/explanationofbenefit.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/explanationofbenefit.profile.xml @@ -3,7 +3,7 @@ - + @@ -262,7 +262,7 @@ - + @@ -276,6 +276,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/extension.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/extension.profile.xml index a595a331675..893886b5d9d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/extension.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/extension.profile.xml @@ -88,8 +88,8 @@ - - + + @@ -98,11 +98,11 @@ + - @@ -178,7 +178,6 @@ - diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/familymemberhistory.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/familymemberhistory.profile.xml index a47f8dd54fa..436887cfcac 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/familymemberhistory.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/familymemberhistory.profile.xml @@ -3,7 +3,7 @@ - + @@ -250,7 +250,7 @@ . . . - . ageAge + . ageQuantity @@ -327,7 +327,7 @@ . . . - . deceasedAge + . deceasedQuantity @@ -472,7 +472,7 @@ . . . - . onsetAge + . onsetQuantity @@ -555,7 +555,7 @@ - + @@ -574,6 +574,7 @@ + @@ -868,7 +869,8 @@ - + + @@ -892,7 +894,8 @@ - + + @@ -1027,7 +1030,8 @@ For age, you'd hang an observation off the role"/> - + + @@ -1233,7 +1237,8 @@ Use originalText for string"/> - + + @@ -1257,7 +1262,8 @@ Use originalText for string"/> - + + @@ -1340,7 +1346,8 @@ For age, you'd hang an observation off the role"/> - + + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/flag.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/flag.profile.xml index 832f93751a0..9158984a6f8 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/flag.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/flag.profile.xml @@ -3,7 +3,7 @@ - + @@ -223,7 +223,7 @@ - + @@ -237,6 +237,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/goal.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/goal.profile.xml index e01f1c2422d..6ce7e8eb35b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/goal.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/goal.profile.xml @@ -3,7 +3,7 @@ - + @@ -325,7 +325,7 @@ - + @@ -344,6 +344,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/group.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/group.profile.xml index 48b45b9d12e..2e4ef4b8d78 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/group.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/group.profile.xml @@ -3,7 +3,7 @@ - + @@ -411,7 +411,7 @@ - + @@ -425,6 +425,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/healthcareservice.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/healthcareservice.profile.xml index b60c58dece7..32f6e3d1df1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/healthcareservice.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/healthcareservice.profile.xml @@ -3,7 +3,7 @@ - + @@ -592,7 +592,7 @@ - + @@ -606,6 +606,7 @@ + @@ -802,6 +803,9 @@ + + + @@ -1322,6 +1326,9 @@ + + + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/humanname.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/humanname.profile.xml index d2bfb80b263..6360ef17825 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/humanname.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/humanname.profile.xml @@ -189,8 +189,8 @@ - - + + @@ -209,12 +209,12 @@ + - @@ -438,7 +438,6 @@ - diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/id.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/id.profile.xml index 372fb503e86..21ca5ce3971 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/id.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/id.profile.xml @@ -16,9 +16,10 @@ - + + @@ -56,6 +57,11 @@ + + + @@ -68,9 +74,6 @@ - - - @@ -85,6 +88,11 @@ + + + @@ -92,9 +100,6 @@ - - - \ No newline at end of file diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/identifier.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/identifier.profile.xml index b414c656a97..1c3dd402612 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/identifier.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/identifier.profile.xml @@ -175,8 +175,8 @@ - - + + @@ -195,12 +195,12 @@ + - @@ -408,7 +408,6 @@ - diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/imagingobjectselection.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/imagingobjectselection.profile.xml index 6754736e2ce..01c05e662a8 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/imagingobjectselection.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/imagingobjectselection.profile.xml @@ -3,7 +3,7 @@ - + @@ -35,7 +35,7 @@ . . - ImagingObjectSelection + ImagingObjectSelection @@ -468,8 +468,9 @@ - + + @@ -487,12 +488,12 @@ + - - + @@ -783,6 +784,9 @@ + + + @@ -892,6 +896,9 @@ + + + @@ -988,6 +995,9 @@ + + + @@ -1101,6 +1111,9 @@ + + + @@ -1194,8 +1207,7 @@ - - + @@ -1368,6 +1380,9 @@ + + + @@ -1425,6 +1440,9 @@ + + + @@ -1469,6 +1487,9 @@ + + + @@ -1530,6 +1551,9 @@ + + + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/imagingstudy.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/imagingstudy.profile.xml index 4aad635beab..099adefd042 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/imagingstudy.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/imagingstudy.profile.xml @@ -3,7 +3,7 @@ - + @@ -707,7 +707,7 @@ - + @@ -726,6 +726,7 @@ + @@ -937,7 +938,7 @@ - + @@ -1352,7 +1353,7 @@ - + @@ -1603,7 +1604,7 @@ - + @@ -1624,7 +1625,7 @@ - + @@ -1782,7 +1783,7 @@ - + @@ -2145,7 +2146,7 @@ - + @@ -2344,7 +2345,7 @@ - + @@ -2365,7 +2366,7 @@ - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/immunization.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/immunization.profile.xml index e86f4329322..32139e693f4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/immunization.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/immunization.profile.xml @@ -3,7 +3,7 @@ - + @@ -350,7 +350,7 @@ 0..1 - Quantity + SimpleQuantity Amount of vaccine administered @@ -698,7 +698,7 @@ - + @@ -722,6 +722,7 @@ + @@ -1261,6 +1262,7 @@ + @@ -2142,6 +2144,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/immunizationrecommendation.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/immunizationrecommendation.profile.xml index a4252714ac5..b51bbf38741 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/immunizationrecommendation.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/immunizationrecommendation.profile.xml @@ -3,7 +3,7 @@ - + @@ -409,7 +409,7 @@ - + @@ -428,6 +428,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/implementationguide.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/implementationguide.profile.xml index 7fb4909f13b..d0d65d6fe30 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/implementationguide.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/implementationguide.profile.xml @@ -3,7 +3,7 @@ - + @@ -844,8 +844,9 @@ - + + @@ -858,12 +859,12 @@ + - @@ -1812,7 +1813,6 @@ - diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/instant.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/instant.profile.xml index e9037cea587..a4e53b34d84 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/instant.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/instant.profile.xml @@ -16,10 +16,11 @@ - + + @@ -61,6 +62,10 @@ + + @@ -68,9 +73,6 @@ - - - @@ -85,6 +87,10 @@ + + @@ -92,9 +98,6 @@ - - - \ No newline at end of file diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/integer.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/integer.profile.xml index 729ce6beda0..7dcda3fd83a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/integer.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/integer.profile.xml @@ -16,10 +16,11 @@ - + + @@ -61,6 +62,11 @@ + + + @@ -68,9 +74,6 @@ - - - @@ -87,6 +90,11 @@ + + + @@ -94,9 +102,6 @@ - - - diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/list.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/list.profile.xml index 278b86e24f0..355818cbeb4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/list.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/list.profile.xml @@ -3,7 +3,7 @@ - + @@ -403,7 +403,7 @@ - + @@ -417,6 +417,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/location.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/location.profile.xml index 6d8a5cfcf7c..c921861d329 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/location.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/location.profile.xml @@ -3,7 +3,7 @@ - + @@ -345,7 +345,7 @@ - + @@ -359,6 +359,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/markdown.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/markdown.profile.xml index 973b14ab987..4127c553903 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/markdown.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/markdown.profile.xml @@ -16,9 +16,10 @@ - + + @@ -56,6 +57,10 @@ + + @@ -68,9 +73,6 @@ - - - @@ -85,6 +87,10 @@ + + @@ -92,9 +98,6 @@ - - - \ No newline at end of file diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/media.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/media.profile.xml index 36591ff8922..b68511d922a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/media.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/media.profile.xml @@ -3,7 +3,7 @@ - + @@ -313,7 +313,7 @@ - + @@ -332,6 +332,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medication.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medication.profile.xml index fc95bec9226..1db888f6db8 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medication.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medication.profile.xml @@ -3,7 +3,7 @@ - + @@ -46,30 +46,12 @@ Definition of a Medication - - - . - . - . - name - - - - Σ - - 0..1 - - string - - Common / Commercial name - - . . . - code + code @@ -91,7 +73,7 @@ . . . - isBrand + isBrand @@ -166,7 +148,7 @@ . . . - form + form @@ -373,7 +355,7 @@ 0..1 - Quantity + SimpleQuantity How many are in the package? @@ -400,7 +382,7 @@ - + @@ -419,6 +401,7 @@ + @@ -556,29 +539,10 @@ - - - - - - - - - - - - - - - - - - - - + @@ -608,7 +572,7 @@ - + @@ -667,8 +631,7 @@ - + @@ -741,7 +704,7 @@ - + @@ -842,8 +805,7 @@ - + @@ -861,8 +823,7 @@ if medication: RXO-1-Requested Give Code / RXE-2-Give Code / RXD-2-Dispense/Give - + @@ -1115,6 +1076,7 @@ if medication: RXO-2-Requested Give Amount - Minimum & RXO-4-Requested Give + @@ -1141,29 +1103,10 @@ if medication: RXO-2-Requested Give Amount - Minimum & RXO-4-Requested Give - - - - - - - - - - - - - - - - - - - - + @@ -1193,7 +1136,7 @@ if medication: RXO-2-Requested Give Amount - Minimum & RXO-4-Requested Give - + @@ -1252,8 +1195,7 @@ if medication: RXO-2-Requested Give Amount - Minimum & RXO-4-Requested Give - + @@ -1274,7 +1216,7 @@ if medication: RXO-2-Requested Give Amount - Minimum & RXO-4-Requested Give - + @@ -1323,8 +1265,7 @@ if medication: RXO-2-Requested Give Amount - Minimum & RXO-4-Requested Give - + @@ -1342,8 +1283,7 @@ if medication: RXO-1-Requested Give Code / RXE-2-Give Code / RXD-2-Dispense/Give - + @@ -1440,6 +1380,7 @@ if medication: RXO-2-Requested Give Amount - Minimum & RXO-4-Requested Give + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medicationadministration.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medicationadministration.profile.xml index 837d37e2e7a..dfc424be72f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medicationadministration.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medicationadministration.profile.xml @@ -3,7 +3,7 @@ - + @@ -156,7 +156,7 @@ 0..1 - MedicationPrescription + MedicationOrder Order administration performed against @@ -485,7 +485,7 @@ 0..1 - Quantity + SimpleQuantity Amount administered in one dose @@ -495,18 +495,50 @@ . . . - . - rate - + . + rate[x] + Σ 0..1 + + Dose quantity per unit of time + + + + + . + . + . + . + . + rateRatio + + + Ratio - Dose quantity per unit of time + + + + + + . + . + . + . + . + rateRange + + + + + Range + + @@ -531,7 +563,7 @@ - + @@ -550,6 +582,7 @@ + @@ -822,7 +855,7 @@ - + @@ -1160,6 +1193,7 @@ + @@ -1172,7 +1206,7 @@ - + @@ -1180,6 +1214,9 @@ + + + @@ -1345,7 +1382,7 @@ - + @@ -1631,6 +1668,7 @@ + @@ -1643,7 +1681,7 @@ - + @@ -1651,6 +1689,9 @@ + + + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medicationdispense.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medicationdispense.profile.xml index f6e2279b089..4f083f8ccab 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medicationdispense.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medicationdispense.profile.xml @@ -3,7 +3,7 @@ - + @@ -142,7 +142,7 @@ 0..* - MedicationPrescription + MedicationOrder Medication order that authorizes the dispense @@ -182,7 +182,7 @@ 0..1 - Quantity + SimpleQuantity Amount dispensed @@ -200,7 +200,7 @@ 0..1 - Quantity + SimpleQuantity Days Supply @@ -404,66 +404,18 @@ . . . - . - schedule[x] - + . + timing + Σ 0..1 - - When medication should be administered - - - - - . - . - . - . - . - scheduleDateTime - - - - - dateTime - - - - - - - . - . - . - . - . - schedulePeriod - - - - - Period - - - - - - - . - . - . - . - . scheduleTiming - - - Timing - + When medication should be administered @@ -569,9 +521,7 @@ . . . - method + method @@ -628,13 +578,12 @@ Terminologies used often pre-coordinate this term with the route and or form of . . . - . - doseQuantity + . doseQuantity - Quantity + SimpleQuantity @@ -644,18 +593,50 @@ Terminologies used often pre-coordinate this term with the route and or form of . . . - . - rate - + . + rate[x] + Σ 0..1 + + Amount of medication per unit of time + + + + + . + . + . + . + . + rateRatio + + + Ratio - Amount of medication per unit of time + + + + + + . + . + . + . + . + rateRange + + + + + Range + + @@ -782,7 +763,7 @@ Terminologies used often pre-coordinate this term with the route and or form of - + @@ -801,6 +782,7 @@ Terminologies used often pre-coordinate this term with the route and or form of + @@ -1051,7 +1033,7 @@ Terminologies used often pre-coordinate this term with the route and or form of - + @@ -1097,6 +1079,7 @@ Terminologies used often pre-coordinate this term with the route and or form of + @@ -1116,6 +1099,7 @@ Terminologies used often pre-coordinate this term with the route and or form of + @@ -1322,17 +1306,11 @@ Terminologies used often pre-coordinate this term with the route and or form of - + - - - - - - @@ -1365,9 +1343,7 @@ Terminologies used often pre-coordinate this term with the route and or form of - + @@ -1425,9 +1401,7 @@ CodeableConcept: .outboundRelationship[typCode=PRCN].target[classCode=OBS, moodC - + @@ -1461,6 +1435,7 @@ Terminologies used often pre-coordinate this term with the route and or form of + @@ -1473,7 +1448,7 @@ Terminologies used often pre-coordinate this term with the route and or form of - + @@ -1481,6 +1456,9 @@ Terminologies used often pre-coordinate this term with the route and or form of + + + @@ -1771,7 +1749,7 @@ Terminologies used often pre-coordinate this term with the route and or form of - + @@ -1817,6 +1795,7 @@ Terminologies used often pre-coordinate this term with the route and or form of + @@ -1836,6 +1815,7 @@ Terminologies used often pre-coordinate this term with the route and or form of + @@ -1990,17 +1970,11 @@ Terminologies used often pre-coordinate this term with the route and or form of - + - - - - - - @@ -2033,9 +2007,7 @@ Terminologies used often pre-coordinate this term with the route and or form of - + @@ -2093,9 +2065,7 @@ CodeableConcept: .outboundRelationship[typCode=PRCN].target[classCode=OBS, moodC - + @@ -2129,6 +2099,7 @@ Terminologies used often pre-coordinate this term with the route and or form of + @@ -2141,7 +2112,7 @@ Terminologies used often pre-coordinate this term with the route and or form of - + @@ -2149,6 +2120,9 @@ Terminologies used often pre-coordinate this term with the route and or form of + + + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medicationorder.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medicationorder.profile.xml new file mode 100644 index 00000000000..440c4f4cd37 --- /dev/null +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medicationorder.profile.xml @@ -0,0 +1,2505 @@ + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Name + + Flags + + Card. + + Type + + Description & Constraints + + + doco + + +
+ . + . + MedicationOrder + + + Σ + + + DomainResource + Prescription of medication to for patient
+ . + . + . + identifier + + + Σ + 0..* + Identifier + External identifier
+ . + . + . + dateWritten + + + Σ + 0..1 + dateTime + When prescription was authorized
+ . + . + . + status + + + ?! + Σ + 0..1 + code + active | on-hold | completed | entered-in-error | stopped | superseded | draft +
+ MedicationOrderStatus ( + Required) +
+ . + . + . + dateEnded + + + Σ + 0..1 + dateTime + When prescription was stopped
+ . + . + . + reasonEnded + + + Σ + 0..1 + CodeableConcept + Why prescription was stopped
+ . + . + . + patient + + + Σ + 0..1 + Patient + Who prescription is for
+ . + . + . + prescriber + + + Σ + 0..1 + Practitioner + Who ordered the medication(s)
+ . + . + . + encounter + + + Σ + 0..1 + Encounter + Created during encounter / admission / stay
+ . + . + . + reason[x] + + + Σ + 0..1Reason or indication for writing the prescription
+ . + . + . + . + reasonCodeableConcept + + + CodeableConcept + +
+ . + . + . + . reasonReference + + + Condition + +
+ . + . + . + note + + + Σ + 0..1 + string + Information about the prescription
+ . + . + . + medication[x] + + + Σ + 1..1Medication to be taken
+ . + . + . + . + medicationCodeableConcept + + + CodeableConcept + +
+ . + . + . + . medicationReference + + + Medication + +
+ . + . + . + dosageInstruction + + + Σ + 0..* + Element + How medication should be taken
+ . + . + . + . + text + + + Σ + 0..1 + string + Dosage instructions expressed as text
+ . + . + . + . + additionalInstructions + + + Σ + 0..1 + CodeableConcept + Supplemental instructions - e.g. "with meals"
+ . + . + . + . + timing + + + Σ + 0..1 + Timing + When medication should be administered
+ . + . + . + . + asNeeded[x] + + + Σ + 0..1Take "as needed" (for x)
+ . + . + . + . + . + asNeededBoolean + + + boolean + +
+ . + . + . + . + . + asNeededCodeableConcept + + + CodeableConcept + +
+ . + . + . + . + site + + + Σ + 0..1 + CodeableConcept + Body site to administer to +
+ SNOMED CT Anatomical Structure for Administration Site Codes ( + Example) +
+ . + . + . + . + route + + + Σ + 0..1 + CodeableConcept + How drug should enter body +
+ SNOMED CT Route Codes ( + Example) +
+ . + . + . + . + method + + + Σ + 0..1 + CodeableConcept + Technique for administering medication +
+ SNOMED CT Introduction (procedure) for Administration Method Codes ( + Example) +
+ . + . + . + . + dose[x] + + + Σ + 0..1Amount of medication per dose
+ . + . + . + . + . + doseRange + + + Range + +
+ . + . + . + . + . doseQuantity + + + SimpleQuantity + +
+ . + . + . + . + rate[x] + + + Σ + 0..1Amount of medication per unit of time
+ . + . + . + . + . + rateRatio + + + Ratio + +
+ . + . + . + . + . + rateRange + + + Range + +
+ . + . + . + . + maxDosePerPeriod + + + Σ + 0..1 + Ratio + Upper limit on medication per unit of time
+ . + . + . + dispense + + + Σ + 0..1 + Element + Medication supply authorization
+ . + . + . + . + medication[x] + + + Σ + 0..1Product to be supplied
+ . + . + . + . + . + medicationCodeableConcept + + + CodeableConcept + +
+ . + . + . + . + . medicationReference + + + Medication + +
+ . + . + . + . + validityPeriod + + + Σ + 0..1 + Period + Time period supply is authorized for
+ . + . + . + . + numberOfRepeatsAllowed + + + Σ + 0..1 + positiveInt + # of refills authorized
+ . + . + . + . + quantity + + + Σ + 0..1 + SimpleQuantity + Amount of medication to supply per dispense
+ . + . + . + . + expectedSupplyDuration + + + Σ + 0..1 + Duration + Days supply per dispense
+ . + . + . + substitution + + + Σ + 0..1 + Element + Any restrictions on medication substitution?
+ . + . + . + . + type + + + Σ + 1..1 + CodeableConcept + generic | formulary + +
+ ActSubstanceAdminSubstitutionCode ( + Example) +
+ . + . + . + . + reason + + + Σ + 0..1 + CodeableConcept + Why should substitution (not) be made +
+ SubstanceAdminSubstitutionReason ( + Example) +
+ . + . + . + priorPrescription + + + Σ + 0..1 + MedicationOrder + An order/prescription that this supersedes
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medicationprescription.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medicationprescription.profile.xml index 97b81a1393b..1030c2b81f1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medicationprescription.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medicationprescription.profile.xml @@ -3,7 +3,7 @@ - + @@ -33,7 +33,7 @@ - . + . . MedicationPrescription @@ -50,9 +50,9 @@ - . - . - . + . + . + . identifier @@ -68,9 +68,9 @@ - . - . - . + . + . + . dateWritten @@ -86,9 +86,9 @@ - . - . - . + . + . + . status @@ -109,9 +109,9 @@ - . - . - . + . + . + . patient @@ -127,9 +127,9 @@ - . - . - . + . + . + . prescriber @@ -145,9 +145,9 @@ - . - . - . + . + . + . encounter @@ -163,9 +163,9 @@ - . - . - . + . + . + . reason[x] @@ -179,10 +179,10 @@ - . - . - . - . + . + . + . + . reasonCodeableConcept @@ -195,10 +195,10 @@ - . - . - . - . reasonReference + . + . + . + . reasonReference @@ -210,9 +210,9 @@ - . - . - . + . + . + . note @@ -228,9 +228,9 @@ - . - . - . + . + . + . medication[x] @@ -244,10 +244,10 @@ - . - . - . - . + . + . + . + . medicationCodeableConcept @@ -260,10 +260,10 @@ - . - . - . - . medicationReference + . + . + . + . medicationReference @@ -275,9 +275,9 @@ - . - . - . + . + . + . dosageInstruction @@ -293,10 +293,10 @@ - . - . - . - . + . + . + . + . text @@ -312,10 +312,10 @@ - . - . - . - . + . + . + . + . additionalInstructions @@ -331,10 +331,10 @@ - . - . - . - . + . + . + . + . scheduled[x] @@ -348,11 +348,11 @@ - . - . - . - . - . + . + . + . + . + . scheduledDateTime @@ -365,11 +365,11 @@ - . - . - . - . - . + . + . + . + . + . scheduledPeriod @@ -382,11 +382,11 @@ - . - . - . - . - . scheduledTiming + . + . + . + . + . scheduledTiming @@ -398,10 +398,10 @@ - . - . - . - . + . + . + . + . asNeeded[x] @@ -415,11 +415,11 @@ - . - . - . - . - . + . + . + . + . + . asNeededBoolean @@ -432,11 +432,11 @@ - . - . - . - . - . + . + . + . + . + . asNeededCodeableConcept @@ -449,10 +449,10 @@ - . - . - . - . + . + . + . + . site @@ -472,10 +472,10 @@ - . - . - . - . + . + . + . + . route @@ -495,10 +495,10 @@ - . - . - . - . + . + . + . + . method @@ -520,10 +520,10 @@ Terminologies used often pre-coordinate this term with the route and or form of - . - . - . - . + . + . + . + . dose[x] @@ -537,11 +537,11 @@ Terminologies used often pre-coordinate this term with the route and or form of - . - . - . - . - . + . + . + . + . + . doseRange @@ -554,11 +554,11 @@ Terminologies used often pre-coordinate this term with the route and or form of - . - . - . - . - . + . + . + . + . + . doseQuantity @@ -571,10 +571,10 @@ Terminologies used often pre-coordinate this term with the route and or form of - . - . - . - . + . + . + . + . rate @@ -590,10 +590,10 @@ Terminologies used often pre-coordinate this term with the route and or form of - . - . - . - . + . + . + . + . maxDosePerPeriod @@ -609,9 +609,9 @@ Terminologies used often pre-coordinate this term with the route and or form of - . - . - . + . + . + . dispense @@ -627,10 +627,10 @@ Terminologies used often pre-coordinate this term with the route and or form of - . - . - . - . + . + . + . + . medication[x] @@ -644,11 +644,11 @@ Terminologies used often pre-coordinate this term with the route and or form of - . - . - . - . - . + . + . + . + . + . medicationCodeableConcept @@ -661,11 +661,11 @@ Terminologies used often pre-coordinate this term with the route and or form of - . - . - . - . - . medicationReference + . + . + . + . + . medicationReference @@ -677,10 +677,10 @@ Terminologies used often pre-coordinate this term with the route and or form of - . - . - . - . + . + . + . + . validityPeriod @@ -698,10 +698,10 @@ Rationale: Indicates when the Prescription becomes valid, and when it ceases to - . - . - . - . + . + . + . + . numberOfRepeatsAllowed @@ -718,10 +718,10 @@ UsageNotes: For example, the number of times the prescribed quantity is to be su - . - . - . - . + . + . + . + . quantity @@ -737,10 +737,10 @@ UsageNotes: For example, the number of times the prescribed quantity is to be su - . - . - . - . + . + . + . + . expectedSupplyDuration @@ -757,9 +757,9 @@ In some situations, this attribute may be used instead of quantity to identify t - . - . - . + . + . + . substitution @@ -775,10 +775,10 @@ In some situations, this attribute may be used instead of quantity to identify t - . - . - . - . + . + . + . + . type @@ -798,10 +798,10 @@ In some situations, this attribute may be used instead of quantity to identify t - . - . - . - . + . + . + . + . reason @@ -841,7 +841,7 @@ In some situations, this attribute may be used instead of quantity to identify t - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medicationstatement.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medicationstatement.profile.xml index 69d06a1dec9..5608dd9ae81 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medicationstatement.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/medicationstatement.profile.xml @@ -3,7 +3,7 @@ - + @@ -77,7 +77,7 @@ Σ - 0..1 + 1..1 Patient @@ -396,8 +396,8 @@ . . . - schedule - + timing + Σ @@ -543,7 +543,7 @@ 0..1 - Quantity + SimpleQuantity Amount administered in one dose @@ -553,18 +553,50 @@ . . . - . - rate - + . + rate[x] + Σ 0..1 + + Dose quantity per unit of time + + + + + . + . + . + . + . + rateRatio + + + Ratio - Dose quantity per unit of time + + + + + + . + . + . + . + . + rateRange + + + + + Range + + @@ -608,7 +640,7 @@ - + @@ -627,6 +659,7 @@ + @@ -792,7 +825,7 @@ - + @@ -1083,7 +1116,7 @@ - + @@ -1209,6 +1242,7 @@ + @@ -1221,7 +1255,7 @@ - + @@ -1229,6 +1263,9 @@ + + + @@ -1306,7 +1343,7 @@ - + @@ -1545,7 +1582,7 @@ - + @@ -1671,6 +1708,7 @@ + @@ -1683,7 +1721,7 @@ - + @@ -1691,6 +1729,9 @@ + + + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/messageheader.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/messageheader.profile.xml index 5ce5b5c6962..c9018104437 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/messageheader.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/messageheader.profile.xml @@ -3,7 +3,7 @@ - + @@ -512,8 +512,9 @@ - + + @@ -531,12 +532,12 @@ + - @@ -892,6 +893,9 @@ + + + @@ -1061,6 +1065,9 @@ + + + @@ -1351,7 +1358,6 @@ PRT-8-Participation Organization:PRT-4-Participation='OP' - @@ -1537,6 +1543,9 @@ PRT-8-Participation Organization:PRT-4-Participation='OP' + + + @@ -1654,6 +1663,9 @@ PRT-8-Participation Organization:PRT-4-Participation='OP' + + + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/meta.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/meta.profile.xml index 31fb0c818fb..cb5a228cf51 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/meta.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/meta.profile.xml @@ -114,7 +114,11 @@ Coding - Security Labels applied to this resource + Security Labels applied to this resource +
+ All Security Labels ( + Extensible) + @@ -148,8 +152,8 @@ - - + + @@ -157,6 +161,7 @@ + @@ -243,6 +248,13 @@ + + + + + + + @@ -311,6 +323,13 @@ + + + + + + + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/money.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/money.profile.xml index d41587982eb..a7218f9bade 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/money.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/money.profile.xml @@ -6,7 +6,7 @@

Data type Money

-

An amount of money. With regard to precision, see [[X]]

+

An amount of money. With regard to precision, see [Decimal Precision](datatypes.html#precision)

Rule

There SHALL be a code if there is a value and it SHALL be an expression of currency. If system is present, it SHALL be ISO 4217 (system = "urn:iso:std:iso:4217" - currency).

XPath:

@@ -25,8 +25,8 @@ - - + + @@ -35,9 +35,8 @@ - + - @@ -251,7 +250,7 @@ - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/namingsystem.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/namingsystem.profile.xml index 8e12f84cb16..e624d569f8f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/namingsystem.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/namingsystem.profile.xml @@ -3,7 +3,7 @@ - + @@ -423,7 +423,7 @@ - + @@ -442,6 +442,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/narrative.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/narrative.profile.xml index 6bb61802838..0db0d8ef017 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/narrative.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/narrative.profile.xml @@ -101,8 +101,8 @@ - - + + @@ -110,6 +110,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/nutritionorder.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/nutritionorder.profile.xml index 037efd67e26..6a1277e3efb 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/nutritionorder.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/nutritionorder.profile.xml @@ -3,7 +3,7 @@ - + @@ -326,7 +326,7 @@ 0..1 - Quantity + SimpleQuantity Quantity of the specified nutrient @@ -519,7 +519,7 @@ 0..1 - Quantity + SimpleQuantity Amount of the nutritional supplement @@ -651,7 +651,7 @@ 0..1 - Quantity + SimpleQuantity Amount of energy per specified volume that is required @@ -725,7 +725,7 @@ 0..1 - Quantity + SimpleQuantity The volume of formula to provide @@ -753,13 +753,12 @@ . . . - . - rateQuantity + . rateQuantity - Quantity + SimpleQuantity @@ -794,7 +793,7 @@ 0..1 - Quantity + SimpleQuantity Upper limit on formula volume per unit of time @@ -840,7 +839,7 @@ - + @@ -859,6 +858,7 @@ + @@ -1431,6 +1431,7 @@ + @@ -1741,6 +1742,7 @@ + @@ -1933,6 +1935,7 @@ + @@ -2062,6 +2065,7 @@ + @@ -2080,6 +2084,7 @@ + @@ -2101,6 +2106,7 @@ + @@ -2481,6 +2487,7 @@ + @@ -2687,6 +2694,7 @@ + @@ -2827,6 +2835,7 @@ + @@ -2904,6 +2913,7 @@ + @@ -2922,6 +2932,7 @@ + @@ -2943,6 +2954,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/observation.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/observation.profile.xml index d8466fcc930..64fa6d0e8d5 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/observation.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/observation.profile.xml @@ -3,7 +3,7 @@ - + @@ -600,7 +600,7 @@ 0..1 - Quantity + SimpleQuantity Low Range, if relevant
@@ -622,7 +622,7 @@ 0..1 - Quantity + SimpleQuantity High Range, if relevant
@@ -1033,8 +1033,9 @@ - + + @@ -1052,12 +1053,12 @@ + - @@ -1071,7 +1072,7 @@ - + @@ -1769,6 +1770,7 @@ + @@ -1795,6 +1797,7 @@ + @@ -2180,7 +2183,6 @@ - @@ -2194,7 +2196,7 @@ - + @@ -2722,6 +2724,7 @@ + @@ -2748,6 +2751,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/oid.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/oid.profile.xml index eea4bf22925..f30b0ad1833 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/oid.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/oid.profile.xml @@ -16,9 +16,10 @@ - + + @@ -56,6 +57,11 @@ + + + @@ -68,9 +74,6 @@ - - - @@ -85,6 +88,11 @@ + + + @@ -92,9 +100,6 @@ - - - \ No newline at end of file diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/operationdefinition.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/operationdefinition.profile.xml index 1989c491cd6..3d8b54f0e7e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/operationdefinition.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/operationdefinition.profile.xml @@ -3,7 +3,7 @@ - + @@ -671,7 +671,7 @@ - + @@ -685,6 +685,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/operationoutcome.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/operationoutcome.profile.xml index 78883173cfb..396dd43c429 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/operationoutcome.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/operationoutcome.profile.xml @@ -3,7 +3,7 @@ - + @@ -196,7 +196,7 @@ - + @@ -215,6 +215,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/order.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/order.profile.xml index ec8ee105a41..f6cc05b1daf 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/order.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/order.profile.xml @@ -3,7 +3,7 @@ - + @@ -293,7 +293,7 @@ - + @@ -312,6 +312,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/orderresponse.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/orderresponse.profile.xml index 3cd81a6b96e..a30ef82d251 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/orderresponse.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/orderresponse.profile.xml @@ -3,7 +3,7 @@ - + @@ -203,7 +203,7 @@ - + @@ -222,6 +222,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/organization.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/organization.profile.xml index 4d4a5d375a1..6963757efa4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/organization.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/organization.profile.xml @@ -3,7 +3,7 @@ - + @@ -300,7 +300,7 @@ - + @@ -324,6 +324,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/parameters.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/parameters.profile.xml index ed3685e1029..3ad2f2b546d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/parameters.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/parameters.profile.xml @@ -3,7 +3,7 @@ - + @@ -169,7 +169,7 @@ - + @@ -183,6 +183,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/patient.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/patient.profile.xml index 4be4d3279a3..221a85f9cf0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/patient.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/patient.profile.xml @@ -3,7 +3,7 @@ - + @@ -717,8 +717,9 @@ - + + @@ -746,12 +747,12 @@ + - @@ -1182,6 +1183,9 @@ + + + @@ -1428,6 +1432,9 @@ + + + @@ -1882,7 +1889,6 @@ - @@ -2195,6 +2201,9 @@ + + + @@ -2389,6 +2398,9 @@ + + + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/paymentnotice.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/paymentnotice.profile.xml index 7940fbfc11d..d94cbe6ac04 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/paymentnotice.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/paymentnotice.profile.xml @@ -3,7 +3,7 @@ - + @@ -262,7 +262,7 @@ - + @@ -276,6 +276,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/paymentreconciliation.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/paymentreconciliation.profile.xml index ac8ceb359a3..7b477e9c0bc 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/paymentreconciliation.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/paymentreconciliation.profile.xml @@ -3,7 +3,7 @@ - + @@ -535,7 +535,7 @@ - + @@ -549,6 +549,7 @@ + @@ -835,6 +836,9 @@ + + + @@ -978,7 +982,8 @@ - + + @@ -1011,11 +1016,15 @@ - + + + + + @@ -1277,6 +1286,9 @@ + + + @@ -1368,7 +1380,8 @@ - + + @@ -1401,11 +1414,15 @@ - + + + + + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/period.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/period.profile.xml index 9ad7083b00e..0540c25b6f8 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/period.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/period.profile.xml @@ -100,8 +100,8 @@ - - + + @@ -114,6 +114,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/person.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/person.profile.xml index e8983fa2c40..11af72cc6e4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/person.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/person.profile.xml @@ -3,7 +3,7 @@ - + @@ -286,8 +286,9 @@ - + + @@ -305,12 +306,12 @@ + - @@ -745,7 +746,6 @@ - diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/positiveint.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/positiveint.profile.xml index 01e25096334..16f8d02b518 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/positiveint.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/positiveint.profile.xml @@ -16,9 +16,10 @@ - + + @@ -55,6 +56,11 @@ + + + @@ -67,9 +73,6 @@ - - - @@ -83,6 +86,11 @@ + + + @@ -90,9 +98,6 @@ - - - \ No newline at end of file diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/practitioner.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/practitioner.profile.xml index 7f8361df6f5..9a21d44e14e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/practitioner.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/practitioner.profile.xml @@ -3,7 +3,7 @@ - + @@ -436,8 +436,9 @@ - + + @@ -460,12 +461,12 @@ + - @@ -1164,7 +1165,6 @@ - diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/procedure.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/procedure.profile.xml index 3b017df6e6e..53ae925e5df 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/procedure.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/procedure.profile.xml @@ -3,7 +3,7 @@ - + @@ -510,7 +510,7 @@ ImmunizationRecommendation | MedicationAdministration | MedicationDispense | - MedicationPrescription | + MedicationOrder | MedicationStatement | Observation | Procedure @@ -631,7 +631,7 @@ - + @@ -645,6 +645,7 @@ + @@ -1352,7 +1353,7 @@ - + @@ -1926,7 +1927,7 @@ - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/procedurerequest.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/procedurerequest.profile.xml index 8de4b13272f..4af61e48c88 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/procedurerequest.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/procedurerequest.profile.xml @@ -3,7 +3,7 @@ - + @@ -462,7 +462,7 @@ - + @@ -481,6 +481,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/processrequest.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/processrequest.profile.xml index d11883d2dea..382464150e8 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/processrequest.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/processrequest.profile.xml @@ -3,7 +3,7 @@ - + @@ -389,7 +389,7 @@ - + @@ -403,6 +403,7 @@ + @@ -698,6 +699,9 @@ + + + @@ -979,6 +983,9 @@ + + + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/processresponse.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/processresponse.profile.xml index cc1be68f5d8..f49427d38f8 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/processresponse.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/processresponse.profile.xml @@ -3,7 +3,7 @@ - + @@ -366,7 +366,7 @@ - + @@ -380,6 +380,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/provenance.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/provenance.profile.xml index 40989fd2a10..37f91047ec6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/provenance.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/provenance.profile.xml @@ -3,7 +3,7 @@ - + @@ -413,7 +413,7 @@ - + @@ -423,10 +423,10 @@ - + - + @@ -440,6 +440,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/quantity.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/quantity.profile.xml index 84495ca0fda..8ad3ba0468f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/quantity.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/quantity.profile.xml @@ -158,8 +158,8 @@ - - + + @@ -173,12 +173,12 @@ + - @@ -347,7 +347,6 @@ - diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/questionnaire.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/questionnaire.profile.xml index 36b89a4e0f0..ba855ea1da4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/questionnaire.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/questionnaire.profile.xml @@ -3,7 +3,7 @@ - + @@ -47,7 +47,7 @@ A structured set of questions
- If root group must be "required" + If root, group must be 'required'
The link ids for groups and questions must be unique within the questionnaire @@ -522,8 +522,9 @@ - + + @@ -536,12 +537,12 @@ + - @@ -553,8 +554,8 @@ - - + + @@ -838,6 +839,9 @@ + + + @@ -1020,6 +1024,9 @@ + + + @@ -1219,7 +1226,6 @@ - @@ -1231,8 +1237,8 @@ - - + + @@ -1398,6 +1404,9 @@ + + + @@ -1528,6 +1537,9 @@ + + + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/questionnaireresponse.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/questionnaireresponse.profile.xml index 808bbeb1f29..3eff6dc4f8a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/questionnaireresponse.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/questionnaireresponse.profile.xml @@ -3,7 +3,7 @@ - + @@ -685,8 +685,9 @@ - + + @@ -699,12 +700,12 @@ + - @@ -1040,6 +1041,9 @@ + + + @@ -1186,6 +1190,9 @@ + + + @@ -1416,7 +1423,6 @@ - @@ -1634,6 +1640,9 @@ + + + @@ -1728,6 +1737,9 @@ + + + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/range.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/range.profile.xml index a4d19717bdb..c501c1feccd 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/range.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/range.profile.xml @@ -46,8 +46,6 @@ Set of values bounded by low and high
If present, low SHALL have a lower value than high -
- Quantity values cannot have a comparator when used in a Range @@ -65,7 +63,7 @@ 0..1 - Quantity + SimpleQuantity Low limit @@ -84,7 +82,7 @@ 0..1 - Quantity + SimpleQuantity High limit @@ -102,8 +100,8 @@ - - + + @@ -117,12 +115,12 @@ + - @@ -134,12 +132,6 @@ - - - - - - @@ -189,9 +181,9 @@ + - @@ -210,9 +202,9 @@ + - @@ -229,7 +221,6 @@ - @@ -241,12 +232,6 @@ - - - - - - @@ -265,9 +250,9 @@ + - @@ -286,9 +271,9 @@ + - diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/ratio.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/ratio.profile.xml index 18266c42484..2ad77e9ce19 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/ratio.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/ratio.profile.xml @@ -98,8 +98,8 @@ - - + + @@ -113,12 +113,12 @@ + - @@ -207,7 +207,6 @@ - diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/reference.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/reference.profile.xml index 71db10af1f7..ab7cdfba7e3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/reference.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/reference.profile.xml @@ -99,8 +99,8 @@ - - + + @@ -108,6 +108,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/referralrequest.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/referralrequest.profile.xml index 345feb5fff3..59eaf100844 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/referralrequest.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/referralrequest.profile.xml @@ -3,7 +3,7 @@ - + @@ -338,7 +338,7 @@ - + @@ -352,6 +352,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/relatedperson.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/relatedperson.profile.xml index 5772197fc75..94a6dc0943a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/relatedperson.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/relatedperson.profile.xml @@ -3,7 +3,7 @@ - + @@ -191,7 +191,7 @@ Σ - 0..1 + 0..* Address @@ -252,8 +252,9 @@ - + + @@ -271,12 +272,12 @@ + - @@ -569,7 +570,7 @@ - + @@ -622,7 +623,6 @@ - @@ -797,7 +797,7 @@ - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/resource.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/resource.profile.xml index 561d0132fac..d24dc232e5f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/resource.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/resource.profile.xml @@ -3,7 +3,7 @@ - + @@ -138,7 +138,7 @@ - + @@ -147,6 +147,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/riskassessment.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/riskassessment.profile.xml index 0c0bc712a8b..621553d7dd9 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/riskassessment.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/riskassessment.profile.xml @@ -3,7 +3,7 @@ - + @@ -402,7 +402,7 @@ - + @@ -426,6 +426,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/sampleddata.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/sampleddata.profile.xml index 0503b7fa301..163a1b1d73f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/sampleddata.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/sampleddata.profile.xml @@ -58,7 +58,7 @@ 1..1 - Quantity + SimpleQuantity Zero value and units @@ -184,8 +184,8 @@ - - + + @@ -199,12 +199,12 @@ + - @@ -259,6 +259,7 @@ + @@ -363,7 +364,6 @@ - @@ -387,6 +387,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/schedule.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/schedule.profile.xml index 1f1e981bcd9..f62eb856ca9 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/schedule.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/schedule.profile.xml @@ -3,7 +3,7 @@ - + @@ -163,7 +163,7 @@ - + @@ -182,6 +182,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/searchparameter.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/searchparameter.profile.xml index 350e9217bf2..8f071697a76 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/searchparameter.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/searchparameter.profile.xml @@ -3,7 +3,7 @@ - + @@ -401,7 +401,7 @@ - + @@ -420,6 +420,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/signature.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/signature.profile.xml index 1833469f5ef..a20df7fb7a7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/signature.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/signature.profile.xml @@ -187,8 +187,8 @@ - - + + @@ -197,12 +197,12 @@ + - @@ -326,7 +326,6 @@ - diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/simplequantity.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/simplequantity.profile.xml new file mode 100644 index 00000000000..56d722eac53 --- /dev/null +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/simplequantity.profile.xml @@ -0,0 +1,274 @@ + + + + + + +
+

Data type SimpleQuantity

+

A fixed quantity (no comparator)

+

Rule

+

The comparator is not used on a SimpleQuantity

+

XPath:

+
+ 
not(exists(f:comparator))
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/slot.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/slot.profile.xml index 11165c22d4a..e3ba2c84d20 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/slot.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/slot.profile.xml @@ -3,7 +3,7 @@ - + @@ -214,7 +214,7 @@ - + @@ -233,6 +233,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/specimen.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/specimen.profile.xml index d467bf760a0..1c6a35b7455 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/specimen.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/specimen.profile.xml @@ -3,7 +3,7 @@ - + @@ -274,7 +274,7 @@ 0..1 - Quantity + SimpleQuantity The quantity of specimen collected @@ -477,7 +477,7 @@ 0..1 - Quantity + SimpleQuantity Container volume or size @@ -494,7 +494,7 @@ 0..1 - Quantity + SimpleQuantity Quantity of specimen within container @@ -573,7 +573,7 @@ - + @@ -592,6 +592,7 @@ + @@ -1015,6 +1016,7 @@ + @@ -1321,6 +1323,7 @@ + @@ -1339,6 +1342,7 @@ + @@ -1632,6 +1636,7 @@ + @@ -1834,6 +1839,7 @@ + @@ -1852,6 +1858,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/string.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/string.profile.xml index 947f538aac3..de1a5a149e7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/string.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/string.profile.xml @@ -16,10 +16,11 @@ - + + @@ -61,6 +62,10 @@ + + @@ -68,9 +73,6 @@ - - - @@ -86,6 +88,10 @@ + + @@ -93,9 +99,6 @@ - - - diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/structuredefinition.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/structuredefinition.profile.xml index 3659f5e36ac..8874ccaf70b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/structuredefinition.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/structuredefinition.profile.xml @@ -3,7 +3,7 @@ - + @@ -57,7 +57,7 @@
element.base must appear if theres's a base on the structure definition
- If the struture is not abstract, or there's a constrained type, then there SHALL be a base + If the structure is not abstract, or there's a constrained type, then there SHALL be a base
If the type is Resource or Type, the url has to start with "http://hl7.org/fhir/StructureDefinition/" and the tail must match the name
@@ -720,7 +720,7 @@ - + @@ -739,6 +739,7 @@ + @@ -776,45 +777,45 @@ - + - + - + - - + + - + - + - + - + @@ -1682,45 +1683,45 @@ - + - + - + - - + + - + - + - + - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/subscription.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/subscription.profile.xml index 5368eb104c5..53e79927b0e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/subscription.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/subscription.profile.xml @@ -3,7 +3,7 @@ - + @@ -303,7 +303,7 @@ - + @@ -317,6 +317,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/substance.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/substance.profile.xml index c6620748892..c0ba45019d2 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/substance.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/substance.profile.xml @@ -3,7 +3,7 @@ - + @@ -69,8 +69,30 @@ . . . - type - + category + + + + Σ + + 0..* + + CodeableConcept + + What class/type of substance this is +
+ Substance Category Codes ( + Extensible) + + + + + + . + . + . + code + Σ @@ -79,9 +101,9 @@ CodeableConcept - What kind of substance this is + What substance this is
- Substance Type ( + Substance Code ( Example) @@ -174,7 +196,7 @@ 0..1 - Quantity + SimpleQuantity Amount of substance in the package @@ -257,7 +279,7 @@ - + @@ -276,6 +298,7 @@ + @@ -288,12 +311,7 @@ - + @@ -438,8 +456,30 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -449,14 +489,14 @@ - + - + - + @@ -464,7 +504,7 @@ - + @@ -589,6 +629,7 @@ + @@ -704,12 +745,7 @@ - + @@ -736,8 +772,30 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -747,14 +805,14 @@ - + - + - + @@ -762,7 +820,7 @@ - + @@ -835,6 +893,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/supplydelivery.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/supplydelivery.profile.xml index 3a330ebefe1..4dc4bc3c68a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/supplydelivery.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/supplydelivery.profile.xml @@ -3,7 +3,7 @@ - + @@ -142,7 +142,7 @@ 0..1 - Quantity + SimpleQuantity Amount dispensed @@ -279,7 +279,7 @@ - + @@ -288,6 +288,7 @@ + @@ -506,6 +507,7 @@ + @@ -716,6 +718,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/supplyrequest.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/supplyrequest.profile.xml index c9accc207ef..00c786bc9a0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/supplyrequest.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/supplyrequest.profile.xml @@ -3,7 +3,7 @@ - + @@ -330,7 +330,7 @@ - + @@ -339,6 +339,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/testscript.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/testscript.profile.xml index 601fcf12aff..8abb948c748 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/testscript.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/testscript.profile.xml @@ -3,7 +3,7 @@ - + @@ -1712,7 +1712,7 @@ - + @@ -1726,6 +1726,7 @@ + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/time.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/time.profile.xml index 99a025da89d..df2a68bd593 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/time.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/time.profile.xml @@ -16,10 +16,11 @@ - + + @@ -60,6 +61,11 @@ + + + @@ -67,9 +73,6 @@ - - - @@ -83,6 +86,11 @@ + + + @@ -90,9 +98,6 @@ - - - \ No newline at end of file diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/timing.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/timing.profile.xml index ab267539238..768d92503d5 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/timing.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/timing.profile.xml @@ -116,7 +116,7 @@ . . . - . boundsDuration + . boundsQuantity @@ -405,8 +405,8 @@ - - + + @@ -420,12 +420,12 @@ + - @@ -572,7 +572,8 @@ - + + @@ -802,7 +803,6 @@ - @@ -884,7 +884,8 @@ - + + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/unsignedint.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/unsignedint.profile.xml index 79034db9098..e006d8fcd7e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/unsignedint.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/unsignedint.profile.xml @@ -16,9 +16,10 @@ - + + @@ -55,6 +56,11 @@ + + + @@ -67,9 +73,6 @@ - - - @@ -83,6 +86,11 @@ + + + @@ -90,9 +98,6 @@ - - - \ No newline at end of file diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/uri.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/uri.profile.xml index b8210a76542..bd6635e9875 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/uri.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/uri.profile.xml @@ -16,10 +16,11 @@ - + + @@ -61,6 +62,10 @@ + + @@ -68,9 +73,6 @@ - - - @@ -85,6 +87,10 @@ + + @@ -92,9 +98,6 @@ - - - \ No newline at end of file diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/uuid.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/uuid.profile.xml index 0b4ef78e8d8..9dc50d31e28 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/uuid.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/uuid.profile.xml @@ -16,9 +16,10 @@ - + + @@ -56,6 +57,11 @@ + + + @@ -68,9 +74,6 @@ - - - @@ -85,6 +88,11 @@ + + + @@ -92,9 +100,6 @@ - - - \ No newline at end of file diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/valueset.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/valueset.profile.xml index 2d5eddd9367..26394742e4f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/valueset.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/valueset.profile.xml @@ -3,7 +3,7 @@ - + @@ -49,9 +49,9 @@
A defined code system (if present) SHALL have a different identifier to the value set itself
- A value set with only one import SHALL also have an include and/or an exclude unless the value set defines its own codes + A value set with only one import SHALL also have an include and/or an exclude unless the value set includes and inline code system
- Value set SHALL contain at least one of a define, a compose, or an expansion element + Value set SHALL contain at least one of a codeSystem, a compose, or an expansion element @@ -1343,7 +1343,7 @@ - + @@ -1362,6 +1362,7 @@ + @@ -1376,19 +1377,19 @@ - + - - + + - - + + @@ -1959,6 +1960,9 @@ + + + @@ -2253,6 +2257,9 @@ + + + @@ -2363,6 +2370,9 @@ + + + @@ -2936,19 +2946,19 @@ - + - - + + - - + + @@ -3297,6 +3307,9 @@ + + + @@ -3435,6 +3448,9 @@ + + + @@ -3493,6 +3509,9 @@ + + + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/visionprescription.profile.xml b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/visionprescription.profile.xml index 4ce6cefdbe3..e115329f899 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/visionprescription.profile.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/profile/visionprescription.profile.xml @@ -3,7 +3,7 @@ - + @@ -438,7 +438,7 @@ 0..1 - Quantity + SimpleQuantity Lens wear duration @@ -522,7 +522,7 @@ - + @@ -536,6 +536,7 @@ + @@ -1015,6 +1016,7 @@ reason.observation[code=ASSERTION].value"/> + @@ -1362,6 +1364,7 @@ reason.observation[code=ASSERTION].value"/> + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/account.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/account.sch index 6c70ccf9aa5..b3644819750 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/account.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/account.sch @@ -10,45 +10,45 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + Account - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + qty-3: If a code for the units is present, the system SHALL also be present - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/allergyintolerance.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/allergyintolerance.sch index 2ad60238a98..d1c864197a4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/allergyintolerance.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/allergyintolerance.sch @@ -10,42 +10,42 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + AllergyIntolerance - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + qty-3: If a code for the units is present, the system SHALL also be present - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/appointment.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/appointment.sch index 72c52d71826..d172aacb684 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/appointment.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/appointment.sch @@ -10,39 +10,39 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + Appointment - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/appointmentresponse.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/appointmentresponse.sch index 39f0bcc0c32..65ebc2d493e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/appointmentresponse.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/appointmentresponse.sch @@ -10,36 +10,36 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + AppointmentResponse - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/auditevent.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/auditevent.sch index 34f0b056e41..6bfd6f7ce5b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/auditevent.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/auditevent.sch @@ -10,46 +10,46 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + AuditEvent - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + sev-3: Either a userId or a reference, but not both - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + sev-1: Either a name or a query (or both) sev-2: Either an identifier or a reference, but not both - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/basic.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/basic.sch index d88e164b187..067e95683c7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/basic.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/basic.sch @@ -10,36 +10,36 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + Basic - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/binary.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/binary.sch index 18a4930f7a7..13e6e6d0b15 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/binary.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/binary.sch @@ -10,13 +10,13 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + Binary - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/bodysite.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/bodysite.sch index d09fd078b7b..a7e747ce08f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/bodysite.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/bodysite.sch @@ -10,36 +10,36 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + BodySite - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + att-1: It the Attachment has data, it SHALL have a contentType - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/bundle.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/bundle.sch index 617f459e616..bd30be11bb0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/bundle.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/bundle.sch @@ -10,27 +10,27 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + Bundle - + bdl-7: FullUrl must be unique in a bundle, or else entries with the same fullUrl must have different meta.versionId bdl-3: entry.transaction when (and only when) a transaction bdl-4: entry.transactionResponse when (and only when) a transaction-response bdl-1: total only when a search or history bdl-2: entry.search only when a search - + bdl-5: must be a resource unless there's a transaction or transaction response bdl-6: The fullUrl element must be present when a resource is present, and not present otherwise - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/careplan.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/careplan.sch index 3e89c6c5023..e638275e960 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/careplan.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/careplan.sch @@ -10,115 +10,114 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + CarePlan - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + cpl-3: Only provide a detail reference, or a simple detail summary cpl-2: Quantity can only be specified if activity category is supply cpl-1: DailyDose can only be specified if activity category is drug or food - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + tim-6: If there's a periodMax, there must be a period tim-7: If there's a durationMax, there must be a duration tim-1: if there's a duration, there needs to be duration units tim-2: if there's a period, there needs to be duration units tim-3: Either frequency or when can exist, not both - + qty-3: If a code for the units is present, the system SHALL also be present - + rng-2: If present, low SHALL have a lower value than high - rng-3: Quantity values cannot have a comparator when used in a Range - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + per-1: If present, start SHALL have a lower value than end - + tim-4: duration SHALL be a non-negative value - + tim-5: period SHALL be a non-negative value - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/claim.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/claim.sch index ff69a735425..8313d1df219 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/claim.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/claim.sch @@ -10,102 +10,102 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + Claim - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/claimresponse.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/claimresponse.sch index 2b77023f099..dc79aea39c6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/claimresponse.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/claimresponse.sch @@ -10,90 +10,90 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + ClaimResponse - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/clinicalimpression.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/clinicalimpression.sch index 5bfb72ce105..159aa4153e2 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/clinicalimpression.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/clinicalimpression.sch @@ -10,48 +10,48 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + ClinicalImpression - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/communication.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/communication.sch index e426de87dc6..d82f500ef94 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/communication.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/communication.sch @@ -10,48 +10,48 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + Communication - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + att-1: It the Attachment has data, it SHALL have a contentType - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/communicationrequest.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/communicationrequest.sch index 95302ff7e1c..e7727855e30 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/communicationrequest.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/communicationrequest.sch @@ -10,51 +10,51 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + CommunicationRequest - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + att-1: It the Attachment has data, it SHALL have a contentType - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/composition.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/composition.sch index 8fbeaafba13..26c4808ab2e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/composition.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/composition.sch @@ -10,63 +10,63 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + Composition - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + cmp-1: A section must at least one of text, entries, or sub-sections cmp-2: A section can only have an emptyReason if it is empty - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/conceptmap.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/conceptmap.sch index 66f21f6b1d4..16f9060c56d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/conceptmap.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/conceptmap.sch @@ -10,45 +10,45 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + ConceptMap - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + cpt-2: A system is required if a value is provided. - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + cmd-1: If the map is narrower or inexact, there SHALL be some comments - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/condition.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/condition.sch index 061996a4774..97a4ae2cdb0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/condition.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/condition.sch @@ -10,83 +10,81 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + Condition - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + qty-3: If a code for the units is present, the system SHALL also be present - + per-1: If present, start SHALL have a lower value than end - + rng-2: If present, low SHALL have a lower value than high - rng-3: Quantity values cannot have a comparator when used in a Range - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + per-1: If present, start SHALL have a lower value than end - + rng-2: If present, low SHALL have a lower value than high - rng-3: Quantity values cannot have a comparator when used in a Range - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + con-1: Stage SHALL have summary or assessment - + ref-1: SHALL have a local reference if the resource is provided inline - + con-2: evidence SHALL have code or details - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/conformance.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/conformance.sch index 9664014b3e6..dacef4903b4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/conformance.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/conformance.sch @@ -10,26 +10,19 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + Conformance - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - cnf-8: There can only be one REST declaration per mode cnf-7: The set of documents must be unique by the combination of profile & mode cnf-2: A Conformance statement SHALL have at least one of description, software, or implementation @@ -37,43 +30,48 @@ cnf-14: Conformance statements of kind 'requirements' do not have software or implementation elements cnf-15: Conformance statements of kind 'software' do not have implementation elements - + + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes + txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes + txt-2: The narrative SHALL have some non-whitespace content + + cpt-2: A system is required if a value is provided. - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + cnf-9: A given resource can only be described once per RESTful mode cnf-10: A given query can only be described once per RESTful mode - + cnf-11: Operation codes must be unique in the context of a resource cnf-12: Search parameter names must be unique in the context of a resource - + ref-1: SHALL have a local reference if the resource is provided inline - + cnf-13: Search parameters can only have chain names when the search parameter type is 'reference' - + ref-1: SHALL have a local reference if the resource is provided inline - + cnf-3: Messaging end point is required (and is only permitted) when statement is for an implementation - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/contract.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/contract.sch index ad771c2b727..70aa46898b6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/contract.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/contract.sch @@ -10,123 +10,123 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + Contract - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + att-1: It the Attachment has data, it SHALL have a contentType - + ref-1: SHALL have a local reference if the resource is provided inline - + att-1: It the Attachment has data, it SHALL have a contentType - + ref-1: SHALL have a local reference if the resource is provided inline - + att-1: It the Attachment has data, it SHALL have a contentType - + ref-1: SHALL have a local reference if the resource is provided inline - + att-1: It the Attachment has data, it SHALL have a contentType - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/contraindication.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/contraindication.sch index f390e0d368b..7e2687a05c7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/contraindication.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/contraindication.sch @@ -10,42 +10,42 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + Contraindication - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/coverage.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/coverage.sch index d624c46f41e..d499442bb09 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/coverage.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/coverage.sch @@ -10,60 +10,60 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + Coverage - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/dataelement.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/dataelement.sch index 00cdc3bac79..915ea65c75c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/dataelement.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/dataelement.sch @@ -10,43 +10,41 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + DataElement - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + cpt-2: A system is required if a value is provided. - + per-1: If present, start SHALL have a lower value than end - + dae-1: No base allowed dae-2: No slicing allowed - - - eld-2: Min <= Max + eld-2: Min <= Max eld-5: Either a namereference or a fixed value (but not both) is permitted eld-7: Pattern may only be specified if there is one type eld-6: Fixed value may only be specified if there is one type @@ -56,24 +54,24 @@ eld-13: Types must be unique by the combination of code and profile eld-15: default value and meaningWhenMissing are mutually exclusive - + eld-1: If there are no discriminators, there must be a definition - + eld-3: Max SHALL be a number or "*" - + eld-4: Aggregation may only be specified if one of the allowed types for the element is a resource - + eld-10: provide either a reference or a description (or both) eld-9: Example value sets are always extensible - + eld-12: uri SHALL start with http:// or https:// - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/device.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/device.sch index ee338d4403b..c37c9d3f36b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/device.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/device.sch @@ -10,48 +10,48 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + Device - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + cpt-2: A system is required if a value is provided. - + per-1: If present, start SHALL have a lower value than end - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/devicecomponent.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/devicecomponent.sch index 288acf0554d..89dcafd11f3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/devicecomponent.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/devicecomponent.sch @@ -10,42 +10,42 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + DeviceComponent - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/devicemetric.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/devicemetric.sch index 958916b4d56..4476a60ba07 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/devicemetric.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/devicemetric.sch @@ -10,65 +10,64 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + DeviceMetric - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + tim-6: If there's a periodMax, there must be a period tim-7: If there's a durationMax, there must be a duration tim-1: if there's a duration, there needs to be duration units tim-2: if there's a period, there needs to be duration units tim-3: Either frequency or when can exist, not both - + qty-3: If a code for the units is present, the system SHALL also be present - + rng-2: If present, low SHALL have a lower value than high - rng-3: Quantity values cannot have a comparator when used in a Range - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + per-1: If present, start SHALL have a lower value than end - + tim-4: duration SHALL be a non-negative value - + tim-5: period SHALL be a non-negative value - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/deviceuserequest.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/deviceuserequest.sch index 05556d32477..fa1987a9662 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/deviceuserequest.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/deviceuserequest.sch @@ -10,74 +10,73 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + DeviceUseRequest - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + tim-6: If there's a periodMax, there must be a period tim-7: If there's a durationMax, there must be a duration tim-1: if there's a duration, there needs to be duration units tim-2: if there's a period, there needs to be duration units tim-3: Either frequency or when can exist, not both - + qty-3: If a code for the units is present, the system SHALL also be present - + rng-2: If present, low SHALL have a lower value than high - rng-3: Quantity values cannot have a comparator when used in a Range - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + per-1: If present, start SHALL have a lower value than end - + tim-4: duration SHALL be a non-negative value - + tim-5: period SHALL be a non-negative value - + per-1: If present, start SHALL have a lower value than end - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/deviceusestatement.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/deviceusestatement.sch index 7da3734ded7..9d70a51a210 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/deviceusestatement.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/deviceusestatement.sch @@ -10,74 +10,73 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + DeviceUseStatement - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + tim-6: If there's a periodMax, there must be a period tim-7: If there's a durationMax, there must be a duration tim-1: if there's a duration, there needs to be duration units tim-2: if there's a period, there needs to be duration units tim-3: Either frequency or when can exist, not both - + qty-3: If a code for the units is present, the system SHALL also be present - + rng-2: If present, low SHALL have a lower value than high - rng-3: Quantity values cannot have a comparator when used in a Range - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + per-1: If present, start SHALL have a lower value than end - + tim-4: duration SHALL be a non-negative value - + tim-5: period SHALL be a non-negative value - + per-1: If present, start SHALL have a lower value than end - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/diagnosticorder.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/diagnosticorder.sch index babffb2e6ca..4244f775a41 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/diagnosticorder.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/diagnosticorder.sch @@ -10,54 +10,54 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + DiagnosticOrder - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/diagnosticreport.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/diagnosticreport.sch index c4e1318eb45..0a45d61ced8 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/diagnosticreport.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/diagnosticreport.sch @@ -10,60 +10,60 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + DiagnosticReport - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + att-1: It the Attachment has data, it SHALL have a contentType - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/documentmanifest.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/documentmanifest.sch index 56c7abb4402..e9d1ab92502 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/documentmanifest.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/documentmanifest.sch @@ -10,60 +10,60 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + DocumentManifest - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + att-1: It the Attachment has data, it SHALL have a contentType - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/documentreference.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/documentreference.sch index e5d0b37ca0e..f2586d0a60c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/documentreference.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/documentreference.sch @@ -10,69 +10,72 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + DocumentReference - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + att-1: It the Attachment has data, it SHALL have a contentType - + + ref-1: SHALL have a local reference if the resource is provided inline + + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/eligibilityrequest.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/eligibilityrequest.sch index 6b01459d74b..71f72dcecf2 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/eligibilityrequest.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/eligibilityrequest.sch @@ -10,39 +10,39 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + EligibilityRequest - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/eligibilityresponse.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/eligibilityresponse.sch index e51ea5067c8..ef641d850d0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/eligibilityresponse.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/eligibilityresponse.sch @@ -10,42 +10,42 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + EligibilityResponse - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/encounter.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/encounter.sch index bb061319249..b7b57946478 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/encounter.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/encounter.sch @@ -10,90 +10,90 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + Encounter - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + qty-3: If a code for the units is present, the system SHALL also be present - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/enrollmentrequest.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/enrollmentrequest.sch index a6f3e2362b5..d826c1fdd86 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/enrollmentrequest.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/enrollmentrequest.sch @@ -10,45 +10,45 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + EnrollmentRequest - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/enrollmentresponse.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/enrollmentresponse.sch index 5559b68c781..d5a3127ab5a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/enrollmentresponse.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/enrollmentresponse.sch @@ -10,42 +10,42 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + EnrollmentResponse - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/episodeofcare.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/episodeofcare.sch index 2577d6a9e64..eb902ef61f2 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/episodeofcare.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/episodeofcare.sch @@ -10,57 +10,57 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + EpisodeOfCare - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/explanationofbenefit.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/explanationofbenefit.sch index 6bef6116296..5fbf1bf3f75 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/explanationofbenefit.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/explanationofbenefit.sch @@ -10,42 +10,42 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + ExplanationOfBenefit - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/familymemberhistory.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/familymemberhistory.sch index 78a71fd2cad..6ad08ab56b3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/familymemberhistory.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/familymemberhistory.sch @@ -10,78 +10,73 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + FamilyMemberHistory - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource + fhs-1: Can have age[x] or birth[x], but not both - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - - fhs-1: Can have age[x] or birth[x], but not both - - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + qty-3: If a code for the units is present, the system SHALL also be present - + rng-2: If present, low SHALL have a lower value than high - rng-3: Quantity values cannot have a comparator when used in a Range - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + rng-2: If present, low SHALL have a lower value than high - rng-3: Quantity values cannot have a comparator when used in a Range - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + rng-2: If present, low SHALL have a lower value than high - rng-3: Quantity values cannot have a comparator when used in a Range - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/fhir-single.xsd b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/fhir-single.xsd index 7629f11328b..ab49a6f8918 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/fhir-single.xsd +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/fhir-single.xsd @@ -27,7 +27,7 @@ POSSIBILITY OF SUCH DAMAGE. - Generated on Fri, Aug 7, 2015 07:14-0400 for FHIR v0.5.0 + Generated on Thu, Aug 13, 2015 16:43-0400 for FHIR v0.5.0 --> @@ -376,7 +376,7 @@ - + @@ -740,7 +740,7 @@ - + The base quantity that a measured value of zero represents. In addition, this provides the units of the entire measurement series. @@ -968,12 +968,12 @@ - + The low limit. The boundary is inclusive. - + The high limit. The boundary is inclusive. @@ -1072,6 +1072,45 @@ + + + + + + + Exception as inherited from Element + + + + + The value of the measured amount. The value includes an implicit precision in the presentation of the value. + + + + + Not allowed to be used in this context + + + + + A human-readable form of the units. + + + + + The identification of the system that provides the coded form of the unit. + + + + + A computer processable form of the units in some unit representation system. + + + + + + + @@ -1645,7 +1684,7 @@ Either a duration for the length of the timing schedule, a range of possible length, or outer bounds for start and/or end limits of the timing schedule. - + @@ -3278,7 +3317,7 @@ - The statement was entered in error and Is not valid + The statement was entered in error and is not valid @@ -3336,6 +3375,11 @@ Substances that are encountered in the environment + + + Other substances that are not covered by any other category + + @@ -5021,12 +5065,12 @@ Identifies the food, drug or other product to be consumed or supplied in the activity. - + Identifies the quantity expected to be consumed in a given day. - + Identifies the quantity expected to be supplied, addministered or consumed by the subject. @@ -5467,7 +5511,7 @@ The date when the enclosed suite of services were performed or completed. - + The number of repetitions of a service or product. @@ -5548,7 +5592,7 @@ If a grouping item then 'GROUP' otherwise it is a node therefore a code to indicate the Professional Service or Product supplied. - + The number of repetitions of a service or product. @@ -5609,7 +5653,7 @@ The fee for an addittional service or product or charge. - + The number of repetitions of a service or product. @@ -6806,12 +6850,12 @@ - A set of healthcare-related information that is assembled together into a single logical document that provides a single coherent statement of meaning, establishes its own context and that has clinical attestation with regard to who is making the statement. + A set of healthcare-related information that is assembled together into a single logical document that provides a single coherent statement of meaning, establishes its own context and that has clinical attestation with regard to who is making the statement. While a Composition defines the structure, it does not actually contain the content: rather the full content of a document is contained in a Bundle, of which the Composition is the first resource contained. - A set of healthcare-related information that is assembled together into a single logical document that provides a single coherent statement of meaning, establishes its own context and that has clinical attestation with regard to who is making the statement. + A set of healthcare-related information that is assembled together into a single logical document that provides a single coherent statement of meaning, establishes its own context and that has clinical attestation with regard to who is making the statement. While a Composition defines the structure, it does not actually contain the content: rather the full content of a document is contained in a Bundle, of which the Composition is the first resource contained. If the element is present, it must have either a @value, an @id, or extensions @@ -6837,7 +6881,7 @@ A categorization for the type of the composition - helps for indexing and searching. This may be implied by or derived from the code specified in the Composition Type. - + Official human-readable label for the composition. @@ -6893,7 +6937,7 @@ - A set of healthcare-related information that is assembled together into a single logical document that provides a single coherent statement of meaning, establishes its own context and that has clinical attestation with regard to who is making the statement. + A set of healthcare-related information that is assembled together into a single logical document that provides a single coherent statement of meaning, establishes its own context and that has clinical attestation with regard to who is making the statement. While a Composition defines the structure, it does not actually contain the content: rather the full content of a document is contained in a Bundle, of which the Composition is the first resource contained. @@ -6919,7 +6963,7 @@ - A set of healthcare-related information that is assembled together into a single logical document that provides a single coherent statement of meaning, establishes its own context and that has clinical attestation with regard to who is making the statement. + A set of healthcare-related information that is assembled together into a single logical document that provides a single coherent statement of meaning, establishes its own context and that has clinical attestation with regard to who is making the statement. While a Composition defines the structure, it does not actually contain the content: rather the full content of a document is contained in a Bundle, of which the Composition is the first resource contained. @@ -6936,7 +6980,7 @@ - Full details for the event(s) the composition/documentation consents. + The description and/or reference of the event(s) being documented. For example, this could be used to document such a colonoscopy or an appendectomy. @@ -6945,7 +6989,7 @@ - A set of healthcare-related information that is assembled together into a single logical document that provides a single coherent statement of meaning, establishes its own context and that has clinical attestation with regard to who is making the statement. + A set of healthcare-related information that is assembled together into a single logical document that provides a single coherent statement of meaning, establishes its own context and that has clinical attestation with regard to who is making the statement. While a Composition defines the structure, it does not actually contain the content: rather the full content of a document is contained in a Bundle, of which the Composition is the first resource contained. @@ -7006,14 +7050,9 @@ This version of the composition is complete and verified by an appropriate person and no further work is planned. Any subsequent updates would be on a new version of the composition. - - - The composition or document has been modified subsequent to being released as "final", and is complete and verified by an authorized person. The modifications added new information to the composition or document, but did not revise existing content - - - The composition or document has been modified subsequent to being released as "final", and is complete and verified by an authorized person + The composition content or the referenced resources have been modified (edited or added to) subsequent to being released as "final" and the composition is complete and verified by an authorized person @@ -7352,7 +7391,7 @@ Estimated or actual date or date-time the condition began, in the opinion of the clinician. - + @@ -7362,7 +7401,7 @@ The date or estimated date that the condition resolved or went into remission. This is called "abatement" because of the many overloaded connotations associated with "remission" or "resolution" - Conditions are never really resolved, but they can abate. - + @@ -8655,7 +8694,7 @@ Indicates the time during which this Contract ValuedItem information is effective. - + Specifies the units by which the Contract Valued Item is measured or counted, and quantifies the countable or measurable Contract Valued Item instances. @@ -8826,7 +8865,7 @@ Indicates the time during which this Contract Term ValuedItem information is effective. - + Specifies the units by which the Contract Provision Valued Item is measured or counted, and quantifies the countable or measurable Contract Term Valued Item instances. @@ -9378,7 +9417,7 @@ - The resource may be found in a literal location (i.e. GPS coordinates), a logical place (i.e. "in/with the patient"), or a coded location. + The place where the device can be found. @@ -10453,9 +10492,9 @@ The update period may be different than the measurement repetition time, if the The diagnostic service that is responsible for issuing the report. - + - Details concerning a test requested. + Details concerning a test or procedure requested. @@ -10608,7 +10647,7 @@ The update period may be different than the measurement repetition time, if the - Identifies who is responsible for adding the information to the document. + Identifies who is responsible for creating the manifest, and adding documents to it. @@ -10654,7 +10693,7 @@ The update period may be different than the measurement repetition time, if the - The list of DocumentReference or Media Resources, or Attachment that consist of the parts of this document manifest. Usually, these would be document references, but direct references to Media or Attachments are also allowed. + The list of references to document content, or Attachment that consist of the parts of this document manifest. Usually, these would be document references, but direct references to Media or Attachments are also allowed. @@ -10722,12 +10761,12 @@ The update period may be different than the measurement repetition time, if the A categorization for the type of document - helps for indexing and searching. This may be implied by or derived from the code specified in the Composition Type. - + An identifier of the document encoding, structure, and template that the document conforms to beyond the base format indicated in the mimeType. - + Identifies who is responsible for adding the information to the document. @@ -10772,9 +10811,9 @@ The update period may be different than the measurement repetition time, if the Human-readable description of the source document. This is sometimes known as the "title". - + - A set of Security-Tag codes specifying the level of privacy/security of the Document. + A set of Security-Tag codes specifying the level of privacy/security of the Document. Note that DocumentReference.meta.security is the security labels of the reference to the document, while DocumentReference.securityLabel is the security labels on the document it refers to. @@ -10819,6 +10858,11 @@ The update period may be different than the measurement repetition time, if the + + + Describes the clinical encounter or type of care that the document content is associated with. + + This list of codes represents the main clinical acts, such as a colonoscopy or an appendectomy, being documented. In some cases, the event is inherent in the typeCode, such as a "History and Physical Report" in which the procedure being documented is necessarily a "History and Physical" act. @@ -11073,9 +11117,7 @@ The update period may be different than the measurement repetition time, if the - Where a specific encounter should be classified as a part of a specific episode(s) of care this field should be used. This association can facilitate grouping of related encounters together for a specific purpose, such as govt reporting, issue tracking, association via a common problem. - -The association is recorded on the encounter as these are typically created after the episode of care, and grouped on entry rather than editing the episode of care to append another encounter to it (the episode of care could span years). + Where a specific encounter should be classified as a part of a specific episode(s) of care this field should be used. This association can facilitate grouping of related encounters together for a specific purpose, such as govt reporting, issue tracking, association via a common problem. The association is recorded on the encounter as these are typically created after the episode of care, and grouped on entry rather than editing the episode of care to append another encounter to it (the episode of care could span years). @@ -11110,8 +11152,7 @@ The association is recorded on the encounter as these are typically created afte - Reason the encounter takes place, as specified using information from another resource. For admissions, this is the admission diagnosis. -The indication will typically be a Condition (with other resources referenced in the evidence.detail), or a Procedure. + Reason the encounter takes place, as specified using information from another resource. For admissions, this is the admission diagnosis. The indication will typically be a Condition (with other resources referenced in the evidence.detail), or a Procedure. @@ -11837,7 +11878,7 @@ The indication will typically be a Condition (with other resources referenced in The actual or approximate age of the relative at the time the family member history is recorded. - + @@ -11846,7 +11887,7 @@ The indication will typically be a Condition (with other resources referenced in The actual or approximate age of the relative at the time the family member history is recorded. - + @@ -11886,7 +11927,7 @@ The indication will typically be a Condition (with other resources referenced in Either the age of onset, range of approximate age or descriptive string can be recorded. For conditions with multiple occurrences, this describes the first known occurrence. - + @@ -12546,12 +12587,12 @@ The indication will typically be a Condition (with other resources referenced in - A manifest of a set of DICOM Service-Object Pair Instances (SOP Instances). The referenced SOP Instances (images or other content) are for a single patient, and may be from one or more studies. The referenced SOP Instances have been selected for a purpose, such as quality assurance, conference, or consult. Reflecting that range of purposes, typical ImagingObjectSelection resources may include all SOP Instances in a study (perhaps for sharing through a Health Information Exchange); key images from multiple studies (for reference by a referring or treating physician); a multi-frame ultrasound instance (“cine” video clip) and a set of measurements taken from that instance (for inclusion in a teaching file); and so on. + A manifest of a set of DICOM Service-Object Pair Instances (SOP Instances). The referenced SOP Instances (images or other content) are for a single patient, and may be from one or more studies. The referenced SOP Instances have been selected for a purpose, such as quality assurance, conference, or consult. Reflecting that range of purposes, typical ImagingObjectSelection resources may include all SOP Instances in a study (perhaps for sharing through a Health Information Exchange); key images from multiple studies (for reference by a referring or treating physician); a multi-frame ultrasound instance ("cine" video clip) and a set of measurements taken from that instance (for inclusion in a teaching file); and so on. - A manifest of a set of DICOM Service-Object Pair Instances (SOP Instances). The referenced SOP Instances (images or other content) are for a single patient, and may be from one or more studies. The referenced SOP Instances have been selected for a purpose, such as quality assurance, conference, or consult. Reflecting that range of purposes, typical ImagingObjectSelection resources may include all SOP Instances in a study (perhaps for sharing through a Health Information Exchange); key images from multiple studies (for reference by a referring or treating physician); a multi-frame ultrasound instance (“cine” video clip) and a set of measurements taken from that instance (for inclusion in a teaching file); and so on. + A manifest of a set of DICOM Service-Object Pair Instances (SOP Instances). The referenced SOP Instances (images or other content) are for a single patient, and may be from one or more studies. The referenced SOP Instances have been selected for a purpose, such as quality assurance, conference, or consult. Reflecting that range of purposes, typical ImagingObjectSelection resources may include all SOP Instances in a study (perhaps for sharing through a Health Information Exchange); key images from multiple studies (for reference by a referring or treating physician); a multi-frame ultrasound instance ("cine" video clip) and a set of measurements taken from that instance (for inclusion in a teaching file); and so on. If the element is present, it must have either a @value, an @id, or extensions @@ -12598,7 +12639,7 @@ The indication will typically be a Condition (with other resources referenced in - A manifest of a set of DICOM Service-Object Pair Instances (SOP Instances). The referenced SOP Instances (images or other content) are for a single patient, and may be from one or more studies. The referenced SOP Instances have been selected for a purpose, such as quality assurance, conference, or consult. Reflecting that range of purposes, typical ImagingObjectSelection resources may include all SOP Instances in a study (perhaps for sharing through a Health Information Exchange); key images from multiple studies (for reference by a referring or treating physician); a multi-frame ultrasound instance (“cine” video clip) and a set of measurements taken from that instance (for inclusion in a teaching file); and so on. + A manifest of a set of DICOM Service-Object Pair Instances (SOP Instances). The referenced SOP Instances (images or other content) are for a single patient, and may be from one or more studies. The referenced SOP Instances have been selected for a purpose, such as quality assurance, conference, or consult. Reflecting that range of purposes, typical ImagingObjectSelection resources may include all SOP Instances in a study (perhaps for sharing through a Health Information Exchange); key images from multiple studies (for reference by a referring or treating physician); a multi-frame ultrasound instance ("cine" video clip) and a set of measurements taken from that instance (for inclusion in a teaching file); and so on. @@ -12629,7 +12670,7 @@ The indication will typically be a Condition (with other resources referenced in - A manifest of a set of DICOM Service-Object Pair Instances (SOP Instances). The referenced SOP Instances (images or other content) are for a single patient, and may be from one or more studies. The referenced SOP Instances have been selected for a purpose, such as quality assurance, conference, or consult. Reflecting that range of purposes, typical ImagingObjectSelection resources may include all SOP Instances in a study (perhaps for sharing through a Health Information Exchange); key images from multiple studies (for reference by a referring or treating physician); a multi-frame ultrasound instance (“cine” video clip) and a set of measurements taken from that instance (for inclusion in a teaching file); and so on. + A manifest of a set of DICOM Service-Object Pair Instances (SOP Instances). The referenced SOP Instances (images or other content) are for a single patient, and may be from one or more studies. The referenced SOP Instances have been selected for a purpose, such as quality assurance, conference, or consult. Reflecting that range of purposes, typical ImagingObjectSelection resources may include all SOP Instances in a study (perhaps for sharing through a Health Information Exchange); key images from multiple studies (for reference by a referring or treating physician); a multi-frame ultrasound instance ("cine" video clip) and a set of measurements taken from that instance (for inclusion in a teaching file); and so on. @@ -12655,7 +12696,7 @@ The indication will typically be a Condition (with other resources referenced in - A manifest of a set of DICOM Service-Object Pair Instances (SOP Instances). The referenced SOP Instances (images or other content) are for a single patient, and may be from one or more studies. The referenced SOP Instances have been selected for a purpose, such as quality assurance, conference, or consult. Reflecting that range of purposes, typical ImagingObjectSelection resources may include all SOP Instances in a study (perhaps for sharing through a Health Information Exchange); key images from multiple studies (for reference by a referring or treating physician); a multi-frame ultrasound instance (“cine” video clip) and a set of measurements taken from that instance (for inclusion in a teaching file); and so on. + A manifest of a set of DICOM Service-Object Pair Instances (SOP Instances). The referenced SOP Instances (images or other content) are for a single patient, and may be from one or more studies. The referenced SOP Instances have been selected for a purpose, such as quality assurance, conference, or consult. Reflecting that range of purposes, typical ImagingObjectSelection resources may include all SOP Instances in a study (perhaps for sharing through a Health Information Exchange); key images from multiple studies (for reference by a referring or treating physician); a multi-frame ultrasound instance ("cine" video clip) and a set of measurements taken from that instance (for inclusion in a teaching file); and so on. @@ -12686,7 +12727,7 @@ The indication will typically be a Condition (with other resources referenced in - A manifest of a set of DICOM Service-Object Pair Instances (SOP Instances). The referenced SOP Instances (images or other content) are for a single patient, and may be from one or more studies. The referenced SOP Instances have been selected for a purpose, such as quality assurance, conference, or consult. Reflecting that range of purposes, typical ImagingObjectSelection resources may include all SOP Instances in a study (perhaps for sharing through a Health Information Exchange); key images from multiple studies (for reference by a referring or treating physician); a multi-frame ultrasound instance (“cine” video clip) and a set of measurements taken from that instance (for inclusion in a teaching file); and so on. + A manifest of a set of DICOM Service-Object Pair Instances (SOP Instances). The referenced SOP Instances (images or other content) are for a single patient, and may be from one or more studies. The referenced SOP Instances have been selected for a purpose, such as quality assurance, conference, or consult. Reflecting that range of purposes, typical ImagingObjectSelection resources may include all SOP Instances in a study (perhaps for sharing through a Health Information Exchange); key images from multiple studies (for reference by a referring or treating physician); a multi-frame ultrasound instance ("cine" video clip) and a set of measurements taken from that instance (for inclusion in a teaching file); and so on. @@ -13032,7 +13073,7 @@ The indication will typically be a Condition (with other resources referenced in The path by which the vaccine product is taken into the body. - + The quantity of vaccine product that was administered. @@ -14140,19 +14181,14 @@ The indication will typically be a Condition (with other resources referenced in - - - The common/commercial name of the medication absent information such as strength, form, etc. E.g. Acetaminophen, Tylenol 3, etc. The fully coordinated name is communicated as the display of Medication.code. - - - A code (or set of codes) that identify this medication. Usage note: This could be a standard drug code such as a drug regulator code, RxNorm code, SNOMED CT code, etc. It could also be a local formulary code, optionally with translations to the standard drug codes. + A code (or set of codes) that specify this medication, or a textual description if no code is available. Usage note: This could be a standard medication code such as a code from RxNorm, SNOMED CT, IDMP etc. It could also be a national or local formulary code, optionally with translations to other code systems. - Set to true if the item is attributable to a specific manufacturer (even if we don't know who that is). + Set to true if the item is attributable to a specific manufacturer. @@ -14188,7 +14224,7 @@ The indication will typically be a Condition (with other resources referenced in - Describes the form of the item. Powder; tables; carton. + Describes the form of the item. Powder; tablets; carton. @@ -14280,7 +14316,7 @@ The indication will typically be a Condition (with other resources referenced in Identifies one of the items in the package. - + The amount of the product that is in the package. @@ -14432,16 +14468,18 @@ The indication will typically be a Condition (with other resources referenced in A coded value indicating the method by which the medication was introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. Terminologies used often pre-coordinate this term with the route and or form of administration. - + The amount of the medication given at one administration event. Use this value when the administration is essentially an instantaneous event such as a swallowing a tablet or giving an injection. - + Identifies the speed with which the medication was introduced into the patient. Typically the rate for an infusion e.g. 200ml in 2 hours. May also be expressed as a rate per unit of time such as 100ml per hour - the duration is then not specified, or is specified in the quantity. - - + + + + @@ -14529,12 +14567,12 @@ The indication will typically be a Condition (with other resources referenced in Indicates the type of dispensing event that is performed. Examples include: Trial Fill, Completion of Trial, Partial Fill, Emergency Fill, Samples, etc. - + The amount of medication that has been dispensed. Includes unit of measure. - + The amount of medication expressed as a timing amount. @@ -14602,14 +14640,11 @@ The indication will typically be a Condition (with other resources referenced in Additional instructions such as "Swallow with plenty of water" which may or may not be coded. - + The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013". - - - - - + + If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose. If a CodeableConcept is present, it indicates the pre-condition for taking the Medication. @@ -14629,9 +14664,7 @@ The indication will typically be a Condition (with other resources referenced in - A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. - -Terminologies used often pre-coordinate this term with the route and or form of administration. + A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. Terminologies used often pre-coordinate this term with the route and or form of administration. @@ -14639,13 +14672,15 @@ Terminologies used often pre-coordinate this term with the route and or form of The amount of therapeutic or other substance given at one administration event. - + - + Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours. - - + + + + The maximum total quantity of a therapeutic substance that may be administered to a subject over the period of time, e.g. 1000mg in 24 hours. @@ -14721,14 +14756,14 @@ Terminologies used often pre-coordinate this term with the route and or form of - + - An order for both supply of the medication and the instructions for administration of the medicine to a patient. + An order for both supply of the medication and the instructions for administration of the medication to a patient. - + - An order for both supply of the medication and the instructions for administration of the medicine to a patient. + An order for both supply of the medication and the instructions for administration of the medication to a patient. If the element is present, it must have either a @value, an @id, or extensions @@ -14744,11 +14779,21 @@ Terminologies used often pre-coordinate this term with the route and or form of The date (and perhaps time) when the prescription was written. - + A code specifying the state of the order. Generally this will be active or completed state. + + + The date (and perhaps time) when the prescription was stopped. + + + + + The reason why the prescription was stopped, if it was. + + A link to a resource representing the person to whom the medication will be given. @@ -14783,28 +14828,33 @@ Terminologies used often pre-coordinate this term with the route and or form of - + Indicates how the medication is to be used by the patient. - + Deals with details of the dispense part of the order. - + 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, and in others it does not matter. This block explains the prescriber's intent. If nothing is specified substitution may be done. + + + A link to a resource representing an earlier order or prescription that this order supersedes. + + - + - An order for both supply of the medication and the instructions for administration of the medicine to a patient. + An order for both supply of the medication and the instructions for administration of the medication to a patient. @@ -14819,14 +14869,11 @@ Terminologies used often pre-coordinate this term with the route and or form of Additional instructions such as "Swallow with plenty of water" which may or may not be coded. - + The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013". - - - - - + + If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose. If a CodeableConcept is present, it indicates the pre-condition for taking the Medication. @@ -14846,9 +14893,7 @@ Terminologies used often pre-coordinate this term with the route and or form of - A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. - -Terminologies used often pre-coordinate this term with the route and or form of administration. + A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. Terminologies used often pre-coordinate this term with the route and or form of administration. @@ -14856,13 +14901,15 @@ Terminologies used often pre-coordinate this term with the route and or form of The amount of therapeutic or other substance given at one administration event. - + - + Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours. - - + + + + The maximum total quantity of a therapeutic substance that may be administered to a subject over the period of time. E.g. 1000mg in 24 hours. @@ -14872,9 +14919,9 @@ Terminologies used often pre-coordinate this term with the route and or form of - + - An order for both supply of the medication and the instructions for administration of the medicine to a patient. + An order for both supply of the medication and the instructions for administration of the medication to a patient. @@ -14888,35 +14935,31 @@ Terminologies used often pre-coordinate this term with the route and or form of - Design Comments: This indicates the validity period of a prescription (stale dating the Prescription) -It reflects the prescriber perspective for the validity of the prescription. Dispenses must not be made against the prescription outside of this period. The lower-bound of the Dispensing Window signifies the earliest date that the prescription can be filled for the first time. If an upper-bound is not specified then the Prescription is open-ended or will default to a stale-date based on regulations. -Rationale: Indicates when the Prescription becomes valid, and when it ceases to be a dispensable Prescription. + Design Comments: This indicates the validity period of a prescription (stale dating the Prescription) It reflects the prescriber perspective for the validity of the prescription. Dispenses must not be made against the prescription outside of this period. The lower-bound of the Dispensing Window signifies the earliest date that the prescription can be filled for the first time. If an upper-bound is not specified then the Prescription is open-ended or will default to a stale-date based on regulations. Rationale: Indicates when the Prescription becomes valid, and when it ceases to be a dispensable Prescription. - An integer indicating the number of repeats of the Dispense. -UsageNotes: For example, the number of times the prescribed quantity is to be supplied including the initial standard fill. + An integer indicating the number of repeats of the Dispense. UsageNotes: For example, the number of times the prescribed quantity is to be supplied including the initial standard fill. - + The amount that is to be dispensed for one fill. - 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. -In some situations, this attribute may be used instead of quantity to identify the amount supplied by how long it is expected to last, rather than the physical quantity issued, e.g. 90 days supply of medication (based on an ordered dosage) When possible, it is always better to specify quantity, as this tends to be more precise. expectedSupplyDuration will always be an estimate that can be influenced by external factors. + 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. In some situations, this attribute may be used instead of quantity to identify the amount supplied by how long it is expected to last, rather than the physical quantity issued, e.g. 90 days supply of medication (based on an ordered dosage) When possible, it is always better to specify quantity, as this tends to be more precise. expectedSupplyDuration will always be an estimate that can be influenced by external factors. - + - An order for both supply of the medication and the instructions for administration of the medicine to a patient. + An order for both supply of the medication and the instructions for administration of the medication to a patient. @@ -14935,7 +14978,7 @@ In some situations, this attribute may be used instead of quantity to identify t - + @@ -14974,14 +15017,14 @@ In some situations, this attribute may be used instead of quantity to identify t - + A code specifying the state of the prescribing event. Describes the lifecycle of the prescription. If the element is present, it must have either a @value, an @id, or extensions - + @@ -15003,7 +15046,7 @@ In some situations, this attribute may be used instead of quantity to identify t External identifier - FHIR will generate its own internal IDs (probably URLs) which do not need to be explicitly managed by the resource. The identifier here is one that would be used by another non-FHIR system - for example an automated medication pump would provide a record each time it operated; an administration while the patient was off the ward might be made with a different system and entered after the event. Particularly important if these records have to be updated. - + The person or animal who is /was taking the medication. @@ -15080,7 +15123,7 @@ In some situations, this attribute may be used instead of quantity to identify t Free text dosage instructions can be used for cases where the instructions are too complex to code. When coded instructions are present, the free text instructions may still be present for display to humans taking or administering the medication. - + The timing schedule for giving the medication to the patient. The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013". @@ -15107,16 +15150,18 @@ In some situations, this attribute may be used instead of quantity to identify t A coded value indicating the method by which the medication is introduced into or onto the body. Most commonly used for injections. Examples: Slow Push; Deep IV. Terminologies used often pre-coordinate this term with the route and or form of administration. - + The amount of therapeutic or other substance given at one administration event. - + Identifies the speed with which the substance is introduced into the subject. Typically the rate for an infusion. 200ml in 2 hours. - - + + + + The maximum total quantity of a therapeutic substance that may be administered to a subject over the period of time. E.g. 1000mg in 24 hours. @@ -15680,7 +15725,7 @@ In some situations, this attribute may be used instead of quantity to identify t The nutrient that is being modified such as carbohydrate or sodium. - + The quantity of the specified nutrient to include in diet. @@ -15732,7 +15777,7 @@ In some situations, this attribute may be used instead of quantity to identify t The time period and frequency at which the supplement(s) should be given. - + The amount of the nutritional supplement to be given. @@ -15773,7 +15818,7 @@ In some situations, this attribute may be used instead of quantity to identify t The product or brand name of the type of modular component to be added to the formula. - + The amount of energy (Calories) that the formula should provide per specified volume, typically per mL or fluid oz. For example, an infant may require a formula the provides 24 Calories per fluid ounce or an adult may require an enteral formula that provides 1.5 Calorie/mL. @@ -15788,7 +15833,7 @@ In some situations, this attribute may be used instead of quantity to identify t Formula administration instructions as structured data. This repeating structure allows for changing the administration rate or volume over time for both bolus and continuous feeding. An example of this would be an instruction to increase the rate of continuous feeding every 2 hours. - + The maximum total quantity of formula that may be administered to a subject over the period of time, e.g., 1440 mL over 24 hours. @@ -15814,7 +15859,7 @@ In some situations, this attribute may be used instead of quantity to identify t The time period and frequency at which the enteral formula should be delivered to the patient. - + The volume of formula to provide to the patient per the specified administration schedule. @@ -15823,7 +15868,7 @@ In some situations, this attribute may be used instead of quantity to identify t The rate of administration of formula via a feeding pump, e.g., 60 mL per hour, according to the specified schedule. - + @@ -16021,12 +16066,12 @@ In some situations, this attribute may be used instead of quantity to identify t - + The value of the low bound of the reference range. If this element is omitted, the low bound of the reference range is assumed to be meaningless. (e.g. reference range is <2.3) If the low.comparator element is missing, it is assumed to be '>'. - + The value of the high bound of the reference range. If this element is omitted, the high bound of the reference range is assumed to be meaningless. (e.g. reference range is > 5) If the low.comparator element is missing , it is assumed to be '<'. @@ -18886,7 +18931,7 @@ In some situations, this attribute may be used instead of quantity to identify t - Answer is a combination of a numeric value and unit + Answer is a combination of a numeric value and unit, potentially with a comparator (<, >, etc) @@ -19285,7 +19330,7 @@ In some situations, this attribute may be used instead of quantity to identify t The date on which the related person was born. - + Address where the related person can be contacted or visited. @@ -19780,7 +19825,7 @@ In some situations, this attribute may be used instead of quantity to identify t - + The quantity of specimen collected; for instance the volume of a blood sample, or the physical measurement of an anatomic pathology sample. @@ -19847,12 +19892,12 @@ In some situations, this attribute may be used instead of quantity to identify t The type of container associated with the specimen (e.g. slide, aliquot, etc). - + The capacity (volume or other measure) the container may contain. - + The quantity of specimen in the container; may be volume, dimensions, or other appropriate measurements, depending on the specimen type. @@ -20340,7 +20385,12 @@ In some situations, this attribute may be used instead of quantity to identify t Unique identifier for the substance. - + + + A code that classifies the the general type of substance. This is used for searching, sorting and display purposes. + + + A code (or set of codes) that identify this substance. @@ -20381,7 +20431,7 @@ In some situations, this attribute may be used instead of quantity to identify t When the substance is no longer valid to use. For some substances, a single arbitrary date is used for expiry. - + The amount of the substance. @@ -20444,7 +20494,7 @@ In some situations, this attribute may be used instead of quantity to identify t Indicates the type of dispensing event that is performed. Examples include: Trial Fill, Completion of Trial, Partial Fill, Emergency Fill, Samples, etc. - + The amount of supply that has been dispensed. Includes unit of measure. @@ -22045,7 +22095,7 @@ In some situations, this attribute may be used instead of quantity to identify t Contact lens diameter measured in millimeters. - + The recommended maximum wear period for the lens. diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/flag.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/flag.sch index 0dba0ed2593..806d13eba1c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/flag.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/flag.sch @@ -10,42 +10,42 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + Flag - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/goal.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/goal.sch index 9fb33fb1106..7d43a3c3a6e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/goal.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/goal.sch @@ -10,42 +10,42 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + Goal - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/group.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/group.sch index 77a25bde85d..1ccdfb14c78 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/group.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/group.sch @@ -10,55 +10,52 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + Group - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource + grp-1: Can only have members if group is "actual" - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - - grp-1: Can only have members if group is "actual" - - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + qty-3: If a code for the units is present, the system SHALL also be present - + rng-2: If present, low SHALL have a lower value than high - rng-3: Quantity values cannot have a comparator when used in a Range - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/healthcareservice.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/healthcareservice.sch index 0a53803f760..94141e8dc76 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/healthcareservice.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/healthcareservice.sch @@ -10,51 +10,51 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + HealthcareService - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + att-1: It the Attachment has data, it SHALL have a contentType - + cpt-2: A system is required if a value is provided. - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/imagingobjectselection.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/imagingobjectselection.sch index daabd06f97e..613a1557ff2 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/imagingobjectselection.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/imagingobjectselection.sch @@ -10,33 +10,33 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + ImagingObjectSelection - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/imagingstudy.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/imagingstudy.sch index f2dfc5635da..4873f1120f7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/imagingstudy.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/imagingstudy.sch @@ -10,54 +10,54 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + ImagingStudy - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + att-1: It the Attachment has data, it SHALL have a contentType - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/immunization.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/immunization.sch index 015b020142a..637485f6d0a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/immunization.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/immunization.sch @@ -10,61 +10,61 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + Immunization - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + imm-2: If immunization was administered (wasNotGiven=false) then explanation.reasonNotGiven SHALL be absent. imm-1: If immunization was not administred (wasNotGiven=true) then there SHALL be no reaction nor explanation.reason present - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + qty-3: If a code for the units is present, the system SHALL also be present - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/immunizationrecommendation.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/immunizationrecommendation.sch index 85dca6a631d..9c21b53a1ac 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/immunizationrecommendation.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/immunizationrecommendation.sch @@ -10,42 +10,42 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + ImmunizationRecommendation - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/implementationguide.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/implementationguide.sch index c60f33ef306..fd47810d439 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/implementationguide.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/implementationguide.sch @@ -10,39 +10,39 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + ImplementationGuide - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + cpt-2: A system is required if a value is provided. - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/list.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/list.sch index 80e6e667f8a..f2f1db6cb21 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/list.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/list.sch @@ -10,46 +10,44 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + List - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource + lst-2: The deleted flag can only be used if the mode of the list is "changes" + lst-1: A list can only have an emptyReason if it is empty - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - - lst-2: The deleted flag can only be used if the mode of the list is "changes" - lst-1: A list can only have an emptyReason if it is empty - - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/location.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/location.sch index f8b34bf7d31..2cfd8d6e391 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/location.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/location.sch @@ -10,45 +10,45 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + Location - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + cpt-2: A system is required if a value is provided. - + per-1: If present, start SHALL have a lower value than end - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/media.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/media.sch index 50cc9cb0cef..3cfdcf6e8cf 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/media.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/media.sch @@ -10,45 +10,43 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + Media - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - mda-1: Height can only be used for a photo or video mda-2: Width can only be used for a photo or video mda-3: Frames can only be used for a photo mda-4: Length can only be used for an audio or a video - + + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes + txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes + txt-2: The narrative SHALL have some non-whitespace content + + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + att-1: It the Attachment has data, it SHALL have a contentType - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/medication.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/medication.sch index 2b03568e44b..6d5b3b7441f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/medication.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/medication.sch @@ -10,45 +10,45 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + Medication - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + rat-1: numerator and denominator SHALL both be present, or both be absent. If both are absent, there SHALL be some extension present - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + ref-1: SHALL have a local reference if the resource is provided inline - + qty-3: If a code for the units is present, the system SHALL also be present - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/medicationadministration.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/medicationadministration.sch index 3da93282e99..6943a627839 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/medicationadministration.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/medicationadministration.sch @@ -10,72 +10,81 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + MedicationAdministration - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + mad-2: Reason not given is only permitted if wasNotGiven is true - + mad-3: Reason given is only permitted if wasNotGiven is false - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + mad-1: SHALL have at least one of dosage.quantity and dosage.rate - + qty-3: If a code for the units is present, the system SHALL also be present - + rat-1: numerator and denominator SHALL both be present, or both be absent. If both are absent, there SHALL be some extension present - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + + rng-2: If present, low SHALL have a lower value than high + + + qty-3: If a code for the units is present, the system SHALL also be present + + + qty-3: If a code for the units is present, the system SHALL also be present + + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/medicationdispense.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/medicationdispense.sch index 3e50d0e5931..dcfe17cbc11 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/medicationdispense.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/medicationdispense.sch @@ -10,123 +10,125 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + MedicationDispense - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource + mdd-1: whenHandedOver cannot be before whenPrepared - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - - mdd-1: whenHandedOver cannot be before whenPrepared - - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - - per-1: If present, start SHALL have a lower value than end - - + tim-6: If there's a periodMax, there must be a period tim-7: If there's a durationMax, there must be a duration tim-1: if there's a duration, there needs to be duration units tim-2: if there's a period, there needs to be duration units tim-3: Either frequency or when can exist, not both - + qty-3: If a code for the units is present, the system SHALL also be present - + rng-2: If present, low SHALL have a lower value than high - rng-3: Quantity values cannot have a comparator when used in a Range - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + per-1: If present, start SHALL have a lower value than end - + tim-4: duration SHALL be a non-negative value - + tim-5: period SHALL be a non-negative value - + rng-2: If present, low SHALL have a lower value than high - rng-3: Quantity values cannot have a comparator when used in a Range - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + rat-1: numerator and denominator SHALL both be present, or both be absent. If both are absent, there SHALL be some extension present - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + + rng-2: If present, low SHALL have a lower value than high + + + qty-3: If a code for the units is present, the system SHALL also be present + + + qty-3: If a code for the units is present, the system SHALL also be present + + rat-1: numerator and denominator SHALL both be present, or both be absent. If both are absent, there SHALL be some extension present - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/medicationorder.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/medicationorder.sch new file mode 100644 index 00000000000..6fdb1d36889 --- /dev/null +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/medicationorder.sch @@ -0,0 +1,136 @@ + + + + + + + Global + + global-1: All FHIR elements must have a @value or children + + + + MedicationOrder + + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources + dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative + dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated + dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource + + + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes + txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes + txt-2: The narrative SHALL have some non-whitespace content + + + per-1: If present, start SHALL have a lower value than end + + + ref-1: SHALL have a local reference if the resource is provided inline + + + ref-1: SHALL have a local reference if the resource is provided inline + + + ref-1: SHALL have a local reference if the resource is provided inline + + + ref-1: SHALL have a local reference if the resource is provided inline + + + ref-1: SHALL have a local reference if the resource is provided inline + + + ref-1: SHALL have a local reference if the resource is provided inline + + + tim-6: If there's a periodMax, there must be a period + tim-7: If there's a durationMax, there must be a duration + tim-1: if there's a duration, there needs to be duration units + tim-2: if there's a period, there needs to be duration units + tim-3: Either frequency or when can exist, not both + + + qty-3: If a code for the units is present, the system SHALL also be present + + + rng-2: If present, low SHALL have a lower value than high + + + qty-3: If a code for the units is present, the system SHALL also be present + + + qty-3: If a code for the units is present, the system SHALL also be present + + + per-1: If present, start SHALL have a lower value than end + + + tim-4: duration SHALL be a non-negative value + + + tim-5: period SHALL be a non-negative value + + + rng-2: If present, low SHALL have a lower value than high + + + qty-3: If a code for the units is present, the system SHALL also be present + + + qty-3: If a code for the units is present, the system SHALL also be present + + + qty-3: If a code for the units is present, the system SHALL also be present + + + rat-1: numerator and denominator SHALL both be present, or both be absent. If both are absent, there SHALL be some extension present + + + qty-3: If a code for the units is present, the system SHALL also be present + + + qty-3: If a code for the units is present, the system SHALL also be present + + + rng-2: If present, low SHALL have a lower value than high + + + qty-3: If a code for the units is present, the system SHALL also be present + + + qty-3: If a code for the units is present, the system SHALL also be present + + + rat-1: numerator and denominator SHALL both be present, or both be absent. If both are absent, there SHALL be some extension present + + + qty-3: If a code for the units is present, the system SHALL also be present + + + qty-3: If a code for the units is present, the system SHALL also be present + + + ref-1: SHALL have a local reference if the resource is provided inline + + + per-1: If present, start SHALL have a lower value than end + + + qty-3: If a code for the units is present, the system SHALL also be present + + + qty-3: If a code for the units is present, the system SHALL also be present + + + ref-1: SHALL have a local reference if the resource is provided inline + + + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/medicationstatement.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/medicationstatement.sch index 9efd1f88c25..6bd7b96705f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/medicationstatement.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/medicationstatement.sch @@ -10,104 +10,110 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + MedicationStatement - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + mst-1: Reason not taken is only permitted if wasNotTaken is true - + mst-2: Reason for use is only permitted if wasNotTaken is false - + mst-2: Reason for use is only permitted if wasNotTaken is false - - ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + tim-6: If there's a periodMax, there must be a period tim-7: If there's a durationMax, there must be a duration tim-1: if there's a duration, there needs to be duration units tim-2: if there's a period, there needs to be duration units tim-3: Either frequency or when can exist, not both - + qty-3: If a code for the units is present, the system SHALL also be present - + rng-2: If present, low SHALL have a lower value than high - rng-3: Quantity values cannot have a comparator when used in a Range - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + per-1: If present, start SHALL have a lower value than end - + tim-4: duration SHALL be a non-negative value - + tim-5: period SHALL be a non-negative value - + qty-3: If a code for the units is present, the system SHALL also be present - + rat-1: numerator and denominator SHALL both be present, or both be absent. If both are absent, there SHALL be some extension present - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + + rng-2: If present, low SHALL have a lower value than high + + + qty-3: If a code for the units is present, the system SHALL also be present + + + qty-3: If a code for the units is present, the system SHALL also be present + + rat-1: numerator and denominator SHALL both be present, or both be absent. If both are absent, there SHALL be some extension present - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/messageheader.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/messageheader.sch index dc685b570d7..043b689019f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/messageheader.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/messageheader.sch @@ -10,51 +10,51 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + MessageHeader - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + ref-1: SHALL have a local reference if the resource is provided inline - + cpt-2: A system is required if a value is provided. - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/namingsystem.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/namingsystem.sch index 344ae83f370..8e06fed95bc 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/namingsystem.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/namingsystem.sch @@ -10,41 +10,39 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + NamingSystem - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - - - txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes - txt-2: The narrative SHALL have some non-whitespace content - - nsd-1: Root systems cannot have uuid or sid identifiers nsd-3: Can only have replacedBy if namingsystem is retired nsd-2: Can't have more than one preferred identifier for a type - + + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes + txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes + txt-2: The narrative SHALL have some non-whitespace content + + cpt-2: A system is required if a value is provided. - + per-1: If present, start SHALL have a lower value than end - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/nutritionorder.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/nutritionorder.sch index 0137f1b1b7f..a9f5ea07a9f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/nutritionorder.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/nutritionorder.sch @@ -10,159 +10,154 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + NutritionOrder - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource + nor-1: Nutrition Order SHALL contain either Oral Diet , Supplement, or Enteral Formula class - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - - nor-1: Nutrition Order SHALL contain either Oral Diet , Supplement, or Enteral Formula class - - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + tim-6: If there's a periodMax, there must be a period tim-7: If there's a durationMax, there must be a duration tim-1: if there's a duration, there needs to be duration units tim-2: if there's a period, there needs to be duration units tim-3: Either frequency or when can exist, not both - + qty-3: If a code for the units is present, the system SHALL also be present - + rng-2: If present, low SHALL have a lower value than high - rng-3: Quantity values cannot have a comparator when used in a Range - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + per-1: If present, start SHALL have a lower value than end - + tim-4: duration SHALL be a non-negative value - + tim-5: period SHALL be a non-negative value - + qty-3: If a code for the units is present, the system SHALL also be present - + tim-6: If there's a periodMax, there must be a period tim-7: If there's a durationMax, there must be a duration tim-1: if there's a duration, there needs to be duration units tim-2: if there's a period, there needs to be duration units tim-3: Either frequency or when can exist, not both - + qty-3: If a code for the units is present, the system SHALL also be present - + rng-2: If present, low SHALL have a lower value than high - rng-3: Quantity values cannot have a comparator when used in a Range - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + per-1: If present, start SHALL have a lower value than end - + tim-4: duration SHALL be a non-negative value - + tim-5: period SHALL be a non-negative value - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + tim-6: If there's a periodMax, there must be a period tim-7: If there's a durationMax, there must be a duration tim-1: if there's a duration, there needs to be duration units tim-2: if there's a period, there needs to be duration units tim-3: Either frequency or when can exist, not both - + qty-3: If a code for the units is present, the system SHALL also be present - + rng-2: If present, low SHALL have a lower value than high - rng-3: Quantity values cannot have a comparator when used in a Range - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + per-1: If present, start SHALL have a lower value than end - + tim-4: duration SHALL be a non-negative value - + tim-5: period SHALL be a non-negative value - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + rat-1: numerator and denominator SHALL both be present, or both be absent. If both are absent, there SHALL be some extension present - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/observation.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/observation.sch index 1b603c7e61e..40a0443b1c0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/observation.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/observation.sch @@ -10,142 +10,133 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + Observation - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource + obs-7: Component code Shall not be same as observation code + obs-6: Shall only be present if Observation.value[x] is not present - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - - obs-7: Component code Shall not be same as observation code - obs-6: Shall only be present if Observation.value[x] is not present - - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + qty-3: If a code for the units is present, the system SHALL also be present - + rng-2: If present, low SHALL have a lower value than high - rng-3: Quantity values cannot have a comparator when used in a Range - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + rat-1: numerator and denominator SHALL both be present, or both be absent. If both are absent, there SHALL be some extension present - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + att-1: It the Attachment has data, it SHALL have a contentType - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + obs-3: Must have at least a low or a high or text - + obs-4: Low range comparators can only be '>' or '>=' or empty - - qty-3: If a code for the units is present, the system SHALL also be present - + obs-5: High range comparators can only be '<' or '<=' or empty - - qty-3: If a code for the units is present, the system SHALL also be present - + rng-2: If present, low SHALL have a lower value than high - rng-3: Quantity values cannot have a comparator when used in a Range - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + ref-1: SHALL have a local reference if the resource is provided inline - + qty-3: If a code for the units is present, the system SHALL also be present - + rng-2: If present, low SHALL have a lower value than high - rng-3: Quantity values cannot have a comparator when used in a Range - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + rat-1: numerator and denominator SHALL both be present, or both be absent. If both are absent, there SHALL be some extension present - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + att-1: It the Attachment has data, it SHALL have a contentType - + per-1: If present, start SHALL have a lower value than end - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/operationdefinition.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/operationdefinition.sch index 8fa38db30a8..9750f04d83f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/operationdefinition.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/operationdefinition.sch @@ -10,42 +10,42 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + OperationDefinition - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + cpt-2: A system is required if a value is provided. - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + opd-1: Either a type must be provided, or parts - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/operationoutcome.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/operationoutcome.sch index 491d03b8709..a88af447a78 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/operationoutcome.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/operationoutcome.sch @@ -10,24 +10,24 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + OperationOutcome - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/order.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/order.sch index 2a722ef37df..637488753ba 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/order.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/order.sch @@ -10,77 +10,76 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + Order - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ord-1: Provide a code or a schedule, but not both - + tim-6: If there's a periodMax, there must be a period tim-7: If there's a durationMax, there must be a duration tim-1: if there's a duration, there needs to be duration units tim-2: if there's a period, there needs to be duration units tim-3: Either frequency or when can exist, not both - + qty-3: If a code for the units is present, the system SHALL also be present - + rng-2: If present, low SHALL have a lower value than high - rng-3: Quantity values cannot have a comparator when used in a Range - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + per-1: If present, start SHALL have a lower value than end - + tim-4: duration SHALL be a non-negative value - + tim-5: period SHALL be a non-negative value - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/orderresponse.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/orderresponse.sch index c976bf72368..f3202cc37e9 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/orderresponse.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/orderresponse.sch @@ -10,39 +10,39 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + OrderResponse - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/organization.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/organization.sch index 4b32cce7266..9662452d4f3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/organization.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/organization.sch @@ -10,63 +10,59 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + Organization - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource + org-1: The organization SHALL at least have a name or an id, and possibly more than one - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - - org-1: The organization SHALL at least have a name or an id, and possibly more than one - - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + org-3: The telecom of an organization can never be of use 'home' - - cpt-2: A system is required if a value is provided. - + per-1: If present, start SHALL have a lower value than end - + org-2: An address of an organization can never be of use 'home' - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + cpt-2: A system is required if a value is provided. - + per-1: If present, start SHALL have a lower value than end - + per-1: If present, start SHALL have a lower value than end - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/patient.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/patient.sch index 61d93814eef..1733650ed3f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/patient.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/patient.sch @@ -10,75 +10,75 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + Patient - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + cpt-2: A system is required if a value is provided. - + per-1: If present, start SHALL have a lower value than end - + per-1: If present, start SHALL have a lower value than end - + att-1: It the Attachment has data, it SHALL have a contentType - + pat-1: SHALL at least contain a contact's details or a reference to an organization - + per-1: If present, start SHALL have a lower value than end - + cpt-2: A system is required if a value is provided. - + per-1: If present, start SHALL have a lower value than end - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/paymentnotice.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/paymentnotice.sch index 0c2c3532149..96dd8fcf196 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/paymentnotice.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/paymentnotice.sch @@ -10,45 +10,45 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + PaymentNotice - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/paymentreconciliation.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/paymentreconciliation.sch index 69cdfd45549..99d76ea95b7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/paymentreconciliation.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/paymentreconciliation.sch @@ -10,63 +10,63 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + PaymentReconciliation - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/person.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/person.sch index 0e3a8efc697..776486a67e8 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/person.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/person.sch @@ -10,51 +10,51 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + Person - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + cpt-2: A system is required if a value is provided. - + per-1: If present, start SHALL have a lower value than end - + per-1: If present, start SHALL have a lower value than end - + att-1: It the Attachment has data, it SHALL have a contentType - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/practitioner.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/practitioner.sch index 23acc2764fc..0c78405fc8e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/practitioner.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/practitioner.sch @@ -10,69 +10,69 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + Practitioner - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + cpt-2: A system is required if a value is provided. - + per-1: If present, start SHALL have a lower value than end - + per-1: If present, start SHALL have a lower value than end - + att-1: It the Attachment has data, it SHALL have a contentType - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/procedure.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/procedure.sch index 6594fc6f646..f4ecdccb3db 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/procedure.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/procedure.sch @@ -10,60 +10,60 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + Procedure - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/procedurerequest.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/procedurerequest.sch index 162a0b48652..fd77cf1bb80 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/procedurerequest.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/procedurerequest.sch @@ -10,77 +10,76 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + ProcedureRequest - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + tim-6: If there's a periodMax, there must be a period tim-7: If there's a durationMax, there must be a duration tim-1: if there's a duration, there needs to be duration units tim-2: if there's a period, there needs to be duration units tim-3: Either frequency or when can exist, not both - + qty-3: If a code for the units is present, the system SHALL also be present - + rng-2: If present, low SHALL have a lower value than high - rng-3: Quantity values cannot have a comparator when used in a Range - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + per-1: If present, start SHALL have a lower value than end - + tim-4: duration SHALL be a non-negative value - + tim-5: period SHALL be a non-negative value - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/processrequest.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/processrequest.sch index 87c74e5945d..103a6fe13e9 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/processrequest.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/processrequest.sch @@ -10,48 +10,48 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + ProcessRequest - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/processresponse.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/processresponse.sch index 42a69ee1120..bdfd991842c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/processresponse.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/processresponse.sch @@ -10,42 +10,42 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + ProcessResponse - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/provenance.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/provenance.sch index 5a491042951..2ed5ae671a7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/provenance.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/provenance.sch @@ -10,45 +10,45 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + Provenance - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/questionnaire.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/questionnaire.sch index 418f06b4e77..273dee67ffb 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/questionnaire.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/questionnaire.sch @@ -10,46 +10,44 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + Questionnaire - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource + que-3: If root, group must be 'required' + que-2: The link ids for groups and questions must be unique within the questionnaire - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - - que-3: If root group must be "required" - que-2: The link ids for groups and questions must be unique within the questionnaire - - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + cpt-2: A system is required if a value is provided. - + per-1: If present, start SHALL have a lower value than end - + que-1: Groups may either contain questions or groups but not both - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/questionnaireresponse.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/questionnaireresponse.sch index 6180efa1d8e..7c02863eb4f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/questionnaireresponse.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/questionnaireresponse.sch @@ -10,60 +10,60 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + QuestionnaireResponse - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + qrs-1: Groups may either contain questions or groups but not both - + ref-1: SHALL have a local reference if the resource is provided inline - + att-1: It the Attachment has data, it SHALL have a contentType - + qty-3: If a code for the units is present, the system SHALL also be present - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/referralrequest.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/referralrequest.sch index fe0895d0eb5..c3ab99a4824 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/referralrequest.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/referralrequest.sch @@ -10,48 +10,48 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + ReferralRequest - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/relatedperson.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/relatedperson.sch index 92df7c8d901..0ac87a00af9 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/relatedperson.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/relatedperson.sch @@ -10,51 +10,51 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + RelatedPerson - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + cpt-2: A system is required if a value is provided. - + per-1: If present, start SHALL have a lower value than end - + per-1: If present, start SHALL have a lower value than end - + att-1: It the Attachment has data, it SHALL have a contentType - + per-1: If present, start SHALL have a lower value than end - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/riskassessment.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/riskassessment.sch index 4d6dab506d7..17ec9583218 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/riskassessment.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/riskassessment.sch @@ -10,71 +10,67 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + RiskAssessment - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ras-2: Must be <= 100 - + ras-1: low and high must be percentages, if present - - rng-2: If present, low SHALL have a lower value than high - rng-3: Quantity values cannot have a comparator when used in a Range - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + per-1: If present, start SHALL have a lower value than end - + rng-2: If present, low SHALL have a lower value than high - rng-3: Quantity values cannot have a comparator when used in a Range - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/schedule.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/schedule.sch index c953aa48d9d..18085fa80cb 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/schedule.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/schedule.sch @@ -10,36 +10,36 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + Schedule - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/searchparameter.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/searchparameter.sch index 9636496ac34..907ab7e4916 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/searchparameter.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/searchparameter.sch @@ -10,33 +10,31 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + SearchParameter - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource + spd-1: If an xpath is present, there SHALL be be an xpathUsage - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - - spd-1: If an xpath is present, there SHALL be be an xpathUsage - - + cpt-2: A system is required if a value is provided. - + per-1: If present, start SHALL have a lower value than end - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/slot.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/slot.sch index 58101ff69fa..754a56d5864 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/slot.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/slot.sch @@ -10,33 +10,33 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + Slot - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/specimen.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/specimen.sch index 7d61c05f78d..f729cb27a07 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/specimen.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/specimen.sch @@ -10,69 +10,69 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + Specimen - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + qty-3: If a code for the units is present, the system SHALL also be present - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/structuredefinition.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/structuredefinition.sch index dab0c173189..6d1379bd77a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/structuredefinition.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/structuredefinition.sch @@ -10,58 +10,56 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + StructureDefinition - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource + sdf-9: In any snapshot or differential, no label, code or requirements on the an element without a "." in the path (e.g. the first element) + sdf-8: In any snapshot or differential, all the elements except the first have to have a path that starts with the path of the first + "." + sdf-12: element.base cannot appear if theres's no base on the structure definition + sdf-11: If there's a constrained type, it's content must match the path name in the first element of a snapshot + sdf-13: element.base must appear if theres's a base on the structure definition + sdf-10: If the structure is not abstract, or there's a constrained type, then there SHALL be a base + sdf-7: If the type is Resource or Type, the url has to start with "http://hl7.org/fhir/StructureDefinition/" and the tail must match the name + sdf-6: A structure must have either a differential, or a snapshot (or both) + sdf-5: If the type is 'extension' then the structure must have context information + sdf-4: A structure must have a base unless it’s type is 'abstract' - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - - sdf-9: In any snapshot or differential, no label, code or requirements on the an element without a "." in the path (e.g. the first element) - sdf-8: In any snapshot or differential, all the elements except the first have to have a path that starts with the path of the first + "." - sdf-12: element.base cannot appear if theres's no base on the structure definition - sdf-11: If there's a constrained type, it's content must match the path name in the first element of a snapshot - sdf-13: element.base must appear if theres's a base on the structure definition - sdf-10: If the struture is not abstract, or there's a constrained type, then there SHALL be a base - sdf-7: If the type is Resource or Type, the url has to start with "http://hl7.org/fhir/StructureDefinition/" and the tail must match the name - sdf-6: A structure must have either a differential, or a snapshot (or both) - sdf-5: If the type is 'extension' then the structure must have context information - sdf-4: A structure must have a base unless it’s type is 'abstract' - - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + cpt-2: A system is required if a value is provided. - + per-1: If present, start SHALL have a lower value than end - + sdf-2: Must have at a name or a uri (or both) - + sdf-3: If a structure is a snapshot, then each element definition must have a formal definition, and cardinalities sdf-1: Element paths must be unique - or not (LM) - - eld-2: Min <= Max + + eld-2: Min <= Max eld-5: Either a namereference or a fixed value (but not both) is permitted eld-7: Pattern may only be specified if there is one type eld-6: Fixed value may only be specified if there is one type @@ -71,27 +69,27 @@ eld-13: Types must be unique by the combination of code and profile eld-15: default value and meaningWhenMissing are mutually exclusive - + eld-1: If there are no discriminators, there must be a definition - + eld-3: Max SHALL be a number or "*" - + eld-4: Aggregation may only be specified if one of the allowed types for the element is a resource - + eld-10: provide either a reference or a description (or both) eld-9: Example value sets are always extensible - + eld-12: uri SHALL start with http:// or https:// - + ref-1: SHALL have a local reference if the resource is provided inline - - eld-2: Min <= Max + + eld-2: Min <= Max eld-5: Either a namereference or a fixed value (but not both) is permitted eld-7: Pattern may only be specified if there is one type eld-6: Fixed value may only be specified if there is one type @@ -101,24 +99,24 @@ eld-13: Types must be unique by the combination of code and profile eld-15: default value and meaningWhenMissing are mutually exclusive - + eld-1: If there are no discriminators, there must be a definition - + eld-3: Max SHALL be a number or "*" - + eld-4: Aggregation may only be specified if one of the allowed types for the element is a resource - + eld-10: provide either a reference or a description (or both) eld-9: Example value sets are always extensible - + eld-12: uri SHALL start with http:// or https:// - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/subscription.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/subscription.sch index ce21e551540..f084e6f0fee 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/subscription.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/subscription.sch @@ -10,30 +10,30 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + Subscription - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + cpt-2: A system is required if a value is provided. - + per-1: If present, start SHALL have a lower value than end - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/substance.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/substance.sch index c151776a687..32486c3604a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/substance.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/substance.sch @@ -10,51 +10,51 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + Substance - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + qty-3: If a code for the units is present, the system SHALL also be present - + rat-1: numerator and denominator SHALL both be present, or both be absent. If both are absent, there SHALL be some extension present - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/supplydelivery.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/supplydelivery.sch index bdab2dda485..0a3615f84d3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/supplydelivery.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/supplydelivery.sch @@ -10,51 +10,51 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + SupplyDelivery - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + qty-3: If a code for the units is present, the system SHALL also be present - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/supplyrequest.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/supplyrequest.sch index a07107b8780..bdcb6d0cfe2 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/supplyrequest.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/supplyrequest.sch @@ -10,74 +10,73 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + SupplyRequest - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + tim-6: If there's a periodMax, there must be a period tim-7: If there's a durationMax, there must be a duration tim-1: if there's a duration, there needs to be duration units tim-2: if there's a period, there needs to be duration units tim-3: Either frequency or when can exist, not both - + qty-3: If a code for the units is present, the system SHALL also be present - + rng-2: If present, low SHALL have a lower value than high - rng-3: Quantity values cannot have a comparator when used in a Range - + qty-3: If a code for the units is present, the system SHALL also be present - + qty-3: If a code for the units is present, the system SHALL also be present - + per-1: If present, start SHALL have a lower value than end - + tim-4: duration SHALL be a non-negative value - + tim-5: period SHALL be a non-negative value - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/testscript.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/testscript.sch index 3c128a2dae5..54222beae4c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/testscript.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/testscript.sch @@ -10,81 +10,79 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + TestScript - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource + inv-16: Assertions SHALL be present in TestScript.setup.action and TestScript.test.action only. + inv-15: Operations SHALL be present in TestScript.setup.action, TestScript.test.action and TestScript.teardown.action only. - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - - inv-16: Assertions SHALL be present in TestScript.setup.action and TestScript.test.action only. - inv-15: Operations SHALL be present in TestScript.setup.action, TestScript.test.action and TestScript.teardown.action only. - - + cpt-2: A system is required if a value is provided. - + per-1: If present, start SHALL have a lower value than end - + inv-5: TestScript metadata capabilities SHALL contain required or validated or both. - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + inv-4: Variable cannot contain both headerField and path. - + inv-6: Setup metadata capabilities SHALL contain required or validated or both. - + inv-1: Setup action SHALL contain either an operation or assert but not both. - + inv-10: Setup operation SHALL contain either sourceId or targetId or params or url. - + inv-8: Only a single assertion SHALL be present within setup action assert element. inv-13: Setup action assert shall contain both compareToSourceId and compareToSourcePath or neither. - + inv-7: Test metadata capabilities SHALL contain required or validated or both. - + inv-2: Test action SHALL contain either an operation or assert but not both. - + inv-11: Test operation SHALL contain either sourceId or targetId or params or url. - + inv-9: Only a single assertion SHALL be present within test action assert element. inv-14: Test action assert shall contain both compareToSourceId and compareToSourcePath or neither. - + inv-3: Teardown action SHALL contain an operation. - + inv-12: Teardown operation SHALL contain either sourceId or targetId or params or url. - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/valueset.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/valueset.sch index 1060280ba30..0e39d75ed7c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/valueset.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/valueset.sch @@ -10,56 +10,54 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + ValueSet - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource + vsd-7: A defined code system (if present) SHALL have a different identifier to the value set itself + vsd-2: A value set with only one import SHALL also have an include and/or an exclude unless the value set includes and inline code system + vsd-5: Value set SHALL contain at least one of a codeSystem, a compose, or an expansion element - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - - vsd-7: A defined code system (if present) SHALL have a different identifier to the value set itself - vsd-2: A value set with only one import SHALL also have an include and/or an exclude unless the value set defines its own codes - vsd-5: Value set SHALL contain at least one of a define, a compose, or an expansion element - - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + cpt-2: A system is required if a value is provided. - + per-1: If present, start SHALL have a lower value than end - + vsd-8: Codes must be unique vsd-3: Within a code system definition, all the codes SHALL be unique - + vsd-1: A value set composition SHALL have an include or an import - + vsd-11: Cannot have both concept and filter - + vsd-6: SHALL have a code or a display vsd-9: Must have a code if not abstract vsd-10: Must have a system if a code is present - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/visionprescription.sch b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/visionprescription.sch index 9f6204e1057..7d39ec34c71 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/visionprescription.sch +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/schema/visionprescription.sch @@ -10,45 +10,45 @@ fhir-invariants.sch (the contents are identical; only include those resources relevant to your implementation). --> - - Global - - global-1: All FHIR elements must have a @value or children - - + + Global + + global-1: All FHIR elements must have a @value or children + + VisionPrescription - + dom-2: If the resource is contained in another resource, it SHALL NOT contain nested Resources dom-1: If the resource is contained in another resource, it SHALL NOT contain any narrative dom-4: If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated dom-3: If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource - + txt-3: The narrative SHALL contain only the basic html formatting attributes described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-1: The narrative SHALL contain only the basic html formatting elements described in chapters 7-11 (except section 4 of chapter 9) and 15 of the HTML 4.0 standard, <a> elements (either name or href), images and internally contained style attributes txt-2: The narrative SHALL have some non-whitespace content - + per-1: If present, start SHALL have a lower value than end - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + ref-1: SHALL have a local reference if the resource is provided inline - + qty-3: If a code for the units is present, the system SHALL also be present - + diff --git a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/validation/FhirInstanceValidatorTest.java b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/validation/FhirInstanceValidatorTest.java index fead155b9e2..ffec701a305 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/validation/FhirInstanceValidatorTest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/validation/FhirInstanceValidatorTest.java @@ -4,6 +4,8 @@ import static org.hamcrest.Matchers.stringContainsInOrder; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; +import org.hl7.fhir.instance.model.QuestionnaireResponse; +import org.hl7.fhir.instance.model.QuestionnaireResponse.QuestionnaireResponseStatus; import org.junit.Before; import org.junit.Test; @@ -69,4 +71,17 @@ public class FhirInstanceValidatorTest { assertEquals(output.toString(), 1, output.getMessages().size()); assertEquals("Element is unknown or does not match any slice", output.getMessages().get(0).getMessage()); } + + + + @Test + public void testValidateResourceWithReference() { + QuestionnaireResponse resp = new QuestionnaireResponse(); + resp.setStatus(QuestionnaireResponseStatus.COMPLETED); + resp.getQuestionnaire().setReference("Questionnaire/1234"); + + ValidationResult output = val.validateWithResult(resp); + assertEquals(output.toString(), 0, output.getMessages().size()); + } + }