From dcd32b61271eaa491d0d98a2587a03b023448898 Mon Sep 17 00:00:00 2001 From: jamesagnew Date: Tue, 3 May 2016 07:03:44 -0400 Subject: [PATCH] Correctly handle search parameter target types in JPA --- .../FhirResourceDaoDstu2SearchNoFtTest.java | 208 ++++++++++-------- .../FhirResourceDaoDstu3SearchNoFtTest.java | 1 - .../org/hl7/fhir/dstu3/model/Account.java | 22 +- .../fhir/dstu3/model/AllergyIntolerance.java | 32 +-- .../org/hl7/fhir/dstu3/model/Appointment.java | 28 +-- .../fhir/dstu3/model/AppointmentResponse.java | 22 +- .../org/hl7/fhir/dstu3/model/AuditEvent.java | 38 +--- .../java/org/hl7/fhir/dstu3/model/Basic.java | 16 +- .../java/org/hl7/fhir/dstu3/model/Binary.java | 4 +- .../org/hl7/fhir/dstu3/model/BodySite.java | 8 +- .../java/org/hl7/fhir/dstu3/model/Bundle.java | 12 +- .../org/hl7/fhir/dstu3/model/CarePlan.java | 32 +-- .../org/hl7/fhir/dstu3/model/CareTeam.java | 18 +- .../java/org/hl7/fhir/dstu3/model/Claim.java | 30 +-- .../hl7/fhir/dstu3/model/ClaimResponse.java | 20 +- .../fhir/dstu3/model/ClinicalImpression.java | 30 +-- .../org/hl7/fhir/dstu3/model/CodeSystem.java | 28 +-- .../hl7/fhir/dstu3/model/Communication.java | 26 +-- .../dstu3/model/CommunicationRequest.java | 28 +-- .../dstu3/model/CompartmentDefinition.java | 14 +- .../org/hl7/fhir/dstu3/model/Composition.java | 36 +-- .../org/hl7/fhir/dstu3/model/ConceptMap.java | 38 +--- .../org/hl7/fhir/dstu3/model/Condition.java | 30 +-- .../org/hl7/fhir/dstu3/model/Conformance.java | 36 +-- .../org/hl7/fhir/dstu3/model/Contract.java | 24 +- .../org/hl7/fhir/dstu3/model/Coverage.java | 28 +-- .../org/hl7/fhir/dstu3/model/DataElement.java | 24 +- .../fhir/dstu3/model/DecisionSupportRule.java | 14 +- .../model/DecisionSupportServiceModule.java | 14 +- .../hl7/fhir/dstu3/model/DetectedIssue.java | 14 +- .../java/org/hl7/fhir/dstu3/model/Device.java | 20 +- .../hl7/fhir/dstu3/model/DeviceComponent.java | 8 +- .../hl7/fhir/dstu3/model/DeviceMetric.java | 12 +- .../fhir/dstu3/model/DeviceUseRequest.java | 8 +- .../fhir/dstu3/model/DeviceUseStatement.java | 8 +- .../hl7/fhir/dstu3/model/DiagnosticOrder.java | 38 +--- .../fhir/dstu3/model/DiagnosticReport.java | 34 +-- .../fhir/dstu3/model/DocumentManifest.java | 30 +-- .../fhir/dstu3/model/DocumentReference.java | 56 +---- .../hl7/fhir/dstu3/model/DomainResource.java | 2 +- .../fhir/dstu3/model/EligibilityRequest.java | 22 +- .../fhir/dstu3/model/EligibilityResponse.java | 26 +-- .../org/hl7/fhir/dstu3/model/Encounter.java | 48 +--- .../org/hl7/fhir/dstu3/model/Endpoint.java | 8 +- .../fhir/dstu3/model/EnrollmentRequest.java | 8 +- .../fhir/dstu3/model/EnrollmentResponse.java | 4 +- .../hl7/fhir/dstu3/model/EpisodeOfCare.java | 20 +- .../fhir/dstu3/model/ExpansionProfile.java | 18 +- .../dstu3/model/ExplanationOfBenefit.java | 28 +-- .../fhir/dstu3/model/FamilyMemberHistory.java | 14 +- .../java/org/hl7/fhir/dstu3/model/Flag.java | 14 +- .../java/org/hl7/fhir/dstu3/model/Goal.java | 16 +- .../java/org/hl7/fhir/dstu3/model/Group.java | 20 +- .../fhir/dstu3/model/GuidanceResponse.java | 2 +- .../fhir/dstu3/model/HealthcareService.java | 18 +- .../hl7/fhir/dstu3/model/ImagingExcerpt.java | 14 +- .../dstu3/model/ImagingObjectSelection.java | 14 +- .../hl7/fhir/dstu3/model/ImagingStudy.java | 24 +- .../hl7/fhir/dstu3/model/Immunization.java | 34 +-- .../model/ImmunizationRecommendation.java | 20 +- .../fhir/dstu3/model/ImplementationGuide.java | 24 +- .../org/hl7/fhir/dstu3/model/Library.java | 14 +- .../org/hl7/fhir/dstu3/model/Linkage.java | 8 +- .../hl7/fhir/dstu3/model/ListResource.java | 28 +-- .../org/hl7/fhir/dstu3/model/Location.java | 30 +-- .../org/hl7/fhir/dstu3/model/Measure.java | 14 +- .../hl7/fhir/dstu3/model/MeasureReport.java | 4 +- .../java/org/hl7/fhir/dstu3/model/Media.java | 20 +- .../org/hl7/fhir/dstu3/model/Medication.java | 18 +- .../dstu3/model/MedicationAdministration.java | 24 +- .../fhir/dstu3/model/MedicationDispense.java | 28 +-- .../hl7/fhir/dstu3/model/MedicationOrder.java | 18 +- .../fhir/dstu3/model/MedicationStatement.java | 16 +- .../hl7/fhir/dstu3/model/MessageHeader.java | 30 +-- .../fhir/dstu3/model/ModuleDefinition.java | 2 +- .../hl7/fhir/dstu3/model/NamingSystem.java | 30 +-- .../hl7/fhir/dstu3/model/NutritionOrder.java | 22 +- .../org/hl7/fhir/dstu3/model/Observation.java | 68 +----- .../fhir/dstu3/model/OperationDefinition.java | 30 +-- .../fhir/dstu3/model/OperationOutcome.java | 2 +- .../java/org/hl7/fhir/dstu3/model/Order.java | 22 +- .../hl7/fhir/dstu3/model/OrderResponse.java | 14 +- .../org/hl7/fhir/dstu3/model/OrderSet.java | 14 +- .../hl7/fhir/dstu3/model/Organization.java | 26 +-- .../org/hl7/fhir/dstu3/model/Parameters.java | 2 +- .../org/hl7/fhir/dstu3/model/Patient.java | 52 +---- .../hl7/fhir/dstu3/model/PaymentNotice.java | 26 +-- .../dstu3/model/PaymentReconciliation.java | 26 +-- .../java/org/hl7/fhir/dstu3/model/Person.java | 46 +--- .../hl7/fhir/dstu3/model/Practitioner.java | 42 +--- .../fhir/dstu3/model/PractitionerRole.java | 20 +- .../org/hl7/fhir/dstu3/model/Procedure.java | 22 +- .../fhir/dstu3/model/ProcedureRequest.java | 16 +- .../hl7/fhir/dstu3/model/ProcessRequest.java | 14 +- .../hl7/fhir/dstu3/model/ProcessResponse.java | 20 +- .../org/hl7/fhir/dstu3/model/Protocol.java | 6 +- .../org/hl7/fhir/dstu3/model/Provenance.java | 24 +- .../hl7/fhir/dstu3/model/Questionnaire.java | 18 +- .../dstu3/model/QuestionnaireResponse.java | 20 +- .../hl7/fhir/dstu3/model/ReferralRequest.java | 26 +-- .../hl7/fhir/dstu3/model/RelatedPerson.java | 32 +-- .../org/hl7/fhir/dstu3/model/Resource.java | 2 +- .../hl7/fhir/dstu3/model/RiskAssessment.java | 20 +- .../org/hl7/fhir/dstu3/model/Schedule.java | 10 +- .../hl7/fhir/dstu3/model/SearchParameter.java | 18 +- .../org/hl7/fhir/dstu3/model/Sequence.java | 16 +- .../java/org/hl7/fhir/dstu3/model/Slot.java | 12 +- .../org/hl7/fhir/dstu3/model/Specimen.java | 26 +-- .../fhir/dstu3/model/StructureDefinition.java | 46 +--- .../hl7/fhir/dstu3/model/StructureMap.java | 22 +- .../hl7/fhir/dstu3/model/Subscription.java | 16 +- .../org/hl7/fhir/dstu3/model/Substance.java | 16 +- .../hl7/fhir/dstu3/model/SupplyDelivery.java | 12 +- .../hl7/fhir/dstu3/model/SupplyRequest.java | 16 +- .../java/org/hl7/fhir/dstu3/model/Task.java | 28 +-- .../org/hl7/fhir/dstu3/model/TestScript.java | 16 +- .../org/hl7/fhir/dstu3/model/ValueSet.java | 24 +- .../fhir/dstu3/model/VisionPrescription.java | 12 +- .../uhn/fhir/tinder/TinderStructuresMojo.java | 2 +- .../fhir/tinder/model/SearchParameter.java | 7 +- .../BaseStructureSpreadsheetParser.java | 46 ++-- src/changes/changes.xml | 5 + 122 files changed, 312 insertions(+), 2441 deletions(-) diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoDstu2SearchNoFtTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoDstu2SearchNoFtTest.java index 9ea8c6be3d2..e35b75549bd 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoDstu2SearchNoFtTest.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoDstu2SearchNoFtTest.java @@ -52,6 +52,7 @@ import ca.uhn.fhir.model.dstu2.composite.IdentifierDt; import ca.uhn.fhir.model.dstu2.composite.PeriodDt; import ca.uhn.fhir.model.dstu2.composite.QuantityDt; import ca.uhn.fhir.model.dstu2.composite.ResourceReferenceDt; +import ca.uhn.fhir.model.dstu2.resource.Appointment; import ca.uhn.fhir.model.dstu2.resource.ConceptMap; import ca.uhn.fhir.model.dstu2.resource.Device; import ca.uhn.fhir.model.dstu2.resource.DiagnosticOrder; @@ -104,12 +105,6 @@ import ca.uhn.fhir.util.TestUtil; public class FhirResourceDaoDstu2SearchNoFtTest extends BaseJpaDstu2Test { private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirResourceDaoDstu2SearchNoFtTest.class); - @AfterClass - public static void afterClassClearContext() { - TestUtil.clearAllStaticFieldsForUnitTest(); - } - - @Test public void testCodeSearch() { Subscription subs = new Subscription(); @@ -403,60 +398,6 @@ public class FhirResourceDaoDstu2SearchNoFtTest extends BaseJpaDstu2Test { } - @SuppressWarnings("unused") - @Test - public void testSearchResourceReferenceMissing() { - IIdType oid1; - { - Organization org = new Organization(); - org.setName("ORG1"); - oid1 = myOrganizationDao.create(org, mySrd).getId().toUnqualifiedVersionless(); - } - - IIdType pid1; - { - Patient patient = new Patient(); - patient.addName().addFamily("FAMILY1"); - pid1 = myPatientDao.create(patient, mySrd).getId().toUnqualifiedVersionless(); - } - IIdType pid2; - { - Patient patient = new Patient(); - patient.addName().addFamily("FAMILY1"); - patient.getManagingOrganization().setReference(oid1); - pid2 = myPatientDao.create(patient, mySrd).getId().toUnqualifiedVersionless(); - } - IIdType pid3; - { - Patient patient = new Patient(); - patient.addName().addFamily("FAMILY2"); - pid3 = myPatientDao.create(patient, mySrd).getId().toUnqualifiedVersionless(); - } - IIdType pid4; - { - Patient patient = new Patient(); - patient.addName().addFamily("FAMILY2"); - patient.getManagingOrganization().setReference(oid1); - pid4 = myPatientDao.create(patient, mySrd).getId().toUnqualifiedVersionless(); - } - - SearchParameterMap params; - - params = new SearchParameterMap(); - params.add(Patient.SP_NAME, new StringParam("FAMILY1")); - params.add(Patient.SP_ORGANIZATION, new ReferenceParam().setMissing(true)); - assertThat(toUnqualifiedVersionlessIds(myPatientDao.search(params)), containsInAnyOrder(pid1)); - - params = new SearchParameterMap(); - params.add(Patient.SP_ORGANIZATION, new ReferenceParam().setMissing(true)); - assertThat(toUnqualifiedVersionlessIds(myPatientDao.search(params)), containsInAnyOrder(pid1, pid3)); - - params = new SearchParameterMap(); - params.add(Patient.SP_NAME, new StringParam("FAMILY9999")); - params.add(Patient.SP_ORGANIZATION, new ReferenceParam().setMissing(true)); - assertThat(toUnqualifiedVersionlessIds(myPatientDao.search(params)), empty()); - } - @Test public void testSearchByIdParamOr() { IIdType id1; @@ -896,6 +837,35 @@ public class FhirResourceDaoDstu2SearchNoFtTest extends BaseJpaDstu2Test { assertThat(toUnqualifiedVersionlessIds(myPatientDao.search(map)), containsInAnyOrder(id1a)); } + /** + * See #310 + */ + @Test + @Ignore + public void testSearchMultiMatches() { + + for (int i = 0; i < 100; i++) { + Practitioner p = new Practitioner(); + p.addAddress().addLine("FOO"); + IIdType pid = myPractitionerDao.create(p, mySrd).getId().toUnqualifiedVersionless(); + + Patient pt = new Patient(); + pt.addCareProvider().setReference(pid); + IIdType ptid = myPatientDao.create(pt, mySrd).getId().toUnqualifiedVersionless(); + + Observation obs = new Observation(); + obs.setSubject(new ResourceReferenceDt(ptid)); + myObservationDao.create(obs, mySrd); + } + + SearchParameterMap map = new SearchParameterMap(); + map.addInclude(new Include("Patient:careprovider")); + map.addRevInclude(new Include("Observation:patient")); + + myPatientDao.search(map); + + } + @Test public void testSearchNameParam() { IIdType id1; @@ -1256,6 +1226,60 @@ public class FhirResourceDaoDstu2SearchNoFtTest extends BaseJpaDstu2Test { } + @SuppressWarnings("unused") + @Test + public void testSearchResourceReferenceMissing() { + IIdType oid1; + { + Organization org = new Organization(); + org.setName("ORG1"); + oid1 = myOrganizationDao.create(org, mySrd).getId().toUnqualifiedVersionless(); + } + + IIdType pid1; + { + Patient patient = new Patient(); + patient.addName().addFamily("FAMILY1"); + pid1 = myPatientDao.create(patient, mySrd).getId().toUnqualifiedVersionless(); + } + IIdType pid2; + { + Patient patient = new Patient(); + patient.addName().addFamily("FAMILY1"); + patient.getManagingOrganization().setReference(oid1); + pid2 = myPatientDao.create(patient, mySrd).getId().toUnqualifiedVersionless(); + } + IIdType pid3; + { + Patient patient = new Patient(); + patient.addName().addFamily("FAMILY2"); + pid3 = myPatientDao.create(patient, mySrd).getId().toUnqualifiedVersionless(); + } + IIdType pid4; + { + Patient patient = new Patient(); + patient.addName().addFamily("FAMILY2"); + patient.getManagingOrganization().setReference(oid1); + pid4 = myPatientDao.create(patient, mySrd).getId().toUnqualifiedVersionless(); + } + + SearchParameterMap params; + + params = new SearchParameterMap(); + params.add(Patient.SP_NAME, new StringParam("FAMILY1")); + params.add(Patient.SP_ORGANIZATION, new ReferenceParam().setMissing(true)); + assertThat(toUnqualifiedVersionlessIds(myPatientDao.search(params)), containsInAnyOrder(pid1)); + + params = new SearchParameterMap(); + params.add(Patient.SP_ORGANIZATION, new ReferenceParam().setMissing(true)); + assertThat(toUnqualifiedVersionlessIds(myPatientDao.search(params)), containsInAnyOrder(pid1, pid3)); + + params = new SearchParameterMap(); + params.add(Patient.SP_NAME, new StringParam("FAMILY9999")); + params.add(Patient.SP_ORGANIZATION, new ReferenceParam().setMissing(true)); + assertThat(toUnqualifiedVersionlessIds(myPatientDao.search(params)), empty()); + } + @Test public void testSearchStringParam() { { @@ -1990,36 +2014,6 @@ public class FhirResourceDaoDstu2SearchNoFtTest extends BaseJpaDstu2Test { } } - /** - * See #310 - */ - @Test - @Ignore - public void testSearchMultiMatches() { - - for (int i = 0; i < 100; i++) { - Practitioner p = new Practitioner(); - p.addAddress().addLine("FOO"); - IIdType pid = myPractitionerDao.create(p, mySrd).getId().toUnqualifiedVersionless(); - - Patient pt = new Patient(); - pt.addCareProvider().setReference(pid); - IIdType ptid = myPatientDao.create(pt, mySrd).getId().toUnqualifiedVersionless(); - - Observation obs = new Observation(); - obs.setSubject(new ResourceReferenceDt(ptid)); - myObservationDao.create(obs, mySrd); - } - - SearchParameterMap map = new SearchParameterMap(); - map.addInclude(new Include("Patient:careprovider")); - map.addRevInclude(new Include("Observation:patient")); - - myPatientDao.search(map); - - } - - @Test public void testSearchWithNoResults() { Device dev = new Device(); @@ -2205,6 +2199,35 @@ public class FhirResourceDaoDstu2SearchNoFtTest extends BaseJpaDstu2Test { } } + /** + * https://chat.fhir.org/#narrow/stream/implementers/topic/Understanding.20_include + */ + @Test + 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 testSearchWithUriParam() throws Exception { Class type = ValueSet.class; @@ -2225,4 +2248,9 @@ public class FhirResourceDaoDstu2SearchNoFtTest extends BaseJpaDstu2Test { return b.toString(); } + @AfterClass + public static void afterClassClearContext() { + TestUtil.clearAllStaticFieldsForUnitTest(); + } + } 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 14f0eaa1fb4..d239587a093 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 @@ -442,7 +442,6 @@ public class FhirResourceDaoDstu3SearchNoFtTest extends BaseJpaDstu3Test { * https://chat.fhir.org/#narrow/stream/implementers/topic/Understanding.20_include */ @Test - @Ignore public void testSearchWithTypedInclude() { IIdType patId; { 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 a256c55ee8f..9af825cc50b 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -879,8 +879,6 @@ public class Account extends DomainResource { * Path: Account.owner
*

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

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="Account.identifier", description="Account number", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -929,8 +925,6 @@ public class Account extends DomainResource { * Path: Account.coveragePeriod
*

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

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

*/ - // [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"; /** @@ -1001,9 +991,7 @@ public class Account extends DomainResource { * Path: Account.subject
*

*/ - // [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} ) + @SearchParamDefinition(name="patient", path="Account.subject", description="What is account tied to?", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -1029,8 +1017,6 @@ public class Account extends DomainResource { * Path: Account.name
*

*/ - // [] - // [] @SearchParamDefinition(name="name", path="Account.name", description="Human-readable label", type="string", target={} ) public static final String SP_NAME = "name"; /** @@ -1051,8 +1037,6 @@ public class Account extends DomainResource { * Path: Account.type
*

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

*/ - // [] - // [] @SearchParamDefinition(name="status", path="Account.status", description="active | inactive", type="token", target={} ) public static final String SP_STATUS = "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 2a68a4c641d..a4a26e7d923 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -2421,8 +2421,6 @@ 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", target={} ) public static final String SP_SEVERITY = "severity"; /** @@ -2443,8 +2441,6 @@ public class AllergyIntolerance extends DomainResource { * Path: AllergyIntolerance.recordedDate
*

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

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="AllergyIntolerance.identifier", description="External ids for this item", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -2487,8 +2481,6 @@ 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", target={} ) public static final String SP_MANIFESTATION = "manifestation"; /** @@ -2509,8 +2501,6 @@ public class AllergyIntolerance extends DomainResource { * Path: AllergyIntolerance.recorder
*

*/ - // [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"; /** @@ -2537,8 +2527,6 @@ 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", target={} ) public static final String SP_SUBSTANCE = "substance"; /** @@ -2559,8 +2547,6 @@ public class AllergyIntolerance extends DomainResource { * Path: AllergyIntolerance.criticality
*

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

*/ - // [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"; /** @@ -2609,8 +2593,6 @@ public class AllergyIntolerance extends DomainResource { * Path: AllergyIntolerance.type
*

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

*/ - // [] - // [] @SearchParamDefinition(name="onset", path="AllergyIntolerance.reaction.onset", description="Date(/time) when manifestations showed", type="date", target={} ) public static final String SP_ONSET = "onset"; /** @@ -2653,8 +2633,6 @@ 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", target={} ) public static final String SP_ROUTE = "route"; /** @@ -2675,8 +2653,6 @@ public class AllergyIntolerance extends DomainResource { * Path: AllergyIntolerance.patient
*

*/ - // [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"; /** @@ -2703,8 +2679,6 @@ public class AllergyIntolerance extends DomainResource { * Path: AllergyIntolerance.category
*

*/ - // [] - // [] @SearchParamDefinition(name="category", path="AllergyIntolerance.category", description="food | medication | environment | other - Category of Substance", type="token", target={} ) public static final String SP_CATEGORY = "category"; /** @@ -2725,8 +2699,6 @@ 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", target={} ) public static final String SP_LAST_DATE = "last-date"; /** @@ -2747,8 +2719,6 @@ 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", target={} ) public static final String SP_STATUS = "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 8229e00753e..168a4020b4c 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -2023,8 +2023,6 @@ public class Appointment extends DomainResource { * Path: Appointment.start
*

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

*/ - // [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"; /** @@ -2073,8 +2069,6 @@ public class Appointment extends DomainResource { * Path: Appointment.identifier
*

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

*/ - // [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} ) + @SearchParamDefinition(name="practitioner", path="Appointment.participant.actor", description="One of the individuals of the appointment is this practitioner", type="reference", target={Practitioner.class} ) public static final String SP_PRACTITIONER = "practitioner"; /** * Fluent Client search parameter constant for practitioner @@ -2123,8 +2115,6 @@ 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", target={} ) public static final String SP_PART_STATUS = "part-status"; /** @@ -2145,9 +2135,7 @@ public class Appointment extends DomainResource { * Path: Appointment.participant.actor
*

*/ - // [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} ) + @SearchParamDefinition(name="patient", path="Appointment.participant.actor", description="One of the individuals of the appointment is this patient", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -2173,8 +2161,6 @@ 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", target={} ) public static final String SP_APPOINTMENT_TYPE = "appointment-type"; /** @@ -2195,8 +2181,6 @@ 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", target={} ) public static final String SP_SERVICE_TYPE = "service-type"; /** @@ -2217,9 +2201,7 @@ public class Appointment extends DomainResource { * Path: Appointment.participant.actor
*

*/ - // [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} ) + @SearchParamDefinition(name="location", path="Appointment.participant.actor", description="This location is listed in the participants of the appointment", type="reference", target={Location.class} ) public static final String SP_LOCATION = "location"; /** * Fluent Client search parameter constant for location @@ -2245,8 +2227,6 @@ public class Appointment extends DomainResource { * Path: Appointment.status
*

*/ - // [] - // [] @SearchParamDefinition(name="status", path="Appointment.status", description="The overall status of the appointment", type="token", target={} ) public static final String SP_STATUS = "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 4a62057e8ad..3413f079507 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -725,8 +725,6 @@ public class AppointmentResponse extends DomainResource { * Path: AppointmentResponse.actor
*

*/ - // [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"; /** @@ -753,8 +751,6 @@ public class AppointmentResponse extends DomainResource { * Path: AppointmentResponse.identifier
*

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

*/ - // [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} ) + @SearchParamDefinition(name="practitioner", path="AppointmentResponse.actor", description="This Response is for this Practitioner", type="reference", target={Practitioner.class} ) public static final String SP_PRACTITIONER = "practitioner"; /** * Fluent Client search parameter constant for practitioner @@ -803,8 +797,6 @@ 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", target={} ) public static final String SP_PART_STATUS = "part-status"; /** @@ -825,9 +817,7 @@ public class AppointmentResponse extends DomainResource { * Path: AppointmentResponse.actor
*

*/ - // [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} ) + @SearchParamDefinition(name="patient", path="AppointmentResponse.actor", description="This Response is for this Patient", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -853,8 +843,6 @@ public class AppointmentResponse extends DomainResource { * Path: AppointmentResponse.appointment
*

*/ - // [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"; /** @@ -881,9 +869,7 @@ public class AppointmentResponse extends DomainResource { * Path: AppointmentResponse.actor
*

*/ - // [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} ) + @SearchParamDefinition(name="location", path="AppointmentResponse.actor", description="This Response is for this Location", type="reference", target={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 e37b877a896..fb0dceacdee 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -3494,8 +3494,6 @@ public class AuditEvent extends DomainResource { * Path: AuditEvent.recorded
*

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

*/ - // [] - // [] @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"; /** @@ -3538,8 +3534,6 @@ public class AuditEvent extends DomainResource { * Path: AuditEvent.agent.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"; /** @@ -3566,8 +3560,6 @@ 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", target={} ) public static final String SP_ADDRESS = "address"; /** @@ -3588,8 +3580,6 @@ 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", target={} ) public static final String SP_SOURCE = "source"; /** @@ -3610,8 +3600,6 @@ public class AuditEvent extends DomainResource { * Path: AuditEvent.type
*

*/ - // [] - // [] @SearchParamDefinition(name="type", path="AuditEvent.type", description="Type/identifier of event", type="token", target={} ) public static final String SP_TYPE = "type"; /** @@ -3632,8 +3620,6 @@ 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", target={} ) public static final String SP_ALTID = "altid"; /** @@ -3654,8 +3640,6 @@ 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", target={} ) public static final String SP_SITE = "site"; /** @@ -3676,8 +3660,6 @@ 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", target={} ) public static final String SP_AGENT_NAME = "agent-name"; /** @@ -3698,8 +3680,6 @@ public class AuditEvent extends DomainResource { * Path: AuditEvent.entity.name
*

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

*/ - // [] - // [] @SearchParamDefinition(name="subtype", path="AuditEvent.subtype", description="More specific type/id for the event", type="token", target={} ) public static final String SP_SUBTYPE = "subtype"; /** @@ -3742,9 +3720,7 @@ 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" ) + @SearchParamDefinition(name="patient", path="AuditEvent.agent.reference | AuditEvent.entity.reference", description="Direct reference to resource", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -3770,8 +3746,6 @@ public class AuditEvent extends DomainResource { * Path: AuditEvent.action
*

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

*/ - // [] - // [] @SearchParamDefinition(name="user", path="AuditEvent.agent.userId", description="Unique identifier for the user", type="token", target={} ) public static final String SP_USER = "user"; /** @@ -3814,8 +3786,6 @@ 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"; /** @@ -3842,8 +3812,6 @@ 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", target={} ) public static final String SP_ENTITY_ID = "entity-id"; /** @@ -3864,8 +3832,6 @@ public class AuditEvent extends DomainResource { * Path: AuditEvent.agent.policy
*

*/ - // [] - // [] @SearchParamDefinition(name="policy", path="AuditEvent.agent.policy", description="Policy that authorized event", type="uri", target={} ) public static final String SP_POLICY = "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 a494e5f53a3..25532379445 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -478,8 +478,6 @@ public class Basic extends DomainResource { * Path: Basic.identifier
*

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="Basic.identifier", description="Business identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -500,8 +498,6 @@ public class Basic extends DomainResource { * Path: Basic.code
*

*/ - // [] - // [] @SearchParamDefinition(name="code", path="Basic.code", description="Kind of Resource", type="token", target={} ) public static final String SP_CODE = "code"; /** @@ -522,8 +518,6 @@ 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"; /** @@ -550,8 +544,6 @@ public class Basic extends DomainResource { * Path: Basic.created
*

*/ - // [] - // [] @SearchParamDefinition(name="created", path="Basic.created", description="When created", type="date", target={} ) public static final String SP_CREATED = "created"; /** @@ -572,9 +564,7 @@ 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" ) + @SearchParamDefinition(name="patient", path="Basic.subject", description="Identifies the focus of this resource", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -600,8 +590,6 @@ public class Basic extends DomainResource { * Path: Basic.author
*

*/ - // [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"; /** 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 194bc5cbd38..8473bfdedcd 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -286,8 +286,6 @@ public class Binary extends BaseBinary implements IBaseBinary { * Path: Binary.contentType
*

*/ - // [] - // [] @SearchParamDefinition(name="contenttype", path="Binary.contentType", description="MimeType of the binary content", type="token", target={} ) public static final String SP_CONTENTTYPE = "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 375826d34b7..dfd8829008a 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -583,8 +583,6 @@ 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", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -605,8 +603,6 @@ public class BodySite extends DomainResource { * Path: BodySite.code
*

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

*/ - // [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"; /** 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 ba6656ab5ac..4c4d78d2480 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -2764,9 +2764,7 @@ public class Bundle extends Resource implements IBaseBundle { * Path: Bundle.entry.resource(0)
*

*/ - // [] - // [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={} ) + @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={Composition.class} ) public static final String SP_COMPOSITION = "composition"; /** * Fluent Client search parameter constant for composition @@ -2792,8 +2790,6 @@ 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", target={} ) public static final String SP_TYPE = "type"; /** @@ -2814,9 +2810,7 @@ public class Bundle extends Resource implements IBaseBundle { * Path: Bundle.entry.resource(0)
*

*/ - // [] - // [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={} ) + @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={MessageHeader.class} ) 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 66dd1397ee4..5c8550eed34 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -3719,8 +3719,6 @@ public class CarePlan extends DomainResource { * Path: CarePlan.period
*

*/ - // [] - // [] @SearchParamDefinition(name="date", path="CarePlan.period", description="Time period plan covers", type="date", target={} ) public static final String SP_DATE = "date"; /** @@ -3741,8 +3739,6 @@ 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", target={} ) public static final String SP_ACTIVITYCODE = "activitycode"; /** @@ -3763,8 +3759,6 @@ 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", target={} ) public static final String SP_ACTIVITYDATE = "activitydate"; /** @@ -3785,8 +3779,6 @@ public class CarePlan extends DomainResource { * Path: CarePlan.activity.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"; /** @@ -3813,8 +3805,6 @@ public class CarePlan extends DomainResource { * Path: CarePlan.activity.detail.performer
*

*/ - // [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"; /** @@ -3841,8 +3831,6 @@ public class CarePlan extends DomainResource { * Path: CarePlan.goal
*

*/ - // [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"; /** @@ -3869,8 +3857,6 @@ public class CarePlan extends DomainResource { * Path: CarePlan.subject
*

*/ - // [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"; /** @@ -3897,8 +3883,6 @@ public class CarePlan extends DomainResource { * Path: CarePlan.relatedPlan.code
*

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

*/ - // [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"; /** @@ -3947,8 +3929,6 @@ public class CarePlan extends DomainResource { * Path: CarePlan.relatedPlan.plan
*

*/ - // [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"; /** @@ -3975,8 +3955,6 @@ public class CarePlan extends DomainResource { * Path: CarePlan.addresses
*

*/ - // [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"; /** @@ -4003,8 +3981,6 @@ 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"}, target={} ) public static final String SP_RELATED = "related"; /** @@ -4025,9 +4001,7 @@ public class CarePlan extends DomainResource { * Path: CarePlan.subject
*

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

*/ - // [] - // [] @SearchParamDefinition(name="category", path="CarePlan.category", description="Type of plan", type="token", target={} ) public static final String SP_CATEGORY = "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 363494ede70..b2507598341 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -925,8 +925,6 @@ public class CareTeam extends DomainResource { * Path: CareTeam.period
*

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

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

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

*/ - // [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"; /** @@ -1025,8 +1017,6 @@ public class CareTeam extends DomainResource { * Path: CareTeam.type
*

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

*/ - // [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"; /** @@ -1075,8 +1063,6 @@ public class CareTeam extends DomainResource { * Path: CareTeam.status
*

*/ - // [] - // [] @SearchParamDefinition(name="status", path="CareTeam.status", description="active | suspended | inactive | entered in error", type="token", target={} ) public static final String SP_STATUS = "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 59a38eb2ac2..e29b18322b7 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -8434,8 +8434,6 @@ public class Claim extends DomainResource { * Path: Claim.identifier
*

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

*/ - // [] - // [] @SearchParamDefinition(name="patientidentifier", path="Claim.patient.as(Identifier)", description="Patient receiving the services", type="token", target={} ) public static final String SP_PATIENTIDENTIFIER = "patientidentifier"; /** @@ -8478,8 +8474,6 @@ 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", target={} ) public static final String SP_ORGANIZATIONIDENTIFIER = "organizationidentifier"; /** @@ -8500,8 +8494,6 @@ public class Claim extends DomainResource { * Path: Claim.use
*

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

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

*/ - // [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"; /** @@ -8572,8 +8560,6 @@ public class Claim extends DomainResource { * Path: Claim.providerReference
*

*/ - // [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"; /** @@ -8600,8 +8586,6 @@ public class Claim extends DomainResource { * Path: Claim.organizationReference
*

*/ - // [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"; /** @@ -8628,8 +8612,6 @@ public class Claim extends DomainResource { * Path: Claim.priority
*

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

*/ - // [] - // [] @SearchParamDefinition(name="provideridentifier", path="Claim.provider.as(Identifier)", description="Provider responsible for the Claim", type="token", target={} ) public static final String SP_PROVIDERIDENTIFIER = "provideridentifier"; /** @@ -8672,8 +8652,6 @@ 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", target={} ) public static final String SP_TARGETIDENTIFIER = "targetidentifier"; /** @@ -8694,8 +8672,6 @@ public class Claim extends DomainResource { * Path: Claim.facilityReference
*

*/ - // [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"; /** @@ -8722,8 +8698,6 @@ public class Claim extends DomainResource { * Path: Claim.targetReference
*

*/ - // [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"; /** @@ -8750,8 +8724,6 @@ 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", target={} ) public static final String SP_FACILITYIDENTIFIER = "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 e77de2b7496..d6c97961f25 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -6230,8 +6230,6 @@ public class ClaimResponse extends DomainResource { * Path: ClaimResponse.identifier
*

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

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

*/ - // [] - // [] @SearchParamDefinition(name="paymentdate", path="ClaimResponse.paymentDate", description="The expected paymentDate", type="date", target={} ) public static final String SP_PAYMENTDATE = "paymentdate"; /** @@ -6296,8 +6290,6 @@ 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", target={} ) public static final String SP_ORGANIZATIONIDENTIFIER = "organizationidentifier"; /** @@ -6318,8 +6310,6 @@ public class ClaimResponse extends DomainResource { * Path: ClaimResponse.created
*

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

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

*/ - // [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"; /** @@ -6390,8 +6376,6 @@ public class ClaimResponse extends DomainResource { * Path: ClaimResponse.requestReference
*

*/ - // [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"; /** @@ -6418,8 +6402,6 @@ public class ClaimResponse extends DomainResource { * Path: ClaimResponse.outcome
*

*/ - // [] - // [] @SearchParamDefinition(name="outcome", path="ClaimResponse.outcome", description="The processing outcome", type="token", target={} ) public static final String SP_OUTCOME = "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 3e501714ffc..3a20653c209 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -2209,8 +2209,6 @@ public class ClinicalImpression extends DomainResource { * Path: ClinicalImpression.date
*

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

*/ - // [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"; /** @@ -2259,8 +2255,6 @@ public class ClinicalImpression extends DomainResource { * Path: ClinicalImpression.assessor
*

*/ - // [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"; /** @@ -2287,8 +2281,6 @@ 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"; /** @@ -2315,8 +2307,6 @@ 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", target={} ) public static final String SP_FINDING = "finding"; /** @@ -2337,8 +2327,6 @@ 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", target={} ) public static final String SP_RULEDOUT = "ruledout"; /** @@ -2359,8 +2347,6 @@ public class ClinicalImpression extends DomainResource { * Path: ClinicalImpression.problem
*

*/ - // [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"; /** @@ -2387,8 +2373,6 @@ public class ClinicalImpression extends DomainResource { * Path: ClinicalImpression.patient
*

*/ - // [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"; /** @@ -2415,8 +2399,6 @@ public class ClinicalImpression extends DomainResource { * Path: ClinicalImpression.investigations.item
*

*/ - // [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"; /** @@ -2443,8 +2425,6 @@ public class ClinicalImpression extends DomainResource { * Path: ClinicalImpression.action
*

*/ - // [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"; /** @@ -2471,8 +2451,6 @@ 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", target={} ) public static final String SP_TRIGGER_CODE = "trigger-code"; /** @@ -2493,8 +2471,6 @@ public class ClinicalImpression extends DomainResource { * Path: ClinicalImpression.plan
*

*/ - // [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"; /** @@ -2521,8 +2497,6 @@ public class ClinicalImpression extends DomainResource { * Path: ClinicalImpression.resolved
*

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

*/ - // [] - // [] @SearchParamDefinition(name="status", path="ClinicalImpression.status", description="in-progress | completed | entered-in-error", type="token", target={} ) public static final String SP_STATUS = "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 8a925fcfc98..d1584a658e0 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -3991,8 +3991,6 @@ public class CodeSystem extends DomainResource { * Path: CodeSystem.date
*

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

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="CodeSystem.identifier", description="The identifier for the code system", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -4035,8 +4031,6 @@ 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", target={} ) public static final String SP_CODE = "code"; /** @@ -4057,8 +4051,6 @@ 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", target={} ) public static final String SP_DESCRIPTION = "description"; /** @@ -4079,8 +4071,6 @@ 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", target={} ) public static final String SP_LANGUAGE = "language"; /** @@ -4101,8 +4091,6 @@ public class CodeSystem extends DomainResource { * Path: CodeSystem.version
*

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

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

*/ - // [] - // [] @SearchParamDefinition(name="content", path="CodeSystem.content", description="not-present | examplar | fragment | complete", type="token", target={} ) public static final String SP_CONTENT = "content"; /** @@ -4167,8 +4151,6 @@ 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", target={} ) public static final String SP_SYSTEM = "system"; /** @@ -4189,8 +4171,6 @@ public class CodeSystem extends DomainResource { * Path: CodeSystem.name
*

*/ - // [] - // [] @SearchParamDefinition(name="name", path="CodeSystem.name", description="The name of the code system", type="string", target={} ) public static final String SP_NAME = "name"; /** @@ -4211,8 +4191,6 @@ 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", target={} ) public static final String SP_CONTEXT = "context"; /** @@ -4233,8 +4211,6 @@ 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", target={} ) public static final String SP_PUBLISHER = "publisher"; /** @@ -4255,8 +4231,6 @@ public class CodeSystem extends DomainResource { * Path: CodeSystem.status
*

*/ - // [] - // [] @SearchParamDefinition(name="status", path="CodeSystem.status", description="The status of the code system", type="token", target={} ) public static final String SP_STATUS = "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 aaac78e671a..8063b84743f 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1409,8 +1409,6 @@ public class Communication extends DomainResource { * Path: Communication.identifier
*

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="Communication.identifier", description="Unique identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -1431,8 +1429,6 @@ public class Communication extends DomainResource { * Path: Communication.requestDetail
*

*/ - // [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"; /** @@ -1459,8 +1455,6 @@ public class Communication extends DomainResource { * Path: Communication.sender
*

*/ - // [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"; /** @@ -1487,8 +1481,6 @@ public class Communication extends DomainResource { * Path: Communication.subject
*

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

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

*/ - // [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"; /** @@ -1571,8 +1559,6 @@ public class Communication extends DomainResource { * Path: Communication.received
*

*/ - // [] - // [] @SearchParamDefinition(name="received", path="Communication.received", description="When received", type="date", target={} ) public static final String SP_RECEIVED = "received"; /** @@ -1593,8 +1579,6 @@ public class Communication extends DomainResource { * Path: Communication.medium
*

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

*/ - // [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"; /** @@ -1643,8 +1625,6 @@ public class Communication extends DomainResource { * Path: Communication.category
*

*/ - // [] - // [] @SearchParamDefinition(name="category", path="Communication.category", description="Message category", type="token", target={} ) public static final String SP_CATEGORY = "category"; /** @@ -1665,8 +1645,6 @@ public class Communication extends DomainResource { * Path: Communication.sent
*

*/ - // [] - // [] @SearchParamDefinition(name="sent", path="Communication.sent", description="When sent", type="date", target={} ) public static final String SP_SENT = "sent"; /** @@ -1687,8 +1665,6 @@ public class Communication extends DomainResource { * Path: Communication.status
*

*/ - // [] - // [] @SearchParamDefinition(name="status", path="Communication.status", description="in-progress | completed | suspended | rejected | failed", type="token", target={} ) public static final String SP_STATUS = "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 8bcfc403e4c..3475405c1bd 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1529,8 +1529,6 @@ public class CommunicationRequest extends DomainResource { * Path: CommunicationRequest.requester
*

*/ - // [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"; /** @@ -1557,8 +1555,6 @@ public class CommunicationRequest extends DomainResource { * Path: CommunicationRequest.identifier
*

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="CommunicationRequest.identifier", description="Unique identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -1579,8 +1575,6 @@ public class CommunicationRequest extends DomainResource { * Path: CommunicationRequest.subject
*

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

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

*/ - // [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"; /** @@ -1657,8 +1647,6 @@ public class CommunicationRequest extends DomainResource { * Path: CommunicationRequest.priority
*

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

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

*/ - // [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"; /** @@ -1729,8 +1713,6 @@ public class CommunicationRequest extends DomainResource { * Path: CommunicationRequest.subject
*

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

*/ - // [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"; /** @@ -1785,8 +1765,6 @@ public class CommunicationRequest extends DomainResource { * Path: CommunicationRequest.scheduledDateTime
*

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

*/ - // [] - // [] @SearchParamDefinition(name="category", path="CommunicationRequest.category", description="Message category", type="token", target={} ) public static final String SP_CATEGORY = "category"; /** @@ -1829,8 +1805,6 @@ 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", target={} ) public static final String SP_STATUS = "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 add2131b968..11ee45fc7d9 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1687,8 +1687,6 @@ public class CompartmentDefinition extends DomainResource { * Path: CompartmentDefinition.date
*

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

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

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

*/ - // [] - // [] @SearchParamDefinition(name="name", path="CompartmentDefinition.name", description="Informal name for this compartment definition", type="string", target={} ) public static final String SP_NAME = "name"; /** @@ -1775,8 +1767,6 @@ 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", target={} ) public static final String SP_URL = "url"; /** @@ -1797,8 +1787,6 @@ public class CompartmentDefinition extends DomainResource { * Path: CompartmentDefinition.status
*

*/ - // [] - // [] @SearchParamDefinition(name="status", path="CompartmentDefinition.status", description="draft | active | retired", type="token", target={} ) public static final String SP_STATUS = "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 8e313416bcf..42048f4b402 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -2542,8 +2542,6 @@ public class Composition extends DomainResource { * Path: Composition.date
*

*/ - // [] - // [] @SearchParamDefinition(name="date", path="Composition.date", description="Composition editing time", type="date", target={} ) public static final String SP_DATE = "date"; /** @@ -2564,8 +2562,6 @@ public class Composition extends DomainResource { * Path: Composition.identifier
*

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="Composition.identifier", description="Logical identifier of composition (version-independent)", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -2586,8 +2582,6 @@ 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", target={} ) public static final String SP_PERIOD = "period"; /** @@ -2608,8 +2602,6 @@ 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"; /** @@ -2636,8 +2628,6 @@ public class Composition extends DomainResource { * Path: Composition.author
*

*/ - // [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"; /** @@ -2664,8 +2654,6 @@ public class Composition extends DomainResource { * Path: Composition.confidentiality
*

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

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

*/ - // [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"; /** @@ -2736,8 +2720,6 @@ public class Composition extends DomainResource { * Path: Composition.type
*

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

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

*/ - // [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"; /** @@ -2808,8 +2786,6 @@ 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"; /** @@ -2836,9 +2812,7 @@ 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" ) + @SearchParamDefinition(name="patient", path="Composition.subject", description="Who and/or what the composition is about", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -2864,8 +2838,6 @@ 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", target={} ) public static final String SP_CONTEXT = "context"; /** @@ -2886,8 +2858,6 @@ public class Composition extends DomainResource { * Path: Composition.class
*

*/ - // [] - // [] @SearchParamDefinition(name="class", path="Composition.class", description="Categorization of Composition", type="token", target={} ) public static final String SP_CLASS = "class"; /** @@ -2908,8 +2878,6 @@ public class Composition extends DomainResource { * Path: Composition.status
*

*/ - // [] - // [] @SearchParamDefinition(name="status", path="Composition.status", description="preliminary | final | amended | entered-in-error", type="token", target={} ) public static final String SP_STATUS = "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 54fb2ba2c72..fd5e0f41d87 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -2769,8 +2769,6 @@ public class ConceptMap extends DomainResource { * Path: ConceptMap.date
*

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

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="ConceptMap.identifier", description="Additional identifier for the concept map", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -2813,8 +2809,6 @@ 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", target={} ) public static final String SP_PRODUCT = "product"; /** @@ -2835,8 +2829,6 @@ 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", target={} ) public static final String SP_TARGET_SYSTEM = "target-system"; /** @@ -2857,8 +2849,6 @@ 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", target={} ) public static final String SP_DEPENDSON = "dependson"; /** @@ -2879,8 +2869,6 @@ 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", target={} ) public static final String SP_DESCRIPTION = "description"; /** @@ -2901,8 +2889,6 @@ public class ConceptMap extends DomainResource { * Path: ConceptMap.sourceReference
*

*/ - // [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"; /** @@ -2929,8 +2915,6 @@ public class ConceptMap extends DomainResource { * Path: ConceptMap.version
*

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

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

*/ - // [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"; /** @@ -3001,8 +2981,6 @@ public class ConceptMap extends DomainResource { * Path: ConceptMap.element.code
*

*/ - // [] - // [] @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"; /** @@ -3023,8 +3001,6 @@ public class ConceptMap extends DomainResource { * Path: ConceptMap.sourceUri
*

*/ - // [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"; /** @@ -3051,8 +3027,6 @@ public class ConceptMap extends DomainResource { * Path: ConceptMap.name
*

*/ - // [] - // [] @SearchParamDefinition(name="name", path="ConceptMap.name", description="Name of the concept map", type="string", target={} ) public static final String SP_NAME = "name"; /** @@ -3073,8 +3047,6 @@ 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", target={} ) public static final String SP_CONTEXT = "context"; /** @@ -3095,8 +3067,6 @@ 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", target={} ) public static final String SP_PUBLISHER = "publisher"; /** @@ -3117,8 +3087,6 @@ 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", target={} ) public static final String SP_SOURCE_SYSTEM = "source-system"; /** @@ -3139,8 +3107,6 @@ 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", target={} ) public static final String SP_TARGET_CODE = "target-code"; /** @@ -3161,8 +3127,6 @@ public class ConceptMap extends DomainResource { * Path: ConceptMap.status
*

*/ - // [] - // [] @SearchParamDefinition(name="status", path="ConceptMap.status", description="Status of the concept map", type="token", target={} ) public static final String SP_STATUS = "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 a0026f1932b..a3e6218845a 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1931,8 +1931,6 @@ public class Condition extends DomainResource { * Path: Condition.severity
*

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

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

*/ - // [] - // [] @SearchParamDefinition(name="clinicalstatus", path="Condition.clinicalStatus", description="The clinical status of the condition", type="token", target={} ) public static final String SP_CLINICALSTATUS = "clinicalstatus"; /** @@ -1997,8 +1991,6 @@ 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", target={} ) public static final String SP_ONSET_INFO = "onset-info"; /** @@ -2019,8 +2011,6 @@ public class Condition extends DomainResource { * Path: Condition.code
*

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

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

*/ - // [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"; /** @@ -2091,8 +2077,6 @@ 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", target={} ) public static final String SP_ONSET = "onset"; /** @@ -2113,8 +2097,6 @@ public class Condition extends DomainResource { * Path: Condition.asserter
*

*/ - // [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"; /** @@ -2141,8 +2123,6 @@ 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", target={} ) public static final String SP_DATE_RECORDED = "date-recorded"; /** @@ -2163,8 +2143,6 @@ public class Condition extends DomainResource { * Path: Condition.stage.summary
*

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

*/ - // [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"; /** @@ -2213,8 +2189,6 @@ public class Condition extends DomainResource { * Path: Condition.category
*

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

*/ - // [] - // [] @SearchParamDefinition(name="body-site", path="Condition.bodySite", description="Anatomical location, if relevant", type="token", target={} ) public static final String SP_BODY_SITE = "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 e90b4ced5cd..707ac4c501b 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -9037,8 +9037,6 @@ public class Conformance extends DomainResource implements IBaseConformance { * Path: Conformance.date
*

*/ - // [] - // [] @SearchParamDefinition(name="date", path="Conformance.date", description="The conformance statement publication date", type="date", target={} ) public static final String SP_DATE = "date"; /** @@ -9059,8 +9057,6 @@ 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", target={} ) public static final String SP_SOFTWARE = "software"; /** @@ -9081,8 +9077,6 @@ 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", target={} ) public static final String SP_RESOURCE = "resource"; /** @@ -9103,8 +9097,6 @@ 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", target={} ) public static final String SP_FORMAT = "format"; /** @@ -9125,8 +9117,6 @@ 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", target={} ) public static final String SP_DESCRIPTION = "description"; /** @@ -9147,8 +9137,6 @@ public class Conformance extends DomainResource implements IBaseConformance { * Path: Conformance.version
*

*/ - // [] - // [] @SearchParamDefinition(name="fhirversion", path="Conformance.version", description="The version of FHIR", type="token", target={} ) public static final String SP_FHIRVERSION = "fhirversion"; /** @@ -9169,8 +9157,6 @@ 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", target={} ) public static final String SP_VERSION = "version"; /** @@ -9191,8 +9177,6 @@ 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", target={} ) public static final String SP_SECURITYSERVICE = "securityservice"; /** @@ -9213,8 +9197,6 @@ 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", target={} ) public static final String SP_URL = "url"; /** @@ -9235,8 +9217,6 @@ public class Conformance extends DomainResource implements IBaseConformance { * Path: Conformance.profile
*

*/ - // [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"; /** @@ -9263,8 +9243,6 @@ 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", target={} ) public static final String SP_MODE = "mode"; /** @@ -9285,8 +9263,6 @@ public class Conformance extends DomainResource implements IBaseConformance { * Path: Conformance.rest.resource.profile
*

*/ - // [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"; /** @@ -9313,8 +9289,6 @@ public class Conformance extends DomainResource implements IBaseConformance { * Path: Conformance.name
*

*/ - // [] - // [] @SearchParamDefinition(name="name", path="Conformance.name", description="Name of the conformance statement", type="string", target={} ) public static final String SP_NAME = "name"; /** @@ -9335,8 +9309,6 @@ 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", target={} ) public static final String SP_CONTEXT = "context"; /** @@ -9357,8 +9329,6 @@ 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", target={} ) public static final String SP_PUBLISHER = "publisher"; /** @@ -9379,8 +9349,6 @@ 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", target={} ) public static final String SP_EVENT = "event"; /** @@ -9401,8 +9369,6 @@ 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", target={} ) public static final String SP_STATUS = "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 36959a8d6eb..6057af26e3e 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -4963,8 +4963,6 @@ public class Contract extends DomainResource { * Path: Contract.identifier
*

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

*/ - // [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"; /** @@ -5013,8 +5009,6 @@ 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"; /** @@ -5041,9 +5035,7 @@ 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" ) + @SearchParamDefinition(name="patient", path="Contract.subject", description="The identity of the subject of the contract (if a patient)", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -5069,8 +5061,6 @@ 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"; /** @@ -5097,8 +5087,6 @@ public class Contract extends DomainResource { * Path: Contract.authority
*

*/ - // [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"; /** @@ -5125,8 +5113,6 @@ public class Contract extends DomainResource { * Path: Contract.domain
*

*/ - // [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"; /** @@ -5153,8 +5139,6 @@ 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"; /** @@ -5181,8 +5165,6 @@ public class Contract extends DomainResource { * Path: Contract.issued
*

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

*/ - // [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"; /** 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 b66939bbcb7..b813d6c0a02 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1314,8 +1314,6 @@ 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", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -1336,8 +1334,6 @@ public class Coverage extends DomainResource { * Path: Coverage.issuerReference
*

*/ - // [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"; /** @@ -1364,8 +1360,6 @@ public class Coverage extends DomainResource { * Path: Coverage.subPlan
*

*/ - // [] - // [] @SearchParamDefinition(name="subplan", path="Coverage.subPlan", description="Sub-plan identifier", type="token", target={} ) public static final String SP_SUBPLAN = "subplan"; /** @@ -1386,8 +1380,6 @@ 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", target={} ) public static final String SP_TYPE = "type"; /** @@ -1408,8 +1400,6 @@ public class Coverage extends DomainResource { * Path: Coverage.beneficiaryIdentifier
*

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

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

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

*/ - // [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"; /** @@ -1502,8 +1486,6 @@ public class Coverage extends DomainResource { * Path: Coverage.issuerIdentifier
*

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

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

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

*/ - // [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"; /** @@ -1596,8 +1572,6 @@ public class Coverage extends DomainResource { * Path: Coverage.group
*

*/ - // [] - // [] @SearchParamDefinition(name="group", path="Coverage.group", description="Group identifier", type="token", target={} ) public static final String SP_GROUP = "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 584edf3a438..ffece186435 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1929,8 +1929,6 @@ public class DataElement extends DomainResource { * Path: DataElement.date
*

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

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="DataElement.identifier", description="The identifier of the data element", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -1973,8 +1969,6 @@ 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", target={} ) public static final String SP_CODE = "code"; /** @@ -1995,8 +1989,6 @@ public class DataElement extends DomainResource { * Path: DataElement.stringency
*

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

*/ - // [] - // [] @SearchParamDefinition(name="name", path="DataElement.name", description="Name of the data element", type="string", target={} ) public static final String SP_NAME = "name"; /** @@ -2039,8 +2029,6 @@ 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", target={} ) public static final String SP_CONTEXT = "context"; /** @@ -2061,8 +2049,6 @@ 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", target={} ) public static final String SP_PUBLISHER = "publisher"; /** @@ -2083,8 +2069,6 @@ 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", target={} ) public static final String SP_DESCRIPTION = "description"; /** @@ -2105,8 +2089,6 @@ public class DataElement extends DomainResource { * Path: DataElement.version
*

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

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

*/ - // [] - // [] @SearchParamDefinition(name="status", path="DataElement.status", description="The current status of the data element", type="token", target={} ) public static final String SP_STATUS = "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 a9912f2298d..9cff9170ef0 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -532,8 +532,6 @@ 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", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -554,8 +552,6 @@ public class DecisionSupportRule extends DomainResource { * Path: DecisionSupportRule.moduleMetadata.topic
*

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

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

*/ - // [] - // [] @SearchParamDefinition(name="title", path="DecisionSupportRule.moduleMetadata.title", description="Text search against the title", type="string", target={} ) public static final String SP_TITLE = "title"; /** @@ -620,8 +612,6 @@ 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", target={} ) public static final String SP_VERSION = "version"; /** @@ -642,8 +632,6 @@ public class DecisionSupportRule extends DomainResource { * Path: DecisionSupportRule.moduleMetadata.status
*

*/ - // [] - // [] @SearchParamDefinition(name="status", path="DecisionSupportRule.moduleMetadata.status", description="Status of the module", type="token", target={} ) public static final String SP_STATUS = "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 178fda8877a..db94e11d201 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -437,8 +437,6 @@ 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", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -459,8 +457,6 @@ public class DecisionSupportServiceModule extends DomainResource { * Path: DecisionSupportServiceModule.moduleMetadata.topic
*

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

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

*/ - // [] - // [] @SearchParamDefinition(name="title", path="DecisionSupportServiceModule.moduleMetadata.title", description="Text search against the title", type="string", target={} ) public static final String SP_TITLE = "title"; /** @@ -525,8 +517,6 @@ 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", target={} ) public static final String SP_VERSION = "version"; /** @@ -547,8 +537,6 @@ public class DecisionSupportServiceModule extends DomainResource { * Path: DecisionSupportServiceModule.moduleMetadata.status
*

*/ - // [] - // [] @SearchParamDefinition(name="status", path="DecisionSupportServiceModule.moduleMetadata.status", description="Status of the module", type="token", target={} ) public static final String SP_STATUS = "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 3bd99a09af2..062f898de4c 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1203,8 +1203,6 @@ public class DetectedIssue extends DomainResource { * Path: DetectedIssue.date
*

*/ - // [] - // [] @SearchParamDefinition(name="date", path="DetectedIssue.date", description="When identified", type="date", target={} ) public static final String SP_DATE = "date"; /** @@ -1225,8 +1223,6 @@ public class DetectedIssue extends DomainResource { * Path: DetectedIssue.identifier
*

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

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

*/ - // [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"; /** @@ -1303,8 +1295,6 @@ 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"; /** @@ -1331,8 +1321,6 @@ 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", target={} ) public static final String SP_CATEGORY = "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 6c93009354d..bf68259d722 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1352,8 +1352,6 @@ public class Device extends DomainResource { * Path: Device.identifier
*

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

*/ - // [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"; /** @@ -1402,8 +1398,6 @@ public class Device extends DomainResource { * Path: Device.owner
*

*/ - // [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"; /** @@ -1430,8 +1424,6 @@ public class Device extends DomainResource { * Path: Device.model
*

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

*/ - // [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"; /** @@ -1480,8 +1470,6 @@ public class Device extends DomainResource { * Path: Device.type
*

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

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

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

*/ - // [] - // [] @SearchParamDefinition(name="manufacturer", path="Device.manufacturer", description="The manufacturer of the device", type="string", target={} ) public static final String SP_MANUFACTURER = "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 7a2862b8670..bbe18a69173 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1251,8 +1251,6 @@ public class DeviceComponent extends DomainResource { * Path: DeviceComponent.parent
*

*/ - // [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"; /** @@ -1279,8 +1277,6 @@ public class DeviceComponent extends DomainResource { * Path: DeviceComponent.source
*

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

*/ - // [] - // [] @SearchParamDefinition(name="type", path="DeviceComponent.type", description="The device component type", type="token", target={} ) public static final String SP_TYPE = "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 c580c50ed0f..2a4be22f242 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1695,8 +1695,6 @@ public class DeviceMetric extends DomainResource { * Path: DeviceMetric.parent
*

*/ - // [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"; /** @@ -1723,8 +1721,6 @@ public class DeviceMetric extends DomainResource { * Path: DeviceMetric.identifier
*

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

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

*/ - // [] - // [] @SearchParamDefinition(name="type", path="DeviceMetric.type", description="The component type", type="token", target={} ) public static final String SP_TYPE = "type"; /** @@ -1795,8 +1787,6 @@ public class DeviceMetric extends DomainResource { * Path: DeviceMetric.category
*

*/ - // [] - // [] @SearchParamDefinition(name="category", path="DeviceMetric.category", description="The category of the metric", type="token", target={} ) public static final String SP_CATEGORY = "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 98becf3016b..ea9eeabe062 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1470,8 +1470,6 @@ public class DeviceUseRequest extends DomainResource { * Path: DeviceUseRequest.subject
*

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

*/ - // [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"; /** @@ -1526,8 +1522,6 @@ public class DeviceUseRequest extends DomainResource { * Path: DeviceUseRequest.device
*

*/ - // [Device] - // [Device] @SearchParamDefinition(name="device", path="DeviceUseRequest.device", description="Device requested", type="reference", target={Device.class} ) public static final String SP_DEVICE = "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 29444cf9968..7f69b0551c6 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -823,8 +823,6 @@ public class DeviceUseStatement extends DomainResource { * Path: DeviceUseStatement.subject
*

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

*/ - // [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"; /** @@ -879,8 +875,6 @@ public class DeviceUseStatement extends DomainResource { * Path: DeviceUseStatement.device
*

*/ - // [Device] - // [Device] @SearchParamDefinition(name="device", path="DeviceUseStatement.device", description="Search by device", type="reference", target={Device.class} ) public static final String SP_DEVICE = "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 d9ec4637a0f..d48cee05f6b 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -2281,8 +2281,6 @@ 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", target={} ) public static final String SP_ITEM_PAST_STATUS = "item-past-status"; /** @@ -2303,8 +2301,6 @@ public class DiagnosticOrder extends DomainResource { * Path: DiagnosticOrder.identifier
*

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="DiagnosticOrder.identifier", description="Identifiers assigned to this order", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -2325,8 +2321,6 @@ 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", target={} ) public static final String SP_BODYSITE = "bodysite"; /** @@ -2347,8 +2341,6 @@ 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", target={} ) public static final String SP_CODE = "code"; /** @@ -2369,8 +2361,6 @@ 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", target={} ) public static final String SP_EVENT_DATE = "event-date"; /** @@ -2391,8 +2381,6 @@ 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"}, target={} ) public static final String SP_EVENT_STATUS_DATE = "event-status-date"; /** @@ -2413,8 +2401,6 @@ public class DiagnosticOrder extends DomainResource { * Path: DiagnosticOrder.subject
*

*/ - // [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"; /** @@ -2441,8 +2427,6 @@ public class DiagnosticOrder extends DomainResource { * Path: DiagnosticOrder.encounter
*

*/ - // [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"; /** @@ -2469,8 +2453,6 @@ public class DiagnosticOrder extends DomainResource { * Path: DiagnosticOrder.event.actor, DiagnosticOrder.item.event.actor
*

*/ - // [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"; /** @@ -2497,8 +2479,6 @@ 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", target={} ) public static final String SP_ITEM_DATE = "item-date"; /** @@ -2519,8 +2499,6 @@ 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"}, target={} ) public static final String SP_ITEM_STATUS_DATE = "item-status-date"; /** @@ -2541,8 +2519,6 @@ 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", target={} ) public static final String SP_EVENT_STATUS = "event-status"; /** @@ -2563,8 +2539,6 @@ 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", target={} ) public static final String SP_ITEM_STATUS = "item-status"; /** @@ -2585,9 +2559,7 @@ public class DiagnosticOrder extends DomainResource { * Path: DiagnosticOrder.subject
*

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

*/ - // [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"; /** @@ -2641,8 +2611,6 @@ public class DiagnosticOrder extends DomainResource { * Path: DiagnosticOrder.specimen, DiagnosticOrder.item.specimen
*

*/ - // [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"; /** @@ -2669,8 +2637,6 @@ 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", target={} ) public static final String SP_STATUS = "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 d295207fe30..bd7009aa330 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1848,8 +1848,6 @@ 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", target={} ) public static final String SP_DATE = "date"; /** @@ -1870,8 +1868,6 @@ public class DiagnosticReport extends DomainResource { * Path: DiagnosticReport.identifier
*

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

*/ - // [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"; /** @@ -1920,8 +1914,6 @@ public class DiagnosticReport extends DomainResource { * Path: DiagnosticReport.request
*

*/ - // [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"; /** @@ -1948,8 +1940,6 @@ public class DiagnosticReport extends DomainResource { * Path: DiagnosticReport.performer
*

*/ - // [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"; /** @@ -1976,8 +1966,6 @@ 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", target={} ) public static final String SP_CODE = "code"; /** @@ -1998,8 +1986,6 @@ public class DiagnosticReport extends DomainResource { * Path: DiagnosticReport.subject
*

*/ - // [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"; /** @@ -2026,8 +2012,6 @@ public class DiagnosticReport extends DomainResource { * Path: DiagnosticReport.codedDiagnosis
*

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

*/ - // [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"; /** @@ -2076,8 +2058,6 @@ public class DiagnosticReport extends DomainResource { * Path: DiagnosticReport.result
*

*/ - // [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"; /** @@ -2104,9 +2084,7 @@ public class DiagnosticReport extends DomainResource { * Path: DiagnosticReport.subject
*

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

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

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

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

*/ - // [] - // [] @SearchParamDefinition(name="status", path="DiagnosticReport.status", description="The status of the report", type="token", target={} ) public static final String SP_STATUS = "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 22589dd804b..ce0706b966d 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1377,8 +1377,6 @@ 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", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -1399,8 +1397,6 @@ 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", target={} ) public static final String SP_RELATED_ID = "related-id"; /** @@ -1421,8 +1417,6 @@ 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"; /** @@ -1449,8 +1443,6 @@ public class DocumentManifest extends DomainResource { * Path: DocumentManifest.subject
*

*/ - // [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"; /** @@ -1477,8 +1469,6 @@ public class DocumentManifest extends DomainResource { * Path: DocumentManifest.author
*

*/ - // [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"; /** @@ -1505,8 +1495,6 @@ public class DocumentManifest extends DomainResource { * Path: DocumentManifest.created
*

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

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

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

*/ - // [] - // [] @SearchParamDefinition(name="type", path="DocumentManifest.type", description="Kind of document set", type="token", target={} ) public static final String SP_TYPE = "type"; /** @@ -1593,8 +1575,6 @@ 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"; /** @@ -1621,9 +1601,7 @@ public class DocumentManifest extends DomainResource { * Path: DocumentManifest.subject
*

*/ - // [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} ) + @SearchParamDefinition(name="patient", path="DocumentManifest.subject", description="The subject of the set of documents", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -1649,8 +1627,6 @@ public class DocumentManifest extends DomainResource { * Path: DocumentManifest.recipient
*

*/ - // [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"; /** @@ -1677,8 +1653,6 @@ public class DocumentManifest extends DomainResource { * Path: DocumentManifest.status
*

*/ - // [] - // [] @SearchParamDefinition(name="status", path="DocumentManifest.status", description="current | superseded | entered-in-error", type="token", target={} ) public static final String SP_STATUS = "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 076f653c661..c592a9c924e 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -2558,8 +2558,6 @@ public class DocumentReference extends DomainResource { * Path: DocumentReference.securityLabel
*

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

*/ - // [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"; /** @@ -2608,8 +2604,6 @@ public class DocumentReference extends DomainResource { * Path: DocumentReference.description
*

*/ - // [] - // [] @SearchParamDefinition(name="description", path="DocumentReference.description", description="Human-readable description (title)", type="string", target={} ) public static final String SP_DESCRIPTION = "description"; /** @@ -2630,8 +2624,6 @@ 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", target={} ) public static final String SP_LANGUAGE = "language"; /** @@ -2652,8 +2644,6 @@ public class DocumentReference extends DomainResource { * Path: DocumentReference.type
*

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

*/ - // [] - // [] @SearchParamDefinition(name="relation", path="DocumentReference.relatesTo.code", description="replaces | transforms | signs | appends", type="token", target={} ) public static final String SP_RELATION = "relation"; /** @@ -2696,8 +2684,6 @@ 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", target={} ) public static final String SP_SETTING = "setting"; /** @@ -2718,9 +2704,7 @@ public class DocumentReference extends DomainResource { * Path: DocumentReference.subject
*

*/ - // [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} ) + @SearchParamDefinition(name="patient", path="DocumentReference.subject", description="Who/what is the subject of the document", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -2746,8 +2730,6 @@ public class DocumentReference extends DomainResource { * Path:
*

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

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

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

*/ - // [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"; /** @@ -2840,8 +2816,6 @@ 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", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -2862,8 +2836,6 @@ 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", target={} ) public static final String SP_PERIOD = "period"; /** @@ -2884,8 +2856,6 @@ 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", target={} ) public static final String SP_RELATED_ID = "related-id"; /** @@ -2906,8 +2876,6 @@ public class DocumentReference extends DomainResource { * Path: DocumentReference.custodian
*

*/ - // [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"; /** @@ -2934,8 +2902,6 @@ public class DocumentReference extends DomainResource { * Path: DocumentReference.indexed
*

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

*/ - // [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"; /** @@ -2984,8 +2948,6 @@ public class DocumentReference extends DomainResource { * Path: DocumentReference.created
*

*/ - // [] - // [] @SearchParamDefinition(name="created", path="DocumentReference.created", description="Document creation time", type="date", target={} ) public static final String SP_CREATED = "created"; /** @@ -3006,8 +2968,6 @@ 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", target={} ) public static final String SP_FORMAT = "format"; /** @@ -3028,8 +2988,6 @@ public class DocumentReference extends DomainResource { * Path: DocumentReference.context.encounter
*

*/ - // [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"; /** @@ -3056,8 +3014,6 @@ 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"; /** @@ -3084,8 +3040,6 @@ 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", target={} ) public static final String SP_LOCATION = "location"; /** @@ -3106,8 +3060,6 @@ public class DocumentReference extends DomainResource { * Path: DocumentReference.relatesTo.target
*

*/ - // [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"; /** @@ -3134,8 +3086,6 @@ 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", target={} ) public static final String SP_FACILITY = "facility"; /** @@ -3156,8 +3106,6 @@ public class DocumentReference extends DomainResource { * Path: DocumentReference.status
*

*/ - // [] - // [] @SearchParamDefinition(name="status", path="DocumentReference.status", description="current | superseded | entered-in-error", type="token", target={} ) public static final String SP_STATUS = "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 58767e19c91..427dbc22115 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-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 364fd4c0af7..61802a93c26 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1147,8 +1147,6 @@ public class EligibilityRequest extends DomainResource { * Path: EligibilityRequest.identifier
*

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

*/ - // [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"; /** @@ -1197,8 +1193,6 @@ public class EligibilityRequest extends DomainResource { * Path: EligibilityRequest.patientIdentifier
*

*/ - // [] - // [] @SearchParamDefinition(name="patientidentifier", path="EligibilityRequest.patient.as(Identifier)", description="The reference to the patient", type="token", target={} ) public static final String SP_PATIENTIDENTIFIER = "patientidentifier"; /** @@ -1219,8 +1213,6 @@ 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", target={} ) public static final String SP_ORGANIZATIONIDENTIFIER = "organizationidentifier"; /** @@ -1241,8 +1233,6 @@ public class EligibilityRequest extends DomainResource { * Path: EligibilityRequest.created
*

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

*/ - // [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"; /** @@ -1291,8 +1279,6 @@ public class EligibilityRequest extends DomainResource { * Path: EligibilityRequest.providerReference
*

*/ - // [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"; /** @@ -1319,8 +1305,6 @@ public class EligibilityRequest extends DomainResource { * Path: EligibilityRequest.organizationReference
*

*/ - // [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"; /** @@ -1347,8 +1331,6 @@ public class EligibilityRequest extends DomainResource { * Path: EligibilityRequest.provideridentifier
*

*/ - // [] - // [] @SearchParamDefinition(name="provideridentifier", path="EligibilityRequest.provider.as(identifier)", description="The reference to the provider", type="token", target={} ) public static final String SP_PROVIDERIDENTIFIER = "provideridentifier"; /** @@ -1369,8 +1351,6 @@ 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", target={} ) public static final String SP_FACILITYIDENTIFIER = "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 52fc3ab550e..6bcfd528d7a 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1964,8 +1964,6 @@ public class EligibilityResponse extends DomainResource { * Path: EligibilityResponse.requestProviderIdentifier
*

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

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

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

*/ - // [] - // [] @SearchParamDefinition(name="disposition", path="EligibilityResponse.disposition", description="The contents of the disposition message", type="string", target={} ) public static final String SP_DISPOSITION = "disposition"; /** @@ -2052,8 +2044,6 @@ 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", target={} ) public static final String SP_ORGANIZATIONIDENTIFIER = "organizationidentifier"; /** @@ -2074,8 +2064,6 @@ public class EligibilityResponse extends DomainResource { * Path: EligibilityResponse.created
*

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

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

*/ - // [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"; /** @@ -2146,8 +2130,6 @@ public class EligibilityResponse extends DomainResource { * Path: EligibilityResponse.requestProviderReference
*

*/ - // [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"; /** @@ -2174,8 +2156,6 @@ public class EligibilityResponse extends DomainResource { * Path: EligibilityResponse.requestOrganizationReference
*

*/ - // [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"; /** @@ -2202,8 +2182,6 @@ public class EligibilityResponse extends DomainResource { * Path: EligibilityResponse.requestReference
*

*/ - // [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"; /** @@ -2230,8 +2208,6 @@ public class EligibilityResponse extends DomainResource { * Path: EligibilityResponse.outcome
*

*/ - // [] - // [] @SearchParamDefinition(name="outcome", path="EligibilityResponse.outcome", description="The processing outcome", type="token", target={} ) public static final String SP_OUTCOME = "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 161b747843e..27f0be4c006 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -3644,8 +3644,6 @@ 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", target={} ) public static final String SP_DATE = "date"; /** @@ -3666,8 +3664,6 @@ 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", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -3688,8 +3684,6 @@ 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", target={} ) public static final String SP_REASON = "reason"; /** @@ -3710,8 +3704,6 @@ Not to be used when the patient is currently at the location * Path: Encounter.episodeOfCare
*

*/ - // [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"; /** @@ -3738,8 +3730,6 @@ 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", target={} ) public static final String SP_PARTICIPANT_TYPE = "participant-type"; /** @@ -3760,8 +3750,6 @@ Not to be used when the patient is currently at the location * Path: Encounter.incomingReferral
*

*/ - // [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"; /** @@ -3788,9 +3776,7 @@ Not to be used when the patient is currently at the location * Path: Encounter.participant.individual
*

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

*/ - // [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"; /** @@ -3866,8 +3848,6 @@ Not to be used when the patient is currently at the location * Path: Encounter.partOf
*

*/ - // [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"; /** @@ -3894,9 +3874,7 @@ Not to be used when the patient is currently at the location * Path: Encounter.indication
*

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

*/ - // [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"; /** @@ -3972,9 +3946,7 @@ Not to be used when the patient is currently at the location * Path: Encounter.indication
*

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

*/ - // [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"; /** @@ -4028,8 +3998,6 @@ 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", target={} ) public static final String SP_LOCATION_PERIOD = "location-period"; /** @@ -4050,8 +4018,6 @@ Not to be used when the patient is currently at the location * Path: Encounter.location.location
*

*/ - // [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"; /** @@ -4078,8 +4044,6 @@ Not to be used when the patient is currently at the location * Path: Encounter.indication
*

*/ - // [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"; /** @@ -4106,8 +4070,6 @@ 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", target={} ) public static final String SP_SPECIAL_ARRANGEMENT = "special-arrangement"; /** @@ -4128,8 +4090,6 @@ 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", target={} ) public static final String SP_STATUS = "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 c7c2d98d601..cc125274ef4 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1064,8 +1064,6 @@ 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", target={} ) public static final String SP_PAYLOAD_TYPE = "payload-type"; /** @@ -1086,8 +1084,6 @@ public class Endpoint extends DomainResource { * Path: Endpoint.managingOrganization
*

*/ - // [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"; /** @@ -1114,8 +1110,6 @@ 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", target={} ) public static final String SP_STATUS = "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 d79a3ff980d..251d270ed19 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -788,8 +788,6 @@ public class EnrollmentRequest extends DomainResource { * Path: EnrollmentRequest.identifier
*

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

*/ - // [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"; /** @@ -838,8 +834,6 @@ public class EnrollmentRequest extends DomainResource { * Path: EnrollmentRequest.subject
*

*/ - // [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"; /** 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 5abf9a5e010..aba2bf69f10 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -803,8 +803,6 @@ 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", target={} ) public static final String SP_IDENTIFIER = "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 348b520bfff..b30f617a037 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1398,8 +1398,6 @@ 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", target={} ) public static final String SP_DATE = "date"; /** @@ -1420,8 +1418,6 @@ public class EpisodeOfCare extends DomainResource { * Path: EpisodeOfCare.identifier
*

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

*/ - // [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"; /** @@ -1470,8 +1464,6 @@ public class EpisodeOfCare extends DomainResource { * Path: EpisodeOfCare.referralRequest
*

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

*/ - // [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"; /** @@ -1526,8 +1516,6 @@ public class EpisodeOfCare extends DomainResource { * Path: EpisodeOfCare.managingOrganization
*

*/ - // [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"; /** @@ -1554,8 +1542,6 @@ 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", target={} ) public static final String SP_TYPE = "type"; /** @@ -1576,8 +1562,6 @@ public class EpisodeOfCare extends DomainResource { * Path: EpisodeOfCare.careManager
*

*/ - // [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"; /** @@ -1604,8 +1588,6 @@ 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", target={} ) public static final String SP_STATUS = "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 b466a623854..33f3054808b 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -3560,8 +3560,6 @@ public class ExpansionProfile extends DomainResource { * Path: ExpansionProfile.date
*

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

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

*/ - // [] - // [] @SearchParamDefinition(name="name", path="ExpansionProfile.name", description="The name of the expansion profile", type="string", target={} ) public static final String SP_NAME = "name"; /** @@ -3626,8 +3620,6 @@ 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", target={} ) public static final String SP_PUBLISHER = "publisher"; /** @@ -3648,8 +3640,6 @@ 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", target={} ) public static final String SP_DESCRIPTION = "description"; /** @@ -3670,8 +3660,6 @@ public class ExpansionProfile extends DomainResource { * Path: ExpansionProfile.version
*

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

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

*/ - // [] - // [] @SearchParamDefinition(name="status", path="ExpansionProfile.status", description="The status of the expansion profile", type="token", target={} ) public static final String SP_STATUS = "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 85bc59b3960..aea9753bf80 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -12191,8 +12191,6 @@ 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", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -12213,8 +12211,6 @@ public class ExplanationOfBenefit extends DomainResource { * Path: ExplanationOfBenefit.patientIdentifier
*

*/ - // [] - // [] @SearchParamDefinition(name="patientidentifier", path="ExplanationOfBenefit.patient.as(Identifier)", description="The reference to the patient", type="token", target={} ) public static final String SP_PATIENTIDENTIFIER = "patientidentifier"; /** @@ -12235,8 +12231,6 @@ 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", target={} ) public static final String SP_ORGANIZATIONIDENTIFIER = "organizationidentifier"; /** @@ -12257,8 +12251,6 @@ public class ExplanationOfBenefit extends DomainResource { * Path: ExplanationOfBenefit.claimReference
*

*/ - // [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"; /** @@ -12285,8 +12277,6 @@ public class ExplanationOfBenefit extends DomainResource { * Path: ExplanationOfBenefit.created
*

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

*/ - // [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"; /** @@ -12335,8 +12323,6 @@ public class ExplanationOfBenefit extends DomainResource { * Path: ExplanationOfBenefit.providerReference
*

*/ - // [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"; /** @@ -12363,8 +12349,6 @@ public class ExplanationOfBenefit extends DomainResource { * Path: ExplanationOfBenefit.organizationReference
*

*/ - // [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"; /** @@ -12391,8 +12375,6 @@ public class ExplanationOfBenefit extends DomainResource { * Path: ExplanationOfBenefit.providerIdentifier
*

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

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

*/ - // [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"; /** @@ -12463,8 +12441,6 @@ public class ExplanationOfBenefit extends DomainResource { * Path: ExplanationOfBenefit.claimIdentifier
*

*/ - // [] - // [] @SearchParamDefinition(name="claimindentifier", path="ExplanationOfBenefit.claim.as(Identifier)", description="The reference to the claim", type="token", target={} ) public static final String SP_CLAIMINDENTIFIER = "claimindentifier"; /** @@ -12485,8 +12461,6 @@ 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", target={} ) public static final String SP_FACILITYIDENTIFIER = "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 b8531f1a6c1..f772c9cafc9 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1495,8 +1495,6 @@ public class FamilyMemberHistory extends DomainResource { * Path: FamilyMemberHistory.date
*

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

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="FamilyMemberHistory.identifier", description="A search by a record identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -1539,8 +1535,6 @@ 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", target={} ) public static final String SP_CODE = "code"; /** @@ -1561,8 +1555,6 @@ 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", target={} ) public static final String SP_GENDER = "gender"; /** @@ -1583,8 +1575,6 @@ public class FamilyMemberHistory extends DomainResource { * Path: FamilyMemberHistory.patient
*

*/ - // [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"; /** @@ -1611,8 +1601,6 @@ public class FamilyMemberHistory extends DomainResource { * Path: FamilyMemberHistory.relationship
*

*/ - // [] - // [] @SearchParamDefinition(name="relationship", path="FamilyMemberHistory.relationship", description="A search by a relationship type", type="token", target={} ) public static final String SP_RELATIONSHIP = "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 fa2289fd459..ea50035bdc9 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -738,8 +738,6 @@ public class Flag extends DomainResource { * Path: Flag.period
*

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

*/ - // [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"; /** @@ -788,9 +784,7 @@ public class Flag extends DomainResource { * Path: Flag.subject
*

*/ - // [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} ) + @SearchParamDefinition(name="patient", path="Flag.subject", description="The identity of a subject to list flags for", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -816,8 +810,6 @@ public class Flag extends DomainResource { * Path: Flag.author
*

*/ - // [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"; /** @@ -844,8 +836,6 @@ public class Flag extends DomainResource { * Path: Flag.encounter
*

*/ - // [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"; /** 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 cb1e66480c2..6e1a6771c42 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1489,8 +1489,6 @@ public class Goal extends DomainResource { * Path: Goal.identifier
*

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

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

*/ - // [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"; /** @@ -1567,8 +1561,6 @@ public class Goal extends DomainResource { * Path: Goal.targetDate
*

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

*/ - // [] - // [] @SearchParamDefinition(name="category", path="Goal.category", description="E.g. Treatment, dietary, behavioral, etc.", type="token", target={} ) public static final String SP_CATEGORY = "category"; /** @@ -1611,8 +1601,6 @@ 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", target={} ) public static final String SP_STATUS = "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 85d10d4d0f6..f32de78b7bf 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1547,8 +1547,6 @@ public class Group extends DomainResource { * Path: Group.actual
*

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

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="Group.identifier", description="Unique id", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -1591,8 +1587,6 @@ public class Group extends DomainResource { * Path:
*

*/ - // [] - // [] @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"; /** @@ -1613,8 +1607,6 @@ public class Group extends DomainResource { * Path: Group.code
*

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

*/ - // [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"; /** @@ -1663,8 +1653,6 @@ public class Group extends DomainResource { * Path: Group.characteristic.exclude
*

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

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

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

*/ - // [] - // [] @SearchParamDefinition(name="characteristic", path="Group.characteristic.code", description="Kind of characteristic", type="token", target={} ) public static final String SP_CHARACTERISTIC = "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 a5204584720..5dbc54ec062 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-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 85eab7b5431..c287a78b55b 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -2632,8 +2632,6 @@ public class HealthcareService extends DomainResource { * Path: HealthcareService.identifier
*

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

*/ - // [] - // [] @SearchParamDefinition(name="servicecategory", path="HealthcareService.serviceCategory", description="Service Category of the Healthcare Service", type="token", target={} ) public static final String SP_SERVICECATEGORY = "servicecategory"; /** @@ -2676,8 +2672,6 @@ 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", target={} ) public static final String SP_SERVICETYPE = "servicetype"; /** @@ -2698,8 +2692,6 @@ public class HealthcareService extends DomainResource { * Path: HealthcareService.providedBy
*

*/ - // [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"; /** @@ -2726,8 +2718,6 @@ public class HealthcareService extends DomainResource { * Path: HealthcareService.serviceName
*

*/ - // [] - // [] @SearchParamDefinition(name="name", path="HealthcareService.serviceName", description="A portion of the Healthcare service name", type="string", target={} ) public static final String SP_NAME = "name"; /** @@ -2748,8 +2738,6 @@ 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", target={} ) public static final String SP_PROGRAMNAME = "programname"; /** @@ -2770,8 +2758,6 @@ public class HealthcareService extends DomainResource { * Path: HealthcareService.location
*

*/ - // [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"; /** @@ -2798,8 +2784,6 @@ public class HealthcareService extends DomainResource { * Path: HealthcareService.characteristic
*

*/ - // [] - // [] @SearchParamDefinition(name="characteristic", path="HealthcareService.characteristic", description="One of the HealthcareService's characteristics", type="token", target={} ) public static final String SP_CHARACTERISTIC = "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 09dec3f0fc3..50962125722 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -3234,8 +3234,6 @@ public class ImagingExcerpt extends DomainResource { * Path: ImagingExcerpt.uid
*

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="ImagingExcerpt.uid", description="UID of key DICOM object selection", type="uri", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -3256,8 +3254,6 @@ 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", target={} ) public static final String SP_AUTHORING_TIME = "authoring-time"; /** @@ -3278,8 +3274,6 @@ 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", target={} ) public static final String SP_SELECTED_STUDY = "selected-study"; /** @@ -3300,8 +3294,6 @@ public class ImagingExcerpt extends DomainResource { * Path: ImagingExcerpt.author
*

*/ - // [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"; /** @@ -3328,8 +3320,6 @@ public class ImagingExcerpt extends DomainResource { * Path: ImagingExcerpt.patient
*

*/ - // [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"; /** @@ -3356,8 +3346,6 @@ public class ImagingExcerpt extends DomainResource { * Path: ImagingExcerpt.title
*

*/ - // [] - // [] @SearchParamDefinition(name="title", path="ImagingExcerpt.title", description="Title of key DICOM object selection", type="token", target={} ) public static final String SP_TITLE = "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 aa80ff07627..d4be7359bb3 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1938,8 +1938,6 @@ public class ImagingObjectSelection extends DomainResource { * Path: ImagingObjectSelection.uid
*

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="ImagingObjectSelection.uid", description="UID of key DICOM object selection", type="uri", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -1960,8 +1958,6 @@ 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", target={} ) public static final String SP_AUTHORING_TIME = "authoring-time"; /** @@ -1982,8 +1978,6 @@ 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", target={} ) public static final String SP_SELECTED_STUDY = "selected-study"; /** @@ -2004,8 +1998,6 @@ public class ImagingObjectSelection extends DomainResource { * Path: ImagingObjectSelection.author
*

*/ - // [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"; /** @@ -2032,8 +2024,6 @@ public class ImagingObjectSelection extends DomainResource { * Path: ImagingObjectSelection.patient
*

*/ - // [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"; /** @@ -2060,8 +2050,6 @@ public class ImagingObjectSelection extends DomainResource { * Path: ImagingObjectSelection.title
*

*/ - // [] - // [] @SearchParamDefinition(name="title", path="ImagingObjectSelection.title", description="Title of key DICOM object selection", type="token", target={} ) public static final String SP_TITLE = "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 3820324d4d3..ef96c4be64c 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -2752,8 +2752,6 @@ public class ImagingStudy extends DomainResource { * Path: ImagingStudy.identifier
*

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="ImagingStudy.identifier", description="Other identifiers for the Study", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -2774,8 +2772,6 @@ 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", target={} ) public static final String SP_UID = "uid"; /** @@ -2796,8 +2792,6 @@ public class ImagingStudy extends DomainResource { * Path: ImagingStudy.uid
*

*/ - // [] - // [] @SearchParamDefinition(name="study", path="ImagingStudy.uid", description="The study identifier for the image", type="uri", target={} ) public static final String SP_STUDY = "study"; /** @@ -2818,8 +2812,6 @@ 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", target={} ) public static final String SP_DICOM_CLASS = "dicom-class"; /** @@ -2840,8 +2832,6 @@ public class ImagingStudy extends DomainResource { * Path: ImagingStudy.series.modality
*

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

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

*/ - // [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"; /** @@ -2912,8 +2898,6 @@ 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", target={} ) public static final String SP_SERIES = "series"; /** @@ -2934,8 +2918,6 @@ public class ImagingStudy extends DomainResource { * Path: ImagingStudy.started
*

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

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

*/ - // [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"; /** 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 0f703d8ea31..38288e5440c 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -2671,8 +2671,6 @@ public class Immunization extends DomainResource { * Path: Immunization.date
*

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

*/ - // [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"; /** @@ -2721,8 +2717,6 @@ public class Immunization extends DomainResource { * Path: Immunization.identifier
*

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

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

*/ - // [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"; /** @@ -2793,8 +2783,6 @@ public class Immunization extends DomainResource { * Path: Immunization.reaction.detail
*

*/ - // [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"; /** @@ -2821,8 +2809,6 @@ public class Immunization extends DomainResource { * Path: Immunization.lotNumber
*

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

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

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

*/ - // [] - // [] @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"; /** @@ -2915,8 +2895,6 @@ public class Immunization extends DomainResource { * Path: Immunization.patient
*

*/ - // [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"; /** @@ -2943,8 +2921,6 @@ public class Immunization extends DomainResource { * Path: Immunization.vaccineCode
*

*/ - // [] - // [] @SearchParamDefinition(name="vaccine-code", path="Immunization.vaccineCode", description="Vaccine Product Administered", type="token", target={} ) public static final String SP_VACCINE_CODE = "vaccine-code"; /** @@ -2965,8 +2941,6 @@ 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", target={} ) public static final String SP_REASON_NOT_GIVEN = "reason-not-given"; /** @@ -2987,8 +2961,6 @@ public class Immunization extends DomainResource { * Path: Immunization.location
*

*/ - // [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"; /** @@ -3015,8 +2987,6 @@ public class Immunization extends DomainResource { * Path: Immunization.reaction.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"; /** @@ -3037,8 +3007,6 @@ public class Immunization extends DomainResource { * Path: Immunization.status
*

*/ - // [] - // [] @SearchParamDefinition(name="status", path="Immunization.status", description="Immunization event status", type="token", target={} ) public static final String SP_STATUS = "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 b6cb3b34dbe..777f94e3b4d 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1599,8 +1599,6 @@ public class ImmunizationRecommendation extends DomainResource { * Path: ImmunizationRecommendation.recommendation.date
*

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

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="ImmunizationRecommendation.identifier", description="Business identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -1643,8 +1639,6 @@ 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", target={} ) public static final String SP_DOSE_SEQUENCE = "dose-sequence"; /** @@ -1665,8 +1659,6 @@ public class ImmunizationRecommendation extends DomainResource { * Path: ImmunizationRecommendation.patient
*

*/ - // [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"; /** @@ -1693,8 +1685,6 @@ public class ImmunizationRecommendation extends DomainResource { * Path: ImmunizationRecommendation.recommendation.vaccineCode
*

