From 5086145132b0799a865da663fca0afd5e70f8bfa Mon Sep 17 00:00:00 2001 From: jamesagnew Date: Mon, 2 May 2016 08:10:43 -0400 Subject: [PATCH] Add targets to search parameters --- .../uhn/fhir/jpa/config/BaseDstu1Config.java | 6 + .../uhn/fhir/jpa/config/BaseDstu2Config.java | 7 + .../jpa/config/dstu3/BaseDstu3Config.java | 7 + .../ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java | 49 +++---- .../jpa/dao/BaseSearchParamExtractor.java | 25 +++- .../jpa/dao/SearchParamExtractorDstu1.java | 4 - .../jpa/dao/SearchParamExtractorDstu2.java | 4 - .../dao/dstu3/JpaValidationSupportDstu3.java | 9 ++ .../dao/dstu3/SearchParamExtractorDstu3.java | 73 +++++++--- .../FhirResourceDaoDstu3SearchNoFtTest.java | 32 ++++- .../dstu3/SearchParamExtractorDstu3Test.java | 6 +- .../org/hl7/fhir/dstu3/model/Account.java | 38 +++-- .../fhir/dstu3/model/AllergyIntolerance.java | 62 ++++++--- .../org/hl7/fhir/dstu3/model/Appointment.java | 42 ++++-- .../fhir/dstu3/model/AppointmentResponse.java | 30 ++-- .../org/hl7/fhir/dstu3/model/AuditEvent.java | 66 ++++++--- .../java/org/hl7/fhir/dstu3/model/Basic.java | 22 ++- .../java/org/hl7/fhir/dstu3/model/Binary.java | 6 +- .../org/hl7/fhir/dstu3/model/BodySite.java | 14 +- .../java/org/hl7/fhir/dstu3/model/Bundle.java | 14 +- .../org/hl7/fhir/dstu3/model/CarePlan.java | 58 ++++++-- .../org/hl7/fhir/dstu3/model/CareTeam.java | 30 ++-- .../java/org/hl7/fhir/dstu3/model/Claim.java | 58 ++++++-- .../hl7/fhir/dstu3/model/ClaimResponse.java | 38 +++-- .../fhir/dstu3/model/ClinicalImpression.java | 56 ++++++-- .../org/hl7/fhir/dstu3/model/CodeSystem.java | 54 ++++++-- .../hl7/fhir/dstu3/model/Communication.java | 50 +++++-- .../dstu3/model/CommunicationRequest.java | 54 ++++++-- .../dstu3/model/CompartmentDefinition.java | 26 +++- .../org/hl7/fhir/dstu3/model/Composition.java | 60 ++++++-- .../org/hl7/fhir/dstu3/model/ConceptMap.java | 74 +++++++--- .../org/hl7/fhir/dstu3/model/Condition.java | 58 ++++++-- .../org/hl7/fhir/dstu3/model/Conformance.java | 70 +++++++--- .../org/hl7/fhir/dstu3/model/Contract.java | 34 ++++- .../org/hl7/fhir/dstu3/model/Coverage.java | 54 ++++++-- .../org/hl7/fhir/dstu3/model/DataElement.java | 46 +++++-- .../fhir/dstu3/model/DecisionSupportRule.java | 26 +++- .../model/DecisionSupportServiceModule.java | 26 +++- .../hl7/fhir/dstu3/model/DetectedIssue.java | 24 +++- .../java/org/hl7/fhir/dstu3/model/Device.java | 38 +++-- .../hl7/fhir/dstu3/model/DeviceComponent.java | 14 +- .../hl7/fhir/dstu3/model/DeviceMetric.java | 22 ++- .../fhir/dstu3/model/DeviceUseRequest.java | 14 +- .../fhir/dstu3/model/DeviceUseStatement.java | 14 +- .../hl7/fhir/dstu3/model/DiagnosticOrder.java | 70 +++++++--- .../fhir/dstu3/model/DiagnosticReport.java | 62 ++++++--- .../fhir/dstu3/model/DocumentManifest.java | 50 +++++-- .../fhir/dstu3/model/DocumentReference.java | 104 ++++++++++---- .../hl7/fhir/dstu3/model/DomainResource.java | 2 +- .../fhir/dstu3/model/EligibilityRequest.java | 42 ++++-- .../fhir/dstu3/model/EligibilityResponse.java | 50 +++++-- .../org/hl7/fhir/dstu3/model/Encounter.java | 82 ++++++++--- .../org/hl7/fhir/dstu3/model/Endpoint.java | 14 +- .../fhir/dstu3/model/EnrollmentRequest.java | 14 +- .../fhir/dstu3/model/EnrollmentResponse.java | 6 +- .../hl7/fhir/dstu3/model/EpisodeOfCare.java | 38 +++-- .../fhir/dstu3/model/ExpansionProfile.java | 34 +++-- .../dstu3/model/ExplanationOfBenefit.java | 54 ++++++-- .../fhir/dstu3/model/FamilyMemberHistory.java | 26 +++- .../java/org/hl7/fhir/dstu3/model/Flag.java | 22 ++- .../java/org/hl7/fhir/dstu3/model/Goal.java | 26 +++- .../java/org/hl7/fhir/dstu3/model/Group.java | 38 +++-- .../fhir/dstu3/model/GuidanceResponse.java | 2 +- .../fhir/dstu3/model/HealthcareService.java | 34 +++-- .../hl7/fhir/dstu3/model/ImagingExcerpt.java | 26 +++- .../dstu3/model/ImagingObjectSelection.java | 26 +++- .../hl7/fhir/dstu3/model/ImagingStudy.java | 46 +++++-- .../hl7/fhir/dstu3/model/Immunization.java | 66 ++++++--- .../model/ImmunizationRecommendation.java | 38 +++-- .../fhir/dstu3/model/ImplementationGuide.java | 44 ++++-- .../org/hl7/fhir/dstu3/model/Library.java | 26 +++- .../org/hl7/fhir/dstu3/model/Linkage.java | 14 +- .../hl7/fhir/dstu3/model/ListResource.java | 48 +++++-- .../org/hl7/fhir/dstu3/model/Location.java | 58 ++++++-- .../org/hl7/fhir/dstu3/model/Measure.java | 26 +++- .../hl7/fhir/dstu3/model/MeasureReport.java | 6 +- .../java/org/hl7/fhir/dstu3/model/Media.java | 34 +++-- .../org/hl7/fhir/dstu3/model/Medication.java | 34 +++-- .../dstu3/model/MedicationAdministration.java | 46 +++++-- .../fhir/dstu3/model/MedicationDispense.java | 54 ++++++-- .../hl7/fhir/dstu3/model/MedicationOrder.java | 34 +++-- .../fhir/dstu3/model/MedicationStatement.java | 30 ++-- .../hl7/fhir/dstu3/model/MessageHeader.java | 56 ++++++-- .../fhir/dstu3/model/ModuleDefinition.java | 2 +- .../hl7/fhir/dstu3/model/NamingSystem.java | 58 ++++++-- .../hl7/fhir/dstu3/model/NutritionOrder.java | 42 ++++-- .../org/hl7/fhir/dstu3/model/Observation.java | 130 +++++++++++++----- .../fhir/dstu3/model/OperationDefinition.java | 58 ++++++-- .../fhir/dstu3/model/OperationOutcome.java | 2 +- .../java/org/hl7/fhir/dstu3/model/Order.java | 36 +++-- .../hl7/fhir/dstu3/model/OrderResponse.java | 24 +++- .../org/hl7/fhir/dstu3/model/OrderSet.java | 26 +++- .../hl7/fhir/dstu3/model/Organization.java | 50 +++++-- .../org/hl7/fhir/dstu3/model/Parameters.java | 2 +- .../org/hl7/fhir/dstu3/model/Patient.java | 102 ++++++++++---- .../hl7/fhir/dstu3/model/PaymentNotice.java | 46 +++++-- .../dstu3/model/PaymentReconciliation.java | 50 +++++-- .../java/org/hl7/fhir/dstu3/model/Person.java | 78 ++++++++--- .../hl7/fhir/dstu3/model/Practitioner.java | 82 ++++++++--- .../fhir/dstu3/model/PractitionerRole.java | 38 +++-- .../org/hl7/fhir/dstu3/model/Procedure.java | 38 +++-- .../fhir/dstu3/model/ProcedureRequest.java | 26 +++- .../hl7/fhir/dstu3/model/ProcessRequest.java | 26 +++- .../hl7/fhir/dstu3/model/ProcessResponse.java | 36 +++-- .../org/hl7/fhir/dstu3/model/Protocol.java | 10 +- .../org/hl7/fhir/dstu3/model/Provenance.java | 38 +++-- .../hl7/fhir/dstu3/model/Questionnaire.java | 34 +++-- .../dstu3/model/QuestionnaireResponse.java | 30 +++- .../hl7/fhir/dstu3/model/ReferralRequest.java | 50 +++++-- .../hl7/fhir/dstu3/model/RelatedPerson.java | 62 ++++++--- .../org/hl7/fhir/dstu3/model/Resource.java | 2 +- .../hl7/fhir/dstu3/model/RiskAssessment.java | 34 +++-- .../org/hl7/fhir/dstu3/model/Schedule.java | 18 ++- .../hl7/fhir/dstu3/model/SearchParameter.java | 34 +++-- .../org/hl7/fhir/dstu3/model/Sequence.java | 30 ++-- .../java/org/hl7/fhir/dstu3/model/Slot.java | 22 ++- .../org/hl7/fhir/dstu3/model/Specimen.java | 46 +++++-- .../fhir/dstu3/model/StructureDefinition.java | 90 ++++++++---- .../hl7/fhir/dstu3/model/StructureMap.java | 42 ++++-- .../hl7/fhir/dstu3/model/Subscription.java | 30 ++-- .../org/hl7/fhir/dstu3/model/Substance.java | 30 ++-- .../hl7/fhir/dstu3/model/SupplyDelivery.java | 22 ++- .../hl7/fhir/dstu3/model/SupplyRequest.java | 30 ++-- .../java/org/hl7/fhir/dstu3/model/Task.java | 52 +++++-- .../org/hl7/fhir/dstu3/model/TestScript.java | 30 ++-- .../org/hl7/fhir/dstu3/model/ValueSet.java | 46 +++++-- .../fhir/dstu3/model/VisionPrescription.java | 22 ++- .../hl7/fhir/utilities/xhtml/XhtmlNode.java | 8 -- .../src/main/resources/vm/resource.vm | 4 + 129 files changed, 3518 insertions(+), 1246 deletions(-) diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseDstu1Config.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseDstu1Config.java index 3bb88ca7795..f7d5dc1cf64 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseDstu1Config.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseDstu1Config.java @@ -28,6 +28,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; import ca.uhn.fhir.context.FhirContext; +import ca.uhn.fhir.jpa.dao.SearchParamExtractorDstu1; import ca.uhn.fhir.model.api.IResource; import ca.uhn.fhir.model.dstu2.composite.MetaDt; @@ -53,4 +54,9 @@ public class BaseDstu1Config extends BaseConfig { return retVal; } + @Bean(autowire=Autowire.BY_TYPE) + public SearchParamExtractorDstu1 searchParamExtractor() { + return new SearchParamExtractorDstu1(); + } + } diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseDstu2Config.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseDstu2Config.java index 341394f5477..80ee7d8fc6c 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseDstu2Config.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseDstu2Config.java @@ -30,6 +30,7 @@ import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.dao.FulltextSearchSvcImpl; import ca.uhn.fhir.jpa.dao.IFhirSystemDao; import ca.uhn.fhir.jpa.dao.IFulltextSearchSvc; +import ca.uhn.fhir.jpa.dao.SearchParamExtractorDstu2; import ca.uhn.fhir.model.dstu2.composite.MetaDt; @Configuration @@ -66,4 +67,10 @@ public class BaseDstu2Config extends BaseConfig { retVal.setDao(systemDaoDstu2()); return retVal; } + + @Bean(autowire=Autowire.BY_TYPE) + public SearchParamExtractorDstu2 searchParamExtractor() { + return new SearchParamExtractorDstu2(); + } + } diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/dstu3/BaseDstu3Config.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/dstu3/BaseDstu3Config.java index 07656f68dde..d87c7a81f03 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/dstu3/BaseDstu3Config.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/dstu3/BaseDstu3Config.java @@ -36,6 +36,7 @@ import ca.uhn.fhir.jpa.config.BaseConfig; import ca.uhn.fhir.jpa.dao.FulltextSearchSvcImpl; import ca.uhn.fhir.jpa.dao.IFhirSystemDao; import ca.uhn.fhir.jpa.dao.IFulltextSearchSvc; +import ca.uhn.fhir.jpa.dao.dstu3.SearchParamExtractorDstu3; import ca.uhn.fhir.jpa.validation.JpaValidationSupportChainDstu3; import ca.uhn.fhir.validation.IValidatorModule; @@ -83,9 +84,15 @@ public class BaseDstu3Config extends BaseConfig { return retVal; } + @Primary @Bean(autowire=Autowire.BY_NAME, name="myJpaValidationSupportChainDstu3") public IValidationSupport validationSupportChainDstu3() { return new JpaValidationSupportChainDstu3(); } + @Bean(autowire=Autowire.BY_TYPE) + public SearchParamExtractorDstu3 searchParamExtractor() { + return new SearchParamExtractorDstu3(); + } + } diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java index afe8c02c6ee..6351524d25b 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java @@ -213,6 +213,7 @@ public abstract class BaseHapiFhirDao implements IDao { @Autowired private ISearchDao mySearchDao; + @Autowired private ISearchParamExtractor mySearchParamExtractor; @Autowired @@ -380,15 +381,15 @@ public abstract class BaseHapiFhirDao implements IDao { return retVal; } + protected Set extractSearchParamCoords(ResourceTable theEntity, IBaseResource theResource) { + return mySearchParamExtractor.extractSearchParamCoords(theEntity, theResource); + } + // @Override // public void setResourceDaos(List> theResourceDaos) { // myResourceDaos = theResourceDaos; // } - protected Set extractSearchParamCoords(ResourceTable theEntity, IBaseResource theResource) { - return mySearchParamExtractor.extractSearchParamCoords(theEntity, theResource); - } - protected Set extractSearchParamDates(ResourceTable theEntity, IBaseResource theResource) { return mySearchParamExtractor.extractSearchParamDates(theEntity, theResource); } @@ -513,11 +514,11 @@ public abstract class BaseHapiFhirDao implements IDao { } } - protected DaoConfig getConfig() { return myConfig; } + @Override public FhirContext getContext() { return myContext; @@ -949,6 +950,10 @@ public abstract class BaseHapiFhirDao implements IDao { throw new NotImplementedException(""); } + public void setConfig(DaoConfig theConfig) { + myConfig = theConfig; + } + // protected MetaDt toMetaDt(Collection tagDefinitions) { // MetaDt retVal = new MetaDt(); // for (TagDefinition next : tagDefinitions) { @@ -967,28 +972,12 @@ public abstract class BaseHapiFhirDao implements IDao { // return retVal; // } - public void setConfig(DaoConfig theConfig) { - myConfig = theConfig; - } - @Autowired public void setContext(FhirContext theContext) { myContext = theContext; - switch (myContext.getVersion().getVersion()) { - case DSTU1: - mySearchParamExtractor = new SearchParamExtractorDstu1(theContext); - break; - case DSTU2: - mySearchParamExtractor = new SearchParamExtractorDstu2(theContext); - break; - case DSTU3: - mySearchParamExtractor = new SearchParamExtractorDstu3(theContext); - break; - case DSTU2_HL7ORG: - throw new IllegalStateException("Don't know how to handle version: " + myContext.getVersion().getVersion()); - } } + public void setEntityManager(EntityManager theEntityManager) { myEntityManager = theEntityManager; } @@ -1088,18 +1077,14 @@ public abstract class BaseHapiFhirDao implements IDao { return myContext.getResourceDefinition(theResource).getName(); } - protected List translateForcedIdToPids(IIdType theId) { - return translateForcedIdToPids(theId, myForcedIdDao); - } - - protected static Long translateForcedIdToPid(String theResourceName, String theResourceId, IForcedIdDao theForcedIdDao) { - return translateForcedIdToPids(new IdDt(theResourceName, theResourceId), theForcedIdDao).get(0); - } - protected Long translateForcedIdToPid(String theResourceName, String theResourceId) { return translateForcedIdToPids(new IdDt(theResourceName, theResourceId), myForcedIdDao).get(0); } + protected List translateForcedIdToPids(IIdType theId) { + return translateForcedIdToPids(theId, myForcedIdDao); + } + protected String translatePidIdToForcedId(String theResourceType, Long theId) { ForcedId forcedId = myForcedIdDao.findByResourcePid(theId); if (forcedId != null) { @@ -1570,6 +1555,10 @@ public abstract class BaseHapiFhirDao implements IDao { return retVal; } + protected static Long translateForcedIdToPid(String theResourceName, String theResourceId, IForcedIdDao theForcedIdDao) { + return translateForcedIdToPids(new IdDt(theResourceName, theResourceId), theForcedIdDao).get(0); + } + static List translateForcedIdToPids(IIdType theId, IForcedIdDao theForcedIdDao) { Validate.isTrue(theId.hasIdPart()); diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseSearchParamExtractor.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseSearchParamExtractor.java index 65bd8c33f85..ec0d6b0ed7b 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseSearchParamExtractor.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseSearchParamExtractor.java @@ -25,22 +25,28 @@ import java.util.List; import java.util.regex.Pattern; import org.hl7.fhir.instance.model.api.IBaseResource; +import org.springframework.beans.factory.annotation.Autowired; + +import com.google.common.annotations.VisibleForTesting; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeResourceDefinition; import ca.uhn.fhir.util.FhirTerser; public class BaseSearchParamExtractor { + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(BaseSearchParamExtractor.class); private static final Pattern SPLIT = Pattern.compile("\\||( or )"); + + @Autowired private FhirContext myContext; - public BaseSearchParamExtractor(FhirContext theContext) { - myContext = theContext; + public BaseSearchParamExtractor() { + super(); } - - protected FhirContext getContext() { - return myContext; + + public BaseSearchParamExtractor(FhirContext theCtx) { + myContext = theCtx; } protected List extractValues(String thePaths, IBaseResource theResource) { @@ -58,6 +64,15 @@ public class BaseSearchParamExtractor { } return values; } + + protected FhirContext getContext() { + return myContext; + } + + @VisibleForTesting + void setContextForUnitTest(FhirContext theContext) { + myContext = theContext; + } } diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchParamExtractorDstu1.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchParamExtractorDstu1.java index 6115cb0155f..acb564e2cfe 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchParamExtractorDstu1.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchParamExtractorDstu1.java @@ -70,10 +70,6 @@ import ca.uhn.fhir.rest.method.RestSearchParameterTypeEnum; public class SearchParamExtractorDstu1 extends BaseSearchParamExtractor implements ISearchParamExtractor { - public SearchParamExtractorDstu1(FhirContext theContext) { - super(theContext); - } - @Override public Set extractSearchParamCoords(ResourceTable theEntity, IBaseResource theResource) { return Collections.emptySet(); diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchParamExtractorDstu2.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchParamExtractorDstu2.java index 8671f907c0a..3f54faa3feb 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchParamExtractorDstu2.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchParamExtractorDstu2.java @@ -82,10 +82,6 @@ public class SearchParamExtractorDstu2 extends BaseSearchParamExtractor implemen private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(SearchParamExtractorDstu2.class); - public SearchParamExtractorDstu2(FhirContext theContext) { - super(theContext); - } - private void addSearchTerm(ResourceTable theEntity, Set retVal, String resourceName, String searchTerm) { if (isBlank(searchTerm)) { return; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/JpaValidationSupportDstu3.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/JpaValidationSupportDstu3.java index e29db1d9c8a..219ebeddc6b 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/JpaValidationSupportDstu3.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/JpaValidationSupportDstu3.java @@ -1,5 +1,8 @@ package ca.uhn.fhir.jpa.dao.dstu3; +import java.util.Collections; +import java.util.List; + import org.hl7.fhir.dstu3.model.CodeSystem; import org.hl7.fhir.dstu3.model.IdType; import org.hl7.fhir.dstu3.model.Questionnaire; @@ -131,4 +134,10 @@ public class JpaValidationSupportDstu3 implements IJpaValidationSupportDstu3 { return fetchResource(theCtx, StructureDefinition.class, theUrl); } + + @Override + public List fetchAllStructureDefinitions(FhirContext theContext) { + return Collections.emptyList(); + } + } diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/SearchParamExtractorDstu3.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/SearchParamExtractorDstu3.java index ecd7104b463..52f0ee329f9 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/SearchParamExtractorDstu3.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/SearchParamExtractorDstu3.java @@ -34,7 +34,10 @@ import javax.measure.unit.Unit; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; +import org.hl7.fhir.dstu3.exceptions.FHIRException; +import org.hl7.fhir.dstu3.hapi.validation.IValidationSupport; import org.hl7.fhir.dstu3.model.Address; +import org.hl7.fhir.dstu3.model.Base; import org.hl7.fhir.dstu3.model.BaseDateTimeType; import org.hl7.fhir.dstu3.model.CodeSystem; import org.hl7.fhir.dstu3.model.CodeableConcept; @@ -53,9 +56,15 @@ import org.hl7.fhir.dstu3.model.Quantity; import org.hl7.fhir.dstu3.model.Questionnaire; import org.hl7.fhir.dstu3.model.StringType; import org.hl7.fhir.dstu3.model.UriType; +import org.hl7.fhir.dstu3.utils.FHIRPathEngine; +import org.hl7.fhir.dstu3.utils.IWorkerContext; import org.hl7.fhir.instance.model.api.IBase; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IPrimitiveType; +import org.omg.PortableServer.ThreadPolicyValue; +import org.springframework.beans.factory.annotation.Autowired; + +import com.google.common.annotations.VisibleForTesting; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.context.FhirContext; @@ -74,13 +83,25 @@ import ca.uhn.fhir.jpa.entity.ResourceIndexedSearchParamToken; import ca.uhn.fhir.jpa.entity.ResourceIndexedSearchParamUri; import ca.uhn.fhir.jpa.entity.ResourceTable; import ca.uhn.fhir.rest.method.RestSearchParameterTypeEnum; +import ca.uhn.fhir.rest.server.exceptions.InternalErrorException; public class SearchParamExtractorDstu3 extends BaseSearchParamExtractor implements ISearchParamExtractor { private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(SearchParamExtractorDstu3.class); - - public SearchParamExtractorDstu3(FhirContext theContext) { - super(theContext); + + @Autowired + private org.hl7.fhir.dstu3.hapi.validation.IValidationSupport myValidationSupport; + + /** + * Constructor + */ + public SearchParamExtractorDstu3() { + super(); + } + + public SearchParamExtractorDstu3(FhirContext theCtx, IValidationSupport theValidationSupport) { + super(theCtx); + myValidationSupport = theValidationSupport; } private void addSearchTerm(ResourceTable theEntity, Set retVal, String resourceName, String searchTerm) { @@ -443,15 +464,15 @@ public class SearchParamExtractorDstu3 extends BaseSearchParamExtractor implemen List systems = new ArrayList(); List codes = new ArrayList(); - String needContactPointSystem = null; - if (nextPath.contains(".where(system='phone')")) { - nextPath = nextPath.replace(".where(system='phone')", ""); - needContactPointSystem = "phone"; - } - if (nextPath.contains(".where(system='email')")) { - nextPath = nextPath.replace(".where(system='email')", ""); - needContactPointSystem = "email"; - } +// String needContactPointSystem = null; +// if (nextPath.contains(".where(system='phone')")) { +// nextPath = nextPath.replace(".where(system='phone')", ""); +// needContactPointSystem = "phone"; +// } +// if (nextPath.contains(".where(system='email')")) { +// nextPath = nextPath.replace(".where(system='email')", ""); +// needContactPointSystem = "email"; +// } for (Object nextObject : extractValues(nextPath, theResource)) { @@ -482,11 +503,6 @@ public class SearchParamExtractorDstu3 extends BaseSearchParamExtractor implemen if (nextValue.isEmpty()) { continue; } - if (isNotBlank(needContactPointSystem)) { - if (!needContactPointSystem.equals(nextValue.getSystemElement().getValueAsString())) { - continue; - } - } systems.add(nextValue.getSystemElement().getValueAsString()); codes.add(nextValue.getValueElement().getValue()); } else if (nextObject instanceof Enumeration) { @@ -623,6 +639,7 @@ public class SearchParamExtractorDstu3 extends BaseSearchParamExtractor implemen return retVal; } + private void extractTokensFromCodeableConcept(List theSystems, List theCodes, CodeableConcept theCodeableConcept, ResourceTable theEntity, Set theListToPopulate, RuntimeSearchParam theParameterDef) { for (Coding nextCoding : theCodeableConcept.getCoding()) { extractTokensFromCoding(theSystems, theCodes, theEntity, theListToPopulate, theParameterDef, nextCoding); @@ -646,6 +663,28 @@ public class SearchParamExtractorDstu3 extends BaseSearchParamExtractor implemen } } + /** + * Override parent because we're using FHIRPath here + */ + @Override + protected List extractValues(String thePaths, IBaseResource theResource) { + IWorkerContext worker = new org.hl7.fhir.dstu3.hapi.validation.HapiWorkerContext(getContext(), myValidationSupport); + FHIRPathEngine fp = new FHIRPathEngine(worker); + + List values = new ArrayList(); + try { + values.addAll(fp.evaluate((Base)theResource, thePaths)); + } catch (FHIRException e) { + throw new InternalErrorException(e); + } + return values; + } + + @VisibleForTesting + void setValidationSupportForTesting(org.hl7.fhir.dstu3.hapi.validation.IValidationSupport theValidationSupport) { + myValidationSupport = theValidationSupport; + } + private static > String extractSystem(Enumeration theBoundCode) { if (theBoundCode.getValue() != null) { return theBoundCode.getEnumFactory().toSystem(theBoundCode.getValue()); diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchNoFtTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchNoFtTest.java index 47f2be9f926..ffb888a3fb6 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchNoFtTest.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchNoFtTest.java @@ -23,6 +23,7 @@ import java.util.Set; import javax.servlet.http.HttpServletRequest; import org.apache.commons.lang3.StringUtils; +import org.hl7.fhir.dstu3.model.Appointment; import org.hl7.fhir.dstu3.model.CodeType; import org.hl7.fhir.dstu3.model.ConceptMap; import org.hl7.fhir.dstu3.model.ContactPoint.ContactPointSystem; @@ -92,7 +93,6 @@ import ca.uhn.fhir.rest.server.Constants; import ca.uhn.fhir.rest.server.IBundleProvider; import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException; -import ca.uhn.fhir.rest.server.servlet.ServletRequestDetails; import ca.uhn.fhir.util.TestUtil; @SuppressWarnings("unchecked") @@ -435,6 +435,36 @@ public class FhirResourceDaoDstu3SearchNoFtTest extends BaseJpaDstu3Test { } + /** + * https://chat.fhir.org/#narrow/stream/implementers/topic/Understanding.20_include + */ + @Test + @Ignore + public void testSearchWithTypedInclude() { + IIdType patId; + { + Patient patient = new Patient(); + patient.addIdentifier().setSystem("urn:system").setValue("001"); + patId = myPatientDao.create(patient, mySrd).getId().toUnqualifiedVersionless(); + } + IIdType practId; + { + Practitioner pract = new Practitioner(); + pract.addIdentifier().setSystem("urn:system").setValue("001"); + practId = myPractitionerDao.create(pract, mySrd).getId().toUnqualifiedVersionless(); + } + + Appointment appt = new Appointment(); + appt.addParticipant().getActor().setReference(patId.getValue()); + appt.addParticipant().getActor().setReference(practId.getValue()); + IIdType apptId = myAppointmentDao.create(appt, mySrd).getId().toUnqualifiedVersionless(); + + SearchParameterMap params = new SearchParameterMap(); + params.addInclude(Appointment.INCLUDE_PATIENT); + assertThat(toUnqualifiedVersionlessIds(myAppointmentDao.search(params)), containsInAnyOrder(patId, apptId)); + + } + @Test public void testSearchByIdParamWrongType() { IIdType id1; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/SearchParamExtractorDstu3Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/SearchParamExtractorDstu3Test.java index 22c67b19ea6..74f29335d21 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/SearchParamExtractorDstu3Test.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/SearchParamExtractorDstu3Test.java @@ -4,6 +4,8 @@ import static org.junit.Assert.*; import java.util.Set; +import org.hl7.fhir.dstu3.hapi.validation.DefaultProfileValidationSupport; +import org.hl7.fhir.dstu3.hapi.validation.IValidationSupport; import org.hl7.fhir.dstu3.model.Observation; import org.junit.AfterClass; import org.junit.Test; @@ -17,10 +19,12 @@ import ca.uhn.fhir.util.TestUtil; public class SearchParamExtractorDstu3Test { private static final FhirContext ourCtx = FhirContext.forDstu3(); + private static IValidationSupport ourValidationSupport; @AfterClass public static void afterClassClearContext() { TestUtil.clearAllStaticFieldsForUnitTest(); + ourValidationSupport = new DefaultProfileValidationSupport(); } @@ -29,7 +33,7 @@ public class SearchParamExtractorDstu3Test { Observation obs = new Observation(); obs.getCategory().addCoding().setSystem("SYSTEM").setCode("CODE"); - SearchParamExtractorDstu3 extractor = new SearchParamExtractorDstu3(ourCtx); + SearchParamExtractorDstu3 extractor = new SearchParamExtractorDstu3(ourCtx, ourValidationSupport); Set tokens = extractor.extractSearchParamTokens(new ResourceTable(), obs); assertEquals(1, tokens.size()); ResourceIndexedSearchParamToken token = (ResourceIndexedSearchParamToken) tokens.iterator().next(); diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Account.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Account.java index 3ad6947f315..a256c55ee8f 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Account.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Account.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -879,7 +879,9 @@ public class Account extends DomainResource { * Path: Account.owner
*

*/ - @SearchParamDefinition(name="owner", path="Account.owner", description="Who is responsible?", type="reference" ) + // [Organization] + // [Organization] + @SearchParamDefinition(name="owner", path="Account.owner", description="Who is responsible?", type="reference", target={Organization.class} ) public static final String SP_OWNER = "owner"; /** * Fluent Client search parameter constant for owner @@ -905,7 +907,9 @@ public class Account extends DomainResource { * Path: Account.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="Account.identifier", description="Account number", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="Account.identifier", description="Account number", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -925,7 +929,9 @@ public class Account extends DomainResource { * Path: Account.coveragePeriod
*

*/ - @SearchParamDefinition(name="period", path="Account.coveragePeriod", description="Transaction window", type="date" ) + // [] + // [] + @SearchParamDefinition(name="period", path="Account.coveragePeriod", description="Transaction window", type="date", target={} ) public static final String SP_PERIOD = "period"; /** * Fluent Client search parameter constant for period @@ -945,7 +951,9 @@ public class Account extends DomainResource { * Path: Account.balance
*

*/ - @SearchParamDefinition(name="balance", path="Account.balance", description="How much is in account?", type="quantity" ) + // [] + // [] + @SearchParamDefinition(name="balance", path="Account.balance", description="How much is in account?", type="quantity", target={} ) public static final String SP_BALANCE = "balance"; /** * Fluent Client search parameter constant for balance @@ -965,7 +973,9 @@ public class Account extends DomainResource { * Path: Account.subject
*

*/ - @SearchParamDefinition(name="subject", path="Account.subject", description="What is account tied to?", type="reference" ) + // [Practitioner, Organization, Device, Patient, HealthcareService, Location] + // [Practitioner, Organization, Device, Patient, HealthcareService, Location] + @SearchParamDefinition(name="subject", path="Account.subject", description="What is account tied to?", type="reference", target={Practitioner.class, Organization.class, Device.class, Patient.class, HealthcareService.class, Location.class} ) public static final String SP_SUBJECT = "subject"; /** * Fluent Client search parameter constant for subject @@ -991,7 +1001,9 @@ public class Account extends DomainResource { * Path: Account.subject
*

*/ - @SearchParamDefinition(name="patient", path="Account.subject", description="What is account tied to?", type="reference" ) + // [Practitioner, Organization, Device, Patient, HealthcareService, Location] + // [Patient] + @SearchParamDefinition(name="patient", path="Account.subject", description="What is account tied to?", type="reference", target={Practitioner.class, Organization.class, Device.class, Patient.class, HealthcareService.class, Location.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -1017,7 +1029,9 @@ public class Account extends DomainResource { * Path: Account.name
*

*/ - @SearchParamDefinition(name="name", path="Account.name", description="Human-readable label", type="string" ) + // [] + // [] + @SearchParamDefinition(name="name", path="Account.name", description="Human-readable label", type="string", target={} ) public static final String SP_NAME = "name"; /** * Fluent Client search parameter constant for name @@ -1037,7 +1051,9 @@ public class Account extends DomainResource { * Path: Account.type
*

*/ - @SearchParamDefinition(name="type", path="Account.type", description="E.g. patient, expense, depreciation", type="token" ) + // [] + // [] + @SearchParamDefinition(name="type", path="Account.type", description="E.g. patient, expense, depreciation", type="token", target={} ) public static final String SP_TYPE = "type"; /** * Fluent Client search parameter constant for type @@ -1057,7 +1073,9 @@ public class Account extends DomainResource { * Path: Account.status
*

*/ - @SearchParamDefinition(name="status", path="Account.status", description="active | inactive", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="Account.status", description="active | inactive", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/AllergyIntolerance.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/AllergyIntolerance.java index f441dc0f7ac..2a68a4c641d 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/AllergyIntolerance.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/AllergyIntolerance.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -2421,7 +2421,9 @@ public class AllergyIntolerance extends DomainResource { * Path: AllergyIntolerance.reaction.severity
*

*/ - @SearchParamDefinition(name="severity", path="AllergyIntolerance.reaction.severity", description="mild | moderate | severe (of event as a whole)", type="token" ) + // [] + // [] + @SearchParamDefinition(name="severity", path="AllergyIntolerance.reaction.severity", description="mild | moderate | severe (of event as a whole)", type="token", target={} ) public static final String SP_SEVERITY = "severity"; /** * Fluent Client search parameter constant for severity @@ -2441,7 +2443,9 @@ public class AllergyIntolerance extends DomainResource { * Path: AllergyIntolerance.recordedDate
*

*/ - @SearchParamDefinition(name="date", path="AllergyIntolerance.recordedDate", description="When recorded", type="date" ) + // [] + // [] + @SearchParamDefinition(name="date", path="AllergyIntolerance.recordedDate", description="When recorded", type="date", target={} ) public static final String SP_DATE = "date"; /** * Fluent Client search parameter constant for date @@ -2461,7 +2465,9 @@ public class AllergyIntolerance extends DomainResource { * Path: AllergyIntolerance.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="AllergyIntolerance.identifier", description="External ids for this item", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="AllergyIntolerance.identifier", description="External ids for this item", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -2481,7 +2487,9 @@ public class AllergyIntolerance extends DomainResource { * Path: AllergyIntolerance.reaction.manifestation
*

*/ - @SearchParamDefinition(name="manifestation", path="AllergyIntolerance.reaction.manifestation", description="Clinical symptoms/signs associated with the Event", type="token" ) + // [] + // [] + @SearchParamDefinition(name="manifestation", path="AllergyIntolerance.reaction.manifestation", description="Clinical symptoms/signs associated with the Event", type="token", target={} ) public static final String SP_MANIFESTATION = "manifestation"; /** * Fluent Client search parameter constant for manifestation @@ -2501,7 +2509,9 @@ public class AllergyIntolerance extends DomainResource { * Path: AllergyIntolerance.recorder
*

*/ - @SearchParamDefinition(name="recorder", path="AllergyIntolerance.recorder", description="Who recorded the sensitivity", type="reference" ) + // [Practitioner, Patient] + // [Practitioner, Patient] + @SearchParamDefinition(name="recorder", path="AllergyIntolerance.recorder", description="Who recorded the sensitivity", type="reference", target={Practitioner.class, Patient.class} ) public static final String SP_RECORDER = "recorder"; /** * Fluent Client search parameter constant for recorder @@ -2527,7 +2537,9 @@ public class AllergyIntolerance extends DomainResource { * Path: AllergyIntolerance.substance, AllergyIntolerance.reaction.substance
*

*/ - @SearchParamDefinition(name="substance", path="AllergyIntolerance.substance | AllergyIntolerance.reaction.substance", description="Substance, (or class) considered to be responsible for risk", type="token" ) + // [] + // [] + @SearchParamDefinition(name="substance", path="AllergyIntolerance.substance | AllergyIntolerance.reaction.substance", description="Substance, (or class) considered to be responsible for risk", type="token", target={} ) public static final String SP_SUBSTANCE = "substance"; /** * Fluent Client search parameter constant for substance @@ -2547,7 +2559,9 @@ public class AllergyIntolerance extends DomainResource { * Path: AllergyIntolerance.criticality
*

*/ - @SearchParamDefinition(name="criticality", path="AllergyIntolerance.criticality", description="low | high | unable-to-assess", type="token" ) + // [] + // [] + @SearchParamDefinition(name="criticality", path="AllergyIntolerance.criticality", description="low | high | unable-to-assess", type="token", target={} ) public static final String SP_CRITICALITY = "criticality"; /** * Fluent Client search parameter constant for criticality @@ -2567,7 +2581,9 @@ public class AllergyIntolerance extends DomainResource { * Path: AllergyIntolerance.reporter
*

*/ - @SearchParamDefinition(name="reporter", path="AllergyIntolerance.reporter", description="Source of the information about the allergy", type="reference" ) + // [Practitioner, Patient, RelatedPerson] + // [Practitioner, Patient, RelatedPerson] + @SearchParamDefinition(name="reporter", path="AllergyIntolerance.reporter", description="Source of the information about the allergy", type="reference", target={Practitioner.class, Patient.class, RelatedPerson.class} ) public static final String SP_REPORTER = "reporter"; /** * Fluent Client search parameter constant for reporter @@ -2593,7 +2609,9 @@ public class AllergyIntolerance extends DomainResource { * Path: AllergyIntolerance.type
*

*/ - @SearchParamDefinition(name="type", path="AllergyIntolerance.type", description="allergy | intolerance - Underlying mechanism (if known)", type="token" ) + // [] + // [] + @SearchParamDefinition(name="type", path="AllergyIntolerance.type", description="allergy | intolerance - Underlying mechanism (if known)", type="token", target={} ) public static final String SP_TYPE = "type"; /** * Fluent Client search parameter constant for type @@ -2613,7 +2631,9 @@ public class AllergyIntolerance extends DomainResource { * Path: AllergyIntolerance.reaction.onset
*

*/ - @SearchParamDefinition(name="onset", path="AllergyIntolerance.reaction.onset", description="Date(/time) when manifestations showed", type="date" ) + // [] + // [] + @SearchParamDefinition(name="onset", path="AllergyIntolerance.reaction.onset", description="Date(/time) when manifestations showed", type="date", target={} ) public static final String SP_ONSET = "onset"; /** * Fluent Client search parameter constant for onset @@ -2633,7 +2653,9 @@ public class AllergyIntolerance extends DomainResource { * Path: AllergyIntolerance.reaction.exposureRoute
*

*/ - @SearchParamDefinition(name="route", path="AllergyIntolerance.reaction.exposureRoute", description="How the subject was exposed to the substance", type="token" ) + // [] + // [] + @SearchParamDefinition(name="route", path="AllergyIntolerance.reaction.exposureRoute", description="How the subject was exposed to the substance", type="token", target={} ) public static final String SP_ROUTE = "route"; /** * Fluent Client search parameter constant for route @@ -2653,7 +2675,9 @@ public class AllergyIntolerance extends DomainResource { * Path: AllergyIntolerance.patient
*

*/ - @SearchParamDefinition(name="patient", path="AllergyIntolerance.patient", description="Who the sensitivity is for", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="AllergyIntolerance.patient", description="Who the sensitivity is for", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -2679,7 +2703,9 @@ public class AllergyIntolerance extends DomainResource { * Path: AllergyIntolerance.category
*

*/ - @SearchParamDefinition(name="category", path="AllergyIntolerance.category", description="food | medication | environment | other - Category of Substance", type="token" ) + // [] + // [] + @SearchParamDefinition(name="category", path="AllergyIntolerance.category", description="food | medication | environment | other - Category of Substance", type="token", target={} ) public static final String SP_CATEGORY = "category"; /** * Fluent Client search parameter constant for category @@ -2699,7 +2725,9 @@ public class AllergyIntolerance extends DomainResource { * Path: AllergyIntolerance.lastOccurence
*

*/ - @SearchParamDefinition(name="last-date", path="AllergyIntolerance.lastOccurence", description="Date(/time) of last known occurrence of a reaction", type="date" ) + // [] + // [] + @SearchParamDefinition(name="last-date", path="AllergyIntolerance.lastOccurence", description="Date(/time) of last known occurrence of a reaction", type="date", target={} ) public static final String SP_LAST_DATE = "last-date"; /** * Fluent Client search parameter constant for last-date @@ -2719,7 +2747,9 @@ public class AllergyIntolerance extends DomainResource { * Path: AllergyIntolerance.status
*

*/ - @SearchParamDefinition(name="status", path="AllergyIntolerance.status", description="active | unconfirmed | confirmed | inactive | resolved | refuted | entered-in-error", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="AllergyIntolerance.status", description="active | unconfirmed | confirmed | inactive | resolved | refuted | entered-in-error", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Appointment.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Appointment.java index a74da60c2f7..8229e00753e 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Appointment.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Appointment.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -2023,7 +2023,9 @@ public class Appointment extends DomainResource { * Path: Appointment.start
*

*/ - @SearchParamDefinition(name="date", path="Appointment.start", description="Appointment date/time.", type="date" ) + // [] + // [] + @SearchParamDefinition(name="date", path="Appointment.start", description="Appointment date/time.", type="date", target={} ) public static final String SP_DATE = "date"; /** * Fluent Client search parameter constant for date @@ -2043,7 +2045,9 @@ public class Appointment extends DomainResource { * Path: Appointment.participant.actor
*

*/ - @SearchParamDefinition(name="actor", path="Appointment.participant.actor", description="Any one of the individuals participating in the appointment", type="reference" ) + // [Practitioner, Device, Patient, HealthcareService, RelatedPerson, Location] + // [Practitioner, Device, Patient, HealthcareService, RelatedPerson, Location] + @SearchParamDefinition(name="actor", path="Appointment.participant.actor", description="Any one of the individuals participating in the appointment", type="reference", target={Practitioner.class, Device.class, Patient.class, HealthcareService.class, RelatedPerson.class, Location.class} ) public static final String SP_ACTOR = "actor"; /** * Fluent Client search parameter constant for actor @@ -2069,7 +2073,9 @@ public class Appointment extends DomainResource { * Path: Appointment.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="Appointment.identifier", description="An Identifier of the Appointment", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="Appointment.identifier", description="An Identifier of the Appointment", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -2089,7 +2095,9 @@ public class Appointment extends DomainResource { * Path: Appointment.participant.actor
*

*/ - @SearchParamDefinition(name="practitioner", path="Appointment.participant.actor", description="One of the individuals of the appointment is this practitioner", type="reference" ) + // [Practitioner, Device, Patient, HealthcareService, RelatedPerson, Location] + // [Practitioner] + @SearchParamDefinition(name="practitioner", path="Appointment.participant.actor", description="One of the individuals of the appointment is this practitioner", type="reference", target={Practitioner.class, Device.class, Patient.class, HealthcareService.class, RelatedPerson.class, Location.class} ) public static final String SP_PRACTITIONER = "practitioner"; /** * Fluent Client search parameter constant for practitioner @@ -2115,7 +2123,9 @@ public class Appointment extends DomainResource { * Path: Appointment.participant.status
*

*/ - @SearchParamDefinition(name="part-status", path="Appointment.participant.status", description="The Participation status of the subject, or other participant on the appointment. Can be used to locate participants that have not responded to meeting requests.", type="token" ) + // [] + // [] + @SearchParamDefinition(name="part-status", path="Appointment.participant.status", description="The Participation status of the subject, or other participant on the appointment. Can be used to locate participants that have not responded to meeting requests.", type="token", target={} ) public static final String SP_PART_STATUS = "part-status"; /** * Fluent Client search parameter constant for part-status @@ -2135,7 +2145,9 @@ public class Appointment extends DomainResource { * Path: Appointment.participant.actor
*

*/ - @SearchParamDefinition(name="patient", path="Appointment.participant.actor", description="One of the individuals of the appointment is this patient", type="reference" ) + // [Practitioner, Device, Patient, HealthcareService, RelatedPerson, Location] + // [Patient] + @SearchParamDefinition(name="patient", path="Appointment.participant.actor", description="One of the individuals of the appointment is this patient", type="reference", target={Practitioner.class, Device.class, Patient.class, HealthcareService.class, RelatedPerson.class, Location.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -2161,7 +2173,9 @@ public class Appointment extends DomainResource { * Path: Appointment.appointmentType
*

*/ - @SearchParamDefinition(name="appointment-type", path="Appointment.appointmentType", description="The style of appointment or patient that has been booked in the slot (not service type)", type="token" ) + // [] + // [] + @SearchParamDefinition(name="appointment-type", path="Appointment.appointmentType", description="The style of appointment or patient that has been booked in the slot (not service type)", type="token", target={} ) public static final String SP_APPOINTMENT_TYPE = "appointment-type"; /** * Fluent Client search parameter constant for appointment-type @@ -2181,7 +2195,9 @@ public class Appointment extends DomainResource { * Path: Appointment.serviceType
*

*/ - @SearchParamDefinition(name="service-type", path="Appointment.serviceType", description="The specific service that is to be performed during this appointment", type="token" ) + // [] + // [] + @SearchParamDefinition(name="service-type", path="Appointment.serviceType", description="The specific service that is to be performed during this appointment", type="token", target={} ) public static final String SP_SERVICE_TYPE = "service-type"; /** * Fluent Client search parameter constant for service-type @@ -2201,7 +2217,9 @@ public class Appointment extends DomainResource { * Path: Appointment.participant.actor
*

*/ - @SearchParamDefinition(name="location", path="Appointment.participant.actor", description="This location is listed in the participants of the appointment", type="reference" ) + // [Practitioner, Device, Patient, HealthcareService, RelatedPerson, Location] + // [Location] + @SearchParamDefinition(name="location", path="Appointment.participant.actor", description="This location is listed in the participants of the appointment", type="reference", target={Practitioner.class, Device.class, Patient.class, HealthcareService.class, RelatedPerson.class, Location.class} ) public static final String SP_LOCATION = "location"; /** * Fluent Client search parameter constant for location @@ -2227,7 +2245,9 @@ public class Appointment extends DomainResource { * Path: Appointment.status
*

*/ - @SearchParamDefinition(name="status", path="Appointment.status", description="The overall status of the appointment", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="Appointment.status", description="The overall status of the appointment", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/AppointmentResponse.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/AppointmentResponse.java index bfc7afdd18a..4a62057e8ad 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/AppointmentResponse.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/AppointmentResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -725,7 +725,9 @@ public class AppointmentResponse extends DomainResource { * Path: AppointmentResponse.actor
*

*/ - @SearchParamDefinition(name="actor", path="AppointmentResponse.actor", description="The Person, Location/HealthcareService or Device that this appointment response replies for", type="reference" ) + // [Practitioner, Device, Patient, HealthcareService, RelatedPerson, Location] + // [Practitioner, Device, Patient, HealthcareService, RelatedPerson, Location] + @SearchParamDefinition(name="actor", path="AppointmentResponse.actor", description="The Person, Location/HealthcareService or Device that this appointment response replies for", type="reference", target={Practitioner.class, Device.class, Patient.class, HealthcareService.class, RelatedPerson.class, Location.class} ) public static final String SP_ACTOR = "actor"; /** * Fluent Client search parameter constant for actor @@ -751,7 +753,9 @@ public class AppointmentResponse extends DomainResource { * Path: AppointmentResponse.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="AppointmentResponse.identifier", description="An Identifier in this appointment response", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="AppointmentResponse.identifier", description="An Identifier in this appointment response", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -771,7 +775,9 @@ public class AppointmentResponse extends DomainResource { * Path: AppointmentResponse.actor
*

*/ - @SearchParamDefinition(name="practitioner", path="AppointmentResponse.actor", description="This Response is for this Practitioner", type="reference" ) + // [Practitioner, Device, Patient, HealthcareService, RelatedPerson, Location] + // [Practitioner] + @SearchParamDefinition(name="practitioner", path="AppointmentResponse.actor", description="This Response is for this Practitioner", type="reference", target={Practitioner.class, Device.class, Patient.class, HealthcareService.class, RelatedPerson.class, Location.class} ) public static final String SP_PRACTITIONER = "practitioner"; /** * Fluent Client search parameter constant for practitioner @@ -797,7 +803,9 @@ public class AppointmentResponse extends DomainResource { * Path: AppointmentResponse.participantStatus
*

*/ - @SearchParamDefinition(name="part-status", path="AppointmentResponse.participantStatus", description="The participants acceptance status for this appointment", type="token" ) + // [] + // [] + @SearchParamDefinition(name="part-status", path="AppointmentResponse.participantStatus", description="The participants acceptance status for this appointment", type="token", target={} ) public static final String SP_PART_STATUS = "part-status"; /** * Fluent Client search parameter constant for part-status @@ -817,7 +825,9 @@ public class AppointmentResponse extends DomainResource { * Path: AppointmentResponse.actor
*

*/ - @SearchParamDefinition(name="patient", path="AppointmentResponse.actor", description="This Response is for this Patient", type="reference" ) + // [Practitioner, Device, Patient, HealthcareService, RelatedPerson, Location] + // [Patient] + @SearchParamDefinition(name="patient", path="AppointmentResponse.actor", description="This Response is for this Patient", type="reference", target={Practitioner.class, Device.class, Patient.class, HealthcareService.class, RelatedPerson.class, Location.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -843,7 +853,9 @@ public class AppointmentResponse extends DomainResource { * Path: AppointmentResponse.appointment
*

*/ - @SearchParamDefinition(name="appointment", path="AppointmentResponse.appointment", description="The appointment that the response is attached to", type="reference" ) + // [Appointment] + // [Appointment] + @SearchParamDefinition(name="appointment", path="AppointmentResponse.appointment", description="The appointment that the response is attached to", type="reference", target={Appointment.class} ) public static final String SP_APPOINTMENT = "appointment"; /** * Fluent Client search parameter constant for appointment @@ -869,7 +881,9 @@ public class AppointmentResponse extends DomainResource { * Path: AppointmentResponse.actor
*

*/ - @SearchParamDefinition(name="location", path="AppointmentResponse.actor", description="This Response is for this Location", type="reference" ) + // [Practitioner, Device, Patient, HealthcareService, RelatedPerson, Location] + // [Location] + @SearchParamDefinition(name="location", path="AppointmentResponse.actor", description="This Response is for this Location", type="reference", target={Practitioner.class, Device.class, Patient.class, HealthcareService.class, RelatedPerson.class, Location.class} ) public static final String SP_LOCATION = "location"; /** * Fluent Client search parameter constant for location diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/AuditEvent.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/AuditEvent.java index 71da86ee108..e37b877a896 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/AuditEvent.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/AuditEvent.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -3494,7 +3494,9 @@ public class AuditEvent extends DomainResource { * Path: AuditEvent.recorded
*

*/ - @SearchParamDefinition(name="date", path="AuditEvent.recorded", description="Time when the event occurred on source", type="date" ) + // [] + // [] + @SearchParamDefinition(name="date", path="AuditEvent.recorded", description="Time when the event occurred on source", type="date", target={} ) public static final String SP_DATE = "date"; /** * Fluent Client search parameter constant for date @@ -3514,7 +3516,9 @@ public class AuditEvent extends DomainResource { * Path: AuditEvent.entity.type
*

*/ - @SearchParamDefinition(name="entity-type", path="AuditEvent.entity.type", description="Type of object involved", type="token" ) + // [] + // [] + @SearchParamDefinition(name="entity-type", path="AuditEvent.entity.type", description="Type of object involved", type="token", target={} ) public static final String SP_ENTITY_TYPE = "entity-type"; /** * Fluent Client search parameter constant for entity-type @@ -3534,7 +3538,9 @@ public class AuditEvent extends DomainResource { * Path: AuditEvent.agent.reference
*

*/ - @SearchParamDefinition(name="agent", path="AuditEvent.agent.reference", description="Direct reference to resource", type="reference" ) + // [Practitioner, Organization, Device, Patient, RelatedPerson] + // [Practitioner, Organization, Device, Patient, RelatedPerson] + @SearchParamDefinition(name="agent", path="AuditEvent.agent.reference", description="Direct reference to resource", type="reference", target={Practitioner.class, Organization.class, Device.class, Patient.class, RelatedPerson.class} ) public static final String SP_AGENT = "agent"; /** * Fluent Client search parameter constant for agent @@ -3560,7 +3566,9 @@ public class AuditEvent extends DomainResource { * Path: AuditEvent.agent.network.address
*

*/ - @SearchParamDefinition(name="address", path="AuditEvent.agent.network.address", description="Identifier for the network access point of the user device", type="token" ) + // [] + // [] + @SearchParamDefinition(name="address", path="AuditEvent.agent.network.address", description="Identifier for the network access point of the user device", type="token", target={} ) public static final String SP_ADDRESS = "address"; /** * Fluent Client search parameter constant for address @@ -3580,7 +3588,9 @@ public class AuditEvent extends DomainResource { * Path: AuditEvent.source.identifier
*

*/ - @SearchParamDefinition(name="source", path="AuditEvent.source.identifier", description="The identity of source detecting the event", type="token" ) + // [] + // [] + @SearchParamDefinition(name="source", path="AuditEvent.source.identifier", description="The identity of source detecting the event", type="token", target={} ) public static final String SP_SOURCE = "source"; /** * Fluent Client search parameter constant for source @@ -3600,7 +3610,9 @@ public class AuditEvent extends DomainResource { * Path: AuditEvent.type
*

*/ - @SearchParamDefinition(name="type", path="AuditEvent.type", description="Type/identifier of event", type="token" ) + // [] + // [] + @SearchParamDefinition(name="type", path="AuditEvent.type", description="Type/identifier of event", type="token", target={} ) public static final String SP_TYPE = "type"; /** * Fluent Client search parameter constant for type @@ -3620,7 +3632,9 @@ public class AuditEvent extends DomainResource { * Path: AuditEvent.agent.altId
*

*/ - @SearchParamDefinition(name="altid", path="AuditEvent.agent.altId", description="Alternative User id e.g. authentication", type="token" ) + // [] + // [] + @SearchParamDefinition(name="altid", path="AuditEvent.agent.altId", description="Alternative User id e.g. authentication", type="token", target={} ) public static final String SP_ALTID = "altid"; /** * Fluent Client search parameter constant for altid @@ -3640,7 +3654,9 @@ public class AuditEvent extends DomainResource { * Path: AuditEvent.source.site
*

*/ - @SearchParamDefinition(name="site", path="AuditEvent.source.site", description="Logical source location within the enterprise", type="token" ) + // [] + // [] + @SearchParamDefinition(name="site", path="AuditEvent.source.site", description="Logical source location within the enterprise", type="token", target={} ) public static final String SP_SITE = "site"; /** * Fluent Client search parameter constant for site @@ -3660,7 +3676,9 @@ public class AuditEvent extends DomainResource { * Path: AuditEvent.agent.name
*

*/ - @SearchParamDefinition(name="agent-name", path="AuditEvent.agent.name", description="Human-meaningful name for the agent", type="string" ) + // [] + // [] + @SearchParamDefinition(name="agent-name", path="AuditEvent.agent.name", description="Human-meaningful name for the agent", type="string", target={} ) public static final String SP_AGENT_NAME = "agent-name"; /** * Fluent Client search parameter constant for agent-name @@ -3680,7 +3698,9 @@ public class AuditEvent extends DomainResource { * Path: AuditEvent.entity.name
*

*/ - @SearchParamDefinition(name="entity-name", path="AuditEvent.entity.name", description="Descriptor for entity", type="string" ) + // [] + // [] + @SearchParamDefinition(name="entity-name", path="AuditEvent.entity.name", description="Descriptor for entity", type="string", target={} ) public static final String SP_ENTITY_NAME = "entity-name"; /** * Fluent Client search parameter constant for entity-name @@ -3700,7 +3720,9 @@ public class AuditEvent extends DomainResource { * Path: AuditEvent.subtype
*

*/ - @SearchParamDefinition(name="subtype", path="AuditEvent.subtype", description="More specific type/id for the event", type="token" ) + // [] + // [] + @SearchParamDefinition(name="subtype", path="AuditEvent.subtype", description="More specific type/id for the event", type="token", target={} ) public static final String SP_SUBTYPE = "subtype"; /** * Fluent Client search parameter constant for subtype @@ -3720,6 +3742,8 @@ public class AuditEvent extends DomainResource { * Path: AuditEvent.agent.reference, AuditEvent.entity.reference
*

*/ + // [Practitioner, Organization, Device, Patient, Any, RelatedPerson] + // [Patient] @SearchParamDefinition(name="patient", path="AuditEvent.agent.reference | AuditEvent.entity.reference", description="Direct reference to resource", type="reference" ) public static final String SP_PATIENT = "patient"; /** @@ -3746,7 +3770,9 @@ public class AuditEvent extends DomainResource { * Path: AuditEvent.action
*

*/ - @SearchParamDefinition(name="action", path="AuditEvent.action", description="Type of action performed during the event", type="token" ) + // [] + // [] + @SearchParamDefinition(name="action", path="AuditEvent.action", description="Type of action performed during the event", type="token", target={} ) public static final String SP_ACTION = "action"; /** * Fluent Client search parameter constant for action @@ -3766,7 +3792,9 @@ public class AuditEvent extends DomainResource { * Path: AuditEvent.agent.userId
*

*/ - @SearchParamDefinition(name="user", path="AuditEvent.agent.userId", description="Unique identifier for the user", type="token" ) + // [] + // [] + @SearchParamDefinition(name="user", path="AuditEvent.agent.userId", description="Unique identifier for the user", type="token", target={} ) public static final String SP_USER = "user"; /** * Fluent Client search parameter constant for user @@ -3786,6 +3814,8 @@ public class AuditEvent extends DomainResource { * Path: AuditEvent.entity.reference
*

*/ + // [Any] + // [Any] @SearchParamDefinition(name="entity", path="AuditEvent.entity.reference", description="Specific instance of resource (e.g. versioned)", type="reference" ) public static final String SP_ENTITY = "entity"; /** @@ -3812,7 +3842,9 @@ public class AuditEvent extends DomainResource { * Path: AuditEvent.entity.identifier
*

*/ - @SearchParamDefinition(name="entity-id", path="AuditEvent.entity.identifier", description="Specific instance of object (e.g. versioned)", type="token" ) + // [] + // [] + @SearchParamDefinition(name="entity-id", path="AuditEvent.entity.identifier", description="Specific instance of object (e.g. versioned)", type="token", target={} ) public static final String SP_ENTITY_ID = "entity-id"; /** * Fluent Client search parameter constant for entity-id @@ -3832,7 +3864,9 @@ public class AuditEvent extends DomainResource { * Path: AuditEvent.agent.policy
*

*/ - @SearchParamDefinition(name="policy", path="AuditEvent.agent.policy", description="Policy that authorized event", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="policy", path="AuditEvent.agent.policy", description="Policy that authorized event", type="uri", target={} ) public static final String SP_POLICY = "policy"; /** * Fluent Client search parameter constant for policy diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Basic.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Basic.java index 990cd962bed..a494e5f53a3 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Basic.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Basic.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -478,7 +478,9 @@ public class Basic extends DomainResource { * Path: Basic.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="Basic.identifier", description="Business identifier", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="Basic.identifier", description="Business identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -498,7 +500,9 @@ public class Basic extends DomainResource { * Path: Basic.code
*

*/ - @SearchParamDefinition(name="code", path="Basic.code", description="Kind of Resource", type="token" ) + // [] + // [] + @SearchParamDefinition(name="code", path="Basic.code", description="Kind of Resource", type="token", target={} ) public static final String SP_CODE = "code"; /** * Fluent Client search parameter constant for code @@ -518,6 +522,8 @@ public class Basic extends DomainResource { * Path: Basic.subject
*

*/ + // [Any] + // [Any] @SearchParamDefinition(name="subject", path="Basic.subject", description="Identifies the focus of this resource", type="reference" ) public static final String SP_SUBJECT = "subject"; /** @@ -544,7 +550,9 @@ public class Basic extends DomainResource { * Path: Basic.created
*

*/ - @SearchParamDefinition(name="created", path="Basic.created", description="When created", type="date" ) + // [] + // [] + @SearchParamDefinition(name="created", path="Basic.created", description="When created", type="date", target={} ) public static final String SP_CREATED = "created"; /** * Fluent Client search parameter constant for created @@ -564,6 +572,8 @@ public class Basic extends DomainResource { * Path: Basic.subject
*

*/ + // [Any] + // [Patient] @SearchParamDefinition(name="patient", path="Basic.subject", description="Identifies the focus of this resource", type="reference" ) public static final String SP_PATIENT = "patient"; /** @@ -590,7 +600,9 @@ public class Basic extends DomainResource { * Path: Basic.author
*

*/ - @SearchParamDefinition(name="author", path="Basic.author", description="Who created", type="reference" ) + // [Practitioner, Patient, RelatedPerson] + // [Practitioner, Patient, RelatedPerson] + @SearchParamDefinition(name="author", path="Basic.author", description="Who created", type="reference", target={Practitioner.class, Patient.class, RelatedPerson.class} ) public static final String SP_AUTHOR = "author"; /** * Fluent Client search parameter constant for author diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Binary.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Binary.java index b9e62e17dde..194bc5cbd38 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Binary.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Binary.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -286,7 +286,9 @@ public class Binary extends BaseBinary implements IBaseBinary { * Path: Binary.contentType
*

*/ - @SearchParamDefinition(name="contenttype", path="Binary.contentType", description="MimeType of the binary content", type="token" ) + // [] + // [] + @SearchParamDefinition(name="contenttype", path="Binary.contentType", description="MimeType of the binary content", type="token", target={} ) public static final String SP_CONTENTTYPE = "contenttype"; /** * Fluent Client search parameter constant for contenttype diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/BodySite.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/BodySite.java index ea5bf2acb42..375826d34b7 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/BodySite.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/BodySite.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -583,7 +583,9 @@ public class BodySite extends DomainResource { * Path: BodySite.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="BodySite.identifier", description="Identifier for this instance of the anatomical location", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="BodySite.identifier", description="Identifier for this instance of the anatomical location", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -603,7 +605,9 @@ public class BodySite extends DomainResource { * Path: BodySite.code
*

*/ - @SearchParamDefinition(name="code", path="BodySite.code", description="Named anatomical location", type="token" ) + // [] + // [] + @SearchParamDefinition(name="code", path="BodySite.code", description="Named anatomical location", type="token", target={} ) public static final String SP_CODE = "code"; /** * Fluent Client search parameter constant for code @@ -623,7 +627,9 @@ public class BodySite extends DomainResource { * Path: BodySite.patient
*

*/ - @SearchParamDefinition(name="patient", path="BodySite.patient", description="Patient to whom bodysite belongs", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="BodySite.patient", description="Patient to whom bodysite belongs", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Bundle.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Bundle.java index e3b975772b4..ba6656ab5ac 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Bundle.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Bundle.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -2764,7 +2764,9 @@ public class Bundle extends Resource implements IBaseBundle { * Path: Bundle.entry.resource(0)
*

*/ - @SearchParamDefinition(name="composition", path="Bundle.entry.resource[0]", description="The first resource in the bundle, if the bundle type is \"document\" - this is a composition, and this parameter provides access to searches its contents", type="reference" ) + // [] + // [Composition] + @SearchParamDefinition(name="composition", path="Bundle.entry.resource[0]", description="The first resource in the bundle, if the bundle type is \"document\" - this is a composition, and this parameter provides access to searches its contents", type="reference", target={} ) public static final String SP_COMPOSITION = "composition"; /** * Fluent Client search parameter constant for composition @@ -2790,7 +2792,9 @@ public class Bundle extends Resource implements IBaseBundle { * Path: Bundle.type
*

*/ - @SearchParamDefinition(name="type", path="Bundle.type", description="document | message | transaction | transaction-response | batch | batch-response | history | searchset | collection", type="token" ) + // [] + // [] + @SearchParamDefinition(name="type", path="Bundle.type", description="document | message | transaction | transaction-response | batch | batch-response | history | searchset | collection", type="token", target={} ) public static final String SP_TYPE = "type"; /** * Fluent Client search parameter constant for type @@ -2810,7 +2814,9 @@ public class Bundle extends Resource implements IBaseBundle { * Path: Bundle.entry.resource(0)
*

*/ - @SearchParamDefinition(name="message", path="Bundle.entry.resource[0]", description="The first resource in the bundle, if the bundle type is \"message\" - this is a message header, and this parameter provides access to search its contents", type="reference" ) + // [] + // [MessageHeader] + @SearchParamDefinition(name="message", path="Bundle.entry.resource[0]", description="The first resource in the bundle, if the bundle type is \"message\" - this is a message header, and this parameter provides access to search its contents", type="reference", target={} ) public static final String SP_MESSAGE = "message"; /** * Fluent Client search parameter constant for message diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CarePlan.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CarePlan.java index b94ab46de50..66dd1397ee4 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CarePlan.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CarePlan.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -3719,7 +3719,9 @@ public class CarePlan extends DomainResource { * Path: CarePlan.period
*

*/ - @SearchParamDefinition(name="date", path="CarePlan.period", description="Time period plan covers", type="date" ) + // [] + // [] + @SearchParamDefinition(name="date", path="CarePlan.period", description="Time period plan covers", type="date", target={} ) public static final String SP_DATE = "date"; /** * Fluent Client search parameter constant for date @@ -3739,7 +3741,9 @@ public class CarePlan extends DomainResource { * Path: CarePlan.activity.detail.code
*

*/ - @SearchParamDefinition(name="activitycode", path="CarePlan.activity.detail.code", description="Detail type of activity", type="token" ) + // [] + // [] + @SearchParamDefinition(name="activitycode", path="CarePlan.activity.detail.code", description="Detail type of activity", type="token", target={} ) public static final String SP_ACTIVITYCODE = "activitycode"; /** * Fluent Client search parameter constant for activitycode @@ -3759,7 +3763,9 @@ public class CarePlan extends DomainResource { * Path: CarePlan.activity.detail.scheduled[x]
*

*/ - @SearchParamDefinition(name="activitydate", path="CarePlan.activity.detail.scheduled", description="Specified date occurs within period specified by CarePlan.activity.timingSchedule", type="date" ) + // [] + // [] + @SearchParamDefinition(name="activitydate", path="CarePlan.activity.detail.scheduled", description="Specified date occurs within period specified by CarePlan.activity.timingSchedule", type="date", target={} ) public static final String SP_ACTIVITYDATE = "activitydate"; /** * Fluent Client search parameter constant for activitydate @@ -3779,7 +3785,9 @@ public class CarePlan extends DomainResource { * Path: CarePlan.activity.reference
*

*/ - @SearchParamDefinition(name="activityreference", path="CarePlan.activity.reference", description="Activity details defined in specific resource", type="reference" ) + // [Appointment, Order, ReferralRequest, ProcessRequest, NutritionOrder, VisionPrescription, DiagnosticOrder, ProcedureRequest, DeviceUseRequest, MedicationOrder, CommunicationRequest, SupplyRequest] + // [Appointment, Order, ReferralRequest, ProcessRequest, NutritionOrder, VisionPrescription, DiagnosticOrder, ProcedureRequest, DeviceUseRequest, MedicationOrder, CommunicationRequest, SupplyRequest] + @SearchParamDefinition(name="activityreference", path="CarePlan.activity.reference", description="Activity details defined in specific resource", type="reference", target={Appointment.class, Order.class, ReferralRequest.class, ProcessRequest.class, NutritionOrder.class, VisionPrescription.class, DiagnosticOrder.class, ProcedureRequest.class, DeviceUseRequest.class, MedicationOrder.class, CommunicationRequest.class, SupplyRequest.class} ) public static final String SP_ACTIVITYREFERENCE = "activityreference"; /** * Fluent Client search parameter constant for activityreference @@ -3805,7 +3813,9 @@ public class CarePlan extends DomainResource { * Path: CarePlan.activity.detail.performer
*

*/ - @SearchParamDefinition(name="performer", path="CarePlan.activity.detail.performer", description="Matches if the practitioner is listed as a performer in any of the \"simple\" activities. (For performers of the detailed activities, chain through the activitydetail search parameter.)", type="reference" ) + // [Practitioner, Organization, Patient, RelatedPerson] + // [Practitioner, Organization, Patient, RelatedPerson] + @SearchParamDefinition(name="performer", path="CarePlan.activity.detail.performer", description="Matches if the practitioner is listed as a performer in any of the \"simple\" activities. (For performers of the detailed activities, chain through the activitydetail search parameter.)", type="reference", target={Practitioner.class, Organization.class, Patient.class, RelatedPerson.class} ) public static final String SP_PERFORMER = "performer"; /** * Fluent Client search parameter constant for performer @@ -3831,7 +3841,9 @@ public class CarePlan extends DomainResource { * Path: CarePlan.goal
*

*/ - @SearchParamDefinition(name="goal", path="CarePlan.goal", description="Desired outcome of plan", type="reference" ) + // [Goal] + // [Goal] + @SearchParamDefinition(name="goal", path="CarePlan.goal", description="Desired outcome of plan", type="reference", target={Goal.class} ) public static final String SP_GOAL = "goal"; /** * Fluent Client search parameter constant for goal @@ -3857,7 +3869,9 @@ public class CarePlan extends DomainResource { * Path: CarePlan.subject
*

*/ - @SearchParamDefinition(name="subject", path="CarePlan.subject", description="Who care plan is for", type="reference" ) + // [Group, Patient] + // [Group, Patient] + @SearchParamDefinition(name="subject", path="CarePlan.subject", description="Who care plan is for", type="reference", target={Group.class, Patient.class} ) public static final String SP_SUBJECT = "subject"; /** * Fluent Client search parameter constant for subject @@ -3883,7 +3897,9 @@ public class CarePlan extends DomainResource { * Path: CarePlan.relatedPlan.code
*

*/ - @SearchParamDefinition(name="relatedcode", path="CarePlan.relatedPlan.code", description="includes | replaces | fulfills", type="token" ) + // [] + // [] + @SearchParamDefinition(name="relatedcode", path="CarePlan.relatedPlan.code", description="includes | replaces | fulfills", type="token", target={} ) public static final String SP_RELATEDCODE = "relatedcode"; /** * Fluent Client search parameter constant for relatedcode @@ -3903,7 +3919,9 @@ public class CarePlan extends DomainResource { * Path: CarePlan.participant.member
*

*/ - @SearchParamDefinition(name="participant", path="CarePlan.participant.member", description="Who is involved", type="reference" ) + // [Practitioner, Organization, Patient, RelatedPerson] + // [Practitioner, Organization, Patient, RelatedPerson] + @SearchParamDefinition(name="participant", path="CarePlan.participant.member", description="Who is involved", type="reference", target={Practitioner.class, Organization.class, Patient.class, RelatedPerson.class} ) public static final String SP_PARTICIPANT = "participant"; /** * Fluent Client search parameter constant for participant @@ -3929,7 +3947,9 @@ public class CarePlan extends DomainResource { * Path: CarePlan.relatedPlan.plan
*

*/ - @SearchParamDefinition(name="relatedplan", path="CarePlan.relatedPlan.plan", description="Plan relationship exists with", type="reference" ) + // [CarePlan] + // [CarePlan] + @SearchParamDefinition(name="relatedplan", path="CarePlan.relatedPlan.plan", description="Plan relationship exists with", type="reference", target={CarePlan.class} ) public static final String SP_RELATEDPLAN = "relatedplan"; /** * Fluent Client search parameter constant for relatedplan @@ -3955,7 +3975,9 @@ public class CarePlan extends DomainResource { * Path: CarePlan.addresses
*

*/ - @SearchParamDefinition(name="condition", path="CarePlan.addresses", description="Health issues this plan addresses", type="reference" ) + // [Condition] + // [Condition] + @SearchParamDefinition(name="condition", path="CarePlan.addresses", description="Health issues this plan addresses", type="reference", target={Condition.class} ) public static final String SP_CONDITION = "condition"; /** * Fluent Client search parameter constant for condition @@ -3981,7 +4003,9 @@ public class CarePlan extends DomainResource { * Path:
*

*/ - @SearchParamDefinition(name="related", path="", description="A combination of the type of relationship and the related plan", type="composite", compositeOf={"relatedcode", "relatedplan"} ) + // [] + // [] + @SearchParamDefinition(name="related", path="", description="A combination of the type of relationship and the related plan", type="composite", compositeOf={"relatedcode", "relatedplan"}, target={} ) public static final String SP_RELATED = "related"; /** * Fluent Client search parameter constant for related @@ -4001,7 +4025,9 @@ public class CarePlan extends DomainResource { * Path: CarePlan.subject
*

*/ - @SearchParamDefinition(name="patient", path="CarePlan.subject", description="Who care plan is for", type="reference" ) + // [Group, Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="CarePlan.subject", description="Who care plan is for", type="reference", target={Group.class, Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -4027,7 +4053,9 @@ public class CarePlan extends DomainResource { * Path: CarePlan.category
*

*/ - @SearchParamDefinition(name="category", path="CarePlan.category", description="Type of plan", type="token" ) + // [] + // [] + @SearchParamDefinition(name="category", path="CarePlan.category", description="Type of plan", type="token", target={} ) public static final String SP_CATEGORY = "category"; /** * Fluent Client search parameter constant for category diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CareTeam.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CareTeam.java index 3cdf1beb78f..363494ede70 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CareTeam.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CareTeam.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -925,7 +925,9 @@ public class CareTeam extends DomainResource { * Path: CareTeam.period
*

*/ - @SearchParamDefinition(name="date", path="CareTeam.period", description="Time period team covers", type="date" ) + // [] + // [] + @SearchParamDefinition(name="date", path="CareTeam.period", description="Time period team covers", type="date", target={} ) public static final String SP_DATE = "date"; /** * Fluent Client search parameter constant for date @@ -945,7 +947,9 @@ public class CareTeam extends DomainResource { * Path: CareTeam.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="CareTeam.identifier", description="External Ids for this team", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="CareTeam.identifier", description="External Ids for this team", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -965,7 +969,9 @@ public class CareTeam extends DomainResource { * Path: CareTeam.subject
*

*/ - @SearchParamDefinition(name="patient", path="CareTeam.subject", description="Who care team is for", type="reference" ) + // [Group, Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="CareTeam.subject", description="Who care team is for", type="reference", target={Group.class, Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -991,7 +997,9 @@ public class CareTeam extends DomainResource { * Path: CareTeam.subject
*

*/ - @SearchParamDefinition(name="subject", path="CareTeam.subject", description="Who care team is for", type="reference" ) + // [Group, Patient] + // [Group, Patient] + @SearchParamDefinition(name="subject", path="CareTeam.subject", description="Who care team is for", type="reference", target={Group.class, Patient.class} ) public static final String SP_SUBJECT = "subject"; /** * Fluent Client search parameter constant for subject @@ -1017,7 +1025,9 @@ public class CareTeam extends DomainResource { * Path: CareTeam.type
*

*/ - @SearchParamDefinition(name="type", path="CareTeam.type", description="Type of team", type="token" ) + // [] + // [] + @SearchParamDefinition(name="type", path="CareTeam.type", description="Type of team", type="token", target={} ) public static final String SP_TYPE = "type"; /** * Fluent Client search parameter constant for type @@ -1037,7 +1047,9 @@ public class CareTeam extends DomainResource { * Path: CareTeam.participant.member
*

*/ - @SearchParamDefinition(name="participant", path="CareTeam.participant.member", description="Who is involved", type="reference" ) + // [Practitioner, Organization, Patient, RelatedPerson] + // [Practitioner, Organization, Patient, RelatedPerson] + @SearchParamDefinition(name="participant", path="CareTeam.participant.member", description="Who is involved", type="reference", target={Practitioner.class, Organization.class, Patient.class, RelatedPerson.class} ) public static final String SP_PARTICIPANT = "participant"; /** * Fluent Client search parameter constant for participant @@ -1063,7 +1075,9 @@ public class CareTeam extends DomainResource { * Path: CareTeam.status
*

*/ - @SearchParamDefinition(name="status", path="CareTeam.status", description="active | suspended | inactive | entered in error", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="CareTeam.status", description="active | suspended | inactive | entered in error", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Claim.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Claim.java index cd38ece8143..59a38eb2ac2 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Claim.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Claim.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -8434,7 +8434,9 @@ public class Claim extends DomainResource { * Path: Claim.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="Claim.identifier", description="The primary identifier of the financial resource", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="Claim.identifier", description="The primary identifier of the financial resource", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -8454,7 +8456,9 @@ public class Claim extends DomainResource { * Path: Claim.patientIdentifier
*

*/ - @SearchParamDefinition(name="patientidentifier", path="Claim.patient.as(Identifier)", description="Patient receiving the services", type="token" ) + // [] + // [] + @SearchParamDefinition(name="patientidentifier", path="Claim.patient.as(Identifier)", description="Patient receiving the services", type="token", target={} ) public static final String SP_PATIENTIDENTIFIER = "patientidentifier"; /** * Fluent Client search parameter constant for patientidentifier @@ -8474,7 +8478,9 @@ public class Claim extends DomainResource { * Path: Claim.organizationIdentifier
*

*/ - @SearchParamDefinition(name="organizationidentifier", path="Claim.organization.as(Identifier)", description="The reference to the providing organization", type="token" ) + // [] + // [] + @SearchParamDefinition(name="organizationidentifier", path="Claim.organization.as(Identifier)", description="The reference to the providing organization", type="token", target={} ) public static final String SP_ORGANIZATIONIDENTIFIER = "organizationidentifier"; /** * Fluent Client search parameter constant for organizationidentifier @@ -8494,7 +8500,9 @@ public class Claim extends DomainResource { * Path: Claim.use
*

*/ - @SearchParamDefinition(name="use", path="Claim.use", description="The kind of financial resource", type="token" ) + // [] + // [] + @SearchParamDefinition(name="use", path="Claim.use", description="The kind of financial resource", type="token", target={} ) public static final String SP_USE = "use"; /** * Fluent Client search parameter constant for use @@ -8514,7 +8522,9 @@ public class Claim extends DomainResource { * Path: Claim.created
*

*/ - @SearchParamDefinition(name="created", path="Claim.created", description="The creation date for the Claim", type="date" ) + // [] + // [] + @SearchParamDefinition(name="created", path="Claim.created", description="The creation date for the Claim", type="date", target={} ) public static final String SP_CREATED = "created"; /** * Fluent Client search parameter constant for created @@ -8534,7 +8544,9 @@ public class Claim extends DomainResource { * Path: Claim.patientReference
*

*/ - @SearchParamDefinition(name="patientreference", path="Claim.patient.as(Reference)", description="Patient receiving the services", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="patientreference", path="Claim.patient.as(Reference)", description="Patient receiving the services", type="reference", target={Patient.class} ) public static final String SP_PATIENTREFERENCE = "patientreference"; /** * Fluent Client search parameter constant for patientreference @@ -8560,7 +8572,9 @@ public class Claim extends DomainResource { * Path: Claim.providerReference
*

*/ - @SearchParamDefinition(name="providerreference", path="Claim.provider.as(Reference)", description="Provider responsible for the Claim", type="reference" ) + // [Practitioner] + // [Practitioner] + @SearchParamDefinition(name="providerreference", path="Claim.provider.as(Reference)", description="Provider responsible for the Claim", type="reference", target={Practitioner.class} ) public static final String SP_PROVIDERREFERENCE = "providerreference"; /** * Fluent Client search parameter constant for providerreference @@ -8586,7 +8600,9 @@ public class Claim extends DomainResource { * Path: Claim.organizationReference
*

*/ - @SearchParamDefinition(name="organizationreference", path="Claim.organization.as(Reference)", description="The reference to the providing organization", type="reference" ) + // [Organization] + // [Organization] + @SearchParamDefinition(name="organizationreference", path="Claim.organization.as(Reference)", description="The reference to the providing organization", type="reference", target={Organization.class} ) public static final String SP_ORGANIZATIONREFERENCE = "organizationreference"; /** * Fluent Client search parameter constant for organizationreference @@ -8612,7 +8628,9 @@ public class Claim extends DomainResource { * Path: Claim.priority
*

*/ - @SearchParamDefinition(name="priority", path="Claim.priority", description="Processing priority requested", type="token" ) + // [] + // [] + @SearchParamDefinition(name="priority", path="Claim.priority", description="Processing priority requested", type="token", target={} ) public static final String SP_PRIORITY = "priority"; /** * Fluent Client search parameter constant for priority @@ -8632,7 +8650,9 @@ public class Claim extends DomainResource { * Path: Claim.providerIdentifier
*

*/ - @SearchParamDefinition(name="provideridentifier", path="Claim.provider.as(Identifier)", description="Provider responsible for the Claim", type="token" ) + // [] + // [] + @SearchParamDefinition(name="provideridentifier", path="Claim.provider.as(Identifier)", description="Provider responsible for the Claim", type="token", target={} ) public static final String SP_PROVIDERIDENTIFIER = "provideridentifier"; /** * Fluent Client search parameter constant for provideridentifier @@ -8652,7 +8672,9 @@ public class Claim extends DomainResource { * Path: Claim.targetIdentifier
*

*/ - @SearchParamDefinition(name="targetidentifier", path="Claim.target.as(Identifier)", description="The target payor/insurer for the Claim", type="token" ) + // [] + // [] + @SearchParamDefinition(name="targetidentifier", path="Claim.target.as(Identifier)", description="The target payor/insurer for the Claim", type="token", target={} ) public static final String SP_TARGETIDENTIFIER = "targetidentifier"; /** * Fluent Client search parameter constant for targetidentifier @@ -8672,7 +8694,9 @@ public class Claim extends DomainResource { * Path: Claim.facilityReference
*

*/ - @SearchParamDefinition(name="facilityreference", path="Claim.facility.as(Reference)", description="Facility responsible for the goods and services", type="reference" ) + // [Location] + // [Location] + @SearchParamDefinition(name="facilityreference", path="Claim.facility.as(Reference)", description="Facility responsible for the goods and services", type="reference", target={Location.class} ) public static final String SP_FACILITYREFERENCE = "facilityreference"; /** * Fluent Client search parameter constant for facilityreference @@ -8698,7 +8722,9 @@ public class Claim extends DomainResource { * Path: Claim.targetReference
*

*/ - @SearchParamDefinition(name="targetreference", path="Claim.target.as(Reference)", description="The target payor/insurer for the Claim", type="reference" ) + // [Organization] + // [Organization] + @SearchParamDefinition(name="targetreference", path="Claim.target.as(Reference)", description="The target payor/insurer for the Claim", type="reference", target={Organization.class} ) public static final String SP_TARGETREFERENCE = "targetreference"; /** * Fluent Client search parameter constant for targetreference @@ -8724,7 +8750,9 @@ public class Claim extends DomainResource { * Path: Claim.facilityIdentifier
*

*/ - @SearchParamDefinition(name="facilityidentifier", path="Claim.facility.as(Identifier)", description="Facility responsible for the goods and services", type="token" ) + // [] + // [] + @SearchParamDefinition(name="facilityidentifier", path="Claim.facility.as(Identifier)", description="Facility responsible for the goods and services", type="token", target={} ) public static final String SP_FACILITYIDENTIFIER = "facilityidentifier"; /** * Fluent Client search parameter constant for facilityidentifier diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ClaimResponse.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ClaimResponse.java index cab0f5ea714..e77de2b7496 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ClaimResponse.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ClaimResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -6230,7 +6230,9 @@ public class ClaimResponse extends DomainResource { * Path: ClaimResponse.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="ClaimResponse.identifier", description="The identity of the insurer", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="ClaimResponse.identifier", description="The identity of the insurer", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -6250,7 +6252,9 @@ public class ClaimResponse extends DomainResource { * Path: ClaimResponse.disposition
*

*/ - @SearchParamDefinition(name="disposition", path="ClaimResponse.disposition", description="The contents of the disposition message", type="string" ) + // [] + // [] + @SearchParamDefinition(name="disposition", path="ClaimResponse.disposition", description="The contents of the disposition message", type="string", target={} ) public static final String SP_DISPOSITION = "disposition"; /** * Fluent Client search parameter constant for disposition @@ -6270,7 +6274,9 @@ public class ClaimResponse extends DomainResource { * Path: ClaimResponse.paymentDate
*

*/ - @SearchParamDefinition(name="paymentdate", path="ClaimResponse.paymentDate", description="The expected paymentDate", type="date" ) + // [] + // [] + @SearchParamDefinition(name="paymentdate", path="ClaimResponse.paymentDate", description="The expected paymentDate", type="date", target={} ) public static final String SP_PAYMENTDATE = "paymentdate"; /** * Fluent Client search parameter constant for paymentdate @@ -6290,7 +6296,9 @@ public class ClaimResponse extends DomainResource { * Path: ClaimResponse.organizationIdentifier
*

*/ - @SearchParamDefinition(name="organizationidentifier", path="ClaimResponse.organization.as(Identifier)", description="The organization who generated this resource", type="token" ) + // [] + // [] + @SearchParamDefinition(name="organizationidentifier", path="ClaimResponse.organization.as(Identifier)", description="The organization who generated this resource", type="token", target={} ) public static final String SP_ORGANIZATIONIDENTIFIER = "organizationidentifier"; /** * Fluent Client search parameter constant for organizationidentifier @@ -6310,7 +6318,9 @@ public class ClaimResponse extends DomainResource { * Path: ClaimResponse.created
*

*/ - @SearchParamDefinition(name="created", path="ClaimResponse.created", description="The creation date", type="date" ) + // [] + // [] + @SearchParamDefinition(name="created", path="ClaimResponse.created", description="The creation date", type="date", target={} ) public static final String SP_CREATED = "created"; /** * Fluent Client search parameter constant for created @@ -6330,7 +6340,9 @@ public class ClaimResponse extends DomainResource { * Path: ClaimResponse.requestIdentifier
*

*/ - @SearchParamDefinition(name="requestidentifier", path="ClaimResponse.request.as(Identifier)", description="The claim reference", type="token" ) + // [] + // [] + @SearchParamDefinition(name="requestidentifier", path="ClaimResponse.request.as(Identifier)", description="The claim reference", type="token", target={} ) public static final String SP_REQUESTIDENTIFIER = "requestidentifier"; /** * Fluent Client search parameter constant for requestidentifier @@ -6350,7 +6362,9 @@ public class ClaimResponse extends DomainResource { * Path: ClaimResponse.organizationReference
*

*/ - @SearchParamDefinition(name="organizationreference", path="ClaimResponse.organization.as(Reference)", description="The organization who generated this resource", type="reference" ) + // [Organization] + // [Organization] + @SearchParamDefinition(name="organizationreference", path="ClaimResponse.organization.as(Reference)", description="The organization who generated this resource", type="reference", target={Organization.class} ) public static final String SP_ORGANIZATIONREFERENCE = "organizationreference"; /** * Fluent Client search parameter constant for organizationreference @@ -6376,7 +6390,9 @@ public class ClaimResponse extends DomainResource { * Path: ClaimResponse.requestReference
*

*/ - @SearchParamDefinition(name="requestreference", path="ClaimResponse.request.as(Reference)", description="The claim reference", type="reference" ) + // [Claim] + // [Claim] + @SearchParamDefinition(name="requestreference", path="ClaimResponse.request.as(Reference)", description="The claim reference", type="reference", target={Claim.class} ) public static final String SP_REQUESTREFERENCE = "requestreference"; /** * Fluent Client search parameter constant for requestreference @@ -6402,7 +6418,9 @@ public class ClaimResponse extends DomainResource { * Path: ClaimResponse.outcome
*

*/ - @SearchParamDefinition(name="outcome", path="ClaimResponse.outcome", description="The processing outcome", type="token" ) + // [] + // [] + @SearchParamDefinition(name="outcome", path="ClaimResponse.outcome", description="The processing outcome", type="token", target={} ) public static final String SP_OUTCOME = "outcome"; /** * Fluent Client search parameter constant for outcome diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ClinicalImpression.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ClinicalImpression.java index c0cfc0d6571..3e501714ffc 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ClinicalImpression.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ClinicalImpression.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -2209,7 +2209,9 @@ public class ClinicalImpression extends DomainResource { * Path: ClinicalImpression.date
*

*/ - @SearchParamDefinition(name="date", path="ClinicalImpression.date", description="When the assessment occurred", type="date" ) + // [] + // [] + @SearchParamDefinition(name="date", path="ClinicalImpression.date", description="When the assessment occurred", type="date", target={} ) public static final String SP_DATE = "date"; /** * Fluent Client search parameter constant for date @@ -2229,7 +2231,9 @@ public class ClinicalImpression extends DomainResource { * Path: ClinicalImpression.previous
*

*/ - @SearchParamDefinition(name="previous", path="ClinicalImpression.previous", description="Reference to last assessment", type="reference" ) + // [ClinicalImpression] + // [ClinicalImpression] + @SearchParamDefinition(name="previous", path="ClinicalImpression.previous", description="Reference to last assessment", type="reference", target={ClinicalImpression.class} ) public static final String SP_PREVIOUS = "previous"; /** * Fluent Client search parameter constant for previous @@ -2255,7 +2259,9 @@ public class ClinicalImpression extends DomainResource { * Path: ClinicalImpression.assessor
*

*/ - @SearchParamDefinition(name="assessor", path="ClinicalImpression.assessor", description="The clinician performing the assessment", type="reference" ) + // [Practitioner] + // [Practitioner] + @SearchParamDefinition(name="assessor", path="ClinicalImpression.assessor", description="The clinician performing the assessment", type="reference", target={Practitioner.class} ) public static final String SP_ASSESSOR = "assessor"; /** * Fluent Client search parameter constant for assessor @@ -2281,6 +2287,8 @@ public class ClinicalImpression extends DomainResource { * Path: ClinicalImpression.triggerReference
*

*/ + // [Any] + // [Any] @SearchParamDefinition(name="trigger", path="ClinicalImpression.trigger.as(Reference)", description="Request or event that necessitated this assessment", type="reference" ) public static final String SP_TRIGGER = "trigger"; /** @@ -2307,7 +2315,9 @@ public class ClinicalImpression extends DomainResource { * Path: ClinicalImpression.finding.item
*

*/ - @SearchParamDefinition(name="finding", path="ClinicalImpression.finding.item", description="Specific text or code for finding", type="token" ) + // [] + // [] + @SearchParamDefinition(name="finding", path="ClinicalImpression.finding.item", description="Specific text or code for finding", type="token", target={} ) public static final String SP_FINDING = "finding"; /** * Fluent Client search parameter constant for finding @@ -2327,7 +2337,9 @@ public class ClinicalImpression extends DomainResource { * Path: ClinicalImpression.ruledOut.item
*

*/ - @SearchParamDefinition(name="ruledout", path="ClinicalImpression.ruledOut.item", description="Specific text of code for diagnosis", type="token" ) + // [] + // [] + @SearchParamDefinition(name="ruledout", path="ClinicalImpression.ruledOut.item", description="Specific text of code for diagnosis", type="token", target={} ) public static final String SP_RULEDOUT = "ruledout"; /** * Fluent Client search parameter constant for ruledout @@ -2347,7 +2359,9 @@ public class ClinicalImpression extends DomainResource { * Path: ClinicalImpression.problem
*

*/ - @SearchParamDefinition(name="problem", path="ClinicalImpression.problem", description="General assessment of patient state", type="reference" ) + // [Condition, AllergyIntolerance] + // [Condition, AllergyIntolerance] + @SearchParamDefinition(name="problem", path="ClinicalImpression.problem", description="General assessment of patient state", type="reference", target={Condition.class, AllergyIntolerance.class} ) public static final String SP_PROBLEM = "problem"; /** * Fluent Client search parameter constant for problem @@ -2373,7 +2387,9 @@ public class ClinicalImpression extends DomainResource { * Path: ClinicalImpression.patient
*

*/ - @SearchParamDefinition(name="patient", path="ClinicalImpression.patient", description="The patient being assessed", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="ClinicalImpression.patient", description="The patient being assessed", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -2399,7 +2415,9 @@ public class ClinicalImpression extends DomainResource { * Path: ClinicalImpression.investigations.item
*

*/ - @SearchParamDefinition(name="investigation", path="ClinicalImpression.investigations.item", description="Record of a specific investigation", type="reference" ) + // [FamilyMemberHistory, Observation, DiagnosticReport, QuestionnaireResponse] + // [FamilyMemberHistory, Observation, DiagnosticReport, QuestionnaireResponse] + @SearchParamDefinition(name="investigation", path="ClinicalImpression.investigations.item", description="Record of a specific investigation", type="reference", target={FamilyMemberHistory.class, Observation.class, DiagnosticReport.class, QuestionnaireResponse.class} ) public static final String SP_INVESTIGATION = "investigation"; /** * Fluent Client search parameter constant for investigation @@ -2425,7 +2443,9 @@ public class ClinicalImpression extends DomainResource { * Path: ClinicalImpression.action
*

*/ - @SearchParamDefinition(name="action", path="ClinicalImpression.action", description="Actions taken during assessment", type="reference" ) + // [Appointment, ReferralRequest, NutritionOrder, ProcedureRequest, Procedure, DiagnosticOrder, MedicationOrder, SupplyRequest] + // [Appointment, ReferralRequest, NutritionOrder, ProcedureRequest, Procedure, DiagnosticOrder, MedicationOrder, SupplyRequest] + @SearchParamDefinition(name="action", path="ClinicalImpression.action", description="Actions taken during assessment", type="reference", target={Appointment.class, ReferralRequest.class, NutritionOrder.class, ProcedureRequest.class, Procedure.class, DiagnosticOrder.class, MedicationOrder.class, SupplyRequest.class} ) public static final String SP_ACTION = "action"; /** * Fluent Client search parameter constant for action @@ -2451,7 +2471,9 @@ public class ClinicalImpression extends DomainResource { * Path: ClinicalImpression.triggerCodeableConcept
*

*/ - @SearchParamDefinition(name="trigger-code", path="ClinicalImpression.trigger.as(CodeableConcept)", description="Request or event that necessitated this assessment", type="token" ) + // [] + // [] + @SearchParamDefinition(name="trigger-code", path="ClinicalImpression.trigger.as(CodeableConcept)", description="Request or event that necessitated this assessment", type="token", target={} ) public static final String SP_TRIGGER_CODE = "trigger-code"; /** * Fluent Client search parameter constant for trigger-code @@ -2471,7 +2493,9 @@ public class ClinicalImpression extends DomainResource { * Path: ClinicalImpression.plan
*

*/ - @SearchParamDefinition(name="plan", path="ClinicalImpression.plan", description="Plan of action after assessment", type="reference" ) + // [Appointment, Order, ReferralRequest, ProcessRequest, VisionPrescription, DiagnosticOrder, ProcedureRequest, DeviceUseRequest, SupplyRequest, CarePlan, NutritionOrder, MedicationOrder, CommunicationRequest] + // [Appointment, Order, ReferralRequest, ProcessRequest, VisionPrescription, DiagnosticOrder, ProcedureRequest, DeviceUseRequest, SupplyRequest, CarePlan, NutritionOrder, MedicationOrder, CommunicationRequest] + @SearchParamDefinition(name="plan", path="ClinicalImpression.plan", description="Plan of action after assessment", type="reference", target={Appointment.class, Order.class, ReferralRequest.class, ProcessRequest.class, VisionPrescription.class, DiagnosticOrder.class, ProcedureRequest.class, DeviceUseRequest.class, SupplyRequest.class, CarePlan.class, NutritionOrder.class, MedicationOrder.class, CommunicationRequest.class} ) public static final String SP_PLAN = "plan"; /** * Fluent Client search parameter constant for plan @@ -2497,7 +2521,9 @@ public class ClinicalImpression extends DomainResource { * Path: ClinicalImpression.resolved
*

*/ - @SearchParamDefinition(name="resolved", path="ClinicalImpression.resolved", description="Diagnoses/conditions resolved since previous assessment", type="token" ) + // [] + // [] + @SearchParamDefinition(name="resolved", path="ClinicalImpression.resolved", description="Diagnoses/conditions resolved since previous assessment", type="token", target={} ) public static final String SP_RESOLVED = "resolved"; /** * Fluent Client search parameter constant for resolved @@ -2517,7 +2543,9 @@ public class ClinicalImpression extends DomainResource { * Path: ClinicalImpression.status
*

*/ - @SearchParamDefinition(name="status", path="ClinicalImpression.status", description="in-progress | completed | entered-in-error", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="ClinicalImpression.status", description="in-progress | completed | entered-in-error", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CodeSystem.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CodeSystem.java index 6f376f86e4b..8a925fcfc98 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CodeSystem.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CodeSystem.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -3991,7 +3991,9 @@ public class CodeSystem extends DomainResource { * Path: CodeSystem.date
*

*/ - @SearchParamDefinition(name="date", path="CodeSystem.date", description="The code system publication date", type="date" ) + // [] + // [] + @SearchParamDefinition(name="date", path="CodeSystem.date", description="The code system publication date", type="date", target={} ) public static final String SP_DATE = "date"; /** * Fluent Client search parameter constant for date @@ -4011,7 +4013,9 @@ public class CodeSystem extends DomainResource { * Path: CodeSystem.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="CodeSystem.identifier", description="The identifier for the code system", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="CodeSystem.identifier", description="The identifier for the code system", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -4031,7 +4035,9 @@ public class CodeSystem extends DomainResource { * Path: CodeSystem.concept.code
*

*/ - @SearchParamDefinition(name="code", path="CodeSystem.concept.code", description="A code defined in the code system", type="token" ) + // [] + // [] + @SearchParamDefinition(name="code", path="CodeSystem.concept.code", description="A code defined in the code system", type="token", target={} ) public static final String SP_CODE = "code"; /** * Fluent Client search parameter constant for code @@ -4051,7 +4057,9 @@ public class CodeSystem extends DomainResource { * Path: CodeSystem.description
*

*/ - @SearchParamDefinition(name="description", path="CodeSystem.description", description="Text search in the description of the code system", type="string" ) + // [] + // [] + @SearchParamDefinition(name="description", path="CodeSystem.description", description="Text search in the description of the code system", type="string", target={} ) public static final String SP_DESCRIPTION = "description"; /** * Fluent Client search parameter constant for description @@ -4071,7 +4079,9 @@ public class CodeSystem extends DomainResource { * Path: CodeSystem.concept.designation.language
*

*/ - @SearchParamDefinition(name="language", path="CodeSystem.concept.designation.language", description="A language in which a designation is provided", type="token" ) + // [] + // [] + @SearchParamDefinition(name="language", path="CodeSystem.concept.designation.language", description="A language in which a designation is provided", type="token", target={} ) public static final String SP_LANGUAGE = "language"; /** * Fluent Client search parameter constant for language @@ -4091,7 +4101,9 @@ public class CodeSystem extends DomainResource { * Path: CodeSystem.version
*

*/ - @SearchParamDefinition(name="version", path="CodeSystem.version", description="The version identifier of the code system", type="token" ) + // [] + // [] + @SearchParamDefinition(name="version", path="CodeSystem.version", description="The version identifier of the code system", type="token", target={} ) public static final String SP_VERSION = "version"; /** * Fluent Client search parameter constant for version @@ -4111,7 +4123,9 @@ public class CodeSystem extends DomainResource { * Path: CodeSystem.url
*

*/ - @SearchParamDefinition(name="url", path="CodeSystem.url", description="The logical URL for the code system", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="url", path="CodeSystem.url", description="The logical URL for the code system", type="uri", target={} ) public static final String SP_URL = "url"; /** * Fluent Client search parameter constant for url @@ -4131,7 +4145,9 @@ public class CodeSystem extends DomainResource { * Path: CodeSystem.content
*

*/ - @SearchParamDefinition(name="content", path="CodeSystem.content", description="not-present | examplar | fragment | complete", type="token" ) + // [] + // [] + @SearchParamDefinition(name="content", path="CodeSystem.content", description="not-present | examplar | fragment | complete", type="token", target={} ) public static final String SP_CONTENT = "content"; /** * Fluent Client search parameter constant for content @@ -4151,7 +4167,9 @@ public class CodeSystem extends DomainResource { * Path: CodeSystem.url
*

*/ - @SearchParamDefinition(name="system", path="CodeSystem.url", description="The system for any codes defined by this code system (same as 'url')", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="system", path="CodeSystem.url", description="The system for any codes defined by this code system (same as 'url')", type="uri", target={} ) public static final String SP_SYSTEM = "system"; /** * Fluent Client search parameter constant for system @@ -4171,7 +4189,9 @@ public class CodeSystem extends DomainResource { * Path: CodeSystem.name
*

*/ - @SearchParamDefinition(name="name", path="CodeSystem.name", description="The name of the code system", type="string" ) + // [] + // [] + @SearchParamDefinition(name="name", path="CodeSystem.name", description="The name of the code system", type="string", target={} ) public static final String SP_NAME = "name"; /** * Fluent Client search parameter constant for name @@ -4191,7 +4211,9 @@ public class CodeSystem extends DomainResource { * Path: CodeSystem.useContext
*

*/ - @SearchParamDefinition(name="context", path="CodeSystem.useContext", description="A use context assigned to the code system", type="token" ) + // [] + // [] + @SearchParamDefinition(name="context", path="CodeSystem.useContext", description="A use context assigned to the code system", type="token", target={} ) public static final String SP_CONTEXT = "context"; /** * Fluent Client search parameter constant for context @@ -4211,7 +4233,9 @@ public class CodeSystem extends DomainResource { * Path: CodeSystem.publisher
*

*/ - @SearchParamDefinition(name="publisher", path="CodeSystem.publisher", description="Name of the publisher of the code system", type="string" ) + // [] + // [] + @SearchParamDefinition(name="publisher", path="CodeSystem.publisher", description="Name of the publisher of the code system", type="string", target={} ) public static final String SP_PUBLISHER = "publisher"; /** * Fluent Client search parameter constant for publisher @@ -4231,7 +4255,9 @@ public class CodeSystem extends DomainResource { * Path: CodeSystem.status
*

*/ - @SearchParamDefinition(name="status", path="CodeSystem.status", description="The status of the code system", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="CodeSystem.status", description="The status of the code system", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Communication.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Communication.java index d5f59213305..aaac78e671a 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Communication.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Communication.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1409,7 +1409,9 @@ public class Communication extends DomainResource { * Path: Communication.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="Communication.identifier", description="Unique identifier", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="Communication.identifier", description="Unique identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -1429,7 +1431,9 @@ public class Communication extends DomainResource { * Path: Communication.requestDetail
*

*/ - @SearchParamDefinition(name="request", path="Communication.requestDetail", description="CommunicationRequest producing this message", type="reference" ) + // [CommunicationRequest] + // [CommunicationRequest] + @SearchParamDefinition(name="request", path="Communication.requestDetail", description="CommunicationRequest producing this message", type="reference", target={CommunicationRequest.class} ) public static final String SP_REQUEST = "request"; /** * Fluent Client search parameter constant for request @@ -1455,7 +1459,9 @@ public class Communication extends DomainResource { * Path: Communication.sender
*

*/ - @SearchParamDefinition(name="sender", path="Communication.sender", description="Message sender", type="reference" ) + // [Practitioner, Organization, Device, Patient, RelatedPerson] + // [Practitioner, Organization, Device, Patient, RelatedPerson] + @SearchParamDefinition(name="sender", path="Communication.sender", description="Message sender", type="reference", target={Practitioner.class, Organization.class, Device.class, Patient.class, RelatedPerson.class} ) public static final String SP_SENDER = "sender"; /** * Fluent Client search parameter constant for sender @@ -1481,7 +1487,9 @@ public class Communication extends DomainResource { * Path: Communication.subject
*

*/ - @SearchParamDefinition(name="subject", path="Communication.subject", description="Focus of message", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="subject", path="Communication.subject", description="Focus of message", type="reference", target={Patient.class} ) public static final String SP_SUBJECT = "subject"; /** * Fluent Client search parameter constant for subject @@ -1507,7 +1515,9 @@ public class Communication extends DomainResource { * Path: Communication.subject
*

*/ - @SearchParamDefinition(name="patient", path="Communication.subject", description="Focus of message", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="Communication.subject", description="Focus of message", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -1533,7 +1543,9 @@ public class Communication extends DomainResource { * Path: Communication.recipient
*

*/ - @SearchParamDefinition(name="recipient", path="Communication.recipient", description="Message recipient", type="reference" ) + // [Practitioner, Group, Organization, Device, Patient, RelatedPerson] + // [Practitioner, Group, Organization, Device, Patient, RelatedPerson] + @SearchParamDefinition(name="recipient", path="Communication.recipient", description="Message recipient", type="reference", target={Practitioner.class, Group.class, Organization.class, Device.class, Patient.class, RelatedPerson.class} ) public static final String SP_RECIPIENT = "recipient"; /** * Fluent Client search parameter constant for recipient @@ -1559,7 +1571,9 @@ public class Communication extends DomainResource { * Path: Communication.received
*

*/ - @SearchParamDefinition(name="received", path="Communication.received", description="When received", type="date" ) + // [] + // [] + @SearchParamDefinition(name="received", path="Communication.received", description="When received", type="date", target={} ) public static final String SP_RECEIVED = "received"; /** * Fluent Client search parameter constant for received @@ -1579,7 +1593,9 @@ public class Communication extends DomainResource { * Path: Communication.medium
*

*/ - @SearchParamDefinition(name="medium", path="Communication.medium", description="A channel of communication", type="token" ) + // [] + // [] + @SearchParamDefinition(name="medium", path="Communication.medium", description="A channel of communication", type="token", target={} ) public static final String SP_MEDIUM = "medium"; /** * Fluent Client search parameter constant for medium @@ -1599,7 +1615,9 @@ public class Communication extends DomainResource { * Path: Communication.encounter
*

*/ - @SearchParamDefinition(name="encounter", path="Communication.encounter", description="Encounter leading to message", type="reference" ) + // [Encounter] + // [Encounter] + @SearchParamDefinition(name="encounter", path="Communication.encounter", description="Encounter leading to message", type="reference", target={Encounter.class} ) public static final String SP_ENCOUNTER = "encounter"; /** * Fluent Client search parameter constant for encounter @@ -1625,7 +1643,9 @@ public class Communication extends DomainResource { * Path: Communication.category
*

*/ - @SearchParamDefinition(name="category", path="Communication.category", description="Message category", type="token" ) + // [] + // [] + @SearchParamDefinition(name="category", path="Communication.category", description="Message category", type="token", target={} ) public static final String SP_CATEGORY = "category"; /** * Fluent Client search parameter constant for category @@ -1645,7 +1665,9 @@ public class Communication extends DomainResource { * Path: Communication.sent
*

*/ - @SearchParamDefinition(name="sent", path="Communication.sent", description="When sent", type="date" ) + // [] + // [] + @SearchParamDefinition(name="sent", path="Communication.sent", description="When sent", type="date", target={} ) public static final String SP_SENT = "sent"; /** * Fluent Client search parameter constant for sent @@ -1665,7 +1687,9 @@ public class Communication extends DomainResource { * Path: Communication.status
*

*/ - @SearchParamDefinition(name="status", path="Communication.status", description="in-progress | completed | suspended | rejected | failed", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="Communication.status", description="in-progress | completed | suspended | rejected | failed", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CommunicationRequest.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CommunicationRequest.java index 62cdcae9f9c..8bcfc403e4c 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CommunicationRequest.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CommunicationRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1529,7 +1529,9 @@ public class CommunicationRequest extends DomainResource { * Path: CommunicationRequest.requester
*

*/ - @SearchParamDefinition(name="requester", path="CommunicationRequest.requester", description="An individual who requested a communication", type="reference" ) + // [Practitioner, Patient, RelatedPerson] + // [Practitioner, Patient, RelatedPerson] + @SearchParamDefinition(name="requester", path="CommunicationRequest.requester", description="An individual who requested a communication", type="reference", target={Practitioner.class, Patient.class, RelatedPerson.class} ) public static final String SP_REQUESTER = "requester"; /** * Fluent Client search parameter constant for requester @@ -1555,7 +1557,9 @@ public class CommunicationRequest extends DomainResource { * Path: CommunicationRequest.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="CommunicationRequest.identifier", description="Unique identifier", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="CommunicationRequest.identifier", description="Unique identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -1575,7 +1579,9 @@ public class CommunicationRequest extends DomainResource { * Path: CommunicationRequest.subject
*

*/ - @SearchParamDefinition(name="subject", path="CommunicationRequest.subject", description="Focus of message", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="subject", path="CommunicationRequest.subject", description="Focus of message", type="reference", target={Patient.class} ) public static final String SP_SUBJECT = "subject"; /** * Fluent Client search parameter constant for subject @@ -1601,7 +1607,9 @@ public class CommunicationRequest extends DomainResource { * Path: CommunicationRequest.medium
*

*/ - @SearchParamDefinition(name="medium", path="CommunicationRequest.medium", description="A channel of communication", type="token" ) + // [] + // [] + @SearchParamDefinition(name="medium", path="CommunicationRequest.medium", description="A channel of communication", type="token", target={} ) public static final String SP_MEDIUM = "medium"; /** * Fluent Client search parameter constant for medium @@ -1621,7 +1629,9 @@ public class CommunicationRequest extends DomainResource { * Path: CommunicationRequest.encounter
*

*/ - @SearchParamDefinition(name="encounter", path="CommunicationRequest.encounter", description="Encounter leading to message", type="reference" ) + // [Encounter] + // [Encounter] + @SearchParamDefinition(name="encounter", path="CommunicationRequest.encounter", description="Encounter leading to message", type="reference", target={Encounter.class} ) public static final String SP_ENCOUNTER = "encounter"; /** * Fluent Client search parameter constant for encounter @@ -1647,7 +1657,9 @@ public class CommunicationRequest extends DomainResource { * Path: CommunicationRequest.priority
*

*/ - @SearchParamDefinition(name="priority", path="CommunicationRequest.priority", description="Message urgency", type="token" ) + // [] + // [] + @SearchParamDefinition(name="priority", path="CommunicationRequest.priority", description="Message urgency", type="token", target={} ) public static final String SP_PRIORITY = "priority"; /** * Fluent Client search parameter constant for priority @@ -1667,7 +1679,9 @@ public class CommunicationRequest extends DomainResource { * Path: CommunicationRequest.requestedOn
*

*/ - @SearchParamDefinition(name="requested", path="CommunicationRequest.requestedOn", description="When ordered or proposed", type="date" ) + // [] + // [] + @SearchParamDefinition(name="requested", path="CommunicationRequest.requestedOn", description="When ordered or proposed", type="date", target={} ) public static final String SP_REQUESTED = "requested"; /** * Fluent Client search parameter constant for requested @@ -1687,7 +1701,9 @@ public class CommunicationRequest extends DomainResource { * Path: CommunicationRequest.sender
*

*/ - @SearchParamDefinition(name="sender", path="CommunicationRequest.sender", description="Message sender", type="reference" ) + // [Practitioner, Organization, Device, Patient, RelatedPerson] + // [Practitioner, Organization, Device, Patient, RelatedPerson] + @SearchParamDefinition(name="sender", path="CommunicationRequest.sender", description="Message sender", type="reference", target={Practitioner.class, Organization.class, Device.class, Patient.class, RelatedPerson.class} ) public static final String SP_SENDER = "sender"; /** * Fluent Client search parameter constant for sender @@ -1713,7 +1729,9 @@ public class CommunicationRequest extends DomainResource { * Path: CommunicationRequest.subject
*

*/ - @SearchParamDefinition(name="patient", path="CommunicationRequest.subject", description="Focus of message", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="CommunicationRequest.subject", description="Focus of message", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -1739,7 +1757,9 @@ public class CommunicationRequest extends DomainResource { * Path: CommunicationRequest.recipient
*

*/ - @SearchParamDefinition(name="recipient", path="CommunicationRequest.recipient", description="Message recipient", type="reference" ) + // [Practitioner, Group, Organization, CareTeam, Device, Patient, RelatedPerson] + // [Practitioner, Group, Organization, CareTeam, Device, Patient, RelatedPerson] + @SearchParamDefinition(name="recipient", path="CommunicationRequest.recipient", description="Message recipient", type="reference", target={Practitioner.class, Group.class, Organization.class, CareTeam.class, Device.class, Patient.class, RelatedPerson.class} ) public static final String SP_RECIPIENT = "recipient"; /** * Fluent Client search parameter constant for recipient @@ -1765,7 +1785,9 @@ public class CommunicationRequest extends DomainResource { * Path: CommunicationRequest.scheduledDateTime
*

*/ - @SearchParamDefinition(name="time", path="CommunicationRequest.scheduled.as(DateTime)", description="When scheduled", type="date" ) + // [] + // [] + @SearchParamDefinition(name="time", path="CommunicationRequest.scheduled.as(DateTime)", description="When scheduled", type="date", target={} ) public static final String SP_TIME = "time"; /** * Fluent Client search parameter constant for time @@ -1785,7 +1807,9 @@ public class CommunicationRequest extends DomainResource { * Path: CommunicationRequest.category
*

*/ - @SearchParamDefinition(name="category", path="CommunicationRequest.category", description="Message category", type="token" ) + // [] + // [] + @SearchParamDefinition(name="category", path="CommunicationRequest.category", description="Message category", type="token", target={} ) public static final String SP_CATEGORY = "category"; /** * Fluent Client search parameter constant for category @@ -1805,7 +1829,9 @@ public class CommunicationRequest extends DomainResource { * Path: CommunicationRequest.status
*

*/ - @SearchParamDefinition(name="status", path="CommunicationRequest.status", description="proposed | planned | requested | received | accepted | in-progress | completed | suspended | rejected | failed", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="CommunicationRequest.status", description="proposed | planned | requested | received | accepted | in-progress | completed | suspended | rejected | failed", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CompartmentDefinition.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CompartmentDefinition.java index 7c8c96938dd..add2131b968 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CompartmentDefinition.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CompartmentDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1687,7 +1687,9 @@ public class CompartmentDefinition extends DomainResource { * Path: CompartmentDefinition.date
*

*/ - @SearchParamDefinition(name="date", path="CompartmentDefinition.date", description="Publication Date(/time)", type="date" ) + // [] + // [] + @SearchParamDefinition(name="date", path="CompartmentDefinition.date", description="Publication Date(/time)", type="date", target={} ) public static final String SP_DATE = "date"; /** * Fluent Client search parameter constant for date @@ -1707,7 +1709,9 @@ public class CompartmentDefinition extends DomainResource { * Path: CompartmentDefinition.code
*

*/ - @SearchParamDefinition(name="code", path="CompartmentDefinition.code", description="Patient | Encounter | RelatedPerson | Practitioner | Device", type="token" ) + // [] + // [] + @SearchParamDefinition(name="code", path="CompartmentDefinition.code", description="Patient | Encounter | RelatedPerson | Practitioner | Device", type="token", target={} ) public static final String SP_CODE = "code"; /** * Fluent Client search parameter constant for code @@ -1727,7 +1731,9 @@ public class CompartmentDefinition extends DomainResource { * Path: CompartmentDefinition.resource.code
*

*/ - @SearchParamDefinition(name="resource", path="CompartmentDefinition.resource.code", description="Name of resource type", type="token" ) + // [] + // [] + @SearchParamDefinition(name="resource", path="CompartmentDefinition.resource.code", description="Name of resource type", type="token", target={} ) public static final String SP_RESOURCE = "resource"; /** * Fluent Client search parameter constant for resource @@ -1747,7 +1753,9 @@ public class CompartmentDefinition extends DomainResource { * Path: CompartmentDefinition.name
*

*/ - @SearchParamDefinition(name="name", path="CompartmentDefinition.name", description="Informal name for this compartment definition", type="string" ) + // [] + // [] + @SearchParamDefinition(name="name", path="CompartmentDefinition.name", description="Informal name for this compartment definition", type="string", target={} ) public static final String SP_NAME = "name"; /** * Fluent Client search parameter constant for name @@ -1767,7 +1775,9 @@ public class CompartmentDefinition extends DomainResource { * Path: CompartmentDefinition.url
*

*/ - @SearchParamDefinition(name="url", path="CompartmentDefinition.url", description="Absolute URL used to reference this compartment definition", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="url", path="CompartmentDefinition.url", description="Absolute URL used to reference this compartment definition", type="uri", target={} ) public static final String SP_URL = "url"; /** * Fluent Client search parameter constant for url @@ -1787,7 +1797,9 @@ public class CompartmentDefinition extends DomainResource { * Path: CompartmentDefinition.status
*

*/ - @SearchParamDefinition(name="status", path="CompartmentDefinition.status", description="draft | active | retired", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="CompartmentDefinition.status", description="draft | active | retired", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Composition.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Composition.java index a58615d1ffb..8e313416bcf 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Composition.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Composition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -2542,7 +2542,9 @@ public class Composition extends DomainResource { * Path: Composition.date
*

*/ - @SearchParamDefinition(name="date", path="Composition.date", description="Composition editing time", type="date" ) + // [] + // [] + @SearchParamDefinition(name="date", path="Composition.date", description="Composition editing time", type="date", target={} ) public static final String SP_DATE = "date"; /** * Fluent Client search parameter constant for date @@ -2562,7 +2564,9 @@ public class Composition extends DomainResource { * Path: Composition.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="Composition.identifier", description="Logical identifier of composition (version-independent)", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="Composition.identifier", description="Logical identifier of composition (version-independent)", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -2582,7 +2586,9 @@ public class Composition extends DomainResource { * Path: Composition.event.period
*

*/ - @SearchParamDefinition(name="period", path="Composition.event.period", description="The period covered by the documentation", type="date" ) + // [] + // [] + @SearchParamDefinition(name="period", path="Composition.event.period", description="The period covered by the documentation", type="date", target={} ) public static final String SP_PERIOD = "period"; /** * Fluent Client search parameter constant for period @@ -2602,6 +2608,8 @@ public class Composition extends DomainResource { * Path: Composition.subject
*

*/ + // [Any] + // [Any] @SearchParamDefinition(name="subject", path="Composition.subject", description="Who and/or what the composition is about", type="reference" ) public static final String SP_SUBJECT = "subject"; /** @@ -2628,7 +2636,9 @@ public class Composition extends DomainResource { * Path: Composition.author
*

*/ - @SearchParamDefinition(name="author", path="Composition.author", description="Who and/or what authored the composition", type="reference" ) + // [Practitioner, Device, Patient, RelatedPerson] + // [Practitioner, Device, Patient, RelatedPerson] + @SearchParamDefinition(name="author", path="Composition.author", description="Who and/or what authored the composition", type="reference", target={Practitioner.class, Device.class, Patient.class, RelatedPerson.class} ) public static final String SP_AUTHOR = "author"; /** * Fluent Client search parameter constant for author @@ -2654,7 +2664,9 @@ public class Composition extends DomainResource { * Path: Composition.confidentiality
*

*/ - @SearchParamDefinition(name="confidentiality", path="Composition.confidentiality", description="As defined by affinity domain", type="token" ) + // [] + // [] + @SearchParamDefinition(name="confidentiality", path="Composition.confidentiality", description="As defined by affinity domain", type="token", target={} ) public static final String SP_CONFIDENTIALITY = "confidentiality"; /** * Fluent Client search parameter constant for confidentiality @@ -2674,7 +2686,9 @@ public class Composition extends DomainResource { * Path: Composition.section.code
*

*/ - @SearchParamDefinition(name="section", path="Composition.section.code", description="Classification of section (recommended)", type="token" ) + // [] + // [] + @SearchParamDefinition(name="section", path="Composition.section.code", description="Classification of section (recommended)", type="token", target={} ) public static final String SP_SECTION = "section"; /** * Fluent Client search parameter constant for section @@ -2694,7 +2708,9 @@ public class Composition extends DomainResource { * Path: Composition.encounter
*

*/ - @SearchParamDefinition(name="encounter", path="Composition.encounter", description="Context of the Composition", type="reference" ) + // [Encounter] + // [Encounter] + @SearchParamDefinition(name="encounter", path="Composition.encounter", description="Context of the Composition", type="reference", target={Encounter.class} ) public static final String SP_ENCOUNTER = "encounter"; /** * Fluent Client search parameter constant for encounter @@ -2720,7 +2736,9 @@ public class Composition extends DomainResource { * Path: Composition.type
*

*/ - @SearchParamDefinition(name="type", path="Composition.type", description="Kind of composition (LOINC if possible)", type="token" ) + // [] + // [] + @SearchParamDefinition(name="type", path="Composition.type", description="Kind of composition (LOINC if possible)", type="token", target={} ) public static final String SP_TYPE = "type"; /** * Fluent Client search parameter constant for type @@ -2740,7 +2758,9 @@ public class Composition extends DomainResource { * Path: Composition.title
*

*/ - @SearchParamDefinition(name="title", path="Composition.title", description="Human Readable name/title", type="string" ) + // [] + // [] + @SearchParamDefinition(name="title", path="Composition.title", description="Human Readable name/title", type="string", target={} ) public static final String SP_TITLE = "title"; /** * Fluent Client search parameter constant for title @@ -2760,7 +2780,9 @@ public class Composition extends DomainResource { * Path: Composition.attester.party
*

*/ - @SearchParamDefinition(name="attester", path="Composition.attester.party", description="Who attested the composition", type="reference" ) + // [Practitioner, Organization, Patient] + // [Practitioner, Organization, Patient] + @SearchParamDefinition(name="attester", path="Composition.attester.party", description="Who attested the composition", type="reference", target={Practitioner.class, Organization.class, Patient.class} ) public static final String SP_ATTESTER = "attester"; /** * Fluent Client search parameter constant for attester @@ -2786,6 +2808,8 @@ public class Composition extends DomainResource { * Path: Composition.section.entry
*

*/ + // [Any] + // [Any] @SearchParamDefinition(name="entry", path="Composition.section.entry", description="A reference to data that supports this section", type="reference" ) public static final String SP_ENTRY = "entry"; /** @@ -2812,6 +2836,8 @@ public class Composition extends DomainResource { * Path: Composition.subject
*

*/ + // [Any] + // [Patient] @SearchParamDefinition(name="patient", path="Composition.subject", description="Who and/or what the composition is about", type="reference" ) public static final String SP_PATIENT = "patient"; /** @@ -2838,7 +2864,9 @@ public class Composition extends DomainResource { * Path: Composition.event.code
*

*/ - @SearchParamDefinition(name="context", path="Composition.event.code", description="Code(s) that apply to the event being documented", type="token" ) + // [] + // [] + @SearchParamDefinition(name="context", path="Composition.event.code", description="Code(s) that apply to the event being documented", type="token", target={} ) public static final String SP_CONTEXT = "context"; /** * Fluent Client search parameter constant for context @@ -2858,7 +2886,9 @@ public class Composition extends DomainResource { * Path: Composition.class
*

*/ - @SearchParamDefinition(name="class", path="Composition.class", description="Categorization of Composition", type="token" ) + // [] + // [] + @SearchParamDefinition(name="class", path="Composition.class", description="Categorization of Composition", type="token", target={} ) public static final String SP_CLASS = "class"; /** * Fluent Client search parameter constant for class @@ -2878,7 +2908,9 @@ public class Composition extends DomainResource { * Path: Composition.status
*

*/ - @SearchParamDefinition(name="status", path="Composition.status", description="preliminary | final | amended | entered-in-error", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="Composition.status", description="preliminary | final | amended | entered-in-error", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ConceptMap.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ConceptMap.java index 705f4be3109..54fb2ba2c72 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ConceptMap.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ConceptMap.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -2769,7 +2769,9 @@ public class ConceptMap extends DomainResource { * Path: ConceptMap.date
*

*/ - @SearchParamDefinition(name="date", path="ConceptMap.date", description="The concept map publication date", type="date" ) + // [] + // [] + @SearchParamDefinition(name="date", path="ConceptMap.date", description="The concept map publication date", type="date", target={} ) public static final String SP_DATE = "date"; /** * Fluent Client search parameter constant for date @@ -2789,7 +2791,9 @@ public class ConceptMap extends DomainResource { * Path: ConceptMap.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="ConceptMap.identifier", description="Additional identifier for the concept map", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="ConceptMap.identifier", description="Additional identifier for the concept map", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -2809,7 +2813,9 @@ public class ConceptMap extends DomainResource { * Path: ConceptMap.element.target.product.element
*

*/ - @SearchParamDefinition(name="product", path="ConceptMap.element.target.product.element", description="Reference to element/field/ValueSet mapping depends on", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="product", path="ConceptMap.element.target.product.element", description="Reference to element/field/ValueSet mapping depends on", type="uri", target={} ) public static final String SP_PRODUCT = "product"; /** * Fluent Client search parameter constant for product @@ -2829,7 +2835,9 @@ public class ConceptMap extends DomainResource { * Path: ConceptMap.element.target.system
*

*/ - @SearchParamDefinition(name="target-system", path="ConceptMap.element.target.system", description="System of the target (if necessary)", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="target-system", path="ConceptMap.element.target.system", description="System of the target (if necessary)", type="uri", target={} ) public static final String SP_TARGET_SYSTEM = "target-system"; /** * Fluent Client search parameter constant for target-system @@ -2849,7 +2857,9 @@ public class ConceptMap extends DomainResource { * Path: ConceptMap.element.target.dependsOn.element
*

*/ - @SearchParamDefinition(name="dependson", path="ConceptMap.element.target.dependsOn.element", description="Reference to element/field/ValueSet mapping depends on", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="dependson", path="ConceptMap.element.target.dependsOn.element", description="Reference to element/field/ValueSet mapping depends on", type="uri", target={} ) public static final String SP_DEPENDSON = "dependson"; /** * Fluent Client search parameter constant for dependson @@ -2869,7 +2879,9 @@ public class ConceptMap extends DomainResource { * Path: ConceptMap.description
*

*/ - @SearchParamDefinition(name="description", path="ConceptMap.description", description="Text search in the description of the concept map", type="string" ) + // [] + // [] + @SearchParamDefinition(name="description", path="ConceptMap.description", description="Text search in the description of the concept map", type="string", target={} ) public static final String SP_DESCRIPTION = "description"; /** * Fluent Client search parameter constant for description @@ -2889,7 +2901,9 @@ public class ConceptMap extends DomainResource { * Path: ConceptMap.sourceReference
*

*/ - @SearchParamDefinition(name="source", path="ConceptMap.source.as(Reference)", description="Identifies the source of the concepts which are being mapped", type="reference" ) + // [StructureDefinition, ValueSet] + // [StructureDefinition, ValueSet] + @SearchParamDefinition(name="source", path="ConceptMap.source.as(Reference)", description="Identifies the source of the concepts which are being mapped", type="reference", target={StructureDefinition.class, ValueSet.class} ) public static final String SP_SOURCE = "source"; /** * Fluent Client search parameter constant for source @@ -2915,7 +2929,9 @@ public class ConceptMap extends DomainResource { * Path: ConceptMap.version
*

*/ - @SearchParamDefinition(name="version", path="ConceptMap.version", description="The version identifier of the concept map", type="token" ) + // [] + // [] + @SearchParamDefinition(name="version", path="ConceptMap.version", description="The version identifier of the concept map", type="token", target={} ) public static final String SP_VERSION = "version"; /** * Fluent Client search parameter constant for version @@ -2935,7 +2951,9 @@ public class ConceptMap extends DomainResource { * Path: ConceptMap.url
*

*/ - @SearchParamDefinition(name="url", path="ConceptMap.url", description="The URL of the concept map", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="url", path="ConceptMap.url", description="The URL of the concept map", type="uri", target={} ) public static final String SP_URL = "url"; /** * Fluent Client search parameter constant for url @@ -2955,7 +2973,9 @@ public class ConceptMap extends DomainResource { * Path: ConceptMap.target[x]
*

*/ - @SearchParamDefinition(name="target", path="ConceptMap.target", description="Provides context to the mappings", type="reference" ) + // [StructureDefinition, ValueSet] + // [StructureDefinition, ValueSet] + @SearchParamDefinition(name="target", path="ConceptMap.target", description="Provides context to the mappings", type="reference", target={StructureDefinition.class, ValueSet.class} ) public static final String SP_TARGET = "target"; /** * Fluent Client search parameter constant for target @@ -2981,7 +3001,9 @@ public class ConceptMap extends DomainResource { * Path: ConceptMap.element.code
*

*/ - @SearchParamDefinition(name="source-code", path="ConceptMap.element.code", description="Identifies element being mapped", type="token" ) + // [] + // [] + @SearchParamDefinition(name="source-code", path="ConceptMap.element.code", description="Identifies element being mapped", type="token", target={} ) public static final String SP_SOURCE_CODE = "source-code"; /** * Fluent Client search parameter constant for source-code @@ -3001,7 +3023,9 @@ public class ConceptMap extends DomainResource { * Path: ConceptMap.sourceUri
*

*/ - @SearchParamDefinition(name="source-uri", path="ConceptMap.source.as(Uri)", description="Identifies the source of the concepts which are being mapped", type="reference" ) + // [StructureDefinition, ValueSet] + // [StructureDefinition, ValueSet] + @SearchParamDefinition(name="source-uri", path="ConceptMap.source.as(Uri)", description="Identifies the source of the concepts which are being mapped", type="reference", target={StructureDefinition.class, ValueSet.class} ) public static final String SP_SOURCE_URI = "source-uri"; /** * Fluent Client search parameter constant for source-uri @@ -3027,7 +3051,9 @@ public class ConceptMap extends DomainResource { * Path: ConceptMap.name
*

*/ - @SearchParamDefinition(name="name", path="ConceptMap.name", description="Name of the concept map", type="string" ) + // [] + // [] + @SearchParamDefinition(name="name", path="ConceptMap.name", description="Name of the concept map", type="string", target={} ) public static final String SP_NAME = "name"; /** * Fluent Client search parameter constant for name @@ -3047,7 +3073,9 @@ public class ConceptMap extends DomainResource { * Path: ConceptMap.useContext
*

*/ - @SearchParamDefinition(name="context", path="ConceptMap.useContext", description="A use context assigned to the concept map", type="token" ) + // [] + // [] + @SearchParamDefinition(name="context", path="ConceptMap.useContext", description="A use context assigned to the concept map", type="token", target={} ) public static final String SP_CONTEXT = "context"; /** * Fluent Client search parameter constant for context @@ -3067,7 +3095,9 @@ public class ConceptMap extends DomainResource { * Path: ConceptMap.publisher
*

*/ - @SearchParamDefinition(name="publisher", path="ConceptMap.publisher", description="Name of the publisher of the concept map", type="string" ) + // [] + // [] + @SearchParamDefinition(name="publisher", path="ConceptMap.publisher", description="Name of the publisher of the concept map", type="string", target={} ) public static final String SP_PUBLISHER = "publisher"; /** * Fluent Client search parameter constant for publisher @@ -3087,7 +3117,9 @@ public class ConceptMap extends DomainResource { * Path: ConceptMap.element.system
*

*/ - @SearchParamDefinition(name="source-system", path="ConceptMap.element.system", description="Code System (if value set crosses code systems)", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="source-system", path="ConceptMap.element.system", description="Code System (if value set crosses code systems)", type="uri", target={} ) public static final String SP_SOURCE_SYSTEM = "source-system"; /** * Fluent Client search parameter constant for source-system @@ -3107,7 +3139,9 @@ public class ConceptMap extends DomainResource { * Path: ConceptMap.element.target.code
*

*/ - @SearchParamDefinition(name="target-code", path="ConceptMap.element.target.code", description="Code that identifies the target element", type="token" ) + // [] + // [] + @SearchParamDefinition(name="target-code", path="ConceptMap.element.target.code", description="Code that identifies the target element", type="token", target={} ) public static final String SP_TARGET_CODE = "target-code"; /** * Fluent Client search parameter constant for target-code @@ -3127,7 +3161,9 @@ public class ConceptMap extends DomainResource { * Path: ConceptMap.status
*

*/ - @SearchParamDefinition(name="status", path="ConceptMap.status", description="Status of the concept map", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="ConceptMap.status", description="Status of the concept map", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Condition.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Condition.java index fe772e91a70..a0026f1932b 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Condition.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Condition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1931,7 +1931,9 @@ public class Condition extends DomainResource { * Path: Condition.severity
*

*/ - @SearchParamDefinition(name="severity", path="Condition.severity", description="The severity of the condition", type="token" ) + // [] + // [] + @SearchParamDefinition(name="severity", path="Condition.severity", description="The severity of the condition", type="token", target={} ) public static final String SP_SEVERITY = "severity"; /** * Fluent Client search parameter constant for severity @@ -1951,7 +1953,9 @@ public class Condition extends DomainResource { * Path: Condition.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="Condition.identifier", description="A unique identifier of the condition record", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="Condition.identifier", description="A unique identifier of the condition record", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -1971,7 +1975,9 @@ public class Condition extends DomainResource { * Path: Condition.clinicalStatus
*

*/ - @SearchParamDefinition(name="clinicalstatus", path="Condition.clinicalStatus", description="The clinical status of the condition", type="token" ) + // [] + // [] + @SearchParamDefinition(name="clinicalstatus", path="Condition.clinicalStatus", description="The clinical status of the condition", type="token", target={} ) public static final String SP_CLINICALSTATUS = "clinicalstatus"; /** * Fluent Client search parameter constant for clinicalstatus @@ -1991,7 +1997,9 @@ public class Condition extends DomainResource { * Path: Condition.onset[x]
*

*/ - @SearchParamDefinition(name="onset-info", path="Condition.onset.as(boolean) | Condition.onset.as(Quantity) | Condition.onset.as(Range) | Condition.onset.as(string)", description="Other onsets (boolean, age, range, string)", type="string" ) + // [] + // [] + @SearchParamDefinition(name="onset-info", path="Condition.onset.as(boolean) | Condition.onset.as(Quantity) | Condition.onset.as(Range) | Condition.onset.as(string)", description="Other onsets (boolean, age, range, string)", type="string", target={} ) public static final String SP_ONSET_INFO = "onset-info"; /** * Fluent Client search parameter constant for onset-info @@ -2011,7 +2019,9 @@ public class Condition extends DomainResource { * Path: Condition.code
*

*/ - @SearchParamDefinition(name="code", path="Condition.code", description="Code for the condition", type="token" ) + // [] + // [] + @SearchParamDefinition(name="code", path="Condition.code", description="Code for the condition", type="token", target={} ) public static final String SP_CODE = "code"; /** * Fluent Client search parameter constant for code @@ -2031,7 +2041,9 @@ public class Condition extends DomainResource { * Path: Condition.evidence.code
*

*/ - @SearchParamDefinition(name="evidence", path="Condition.evidence.code", description="Manifestation/symptom", type="token" ) + // [] + // [] + @SearchParamDefinition(name="evidence", path="Condition.evidence.code", description="Manifestation/symptom", type="token", target={} ) public static final String SP_EVIDENCE = "evidence"; /** * Fluent Client search parameter constant for evidence @@ -2051,7 +2063,9 @@ public class Condition extends DomainResource { * Path: Condition.encounter
*

*/ - @SearchParamDefinition(name="encounter", path="Condition.encounter", description="Encounter when condition first asserted", type="reference" ) + // [Encounter] + // [Encounter] + @SearchParamDefinition(name="encounter", path="Condition.encounter", description="Encounter when condition first asserted", type="reference", target={Encounter.class} ) public static final String SP_ENCOUNTER = "encounter"; /** * Fluent Client search parameter constant for encounter @@ -2077,7 +2091,9 @@ public class Condition extends DomainResource { * Path: Condition.onset[x]
*

*/ - @SearchParamDefinition(name="onset", path="Condition.onset.as(dateTime) | Condition.onset.as(Period)", description="Date related onsets (dateTime and Period)", type="date" ) + // [] + // [] + @SearchParamDefinition(name="onset", path="Condition.onset.as(dateTime) | Condition.onset.as(Period)", description="Date related onsets (dateTime and Period)", type="date", target={} ) public static final String SP_ONSET = "onset"; /** * Fluent Client search parameter constant for onset @@ -2097,7 +2113,9 @@ public class Condition extends DomainResource { * Path: Condition.asserter
*

*/ - @SearchParamDefinition(name="asserter", path="Condition.asserter", description="Person who asserts this condition", type="reference" ) + // [Practitioner, Patient] + // [Practitioner, Patient] + @SearchParamDefinition(name="asserter", path="Condition.asserter", description="Person who asserts this condition", type="reference", target={Practitioner.class, Patient.class} ) public static final String SP_ASSERTER = "asserter"; /** * Fluent Client search parameter constant for asserter @@ -2123,7 +2141,9 @@ public class Condition extends DomainResource { * Path: Condition.dateRecorded
*

*/ - @SearchParamDefinition(name="date-recorded", path="Condition.dateRecorded", description="A date, when the Condition statement was documented", type="date" ) + // [] + // [] + @SearchParamDefinition(name="date-recorded", path="Condition.dateRecorded", description="A date, when the Condition statement was documented", type="date", target={} ) public static final String SP_DATE_RECORDED = "date-recorded"; /** * Fluent Client search parameter constant for date-recorded @@ -2143,7 +2163,9 @@ public class Condition extends DomainResource { * Path: Condition.stage.summary
*

*/ - @SearchParamDefinition(name="stage", path="Condition.stage.summary", description="Simple summary (disease specific)", type="token" ) + // [] + // [] + @SearchParamDefinition(name="stage", path="Condition.stage.summary", description="Simple summary (disease specific)", type="token", target={} ) public static final String SP_STAGE = "stage"; /** * Fluent Client search parameter constant for stage @@ -2163,7 +2185,9 @@ public class Condition extends DomainResource { * Path: Condition.patient
*

*/ - @SearchParamDefinition(name="patient", path="Condition.patient", description="Who has the condition?", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="Condition.patient", description="Who has the condition?", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -2189,7 +2213,9 @@ public class Condition extends DomainResource { * Path: Condition.category
*

*/ - @SearchParamDefinition(name="category", path="Condition.category", description="The category of the condition", type="token" ) + // [] + // [] + @SearchParamDefinition(name="category", path="Condition.category", description="The category of the condition", type="token", target={} ) public static final String SP_CATEGORY = "category"; /** * Fluent Client search parameter constant for category @@ -2209,7 +2235,9 @@ public class Condition extends DomainResource { * Path: Condition.bodySite
*

*/ - @SearchParamDefinition(name="body-site", path="Condition.bodySite", description="Anatomical location, if relevant", type="token" ) + // [] + // [] + @SearchParamDefinition(name="body-site", path="Condition.bodySite", description="Anatomical location, if relevant", type="token", target={} ) public static final String SP_BODY_SITE = "body-site"; /** * Fluent Client search parameter constant for body-site diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Conformance.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Conformance.java index 095ef11f693..e90b4ced5cd 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Conformance.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Conformance.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -9037,7 +9037,9 @@ public class Conformance extends DomainResource implements IBaseConformance { * Path: Conformance.date
*

*/ - @SearchParamDefinition(name="date", path="Conformance.date", description="The conformance statement publication date", type="date" ) + // [] + // [] + @SearchParamDefinition(name="date", path="Conformance.date", description="The conformance statement publication date", type="date", target={} ) public static final String SP_DATE = "date"; /** * Fluent Client search parameter constant for date @@ -9057,7 +9059,9 @@ public class Conformance extends DomainResource implements IBaseConformance { * Path: Conformance.software.name
*

*/ - @SearchParamDefinition(name="software", path="Conformance.software.name", description="Part of a the name of a software application", type="string" ) + // [] + // [] + @SearchParamDefinition(name="software", path="Conformance.software.name", description="Part of a the name of a software application", type="string", target={} ) public static final String SP_SOFTWARE = "software"; /** * Fluent Client search parameter constant for software @@ -9077,7 +9081,9 @@ public class Conformance extends DomainResource implements IBaseConformance { * Path: Conformance.rest.resource.type
*

*/ - @SearchParamDefinition(name="resource", path="Conformance.rest.resource.type", description="Name of a resource mentioned in a conformance statement", type="token" ) + // [] + // [] + @SearchParamDefinition(name="resource", path="Conformance.rest.resource.type", description="Name of a resource mentioned in a conformance statement", type="token", target={} ) public static final String SP_RESOURCE = "resource"; /** * Fluent Client search parameter constant for resource @@ -9097,7 +9103,9 @@ public class Conformance extends DomainResource implements IBaseConformance { * Path: Conformance.format
*

*/ - @SearchParamDefinition(name="format", path="Conformance.format", description="formats supported (xml | json | mime type)", type="token" ) + // [] + // [] + @SearchParamDefinition(name="format", path="Conformance.format", description="formats supported (xml | json | mime type)", type="token", target={} ) public static final String SP_FORMAT = "format"; /** * Fluent Client search parameter constant for format @@ -9117,7 +9125,9 @@ public class Conformance extends DomainResource implements IBaseConformance { * Path: Conformance.description
*

*/ - @SearchParamDefinition(name="description", path="Conformance.description", description="Text search in the description of the conformance statement", type="string" ) + // [] + // [] + @SearchParamDefinition(name="description", path="Conformance.description", description="Text search in the description of the conformance statement", type="string", target={} ) public static final String SP_DESCRIPTION = "description"; /** * Fluent Client search parameter constant for description @@ -9137,7 +9147,9 @@ public class Conformance extends DomainResource implements IBaseConformance { * Path: Conformance.version
*

*/ - @SearchParamDefinition(name="fhirversion", path="Conformance.version", description="The version of FHIR", type="token" ) + // [] + // [] + @SearchParamDefinition(name="fhirversion", path="Conformance.version", description="The version of FHIR", type="token", target={} ) public static final String SP_FHIRVERSION = "fhirversion"; /** * Fluent Client search parameter constant for fhirversion @@ -9157,7 +9169,9 @@ public class Conformance extends DomainResource implements IBaseConformance { * Path: Conformance.version
*

*/ - @SearchParamDefinition(name="version", path="Conformance.version", description="The version identifier of the conformance statement", type="token" ) + // [] + // [] + @SearchParamDefinition(name="version", path="Conformance.version", description="The version identifier of the conformance statement", type="token", target={} ) public static final String SP_VERSION = "version"; /** * Fluent Client search parameter constant for version @@ -9177,7 +9191,9 @@ public class Conformance extends DomainResource implements IBaseConformance { * Path: Conformance.rest.security.service
*

*/ - @SearchParamDefinition(name="securityservice", path="Conformance.rest.security.service", description="OAuth | SMART-on-FHIR | NTLM | Basic | Kerberos | Certificates", type="token" ) + // [] + // [] + @SearchParamDefinition(name="securityservice", path="Conformance.rest.security.service", description="OAuth | SMART-on-FHIR | NTLM | Basic | Kerberos | Certificates", type="token", target={} ) public static final String SP_SECURITYSERVICE = "securityservice"; /** * Fluent Client search parameter constant for securityservice @@ -9197,7 +9213,9 @@ public class Conformance extends DomainResource implements IBaseConformance { * Path: Conformance.url
*

*/ - @SearchParamDefinition(name="url", path="Conformance.url", description="The uri that identifies the conformance statement", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="url", path="Conformance.url", description="The uri that identifies the conformance statement", type="uri", target={} ) public static final String SP_URL = "url"; /** * Fluent Client search parameter constant for url @@ -9217,7 +9235,9 @@ public class Conformance extends DomainResource implements IBaseConformance { * Path: Conformance.profile
*

*/ - @SearchParamDefinition(name="supported-profile", path="Conformance.profile", description="Profiles for use cases supported", type="reference" ) + // [StructureDefinition] + // [StructureDefinition] + @SearchParamDefinition(name="supported-profile", path="Conformance.profile", description="Profiles for use cases supported", type="reference", target={StructureDefinition.class} ) public static final String SP_SUPPORTED_PROFILE = "supported-profile"; /** * Fluent Client search parameter constant for supported-profile @@ -9243,7 +9263,9 @@ public class Conformance extends DomainResource implements IBaseConformance { * Path: Conformance.rest.mode
*

*/ - @SearchParamDefinition(name="mode", path="Conformance.rest.mode", description="Mode - restful (server/client) or messaging (sender/receiver)", type="token" ) + // [] + // [] + @SearchParamDefinition(name="mode", path="Conformance.rest.mode", description="Mode - restful (server/client) or messaging (sender/receiver)", type="token", target={} ) public static final String SP_MODE = "mode"; /** * Fluent Client search parameter constant for mode @@ -9263,7 +9285,9 @@ public class Conformance extends DomainResource implements IBaseConformance { * Path: Conformance.rest.resource.profile
*

*/ - @SearchParamDefinition(name="resourceprofile", path="Conformance.rest.resource.profile", description="A profile id invoked in a conformance statement", type="reference" ) + // [StructureDefinition] + // [StructureDefinition] + @SearchParamDefinition(name="resourceprofile", path="Conformance.rest.resource.profile", description="A profile id invoked in a conformance statement", type="reference", target={StructureDefinition.class} ) public static final String SP_RESOURCEPROFILE = "resourceprofile"; /** * Fluent Client search parameter constant for resourceprofile @@ -9289,7 +9313,9 @@ public class Conformance extends DomainResource implements IBaseConformance { * Path: Conformance.name
*

*/ - @SearchParamDefinition(name="name", path="Conformance.name", description="Name of the conformance statement", type="string" ) + // [] + // [] + @SearchParamDefinition(name="name", path="Conformance.name", description="Name of the conformance statement", type="string", target={} ) public static final String SP_NAME = "name"; /** * Fluent Client search parameter constant for name @@ -9309,7 +9335,9 @@ public class Conformance extends DomainResource implements IBaseConformance { * Path: Conformance.useContext
*

*/ - @SearchParamDefinition(name="context", path="Conformance.useContext", description="A use context assigned to the conformance statement", type="token" ) + // [] + // [] + @SearchParamDefinition(name="context", path="Conformance.useContext", description="A use context assigned to the conformance statement", type="token", target={} ) public static final String SP_CONTEXT = "context"; /** * Fluent Client search parameter constant for context @@ -9329,7 +9357,9 @@ public class Conformance extends DomainResource implements IBaseConformance { * Path: Conformance.publisher
*

*/ - @SearchParamDefinition(name="publisher", path="Conformance.publisher", description="Name of the publisher of the conformance statement", type="string" ) + // [] + // [] + @SearchParamDefinition(name="publisher", path="Conformance.publisher", description="Name of the publisher of the conformance statement", type="string", target={} ) public static final String SP_PUBLISHER = "publisher"; /** * Fluent Client search parameter constant for publisher @@ -9349,7 +9379,9 @@ public class Conformance extends DomainResource implements IBaseConformance { * Path: Conformance.messaging.event.code
*

*/ - @SearchParamDefinition(name="event", path="Conformance.messaging.event.code", description="Event code in a conformance statement", type="token" ) + // [] + // [] + @SearchParamDefinition(name="event", path="Conformance.messaging.event.code", description="Event code in a conformance statement", type="token", target={} ) public static final String SP_EVENT = "event"; /** * Fluent Client search parameter constant for event @@ -9369,7 +9401,9 @@ public class Conformance extends DomainResource implements IBaseConformance { * Path: Conformance.status
*

*/ - @SearchParamDefinition(name="status", path="Conformance.status", description="The current status of the conformance statement", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="Conformance.status", description="The current status of the conformance statement", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Contract.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Contract.java index 6543440d3c8..36959a8d6eb 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Contract.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Contract.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -4963,7 +4963,9 @@ public class Contract extends DomainResource { * Path: Contract.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="Contract.identifier", description="The identity of the contract", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="Contract.identifier", description="The identity of the contract", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -4983,7 +4985,9 @@ public class Contract extends DomainResource { * Path: Contract.agent.actor
*

*/ - @SearchParamDefinition(name="agent", path="Contract.agent.actor", description="Agent to the Contact", type="reference" ) + // [Practitioner, Group, Organization, Device, Patient, Substance, Contract, RelatedPerson, Location] + // [Practitioner, Group, Organization, Device, Patient, Substance, Contract, RelatedPerson, Location] + @SearchParamDefinition(name="agent", path="Contract.agent.actor", description="Agent to the Contact", type="reference", target={Practitioner.class, Group.class, Organization.class, Device.class, Patient.class, Substance.class, Contract.class, RelatedPerson.class, Location.class} ) public static final String SP_AGENT = "agent"; /** * Fluent Client search parameter constant for agent @@ -5009,6 +5013,8 @@ public class Contract extends DomainResource { * Path: Contract.term.topic
*

*/ + // [Any] + // [Any] @SearchParamDefinition(name="ttopic", path="Contract.term.topic", description="The identity of the topic of the contract terms", type="reference" ) public static final String SP_TTOPIC = "ttopic"; /** @@ -5035,6 +5041,8 @@ public class Contract extends DomainResource { * Path: Contract.subject
*

*/ + // [Any] + // [Patient] @SearchParamDefinition(name="patient", path="Contract.subject", description="The identity of the subject of the contract (if a patient)", type="reference" ) public static final String SP_PATIENT = "patient"; /** @@ -5061,6 +5069,8 @@ public class Contract extends DomainResource { * Path: Contract.subject
*

*/ + // [Any] + // [Any] @SearchParamDefinition(name="subject", path="Contract.subject", description="The identity of the subject of the contract", type="reference" ) public static final String SP_SUBJECT = "subject"; /** @@ -5087,7 +5097,9 @@ public class Contract extends DomainResource { * Path: Contract.authority
*

*/ - @SearchParamDefinition(name="authority", path="Contract.authority", description="The authority of the contract", type="reference" ) + // [Organization] + // [Organization] + @SearchParamDefinition(name="authority", path="Contract.authority", description="The authority of the contract", type="reference", target={Organization.class} ) public static final String SP_AUTHORITY = "authority"; /** * Fluent Client search parameter constant for authority @@ -5113,7 +5125,9 @@ public class Contract extends DomainResource { * Path: Contract.domain
*

*/ - @SearchParamDefinition(name="domain", path="Contract.domain", description="The domain of the contract", type="reference" ) + // [Location] + // [Location] + @SearchParamDefinition(name="domain", path="Contract.domain", description="The domain of the contract", type="reference", target={Location.class} ) public static final String SP_DOMAIN = "domain"; /** * Fluent Client search parameter constant for domain @@ -5139,6 +5153,8 @@ public class Contract extends DomainResource { * Path: Contract.topic
*

*/ + // [Any] + // [Any] @SearchParamDefinition(name="topic", path="Contract.topic", description="The identity of the topic of the contract", type="reference" ) public static final String SP_TOPIC = "topic"; /** @@ -5165,7 +5181,9 @@ public class Contract extends DomainResource { * Path: Contract.issued
*

*/ - @SearchParamDefinition(name="issued", path="Contract.issued", description="The date/time the contract was issued", type="date" ) + // [] + // [] + @SearchParamDefinition(name="issued", path="Contract.issued", description="The date/time the contract was issued", type="date", target={} ) public static final String SP_ISSUED = "issued"; /** * Fluent Client search parameter constant for issued @@ -5185,7 +5203,9 @@ public class Contract extends DomainResource { * Path: Contract.signer.party
*

*/ - @SearchParamDefinition(name="signer", path="Contract.signer.party", description="Contract Signatory Party", type="reference" ) + // [Practitioner, Organization, Patient, RelatedPerson] + // [Practitioner, Organization, Patient, RelatedPerson] + @SearchParamDefinition(name="signer", path="Contract.signer.party", description="Contract Signatory Party", type="reference", target={Practitioner.class, Organization.class, Patient.class, RelatedPerson.class} ) public static final String SP_SIGNER = "signer"; /** * Fluent Client search parameter constant for signer diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Coverage.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Coverage.java index 13011e04645..b66939bbcb7 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Coverage.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Coverage.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1314,7 +1314,9 @@ public class Coverage extends DomainResource { * Path: Coverage.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="Coverage.identifier", description="The primary identifier of the insured and the coverage", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="Coverage.identifier", description="The primary identifier of the insured and the coverage", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -1334,7 +1336,9 @@ public class Coverage extends DomainResource { * Path: Coverage.issuerReference
*

*/ - @SearchParamDefinition(name="issuerreference", path="Coverage.issuer.as(Reference)", description="The identity of the insurer", type="reference" ) + // [Organization] + // [Organization] + @SearchParamDefinition(name="issuerreference", path="Coverage.issuer.as(Reference)", description="The identity of the insurer", type="reference", target={Organization.class} ) public static final String SP_ISSUERREFERENCE = "issuerreference"; /** * Fluent Client search parameter constant for issuerreference @@ -1360,7 +1364,9 @@ public class Coverage extends DomainResource { * Path: Coverage.subPlan
*

*/ - @SearchParamDefinition(name="subplan", path="Coverage.subPlan", description="Sub-plan identifier", type="token" ) + // [] + // [] + @SearchParamDefinition(name="subplan", path="Coverage.subPlan", description="Sub-plan identifier", type="token", target={} ) public static final String SP_SUBPLAN = "subplan"; /** * Fluent Client search parameter constant for subplan @@ -1380,7 +1386,9 @@ public class Coverage extends DomainResource { * Path: Coverage.type
*

*/ - @SearchParamDefinition(name="type", path="Coverage.type", description="The kind of coverage (health plan, auto, Workers Compensation)", type="token" ) + // [] + // [] + @SearchParamDefinition(name="type", path="Coverage.type", description="The kind of coverage (health plan, auto, Workers Compensation)", type="token", target={} ) public static final String SP_TYPE = "type"; /** * Fluent Client search parameter constant for type @@ -1400,7 +1408,9 @@ public class Coverage extends DomainResource { * Path: Coverage.beneficiaryIdentifier
*

*/ - @SearchParamDefinition(name="beneficiaryidentifier", path="Coverage.beneficiary.as(Identifier)", description="Covered party", type="token" ) + // [] + // [] + @SearchParamDefinition(name="beneficiaryidentifier", path="Coverage.beneficiary.as(Identifier)", description="Covered party", type="token", target={} ) public static final String SP_BENEFICIARYIDENTIFIER = "beneficiaryidentifier"; /** * Fluent Client search parameter constant for beneficiaryidentifier @@ -1420,7 +1430,9 @@ public class Coverage extends DomainResource { * Path: Coverage.planholderIdentifier
*

*/ - @SearchParamDefinition(name="planholderidentifier", path="Coverage.planholder.as(Identifier)", description="Reference to the planholder", type="token" ) + // [] + // [] + @SearchParamDefinition(name="planholderidentifier", path="Coverage.planholder.as(Identifier)", description="Reference to the planholder", type="token", target={} ) public static final String SP_PLANHOLDERIDENTIFIER = "planholderidentifier"; /** * Fluent Client search parameter constant for planholderidentifier @@ -1440,7 +1452,9 @@ public class Coverage extends DomainResource { * Path: Coverage.sequence
*

*/ - @SearchParamDefinition(name="sequence", path="Coverage.sequence", description="Sequence number", type="token" ) + // [] + // [] + @SearchParamDefinition(name="sequence", path="Coverage.sequence", description="Sequence number", type="token", target={} ) public static final String SP_SEQUENCE = "sequence"; /** * Fluent Client search parameter constant for sequence @@ -1460,7 +1474,9 @@ public class Coverage extends DomainResource { * Path: Coverage.planholderReference
*

*/ - @SearchParamDefinition(name="planholderreference", path="Coverage.planholder.as(Reference)", description="Reference to the planholder", type="reference" ) + // [Organization, Patient] + // [Organization, Patient] + @SearchParamDefinition(name="planholderreference", path="Coverage.planholder.as(Reference)", description="Reference to the planholder", type="reference", target={Organization.class, Patient.class} ) public static final String SP_PLANHOLDERREFERENCE = "planholderreference"; /** * Fluent Client search parameter constant for planholderreference @@ -1486,7 +1502,9 @@ public class Coverage extends DomainResource { * Path: Coverage.issuerIdentifier
*

*/ - @SearchParamDefinition(name="issueridentifier", path="Coverage.issuer.as(Identifier)", description="The identity of the insurer", type="token" ) + // [] + // [] + @SearchParamDefinition(name="issueridentifier", path="Coverage.issuer.as(Identifier)", description="The identity of the insurer", type="token", target={} ) public static final String SP_ISSUERIDENTIFIER = "issueridentifier"; /** * Fluent Client search parameter constant for issueridentifier @@ -1506,7 +1524,9 @@ public class Coverage extends DomainResource { * Path: Coverage.plan
*

*/ - @SearchParamDefinition(name="plan", path="Coverage.plan", description="A plan or policy identifier", type="token" ) + // [] + // [] + @SearchParamDefinition(name="plan", path="Coverage.plan", description="A plan or policy identifier", type="token", target={} ) public static final String SP_PLAN = "plan"; /** * Fluent Client search parameter constant for plan @@ -1526,7 +1546,9 @@ public class Coverage extends DomainResource { * Path: Coverage.dependent
*

*/ - @SearchParamDefinition(name="dependent", path="Coverage.dependent", description="Dependent number", type="token" ) + // [] + // [] + @SearchParamDefinition(name="dependent", path="Coverage.dependent", description="Dependent number", type="token", target={} ) public static final String SP_DEPENDENT = "dependent"; /** * Fluent Client search parameter constant for dependent @@ -1546,7 +1568,9 @@ public class Coverage extends DomainResource { * Path: Coverage.beneficiaryReference
*

*/ - @SearchParamDefinition(name="beneficiaryreference", path="Coverage.beneficiary.as(Reference)", description="Covered party", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="beneficiaryreference", path="Coverage.beneficiary.as(Reference)", description="Covered party", type="reference", target={Patient.class} ) public static final String SP_BENEFICIARYREFERENCE = "beneficiaryreference"; /** * Fluent Client search parameter constant for beneficiaryreference @@ -1572,7 +1596,9 @@ public class Coverage extends DomainResource { * Path: Coverage.group
*

*/ - @SearchParamDefinition(name="group", path="Coverage.group", description="Group identifier", type="token" ) + // [] + // [] + @SearchParamDefinition(name="group", path="Coverage.group", description="Group identifier", type="token", target={} ) public static final String SP_GROUP = "group"; /** * Fluent Client search parameter constant for group diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DataElement.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DataElement.java index c4546e4b8e8..584edf3a438 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DataElement.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DataElement.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1929,7 +1929,9 @@ public class DataElement extends DomainResource { * Path: DataElement.date
*

*/ - @SearchParamDefinition(name="date", path="DataElement.date", description="The data element publication date", type="date" ) + // [] + // [] + @SearchParamDefinition(name="date", path="DataElement.date", description="The data element publication date", type="date", target={} ) public static final String SP_DATE = "date"; /** * Fluent Client search parameter constant for date @@ -1949,7 +1951,9 @@ public class DataElement extends DomainResource { * Path: DataElement.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="DataElement.identifier", description="The identifier of the data element", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="DataElement.identifier", description="The identifier of the data element", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -1969,7 +1973,9 @@ public class DataElement extends DomainResource { * Path: DataElement.element.code
*

*/ - @SearchParamDefinition(name="code", path="DataElement.element.code", description="A code for the data element (server may choose to do subsumption)", type="token" ) + // [] + // [] + @SearchParamDefinition(name="code", path="DataElement.element.code", description="A code for the data element (server may choose to do subsumption)", type="token", target={} ) public static final String SP_CODE = "code"; /** * Fluent Client search parameter constant for code @@ -1989,7 +1995,9 @@ public class DataElement extends DomainResource { * Path: DataElement.stringency
*

*/ - @SearchParamDefinition(name="stringency", path="DataElement.stringency", description="The stringency of the data element definition", type="token" ) + // [] + // [] + @SearchParamDefinition(name="stringency", path="DataElement.stringency", description="The stringency of the data element definition", type="token", target={} ) public static final String SP_STRINGENCY = "stringency"; /** * Fluent Client search parameter constant for stringency @@ -2009,7 +2017,9 @@ public class DataElement extends DomainResource { * Path: DataElement.name
*

*/ - @SearchParamDefinition(name="name", path="DataElement.name", description="Name of the data element", type="string" ) + // [] + // [] + @SearchParamDefinition(name="name", path="DataElement.name", description="Name of the data element", type="string", target={} ) public static final String SP_NAME = "name"; /** * Fluent Client search parameter constant for name @@ -2029,7 +2039,9 @@ public class DataElement extends DomainResource { * Path: DataElement.useContext
*

*/ - @SearchParamDefinition(name="context", path="DataElement.useContext", description="A use context assigned to the data element", type="token" ) + // [] + // [] + @SearchParamDefinition(name="context", path="DataElement.useContext", description="A use context assigned to the data element", type="token", target={} ) public static final String SP_CONTEXT = "context"; /** * Fluent Client search parameter constant for context @@ -2049,7 +2061,9 @@ public class DataElement extends DomainResource { * Path: DataElement.publisher
*

*/ - @SearchParamDefinition(name="publisher", path="DataElement.publisher", description="Name of the publisher of the data element", type="string" ) + // [] + // [] + @SearchParamDefinition(name="publisher", path="DataElement.publisher", description="Name of the publisher of the data element", type="string", target={} ) public static final String SP_PUBLISHER = "publisher"; /** * Fluent Client search parameter constant for publisher @@ -2069,7 +2083,9 @@ public class DataElement extends DomainResource { * Path: DataElement.element.definition
*

*/ - @SearchParamDefinition(name="description", path="DataElement.element.definition", description="Text search in the description of the data element. This corresponds to the definition of the first DataElement.element.", type="string" ) + // [] + // [] + @SearchParamDefinition(name="description", path="DataElement.element.definition", description="Text search in the description of the data element. This corresponds to the definition of the first DataElement.element.", type="string", target={} ) public static final String SP_DESCRIPTION = "description"; /** * Fluent Client search parameter constant for description @@ -2089,7 +2105,9 @@ public class DataElement extends DomainResource { * Path: DataElement.version
*

*/ - @SearchParamDefinition(name="version", path="DataElement.version", description="The version identifier of the data element", type="string" ) + // [] + // [] + @SearchParamDefinition(name="version", path="DataElement.version", description="The version identifier of the data element", type="string", target={} ) public static final String SP_VERSION = "version"; /** * Fluent Client search parameter constant for version @@ -2109,7 +2127,9 @@ public class DataElement extends DomainResource { * Path: DataElement.url
*

*/ - @SearchParamDefinition(name="url", path="DataElement.url", description="The official URL for the data element", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="url", path="DataElement.url", description="The official URL for the data element", type="uri", target={} ) public static final String SP_URL = "url"; /** * Fluent Client search parameter constant for url @@ -2129,7 +2149,9 @@ public class DataElement extends DomainResource { * Path: DataElement.status
*

*/ - @SearchParamDefinition(name="status", path="DataElement.status", description="The current status of the data element", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="DataElement.status", description="The current status of the data element", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DecisionSupportRule.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DecisionSupportRule.java index f636f089300..a9912f2298d 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DecisionSupportRule.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DecisionSupportRule.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -532,7 +532,9 @@ public class DecisionSupportRule extends DomainResource { * Path: DecisionSupportRule.moduleMetadata.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="DecisionSupportRule.moduleMetadata.identifier", description="Logical identifier for the module (e.g. CMS-143)", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="DecisionSupportRule.moduleMetadata.identifier", description="Logical identifier for the module (e.g. CMS-143)", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -552,7 +554,9 @@ public class DecisionSupportRule extends DomainResource { * Path: DecisionSupportRule.moduleMetadata.topic
*

*/ - @SearchParamDefinition(name="topic", path="DecisionSupportRule.moduleMetadata.topic", description="Topics associated with the module", type="token" ) + // [] + // [] + @SearchParamDefinition(name="topic", path="DecisionSupportRule.moduleMetadata.topic", description="Topics associated with the module", type="token", target={} ) public static final String SP_TOPIC = "topic"; /** * Fluent Client search parameter constant for topic @@ -572,7 +576,9 @@ public class DecisionSupportRule extends DomainResource { * Path: DecisionSupportRule.moduleMetadata.description
*

*/ - @SearchParamDefinition(name="description", path="DecisionSupportRule.moduleMetadata.description", description="Text search against the description", type="string" ) + // [] + // [] + @SearchParamDefinition(name="description", path="DecisionSupportRule.moduleMetadata.description", description="Text search against the description", type="string", target={} ) public static final String SP_DESCRIPTION = "description"; /** * Fluent Client search parameter constant for description @@ -592,7 +598,9 @@ public class DecisionSupportRule extends DomainResource { * Path: DecisionSupportRule.moduleMetadata.title
*

*/ - @SearchParamDefinition(name="title", path="DecisionSupportRule.moduleMetadata.title", description="Text search against the title", type="string" ) + // [] + // [] + @SearchParamDefinition(name="title", path="DecisionSupportRule.moduleMetadata.title", description="Text search against the title", type="string", target={} ) public static final String SP_TITLE = "title"; /** * Fluent Client search parameter constant for title @@ -612,7 +620,9 @@ public class DecisionSupportRule extends DomainResource { * Path: DecisionSupportRule.moduleMetadata.version
*

*/ - @SearchParamDefinition(name="version", path="DecisionSupportRule.moduleMetadata.version", description="Version of the module (e.g. 1.0.0)", type="string" ) + // [] + // [] + @SearchParamDefinition(name="version", path="DecisionSupportRule.moduleMetadata.version", description="Version of the module (e.g. 1.0.0)", type="string", target={} ) public static final String SP_VERSION = "version"; /** * Fluent Client search parameter constant for version @@ -632,7 +642,9 @@ public class DecisionSupportRule extends DomainResource { * Path: DecisionSupportRule.moduleMetadata.status
*

*/ - @SearchParamDefinition(name="status", path="DecisionSupportRule.moduleMetadata.status", description="Status of the module", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="DecisionSupportRule.moduleMetadata.status", description="Status of the module", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DecisionSupportServiceModule.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DecisionSupportServiceModule.java index 3057a6a729e..178fda8877a 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DecisionSupportServiceModule.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DecisionSupportServiceModule.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -437,7 +437,9 @@ public class DecisionSupportServiceModule extends DomainResource { * Path: DecisionSupportServiceModule.moduleMetadata.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="DecisionSupportServiceModule.moduleMetadata.identifier", description="Logical identifier for the module (e.g. CMS-143)", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="DecisionSupportServiceModule.moduleMetadata.identifier", description="Logical identifier for the module (e.g. CMS-143)", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -457,7 +459,9 @@ public class DecisionSupportServiceModule extends DomainResource { * Path: DecisionSupportServiceModule.moduleMetadata.topic
*

*/ - @SearchParamDefinition(name="topic", path="DecisionSupportServiceModule.moduleMetadata.topic", description="Topics associated with the module", type="token" ) + // [] + // [] + @SearchParamDefinition(name="topic", path="DecisionSupportServiceModule.moduleMetadata.topic", description="Topics associated with the module", type="token", target={} ) public static final String SP_TOPIC = "topic"; /** * Fluent Client search parameter constant for topic @@ -477,7 +481,9 @@ public class DecisionSupportServiceModule extends DomainResource { * Path: DecisionSupportServiceModule.moduleMetadata.description
*

*/ - @SearchParamDefinition(name="description", path="DecisionSupportServiceModule.moduleMetadata.description", description="Text search against the description", type="string" ) + // [] + // [] + @SearchParamDefinition(name="description", path="DecisionSupportServiceModule.moduleMetadata.description", description="Text search against the description", type="string", target={} ) public static final String SP_DESCRIPTION = "description"; /** * Fluent Client search parameter constant for description @@ -497,7 +503,9 @@ public class DecisionSupportServiceModule extends DomainResource { * Path: DecisionSupportServiceModule.moduleMetadata.title
*

*/ - @SearchParamDefinition(name="title", path="DecisionSupportServiceModule.moduleMetadata.title", description="Text search against the title", type="string" ) + // [] + // [] + @SearchParamDefinition(name="title", path="DecisionSupportServiceModule.moduleMetadata.title", description="Text search against the title", type="string", target={} ) public static final String SP_TITLE = "title"; /** * Fluent Client search parameter constant for title @@ -517,7 +525,9 @@ public class DecisionSupportServiceModule extends DomainResource { * Path: DecisionSupportServiceModule.moduleMetadata.version
*

*/ - @SearchParamDefinition(name="version", path="DecisionSupportServiceModule.moduleMetadata.version", description="Version of the module (e.g. 1.0.0)", type="string" ) + // [] + // [] + @SearchParamDefinition(name="version", path="DecisionSupportServiceModule.moduleMetadata.version", description="Version of the module (e.g. 1.0.0)", type="string", target={} ) public static final String SP_VERSION = "version"; /** * Fluent Client search parameter constant for version @@ -537,7 +547,9 @@ public class DecisionSupportServiceModule extends DomainResource { * Path: DecisionSupportServiceModule.moduleMetadata.status
*

*/ - @SearchParamDefinition(name="status", path="DecisionSupportServiceModule.moduleMetadata.status", description="Status of the module", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="DecisionSupportServiceModule.moduleMetadata.status", description="Status of the module", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DetectedIssue.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DetectedIssue.java index 3a8b14eadb3..3bd99a09af2 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DetectedIssue.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DetectedIssue.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1203,7 +1203,9 @@ public class DetectedIssue extends DomainResource { * Path: DetectedIssue.date
*

*/ - @SearchParamDefinition(name="date", path="DetectedIssue.date", description="When identified", type="date" ) + // [] + // [] + @SearchParamDefinition(name="date", path="DetectedIssue.date", description="When identified", type="date", target={} ) public static final String SP_DATE = "date"; /** * Fluent Client search parameter constant for date @@ -1223,7 +1225,9 @@ public class DetectedIssue extends DomainResource { * Path: DetectedIssue.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="DetectedIssue.identifier", description="Unique id for the detected issue", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="DetectedIssue.identifier", description="Unique id for the detected issue", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -1243,7 +1247,9 @@ public class DetectedIssue extends DomainResource { * Path: DetectedIssue.patient
*

*/ - @SearchParamDefinition(name="patient", path="DetectedIssue.patient", description="Associated patient", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="DetectedIssue.patient", description="Associated patient", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -1269,7 +1275,9 @@ public class DetectedIssue extends DomainResource { * Path: DetectedIssue.author
*

*/ - @SearchParamDefinition(name="author", path="DetectedIssue.author", description="The provider or device that identified the issue", type="reference" ) + // [Practitioner, Device] + // [Practitioner, Device] + @SearchParamDefinition(name="author", path="DetectedIssue.author", description="The provider or device that identified the issue", type="reference", target={Practitioner.class, Device.class} ) public static final String SP_AUTHOR = "author"; /** * Fluent Client search parameter constant for author @@ -1295,6 +1303,8 @@ public class DetectedIssue extends DomainResource { * Path: DetectedIssue.implicated
*

*/ + // [Any] + // [Any] @SearchParamDefinition(name="implicated", path="DetectedIssue.implicated", description="Problem resource", type="reference" ) public static final String SP_IMPLICATED = "implicated"; /** @@ -1321,7 +1331,9 @@ public class DetectedIssue extends DomainResource { * Path: DetectedIssue.category
*

*/ - @SearchParamDefinition(name="category", path="DetectedIssue.category", description="Issue Category, e.g. drug-drug, duplicate therapy, etc.", type="token" ) + // [] + // [] + @SearchParamDefinition(name="category", path="DetectedIssue.category", description="Issue Category, e.g. drug-drug, duplicate therapy, etc.", type="token", target={} ) public static final String SP_CATEGORY = "category"; /** * Fluent Client search parameter constant for category diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Device.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Device.java index 34d8d3a52a9..6c93009354d 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Device.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Device.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1352,7 +1352,9 @@ public class Device extends DomainResource { * Path: Device.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="Device.identifier", description="Instance id from manufacturer, owner, and others", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="Device.identifier", description="Instance id from manufacturer, owner, and others", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -1372,7 +1374,9 @@ public class Device extends DomainResource { * Path: Device.patient
*

*/ - @SearchParamDefinition(name="patient", path="Device.patient", description="Patient information, if the resource is affixed to a person", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="Device.patient", description="Patient information, if the resource is affixed to a person", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -1398,7 +1402,9 @@ public class Device extends DomainResource { * Path: Device.owner
*

*/ - @SearchParamDefinition(name="organization", path="Device.owner", description="The organization responsible for the device", type="reference" ) + // [Organization] + // [Organization] + @SearchParamDefinition(name="organization", path="Device.owner", description="The organization responsible for the device", type="reference", target={Organization.class} ) public static final String SP_ORGANIZATION = "organization"; /** * Fluent Client search parameter constant for organization @@ -1424,7 +1430,9 @@ public class Device extends DomainResource { * Path: Device.model
*

*/ - @SearchParamDefinition(name="model", path="Device.model", description="The model of the device", type="string" ) + // [] + // [] + @SearchParamDefinition(name="model", path="Device.model", description="The model of the device", type="string", target={} ) public static final String SP_MODEL = "model"; /** * Fluent Client search parameter constant for model @@ -1444,7 +1452,9 @@ public class Device extends DomainResource { * Path: Device.location
*

*/ - @SearchParamDefinition(name="location", path="Device.location", description="A location, where the resource is found", type="reference" ) + // [Location] + // [Location] + @SearchParamDefinition(name="location", path="Device.location", description="A location, where the resource is found", type="reference", target={Location.class} ) public static final String SP_LOCATION = "location"; /** * Fluent Client search parameter constant for location @@ -1470,7 +1480,9 @@ public class Device extends DomainResource { * Path: Device.type
*

*/ - @SearchParamDefinition(name="type", path="Device.type", description="The type of the device", type="token" ) + // [] + // [] + @SearchParamDefinition(name="type", path="Device.type", description="The type of the device", type="token", target={} ) public static final String SP_TYPE = "type"; /** * Fluent Client search parameter constant for type @@ -1490,7 +1502,9 @@ public class Device extends DomainResource { * Path: Device.udiCarrier
*

*/ - @SearchParamDefinition(name="udicarrier", path="Device.udiCarrier", description="Barcode string (udi)", type="token" ) + // [] + // [] + @SearchParamDefinition(name="udicarrier", path="Device.udiCarrier", description="Barcode string (udi)", type="token", target={} ) public static final String SP_UDICARRIER = "udicarrier"; /** * Fluent Client search parameter constant for udicarrier @@ -1510,7 +1524,9 @@ public class Device extends DomainResource { * Path: Device.url
*

*/ - @SearchParamDefinition(name="url", path="Device.url", description="Network address to contact device", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="url", path="Device.url", description="Network address to contact device", type="uri", target={} ) public static final String SP_URL = "url"; /** * Fluent Client search parameter constant for url @@ -1530,7 +1546,9 @@ public class Device extends DomainResource { * Path: Device.manufacturer
*

*/ - @SearchParamDefinition(name="manufacturer", path="Device.manufacturer", description="The manufacturer of the device", type="string" ) + // [] + // [] + @SearchParamDefinition(name="manufacturer", path="Device.manufacturer", description="The manufacturer of the device", type="string", target={} ) public static final String SP_MANUFACTURER = "manufacturer"; /** * Fluent Client search parameter constant for manufacturer diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceComponent.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceComponent.java index 99417687ee2..7a2862b8670 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceComponent.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceComponent.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1251,7 +1251,9 @@ public class DeviceComponent extends DomainResource { * Path: DeviceComponent.parent
*

*/ - @SearchParamDefinition(name="parent", path="DeviceComponent.parent", description="The parent DeviceComponent resource", type="reference" ) + // [DeviceComponent] + // [DeviceComponent] + @SearchParamDefinition(name="parent", path="DeviceComponent.parent", description="The parent DeviceComponent resource", type="reference", target={DeviceComponent.class} ) public static final String SP_PARENT = "parent"; /** * Fluent Client search parameter constant for parent @@ -1277,7 +1279,9 @@ public class DeviceComponent extends DomainResource { * Path: DeviceComponent.source
*

*/ - @SearchParamDefinition(name="source", path="DeviceComponent.source", description="The device source", type="reference" ) + // [Device] + // [Device] + @SearchParamDefinition(name="source", path="DeviceComponent.source", description="The device source", type="reference", target={Device.class} ) public static final String SP_SOURCE = "source"; /** * Fluent Client search parameter constant for source @@ -1303,7 +1307,9 @@ public class DeviceComponent extends DomainResource { * Path: DeviceComponent.type
*

*/ - @SearchParamDefinition(name="type", path="DeviceComponent.type", description="The device component type", type="token" ) + // [] + // [] + @SearchParamDefinition(name="type", path="DeviceComponent.type", description="The device component type", type="token", target={} ) public static final String SP_TYPE = "type"; /** * Fluent Client search parameter constant for type diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceMetric.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceMetric.java index 8c114a7f8c3..c580c50ed0f 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceMetric.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceMetric.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1695,7 +1695,9 @@ public class DeviceMetric extends DomainResource { * Path: DeviceMetric.parent
*

*/ - @SearchParamDefinition(name="parent", path="DeviceMetric.parent", description="The parent DeviceMetric resource", type="reference" ) + // [DeviceComponent] + // [DeviceComponent] + @SearchParamDefinition(name="parent", path="DeviceMetric.parent", description="The parent DeviceMetric resource", type="reference", target={DeviceComponent.class} ) public static final String SP_PARENT = "parent"; /** * Fluent Client search parameter constant for parent @@ -1721,7 +1723,9 @@ public class DeviceMetric extends DomainResource { * Path: DeviceMetric.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="DeviceMetric.identifier", description="The identifier of the metric", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="DeviceMetric.identifier", description="The identifier of the metric", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -1741,7 +1745,9 @@ public class DeviceMetric extends DomainResource { * Path: DeviceMetric.source
*

*/ - @SearchParamDefinition(name="source", path="DeviceMetric.source", description="The device resource", type="reference" ) + // [Device] + // [Device] + @SearchParamDefinition(name="source", path="DeviceMetric.source", description="The device resource", type="reference", target={Device.class} ) public static final String SP_SOURCE = "source"; /** * Fluent Client search parameter constant for source @@ -1767,7 +1773,9 @@ public class DeviceMetric extends DomainResource { * Path: DeviceMetric.type
*

*/ - @SearchParamDefinition(name="type", path="DeviceMetric.type", description="The component type", type="token" ) + // [] + // [] + @SearchParamDefinition(name="type", path="DeviceMetric.type", description="The component type", type="token", target={} ) public static final String SP_TYPE = "type"; /** * Fluent Client search parameter constant for type @@ -1787,7 +1795,9 @@ public class DeviceMetric extends DomainResource { * Path: DeviceMetric.category
*

*/ - @SearchParamDefinition(name="category", path="DeviceMetric.category", description="The category of the metric", type="token" ) + // [] + // [] + @SearchParamDefinition(name="category", path="DeviceMetric.category", description="The category of the metric", type="token", target={} ) public static final String SP_CATEGORY = "category"; /** * Fluent Client search parameter constant for category diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceUseRequest.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceUseRequest.java index 211a8594dac..98becf3016b 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceUseRequest.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceUseRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1470,7 +1470,9 @@ public class DeviceUseRequest extends DomainResource { * Path: DeviceUseRequest.subject
*

*/ - @SearchParamDefinition(name="subject", path="DeviceUseRequest.subject", description="Search by subject", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="subject", path="DeviceUseRequest.subject", description="Search by subject", type="reference", target={Patient.class} ) public static final String SP_SUBJECT = "subject"; /** * Fluent Client search parameter constant for subject @@ -1496,7 +1498,9 @@ public class DeviceUseRequest extends DomainResource { * Path: DeviceUseRequest.subject
*

*/ - @SearchParamDefinition(name="patient", path="DeviceUseRequest.subject", description="Search by subject - a patient", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="DeviceUseRequest.subject", description="Search by subject - a patient", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -1522,7 +1526,9 @@ public class DeviceUseRequest extends DomainResource { * Path: DeviceUseRequest.device
*

*/ - @SearchParamDefinition(name="device", path="DeviceUseRequest.device", description="Device requested", type="reference" ) + // [Device] + // [Device] + @SearchParamDefinition(name="device", path="DeviceUseRequest.device", description="Device requested", type="reference", target={Device.class} ) public static final String SP_DEVICE = "device"; /** * Fluent Client search parameter constant for device diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceUseStatement.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceUseStatement.java index b6e6e6d32a4..29444cf9968 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceUseStatement.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceUseStatement.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -823,7 +823,9 @@ public class DeviceUseStatement extends DomainResource { * Path: DeviceUseStatement.subject
*

*/ - @SearchParamDefinition(name="subject", path="DeviceUseStatement.subject", description="Search by subject", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="subject", path="DeviceUseStatement.subject", description="Search by subject", type="reference", target={Patient.class} ) public static final String SP_SUBJECT = "subject"; /** * Fluent Client search parameter constant for subject @@ -849,7 +851,9 @@ public class DeviceUseStatement extends DomainResource { * Path: DeviceUseStatement.subject
*

*/ - @SearchParamDefinition(name="patient", path="DeviceUseStatement.subject", description="Search by subject - a patient", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="DeviceUseStatement.subject", description="Search by subject - a patient", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -875,7 +879,9 @@ public class DeviceUseStatement extends DomainResource { * Path: DeviceUseStatement.device
*

*/ - @SearchParamDefinition(name="device", path="DeviceUseStatement.device", description="Search by device", type="reference" ) + // [Device] + // [Device] + @SearchParamDefinition(name="device", path="DeviceUseStatement.device", description="Search by device", type="reference", target={Device.class} ) public static final String SP_DEVICE = "device"; /** * Fluent Client search parameter constant for device diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DiagnosticOrder.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DiagnosticOrder.java index e8705149e49..d9ec4637a0f 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DiagnosticOrder.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DiagnosticOrder.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -2281,7 +2281,9 @@ public class DiagnosticOrder extends DomainResource { * Path: DiagnosticOrder.item.event.status
*

*/ - @SearchParamDefinition(name="item-past-status", path="DiagnosticOrder.item.event.status", description="proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed | entered-in-error", type="token" ) + // [] + // [] + @SearchParamDefinition(name="item-past-status", path="DiagnosticOrder.item.event.status", description="proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed | entered-in-error", type="token", target={} ) public static final String SP_ITEM_PAST_STATUS = "item-past-status"; /** * Fluent Client search parameter constant for item-past-status @@ -2301,7 +2303,9 @@ public class DiagnosticOrder extends DomainResource { * Path: DiagnosticOrder.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="DiagnosticOrder.identifier", description="Identifiers assigned to this order", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="DiagnosticOrder.identifier", description="Identifiers assigned to this order", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -2321,7 +2325,9 @@ public class DiagnosticOrder extends DomainResource { * Path: DiagnosticOrder.item.bodySite
*

*/ - @SearchParamDefinition(name="bodysite", path="DiagnosticOrder.item.bodySite", description="Location of requested test (if applicable)", type="token" ) + // [] + // [] + @SearchParamDefinition(name="bodysite", path="DiagnosticOrder.item.bodySite", description="Location of requested test (if applicable)", type="token", target={} ) public static final String SP_BODYSITE = "bodysite"; /** * Fluent Client search parameter constant for bodysite @@ -2341,7 +2347,9 @@ public class DiagnosticOrder extends DomainResource { * Path: DiagnosticOrder.item.code
*

*/ - @SearchParamDefinition(name="code", path="DiagnosticOrder.item.code", description="Code to indicate the item (test or panel) being ordered", type="token" ) + // [] + // [] + @SearchParamDefinition(name="code", path="DiagnosticOrder.item.code", description="Code to indicate the item (test or panel) being ordered", type="token", target={} ) public static final String SP_CODE = "code"; /** * Fluent Client search parameter constant for code @@ -2361,7 +2369,9 @@ public class DiagnosticOrder extends DomainResource { * Path: DiagnosticOrder.event.dateTime
*

*/ - @SearchParamDefinition(name="event-date", path="DiagnosticOrder.event.dateTime", description="The date at which the event happened", type="date" ) + // [] + // [] + @SearchParamDefinition(name="event-date", path="DiagnosticOrder.event.dateTime", description="The date at which the event happened", type="date", target={} ) public static final String SP_EVENT_DATE = "event-date"; /** * Fluent Client search parameter constant for event-date @@ -2381,7 +2391,9 @@ public class DiagnosticOrder extends DomainResource { * Path:
*

*/ - @SearchParamDefinition(name="event-status-date", path="", description="A combination of past-status and date", type="composite", compositeOf={"event-status", "event-date"} ) + // [] + // [] + @SearchParamDefinition(name="event-status-date", path="", description="A combination of past-status and date", type="composite", compositeOf={"event-status", "event-date"}, target={} ) public static final String SP_EVENT_STATUS_DATE = "event-status-date"; /** * Fluent Client search parameter constant for event-status-date @@ -2401,7 +2413,9 @@ public class DiagnosticOrder extends DomainResource { * Path: DiagnosticOrder.subject
*

*/ - @SearchParamDefinition(name="subject", path="DiagnosticOrder.subject", description="Who and/or what test is about", type="reference" ) + // [Group, Device, Patient, Location] + // [Group, Device, Patient, Location] + @SearchParamDefinition(name="subject", path="DiagnosticOrder.subject", description="Who and/or what test is about", type="reference", target={Group.class, Device.class, Patient.class, Location.class} ) public static final String SP_SUBJECT = "subject"; /** * Fluent Client search parameter constant for subject @@ -2427,7 +2441,9 @@ public class DiagnosticOrder extends DomainResource { * Path: DiagnosticOrder.encounter
*

*/ - @SearchParamDefinition(name="encounter", path="DiagnosticOrder.encounter", description="The encounter that this diagnostic order is associated with", type="reference" ) + // [Encounter] + // [Encounter] + @SearchParamDefinition(name="encounter", path="DiagnosticOrder.encounter", description="The encounter that this diagnostic order is associated with", type="reference", target={Encounter.class} ) public static final String SP_ENCOUNTER = "encounter"; /** * Fluent Client search parameter constant for encounter @@ -2453,7 +2469,9 @@ public class DiagnosticOrder extends DomainResource { * Path: DiagnosticOrder.event.actor, DiagnosticOrder.item.event.actor
*

*/ - @SearchParamDefinition(name="actor", path="DiagnosticOrder.event.actor | DiagnosticOrder.item.event.actor", description="Who recorded or did this", type="reference" ) + // [Practitioner, Device] + // [Practitioner, Device] + @SearchParamDefinition(name="actor", path="DiagnosticOrder.event.actor | DiagnosticOrder.item.event.actor", description="Who recorded or did this", type="reference", target={Practitioner.class, Device.class} ) public static final String SP_ACTOR = "actor"; /** * Fluent Client search parameter constant for actor @@ -2479,7 +2497,9 @@ public class DiagnosticOrder extends DomainResource { * Path: DiagnosticOrder.item.event.dateTime
*

*/ - @SearchParamDefinition(name="item-date", path="DiagnosticOrder.item.event.dateTime", description="The date at which the event happened", type="date" ) + // [] + // [] + @SearchParamDefinition(name="item-date", path="DiagnosticOrder.item.event.dateTime", description="The date at which the event happened", type="date", target={} ) public static final String SP_ITEM_DATE = "item-date"; /** * Fluent Client search parameter constant for item-date @@ -2499,7 +2519,9 @@ public class DiagnosticOrder extends DomainResource { * Path:
*

*/ - @SearchParamDefinition(name="item-status-date", path="", description="A combination of item-past-status and item-date", type="composite", compositeOf={"item-past-status", "item-date"} ) + // [] + // [] + @SearchParamDefinition(name="item-status-date", path="", description="A combination of item-past-status and item-date", type="composite", compositeOf={"item-past-status", "item-date"}, target={} ) public static final String SP_ITEM_STATUS_DATE = "item-status-date"; /** * Fluent Client search parameter constant for item-status-date @@ -2519,7 +2541,9 @@ public class DiagnosticOrder extends DomainResource { * Path: DiagnosticOrder.event.status
*

*/ - @SearchParamDefinition(name="event-status", path="DiagnosticOrder.event.status", description="proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed | entered-in-error", type="token" ) + // [] + // [] + @SearchParamDefinition(name="event-status", path="DiagnosticOrder.event.status", description="proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed | entered-in-error", type="token", target={} ) public static final String SP_EVENT_STATUS = "event-status"; /** * Fluent Client search parameter constant for event-status @@ -2539,7 +2563,9 @@ public class DiagnosticOrder extends DomainResource { * Path: DiagnosticOrder.item.status
*

*/ - @SearchParamDefinition(name="item-status", path="DiagnosticOrder.item.status", description="proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed | entered-in-error", type="token" ) + // [] + // [] + @SearchParamDefinition(name="item-status", path="DiagnosticOrder.item.status", description="proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed | entered-in-error", type="token", target={} ) public static final String SP_ITEM_STATUS = "item-status"; /** * Fluent Client search parameter constant for item-status @@ -2559,7 +2585,9 @@ public class DiagnosticOrder extends DomainResource { * Path: DiagnosticOrder.subject
*

*/ - @SearchParamDefinition(name="patient", path="DiagnosticOrder.subject", description="Who and/or what test is about", type="reference" ) + // [Group, Device, Patient, Location] + // [Patient] + @SearchParamDefinition(name="patient", path="DiagnosticOrder.subject", description="Who and/or what test is about", type="reference", target={Group.class, Device.class, Patient.class, Location.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -2585,7 +2613,9 @@ public class DiagnosticOrder extends DomainResource { * Path: DiagnosticOrder.orderer
*

*/ - @SearchParamDefinition(name="orderer", path="DiagnosticOrder.orderer", description="Who ordered the test", type="reference" ) + // [Practitioner] + // [Practitioner] + @SearchParamDefinition(name="orderer", path="DiagnosticOrder.orderer", description="Who ordered the test", type="reference", target={Practitioner.class} ) public static final String SP_ORDERER = "orderer"; /** * Fluent Client search parameter constant for orderer @@ -2611,7 +2641,9 @@ public class DiagnosticOrder extends DomainResource { * Path: DiagnosticOrder.specimen, DiagnosticOrder.item.specimen
*

*/ - @SearchParamDefinition(name="specimen", path="DiagnosticOrder.specimen | DiagnosticOrder.item.specimen", description="If the whole order relates to specific specimens", type="reference" ) + // [Specimen] + // [Specimen] + @SearchParamDefinition(name="specimen", path="DiagnosticOrder.specimen | DiagnosticOrder.item.specimen", description="If the whole order relates to specific specimens", type="reference", target={Specimen.class} ) public static final String SP_SPECIMEN = "specimen"; /** * Fluent Client search parameter constant for specimen @@ -2637,7 +2669,9 @@ public class DiagnosticOrder extends DomainResource { * Path: DiagnosticOrder.status
*

*/ - @SearchParamDefinition(name="status", path="DiagnosticOrder.status", description="proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed | entered-in-error", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="DiagnosticOrder.status", description="proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed | entered-in-error", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DiagnosticReport.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DiagnosticReport.java index b2400610da5..d295207fe30 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DiagnosticReport.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DiagnosticReport.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1848,7 +1848,9 @@ public class DiagnosticReport extends DomainResource { * Path: DiagnosticReport.effective[x]
*

*/ - @SearchParamDefinition(name="date", path="DiagnosticReport.effective", description="The clinically relevant time of the report", type="date" ) + // [] + // [] + @SearchParamDefinition(name="date", path="DiagnosticReport.effective", description="The clinically relevant time of the report", type="date", target={} ) public static final String SP_DATE = "date"; /** * Fluent Client search parameter constant for date @@ -1868,7 +1870,9 @@ public class DiagnosticReport extends DomainResource { * Path: DiagnosticReport.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="DiagnosticReport.identifier", description="An identifier for the report", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="DiagnosticReport.identifier", description="An identifier for the report", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -1888,7 +1892,9 @@ public class DiagnosticReport extends DomainResource { * Path: DiagnosticReport.image.link
*

*/ - @SearchParamDefinition(name="image", path="DiagnosticReport.image.link", description="A reference to the image source.", type="reference" ) + // [Media] + // [Media] + @SearchParamDefinition(name="image", path="DiagnosticReport.image.link", description="A reference to the image source.", type="reference", target={Media.class} ) public static final String SP_IMAGE = "image"; /** * Fluent Client search parameter constant for image @@ -1914,7 +1920,9 @@ public class DiagnosticReport extends DomainResource { * Path: DiagnosticReport.request
*

*/ - @SearchParamDefinition(name="request", path="DiagnosticReport.request", description="Reference to the test or procedure request.", type="reference" ) + // [ReferralRequest, DiagnosticOrder, ProcedureRequest] + // [ReferralRequest, DiagnosticOrder, ProcedureRequest] + @SearchParamDefinition(name="request", path="DiagnosticReport.request", description="Reference to the test or procedure request.", type="reference", target={ReferralRequest.class, DiagnosticOrder.class, ProcedureRequest.class} ) public static final String SP_REQUEST = "request"; /** * Fluent Client search parameter constant for request @@ -1940,7 +1948,9 @@ public class DiagnosticReport extends DomainResource { * Path: DiagnosticReport.performer
*

*/ - @SearchParamDefinition(name="performer", path="DiagnosticReport.performer", description="Who was the source of the report (organization)", type="reference" ) + // [Practitioner, Organization] + // [Practitioner, Organization] + @SearchParamDefinition(name="performer", path="DiagnosticReport.performer", description="Who was the source of the report (organization)", type="reference", target={Practitioner.class, Organization.class} ) public static final String SP_PERFORMER = "performer"; /** * Fluent Client search parameter constant for performer @@ -1966,7 +1976,9 @@ public class DiagnosticReport extends DomainResource { * Path: DiagnosticReport.code
*

*/ - @SearchParamDefinition(name="code", path="DiagnosticReport.code", description="The code for the report as a whole, as opposed to codes for the atomic results, which are the names on the observation resource referred to from the result", type="token" ) + // [] + // [] + @SearchParamDefinition(name="code", path="DiagnosticReport.code", description="The code for the report as a whole, as opposed to codes for the atomic results, which are the names on the observation resource referred to from the result", type="token", target={} ) public static final String SP_CODE = "code"; /** * Fluent Client search parameter constant for code @@ -1986,7 +1998,9 @@ public class DiagnosticReport extends DomainResource { * Path: DiagnosticReport.subject
*

*/ - @SearchParamDefinition(name="subject", path="DiagnosticReport.subject", description="The subject of the report", type="reference" ) + // [Group, Device, Patient, Location] + // [Group, Device, Patient, Location] + @SearchParamDefinition(name="subject", path="DiagnosticReport.subject", description="The subject of the report", type="reference", target={Group.class, Device.class, Patient.class, Location.class} ) public static final String SP_SUBJECT = "subject"; /** * Fluent Client search parameter constant for subject @@ -2012,7 +2026,9 @@ public class DiagnosticReport extends DomainResource { * Path: DiagnosticReport.codedDiagnosis
*

*/ - @SearchParamDefinition(name="diagnosis", path="DiagnosticReport.codedDiagnosis", description="A coded diagnosis on the report", type="token" ) + // [] + // [] + @SearchParamDefinition(name="diagnosis", path="DiagnosticReport.codedDiagnosis", description="A coded diagnosis on the report", type="token", target={} ) public static final String SP_DIAGNOSIS = "diagnosis"; /** * Fluent Client search parameter constant for diagnosis @@ -2032,7 +2048,9 @@ public class DiagnosticReport extends DomainResource { * Path: DiagnosticReport.encounter
*

*/ - @SearchParamDefinition(name="encounter", path="DiagnosticReport.encounter", description="The Encounter when the order was made", type="reference" ) + // [Encounter] + // [Encounter] + @SearchParamDefinition(name="encounter", path="DiagnosticReport.encounter", description="The Encounter when the order was made", type="reference", target={Encounter.class} ) public static final String SP_ENCOUNTER = "encounter"; /** * Fluent Client search parameter constant for encounter @@ -2058,7 +2076,9 @@ public class DiagnosticReport extends DomainResource { * Path: DiagnosticReport.result
*

*/ - @SearchParamDefinition(name="result", path="DiagnosticReport.result", description="Link to an atomic result (observation resource)", type="reference" ) + // [Observation] + // [Observation] + @SearchParamDefinition(name="result", path="DiagnosticReport.result", description="Link to an atomic result (observation resource)", type="reference", target={Observation.class} ) public static final String SP_RESULT = "result"; /** * Fluent Client search parameter constant for result @@ -2084,7 +2104,9 @@ public class DiagnosticReport extends DomainResource { * Path: DiagnosticReport.subject
*

*/ - @SearchParamDefinition(name="patient", path="DiagnosticReport.subject", description="The subject of the report if a patient", type="reference" ) + // [Group, Device, Patient, Location] + // [Patient] + @SearchParamDefinition(name="patient", path="DiagnosticReport.subject", description="The subject of the report if a patient", type="reference", target={Group.class, Device.class, Patient.class, Location.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -2110,7 +2132,9 @@ public class DiagnosticReport extends DomainResource { * Path: DiagnosticReport.specimen
*

*/ - @SearchParamDefinition(name="specimen", path="DiagnosticReport.specimen", description="The specimen details", type="reference" ) + // [Specimen] + // [Specimen] + @SearchParamDefinition(name="specimen", path="DiagnosticReport.specimen", description="The specimen details", type="reference", target={Specimen.class} ) public static final String SP_SPECIMEN = "specimen"; /** * Fluent Client search parameter constant for specimen @@ -2136,7 +2160,9 @@ public class DiagnosticReport extends DomainResource { * Path: DiagnosticReport.issued
*

*/ - @SearchParamDefinition(name="issued", path="DiagnosticReport.issued", description="When the report was issued", type="date" ) + // [] + // [] + @SearchParamDefinition(name="issued", path="DiagnosticReport.issued", description="When the report was issued", type="date", target={} ) public static final String SP_ISSUED = "issued"; /** * Fluent Client search parameter constant for issued @@ -2156,7 +2182,9 @@ public class DiagnosticReport extends DomainResource { * Path: DiagnosticReport.category
*

*/ - @SearchParamDefinition(name="category", path="DiagnosticReport.category", description="Which diagnostic discipline/department created the report", type="token" ) + // [] + // [] + @SearchParamDefinition(name="category", path="DiagnosticReport.category", description="Which diagnostic discipline/department created the report", type="token", target={} ) public static final String SP_CATEGORY = "category"; /** * Fluent Client search parameter constant for category @@ -2176,7 +2204,9 @@ public class DiagnosticReport extends DomainResource { * Path: DiagnosticReport.status
*

*/ - @SearchParamDefinition(name="status", path="DiagnosticReport.status", description="The status of the report", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="DiagnosticReport.status", description="The status of the report", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DocumentManifest.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DocumentManifest.java index c3061ad8ba1..22589dd804b 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DocumentManifest.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DocumentManifest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1377,7 +1377,9 @@ public class DocumentManifest extends DomainResource { * Path: DocumentManifest.masterIdentifier, DocumentManifest.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="DocumentManifest.masterIdentifier | DocumentManifest.identifier", description="Unique Identifier for the set of documents", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="DocumentManifest.masterIdentifier | DocumentManifest.identifier", description="Unique Identifier for the set of documents", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -1397,7 +1399,9 @@ public class DocumentManifest extends DomainResource { * Path: DocumentManifest.related.identifier
*

*/ - @SearchParamDefinition(name="related-id", path="DocumentManifest.related.identifier", description="Identifiers of things that are related", type="token" ) + // [] + // [] + @SearchParamDefinition(name="related-id", path="DocumentManifest.related.identifier", description="Identifiers of things that are related", type="token", target={} ) public static final String SP_RELATED_ID = "related-id"; /** * Fluent Client search parameter constant for related-id @@ -1417,6 +1421,8 @@ public class DocumentManifest extends DomainResource { * Path: DocumentManifest.content.pReference
*

*/ + // [Any] + // [Any] @SearchParamDefinition(name="content-ref", path="DocumentManifest.content.p.as(Reference)", description="Contents of this set of documents", type="reference" ) public static final String SP_CONTENT_REF = "content-ref"; /** @@ -1443,7 +1449,9 @@ public class DocumentManifest extends DomainResource { * Path: DocumentManifest.subject
*

*/ - @SearchParamDefinition(name="subject", path="DocumentManifest.subject", description="The subject of the set of documents", type="reference" ) + // [Practitioner, Group, Device, Patient] + // [Practitioner, Group, Device, Patient] + @SearchParamDefinition(name="subject", path="DocumentManifest.subject", description="The subject of the set of documents", type="reference", target={Practitioner.class, Group.class, Device.class, Patient.class} ) public static final String SP_SUBJECT = "subject"; /** * Fluent Client search parameter constant for subject @@ -1469,7 +1477,9 @@ public class DocumentManifest extends DomainResource { * Path: DocumentManifest.author
*

*/ - @SearchParamDefinition(name="author", path="DocumentManifest.author", description="Who and/or what authored the manifest", type="reference" ) + // [Practitioner, Organization, Device, Patient, RelatedPerson] + // [Practitioner, Organization, Device, Patient, RelatedPerson] + @SearchParamDefinition(name="author", path="DocumentManifest.author", description="Who and/or what authored the manifest", type="reference", target={Practitioner.class, Organization.class, Device.class, Patient.class, RelatedPerson.class} ) public static final String SP_AUTHOR = "author"; /** * Fluent Client search parameter constant for author @@ -1495,7 +1505,9 @@ public class DocumentManifest extends DomainResource { * Path: DocumentManifest.created
*

*/ - @SearchParamDefinition(name="created", path="DocumentManifest.created", description="When this document manifest created", type="date" ) + // [] + // [] + @SearchParamDefinition(name="created", path="DocumentManifest.created", description="When this document manifest created", type="date", target={} ) public static final String SP_CREATED = "created"; /** * Fluent Client search parameter constant for created @@ -1515,7 +1527,9 @@ public class DocumentManifest extends DomainResource { * Path: DocumentManifest.description
*

*/ - @SearchParamDefinition(name="description", path="DocumentManifest.description", description="Human-readable description (title)", type="string" ) + // [] + // [] + @SearchParamDefinition(name="description", path="DocumentManifest.description", description="Human-readable description (title)", type="string", target={} ) public static final String SP_DESCRIPTION = "description"; /** * Fluent Client search parameter constant for description @@ -1535,7 +1549,9 @@ public class DocumentManifest extends DomainResource { * Path: DocumentManifest.source
*

*/ - @SearchParamDefinition(name="source", path="DocumentManifest.source", description="The source system/application/software", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="source", path="DocumentManifest.source", description="The source system/application/software", type="uri", target={} ) public static final String SP_SOURCE = "source"; /** * Fluent Client search parameter constant for source @@ -1555,7 +1571,9 @@ public class DocumentManifest extends DomainResource { * Path: DocumentManifest.type
*

*/ - @SearchParamDefinition(name="type", path="DocumentManifest.type", description="Kind of document set", type="token" ) + // [] + // [] + @SearchParamDefinition(name="type", path="DocumentManifest.type", description="Kind of document set", type="token", target={} ) public static final String SP_TYPE = "type"; /** * Fluent Client search parameter constant for type @@ -1575,6 +1593,8 @@ public class DocumentManifest extends DomainResource { * Path: DocumentManifest.related.ref
*

*/ + // [Any] + // [Any] @SearchParamDefinition(name="related-ref", path="DocumentManifest.related.ref", description="Related Resource", type="reference" ) public static final String SP_RELATED_REF = "related-ref"; /** @@ -1601,7 +1621,9 @@ public class DocumentManifest extends DomainResource { * Path: DocumentManifest.subject
*

*/ - @SearchParamDefinition(name="patient", path="DocumentManifest.subject", description="The subject of the set of documents", type="reference" ) + // [Practitioner, Group, Device, Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="DocumentManifest.subject", description="The subject of the set of documents", type="reference", target={Practitioner.class, Group.class, Device.class, Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -1627,7 +1649,9 @@ public class DocumentManifest extends DomainResource { * Path: DocumentManifest.recipient
*

*/ - @SearchParamDefinition(name="recipient", path="DocumentManifest.recipient", description="Intended to get notified about this set of documents", type="reference" ) + // [Practitioner, Organization, Patient, RelatedPerson] + // [Practitioner, Organization, Patient, RelatedPerson] + @SearchParamDefinition(name="recipient", path="DocumentManifest.recipient", description="Intended to get notified about this set of documents", type="reference", target={Practitioner.class, Organization.class, Patient.class, RelatedPerson.class} ) public static final String SP_RECIPIENT = "recipient"; /** * Fluent Client search parameter constant for recipient @@ -1653,7 +1677,9 @@ public class DocumentManifest extends DomainResource { * Path: DocumentManifest.status
*

*/ - @SearchParamDefinition(name="status", path="DocumentManifest.status", description="current | superseded | entered-in-error", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="DocumentManifest.status", description="current | superseded | entered-in-error", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DocumentReference.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DocumentReference.java index a1a96b6b84a..076f653c661 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DocumentReference.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DocumentReference.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -2558,7 +2558,9 @@ public class DocumentReference extends DomainResource { * Path: DocumentReference.securityLabel
*

*/ - @SearchParamDefinition(name="securitylabel", path="DocumentReference.securityLabel", description="Document security-tags", type="token" ) + // [] + // [] + @SearchParamDefinition(name="securitylabel", path="DocumentReference.securityLabel", description="Document security-tags", type="token", target={} ) public static final String SP_SECURITYLABEL = "securitylabel"; /** * Fluent Client search parameter constant for securitylabel @@ -2578,7 +2580,9 @@ public class DocumentReference extends DomainResource { * Path: DocumentReference.subject
*

*/ - @SearchParamDefinition(name="subject", path="DocumentReference.subject", description="Who/what is the subject of the document", type="reference" ) + // [Practitioner, Group, Device, Patient] + // [Practitioner, Group, Device, Patient] + @SearchParamDefinition(name="subject", path="DocumentReference.subject", description="Who/what is the subject of the document", type="reference", target={Practitioner.class, Group.class, Device.class, Patient.class} ) public static final String SP_SUBJECT = "subject"; /** * Fluent Client search parameter constant for subject @@ -2604,7 +2608,9 @@ public class DocumentReference extends DomainResource { * Path: DocumentReference.description
*

*/ - @SearchParamDefinition(name="description", path="DocumentReference.description", description="Human-readable description (title)", type="string" ) + // [] + // [] + @SearchParamDefinition(name="description", path="DocumentReference.description", description="Human-readable description (title)", type="string", target={} ) public static final String SP_DESCRIPTION = "description"; /** * Fluent Client search parameter constant for description @@ -2624,7 +2630,9 @@ public class DocumentReference extends DomainResource { * Path: DocumentReference.content.attachment.language
*

*/ - @SearchParamDefinition(name="language", path="DocumentReference.content.attachment.language", description="Human language of the content (BCP-47)", type="token" ) + // [] + // [] + @SearchParamDefinition(name="language", path="DocumentReference.content.attachment.language", description="Human language of the content (BCP-47)", type="token", target={} ) public static final String SP_LANGUAGE = "language"; /** * Fluent Client search parameter constant for language @@ -2644,7 +2652,9 @@ public class DocumentReference extends DomainResource { * Path: DocumentReference.type
*

*/ - @SearchParamDefinition(name="type", path="DocumentReference.type", description="Kind of document (LOINC if possible)", type="token" ) + // [] + // [] + @SearchParamDefinition(name="type", path="DocumentReference.type", description="Kind of document (LOINC if possible)", type="token", target={} ) public static final String SP_TYPE = "type"; /** * Fluent Client search parameter constant for type @@ -2664,7 +2674,9 @@ public class DocumentReference extends DomainResource { * Path: DocumentReference.relatesTo.code
*

*/ - @SearchParamDefinition(name="relation", path="DocumentReference.relatesTo.code", description="replaces | transforms | signs | appends", type="token" ) + // [] + // [] + @SearchParamDefinition(name="relation", path="DocumentReference.relatesTo.code", description="replaces | transforms | signs | appends", type="token", target={} ) public static final String SP_RELATION = "relation"; /** * Fluent Client search parameter constant for relation @@ -2684,7 +2696,9 @@ public class DocumentReference extends DomainResource { * Path: DocumentReference.context.practiceSetting
*

*/ - @SearchParamDefinition(name="setting", path="DocumentReference.context.practiceSetting", description="Additional details about where the content was created (e.g. clinical specialty)", type="token" ) + // [] + // [] + @SearchParamDefinition(name="setting", path="DocumentReference.context.practiceSetting", description="Additional details about where the content was created (e.g. clinical specialty)", type="token", target={} ) public static final String SP_SETTING = "setting"; /** * Fluent Client search parameter constant for setting @@ -2704,7 +2718,9 @@ public class DocumentReference extends DomainResource { * Path: DocumentReference.subject
*

*/ - @SearchParamDefinition(name="patient", path="DocumentReference.subject", description="Who/what is the subject of the document", type="reference" ) + // [Practitioner, Group, Device, Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="DocumentReference.subject", description="Who/what is the subject of the document", type="reference", target={Practitioner.class, Group.class, Device.class, Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -2730,7 +2746,9 @@ public class DocumentReference extends DomainResource { * Path:
*

*/ - @SearchParamDefinition(name="relationship", path="", description="Combination of relation and relatesTo", type="composite", compositeOf={"relatesto", "relation"} ) + // [] + // [] + @SearchParamDefinition(name="relationship", path="", description="Combination of relation and relatesTo", type="composite", compositeOf={"relatesto", "relation"}, target={} ) public static final String SP_RELATIONSHIP = "relationship"; /** * Fluent Client search parameter constant for relationship @@ -2750,7 +2768,9 @@ public class DocumentReference extends DomainResource { * Path: DocumentReference.context.event
*

*/ - @SearchParamDefinition(name="event", path="DocumentReference.context.event", description="Main Clinical Acts Documented", type="token" ) + // [] + // [] + @SearchParamDefinition(name="event", path="DocumentReference.context.event", description="Main Clinical Acts Documented", type="token", target={} ) public static final String SP_EVENT = "event"; /** * Fluent Client search parameter constant for event @@ -2770,7 +2790,9 @@ public class DocumentReference extends DomainResource { * Path: DocumentReference.class
*

*/ - @SearchParamDefinition(name="class", path="DocumentReference.class", description="Categorization of document", type="token" ) + // [] + // [] + @SearchParamDefinition(name="class", path="DocumentReference.class", description="Categorization of document", type="token", target={} ) public static final String SP_CLASS = "class"; /** * Fluent Client search parameter constant for class @@ -2790,7 +2812,9 @@ public class DocumentReference extends DomainResource { * Path: DocumentReference.authenticator
*

*/ - @SearchParamDefinition(name="authenticator", path="DocumentReference.authenticator", description="Who/what authenticated the document", type="reference" ) + // [Practitioner, Organization] + // [Practitioner, Organization] + @SearchParamDefinition(name="authenticator", path="DocumentReference.authenticator", description="Who/what authenticated the document", type="reference", target={Practitioner.class, Organization.class} ) public static final String SP_AUTHENTICATOR = "authenticator"; /** * Fluent Client search parameter constant for authenticator @@ -2816,7 +2840,9 @@ public class DocumentReference extends DomainResource { * Path: DocumentReference.masterIdentifier, DocumentReference.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="DocumentReference.masterIdentifier | DocumentReference.identifier", description="Master Version Specific Identifier", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="DocumentReference.masterIdentifier | DocumentReference.identifier", description="Master Version Specific Identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -2836,7 +2862,9 @@ public class DocumentReference extends DomainResource { * Path: DocumentReference.context.period
*

*/ - @SearchParamDefinition(name="period", path="DocumentReference.context.period", description="Time of service that is being documented", type="date" ) + // [] + // [] + @SearchParamDefinition(name="period", path="DocumentReference.context.period", description="Time of service that is being documented", type="date", target={} ) public static final String SP_PERIOD = "period"; /** * Fluent Client search parameter constant for period @@ -2856,7 +2884,9 @@ public class DocumentReference extends DomainResource { * Path: DocumentReference.context.related.identifier
*

*/ - @SearchParamDefinition(name="related-id", path="DocumentReference.context.related.identifier", description="Identifier of related objects or events", type="token" ) + // [] + // [] + @SearchParamDefinition(name="related-id", path="DocumentReference.context.related.identifier", description="Identifier of related objects or events", type="token", target={} ) public static final String SP_RELATED_ID = "related-id"; /** * Fluent Client search parameter constant for related-id @@ -2876,7 +2906,9 @@ public class DocumentReference extends DomainResource { * Path: DocumentReference.custodian
*

*/ - @SearchParamDefinition(name="custodian", path="DocumentReference.custodian", description="Organization which maintains the document", type="reference" ) + // [Organization] + // [Organization] + @SearchParamDefinition(name="custodian", path="DocumentReference.custodian", description="Organization which maintains the document", type="reference", target={Organization.class} ) public static final String SP_CUSTODIAN = "custodian"; /** * Fluent Client search parameter constant for custodian @@ -2902,7 +2934,9 @@ public class DocumentReference extends DomainResource { * Path: DocumentReference.indexed
*

*/ - @SearchParamDefinition(name="indexed", path="DocumentReference.indexed", description="When this document reference created", type="date" ) + // [] + // [] + @SearchParamDefinition(name="indexed", path="DocumentReference.indexed", description="When this document reference created", type="date", target={} ) public static final String SP_INDEXED = "indexed"; /** * Fluent Client search parameter constant for indexed @@ -2922,7 +2956,9 @@ public class DocumentReference extends DomainResource { * Path: DocumentReference.author
*

*/ - @SearchParamDefinition(name="author", path="DocumentReference.author", description="Who and/or what authored the document", type="reference" ) + // [Practitioner, Organization, Device, Patient, RelatedPerson] + // [Practitioner, Organization, Device, Patient, RelatedPerson] + @SearchParamDefinition(name="author", path="DocumentReference.author", description="Who and/or what authored the document", type="reference", target={Practitioner.class, Organization.class, Device.class, Patient.class, RelatedPerson.class} ) public static final String SP_AUTHOR = "author"; /** * Fluent Client search parameter constant for author @@ -2948,7 +2984,9 @@ public class DocumentReference extends DomainResource { * Path: DocumentReference.created
*

*/ - @SearchParamDefinition(name="created", path="DocumentReference.created", description="Document creation time", type="date" ) + // [] + // [] + @SearchParamDefinition(name="created", path="DocumentReference.created", description="Document creation time", type="date", target={} ) public static final String SP_CREATED = "created"; /** * Fluent Client search parameter constant for created @@ -2968,7 +3006,9 @@ public class DocumentReference extends DomainResource { * Path: DocumentReference.content.format
*

*/ - @SearchParamDefinition(name="format", path="DocumentReference.content.format", description="Format/content rules for the document", type="token" ) + // [] + // [] + @SearchParamDefinition(name="format", path="DocumentReference.content.format", description="Format/content rules for the document", type="token", target={} ) public static final String SP_FORMAT = "format"; /** * Fluent Client search parameter constant for format @@ -2988,7 +3028,9 @@ public class DocumentReference extends DomainResource { * Path: DocumentReference.context.encounter
*

*/ - @SearchParamDefinition(name="encounter", path="DocumentReference.context.encounter", description="Context of the document content", type="reference" ) + // [Encounter] + // [Encounter] + @SearchParamDefinition(name="encounter", path="DocumentReference.context.encounter", description="Context of the document content", type="reference", target={Encounter.class} ) public static final String SP_ENCOUNTER = "encounter"; /** * Fluent Client search parameter constant for encounter @@ -3014,6 +3056,8 @@ public class DocumentReference extends DomainResource { * Path: DocumentReference.context.related.ref
*

*/ + // [Any] + // [Any] @SearchParamDefinition(name="related-ref", path="DocumentReference.context.related.ref", description="Related Resource", type="reference" ) public static final String SP_RELATED_REF = "related-ref"; /** @@ -3040,7 +3084,9 @@ public class DocumentReference extends DomainResource { * Path: DocumentReference.content.attachment.url
*

*/ - @SearchParamDefinition(name="location", path="DocumentReference.content.attachment.url", description="Uri where the data can be found", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="location", path="DocumentReference.content.attachment.url", description="Uri where the data can be found", type="uri", target={} ) public static final String SP_LOCATION = "location"; /** * Fluent Client search parameter constant for location @@ -3060,7 +3106,9 @@ public class DocumentReference extends DomainResource { * Path: DocumentReference.relatesTo.target
*

*/ - @SearchParamDefinition(name="relatesto", path="DocumentReference.relatesTo.target", description="Target of the relationship", type="reference" ) + // [DocumentReference] + // [DocumentReference] + @SearchParamDefinition(name="relatesto", path="DocumentReference.relatesTo.target", description="Target of the relationship", type="reference", target={DocumentReference.class} ) public static final String SP_RELATESTO = "relatesto"; /** * Fluent Client search parameter constant for relatesto @@ -3086,7 +3134,9 @@ public class DocumentReference extends DomainResource { * Path: DocumentReference.context.facilityType
*

*/ - @SearchParamDefinition(name="facility", path="DocumentReference.context.facilityType", description="Kind of facility where patient was seen", type="token" ) + // [] + // [] + @SearchParamDefinition(name="facility", path="DocumentReference.context.facilityType", description="Kind of facility where patient was seen", type="token", target={} ) public static final String SP_FACILITY = "facility"; /** * Fluent Client search parameter constant for facility @@ -3106,7 +3156,9 @@ public class DocumentReference extends DomainResource { * Path: DocumentReference.status
*

*/ - @SearchParamDefinition(name="status", path="DocumentReference.status", description="current | superseded | entered-in-error", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="DocumentReference.status", description="current | superseded | entered-in-error", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DomainResource.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DomainResource.java index 1ec8074d25e..58767e19c91 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DomainResource.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DomainResource.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EligibilityRequest.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EligibilityRequest.java index dadb678ee24..364fd4c0af7 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EligibilityRequest.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EligibilityRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1147,7 +1147,9 @@ public class EligibilityRequest extends DomainResource { * Path: EligibilityRequest.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="EligibilityRequest.identifier", description="The business identifier of the Eligibility", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="EligibilityRequest.identifier", description="The business identifier of the Eligibility", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -1167,7 +1169,9 @@ public class EligibilityRequest extends DomainResource { * Path: EligibilityRequest.facilityReference
*

*/ - @SearchParamDefinition(name="facilityreference", path="EligibilityRequest.facility.as(Reference)", description="Facility responsible for the goods and services", type="reference" ) + // [Location] + // [Location] + @SearchParamDefinition(name="facilityreference", path="EligibilityRequest.facility.as(Reference)", description="Facility responsible for the goods and services", type="reference", target={Location.class} ) public static final String SP_FACILITYREFERENCE = "facilityreference"; /** * Fluent Client search parameter constant for facilityreference @@ -1193,7 +1197,9 @@ public class EligibilityRequest extends DomainResource { * Path: EligibilityRequest.patientIdentifier
*

*/ - @SearchParamDefinition(name="patientidentifier", path="EligibilityRequest.patient.as(Identifier)", description="The reference to the patient", type="token" ) + // [] + // [] + @SearchParamDefinition(name="patientidentifier", path="EligibilityRequest.patient.as(Identifier)", description="The reference to the patient", type="token", target={} ) public static final String SP_PATIENTIDENTIFIER = "patientidentifier"; /** * Fluent Client search parameter constant for patientidentifier @@ -1213,7 +1219,9 @@ public class EligibilityRequest extends DomainResource { * Path: EligibilityRequest.organizationidentifier
*

*/ - @SearchParamDefinition(name="organizationidentifier", path="EligibilityRequest.organization.as(identifier)", description="The reference to the providing organization", type="token" ) + // [] + // [] + @SearchParamDefinition(name="organizationidentifier", path="EligibilityRequest.organization.as(identifier)", description="The reference to the providing organization", type="token", target={} ) public static final String SP_ORGANIZATIONIDENTIFIER = "organizationidentifier"; /** * Fluent Client search parameter constant for organizationidentifier @@ -1233,7 +1241,9 @@ public class EligibilityRequest extends DomainResource { * Path: EligibilityRequest.created
*

*/ - @SearchParamDefinition(name="created", path="EligibilityRequest.created", description="The creation date for the EOB", type="date" ) + // [] + // [] + @SearchParamDefinition(name="created", path="EligibilityRequest.created", description="The creation date for the EOB", type="date", target={} ) public static final String SP_CREATED = "created"; /** * Fluent Client search parameter constant for created @@ -1253,7 +1263,9 @@ public class EligibilityRequest extends DomainResource { * Path: EligibilityRequest.patientReference
*

*/ - @SearchParamDefinition(name="patientreference", path="EligibilityRequest.patient.as(Reference)", description="The reference to the patient", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="patientreference", path="EligibilityRequest.patient.as(Reference)", description="The reference to the patient", type="reference", target={Patient.class} ) public static final String SP_PATIENTREFERENCE = "patientreference"; /** * Fluent Client search parameter constant for patientreference @@ -1279,7 +1291,9 @@ public class EligibilityRequest extends DomainResource { * Path: EligibilityRequest.providerReference
*

*/ - @SearchParamDefinition(name="providerreference", path="EligibilityRequest.provider.as(Reference)", description="The reference to the provider", type="reference" ) + // [Practitioner] + // [Practitioner] + @SearchParamDefinition(name="providerreference", path="EligibilityRequest.provider.as(Reference)", description="The reference to the provider", type="reference", target={Practitioner.class} ) public static final String SP_PROVIDERREFERENCE = "providerreference"; /** * Fluent Client search parameter constant for providerreference @@ -1305,7 +1319,9 @@ public class EligibilityRequest extends DomainResource { * Path: EligibilityRequest.organizationReference
*

*/ - @SearchParamDefinition(name="organizationreference", path="EligibilityRequest.organization.as(Reference)", description="The reference to the providing organization", type="reference" ) + // [Organization] + // [Organization] + @SearchParamDefinition(name="organizationreference", path="EligibilityRequest.organization.as(Reference)", description="The reference to the providing organization", type="reference", target={Organization.class} ) public static final String SP_ORGANIZATIONREFERENCE = "organizationreference"; /** * Fluent Client search parameter constant for organizationreference @@ -1331,7 +1347,9 @@ public class EligibilityRequest extends DomainResource { * Path: EligibilityRequest.provideridentifier
*

*/ - @SearchParamDefinition(name="provideridentifier", path="EligibilityRequest.provider.as(identifier)", description="The reference to the provider", type="token" ) + // [] + // [] + @SearchParamDefinition(name="provideridentifier", path="EligibilityRequest.provider.as(identifier)", description="The reference to the provider", type="token", target={} ) public static final String SP_PROVIDERIDENTIFIER = "provideridentifier"; /** * Fluent Client search parameter constant for provideridentifier @@ -1351,7 +1369,9 @@ public class EligibilityRequest extends DomainResource { * Path: EligibilityRequest.facilityidentifier
*

*/ - @SearchParamDefinition(name="facilityidentifier", path="EligibilityRequest.facility.as(identifier)", description="Facility responsible for the goods and services", type="token" ) + // [] + // [] + @SearchParamDefinition(name="facilityidentifier", path="EligibilityRequest.facility.as(identifier)", description="Facility responsible for the goods and services", type="token", target={} ) public static final String SP_FACILITYIDENTIFIER = "facilityidentifier"; /** * Fluent Client search parameter constant for facilityidentifier diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EligibilityResponse.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EligibilityResponse.java index 47deba86ddc..52fc3ab550e 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EligibilityResponse.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EligibilityResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1964,7 +1964,9 @@ public class EligibilityResponse extends DomainResource { * Path: EligibilityResponse.requestProviderIdentifier
*

*/ - @SearchParamDefinition(name="requestprovideridentifier", path="EligibilityResponse.requestProvider.as(Identifier)", description="The EligibilityRequest provider", type="token" ) + // [] + // [] + @SearchParamDefinition(name="requestprovideridentifier", path="EligibilityResponse.requestProvider.as(Identifier)", description="The EligibilityRequest provider", type="token", target={} ) public static final String SP_REQUESTPROVIDERIDENTIFIER = "requestprovideridentifier"; /** * Fluent Client search parameter constant for requestprovideridentifier @@ -1984,7 +1986,9 @@ public class EligibilityResponse extends DomainResource { * Path: EligibilityResponse.requestOrganizationIdentifier
*

*/ - @SearchParamDefinition(name="requestorganizationidentifier", path="EligibilityResponse.requestOrganization.as(Identifier)", description="The EligibilityRequest organization", type="token" ) + // [] + // [] + @SearchParamDefinition(name="requestorganizationidentifier", path="EligibilityResponse.requestOrganization.as(Identifier)", description="The EligibilityRequest organization", type="token", target={} ) public static final String SP_REQUESTORGANIZATIONIDENTIFIER = "requestorganizationidentifier"; /** * Fluent Client search parameter constant for requestorganizationidentifier @@ -2004,7 +2008,9 @@ public class EligibilityResponse extends DomainResource { * Path: EligibilityResponse.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="EligibilityResponse.identifier", description="The business identifier", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="EligibilityResponse.identifier", description="The business identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -2024,7 +2030,9 @@ public class EligibilityResponse extends DomainResource { * Path: EligibilityResponse.disposition
*

*/ - @SearchParamDefinition(name="disposition", path="EligibilityResponse.disposition", description="The contents of the disposition message", type="string" ) + // [] + // [] + @SearchParamDefinition(name="disposition", path="EligibilityResponse.disposition", description="The contents of the disposition message", type="string", target={} ) public static final String SP_DISPOSITION = "disposition"; /** * Fluent Client search parameter constant for disposition @@ -2044,7 +2052,9 @@ public class EligibilityResponse extends DomainResource { * Path: EligibilityResponse.organizationIdentifier
*

*/ - @SearchParamDefinition(name="organizationidentifier", path="EligibilityResponse.organization.as(Identifier)", description="The organization which generated this resource", type="token" ) + // [] + // [] + @SearchParamDefinition(name="organizationidentifier", path="EligibilityResponse.organization.as(Identifier)", description="The organization which generated this resource", type="token", target={} ) public static final String SP_ORGANIZATIONIDENTIFIER = "organizationidentifier"; /** * Fluent Client search parameter constant for organizationidentifier @@ -2064,7 +2074,9 @@ public class EligibilityResponse extends DomainResource { * Path: EligibilityResponse.created
*

*/ - @SearchParamDefinition(name="created", path="EligibilityResponse.created", description="The creation date", type="date" ) + // [] + // [] + @SearchParamDefinition(name="created", path="EligibilityResponse.created", description="The creation date", type="date", target={} ) public static final String SP_CREATED = "created"; /** * Fluent Client search parameter constant for created @@ -2084,7 +2096,9 @@ public class EligibilityResponse extends DomainResource { * Path: EligibilityResponse.requestIdentifier
*

*/ - @SearchParamDefinition(name="requestidentifier", path="EligibilityResponse.request.as(Identifier)", description="The EligibilityRequest reference", type="token" ) + // [] + // [] + @SearchParamDefinition(name="requestidentifier", path="EligibilityResponse.request.as(Identifier)", description="The EligibilityRequest reference", type="token", target={} ) public static final String SP_REQUESTIDENTIFIER = "requestidentifier"; /** * Fluent Client search parameter constant for requestidentifier @@ -2104,7 +2118,9 @@ public class EligibilityResponse extends DomainResource { * Path: EligibilityResponse.organizationReference
*

*/ - @SearchParamDefinition(name="organizationreference", path="EligibilityResponse.organization.as(Reference)", description="The organization which generated this resource", type="reference" ) + // [Organization] + // [Organization] + @SearchParamDefinition(name="organizationreference", path="EligibilityResponse.organization.as(Reference)", description="The organization which generated this resource", type="reference", target={Organization.class} ) public static final String SP_ORGANIZATIONREFERENCE = "organizationreference"; /** * Fluent Client search parameter constant for organizationreference @@ -2130,7 +2146,9 @@ public class EligibilityResponse extends DomainResource { * Path: EligibilityResponse.requestProviderReference
*

*/ - @SearchParamDefinition(name="requestproviderreference", path="EligibilityResponse.requestProvider.as(Reference)", description="The EligibilityRequest provider", type="reference" ) + // [Practitioner] + // [Practitioner] + @SearchParamDefinition(name="requestproviderreference", path="EligibilityResponse.requestProvider.as(Reference)", description="The EligibilityRequest provider", type="reference", target={Practitioner.class} ) public static final String SP_REQUESTPROVIDERREFERENCE = "requestproviderreference"; /** * Fluent Client search parameter constant for requestproviderreference @@ -2156,7 +2174,9 @@ public class EligibilityResponse extends DomainResource { * Path: EligibilityResponse.requestOrganizationReference
*

*/ - @SearchParamDefinition(name="requestorganizationreference", path="EligibilityResponse.requestOrganization.as(Reference)", description="The EligibilityRequest organization", type="reference" ) + // [Organization] + // [Organization] + @SearchParamDefinition(name="requestorganizationreference", path="EligibilityResponse.requestOrganization.as(Reference)", description="The EligibilityRequest organization", type="reference", target={Organization.class} ) public static final String SP_REQUESTORGANIZATIONREFERENCE = "requestorganizationreference"; /** * Fluent Client search parameter constant for requestorganizationreference @@ -2182,7 +2202,9 @@ public class EligibilityResponse extends DomainResource { * Path: EligibilityResponse.requestReference
*

*/ - @SearchParamDefinition(name="requestreference", path="EligibilityResponse.request.as(Reference)", description="The EligibilityRequest reference", type="reference" ) + // [EligibilityRequest] + // [EligibilityRequest] + @SearchParamDefinition(name="requestreference", path="EligibilityResponse.request.as(Reference)", description="The EligibilityRequest reference", type="reference", target={EligibilityRequest.class} ) public static final String SP_REQUESTREFERENCE = "requestreference"; /** * Fluent Client search parameter constant for requestreference @@ -2208,7 +2230,9 @@ public class EligibilityResponse extends DomainResource { * Path: EligibilityResponse.outcome
*

*/ - @SearchParamDefinition(name="outcome", path="EligibilityResponse.outcome", description="The processing outcome", type="token" ) + // [] + // [] + @SearchParamDefinition(name="outcome", path="EligibilityResponse.outcome", description="The processing outcome", type="token", target={} ) public static final String SP_OUTCOME = "outcome"; /** * Fluent Client search parameter constant for outcome diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Encounter.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Encounter.java index 92ce4968114..161b747843e 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Encounter.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Encounter.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -3644,7 +3644,9 @@ Not to be used when the patient is currently at the location * Path: Encounter.period
*

*/ - @SearchParamDefinition(name="date", path="Encounter.period", description="A date within the period the Encounter lasted", type="date" ) + // [] + // [] + @SearchParamDefinition(name="date", path="Encounter.period", description="A date within the period the Encounter lasted", type="date", target={} ) public static final String SP_DATE = "date"; /** * Fluent Client search parameter constant for date @@ -3664,7 +3666,9 @@ Not to be used when the patient is currently at the location * Path: Encounter.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="Encounter.identifier", description="Identifier(s) by which this encounter is known", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="Encounter.identifier", description="Identifier(s) by which this encounter is known", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -3684,7 +3688,9 @@ Not to be used when the patient is currently at the location * Path: Encounter.reason
*

*/ - @SearchParamDefinition(name="reason", path="Encounter.reason", description="Reason the encounter takes place (code)", type="token" ) + // [] + // [] + @SearchParamDefinition(name="reason", path="Encounter.reason", description="Reason the encounter takes place (code)", type="token", target={} ) public static final String SP_REASON = "reason"; /** * Fluent Client search parameter constant for reason @@ -3704,7 +3710,9 @@ Not to be used when the patient is currently at the location * Path: Encounter.episodeOfCare
*

*/ - @SearchParamDefinition(name="episodeofcare", path="Encounter.episodeOfCare", description="Episode(s) of care that this encounter should be recorded against", type="reference" ) + // [EpisodeOfCare] + // [EpisodeOfCare] + @SearchParamDefinition(name="episodeofcare", path="Encounter.episodeOfCare", description="Episode(s) of care that this encounter should be recorded against", type="reference", target={EpisodeOfCare.class} ) public static final String SP_EPISODEOFCARE = "episodeofcare"; /** * Fluent Client search parameter constant for episodeofcare @@ -3730,7 +3738,9 @@ Not to be used when the patient is currently at the location * Path: Encounter.participant.type
*

*/ - @SearchParamDefinition(name="participant-type", path="Encounter.participant.type", description="Role of participant in encounter", type="token" ) + // [] + // [] + @SearchParamDefinition(name="participant-type", path="Encounter.participant.type", description="Role of participant in encounter", type="token", target={} ) public static final String SP_PARTICIPANT_TYPE = "participant-type"; /** * Fluent Client search parameter constant for participant-type @@ -3750,7 +3760,9 @@ Not to be used when the patient is currently at the location * Path: Encounter.incomingReferral
*

*/ - @SearchParamDefinition(name="incomingreferral", path="Encounter.incomingReferral", description="The ReferralRequest that initiated this encounter", type="reference" ) + // [ReferralRequest] + // [ReferralRequest] + @SearchParamDefinition(name="incomingreferral", path="Encounter.incomingReferral", description="The ReferralRequest that initiated this encounter", type="reference", target={ReferralRequest.class} ) public static final String SP_INCOMINGREFERRAL = "incomingreferral"; /** * Fluent Client search parameter constant for incomingreferral @@ -3776,7 +3788,9 @@ Not to be used when the patient is currently at the location * Path: Encounter.participant.individual
*

*/ - @SearchParamDefinition(name="practitioner", path="Encounter.participant.individual", description="Persons involved in the encounter other than the patient", type="reference" ) + // [Practitioner, RelatedPerson] + // [Practitioner] + @SearchParamDefinition(name="practitioner", path="Encounter.participant.individual", description="Persons involved in the encounter other than the patient", type="reference", target={Practitioner.class, RelatedPerson.class} ) public static final String SP_PRACTITIONER = "practitioner"; /** * Fluent Client search parameter constant for practitioner @@ -3802,7 +3816,9 @@ Not to be used when the patient is currently at the location * Path: Encounter.length
*

*/ - @SearchParamDefinition(name="length", path="Encounter.length", description="Length of encounter in days", type="number" ) + // [] + // [] + @SearchParamDefinition(name="length", path="Encounter.length", description="Length of encounter in days", type="number", target={} ) public static final String SP_LENGTH = "length"; /** * Fluent Client search parameter constant for length @@ -3822,7 +3838,9 @@ Not to be used when the patient is currently at the location * Path: Encounter.appointment
*

*/ - @SearchParamDefinition(name="appointment", path="Encounter.appointment", description="The appointment that scheduled this encounter", type="reference" ) + // [Appointment] + // [Appointment] + @SearchParamDefinition(name="appointment", path="Encounter.appointment", description="The appointment that scheduled this encounter", type="reference", target={Appointment.class} ) public static final String SP_APPOINTMENT = "appointment"; /** * Fluent Client search parameter constant for appointment @@ -3848,7 +3866,9 @@ Not to be used when the patient is currently at the location * Path: Encounter.partOf
*

*/ - @SearchParamDefinition(name="part-of", path="Encounter.partOf", description="Another Encounter this encounter is part of", type="reference" ) + // [Encounter] + // [Encounter] + @SearchParamDefinition(name="part-of", path="Encounter.partOf", description="Another Encounter this encounter is part of", type="reference", target={Encounter.class} ) public static final String SP_PART_OF = "part-of"; /** * Fluent Client search parameter constant for part-of @@ -3874,7 +3894,9 @@ Not to be used when the patient is currently at the location * Path: Encounter.indication
*

*/ - @SearchParamDefinition(name="procedure", path="Encounter.indication", description="Reason the encounter takes place (resource)", type="reference" ) + // [Condition, Procedure] + // [Procedure] + @SearchParamDefinition(name="procedure", path="Encounter.indication", description="Reason the encounter takes place (resource)", type="reference", target={Condition.class, Procedure.class} ) public static final String SP_PROCEDURE = "procedure"; /** * Fluent Client search parameter constant for procedure @@ -3900,7 +3922,9 @@ Not to be used when the patient is currently at the location * Path: Encounter.type
*

*/ - @SearchParamDefinition(name="type", path="Encounter.type", description="Specific type of encounter", type="token" ) + // [] + // [] + @SearchParamDefinition(name="type", path="Encounter.type", description="Specific type of encounter", type="token", target={} ) public static final String SP_TYPE = "type"; /** * Fluent Client search parameter constant for type @@ -3920,7 +3944,9 @@ Not to be used when the patient is currently at the location * Path: Encounter.participant.individual
*

*/ - @SearchParamDefinition(name="participant", path="Encounter.participant.individual", description="Persons involved in the encounter other than the patient", type="reference" ) + // [Practitioner, RelatedPerson] + // [Practitioner, RelatedPerson] + @SearchParamDefinition(name="participant", path="Encounter.participant.individual", description="Persons involved in the encounter other than the patient", type="reference", target={Practitioner.class, RelatedPerson.class} ) public static final String SP_PARTICIPANT = "participant"; /** * Fluent Client search parameter constant for participant @@ -3946,7 +3972,9 @@ Not to be used when the patient is currently at the location * Path: Encounter.indication
*

*/ - @SearchParamDefinition(name="condition", path="Encounter.indication", description="Reason the encounter takes place (resource)", type="reference" ) + // [Condition, Procedure] + // [Condition] + @SearchParamDefinition(name="condition", path="Encounter.indication", description="Reason the encounter takes place (resource)", type="reference", target={Condition.class, Procedure.class} ) public static final String SP_CONDITION = "condition"; /** * Fluent Client search parameter constant for condition @@ -3972,7 +4000,9 @@ Not to be used when the patient is currently at the location * Path: Encounter.patient
*

*/ - @SearchParamDefinition(name="patient", path="Encounter.patient", description="The patient present at the encounter", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="Encounter.patient", description="The patient present at the encounter", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -3998,7 +4028,9 @@ Not to be used when the patient is currently at the location * Path: Encounter.location.period
*

*/ - @SearchParamDefinition(name="location-period", path="Encounter.location.period", description="Time period during which the patient was present at the location", type="date" ) + // [] + // [] + @SearchParamDefinition(name="location-period", path="Encounter.location.period", description="Time period during which the patient was present at the location", type="date", target={} ) public static final String SP_LOCATION_PERIOD = "location-period"; /** * Fluent Client search parameter constant for location-period @@ -4018,7 +4050,9 @@ Not to be used when the patient is currently at the location * Path: Encounter.location.location
*

*/ - @SearchParamDefinition(name="location", path="Encounter.location.location", description="Location the encounter takes place", type="reference" ) + // [Location] + // [Location] + @SearchParamDefinition(name="location", path="Encounter.location.location", description="Location the encounter takes place", type="reference", target={Location.class} ) public static final String SP_LOCATION = "location"; /** * Fluent Client search parameter constant for location @@ -4044,7 +4078,9 @@ Not to be used when the patient is currently at the location * Path: Encounter.indication
*

*/ - @SearchParamDefinition(name="indication", path="Encounter.indication", description="Reason the encounter takes place (resource)", type="reference" ) + // [Condition, Procedure] + // [Condition, Procedure] + @SearchParamDefinition(name="indication", path="Encounter.indication", description="Reason the encounter takes place (resource)", type="reference", target={Condition.class, Procedure.class} ) public static final String SP_INDICATION = "indication"; /** * Fluent Client search parameter constant for indication @@ -4070,7 +4106,9 @@ Not to be used when the patient is currently at the location * Path: Encounter.hospitalization.specialArrangement
*

*/ - @SearchParamDefinition(name="special-arrangement", path="Encounter.hospitalization.specialArrangement", description="Wheelchair, translator, stretcher, etc.", type="token" ) + // [] + // [] + @SearchParamDefinition(name="special-arrangement", path="Encounter.hospitalization.specialArrangement", description="Wheelchair, translator, stretcher, etc.", type="token", target={} ) public static final String SP_SPECIAL_ARRANGEMENT = "special-arrangement"; /** * Fluent Client search parameter constant for special-arrangement @@ -4090,7 +4128,9 @@ Not to be used when the patient is currently at the location * Path: Encounter.status
*

*/ - @SearchParamDefinition(name="status", path="Encounter.status", description="planned | arrived | in-progress | onleave | finished | cancelled", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="Encounter.status", description="planned | arrived | in-progress | onleave | finished | cancelled", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Endpoint.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Endpoint.java index 68d6e1cca31..c7c2d98d601 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Endpoint.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Endpoint.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1064,7 +1064,9 @@ public class Endpoint extends DomainResource { * Path: Endpoint.payloadType
*

*/ - @SearchParamDefinition(name="payload-type", path="Endpoint.payloadType", description="The type of content that may be used at this endpoint (e.g. XDS Discharge summaries)", type="token" ) + // [] + // [] + @SearchParamDefinition(name="payload-type", path="Endpoint.payloadType", description="The type of content that may be used at this endpoint (e.g. XDS Discharge summaries)", type="token", target={} ) public static final String SP_PAYLOAD_TYPE = "payload-type"; /** * Fluent Client search parameter constant for payload-type @@ -1084,7 +1086,9 @@ public class Endpoint extends DomainResource { * Path: Endpoint.managingOrganization
*

*/ - @SearchParamDefinition(name="organization", path="Endpoint.managingOrganization", description="The organization that is exposing the endpoint", type="reference" ) + // [Organization] + // [Organization] + @SearchParamDefinition(name="organization", path="Endpoint.managingOrganization", description="The organization that is exposing the endpoint", type="reference", target={Organization.class} ) public static final String SP_ORGANIZATION = "organization"; /** * Fluent Client search parameter constant for organization @@ -1110,7 +1114,9 @@ public class Endpoint extends DomainResource { * Path: Endpoint.status
*

*/ - @SearchParamDefinition(name="status", path="Endpoint.status", description="The current status of the Endpoint (usually expected to be active)", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="Endpoint.status", description="The current status of the Endpoint (usually expected to be active)", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EnrollmentRequest.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EnrollmentRequest.java index 04fb6c87cec..d79a3ff980d 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EnrollmentRequest.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EnrollmentRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -788,7 +788,9 @@ public class EnrollmentRequest extends DomainResource { * Path: EnrollmentRequest.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="EnrollmentRequest.identifier", description="The business identifier of the Enrollment", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="EnrollmentRequest.identifier", description="The business identifier of the Enrollment", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -808,7 +810,9 @@ public class EnrollmentRequest extends DomainResource { * Path: EnrollmentRequest.subject
*

*/ - @SearchParamDefinition(name="subject", path="EnrollmentRequest.subject", description="The party to be enrolled", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="subject", path="EnrollmentRequest.subject", description="The party to be enrolled", type="reference", target={Patient.class} ) public static final String SP_SUBJECT = "subject"; /** * Fluent Client search parameter constant for subject @@ -834,7 +838,9 @@ public class EnrollmentRequest extends DomainResource { * Path: EnrollmentRequest.subject
*

*/ - @SearchParamDefinition(name="patient", path="EnrollmentRequest.subject", description="The party to be enrolled", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="EnrollmentRequest.subject", description="The party to be enrolled", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EnrollmentResponse.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EnrollmentResponse.java index ae797342bdb..5abf9a5e010 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EnrollmentResponse.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EnrollmentResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -803,7 +803,9 @@ public class EnrollmentResponse extends DomainResource { * Path: EnrollmentResponse.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="EnrollmentResponse.identifier", description="The business identifier of the Explanation of Benefit", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="EnrollmentResponse.identifier", description="The business identifier of the Explanation of Benefit", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EpisodeOfCare.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EpisodeOfCare.java index d313747c3f7..348b520bfff 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EpisodeOfCare.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EpisodeOfCare.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1398,7 +1398,9 @@ public class EpisodeOfCare extends DomainResource { * Path: EpisodeOfCare.period
*

*/ - @SearchParamDefinition(name="date", path="EpisodeOfCare.period", description="The provided date search value falls within the episode of care's period", type="date" ) + // [] + // [] + @SearchParamDefinition(name="date", path="EpisodeOfCare.period", description="The provided date search value falls within the episode of care's period", type="date", target={} ) public static final String SP_DATE = "date"; /** * Fluent Client search parameter constant for date @@ -1418,7 +1420,9 @@ public class EpisodeOfCare extends DomainResource { * Path: EpisodeOfCare.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="EpisodeOfCare.identifier", description="Identifier(s) for the EpisodeOfCare", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="EpisodeOfCare.identifier", description="Identifier(s) for the EpisodeOfCare", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -1438,7 +1442,9 @@ public class EpisodeOfCare extends DomainResource { * Path: EpisodeOfCare.condition
*

*/ - @SearchParamDefinition(name="condition", path="EpisodeOfCare.condition", description="Conditions/problems/diagnoses this episode of care is for", type="reference" ) + // [Condition] + // [Condition] + @SearchParamDefinition(name="condition", path="EpisodeOfCare.condition", description="Conditions/problems/diagnoses this episode of care is for", type="reference", target={Condition.class} ) public static final String SP_CONDITION = "condition"; /** * Fluent Client search parameter constant for condition @@ -1464,7 +1470,9 @@ public class EpisodeOfCare extends DomainResource { * Path: EpisodeOfCare.referralRequest
*

*/ - @SearchParamDefinition(name="incomingreferral", path="EpisodeOfCare.referralRequest", description="Incoming Referral Request", type="reference" ) + // [ReferralRequest] + // [ReferralRequest] + @SearchParamDefinition(name="incomingreferral", path="EpisodeOfCare.referralRequest", description="Incoming Referral Request", type="reference", target={ReferralRequest.class} ) public static final String SP_INCOMINGREFERRAL = "incomingreferral"; /** * Fluent Client search parameter constant for incomingreferral @@ -1490,7 +1498,9 @@ public class EpisodeOfCare extends DomainResource { * Path: EpisodeOfCare.patient
*

*/ - @SearchParamDefinition(name="patient", path="EpisodeOfCare.patient", description="Patient for this episode of care", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="EpisodeOfCare.patient", description="Patient for this episode of care", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -1516,7 +1526,9 @@ public class EpisodeOfCare extends DomainResource { * Path: EpisodeOfCare.managingOrganization
*

*/ - @SearchParamDefinition(name="organization", path="EpisodeOfCare.managingOrganization", description="The organization that has assumed the specific responsibilities of this EpisodeOfCare", type="reference" ) + // [Organization] + // [Organization] + @SearchParamDefinition(name="organization", path="EpisodeOfCare.managingOrganization", description="The organization that has assumed the specific responsibilities of this EpisodeOfCare", type="reference", target={Organization.class} ) public static final String SP_ORGANIZATION = "organization"; /** * Fluent Client search parameter constant for organization @@ -1542,7 +1554,9 @@ public class EpisodeOfCare extends DomainResource { * Path: EpisodeOfCare.type
*

*/ - @SearchParamDefinition(name="type", path="EpisodeOfCare.type", description="Type/class - e.g. specialist referral, disease management", type="token" ) + // [] + // [] + @SearchParamDefinition(name="type", path="EpisodeOfCare.type", description="Type/class - e.g. specialist referral, disease management", type="token", target={} ) public static final String SP_TYPE = "type"; /** * Fluent Client search parameter constant for type @@ -1562,7 +1576,9 @@ public class EpisodeOfCare extends DomainResource { * Path: EpisodeOfCare.careManager
*

*/ - @SearchParamDefinition(name="care-manager", path="EpisodeOfCare.careManager", description="Care manager/care co-ordinator for the patient", type="reference" ) + // [Practitioner] + // [Practitioner] + @SearchParamDefinition(name="care-manager", path="EpisodeOfCare.careManager", description="Care manager/care co-ordinator for the patient", type="reference", target={Practitioner.class} ) public static final String SP_CARE_MANAGER = "care-manager"; /** * Fluent Client search parameter constant for care-manager @@ -1588,7 +1604,9 @@ public class EpisodeOfCare extends DomainResource { * Path: EpisodeOfCare.status
*

*/ - @SearchParamDefinition(name="status", path="EpisodeOfCare.status", description="The current status of the Episode of Care as provided (does not check the status history collection)", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="EpisodeOfCare.status", description="The current status of the Episode of Care as provided (does not check the status history collection)", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ExpansionProfile.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ExpansionProfile.java index a804a3382fb..b466a623854 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ExpansionProfile.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ExpansionProfile.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -3560,7 +3560,9 @@ public class ExpansionProfile extends DomainResource { * Path: ExpansionProfile.date
*

*/ - @SearchParamDefinition(name="date", path="ExpansionProfile.date", description="The expansion profile publication date", type="date" ) + // [] + // [] + @SearchParamDefinition(name="date", path="ExpansionProfile.date", description="The expansion profile publication date", type="date", target={} ) public static final String SP_DATE = "date"; /** * Fluent Client search parameter constant for date @@ -3580,7 +3582,9 @@ public class ExpansionProfile extends DomainResource { * Path: ExpansionProfile.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="ExpansionProfile.identifier", description="The identifier for the expansion profile", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="ExpansionProfile.identifier", description="The identifier for the expansion profile", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -3600,7 +3604,9 @@ public class ExpansionProfile extends DomainResource { * Path: ExpansionProfile.name
*

*/ - @SearchParamDefinition(name="name", path="ExpansionProfile.name", description="The name of the expansion profile", type="string" ) + // [] + // [] + @SearchParamDefinition(name="name", path="ExpansionProfile.name", description="The name of the expansion profile", type="string", target={} ) public static final String SP_NAME = "name"; /** * Fluent Client search parameter constant for name @@ -3620,7 +3626,9 @@ public class ExpansionProfile extends DomainResource { * Path: ExpansionProfile.publisher
*

*/ - @SearchParamDefinition(name="publisher", path="ExpansionProfile.publisher", description="Name of the publisher of the expansion profile", type="string" ) + // [] + // [] + @SearchParamDefinition(name="publisher", path="ExpansionProfile.publisher", description="Name of the publisher of the expansion profile", type="string", target={} ) public static final String SP_PUBLISHER = "publisher"; /** * Fluent Client search parameter constant for publisher @@ -3640,7 +3648,9 @@ public class ExpansionProfile extends DomainResource { * Path: ExpansionProfile.description
*

*/ - @SearchParamDefinition(name="description", path="ExpansionProfile.description", description="Text search in the description of the expansion profile", type="string" ) + // [] + // [] + @SearchParamDefinition(name="description", path="ExpansionProfile.description", description="Text search in the description of the expansion profile", type="string", target={} ) public static final String SP_DESCRIPTION = "description"; /** * Fluent Client search parameter constant for description @@ -3660,7 +3670,9 @@ public class ExpansionProfile extends DomainResource { * Path: ExpansionProfile.version
*

*/ - @SearchParamDefinition(name="version", path="ExpansionProfile.version", description="The version identifier of the expansion profile", type="token" ) + // [] + // [] + @SearchParamDefinition(name="version", path="ExpansionProfile.version", description="The version identifier of the expansion profile", type="token", target={} ) public static final String SP_VERSION = "version"; /** * Fluent Client search parameter constant for version @@ -3680,7 +3692,9 @@ public class ExpansionProfile extends DomainResource { * Path: ExpansionProfile.url
*

*/ - @SearchParamDefinition(name="url", path="ExpansionProfile.url", description="The logical URL for the expansion profile", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="url", path="ExpansionProfile.url", description="The logical URL for the expansion profile", type="uri", target={} ) public static final String SP_URL = "url"; /** * Fluent Client search parameter constant for url @@ -3700,7 +3714,9 @@ public class ExpansionProfile extends DomainResource { * Path: ExpansionProfile.status
*

*/ - @SearchParamDefinition(name="status", path="ExpansionProfile.status", description="The status of the expansion profile", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="ExpansionProfile.status", description="The status of the expansion profile", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ExplanationOfBenefit.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ExplanationOfBenefit.java index 72e39366a74..85bc59b3960 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ExplanationOfBenefit.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ExplanationOfBenefit.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -12191,7 +12191,9 @@ public class ExplanationOfBenefit extends DomainResource { * Path: ExplanationOfBenefit.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="ExplanationOfBenefit.identifier", description="The business identifier of the Explanation of Benefit", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="ExplanationOfBenefit.identifier", description="The business identifier of the Explanation of Benefit", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -12211,7 +12213,9 @@ public class ExplanationOfBenefit extends DomainResource { * Path: ExplanationOfBenefit.patientIdentifier
*

*/ - @SearchParamDefinition(name="patientidentifier", path="ExplanationOfBenefit.patient.as(Identifier)", description="The reference to the patient", type="token" ) + // [] + // [] + @SearchParamDefinition(name="patientidentifier", path="ExplanationOfBenefit.patient.as(Identifier)", description="The reference to the patient", type="token", target={} ) public static final String SP_PATIENTIDENTIFIER = "patientidentifier"; /** * Fluent Client search parameter constant for patientidentifier @@ -12231,7 +12235,9 @@ public class ExplanationOfBenefit extends DomainResource { * Path: ExplanationOfBenefit.organizationIdentifier
*

*/ - @SearchParamDefinition(name="organizationidentifier", path="ExplanationOfBenefit.organization.as(Identifier)", description="The reference to the providing organization", type="token" ) + // [] + // [] + @SearchParamDefinition(name="organizationidentifier", path="ExplanationOfBenefit.organization.as(Identifier)", description="The reference to the providing organization", type="token", target={} ) public static final String SP_ORGANIZATIONIDENTIFIER = "organizationidentifier"; /** * Fluent Client search parameter constant for organizationidentifier @@ -12251,7 +12257,9 @@ public class ExplanationOfBenefit extends DomainResource { * Path: ExplanationOfBenefit.claimReference
*

*/ - @SearchParamDefinition(name="claimreference", path="ExplanationOfBenefit.claim.as(Reference)", description="The reference to the claim", type="reference" ) + // [Claim] + // [Claim] + @SearchParamDefinition(name="claimreference", path="ExplanationOfBenefit.claim.as(Reference)", description="The reference to the claim", type="reference", target={Claim.class} ) public static final String SP_CLAIMREFERENCE = "claimreference"; /** * Fluent Client search parameter constant for claimreference @@ -12277,7 +12285,9 @@ public class ExplanationOfBenefit extends DomainResource { * Path: ExplanationOfBenefit.created
*

*/ - @SearchParamDefinition(name="created", path="ExplanationOfBenefit.created", description="The creation date for the EOB", type="date" ) + // [] + // [] + @SearchParamDefinition(name="created", path="ExplanationOfBenefit.created", description="The creation date for the EOB", type="date", target={} ) public static final String SP_CREATED = "created"; /** * Fluent Client search parameter constant for created @@ -12297,7 +12307,9 @@ public class ExplanationOfBenefit extends DomainResource { * Path: ExplanationOfBenefit.patientReference
*

*/ - @SearchParamDefinition(name="patientreference", path="ExplanationOfBenefit.patient.as(Reference)", description="The reference to the patient", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="patientreference", path="ExplanationOfBenefit.patient.as(Reference)", description="The reference to the patient", type="reference", target={Patient.class} ) public static final String SP_PATIENTREFERENCE = "patientreference"; /** * Fluent Client search parameter constant for patientreference @@ -12323,7 +12335,9 @@ public class ExplanationOfBenefit extends DomainResource { * Path: ExplanationOfBenefit.providerReference
*

*/ - @SearchParamDefinition(name="providerreference", path="ExplanationOfBenefit.provider.as(Reference)", description="The reference to the provider", type="reference" ) + // [Practitioner] + // [Practitioner] + @SearchParamDefinition(name="providerreference", path="ExplanationOfBenefit.provider.as(Reference)", description="The reference to the provider", type="reference", target={Practitioner.class} ) public static final String SP_PROVIDERREFERENCE = "providerreference"; /** * Fluent Client search parameter constant for providerreference @@ -12349,7 +12363,9 @@ public class ExplanationOfBenefit extends DomainResource { * Path: ExplanationOfBenefit.organizationReference
*

*/ - @SearchParamDefinition(name="organizationreference", path="ExplanationOfBenefit.organization.as(Reference)", description="The reference to the providing organization", type="reference" ) + // [Organization] + // [Organization] + @SearchParamDefinition(name="organizationreference", path="ExplanationOfBenefit.organization.as(Reference)", description="The reference to the providing organization", type="reference", target={Organization.class} ) public static final String SP_ORGANIZATIONREFERENCE = "organizationreference"; /** * Fluent Client search parameter constant for organizationreference @@ -12375,7 +12391,9 @@ public class ExplanationOfBenefit extends DomainResource { * Path: ExplanationOfBenefit.providerIdentifier
*

*/ - @SearchParamDefinition(name="provideridentifier", path="ExplanationOfBenefit.provider.as(Identifier)", description="The reference to the provider", type="token" ) + // [] + // [] + @SearchParamDefinition(name="provideridentifier", path="ExplanationOfBenefit.provider.as(Identifier)", description="The reference to the provider", type="token", target={} ) public static final String SP_PROVIDERIDENTIFIER = "provideridentifier"; /** * Fluent Client search parameter constant for provideridentifier @@ -12395,7 +12413,9 @@ public class ExplanationOfBenefit extends DomainResource { * Path: ExplanationOfBenefit.disposition
*

*/ - @SearchParamDefinition(name="disposition", path="ExplanationOfBenefit.disposition", description="The contents of the disposition message", type="string" ) + // [] + // [] + @SearchParamDefinition(name="disposition", path="ExplanationOfBenefit.disposition", description="The contents of the disposition message", type="string", target={} ) public static final String SP_DISPOSITION = "disposition"; /** * Fluent Client search parameter constant for disposition @@ -12415,7 +12435,9 @@ public class ExplanationOfBenefit extends DomainResource { * Path: ExplanationOfBenefit.facilityReference
*

*/ - @SearchParamDefinition(name="facilityreference", path="ExplanationOfBenefit.facility.as(Reference)", description="Facility responsible for the goods and services", type="reference" ) + // [Location] + // [Location] + @SearchParamDefinition(name="facilityreference", path="ExplanationOfBenefit.facility.as(Reference)", description="Facility responsible for the goods and services", type="reference", target={Location.class} ) public static final String SP_FACILITYREFERENCE = "facilityreference"; /** * Fluent Client search parameter constant for facilityreference @@ -12441,7 +12463,9 @@ public class ExplanationOfBenefit extends DomainResource { * Path: ExplanationOfBenefit.claimIdentifier
*

*/ - @SearchParamDefinition(name="claimindentifier", path="ExplanationOfBenefit.claim.as(Identifier)", description="The reference to the claim", type="token" ) + // [] + // [] + @SearchParamDefinition(name="claimindentifier", path="ExplanationOfBenefit.claim.as(Identifier)", description="The reference to the claim", type="token", target={} ) public static final String SP_CLAIMINDENTIFIER = "claimindentifier"; /** * Fluent Client search parameter constant for claimindentifier @@ -12461,7 +12485,9 @@ public class ExplanationOfBenefit extends DomainResource { * Path: ExplanationOfBenefit.facilityIdentifier
*

*/ - @SearchParamDefinition(name="facilityidentifier", path="ExplanationOfBenefit.facility.as(Identifier)", description="Facility responsible for the goods and services", type="token" ) + // [] + // [] + @SearchParamDefinition(name="facilityidentifier", path="ExplanationOfBenefit.facility.as(Identifier)", description="Facility responsible for the goods and services", type="token", target={} ) public static final String SP_FACILITYIDENTIFIER = "facilityidentifier"; /** * Fluent Client search parameter constant for facilityidentifier diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/FamilyMemberHistory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/FamilyMemberHistory.java index 93e5b9074d3..b8531f1a6c1 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/FamilyMemberHistory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/FamilyMemberHistory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1495,7 +1495,9 @@ public class FamilyMemberHistory extends DomainResource { * Path: FamilyMemberHistory.date
*

*/ - @SearchParamDefinition(name="date", path="FamilyMemberHistory.date", description="When history was captured/updated", type="date" ) + // [] + // [] + @SearchParamDefinition(name="date", path="FamilyMemberHistory.date", description="When history was captured/updated", type="date", target={} ) public static final String SP_DATE = "date"; /** * Fluent Client search parameter constant for date @@ -1515,7 +1517,9 @@ public class FamilyMemberHistory extends DomainResource { * Path: FamilyMemberHistory.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="FamilyMemberHistory.identifier", description="A search by a record identifier", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="FamilyMemberHistory.identifier", description="A search by a record identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -1535,7 +1539,9 @@ public class FamilyMemberHistory extends DomainResource { * Path: FamilyMemberHistory.condition.code
*

*/ - @SearchParamDefinition(name="code", path="FamilyMemberHistory.condition.code", description="A search by a condition code", type="token" ) + // [] + // [] + @SearchParamDefinition(name="code", path="FamilyMemberHistory.condition.code", description="A search by a condition code", type="token", target={} ) public static final String SP_CODE = "code"; /** * Fluent Client search parameter constant for code @@ -1555,7 +1561,9 @@ public class FamilyMemberHistory extends DomainResource { * Path: FamilyMemberHistory.gender
*

*/ - @SearchParamDefinition(name="gender", path="FamilyMemberHistory.gender", description="A search by a gender code of a family member", type="token" ) + // [] + // [] + @SearchParamDefinition(name="gender", path="FamilyMemberHistory.gender", description="A search by a gender code of a family member", type="token", target={} ) public static final String SP_GENDER = "gender"; /** * Fluent Client search parameter constant for gender @@ -1575,7 +1583,9 @@ public class FamilyMemberHistory extends DomainResource { * Path: FamilyMemberHistory.patient
*

*/ - @SearchParamDefinition(name="patient", path="FamilyMemberHistory.patient", description="The identity of a subject to list family member history items for", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="FamilyMemberHistory.patient", description="The identity of a subject to list family member history items for", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -1601,7 +1611,9 @@ public class FamilyMemberHistory extends DomainResource { * Path: FamilyMemberHistory.relationship
*

*/ - @SearchParamDefinition(name="relationship", path="FamilyMemberHistory.relationship", description="A search by a relationship type", type="token" ) + // [] + // [] + @SearchParamDefinition(name="relationship", path="FamilyMemberHistory.relationship", description="A search by a relationship type", type="token", target={} ) public static final String SP_RELATIONSHIP = "relationship"; /** * Fluent Client search parameter constant for relationship diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Flag.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Flag.java index 0fa72a913f6..fa2289fd459 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Flag.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Flag.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -738,7 +738,9 @@ public class Flag extends DomainResource { * Path: Flag.period
*

*/ - @SearchParamDefinition(name="date", path="Flag.period", description="Time period when flag is active", type="date" ) + // [] + // [] + @SearchParamDefinition(name="date", path="Flag.period", description="Time period when flag is active", type="date", target={} ) public static final String SP_DATE = "date"; /** * Fluent Client search parameter constant for date @@ -758,7 +760,9 @@ public class Flag extends DomainResource { * Path: Flag.subject
*

*/ - @SearchParamDefinition(name="subject", path="Flag.subject", description="The identity of a subject to list flags for", type="reference" ) + // [Practitioner, Group, Organization, Patient, Location] + // [Practitioner, Group, Organization, Patient, Location] + @SearchParamDefinition(name="subject", path="Flag.subject", description="The identity of a subject to list flags for", type="reference", target={Practitioner.class, Group.class, Organization.class, Patient.class, Location.class} ) public static final String SP_SUBJECT = "subject"; /** * Fluent Client search parameter constant for subject @@ -784,7 +788,9 @@ public class Flag extends DomainResource { * Path: Flag.subject
*

*/ - @SearchParamDefinition(name="patient", path="Flag.subject", description="The identity of a subject to list flags for", type="reference" ) + // [Practitioner, Group, Organization, Patient, Location] + // [Patient] + @SearchParamDefinition(name="patient", path="Flag.subject", description="The identity of a subject to list flags for", type="reference", target={Practitioner.class, Group.class, Organization.class, Patient.class, Location.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -810,7 +816,9 @@ public class Flag extends DomainResource { * Path: Flag.author
*

*/ - @SearchParamDefinition(name="author", path="Flag.author", description="Flag creator", type="reference" ) + // [Practitioner, Organization, Device, Patient] + // [Practitioner, Organization, Device, Patient] + @SearchParamDefinition(name="author", path="Flag.author", description="Flag creator", type="reference", target={Practitioner.class, Organization.class, Device.class, Patient.class} ) public static final String SP_AUTHOR = "author"; /** * Fluent Client search parameter constant for author @@ -836,7 +844,9 @@ public class Flag extends DomainResource { * Path: Flag.encounter
*

*/ - @SearchParamDefinition(name="encounter", path="Flag.encounter", description="Alert relevant during encounter", type="reference" ) + // [Encounter] + // [Encounter] + @SearchParamDefinition(name="encounter", path="Flag.encounter", description="Alert relevant during encounter", type="reference", target={Encounter.class} ) public static final String SP_ENCOUNTER = "encounter"; /** * Fluent Client search parameter constant for encounter diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Goal.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Goal.java index c00bae77dc7..cb1e66480c2 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Goal.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Goal.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1489,7 +1489,9 @@ public class Goal extends DomainResource { * Path: Goal.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="Goal.identifier", description="External Ids for this goal", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="Goal.identifier", description="External Ids for this goal", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -1509,7 +1511,9 @@ public class Goal extends DomainResource { * Path: Goal.subject
*

*/ - @SearchParamDefinition(name="patient", path="Goal.subject", description="Who this goal is intended for", type="reference" ) + // [Group, Organization, Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="Goal.subject", description="Who this goal is intended for", type="reference", target={Group.class, Organization.class, Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -1535,7 +1539,9 @@ public class Goal extends DomainResource { * Path: Goal.subject
*

*/ - @SearchParamDefinition(name="subject", path="Goal.subject", description="Who this goal is intended for", type="reference" ) + // [Group, Organization, Patient] + // [Group, Organization, Patient] + @SearchParamDefinition(name="subject", path="Goal.subject", description="Who this goal is intended for", type="reference", target={Group.class, Organization.class, Patient.class} ) public static final String SP_SUBJECT = "subject"; /** * Fluent Client search parameter constant for subject @@ -1561,7 +1567,9 @@ public class Goal extends DomainResource { * Path: Goal.targetDate
*

*/ - @SearchParamDefinition(name="targetdate", path="Goal.target.as(Date)", description="Reach goal on or before", type="date" ) + // [] + // [] + @SearchParamDefinition(name="targetdate", path="Goal.target.as(Date)", description="Reach goal on or before", type="date", target={} ) public static final String SP_TARGETDATE = "targetdate"; /** * Fluent Client search parameter constant for targetdate @@ -1581,7 +1589,9 @@ public class Goal extends DomainResource { * Path: Goal.category
*

*/ - @SearchParamDefinition(name="category", path="Goal.category", description="E.g. Treatment, dietary, behavioral, etc.", type="token" ) + // [] + // [] + @SearchParamDefinition(name="category", path="Goal.category", description="E.g. Treatment, dietary, behavioral, etc.", type="token", target={} ) public static final String SP_CATEGORY = "category"; /** * Fluent Client search parameter constant for category @@ -1601,7 +1611,9 @@ public class Goal extends DomainResource { * Path: Goal.status
*

*/ - @SearchParamDefinition(name="status", path="Goal.status", description="proposed | planned | accepted | rejected | in-progress | achieved | sustaining | on-hold | cancelled", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="Goal.status", description="proposed | planned | accepted | rejected | in-progress | achieved | sustaining | on-hold | cancelled", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Group.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Group.java index 9176adcc131..85d10d4d0f6 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Group.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Group.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1547,7 +1547,9 @@ public class Group extends DomainResource { * Path: Group.actual
*

*/ - @SearchParamDefinition(name="actual", path="Group.actual", description="Descriptive or actual", type="token" ) + // [] + // [] + @SearchParamDefinition(name="actual", path="Group.actual", description="Descriptive or actual", type="token", target={} ) public static final String SP_ACTUAL = "actual"; /** * Fluent Client search parameter constant for actual @@ -1567,7 +1569,9 @@ public class Group extends DomainResource { * Path: Group.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="Group.identifier", description="Unique id", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="Group.identifier", description="Unique id", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -1587,7 +1591,9 @@ public class Group extends DomainResource { * Path:
*

*/ - @SearchParamDefinition(name="characteristic-value", path="", description="A composite of both characteristic and value", type="composite", compositeOf={"characteristic", "value"} ) + // [] + // [] + @SearchParamDefinition(name="characteristic-value", path="", description="A composite of both characteristic and value", type="composite", compositeOf={"characteristic", "value"}, target={} ) public static final String SP_CHARACTERISTIC_VALUE = "characteristic-value"; /** * Fluent Client search parameter constant for characteristic-value @@ -1607,7 +1613,9 @@ public class Group extends DomainResource { * Path: Group.code
*

*/ - @SearchParamDefinition(name="code", path="Group.code", description="The kind of resources contained", type="token" ) + // [] + // [] + @SearchParamDefinition(name="code", path="Group.code", description="The kind of resources contained", type="token", target={} ) public static final String SP_CODE = "code"; /** * Fluent Client search parameter constant for code @@ -1627,7 +1635,9 @@ public class Group extends DomainResource { * Path: Group.member.entity
*

*/ - @SearchParamDefinition(name="member", path="Group.member.entity", description="Reference to the group member", type="reference" ) + // [Practitioner, Device, Medication, Patient, Substance] + // [Practitioner, Device, Medication, Patient, Substance] + @SearchParamDefinition(name="member", path="Group.member.entity", description="Reference to the group member", type="reference", target={Practitioner.class, Device.class, Medication.class, Patient.class, Substance.class} ) public static final String SP_MEMBER = "member"; /** * Fluent Client search parameter constant for member @@ -1653,7 +1663,9 @@ public class Group extends DomainResource { * Path: Group.characteristic.exclude
*

*/ - @SearchParamDefinition(name="exclude", path="Group.characteristic.exclude", description="Group includes or excludes", type="token" ) + // [] + // [] + @SearchParamDefinition(name="exclude", path="Group.characteristic.exclude", description="Group includes or excludes", type="token", target={} ) public static final String SP_EXCLUDE = "exclude"; /** * Fluent Client search parameter constant for exclude @@ -1673,7 +1685,9 @@ public class Group extends DomainResource { * Path: Group.type
*

*/ - @SearchParamDefinition(name="type", path="Group.type", description="The type of resources the group contains", type="token" ) + // [] + // [] + @SearchParamDefinition(name="type", path="Group.type", description="The type of resources the group contains", type="token", target={} ) public static final String SP_TYPE = "type"; /** * Fluent Client search parameter constant for type @@ -1693,7 +1707,9 @@ public class Group extends DomainResource { * Path: Group.characteristic.value[x]
*

*/ - @SearchParamDefinition(name="value", path="Group.characteristic.value", description="Value held by characteristic", type="token" ) + // [] + // [] + @SearchParamDefinition(name="value", path="Group.characteristic.value", description="Value held by characteristic", type="token", target={} ) public static final String SP_VALUE = "value"; /** * Fluent Client search parameter constant for value @@ -1713,7 +1729,9 @@ public class Group extends DomainResource { * Path: Group.characteristic.code
*

*/ - @SearchParamDefinition(name="characteristic", path="Group.characteristic.code", description="Kind of characteristic", type="token" ) + // [] + // [] + @SearchParamDefinition(name="characteristic", path="Group.characteristic.code", description="Kind of characteristic", type="token", target={} ) public static final String SP_CHARACTERISTIC = "characteristic"; /** * Fluent Client search parameter constant for characteristic diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/GuidanceResponse.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/GuidanceResponse.java index 8c678edd357..a5204584720 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/GuidanceResponse.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/GuidanceResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/HealthcareService.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/HealthcareService.java index 15c5170e8c3..85eab7b5431 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/HealthcareService.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/HealthcareService.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -2632,7 +2632,9 @@ public class HealthcareService extends DomainResource { * Path: HealthcareService.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="HealthcareService.identifier", description="External identifiers for this item", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="HealthcareService.identifier", description="External identifiers for this item", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -2652,7 +2654,9 @@ public class HealthcareService extends DomainResource { * Path: HealthcareService.serviceCategory
*

*/ - @SearchParamDefinition(name="servicecategory", path="HealthcareService.serviceCategory", description="Service Category of the Healthcare Service", type="token" ) + // [] + // [] + @SearchParamDefinition(name="servicecategory", path="HealthcareService.serviceCategory", description="Service Category of the Healthcare Service", type="token", target={} ) public static final String SP_SERVICECATEGORY = "servicecategory"; /** * Fluent Client search parameter constant for servicecategory @@ -2672,7 +2676,9 @@ public class HealthcareService extends DomainResource { * Path: HealthcareService.serviceType
*

*/ - @SearchParamDefinition(name="servicetype", path="HealthcareService.serviceType", description="The type of service provided by this healthcare service", type="token" ) + // [] + // [] + @SearchParamDefinition(name="servicetype", path="HealthcareService.serviceType", description="The type of service provided by this healthcare service", type="token", target={} ) public static final String SP_SERVICETYPE = "servicetype"; /** * Fluent Client search parameter constant for servicetype @@ -2692,7 +2698,9 @@ public class HealthcareService extends DomainResource { * Path: HealthcareService.providedBy
*

*/ - @SearchParamDefinition(name="organization", path="HealthcareService.providedBy", description="The organization that provides this Healthcare Service", type="reference" ) + // [Organization] + // [Organization] + @SearchParamDefinition(name="organization", path="HealthcareService.providedBy", description="The organization that provides this Healthcare Service", type="reference", target={Organization.class} ) public static final String SP_ORGANIZATION = "organization"; /** * Fluent Client search parameter constant for organization @@ -2718,7 +2726,9 @@ public class HealthcareService extends DomainResource { * Path: HealthcareService.serviceName
*

*/ - @SearchParamDefinition(name="name", path="HealthcareService.serviceName", description="A portion of the Healthcare service name", type="string" ) + // [] + // [] + @SearchParamDefinition(name="name", path="HealthcareService.serviceName", description="A portion of the Healthcare service name", type="string", target={} ) public static final String SP_NAME = "name"; /** * Fluent Client search parameter constant for name @@ -2738,7 +2748,9 @@ public class HealthcareService extends DomainResource { * Path: HealthcareService.programName
*

*/ - @SearchParamDefinition(name="programname", path="HealthcareService.programName", description="One of the Program Names serviced by this HealthcareService", type="string" ) + // [] + // [] + @SearchParamDefinition(name="programname", path="HealthcareService.programName", description="One of the Program Names serviced by this HealthcareService", type="string", target={} ) public static final String SP_PROGRAMNAME = "programname"; /** * Fluent Client search parameter constant for programname @@ -2758,7 +2770,9 @@ public class HealthcareService extends DomainResource { * Path: HealthcareService.location
*

*/ - @SearchParamDefinition(name="location", path="HealthcareService.location", description="The location of the Healthcare Service", type="reference" ) + // [Location] + // [Location] + @SearchParamDefinition(name="location", path="HealthcareService.location", description="The location of the Healthcare Service", type="reference", target={Location.class} ) public static final String SP_LOCATION = "location"; /** * Fluent Client search parameter constant for location @@ -2784,7 +2798,9 @@ public class HealthcareService extends DomainResource { * Path: HealthcareService.characteristic
*

*/ - @SearchParamDefinition(name="characteristic", path="HealthcareService.characteristic", description="One of the HealthcareService's characteristics", type="token" ) + // [] + // [] + @SearchParamDefinition(name="characteristic", path="HealthcareService.characteristic", description="One of the HealthcareService's characteristics", type="token", target={} ) public static final String SP_CHARACTERISTIC = "characteristic"; /** * Fluent Client search parameter constant for characteristic diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImagingExcerpt.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImagingExcerpt.java index 4c36c6c77d9..09dec3f0fc3 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImagingExcerpt.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImagingExcerpt.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -3234,7 +3234,9 @@ public class ImagingExcerpt extends DomainResource { * Path: ImagingExcerpt.uid
*

*/ - @SearchParamDefinition(name="identifier", path="ImagingExcerpt.uid", description="UID of key DICOM object selection", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="ImagingExcerpt.uid", description="UID of key DICOM object selection", type="uri", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -3254,7 +3256,9 @@ public class ImagingExcerpt extends DomainResource { * Path: ImagingExcerpt.authoringTime
*

*/ - @SearchParamDefinition(name="authoring-time", path="ImagingExcerpt.authoringTime", description="Time of key DICOM object selection authoring", type="date" ) + // [] + // [] + @SearchParamDefinition(name="authoring-time", path="ImagingExcerpt.authoringTime", description="Time of key DICOM object selection authoring", type="date", target={} ) public static final String SP_AUTHORING_TIME = "authoring-time"; /** * Fluent Client search parameter constant for authoring-time @@ -3274,7 +3278,9 @@ public class ImagingExcerpt extends DomainResource { * Path: ImagingExcerpt.study.uid
*

*/ - @SearchParamDefinition(name="selected-study", path="ImagingExcerpt.study.uid", description="Study selected in key DICOM object selection", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="selected-study", path="ImagingExcerpt.study.uid", description="Study selected in key DICOM object selection", type="uri", target={} ) public static final String SP_SELECTED_STUDY = "selected-study"; /** * Fluent Client search parameter constant for selected-study @@ -3294,7 +3300,9 @@ public class ImagingExcerpt extends DomainResource { * Path: ImagingExcerpt.author
*

*/ - @SearchParamDefinition(name="author", path="ImagingExcerpt.author", description="Author of key DICOM object selection", type="reference" ) + // [Practitioner, Organization, Device, Patient, RelatedPerson] + // [Practitioner, Organization, Device, Patient, RelatedPerson] + @SearchParamDefinition(name="author", path="ImagingExcerpt.author", description="Author of key DICOM object selection", type="reference", target={Practitioner.class, Organization.class, Device.class, Patient.class, RelatedPerson.class} ) public static final String SP_AUTHOR = "author"; /** * Fluent Client search parameter constant for author @@ -3320,7 +3328,9 @@ public class ImagingExcerpt extends DomainResource { * Path: ImagingExcerpt.patient
*

*/ - @SearchParamDefinition(name="patient", path="ImagingExcerpt.patient", description="Subject of key DICOM object selection", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="ImagingExcerpt.patient", description="Subject of key DICOM object selection", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -3346,7 +3356,9 @@ public class ImagingExcerpt extends DomainResource { * Path: ImagingExcerpt.title
*

*/ - @SearchParamDefinition(name="title", path="ImagingExcerpt.title", description="Title of key DICOM object selection", type="token" ) + // [] + // [] + @SearchParamDefinition(name="title", path="ImagingExcerpt.title", description="Title of key DICOM object selection", type="token", target={} ) public static final String SP_TITLE = "title"; /** * Fluent Client search parameter constant for title diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImagingObjectSelection.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImagingObjectSelection.java index c81c98a5754..aa80ff07627 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImagingObjectSelection.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImagingObjectSelection.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1938,7 +1938,9 @@ public class ImagingObjectSelection extends DomainResource { * Path: ImagingObjectSelection.uid
*

*/ - @SearchParamDefinition(name="identifier", path="ImagingObjectSelection.uid", description="UID of key DICOM object selection", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="ImagingObjectSelection.uid", description="UID of key DICOM object selection", type="uri", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -1958,7 +1960,9 @@ public class ImagingObjectSelection extends DomainResource { * Path: ImagingObjectSelection.authoringTime
*

*/ - @SearchParamDefinition(name="authoring-time", path="ImagingObjectSelection.authoringTime", description="Time of key DICOM object selection authoring", type="date" ) + // [] + // [] + @SearchParamDefinition(name="authoring-time", path="ImagingObjectSelection.authoringTime", description="Time of key DICOM object selection authoring", type="date", target={} ) public static final String SP_AUTHORING_TIME = "authoring-time"; /** * Fluent Client search parameter constant for authoring-time @@ -1978,7 +1982,9 @@ public class ImagingObjectSelection extends DomainResource { * Path: ImagingObjectSelection.study.uid
*

*/ - @SearchParamDefinition(name="selected-study", path="ImagingObjectSelection.study.uid", description="Study selected in key DICOM object selection", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="selected-study", path="ImagingObjectSelection.study.uid", description="Study selected in key DICOM object selection", type="uri", target={} ) public static final String SP_SELECTED_STUDY = "selected-study"; /** * Fluent Client search parameter constant for selected-study @@ -1998,7 +2004,9 @@ public class ImagingObjectSelection extends DomainResource { * Path: ImagingObjectSelection.author
*

*/ - @SearchParamDefinition(name="author", path="ImagingObjectSelection.author", description="Author of key DICOM object selection", type="reference" ) + // [Practitioner, Organization, Device, Patient, RelatedPerson] + // [Practitioner, Organization, Device, Patient, RelatedPerson] + @SearchParamDefinition(name="author", path="ImagingObjectSelection.author", description="Author of key DICOM object selection", type="reference", target={Practitioner.class, Organization.class, Device.class, Patient.class, RelatedPerson.class} ) public static final String SP_AUTHOR = "author"; /** * Fluent Client search parameter constant for author @@ -2024,7 +2032,9 @@ public class ImagingObjectSelection extends DomainResource { * Path: ImagingObjectSelection.patient
*

*/ - @SearchParamDefinition(name="patient", path="ImagingObjectSelection.patient", description="Subject of key DICOM object selection", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="ImagingObjectSelection.patient", description="Subject of key DICOM object selection", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -2050,7 +2060,9 @@ public class ImagingObjectSelection extends DomainResource { * Path: ImagingObjectSelection.title
*

*/ - @SearchParamDefinition(name="title", path="ImagingObjectSelection.title", description="Title of key DICOM object selection", type="token" ) + // [] + // [] + @SearchParamDefinition(name="title", path="ImagingObjectSelection.title", description="Title of key DICOM object selection", type="token", target={} ) public static final String SP_TITLE = "title"; /** * Fluent Client search parameter constant for title diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImagingStudy.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImagingStudy.java index c984cd2f0fd..3820324d4d3 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImagingStudy.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImagingStudy.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -2752,7 +2752,9 @@ public class ImagingStudy extends DomainResource { * Path: ImagingStudy.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="ImagingStudy.identifier", description="Other identifiers for the Study", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="ImagingStudy.identifier", description="Other identifiers for the Study", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -2772,7 +2774,9 @@ public class ImagingStudy extends DomainResource { * Path: ImagingStudy.series.instance.uid
*

*/ - @SearchParamDefinition(name="uid", path="ImagingStudy.series.instance.uid", description="The instance unique identifier", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="uid", path="ImagingStudy.series.instance.uid", description="The instance unique identifier", type="uri", target={} ) public static final String SP_UID = "uid"; /** * Fluent Client search parameter constant for uid @@ -2792,7 +2796,9 @@ public class ImagingStudy extends DomainResource { * Path: ImagingStudy.uid
*

*/ - @SearchParamDefinition(name="study", path="ImagingStudy.uid", description="The study identifier for the image", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="study", path="ImagingStudy.uid", description="The study identifier for the image", type="uri", target={} ) public static final String SP_STUDY = "study"; /** * Fluent Client search parameter constant for study @@ -2812,7 +2818,9 @@ public class ImagingStudy extends DomainResource { * Path: ImagingStudy.series.instance.sopClass
*

*/ - @SearchParamDefinition(name="dicom-class", path="ImagingStudy.series.instance.sopClass", description="The type of the instance", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="dicom-class", path="ImagingStudy.series.instance.sopClass", description="The type of the instance", type="uri", target={} ) public static final String SP_DICOM_CLASS = "dicom-class"; /** * Fluent Client search parameter constant for dicom-class @@ -2832,7 +2840,9 @@ public class ImagingStudy extends DomainResource { * Path: ImagingStudy.series.modality
*

*/ - @SearchParamDefinition(name="modality", path="ImagingStudy.series.modality", description="The modality of the series", type="token" ) + // [] + // [] + @SearchParamDefinition(name="modality", path="ImagingStudy.series.modality", description="The modality of the series", type="token", target={} ) public static final String SP_MODALITY = "modality"; /** * Fluent Client search parameter constant for modality @@ -2852,7 +2862,9 @@ public class ImagingStudy extends DomainResource { * Path: ImagingStudy.series.bodySite
*

*/ - @SearchParamDefinition(name="bodysite", path="ImagingStudy.series.bodySite", description="The body site studied", type="token" ) + // [] + // [] + @SearchParamDefinition(name="bodysite", path="ImagingStudy.series.bodySite", description="The body site studied", type="token", target={} ) public static final String SP_BODYSITE = "bodysite"; /** * Fluent Client search parameter constant for bodysite @@ -2872,7 +2884,9 @@ public class ImagingStudy extends DomainResource { * Path: ImagingStudy.patient
*

*/ - @SearchParamDefinition(name="patient", path="ImagingStudy.patient", description="Who the study is about", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="ImagingStudy.patient", description="Who the study is about", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -2898,7 +2912,9 @@ public class ImagingStudy extends DomainResource { * Path: ImagingStudy.series.uid
*

*/ - @SearchParamDefinition(name="series", path="ImagingStudy.series.uid", description="The identifier of the series of images", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="series", path="ImagingStudy.series.uid", description="The identifier of the series of images", type="uri", target={} ) public static final String SP_SERIES = "series"; /** * Fluent Client search parameter constant for series @@ -2918,7 +2934,9 @@ public class ImagingStudy extends DomainResource { * Path: ImagingStudy.started
*

*/ - @SearchParamDefinition(name="started", path="ImagingStudy.started", description="When the study was started", type="date" ) + // [] + // [] + @SearchParamDefinition(name="started", path="ImagingStudy.started", description="When the study was started", type="date", target={} ) public static final String SP_STARTED = "started"; /** * Fluent Client search parameter constant for started @@ -2938,7 +2956,9 @@ public class ImagingStudy extends DomainResource { * Path: ImagingStudy.accession
*

*/ - @SearchParamDefinition(name="accession", path="ImagingStudy.accession", description="The accession identifier for the study", type="token" ) + // [] + // [] + @SearchParamDefinition(name="accession", path="ImagingStudy.accession", description="The accession identifier for the study", type="token", target={} ) public static final String SP_ACCESSION = "accession"; /** * Fluent Client search parameter constant for accession @@ -2958,7 +2978,9 @@ public class ImagingStudy extends DomainResource { * Path: ImagingStudy.order
*

*/ - @SearchParamDefinition(name="order", path="ImagingStudy.order", description="The order for the image", type="reference" ) + // [DiagnosticOrder] + // [DiagnosticOrder] + @SearchParamDefinition(name="order", path="ImagingStudy.order", description="The order for the image", type="reference", target={DiagnosticOrder.class} ) public static final String SP_ORDER = "order"; /** * Fluent Client search parameter constant for order diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Immunization.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Immunization.java index d4c61e26670..0f703d8ea31 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Immunization.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Immunization.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -2671,7 +2671,9 @@ public class Immunization extends DomainResource { * Path: Immunization.date
*

*/ - @SearchParamDefinition(name="date", path="Immunization.date", description="Vaccination (non)-Administration Date", type="date" ) + // [] + // [] + @SearchParamDefinition(name="date", path="Immunization.date", description="Vaccination (non)-Administration Date", type="date", target={} ) public static final String SP_DATE = "date"; /** * Fluent Client search parameter constant for date @@ -2691,7 +2693,9 @@ public class Immunization extends DomainResource { * Path: Immunization.requester
*

*/ - @SearchParamDefinition(name="requester", path="Immunization.requester", description="The practitioner who ordered the vaccination", type="reference" ) + // [Practitioner] + // [Practitioner] + @SearchParamDefinition(name="requester", path="Immunization.requester", description="The practitioner who ordered the vaccination", type="reference", target={Practitioner.class} ) public static final String SP_REQUESTER = "requester"; /** * Fluent Client search parameter constant for requester @@ -2717,7 +2721,9 @@ public class Immunization extends DomainResource { * Path: Immunization.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="Immunization.identifier", description="Business identifier", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="Immunization.identifier", description="Business identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -2737,7 +2743,9 @@ public class Immunization extends DomainResource { * Path: Immunization.explanation.reason
*

*/ - @SearchParamDefinition(name="reason", path="Immunization.explanation.reason", description="Why immunization occurred", type="token" ) + // [] + // [] + @SearchParamDefinition(name="reason", path="Immunization.explanation.reason", description="Why immunization occurred", type="token", target={} ) public static final String SP_REASON = "reason"; /** * Fluent Client search parameter constant for reason @@ -2757,7 +2765,9 @@ public class Immunization extends DomainResource { * Path: Immunization.performer
*

*/ - @SearchParamDefinition(name="performer", path="Immunization.performer", description="The practitioner who administered the vaccination", type="reference" ) + // [Practitioner] + // [Practitioner] + @SearchParamDefinition(name="performer", path="Immunization.performer", description="The practitioner who administered the vaccination", type="reference", target={Practitioner.class} ) public static final String SP_PERFORMER = "performer"; /** * Fluent Client search parameter constant for performer @@ -2783,7 +2793,9 @@ public class Immunization extends DomainResource { * Path: Immunization.reaction.detail
*

*/ - @SearchParamDefinition(name="reaction", path="Immunization.reaction.detail", description="Additional information on reaction", type="reference" ) + // [Observation] + // [Observation] + @SearchParamDefinition(name="reaction", path="Immunization.reaction.detail", description="Additional information on reaction", type="reference", target={Observation.class} ) public static final String SP_REACTION = "reaction"; /** * Fluent Client search parameter constant for reaction @@ -2809,7 +2821,9 @@ public class Immunization extends DomainResource { * Path: Immunization.lotNumber
*

*/ - @SearchParamDefinition(name="lot-number", path="Immunization.lotNumber", description="Vaccine Lot Number", type="string" ) + // [] + // [] + @SearchParamDefinition(name="lot-number", path="Immunization.lotNumber", description="Vaccine Lot Number", type="string", target={} ) public static final String SP_LOT_NUMBER = "lot-number"; /** * Fluent Client search parameter constant for lot-number @@ -2829,7 +2843,9 @@ public class Immunization extends DomainResource { * Path: Immunization.wasNotGiven
*

*/ - @SearchParamDefinition(name="notgiven", path="Immunization.wasNotGiven", description="Administrations which were not given", type="token" ) + // [] + // [] + @SearchParamDefinition(name="notgiven", path="Immunization.wasNotGiven", description="Administrations which were not given", type="token", target={} ) public static final String SP_NOTGIVEN = "notgiven"; /** * Fluent Client search parameter constant for notgiven @@ -2849,7 +2865,9 @@ public class Immunization extends DomainResource { * Path: Immunization.manufacturer
*

*/ - @SearchParamDefinition(name="manufacturer", path="Immunization.manufacturer", description="Vaccine Manufacturer", type="reference" ) + // [Organization] + // [Organization] + @SearchParamDefinition(name="manufacturer", path="Immunization.manufacturer", description="Vaccine Manufacturer", type="reference", target={Organization.class} ) public static final String SP_MANUFACTURER = "manufacturer"; /** * Fluent Client search parameter constant for manufacturer @@ -2875,7 +2893,9 @@ public class Immunization extends DomainResource { * Path: Immunization.vaccinationProtocol.doseSequence
*

*/ - @SearchParamDefinition(name="dose-sequence", path="Immunization.vaccinationProtocol.doseSequence", description="Dose number within series", type="number" ) + // [] + // [] + @SearchParamDefinition(name="dose-sequence", path="Immunization.vaccinationProtocol.doseSequence", description="Dose number within series", type="number", target={} ) public static final String SP_DOSE_SEQUENCE = "dose-sequence"; /** * Fluent Client search parameter constant for dose-sequence @@ -2895,7 +2915,9 @@ public class Immunization extends DomainResource { * Path: Immunization.patient
*

*/ - @SearchParamDefinition(name="patient", path="Immunization.patient", description="The patient for the vaccination record", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="Immunization.patient", description="The patient for the vaccination record", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -2921,7 +2943,9 @@ public class Immunization extends DomainResource { * Path: Immunization.vaccineCode
*

*/ - @SearchParamDefinition(name="vaccine-code", path="Immunization.vaccineCode", description="Vaccine Product Administered", type="token" ) + // [] + // [] + @SearchParamDefinition(name="vaccine-code", path="Immunization.vaccineCode", description="Vaccine Product Administered", type="token", target={} ) public static final String SP_VACCINE_CODE = "vaccine-code"; /** * Fluent Client search parameter constant for vaccine-code @@ -2941,7 +2965,9 @@ public class Immunization extends DomainResource { * Path: Immunization.explanation.reasonNotGiven
*

*/ - @SearchParamDefinition(name="reason-not-given", path="Immunization.explanation.reasonNotGiven", description="Explanation of reason vaccination was not administered", type="token" ) + // [] + // [] + @SearchParamDefinition(name="reason-not-given", path="Immunization.explanation.reasonNotGiven", description="Explanation of reason vaccination was not administered", type="token", target={} ) public static final String SP_REASON_NOT_GIVEN = "reason-not-given"; /** * Fluent Client search parameter constant for reason-not-given @@ -2961,7 +2987,9 @@ public class Immunization extends DomainResource { * Path: Immunization.location
*

*/ - @SearchParamDefinition(name="location", path="Immunization.location", description="The service delivery location or facility in which the vaccine was / was to be administered", type="reference" ) + // [Location] + // [Location] + @SearchParamDefinition(name="location", path="Immunization.location", description="The service delivery location or facility in which the vaccine was / was to be administered", type="reference", target={Location.class} ) public static final String SP_LOCATION = "location"; /** * Fluent Client search parameter constant for location @@ -2987,7 +3015,9 @@ public class Immunization extends DomainResource { * Path: Immunization.reaction.date
*

*/ - @SearchParamDefinition(name="reaction-date", path="Immunization.reaction.date", description="When reaction started", type="date" ) + // [] + // [] + @SearchParamDefinition(name="reaction-date", path="Immunization.reaction.date", description="When reaction started", type="date", target={} ) public static final String SP_REACTION_DATE = "reaction-date"; /** * Fluent Client search parameter constant for reaction-date @@ -3007,7 +3037,9 @@ public class Immunization extends DomainResource { * Path: Immunization.status
*

*/ - @SearchParamDefinition(name="status", path="Immunization.status", description="Immunization event status", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="Immunization.status", description="Immunization event status", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImmunizationRecommendation.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImmunizationRecommendation.java index 749ac3f85d1..b6cb3b34dbe 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImmunizationRecommendation.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImmunizationRecommendation.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1599,7 +1599,9 @@ public class ImmunizationRecommendation extends DomainResource { * Path: ImmunizationRecommendation.recommendation.date
*

*/ - @SearchParamDefinition(name="date", path="ImmunizationRecommendation.recommendation.date", description="Date recommendation created", type="date" ) + // [] + // [] + @SearchParamDefinition(name="date", path="ImmunizationRecommendation.recommendation.date", description="Date recommendation created", type="date", target={} ) public static final String SP_DATE = "date"; /** * Fluent Client search parameter constant for date @@ -1619,7 +1621,9 @@ public class ImmunizationRecommendation extends DomainResource { * Path: ImmunizationRecommendation.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="ImmunizationRecommendation.identifier", description="Business identifier", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="ImmunizationRecommendation.identifier", description="Business identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -1639,7 +1643,9 @@ public class ImmunizationRecommendation extends DomainResource { * Path: ImmunizationRecommendation.recommendation.protocol.doseSequence
*

*/ - @SearchParamDefinition(name="dose-sequence", path="ImmunizationRecommendation.recommendation.protocol.doseSequence", description="Dose number within sequence", type="number" ) + // [] + // [] + @SearchParamDefinition(name="dose-sequence", path="ImmunizationRecommendation.recommendation.protocol.doseSequence", description="Dose number within sequence", type="number", target={} ) public static final String SP_DOSE_SEQUENCE = "dose-sequence"; /** * Fluent Client search parameter constant for dose-sequence @@ -1659,7 +1665,9 @@ public class ImmunizationRecommendation extends DomainResource { * Path: ImmunizationRecommendation.patient
*

*/ - @SearchParamDefinition(name="patient", path="ImmunizationRecommendation.patient", description="Who this profile is for", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="ImmunizationRecommendation.patient", description="Who this profile is for", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -1685,7 +1693,9 @@ public class ImmunizationRecommendation extends DomainResource { * Path: ImmunizationRecommendation.recommendation.vaccineCode
*

*/ - @SearchParamDefinition(name="vaccine-type", path="ImmunizationRecommendation.recommendation.vaccineCode", description="Vaccine recommendation applies to", type="token" ) + // [] + // [] + @SearchParamDefinition(name="vaccine-type", path="ImmunizationRecommendation.recommendation.vaccineCode", description="Vaccine recommendation applies to", type="token", target={} ) public static final String SP_VACCINE_TYPE = "vaccine-type"; /** * Fluent Client search parameter constant for vaccine-type @@ -1705,7 +1715,9 @@ public class ImmunizationRecommendation extends DomainResource { * Path: ImmunizationRecommendation.recommendation.doseNumber
*

*/ - @SearchParamDefinition(name="dose-number", path="ImmunizationRecommendation.recommendation.doseNumber", description="Recommended dose number", type="number" ) + // [] + // [] + @SearchParamDefinition(name="dose-number", path="ImmunizationRecommendation.recommendation.doseNumber", description="Recommended dose number", type="number", target={} ) public static final String SP_DOSE_NUMBER = "dose-number"; /** * Fluent Client search parameter constant for dose-number @@ -1725,7 +1737,9 @@ public class ImmunizationRecommendation extends DomainResource { * Path: ImmunizationRecommendation.recommendation.supportingPatientInformation
*

*/ - @SearchParamDefinition(name="information", path="ImmunizationRecommendation.recommendation.supportingPatientInformation", description="Patient observations supporting recommendation", type="reference" ) + // [AllergyIntolerance, Observation] + // [AllergyIntolerance, Observation] + @SearchParamDefinition(name="information", path="ImmunizationRecommendation.recommendation.supportingPatientInformation", description="Patient observations supporting recommendation", type="reference", target={AllergyIntolerance.class, Observation.class} ) public static final String SP_INFORMATION = "information"; /** * Fluent Client search parameter constant for information @@ -1751,7 +1765,9 @@ public class ImmunizationRecommendation extends DomainResource { * Path: ImmunizationRecommendation.recommendation.supportingImmunization
*

*/ - @SearchParamDefinition(name="support", path="ImmunizationRecommendation.recommendation.supportingImmunization", description="Past immunizations supporting recommendation", type="reference" ) + // [Immunization] + // [Immunization] + @SearchParamDefinition(name="support", path="ImmunizationRecommendation.recommendation.supportingImmunization", description="Past immunizations supporting recommendation", type="reference", target={Immunization.class} ) public static final String SP_SUPPORT = "support"; /** * Fluent Client search parameter constant for support @@ -1777,7 +1793,9 @@ public class ImmunizationRecommendation extends DomainResource { * Path: ImmunizationRecommendation.recommendation.forecastStatus
*

*/ - @SearchParamDefinition(name="status", path="ImmunizationRecommendation.recommendation.forecastStatus", description="Vaccine administration status", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="ImmunizationRecommendation.recommendation.forecastStatus", description="Vaccine administration status", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImplementationGuide.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImplementationGuide.java index 49b074bf7c2..08c5fd5f515 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImplementationGuide.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImplementationGuide.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -3791,7 +3791,9 @@ public class ImplementationGuide extends DomainResource { * Path: ImplementationGuide.date
*

*/ - @SearchParamDefinition(name="date", path="ImplementationGuide.date", description="The implementation guide publication date", type="date" ) + // [] + // [] + @SearchParamDefinition(name="date", path="ImplementationGuide.date", description="The implementation guide publication date", type="date", target={} ) public static final String SP_DATE = "date"; /** * Fluent Client search parameter constant for date @@ -3811,7 +3813,9 @@ public class ImplementationGuide extends DomainResource { * Path: ImplementationGuide.dependency.uri
*

*/ - @SearchParamDefinition(name="dependency", path="ImplementationGuide.dependency.uri", description="Where to find dependency", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="dependency", path="ImplementationGuide.dependency.uri", description="Where to find dependency", type="uri", target={} ) public static final String SP_DEPENDENCY = "dependency"; /** * Fluent Client search parameter constant for dependency @@ -3831,6 +3835,8 @@ public class ImplementationGuide extends DomainResource { * Path: ImplementationGuide.package.resource.source[x]
*

*/ + // [Any] + // [Any] @SearchParamDefinition(name="resource", path="ImplementationGuide.package.resource.source", description="Location of the resource", type="reference" ) public static final String SP_RESOURCE = "resource"; /** @@ -3857,7 +3863,9 @@ public class ImplementationGuide extends DomainResource { * Path: ImplementationGuide.name
*

*/ - @SearchParamDefinition(name="name", path="ImplementationGuide.name", description="Name of the implementation guide", type="string" ) + // [] + // [] + @SearchParamDefinition(name="name", path="ImplementationGuide.name", description="Name of the implementation guide", type="string", target={} ) public static final String SP_NAME = "name"; /** * Fluent Client search parameter constant for name @@ -3877,7 +3885,9 @@ public class ImplementationGuide extends DomainResource { * Path: ImplementationGuide.useContext
*

*/ - @SearchParamDefinition(name="context", path="ImplementationGuide.useContext", description="A use context assigned to the structure", type="token" ) + // [] + // [] + @SearchParamDefinition(name="context", path="ImplementationGuide.useContext", description="A use context assigned to the structure", type="token", target={} ) public static final String SP_CONTEXT = "context"; /** * Fluent Client search parameter constant for context @@ -3897,7 +3907,9 @@ public class ImplementationGuide extends DomainResource { * Path: ImplementationGuide.publisher
*

*/ - @SearchParamDefinition(name="publisher", path="ImplementationGuide.publisher", description="Name of the publisher of the implementation guide", type="string" ) + // [] + // [] + @SearchParamDefinition(name="publisher", path="ImplementationGuide.publisher", description="Name of the publisher of the implementation guide", type="string", target={} ) public static final String SP_PUBLISHER = "publisher"; /** * Fluent Client search parameter constant for publisher @@ -3917,7 +3929,9 @@ public class ImplementationGuide extends DomainResource { * Path: ImplementationGuide.description
*

*/ - @SearchParamDefinition(name="description", path="ImplementationGuide.description", description="Text search in the description of the implementation guide", type="string" ) + // [] + // [] + @SearchParamDefinition(name="description", path="ImplementationGuide.description", description="Text search in the description of the implementation guide", type="string", target={} ) public static final String SP_DESCRIPTION = "description"; /** * Fluent Client search parameter constant for description @@ -3937,7 +3951,9 @@ public class ImplementationGuide extends DomainResource { * Path: ImplementationGuide.experimental
*

*/ - @SearchParamDefinition(name="experimental", path="ImplementationGuide.experimental", description="If for testing purposes, not real usage", type="token" ) + // [] + // [] + @SearchParamDefinition(name="experimental", path="ImplementationGuide.experimental", description="If for testing purposes, not real usage", type="token", target={} ) public static final String SP_EXPERIMENTAL = "experimental"; /** * Fluent Client search parameter constant for experimental @@ -3957,7 +3973,9 @@ public class ImplementationGuide extends DomainResource { * Path: ImplementationGuide.version
*

*/ - @SearchParamDefinition(name="version", path="ImplementationGuide.version", description="The version identifier of the implementation guide", type="token" ) + // [] + // [] + @SearchParamDefinition(name="version", path="ImplementationGuide.version", description="The version identifier of the implementation guide", type="token", target={} ) public static final String SP_VERSION = "version"; /** * Fluent Client search parameter constant for version @@ -3977,7 +3995,9 @@ public class ImplementationGuide extends DomainResource { * Path: ImplementationGuide.url
*

*/ - @SearchParamDefinition(name="url", path="ImplementationGuide.url", description="Absolute URL used to reference this Implementation Guide", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="url", path="ImplementationGuide.url", description="Absolute URL used to reference this Implementation Guide", type="uri", target={} ) public static final String SP_URL = "url"; /** * Fluent Client search parameter constant for url @@ -3997,7 +4017,9 @@ public class ImplementationGuide extends DomainResource { * Path: ImplementationGuide.status
*

*/ - @SearchParamDefinition(name="status", path="ImplementationGuide.status", description="The current status of the implementation guide", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="ImplementationGuide.status", description="The current status of the implementation guide", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Library.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Library.java index 1446097dce7..8a10ebe8d1e 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Library.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Library.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -2092,7 +2092,9 @@ public class Library extends DomainResource { * Path: Library.moduleMetadata.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="Library.moduleMetadata.identifier", description="Logical identifier for the module (e.g. CMS-143)", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="Library.moduleMetadata.identifier", description="Logical identifier for the module (e.g. CMS-143)", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -2112,7 +2114,9 @@ public class Library extends DomainResource { * Path: Library.moduleMetadata.topic
*

*/ - @SearchParamDefinition(name="topic", path="Library.moduleMetadata.topic", description="Topics associated with the module", type="token" ) + // [] + // [] + @SearchParamDefinition(name="topic", path="Library.moduleMetadata.topic", description="Topics associated with the module", type="token", target={} ) public static final String SP_TOPIC = "topic"; /** * Fluent Client search parameter constant for topic @@ -2132,7 +2136,9 @@ public class Library extends DomainResource { * Path: Library.moduleMetadata.description
*

*/ - @SearchParamDefinition(name="description", path="Library.moduleMetadata.description", description="Text search against the description", type="string" ) + // [] + // [] + @SearchParamDefinition(name="description", path="Library.moduleMetadata.description", description="Text search against the description", type="string", target={} ) public static final String SP_DESCRIPTION = "description"; /** * Fluent Client search parameter constant for description @@ -2152,7 +2158,9 @@ public class Library extends DomainResource { * Path: Library.moduleMetadata.title
*

*/ - @SearchParamDefinition(name="title", path="Library.moduleMetadata.title", description="Text search against the title", type="string" ) + // [] + // [] + @SearchParamDefinition(name="title", path="Library.moduleMetadata.title", description="Text search against the title", type="string", target={} ) public static final String SP_TITLE = "title"; /** * Fluent Client search parameter constant for title @@ -2172,7 +2180,9 @@ public class Library extends DomainResource { * Path: Library.moduleMetadata.version
*

*/ - @SearchParamDefinition(name="version", path="Library.moduleMetadata.version", description="Version of the module (e.g. 1.0.0)", type="string" ) + // [] + // [] + @SearchParamDefinition(name="version", path="Library.moduleMetadata.version", description="Version of the module (e.g. 1.0.0)", type="string", target={} ) public static final String SP_VERSION = "version"; /** * Fluent Client search parameter constant for version @@ -2192,7 +2202,9 @@ public class Library extends DomainResource { * Path: Library.moduleMetadata.status
*

*/ - @SearchParamDefinition(name="status", path="Library.moduleMetadata.status", description="Status of the module", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="Library.moduleMetadata.status", description="Status of the module", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Linkage.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Linkage.java index ea444bd69b5..8d2b73e3b41 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Linkage.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Linkage.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -601,7 +601,9 @@ public class Linkage extends DomainResource { * Path: Linkage.item.resource
*

*/ - @SearchParamDefinition(name="item", path="Linkage.item.resource", description="Matches on any item in the Linkage", type="reference" ) + // [] + // [] + @SearchParamDefinition(name="item", path="Linkage.item.resource", description="Matches on any item in the Linkage", type="reference", target={} ) public static final String SP_ITEM = "item"; /** * Fluent Client search parameter constant for item @@ -627,7 +629,9 @@ public class Linkage extends DomainResource { * Path: Linkage.author
*

*/ - @SearchParamDefinition(name="author", path="Linkage.author", description="Author of the Linkage", type="reference" ) + // [Practitioner, Organization] + // [Practitioner, Organization] + @SearchParamDefinition(name="author", path="Linkage.author", description="Author of the Linkage", type="reference", target={Practitioner.class, Organization.class} ) public static final String SP_AUTHOR = "author"; /** * Fluent Client search parameter constant for author @@ -653,7 +657,9 @@ public class Linkage extends DomainResource { * Path: Linkage.item.resource
*

*/ - @SearchParamDefinition(name="source", path="Linkage.item.resource", description="Matches on any item in the Linkage with a type of 'source'", type="reference" ) + // [] + // [] + @SearchParamDefinition(name="source", path="Linkage.item.resource", description="Matches on any item in the Linkage with a type of 'source'", type="reference", target={} ) public static final String SP_SOURCE = "source"; /** * Fluent Client search parameter constant for source diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ListResource.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ListResource.java index e66f61a37b2..0428fa57e0d 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ListResource.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ListResource.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1542,7 +1542,9 @@ public class ListResource extends DomainResource { * Path: List.date
*

*/ - @SearchParamDefinition(name="date", path="List.date", description="When the list was prepared", type="date" ) + // [] + // [] + @SearchParamDefinition(name="date", path="List.date", description="When the list was prepared", type="date", target={} ) public static final String SP_DATE = "date"; /** * Fluent Client search parameter constant for date @@ -1562,7 +1564,9 @@ public class ListResource extends DomainResource { * Path: List.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="List.identifier", description="Business identifier", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="List.identifier", description="Business identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -1582,6 +1586,8 @@ public class ListResource extends DomainResource { * Path: List.entry.item
*

*/ + // [Any] + // [Any] @SearchParamDefinition(name="item", path="List.entry.item", description="Actual entry", type="reference" ) public static final String SP_ITEM = "item"; /** @@ -1608,7 +1614,9 @@ public class ListResource extends DomainResource { * Path: List.emptyReason
*

*/ - @SearchParamDefinition(name="empty-reason", path="List.emptyReason", description="Why list is empty", type="token" ) + // [] + // [] + @SearchParamDefinition(name="empty-reason", path="List.emptyReason", description="Why list is empty", type="token", target={} ) public static final String SP_EMPTY_REASON = "empty-reason"; /** * Fluent Client search parameter constant for empty-reason @@ -1628,7 +1636,9 @@ public class ListResource extends DomainResource { * Path: List.code
*

*/ - @SearchParamDefinition(name="code", path="List.code", description="What the purpose of this list is", type="token" ) + // [] + // [] + @SearchParamDefinition(name="code", path="List.code", description="What the purpose of this list is", type="token", target={} ) public static final String SP_CODE = "code"; /** * Fluent Client search parameter constant for code @@ -1648,7 +1658,9 @@ public class ListResource extends DomainResource { * Path: List.note.text
*

*/ - @SearchParamDefinition(name="notes", path="List.note.text", description="The annotation - text content", type="string" ) + // [] + // [] + @SearchParamDefinition(name="notes", path="List.note.text", description="The annotation - text content", type="string", target={} ) public static final String SP_NOTES = "notes"; /** * Fluent Client search parameter constant for notes @@ -1668,7 +1680,9 @@ public class ListResource extends DomainResource { * Path: List.subject
*

*/ - @SearchParamDefinition(name="subject", path="List.subject", description="If all resources have the same subject", type="reference" ) + // [Group, Device, Patient, Location] + // [Group, Device, Patient, Location] + @SearchParamDefinition(name="subject", path="List.subject", description="If all resources have the same subject", type="reference", target={Group.class, Device.class, Patient.class, Location.class} ) public static final String SP_SUBJECT = "subject"; /** * Fluent Client search parameter constant for subject @@ -1694,7 +1708,9 @@ public class ListResource extends DomainResource { * Path: List.subject
*

*/ - @SearchParamDefinition(name="patient", path="List.subject", description="If all resources have the same subject", type="reference" ) + // [Group, Device, Patient, Location] + // [Patient] + @SearchParamDefinition(name="patient", path="List.subject", description="If all resources have the same subject", type="reference", target={Group.class, Device.class, Patient.class, Location.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -1720,7 +1736,9 @@ public class ListResource extends DomainResource { * Path: List.source
*

*/ - @SearchParamDefinition(name="source", path="List.source", description="Who and/or what defined the list contents (aka Author)", type="reference" ) + // [Practitioner, Device, Patient] + // [Practitioner, Device, Patient] + @SearchParamDefinition(name="source", path="List.source", description="Who and/or what defined the list contents (aka Author)", type="reference", target={Practitioner.class, Device.class, Patient.class} ) public static final String SP_SOURCE = "source"; /** * Fluent Client search parameter constant for source @@ -1746,7 +1764,9 @@ public class ListResource extends DomainResource { * Path: List.encounter
*

*/ - @SearchParamDefinition(name="encounter", path="List.encounter", description="Context in which list created", type="reference" ) + // [Encounter] + // [Encounter] + @SearchParamDefinition(name="encounter", path="List.encounter", description="Context in which list created", type="reference", target={Encounter.class} ) public static final String SP_ENCOUNTER = "encounter"; /** * Fluent Client search parameter constant for encounter @@ -1772,7 +1792,9 @@ public class ListResource extends DomainResource { * Path: List.title
*

*/ - @SearchParamDefinition(name="title", path="List.title", description="Descriptive name for the list", type="string" ) + // [] + // [] + @SearchParamDefinition(name="title", path="List.title", description="Descriptive name for the list", type="string", target={} ) public static final String SP_TITLE = "title"; /** * Fluent Client search parameter constant for title @@ -1792,7 +1814,9 @@ public class ListResource extends DomainResource { * Path: List.status
*

*/ - @SearchParamDefinition(name="status", path="List.status", description="current | retired | entered-in-error", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="List.status", description="current | retired | entered-in-error", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Location.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Location.java index 24431bc1d2d..c7e929ede6a 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Location.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Location.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1442,7 +1442,9 @@ public class Location extends DomainResource { * Path: Location.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="Location.identifier", description="Unique code or number identifying the location to its users", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="Location.identifier", description="Unique code or number identifying the location to its users", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -1462,7 +1464,9 @@ public class Location extends DomainResource { * Path: Location.partOf
*

*/ - @SearchParamDefinition(name="partof", path="Location.partOf", description="The location of which this location is a part", type="reference" ) + // [Location] + // [Location] + @SearchParamDefinition(name="partof", path="Location.partOf", description="The location of which this location is a part", type="reference", target={Location.class} ) public static final String SP_PARTOF = "partof"; /** * Fluent Client search parameter constant for partof @@ -1488,7 +1492,9 @@ public class Location extends DomainResource { * Path: Location.position
*

*/ - @SearchParamDefinition(name="near-distance", path="Location.position", description="A distance quantity to limit the near search to locations within a specific distance", type="token" ) + // [] + // [] + @SearchParamDefinition(name="near-distance", path="Location.position", description="A distance quantity to limit the near search to locations within a specific distance", type="token", target={} ) public static final String SP_NEAR_DISTANCE = "near-distance"; /** * Fluent Client search parameter constant for near-distance @@ -1508,7 +1514,9 @@ public class Location extends DomainResource { * Path: Location.address
*

*/ - @SearchParamDefinition(name="address", path="Location.address", description="A (part of the) address of the location", type="string" ) + // [] + // [] + @SearchParamDefinition(name="address", path="Location.address", description="A (part of the) address of the location", type="string", target={} ) public static final String SP_ADDRESS = "address"; /** * Fluent Client search parameter constant for address @@ -1528,7 +1536,9 @@ public class Location extends DomainResource { * Path: Location.address.state
*

*/ - @SearchParamDefinition(name="address-state", path="Location.address.state", description="A state specified in an address", type="string" ) + // [] + // [] + @SearchParamDefinition(name="address-state", path="Location.address.state", description="A state specified in an address", type="string", target={} ) public static final String SP_ADDRESS_STATE = "address-state"; /** * Fluent Client search parameter constant for address-state @@ -1548,7 +1558,9 @@ public class Location extends DomainResource { * Path: Location.type
*

*/ - @SearchParamDefinition(name="type", path="Location.type", description="A code for the type of location", type="token" ) + // [] + // [] + @SearchParamDefinition(name="type", path="Location.type", description="A code for the type of location", type="token", target={} ) public static final String SP_TYPE = "type"; /** * Fluent Client search parameter constant for type @@ -1568,7 +1580,9 @@ public class Location extends DomainResource { * Path: Location.address.postalCode
*

*/ - @SearchParamDefinition(name="address-postalcode", path="Location.address.postalCode", description="A postal code specified in an address", type="string" ) + // [] + // [] + @SearchParamDefinition(name="address-postalcode", path="Location.address.postalCode", description="A postal code specified in an address", type="string", target={} ) public static final String SP_ADDRESS_POSTALCODE = "address-postalcode"; /** * Fluent Client search parameter constant for address-postalcode @@ -1588,7 +1602,9 @@ public class Location extends DomainResource { * Path: Location.address.country
*

*/ - @SearchParamDefinition(name="address-country", path="Location.address.country", description="A country specified in an address", type="string" ) + // [] + // [] + @SearchParamDefinition(name="address-country", path="Location.address.country", description="A country specified in an address", type="string", target={} ) public static final String SP_ADDRESS_COUNTRY = "address-country"; /** * Fluent Client search parameter constant for address-country @@ -1608,7 +1624,9 @@ public class Location extends DomainResource { * Path: Location.managingOrganization
*

*/ - @SearchParamDefinition(name="organization", path="Location.managingOrganization", description="Searches for locations that are managed by the provided organization", type="reference" ) + // [Organization] + // [Organization] + @SearchParamDefinition(name="organization", path="Location.managingOrganization", description="Searches for locations that are managed by the provided organization", type="reference", target={Organization.class} ) public static final String SP_ORGANIZATION = "organization"; /** * Fluent Client search parameter constant for organization @@ -1634,7 +1652,9 @@ public class Location extends DomainResource { * Path: Location.name
*

*/ - @SearchParamDefinition(name="name", path="Location.name", description="A (portion of the) name of the location", type="string" ) + // [] + // [] + @SearchParamDefinition(name="name", path="Location.name", description="A (portion of the) name of the location", type="string", target={} ) public static final String SP_NAME = "name"; /** * Fluent Client search parameter constant for name @@ -1654,7 +1674,9 @@ public class Location extends DomainResource { * Path: Location.address.use
*

*/ - @SearchParamDefinition(name="address-use", path="Location.address.use", description="A use code specified in an address", type="token" ) + // [] + // [] + @SearchParamDefinition(name="address-use", path="Location.address.use", description="A use code specified in an address", type="token", target={} ) public static final String SP_ADDRESS_USE = "address-use"; /** * Fluent Client search parameter constant for address-use @@ -1674,7 +1696,9 @@ public class Location extends DomainResource { * Path: Location.position
*

*/ - @SearchParamDefinition(name="near", path="Location.position", description="The coordinates expressed as [lat],[long] (using the WGS84 datum, see notes) to find locations near to (servers may search using a square rather than a circle for efficiency)", type="token" ) + // [] + // [] + @SearchParamDefinition(name="near", path="Location.position", description="The coordinates expressed as [lat],[long] (using the WGS84 datum, see notes) to find locations near to (servers may search using a square rather than a circle for efficiency)", type="token", target={} ) public static final String SP_NEAR = "near"; /** * Fluent Client search parameter constant for near @@ -1694,7 +1718,9 @@ public class Location extends DomainResource { * Path: Location.address.city
*

*/ - @SearchParamDefinition(name="address-city", path="Location.address.city", description="A city specified in an address", type="string" ) + // [] + // [] + @SearchParamDefinition(name="address-city", path="Location.address.city", description="A city specified in an address", type="string", target={} ) public static final String SP_ADDRESS_CITY = "address-city"; /** * Fluent Client search parameter constant for address-city @@ -1714,7 +1740,9 @@ public class Location extends DomainResource { * Path: Location.status
*

*/ - @SearchParamDefinition(name="status", path="Location.status", description="Searches for locations with a specific kind of status", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="Location.status", description="Searches for locations with a specific kind of status", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Measure.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Measure.java index 78da245c439..333c7d09553 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Measure.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Measure.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -3240,7 +3240,9 @@ public class Measure extends DomainResource { * Path: Measure.moduleMetadata.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="Measure.moduleMetadata.identifier", description="Logical identifier for the module (e.g. CMS-143)", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="Measure.moduleMetadata.identifier", description="Logical identifier for the module (e.g. CMS-143)", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -3260,7 +3262,9 @@ public class Measure extends DomainResource { * Path: Measure.moduleMetadata.topic
*

*/ - @SearchParamDefinition(name="topic", path="Measure.moduleMetadata.topic", description="Topics associated with the module", type="token" ) + // [] + // [] + @SearchParamDefinition(name="topic", path="Measure.moduleMetadata.topic", description="Topics associated with the module", type="token", target={} ) public static final String SP_TOPIC = "topic"; /** * Fluent Client search parameter constant for topic @@ -3280,7 +3284,9 @@ public class Measure extends DomainResource { * Path: Measure.moduleMetadata.description
*

*/ - @SearchParamDefinition(name="description", path="Measure.moduleMetadata.description", description="Text search against the description", type="string" ) + // [] + // [] + @SearchParamDefinition(name="description", path="Measure.moduleMetadata.description", description="Text search against the description", type="string", target={} ) public static final String SP_DESCRIPTION = "description"; /** * Fluent Client search parameter constant for description @@ -3300,7 +3306,9 @@ public class Measure extends DomainResource { * Path: Measure.moduleMetadata.title
*

*/ - @SearchParamDefinition(name="title", path="Measure.moduleMetadata.title", description="Text search against the title", type="string" ) + // [] + // [] + @SearchParamDefinition(name="title", path="Measure.moduleMetadata.title", description="Text search against the title", type="string", target={} ) public static final String SP_TITLE = "title"; /** * Fluent Client search parameter constant for title @@ -3320,7 +3328,9 @@ public class Measure extends DomainResource { * Path: Measure.moduleMetadata.version
*

*/ - @SearchParamDefinition(name="version", path="Measure.moduleMetadata.version", description="Version of the module (e.g. 1.0.0)", type="string" ) + // [] + // [] + @SearchParamDefinition(name="version", path="Measure.moduleMetadata.version", description="Version of the module (e.g. 1.0.0)", type="string", target={} ) public static final String SP_VERSION = "version"; /** * Fluent Client search parameter constant for version @@ -3340,7 +3350,9 @@ public class Measure extends DomainResource { * Path: Measure.moduleMetadata.status
*

*/ - @SearchParamDefinition(name="status", path="Measure.moduleMetadata.status", description="Status of the module", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="Measure.moduleMetadata.status", description="Status of the module", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/MeasureReport.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/MeasureReport.java index fbc6627e5ac..d54842cc24b 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/MeasureReport.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/MeasureReport.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -3093,7 +3093,9 @@ public class MeasureReport extends DomainResource { * Path: MeasureReport.patient
*

*/ - @SearchParamDefinition(name="patient", path="MeasureReport.patient", description="The identity of a patient to search for individual measure report results for", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="MeasureReport.patient", description="The identity of a patient to search for individual measure report results for", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Media.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Media.java index e37a697f1a5..e28a66ad3e3 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Media.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Media.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1001,7 +1001,9 @@ public class Media extends DomainResource { * Path: Media.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="Media.identifier", description="Identifier(s) for the image", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="Media.identifier", description="Identifier(s) for the image", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -1021,7 +1023,9 @@ public class Media extends DomainResource { * Path: Media.view
*

*/ - @SearchParamDefinition(name="view", path="Media.view", description="Imaging view, e.g. Lateral or Antero-posterior", type="token" ) + // [] + // [] + @SearchParamDefinition(name="view", path="Media.view", description="Imaging view, e.g. Lateral or Antero-posterior", type="token", target={} ) public static final String SP_VIEW = "view"; /** * Fluent Client search parameter constant for view @@ -1041,7 +1045,9 @@ public class Media extends DomainResource { * Path: Media.subtype
*

*/ - @SearchParamDefinition(name="subtype", path="Media.subtype", description="The type of acquisition equipment/process", type="token" ) + // [] + // [] + @SearchParamDefinition(name="subtype", path="Media.subtype", description="The type of acquisition equipment/process", type="token", target={} ) public static final String SP_SUBTYPE = "subtype"; /** * Fluent Client search parameter constant for subtype @@ -1061,7 +1067,9 @@ public class Media extends DomainResource { * Path: Media.content.creation
*

*/ - @SearchParamDefinition(name="created", path="Media.content.creation", description="Date attachment was first created", type="date" ) + // [] + // [] + @SearchParamDefinition(name="created", path="Media.content.creation", description="Date attachment was first created", type="date", target={} ) public static final String SP_CREATED = "created"; /** * Fluent Client search parameter constant for created @@ -1081,7 +1089,9 @@ public class Media extends DomainResource { * Path: Media.subject
*

*/ - @SearchParamDefinition(name="subject", path="Media.subject", description="Who/What this Media is a record of", type="reference" ) + // [Practitioner, Group, Specimen, Device, Patient] + // [Practitioner, Group, Specimen, Device, Patient] + @SearchParamDefinition(name="subject", path="Media.subject", description="Who/What this Media is a record of", type="reference", target={Practitioner.class, Group.class, Specimen.class, Device.class, Patient.class} ) public static final String SP_SUBJECT = "subject"; /** * Fluent Client search parameter constant for subject @@ -1107,7 +1117,9 @@ public class Media extends DomainResource { * Path: Media.subject
*

*/ - @SearchParamDefinition(name="patient", path="Media.subject", description="Who/What this Media is a record of", type="reference" ) + // [Practitioner, Group, Specimen, Device, Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="Media.subject", description="Who/What this Media is a record of", type="reference", target={Practitioner.class, Group.class, Specimen.class, Device.class, Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -1133,7 +1145,9 @@ public class Media extends DomainResource { * Path: Media.type
*

*/ - @SearchParamDefinition(name="type", path="Media.type", description="photo | video | audio", type="token" ) + // [] + // [] + @SearchParamDefinition(name="type", path="Media.type", description="photo | video | audio", type="token", target={} ) public static final String SP_TYPE = "type"; /** * Fluent Client search parameter constant for type @@ -1153,7 +1167,9 @@ public class Media extends DomainResource { * Path: Media.operator
*

*/ - @SearchParamDefinition(name="operator", path="Media.operator", description="The person who generated the image", type="reference" ) + // [Practitioner] + // [Practitioner] + @SearchParamDefinition(name="operator", path="Media.operator", description="The person who generated the image", type="reference", target={Practitioner.class} ) public static final String SP_OPERATOR = "operator"; /** * Fluent Client search parameter constant for operator diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Medication.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Medication.java index 293133c3c31..528ad42f826 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Medication.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Medication.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1567,7 +1567,9 @@ public class Medication extends DomainResource { * Path: Medication.product.ingredient.itemCodeableConcept
*

*/ - @SearchParamDefinition(name="ingredient-code", path="Medication.product.ingredient.item.as(CodeableConcept)", description="The product contained", type="token" ) + // [] + // [] + @SearchParamDefinition(name="ingredient-code", path="Medication.product.ingredient.item.as(CodeableConcept)", description="The product contained", type="token", target={} ) public static final String SP_INGREDIENT_CODE = "ingredient-code"; /** * Fluent Client search parameter constant for ingredient-code @@ -1587,7 +1589,9 @@ public class Medication extends DomainResource { * Path: Medication.package.container
*

*/ - @SearchParamDefinition(name="container", path="Medication.package.container", description="E.g. box, vial, blister-pack", type="token" ) + // [] + // [] + @SearchParamDefinition(name="container", path="Medication.package.container", description="E.g. box, vial, blister-pack", type="token", target={} ) public static final String SP_CONTAINER = "container"; /** * Fluent Client search parameter constant for container @@ -1607,7 +1611,9 @@ public class Medication extends DomainResource { * Path: Medication.package.content.itemReference
*

*/ - @SearchParamDefinition(name="package-item", path="Medication.package.content.item.as(Reference)", description="The item in the package", type="reference" ) + // [Medication] + // [Medication] + @SearchParamDefinition(name="package-item", path="Medication.package.content.item.as(Reference)", description="The item in the package", type="reference", target={Medication.class} ) public static final String SP_PACKAGE_ITEM = "package-item"; /** * Fluent Client search parameter constant for package-item @@ -1633,7 +1639,9 @@ public class Medication extends DomainResource { * Path: Medication.code
*

*/ - @SearchParamDefinition(name="code", path="Medication.code", description="Codes that identify this medication", type="token" ) + // [] + // [] + @SearchParamDefinition(name="code", path="Medication.code", description="Codes that identify this medication", type="token", target={} ) public static final String SP_CODE = "code"; /** * Fluent Client search parameter constant for code @@ -1653,7 +1661,9 @@ public class Medication extends DomainResource { * Path: Medication.product.ingredient.itemReference
*

*/ - @SearchParamDefinition(name="ingredient", path="Medication.product.ingredient.item.as(Reference)", description="The product contained", type="reference" ) + // [Medication, Substance] + // [Medication, Substance] + @SearchParamDefinition(name="ingredient", path="Medication.product.ingredient.item.as(Reference)", description="The product contained", type="reference", target={Medication.class, Substance.class} ) public static final String SP_INGREDIENT = "ingredient"; /** * Fluent Client search parameter constant for ingredient @@ -1679,7 +1689,9 @@ public class Medication extends DomainResource { * Path: Medication.product.form
*

*/ - @SearchParamDefinition(name="form", path="Medication.product.form", description="powder | tablets | carton +", type="token" ) + // [] + // [] + @SearchParamDefinition(name="form", path="Medication.product.form", description="powder | tablets | carton +", type="token", target={} ) public static final String SP_FORM = "form"; /** * Fluent Client search parameter constant for form @@ -1699,7 +1711,9 @@ public class Medication extends DomainResource { * Path: Medication.package.content.itemCodeableConcept
*

*/ - @SearchParamDefinition(name="package-item-code", path="Medication.package.content.item.as(CodeableConcept)", description="The item in the package", type="token" ) + // [] + // [] + @SearchParamDefinition(name="package-item-code", path="Medication.package.content.item.as(CodeableConcept)", description="The item in the package", type="token", target={} ) public static final String SP_PACKAGE_ITEM_CODE = "package-item-code"; /** * Fluent Client search parameter constant for package-item-code @@ -1719,7 +1733,9 @@ public class Medication extends DomainResource { * Path: Medication.manufacturer
*

*/ - @SearchParamDefinition(name="manufacturer", path="Medication.manufacturer", description="Manufacturer of the item", type="reference" ) + // [Organization] + // [Organization] + @SearchParamDefinition(name="manufacturer", path="Medication.manufacturer", description="Manufacturer of the item", type="reference", target={Organization.class} ) public static final String SP_MANUFACTURER = "manufacturer"; /** * Fluent Client search parameter constant for manufacturer diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationAdministration.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationAdministration.java index 8fa5b33e79e..85b49395864 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationAdministration.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationAdministration.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1717,7 +1717,9 @@ public class MedicationAdministration extends DomainResource { * Path: MedicationAdministration.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="MedicationAdministration.identifier", description="Return administrations with this external identifier", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="MedicationAdministration.identifier", description="Return administrations with this external identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -1737,7 +1739,9 @@ public class MedicationAdministration extends DomainResource { * Path: MedicationAdministration.medicationCodeableConcept
*

*/ - @SearchParamDefinition(name="code", path="MedicationAdministration.medication.as(CodeableConcept)", description="Return administrations of this medication code", type="token" ) + // [] + // [] + @SearchParamDefinition(name="code", path="MedicationAdministration.medication.as(CodeableConcept)", description="Return administrations of this medication code", type="token", target={} ) public static final String SP_CODE = "code"; /** * Fluent Client search parameter constant for code @@ -1757,7 +1761,9 @@ public class MedicationAdministration extends DomainResource { * Path: MedicationAdministration.prescription
*

*/ - @SearchParamDefinition(name="prescription", path="MedicationAdministration.prescription", description="The identity of a prescription to list administrations from", type="reference" ) + // [MedicationOrder] + // [MedicationOrder] + @SearchParamDefinition(name="prescription", path="MedicationAdministration.prescription", description="The identity of a prescription to list administrations from", type="reference", target={MedicationOrder.class} ) public static final String SP_PRESCRIPTION = "prescription"; /** * Fluent Client search parameter constant for prescription @@ -1783,7 +1789,9 @@ public class MedicationAdministration extends DomainResource { * Path: MedicationAdministration.effectiveTime[x]
*

*/ - @SearchParamDefinition(name="effectivetime", path="MedicationAdministration.effectiveTime", description="Date administration happened (or did not happen)", type="date" ) + // [] + // [] + @SearchParamDefinition(name="effectivetime", path="MedicationAdministration.effectiveTime", description="Date administration happened (or did not happen)", type="date", target={} ) public static final String SP_EFFECTIVETIME = "effectivetime"; /** * Fluent Client search parameter constant for effectivetime @@ -1803,7 +1811,9 @@ public class MedicationAdministration extends DomainResource { * Path: MedicationAdministration.practitioner
*

*/ - @SearchParamDefinition(name="practitioner", path="MedicationAdministration.practitioner", description="Who administered substance", type="reference" ) + // [Practitioner, Patient, RelatedPerson] + // [Practitioner, Patient, RelatedPerson] + @SearchParamDefinition(name="practitioner", path="MedicationAdministration.practitioner", description="Who administered substance", type="reference", target={Practitioner.class, Patient.class, RelatedPerson.class} ) public static final String SP_PRACTITIONER = "practitioner"; /** * Fluent Client search parameter constant for practitioner @@ -1829,7 +1839,9 @@ public class MedicationAdministration extends DomainResource { * Path: MedicationAdministration.patient
*

*/ - @SearchParamDefinition(name="patient", path="MedicationAdministration.patient", description="The identity of a patient to list administrations for", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="MedicationAdministration.patient", description="The identity of a patient to list administrations for", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -1855,7 +1867,9 @@ public class MedicationAdministration extends DomainResource { * Path: MedicationAdministration.wasNotGiven
*

*/ - @SearchParamDefinition(name="wasnotgiven", path="MedicationAdministration.wasNotGiven", description="Administrations that were not made", type="token" ) + // [] + // [] + @SearchParamDefinition(name="wasnotgiven", path="MedicationAdministration.wasNotGiven", description="Administrations that were not made", type="token", target={} ) public static final String SP_WASNOTGIVEN = "wasnotgiven"; /** * Fluent Client search parameter constant for wasnotgiven @@ -1875,7 +1889,9 @@ public class MedicationAdministration extends DomainResource { * Path: MedicationAdministration.medicationReference
*

*/ - @SearchParamDefinition(name="medication", path="MedicationAdministration.medication.as(Reference)", description="Return administrations of this medication resource", type="reference" ) + // [Medication] + // [Medication] + @SearchParamDefinition(name="medication", path="MedicationAdministration.medication.as(Reference)", description="Return administrations of this medication resource", type="reference", target={Medication.class} ) public static final String SP_MEDICATION = "medication"; /** * Fluent Client search parameter constant for medication @@ -1901,7 +1917,9 @@ public class MedicationAdministration extends DomainResource { * Path: MedicationAdministration.encounter
*

*/ - @SearchParamDefinition(name="encounter", path="MedicationAdministration.encounter", description="Return administrations that share this encounter", type="reference" ) + // [Encounter] + // [Encounter] + @SearchParamDefinition(name="encounter", path="MedicationAdministration.encounter", description="Return administrations that share this encounter", type="reference", target={Encounter.class} ) public static final String SP_ENCOUNTER = "encounter"; /** * Fluent Client search parameter constant for encounter @@ -1927,7 +1945,9 @@ public class MedicationAdministration extends DomainResource { * Path: MedicationAdministration.device
*

*/ - @SearchParamDefinition(name="device", path="MedicationAdministration.device", description="Return administrations with this administration device identity", type="reference" ) + // [Device] + // [Device] + @SearchParamDefinition(name="device", path="MedicationAdministration.device", description="Return administrations with this administration device identity", type="reference", target={Device.class} ) public static final String SP_DEVICE = "device"; /** * Fluent Client search parameter constant for device @@ -1953,7 +1973,9 @@ public class MedicationAdministration extends DomainResource { * Path: MedicationAdministration.status
*

*/ - @SearchParamDefinition(name="status", path="MedicationAdministration.status", description="MedicationAdministration event status (for example one of active/paused/completed/nullified)", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="MedicationAdministration.status", description="MedicationAdministration event status (for example one of active/paused/completed/nullified)", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationDispense.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationDispense.java index d634d3b10d9..89c5b843b41 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationDispense.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationDispense.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -2397,7 +2397,9 @@ Specifically if 'boolean' datatype is selected, then the following logic applies * Path: MedicationDispense.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="MedicationDispense.identifier", description="Return dispenses with this external identifier", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="MedicationDispense.identifier", description="Return dispenses with this external identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -2417,7 +2419,9 @@ Specifically if 'boolean' datatype is selected, then the following logic applies * Path: MedicationDispense.medicationCodeableConcept
*

*/ - @SearchParamDefinition(name="code", path="MedicationDispense.medication.as(CodeableConcept)", description="Return dispenses of this medicine code", type="token" ) + // [] + // [] + @SearchParamDefinition(name="code", path="MedicationDispense.medication.as(CodeableConcept)", description="Return dispenses of this medicine code", type="token", target={} ) public static final String SP_CODE = "code"; /** * Fluent Client search parameter constant for code @@ -2437,7 +2441,9 @@ Specifically if 'boolean' datatype is selected, then the following logic applies * Path: MedicationDispense.receiver
*

*/ - @SearchParamDefinition(name="receiver", path="MedicationDispense.receiver", description="Who collected the medication", type="reference" ) + // [Practitioner, Patient] + // [Practitioner, Patient] + @SearchParamDefinition(name="receiver", path="MedicationDispense.receiver", description="Who collected the medication", type="reference", target={Practitioner.class, Patient.class} ) public static final String SP_RECEIVER = "receiver"; /** * Fluent Client search parameter constant for receiver @@ -2463,7 +2469,9 @@ Specifically if 'boolean' datatype is selected, then the following logic applies * Path: MedicationDispense.destination
*

*/ - @SearchParamDefinition(name="destination", path="MedicationDispense.destination", description="Return dispenses that should be sent to a specific destination", type="reference" ) + // [Location] + // [Location] + @SearchParamDefinition(name="destination", path="MedicationDispense.destination", description="Return dispenses that should be sent to a specific destination", type="reference", target={Location.class} ) public static final String SP_DESTINATION = "destination"; /** * Fluent Client search parameter constant for destination @@ -2489,7 +2497,9 @@ Specifically if 'boolean' datatype is selected, then the following logic applies * Path: MedicationDispense.medicationReference
*

*/ - @SearchParamDefinition(name="medication", path="MedicationDispense.medication.as(Reference)", description="Return dispenses of this medicine resource", type="reference" ) + // [Medication] + // [Medication] + @SearchParamDefinition(name="medication", path="MedicationDispense.medication.as(Reference)", description="Return dispenses of this medicine resource", type="reference", target={Medication.class} ) public static final String SP_MEDICATION = "medication"; /** * Fluent Client search parameter constant for medication @@ -2515,7 +2525,9 @@ Specifically if 'boolean' datatype is selected, then the following logic applies * Path: MedicationDispense.substitution.responsibleParty
*

*/ - @SearchParamDefinition(name="responsibleparty", path="MedicationDispense.substitution.responsibleParty", description="Return all dispenses with the specified responsible party", type="reference" ) + // [Practitioner] + // [Practitioner] + @SearchParamDefinition(name="responsibleparty", path="MedicationDispense.substitution.responsibleParty", description="Return all dispenses with the specified responsible party", type="reference", target={Practitioner.class} ) public static final String SP_RESPONSIBLEPARTY = "responsibleparty"; /** * Fluent Client search parameter constant for responsibleparty @@ -2541,7 +2553,9 @@ Specifically if 'boolean' datatype is selected, then the following logic applies * Path: MedicationDispense.type
*

*/ - @SearchParamDefinition(name="type", path="MedicationDispense.type", description="Return all dispenses of a specific type", type="token" ) + // [] + // [] + @SearchParamDefinition(name="type", path="MedicationDispense.type", description="Return all dispenses of a specific type", type="token", target={} ) public static final String SP_TYPE = "type"; /** * Fluent Client search parameter constant for type @@ -2561,7 +2575,9 @@ Specifically if 'boolean' datatype is selected, then the following logic applies * Path: MedicationDispense.whenHandedOver
*

*/ - @SearchParamDefinition(name="whenhandedover", path="MedicationDispense.whenHandedOver", description="Date when medication handed over to patient (outpatient setting), or supplied to ward or clinic (inpatient setting)", type="date" ) + // [] + // [] + @SearchParamDefinition(name="whenhandedover", path="MedicationDispense.whenHandedOver", description="Date when medication handed over to patient (outpatient setting), or supplied to ward or clinic (inpatient setting)", type="date", target={} ) public static final String SP_WHENHANDEDOVER = "whenhandedover"; /** * Fluent Client search parameter constant for whenhandedover @@ -2581,7 +2597,9 @@ Specifically if 'boolean' datatype is selected, then the following logic applies * Path: MedicationDispense.whenPrepared
*

*/ - @SearchParamDefinition(name="whenprepared", path="MedicationDispense.whenPrepared", description="Date when medication prepared", type="date" ) + // [] + // [] + @SearchParamDefinition(name="whenprepared", path="MedicationDispense.whenPrepared", description="Date when medication prepared", type="date", target={} ) public static final String SP_WHENPREPARED = "whenprepared"; /** * Fluent Client search parameter constant for whenprepared @@ -2601,7 +2619,9 @@ Specifically if 'boolean' datatype is selected, then the following logic applies * Path: MedicationDispense.dispenser
*

*/ - @SearchParamDefinition(name="dispenser", path="MedicationDispense.dispenser", description="Return all dispenses performed by a specific individual", type="reference" ) + // [Practitioner] + // [Practitioner] + @SearchParamDefinition(name="dispenser", path="MedicationDispense.dispenser", description="Return all dispenses performed by a specific individual", type="reference", target={Practitioner.class} ) public static final String SP_DISPENSER = "dispenser"; /** * Fluent Client search parameter constant for dispenser @@ -2627,7 +2647,9 @@ Specifically if 'boolean' datatype is selected, then the following logic applies * Path: MedicationDispense.authorizingPrescription
*

*/ - @SearchParamDefinition(name="prescription", path="MedicationDispense.authorizingPrescription", description="The identity of a prescription to list dispenses from", type="reference" ) + // [MedicationOrder] + // [MedicationOrder] + @SearchParamDefinition(name="prescription", path="MedicationDispense.authorizingPrescription", description="The identity of a prescription to list dispenses from", type="reference", target={MedicationOrder.class} ) public static final String SP_PRESCRIPTION = "prescription"; /** * Fluent Client search parameter constant for prescription @@ -2653,7 +2675,9 @@ Specifically if 'boolean' datatype is selected, then the following logic applies * Path: MedicationDispense.patient
*

*/ - @SearchParamDefinition(name="patient", path="MedicationDispense.patient", description="The identity of a patient to list dispenses for", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="MedicationDispense.patient", description="The identity of a patient to list dispenses for", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -2679,7 +2703,9 @@ Specifically if 'boolean' datatype is selected, then the following logic applies * Path: MedicationDispense.status
*

*/ - @SearchParamDefinition(name="status", path="MedicationDispense.status", description="Status of the dispense", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="MedicationDispense.status", description="Status of the dispense", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationOrder.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationOrder.java index 7826917cd96..a5eea44f113 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationOrder.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationOrder.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -2723,7 +2723,9 @@ public class MedicationOrder extends DomainResource { * Path: MedicationOrder.prescriber
*

*/ - @SearchParamDefinition(name="prescriber", path="MedicationOrder.prescriber", description="Who ordered the medication(s)", type="reference" ) + // [Practitioner] + // [Practitioner] + @SearchParamDefinition(name="prescriber", path="MedicationOrder.prescriber", description="Who ordered the medication(s)", type="reference", target={Practitioner.class} ) public static final String SP_PRESCRIBER = "prescriber"; /** * Fluent Client search parameter constant for prescriber @@ -2749,7 +2751,9 @@ public class MedicationOrder extends DomainResource { * Path: MedicationOrder.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="MedicationOrder.identifier", description="Return prescriptions with this external identifier", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="MedicationOrder.identifier", description="Return prescriptions with this external identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -2769,7 +2773,9 @@ public class MedicationOrder extends DomainResource { * Path: MedicationOrder.medicationCodeableConcept
*

*/ - @SearchParamDefinition(name="code", path="MedicationOrder.medication.as(CodeableConcept)", description="Return administrations of this medication code", type="token" ) + // [] + // [] + @SearchParamDefinition(name="code", path="MedicationOrder.medication.as(CodeableConcept)", description="Return administrations of this medication code", type="token", target={} ) public static final String SP_CODE = "code"; /** * Fluent Client search parameter constant for code @@ -2789,7 +2795,9 @@ public class MedicationOrder extends DomainResource { * Path: MedicationOrder.patient
*

*/ - @SearchParamDefinition(name="patient", path="MedicationOrder.patient", description="The identity of a patient to list orders for", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="MedicationOrder.patient", description="The identity of a patient to list orders for", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -2815,7 +2823,9 @@ public class MedicationOrder extends DomainResource { * Path: MedicationOrder.dateWritten
*

*/ - @SearchParamDefinition(name="datewritten", path="MedicationOrder.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", target={} ) public static final String SP_DATEWRITTEN = "datewritten"; /** * Fluent Client search parameter constant for datewritten @@ -2835,7 +2845,9 @@ public class MedicationOrder extends DomainResource { * Path: MedicationOrder.medicationReference
*

*/ - @SearchParamDefinition(name="medication", path="MedicationOrder.medication.as(Reference)", description="Return administrations of this medication reference", type="reference" ) + // [Medication] + // [Medication] + @SearchParamDefinition(name="medication", path="MedicationOrder.medication.as(Reference)", description="Return administrations of this medication reference", type="reference", target={Medication.class} ) public static final String SP_MEDICATION = "medication"; /** * Fluent Client search parameter constant for medication @@ -2861,7 +2873,9 @@ public class MedicationOrder extends DomainResource { * Path: MedicationOrder.encounter
*

*/ - @SearchParamDefinition(name="encounter", path="MedicationOrder.encounter", description="Return prescriptions with this encounter identifier", type="reference" ) + // [Encounter] + // [Encounter] + @SearchParamDefinition(name="encounter", path="MedicationOrder.encounter", description="Return prescriptions with this encounter identifier", type="reference", target={Encounter.class} ) public static final String SP_ENCOUNTER = "encounter"; /** * Fluent Client search parameter constant for encounter @@ -2887,7 +2901,9 @@ public class MedicationOrder extends DomainResource { * Path: MedicationOrder.status
*

*/ - @SearchParamDefinition(name="status", path="MedicationOrder.status", description="Status of the prescription", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="MedicationOrder.status", description="Status of the prescription", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationStatement.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationStatement.java index a37d84bd382..e62ad7e8fce 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationStatement.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationStatement.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1981,7 +1981,9 @@ Specifically if 'boolean' datatype is selected, then the following logic applies * Path: MedicationStatement.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="MedicationStatement.identifier", description="Return statements with this external identifier", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="MedicationStatement.identifier", description="Return statements with this external identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -2001,7 +2003,9 @@ Specifically if 'boolean' datatype is selected, then the following logic applies * Path: MedicationStatement.effective[x]
*

*/ - @SearchParamDefinition(name="effective", path="MedicationStatement.effective", description="Date when patient was taking (or not taking) the medication", type="date" ) + // [] + // [] + @SearchParamDefinition(name="effective", path="MedicationStatement.effective", description="Date when patient was taking (or not taking) the medication", type="date", target={} ) public static final String SP_EFFECTIVE = "effective"; /** * Fluent Client search parameter constant for effective @@ -2021,7 +2025,9 @@ Specifically if 'boolean' datatype is selected, then the following logic applies * Path: MedicationStatement.medicationCodeableConcept
*

*/ - @SearchParamDefinition(name="code", path="MedicationStatement.medication.as(CodeableConcept)", description="Return administrations of this medication code", type="token" ) + // [] + // [] + @SearchParamDefinition(name="code", path="MedicationStatement.medication.as(CodeableConcept)", description="Return administrations of this medication code", type="token", target={} ) public static final String SP_CODE = "code"; /** * Fluent Client search parameter constant for code @@ -2041,7 +2047,9 @@ Specifically if 'boolean' datatype is selected, then the following logic applies * Path: MedicationStatement.patient
*

*/ - @SearchParamDefinition(name="patient", path="MedicationStatement.patient", description="The identity of a patient to list statements for", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="MedicationStatement.patient", description="The identity of a patient to list statements for", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -2067,7 +2075,9 @@ Specifically if 'boolean' datatype is selected, then the following logic applies * Path: MedicationStatement.medicationReference
*

*/ - @SearchParamDefinition(name="medication", path="MedicationStatement.medication.as(Reference)", description="Return administrations of this medication reference", type="reference" ) + // [Medication] + // [Medication] + @SearchParamDefinition(name="medication", path="MedicationStatement.medication.as(Reference)", description="Return administrations of this medication reference", type="reference", target={Medication.class} ) public static final String SP_MEDICATION = "medication"; /** * Fluent Client search parameter constant for medication @@ -2093,7 +2103,9 @@ Specifically if 'boolean' datatype is selected, then the following logic applies * Path: MedicationStatement.informationSource
*

*/ - @SearchParamDefinition(name="source", path="MedicationStatement.informationSource", description="Who the information in the statement came from", type="reference" ) + // [Practitioner, Patient, RelatedPerson] + // [Practitioner, Patient, RelatedPerson] + @SearchParamDefinition(name="source", path="MedicationStatement.informationSource", description="Who the information in the statement came from", type="reference", target={Practitioner.class, Patient.class, RelatedPerson.class} ) public static final String SP_SOURCE = "source"; /** * Fluent Client search parameter constant for source @@ -2119,7 +2131,9 @@ Specifically if 'boolean' datatype is selected, then the following logic applies * Path: MedicationStatement.status
*

*/ - @SearchParamDefinition(name="status", path="MedicationStatement.status", description="Return statements that match the given status", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="MedicationStatement.status", description="Return statements that match the given status", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/MessageHeader.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/MessageHeader.java index dd4b8763998..de963e11937 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/MessageHeader.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/MessageHeader.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1952,7 +1952,9 @@ public class MessageHeader extends DomainResource { * Path: MessageHeader.response.code
*

*/ - @SearchParamDefinition(name="code", path="MessageHeader.response.code", description="ok | transient-error | fatal-error", type="token" ) + // [] + // [] + @SearchParamDefinition(name="code", path="MessageHeader.response.code", description="ok | transient-error | fatal-error", type="token", target={} ) public static final String SP_CODE = "code"; /** * Fluent Client search parameter constant for code @@ -1972,6 +1974,8 @@ public class MessageHeader extends DomainResource { * Path: MessageHeader.data
*

*/ + // [Any] + // [Any] @SearchParamDefinition(name="data", path="MessageHeader.data", description="The actual content of the message", type="reference" ) public static final String SP_DATA = "data"; /** @@ -1998,7 +2002,9 @@ public class MessageHeader extends DomainResource { * Path: MessageHeader.receiver
*

*/ - @SearchParamDefinition(name="receiver", path="MessageHeader.receiver", description="Intended \"real-world\" recipient for the data", type="reference" ) + // [Practitioner, Organization] + // [Practitioner, Organization] + @SearchParamDefinition(name="receiver", path="MessageHeader.receiver", description="Intended \"real-world\" recipient for the data", type="reference", target={Practitioner.class, Organization.class} ) public static final String SP_RECEIVER = "receiver"; /** * Fluent Client search parameter constant for receiver @@ -2024,7 +2030,9 @@ public class MessageHeader extends DomainResource { * Path: MessageHeader.author
*

*/ - @SearchParamDefinition(name="author", path="MessageHeader.author", description="The source of the decision", type="reference" ) + // [Practitioner] + // [Practitioner] + @SearchParamDefinition(name="author", path="MessageHeader.author", description="The source of the decision", type="reference", target={Practitioner.class} ) public static final String SP_AUTHOR = "author"; /** * Fluent Client search parameter constant for author @@ -2050,7 +2058,9 @@ public class MessageHeader extends DomainResource { * Path: MessageHeader.destination.name
*

*/ - @SearchParamDefinition(name="destination", path="MessageHeader.destination.name", description="Name of system", type="string" ) + // [] + // [] + @SearchParamDefinition(name="destination", path="MessageHeader.destination.name", description="Name of system", type="string", target={} ) public static final String SP_DESTINATION = "destination"; /** * Fluent Client search parameter constant for destination @@ -2070,7 +2080,9 @@ public class MessageHeader extends DomainResource { * Path: MessageHeader.source.name
*

*/ - @SearchParamDefinition(name="source", path="MessageHeader.source.name", description="Name of system", type="string" ) + // [] + // [] + @SearchParamDefinition(name="source", path="MessageHeader.source.name", description="Name of system", type="string", target={} ) public static final String SP_SOURCE = "source"; /** * Fluent Client search parameter constant for source @@ -2090,7 +2102,9 @@ public class MessageHeader extends DomainResource { * Path: MessageHeader.destination.target
*

*/ - @SearchParamDefinition(name="target", path="MessageHeader.destination.target", description="Particular delivery destination within the destination", type="reference" ) + // [Device] + // [Device] + @SearchParamDefinition(name="target", path="MessageHeader.destination.target", description="Particular delivery destination within the destination", type="reference", target={Device.class} ) public static final String SP_TARGET = "target"; /** * Fluent Client search parameter constant for target @@ -2116,7 +2130,9 @@ public class MessageHeader extends DomainResource { * Path: MessageHeader.destination.endpoint
*

*/ - @SearchParamDefinition(name="destination-uri", path="MessageHeader.destination.endpoint", description="Actual destination address or id", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="destination-uri", path="MessageHeader.destination.endpoint", description="Actual destination address or id", type="uri", target={} ) public static final String SP_DESTINATION_URI = "destination-uri"; /** * Fluent Client search parameter constant for destination-uri @@ -2136,7 +2152,9 @@ public class MessageHeader extends DomainResource { * Path: MessageHeader.source.endpoint
*

*/ - @SearchParamDefinition(name="source-uri", path="MessageHeader.source.endpoint", description="Actual message source address or id", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="source-uri", path="MessageHeader.source.endpoint", description="Actual message source address or id", type="uri", target={} ) public static final String SP_SOURCE_URI = "source-uri"; /** * Fluent Client search parameter constant for source-uri @@ -2156,7 +2174,9 @@ public class MessageHeader extends DomainResource { * Path: MessageHeader.responsible
*

*/ - @SearchParamDefinition(name="responsible", path="MessageHeader.responsible", description="Final responsibility for event", type="reference" ) + // [Practitioner, Organization] + // [Practitioner, Organization] + @SearchParamDefinition(name="responsible", path="MessageHeader.responsible", description="Final responsibility for event", type="reference", target={Practitioner.class, Organization.class} ) public static final String SP_RESPONSIBLE = "responsible"; /** * Fluent Client search parameter constant for responsible @@ -2182,7 +2202,9 @@ public class MessageHeader extends DomainResource { * Path: MessageHeader.response.identifier
*

*/ - @SearchParamDefinition(name="response-id", path="MessageHeader.response.identifier", description="Id of original message", type="token" ) + // [] + // [] + @SearchParamDefinition(name="response-id", path="MessageHeader.response.identifier", description="Id of original message", type="token", target={} ) public static final String SP_RESPONSE_ID = "response-id"; /** * Fluent Client search parameter constant for response-id @@ -2202,7 +2224,9 @@ public class MessageHeader extends DomainResource { * Path: MessageHeader.enterer
*

*/ - @SearchParamDefinition(name="enterer", path="MessageHeader.enterer", description="The source of the data entry", type="reference" ) + // [Practitioner] + // [Practitioner] + @SearchParamDefinition(name="enterer", path="MessageHeader.enterer", description="The source of the data entry", type="reference", target={Practitioner.class} ) public static final String SP_ENTERER = "enterer"; /** * Fluent Client search parameter constant for enterer @@ -2228,7 +2252,9 @@ public class MessageHeader extends DomainResource { * Path: MessageHeader.event
*

*/ - @SearchParamDefinition(name="event", path="MessageHeader.event", description="Code for the event this message represents", type="token" ) + // [] + // [] + @SearchParamDefinition(name="event", path="MessageHeader.event", description="Code for the event this message represents", type="token", target={} ) public static final String SP_EVENT = "event"; /** * Fluent Client search parameter constant for event @@ -2248,7 +2274,9 @@ public class MessageHeader extends DomainResource { * Path: MessageHeader.timestamp
*

*/ - @SearchParamDefinition(name="timestamp", path="MessageHeader.timestamp", description="Time that the message was sent", type="date" ) + // [] + // [] + @SearchParamDefinition(name="timestamp", path="MessageHeader.timestamp", description="Time that the message was sent", type="date", target={} ) public static final String SP_TIMESTAMP = "timestamp"; /** * Fluent Client search parameter constant for timestamp diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ModuleDefinition.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ModuleDefinition.java index 5b7ec713a40..fc76e106a23 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ModuleDefinition.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ModuleDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/NamingSystem.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/NamingSystem.java index d1024b7dea6..fae602a6307 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/NamingSystem.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/NamingSystem.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1846,7 +1846,9 @@ public class NamingSystem extends DomainResource { * Path: NamingSystem.date
*

*/ - @SearchParamDefinition(name="date", path="NamingSystem.date", description="Publication Date(/time)", type="date" ) + // [] + // [] + @SearchParamDefinition(name="date", path="NamingSystem.date", description="Publication Date(/time)", type="date", target={} ) public static final String SP_DATE = "date"; /** * Fluent Client search parameter constant for date @@ -1866,7 +1868,9 @@ public class NamingSystem extends DomainResource { * Path: NamingSystem.uniqueId.period
*

*/ - @SearchParamDefinition(name="period", path="NamingSystem.uniqueId.period", description="When is identifier valid?", type="date" ) + // [] + // [] + @SearchParamDefinition(name="period", path="NamingSystem.uniqueId.period", description="When is identifier valid?", type="date", target={} ) public static final String SP_PERIOD = "period"; /** * Fluent Client search parameter constant for period @@ -1886,7 +1890,9 @@ public class NamingSystem extends DomainResource { * Path: NamingSystem.kind
*

*/ - @SearchParamDefinition(name="kind", path="NamingSystem.kind", description="codesystem | identifier | root", type="token" ) + // [] + // [] + @SearchParamDefinition(name="kind", path="NamingSystem.kind", description="codesystem | identifier | root", type="token", target={} ) public static final String SP_KIND = "kind"; /** * Fluent Client search parameter constant for kind @@ -1906,7 +1912,9 @@ public class NamingSystem extends DomainResource { * Path: NamingSystem.type
*

*/ - @SearchParamDefinition(name="type", path="NamingSystem.type", description="e.g. driver, provider, patient, bank etc.", type="token" ) + // [] + // [] + @SearchParamDefinition(name="type", path="NamingSystem.type", description="e.g. driver, provider, patient, bank etc.", type="token", target={} ) public static final String SP_TYPE = "type"; /** * Fluent Client search parameter constant for type @@ -1926,7 +1934,9 @@ public class NamingSystem extends DomainResource { * Path: NamingSystem.uniqueId.type
*

*/ - @SearchParamDefinition(name="id-type", path="NamingSystem.uniqueId.type", description="oid | uuid | uri | other", type="token" ) + // [] + // [] + @SearchParamDefinition(name="id-type", path="NamingSystem.uniqueId.type", description="oid | uuid | uri | other", type="token", target={} ) public static final String SP_ID_TYPE = "id-type"; /** * Fluent Client search parameter constant for id-type @@ -1946,7 +1956,9 @@ public class NamingSystem extends DomainResource { * Path: NamingSystem.responsible
*

*/ - @SearchParamDefinition(name="responsible", path="NamingSystem.responsible", description="Who maintains system namespace?", type="string" ) + // [] + // [] + @SearchParamDefinition(name="responsible", path="NamingSystem.responsible", description="Who maintains system namespace?", type="string", target={} ) public static final String SP_RESPONSIBLE = "responsible"; /** * Fluent Client search parameter constant for responsible @@ -1966,7 +1978,9 @@ public class NamingSystem extends DomainResource { * Path: NamingSystem.contact.name
*

*/ - @SearchParamDefinition(name="contact", path="NamingSystem.contact.name", description="Name of an individual to contact", type="string" ) + // [] + // [] + @SearchParamDefinition(name="contact", path="NamingSystem.contact.name", description="Name of an individual to contact", type="string", target={} ) public static final String SP_CONTACT = "contact"; /** * Fluent Client search parameter constant for contact @@ -1986,7 +2000,9 @@ public class NamingSystem extends DomainResource { * Path: NamingSystem.name
*

*/ - @SearchParamDefinition(name="name", path="NamingSystem.name", description="Human-readable label", type="string" ) + // [] + // [] + @SearchParamDefinition(name="name", path="NamingSystem.name", description="Human-readable label", type="string", target={} ) public static final String SP_NAME = "name"; /** * Fluent Client search parameter constant for name @@ -2006,7 +2022,9 @@ public class NamingSystem extends DomainResource { * Path: NamingSystem.useContext
*

*/ - @SearchParamDefinition(name="context", path="NamingSystem.useContext", description="Content intends to support these contexts", type="token" ) + // [] + // [] + @SearchParamDefinition(name="context", path="NamingSystem.useContext", description="Content intends to support these contexts", type="token", target={} ) public static final String SP_CONTEXT = "context"; /** * Fluent Client search parameter constant for context @@ -2026,7 +2044,9 @@ public class NamingSystem extends DomainResource { * Path: NamingSystem.publisher
*

*/ - @SearchParamDefinition(name="publisher", path="NamingSystem.publisher", description="Name of the publisher (Organization or individual)", type="string" ) + // [] + // [] + @SearchParamDefinition(name="publisher", path="NamingSystem.publisher", description="Name of the publisher (Organization or individual)", type="string", target={} ) public static final String SP_PUBLISHER = "publisher"; /** * Fluent Client search parameter constant for publisher @@ -2046,7 +2066,9 @@ public class NamingSystem extends DomainResource { * Path: NamingSystem.contact.telecom
*

*/ - @SearchParamDefinition(name="telecom", path="NamingSystem.contact.telecom", description="Contact details for individual or publisher", type="token" ) + // [] + // [] + @SearchParamDefinition(name="telecom", path="NamingSystem.contact.telecom", description="Contact details for individual or publisher", type="token", target={} ) public static final String SP_TELECOM = "telecom"; /** * Fluent Client search parameter constant for telecom @@ -2066,7 +2088,9 @@ public class NamingSystem extends DomainResource { * Path: NamingSystem.uniqueId.value
*

*/ - @SearchParamDefinition(name="value", path="NamingSystem.uniqueId.value", description="The unique identifier", type="string" ) + // [] + // [] + @SearchParamDefinition(name="value", path="NamingSystem.uniqueId.value", description="The unique identifier", type="string", target={} ) public static final String SP_VALUE = "value"; /** * Fluent Client search parameter constant for value @@ -2086,7 +2110,9 @@ public class NamingSystem extends DomainResource { * Path: NamingSystem.replacedBy
*

*/ - @SearchParamDefinition(name="replaced-by", path="NamingSystem.replacedBy", description="Use this instead", type="reference" ) + // [NamingSystem] + // [NamingSystem] + @SearchParamDefinition(name="replaced-by", path="NamingSystem.replacedBy", description="Use this instead", type="reference", target={NamingSystem.class} ) public static final String SP_REPLACED_BY = "replaced-by"; /** * Fluent Client search parameter constant for replaced-by @@ -2112,7 +2138,9 @@ public class NamingSystem extends DomainResource { * Path: NamingSystem.status
*

*/ - @SearchParamDefinition(name="status", path="NamingSystem.status", description="draft | active | retired", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="NamingSystem.status", description="draft | active | retired", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/NutritionOrder.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/NutritionOrder.java index 01eb610a43d..9b9dfd65af3 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/NutritionOrder.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/NutritionOrder.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -3379,7 +3379,9 @@ public class NutritionOrder extends DomainResource { * Path: NutritionOrder.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="NutritionOrder.identifier", description="Return nutrition orders with this external identifier", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="NutritionOrder.identifier", description="Return nutrition orders with this external identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -3399,7 +3401,9 @@ public class NutritionOrder extends DomainResource { * Path: NutritionOrder.dateTime
*

*/ - @SearchParamDefinition(name="datetime", path="NutritionOrder.dateTime", description="Return nutrition orders requested on this date", type="date" ) + // [] + // [] + @SearchParamDefinition(name="datetime", path="NutritionOrder.dateTime", description="Return nutrition orders requested on this date", type="date", target={} ) public static final String SP_DATETIME = "datetime"; /** * Fluent Client search parameter constant for datetime @@ -3419,7 +3423,9 @@ public class NutritionOrder extends DomainResource { * Path: NutritionOrder.orderer
*

*/ - @SearchParamDefinition(name="provider", path="NutritionOrder.orderer", description="The identify of the provider who placed the nutrition order", type="reference" ) + // [Practitioner] + // [Practitioner] + @SearchParamDefinition(name="provider", path="NutritionOrder.orderer", description="The identify of the provider who placed the nutrition order", type="reference", target={Practitioner.class} ) public static final String SP_PROVIDER = "provider"; /** * Fluent Client search parameter constant for provider @@ -3445,7 +3451,9 @@ public class NutritionOrder extends DomainResource { * Path: NutritionOrder.patient
*

*/ - @SearchParamDefinition(name="patient", path="NutritionOrder.patient", description="The identity of the person who requires the diet, formula or nutritional supplement", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="NutritionOrder.patient", description="The identity of the person who requires the diet, formula or nutritional supplement", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -3471,7 +3479,9 @@ public class NutritionOrder extends DomainResource { * Path: NutritionOrder.supplement.type
*

*/ - @SearchParamDefinition(name="supplement", path="NutritionOrder.supplement.type", description="Type of supplement product requested", type="token" ) + // [] + // [] + @SearchParamDefinition(name="supplement", path="NutritionOrder.supplement.type", description="Type of supplement product requested", type="token", target={} ) public static final String SP_SUPPLEMENT = "supplement"; /** * Fluent Client search parameter constant for supplement @@ -3491,7 +3501,9 @@ public class NutritionOrder extends DomainResource { * Path: NutritionOrder.enteralFormula.baseFormulaType
*

*/ - @SearchParamDefinition(name="formula", path="NutritionOrder.enteralFormula.baseFormulaType", description="Type of enteral or infant formula", type="token" ) + // [] + // [] + @SearchParamDefinition(name="formula", path="NutritionOrder.enteralFormula.baseFormulaType", description="Type of enteral or infant formula", type="token", target={} ) public static final String SP_FORMULA = "formula"; /** * Fluent Client search parameter constant for formula @@ -3511,7 +3523,9 @@ public class NutritionOrder extends DomainResource { * Path: NutritionOrder.encounter
*

*/ - @SearchParamDefinition(name="encounter", path="NutritionOrder.encounter", description="Return nutrition orders with this encounter identifier", type="reference" ) + // [Encounter] + // [Encounter] + @SearchParamDefinition(name="encounter", path="NutritionOrder.encounter", description="Return nutrition orders with this encounter identifier", type="reference", target={Encounter.class} ) public static final String SP_ENCOUNTER = "encounter"; /** * Fluent Client search parameter constant for encounter @@ -3537,7 +3551,9 @@ public class NutritionOrder extends DomainResource { * Path: NutritionOrder.oralDiet.type
*

*/ - @SearchParamDefinition(name="oraldiet", path="NutritionOrder.oralDiet.type", description="Type of diet that can be consumed orally (i.e., take via the mouth).", type="token" ) + // [] + // [] + @SearchParamDefinition(name="oraldiet", path="NutritionOrder.oralDiet.type", description="Type of diet that can be consumed orally (i.e., take via the mouth).", type="token", target={} ) public static final String SP_ORALDIET = "oraldiet"; /** * Fluent Client search parameter constant for oraldiet @@ -3557,7 +3573,9 @@ public class NutritionOrder extends DomainResource { * Path: NutritionOrder.status
*

*/ - @SearchParamDefinition(name="status", path="NutritionOrder.status", description="Status of the nutrition order.", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="NutritionOrder.status", description="Status of the nutrition order.", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status @@ -3577,7 +3595,9 @@ public class NutritionOrder extends DomainResource { * Path: NutritionOrder.enteralFormula.additiveType
*

*/ - @SearchParamDefinition(name="additive", path="NutritionOrder.enteralFormula.additiveType", description="Type of module component to add to the feeding", type="token" ) + // [] + // [] + @SearchParamDefinition(name="additive", path="NutritionOrder.enteralFormula.additiveType", description="Type of module component to add to the feeding", type="token", target={} ) public static final String SP_ADDITIVE = "additive"; /** * Fluent Client search parameter constant for additive diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Observation.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Observation.java index 48d83f7fea0..284a6dadcfb 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Observation.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Observation.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -2941,7 +2941,9 @@ public class Observation extends DomainResource { * Path: Observation.effective[x]
*

*/ - @SearchParamDefinition(name="date", path="Observation.effective", description="Obtained date/time. If the obtained element is a period, a date that falls in the period", type="date" ) + // [] + // [] + @SearchParamDefinition(name="date", path="Observation.effective", description="Obtained date/time. If the obtained element is a period, a date that falls in the period", type="date", target={} ) public static final String SP_DATE = "date"; /** * Fluent Client search parameter constant for date @@ -2961,7 +2963,9 @@ public class Observation extends DomainResource { * Path: Observation.code
*

*/ - @SearchParamDefinition(name="code", path="Observation.code", description="The code of the observation type", type="token" ) + // [] + // [] + @SearchParamDefinition(name="code", path="Observation.code", description="The code of the observation type", type="token", target={} ) public static final String SP_CODE = "code"; /** * Fluent Client search parameter constant for code @@ -2981,7 +2985,9 @@ public class Observation extends DomainResource { * Path: Observation.subject
*

*/ - @SearchParamDefinition(name="subject", path="Observation.subject", description="The subject that the observation is about", type="reference" ) + // [Group, Device, Patient, Location] + // [Group, Device, Patient, Location] + @SearchParamDefinition(name="subject", path="Observation.subject", description="The subject that the observation is about", type="reference", target={Group.class, Device.class, Patient.class, Location.class} ) public static final String SP_SUBJECT = "subject"; /** * Fluent Client search parameter constant for subject @@ -3007,7 +3013,9 @@ public class Observation extends DomainResource { * Path: Observation.component.dataAbsentReason
*

*/ - @SearchParamDefinition(name="component-data-absent-reason", path="Observation.component.dataAbsentReason", description="The reason why the expected value in the element Observation.component.value[x] is missing.", type="token" ) + // [] + // [] + @SearchParamDefinition(name="component-data-absent-reason", path="Observation.component.dataAbsentReason", description="The reason why the expected value in the element Observation.component.value[x] is missing.", type="token", target={} ) public static final String SP_COMPONENT_DATA_ABSENT_REASON = "component-data-absent-reason"; /** * Fluent Client search parameter constant for component-data-absent-reason @@ -3027,7 +3035,9 @@ public class Observation extends DomainResource { * Path: Observation.valueCodeableConcept
*

*/ - @SearchParamDefinition(name="value-concept", path="Observation.value.as(CodeableConcept)", description="The value of the observation, if the value is a CodeableConcept", type="token" ) + // [] + // [] + @SearchParamDefinition(name="value-concept", path="Observation.value.as(CodeableConcept)", description="The value of the observation, if the value is a CodeableConcept", type="token", target={} ) public static final String SP_VALUE_CONCEPT = "value-concept"; /** * Fluent Client search parameter constant for value-concept @@ -3047,7 +3057,9 @@ public class Observation extends DomainResource { * Path: Observation.valueDateTime, Observation.valuePeriod
*

*/ - @SearchParamDefinition(name="value-date", path="Observation.value.as(DateTime) | Observation.value.as(Period)", description="The value of the observation, if the value is a date or period of time", type="date" ) + // [] + // [] + @SearchParamDefinition(name="value-date", path="Observation.value.as(DateTime) | Observation.value.as(Period)", description="The value of the observation, if the value is a date or period of time", type="date", target={} ) public static final String SP_VALUE_DATE = "value-date"; /** * Fluent Client search parameter constant for value-date @@ -3067,7 +3079,9 @@ public class Observation extends DomainResource { * Path:
*

*/ - @SearchParamDefinition(name="related", path="", description="Related Observations - search on related-type and related-target together", type="composite", compositeOf={"related-target", "related-type"} ) + // [] + // [] + @SearchParamDefinition(name="related", path="", description="Related Observations - search on related-type and related-target together", type="composite", compositeOf={"related-target", "related-type"}, target={} ) public static final String SP_RELATED = "related"; /** * Fluent Client search parameter constant for related @@ -3087,7 +3101,9 @@ public class Observation extends DomainResource { * Path: Observation.subject
*

*/ - @SearchParamDefinition(name="patient", path="Observation.subject", description="The subject that the observation is about (if patient)", type="reference" ) + // [Group, Device, Patient, Location] + // [Patient] + @SearchParamDefinition(name="patient", path="Observation.subject", description="The subject that the observation is about (if patient)", type="reference", target={Group.class, Device.class, Patient.class, Location.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -3113,7 +3129,9 @@ public class Observation extends DomainResource { * Path: Observation.specimen
*

*/ - @SearchParamDefinition(name="specimen", path="Observation.specimen", description="Specimen used for this observation", type="reference" ) + // [Specimen] + // [Specimen] + @SearchParamDefinition(name="specimen", path="Observation.specimen", description="Specimen used for this observation", type="reference", target={Specimen.class} ) public static final String SP_SPECIMEN = "specimen"; /** * Fluent Client search parameter constant for specimen @@ -3139,7 +3157,9 @@ public class Observation extends DomainResource { * Path: Observation.component.code
*

*/ - @SearchParamDefinition(name="component-code", path="Observation.component.code", description="The component code of the observation type", type="token" ) + // [] + // [] + @SearchParamDefinition(name="component-code", path="Observation.component.code", description="The component code of the observation type", type="token", target={} ) public static final String SP_COMPONENT_CODE = "component-code"; /** * Fluent Client search parameter constant for component-code @@ -3159,7 +3179,9 @@ public class Observation extends DomainResource { * Path: Observation.valueString
*

*/ - @SearchParamDefinition(name="value-string", path="Observation.value.as(String)", description="The value of the observation, if the value is a string, and also searches in CodeableConcept.text", type="string" ) + // [] + // [] + @SearchParamDefinition(name="value-string", path="Observation.value.as(String)", description="The value of the observation, if the value is a string, and also searches in CodeableConcept.text", type="string", target={} ) public static final String SP_VALUE_STRING = "value-string"; /** * Fluent Client search parameter constant for value-string @@ -3179,7 +3201,9 @@ public class Observation extends DomainResource { * Path: Observation.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="Observation.identifier", description="The unique id for a particular observation", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="Observation.identifier", description="The unique id for a particular observation", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -3199,7 +3223,9 @@ public class Observation extends DomainResource { * Path:
*

*/ - @SearchParamDefinition(name="component-code-value-concept", path="", description="Both component code and one of the component value parameters", type="composite", compositeOf={"component-code", "value-concept"} ) + // [] + // [] + @SearchParamDefinition(name="component-code-value-concept", path="", description="Both component code and one of the component value parameters", type="composite", compositeOf={"component-code", "value-concept"}, target={} ) public static final String SP_COMPONENT_CODE_VALUE_CONCEPT = "component-code-value-concept"; /** * Fluent Client search parameter constant for component-code-value-concept @@ -3219,7 +3245,9 @@ public class Observation extends DomainResource { * Path:
*

*/ - @SearchParamDefinition(name="component-code-value-date", path="", description="Both component code and one of the component value parameters", type="composite", compositeOf={"component-code", "value-date"} ) + // [] + // [] + @SearchParamDefinition(name="component-code-value-date", path="", description="Both component code and one of the component value parameters", type="composite", compositeOf={"component-code", "value-date"}, target={} ) public static final String SP_COMPONENT_CODE_VALUE_DATE = "component-code-value-date"; /** * Fluent Client search parameter constant for component-code-value-date @@ -3239,7 +3267,9 @@ public class Observation extends DomainResource { * Path:
*

*/ - @SearchParamDefinition(name="component-code-value-string", path="", description="Both component code and one of the component value parameters", type="composite", compositeOf={"component-code", "value-string"} ) + // [] + // [] + @SearchParamDefinition(name="component-code-value-string", path="", description="Both component code and one of the component value parameters", type="composite", compositeOf={"component-code", "value-string"}, target={} ) public static final String SP_COMPONENT_CODE_VALUE_STRING = "component-code-value-string"; /** * Fluent Client search parameter constant for component-code-value-string @@ -3259,7 +3289,9 @@ public class Observation extends DomainResource { * Path:
*

*/ - @SearchParamDefinition(name="component-code-value-quantity", path="", description="Both component code and one of the component value parameters", type="composite", compositeOf={"component-code", "value-quantity"} ) + // [] + // [] + @SearchParamDefinition(name="component-code-value-quantity", path="", description="Both component code and one of the component value parameters", type="composite", compositeOf={"component-code", "value-quantity"}, target={} ) public static final String SP_COMPONENT_CODE_VALUE_QUANTITY = "component-code-value-quantity"; /** * Fluent Client search parameter constant for component-code-value-quantity @@ -3279,7 +3311,9 @@ public class Observation extends DomainResource { * Path:
*

*/ - @SearchParamDefinition(name="code-value-concept", path="", description="Both code and one of the value parameters", type="composite", compositeOf={"code", "value-concept"} ) + // [] + // [] + @SearchParamDefinition(name="code-value-concept", path="", description="Both code and one of the value parameters", type="composite", compositeOf={"code", "value-concept"}, target={} ) public static final String SP_CODE_VALUE_CONCEPT = "code-value-concept"; /** * Fluent Client search parameter constant for code-value-concept @@ -3299,7 +3333,9 @@ public class Observation extends DomainResource { * Path:
*

*/ - @SearchParamDefinition(name="code-value-date", path="", description="Both code and one of the value parameters", type="composite", compositeOf={"code", "value-date"} ) + // [] + // [] + @SearchParamDefinition(name="code-value-date", path="", description="Both code and one of the value parameters", type="composite", compositeOf={"code", "value-date"}, target={} ) public static final String SP_CODE_VALUE_DATE = "code-value-date"; /** * Fluent Client search parameter constant for code-value-date @@ -3319,7 +3355,9 @@ public class Observation extends DomainResource { * Path:
*

*/ - @SearchParamDefinition(name="code-value-string", path="", description="Both code and one of the value parameters", type="composite", compositeOf={"code", "value-string"} ) + // [] + // [] + @SearchParamDefinition(name="code-value-string", path="", description="Both code and one of the value parameters", type="composite", compositeOf={"code", "value-string"}, target={} ) public static final String SP_CODE_VALUE_STRING = "code-value-string"; /** * Fluent Client search parameter constant for code-value-string @@ -3339,7 +3377,9 @@ public class Observation extends DomainResource { * Path:
*

*/ - @SearchParamDefinition(name="code-value-quantity", path="", description="Both code and one of the value parameters", type="composite", compositeOf={"code", "value-quantity"} ) + // [] + // [] + @SearchParamDefinition(name="code-value-quantity", path="", description="Both code and one of the value parameters", type="composite", compositeOf={"code", "value-quantity"}, target={} ) public static final String SP_CODE_VALUE_QUANTITY = "code-value-quantity"; /** * Fluent Client search parameter constant for code-value-quantity @@ -3359,7 +3399,9 @@ public class Observation extends DomainResource { * Path: Observation.performer
*

*/ - @SearchParamDefinition(name="performer", path="Observation.performer", description="Who performed the observation", type="reference" ) + // [Practitioner, Organization, Patient, RelatedPerson] + // [Practitioner, Organization, Patient, RelatedPerson] + @SearchParamDefinition(name="performer", path="Observation.performer", description="Who performed the observation", type="reference", target={Practitioner.class, Organization.class, Patient.class, RelatedPerson.class} ) public static final String SP_PERFORMER = "performer"; /** * Fluent Client search parameter constant for performer @@ -3385,7 +3427,9 @@ public class Observation extends DomainResource { * Path: Observation.valueQuantity
*

*/ - @SearchParamDefinition(name="value-quantity", path="Observation.value.as(Quantity)", description="The value of the observation, if the value is a Quantity, or a SampledData (just search on the bounds of the values in sampled data)", type="quantity" ) + // [] + // [] + @SearchParamDefinition(name="value-quantity", path="Observation.value.as(Quantity)", description="The value of the observation, if the value is a Quantity, or a SampledData (just search on the bounds of the values in sampled data)", type="quantity", target={} ) public static final String SP_VALUE_QUANTITY = "value-quantity"; /** * Fluent Client search parameter constant for value-quantity @@ -3405,7 +3449,9 @@ public class Observation extends DomainResource { * Path: Observation.component.valueQuantity
*

*/ - @SearchParamDefinition(name="component-value-quantity", path="Observation.component.value.as(Quantity)", description="The value of the component observation, if the value is a Quantity, or a SampledData (just search on the bounds of the values in sampled data)", type="quantity" ) + // [] + // [] + @SearchParamDefinition(name="component-value-quantity", path="Observation.component.value.as(Quantity)", description="The value of the component observation, if the value is a Quantity, or a SampledData (just search on the bounds of the values in sampled data)", type="quantity", target={} ) public static final String SP_COMPONENT_VALUE_QUANTITY = "component-value-quantity"; /** * Fluent Client search parameter constant for component-value-quantity @@ -3425,7 +3471,9 @@ public class Observation extends DomainResource { * Path: Observation.dataAbsentReason
*

*/ - @SearchParamDefinition(name="data-absent-reason", path="Observation.dataAbsentReason", description="The reason why the expected value in the element Observation.value[x] is missing.", type="token" ) + // [] + // [] + @SearchParamDefinition(name="data-absent-reason", path="Observation.dataAbsentReason", description="The reason why the expected value in the element Observation.value[x] is missing.", type="token", target={} ) public static final String SP_DATA_ABSENT_REASON = "data-absent-reason"; /** * Fluent Client search parameter constant for data-absent-reason @@ -3445,7 +3493,9 @@ public class Observation extends DomainResource { * Path: Observation.encounter
*

*/ - @SearchParamDefinition(name="encounter", path="Observation.encounter", description="Healthcare event related to the observation", type="reference" ) + // [Encounter] + // [Encounter] + @SearchParamDefinition(name="encounter", path="Observation.encounter", description="Healthcare event related to the observation", type="reference", target={Encounter.class} ) public static final String SP_ENCOUNTER = "encounter"; /** * Fluent Client search parameter constant for encounter @@ -3471,7 +3521,9 @@ public class Observation extends DomainResource { * Path: Observation.related.type
*

*/ - @SearchParamDefinition(name="related-type", path="Observation.related.type", description="has-member | derived-from | sequel-to | replaces | qualified-by | interfered-by", type="token" ) + // [] + // [] + @SearchParamDefinition(name="related-type", path="Observation.related.type", description="has-member | derived-from | sequel-to | replaces | qualified-by | interfered-by", type="token", target={} ) public static final String SP_RELATED_TYPE = "related-type"; /** * Fluent Client search parameter constant for related-type @@ -3491,7 +3543,9 @@ public class Observation extends DomainResource { * Path: Observation.related.target
*

*/ - @SearchParamDefinition(name="related-target", path="Observation.related.target", description="Resource that is related to this one", type="reference" ) + // [Observation, QuestionnaireResponse] + // [Observation, QuestionnaireResponse] + @SearchParamDefinition(name="related-target", path="Observation.related.target", description="Resource that is related to this one", type="reference", target={Observation.class, QuestionnaireResponse.class} ) public static final String SP_RELATED_TARGET = "related-target"; /** * Fluent Client search parameter constant for related-target @@ -3517,7 +3571,9 @@ public class Observation extends DomainResource { * Path: Observation.component.valueString
*

*/ - @SearchParamDefinition(name="component-value-string", path="Observation.component.value.as(String)", description="The value of the component observation, if the value is a string, and also searches in CodeableConcept.text", type="string" ) + // [] + // [] + @SearchParamDefinition(name="component-value-string", path="Observation.component.value.as(String)", description="The value of the component observation, if the value is a string, and also searches in CodeableConcept.text", type="string", target={} ) public static final String SP_COMPONENT_VALUE_STRING = "component-value-string"; /** * Fluent Client search parameter constant for component-value-string @@ -3537,7 +3593,9 @@ public class Observation extends DomainResource { * Path: Observation.component.valueCodeableConcept
*

*/ - @SearchParamDefinition(name="component-value-concept", path="Observation.component.value.as(CodeableConcept)", description="The value of the component observation, if the value is a CodeableConcept", type="token" ) + // [] + // [] + @SearchParamDefinition(name="component-value-concept", path="Observation.component.value.as(CodeableConcept)", description="The value of the component observation, if the value is a CodeableConcept", type="token", target={} ) public static final String SP_COMPONENT_VALUE_CONCEPT = "component-value-concept"; /** * Fluent Client search parameter constant for component-value-concept @@ -3557,7 +3615,9 @@ public class Observation extends DomainResource { * Path: Observation.category
*

*/ - @SearchParamDefinition(name="category", path="Observation.category", description="The classification of the type of observation", type="token" ) + // [] + // [] + @SearchParamDefinition(name="category", path="Observation.category", description="The classification of the type of observation", type="token", target={} ) public static final String SP_CATEGORY = "category"; /** * Fluent Client search parameter constant for category @@ -3577,7 +3637,9 @@ public class Observation extends DomainResource { * Path: Observation.device
*

*/ - @SearchParamDefinition(name="device", path="Observation.device", description="The Device that generated the observation data.", type="reference" ) + // [Device, DeviceMetric] + // [Device, DeviceMetric] + @SearchParamDefinition(name="device", path="Observation.device", description="The Device that generated the observation data.", type="reference", target={Device.class, DeviceMetric.class} ) public static final String SP_DEVICE = "device"; /** * Fluent Client search parameter constant for device @@ -3603,7 +3665,9 @@ public class Observation extends DomainResource { * Path: Observation.status
*

*/ - @SearchParamDefinition(name="status", path="Observation.status", description="The status of the observation", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="Observation.status", description="The status of the observation", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/OperationDefinition.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/OperationDefinition.java index 50a9f5d1f59..a056d140372 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/OperationDefinition.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/OperationDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -2971,7 +2971,9 @@ public class OperationDefinition extends DomainResource { * Path: OperationDefinition.date
*

*/ - @SearchParamDefinition(name="date", path="OperationDefinition.date", description="Date for this version of the operation definition", type="date" ) + // [] + // [] + @SearchParamDefinition(name="date", path="OperationDefinition.date", description="Date for this version of the operation definition", type="date", target={} ) public static final String SP_DATE = "date"; /** * Fluent Client search parameter constant for date @@ -2991,7 +2993,9 @@ public class OperationDefinition extends DomainResource { * Path: OperationDefinition.code
*

*/ - @SearchParamDefinition(name="code", path="OperationDefinition.code", description="Name used to invoke the operation", type="token" ) + // [] + // [] + @SearchParamDefinition(name="code", path="OperationDefinition.code", description="Name used to invoke the operation", type="token", target={} ) public static final String SP_CODE = "code"; /** * Fluent Client search parameter constant for code @@ -3011,7 +3015,9 @@ public class OperationDefinition extends DomainResource { * Path: OperationDefinition.instance
*

*/ - @SearchParamDefinition(name="instance", path="OperationDefinition.instance", description="Invoke on an instance?", type="token" ) + // [] + // [] + @SearchParamDefinition(name="instance", path="OperationDefinition.instance", description="Invoke on an instance?", type="token", target={} ) public static final String SP_INSTANCE = "instance"; /** * Fluent Client search parameter constant for instance @@ -3031,7 +3037,9 @@ public class OperationDefinition extends DomainResource { * Path: OperationDefinition.kind
*

*/ - @SearchParamDefinition(name="kind", path="OperationDefinition.kind", description="operation | query", type="token" ) + // [] + // [] + @SearchParamDefinition(name="kind", path="OperationDefinition.kind", description="operation | query", type="token", target={} ) public static final String SP_KIND = "kind"; /** * Fluent Client search parameter constant for kind @@ -3051,7 +3059,9 @@ public class OperationDefinition extends DomainResource { * Path: OperationDefinition.type
*

*/ - @SearchParamDefinition(name="type", path="OperationDefinition.type", description="Invoke at resource level for these type", type="token" ) + // [] + // [] + @SearchParamDefinition(name="type", path="OperationDefinition.type", description="Invoke at resource level for these type", type="token", target={} ) public static final String SP_TYPE = "type"; /** * Fluent Client search parameter constant for type @@ -3071,7 +3081,9 @@ public class OperationDefinition extends DomainResource { * Path: OperationDefinition.version
*

*/ - @SearchParamDefinition(name="version", path="OperationDefinition.version", description="Logical id for this version of the operation definition", type="token" ) + // [] + // [] + @SearchParamDefinition(name="version", path="OperationDefinition.version", description="Logical id for this version of the operation definition", type="token", target={} ) public static final String SP_VERSION = "version"; /** * Fluent Client search parameter constant for version @@ -3091,7 +3103,9 @@ public class OperationDefinition extends DomainResource { * Path: OperationDefinition.parameter.profile
*

*/ - @SearchParamDefinition(name="paramprofile", path="OperationDefinition.parameter.profile", description="Profile on the type", type="reference" ) + // [StructureDefinition] + // [StructureDefinition] + @SearchParamDefinition(name="paramprofile", path="OperationDefinition.parameter.profile", description="Profile on the type", type="reference", target={StructureDefinition.class} ) public static final String SP_PARAMPROFILE = "paramprofile"; /** * Fluent Client search parameter constant for paramprofile @@ -3117,7 +3131,9 @@ public class OperationDefinition extends DomainResource { * Path: OperationDefinition.url
*

*/ - @SearchParamDefinition(name="url", path="OperationDefinition.url", description="Logical URL to reference this operation definition", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="url", path="OperationDefinition.url", description="Logical URL to reference this operation definition", type="uri", target={} ) public static final String SP_URL = "url"; /** * Fluent Client search parameter constant for url @@ -3137,7 +3153,9 @@ public class OperationDefinition extends DomainResource { * Path: OperationDefinition.system
*

*/ - @SearchParamDefinition(name="system", path="OperationDefinition.system", description="Invoke at the system level?", type="token" ) + // [] + // [] + @SearchParamDefinition(name="system", path="OperationDefinition.system", description="Invoke at the system level?", type="token", target={} ) public static final String SP_SYSTEM = "system"; /** * Fluent Client search parameter constant for system @@ -3157,7 +3175,9 @@ public class OperationDefinition extends DomainResource { * Path: OperationDefinition.name
*

*/ - @SearchParamDefinition(name="name", path="OperationDefinition.name", description="Informal name for this operation", type="string" ) + // [] + // [] + @SearchParamDefinition(name="name", path="OperationDefinition.name", description="Informal name for this operation", type="string", target={} ) public static final String SP_NAME = "name"; /** * Fluent Client search parameter constant for name @@ -3177,7 +3197,9 @@ public class OperationDefinition extends DomainResource { * Path: OperationDefinition.useContext
*

*/ - @SearchParamDefinition(name="context", path="OperationDefinition.useContext", description="A use context assigned to the operation definition", type="token" ) + // [] + // [] + @SearchParamDefinition(name="context", path="OperationDefinition.useContext", description="A use context assigned to the operation definition", type="token", target={} ) public static final String SP_CONTEXT = "context"; /** * Fluent Client search parameter constant for context @@ -3197,7 +3219,9 @@ public class OperationDefinition extends DomainResource { * Path: OperationDefinition.publisher
*

*/ - @SearchParamDefinition(name="publisher", path="OperationDefinition.publisher", description="Name of the publisher (Organization or individual)", type="string" ) + // [] + // [] + @SearchParamDefinition(name="publisher", path="OperationDefinition.publisher", description="Name of the publisher (Organization or individual)", type="string", target={} ) public static final String SP_PUBLISHER = "publisher"; /** * Fluent Client search parameter constant for publisher @@ -3217,7 +3241,9 @@ public class OperationDefinition extends DomainResource { * Path: OperationDefinition.status
*

*/ - @SearchParamDefinition(name="status", path="OperationDefinition.status", description="draft | active | retired", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="OperationDefinition.status", description="draft | active | retired", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status @@ -3237,7 +3263,9 @@ public class OperationDefinition extends DomainResource { * Path: OperationDefinition.base
*

*/ - @SearchParamDefinition(name="base", path="OperationDefinition.base", description="Marks this as a profile of the base", type="reference" ) + // [OperationDefinition] + // [OperationDefinition] + @SearchParamDefinition(name="base", path="OperationDefinition.base", description="Marks this as a profile of the base", type="reference", target={OperationDefinition.class} ) public static final String SP_BASE = "base"; /** * Fluent Client search parameter constant for base diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/OperationOutcome.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/OperationOutcome.java index 8f1724caf0a..07b91e9fca9 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/OperationOutcome.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/OperationOutcome.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Order.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Order.java index 645d725bdcd..c32ccc97dd9 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Order.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Order.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -875,7 +875,9 @@ public class Order extends DomainResource { * Path: Order.date
*

*/ - @SearchParamDefinition(name="date", path="Order.date", description="When the order was made", type="date" ) + // [] + // [] + @SearchParamDefinition(name="date", path="Order.date", description="When the order was made", type="date", target={} ) public static final String SP_DATE = "date"; /** * Fluent Client search parameter constant for date @@ -895,7 +897,9 @@ public class Order extends DomainResource { * Path: Order.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="Order.identifier", description="Instance id from source, target, and/or others", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="Order.identifier", description="Instance id from source, target, and/or others", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -915,7 +919,9 @@ public class Order extends DomainResource { * Path: Order.subject
*

*/ - @SearchParamDefinition(name="subject", path="Order.subject", description="Patient this order is about", type="reference" ) + // [Group, Device, Patient, Substance] + // [Group, Device, Patient, Substance] + @SearchParamDefinition(name="subject", path="Order.subject", description="Patient this order is about", type="reference", target={Group.class, Device.class, Patient.class, Substance.class} ) public static final String SP_SUBJECT = "subject"; /** * Fluent Client search parameter constant for subject @@ -941,7 +947,9 @@ public class Order extends DomainResource { * Path: Order.subject
*

*/ - @SearchParamDefinition(name="patient", path="Order.subject", description="Patient this order is about", type="reference" ) + // [Group, Device, Patient, Substance] + // [Patient] + @SearchParamDefinition(name="patient", path="Order.subject", description="Patient this order is about", type="reference", target={Group.class, Device.class, Patient.class, Substance.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -967,7 +975,9 @@ public class Order extends DomainResource { * Path: Order.source
*

*/ - @SearchParamDefinition(name="source", path="Order.source", description="Who initiated the order", type="reference" ) + // [Practitioner, Organization] + // [Practitioner, Organization] + @SearchParamDefinition(name="source", path="Order.source", description="Who initiated the order", type="reference", target={Practitioner.class, Organization.class} ) public static final String SP_SOURCE = "source"; /** * Fluent Client search parameter constant for source @@ -993,6 +1003,8 @@ public class Order extends DomainResource { * Path: Order.detail
*

*/ + // [Any] + // [Any] @SearchParamDefinition(name="detail", path="Order.detail", description="What action is being ordered", type="reference" ) public static final String SP_DETAIL = "detail"; /** @@ -1019,7 +1031,9 @@ public class Order extends DomainResource { * Path: Order.when.schedule
*

*/ - @SearchParamDefinition(name="when", path="Order.when.schedule", description="A formal schedule", type="date" ) + // [] + // [] + @SearchParamDefinition(name="when", path="Order.when.schedule", description="A formal schedule", type="date", target={} ) public static final String SP_WHEN = "when"; /** * Fluent Client search parameter constant for when @@ -1039,7 +1053,9 @@ public class Order extends DomainResource { * Path: Order.target
*

*/ - @SearchParamDefinition(name="target", path="Order.target", description="Who is intended to fulfill the order", type="reference" ) + // [Practitioner, Organization, Device] + // [Practitioner, Organization, Device] + @SearchParamDefinition(name="target", path="Order.target", description="Who is intended to fulfill the order", type="reference", target={Practitioner.class, Organization.class, Device.class} ) public static final String SP_TARGET = "target"; /** * Fluent Client search parameter constant for target @@ -1065,7 +1081,9 @@ public class Order extends DomainResource { * Path: Order.when.code
*

*/ - @SearchParamDefinition(name="when_code", path="Order.when.code", description="Code specifies when request should be done. The code may simply be a priority code", type="token" ) + // [] + // [] + @SearchParamDefinition(name="when_code", path="Order.when.code", description="Code specifies when request should be done. The code may simply be a priority code", type="token", target={} ) public static final String SP_WHENCODE = "when_code"; /** * Fluent Client search parameter constant for when_code diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/OrderResponse.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/OrderResponse.java index f6d8db52d89..a5a81ac5c98 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/OrderResponse.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/OrderResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -869,7 +869,9 @@ public class OrderResponse extends DomainResource { * Path: OrderResponse.date
*

*/ - @SearchParamDefinition(name="date", path="OrderResponse.date", description="When the response was made", type="date" ) + // [] + // [] + @SearchParamDefinition(name="date", path="OrderResponse.date", description="When the response was made", type="date", target={} ) public static final String SP_DATE = "date"; /** * Fluent Client search parameter constant for date @@ -889,7 +891,9 @@ public class OrderResponse extends DomainResource { * Path: OrderResponse.request
*

*/ - @SearchParamDefinition(name="request", path="OrderResponse.request", description="The order that this is a response to", type="reference" ) + // [Order] + // [Order] + @SearchParamDefinition(name="request", path="OrderResponse.request", description="The order that this is a response to", type="reference", target={Order.class} ) public static final String SP_REQUEST = "request"; /** * Fluent Client search parameter constant for request @@ -915,7 +919,9 @@ public class OrderResponse extends DomainResource { * Path: OrderResponse.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="OrderResponse.identifier", description="Identifiers assigned to this order by the orderer or by the receiver", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="OrderResponse.identifier", description="Identifiers assigned to this order by the orderer or by the receiver", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -935,7 +941,9 @@ public class OrderResponse extends DomainResource { * Path: OrderResponse.orderStatus
*

*/ - @SearchParamDefinition(name="code", path="OrderResponse.orderStatus", description="pending | review | rejected | error | accepted | cancelled | replaced | aborted | completed", type="token" ) + // [] + // [] + @SearchParamDefinition(name="code", path="OrderResponse.orderStatus", description="pending | review | rejected | error | accepted | cancelled | replaced | aborted | completed", type="token", target={} ) public static final String SP_CODE = "code"; /** * Fluent Client search parameter constant for code @@ -955,6 +963,8 @@ public class OrderResponse extends DomainResource { * Path: OrderResponse.fulfillment
*

*/ + // [Any] + // [Any] @SearchParamDefinition(name="fulfillment", path="OrderResponse.fulfillment", description="Details of the outcome of performing the order", type="reference" ) public static final String SP_FULFILLMENT = "fulfillment"; /** @@ -981,7 +991,9 @@ public class OrderResponse extends DomainResource { * Path: OrderResponse.who
*

*/ - @SearchParamDefinition(name="who", path="OrderResponse.who", description="Who made the response", type="reference" ) + // [Practitioner, Organization, Device] + // [Practitioner, Organization, Device] + @SearchParamDefinition(name="who", path="OrderResponse.who", description="Who made the response", type="reference", target={Practitioner.class, Organization.class, Device.class} ) public static final String SP_WHO = "who"; /** * Fluent Client search parameter constant for who diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/OrderSet.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/OrderSet.java index 6e158b02865..fbc746cced7 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/OrderSet.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/OrderSet.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -381,7 +381,9 @@ public class OrderSet extends DomainResource { * Path: OrderSet.moduleMetadata.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="OrderSet.moduleMetadata.identifier", description="Logical identifier for the module (e.g. CMS-143)", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="OrderSet.moduleMetadata.identifier", description="Logical identifier for the module (e.g. CMS-143)", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -401,7 +403,9 @@ public class OrderSet extends DomainResource { * Path: OrderSet.moduleMetadata.topic
*

*/ - @SearchParamDefinition(name="topic", path="OrderSet.moduleMetadata.topic", description="Topics associated with the module", type="token" ) + // [] + // [] + @SearchParamDefinition(name="topic", path="OrderSet.moduleMetadata.topic", description="Topics associated with the module", type="token", target={} ) public static final String SP_TOPIC = "topic"; /** * Fluent Client search parameter constant for topic @@ -421,7 +425,9 @@ public class OrderSet extends DomainResource { * Path: OrderSet.moduleMetadata.description
*

*/ - @SearchParamDefinition(name="description", path="OrderSet.moduleMetadata.description", description="Text search against the description", type="string" ) + // [] + // [] + @SearchParamDefinition(name="description", path="OrderSet.moduleMetadata.description", description="Text search against the description", type="string", target={} ) public static final String SP_DESCRIPTION = "description"; /** * Fluent Client search parameter constant for description @@ -441,7 +447,9 @@ public class OrderSet extends DomainResource { * Path: OrderSet.moduleMetadata.title
*

*/ - @SearchParamDefinition(name="title", path="OrderSet.moduleMetadata.title", description="Text search against the title", type="string" ) + // [] + // [] + @SearchParamDefinition(name="title", path="OrderSet.moduleMetadata.title", description="Text search against the title", type="string", target={} ) public static final String SP_TITLE = "title"; /** * Fluent Client search parameter constant for title @@ -461,7 +469,9 @@ public class OrderSet extends DomainResource { * Path: OrderSet.moduleMetadata.version
*

*/ - @SearchParamDefinition(name="version", path="OrderSet.moduleMetadata.version", description="Version of the module (e.g. 1.0.0)", type="string" ) + // [] + // [] + @SearchParamDefinition(name="version", path="OrderSet.moduleMetadata.version", description="Version of the module (e.g. 1.0.0)", type="string", target={} ) public static final String SP_VERSION = "version"; /** * Fluent Client search parameter constant for version @@ -481,7 +491,9 @@ public class OrderSet extends DomainResource { * Path: OrderSet.moduleMetadata.status
*

*/ - @SearchParamDefinition(name="status", path="OrderSet.moduleMetadata.status", description="Status of the module", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="OrderSet.moduleMetadata.status", description="Status of the module", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Organization.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Organization.java index 3af8f419279..2234c287283 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Organization.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Organization.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1023,7 +1023,9 @@ public class Organization extends DomainResource { * Path: Organization.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="Organization.identifier", description="Any identifier for the organization (not the accreditation issuer's identifier)", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="Organization.identifier", description="Any identifier for the organization (not the accreditation issuer's identifier)", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -1043,7 +1045,9 @@ public class Organization extends DomainResource { * Path: Organization.partOf
*

*/ - @SearchParamDefinition(name="partof", path="Organization.partOf", description="Search all organizations that are part of the given organization", type="reference" ) + // [Organization] + // [Organization] + @SearchParamDefinition(name="partof", path="Organization.partOf", description="Search all organizations that are part of the given organization", type="reference", target={Organization.class} ) public static final String SP_PARTOF = "partof"; /** * Fluent Client search parameter constant for partof @@ -1069,7 +1073,9 @@ public class Organization extends DomainResource { * Path: Organization.name
*

*/ - @SearchParamDefinition(name="phonetic", path="Organization.name", description="A portion of the organization's name using some kind of phonetic matching algorithm", type="string" ) + // [] + // [] + @SearchParamDefinition(name="phonetic", path="Organization.name", description="A portion of the organization's name using some kind of phonetic matching algorithm", type="string", target={} ) public static final String SP_PHONETIC = "phonetic"; /** * Fluent Client search parameter constant for phonetic @@ -1089,7 +1095,9 @@ public class Organization extends DomainResource { * Path: Organization.address
*

*/ - @SearchParamDefinition(name="address", path="Organization.address", description="A (part of the) address of the Organization", type="string" ) + // [] + // [] + @SearchParamDefinition(name="address", path="Organization.address", description="A (part of the) address of the Organization", type="string", target={} ) public static final String SP_ADDRESS = "address"; /** * Fluent Client search parameter constant for address @@ -1109,7 +1117,9 @@ public class Organization extends DomainResource { * Path: Organization.address.state
*

*/ - @SearchParamDefinition(name="address-state", path="Organization.address.state", description="A state specified in an address", type="string" ) + // [] + // [] + @SearchParamDefinition(name="address-state", path="Organization.address.state", description="A state specified in an address", type="string", target={} ) public static final String SP_ADDRESS_STATE = "address-state"; /** * Fluent Client search parameter constant for address-state @@ -1129,7 +1139,9 @@ public class Organization extends DomainResource { * Path: Organization.name
*

*/ - @SearchParamDefinition(name="name", path="Organization.name", description="A portion of the organization's name", type="string" ) + // [] + // [] + @SearchParamDefinition(name="name", path="Organization.name", description="A portion of the organization's name", type="string", target={} ) public static final String SP_NAME = "name"; /** * Fluent Client search parameter constant for name @@ -1149,7 +1161,9 @@ public class Organization extends DomainResource { * Path: Organization.address.use
*

*/ - @SearchParamDefinition(name="address-use", path="Organization.address.use", description="A use code specified in an address", type="token" ) + // [] + // [] + @SearchParamDefinition(name="address-use", path="Organization.address.use", description="A use code specified in an address", type="token", target={} ) public static final String SP_ADDRESS_USE = "address-use"; /** * Fluent Client search parameter constant for address-use @@ -1169,7 +1183,9 @@ public class Organization extends DomainResource { * Path: Organization.active
*

*/ - @SearchParamDefinition(name="active", path="Organization.active", description="Whether the organization's record is active", type="token" ) + // [] + // [] + @SearchParamDefinition(name="active", path="Organization.active", description="Whether the organization's record is active", type="token", target={} ) public static final String SP_ACTIVE = "active"; /** * Fluent Client search parameter constant for active @@ -1189,7 +1205,9 @@ public class Organization extends DomainResource { * Path: Organization.type
*

*/ - @SearchParamDefinition(name="type", path="Organization.type", description="A code for the type of organization", type="token" ) + // [] + // [] + @SearchParamDefinition(name="type", path="Organization.type", description="A code for the type of organization", type="token", target={} ) public static final String SP_TYPE = "type"; /** * Fluent Client search parameter constant for type @@ -1209,7 +1227,9 @@ public class Organization extends DomainResource { * Path: Organization.address.city
*

*/ - @SearchParamDefinition(name="address-city", path="Organization.address.city", description="A city specified in an address", type="string" ) + // [] + // [] + @SearchParamDefinition(name="address-city", path="Organization.address.city", description="A city specified in an address", type="string", target={} ) public static final String SP_ADDRESS_CITY = "address-city"; /** * Fluent Client search parameter constant for address-city @@ -1229,7 +1249,9 @@ public class Organization extends DomainResource { * Path: Organization.address.postalCode
*

*/ - @SearchParamDefinition(name="address-postalcode", path="Organization.address.postalCode", description="A postal code specified in an address", type="string" ) + // [] + // [] + @SearchParamDefinition(name="address-postalcode", path="Organization.address.postalCode", description="A postal code specified in an address", type="string", target={} ) public static final String SP_ADDRESS_POSTALCODE = "address-postalcode"; /** * Fluent Client search parameter constant for address-postalcode @@ -1249,7 +1271,9 @@ public class Organization extends DomainResource { * Path: Organization.address.country
*

*/ - @SearchParamDefinition(name="address-country", path="Organization.address.country", description="A country specified in an address", type="string" ) + // [] + // [] + @SearchParamDefinition(name="address-country", path="Organization.address.country", description="A country specified in an address", type="string", target={} ) public static final String SP_ADDRESS_COUNTRY = "address-country"; /** * Fluent Client search parameter constant for address-country diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Parameters.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Parameters.java index 1a0917cb288..35f8be0edc6 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Parameters.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Parameters.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Patient.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Patient.java index 7f1b8e54258..09d0391510a 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Patient.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Patient.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -2684,7 +2684,9 @@ public class Patient extends DomainResource { * Path: Patient.birthDate
*

*/ - @SearchParamDefinition(name="birthdate", path="Patient.birthDate", description="The patient's date of birth", type="date" ) + // [] + // [] + @SearchParamDefinition(name="birthdate", path="Patient.birthDate", description="The patient's date of birth", type="date", target={} ) public static final String SP_BIRTHDATE = "birthdate"; /** * Fluent Client search parameter constant for birthdate @@ -2704,7 +2706,9 @@ public class Patient extends DomainResource { * Path: Patient.deceased[x]
*

*/ - @SearchParamDefinition(name="deceased", path="Patient.deceased.exists()", description="This patient has been marked as deceased, or as a death date entered", type="token" ) + // [] + // [] + @SearchParamDefinition(name="deceased", path="Patient.deceased.exists()", description="This patient has been marked as deceased, or as a death date entered", type="token", target={} ) public static final String SP_DECEASED = "deceased"; /** * Fluent Client search parameter constant for deceased @@ -2724,7 +2728,9 @@ public class Patient extends DomainResource { * Path: Patient.address.state
*

*/ - @SearchParamDefinition(name="address-state", path="Patient.address.state", description="A state specified in an address", type="string" ) + // [] + // [] + @SearchParamDefinition(name="address-state", path="Patient.address.state", description="A state specified in an address", type="string", target={} ) public static final String SP_ADDRESS_STATE = "address-state"; /** * Fluent Client search parameter constant for address-state @@ -2744,7 +2750,9 @@ public class Patient extends DomainResource { * Path: Patient.gender
*

*/ - @SearchParamDefinition(name="gender", path="Patient.gender", description="Gender of the patient", type="token" ) + // [] + // [] + @SearchParamDefinition(name="gender", path="Patient.gender", description="Gender of the patient", type="token", target={} ) public static final String SP_GENDER = "gender"; /** * Fluent Client search parameter constant for gender @@ -2764,7 +2772,9 @@ public class Patient extends DomainResource { * Path: Patient.animal.species
*

*/ - @SearchParamDefinition(name="animal-species", path="Patient.animal.species", description="The species for animal patients", type="token" ) + // [] + // [] + @SearchParamDefinition(name="animal-species", path="Patient.animal.species", description="The species for animal patients", type="token", target={} ) public static final String SP_ANIMAL_SPECIES = "animal-species"; /** * Fluent Client search parameter constant for animal-species @@ -2784,7 +2794,9 @@ public class Patient extends DomainResource { * Path: Patient.link.other
*

*/ - @SearchParamDefinition(name="link", path="Patient.link.other", description="All patients linked to the given patient", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="link", path="Patient.link.other", description="All patients linked to the given patient", type="reference", target={Patient.class} ) public static final String SP_LINK = "link"; /** * Fluent Client search parameter constant for link @@ -2810,7 +2822,9 @@ public class Patient extends DomainResource { * Path: Patient.communication.language
*

*/ - @SearchParamDefinition(name="language", path="Patient.communication.language", description="Language code (irrespective of use value)", type="token" ) + // [] + // [] + @SearchParamDefinition(name="language", path="Patient.communication.language", description="Language code (irrespective of use value)", type="token", target={} ) public static final String SP_LANGUAGE = "language"; /** * Fluent Client search parameter constant for language @@ -2830,7 +2844,9 @@ public class Patient extends DomainResource { * Path: Patient.animal.breed
*

*/ - @SearchParamDefinition(name="animal-breed", path="Patient.animal.breed", description="The breed for animal patients", type="token" ) + // [] + // [] + @SearchParamDefinition(name="animal-breed", path="Patient.animal.breed", description="The breed for animal patients", type="token", target={} ) public static final String SP_ANIMAL_BREED = "animal-breed"; /** * Fluent Client search parameter constant for animal-breed @@ -2850,7 +2866,9 @@ public class Patient extends DomainResource { * Path: Patient.address.country
*

*/ - @SearchParamDefinition(name="address-country", path="Patient.address.country", description="A country specified in an address", type="string" ) + // [] + // [] + @SearchParamDefinition(name="address-country", path="Patient.address.country", description="A country specified in an address", type="string", target={} ) public static final String SP_ADDRESS_COUNTRY = "address-country"; /** * Fluent Client search parameter constant for address-country @@ -2870,7 +2888,9 @@ public class Patient extends DomainResource { * Path: Patient.deceasedDateTime
*

*/ - @SearchParamDefinition(name="death-date", path="Patient.deceased.as(DateTime)", description="The date of death has been provided and satisfies this search value", type="date" ) + // [] + // [] + @SearchParamDefinition(name="death-date", path="Patient.deceased.as(DateTime)", description="The date of death has been provided and satisfies this search value", type="date", target={} ) public static final String SP_DEATH_DATE = "death-date"; /** * Fluent Client search parameter constant for death-date @@ -2890,7 +2910,9 @@ public class Patient extends DomainResource { * Path: Patient.name
*

*/ - @SearchParamDefinition(name="phonetic", path="Patient.name", description="A portion of either family or given name using some kind of phonetic matching algorithm", type="string" ) + // [] + // [] + @SearchParamDefinition(name="phonetic", path="Patient.name", description="A portion of either family or given name using some kind of phonetic matching algorithm", type="string", target={} ) public static final String SP_PHONETIC = "phonetic"; /** * Fluent Client search parameter constant for phonetic @@ -2910,7 +2932,9 @@ public class Patient extends DomainResource { * Path: Patient.telecom
*

*/ - @SearchParamDefinition(name="telecom", path="Patient.telecom", description="The value in any kind of telecom details of the patient", type="token" ) + // [] + // [] + @SearchParamDefinition(name="telecom", path="Patient.telecom", description="The value in any kind of telecom details of the patient", type="token", target={} ) public static final String SP_TELECOM = "telecom"; /** * Fluent Client search parameter constant for telecom @@ -2930,7 +2954,9 @@ public class Patient extends DomainResource { * Path: Patient.address.city
*

*/ - @SearchParamDefinition(name="address-city", path="Patient.address.city", description="A city specified in an address", type="string" ) + // [] + // [] + @SearchParamDefinition(name="address-city", path="Patient.address.city", description="A city specified in an address", type="string", target={} ) public static final String SP_ADDRESS_CITY = "address-city"; /** * Fluent Client search parameter constant for address-city @@ -2950,7 +2976,9 @@ public class Patient extends DomainResource { * Path: Patient.telecom(system=email)
*

*/ - @SearchParamDefinition(name="email", path="Patient.telecom.where(system='email')", description="A value in an email contact", type="token" ) + // [] + // [] + @SearchParamDefinition(name="email", path="Patient.telecom.where(system='email')", description="A value in an email contact", type="token", target={} ) public static final String SP_EMAIL = "email"; /** * Fluent Client search parameter constant for email @@ -2970,7 +2998,9 @@ public class Patient extends DomainResource { * Path: Patient.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="Patient.identifier", description="A patient identifier", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="Patient.identifier", description="A patient identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -2990,7 +3020,9 @@ public class Patient extends DomainResource { * Path: Patient.name.given
*

*/ - @SearchParamDefinition(name="given", path="Patient.name.given", description="A portion of the given name of the patient", type="string" ) + // [] + // [] + @SearchParamDefinition(name="given", path="Patient.name.given", description="A portion of the given name of the patient", type="string", target={} ) public static final String SP_GIVEN = "given"; /** * Fluent Client search parameter constant for given @@ -3010,7 +3042,9 @@ public class Patient extends DomainResource { * Path: Patient.address
*

*/ - @SearchParamDefinition(name="address", path="Patient.address", description="An address in any kind of address/part of the patient", type="string" ) + // [] + // [] + @SearchParamDefinition(name="address", path="Patient.address", description="An address in any kind of address/part of the patient", type="string", target={} ) public static final String SP_ADDRESS = "address"; /** * Fluent Client search parameter constant for address @@ -3030,7 +3064,9 @@ public class Patient extends DomainResource { * Path: Patient.active
*

*/ - @SearchParamDefinition(name="active", path="Patient.active", description="Whether the patient record is active", type="token" ) + // [] + // [] + @SearchParamDefinition(name="active", path="Patient.active", description="Whether the patient record is active", type="token", target={} ) public static final String SP_ACTIVE = "active"; /** * Fluent Client search parameter constant for active @@ -3050,7 +3086,9 @@ public class Patient extends DomainResource { * Path: Patient.address.postalCode
*

*/ - @SearchParamDefinition(name="address-postalcode", path="Patient.address.postalCode", description="A postalCode specified in an address", type="string" ) + // [] + // [] + @SearchParamDefinition(name="address-postalcode", path="Patient.address.postalCode", description="A postalCode specified in an address", type="string", target={} ) public static final String SP_ADDRESS_POSTALCODE = "address-postalcode"; /** * Fluent Client search parameter constant for address-postalcode @@ -3070,7 +3108,9 @@ public class Patient extends DomainResource { * Path: Patient.careProvider
*

*/ - @SearchParamDefinition(name="careprovider", path="Patient.careProvider", description="Patient's nominated care provider, could be a care manager, not the organization that manages the record", type="reference" ) + // [Practitioner, Organization] + // [Practitioner, Organization] + @SearchParamDefinition(name="careprovider", path="Patient.careProvider", description="Patient's nominated care provider, could be a care manager, not the organization that manages the record", type="reference", target={Practitioner.class, Organization.class} ) public static final String SP_CAREPROVIDER = "careprovider"; /** * Fluent Client search parameter constant for careprovider @@ -3096,7 +3136,9 @@ public class Patient extends DomainResource { * Path: Patient.telecom(system=phone)
*

*/ - @SearchParamDefinition(name="phone", path="Patient.telecom.where(system='phone')", description="A value in a phone contact", type="token" ) + // [] + // [] + @SearchParamDefinition(name="phone", path="Patient.telecom.where(system='phone')", description="A value in a phone contact", type="token", target={} ) public static final String SP_PHONE = "phone"; /** * Fluent Client search parameter constant for phone @@ -3116,7 +3158,9 @@ public class Patient extends DomainResource { * Path: Patient.managingOrganization
*

*/ - @SearchParamDefinition(name="organization", path="Patient.managingOrganization", description="The organization at which this person is a patient", type="reference" ) + // [Organization] + // [Organization] + @SearchParamDefinition(name="organization", path="Patient.managingOrganization", description="The organization at which this person is a patient", type="reference", target={Organization.class} ) public static final String SP_ORGANIZATION = "organization"; /** * Fluent Client search parameter constant for organization @@ -3142,7 +3186,9 @@ public class Patient extends DomainResource { * Path: Patient.name
*

*/ - @SearchParamDefinition(name="name", path="Patient.name", description="A portion of either family or given name of the patient", type="string" ) + // [] + // [] + @SearchParamDefinition(name="name", path="Patient.name", description="A portion of either family or given name of the patient", type="string", target={} ) public static final String SP_NAME = "name"; /** * Fluent Client search parameter constant for name @@ -3162,7 +3208,9 @@ public class Patient extends DomainResource { * Path: Patient.address.use
*

*/ - @SearchParamDefinition(name="address-use", path="Patient.address.use", description="A use code specified in an address", type="token" ) + // [] + // [] + @SearchParamDefinition(name="address-use", path="Patient.address.use", description="A use code specified in an address", type="token", target={} ) public static final String SP_ADDRESS_USE = "address-use"; /** * Fluent Client search parameter constant for address-use @@ -3182,7 +3230,9 @@ public class Patient extends DomainResource { * Path: Patient.name.family
*

*/ - @SearchParamDefinition(name="family", path="Patient.name.family", description="A portion of the family name of the patient", type="string" ) + // [] + // [] + @SearchParamDefinition(name="family", path="Patient.name.family", description="A portion of the family name of the patient", type="string", target={} ) public static final String SP_FAMILY = "family"; /** * Fluent Client search parameter constant for family diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/PaymentNotice.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/PaymentNotice.java index c021ebbe262..49096a8f064 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/PaymentNotice.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/PaymentNotice.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -855,7 +855,9 @@ public class PaymentNotice extends DomainResource { * Path: PaymentNotice.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="PaymentNotice.identifier", description="The business identifier of the notice", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="PaymentNotice.identifier", description="The business identifier of the notice", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -875,7 +877,9 @@ public class PaymentNotice extends DomainResource { * Path: PaymentNotice.responseIdentifier
*

*/ - @SearchParamDefinition(name="responseidentifier", path="PaymentNotice.response.as(Identifier)", description="The ClaimResponse", type="token" ) + // [] + // [] + @SearchParamDefinition(name="responseidentifier", path="PaymentNotice.response.as(Identifier)", description="The ClaimResponse", type="token", target={} ) public static final String SP_RESPONSEIDENTIFIER = "responseidentifier"; /** * Fluent Client search parameter constant for responseidentifier @@ -895,7 +899,9 @@ public class PaymentNotice extends DomainResource { * Path: PaymentNotice.organizationIdentifier
*

*/ - @SearchParamDefinition(name="organizationidentifier", path="PaymentNotice.organization.as(Identifier)", description="The organization who generated this resource", type="token" ) + // [] + // [] + @SearchParamDefinition(name="organizationidentifier", path="PaymentNotice.organization.as(Identifier)", description="The organization who generated this resource", type="token", target={} ) public static final String SP_ORGANIZATIONIDENTIFIER = "organizationidentifier"; /** * Fluent Client search parameter constant for organizationidentifier @@ -915,7 +921,9 @@ public class PaymentNotice extends DomainResource { * Path: PaymentNotice.created
*

*/ - @SearchParamDefinition(name="created", path="PaymentNotice.created", description="Creation date fro the notice", type="date" ) + // [] + // [] + @SearchParamDefinition(name="created", path="PaymentNotice.created", description="Creation date fro the notice", type="date", target={} ) public static final String SP_CREATED = "created"; /** * Fluent Client search parameter constant for created @@ -935,7 +943,9 @@ public class PaymentNotice extends DomainResource { * Path: PaymentNotice.requestIdentifier
*

*/ - @SearchParamDefinition(name="requestidentifier", path="PaymentNotice.request.as(Identifier)", description="The Claim", type="token" ) + // [] + // [] + @SearchParamDefinition(name="requestidentifier", path="PaymentNotice.request.as(Identifier)", description="The Claim", type="token", target={} ) public static final String SP_REQUESTIDENTIFIER = "requestidentifier"; /** * Fluent Client search parameter constant for requestidentifier @@ -955,7 +965,9 @@ public class PaymentNotice extends DomainResource { * Path: PaymentNotice.paymentStatus
*

*/ - @SearchParamDefinition(name="paymentstatus", path="PaymentNotice.paymentStatus", description="The type of payment notice", type="token" ) + // [] + // [] + @SearchParamDefinition(name="paymentstatus", path="PaymentNotice.paymentStatus", description="The type of payment notice", type="token", target={} ) public static final String SP_PAYMENTSTATUS = "paymentstatus"; /** * Fluent Client search parameter constant for paymentstatus @@ -975,7 +987,9 @@ public class PaymentNotice extends DomainResource { * Path: PaymentNotice.organizationReference
*

*/ - @SearchParamDefinition(name="organizationreference", path="PaymentNotice.organization.as(Reference)", description="The organization who generated this resource", type="reference" ) + // [Organization] + // [Organization] + @SearchParamDefinition(name="organizationreference", path="PaymentNotice.organization.as(Reference)", description="The organization who generated this resource", type="reference", target={Organization.class} ) public static final String SP_ORGANIZATIONREFERENCE = "organizationreference"; /** * Fluent Client search parameter constant for organizationreference @@ -1001,7 +1015,9 @@ public class PaymentNotice extends DomainResource { * Path: PaymentNotice.providerReference
*

*/ - @SearchParamDefinition(name="providerreference", path="PaymentNotice.provider.as(Reference)", description="The reference to the provider", type="reference" ) + // [Practitioner] + // [Practitioner] + @SearchParamDefinition(name="providerreference", path="PaymentNotice.provider.as(Reference)", description="The reference to the provider", type="reference", target={Practitioner.class} ) public static final String SP_PROVIDERREFERENCE = "providerreference"; /** * Fluent Client search parameter constant for providerreference @@ -1027,6 +1043,8 @@ public class PaymentNotice extends DomainResource { * Path: PaymentNotice.responseReference
*

*/ + // [Any] + // [Any] @SearchParamDefinition(name="responsereference", path="PaymentNotice.response.as(Reference)", description="The ClaimResponse", type="reference" ) public static final String SP_RESPONSEREFERENCE = "responsereference"; /** @@ -1053,7 +1071,9 @@ public class PaymentNotice extends DomainResource { * Path: PaymentNotice.providerIdentifier
*

*/ - @SearchParamDefinition(name="provideridentifier", path="PaymentNotice.provider.as(Identifier)", description="The reference to the provider", type="token" ) + // [] + // [] + @SearchParamDefinition(name="provideridentifier", path="PaymentNotice.provider.as(Identifier)", description="The reference to the provider", type="token", target={} ) public static final String SP_PROVIDERIDENTIFIER = "provideridentifier"; /** * Fluent Client search parameter constant for provideridentifier @@ -1073,6 +1093,8 @@ public class PaymentNotice extends DomainResource { * Path: PaymentNotice.requestReference
*

*/ + // [Any] + // [Any] @SearchParamDefinition(name="requestreference", path="PaymentNotice.request.as(Reference)", description="The Claim", type="reference" ) public static final String SP_REQUESTREFERENCE = "requestreference"; /** @@ -1099,7 +1121,9 @@ public class PaymentNotice extends DomainResource { * Path: PaymentNotice.statusDate
*

*/ - @SearchParamDefinition(name="statusdate", path="PaymentNotice.statusDate", description="The date of the payment action", type="date" ) + // [] + // [] + @SearchParamDefinition(name="statusdate", path="PaymentNotice.statusDate", description="The date of the payment action", type="date", target={} ) public static final String SP_STATUSDATE = "statusdate"; /** * Fluent Client search parameter constant for statusdate diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/PaymentReconciliation.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/PaymentReconciliation.java index 9d3374391de..d3aa351a41f 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/PaymentReconciliation.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/PaymentReconciliation.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1839,7 +1839,9 @@ public class PaymentReconciliation extends DomainResource { * Path: PaymentReconciliation.requestProviderIdentifier
*

*/ - @SearchParamDefinition(name="requestprovideridentifier", path="PaymentReconciliation.requestProvider.as(Identifier)", description="The reference to the provider who sumbitted the claim", type="token" ) + // [] + // [] + @SearchParamDefinition(name="requestprovideridentifier", path="PaymentReconciliation.requestProvider.as(Identifier)", description="The reference to the provider who sumbitted the claim", type="token", target={} ) public static final String SP_REQUESTPROVIDERIDENTIFIER = "requestprovideridentifier"; /** * Fluent Client search parameter constant for requestprovideridentifier @@ -1859,7 +1861,9 @@ public class PaymentReconciliation extends DomainResource { * Path: PaymentReconciliation.requestOrganizationIdentifier
*

*/ - @SearchParamDefinition(name="requestorganizationidentifier", path="PaymentReconciliation.requestOrganization.as(Identifier)", description="The organization who generated this resource", type="token" ) + // [] + // [] + @SearchParamDefinition(name="requestorganizationidentifier", path="PaymentReconciliation.requestOrganization.as(Identifier)", description="The organization who generated this resource", type="token", target={} ) public static final String SP_REQUESTORGANIZATIONIDENTIFIER = "requestorganizationidentifier"; /** * Fluent Client search parameter constant for requestorganizationidentifier @@ -1879,7 +1883,9 @@ public class PaymentReconciliation extends DomainResource { * Path: PaymentReconciliation.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="PaymentReconciliation.identifier", description="The business identifier of the Explanation of Benefit", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="PaymentReconciliation.identifier", description="The business identifier of the Explanation of Benefit", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -1899,7 +1905,9 @@ public class PaymentReconciliation extends DomainResource { * Path: PaymentReconciliation.disposition
*

*/ - @SearchParamDefinition(name="disposition", path="PaymentReconciliation.disposition", description="The contents of the disposition message", type="string" ) + // [] + // [] + @SearchParamDefinition(name="disposition", path="PaymentReconciliation.disposition", description="The contents of the disposition message", type="string", target={} ) public static final String SP_DISPOSITION = "disposition"; /** * Fluent Client search parameter constant for disposition @@ -1919,7 +1927,9 @@ public class PaymentReconciliation extends DomainResource { * Path: PaymentReconciliation.organizationIdentifier
*

*/ - @SearchParamDefinition(name="organizationidentifier", path="PaymentReconciliation.organization.as(Identifier)", description="The organization who generated this resource", type="token" ) + // [] + // [] + @SearchParamDefinition(name="organizationidentifier", path="PaymentReconciliation.organization.as(Identifier)", description="The organization who generated this resource", type="token", target={} ) public static final String SP_ORGANIZATIONIDENTIFIER = "organizationidentifier"; /** * Fluent Client search parameter constant for organizationidentifier @@ -1939,7 +1949,9 @@ public class PaymentReconciliation extends DomainResource { * Path: PaymentReconciliation.created
*

*/ - @SearchParamDefinition(name="created", path="PaymentReconciliation.created", description="The creation date", type="date" ) + // [] + // [] + @SearchParamDefinition(name="created", path="PaymentReconciliation.created", description="The creation date", type="date", target={} ) public static final String SP_CREATED = "created"; /** * Fluent Client search parameter constant for created @@ -1959,7 +1971,9 @@ public class PaymentReconciliation extends DomainResource { * Path: PaymentReconciliation.requestIdentifier
*

*/ - @SearchParamDefinition(name="requestidentifier", path="PaymentReconciliation.request.as(Identifier)", description="The reference to the claim", type="token" ) + // [] + // [] + @SearchParamDefinition(name="requestidentifier", path="PaymentReconciliation.request.as(Identifier)", description="The reference to the claim", type="token", target={} ) public static final String SP_REQUESTIDENTIFIER = "requestidentifier"; /** * Fluent Client search parameter constant for requestidentifier @@ -1979,7 +1993,9 @@ public class PaymentReconciliation extends DomainResource { * Path: PaymentReconciliation.organizationReference
*

*/ - @SearchParamDefinition(name="organizationreference", path="PaymentReconciliation.organization.as(Reference)", description="The organization who generated this resource", type="reference" ) + // [Organization] + // [Organization] + @SearchParamDefinition(name="organizationreference", path="PaymentReconciliation.organization.as(Reference)", description="The organization who generated this resource", type="reference", target={Organization.class} ) public static final String SP_ORGANIZATIONREFERENCE = "organizationreference"; /** * Fluent Client search parameter constant for organizationreference @@ -2005,7 +2021,9 @@ public class PaymentReconciliation extends DomainResource { * Path: PaymentReconciliation.requestProviderReference
*

*/ - @SearchParamDefinition(name="requestproviderreference", path="PaymentReconciliation.requestProvider.as(Reference)", description="The reference to the provider who sumbitted the claim", type="reference" ) + // [Practitioner] + // [Practitioner] + @SearchParamDefinition(name="requestproviderreference", path="PaymentReconciliation.requestProvider.as(Reference)", description="The reference to the provider who sumbitted the claim", type="reference", target={Practitioner.class} ) public static final String SP_REQUESTPROVIDERREFERENCE = "requestproviderreference"; /** * Fluent Client search parameter constant for requestproviderreference @@ -2031,7 +2049,9 @@ public class PaymentReconciliation extends DomainResource { * Path: PaymentReconciliation.requestOrganizationReference
*

*/ - @SearchParamDefinition(name="requestorganizationreference", path="PaymentReconciliation.requestOrganization.as(Reference)", description="The organization who generated this resource", type="reference" ) + // [Organization] + // [Organization] + @SearchParamDefinition(name="requestorganizationreference", path="PaymentReconciliation.requestOrganization.as(Reference)", description="The organization who generated this resource", type="reference", target={Organization.class} ) public static final String SP_REQUESTORGANIZATIONREFERENCE = "requestorganizationreference"; /** * Fluent Client search parameter constant for requestorganizationreference @@ -2057,7 +2077,9 @@ public class PaymentReconciliation extends DomainResource { * Path: PaymentReconciliation.requestReference
*

*/ - @SearchParamDefinition(name="requestreference", path="PaymentReconciliation.request.as(Reference)", description="The reference to the claim", type="reference" ) + // [ProcessRequest] + // [ProcessRequest] + @SearchParamDefinition(name="requestreference", path="PaymentReconciliation.request.as(Reference)", description="The reference to the claim", type="reference", target={ProcessRequest.class} ) public static final String SP_REQUESTREFERENCE = "requestreference"; /** * Fluent Client search parameter constant for requestreference @@ -2083,7 +2105,9 @@ public class PaymentReconciliation extends DomainResource { * Path: PaymentReconciliation.outcome
*

*/ - @SearchParamDefinition(name="outcome", path="PaymentReconciliation.outcome", description="The processing outcome", type="token" ) + // [] + // [] + @SearchParamDefinition(name="outcome", path="PaymentReconciliation.outcome", description="The processing outcome", type="token", target={} ) public static final String SP_OUTCOME = "outcome"; /** * Fluent Client search parameter constant for outcome diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Person.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Person.java index 31ececeb540..6473580119b 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Person.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Person.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1219,7 +1219,9 @@ public class Person extends DomainResource { * Path: Person.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="Person.identifier", description="A person Identifier", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="Person.identifier", description="A person Identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -1239,7 +1241,9 @@ public class Person extends DomainResource { * Path: Person.address
*

*/ - @SearchParamDefinition(name="address", path="Person.address", description="An address in any kind of address/part", type="string" ) + // [] + // [] + @SearchParamDefinition(name="address", path="Person.address", description="An address in any kind of address/part", type="string", target={} ) public static final String SP_ADDRESS = "address"; /** * Fluent Client search parameter constant for address @@ -1259,7 +1263,9 @@ public class Person extends DomainResource { * Path: Person.birthDate
*

*/ - @SearchParamDefinition(name="birthdate", path="Person.birthDate", description="The person's date of birth", type="date" ) + // [] + // [] + @SearchParamDefinition(name="birthdate", path="Person.birthDate", description="The person's date of birth", type="date", target={} ) public static final String SP_BIRTHDATE = "birthdate"; /** * Fluent Client search parameter constant for birthdate @@ -1279,7 +1285,9 @@ public class Person extends DomainResource { * Path: Person.address.state
*

*/ - @SearchParamDefinition(name="address-state", path="Person.address.state", description="A state specified in an address", type="string" ) + // [] + // [] + @SearchParamDefinition(name="address-state", path="Person.address.state", description="A state specified in an address", type="string", target={} ) public static final String SP_ADDRESS_STATE = "address-state"; /** * Fluent Client search parameter constant for address-state @@ -1299,7 +1307,9 @@ public class Person extends DomainResource { * Path: Person.gender
*

*/ - @SearchParamDefinition(name="gender", path="Person.gender", description="The gender of the person", type="token" ) + // [] + // [] + @SearchParamDefinition(name="gender", path="Person.gender", description="The gender of the person", type="token", target={} ) public static final String SP_GENDER = "gender"; /** * Fluent Client search parameter constant for gender @@ -1319,7 +1329,9 @@ public class Person extends DomainResource { * Path: Person.link.target
*

*/ - @SearchParamDefinition(name="practitioner", path="Person.link.target", description="The Person links to this Practitioner", type="reference" ) + // [Practitioner, Patient, Person, RelatedPerson] + // [Practitioner] + @SearchParamDefinition(name="practitioner", path="Person.link.target", description="The Person links to this Practitioner", type="reference", target={Practitioner.class, Patient.class, Person.class, RelatedPerson.class} ) public static final String SP_PRACTITIONER = "practitioner"; /** * Fluent Client search parameter constant for practitioner @@ -1345,7 +1357,9 @@ public class Person extends DomainResource { * Path: Person.link.target
*

*/ - @SearchParamDefinition(name="link", path="Person.link.target", description="Any link has this Patient, Person, RelatedPerson or Practitioner reference", type="reference" ) + // [Practitioner, Patient, Person, RelatedPerson] + // [Practitioner, Patient, Person, RelatedPerson] + @SearchParamDefinition(name="link", path="Person.link.target", description="Any link has this Patient, Person, RelatedPerson or Practitioner reference", type="reference", target={Practitioner.class, Patient.class, Person.class, RelatedPerson.class} ) public static final String SP_LINK = "link"; /** * Fluent Client search parameter constant for link @@ -1371,7 +1385,9 @@ public class Person extends DomainResource { * Path: Person.link.target
*

*/ - @SearchParamDefinition(name="relatedperson", path="Person.link.target", description="The Person links to this RelatedPerson", type="reference" ) + // [Practitioner, Patient, Person, RelatedPerson] + // [RelatedPerson] + @SearchParamDefinition(name="relatedperson", path="Person.link.target", description="The Person links to this RelatedPerson", type="reference", target={Practitioner.class, Patient.class, Person.class, RelatedPerson.class} ) public static final String SP_RELATEDPERSON = "relatedperson"; /** * Fluent Client search parameter constant for relatedperson @@ -1397,7 +1413,9 @@ public class Person extends DomainResource { * Path: Person.address.postalCode
*

*/ - @SearchParamDefinition(name="address-postalcode", path="Person.address.postalCode", description="A postal code specified in an address", type="string" ) + // [] + // [] + @SearchParamDefinition(name="address-postalcode", path="Person.address.postalCode", description="A postal code specified in an address", type="string", target={} ) public static final String SP_ADDRESS_POSTALCODE = "address-postalcode"; /** * Fluent Client search parameter constant for address-postalcode @@ -1417,7 +1435,9 @@ public class Person extends DomainResource { * Path: Person.address.country
*

*/ - @SearchParamDefinition(name="address-country", path="Person.address.country", description="A country specified in an address", type="string" ) + // [] + // [] + @SearchParamDefinition(name="address-country", path="Person.address.country", description="A country specified in an address", type="string", target={} ) public static final String SP_ADDRESS_COUNTRY = "address-country"; /** * Fluent Client search parameter constant for address-country @@ -1437,7 +1457,9 @@ public class Person extends DomainResource { * Path: Person.name
*

*/ - @SearchParamDefinition(name="phonetic", path="Person.name", description="A portion of name using some kind of phonetic matching algorithm", type="string" ) + // [] + // [] + @SearchParamDefinition(name="phonetic", path="Person.name", description="A portion of name using some kind of phonetic matching algorithm", type="string", target={} ) public static final String SP_PHONETIC = "phonetic"; /** * Fluent Client search parameter constant for phonetic @@ -1457,7 +1479,9 @@ public class Person extends DomainResource { * Path: Person.telecom(system=phone)
*

*/ - @SearchParamDefinition(name="phone", path="Person.telecom.where(system='phone')", description="A value in a phone contact", type="token" ) + // [] + // [] + @SearchParamDefinition(name="phone", path="Person.telecom.where(system='phone')", description="A value in a phone contact", type="token", target={} ) public static final String SP_PHONE = "phone"; /** * Fluent Client search parameter constant for phone @@ -1477,7 +1501,9 @@ public class Person extends DomainResource { * Path: Person.link.target
*

*/ - @SearchParamDefinition(name="patient", path="Person.link.target", description="The Person links to this Patient", type="reference" ) + // [Practitioner, Patient, Person, RelatedPerson] + // [Patient] + @SearchParamDefinition(name="patient", path="Person.link.target", description="The Person links to this Patient", type="reference", target={Practitioner.class, Patient.class, Person.class, RelatedPerson.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -1503,7 +1529,9 @@ public class Person extends DomainResource { * Path: Person.managingOrganization
*

*/ - @SearchParamDefinition(name="organization", path="Person.managingOrganization", description="The organization at which this person record is being managed", type="reference" ) + // [Organization] + // [Organization] + @SearchParamDefinition(name="organization", path="Person.managingOrganization", description="The organization at which this person record is being managed", type="reference", target={Organization.class} ) public static final String SP_ORGANIZATION = "organization"; /** * Fluent Client search parameter constant for organization @@ -1529,7 +1557,9 @@ public class Person extends DomainResource { * Path: Person.name
*

*/ - @SearchParamDefinition(name="name", path="Person.name", description="A portion of name in any name part", type="string" ) + // [] + // [] + @SearchParamDefinition(name="name", path="Person.name", description="A portion of name in any name part", type="string", target={} ) public static final String SP_NAME = "name"; /** * Fluent Client search parameter constant for name @@ -1549,7 +1579,9 @@ public class Person extends DomainResource { * Path: Person.address.use
*

*/ - @SearchParamDefinition(name="address-use", path="Person.address.use", description="A use code specified in an address", type="token" ) + // [] + // [] + @SearchParamDefinition(name="address-use", path="Person.address.use", description="A use code specified in an address", type="token", target={} ) public static final String SP_ADDRESS_USE = "address-use"; /** * Fluent Client search parameter constant for address-use @@ -1569,7 +1601,9 @@ public class Person extends DomainResource { * Path: Person.telecom
*

*/ - @SearchParamDefinition(name="telecom", path="Person.telecom", description="The value in any kind of contact", type="token" ) + // [] + // [] + @SearchParamDefinition(name="telecom", path="Person.telecom", description="The value in any kind of contact", type="token", target={} ) public static final String SP_TELECOM = "telecom"; /** * Fluent Client search parameter constant for telecom @@ -1589,7 +1623,9 @@ public class Person extends DomainResource { * Path: Person.address.city
*

*/ - @SearchParamDefinition(name="address-city", path="Person.address.city", description="A city specified in an address", type="string" ) + // [] + // [] + @SearchParamDefinition(name="address-city", path="Person.address.city", description="A city specified in an address", type="string", target={} ) public static final String SP_ADDRESS_CITY = "address-city"; /** * Fluent Client search parameter constant for address-city @@ -1609,7 +1645,9 @@ public class Person extends DomainResource { * Path: Person.telecom(system=email)
*

*/ - @SearchParamDefinition(name="email", path="Person.telecom.where(system='email')", description="A value in an email contact", type="token" ) + // [] + // [] + @SearchParamDefinition(name="email", path="Person.telecom.where(system='email')", description="A value in an email contact", type="token", target={} ) public static final String SP_EMAIL = "email"; /** * Fluent Client search parameter constant for email diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Practitioner.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Practitioner.java index c9216704217..b44b85a8dcb 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Practitioner.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Practitioner.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -2048,7 +2048,9 @@ Work addresses are not typically entered in this property as they are usually ro * Path: Practitioner.identifier, Practitioner.practitionerRole.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="Practitioner.identifier | Practitioner.practitionerRole.identifier", description="A practitioner's Identifier", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="Practitioner.identifier | Practitioner.practitionerRole.identifier", description="A practitioner's Identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -2068,7 +2070,9 @@ Work addresses are not typically entered in this property as they are usually ro * Path: Practitioner.name.given
*

*/ - @SearchParamDefinition(name="given", path="Practitioner.name.given", description="A portion of the given name", type="string" ) + // [] + // [] + @SearchParamDefinition(name="given", path="Practitioner.name.given", description="A portion of the given name", type="string", target={} ) public static final String SP_GIVEN = "given"; /** * Fluent Client search parameter constant for given @@ -2088,7 +2092,9 @@ Work addresses are not typically entered in this property as they are usually ro * Path: Practitioner.practitionerRole.specialty
*

*/ - @SearchParamDefinition(name="specialty", path="Practitioner.practitionerRole.specialty", description="The practitioner has this specialty at an organization", type="token" ) + // [] + // [] + @SearchParamDefinition(name="specialty", path="Practitioner.practitionerRole.specialty", description="The practitioner has this specialty at an organization", type="token", target={} ) public static final String SP_SPECIALTY = "specialty"; /** * Fluent Client search parameter constant for specialty @@ -2108,7 +2114,9 @@ Work addresses are not typically entered in this property as they are usually ro * Path: Practitioner.address
*

*/ - @SearchParamDefinition(name="address", path="Practitioner.address", description="An address in any kind of address/part", type="string" ) + // [] + // [] + @SearchParamDefinition(name="address", path="Practitioner.address", description="An address in any kind of address/part", type="string", target={} ) public static final String SP_ADDRESS = "address"; /** * Fluent Client search parameter constant for address @@ -2128,7 +2136,9 @@ Work addresses are not typically entered in this property as they are usually ro * Path: Practitioner.practitionerRole.role
*

*/ - @SearchParamDefinition(name="role", path="Practitioner.practitionerRole.role", description="The practitioner can perform this role at for the organization", type="token" ) + // [] + // [] + @SearchParamDefinition(name="role", path="Practitioner.practitionerRole.role", description="The practitioner can perform this role at for the organization", type="token", target={} ) public static final String SP_ROLE = "role"; /** * Fluent Client search parameter constant for role @@ -2148,7 +2158,9 @@ Work addresses are not typically entered in this property as they are usually ro * Path: Practitioner.address.state
*

*/ - @SearchParamDefinition(name="address-state", path="Practitioner.address.state", description="A state specified in an address", type="string" ) + // [] + // [] + @SearchParamDefinition(name="address-state", path="Practitioner.address.state", description="A state specified in an address", type="string", target={} ) public static final String SP_ADDRESS_STATE = "address-state"; /** * Fluent Client search parameter constant for address-state @@ -2168,7 +2180,9 @@ Work addresses are not typically entered in this property as they are usually ro * Path: Practitioner.gender
*

*/ - @SearchParamDefinition(name="gender", path="Practitioner.gender", description="Gender of the practitioner", type="token" ) + // [] + // [] + @SearchParamDefinition(name="gender", path="Practitioner.gender", description="Gender of the practitioner", type="token", target={} ) public static final String SP_GENDER = "gender"; /** * Fluent Client search parameter constant for gender @@ -2188,7 +2202,9 @@ Work addresses are not typically entered in this property as they are usually ro * Path: Practitioner.address.postalCode
*

*/ - @SearchParamDefinition(name="address-postalcode", path="Practitioner.address.postalCode", description="A postalCode specified in an address", type="string" ) + // [] + // [] + @SearchParamDefinition(name="address-postalcode", path="Practitioner.address.postalCode", description="A postalCode specified in an address", type="string", target={} ) public static final String SP_ADDRESS_POSTALCODE = "address-postalcode"; /** * Fluent Client search parameter constant for address-postalcode @@ -2208,7 +2224,9 @@ Work addresses are not typically entered in this property as they are usually ro * Path: Practitioner.address.country
*

*/ - @SearchParamDefinition(name="address-country", path="Practitioner.address.country", description="A country specified in an address", type="string" ) + // [] + // [] + @SearchParamDefinition(name="address-country", path="Practitioner.address.country", description="A country specified in an address", type="string", target={} ) public static final String SP_ADDRESS_COUNTRY = "address-country"; /** * Fluent Client search parameter constant for address-country @@ -2228,7 +2246,9 @@ Work addresses are not typically entered in this property as they are usually ro * Path: Practitioner.name
*

*/ - @SearchParamDefinition(name="phonetic", path="Practitioner.name", description="A portion of either family or given name using some kind of phonetic matching algorithm", type="string" ) + // [] + // [] + @SearchParamDefinition(name="phonetic", path="Practitioner.name", description="A portion of either family or given name using some kind of phonetic matching algorithm", type="string", target={} ) public static final String SP_PHONETIC = "phonetic"; /** * Fluent Client search parameter constant for phonetic @@ -2248,7 +2268,9 @@ Work addresses are not typically entered in this property as they are usually ro * Path: Practitioner.telecom(system=phone), Practitioner.practitionerRole.telecom(system=phone)
*

*/ - @SearchParamDefinition(name="phone", path="Practitioner.telecom.where(system='phone') or Practitioner.practitionerRole.telecom.where(system='phone')", description="A value in a phone contact", type="token" ) + // [] + // [] + @SearchParamDefinition(name="phone", path="Practitioner.telecom.where(system='phone') or Practitioner.practitionerRole.telecom.where(system='phone')", description="A value in a phone contact", type="token", target={} ) public static final String SP_PHONE = "phone"; /** * Fluent Client search parameter constant for phone @@ -2268,7 +2290,9 @@ Work addresses are not typically entered in this property as they are usually ro * Path: Practitioner.practitionerRole.organization
*

*/ - @SearchParamDefinition(name="organization", path="Practitioner.practitionerRole.organization", description="The identity of the organization the practitioner represents / acts on behalf of", type="reference" ) + // [Organization] + // [Organization] + @SearchParamDefinition(name="organization", path="Practitioner.practitionerRole.organization", description="The identity of the organization the practitioner represents / acts on behalf of", type="reference", target={Organization.class} ) public static final String SP_ORGANIZATION = "organization"; /** * Fluent Client search parameter constant for organization @@ -2294,7 +2318,9 @@ Work addresses are not typically entered in this property as they are usually ro * Path: Practitioner.name
*

*/ - @SearchParamDefinition(name="name", path="Practitioner.name", description="A portion of either family or given name", type="string" ) + // [] + // [] + @SearchParamDefinition(name="name", path="Practitioner.name", description="A portion of either family or given name", type="string", target={} ) public static final String SP_NAME = "name"; /** * Fluent Client search parameter constant for name @@ -2314,7 +2340,9 @@ Work addresses are not typically entered in this property as they are usually ro * Path: Practitioner.address.use
*

*/ - @SearchParamDefinition(name="address-use", path="Practitioner.address.use", description="A use code specified in an address", type="token" ) + // [] + // [] + @SearchParamDefinition(name="address-use", path="Practitioner.address.use", description="A use code specified in an address", type="token", target={} ) public static final String SP_ADDRESS_USE = "address-use"; /** * Fluent Client search parameter constant for address-use @@ -2334,7 +2362,9 @@ Work addresses are not typically entered in this property as they are usually ro * Path: Practitioner.telecom, Practitioner.practitionerRole.telecom
*

*/ - @SearchParamDefinition(name="telecom", path="Practitioner.telecom | Practitioner.practitionerRole.telecom", description="The value in any kind of contact", type="token" ) + // [] + // [] + @SearchParamDefinition(name="telecom", path="Practitioner.telecom | Practitioner.practitionerRole.telecom", description="The value in any kind of contact", type="token", target={} ) public static final String SP_TELECOM = "telecom"; /** * Fluent Client search parameter constant for telecom @@ -2354,7 +2384,9 @@ Work addresses are not typically entered in this property as they are usually ro * Path: Practitioner.practitionerRole.location
*

*/ - @SearchParamDefinition(name="location", path="Practitioner.practitionerRole.location", description="One of the locations at which this practitioner provides care", type="reference" ) + // [Location] + // [Location] + @SearchParamDefinition(name="location", path="Practitioner.practitionerRole.location", description="One of the locations at which this practitioner provides care", type="reference", target={Location.class} ) public static final String SP_LOCATION = "location"; /** * Fluent Client search parameter constant for location @@ -2380,7 +2412,9 @@ Work addresses are not typically entered in this property as they are usually ro * Path: Practitioner.name.family
*

*/ - @SearchParamDefinition(name="family", path="Practitioner.name.family", description="A portion of the family name", type="string" ) + // [] + // [] + @SearchParamDefinition(name="family", path="Practitioner.name.family", description="A portion of the family name", type="string", target={} ) public static final String SP_FAMILY = "family"; /** * Fluent Client search parameter constant for family @@ -2400,7 +2434,9 @@ Work addresses are not typically entered in this property as they are usually ro * Path: Practitioner.address.city
*

*/ - @SearchParamDefinition(name="address-city", path="Practitioner.address.city", description="A city specified in an address", type="string" ) + // [] + // [] + @SearchParamDefinition(name="address-city", path="Practitioner.address.city", description="A city specified in an address", type="string", target={} ) public static final String SP_ADDRESS_CITY = "address-city"; /** * Fluent Client search parameter constant for address-city @@ -2420,7 +2456,9 @@ Work addresses are not typically entered in this property as they are usually ro * Path: Practitioner.communication
*

*/ - @SearchParamDefinition(name="communication", path="Practitioner.communication", description="One of the languages that the practitioner can communicate with", type="token" ) + // [] + // [] + @SearchParamDefinition(name="communication", path="Practitioner.communication", description="One of the languages that the practitioner can communicate with", type="token", target={} ) public static final String SP_COMMUNICATION = "communication"; /** * Fluent Client search parameter constant for communication @@ -2440,7 +2478,9 @@ Work addresses are not typically entered in this property as they are usually ro * Path: Practitioner.telecom(system=email), Practitioner.practitionerRole.telecom(system=email)
*

*/ - @SearchParamDefinition(name="email", path="Practitioner.telecom.where(system='email') or Practitioner.practitionerRole.telecom.where(system='email')", description="A value in an email contact", type="token" ) + // [] + // [] + @SearchParamDefinition(name="email", path="Practitioner.telecom.where(system='email') or Practitioner.practitionerRole.telecom.where(system='email')", description="A value in an email contact", type="token", target={} ) public static final String SP_EMAIL = "email"; /** * Fluent Client search parameter constant for email diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/PractitionerRole.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/PractitionerRole.java index 146c551a66e..2e5a8a249e7 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/PractitionerRole.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/PractitionerRole.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1760,7 +1760,9 @@ public class PractitionerRole extends DomainResource { * Path: PractitionerRole.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="PractitionerRole.identifier", description="A practitioner's Identifier", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="PractitionerRole.identifier", description="A practitioner's Identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -1780,7 +1782,9 @@ public class PractitionerRole extends DomainResource { * Path: PractitionerRole.specialty
*

*/ - @SearchParamDefinition(name="specialty", path="PractitionerRole.specialty", description="The practitioner has this specialty at an organization", type="token" ) + // [] + // [] + @SearchParamDefinition(name="specialty", path="PractitionerRole.specialty", description="The practitioner has this specialty at an organization", type="token", target={} ) public static final String SP_SPECIALTY = "specialty"; /** * Fluent Client search parameter constant for specialty @@ -1800,7 +1804,9 @@ public class PractitionerRole extends DomainResource { * Path: PractitionerRole.role
*

*/ - @SearchParamDefinition(name="role", path="PractitionerRole.role", description="The practitioner can perform this role at for the organization", type="token" ) + // [] + // [] + @SearchParamDefinition(name="role", path="PractitionerRole.role", description="The practitioner can perform this role at for the organization", type="token", target={} ) public static final String SP_ROLE = "role"; /** * Fluent Client search parameter constant for role @@ -1820,7 +1826,9 @@ public class PractitionerRole extends DomainResource { * Path: PractitionerRole.practitioner
*

*/ - @SearchParamDefinition(name="practitioner", path="PractitionerRole.practitioner", description="Practitioner that is able to provide the defined services for the organation", type="reference" ) + // [Practitioner] + // [Practitioner] + @SearchParamDefinition(name="practitioner", path="PractitionerRole.practitioner", description="Practitioner that is able to provide the defined services for the organation", type="reference", target={Practitioner.class} ) public static final String SP_PRACTITIONER = "practitioner"; /** * Fluent Client search parameter constant for practitioner @@ -1846,7 +1854,9 @@ public class PractitionerRole extends DomainResource { * Path: PractitionerRole.telecom(system=phone)
*

*/ - @SearchParamDefinition(name="phone", path="PractitionerRole.telecom.where(system='phone')", description="A value in a phone contact", type="token" ) + // [] + // [] + @SearchParamDefinition(name="phone", path="PractitionerRole.telecom.where(system='phone')", description="A value in a phone contact", type="token", target={} ) public static final String SP_PHONE = "phone"; /** * Fluent Client search parameter constant for phone @@ -1866,7 +1876,9 @@ public class PractitionerRole extends DomainResource { * Path: PractitionerRole.organization
*

*/ - @SearchParamDefinition(name="organization", path="PractitionerRole.organization", description="The identity of the organization the practitioner represents / acts on behalf of", type="reference" ) + // [Organization] + // [Organization] + @SearchParamDefinition(name="organization", path="PractitionerRole.organization", description="The identity of the organization the practitioner represents / acts on behalf of", type="reference", target={Organization.class} ) public static final String SP_ORGANIZATION = "organization"; /** * Fluent Client search parameter constant for organization @@ -1892,7 +1904,9 @@ public class PractitionerRole extends DomainResource { * Path: PractitionerRole.telecom
*

*/ - @SearchParamDefinition(name="telecom", path="PractitionerRole.telecom", description="The value in any kind of contact", type="token" ) + // [] + // [] + @SearchParamDefinition(name="telecom", path="PractitionerRole.telecom", description="The value in any kind of contact", type="token", target={} ) public static final String SP_TELECOM = "telecom"; /** * Fluent Client search parameter constant for telecom @@ -1912,7 +1926,9 @@ public class PractitionerRole extends DomainResource { * Path: PractitionerRole.location
*

*/ - @SearchParamDefinition(name="location", path="PractitionerRole.location", description="One of the locations at which this practitioner provides care", type="reference" ) + // [Location] + // [Location] + @SearchParamDefinition(name="location", path="PractitionerRole.location", description="One of the locations at which this practitioner provides care", type="reference", target={Location.class} ) public static final String SP_LOCATION = "location"; /** * Fluent Client search parameter constant for location @@ -1938,7 +1954,9 @@ public class PractitionerRole extends DomainResource { * Path: PractitionerRole.telecom(system=email)
*

*/ - @SearchParamDefinition(name="email", path="PractitionerRole.telecom.where(system='email')", description="A value in an email contact", type="token" ) + // [] + // [] + @SearchParamDefinition(name="email", path="PractitionerRole.telecom.where(system='email')", description="A value in an email contact", type="token", target={} ) public static final String SP_EMAIL = "email"; /** * Fluent Client search parameter constant for email diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Procedure.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Procedure.java index 06257dd3e6a..5bd4508caaf 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Procedure.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Procedure.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -2205,7 +2205,9 @@ public class Procedure extends DomainResource { * Path: Procedure.performed[x]
*

*/ - @SearchParamDefinition(name="date", path="Procedure.performed", description="Date/Period the procedure was performed", type="date" ) + // [] + // [] + @SearchParamDefinition(name="date", path="Procedure.performed", description="Date/Period the procedure was performed", type="date", target={} ) public static final String SP_DATE = "date"; /** * Fluent Client search parameter constant for date @@ -2225,7 +2227,9 @@ public class Procedure extends DomainResource { * Path: Procedure.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="Procedure.identifier", description="A unique identifier for a procedure", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="Procedure.identifier", description="A unique identifier for a procedure", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -2245,7 +2249,9 @@ public class Procedure extends DomainResource { * Path: Procedure.code
*

*/ - @SearchParamDefinition(name="code", path="Procedure.code", description="A code to identify a procedure", type="token" ) + // [] + // [] + @SearchParamDefinition(name="code", path="Procedure.code", description="A code to identify a procedure", type="token", target={} ) public static final String SP_CODE = "code"; /** * Fluent Client search parameter constant for code @@ -2265,7 +2271,9 @@ public class Procedure extends DomainResource { * Path: Procedure.performer.actor
*

*/ - @SearchParamDefinition(name="performer", path="Procedure.performer.actor", description="The reference to the practitioner", type="reference" ) + // [Practitioner, Organization, Patient, RelatedPerson] + // [Practitioner, Organization, Patient, RelatedPerson] + @SearchParamDefinition(name="performer", path="Procedure.performer.actor", description="The reference to the practitioner", type="reference", target={Practitioner.class, Organization.class, Patient.class, RelatedPerson.class} ) public static final String SP_PERFORMER = "performer"; /** * Fluent Client search parameter constant for performer @@ -2291,7 +2299,9 @@ public class Procedure extends DomainResource { * Path: Procedure.subject
*

*/ - @SearchParamDefinition(name="subject", path="Procedure.subject", description="Search by subject", type="reference" ) + // [Group, Patient] + // [Group, Patient] + @SearchParamDefinition(name="subject", path="Procedure.subject", description="Search by subject", type="reference", target={Group.class, Patient.class} ) public static final String SP_SUBJECT = "subject"; /** * Fluent Client search parameter constant for subject @@ -2317,7 +2327,9 @@ public class Procedure extends DomainResource { * Path: Procedure.subject
*

*/ - @SearchParamDefinition(name="patient", path="Procedure.subject", description="Search by subject - a patient", type="reference" ) + // [Group, Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="Procedure.subject", description="Search by subject - a patient", type="reference", target={Group.class, Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -2343,7 +2355,9 @@ public class Procedure extends DomainResource { * Path: Procedure.location
*

*/ - @SearchParamDefinition(name="location", path="Procedure.location", description="Where the procedure happened", type="reference" ) + // [Location] + // [Location] + @SearchParamDefinition(name="location", path="Procedure.location", description="Where the procedure happened", type="reference", target={Location.class} ) public static final String SP_LOCATION = "location"; /** * Fluent Client search parameter constant for location @@ -2369,7 +2383,9 @@ public class Procedure extends DomainResource { * Path: Procedure.encounter
*

*/ - @SearchParamDefinition(name="encounter", path="Procedure.encounter", description="The encounter associated with the procedure", type="reference" ) + // [Encounter] + // [Encounter] + @SearchParamDefinition(name="encounter", path="Procedure.encounter", description="The encounter associated with the procedure", type="reference", target={Encounter.class} ) public static final String SP_ENCOUNTER = "encounter"; /** * Fluent Client search parameter constant for encounter @@ -2395,7 +2411,9 @@ public class Procedure extends DomainResource { * Path: Procedure.category
*

*/ - @SearchParamDefinition(name="category", path="Procedure.category", description="Classification of the procedure", type="token" ) + // [] + // [] + @SearchParamDefinition(name="category", path="Procedure.category", description="Classification of the procedure", type="token", target={} ) public static final String SP_CATEGORY = "category"; /** * Fluent Client search parameter constant for category diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ProcedureRequest.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ProcedureRequest.java index f6a8bcc7e41..bde8acdf8a1 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ProcedureRequest.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ProcedureRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1474,7 +1474,9 @@ public class ProcedureRequest extends DomainResource { * Path: ProcedureRequest.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="ProcedureRequest.identifier", description="A unique identifier of the Procedure Request", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="ProcedureRequest.identifier", description="A unique identifier of the Procedure Request", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -1494,7 +1496,9 @@ public class ProcedureRequest extends DomainResource { * Path: ProcedureRequest.performer
*

*/ - @SearchParamDefinition(name="performer", path="ProcedureRequest.performer", description="Who should perform the procedure", type="reference" ) + // [Practitioner, Organization, Patient, RelatedPerson] + // [Practitioner, Organization, Patient, RelatedPerson] + @SearchParamDefinition(name="performer", path="ProcedureRequest.performer", description="Who should perform the procedure", type="reference", target={Practitioner.class, Organization.class, Patient.class, RelatedPerson.class} ) public static final String SP_PERFORMER = "performer"; /** * Fluent Client search parameter constant for performer @@ -1520,7 +1524,9 @@ public class ProcedureRequest extends DomainResource { * Path: ProcedureRequest.subject
*

*/ - @SearchParamDefinition(name="subject", path="ProcedureRequest.subject", description="Search by subject", type="reference" ) + // [Group, Patient] + // [Group, Patient] + @SearchParamDefinition(name="subject", path="ProcedureRequest.subject", description="Search by subject", type="reference", target={Group.class, Patient.class} ) public static final String SP_SUBJECT = "subject"; /** * Fluent Client search parameter constant for subject @@ -1546,7 +1552,9 @@ public class ProcedureRequest extends DomainResource { * Path: ProcedureRequest.subject
*

*/ - @SearchParamDefinition(name="patient", path="ProcedureRequest.subject", description="Search by subject - a patient", type="reference" ) + // [Group, Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="ProcedureRequest.subject", description="Search by subject - a patient", type="reference", target={Group.class, Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -1572,7 +1580,9 @@ public class ProcedureRequest extends DomainResource { * Path: ProcedureRequest.orderer
*

*/ - @SearchParamDefinition(name="orderer", path="ProcedureRequest.orderer", description="Who made request", type="reference" ) + // [Practitioner, Device, Patient, RelatedPerson] + // [Practitioner, Device, Patient, RelatedPerson] + @SearchParamDefinition(name="orderer", path="ProcedureRequest.orderer", description="Who made request", type="reference", target={Practitioner.class, Device.class, Patient.class, RelatedPerson.class} ) public static final String SP_ORDERER = "orderer"; /** * Fluent Client search parameter constant for orderer @@ -1598,7 +1608,9 @@ public class ProcedureRequest extends DomainResource { * Path: ProcedureRequest.encounter
*

*/ - @SearchParamDefinition(name="encounter", path="ProcedureRequest.encounter", description="Encounter request created during", type="reference" ) + // [Encounter] + // [Encounter] + @SearchParamDefinition(name="encounter", path="ProcedureRequest.encounter", description="Encounter request created during", type="reference", target={Encounter.class} ) public static final String SP_ENCOUNTER = "encounter"; /** * Fluent Client search parameter constant for encounter diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ProcessRequest.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ProcessRequest.java index 8275a160051..bb2a71e4c9b 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ProcessRequest.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ProcessRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1538,7 +1538,9 @@ public class ProcessRequest extends DomainResource { * Path: ProcessRequest.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="ProcessRequest.identifier", description="The business identifier of the ProcessRequest", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="ProcessRequest.identifier", description="The business identifier of the ProcessRequest", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -1558,7 +1560,9 @@ public class ProcessRequest extends DomainResource { * Path: ProcessRequest.organizationIdentifier
*

*/ - @SearchParamDefinition(name="organizationidentifier", path="ProcessRequest.organization.as(Identifier)", description="The organization who generated this request", type="token" ) + // [] + // [] + @SearchParamDefinition(name="organizationidentifier", path="ProcessRequest.organization.as(Identifier)", description="The organization who generated this request", type="token", target={} ) public static final String SP_ORGANIZATIONIDENTIFIER = "organizationidentifier"; /** * Fluent Client search parameter constant for organizationidentifier @@ -1578,7 +1582,9 @@ public class ProcessRequest extends DomainResource { * Path: ProcessRequest.action
*

*/ - @SearchParamDefinition(name="action", path="ProcessRequest.action", description="The action requested by this resource", type="token" ) + // [] + // [] + @SearchParamDefinition(name="action", path="ProcessRequest.action", description="The action requested by this resource", type="token", target={} ) public static final String SP_ACTION = "action"; /** * Fluent Client search parameter constant for action @@ -1598,7 +1604,9 @@ public class ProcessRequest extends DomainResource { * Path: ProcessRequest.organizationReference
*

*/ - @SearchParamDefinition(name="organizationreference", path="ProcessRequest.organization.as(Reference)", description="The organization who generated this request", type="reference" ) + // [Organization] + // [Organization] + @SearchParamDefinition(name="organizationreference", path="ProcessRequest.organization.as(Reference)", description="The organization who generated this request", type="reference", target={Organization.class} ) public static final String SP_ORGANIZATIONREFERENCE = "organizationreference"; /** * Fluent Client search parameter constant for organizationreference @@ -1624,7 +1632,9 @@ public class ProcessRequest extends DomainResource { * Path: ProcessRequest.providerReference
*

*/ - @SearchParamDefinition(name="providerreference", path="ProcessRequest.provider.as(Reference)", description="The provider who regenerated this request", type="reference" ) + // [Practitioner] + // [Practitioner] + @SearchParamDefinition(name="providerreference", path="ProcessRequest.provider.as(Reference)", description="The provider who regenerated this request", type="reference", target={Practitioner.class} ) public static final String SP_PROVIDERREFERENCE = "providerreference"; /** * Fluent Client search parameter constant for providerreference @@ -1650,7 +1660,9 @@ public class ProcessRequest extends DomainResource { * Path: ProcessRequest.providerIdentifier
*

*/ - @SearchParamDefinition(name="provideridentifier", path="ProcessRequest.provider.as(Identifier)", description="The provider who regenerated this request", type="token" ) + // [] + // [] + @SearchParamDefinition(name="provideridentifier", path="ProcessRequest.provider.as(Identifier)", description="The provider who regenerated this request", type="token", target={} ) public static final String SP_PROVIDERIDENTIFIER = "provideridentifier"; /** * Fluent Client search parameter constant for provideridentifier diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ProcessResponse.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ProcessResponse.java index 2bfb77a6e21..e80730a1149 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ProcessResponse.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ProcessResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1186,7 +1186,9 @@ public class ProcessResponse extends DomainResource { * Path: ProcessResponse.requestProviderIdentifier
*

*/ - @SearchParamDefinition(name="requestprovideridentifier", path="ProcessResponse.requestProvider.as(Identifier)", description="The Provider who is responsible the request transaction", type="token" ) + // [] + // [] + @SearchParamDefinition(name="requestprovideridentifier", path="ProcessResponse.requestProvider.as(Identifier)", description="The Provider who is responsible the request transaction", type="token", target={} ) public static final String SP_REQUESTPROVIDERIDENTIFIER = "requestprovideridentifier"; /** * Fluent Client search parameter constant for requestprovideridentifier @@ -1206,7 +1208,9 @@ public class ProcessResponse extends DomainResource { * Path: ProcessResponse.requestOrganizationIdentifier
*

*/ - @SearchParamDefinition(name="requestorganizationidentifier", path="ProcessResponse.requestOrganization.as(Identifier)", description="The Organization who is responsible the request transaction", type="token" ) + // [] + // [] + @SearchParamDefinition(name="requestorganizationidentifier", path="ProcessResponse.requestOrganization.as(Identifier)", description="The Organization who is responsible the request transaction", type="token", target={} ) public static final String SP_REQUESTORGANIZATIONIDENTIFIER = "requestorganizationidentifier"; /** * Fluent Client search parameter constant for requestorganizationidentifier @@ -1226,7 +1230,9 @@ public class ProcessResponse extends DomainResource { * Path: ProcessResponse.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="ProcessResponse.identifier", description="The business identifier of the Explanation of Benefit", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="ProcessResponse.identifier", description="The business identifier of the Explanation of Benefit", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -1246,7 +1252,9 @@ public class ProcessResponse extends DomainResource { * Path: ProcessResponse.organizationIdentifier
*

*/ - @SearchParamDefinition(name="organizationidentifier", path="ProcessResponse.organization.as(Identifier)", description="The organization who generated this resource", type="token" ) + // [] + // [] + @SearchParamDefinition(name="organizationidentifier", path="ProcessResponse.organization.as(Identifier)", description="The organization who generated this resource", type="token", target={} ) public static final String SP_ORGANIZATIONIDENTIFIER = "organizationidentifier"; /** * Fluent Client search parameter constant for organizationidentifier @@ -1266,7 +1274,9 @@ public class ProcessResponse extends DomainResource { * Path: ProcessResponse.requestIdentifier
*

*/ - @SearchParamDefinition(name="requestidentifier", path="ProcessResponse.request.as(Identifier)", description="The reference to the claim", type="token" ) + // [] + // [] + @SearchParamDefinition(name="requestidentifier", path="ProcessResponse.request.as(Identifier)", description="The reference to the claim", type="token", target={} ) public static final String SP_REQUESTIDENTIFIER = "requestidentifier"; /** * Fluent Client search parameter constant for requestidentifier @@ -1286,7 +1296,9 @@ public class ProcessResponse extends DomainResource { * Path: ProcessResponse.organizationReference
*

*/ - @SearchParamDefinition(name="organizationreference", path="ProcessResponse.organization.as(Reference)", description="The organization who generated this resource", type="reference" ) + // [Organization] + // [Organization] + @SearchParamDefinition(name="organizationreference", path="ProcessResponse.organization.as(Reference)", description="The organization who generated this resource", type="reference", target={Organization.class} ) public static final String SP_ORGANIZATIONREFERENCE = "organizationreference"; /** * Fluent Client search parameter constant for organizationreference @@ -1312,7 +1324,9 @@ public class ProcessResponse extends DomainResource { * Path: ProcessResponse.requestProviderReference
*

*/ - @SearchParamDefinition(name="requestproviderreference", path="ProcessResponse.requestProvider.as(Reference)", description="The Provider who is responsible the request transaction", type="reference" ) + // [Practitioner] + // [Practitioner] + @SearchParamDefinition(name="requestproviderreference", path="ProcessResponse.requestProvider.as(Reference)", description="The Provider who is responsible the request transaction", type="reference", target={Practitioner.class} ) public static final String SP_REQUESTPROVIDERREFERENCE = "requestproviderreference"; /** * Fluent Client search parameter constant for requestproviderreference @@ -1338,7 +1352,9 @@ public class ProcessResponse extends DomainResource { * Path: ProcessResponse.requestOrganizationReference
*

*/ - @SearchParamDefinition(name="requestorganizationreference", path="ProcessResponse.requestOrganization.as(Reference)", description="The Organization who is responsible the request transaction", type="reference" ) + // [Organization] + // [Organization] + @SearchParamDefinition(name="requestorganizationreference", path="ProcessResponse.requestOrganization.as(Reference)", description="The Organization who is responsible the request transaction", type="reference", target={Organization.class} ) public static final String SP_REQUESTORGANIZATIONREFERENCE = "requestorganizationreference"; /** * Fluent Client search parameter constant for requestorganizationreference @@ -1364,6 +1380,8 @@ public class ProcessResponse extends DomainResource { * Path: ProcessResponse.requestReference
*

*/ + // [Any] + // [Any] @SearchParamDefinition(name="requestreference", path="ProcessResponse.request.as(Reference)", description="The reference to the claim", type="reference" ) public static final String SP_REQUESTREFERENCE = "requestreference"; /** diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Protocol.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Protocol.java index b93eabf75ef..ef0d9c2ced8 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Protocol.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Protocol.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -4076,7 +4076,9 @@ public class Protocol extends DomainResource { * Path: Protocol.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="Protocol.identifier", description="The unique id for a particular protocol", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="Protocol.identifier", description="The unique id for a particular protocol", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -4096,7 +4098,9 @@ public class Protocol extends DomainResource { * Path: Protocol.subject
*

*/ - @SearchParamDefinition(name="subject", path="Protocol.subject", description="Protocols with specified subject", type="reference" ) + // [Condition, Device, Medication] + // [Condition, Device, Medication] + @SearchParamDefinition(name="subject", path="Protocol.subject", description="Protocols with specified subject", type="reference", target={Condition.class, Device.class, Medication.class} ) public static final String SP_SUBJECT = "subject"; /** * Fluent Client search parameter constant for subject diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Provenance.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Provenance.java index e21082ce1ac..5eeb92eacce 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Provenance.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Provenance.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1951,7 +1951,9 @@ public class Provenance extends DomainResource { * Path: Provenance.signature.type
*

*/ - @SearchParamDefinition(name="sig", path="Provenance.signature.type", description="Indication of the reason the entity signed the object(s)", type="token" ) + // [] + // [] + @SearchParamDefinition(name="sig", path="Provenance.signature.type", description="Indication of the reason the entity signed the object(s)", type="token", target={} ) public static final String SP_SIG = "sig"; /** * Fluent Client search parameter constant for sig @@ -1971,7 +1973,9 @@ public class Provenance extends DomainResource { * Path: Provenance.entity.type
*

*/ - @SearchParamDefinition(name="entity-type", path="Provenance.entity.type", description="The type of resource in this entity", type="token" ) + // [] + // [] + @SearchParamDefinition(name="entity-type", path="Provenance.entity.type", description="The type of resource in this entity", type="token", target={} ) public static final String SP_ENTITY_TYPE = "entity-type"; /** * Fluent Client search parameter constant for entity-type @@ -1991,7 +1995,9 @@ public class Provenance extends DomainResource { * Path: Provenance.agent.actor
*

*/ - @SearchParamDefinition(name="agent", path="Provenance.agent.actor", description="Individual, device or organization playing role", type="reference" ) + // [Practitioner, Organization, Device, Patient, RelatedPerson] + // [Practitioner, Organization, Device, Patient, RelatedPerson] + @SearchParamDefinition(name="agent", path="Provenance.agent.actor", description="Individual, device or organization playing role", type="reference", target={Practitioner.class, Organization.class, Device.class, Patient.class, RelatedPerson.class} ) public static final String SP_AGENT = "agent"; /** * Fluent Client search parameter constant for agent @@ -2017,6 +2023,8 @@ public class Provenance extends DomainResource { * Path: Provenance.target
*

*/ + // [Any] + // [Patient] @SearchParamDefinition(name="patient", path="Provenance.target", description="Target Reference(s) (usually version specific)", type="reference" ) public static final String SP_PATIENT = "patient"; /** @@ -2043,7 +2051,9 @@ public class Provenance extends DomainResource { * Path: Provenance.period.start
*

*/ - @SearchParamDefinition(name="start", path="Provenance.period.start", description="Starting time with inclusive boundary", type="date" ) + // [] + // [] + @SearchParamDefinition(name="start", path="Provenance.period.start", description="Starting time with inclusive boundary", type="date", target={} ) public static final String SP_START = "start"; /** * Fluent Client search parameter constant for start @@ -2063,7 +2073,9 @@ public class Provenance extends DomainResource { * Path: Provenance.period.end
*

*/ - @SearchParamDefinition(name="end", path="Provenance.period.end", description="End time with inclusive boundary, if not ongoing", type="date" ) + // [] + // [] + @SearchParamDefinition(name="end", path="Provenance.period.end", description="End time with inclusive boundary, if not ongoing", type="date", target={} ) public static final String SP_END = "end"; /** * Fluent Client search parameter constant for end @@ -2083,7 +2095,9 @@ public class Provenance extends DomainResource { * Path: Provenance.location
*

*/ - @SearchParamDefinition(name="location", path="Provenance.location", description="Where the activity occurred, if relevant", type="reference" ) + // [Location] + // [Location] + @SearchParamDefinition(name="location", path="Provenance.location", description="Where the activity occurred, if relevant", type="reference", target={Location.class} ) public static final String SP_LOCATION = "location"; /** * Fluent Client search parameter constant for location @@ -2109,7 +2123,9 @@ public class Provenance extends DomainResource { * Path: Provenance.agent.userId
*

*/ - @SearchParamDefinition(name="userid", path="Provenance.agent.userId", description="Authorization-system identifier for the agent", type="token" ) + // [] + // [] + @SearchParamDefinition(name="userid", path="Provenance.agent.userId", description="Authorization-system identifier for the agent", type="token", target={} ) public static final String SP_USERID = "userid"; /** * Fluent Client search parameter constant for userid @@ -2129,7 +2145,9 @@ public class Provenance extends DomainResource { * Path: Provenance.entity.reference
*

*/ - @SearchParamDefinition(name="entity", path="Provenance.entity.reference", description="Identity of entity", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="entity", path="Provenance.entity.reference", description="Identity of entity", type="uri", target={} ) public static final String SP_ENTITY = "entity"; /** * Fluent Client search parameter constant for entity @@ -2149,6 +2167,8 @@ public class Provenance extends DomainResource { * Path: Provenance.target
*

*/ + // [Any] + // [Any] @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-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Questionnaire.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Questionnaire.java index 917669c1fe3..49ac9d318aa 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Questionnaire.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Questionnaire.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -3487,7 +3487,9 @@ public class Questionnaire extends DomainResource { * Path: Questionnaire.date
*

*/ - @SearchParamDefinition(name="date", path="Questionnaire.date", description="When the questionnaire was last changed", type="date" ) + // [] + // [] + @SearchParamDefinition(name="date", path="Questionnaire.date", description="When the questionnaire was last changed", type="date", target={} ) public static final String SP_DATE = "date"; /** * Fluent Client search parameter constant for date @@ -3507,7 +3509,9 @@ public class Questionnaire extends DomainResource { * Path: Questionnaire.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="Questionnaire.identifier", description="An identifier for the questionnaire", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="Questionnaire.identifier", description="An identifier for the questionnaire", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -3527,7 +3531,9 @@ public class Questionnaire extends DomainResource { * Path: Questionnaire.item.concept
*

*/ - @SearchParamDefinition(name="code", path="Questionnaire.item.concept", description="A code that corresponds to the questionnaire or one of its groups", type="token" ) + // [] + // [] + @SearchParamDefinition(name="code", path="Questionnaire.item.concept", description="A code that corresponds to the questionnaire or one of its groups", type="token", target={} ) public static final String SP_CODE = "code"; /** * Fluent Client search parameter constant for code @@ -3547,7 +3553,9 @@ public class Questionnaire extends DomainResource { * Path: Questionnaire.useContext
*

*/ - @SearchParamDefinition(name="context", path="Questionnaire.useContext", description="A use context assigned to the questionnaire", type="token" ) + // [] + // [] + @SearchParamDefinition(name="context", path="Questionnaire.useContext", description="A use context assigned to the questionnaire", type="token", target={} ) public static final String SP_CONTEXT = "context"; /** * Fluent Client search parameter constant for context @@ -3567,7 +3575,9 @@ public class Questionnaire extends DomainResource { * Path: Questionnaire.publisher
*

*/ - @SearchParamDefinition(name="publisher", path="Questionnaire.publisher", description="The author of the questionnaire", type="string" ) + // [] + // [] + @SearchParamDefinition(name="publisher", path="Questionnaire.publisher", description="The author of the questionnaire", type="string", target={} ) public static final String SP_PUBLISHER = "publisher"; /** * Fluent Client search parameter constant for publisher @@ -3587,7 +3597,9 @@ public class Questionnaire extends DomainResource { * Path: Questionnaire.title
*

*/ - @SearchParamDefinition(name="title", path="Questionnaire.title", description="All or part of the name of the questionnaire", type="string" ) + // [] + // [] + @SearchParamDefinition(name="title", path="Questionnaire.title", description="All or part of the name of the questionnaire", type="string", target={} ) public static final String SP_TITLE = "title"; /** * Fluent Client search parameter constant for title @@ -3607,7 +3619,9 @@ public class Questionnaire extends DomainResource { * Path: Questionnaire.version
*

*/ - @SearchParamDefinition(name="version", path="Questionnaire.version", description="The business version of the questionnaire", type="string" ) + // [] + // [] + @SearchParamDefinition(name="version", path="Questionnaire.version", description="The business version of the questionnaire", type="string", target={} ) public static final String SP_VERSION = "version"; /** * Fluent Client search parameter constant for version @@ -3627,7 +3641,9 @@ public class Questionnaire extends DomainResource { * Path: Questionnaire.status
*

*/ - @SearchParamDefinition(name="status", path="Questionnaire.status", description="The status of the questionnaire", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="Questionnaire.status", description="The status of the questionnaire", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/QuestionnaireResponse.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/QuestionnaireResponse.java index 7172dcec898..2f088a5775c 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/QuestionnaireResponse.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/QuestionnaireResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1727,7 +1727,9 @@ public class QuestionnaireResponse extends DomainResource { * Path: QuestionnaireResponse.authored
*

*/ - @SearchParamDefinition(name="authored", path="QuestionnaireResponse.authored", description="When the questionnaire was authored", type="date" ) + // [] + // [] + @SearchParamDefinition(name="authored", path="QuestionnaireResponse.authored", description="When the questionnaire was authored", type="date", target={} ) public static final String SP_AUTHORED = "authored"; /** * Fluent Client search parameter constant for authored @@ -1747,7 +1749,9 @@ public class QuestionnaireResponse extends DomainResource { * Path: QuestionnaireResponse.questionnaire
*

*/ - @SearchParamDefinition(name="questionnaire", path="QuestionnaireResponse.questionnaire", description="The questionnaire the answers are provided for", type="reference" ) + // [Questionnaire] + // [Questionnaire] + @SearchParamDefinition(name="questionnaire", path="QuestionnaireResponse.questionnaire", description="The questionnaire the answers are provided for", type="reference", target={Questionnaire.class} ) public static final String SP_QUESTIONNAIRE = "questionnaire"; /** * Fluent Client search parameter constant for questionnaire @@ -1773,6 +1777,8 @@ public class QuestionnaireResponse extends DomainResource { * Path: QuestionnaireResponse.subject
*

*/ + // [Any] + // [Any] @SearchParamDefinition(name="subject", path="QuestionnaireResponse.subject", description="The subject of the questionnaire", type="reference" ) public static final String SP_SUBJECT = "subject"; /** @@ -1799,7 +1805,9 @@ public class QuestionnaireResponse extends DomainResource { * Path: QuestionnaireResponse.author
*

*/ - @SearchParamDefinition(name="author", path="QuestionnaireResponse.author", description="The author of the questionnaire", type="reference" ) + // [Practitioner, Device, Patient, RelatedPerson] + // [Practitioner, Device, Patient, RelatedPerson] + @SearchParamDefinition(name="author", path="QuestionnaireResponse.author", description="The author of the questionnaire", type="reference", target={Practitioner.class, Device.class, Patient.class, RelatedPerson.class} ) public static final String SP_AUTHOR = "author"; /** * Fluent Client search parameter constant for author @@ -1825,6 +1833,8 @@ public class QuestionnaireResponse extends DomainResource { * Path: QuestionnaireResponse.subject
*

*/ + // [Any] + // [Patient] @SearchParamDefinition(name="patient", path="QuestionnaireResponse.subject", description="The patient that is the subject of the questionnaire", type="reference" ) public static final String SP_PATIENT = "patient"; /** @@ -1851,7 +1861,9 @@ public class QuestionnaireResponse extends DomainResource { * Path: QuestionnaireResponse.encounter
*

*/ - @SearchParamDefinition(name="encounter", path="QuestionnaireResponse.encounter", description="Encounter during which questionnaire was authored", type="reference" ) + // [Encounter] + // [Encounter] + @SearchParamDefinition(name="encounter", path="QuestionnaireResponse.encounter", description="Encounter during which questionnaire was authored", type="reference", target={Encounter.class} ) public static final String SP_ENCOUNTER = "encounter"; /** * Fluent Client search parameter constant for encounter @@ -1877,7 +1889,9 @@ public class QuestionnaireResponse extends DomainResource { * Path: QuestionnaireResponse.source
*

*/ - @SearchParamDefinition(name="source", path="QuestionnaireResponse.source", description="The person who answered the questions", type="reference" ) + // [Practitioner, Patient, RelatedPerson] + // [Practitioner, Patient, RelatedPerson] + @SearchParamDefinition(name="source", path="QuestionnaireResponse.source", description="The person who answered the questions", type="reference", target={Practitioner.class, Patient.class, RelatedPerson.class} ) public static final String SP_SOURCE = "source"; /** * Fluent Client search parameter constant for source @@ -1903,7 +1917,9 @@ public class QuestionnaireResponse extends DomainResource { * Path: QuestionnaireResponse.status
*

*/ - @SearchParamDefinition(name="status", path="QuestionnaireResponse.status", description="The status of the questionnaire response", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="QuestionnaireResponse.status", description="The status of the questionnaire response", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ReferralRequest.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ReferralRequest.java index a6b4cbf4542..cd5325ec7a6 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ReferralRequest.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ReferralRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1576,7 +1576,9 @@ public class ReferralRequest extends DomainResource { * Path: ReferralRequest.authored
*

*/ - @SearchParamDefinition(name="date", path="ReferralRequest.authored", description="Creation or activation date", type="date" ) + // [] + // [] + @SearchParamDefinition(name="date", path="ReferralRequest.authored", description="Creation or activation date", type="date", target={} ) public static final String SP_DATE = "date"; /** * Fluent Client search parameter constant for date @@ -1596,7 +1598,9 @@ public class ReferralRequest extends DomainResource { * Path: ReferralRequest.requester
*

*/ - @SearchParamDefinition(name="requester", path="ReferralRequest.requester", description="Requester of referral / transfer of care", type="reference" ) + // [Practitioner, Organization, Patient] + // [Practitioner, Organization, Patient] + @SearchParamDefinition(name="requester", path="ReferralRequest.requester", description="Requester of referral / transfer of care", type="reference", target={Practitioner.class, Organization.class, Patient.class} ) public static final String SP_REQUESTER = "requester"; /** * Fluent Client search parameter constant for requester @@ -1622,7 +1626,9 @@ public class ReferralRequest extends DomainResource { * Path: ReferralRequest.parent
*

*/ - @SearchParamDefinition(name="parent", path="ReferralRequest.parent", description="Part of common request", type="token" ) + // [] + // [] + @SearchParamDefinition(name="parent", path="ReferralRequest.parent", description="Part of common request", type="token", target={} ) public static final String SP_PARENT = "parent"; /** * Fluent Client search parameter constant for parent @@ -1642,7 +1648,9 @@ public class ReferralRequest extends DomainResource { * Path: ReferralRequest.specialty
*

*/ - @SearchParamDefinition(name="specialty", path="ReferralRequest.specialty", description="The specialty that the referral is for", type="token" ) + // [] + // [] + @SearchParamDefinition(name="specialty", path="ReferralRequest.specialty", description="The specialty that the referral is for", type="token", target={} ) public static final String SP_SPECIALTY = "specialty"; /** * Fluent Client search parameter constant for specialty @@ -1662,7 +1670,9 @@ public class ReferralRequest extends DomainResource { * Path: ReferralRequest.patient
*

*/ - @SearchParamDefinition(name="patient", path="ReferralRequest.patient", description="Who the referral is about", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="ReferralRequest.patient", description="Who the referral is about", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -1688,7 +1698,9 @@ public class ReferralRequest extends DomainResource { * Path: ReferralRequest.recipient
*

*/ - @SearchParamDefinition(name="recipient", path="ReferralRequest.recipient", description="The person that the referral was sent to", type="reference" ) + // [Practitioner, Organization] + // [Practitioner, Organization] + @SearchParamDefinition(name="recipient", path="ReferralRequest.recipient", description="The person that the referral was sent to", type="reference", target={Practitioner.class, Organization.class} ) public static final String SP_RECIPIENT = "recipient"; /** * Fluent Client search parameter constant for recipient @@ -1714,7 +1726,9 @@ public class ReferralRequest extends DomainResource { * Path: ReferralRequest.context
*

*/ - @SearchParamDefinition(name="context", path="ReferralRequest.context", description="Part of encounter or episode of care", type="reference" ) + // [EpisodeOfCare, Encounter] + // [EpisodeOfCare, Encounter] + @SearchParamDefinition(name="context", path="ReferralRequest.context", description="Part of encounter or episode of care", type="reference", target={EpisodeOfCare.class, Encounter.class} ) public static final String SP_CONTEXT = "context"; /** * Fluent Client search parameter constant for context @@ -1740,7 +1754,9 @@ public class ReferralRequest extends DomainResource { * Path: ReferralRequest.type
*

*/ - @SearchParamDefinition(name="type", path="ReferralRequest.type", description="The type of the referral", type="token" ) + // [] + // [] + @SearchParamDefinition(name="type", path="ReferralRequest.type", description="The type of the referral", type="token", target={} ) public static final String SP_TYPE = "type"; /** * Fluent Client search parameter constant for type @@ -1760,7 +1776,9 @@ public class ReferralRequest extends DomainResource { * Path: ReferralRequest.priority
*

*/ - @SearchParamDefinition(name="priority", path="ReferralRequest.priority", description="The priority assigned to the referral", type="token" ) + // [] + // [] + @SearchParamDefinition(name="priority", path="ReferralRequest.priority", description="The priority assigned to the referral", type="token", target={} ) public static final String SP_PRIORITY = "priority"; /** * Fluent Client search parameter constant for priority @@ -1780,7 +1798,9 @@ public class ReferralRequest extends DomainResource { * Path: ReferralRequest.category
*

*/ - @SearchParamDefinition(name="category", path="ReferralRequest.category", description="Proposal, plan or request", type="token" ) + // [] + // [] + @SearchParamDefinition(name="category", path="ReferralRequest.category", description="Proposal, plan or request", type="token", target={} ) public static final String SP_CATEGORY = "category"; /** * Fluent Client search parameter constant for category @@ -1800,7 +1820,9 @@ public class ReferralRequest extends DomainResource { * Path: ReferralRequest.basedOn
*

*/ - @SearchParamDefinition(name="basedon", path="ReferralRequest.basedOn", description="Request being fulfilled", type="reference" ) + // [ReferralRequest, CarePlan, DiagnosticOrder, ProcedureRequest] + // [ReferralRequest, CarePlan, DiagnosticOrder, ProcedureRequest] + @SearchParamDefinition(name="basedon", path="ReferralRequest.basedOn", description="Request being fulfilled", type="reference", target={ReferralRequest.class, CarePlan.class, DiagnosticOrder.class, ProcedureRequest.class} ) public static final String SP_BASEDON = "basedon"; /** * Fluent Client search parameter constant for basedon @@ -1826,7 +1848,9 @@ public class ReferralRequest extends DomainResource { * Path: ReferralRequest.status
*

*/ - @SearchParamDefinition(name="status", path="ReferralRequest.status", description="The status of the referral", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="ReferralRequest.status", description="The status of the referral", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/RelatedPerson.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/RelatedPerson.java index ba182cab4b4..da31313b695 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/RelatedPerson.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/RelatedPerson.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -822,7 +822,9 @@ public class RelatedPerson extends DomainResource { * Path: RelatedPerson.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="RelatedPerson.identifier", description="A patient Identifier", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="RelatedPerson.identifier", description="A patient Identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -842,7 +844,9 @@ public class RelatedPerson extends DomainResource { * Path: RelatedPerson.address
*

*/ - @SearchParamDefinition(name="address", path="RelatedPerson.address", description="An address in any kind of address/part", type="string" ) + // [] + // [] + @SearchParamDefinition(name="address", path="RelatedPerson.address", description="An address in any kind of address/part", type="string", target={} ) public static final String SP_ADDRESS = "address"; /** * Fluent Client search parameter constant for address @@ -862,7 +866,9 @@ public class RelatedPerson extends DomainResource { * Path: RelatedPerson.birthDate
*

*/ - @SearchParamDefinition(name="birthdate", path="RelatedPerson.birthDate", description="The Related Person's date of birth", type="date" ) + // [] + // [] + @SearchParamDefinition(name="birthdate", path="RelatedPerson.birthDate", description="The Related Person's date of birth", type="date", target={} ) public static final String SP_BIRTHDATE = "birthdate"; /** * Fluent Client search parameter constant for birthdate @@ -882,7 +888,9 @@ public class RelatedPerson extends DomainResource { * Path: RelatedPerson.address.state
*

*/ - @SearchParamDefinition(name="address-state", path="RelatedPerson.address.state", description="A state specified in an address", type="string" ) + // [] + // [] + @SearchParamDefinition(name="address-state", path="RelatedPerson.address.state", description="A state specified in an address", type="string", target={} ) public static final String SP_ADDRESS_STATE = "address-state"; /** * Fluent Client search parameter constant for address-state @@ -902,7 +910,9 @@ public class RelatedPerson extends DomainResource { * Path: RelatedPerson.gender
*

*/ - @SearchParamDefinition(name="gender", path="RelatedPerson.gender", description="Gender of the person", type="token" ) + // [] + // [] + @SearchParamDefinition(name="gender", path="RelatedPerson.gender", description="Gender of the person", type="token", target={} ) public static final String SP_GENDER = "gender"; /** * Fluent Client search parameter constant for gender @@ -922,7 +932,9 @@ public class RelatedPerson extends DomainResource { * Path: RelatedPerson.address.postalCode
*

*/ - @SearchParamDefinition(name="address-postalcode", path="RelatedPerson.address.postalCode", description="A postal code specified in an address", type="string" ) + // [] + // [] + @SearchParamDefinition(name="address-postalcode", path="RelatedPerson.address.postalCode", description="A postal code specified in an address", type="string", target={} ) public static final String SP_ADDRESS_POSTALCODE = "address-postalcode"; /** * Fluent Client search parameter constant for address-postalcode @@ -942,7 +954,9 @@ public class RelatedPerson extends DomainResource { * Path: RelatedPerson.address.country
*

*/ - @SearchParamDefinition(name="address-country", path="RelatedPerson.address.country", description="A country specified in an address", type="string" ) + // [] + // [] + @SearchParamDefinition(name="address-country", path="RelatedPerson.address.country", description="A country specified in an address", type="string", target={} ) public static final String SP_ADDRESS_COUNTRY = "address-country"; /** * Fluent Client search parameter constant for address-country @@ -962,7 +976,9 @@ public class RelatedPerson extends DomainResource { * Path: RelatedPerson.name
*

*/ - @SearchParamDefinition(name="phonetic", path="RelatedPerson.name", description="A portion of name using some kind of phonetic matching algorithm", type="string" ) + // [] + // [] + @SearchParamDefinition(name="phonetic", path="RelatedPerson.name", description="A portion of name using some kind of phonetic matching algorithm", type="string", target={} ) public static final String SP_PHONETIC = "phonetic"; /** * Fluent Client search parameter constant for phonetic @@ -982,7 +998,9 @@ public class RelatedPerson extends DomainResource { * Path: RelatedPerson.telecom(system=phone)
*

*/ - @SearchParamDefinition(name="phone", path="RelatedPerson.telecom.where(system='phone')", description="A value in a phone contact", type="token" ) + // [] + // [] + @SearchParamDefinition(name="phone", path="RelatedPerson.telecom.where(system='phone')", description="A value in a phone contact", type="token", target={} ) public static final String SP_PHONE = "phone"; /** * Fluent Client search parameter constant for phone @@ -1002,7 +1020,9 @@ public class RelatedPerson extends DomainResource { * Path: RelatedPerson.patient
*

*/ - @SearchParamDefinition(name="patient", path="RelatedPerson.patient", description="The patient this person is related to", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="RelatedPerson.patient", description="The patient this person is related to", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -1028,7 +1048,9 @@ public class RelatedPerson extends DomainResource { * Path: RelatedPerson.name
*

*/ - @SearchParamDefinition(name="name", path="RelatedPerson.name", description="A portion of name in any name part", type="string" ) + // [] + // [] + @SearchParamDefinition(name="name", path="RelatedPerson.name", description="A portion of name in any name part", type="string", target={} ) public static final String SP_NAME = "name"; /** * Fluent Client search parameter constant for name @@ -1048,7 +1070,9 @@ public class RelatedPerson extends DomainResource { * Path: RelatedPerson.address.use
*

*/ - @SearchParamDefinition(name="address-use", path="RelatedPerson.address.use", description="A use code specified in an address", type="token" ) + // [] + // [] + @SearchParamDefinition(name="address-use", path="RelatedPerson.address.use", description="A use code specified in an address", type="token", target={} ) public static final String SP_ADDRESS_USE = "address-use"; /** * Fluent Client search parameter constant for address-use @@ -1068,7 +1092,9 @@ public class RelatedPerson extends DomainResource { * Path: RelatedPerson.telecom
*

*/ - @SearchParamDefinition(name="telecom", path="RelatedPerson.telecom", description="The value in any kind of contact", type="token" ) + // [] + // [] + @SearchParamDefinition(name="telecom", path="RelatedPerson.telecom", description="The value in any kind of contact", type="token", target={} ) public static final String SP_TELECOM = "telecom"; /** * Fluent Client search parameter constant for telecom @@ -1088,7 +1114,9 @@ public class RelatedPerson extends DomainResource { * Path: RelatedPerson.address.city
*

*/ - @SearchParamDefinition(name="address-city", path="RelatedPerson.address.city", description="A city specified in an address", type="string" ) + // [] + // [] + @SearchParamDefinition(name="address-city", path="RelatedPerson.address.city", description="A city specified in an address", type="string", target={} ) public static final String SP_ADDRESS_CITY = "address-city"; /** * Fluent Client search parameter constant for address-city @@ -1108,7 +1136,9 @@ public class RelatedPerson extends DomainResource { * Path: RelatedPerson.telecom(system=email)
*

*/ - @SearchParamDefinition(name="email", path="RelatedPerson.telecom.where(system='email')", description="A value in an email contact", type="token" ) + // [] + // [] + @SearchParamDefinition(name="email", path="RelatedPerson.telecom.where(system='email')", description="A value in an email contact", type="token", target={} ) public static final String SP_EMAIL = "email"; /** * Fluent Client search parameter constant for email diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Resource.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Resource.java index afdc6cb2471..66e49c478a0 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Resource.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Resource.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/RiskAssessment.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/RiskAssessment.java index a92b18f795f..0c3cef9be52 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/RiskAssessment.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/RiskAssessment.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1271,7 +1271,9 @@ public class RiskAssessment extends DomainResource { * Path: RiskAssessment.date
*

*/ - @SearchParamDefinition(name="date", path="RiskAssessment.date", description="When was assessment made?", type="date" ) + // [] + // [] + @SearchParamDefinition(name="date", path="RiskAssessment.date", description="When was assessment made?", type="date", target={} ) public static final String SP_DATE = "date"; /** * Fluent Client search parameter constant for date @@ -1291,7 +1293,9 @@ public class RiskAssessment extends DomainResource { * Path: RiskAssessment.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="RiskAssessment.identifier", description="Unique identifier for the assessment", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="RiskAssessment.identifier", description="Unique identifier for the assessment", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -1311,7 +1315,9 @@ public class RiskAssessment extends DomainResource { * Path: RiskAssessment.condition
*

*/ - @SearchParamDefinition(name="condition", path="RiskAssessment.condition", description="Condition assessed", type="reference" ) + // [Condition] + // [Condition] + @SearchParamDefinition(name="condition", path="RiskAssessment.condition", description="Condition assessed", type="reference", target={Condition.class} ) public static final String SP_CONDITION = "condition"; /** * Fluent Client search parameter constant for condition @@ -1337,7 +1343,9 @@ public class RiskAssessment extends DomainResource { * Path: RiskAssessment.performer
*

*/ - @SearchParamDefinition(name="performer", path="RiskAssessment.performer", description="Who did assessment?", type="reference" ) + // [Practitioner, Device] + // [Practitioner, Device] + @SearchParamDefinition(name="performer", path="RiskAssessment.performer", description="Who did assessment?", type="reference", target={Practitioner.class, Device.class} ) public static final String SP_PERFORMER = "performer"; /** * Fluent Client search parameter constant for performer @@ -1363,7 +1371,9 @@ public class RiskAssessment extends DomainResource { * Path: RiskAssessment.method
*

*/ - @SearchParamDefinition(name="method", path="RiskAssessment.method", description="Evaluation mechanism", type="token" ) + // [] + // [] + @SearchParamDefinition(name="method", path="RiskAssessment.method", description="Evaluation mechanism", type="token", target={} ) public static final String SP_METHOD = "method"; /** * Fluent Client search parameter constant for method @@ -1383,7 +1393,9 @@ public class RiskAssessment extends DomainResource { * Path: RiskAssessment.subject
*

*/ - @SearchParamDefinition(name="subject", path="RiskAssessment.subject", description="Who/what does assessment apply to?", type="reference" ) + // [Group, Patient] + // [Group, Patient] + @SearchParamDefinition(name="subject", path="RiskAssessment.subject", description="Who/what does assessment apply to?", type="reference", target={Group.class, Patient.class} ) public static final String SP_SUBJECT = "subject"; /** * Fluent Client search parameter constant for subject @@ -1409,7 +1421,9 @@ public class RiskAssessment extends DomainResource { * Path: RiskAssessment.subject
*

*/ - @SearchParamDefinition(name="patient", path="RiskAssessment.subject", description="Who/what does assessment apply to?", type="reference" ) + // [Group, Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="RiskAssessment.subject", description="Who/what does assessment apply to?", type="reference", target={Group.class, Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -1435,7 +1449,9 @@ public class RiskAssessment extends DomainResource { * Path: RiskAssessment.encounter
*

*/ - @SearchParamDefinition(name="encounter", path="RiskAssessment.encounter", description="Where was assessment performed?", type="reference" ) + // [Encounter] + // [Encounter] + @SearchParamDefinition(name="encounter", path="RiskAssessment.encounter", description="Where was assessment performed?", type="reference", target={Encounter.class} ) public static final String SP_ENCOUNTER = "encounter"; /** * Fluent Client search parameter constant for encounter diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Schedule.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Schedule.java index 3ab0919c00b..c0e22797931 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Schedule.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Schedule.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -623,7 +623,9 @@ public class Schedule extends DomainResource { * Path: Schedule.actor
*

*/ - @SearchParamDefinition(name="actor", path="Schedule.actor", description="The individual(HealthcareService, Practitioner, Location, ...) to find a Schedule for", type="reference" ) + // [Practitioner, Device, Patient, HealthcareService, RelatedPerson, Location] + // [Practitioner, Device, Patient, HealthcareService, RelatedPerson, Location] + @SearchParamDefinition(name="actor", path="Schedule.actor", description="The individual(HealthcareService, Practitioner, Location, ...) to find a Schedule for", type="reference", target={Practitioner.class, Device.class, Patient.class, HealthcareService.class, RelatedPerson.class, Location.class} ) public static final String SP_ACTOR = "actor"; /** * Fluent Client search parameter constant for actor @@ -649,7 +651,9 @@ public class Schedule extends DomainResource { * Path: Schedule.planningHorizon
*

*/ - @SearchParamDefinition(name="date", path="Schedule.planningHorizon", description="Search for Schedule resources that have a period that contains this date specified", type="date" ) + // [] + // [] + @SearchParamDefinition(name="date", path="Schedule.planningHorizon", description="Search for Schedule resources that have a period that contains this date specified", type="date", target={} ) public static final String SP_DATE = "date"; /** * Fluent Client search parameter constant for date @@ -669,7 +673,9 @@ public class Schedule extends DomainResource { * Path: Schedule.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="Schedule.identifier", description="A Schedule Identifier", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="Schedule.identifier", description="A Schedule Identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -689,7 +695,9 @@ public class Schedule extends DomainResource { * Path: Schedule.serviceType
*

*/ - @SearchParamDefinition(name="type", path="Schedule.serviceType", description="The type of appointments that can be booked into associated slot(s)", type="token" ) + // [] + // [] + @SearchParamDefinition(name="type", path="Schedule.serviceType", description="The type of appointments that can be booked into associated slot(s)", type="token", target={} ) public static final String SP_TYPE = "type"; /** * Fluent Client search parameter constant for type diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/SearchParameter.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/SearchParameter.java index 8aeeda45f04..c0e2e237ff5 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/SearchParameter.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/SearchParameter.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1728,7 +1728,9 @@ public class SearchParameter extends DomainResource { * Path: SearchParameter.code
*

*/ - @SearchParamDefinition(name="code", path="SearchParameter.code", description="Code used in URL", type="token" ) + // [] + // [] + @SearchParamDefinition(name="code", path="SearchParameter.code", description="Code used in URL", type="token", target={} ) public static final String SP_CODE = "code"; /** * Fluent Client search parameter constant for code @@ -1748,7 +1750,9 @@ public class SearchParameter extends DomainResource { * Path: SearchParameter.name
*

*/ - @SearchParamDefinition(name="name", path="SearchParameter.name", description="Informal name for this search parameter", type="string" ) + // [] + // [] + @SearchParamDefinition(name="name", path="SearchParameter.name", description="Informal name for this search parameter", type="string", target={} ) public static final String SP_NAME = "name"; /** * Fluent Client search parameter constant for name @@ -1768,7 +1772,9 @@ public class SearchParameter extends DomainResource { * Path: SearchParameter.useContext
*

*/ - @SearchParamDefinition(name="context", path="SearchParameter.useContext", description="A use context assigned to the search parameter", type="token" ) + // [] + // [] + @SearchParamDefinition(name="context", path="SearchParameter.useContext", description="A use context assigned to the search parameter", type="token", target={} ) public static final String SP_CONTEXT = "context"; /** * Fluent Client search parameter constant for context @@ -1788,7 +1794,9 @@ public class SearchParameter extends DomainResource { * Path: SearchParameter.description
*

*/ - @SearchParamDefinition(name="description", path="SearchParameter.description", description="Documentation for search parameter", type="string" ) + // [] + // [] + @SearchParamDefinition(name="description", path="SearchParameter.description", description="Documentation for search parameter", type="string", target={} ) public static final String SP_DESCRIPTION = "description"; /** * Fluent Client search parameter constant for description @@ -1808,7 +1816,9 @@ public class SearchParameter extends DomainResource { * Path: SearchParameter.type
*

*/ - @SearchParamDefinition(name="type", path="SearchParameter.type", description="number | date | string | token | reference | composite | quantity | uri", type="token" ) + // [] + // [] + @SearchParamDefinition(name="type", path="SearchParameter.type", description="number | date | string | token | reference | composite | quantity | uri", type="token", target={} ) public static final String SP_TYPE = "type"; /** * Fluent Client search parameter constant for type @@ -1828,7 +1838,9 @@ public class SearchParameter extends DomainResource { * Path: SearchParameter.url
*

*/ - @SearchParamDefinition(name="url", path="SearchParameter.url", description="Absolute URL used to reference this search parameter", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="url", path="SearchParameter.url", description="Absolute URL used to reference this search parameter", type="uri", target={} ) public static final String SP_URL = "url"; /** * Fluent Client search parameter constant for url @@ -1848,7 +1860,9 @@ public class SearchParameter extends DomainResource { * Path: SearchParameter.base
*

*/ - @SearchParamDefinition(name="base", path="SearchParameter.base", description="The resource type this search parameter applies to", type="token" ) + // [] + // [] + @SearchParamDefinition(name="base", path="SearchParameter.base", description="The resource type this search parameter applies to", type="token", target={} ) public static final String SP_BASE = "base"; /** * Fluent Client search parameter constant for base @@ -1868,7 +1882,9 @@ public class SearchParameter extends DomainResource { * Path: SearchParameter.target
*

*/ - @SearchParamDefinition(name="target", path="SearchParameter.target", description="Types of resource (if a resource reference)", type="token" ) + // [] + // [] + @SearchParamDefinition(name="target", path="SearchParameter.target", description="Types of resource (if a resource reference)", type="token", target={} ) public static final String SP_TARGET = "target"; /** * Fluent Client search parameter constant for target diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Sequence.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Sequence.java index ad6dd966fff..a86bf11f358 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Sequence.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Sequence.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -3912,7 +3912,9 @@ public class Sequence extends DomainResource { * Path:
*

*/ - @SearchParamDefinition(name="coordinate", path="", description="Genomic coordinate of the sequence. For example, a search for sequence in region 1:123-345 can be represented as `coordinate=1$lt345$gt123`", type="composite", compositeOf={"chromosome", "start"} ) + // [] + // [] + @SearchParamDefinition(name="coordinate", path="", description="Genomic coordinate of the sequence. For example, a search for sequence in region 1:123-345 can be represented as `coordinate=1$lt345$gt123`", type="composite", compositeOf={"chromosome", "start"}, target={} ) public static final String SP_COORDINATE = "coordinate"; /** * Fluent Client search parameter constant for coordinate @@ -3932,7 +3934,9 @@ public class Sequence extends DomainResource { * Path: Sequence.species
*

*/ - @SearchParamDefinition(name="species", path="Sequence.species", description="The organism from which sample of the sequence was extracted.", type="token" ) + // [] + // [] + @SearchParamDefinition(name="species", path="Sequence.species", description="The organism from which sample of the sequence was extracted.", type="token", target={} ) public static final String SP_SPECIES = "species"; /** * Fluent Client search parameter constant for species @@ -3952,7 +3956,9 @@ public class Sequence extends DomainResource { * Path: Sequence.patient
*

*/ - @SearchParamDefinition(name="patient", path="Sequence.patient", description="The subject that the observation is about", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="Sequence.patient", description="The subject that the observation is about", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -3978,7 +3984,9 @@ public class Sequence extends DomainResource { * Path: Sequence.referenceSeq.chromosome
*

*/ - @SearchParamDefinition(name="chromosome", path="Sequence.referenceSeq.chromosome", description="Chromosome of the sequence", type="token" ) + // [] + // [] + @SearchParamDefinition(name="chromosome", path="Sequence.referenceSeq.chromosome", description="Chromosome of the sequence", type="token", target={} ) public static final String SP_CHROMOSOME = "chromosome"; /** * Fluent Client search parameter constant for chromosome @@ -3998,7 +4006,9 @@ public class Sequence extends DomainResource { * Path: Sequence.variation.start
*

*/ - @SearchParamDefinition(name="start", path="Sequence.variation.start", description="Start position (0-based inclusive) of the sequence", type="number" ) + // [] + // [] + @SearchParamDefinition(name="start", path="Sequence.variation.start", description="Start position (0-based inclusive) of the sequence", type="number", target={} ) public static final String SP_START = "start"; /** * Fluent Client search parameter constant for start @@ -4018,7 +4028,9 @@ public class Sequence extends DomainResource { * Path: Sequence.variation.end
*

*/ - @SearchParamDefinition(name="end", path="Sequence.variation.end", description="End position (0-based exclusive) of the sequence", type="number" ) + // [] + // [] + @SearchParamDefinition(name="end", path="Sequence.variation.end", description="End position (0-based exclusive) of the sequence", type="number", target={} ) public static final String SP_END = "end"; /** * Fluent Client search parameter constant for end @@ -4038,7 +4050,9 @@ public class Sequence extends DomainResource { * Path: Sequence.type
*

*/ - @SearchParamDefinition(name="type", path="Sequence.type", description="The type of the variant: Amino acid / cDNA transcript / RNA variation.", type="token" ) + // [] + // [] + @SearchParamDefinition(name="type", path="Sequence.type", description="The type of the variant: Amino acid / cDNA transcript / RNA variation.", type="token", target={} ) public static final String SP_TYPE = "type"; /** * Fluent Client search parameter constant for type diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Slot.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Slot.java index dce0233eb4f..6cfa59271df 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Slot.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Slot.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1008,7 +1008,9 @@ public class Slot extends DomainResource { * Path: Slot.schedule
*

*/ - @SearchParamDefinition(name="schedule", path="Slot.schedule", description="The Schedule Resource that we are seeking a slot within", type="reference" ) + // [Schedule] + // [Schedule] + @SearchParamDefinition(name="schedule", path="Slot.schedule", description="The Schedule Resource that we are seeking a slot within", type="reference", target={Schedule.class} ) public static final String SP_SCHEDULE = "schedule"; /** * Fluent Client search parameter constant for schedule @@ -1034,7 +1036,9 @@ public class Slot extends DomainResource { * Path: Slot.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="Slot.identifier", description="A Slot Identifier", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="Slot.identifier", description="A Slot Identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -1054,7 +1058,9 @@ public class Slot extends DomainResource { * Path: Slot.start
*

*/ - @SearchParamDefinition(name="start", path="Slot.start", description="Appointment date/time.", type="date" ) + // [] + // [] + @SearchParamDefinition(name="start", path="Slot.start", description="Appointment date/time.", type="date", target={} ) public static final String SP_START = "start"; /** * Fluent Client search parameter constant for start @@ -1074,7 +1080,9 @@ public class Slot extends DomainResource { * Path: Slot.serviceType
*

*/ - @SearchParamDefinition(name="slot-type", path="Slot.serviceType", description="The type of appointments that can be booked into the slot", type="token" ) + // [] + // [] + @SearchParamDefinition(name="slot-type", path="Slot.serviceType", description="The type of appointments that can be booked into the slot", type="token", target={} ) public static final String SP_SLOT_TYPE = "slot-type"; /** * Fluent Client search parameter constant for slot-type @@ -1094,7 +1102,9 @@ public class Slot extends DomainResource { * Path: Slot.status
*

*/ - @SearchParamDefinition(name="status", path="Slot.status", description="The free/busy status of the appointment", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="Slot.status", description="The free/busy status of the appointment", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Specimen.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Specimen.java index 786f4354aa5..546e86c23d5 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Specimen.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Specimen.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -2140,7 +2140,9 @@ public class Specimen extends DomainResource { * Path: Specimen.container.type
*

*/ - @SearchParamDefinition(name="container", path="Specimen.container.type", description="The kind of specimen container", type="token" ) + // [] + // [] + @SearchParamDefinition(name="container", path="Specimen.container.type", description="The kind of specimen container", type="token", target={} ) public static final String SP_CONTAINER = "container"; /** * Fluent Client search parameter constant for container @@ -2160,7 +2162,9 @@ public class Specimen extends DomainResource { * Path: Specimen.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="Specimen.identifier", description="The unique identifier associated with the specimen", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="Specimen.identifier", description="The unique identifier associated with the specimen", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -2180,7 +2184,9 @@ public class Specimen extends DomainResource { * Path: Specimen.parent
*

*/ - @SearchParamDefinition(name="parent", path="Specimen.parent", description="The parent of the specimen", type="reference" ) + // [Specimen] + // [Specimen] + @SearchParamDefinition(name="parent", path="Specimen.parent", description="The parent of the specimen", type="reference", target={Specimen.class} ) public static final String SP_PARENT = "parent"; /** * Fluent Client search parameter constant for parent @@ -2206,7 +2212,9 @@ public class Specimen extends DomainResource { * Path: Specimen.container.identifier
*

*/ - @SearchParamDefinition(name="container-id", path="Specimen.container.identifier", description="The unique identifier associated with the specimen container", type="token" ) + // [] + // [] + @SearchParamDefinition(name="container-id", path="Specimen.container.identifier", description="The unique identifier associated with the specimen container", type="token", target={} ) public static final String SP_CONTAINER_ID = "container-id"; /** * Fluent Client search parameter constant for container-id @@ -2226,7 +2234,9 @@ public class Specimen extends DomainResource { * Path: Specimen.collection.bodySite
*

*/ - @SearchParamDefinition(name="bodysite", path="Specimen.collection.bodySite", description="The code for the body site from where the specimen originated", type="token" ) + // [] + // [] + @SearchParamDefinition(name="bodysite", path="Specimen.collection.bodySite", description="The code for the body site from where the specimen originated", type="token", target={} ) public static final String SP_BODYSITE = "bodysite"; /** * Fluent Client search parameter constant for bodysite @@ -2246,7 +2256,9 @@ public class Specimen extends DomainResource { * Path: Specimen.subject
*

*/ - @SearchParamDefinition(name="subject", path="Specimen.subject", description="The subject of the specimen", type="reference" ) + // [Group, Device, Patient, Substance] + // [Group, Device, Patient, Substance] + @SearchParamDefinition(name="subject", path="Specimen.subject", description="The subject of the specimen", type="reference", target={Group.class, Device.class, Patient.class, Substance.class} ) public static final String SP_SUBJECT = "subject"; /** * Fluent Client search parameter constant for subject @@ -2272,7 +2284,9 @@ public class Specimen extends DomainResource { * Path: Specimen.subject
*

*/ - @SearchParamDefinition(name="patient", path="Specimen.subject", description="The patient the specimen comes from", type="reference" ) + // [Group, Device, Patient, Substance] + // [Patient] + @SearchParamDefinition(name="patient", path="Specimen.subject", description="The patient the specimen comes from", type="reference", target={Group.class, Device.class, Patient.class, Substance.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -2298,7 +2312,9 @@ public class Specimen extends DomainResource { * Path: Specimen.collection.collected[x]
*

*/ - @SearchParamDefinition(name="collected", path="Specimen.collection.collected", description="The date the specimen was collected", type="date" ) + // [] + // [] + @SearchParamDefinition(name="collected", path="Specimen.collection.collected", description="The date the specimen was collected", type="date", target={} ) public static final String SP_COLLECTED = "collected"; /** * Fluent Client search parameter constant for collected @@ -2318,7 +2334,9 @@ public class Specimen extends DomainResource { * Path: Specimen.accessionIdentifier
*

*/ - @SearchParamDefinition(name="accession", path="Specimen.accessionIdentifier", description="The accession number associated with the specimen", type="token" ) + // [] + // [] + @SearchParamDefinition(name="accession", path="Specimen.accessionIdentifier", description="The accession number associated with the specimen", type="token", target={} ) public static final String SP_ACCESSION = "accession"; /** * Fluent Client search parameter constant for accession @@ -2338,7 +2356,9 @@ public class Specimen extends DomainResource { * Path: Specimen.type
*

*/ - @SearchParamDefinition(name="type", path="Specimen.type", description="The specimen type", type="token" ) + // [] + // [] + @SearchParamDefinition(name="type", path="Specimen.type", description="The specimen type", type="token", target={} ) public static final String SP_TYPE = "type"; /** * Fluent Client search parameter constant for type @@ -2358,7 +2378,9 @@ public class Specimen extends DomainResource { * Path: Specimen.collection.collector
*

*/ - @SearchParamDefinition(name="collector", path="Specimen.collection.collector", description="Who collected the specimen", type="reference" ) + // [Practitioner] + // [Practitioner] + @SearchParamDefinition(name="collector", path="Specimen.collection.collector", description="Who collected the specimen", type="reference", target={Practitioner.class} ) public static final String SP_COLLECTOR = "collector"; /** * Fluent Client search parameter constant for collector diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/StructureDefinition.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/StructureDefinition.java index 678492fe0e4..b674fd102a3 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/StructureDefinition.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/StructureDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -3202,7 +3202,9 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.date
*

*/ - @SearchParamDefinition(name="date", path="StructureDefinition.date", description="The profile publication date", type="date" ) + // [] + // [] + @SearchParamDefinition(name="date", path="StructureDefinition.date", description="The profile publication date", type="date", target={} ) public static final String SP_DATE = "date"; /** * Fluent Client search parameter constant for date @@ -3222,7 +3224,9 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="StructureDefinition.identifier", description="The identifier of the profile", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="StructureDefinition.identifier", description="The identifier of the profile", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -3242,7 +3246,9 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.code
*

*/ - @SearchParamDefinition(name="code", path="StructureDefinition.code", description="A code for the profile", type="token" ) + // [] + // [] + @SearchParamDefinition(name="code", path="StructureDefinition.code", description="A code for the profile", type="token", target={} ) public static final String SP_CODE = "code"; /** * Fluent Client search parameter constant for code @@ -3262,7 +3268,9 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.snapshot.element.binding.valueSet[x]
*

*/ - @SearchParamDefinition(name="valueset", path="StructureDefinition.snapshot.element.binding.valueSet", description="A vocabulary binding reference", type="reference" ) + // [ValueSet] + // [ValueSet] + @SearchParamDefinition(name="valueset", path="StructureDefinition.snapshot.element.binding.valueSet", description="A vocabulary binding reference", type="reference", target={ValueSet.class} ) public static final String SP_VALUESET = "valueset"; /** * Fluent Client search parameter constant for valueset @@ -3288,7 +3296,9 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.kind
*

*/ - @SearchParamDefinition(name="kind", path="StructureDefinition.kind", description="datatype | resource | logical", type="token" ) + // [] + // [] + @SearchParamDefinition(name="kind", path="StructureDefinition.kind", description="datatype | resource | logical", type="token", target={} ) public static final String SP_KIND = "kind"; /** * Fluent Client search parameter constant for kind @@ -3308,7 +3318,9 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.display
*

*/ - @SearchParamDefinition(name="display", path="StructureDefinition.display", description="Use this name when displaying the value", type="string" ) + // [] + // [] + @SearchParamDefinition(name="display", path="StructureDefinition.display", description="Use this name when displaying the value", type="string", target={} ) public static final String SP_DISPLAY = "display"; /** * Fluent Client search parameter constant for display @@ -3328,7 +3340,9 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.description
*

*/ - @SearchParamDefinition(name="description", path="StructureDefinition.description", description="Text search in the description of the profile", type="string" ) + // [] + // [] + @SearchParamDefinition(name="description", path="StructureDefinition.description", description="Text search in the description of the profile", type="string", target={} ) public static final String SP_DESCRIPTION = "description"; /** * Fluent Client search parameter constant for description @@ -3348,7 +3362,9 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.experimental
*

*/ - @SearchParamDefinition(name="experimental", path="StructureDefinition.experimental", description="If for testing purposes, not real usage", type="token" ) + // [] + // [] + @SearchParamDefinition(name="experimental", path="StructureDefinition.experimental", description="If for testing purposes, not real usage", type="token", target={} ) public static final String SP_EXPERIMENTAL = "experimental"; /** * Fluent Client search parameter constant for experimental @@ -3368,7 +3384,9 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.contextType
*

*/ - @SearchParamDefinition(name="context-type", path="StructureDefinition.contextType", description="resource | datatype | extension", type="token" ) + // [] + // [] + @SearchParamDefinition(name="context-type", path="StructureDefinition.contextType", description="resource | datatype | extension", type="token", target={} ) public static final String SP_CONTEXT_TYPE = "context-type"; /** * Fluent Client search parameter constant for context-type @@ -3388,7 +3406,9 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.abstract
*

*/ - @SearchParamDefinition(name="abstract", path="StructureDefinition.abstract", description="Whether the structure is abstract", type="token" ) + // [] + // [] + @SearchParamDefinition(name="abstract", path="StructureDefinition.abstract", description="Whether the structure is abstract", type="token", target={} ) public static final String SP_ABSTRACT = "abstract"; /** * Fluent Client search parameter constant for abstract @@ -3408,7 +3428,9 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.baseType
*

*/ - @SearchParamDefinition(name="type", path="StructureDefinition.baseType", description="Any datatype or resource, including abstract ones", type="token" ) + // [] + // [] + @SearchParamDefinition(name="type", path="StructureDefinition.baseType", description="Any datatype or resource, including abstract ones", type="token", target={} ) public static final String SP_TYPE = "type"; /** * Fluent Client search parameter constant for type @@ -3428,7 +3450,9 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.version
*

*/ - @SearchParamDefinition(name="version", path="StructureDefinition.version", description="The version identifier of the profile", type="token" ) + // [] + // [] + @SearchParamDefinition(name="version", path="StructureDefinition.version", description="The version identifier of the profile", type="token", target={} ) public static final String SP_VERSION = "version"; /** * Fluent Client search parameter constant for version @@ -3448,7 +3472,9 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.url
*

*/ - @SearchParamDefinition(name="url", path="StructureDefinition.url", description="Absolute URL used to reference this StructureDefinition", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="url", path="StructureDefinition.url", description="Absolute URL used to reference this StructureDefinition", type="uri", target={} ) public static final String SP_URL = "url"; /** * Fluent Client search parameter constant for url @@ -3468,7 +3494,9 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.snapshot.element.path, StructureDefinition.differential.element.path
*

*/ - @SearchParamDefinition(name="path", path="StructureDefinition.snapshot.element.path | StructureDefinition.differential.element.path", description="A path that is constrained in the profile", type="token" ) + // [] + // [] + @SearchParamDefinition(name="path", path="StructureDefinition.snapshot.element.path | StructureDefinition.differential.element.path", description="A path that is constrained in the profile", type="token", target={} ) public static final String SP_PATH = "path"; /** * Fluent Client search parameter constant for path @@ -3488,7 +3516,9 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.context
*

*/ - @SearchParamDefinition(name="ext-context", path="StructureDefinition.context", description="Where the extension can be used in instances", type="string" ) + // [] + // [] + @SearchParamDefinition(name="ext-context", path="StructureDefinition.context", description="Where the extension can be used in instances", type="string", target={} ) public static final String SP_EXT_CONTEXT = "ext-context"; /** * Fluent Client search parameter constant for ext-context @@ -3508,7 +3538,9 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.name
*

*/ - @SearchParamDefinition(name="name", path="StructureDefinition.name", description="Name of the profile", type="string" ) + // [] + // [] + @SearchParamDefinition(name="name", path="StructureDefinition.name", description="Name of the profile", type="string", target={} ) public static final String SP_NAME = "name"; /** * Fluent Client search parameter constant for name @@ -3528,7 +3560,9 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.useContext
*

*/ - @SearchParamDefinition(name="context", path="StructureDefinition.useContext", description="A use context assigned to the structure", type="token" ) + // [] + // [] + @SearchParamDefinition(name="context", path="StructureDefinition.useContext", description="A use context assigned to the structure", type="token", target={} ) public static final String SP_CONTEXT = "context"; /** * Fluent Client search parameter constant for context @@ -3548,7 +3582,9 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.snapshot.element.base.path, StructureDefinition.differential.element.base.path
*

*/ - @SearchParamDefinition(name="base-path", path="StructureDefinition.snapshot.element.base.path | StructureDefinition.differential.element.base.path", description="Path that identifies the base element", type="token" ) + // [] + // [] + @SearchParamDefinition(name="base-path", path="StructureDefinition.snapshot.element.base.path | StructureDefinition.differential.element.base.path", description="Path that identifies the base element", type="token", target={} ) public static final String SP_BASE_PATH = "base-path"; /** * Fluent Client search parameter constant for base-path @@ -3568,7 +3604,9 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.publisher
*

*/ - @SearchParamDefinition(name="publisher", path="StructureDefinition.publisher", description="Name of the publisher of the profile", type="string" ) + // [] + // [] + @SearchParamDefinition(name="publisher", path="StructureDefinition.publisher", description="Name of the publisher of the profile", type="string", target={} ) public static final String SP_PUBLISHER = "publisher"; /** * Fluent Client search parameter constant for publisher @@ -3588,7 +3626,9 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.derivation
*

*/ - @SearchParamDefinition(name="derivation", path="StructureDefinition.derivation", description="specialization | constraint - How relates to base definition", type="token" ) + // [] + // [] + @SearchParamDefinition(name="derivation", path="StructureDefinition.derivation", description="specialization | constraint - How relates to base definition", type="token", target={} ) public static final String SP_DERIVATION = "derivation"; /** * Fluent Client search parameter constant for derivation @@ -3608,7 +3648,9 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.status
*

*/ - @SearchParamDefinition(name="status", path="StructureDefinition.status", description="The current status of the profile", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="StructureDefinition.status", description="The current status of the profile", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status @@ -3628,7 +3670,9 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.baseDefinition
*

*/ - @SearchParamDefinition(name="base", path="StructureDefinition.baseDefinition", description="Definition that this type is constrained/specialized from", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="base", path="StructureDefinition.baseDefinition", description="Definition that this type is constrained/specialized from", type="uri", target={} ) public static final String SP_BASE = "base"; /** * Fluent Client search parameter constant for base diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/StructureMap.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/StructureMap.java index cbb9e5997ec..9568bf2285f 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/StructureMap.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/StructureMap.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -5673,7 +5673,9 @@ public class StructureMap extends DomainResource { * Path: StructureMap.date
*

*/ - @SearchParamDefinition(name="date", path="StructureMap.date", description="The profile publication date", type="date" ) + // [] + // [] + @SearchParamDefinition(name="date", path="StructureMap.date", description="The profile publication date", type="date", target={} ) public static final String SP_DATE = "date"; /** * Fluent Client search parameter constant for date @@ -5693,7 +5695,9 @@ public class StructureMap extends DomainResource { * Path: StructureMap.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="StructureMap.identifier", description="The identifier of the profile", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="StructureMap.identifier", description="The identifier of the profile", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -5713,7 +5717,9 @@ public class StructureMap extends DomainResource { * Path: StructureMap.name
*

*/ - @SearchParamDefinition(name="name", path="StructureMap.name", description="Name of the profile", type="string" ) + // [] + // [] + @SearchParamDefinition(name="name", path="StructureMap.name", description="Name of the profile", type="string", target={} ) public static final String SP_NAME = "name"; /** * Fluent Client search parameter constant for name @@ -5733,7 +5739,9 @@ public class StructureMap extends DomainResource { * Path: StructureMap.useContext
*

*/ - @SearchParamDefinition(name="context", path="StructureMap.useContext", description="A use context assigned to the structure", type="token" ) + // [] + // [] + @SearchParamDefinition(name="context", path="StructureMap.useContext", description="A use context assigned to the structure", type="token", target={} ) public static final String SP_CONTEXT = "context"; /** * Fluent Client search parameter constant for context @@ -5753,7 +5761,9 @@ public class StructureMap extends DomainResource { * Path: StructureMap.publisher
*

*/ - @SearchParamDefinition(name="publisher", path="StructureMap.publisher", description="Name of the publisher of the profile", type="string" ) + // [] + // [] + @SearchParamDefinition(name="publisher", path="StructureMap.publisher", description="Name of the publisher of the profile", type="string", target={} ) public static final String SP_PUBLISHER = "publisher"; /** * Fluent Client search parameter constant for publisher @@ -5773,7 +5783,9 @@ public class StructureMap extends DomainResource { * Path: StructureMap.description
*

*/ - @SearchParamDefinition(name="description", path="StructureMap.description", description="Text search in the description of the profile", type="string" ) + // [] + // [] + @SearchParamDefinition(name="description", path="StructureMap.description", description="Text search in the description of the profile", type="string", target={} ) public static final String SP_DESCRIPTION = "description"; /** * Fluent Client search parameter constant for description @@ -5793,7 +5805,9 @@ public class StructureMap extends DomainResource { * Path: StructureMap.experimental
*

*/ - @SearchParamDefinition(name="experimental", path="StructureMap.experimental", description="Whether the map is defined purely for experimental reasons", type="token" ) + // [] + // [] + @SearchParamDefinition(name="experimental", path="StructureMap.experimental", description="Whether the map is defined purely for experimental reasons", type="token", target={} ) public static final String SP_EXPERIMENTAL = "experimental"; /** * Fluent Client search parameter constant for experimental @@ -5813,7 +5827,9 @@ public class StructureMap extends DomainResource { * Path: StructureMap.version
*

*/ - @SearchParamDefinition(name="version", path="StructureMap.version", description="The version identifier of the profile", type="token" ) + // [] + // [] + @SearchParamDefinition(name="version", path="StructureMap.version", description="The version identifier of the profile", type="token", target={} ) public static final String SP_VERSION = "version"; /** * Fluent Client search parameter constant for version @@ -5833,7 +5849,9 @@ public class StructureMap extends DomainResource { * Path: StructureMap.url
*

*/ - @SearchParamDefinition(name="url", path="StructureMap.url", description="The url that identifies the structure map", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="url", path="StructureMap.url", description="The url that identifies the structure map", type="uri", target={} ) public static final String SP_URL = "url"; /** * Fluent Client search parameter constant for url @@ -5853,7 +5871,9 @@ public class StructureMap extends DomainResource { * Path: StructureMap.status
*

*/ - @SearchParamDefinition(name="status", path="StructureMap.status", description="The current status of the profile", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="StructureMap.status", description="The current status of the profile", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Subscription.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Subscription.java index 1141edbd27c..ec34856cf61 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Subscription.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Subscription.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1315,7 +1315,9 @@ public class Subscription extends DomainResource { * Path: Subscription.channel.payload
*

*/ - @SearchParamDefinition(name="payload", path="Subscription.channel.payload", description="Mimetype to send, or blank for no payload", type="string" ) + // [] + // [] + @SearchParamDefinition(name="payload", path="Subscription.channel.payload", description="Mimetype to send, or blank for no payload", type="string", target={} ) public static final String SP_PAYLOAD = "payload"; /** * Fluent Client search parameter constant for payload @@ -1335,7 +1337,9 @@ public class Subscription extends DomainResource { * Path: Subscription.criteria
*

*/ - @SearchParamDefinition(name="criteria", path="Subscription.criteria", description="Rule for server push criteria", type="string" ) + // [] + // [] + @SearchParamDefinition(name="criteria", path="Subscription.criteria", description="Rule for server push criteria", type="string", target={} ) public static final String SP_CRITERIA = "criteria"; /** * Fluent Client search parameter constant for criteria @@ -1355,7 +1359,9 @@ public class Subscription extends DomainResource { * Path: Subscription.contact
*

*/ - @SearchParamDefinition(name="contact", path="Subscription.contact", description="Contact details for source (e.g. troubleshooting)", type="token" ) + // [] + // [] + @SearchParamDefinition(name="contact", path="Subscription.contact", description="Contact details for source (e.g. troubleshooting)", type="token", target={} ) public static final String SP_CONTACT = "contact"; /** * Fluent Client search parameter constant for contact @@ -1375,7 +1381,9 @@ public class Subscription extends DomainResource { * Path: Subscription.tag
*

*/ - @SearchParamDefinition(name="tag", path="Subscription.tag", description="A tag to add to matching resources", type="token" ) + // [] + // [] + @SearchParamDefinition(name="tag", path="Subscription.tag", description="A tag to add to matching resources", type="token", target={} ) public static final String SP_TAG = "tag"; /** * Fluent Client search parameter constant for tag @@ -1395,7 +1403,9 @@ public class Subscription extends DomainResource { * Path: Subscription.channel.type
*

*/ - @SearchParamDefinition(name="type", path="Subscription.channel.type", description="rest-hook | websocket | email | sms | message", type="token" ) + // [] + // [] + @SearchParamDefinition(name="type", path="Subscription.channel.type", description="rest-hook | websocket | email | sms | message", type="token", target={} ) public static final String SP_TYPE = "type"; /** * Fluent Client search parameter constant for type @@ -1415,7 +1425,9 @@ public class Subscription extends DomainResource { * Path: Subscription.channel.endpoint
*

*/ - @SearchParamDefinition(name="url", path="Subscription.channel.endpoint", description="Where the channel points to", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="url", path="Subscription.channel.endpoint", description="Where the channel points to", type="uri", target={} ) public static final String SP_URL = "url"; /** * Fluent Client search parameter constant for url @@ -1435,7 +1447,9 @@ public class Subscription extends DomainResource { * Path: Subscription.status
*

*/ - @SearchParamDefinition(name="status", path="Subscription.status", description="requested | active | error | off", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="Subscription.status", description="requested | active | error | off", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Substance.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Substance.java index 1cd6e791b02..639a3ba269a 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Substance.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Substance.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1049,7 +1049,9 @@ public class Substance extends DomainResource { * Path: Substance.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="Substance.identifier", description="Unique identifier for the substance", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="Substance.identifier", description="Unique identifier for the substance", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -1069,7 +1071,9 @@ public class Substance extends DomainResource { * Path: Substance.instance.identifier
*

*/ - @SearchParamDefinition(name="container-identifier", path="Substance.instance.identifier", description="Identifier of the package/container", type="token" ) + // [] + // [] + @SearchParamDefinition(name="container-identifier", path="Substance.instance.identifier", description="Identifier of the package/container", type="token", target={} ) public static final String SP_CONTAINER_IDENTIFIER = "container-identifier"; /** * Fluent Client search parameter constant for container-identifier @@ -1089,7 +1093,9 @@ public class Substance extends DomainResource { * Path: Substance.code
*

*/ - @SearchParamDefinition(name="code", path="Substance.code", description="The code of the substance", type="token" ) + // [] + // [] + @SearchParamDefinition(name="code", path="Substance.code", description="The code of the substance", type="token", target={} ) public static final String SP_CODE = "code"; /** * Fluent Client search parameter constant for code @@ -1109,7 +1115,9 @@ public class Substance extends DomainResource { * Path: Substance.instance.quantity
*

*/ - @SearchParamDefinition(name="quantity", path="Substance.instance.quantity", description="Amount of substance in the package", type="quantity" ) + // [] + // [] + @SearchParamDefinition(name="quantity", path="Substance.instance.quantity", description="Amount of substance in the package", type="quantity", target={} ) public static final String SP_QUANTITY = "quantity"; /** * Fluent Client search parameter constant for quantity @@ -1129,7 +1137,9 @@ public class Substance extends DomainResource { * Path: Substance.ingredient.substance
*

*/ - @SearchParamDefinition(name="substance", path="Substance.ingredient.substance", description="A component of the substance", type="reference" ) + // [Substance] + // [Substance] + @SearchParamDefinition(name="substance", path="Substance.ingredient.substance", description="A component of the substance", type="reference", target={Substance.class} ) public static final String SP_SUBSTANCE = "substance"; /** * Fluent Client search parameter constant for substance @@ -1155,7 +1165,9 @@ public class Substance extends DomainResource { * Path: Substance.instance.expiry
*

*/ - @SearchParamDefinition(name="expiry", path="Substance.instance.expiry", description="Expiry date of package or container of substance", type="date" ) + // [] + // [] + @SearchParamDefinition(name="expiry", path="Substance.instance.expiry", description="Expiry date of package or container of substance", type="date", target={} ) public static final String SP_EXPIRY = "expiry"; /** * Fluent Client search parameter constant for expiry @@ -1175,7 +1187,9 @@ public class Substance extends DomainResource { * Path: Substance.category
*

*/ - @SearchParamDefinition(name="category", path="Substance.category", description="The category of the substance", type="token" ) + // [] + // [] + @SearchParamDefinition(name="category", path="Substance.category", description="The category of the substance", type="token", target={} ) public static final String SP_CATEGORY = "category"; /** * Fluent Client search parameter constant for category diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/SupplyDelivery.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/SupplyDelivery.java index d076f80f103..0c3e1f74d4c 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/SupplyDelivery.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/SupplyDelivery.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -945,7 +945,9 @@ public class SupplyDelivery extends DomainResource { * Path: SupplyDelivery.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="SupplyDelivery.identifier", description="External identifier", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="SupplyDelivery.identifier", description="External identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -965,7 +967,9 @@ public class SupplyDelivery extends DomainResource { * Path: SupplyDelivery.receiver
*

*/ - @SearchParamDefinition(name="receiver", path="SupplyDelivery.receiver", description="Who collected the Supply", type="reference" ) + // [Practitioner] + // [Practitioner] + @SearchParamDefinition(name="receiver", path="SupplyDelivery.receiver", description="Who collected the Supply", type="reference", target={Practitioner.class} ) public static final String SP_RECEIVER = "receiver"; /** * Fluent Client search parameter constant for receiver @@ -991,7 +995,9 @@ public class SupplyDelivery extends DomainResource { * Path: SupplyDelivery.patient
*

*/ - @SearchParamDefinition(name="patient", path="SupplyDelivery.patient", description="Patient for whom the item is supplied", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="SupplyDelivery.patient", description="Patient for whom the item is supplied", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -1017,7 +1023,9 @@ public class SupplyDelivery extends DomainResource { * Path: SupplyDelivery.supplier
*

*/ - @SearchParamDefinition(name="supplier", path="SupplyDelivery.supplier", description="Dispenser", type="reference" ) + // [Practitioner] + // [Practitioner] + @SearchParamDefinition(name="supplier", path="SupplyDelivery.supplier", description="Dispenser", type="reference", target={Practitioner.class} ) public static final String SP_SUPPLIER = "supplier"; /** * Fluent Client search parameter constant for supplier @@ -1043,7 +1051,9 @@ public class SupplyDelivery extends DomainResource { * Path: SupplyDelivery.status
*

*/ - @SearchParamDefinition(name="status", path="SupplyDelivery.status", description="in-progress | completed | abandoned", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="SupplyDelivery.status", description="in-progress | completed | abandoned", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/SupplyRequest.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/SupplyRequest.java index b7da0098ea8..b39070cebc1 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/SupplyRequest.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/SupplyRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -1088,7 +1088,9 @@ public class SupplyRequest extends DomainResource { * Path: SupplyRequest.date
*

*/ - @SearchParamDefinition(name="date", path="SupplyRequest.date", description="When the request was made", type="date" ) + // [] + // [] + @SearchParamDefinition(name="date", path="SupplyRequest.date", description="When the request was made", type="date", target={} ) public static final String SP_DATE = "date"; /** * Fluent Client search parameter constant for date @@ -1108,7 +1110,9 @@ public class SupplyRequest extends DomainResource { * Path: SupplyRequest.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="SupplyRequest.identifier", description="Unique identifier", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="SupplyRequest.identifier", description="Unique identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -1128,7 +1132,9 @@ public class SupplyRequest extends DomainResource { * Path: SupplyRequest.kind
*

*/ - @SearchParamDefinition(name="kind", path="SupplyRequest.kind", description="The kind of supply (central, non-stock, etc.)", type="token" ) + // [] + // [] + @SearchParamDefinition(name="kind", path="SupplyRequest.kind", description="The kind of supply (central, non-stock, etc.)", type="token", target={} ) public static final String SP_KIND = "kind"; /** * Fluent Client search parameter constant for kind @@ -1148,7 +1154,9 @@ public class SupplyRequest extends DomainResource { * Path: SupplyRequest.patient
*

*/ - @SearchParamDefinition(name="patient", path="SupplyRequest.patient", description="Patient for whom the item is supplied", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="SupplyRequest.patient", description="Patient for whom the item is supplied", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -1174,7 +1182,9 @@ public class SupplyRequest extends DomainResource { * Path: SupplyRequest.supplier
*

*/ - @SearchParamDefinition(name="supplier", path="SupplyRequest.supplier", description="Who is intended to fulfill the request", type="reference" ) + // [Organization] + // [Organization] + @SearchParamDefinition(name="supplier", path="SupplyRequest.supplier", description="Who is intended to fulfill the request", type="reference", target={Organization.class} ) public static final String SP_SUPPLIER = "supplier"; /** * Fluent Client search parameter constant for supplier @@ -1200,7 +1210,9 @@ public class SupplyRequest extends DomainResource { * Path: SupplyRequest.source
*

*/ - @SearchParamDefinition(name="source", path="SupplyRequest.source", description="Who initiated this order", type="reference" ) + // [Practitioner, Organization, Patient] + // [Practitioner, Organization, Patient] + @SearchParamDefinition(name="source", path="SupplyRequest.source", description="Who initiated this order", type="reference", target={Practitioner.class, Organization.class, Patient.class} ) public static final String SP_SOURCE = "source"; /** * Fluent Client search parameter constant for source @@ -1226,7 +1238,9 @@ public class SupplyRequest extends DomainResource { * Path: SupplyRequest.status
*

*/ - @SearchParamDefinition(name="status", path="SupplyRequest.status", description="requested | completed | failed | cancelled", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="SupplyRequest.status", description="requested | completed | failed | cancelled", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Task.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Task.java index 11fb62246eb..81b57b19817 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Task.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Task.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -2239,7 +2239,9 @@ public class Task extends DomainResource { * Path: Task.owner
*

*/ - @SearchParamDefinition(name="owner", path="Task.owner", description="Search by task owner", type="reference" ) + // [Practitioner, Organization, Device, Patient, RelatedPerson] + // [Practitioner, Organization, Device, Patient, RelatedPerson] + @SearchParamDefinition(name="owner", path="Task.owner", description="Search by task owner", type="reference", target={Practitioner.class, Organization.class, Device.class, Patient.class, RelatedPerson.class} ) public static final String SP_OWNER = "owner"; /** * Fluent Client search parameter constant for owner @@ -2265,7 +2267,9 @@ public class Task extends DomainResource { * Path: Task.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="Task.identifier", description="Search for a task instance by its business identifier", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="Task.identifier", description="Search for a task instance by its business identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -2285,7 +2289,9 @@ public class Task extends DomainResource { * Path: Task.parent
*

*/ - @SearchParamDefinition(name="parent", path="Task.parent", description="Search by parent task", type="reference" ) + // [Task] + // [Task] + @SearchParamDefinition(name="parent", path="Task.parent", description="Search by parent task", type="reference", target={Task.class} ) public static final String SP_PARENT = "parent"; /** * Fluent Client search parameter constant for parent @@ -2311,7 +2317,9 @@ public class Task extends DomainResource { * Path: Task.creator
*

*/ - @SearchParamDefinition(name="creator", path="Task.creator", description="Search by task creator", type="reference" ) + // [Practitioner, Organization, Device, Patient, RelatedPerson] + // [Practitioner, Organization, Device, Patient, RelatedPerson] + @SearchParamDefinition(name="creator", path="Task.creator", description="Search by task creator", type="reference", target={Practitioner.class, Organization.class, Device.class, Patient.class, RelatedPerson.class} ) public static final String SP_CREATOR = "creator"; /** * Fluent Client search parameter constant for creator @@ -2337,7 +2345,9 @@ public class Task extends DomainResource { * Path: Task.performerType
*

*/ - @SearchParamDefinition(name="performer", path="Task.performerType", description="Search by recommended type of performer (e.g., Requester, Performer, Scheduler).", type="token" ) + // [] + // [] + @SearchParamDefinition(name="performer", path="Task.performerType", description="Search by recommended type of performer (e.g., Requester, Performer, Scheduler).", type="token", target={} ) public static final String SP_PERFORMER = "performer"; /** * Fluent Client search parameter constant for performer @@ -2357,6 +2367,8 @@ public class Task extends DomainResource { * Path: Task.subject
*

*/ + // [Any] + // [Any] @SearchParamDefinition(name="subject", path="Task.subject", description="Search by task subject", type="reference" ) public static final String SP_SUBJECT = "subject"; /** @@ -2383,7 +2395,9 @@ public class Task extends DomainResource { * Path: Task.created
*

*/ - @SearchParamDefinition(name="created", path="Task.created", description="Search by creation date", type="date" ) + // [] + // [] + @SearchParamDefinition(name="created", path="Task.created", description="Search by creation date", type="date", target={} ) public static final String SP_CREATED = "created"; /** * Fluent Client search parameter constant for created @@ -2403,7 +2417,9 @@ public class Task extends DomainResource { * Path: Task.type
*

*/ - @SearchParamDefinition(name="type", path="Task.type", description="Search by task type", type="token" ) + // [] + // [] + @SearchParamDefinition(name="type", path="Task.type", description="Search by task type", type="token", target={} ) public static final String SP_TYPE = "type"; /** * Fluent Client search parameter constant for type @@ -2423,7 +2439,9 @@ public class Task extends DomainResource { * Path: Task.priority
*

*/ - @SearchParamDefinition(name="priority", path="Task.priority", description="Search by task priority", type="token" ) + // [] + // [] + @SearchParamDefinition(name="priority", path="Task.priority", description="Search by task priority", type="token", target={} ) public static final String SP_PRIORITY = "priority"; /** * Fluent Client search parameter constant for priority @@ -2443,7 +2461,9 @@ public class Task extends DomainResource { * Path: Task.failureReason
*

*/ - @SearchParamDefinition(name="failure", path="Task.failureReason", description="Search by failure reason", type="token" ) + // [] + // [] + @SearchParamDefinition(name="failure", path="Task.failureReason", description="Search by failure reason", type="token", target={} ) public static final String SP_FAILURE = "failure"; /** * Fluent Client search parameter constant for failure @@ -2463,7 +2483,9 @@ public class Task extends DomainResource { * Path: Task.lastModified
*

*/ - @SearchParamDefinition(name="modified", path="Task.lastModified", description="Search by last modification date", type="date" ) + // [] + // [] + @SearchParamDefinition(name="modified", path="Task.lastModified", description="Search by last modification date", type="date", target={} ) public static final String SP_MODIFIED = "modified"; /** * Fluent Client search parameter constant for modified @@ -2483,7 +2505,9 @@ public class Task extends DomainResource { * Path: Task.definition
*

*/ - @SearchParamDefinition(name="definition", path="Task.definition", description="Search by task definition", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="definition", path="Task.definition", description="Search by task definition", type="uri", target={} ) public static final String SP_DEFINITION = "definition"; /** * Fluent Client search parameter constant for definition @@ -2503,7 +2527,9 @@ public class Task extends DomainResource { * Path: Task.status
*

*/ - @SearchParamDefinition(name="status", path="Task.status", description="Search by task status", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="Task.status", description="Search by task status", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/TestScript.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/TestScript.java index eb914c12b3f..8e43ad7a440 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/TestScript.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/TestScript.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -11234,7 +11234,9 @@ public class TestScript extends DomainResource { * Path: TestScript.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="TestScript.identifier", description="External identifier", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="TestScript.identifier", description="External identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -11254,7 +11256,9 @@ public class TestScript extends DomainResource { * Path: TestScript.test.metadata.capability.description
*

*/ - @SearchParamDefinition(name="testscript-test-capability", path="TestScript.test.metadata.capability.description", description="TestScript test required and validated capability", type="string" ) + // [] + // [] + @SearchParamDefinition(name="testscript-test-capability", path="TestScript.test.metadata.capability.description", description="TestScript test required and validated capability", type="string", target={} ) public static final String SP_TESTSCRIPT_TEST_CAPABILITY = "testscript-test-capability"; /** * Fluent Client search parameter constant for testscript-test-capability @@ -11274,7 +11278,9 @@ public class TestScript extends DomainResource { * Path: TestScript.setup.metadata.capability.description
*

*/ - @SearchParamDefinition(name="testscript-setup-capability", path="TestScript.setup.metadata.capability.description", description="TestScript setup required and validated capability", type="string" ) + // [] + // [] + @SearchParamDefinition(name="testscript-setup-capability", path="TestScript.setup.metadata.capability.description", description="TestScript setup required and validated capability", type="string", target={} ) public static final String SP_TESTSCRIPT_SETUP_CAPABILITY = "testscript-setup-capability"; /** * Fluent Client search parameter constant for testscript-setup-capability @@ -11294,7 +11300,9 @@ public class TestScript extends DomainResource { * Path: TestScript.name
*

*/ - @SearchParamDefinition(name="name", path="TestScript.name", description="Informal name for this TestScript", type="string" ) + // [] + // [] + @SearchParamDefinition(name="name", path="TestScript.name", description="Informal name for this TestScript", type="string", target={} ) public static final String SP_NAME = "name"; /** * Fluent Client search parameter constant for name @@ -11314,7 +11322,9 @@ public class TestScript extends DomainResource { * Path: TestScript.description
*

*/ - @SearchParamDefinition(name="description", path="TestScript.description", description="Natural language description of the TestScript", type="string" ) + // [] + // [] + @SearchParamDefinition(name="description", path="TestScript.description", description="Natural language description of the TestScript", type="string", target={} ) public static final String SP_DESCRIPTION = "description"; /** * Fluent Client search parameter constant for description @@ -11334,7 +11344,9 @@ public class TestScript extends DomainResource { * Path: TestScript.metadata.capability.description
*

*/ - @SearchParamDefinition(name="testscript-capability", path="TestScript.metadata.capability.description", description="TestScript required and validated capability", type="string" ) + // [] + // [] + @SearchParamDefinition(name="testscript-capability", path="TestScript.metadata.capability.description", description="TestScript required and validated capability", type="string", target={} ) public static final String SP_TESTSCRIPT_CAPABILITY = "testscript-capability"; /** * Fluent Client search parameter constant for testscript-capability @@ -11354,7 +11366,9 @@ public class TestScript extends DomainResource { * Path: TestScript.url
*

*/ - @SearchParamDefinition(name="url", path="TestScript.url", description="Absolute URL used to reference this TestScript", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="url", path="TestScript.url", description="Absolute URL used to reference this TestScript", type="uri", target={} ) public static final String SP_URL = "url"; /** * Fluent Client search parameter constant for url diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ValueSet.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ValueSet.java index 934a551a739..982863501e6 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ValueSet.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ValueSet.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -4657,7 +4657,9 @@ public class ValueSet extends DomainResource { * Path: ValueSet.date
*

*/ - @SearchParamDefinition(name="date", path="ValueSet.date", description="The value set publication date", type="date" ) + // [] + // [] + @SearchParamDefinition(name="date", path="ValueSet.date", description="The value set publication date", type="date", target={} ) public static final String SP_DATE = "date"; /** * Fluent Client search parameter constant for date @@ -4677,7 +4679,9 @@ public class ValueSet extends DomainResource { * Path: ValueSet.compose.include.system
*

*/ - @SearchParamDefinition(name="reference", path="ValueSet.compose.include.system", description="A code system included or excluded in the value set or an imported value set", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="reference", path="ValueSet.compose.include.system", description="A code system included or excluded in the value set or an imported value set", type="uri", target={} ) public static final String SP_REFERENCE = "reference"; /** * Fluent Client search parameter constant for reference @@ -4697,7 +4701,9 @@ public class ValueSet extends DomainResource { * Path: ValueSet.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="ValueSet.identifier", description="The identifier for the value set", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="ValueSet.identifier", description="The identifier for the value set", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -4717,7 +4723,9 @@ public class ValueSet extends DomainResource { * Path: ValueSet.name
*

*/ - @SearchParamDefinition(name="name", path="ValueSet.name", description="The name of the value set", type="string" ) + // [] + // [] + @SearchParamDefinition(name="name", path="ValueSet.name", description="The name of the value set", type="string", target={} ) public static final String SP_NAME = "name"; /** * Fluent Client search parameter constant for name @@ -4737,7 +4745,9 @@ public class ValueSet extends DomainResource { * Path: ValueSet.useContext
*

*/ - @SearchParamDefinition(name="context", path="ValueSet.useContext", description="A use context assigned to the value set", type="token" ) + // [] + // [] + @SearchParamDefinition(name="context", path="ValueSet.useContext", description="A use context assigned to the value set", type="token", target={} ) public static final String SP_CONTEXT = "context"; /** * Fluent Client search parameter constant for context @@ -4757,7 +4767,9 @@ public class ValueSet extends DomainResource { * Path: ValueSet.publisher
*

*/ - @SearchParamDefinition(name="publisher", path="ValueSet.publisher", description="Name of the publisher of the value set", type="string" ) + // [] + // [] + @SearchParamDefinition(name="publisher", path="ValueSet.publisher", description="Name of the publisher of the value set", type="string", target={} ) public static final String SP_PUBLISHER = "publisher"; /** * Fluent Client search parameter constant for publisher @@ -4777,7 +4789,9 @@ public class ValueSet extends DomainResource { * Path: ValueSet.description
*

*/ - @SearchParamDefinition(name="description", path="ValueSet.description", description="Text search in the description of the value set", type="string" ) + // [] + // [] + @SearchParamDefinition(name="description", path="ValueSet.description", description="Text search in the description of the value set", type="string", target={} ) public static final String SP_DESCRIPTION = "description"; /** * Fluent Client search parameter constant for description @@ -4797,7 +4811,9 @@ public class ValueSet extends DomainResource { * Path: ValueSet.version
*

*/ - @SearchParamDefinition(name="version", path="ValueSet.version", description="The version identifier of the value set", type="token" ) + // [] + // [] + @SearchParamDefinition(name="version", path="ValueSet.version", description="The version identifier of the value set", type="token", target={} ) public static final String SP_VERSION = "version"; /** * Fluent Client search parameter constant for version @@ -4817,7 +4833,9 @@ public class ValueSet extends DomainResource { * Path: ValueSet.url
*

*/ - @SearchParamDefinition(name="url", path="ValueSet.url", description="The logical URL for the value set", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="url", path="ValueSet.url", description="The logical URL for the value set", type="uri", target={} ) public static final String SP_URL = "url"; /** * Fluent Client search parameter constant for url @@ -4837,7 +4855,9 @@ public class ValueSet extends DomainResource { * Path: ValueSet.status
*

*/ - @SearchParamDefinition(name="status", path="ValueSet.status", description="The status of the value set", type="token" ) + // [] + // [] + @SearchParamDefinition(name="status", path="ValueSet.status", description="The status of the value set", type="token", target={} ) public static final String SP_STATUS = "status"; /** * Fluent Client search parameter constant for status @@ -4857,7 +4877,9 @@ public class ValueSet extends DomainResource { * Path: ValueSet.expansion.identifier
*

*/ - @SearchParamDefinition(name="expansion", path="ValueSet.expansion.identifier", description="Uniquely identifies this expansion", type="uri" ) + // [] + // [] + @SearchParamDefinition(name="expansion", path="ValueSet.expansion.identifier", description="Uniquely identifies this expansion", type="uri", target={} ) public static final String SP_EXPANSION = "expansion"; /** * Fluent Client search parameter constant for expansion diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/VisionPrescription.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/VisionPrescription.java index 222a6dde5d7..c9a1d07cd05 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/VisionPrescription.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/VisionPrescription.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Sun, May 1, 2016 19:50-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 import java.util.*; @@ -2064,7 +2064,9 @@ public class VisionPrescription extends DomainResource { * Path: VisionPrescription.prescriber
*

*/ - @SearchParamDefinition(name="prescriber", path="VisionPrescription.prescriber", description="Who authorizes the vision product", type="reference" ) + // [Practitioner] + // [Practitioner] + @SearchParamDefinition(name="prescriber", path="VisionPrescription.prescriber", description="Who authorizes the vision product", type="reference", target={Practitioner.class} ) public static final String SP_PRESCRIBER = "prescriber"; /** * Fluent Client search parameter constant for prescriber @@ -2090,7 +2092,9 @@ public class VisionPrescription extends DomainResource { * Path: VisionPrescription.identifier
*

*/ - @SearchParamDefinition(name="identifier", path="VisionPrescription.identifier", description="Return prescriptions with this external identifier", type="token" ) + // [] + // [] + @SearchParamDefinition(name="identifier", path="VisionPrescription.identifier", description="Return prescriptions with this external identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** * Fluent Client search parameter constant for identifier @@ -2110,7 +2114,9 @@ public class VisionPrescription extends DomainResource { * Path: VisionPrescription.patient
*

*/ - @SearchParamDefinition(name="patient", path="VisionPrescription.patient", description="The identity of a patient to list dispenses for", type="reference" ) + // [Patient] + // [Patient] + @SearchParamDefinition(name="patient", path="VisionPrescription.patient", description="The identity of a patient to list dispenses for", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -2136,7 +2142,9 @@ public class VisionPrescription extends DomainResource { * Path: VisionPrescription.dateWritten
*

*/ - @SearchParamDefinition(name="datewritten", path="VisionPrescription.dateWritten", description="Return prescriptions written on this date", type="date" ) + // [] + // [] + @SearchParamDefinition(name="datewritten", path="VisionPrescription.dateWritten", description="Return prescriptions written on this date", type="date", target={} ) public static final String SP_DATEWRITTEN = "datewritten"; /** * Fluent Client search parameter constant for datewritten @@ -2156,7 +2164,9 @@ public class VisionPrescription extends DomainResource { * Path: VisionPrescription.encounter
*

*/ - @SearchParamDefinition(name="encounter", path="VisionPrescription.encounter", description="Return prescriptions with this encounter identifier", type="reference" ) + // [Encounter] + // [Encounter] + @SearchParamDefinition(name="encounter", path="VisionPrescription.encounter", description="Return prescriptions with this encounter identifier", type="reference", target={Encounter.class} ) public static final String SP_ENCOUNTER = "encounter"; /** * Fluent Client search parameter constant for encounter diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlNode.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlNode.java index c3815d276b8..886dcc99cda 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlNode.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlNode.java @@ -35,8 +35,6 @@ import java.util.Map; import org.hl7.fhir.instance.model.api.IBaseXhtml; -import ca.uhn.fhir.util.CoverageIgnore; - @ca.uhn.fhir.model.api.annotation.DatatypeDef(name="xhtml") public class XhtmlNode implements IBaseXhtml { @@ -375,8 +373,6 @@ public XhtmlNode setValue(String theValue) throws IllegalArgumentException { /** * Returns false */ -@Override -@CoverageIgnore public boolean hasFormatComment() { return false; } @@ -384,8 +380,6 @@ public boolean hasFormatComment() { /** * NOT SUPPORTED - Throws {@link UnsupportedOperationException} */ -@Override -@CoverageIgnore public List getFormatCommentsPre() { throw new UnsupportedOperationException(); } @@ -393,8 +387,6 @@ public List getFormatCommentsPre() { /** * NOT SUPPORTED - Throws {@link UnsupportedOperationException} */ -@Override -@CoverageIgnore public List getFormatCommentsPost() { throw new UnsupportedOperationException(); } diff --git a/hapi-tinder-plugin/src/main/resources/vm/resource.vm b/hapi-tinder-plugin/src/main/resources/vm/resource.vm index 2a2e382651e..f224e7cd5d5 100644 --- a/hapi-tinder-plugin/src/main/resources/vm/resource.vm +++ b/hapi-tinder-plugin/src/main/resources/vm/resource.vm @@ -59,6 +59,10 @@ public class ${className} extends ca.uhn.fhir.model.${version}.resource.BaseReso #{if} ($param.compartments.size() > 0), providesMembershipIn={ #{foreach} ($compartment in $param.compartments) @Compartment(name="$compartment") #{if}($foreach.hasNext), #{end}#{end} } +#{end} +#{if} ($param.targetTypes.size() > 0), target={ +#{foreach} ($target in $param.targetTypes) ${packageBase}.resource.${target}.class #{if}($foreach.hasNext), #{end}#{end} + } #{end} ) public static final String $param.constantName = "${param.name}";