*/ - // [] - // [] @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"; /** @@ -1715,8 +1705,6 @@ public class ImmunizationRecommendation extends DomainResource { * Path: ImmunizationRecommendation.recommendation.doseNumber
*

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

*/ - // [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"; /** @@ -1765,8 +1751,6 @@ public class ImmunizationRecommendation extends DomainResource { * Path: ImmunizationRecommendation.recommendation.supportingImmunization
*

*/ - // [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"; /** @@ -1793,8 +1777,6 @@ public class ImmunizationRecommendation extends DomainResource { * Path: ImmunizationRecommendation.recommendation.forecastStatus
*

*/ - // [] - // [] @SearchParamDefinition(name="status", path="ImmunizationRecommendation.recommendation.forecastStatus", description="Vaccine administration status", type="token", target={} ) public static final String SP_STATUS = "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 08c5fd5f515..034f24de144 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -3791,8 +3791,6 @@ public class ImplementationGuide extends DomainResource { * Path: ImplementationGuide.date
*

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

*/ - // [] - // [] @SearchParamDefinition(name="dependency", path="ImplementationGuide.dependency.uri", description="Where to find dependency", type="uri", target={} ) public static final String SP_DEPENDENCY = "dependency"; /** @@ -3835,8 +3831,6 @@ 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"; /** @@ -3863,8 +3857,6 @@ public class ImplementationGuide extends DomainResource { * Path: ImplementationGuide.name
*

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

*/ - // [] - // [] @SearchParamDefinition(name="context", path="ImplementationGuide.useContext", description="A use context assigned to the structure", type="token", target={} ) public static final String SP_CONTEXT = "context"; /** @@ -3907,8 +3897,6 @@ 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", target={} ) public static final String SP_PUBLISHER = "publisher"; /** @@ -3929,8 +3917,6 @@ 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", target={} ) public static final String SP_DESCRIPTION = "description"; /** @@ -3951,8 +3937,6 @@ public class ImplementationGuide extends DomainResource { * Path: ImplementationGuide.experimental
*

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

*/ - // [] - // [] @SearchParamDefinition(name="version", path="ImplementationGuide.version", description="The version identifier of the implementation guide", type="token", target={} ) public static final String SP_VERSION = "version"; /** @@ -3995,8 +3977,6 @@ 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", target={} ) public static final String SP_URL = "url"; /** @@ -4017,8 +3997,6 @@ public class ImplementationGuide extends DomainResource { * Path: ImplementationGuide.status
*

*/ - // [] - // [] @SearchParamDefinition(name="status", path="ImplementationGuide.status", description="The current status of the implementation guide", type="token", target={} ) public static final String SP_STATUS = "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 8a10ebe8d1e..6c655fcc34c 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -2092,8 +2092,6 @@ 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", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -2114,8 +2112,6 @@ public class Library extends DomainResource { * Path: Library.moduleMetadata.topic
*

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

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

*/ - // [] - // [] @SearchParamDefinition(name="title", path="Library.moduleMetadata.title", description="Text search against the title", type="string", target={} ) public static final String SP_TITLE = "title"; /** @@ -2180,8 +2172,6 @@ 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", target={} ) public static final String SP_VERSION = "version"; /** @@ -2202,8 +2192,6 @@ public class Library extends DomainResource { * Path: Library.moduleMetadata.status
*

*/ - // [] - // [] @SearchParamDefinition(name="status", path="Library.moduleMetadata.status", description="Status of the module", type="token", target={} ) public static final String SP_STATUS = "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 8d2b73e3b41..ef21961ad71 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -601,8 +601,6 @@ public class Linkage extends DomainResource { * Path: Linkage.item.resource
*

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

*/ - // [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"; /** @@ -657,8 +653,6 @@ public class Linkage extends DomainResource { * Path: Linkage.item.resource
*

*/ - // [] - // [] @SearchParamDefinition(name="source", path="Linkage.item.resource", description="Matches on any item in the Linkage with a type of 'source'", type="reference", target={} ) public static final String SP_SOURCE = "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 0428fa57e0d..a71672caa16 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1542,8 +1542,6 @@ public class ListResource extends DomainResource { * Path: List.date
*

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

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="List.identifier", description="Business identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -1586,8 +1582,6 @@ 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"; /** @@ -1614,8 +1608,6 @@ public class ListResource extends DomainResource { * Path: List.emptyReason
*

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

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

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

*/ - // [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"; /** @@ -1708,9 +1694,7 @@ public class ListResource extends DomainResource { * Path: List.subject
*

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

*/ - // [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"; /** @@ -1764,8 +1746,6 @@ public class ListResource extends DomainResource { * Path: List.encounter
*

*/ - // [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"; /** @@ -1792,8 +1772,6 @@ public class ListResource extends DomainResource { * Path: List.title
*

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

*/ - // [] - // [] @SearchParamDefinition(name="status", path="List.status", description="current | retired | entered-in-error", type="token", target={} ) public static final String SP_STATUS = "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 c7e929ede6a..b4da56c87a1 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1442,8 +1442,6 @@ 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", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -1464,8 +1462,6 @@ public class Location extends DomainResource { * Path: Location.partOf
*

*/ - // [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"; /** @@ -1492,8 +1488,6 @@ 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", target={} ) public static final String SP_NEAR_DISTANCE = "near-distance"; /** @@ -1514,8 +1508,6 @@ 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", target={} ) public static final String SP_ADDRESS = "address"; /** @@ -1536,8 +1528,6 @@ 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", target={} ) public static final String SP_ADDRESS_STATE = "address-state"; /** @@ -1558,8 +1548,6 @@ public class Location extends DomainResource { * Path: Location.type
*

*/ - // [] - // [] @SearchParamDefinition(name="type", path="Location.type", description="A code for the type of location", type="token", target={} ) public static final String SP_TYPE = "type"; /** @@ -1580,8 +1568,6 @@ 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", target={} ) public static final String SP_ADDRESS_POSTALCODE = "address-postalcode"; /** @@ -1602,8 +1588,6 @@ 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", target={} ) public static final String SP_ADDRESS_COUNTRY = "address-country"; /** @@ -1624,8 +1608,6 @@ public class Location extends DomainResource { * Path: Location.managingOrganization
*

*/ - // [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"; /** @@ -1652,8 +1634,6 @@ 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", target={} ) public static final String SP_NAME = "name"; /** @@ -1674,8 +1654,6 @@ 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", target={} ) public static final String SP_ADDRESS_USE = "address-use"; /** @@ -1696,8 +1674,6 @@ 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", target={} ) public static final String SP_NEAR = "near"; /** @@ -1718,8 +1694,6 @@ 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", target={} ) public static final String SP_ADDRESS_CITY = "address-city"; /** @@ -1740,8 +1714,6 @@ 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", target={} ) public static final String SP_STATUS = "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 333c7d09553..bb9c2c178cf 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -3240,8 +3240,6 @@ 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", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -3262,8 +3260,6 @@ public class Measure extends DomainResource { * Path: Measure.moduleMetadata.topic
*

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

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

*/ - // [] - // [] @SearchParamDefinition(name="title", path="Measure.moduleMetadata.title", description="Text search against the title", type="string", target={} ) public static final String SP_TITLE = "title"; /** @@ -3328,8 +3320,6 @@ 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", target={} ) public static final String SP_VERSION = "version"; /** @@ -3350,8 +3340,6 @@ public class Measure extends DomainResource { * Path: Measure.moduleMetadata.status
*

*/ - // [] - // [] @SearchParamDefinition(name="status", path="Measure.moduleMetadata.status", description="Status of the module", type="token", target={} ) public static final String SP_STATUS = "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 d54842cc24b..a26201a9468 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -3093,8 +3093,6 @@ public class MeasureReport extends DomainResource { * Path: MeasureReport.patient
*

*/ - // [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"; /** 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 e28a66ad3e3..3563820f591 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1001,8 +1001,6 @@ public class Media extends DomainResource { * Path: Media.identifier
*

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="Media.identifier", description="Identifier(s) for the image", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -1023,8 +1021,6 @@ 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", target={} ) public static final String SP_VIEW = "view"; /** @@ -1045,8 +1041,6 @@ public class Media extends DomainResource { * Path: Media.subtype
*

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

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

*/ - // [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"; /** @@ -1117,9 +1107,7 @@ public class Media extends DomainResource { * Path: Media.subject
*

*/ - // [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} ) + @SearchParamDefinition(name="patient", path="Media.subject", description="Who/What this Media is a record of", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -1145,8 +1133,6 @@ public class Media extends DomainResource { * Path: Media.type
*

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

*/ - // [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"; /** 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 528ad42f826..45ee5bd6434 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1567,8 +1567,6 @@ 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", target={} ) public static final String SP_INGREDIENT_CODE = "ingredient-code"; /** @@ -1589,8 +1587,6 @@ 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", target={} ) public static final String SP_CONTAINER = "container"; /** @@ -1611,8 +1607,6 @@ public class Medication extends DomainResource { * Path: Medication.package.content.itemReference
*

*/ - // [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"; /** @@ -1639,8 +1633,6 @@ public class Medication extends DomainResource { * Path: Medication.code
*

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

*/ - // [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"; /** @@ -1689,8 +1679,6 @@ public class Medication extends DomainResource { * Path: Medication.product.form
*

*/ - // [] - // [] @SearchParamDefinition(name="form", path="Medication.product.form", description="powder | tablets | carton +", type="token", target={} ) public static final String SP_FORM = "form"; /** @@ -1711,8 +1699,6 @@ 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", target={} ) public static final String SP_PACKAGE_ITEM_CODE = "package-item-code"; /** @@ -1733,8 +1719,6 @@ public class Medication extends DomainResource { * Path: Medication.manufacturer
*

*/ - // [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"; /** 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 85b49395864..35d30373ce6 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1717,8 +1717,6 @@ public class MedicationAdministration extends DomainResource { * Path: MedicationAdministration.identifier
*

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="MedicationAdministration.identifier", description="Return administrations with this external identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -1739,8 +1737,6 @@ 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", target={} ) public static final String SP_CODE = "code"; /** @@ -1761,8 +1757,6 @@ public class MedicationAdministration extends DomainResource { * Path: MedicationAdministration.prescription
*

*/ - // [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"; /** @@ -1789,8 +1783,6 @@ 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", target={} ) public static final String SP_EFFECTIVETIME = "effectivetime"; /** @@ -1811,8 +1803,6 @@ public class MedicationAdministration extends DomainResource { * Path: MedicationAdministration.practitioner
*

*/ - // [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"; /** @@ -1839,8 +1829,6 @@ public class MedicationAdministration extends DomainResource { * Path: MedicationAdministration.patient
*

*/ - // [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"; /** @@ -1867,8 +1855,6 @@ public class MedicationAdministration extends DomainResource { * Path: MedicationAdministration.wasNotGiven
*

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

*/ - // [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"; /** @@ -1917,8 +1901,6 @@ public class MedicationAdministration extends DomainResource { * Path: MedicationAdministration.encounter
*

*/ - // [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"; /** @@ -1945,8 +1927,6 @@ public class MedicationAdministration extends DomainResource { * Path: MedicationAdministration.device
*

*/ - // [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"; /** @@ -1973,8 +1953,6 @@ 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", target={} ) public static final String SP_STATUS = "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 89c5b843b41..2220e935f32 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -2397,8 +2397,6 @@ 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", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -2419,8 +2417,6 @@ 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", target={} ) public static final String SP_CODE = "code"; /** @@ -2441,8 +2437,6 @@ Specifically if 'boolean' datatype is selected, then the following logic applies * Path: MedicationDispense.receiver
*

*/ - // [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"; /** @@ -2469,8 +2463,6 @@ Specifically if 'boolean' datatype is selected, then the following logic applies * Path: MedicationDispense.destination
*

*/ - // [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"; /** @@ -2497,8 +2489,6 @@ Specifically if 'boolean' datatype is selected, then the following logic applies * Path: MedicationDispense.medicationReference
*

*/ - // [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"; /** @@ -2525,8 +2515,6 @@ Specifically if 'boolean' datatype is selected, then the following logic applies * Path: MedicationDispense.substitution.responsibleParty
*

*/ - // [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"; /** @@ -2553,8 +2541,6 @@ 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", target={} ) public static final String SP_TYPE = "type"; /** @@ -2575,8 +2561,6 @@ 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", target={} ) public static final String SP_WHENHANDEDOVER = "whenhandedover"; /** @@ -2597,8 +2581,6 @@ 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", target={} ) public static final String SP_WHENPREPARED = "whenprepared"; /** @@ -2619,8 +2601,6 @@ Specifically if 'boolean' datatype is selected, then the following logic applies * Path: MedicationDispense.dispenser
*

*/ - // [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"; /** @@ -2647,8 +2627,6 @@ Specifically if 'boolean' datatype is selected, then the following logic applies * Path: MedicationDispense.authorizingPrescription
*

*/ - // [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"; /** @@ -2675,8 +2653,6 @@ Specifically if 'boolean' datatype is selected, then the following logic applies * Path: MedicationDispense.patient
*

*/ - // [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"; /** @@ -2703,8 +2679,6 @@ 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", target={} ) public static final String SP_STATUS = "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 a5eea44f113..c293d46ef71 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -2723,8 +2723,6 @@ public class MedicationOrder extends DomainResource { * Path: MedicationOrder.prescriber
*

*/ - // [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"; /** @@ -2751,8 +2749,6 @@ public class MedicationOrder extends DomainResource { * Path: MedicationOrder.identifier
*

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="MedicationOrder.identifier", description="Return prescriptions with this external identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -2773,8 +2769,6 @@ 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", target={} ) public static final String SP_CODE = "code"; /** @@ -2795,8 +2789,6 @@ public class MedicationOrder extends DomainResource { * Path: MedicationOrder.patient
*

*/ - // [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"; /** @@ -2823,8 +2815,6 @@ public class MedicationOrder extends DomainResource { * Path: MedicationOrder.dateWritten
*

*/ - // [] - // [] @SearchParamDefinition(name="datewritten", path="MedicationOrder.dateWritten", description="Return prescriptions written on this date", type="date", target={} ) public static final String SP_DATEWRITTEN = "datewritten"; /** @@ -2845,8 +2835,6 @@ public class MedicationOrder extends DomainResource { * Path: MedicationOrder.medicationReference
*

*/ - // [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"; /** @@ -2873,8 +2861,6 @@ public class MedicationOrder extends DomainResource { * Path: MedicationOrder.encounter
*

*/ - // [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"; /** @@ -2901,8 +2887,6 @@ public class MedicationOrder extends DomainResource { * Path: MedicationOrder.status
*

*/ - // [] - // [] @SearchParamDefinition(name="status", path="MedicationOrder.status", description="Status of the prescription", type="token", target={} ) public static final String SP_STATUS = "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 e62ad7e8fce..2824bae8376 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1981,8 +1981,6 @@ 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", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -2003,8 +2001,6 @@ 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", target={} ) public static final String SP_EFFECTIVE = "effective"; /** @@ -2025,8 +2021,6 @@ 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", target={} ) public static final String SP_CODE = "code"; /** @@ -2047,8 +2041,6 @@ Specifically if 'boolean' datatype is selected, then the following logic applies * Path: MedicationStatement.patient
*

*/ - // [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"; /** @@ -2075,8 +2067,6 @@ Specifically if 'boolean' datatype is selected, then the following logic applies * Path: MedicationStatement.medicationReference
*

*/ - // [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"; /** @@ -2103,8 +2093,6 @@ Specifically if 'boolean' datatype is selected, then the following logic applies * Path: MedicationStatement.informationSource
*

*/ - // [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"; /** @@ -2131,8 +2119,6 @@ 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", target={} ) public static final String SP_STATUS = "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 de963e11937..4f673cdb47f 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1952,8 +1952,6 @@ public class MessageHeader extends DomainResource { * Path: MessageHeader.response.code
*

*/ - // [] - // [] @SearchParamDefinition(name="code", path="MessageHeader.response.code", description="ok | transient-error | fatal-error", type="token", target={} ) public static final String SP_CODE = "code"; /** @@ -1974,8 +1972,6 @@ 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"; /** @@ -2002,8 +1998,6 @@ public class MessageHeader extends DomainResource { * Path: MessageHeader.receiver
*

*/ - // [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"; /** @@ -2030,8 +2024,6 @@ public class MessageHeader extends DomainResource { * Path: MessageHeader.author
*

*/ - // [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"; /** @@ -2058,8 +2050,6 @@ public class MessageHeader extends DomainResource { * Path: MessageHeader.destination.name
*

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

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

*/ - // [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"; /** @@ -2130,8 +2116,6 @@ 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", target={} ) public static final String SP_DESTINATION_URI = "destination-uri"; /** @@ -2152,8 +2136,6 @@ 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", target={} ) public static final String SP_SOURCE_URI = "source-uri"; /** @@ -2174,8 +2156,6 @@ public class MessageHeader extends DomainResource { * Path: MessageHeader.responsible
*

*/ - // [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"; /** @@ -2202,8 +2182,6 @@ public class MessageHeader extends DomainResource { * Path: MessageHeader.response.identifier
*

*/ - // [] - // [] @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"; /** @@ -2224,8 +2202,6 @@ public class MessageHeader extends DomainResource { * Path: MessageHeader.enterer
*

*/ - // [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"; /** @@ -2252,8 +2228,6 @@ public class MessageHeader extends DomainResource { * Path: MessageHeader.event
*

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

*/ - // [] - // [] @SearchParamDefinition(name="timestamp", path="MessageHeader.timestamp", description="Time that the message was sent", type="date", target={} ) public static final String SP_TIMESTAMP = "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 fc76e106a23..69a6e26d5a5 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-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 fae602a6307..18be1425d17 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1846,8 +1846,6 @@ public class NamingSystem extends DomainResource { * Path: NamingSystem.date
*

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

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

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

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

*/ - // [] - // [] @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"; /** @@ -1956,8 +1946,6 @@ public class NamingSystem extends DomainResource { * Path: NamingSystem.responsible
*

*/ - // [] - // [] @SearchParamDefinition(name="responsible", path="NamingSystem.responsible", description="Who maintains system namespace?", type="string", target={} ) public static final String SP_RESPONSIBLE = "responsible"; /** @@ -1978,8 +1966,6 @@ 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", target={} ) public static final String SP_CONTACT = "contact"; /** @@ -2000,8 +1986,6 @@ public class NamingSystem extends DomainResource { * Path: NamingSystem.name
*

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

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

*/ - // [] - // [] @SearchParamDefinition(name="publisher", path="NamingSystem.publisher", description="Name of the publisher (Organization or individual)", type="string", target={} ) public static final String SP_PUBLISHER = "publisher"; /** @@ -2066,8 +2046,6 @@ 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", target={} ) public static final String SP_TELECOM = "telecom"; /** @@ -2088,8 +2066,6 @@ public class NamingSystem extends DomainResource { * Path: NamingSystem.uniqueId.value
*

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

*/ - // [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"; /** @@ -2138,8 +2112,6 @@ public class NamingSystem extends DomainResource { * Path: NamingSystem.status
*

*/ - // [] - // [] @SearchParamDefinition(name="status", path="NamingSystem.status", description="draft | active | retired", type="token", target={} ) public static final String SP_STATUS = "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 9b9dfd65af3..ac2d918d489 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -3379,8 +3379,6 @@ public class NutritionOrder extends DomainResource { * Path: NutritionOrder.identifier
*

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

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

*/ - // [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"; /** @@ -3451,8 +3445,6 @@ public class NutritionOrder extends DomainResource { * Path: NutritionOrder.patient
*

*/ - // [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"; /** @@ -3479,8 +3471,6 @@ public class NutritionOrder extends DomainResource { * Path: NutritionOrder.supplement.type
*

*/ - // [] - // [] @SearchParamDefinition(name="supplement", path="NutritionOrder.supplement.type", description="Type of supplement product requested", type="token", target={} ) public static final String SP_SUPPLEMENT = "supplement"; /** @@ -3501,8 +3491,6 @@ 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", target={} ) public static final String SP_FORMULA = "formula"; /** @@ -3523,8 +3511,6 @@ public class NutritionOrder extends DomainResource { * Path: NutritionOrder.encounter
*

*/ - // [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"; /** @@ -3551,8 +3537,6 @@ 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", target={} ) public static final String SP_ORALDIET = "oraldiet"; /** @@ -3573,8 +3557,6 @@ public class NutritionOrder extends DomainResource { * Path: NutritionOrder.status
*

*/ - // [] - // [] @SearchParamDefinition(name="status", path="NutritionOrder.status", description="Status of the nutrition order.", type="token", target={} ) public static final String SP_STATUS = "status"; /** @@ -3595,8 +3577,6 @@ 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", target={} ) public static final String SP_ADDITIVE = "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 284a6dadcfb..89f6786e555 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -2941,8 +2941,6 @@ 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", target={} ) public static final String SP_DATE = "date"; /** @@ -2963,8 +2961,6 @@ public class Observation extends DomainResource { * Path: Observation.code
*

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

*/ - // [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"; /** @@ -3013,8 +3007,6 @@ 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", target={} ) public static final String SP_COMPONENT_DATA_ABSENT_REASON = "component-data-absent-reason"; /** @@ -3035,8 +3027,6 @@ 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", target={} ) public static final String SP_VALUE_CONCEPT = "value-concept"; /** @@ -3057,8 +3047,6 @@ 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", target={} ) public static final String SP_VALUE_DATE = "value-date"; /** @@ -3079,8 +3067,6 @@ 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"}, target={} ) public static final String SP_RELATED = "related"; /** @@ -3101,9 +3087,7 @@ public class Observation extends DomainResource { * Path: Observation.subject
*

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

*/ - // [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"; /** @@ -3157,8 +3139,6 @@ 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", target={} ) public static final String SP_COMPONENT_CODE = "component-code"; /** @@ -3179,8 +3159,6 @@ 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", target={} ) public static final String SP_VALUE_STRING = "value-string"; /** @@ -3201,8 +3179,6 @@ public class Observation extends DomainResource { * Path: Observation.identifier
*

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="Observation.identifier", description="The unique id for a particular observation", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -3223,8 +3199,6 @@ 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"}, target={} ) public static final String SP_COMPONENT_CODE_VALUE_CONCEPT = "component-code-value-concept"; /** @@ -3245,8 +3219,6 @@ 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"}, target={} ) public static final String SP_COMPONENT_CODE_VALUE_DATE = "component-code-value-date"; /** @@ -3267,8 +3239,6 @@ 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"}, target={} ) public static final String SP_COMPONENT_CODE_VALUE_STRING = "component-code-value-string"; /** @@ -3289,8 +3259,6 @@ 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"}, target={} ) public static final String SP_COMPONENT_CODE_VALUE_QUANTITY = "component-code-value-quantity"; /** @@ -3311,8 +3279,6 @@ 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"}, target={} ) public static final String SP_CODE_VALUE_CONCEPT = "code-value-concept"; /** @@ -3333,8 +3299,6 @@ 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"}, target={} ) public static final String SP_CODE_VALUE_DATE = "code-value-date"; /** @@ -3355,8 +3319,6 @@ 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"}, target={} ) public static final String SP_CODE_VALUE_STRING = "code-value-string"; /** @@ -3377,8 +3339,6 @@ 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"}, target={} ) public static final String SP_CODE_VALUE_QUANTITY = "code-value-quantity"; /** @@ -3399,8 +3359,6 @@ public class Observation extends DomainResource { * Path: Observation.performer
*

*/ - // [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"; /** @@ -3427,8 +3385,6 @@ 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", target={} ) public static final String SP_VALUE_QUANTITY = "value-quantity"; /** @@ -3449,8 +3405,6 @@ 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", target={} ) public static final String SP_COMPONENT_VALUE_QUANTITY = "component-value-quantity"; /** @@ -3471,8 +3425,6 @@ 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", target={} ) public static final String SP_DATA_ABSENT_REASON = "data-absent-reason"; /** @@ -3493,8 +3445,6 @@ public class Observation extends DomainResource { * Path: Observation.encounter
*

*/ - // [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"; /** @@ -3521,8 +3471,6 @@ 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", target={} ) public static final String SP_RELATED_TYPE = "related-type"; /** @@ -3543,8 +3491,6 @@ public class Observation extends DomainResource { * Path: Observation.related.target
*

*/ - // [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"; /** @@ -3571,8 +3517,6 @@ 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", target={} ) public static final String SP_COMPONENT_VALUE_STRING = "component-value-string"; /** @@ -3593,8 +3537,6 @@ 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", target={} ) public static final String SP_COMPONENT_VALUE_CONCEPT = "component-value-concept"; /** @@ -3615,8 +3557,6 @@ public class Observation extends DomainResource { * Path: Observation.category
*

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

*/ - // [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"; /** @@ -3665,8 +3603,6 @@ public class Observation extends DomainResource { * Path: Observation.status
*

*/ - // [] - // [] @SearchParamDefinition(name="status", path="Observation.status", description="The status of the observation", type="token", target={} ) public static final String SP_STATUS = "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 a056d140372..6ec550bfa08 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -2971,8 +2971,6 @@ 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", target={} ) public static final String SP_DATE = "date"; /** @@ -2993,8 +2991,6 @@ public class OperationDefinition extends DomainResource { * Path: OperationDefinition.code
*

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

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

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

*/ - // [] - // [] @SearchParamDefinition(name="type", path="OperationDefinition.type", description="Invoke at resource level for these type", type="token", target={} ) public static final String SP_TYPE = "type"; /** @@ -3081,8 +3071,6 @@ 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", target={} ) public static final String SP_VERSION = "version"; /** @@ -3103,8 +3091,6 @@ public class OperationDefinition extends DomainResource { * Path: OperationDefinition.parameter.profile
*

*/ - // [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"; /** @@ -3131,8 +3117,6 @@ public class OperationDefinition extends DomainResource { * Path: OperationDefinition.url
*

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

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

*/ - // [] - // [] @SearchParamDefinition(name="name", path="OperationDefinition.name", description="Informal name for this operation", type="string", target={} ) public static final String SP_NAME = "name"; /** @@ -3197,8 +3177,6 @@ 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", target={} ) public static final String SP_CONTEXT = "context"; /** @@ -3219,8 +3197,6 @@ public class OperationDefinition extends DomainResource { * Path: OperationDefinition.publisher
*

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

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

*/ - // [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"; /** 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 07b91e9fca9..2ee31eeb198 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-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 c32ccc97dd9..63a9a962c26 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -875,8 +875,6 @@ public class Order extends DomainResource { * Path: Order.date
*

*/ - // [] - // [] @SearchParamDefinition(name="date", path="Order.date", description="When the order was made", type="date", target={} ) public static final String SP_DATE = "date"; /** @@ -897,8 +895,6 @@ 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", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -919,8 +915,6 @@ public class Order extends DomainResource { * Path: Order.subject
*

*/ - // [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"; /** @@ -947,9 +941,7 @@ public class Order extends DomainResource { * Path: Order.subject
*

*/ - // [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} ) + @SearchParamDefinition(name="patient", path="Order.subject", description="Patient this order is about", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -975,8 +967,6 @@ public class Order extends DomainResource { * Path: Order.source
*

*/ - // [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"; /** @@ -1003,8 +993,6 @@ 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"; /** @@ -1031,8 +1019,6 @@ public class Order extends DomainResource { * Path: Order.when.schedule
*

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

*/ - // [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"; /** @@ -1081,8 +1065,6 @@ 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", target={} ) public static final String SP_WHENCODE = "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 a5a81ac5c98..1613672cd9a 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -869,8 +869,6 @@ public class OrderResponse extends DomainResource { * Path: OrderResponse.date
*

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

*/ - // [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"; /** @@ -919,8 +915,6 @@ 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", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -941,8 +935,6 @@ 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", target={} ) public static final String SP_CODE = "code"; /** @@ -963,8 +955,6 @@ 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"; /** @@ -991,8 +981,6 @@ public class OrderResponse extends DomainResource { * Path: OrderResponse.who
*

*/ - // [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"; /** 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 fbc746cced7..660c6bfde3e 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -381,8 +381,6 @@ 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", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -403,8 +401,6 @@ public class OrderSet extends DomainResource { * Path: OrderSet.moduleMetadata.topic
*

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

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

*/ - // [] - // [] @SearchParamDefinition(name="title", path="OrderSet.moduleMetadata.title", description="Text search against the title", type="string", target={} ) public static final String SP_TITLE = "title"; /** @@ -469,8 +461,6 @@ 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", target={} ) public static final String SP_VERSION = "version"; /** @@ -491,8 +481,6 @@ public class OrderSet extends DomainResource { * Path: OrderSet.moduleMetadata.status
*

*/ - // [] - // [] @SearchParamDefinition(name="status", path="OrderSet.moduleMetadata.status", description="Status of the module", type="token", target={} ) public static final String SP_STATUS = "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 2234c287283..77ac078e67e 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1023,8 +1023,6 @@ 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", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -1045,8 +1043,6 @@ public class Organization extends DomainResource { * Path: Organization.partOf
*

*/ - // [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"; /** @@ -1073,8 +1069,6 @@ 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", target={} ) public static final String SP_PHONETIC = "phonetic"; /** @@ -1095,8 +1089,6 @@ 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", target={} ) public static final String SP_ADDRESS = "address"; /** @@ -1117,8 +1109,6 @@ 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", target={} ) public static final String SP_ADDRESS_STATE = "address-state"; /** @@ -1139,8 +1129,6 @@ public class Organization extends DomainResource { * Path: Organization.name
*

*/ - // [] - // [] @SearchParamDefinition(name="name", path="Organization.name", description="A portion of the organization's name", type="string", target={} ) public static final String SP_NAME = "name"; /** @@ -1161,8 +1149,6 @@ 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", target={} ) public static final String SP_ADDRESS_USE = "address-use"; /** @@ -1183,8 +1169,6 @@ public class Organization extends DomainResource { * Path: Organization.active
*

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

*/ - // [] - // [] @SearchParamDefinition(name="type", path="Organization.type", description="A code for the type of organization", type="token", target={} ) public static final String SP_TYPE = "type"; /** @@ -1227,8 +1209,6 @@ 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", target={} ) public static final String SP_ADDRESS_CITY = "address-city"; /** @@ -1249,8 +1229,6 @@ 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", target={} ) public static final String SP_ADDRESS_POSTALCODE = "address-postalcode"; /** @@ -1271,8 +1249,6 @@ 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", target={} ) public static final String SP_ADDRESS_COUNTRY = "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 35f8be0edc6..97798a24359 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-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 09d0391510a..d74d0f08199 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -2684,8 +2684,6 @@ public class Patient extends DomainResource { * Path: Patient.birthDate
*

*/ - // [] - // [] @SearchParamDefinition(name="birthdate", path="Patient.birthDate", description="The patient's date of birth", type="date", target={} ) public static final String SP_BIRTHDATE = "birthdate"; /** @@ -2706,8 +2704,6 @@ 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", target={} ) public static final String SP_DECEASED = "deceased"; /** @@ -2728,8 +2724,6 @@ 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", target={} ) public static final String SP_ADDRESS_STATE = "address-state"; /** @@ -2750,8 +2744,6 @@ public class Patient extends DomainResource { * Path: Patient.gender
*

*/ - // [] - // [] @SearchParamDefinition(name="gender", path="Patient.gender", description="Gender of the patient", type="token", target={} ) public static final String SP_GENDER = "gender"; /** @@ -2772,8 +2764,6 @@ 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", target={} ) public static final String SP_ANIMAL_SPECIES = "animal-species"; /** @@ -2794,8 +2784,6 @@ public class Patient extends DomainResource { * Path: Patient.link.other
*

*/ - // [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"; /** @@ -2822,8 +2810,6 @@ 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", target={} ) public static final String SP_LANGUAGE = "language"; /** @@ -2844,8 +2830,6 @@ 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", target={} ) public static final String SP_ANIMAL_BREED = "animal-breed"; /** @@ -2866,8 +2850,6 @@ 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", target={} ) public static final String SP_ADDRESS_COUNTRY = "address-country"; /** @@ -2888,8 +2870,6 @@ 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", target={} ) public static final String SP_DEATH_DATE = "death-date"; /** @@ -2910,8 +2890,6 @@ 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", target={} ) public static final String SP_PHONETIC = "phonetic"; /** @@ -2932,8 +2910,6 @@ 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", target={} ) public static final String SP_TELECOM = "telecom"; /** @@ -2954,8 +2930,6 @@ 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", target={} ) public static final String SP_ADDRESS_CITY = "address-city"; /** @@ -2976,8 +2950,6 @@ 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", target={} ) public static final String SP_EMAIL = "email"; /** @@ -2998,8 +2970,6 @@ public class Patient extends DomainResource { * Path: Patient.identifier
*

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="Patient.identifier", description="A patient identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -3020,8 +2990,6 @@ 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", target={} ) public static final String SP_GIVEN = "given"; /** @@ -3042,8 +3010,6 @@ 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", target={} ) public static final String SP_ADDRESS = "address"; /** @@ -3064,8 +3030,6 @@ public class Patient extends DomainResource { * Path: Patient.active
*

*/ - // [] - // [] @SearchParamDefinition(name="active", path="Patient.active", description="Whether the patient record is active", type="token", target={} ) public static final String SP_ACTIVE = "active"; /** @@ -3086,8 +3050,6 @@ 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", target={} ) public static final String SP_ADDRESS_POSTALCODE = "address-postalcode"; /** @@ -3108,8 +3070,6 @@ public class Patient extends DomainResource { * Path: Patient.careProvider
*

*/ - // [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"; /** @@ -3136,8 +3096,6 @@ 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", target={} ) public static final String SP_PHONE = "phone"; /** @@ -3158,8 +3116,6 @@ public class Patient extends DomainResource { * Path: Patient.managingOrganization
*

*/ - // [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"; /** @@ -3186,8 +3142,6 @@ 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", target={} ) public static final String SP_NAME = "name"; /** @@ -3208,8 +3162,6 @@ 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", target={} ) public static final String SP_ADDRESS_USE = "address-use"; /** @@ -3230,8 +3182,6 @@ 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", target={} ) public static final String SP_FAMILY = "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 49096a8f064..e3c41b9935d 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -855,8 +855,6 @@ public class PaymentNotice extends DomainResource { * Path: PaymentNotice.identifier
*

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

*/ - // [] - // [] @SearchParamDefinition(name="responseidentifier", path="PaymentNotice.response.as(Identifier)", description="The ClaimResponse", type="token", target={} ) public static final String SP_RESPONSEIDENTIFIER = "responseidentifier"; /** @@ -899,8 +895,6 @@ 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", target={} ) public static final String SP_ORGANIZATIONIDENTIFIER = "organizationidentifier"; /** @@ -921,8 +915,6 @@ public class PaymentNotice extends DomainResource { * Path: PaymentNotice.created
*

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

*/ - // [] - // [] @SearchParamDefinition(name="requestidentifier", path="PaymentNotice.request.as(Identifier)", description="The Claim", type="token", target={} ) public static final String SP_REQUESTIDENTIFIER = "requestidentifier"; /** @@ -965,8 +955,6 @@ public class PaymentNotice extends DomainResource { * Path: PaymentNotice.paymentStatus
*

*/ - // [] - // [] @SearchParamDefinition(name="paymentstatus", path="PaymentNotice.paymentStatus", description="The type of payment notice", type="token", target={} ) public static final String SP_PAYMENTSTATUS = "paymentstatus"; /** @@ -987,8 +975,6 @@ public class PaymentNotice extends DomainResource { * Path: PaymentNotice.organizationReference
*

*/ - // [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"; /** @@ -1015,8 +1001,6 @@ public class PaymentNotice extends DomainResource { * Path: PaymentNotice.providerReference
*

*/ - // [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"; /** @@ -1043,8 +1027,6 @@ 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"; /** @@ -1071,8 +1053,6 @@ public class PaymentNotice extends DomainResource { * Path: PaymentNotice.providerIdentifier
*

*/ - // [] - // [] @SearchParamDefinition(name="provideridentifier", path="PaymentNotice.provider.as(Identifier)", description="The reference to the provider", type="token", target={} ) public static final String SP_PROVIDERIDENTIFIER = "provideridentifier"; /** @@ -1093,8 +1073,6 @@ 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"; /** @@ -1121,8 +1099,6 @@ public class PaymentNotice extends DomainResource { * Path: PaymentNotice.statusDate
*

*/ - // [] - // [] @SearchParamDefinition(name="statusdate", path="PaymentNotice.statusDate", description="The date of the payment action", type="date", target={} ) public static final String SP_STATUSDATE = "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 d3aa351a41f..bb50ded19e9 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1839,8 +1839,6 @@ 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", target={} ) public static final String SP_REQUESTPROVIDERIDENTIFIER = "requestprovideridentifier"; /** @@ -1861,8 +1859,6 @@ 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", target={} ) public static final String SP_REQUESTORGANIZATIONIDENTIFIER = "requestorganizationidentifier"; /** @@ -1883,8 +1879,6 @@ 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", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -1905,8 +1899,6 @@ public class PaymentReconciliation extends DomainResource { * Path: PaymentReconciliation.disposition
*

*/ - // [] - // [] @SearchParamDefinition(name="disposition", path="PaymentReconciliation.disposition", description="The contents of the disposition message", type="string", target={} ) public static final String SP_DISPOSITION = "disposition"; /** @@ -1927,8 +1919,6 @@ 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", target={} ) public static final String SP_ORGANIZATIONIDENTIFIER = "organizationidentifier"; /** @@ -1949,8 +1939,6 @@ public class PaymentReconciliation extends DomainResource { * Path: PaymentReconciliation.created
*

*/ - // [] - // [] @SearchParamDefinition(name="created", path="PaymentReconciliation.created", description="The creation date", type="date", target={} ) public static final String SP_CREATED = "created"; /** @@ -1971,8 +1959,6 @@ public class PaymentReconciliation extends DomainResource { * Path: PaymentReconciliation.requestIdentifier
*

*/ - // [] - // [] @SearchParamDefinition(name="requestidentifier", path="PaymentReconciliation.request.as(Identifier)", description="The reference to the claim", type="token", target={} ) public static final String SP_REQUESTIDENTIFIER = "requestidentifier"; /** @@ -1993,8 +1979,6 @@ public class PaymentReconciliation extends DomainResource { * Path: PaymentReconciliation.organizationReference
*

*/ - // [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"; /** @@ -2021,8 +2005,6 @@ public class PaymentReconciliation extends DomainResource { * Path: PaymentReconciliation.requestProviderReference
*

*/ - // [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"; /** @@ -2049,8 +2031,6 @@ public class PaymentReconciliation extends DomainResource { * Path: PaymentReconciliation.requestOrganizationReference
*

*/ - // [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"; /** @@ -2077,8 +2057,6 @@ public class PaymentReconciliation extends DomainResource { * Path: PaymentReconciliation.requestReference
*

*/ - // [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"; /** @@ -2105,8 +2083,6 @@ public class PaymentReconciliation extends DomainResource { * Path: PaymentReconciliation.outcome
*

*/ - // [] - // [] @SearchParamDefinition(name="outcome", path="PaymentReconciliation.outcome", description="The processing outcome", type="token", target={} ) public static final String SP_OUTCOME = "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 6473580119b..2f52f1e9d33 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1219,8 +1219,6 @@ public class Person extends DomainResource { * Path: Person.identifier
*

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="Person.identifier", description="A person Identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -1241,8 +1239,6 @@ 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", target={} ) public static final String SP_ADDRESS = "address"; /** @@ -1263,8 +1259,6 @@ public class Person extends DomainResource { * Path: Person.birthDate
*

*/ - // [] - // [] @SearchParamDefinition(name="birthdate", path="Person.birthDate", description="The person's date of birth", type="date", target={} ) public static final String SP_BIRTHDATE = "birthdate"; /** @@ -1285,8 +1279,6 @@ 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", target={} ) public static final String SP_ADDRESS_STATE = "address-state"; /** @@ -1307,8 +1299,6 @@ public class Person extends DomainResource { * Path: Person.gender
*

*/ - // [] - // [] @SearchParamDefinition(name="gender", path="Person.gender", description="The gender of the person", type="token", target={} ) public static final String SP_GENDER = "gender"; /** @@ -1329,9 +1319,7 @@ public class Person extends DomainResource { * Path: Person.link.target
*

*/ - // [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} ) + @SearchParamDefinition(name="practitioner", path="Person.link.target", description="The Person links to this Practitioner", type="reference", target={Practitioner.class} ) public static final String SP_PRACTITIONER = "practitioner"; /** * Fluent Client search parameter constant for practitioner @@ -1357,8 +1345,6 @@ public class Person extends DomainResource { * Path: Person.link.target
*

*/ - // [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"; /** @@ -1385,9 +1371,7 @@ public class Person extends DomainResource { * Path: Person.link.target
*

*/ - // [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} ) + @SearchParamDefinition(name="relatedperson", path="Person.link.target", description="The Person links to this RelatedPerson", type="reference", target={RelatedPerson.class} ) public static final String SP_RELATEDPERSON = "relatedperson"; /** * Fluent Client search parameter constant for relatedperson @@ -1413,8 +1397,6 @@ 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", target={} ) public static final String SP_ADDRESS_POSTALCODE = "address-postalcode"; /** @@ -1435,8 +1417,6 @@ 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", target={} ) public static final String SP_ADDRESS_COUNTRY = "address-country"; /** @@ -1457,8 +1437,6 @@ 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", target={} ) public static final String SP_PHONETIC = "phonetic"; /** @@ -1479,8 +1457,6 @@ 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", target={} ) public static final String SP_PHONE = "phone"; /** @@ -1501,9 +1477,7 @@ public class Person extends DomainResource { * Path: Person.link.target
*

*/ - // [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} ) + @SearchParamDefinition(name="patient", path="Person.link.target", description="The Person links to this Patient", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -1529,8 +1503,6 @@ public class Person extends DomainResource { * Path: Person.managingOrganization
*

*/ - // [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"; /** @@ -1557,8 +1529,6 @@ 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", target={} ) public static final String SP_NAME = "name"; /** @@ -1579,8 +1549,6 @@ 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", target={} ) public static final String SP_ADDRESS_USE = "address-use"; /** @@ -1601,8 +1569,6 @@ public class Person extends DomainResource { * Path: Person.telecom
*

*/ - // [] - // [] @SearchParamDefinition(name="telecom", path="Person.telecom", description="The value in any kind of contact", type="token", target={} ) public static final String SP_TELECOM = "telecom"; /** @@ -1623,8 +1589,6 @@ 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", target={} ) public static final String SP_ADDRESS_CITY = "address-city"; /** @@ -1645,8 +1609,6 @@ 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", target={} ) public static final String SP_EMAIL = "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 b44b85a8dcb..3bdfc24a8e1 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -2048,8 +2048,6 @@ 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", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -2070,8 +2068,6 @@ 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", target={} ) public static final String SP_GIVEN = "given"; /** @@ -2092,8 +2088,6 @@ 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", target={} ) public static final String SP_SPECIALTY = "specialty"; /** @@ -2114,8 +2108,6 @@ 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", target={} ) public static final String SP_ADDRESS = "address"; /** @@ -2136,8 +2128,6 @@ 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", target={} ) public static final String SP_ROLE = "role"; /** @@ -2158,8 +2148,6 @@ 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", target={} ) public static final String SP_ADDRESS_STATE = "address-state"; /** @@ -2180,8 +2168,6 @@ 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", target={} ) public static final String SP_GENDER = "gender"; /** @@ -2202,8 +2188,6 @@ 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", target={} ) public static final String SP_ADDRESS_POSTALCODE = "address-postalcode"; /** @@ -2224,8 +2208,6 @@ 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", target={} ) public static final String SP_ADDRESS_COUNTRY = "address-country"; /** @@ -2246,8 +2228,6 @@ 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", target={} ) public static final String SP_PHONETIC = "phonetic"; /** @@ -2268,8 +2248,6 @@ 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", target={} ) public static final String SP_PHONE = "phone"; /** @@ -2290,8 +2268,6 @@ Work addresses are not typically entered in this property as they are usually ro * Path: Practitioner.practitionerRole.organization
*

*/ - // [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"; /** @@ -2318,8 +2294,6 @@ 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", target={} ) public static final String SP_NAME = "name"; /** @@ -2340,8 +2314,6 @@ 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", target={} ) public static final String SP_ADDRESS_USE = "address-use"; /** @@ -2362,8 +2334,6 @@ 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", target={} ) public static final String SP_TELECOM = "telecom"; /** @@ -2384,8 +2354,6 @@ Work addresses are not typically entered in this property as they are usually ro * Path: Practitioner.practitionerRole.location
*

*/ - // [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"; /** @@ -2412,8 +2380,6 @@ 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", target={} ) public static final String SP_FAMILY = "family"; /** @@ -2434,8 +2400,6 @@ 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", target={} ) public static final String SP_ADDRESS_CITY = "address-city"; /** @@ -2456,8 +2420,6 @@ 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", target={} ) public static final String SP_COMMUNICATION = "communication"; /** @@ -2478,8 +2440,6 @@ 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", target={} ) public static final String SP_EMAIL = "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 2e5a8a249e7..860743aa7f7 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1760,8 +1760,6 @@ public class PractitionerRole extends DomainResource { * Path: PractitionerRole.identifier
*

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="PractitionerRole.identifier", description="A practitioner's Identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -1782,8 +1780,6 @@ 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", target={} ) public static final String SP_SPECIALTY = "specialty"; /** @@ -1804,8 +1800,6 @@ 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", target={} ) public static final String SP_ROLE = "role"; /** @@ -1826,8 +1820,6 @@ public class PractitionerRole extends DomainResource { * Path: PractitionerRole.practitioner
*

*/ - // [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"; /** @@ -1854,8 +1846,6 @@ 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", target={} ) public static final String SP_PHONE = "phone"; /** @@ -1876,8 +1866,6 @@ public class PractitionerRole extends DomainResource { * Path: PractitionerRole.organization
*

*/ - // [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"; /** @@ -1904,8 +1892,6 @@ public class PractitionerRole extends DomainResource { * Path: PractitionerRole.telecom
*

*/ - // [] - // [] @SearchParamDefinition(name="telecom", path="PractitionerRole.telecom", description="The value in any kind of contact", type="token", target={} ) public static final String SP_TELECOM = "telecom"; /** @@ -1926,8 +1912,6 @@ public class PractitionerRole extends DomainResource { * Path: PractitionerRole.location
*

*/ - // [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"; /** @@ -1954,8 +1938,6 @@ 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", target={} ) public static final String SP_EMAIL = "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 5bd4508caaf..a4275305400 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -2205,8 +2205,6 @@ public class Procedure extends DomainResource { * Path: Procedure.performed[x]
*

*/ - // [] - // [] @SearchParamDefinition(name="date", path="Procedure.performed", description="Date/Period the procedure was performed", type="date", target={} ) public static final String SP_DATE = "date"; /** @@ -2227,8 +2225,6 @@ public class Procedure extends DomainResource { * Path: Procedure.identifier
*

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="Procedure.identifier", description="A unique identifier for a procedure", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -2249,8 +2245,6 @@ public class Procedure extends DomainResource { * Path: Procedure.code
*

*/ - // [] - // [] @SearchParamDefinition(name="code", path="Procedure.code", description="A code to identify a procedure", type="token", target={} ) public static final String SP_CODE = "code"; /** @@ -2271,8 +2265,6 @@ public class Procedure extends DomainResource { * Path: Procedure.performer.actor
*

*/ - // [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"; /** @@ -2299,8 +2291,6 @@ public class Procedure extends DomainResource { * Path: Procedure.subject
*

*/ - // [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"; /** @@ -2327,9 +2317,7 @@ public class Procedure extends DomainResource { * Path: Procedure.subject
*

*/ - // [Group, Patient] - // [Patient] - @SearchParamDefinition(name="patient", path="Procedure.subject", description="Search by subject - a patient", type="reference", target={Group.class, Patient.class} ) + @SearchParamDefinition(name="patient", path="Procedure.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 @@ -2355,8 +2343,6 @@ public class Procedure extends DomainResource { * Path: Procedure.location
*

*/ - // [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"; /** @@ -2383,8 +2369,6 @@ public class Procedure extends DomainResource { * Path: Procedure.encounter
*

*/ - // [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"; /** @@ -2411,8 +2395,6 @@ public class Procedure extends DomainResource { * Path: Procedure.category
*

*/ - // [] - // [] @SearchParamDefinition(name="category", path="Procedure.category", description="Classification of the procedure", type="token", target={} ) public static final String SP_CATEGORY = "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 bde8acdf8a1..6ea345572d4 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1474,8 +1474,6 @@ public class ProcedureRequest extends DomainResource { * Path: ProcedureRequest.identifier
*

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="ProcedureRequest.identifier", description="A unique identifier of the Procedure Request", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -1496,8 +1494,6 @@ public class ProcedureRequest extends DomainResource { * Path: ProcedureRequest.performer
*

*/ - // [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"; /** @@ -1524,8 +1520,6 @@ public class ProcedureRequest extends DomainResource { * Path: ProcedureRequest.subject
*

*/ - // [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"; /** @@ -1552,9 +1546,7 @@ public class ProcedureRequest extends DomainResource { * Path: ProcedureRequest.subject
*

*/ - // [Group, Patient] - // [Patient] - @SearchParamDefinition(name="patient", path="ProcedureRequest.subject", description="Search by subject - a patient", type="reference", target={Group.class, Patient.class} ) + @SearchParamDefinition(name="patient", path="ProcedureRequest.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 @@ -1580,8 +1572,6 @@ public class ProcedureRequest extends DomainResource { * Path: ProcedureRequest.orderer
*

*/ - // [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"; /** @@ -1608,8 +1598,6 @@ public class ProcedureRequest extends DomainResource { * Path: ProcedureRequest.encounter
*

*/ - // [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"; /** 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 bb2a71e4c9b..a6ed6be3a65 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1538,8 +1538,6 @@ public class ProcessRequest extends DomainResource { * Path: ProcessRequest.identifier
*

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="ProcessRequest.identifier", description="The business identifier of the ProcessRequest", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -1560,8 +1558,6 @@ 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", target={} ) public static final String SP_ORGANIZATIONIDENTIFIER = "organizationidentifier"; /** @@ -1582,8 +1578,6 @@ public class ProcessRequest extends DomainResource { * Path: ProcessRequest.action
*

*/ - // [] - // [] @SearchParamDefinition(name="action", path="ProcessRequest.action", description="The action requested by this resource", type="token", target={} ) public static final String SP_ACTION = "action"; /** @@ -1604,8 +1598,6 @@ public class ProcessRequest extends DomainResource { * Path: ProcessRequest.organizationReference
*

*/ - // [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"; /** @@ -1632,8 +1624,6 @@ public class ProcessRequest extends DomainResource { * Path: ProcessRequest.providerReference
*

*/ - // [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"; /** @@ -1660,8 +1650,6 @@ 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", target={} ) public static final String SP_PROVIDERIDENTIFIER = "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 e80730a1149..054f2b76d04 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1186,8 +1186,6 @@ 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", target={} ) public static final String SP_REQUESTPROVIDERIDENTIFIER = "requestprovideridentifier"; /** @@ -1208,8 +1206,6 @@ 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", target={} ) public static final String SP_REQUESTORGANIZATIONIDENTIFIER = "requestorganizationidentifier"; /** @@ -1230,8 +1226,6 @@ 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", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -1252,8 +1246,6 @@ 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", target={} ) public static final String SP_ORGANIZATIONIDENTIFIER = "organizationidentifier"; /** @@ -1274,8 +1266,6 @@ public class ProcessResponse extends DomainResource { * Path: ProcessResponse.requestIdentifier
*

*/ - // [] - // [] @SearchParamDefinition(name="requestidentifier", path="ProcessResponse.request.as(Identifier)", description="The reference to the claim", type="token", target={} ) public static final String SP_REQUESTIDENTIFIER = "requestidentifier"; /** @@ -1296,8 +1286,6 @@ public class ProcessResponse extends DomainResource { * Path: ProcessResponse.organizationReference
*

*/ - // [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"; /** @@ -1324,8 +1312,6 @@ public class ProcessResponse extends DomainResource { * Path: ProcessResponse.requestProviderReference
*

*/ - // [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"; /** @@ -1352,8 +1338,6 @@ public class ProcessResponse extends DomainResource { * Path: ProcessResponse.requestOrganizationReference
*

*/ - // [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"; /** @@ -1380,8 +1364,6 @@ 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 ef0d9c2ced8..7e000dff071 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -4076,8 +4076,6 @@ public class Protocol extends DomainResource { * Path: Protocol.identifier
*

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="Protocol.identifier", description="The unique id for a particular protocol", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -4098,8 +4096,6 @@ public class Protocol extends DomainResource { * Path: Protocol.subject
*

*/ - // [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"; /** 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 5eeb92eacce..4e9d51d52bd 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1951,8 +1951,6 @@ 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", target={} ) public static final String SP_SIG = "sig"; /** @@ -1973,8 +1971,6 @@ 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", target={} ) public static final String SP_ENTITY_TYPE = "entity-type"; /** @@ -1995,8 +1991,6 @@ public class Provenance extends DomainResource { * Path: Provenance.agent.actor
*

*/ - // [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"; /** @@ -2023,9 +2017,7 @@ 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" ) + @SearchParamDefinition(name="patient", path="Provenance.target", description="Target Reference(s) (usually version specific)", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -2051,8 +2043,6 @@ public class Provenance extends DomainResource { * Path: Provenance.period.start
*

*/ - // [] - // [] @SearchParamDefinition(name="start", path="Provenance.period.start", description="Starting time with inclusive boundary", type="date", target={} ) public static final String SP_START = "start"; /** @@ -2073,8 +2063,6 @@ 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", target={} ) public static final String SP_END = "end"; /** @@ -2095,8 +2083,6 @@ public class Provenance extends DomainResource { * Path: Provenance.location
*

*/ - // [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"; /** @@ -2123,8 +2109,6 @@ 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", target={} ) public static final String SP_USERID = "userid"; /** @@ -2145,8 +2129,6 @@ public class Provenance extends DomainResource { * Path: Provenance.entity.reference
*

*/ - // [] - // [] @SearchParamDefinition(name="entity", path="Provenance.entity.reference", description="Identity of entity", type="uri", target={} ) public static final String SP_ENTITY = "entity"; /** @@ -2167,8 +2149,6 @@ 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 49ac9d318aa..051a9dfd6c4 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -3487,8 +3487,6 @@ public class Questionnaire extends DomainResource { * Path: Questionnaire.date
*

*/ - // [] - // [] @SearchParamDefinition(name="date", path="Questionnaire.date", description="When the questionnaire was last changed", type="date", target={} ) public static final String SP_DATE = "date"; /** @@ -3509,8 +3507,6 @@ public class Questionnaire extends DomainResource { * Path: Questionnaire.identifier
*

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="Questionnaire.identifier", description="An identifier for the questionnaire", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -3531,8 +3527,6 @@ 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", target={} ) public static final String SP_CODE = "code"; /** @@ -3553,8 +3547,6 @@ public class Questionnaire extends DomainResource { * Path: Questionnaire.useContext
*

*/ - // [] - // [] @SearchParamDefinition(name="context", path="Questionnaire.useContext", description="A use context assigned to the questionnaire", type="token", target={} ) public static final String SP_CONTEXT = "context"; /** @@ -3575,8 +3567,6 @@ public class Questionnaire extends DomainResource { * Path: Questionnaire.publisher
*

*/ - // [] - // [] @SearchParamDefinition(name="publisher", path="Questionnaire.publisher", description="The author of the questionnaire", type="string", target={} ) public static final String SP_PUBLISHER = "publisher"; /** @@ -3597,8 +3587,6 @@ 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", target={} ) public static final String SP_TITLE = "title"; /** @@ -3619,8 +3607,6 @@ public class Questionnaire extends DomainResource { * Path: Questionnaire.version
*

*/ - // [] - // [] @SearchParamDefinition(name="version", path="Questionnaire.version", description="The business version of the questionnaire", type="string", target={} ) public static final String SP_VERSION = "version"; /** @@ -3641,8 +3627,6 @@ public class Questionnaire extends DomainResource { * Path: Questionnaire.status
*

*/ - // [] - // [] @SearchParamDefinition(name="status", path="Questionnaire.status", description="The status of the questionnaire", type="token", target={} ) public static final String SP_STATUS = "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 2f088a5775c..13923a7a15e 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1727,8 +1727,6 @@ public class QuestionnaireResponse extends DomainResource { * Path: QuestionnaireResponse.authored
*

*/ - // [] - // [] @SearchParamDefinition(name="authored", path="QuestionnaireResponse.authored", description="When the questionnaire was authored", type="date", target={} ) public static final String SP_AUTHORED = "authored"; /** @@ -1749,8 +1747,6 @@ public class QuestionnaireResponse extends DomainResource { * Path: QuestionnaireResponse.questionnaire
*

*/ - // [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"; /** @@ -1777,8 +1773,6 @@ 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"; /** @@ -1805,8 +1799,6 @@ public class QuestionnaireResponse extends DomainResource { * Path: QuestionnaireResponse.author
*

*/ - // [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"; /** @@ -1833,9 +1825,7 @@ 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" ) + @SearchParamDefinition(name="patient", path="QuestionnaireResponse.subject", description="The patient that is the subject of the questionnaire", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -1861,8 +1851,6 @@ public class QuestionnaireResponse extends DomainResource { * Path: QuestionnaireResponse.encounter
*

*/ - // [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"; /** @@ -1889,8 +1877,6 @@ public class QuestionnaireResponse extends DomainResource { * Path: QuestionnaireResponse.source
*

*/ - // [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"; /** @@ -1917,8 +1903,6 @@ public class QuestionnaireResponse extends DomainResource { * Path: QuestionnaireResponse.status
*

*/ - // [] - // [] @SearchParamDefinition(name="status", path="QuestionnaireResponse.status", description="The status of the questionnaire response", type="token", target={} ) public static final String SP_STATUS = "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 cd5325ec7a6..d06920e3167 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1576,8 +1576,6 @@ public class ReferralRequest extends DomainResource { * Path: ReferralRequest.authored
*

*/ - // [] - // [] @SearchParamDefinition(name="date", path="ReferralRequest.authored", description="Creation or activation date", type="date", target={} ) public static final String SP_DATE = "date"; /** @@ -1598,8 +1596,6 @@ public class ReferralRequest extends DomainResource { * Path: ReferralRequest.requester
*

*/ - // [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"; /** @@ -1626,8 +1622,6 @@ public class ReferralRequest extends DomainResource { * Path: ReferralRequest.parent
*

*/ - // [] - // [] @SearchParamDefinition(name="parent", path="ReferralRequest.parent", description="Part of common request", type="token", target={} ) public static final String SP_PARENT = "parent"; /** @@ -1648,8 +1642,6 @@ public class ReferralRequest extends DomainResource { * Path: ReferralRequest.specialty
*

*/ - // [] - // [] @SearchParamDefinition(name="specialty", path="ReferralRequest.specialty", description="The specialty that the referral is for", type="token", target={} ) public static final String SP_SPECIALTY = "specialty"; /** @@ -1670,8 +1662,6 @@ public class ReferralRequest extends DomainResource { * Path: ReferralRequest.patient
*

*/ - // [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"; /** @@ -1698,8 +1688,6 @@ public class ReferralRequest extends DomainResource { * Path: ReferralRequest.recipient
*

*/ - // [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"; /** @@ -1726,8 +1714,6 @@ public class ReferralRequest extends DomainResource { * Path: ReferralRequest.context
*

*/ - // [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"; /** @@ -1754,8 +1740,6 @@ public class ReferralRequest extends DomainResource { * Path: ReferralRequest.type
*

*/ - // [] - // [] @SearchParamDefinition(name="type", path="ReferralRequest.type", description="The type of the referral", type="token", target={} ) public static final String SP_TYPE = "type"; /** @@ -1776,8 +1760,6 @@ public class ReferralRequest extends DomainResource { * Path: ReferralRequest.priority
*

*/ - // [] - // [] @SearchParamDefinition(name="priority", path="ReferralRequest.priority", description="The priority assigned to the referral", type="token", target={} ) public static final String SP_PRIORITY = "priority"; /** @@ -1798,8 +1780,6 @@ public class ReferralRequest extends DomainResource { * Path: ReferralRequest.category
*

*/ - // [] - // [] @SearchParamDefinition(name="category", path="ReferralRequest.category", description="Proposal, plan or request", type="token", target={} ) public static final String SP_CATEGORY = "category"; /** @@ -1820,8 +1800,6 @@ public class ReferralRequest extends DomainResource { * Path: ReferralRequest.basedOn
*

*/ - // [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"; /** @@ -1848,8 +1826,6 @@ public class ReferralRequest extends DomainResource { * Path: ReferralRequest.status
*

*/ - // [] - // [] @SearchParamDefinition(name="status", path="ReferralRequest.status", description="The status of the referral", type="token", target={} ) public static final String SP_STATUS = "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 da31313b695..c023c73cfc7 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -822,8 +822,6 @@ public class RelatedPerson extends DomainResource { * Path: RelatedPerson.identifier
*

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="RelatedPerson.identifier", description="A patient Identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -844,8 +842,6 @@ 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", target={} ) public static final String SP_ADDRESS = "address"; /** @@ -866,8 +862,6 @@ public class RelatedPerson extends DomainResource { * Path: RelatedPerson.birthDate
*

*/ - // [] - // [] @SearchParamDefinition(name="birthdate", path="RelatedPerson.birthDate", description="The Related Person's date of birth", type="date", target={} ) public static final String SP_BIRTHDATE = "birthdate"; /** @@ -888,8 +882,6 @@ 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", target={} ) public static final String SP_ADDRESS_STATE = "address-state"; /** @@ -910,8 +902,6 @@ public class RelatedPerson extends DomainResource { * Path: RelatedPerson.gender
*

*/ - // [] - // [] @SearchParamDefinition(name="gender", path="RelatedPerson.gender", description="Gender of the person", type="token", target={} ) public static final String SP_GENDER = "gender"; /** @@ -932,8 +922,6 @@ 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", target={} ) public static final String SP_ADDRESS_POSTALCODE = "address-postalcode"; /** @@ -954,8 +942,6 @@ 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", target={} ) public static final String SP_ADDRESS_COUNTRY = "address-country"; /** @@ -976,8 +962,6 @@ 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", target={} ) public static final String SP_PHONETIC = "phonetic"; /** @@ -998,8 +982,6 @@ 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", target={} ) public static final String SP_PHONE = "phone"; /** @@ -1020,8 +1002,6 @@ public class RelatedPerson extends DomainResource { * Path: RelatedPerson.patient
*

*/ - // [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"; /** @@ -1048,8 +1028,6 @@ 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", target={} ) public static final String SP_NAME = "name"; /** @@ -1070,8 +1048,6 @@ 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", target={} ) public static final String SP_ADDRESS_USE = "address-use"; /** @@ -1092,8 +1068,6 @@ public class RelatedPerson extends DomainResource { * Path: RelatedPerson.telecom
*

*/ - // [] - // [] @SearchParamDefinition(name="telecom", path="RelatedPerson.telecom", description="The value in any kind of contact", type="token", target={} ) public static final String SP_TELECOM = "telecom"; /** @@ -1114,8 +1088,6 @@ 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", target={} ) public static final String SP_ADDRESS_CITY = "address-city"; /** @@ -1136,8 +1108,6 @@ 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", target={} ) public static final String SP_EMAIL = "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 66e49c478a0..f8051cdafaf 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-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 0c3cef9be52..4e084104ae4 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1271,8 +1271,6 @@ public class RiskAssessment extends DomainResource { * Path: RiskAssessment.date
*

*/ - // [] - // [] @SearchParamDefinition(name="date", path="RiskAssessment.date", description="When was assessment made?", type="date", target={} ) public static final String SP_DATE = "date"; /** @@ -1293,8 +1291,6 @@ public class RiskAssessment extends DomainResource { * Path: RiskAssessment.identifier
*

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="RiskAssessment.identifier", description="Unique identifier for the assessment", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -1315,8 +1311,6 @@ public class RiskAssessment extends DomainResource { * Path: RiskAssessment.condition
*

*/ - // [Condition] - // [Condition] @SearchParamDefinition(name="condition", path="RiskAssessment.condition", description="Condition assessed", type="reference", target={Condition.class} ) public static final String SP_CONDITION = "condition"; /** @@ -1343,8 +1337,6 @@ public class RiskAssessment extends DomainResource { * Path: RiskAssessment.performer
*

*/ - // [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"; /** @@ -1371,8 +1363,6 @@ public class RiskAssessment extends DomainResource { * Path: RiskAssessment.method
*

*/ - // [] - // [] @SearchParamDefinition(name="method", path="RiskAssessment.method", description="Evaluation mechanism", type="token", target={} ) public static final String SP_METHOD = "method"; /** @@ -1393,8 +1383,6 @@ public class RiskAssessment extends DomainResource { * Path: RiskAssessment.subject
*

*/ - // [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"; /** @@ -1421,9 +1409,7 @@ public class RiskAssessment extends DomainResource { * Path: RiskAssessment.subject
*

*/ - // [Group, Patient] - // [Patient] - @SearchParamDefinition(name="patient", path="RiskAssessment.subject", description="Who/what does assessment apply to?", type="reference", target={Group.class, Patient.class} ) + @SearchParamDefinition(name="patient", path="RiskAssessment.subject", description="Who/what does assessment apply to?", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -1449,8 +1435,6 @@ public class RiskAssessment extends DomainResource { * Path: RiskAssessment.encounter
*

*/ - // [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"; /** 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 c0e22797931..154238b8542 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -623,8 +623,6 @@ public class Schedule extends DomainResource { * Path: Schedule.actor
*

*/ - // [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"; /** @@ -651,8 +649,6 @@ 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", target={} ) public static final String SP_DATE = "date"; /** @@ -673,8 +669,6 @@ public class Schedule extends DomainResource { * Path: Schedule.identifier
*

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="Schedule.identifier", description="A Schedule Identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -695,8 +689,6 @@ 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", target={} ) public static final String SP_TYPE = "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 c0e2e237ff5..97e435a47f9 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1728,8 +1728,6 @@ public class SearchParameter extends DomainResource { * Path: SearchParameter.code
*

*/ - // [] - // [] @SearchParamDefinition(name="code", path="SearchParameter.code", description="Code used in URL", type="token", target={} ) public static final String SP_CODE = "code"; /** @@ -1750,8 +1748,6 @@ public class SearchParameter extends DomainResource { * Path: SearchParameter.name
*

*/ - // [] - // [] @SearchParamDefinition(name="name", path="SearchParameter.name", description="Informal name for this search parameter", type="string", target={} ) public static final String SP_NAME = "name"; /** @@ -1772,8 +1768,6 @@ 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", target={} ) public static final String SP_CONTEXT = "context"; /** @@ -1794,8 +1788,6 @@ public class SearchParameter extends DomainResource { * Path: SearchParameter.description
*

*/ - // [] - // [] @SearchParamDefinition(name="description", path="SearchParameter.description", description="Documentation for search parameter", type="string", target={} ) public static final String SP_DESCRIPTION = "description"; /** @@ -1816,8 +1808,6 @@ 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", target={} ) public static final String SP_TYPE = "type"; /** @@ -1838,8 +1828,6 @@ 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", target={} ) public static final String SP_URL = "url"; /** @@ -1860,8 +1848,6 @@ 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", target={} ) public static final String SP_BASE = "base"; /** @@ -1882,8 +1868,6 @@ public class SearchParameter extends DomainResource { * Path: SearchParameter.target
*

*/ - // [] - // [] @SearchParamDefinition(name="target", path="SearchParameter.target", description="Types of resource (if a resource reference)", type="token", target={} ) public static final String SP_TARGET = "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 a86bf11f358..24ef274e5b2 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -3912,8 +3912,6 @@ 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"}, target={} ) public static final String SP_COORDINATE = "coordinate"; /** @@ -3934,8 +3932,6 @@ 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", target={} ) public static final String SP_SPECIES = "species"; /** @@ -3956,8 +3952,6 @@ public class Sequence extends DomainResource { * Path: Sequence.patient
*

*/ - // [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"; /** @@ -3984,8 +3978,6 @@ public class Sequence extends DomainResource { * Path: Sequence.referenceSeq.chromosome
*

*/ - // [] - // [] @SearchParamDefinition(name="chromosome", path="Sequence.referenceSeq.chromosome", description="Chromosome of the sequence", type="token", target={} ) public static final String SP_CHROMOSOME = "chromosome"; /** @@ -4006,8 +3998,6 @@ 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", target={} ) public static final String SP_START = "start"; /** @@ -4028,8 +4018,6 @@ 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", target={} ) public static final String SP_END = "end"; /** @@ -4050,8 +4038,6 @@ 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", target={} ) public static final String SP_TYPE = "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 6cfa59271df..85dd85e3c33 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1008,8 +1008,6 @@ public class Slot extends DomainResource { * Path: Slot.schedule
*

*/ - // [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"; /** @@ -1036,8 +1034,6 @@ public class Slot extends DomainResource { * Path: Slot.identifier
*

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="Slot.identifier", description="A Slot Identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -1058,8 +1054,6 @@ public class Slot extends DomainResource { * Path: Slot.start
*

*/ - // [] - // [] @SearchParamDefinition(name="start", path="Slot.start", description="Appointment date/time.", type="date", target={} ) public static final String SP_START = "start"; /** @@ -1080,8 +1074,6 @@ 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", target={} ) public static final String SP_SLOT_TYPE = "slot-type"; /** @@ -1102,8 +1094,6 @@ public class Slot extends DomainResource { * Path: Slot.status
*

*/ - // [] - // [] @SearchParamDefinition(name="status", path="Slot.status", description="The free/busy status of the appointment", type="token", target={} ) public static final String SP_STATUS = "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 546e86c23d5..92dbf51a3af 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -2140,8 +2140,6 @@ public class Specimen extends DomainResource { * Path: Specimen.container.type
*

*/ - // [] - // [] @SearchParamDefinition(name="container", path="Specimen.container.type", description="The kind of specimen container", type="token", target={} ) public static final String SP_CONTAINER = "container"; /** @@ -2162,8 +2160,6 @@ public class Specimen extends DomainResource { * Path: Specimen.identifier
*

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="Specimen.identifier", description="The unique identifier associated with the specimen", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -2184,8 +2180,6 @@ public class Specimen extends DomainResource { * Path: Specimen.parent
*

*/ - // [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"; /** @@ -2212,8 +2206,6 @@ 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", target={} ) public static final String SP_CONTAINER_ID = "container-id"; /** @@ -2234,8 +2226,6 @@ 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", target={} ) public static final String SP_BODYSITE = "bodysite"; /** @@ -2256,8 +2246,6 @@ public class Specimen extends DomainResource { * Path: Specimen.subject
*

*/ - // [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"; /** @@ -2284,9 +2272,7 @@ public class Specimen extends DomainResource { * Path: Specimen.subject
*

*/ - // [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} ) + @SearchParamDefinition(name="patient", path="Specimen.subject", description="The patient the specimen comes from", type="reference", target={Patient.class} ) public static final String SP_PATIENT = "patient"; /** * Fluent Client search parameter constant for patient @@ -2312,8 +2298,6 @@ 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", target={} ) public static final String SP_COLLECTED = "collected"; /** @@ -2334,8 +2318,6 @@ public class Specimen extends DomainResource { * Path: Specimen.accessionIdentifier
*

*/ - // [] - // [] @SearchParamDefinition(name="accession", path="Specimen.accessionIdentifier", description="The accession number associated with the specimen", type="token", target={} ) public static final String SP_ACCESSION = "accession"; /** @@ -2356,8 +2338,6 @@ public class Specimen extends DomainResource { * Path: Specimen.type
*

*/ - // [] - // [] @SearchParamDefinition(name="type", path="Specimen.type", description="The specimen type", type="token", target={} ) public static final String SP_TYPE = "type"; /** @@ -2378,8 +2358,6 @@ public class Specimen extends DomainResource { * Path: Specimen.collection.collector
*

*/ - // [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"; /** 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 b674fd102a3..7f1da5ee757 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -3202,8 +3202,6 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.date
*

*/ - // [] - // [] @SearchParamDefinition(name="date", path="StructureDefinition.date", description="The profile publication date", type="date", target={} ) public static final String SP_DATE = "date"; /** @@ -3224,8 +3222,6 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.identifier
*

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="StructureDefinition.identifier", description="The identifier of the profile", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -3246,8 +3242,6 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.code
*

*/ - // [] - // [] @SearchParamDefinition(name="code", path="StructureDefinition.code", description="A code for the profile", type="token", target={} ) public static final String SP_CODE = "code"; /** @@ -3268,8 +3262,6 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.snapshot.element.binding.valueSet[x]
*

*/ - // [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"; /** @@ -3296,8 +3288,6 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.kind
*

*/ - // [] - // [] @SearchParamDefinition(name="kind", path="StructureDefinition.kind", description="datatype | resource | logical", type="token", target={} ) public static final String SP_KIND = "kind"; /** @@ -3318,8 +3308,6 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.display
*

*/ - // [] - // [] @SearchParamDefinition(name="display", path="StructureDefinition.display", description="Use this name when displaying the value", type="string", target={} ) public static final String SP_DISPLAY = "display"; /** @@ -3340,8 +3328,6 @@ 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", target={} ) public static final String SP_DESCRIPTION = "description"; /** @@ -3362,8 +3348,6 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.experimental
*

*/ - // [] - // [] @SearchParamDefinition(name="experimental", path="StructureDefinition.experimental", description="If for testing purposes, not real usage", type="token", target={} ) public static final String SP_EXPERIMENTAL = "experimental"; /** @@ -3384,8 +3368,6 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.contextType
*

*/ - // [] - // [] @SearchParamDefinition(name="context-type", path="StructureDefinition.contextType", description="resource | datatype | extension", type="token", target={} ) public static final String SP_CONTEXT_TYPE = "context-type"; /** @@ -3406,8 +3388,6 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.abstract
*

*/ - // [] - // [] @SearchParamDefinition(name="abstract", path="StructureDefinition.abstract", description="Whether the structure is abstract", type="token", target={} ) public static final String SP_ABSTRACT = "abstract"; /** @@ -3428,8 +3408,6 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.baseType
*

*/ - // [] - // [] @SearchParamDefinition(name="type", path="StructureDefinition.baseType", description="Any datatype or resource, including abstract ones", type="token", target={} ) public static final String SP_TYPE = "type"; /** @@ -3450,8 +3428,6 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.version
*

*/ - // [] - // [] @SearchParamDefinition(name="version", path="StructureDefinition.version", description="The version identifier of the profile", type="token", target={} ) public static final String SP_VERSION = "version"; /** @@ -3472,8 +3448,6 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.url
*

*/ - // [] - // [] @SearchParamDefinition(name="url", path="StructureDefinition.url", description="Absolute URL used to reference this StructureDefinition", type="uri", target={} ) public static final String SP_URL = "url"; /** @@ -3494,8 +3468,6 @@ 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", target={} ) public static final String SP_PATH = "path"; /** @@ -3516,8 +3488,6 @@ 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", target={} ) public static final String SP_EXT_CONTEXT = "ext-context"; /** @@ -3538,8 +3508,6 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.name
*

*/ - // [] - // [] @SearchParamDefinition(name="name", path="StructureDefinition.name", description="Name of the profile", type="string", target={} ) public static final String SP_NAME = "name"; /** @@ -3560,8 +3528,6 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.useContext
*

*/ - // [] - // [] @SearchParamDefinition(name="context", path="StructureDefinition.useContext", description="A use context assigned to the structure", type="token", target={} ) public static final String SP_CONTEXT = "context"; /** @@ -3582,8 +3548,6 @@ 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", target={} ) public static final String SP_BASE_PATH = "base-path"; /** @@ -3604,8 +3568,6 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.publisher
*

*/ - // [] - // [] @SearchParamDefinition(name="publisher", path="StructureDefinition.publisher", description="Name of the publisher of the profile", type="string", target={} ) public static final String SP_PUBLISHER = "publisher"; /** @@ -3626,8 +3588,6 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.derivation
*

*/ - // [] - // [] @SearchParamDefinition(name="derivation", path="StructureDefinition.derivation", description="specialization | constraint - How relates to base definition", type="token", target={} ) public static final String SP_DERIVATION = "derivation"; /** @@ -3648,8 +3608,6 @@ public class StructureDefinition extends DomainResource { * Path: StructureDefinition.status
*

*/ - // [] - // [] @SearchParamDefinition(name="status", path="StructureDefinition.status", description="The current status of the profile", type="token", target={} ) public static final String SP_STATUS = "status"; /** @@ -3670,8 +3628,6 @@ 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", target={} ) public static final String SP_BASE = "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 9568bf2285f..ae3168d9686 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -5673,8 +5673,6 @@ public class StructureMap extends DomainResource { * Path: StructureMap.date
*

*/ - // [] - // [] @SearchParamDefinition(name="date", path="StructureMap.date", description="The profile publication date", type="date", target={} ) public static final String SP_DATE = "date"; /** @@ -5695,8 +5693,6 @@ public class StructureMap extends DomainResource { * Path: StructureMap.identifier
*

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="StructureMap.identifier", description="The identifier of the profile", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -5717,8 +5713,6 @@ public class StructureMap extends DomainResource { * Path: StructureMap.name
*

*/ - // [] - // [] @SearchParamDefinition(name="name", path="StructureMap.name", description="Name of the profile", type="string", target={} ) public static final String SP_NAME = "name"; /** @@ -5739,8 +5733,6 @@ public class StructureMap extends DomainResource { * Path: StructureMap.useContext
*

*/ - // [] - // [] @SearchParamDefinition(name="context", path="StructureMap.useContext", description="A use context assigned to the structure", type="token", target={} ) public static final String SP_CONTEXT = "context"; /** @@ -5761,8 +5753,6 @@ public class StructureMap extends DomainResource { * Path: StructureMap.publisher
*

*/ - // [] - // [] @SearchParamDefinition(name="publisher", path="StructureMap.publisher", description="Name of the publisher of the profile", type="string", target={} ) public static final String SP_PUBLISHER = "publisher"; /** @@ -5783,8 +5773,6 @@ 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", target={} ) public static final String SP_DESCRIPTION = "description"; /** @@ -5805,8 +5793,6 @@ 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", target={} ) public static final String SP_EXPERIMENTAL = "experimental"; /** @@ -5827,8 +5813,6 @@ public class StructureMap extends DomainResource { * Path: StructureMap.version
*

*/ - // [] - // [] @SearchParamDefinition(name="version", path="StructureMap.version", description="The version identifier of the profile", type="token", target={} ) public static final String SP_VERSION = "version"; /** @@ -5849,8 +5833,6 @@ public class StructureMap extends DomainResource { * Path: StructureMap.url
*

*/ - // [] - // [] @SearchParamDefinition(name="url", path="StructureMap.url", description="The url that identifies the structure map", type="uri", target={} ) public static final String SP_URL = "url"; /** @@ -5871,8 +5853,6 @@ public class StructureMap extends DomainResource { * Path: StructureMap.status
*

*/ - // [] - // [] @SearchParamDefinition(name="status", path="StructureMap.status", description="The current status of the profile", type="token", target={} ) public static final String SP_STATUS = "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 ec34856cf61..60701dae3b3 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1315,8 +1315,6 @@ 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", target={} ) public static final String SP_PAYLOAD = "payload"; /** @@ -1337,8 +1335,6 @@ public class Subscription extends DomainResource { * Path: Subscription.criteria
*

*/ - // [] - // [] @SearchParamDefinition(name="criteria", path="Subscription.criteria", description="Rule for server push criteria", type="string", target={} ) public static final String SP_CRITERIA = "criteria"; /** @@ -1359,8 +1355,6 @@ public class Subscription extends DomainResource { * Path: Subscription.contact
*

*/ - // [] - // [] @SearchParamDefinition(name="contact", path="Subscription.contact", description="Contact details for source (e.g. troubleshooting)", type="token", target={} ) public static final String SP_CONTACT = "contact"; /** @@ -1381,8 +1375,6 @@ public class Subscription extends DomainResource { * Path: Subscription.tag
*

*/ - // [] - // [] @SearchParamDefinition(name="tag", path="Subscription.tag", description="A tag to add to matching resources", type="token", target={} ) public static final String SP_TAG = "tag"; /** @@ -1403,8 +1395,6 @@ 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", target={} ) public static final String SP_TYPE = "type"; /** @@ -1425,8 +1415,6 @@ public class Subscription extends DomainResource { * Path: Subscription.channel.endpoint
*

*/ - // [] - // [] @SearchParamDefinition(name="url", path="Subscription.channel.endpoint", description="Where the channel points to", type="uri", target={} ) public static final String SP_URL = "url"; /** @@ -1447,8 +1435,6 @@ public class Subscription extends DomainResource { * Path: Subscription.status
*

*/ - // [] - // [] @SearchParamDefinition(name="status", path="Subscription.status", description="requested | active | error | off", type="token", target={} ) public static final String SP_STATUS = "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 639a3ba269a..a0a824c89d6 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1049,8 +1049,6 @@ public class Substance extends DomainResource { * Path: Substance.identifier
*

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="Substance.identifier", description="Unique identifier for the substance", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -1071,8 +1069,6 @@ 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", target={} ) public static final String SP_CONTAINER_IDENTIFIER = "container-identifier"; /** @@ -1093,8 +1089,6 @@ public class Substance extends DomainResource { * Path: Substance.code
*

*/ - // [] - // [] @SearchParamDefinition(name="code", path="Substance.code", description="The code of the substance", type="token", target={} ) public static final String SP_CODE = "code"; /** @@ -1115,8 +1109,6 @@ 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", target={} ) public static final String SP_QUANTITY = "quantity"; /** @@ -1137,8 +1129,6 @@ public class Substance extends DomainResource { * Path: Substance.ingredient.substance
*

*/ - // [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"; /** @@ -1165,8 +1155,6 @@ 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", target={} ) public static final String SP_EXPIRY = "expiry"; /** @@ -1187,8 +1175,6 @@ public class Substance extends DomainResource { * Path: Substance.category
*

*/ - // [] - // [] @SearchParamDefinition(name="category", path="Substance.category", description="The category of the substance", type="token", target={} ) public static final String SP_CATEGORY = "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 0c3e1f74d4c..b9151d58b02 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -945,8 +945,6 @@ public class SupplyDelivery extends DomainResource { * Path: SupplyDelivery.identifier
*

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="SupplyDelivery.identifier", description="External identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -967,8 +965,6 @@ public class SupplyDelivery extends DomainResource { * Path: SupplyDelivery.receiver
*

*/ - // [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"; /** @@ -995,8 +991,6 @@ public class SupplyDelivery extends DomainResource { * Path: SupplyDelivery.patient
*

*/ - // [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"; /** @@ -1023,8 +1017,6 @@ public class SupplyDelivery extends DomainResource { * Path: SupplyDelivery.supplier
*

*/ - // [Practitioner] - // [Practitioner] @SearchParamDefinition(name="supplier", path="SupplyDelivery.supplier", description="Dispenser", type="reference", target={Practitioner.class} ) public static final String SP_SUPPLIER = "supplier"; /** @@ -1051,8 +1043,6 @@ public class SupplyDelivery extends DomainResource { * Path: SupplyDelivery.status
*

*/ - // [] - // [] @SearchParamDefinition(name="status", path="SupplyDelivery.status", description="in-progress | completed | abandoned", type="token", target={} ) public static final String SP_STATUS = "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 b39070cebc1..53a1774bcd3 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -1088,8 +1088,6 @@ public class SupplyRequest extends DomainResource { * Path: SupplyRequest.date
*

*/ - // [] - // [] @SearchParamDefinition(name="date", path="SupplyRequest.date", description="When the request was made", type="date", target={} ) public static final String SP_DATE = "date"; /** @@ -1110,8 +1108,6 @@ public class SupplyRequest extends DomainResource { * Path: SupplyRequest.identifier
*

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="SupplyRequest.identifier", description="Unique identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -1132,8 +1128,6 @@ 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", target={} ) public static final String SP_KIND = "kind"; /** @@ -1154,8 +1148,6 @@ public class SupplyRequest extends DomainResource { * Path: SupplyRequest.patient
*

*/ - // [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"; /** @@ -1182,8 +1174,6 @@ public class SupplyRequest extends DomainResource { * Path: SupplyRequest.supplier
*

*/ - // [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"; /** @@ -1210,8 +1200,6 @@ public class SupplyRequest extends DomainResource { * Path: SupplyRequest.source
*

*/ - // [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"; /** @@ -1238,8 +1226,6 @@ public class SupplyRequest extends DomainResource { * Path: SupplyRequest.status
*

*/ - // [] - // [] @SearchParamDefinition(name="status", path="SupplyRequest.status", description="requested | completed | failed | cancelled", type="token", target={} ) public static final String SP_STATUS = "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 81b57b19817..4c7f4e93c8e 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -2239,8 +2239,6 @@ public class Task extends DomainResource { * Path: Task.owner
*

*/ - // [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"; /** @@ -2267,8 +2265,6 @@ 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", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -2289,8 +2285,6 @@ public class Task extends DomainResource { * Path: Task.parent
*

*/ - // [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"; /** @@ -2317,8 +2311,6 @@ public class Task extends DomainResource { * Path: Task.creator
*

*/ - // [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"; /** @@ -2345,8 +2337,6 @@ 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", target={} ) public static final String SP_PERFORMER = "performer"; /** @@ -2367,8 +2357,6 @@ 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"; /** @@ -2395,8 +2383,6 @@ public class Task extends DomainResource { * Path: Task.created
*

*/ - // [] - // [] @SearchParamDefinition(name="created", path="Task.created", description="Search by creation date", type="date", target={} ) public static final String SP_CREATED = "created"; /** @@ -2417,8 +2403,6 @@ public class Task extends DomainResource { * Path: Task.type
*

*/ - // [] - // [] @SearchParamDefinition(name="type", path="Task.type", description="Search by task type", type="token", target={} ) public static final String SP_TYPE = "type"; /** @@ -2439,8 +2423,6 @@ public class Task extends DomainResource { * Path: Task.priority
*

*/ - // [] - // [] @SearchParamDefinition(name="priority", path="Task.priority", description="Search by task priority", type="token", target={} ) public static final String SP_PRIORITY = "priority"; /** @@ -2461,8 +2443,6 @@ public class Task extends DomainResource { * Path: Task.failureReason
*

*/ - // [] - // [] @SearchParamDefinition(name="failure", path="Task.failureReason", description="Search by failure reason", type="token", target={} ) public static final String SP_FAILURE = "failure"; /** @@ -2483,8 +2463,6 @@ public class Task extends DomainResource { * Path: Task.lastModified
*

*/ - // [] - // [] @SearchParamDefinition(name="modified", path="Task.lastModified", description="Search by last modification date", type="date", target={} ) public static final String SP_MODIFIED = "modified"; /** @@ -2505,8 +2483,6 @@ public class Task extends DomainResource { * Path: Task.definition
*

*/ - // [] - // [] @SearchParamDefinition(name="definition", path="Task.definition", description="Search by task definition", type="uri", target={} ) public static final String SP_DEFINITION = "definition"; /** @@ -2527,8 +2503,6 @@ public class Task extends DomainResource { * Path: Task.status
*

*/ - // [] - // [] @SearchParamDefinition(name="status", path="Task.status", description="Search by task status", type="token", target={} ) public static final String SP_STATUS = "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 8e43ad7a440..ec1b220d00c 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -11234,8 +11234,6 @@ public class TestScript extends DomainResource { * Path: TestScript.identifier
*

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="TestScript.identifier", description="External identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -11256,8 +11254,6 @@ 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", target={} ) public static final String SP_TESTSCRIPT_TEST_CAPABILITY = "testscript-test-capability"; /** @@ -11278,8 +11274,6 @@ 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", target={} ) public static final String SP_TESTSCRIPT_SETUP_CAPABILITY = "testscript-setup-capability"; /** @@ -11300,8 +11294,6 @@ public class TestScript extends DomainResource { * Path: TestScript.name
*

*/ - // [] - // [] @SearchParamDefinition(name="name", path="TestScript.name", description="Informal name for this TestScript", type="string", target={} ) public static final String SP_NAME = "name"; /** @@ -11322,8 +11314,6 @@ public class TestScript extends DomainResource { * Path: TestScript.description
*

*/ - // [] - // [] @SearchParamDefinition(name="description", path="TestScript.description", description="Natural language description of the TestScript", type="string", target={} ) public static final String SP_DESCRIPTION = "description"; /** @@ -11344,8 +11334,6 @@ 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", target={} ) public static final String SP_TESTSCRIPT_CAPABILITY = "testscript-capability"; /** @@ -11366,8 +11354,6 @@ public class TestScript extends DomainResource { * Path: TestScript.url
*

*/ - // [] - // [] @SearchParamDefinition(name="url", path="TestScript.url", description="Absolute URL used to reference this TestScript", type="uri", target={} ) public static final String SP_URL = "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 982863501e6..1091c5e4733 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -4657,8 +4657,6 @@ public class ValueSet extends DomainResource { * Path: ValueSet.date
*

*/ - // [] - // [] @SearchParamDefinition(name="date", path="ValueSet.date", description="The value set publication date", type="date", target={} ) public static final String SP_DATE = "date"; /** @@ -4679,8 +4677,6 @@ 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", target={} ) public static final String SP_REFERENCE = "reference"; /** @@ -4701,8 +4697,6 @@ public class ValueSet extends DomainResource { * Path: ValueSet.identifier
*

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="ValueSet.identifier", description="The identifier for the value set", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -4723,8 +4717,6 @@ public class ValueSet extends DomainResource { * Path: ValueSet.name
*

*/ - // [] - // [] @SearchParamDefinition(name="name", path="ValueSet.name", description="The name of the value set", type="string", target={} ) public static final String SP_NAME = "name"; /** @@ -4745,8 +4737,6 @@ 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", target={} ) public static final String SP_CONTEXT = "context"; /** @@ -4767,8 +4757,6 @@ 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", target={} ) public static final String SP_PUBLISHER = "publisher"; /** @@ -4789,8 +4777,6 @@ 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", target={} ) public static final String SP_DESCRIPTION = "description"; /** @@ -4811,8 +4797,6 @@ public class ValueSet extends DomainResource { * Path: ValueSet.version
*

*/ - // [] - // [] @SearchParamDefinition(name="version", path="ValueSet.version", description="The version identifier of the value set", type="token", target={} ) public static final String SP_VERSION = "version"; /** @@ -4833,8 +4817,6 @@ public class ValueSet extends DomainResource { * Path: ValueSet.url
*

*/ - // [] - // [] @SearchParamDefinition(name="url", path="ValueSet.url", description="The logical URL for the value set", type="uri", target={} ) public static final String SP_URL = "url"; /** @@ -4855,8 +4837,6 @@ public class ValueSet extends DomainResource { * Path: ValueSet.status
*

*/ - // [] - // [] @SearchParamDefinition(name="status", path="ValueSet.status", description="The status of the value set", type="token", target={} ) public static final String SP_STATUS = "status"; /** @@ -4877,8 +4857,6 @@ public class ValueSet extends DomainResource { * Path: ValueSet.expansion.identifier
*

*/ - // [] - // [] @SearchParamDefinition(name="expansion", path="ValueSet.expansion.identifier", description="Uniquely identifies this expansion", type="uri", target={} ) public static final String SP_EXPANSION = "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 c9a1d07cd05..02d73f75249 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 Mon, May 2, 2016 06:53-0400 for FHIR v1.4.0 +// Generated on Mon, May 2, 2016 22:48-0400 for FHIR v1.4.0 import java.util.*; @@ -2064,8 +2064,6 @@ public class VisionPrescription extends DomainResource { * Path: VisionPrescription.prescriber
*

*/ - // [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"; /** @@ -2092,8 +2090,6 @@ public class VisionPrescription extends DomainResource { * Path: VisionPrescription.identifier
*

*/ - // [] - // [] @SearchParamDefinition(name="identifier", path="VisionPrescription.identifier", description="Return prescriptions with this external identifier", type="token", target={} ) public static final String SP_IDENTIFIER = "identifier"; /** @@ -2114,8 +2110,6 @@ public class VisionPrescription extends DomainResource { * Path: VisionPrescription.patient
*

*/ - // [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"; /** @@ -2142,8 +2136,6 @@ public class VisionPrescription extends DomainResource { * Path: VisionPrescription.dateWritten
*

*/ - // [] - // [] @SearchParamDefinition(name="datewritten", path="VisionPrescription.dateWritten", description="Return prescriptions written on this date", type="date", target={} ) public static final String SP_DATEWRITTEN = "datewritten"; /** @@ -2164,8 +2156,6 @@ public class VisionPrescription extends DomainResource { * Path: VisionPrescription.encounter
*

*/ - // [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"; /** diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/TinderStructuresMojo.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/TinderStructuresMojo.java index b2a96b1ab11..b52666dc707 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/TinderStructuresMojo.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/TinderStructuresMojo.java @@ -228,7 +228,7 @@ public class TinderStructuresMojo extends AbstractMojo { String dtOutputDir = "target/generated-sources/tinder/ca/uhn/fhir/model/dev/composite"; ResourceGeneratorUsingSpreadsheet rp = new ResourceGeneratorUsingSpreadsheet("dstu2", "."); - rp.setBaseResourceNames(Arrays.asList( "practitioner"//, "auditevent" , "observation" + rp.setBaseResourceNames(Arrays.asList( "appointment"//, "auditevent" , "observation" // //, "contract" // "valueset", "organization", "location" // , "observation", "conformance" diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/model/SearchParameter.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/model/SearchParameter.java index 41a984daf8c..6c34a5a7813 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/model/SearchParameter.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/model/SearchParameter.java @@ -140,8 +140,11 @@ public class SearchParameter { myPath = thePath; } - public void setTargetTypes(List theTargetTypes) { - myTargetTypes = theTargetTypes; + public void addTargetType(String theTargetType) { + if (myTargetTypes == null) { + myTargetTypes = new ArrayList(); + } + myTargetTypes.add(theTargetType); } public void setType(String theType) { diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/parser/BaseStructureSpreadsheetParser.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/parser/BaseStructureSpreadsheetParser.java index da80c52737c..26b6d0cdb79 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/parser/BaseStructureSpreadsheetParser.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/parser/BaseStructureSpreadsheetParser.java @@ -170,22 +170,22 @@ public abstract class BaseStructureSpreadsheetParser extends BaseStructureParser postProcess(resource); - for (SearchParameter nextParam : resource.getSearchParameters()) { - if (nextParam.getType().equals("reference")) { - String path = nextParam.getPath(); - List targetTypes = pathToResourceTypes.get(path); - if (targetTypes != null) { - targetTypes = new ArrayList(targetTypes); - for (Iterator iter = targetTypes.iterator(); iter.hasNext();) { - String next = iter.next(); - if (next.equals("Any") || next.endsWith("Dt")) { - iter.remove(); - } - } - } - nextParam.setTargetTypes(targetTypes); - } - } +// for (SearchParameter nextParam : resource.getSearchParameters()) { +// if (nextParam.getType().equals("reference")) { +// String path = nextParam.getPath(); +// List targetTypes = pathToResourceTypes.get(path); +// if (targetTypes != null) { +// targetTypes = new ArrayList(targetTypes); +// for (Iterator iter = targetTypes.iterator(); iter.hasNext();) { +// String next = iter.next(); +// if (next.equals("Any") || next.endsWith("Dt")) { +// iter.remove(); +// } +// } +// } +// nextParam.setTargetTypes(targetTypes); +// } +// } index++; } @@ -244,6 +244,7 @@ public abstract class BaseStructureSpreadsheetParser extends BaseStructureParser int colDesc = 0; int colType = 0; int colPath = 0; + int colTargetTypes = 0; for (int j = 0; j < 20; j++) { String nextName = cellValue(defRow, j); if (nextName == null) { @@ -258,6 +259,8 @@ public abstract class BaseStructureSpreadsheetParser extends BaseStructureParser colType = j; } else if ("path".equals(nextName)) { colPath = j; + } else if ("target types".equals(nextName)) { + colTargetTypes = j; } } @@ -279,6 +282,17 @@ public abstract class BaseStructureSpreadsheetParser extends BaseStructureParser theResource.addSearchParameter(getVersion(), sp); } } + + String targetTypes = cellValue(nextRow, colTargetTypes); + if (isNotBlank(targetTypes)) { + for (String next : targetTypes.trim().split("\\s*,\\s*")) { + if (isNotBlank(next)) { + if (Character.isUpperCase(next.charAt(0))) { + sp.addTargetType(next); + } + } + } + } } for (SearchParameter nextCompositeParam : compositeParams) { diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 385dddc23bb..56cc0e8dc40 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -522,6 +522,11 @@ Remove invalid resource type "Documentation" from DSTU2 structures. + + JPA server did not respect target types for search parameters. E.g. Appointment:patient has + a path of "Appointment.participant.actor" and a target type of "Patient". The search path + was being correctly handled, but the target type was being ignored. +